Index: user/gjb/releng-rewrite/en_US.ISO8859-1/books/handbook/network-servers/chapter.xml
===================================================================
--- user/gjb/releng-rewrite/en_US.ISO8859-1/books/handbook/network-servers/chapter.xml	(revision 49724)
+++ user/gjb/releng-rewrite/en_US.ISO8859-1/books/handbook/network-servers/chapter.xml	(revision 49725)
@@ -1,5788 +1,5788 @@
 <?xml version="1.0" encoding="iso-8859-1"?>
 <!--
      The FreeBSD Documentation Project
 
      $FreeBSD$
 -->
 <chapter xmlns="http://docbook.org/ns/docbook"
   xmlns:xlink="http://www.w3.org/1999/xlink" version="5.0"
   xml:id="network-servers">
   <!--
   <chapterinfo>
     <authorgroup>
       <author>
 	<firstname>Murray</firstname>
 	<surname>Stokely</surname>
 	<contrib>Reorganized by in July 2004</contrib>
       </author>
     </authorgroup>
   </chapterinfo>
   -->
 
   <title>Network Servers</title>
 
   <sect1 xml:id="network-servers-synopsis">
     <title>Synopsis</title>
 
     <para>This chapter covers some of the more frequently used network
       services on &unix; systems.  This includes installing,
       configuring, testing, and maintaining many different types of
       network services.  Example configuration files are included
       throughout this chapter for reference.</para>
 
     <para>By the end of this chapter, readers will know:</para>
 
     <itemizedlist>
       <listitem>
 	<para>How to manage the <application>inetd</application>
 	  daemon.</para>
       </listitem>
 
       <listitem>
 	<para>How to set up the Network File System
 	  (<acronym>NFS</acronym>).</para>
       </listitem>
 
       <listitem>
 	<para>How to set up the Network Information Server
 	  (<acronym>NIS</acronym>) for centralizing and sharing
 	  user accounts.</para>
       </listitem>
 
       <listitem>
 	<para>How to set &os; up to act as an <acronym>LDAP</acronym>
 	  server or client</para>
       </listitem>
 
       <listitem>
 	<para>How to set up automatic network settings using
 	  <acronym>DHCP</acronym>.</para>
       </listitem>
 
       <listitem>
 	<para>How to set up a Domain Name Server
 	  (<acronym>DNS</acronym>).</para>
       </listitem>
 
       <listitem>
 	<para>How to set up the <application>Apache</application>
 	  <acronym>HTTP</acronym> Server.</para>
       </listitem>
 
       <listitem>
 	<para>How to set up a File Transfer Protocol
 	  (<acronym>FTP</acronym>) server.</para>
       </listitem>
 
       <listitem>
 	<para>How to set up a file and print server for &windows;
 	  clients using <application>Samba</application>.</para>
       </listitem>
 
       <listitem>
 	<para>How to synchronize the time and date, and set up a
 	  time server using the Network Time Protocol
 	  (<acronym>NTP</acronym>).</para>
       </listitem>
 
       <listitem>
 	<para>How to set up <acronym>iSCSI</acronym>.</para>
       </listitem>
     </itemizedlist>
 
     <para>This chapter assumes a basic knowledge of:</para>
 
     <itemizedlist>
       <listitem>
 	<para><filename>/etc/rc</filename> scripts.</para>
       </listitem>
 
       <listitem>
 	<para>Network terminology.</para>
       </listitem>
 
       <listitem>
 	<para>Installation of additional third-party
 	  software (<xref linkend="ports"/>).</para>
       </listitem>
     </itemizedlist>
   </sect1>
 
   <sect1 xml:id="network-inetd">
     <title>The <application>inetd</application>
       Super-Server</title>
 
     <!--
     <sect1info>
       <authorgroup>
 	<author>
 	  <firstname>Chern</firstname>
 	  <surname>Lee</surname>
 	  <contrib>Contributed by </contrib>
 	</author>
       </authorgroup>
       <authorgroup>
 	<author>
 	  <contrib>Updated by </contrib>
 	  <othername>The &os; Documentation Project</othername>
 	</author>
       </authorgroup>
     </sect1info>
     -->
 
     <para>The &man.inetd.8; daemon is sometimes referred to as a
       Super-Server because it manages connections for many services.
       Instead of starting multiple applications, only the
       <application>inetd</application> service needs to be started.
       When a connection is received for a service that is managed by
       <application>inetd</application>, it determines which program
       the connection is destined for, spawns a process for that
       program, and delegates the program a socket.  Using
       <application>inetd</application> for services that are not
       heavily used can reduce system load, when compared to running
       each daemon individually in stand-alone mode.</para>
 
     <para>Primarily, <application>inetd</application> is used to
       spawn other daemons, but several trivial protocols are handled
       internally, such as <application>chargen</application>,
       <application>auth</application>,
       <application>time</application>,
       <application>echo</application>,
       <application>discard</application>, and
       <application>daytime</application>.</para>
 
     <para>This section covers the basics of configuring
       <application>inetd</application>.</para>
 
     <sect2 xml:id="network-inetd-conf">
       <title>Configuration File</title>
 
       <para>Configuration of <application>inetd</application> is
 	done by editing <filename>/etc/inetd.conf</filename>.  Each
 	line of this configuration file represents an application
 	which can be started by <application>inetd</application>.  By
 	default, every line starts with a comment
 	(<literal>#</literal>), meaning that
 	<application>inetd</application> is not listening for any
 	applications.  To configure <application>inetd</application>
 	to listen for an application's connections, remove the
 	<literal>#</literal> at the beginning of the line for that
 	application.</para>
 
       <para>After saving your edits, configure
 	<application>inetd</application> to start at system boot by
 	editing <filename>/etc/rc.conf</filename>:</para>
 
       <programlisting>inetd_enable="YES"</programlisting>
 
       <para>To start  <application>inetd</application> now, so that it
 	listens for the service you configured, type:</para>
 
       <screen>&prompt.root; <userinput>service inetd start</userinput></screen>
 
       <para>Once <application>inetd</application> is started, it needs
 	to be notified whenever a modification is made to
 	<filename>/etc/inetd.conf</filename>:</para>
 
       <example xml:id="network-inetd-reread">
 	<title>Reloading the <application>inetd</application>
 	  Configuration File</title>
 
 	<screen>&prompt.root; <userinput>service inetd reload</userinput></screen>
       </example>
 
       <para>Typically, the default entry for an application does not
 	need to be edited beyond removing the <literal>#</literal>.
 	In some situations, it may be appropriate to edit the default
 	entry.</para>
 
       <para>As an example, this is the default entry for &man.ftpd.8;
 	over IPv4:</para>
 
       <programlisting>ftp     stream  tcp     nowait  root    /usr/libexec/ftpd       ftpd -l</programlisting>
 
       <para>The seven columns in an entry are as follows:</para>
 
       <programlisting>service-name
 socket-type
 protocol
 {wait|nowait}[/max-child[/max-connections-per-ip-per-minute[/max-child-per-ip]]]
 user[:group][/login-class]
 server-program
 server-program-arguments</programlisting>
 
       <para>where:</para>
 
       <variablelist>
 	<varlistentry>
 	  <term>service-name</term>
 
 	  <listitem>
 	    <para>The service name of the daemon to start.  It must
 	      correspond to a service listed in
 	      <filename>/etc/services</filename>.  This determines
 	      which port <application>inetd</application> listens on
 	      for incoming connections to that service.  When using a
 	      custom service, it must first be added to
 	      <filename>/etc/services</filename>.</para>
 	  </listitem>
 	</varlistentry>
 
 	<varlistentry>
 	  <term>socket-type</term>
 
 	  <listitem>
 	    <para>Either <literal>stream</literal>,
 	      <literal>dgram</literal>, <literal>raw</literal>, or
 	      <literal>seqpacket</literal>.  Use
 	      <literal>stream</literal> for TCP connections and
 	      <literal>dgram</literal> for
 	      <acronym>UDP</acronym> services.</para>
 	  </listitem>
 	</varlistentry>
 
 	<varlistentry>
 	  <term>protocol</term>
 
 	  <listitem>
 	    <para>Use one of the following protocol names:</para>
 
 	    <informaltable frame="none" pgwide="1">
 	      <tgroup cols="2">
 		<thead>
 		  <row>
 		    <entry>Protocol Name</entry>
 		    <entry>Explanation</entry>
 		  </row>
 		</thead>
 
 		<tbody>
 		  <row>
 		    <entry>tcp or tcp4</entry>
 		    <entry>TCP IPv4</entry>
 		  </row>
 
 		  <row>
 		    <entry>udp or udp4</entry>
 		    <entry><acronym>UDP</acronym> IPv4</entry>
 		  </row>
 
 		  <row>
 		    <entry>tcp6</entry>
 		    <entry>TCP IPv6</entry>
 		  </row>
 
 		  <row>
 		    <entry>udp6</entry>
 		    <entry><acronym>UDP</acronym> IPv6</entry>
 		  </row>
 
 		  <row>
 		    <entry>tcp46</entry>
 		    <entry>Both TCP IPv4 and IPv6</entry>
 		  </row>
 
 		  <row>
 		    <entry>udp46</entry>
 		    <entry>Both <acronym>UDP</acronym> IPv4 and
 		      IPv6</entry>
 		  </row>
 		</tbody>
 	      </tgroup>
 	    </informaltable>
 	  </listitem>
 	</varlistentry>
 
 	<varlistentry>
 	  <term>{wait|nowait}[/max-child[/max-connections-per-ip-per-minute[/max-child-per-ip]]]</term>
 
 	  <listitem>
 	    <para>In this field, <option>wait</option> or
 	      <option>nowait</option> must be specified.
 	      <option>max-child</option>,
 	      <option>max-connections-per-ip-per-minute</option> and
 	      <option>max-child-per-ip</option> are optional.</para>
 
 	    <para><option>wait|nowait</option> indicates whether or
 	      not the service is able to handle its own socket.
 	      <option>dgram</option> socket types must use
 	      <option>wait</option> while
 	      <option>stream</option> daemons, which are usually
 	      multi-threaded, should use <option>nowait</option>.
 	      <option>wait</option> usually hands off multiple sockets
 	      to a single daemon, while <option>nowait</option> spawns
 	      a child daemon for each new socket.</para>
 
 	    <para>The maximum number of child daemons
 	      <application>inetd</application> may spawn is set by
 	      <option>max-child</option>.  For example, to limit ten
 	      instances of the daemon, place a <literal>/10</literal>
 	      after <option>nowait</option>.  Specifying
 	      <literal>/0</literal> allows an unlimited number of
 	      children.</para>
 
 	    <para><option>max-connections-per-ip-per-minute</option>
 	      limits the number of connections from any particular
 	      <acronym>IP</acronym> address per minute.  Once the
 	      limit  is reached, further connections from this IP
 	      address will be dropped until the end of the minute.
 	      For example, a value of <literal>/10</literal> would
 	      limit any particular <acronym>IP</acronym> address to
 	      ten connection attempts per minute.
 	      <option>max-child-per-ip</option> limits the number of
 	      child processes that can be started on behalf on any
 	      single <acronym>IP</acronym> address at any moment.
 	      These options can limit excessive resource consumption
 	      and help to prevent Denial of Service attacks.</para>
 
 	    <para>An example can be seen in the default settings for
 	      &man.fingerd.8;:</para>
 
 	    <programlisting>finger stream  tcp     nowait/3/10 nobody /usr/libexec/fingerd fingerd -k -s</programlisting>
 	  </listitem>
 	</varlistentry>
 
 	<varlistentry>
 	  <term>user</term>
 
 	  <listitem>
 	    <para>The username the daemon
 	      will run as.  Daemons typically run as
 	      <systemitem class="username">root</systemitem>,
 	      <systemitem class="username">daemon</systemitem>, or
 	      <systemitem class="username">nobody</systemitem>.</para>
 	  </listitem>
 	</varlistentry>
 
 	<varlistentry>
 	  <term>server-program</term>
 
 	  <listitem>
 	    <para>The full path to the daemon.  If the daemon is a
 	      service provided by <application>inetd</application>
 	      internally, use <option>internal</option>.</para>
 	  </listitem>
 	</varlistentry>
 
 	<varlistentry>
 	  <term>server-program-arguments</term>
 
 	  <listitem>
 	    <para>Used to specify any command arguments to be passed
 	      to the daemon on invocation.  If the daemon is an
 	      internal service, use
 	      <option>internal</option>.</para>
 	  </listitem>
 	</varlistentry>
       </variablelist>
     </sect2>
 
     <sect2 xml:id="network-inetd-cmdline">
       <title>Command-Line Options</title>
 
       <para>Like most server daemons, <application>inetd</application>
 	has a number of options that can be used to modify its
 	behavior.  By default, <application>inetd</application> is
 	started with <literal>-wW -C 60</literal>.  These options
 	enable TCP wrappers for all services, including internal
 	services, and prevent any <acronym>IP</acronym> address from
 	requesting any service more than 60 times per minute.</para>
 
       <para>To change the default options which are passed to
 	<application>inetd</application>, add an entry for
 	<literal>inetd_flags</literal> in
 	<filename>/etc/rc.conf</filename>.  If
 	<application>inetd</application> is already running, restart
 	it with <command>service inetd restart</command>.</para>
 
       <para>The available rate limiting options are:</para>
 
       <variablelist>
 	<varlistentry>
 	  <term>-c maximum</term>
 
 	  <listitem>
 	    <para>Specify the default maximum number of simultaneous
 	      invocations of each service, where the default is
 	      unlimited.  May be overridden on a per-service basis by
 	      using <option>max-child</option> in
 	      <filename>/etc/inetd.conf</filename>.</para>
 	  </listitem>
 	</varlistentry>
 
 	<varlistentry>
 	  <term>-C rate</term>
 
 	  <listitem>
 	    <para>Specify the default maximum number of times a
 	      service can be invoked from a single
 	      <acronym>IP</acronym> address per minute.  May be
 	      overridden on a per-service basis by using
 	      <option>max-connections-per-ip-per-minute</option> in
 	      <filename>/etc/inetd.conf</filename>.</para>
 	  </listitem>
 	</varlistentry>
 
 	<varlistentry>
 	  <term>-R rate</term>
 
 	  <listitem>
 	    <para>Specify the maximum number of times a service can be
 	      invoked in one minute, where the default is
 	      <literal>256</literal>.  A rate of <literal>0</literal>
 	      allows an unlimited number.</para>
 	  </listitem>
 	</varlistentry>
 
 	<varlistentry>
 	  <term>-s maximum</term>
 
 	  <listitem>
 	    <para>Specify the maximum number of times a service can be
 	      invoked from a single <acronym>IP</acronym> address at
 	      any one time, where the default is unlimited.  May be
 	      overridden on a per-service basis by using
 	      <option>max-child-per-ip</option> in
 	      <filename>/etc/inetd.conf</filename>.</para>
 	  </listitem>
 	</varlistentry>
       </variablelist>
 
       <para>Additional options are available.  Refer to &man.inetd.8;
 	for the full list of options.</para>
     </sect2>
 
     <sect2 xml:id="network-inetd-security">
       <title>Security Considerations</title>
 
       <para>Many of the daemons which can be managed by
 	<application>inetd</application> are not security-conscious.
 	Some daemons, such as <application>fingerd</application>, can
 	provide information that may be useful to an attacker.  Only
 	enable the services which are needed and monitor the system
 	for excessive connection attempts.
 	<literal>max-connections-per-ip-per-minute</literal>,
 	<literal>max-child</literal> and
 	<literal>max-child-per-ip</literal> can be used to limit such
 	attacks.</para>
 
       <para>By default, TCP wrappers is enabled.  Consult
 	&man.hosts.access.5; for more information on placing TCP
 	restrictions on various
 	<application>inetd</application> invoked daemons.</para>
     </sect2>
   </sect1>
 
   <sect1 xml:id="network-nfs">
     <info>
       <title>Network File System (NFS)</title>
 
       <authorgroup>
 	<author>
 	  <personname>
 	    <firstname>Tom</firstname>
 	    <surname>Rhodes</surname>
 	  </personname>
 	  <contrib>Reorganized and enhanced by </contrib>
 	</author>
       </authorgroup>
 
       <authorgroup>
 	<author>
 	  <personname>
 	    <firstname>Bill</firstname>
 	    <surname>Swingle</surname>
 	  </personname>
 	  <contrib>Written by </contrib>
 	</author>
       </authorgroup>
     </info>
 
     <indexterm><primary>NFS</primary></indexterm>
     <para>&os; supports the Network File System
       (<acronym>NFS</acronym>), which allows a server to share
       directories and files with clients over a network.  With
       <acronym>NFS</acronym>, users and programs can access files on
       remote systems as if they were stored locally.</para>
 
     <para><acronym>NFS</acronym> has many practical uses.  Some of
       the more common uses include:</para>
 
     <itemizedlist>
       <listitem>
 	<para>Data that would otherwise be duplicated on each client
 	  can be kept in a single location and accessed by clients
 	  on the network.</para>
       </listitem>
 
       <listitem>
 	<para>Several clients may need access to the
 	  <filename>/usr/ports/distfiles</filename> directory.
 	  Sharing that directory allows for quick access to the
 	  source files without having to download them to each
 	  client.</para>
       </listitem>
 
       <listitem>
 	<para>On large networks, it is often more convenient to
 	  configure a central <acronym>NFS</acronym> server on which
 	  all user home directories are stored.  Users can log into
 	  a client anywhere on the network and have access to their
 	  home directories.</para>
       </listitem>
 
       <listitem>
 	<para>Administration of <acronym>NFS</acronym> exports is
 	  simplified.  For example, there is only one file system
 	  where security or backup policies must be set.</para>
       </listitem>
 
       <listitem>
 	<para>Removable media storage devices can be used by other
 	  machines on the network.  This reduces the number of devices
 	  throughout the network and provides a centralized location
 	  to manage their security.  It is often more convenient to
 	  install software on multiple machines from a centralized
 	  installation media.</para>
       </listitem>
     </itemizedlist>
 
     <para><acronym>NFS</acronym> consists of a server and one or more
       clients.  The client remotely accesses the data that is stored
       on the server machine.  In order for this to function properly,
       a few processes have to be configured and running.</para>
 
     <para>These daemons must be running on the server:</para>
     <indexterm>
       <primary>NFS</primary>
 	<secondary>server</secondary>
      </indexterm>
      <indexterm>
        <primary>file server</primary>
 	<secondary>UNIX clients</secondary>
       </indexterm>
 
       <indexterm>
 	<primary><application>rpcbind</application></primary>
       </indexterm>
       <indexterm>
 	<primary><application>mountd</application></primary>
       </indexterm>
       <indexterm>
 	<primary><application>nfsd</application></primary>
       </indexterm>
 
       <informaltable frame="none" pgwide="1">
 	<tgroup cols="2">
 	  <colspec colwidth="1*"/>
 	  <colspec colwidth="3*"/>
 
 	  <thead>
 	    <row>
 	      <entry>Daemon</entry>
 	      <entry>Description</entry>
 	    </row>
 	  </thead>
 
 	  <tbody>
 	    <row>
 	      <entry><application>nfsd</application></entry>
 	      <entry>The <acronym>NFS</acronym> daemon which services
 		requests from <acronym>NFS</acronym> clients.</entry>
 	    </row>
 
 	    <row>
 	      <entry><application>mountd</application></entry>
 	      <entry>The <acronym>NFS</acronym> mount daemon which
 		carries out requests received from
 		<application>nfsd</application>.</entry>
 	    </row>
 
 	    <row>
 	      <entry><application>rpcbind</application></entry>
 	      <entry> This daemon allows <acronym>NFS</acronym>
 		clients to discover which port the
 		<acronym>NFS</acronym> server is using.</entry>
 	    </row>
 	  </tbody>
 	</tgroup>
       </informaltable>
 
       <para>Running &man.nfsiod.8; on the client can improve
 	performance, but is not required.</para>
 
       <sect2 xml:id="network-configuring-nfs">
 	<title>Configuring the Server</title>
 
 	<indexterm>
 	  <primary>NFS</primary>
 	  <secondary>configuration</secondary>
 	</indexterm>
 
       <para>The file systems which the <acronym>NFS</acronym> server
 	will share are specified in <filename>/etc/exports</filename>.
 	Each line in this file specifies a file system to be exported,
 	which clients have access to that file system, and any access
 	options.  When adding entries to this file, each exported file
 	system, its properties, and allowed hosts must occur on a
 	single line.  If no clients are listed in the entry, then any
 	client on the network can mount that file system.</para>
 
       <indexterm>
 	<primary>NFS</primary>
 	<secondary>export examples</secondary>
       </indexterm>
 
       <para>The following <filename>/etc/exports</filename> entries
 	demonstrate how to export file systems.  The examples can be
 	modified to match the file systems and client names on the
 	reader's network.  There are many options that can be used in
 	this file, but only a few will be mentioned here.  See
 	&man.exports.5; for the full list of options.</para>
 
       <para>This example shows how to export
 	<filename>/cdrom</filename> to three hosts named
 	<replaceable>alpha</replaceable>,
 	<replaceable>bravo</replaceable>, and
 	<replaceable>charlie</replaceable>:</para>
 
       <programlisting>/cdrom -ro <replaceable>alpha</replaceable> <replaceable>bravo</replaceable> <replaceable>charlie</replaceable></programlisting>
 
       <para>The <literal>-ro</literal> flag makes the file system
 	read-only, preventing clients from making any changes to the
 	exported file system.  This example assumes that the host
 	names are either in <acronym>DNS</acronym> or in
 	<filename>/etc/hosts</filename>.  Refer to &man.hosts.5; if
 	the network does not have a <acronym>DNS</acronym>
 	server.</para>
 
       <para>The next example exports <filename>/home</filename> to
 	three clients by <acronym>IP</acronym> address.  This can be
 	useful for networks without <acronym>DNS</acronym> or
 	<filename>/etc/hosts</filename> entries.  The
 	<literal>-alldirs</literal> flag allows subdirectories to be
 	mount points.  In other words, it will not automatically mount
 	the subdirectories, but will permit the client to mount the
 	directories that are required as needed.</para>
 
       <programlisting>/usr/home  -alldirs  10.0.0.2 10.0.0.3 10.0.0.4</programlisting>
 
       <para>This next example exports <filename>/a</filename> so that
 	two clients from different domains may access that file
 	system.  The <option>-maproot=root</option> allows <systemitem
 	  class="username">root</systemitem> on the remote system to
 	write data on the exported file system as <systemitem
 	  class="username">root</systemitem>.  If
 	<literal>-maproot=root</literal> is not specified, the
 	client's <systemitem class="username">root</systemitem> user
 	will be mapped to the server's <systemitem
 	  class="username">nobody</systemitem> account and will be
 	subject to the access limitations defined for <systemitem
 	  class="username">nobody</systemitem>.</para>
 
       <programlisting>/a  -maproot=root  host.example.com box.example.org</programlisting>
 
       <para>A client can only be specified once per file system.  For
 	example, if <filename>/usr</filename> is a single file system,
 	these entries would be invalid as both entries specify the
 	same host:</para>
 
       <programlisting># Invalid when /usr is one file system
 /usr/src   client
 /usr/ports client</programlisting>
 
       <para>The correct format for this situation is to use one
 	entry:</para>
 
       <programlisting>/usr/src /usr/ports  client</programlisting>
 
       <para>The following is an example of a valid export list, where
 	<filename>/usr</filename> and <filename>/exports</filename>
 	are local file systems:</para>
 
       <programlisting># Export src and ports to client01 and client02, but only
 # client01 has root privileges on it
 /usr/src /usr/ports -maproot=root    client01
 /usr/src /usr/ports               client02
 # The client machines have root and can mount anywhere
 # on /exports. Anyone in the world can mount /exports/obj read-only
 /exports -alldirs -maproot=root      client01 client02
 /exports/obj -ro</programlisting>
 
       <para>To enable the processes required by the
 	<acronym>NFS</acronym> server at boot time, add these options
 	to <filename>/etc/rc.conf</filename>:</para>
 
       <programlisting>rpcbind_enable="YES"
 nfs_server_enable="YES"
 mountd_flags="-r"</programlisting>
 
       <para>The server can be started now by running this
 	command:</para>
 
       <screen>&prompt.root; <userinput>service nfsd start</userinput></screen>
 
       <para>Whenever the <acronym>NFS</acronym> server is started,
 	<application>mountd</application> also starts automatically.
 	However, <application>mountd</application> only reads
 	<filename>/etc/exports</filename> when it is started.  To make
 	subsequent <filename>/etc/exports</filename> edits take effect
 	immediately, force <application>mountd</application> to reread
 	it:</para>
 
       <screen>&prompt.root; <userinput>service mountd reload</userinput></screen>
     </sect2>
 
     <sect2>
       <title>Configuring the Client</title>
 
       <para>To enable <acronym>NFS</acronym> clients, set this option
 	in each client's <filename>/etc/rc.conf</filename>:</para>
 
       <programlisting>nfs_client_enable="YES"</programlisting>
 
       <para>Then, run this command on each <acronym>NFS</acronym>
 	client:</para>
 
       <screen>&prompt.root; <userinput>service nfsclient start</userinput></screen>
 
       <para>The client now has everything it needs to mount a remote
 	file system.  In these examples, the server's name is
 	<systemitem>server</systemitem> and the client's name is
 	<systemitem>client</systemitem>.  To mount
 	<filename>/home</filename> on
 	<systemitem>server</systemitem> to the
 	<filename>/mnt</filename> mount point on
 	<systemitem>client</systemitem>:</para>
 
       <indexterm>
 	<primary>NFS</primary>
 	<secondary>mounting</secondary>
       </indexterm>
       <screen>&prompt.root; <userinput>mount server:/home /mnt</userinput></screen>
 
       <para>The files and directories in
 	<filename>/home</filename> will now be available on
 	<systemitem>client</systemitem>, in the
 	<filename>/mnt</filename> directory.</para>
 
       <para>To mount a remote file system each time the client boots,
 	add it to <filename>/etc/fstab</filename>:</para>
 
       <programlisting>server:/home	/mnt	nfs	rw	0	0</programlisting>
 
       <para>Refer to &man.fstab.5; for a description of all available
 	options.</para>
     </sect2>
 
     <sect2>
       <title>Locking</title>
 
       <para>Some applications require file locking to operate
 	correctly.  To enable locking, add these lines to
 	<filename>/etc/rc.conf</filename> on both the client and
 	server:</para>
 
       <programlisting>rpc_lockd_enable="YES"
 rpc_statd_enable="YES"</programlisting>
 
       <para>Then start the applications:</para>
 
       <screen>&prompt.root; <userinput>service lockd start</userinput>
 &prompt.root; <userinput>service statd start</userinput></screen>
 
       <para>If locking is not required on the server, the
 	<acronym>NFS</acronym> client can be configured to lock
 	locally by including <option>-L</option> when running
 	<application>mount</application>.  Refer to &man.mount.nfs.8;
 	for further details.</para>
     </sect2>
 
     <sect2 xml:id="network-amd">
       <info>
 	<title>Automating Mounts with &man.amd.8;</title>
 
 	<authorgroup>
 	  <author>
 	    <personname>
 	      <firstname>Wylie</firstname>
 	      <surname>Stilwell</surname>
 	    </personname>
 	    <contrib>Contributed by </contrib>
 	  </author>
 	</authorgroup>
 
 	<authorgroup>
 	  <author>
 	    <personname>
 	      <firstname>Chern</firstname>
 	      <surname>Lee</surname>
 	    </personname>
 	    <contrib>Rewritten by </contrib>
 	  </author>
 	</authorgroup>
       </info>
 
       <indexterm><primary>amd</primary></indexterm>
       <indexterm>
 	<primary>automatic mounter daemon</primary>
       </indexterm>
 
       <para>The automatic mounter daemon,
 	<application>amd</application>, automatically mounts a remote
 	file system whenever a file or directory within that file
 	system is accessed.  File systems that are inactive for a
 	period of time will be automatically unmounted by
 	<application>amd</application>.</para>
 
       <para>This daemon provides an alternative to modifying
 	<filename>/etc/fstab</filename> to list every client.  It
 	operates by attaching itself as an  <acronym>NFS</acronym>
 	server to the <filename>/host</filename> and
 	<filename>/net</filename> directories.  When a file is
 	accessed within one of these directories,
 	<application>amd</application> looks up the corresponding
 	remote mount and automatically mounts it.
 	<filename>/net</filename> is used to mount an exported file
 	system from an <acronym>IP</acronym> address while
 	<filename>/host</filename> is used to mount an export from a
 	remote hostname.  For instance, an attempt to access a file
 	within <filename>/host/foobar/usr</filename> would tell
 	<application>amd</application> to mount the
 	<filename>/usr</filename> export on the host
 	<systemitem>foobar</systemitem>.</para>
 
       <example>
 	<title>Mounting an Export with
 	  <application>amd</application></title>
 
 	<para>In this example, <command>showmount -e</command> shows
 	  the exported file systems that can be mounted from the
 	  <acronym>NFS</acronym> server,
 	  <systemitem>foobar</systemitem>:</para>
 
 	<screen>&prompt.user; <userinput>showmount -e foobar</userinput>
 Exports list on foobar:
 /usr                               10.10.10.0
 /a                                 10.10.10.0
 &prompt.user; <userinput>cd /host/foobar/usr</userinput></screen>
       </example>
 
       <para>The output from <command>showmount</command> shows
 	<filename>/usr</filename> as an export.  When changing
 	directories to <filename>/host/foobar/usr</filename>,
 	<application>amd</application> intercepts the request and
 	attempts to resolve the hostname
 	<systemitem>foobar</systemitem>.  If successful,
 	<application>amd</application> automatically mounts the
 	desired export.</para>
 
       <para>To enable <application>amd</application> at boot time, add
 	this line to <filename>/etc/rc.conf</filename>:</para>
 
       <programlisting>amd_enable="YES"</programlisting>
 
       <para>To start <application>amd</application> now:</para>
 
       <screen>&prompt.root; <userinput>service amd start</userinput></screen>
 
       <para>Custom flags can be passed to
 	<application>amd</application> from the
 	<varname>amd_flags</varname> environment variable.  By
 	default, <varname>amd_flags</varname> is set to:</para>
 
       <programlisting>amd_flags="-a /.amd_mnt -l syslog /host /etc/amd.map /net /etc/amd.map"</programlisting>
 
       <para>The default options with which exports are mounted are
 	defined in <filename>/etc/amd.map</filename>.  Some of the
 	more advanced features of <application>amd</application> are
 	defined in <filename>/etc/amd.conf</filename>.</para>
 
       <para>Consult &man.amd.8; and &man.amd.conf.5; for more
 	information.</para>
     </sect2>
 
     <sect2 xml:id="network-autofs">
       <title>Automating Mounts with &man.autofs.5;</title>
 
       <note>
 	<para>The &man.autofs.5; automount facility is supported
 	  starting with &os;&nbsp;10.1-RELEASE.  To use the
 	  automounter functionality in older versions of &os;, use
 	  &man.amd.8; instead.  This chapter only describes the
 	  &man.autofs.5; automounter.</para>
       </note>
 
 
       <indexterm><primary>autofs</primary></indexterm>
       <indexterm>
 	<primary>automounter subsystem</primary>
       </indexterm>
 
       <para>The &man.autofs.5; facility is a common name for several
 	components that, together, allow for automatic mounting of
 	remote and local filesystems whenever a file or directory
 	within that file system is accessed.  It consists of the
 	kernel component, &man.autofs.5;, and several userspace
 	applications: &man.automount.8;, &man.automountd.8; and
 	&man.autounmountd.8;.  It serves as an alternative for
 	&man.amd.8; from previous &os; releases.  Amd is still
 	provided for backward compatibility purposes, as the two use
 	different map format; the one used by autofs is the same as
 	with other SVR4 automounters, such as the ones in Solaris,
 	MacOS X, and Linux.</para>
 
       <para>The &man.autofs.5; virtual filesystem is mounted on
 	specified mountpoints by &man.automount.8;, usually invoked
 	during boot.</para>
 
       <para>Whenever a process attempts to access file within the
 	&man.autofs.5; mountpoint, the kernel will notify
 	&man.automountd.8; daemon and pause the triggering process.
 	The &man.automountd.8; daemon will handle kernel requests by
 	finding the proper map and mounting the filesystem according
 	to it, then signal the kernel to release blocked process.  The
 	&man.autounmountd.8; daemon automatically unmounts automounted
 	filesystems after some time, unless they are still being
 	used.</para>
 
       <para>The primary autofs configuration file is
 	<filename>/etc/auto_master</filename>.  It assigns individual
 	maps to top-level mounts.  For an explanation of
 	<filename>auto_master</filename> and the map syntax, refer to
 	&man.auto.master.5;.</para>
 
       <para>There is a special automounter map mounted on
 	<filename>/net</filename>.  When a file is accessed within
 	this directory, &man.autofs.5; looks up the corresponding
 	remote mount and automatically mounts it.  For instance, an
 	attempt to access a file within
 	<filename>/net/foobar/usr</filename> would tell
 	&man.automountd.8; to mount the <filename
 	  >/usr</filename> export from the host
 	<systemitem class="fqdomainname">foobar</systemitem>.</para>
 
       <example>
 	<title>Mounting an Export with &man.autofs.5;</title>
 
 	<para>In this example, <command>showmount -e</command> shows
 	  the exported file systems that can be mounted from the
 	  <acronym>NFS</acronym> server,
 	  <systemitem class="fqdomainname">foobar</systemitem>:</para>
 
 	<screen>&prompt.user; <userinput>showmount -e foobar</userinput>
 Exports list on foobar:
 /usr                               10.10.10.0
 /a                                 10.10.10.0
 &prompt.user; <userinput>cd /net/foobar/usr</userinput></screen>
       </example>
 
       <para>The output from <command>showmount</command> shows
 	<filename>/usr</filename> as an export.
 	When changing directories to <filename
 	  >/host/foobar/usr</filename>,
 	&man.automountd.8; intercepts the request and attempts to
 	resolve the hostname <systemitem
 	  class="fqdomainname">foobar</systemitem>.  If successful,
 	&man.automountd.8; automatically mounts the source
 	export.</para>
 
       <para>To enable &man.autofs.5; at boot time, add this line to
 	<filename>/etc/rc.conf</filename>:</para>
 
       <programlisting>autofs_enable="YES"</programlisting>
 
       <para>Then &man.autofs.5; can be started by running:</para>
 
       <screen>&prompt.root; <userinput>service automount start</userinput>
 &prompt.root; <userinput>service automountd start</userinput>
 &prompt.root; <userinput>service autounmountd start</userinput></screen>
 
       <para>The &man.autofs.5; map format is the same as in other
 	operating systems.  Information about this format from other
 	 sources can be useful, like the <link
 	  xlink:href="http://web.archive.org/web/20160813071113/http://images.apple.com/business/docs/Autofs.pdf">Mac
 	  OS X document</link>.</para>
 
       <para>Consult the &man.automount.8;, &man.automountd.8;,
 	&man.autounmountd.8;, and &man.auto.master.5; manual pages for
 	more information.</para>
     </sect2>
   </sect1>
 
   <sect1 xml:id="network-nis">
     <!--
     <sect1info>
       <authorgroup>
 	<author>
 	  <firstname>Bill</firstname>
 	  <surname>Swingle</surname>
 	  <contrib>Written by </contrib>
 	</author>
       </authorgroup>
       <authorgroup>
 	<author>
 	  <firstname>Eric</firstname>
 	  <surname>Ogren</surname>
 	  <contrib>Enhanced by </contrib>
 	</author>
 	<author>
 	  <firstname>Udo</firstname>
 	  <surname>Erdelhoff</surname>
 	</author>
       </authorgroup>
     </sect1info>
     -->
     <title>Network Information System
       (<acronym>NIS</acronym>)</title>
 
     <indexterm><primary>NIS</primary></indexterm>
     <indexterm><primary>Solaris</primary></indexterm>
     <indexterm><primary>HP-UX</primary></indexterm>
     <indexterm><primary>AIX</primary></indexterm>
     <indexterm><primary>Linux</primary></indexterm>
     <indexterm><primary>NetBSD</primary></indexterm>
     <indexterm><primary>OpenBSD</primary></indexterm>
     <indexterm>
       <primary>yellow pages</primary>
       <see>NIS</see>
     </indexterm>
 
     <para>Network Information System (<acronym>NIS</acronym>) is
       designed to centralize administration of &unix;-like systems
       such as &solaris;, HP-UX, &aix;, Linux, NetBSD, OpenBSD, and
       &os;.  <acronym>NIS</acronym> was originally known as Yellow
       Pages but the name was changed due to trademark issues.   This
       is the reason why <acronym>NIS</acronym> commands begin with
       <literal>yp</literal>.</para>
 
     <indexterm>
       <primary>NIS</primary>
       <secondary>domains</secondary>
       </indexterm>
 
     <para><acronym>NIS</acronym> is a Remote Procedure Call
       (<acronym>RPC</acronym>)-based client/server system that allows
       a group of machines within an <acronym>NIS</acronym> domain to
       share a common set of configuration files.  This permits a
       system administrator to set up <acronym>NIS</acronym> client
       systems with only minimal configuration data and to add, remove,
       or modify configuration data from a single location.</para>
 
     <para>&os; uses version 2 of the <acronym>NIS</acronym>
       protocol.</para>
 
     <sect2>
       <title><acronym>NIS</acronym> Terms and Processes</title>
 
       <para>Table 28.1 summarizes the terms and important processes
 	used by <acronym>NIS</acronym>:</para>
 
       <indexterm>
 	<primary><application>rpcbind</application></primary>
       </indexterm>
       <indexterm>
 	<primary><application>portmap</application></primary>
       </indexterm>
 
       <table frame="none" pgwide="1">
 	<title><acronym>NIS</acronym> Terminology</title>
 
 	<tgroup cols="2">
 	  <colspec colwidth="1*"/>
 	  <colspec colwidth="3*"/>
 
 	  <thead>
 	    <row>
 	      <entry>Term</entry>
 	      <entry>Description</entry>
 	    </row>
 	  </thead>
 
 	  <tbody>
 	    <row>
 	      <entry><acronym>NIS</acronym> domain name</entry>
 
 	      <entry><acronym>NIS</acronym> servers and clients share
 		an <acronym>NIS</acronym> domain name.  Typically,
 		this name does not have anything to do with
 		<acronym>DNS</acronym>.</entry>
 	    </row>
 
 	    <row>
 	      <entry>&man.rpcbind.8;</entry>
 
 	      <entry>This service enables <acronym>RPC</acronym> and
 		must be running in order to run an
 		<acronym>NIS</acronym> server or act as an
 		<acronym>NIS</acronym> client.</entry>
 	    </row>
 
 	    <row>
 	      <entry>&man.ypbind.8;</entry>
 	      <entry>This service binds an <acronym>NIS</acronym>
 		client to its <acronym>NIS</acronym> server.  It will
 		take the <acronym>NIS</acronym> domain name and use
 		<acronym>RPC</acronym> to connect to the server.  It
 		is the core of client/server communication in an
 		<acronym>NIS</acronym> environment.  If this service
 		is not running on a client machine, it will not be
 		able to access the <acronym>NIS</acronym>
 		server.</entry>
 	    </row>
 
 	    <row>
 	      <entry>&man.ypserv.8;</entry>
 	      <entry>This is the process for the
 		<acronym>NIS</acronym> server.  If this service stops
 		running, the server will no longer be able to respond
 		to <acronym>NIS</acronym> requests so hopefully, there
 		is a slave server to take over.  Some non-&os; clients
 		will not try to reconnect using a slave server and the
 		<application>ypbind</application> process may need to
 		be restarted on these
 		clients.</entry>
 	    </row>
 
 	    <row>
 	      <entry>&man.rpc.yppasswdd.8;</entry>
 	      <entry>This process only runs on
 		<acronym>NIS</acronym> master servers.  This daemon
 		allows <acronym>NIS</acronym> clients to change their
 		<acronym>NIS</acronym> passwords.  If this daemon is
 		not running, users will have to login to the
 		<acronym>NIS</acronym> master server and change their
 		passwords there.</entry>
 	    </row>
 	  </tbody>
 	</tgroup>
       </table>
       <!-- XXX Missing: rpc.ypxfrd (not important, though) May only run
       on the master -->
     </sect2>
 
     <sect2>
       <title>Machine Types</title>
 
       <indexterm><primary>NIS</primary>
 	<secondary>master server</secondary>
       </indexterm>
       <indexterm><primary>NIS</primary>
 	<secondary>slave server</secondary>
       </indexterm>
       <indexterm><primary>NIS</primary>
 	<secondary>client</secondary>
       </indexterm>
 
       <para>There are three types of hosts in an
 	<acronym>NIS</acronym> environment:</para>
 
       <itemizedlist>
 	<listitem>
 	  <para><acronym>NIS</acronym> master server</para>
 
 	  <para>This server acts as a central repository for host
 	    configuration information and maintains the
 	    authoritative copy of the files used by all of the
 	    <acronym>NIS</acronym> clients.  The
 	    <filename>passwd</filename>, <filename>group</filename>,
 	    and other various files used by <acronym>NIS</acronym>
 	    clients are stored on the master server.  While it is
 	    possible for one machine to be an <acronym>NIS</acronym>
 	    master server for more than one <acronym>NIS</acronym>
 	    domain, this type of configuration will not be covered in
 	    this chapter as it assumes a relatively small-scale
 	    <acronym>NIS</acronym> environment.</para>
 	</listitem>
 
 	<listitem>
 	  <para><acronym>NIS</acronym> slave servers</para>
 
 	  <para><acronym>NIS</acronym> slave servers maintain copies
 	    of the <acronym>NIS</acronym> master's data files in
 	    order to provide redundancy.  Slave servers also help to
 	    balance the load of the master server as
 	    <acronym>NIS</acronym> clients always attach to the
 	    <acronym>NIS</acronym> server which responds
 	    first.</para>
 	</listitem>
 
 	<listitem>
 	  <para><acronym>NIS</acronym> clients</para>
 
 	  <para><acronym>NIS</acronym> clients authenticate
 	    against the <acronym>NIS</acronym> server during log
 	    on.</para>
 	</listitem>
       </itemizedlist>
 
       <para>Information in many files can be shared using
 	<acronym>NIS</acronym>.  The
 	<filename>master.passwd</filename>,
 	<filename>group</filename>, and <filename>hosts</filename>
 	files are commonly shared via <acronym>NIS</acronym>.
 	Whenever a process on a client needs information that would
 	normally be found in these files locally, it makes a query to
 	the <acronym>NIS</acronym> server that it is bound to
 	instead.</para>
     </sect2>
 
     <sect2>
       <title>Planning Considerations</title>
 
       <para>This section describes a sample <acronym>NIS</acronym>
 	environment which consists of 15 &os; machines with no
 	centralized point of administration.  Each machine has its own
 	<filename>/etc/passwd</filename> and
 	<filename>/etc/master.passwd</filename>.  These files are kept
 	in sync with each other only through manual intervention.
 	Currently, when a user is added to the lab, the process must
 	be repeated on all 15 machines.</para>
 
       <para>The configuration of the lab will be as follows:</para>
 
       <informaltable frame="none" pgwide="1">
 	<tgroup cols="3">
 	  <thead>
 	    <row>
 	      <entry>Machine name</entry>
 	      <entry><acronym>IP</acronym> address</entry>
 	      <entry>Machine role</entry>
 	    </row>
 	  </thead>
 
 	  <tbody>
 	    <row>
 	      <entry><systemitem>ellington</systemitem></entry>
 	      <entry><systemitem
 		  class="ipaddress">10.0.0.2</systemitem></entry>
 	      <entry><acronym>NIS</acronym> master</entry>
 	    </row>
 
 	    <row>
 	      <entry><systemitem>coltrane</systemitem></entry>
 	      <entry><systemitem
 		  class="ipaddress">10.0.0.3</systemitem></entry>
 	      <entry><acronym>NIS</acronym> slave</entry>
 	    </row>
 
 	    <row>
 	      <entry><systemitem>basie</systemitem></entry>
 	      <entry><systemitem
 		  class="ipaddress">10.0.0.4</systemitem></entry>
 	      <entry>Faculty workstation</entry>
 	    </row>
 
 	    <row>
 	      <entry><systemitem>bird</systemitem></entry>
 	      <entry><systemitem
 		  class="ipaddress">10.0.0.5</systemitem></entry>
 	      <entry>Client machine</entry>
 	    </row>
 
 	    <row>
 	      <entry><systemitem>cli[1-11]</systemitem></entry>
 	      <entry>
 		<systemitem
 		  class="ipaddress">10.0.0.[6-17]</systemitem></entry>
 	      <entry>Other client machines</entry>
 	    </row>
 	  </tbody>
 	</tgroup>
       </informaltable>
 
       <para>If this is the first time an <acronym>NIS</acronym>
 	scheme is being developed, it should be thoroughly planned
 	ahead of time.  Regardless of network size, several decisions
 	need to be made as part of the planning process.</para>
 
       <sect3>
 	<title>Choosing a <acronym>NIS</acronym> Domain Name</title>
 
 	<indexterm>
 	  <primary>NIS</primary>
 	  <secondary>domain name</secondary>
 	</indexterm>
 	<para>When a client broadcasts its requests for info, it
 	  includes the name of the <acronym>NIS</acronym> domain that
 	  it is part of.  This is how multiple servers on one network
 	  can tell which server should answer which request.  Think of
 	  the <acronym>NIS</acronym> domain name as the name for a
 	  group of hosts.</para>
 
 	<para>Some organizations choose to use their Internet domain
 	  name for their <acronym>NIS</acronym> domain name.  This is
 	  not recommended as it can cause confusion when trying to
 	  debug network problems.  The <acronym>NIS</acronym> domain
 	  name should be unique within the network and it is helpful
 	  if it describes the group of machines it represents.  For
 	  example, the Art department at Acme Inc. might be in the
 	  <quote>acme-art</quote> <acronym>NIS</acronym> domain.  This
 	  example will use the domain name
 	  <literal>test-domain</literal>.</para>
 
 	<para>However, some non-&os; operating systems require the
 	  <acronym>NIS</acronym> domain name to be the same as the
 	  Internet domain name.  If one or more machines on the
 	  network have this restriction, the Internet domain name
 	  <emphasis>must</emphasis> be used as the
 	  <acronym>NIS</acronym> domain name.</para>
       </sect3>
 
       <sect3>
 	<title>Physical Server Requirements</title>
 
 	<para>There are several things to keep in mind when choosing a
 	  machine to use as a <acronym>NIS</acronym> server.  Since
 	  <acronym>NIS</acronym> clients depend upon the availability
 	  of the server, choose a machine that is not rebooted
 	  frequently.  The <acronym>NIS</acronym> server should
 	  ideally be a stand alone machine whose sole purpose is to be
 	  an <acronym>NIS</acronym> server.  If the network is not
 	  heavily used, it is acceptable to put the
 	  <acronym>NIS</acronym> server on a machine running other
 	  services.  However, if the <acronym>NIS</acronym> server
 	  becomes unavailable, it will adversely affect all
 	  <acronym>NIS</acronym> clients.</para>
       </sect3>
     </sect2>
 
     <sect2>
       <title>Configuring the <acronym>NIS</acronym> Master
 	Server</title>
 
       <para>The canonical copies of all <acronym>NIS</acronym> files
 	are stored on the master server.  The databases used to store
 	the information are called <acronym>NIS</acronym> maps.  In
 	&os;, these maps are stored in
 	<filename>/var/yp/[domainname]</filename> where
 	<filename>[domainname]</filename> is the name of the
 	<acronym>NIS</acronym> domain.  Since multiple domains are
 	supported, it is possible to have several directories, one for
 	each domain.  Each domain will have its own independent set of
 	maps.</para>
 
       <para><acronym>NIS</acronym> master and slave servers handle all
 	<acronym>NIS</acronym> requests through &man.ypserv.8;.  This
 	daemon is responsible for receiving incoming requests from
 	<acronym>NIS</acronym> clients, translating the requested
 	domain and map name to a path to the corresponding database
 	file, and transmitting data from the database back to the
 	client.</para>
 
       <indexterm><primary>NIS</primary>
 	<secondary>server configuration</secondary>
       </indexterm>
       <para>Setting up a master <acronym>NIS</acronym> server can be
 	relatively straight forward, depending on environmental needs.
 	Since &os; provides built-in <acronym>NIS</acronym> support,
 	it only needs to be enabled by adding the following lines to
 	<filename>/etc/rc.conf</filename>:</para>
 
       <programlisting>nisdomainname="test-domain"	<co xml:id="network-nis-co-domainname" />
 nis_server_enable="YES"		<co xml:id="network-nis-co-server" />
 nis_yppasswdd_enable="YES"	<co xml:id="network-nis-co-yppasswdd" /></programlisting>
 
       <calloutlist>
 	<callout arearefs="network-nis-co-domainname">
 	  <para>This line sets the <acronym>NIS</acronym> domain name
 	    to <literal>test-domain</literal>.</para>
 	</callout>
 
 	<callout arearefs="network-nis-co-server">
 	  <para>This automates the start up of the
 	    <acronym>NIS</acronym> server processes when the system
 	    boots.</para>
 	</callout>
 
 	<callout arearefs="network-nis-co-yppasswdd">
 	  <para>This enables the &man.rpc.yppasswdd.8; daemon so that
 	    users can change their <acronym>NIS</acronym> password
 	    from a client machine.</para>
 	</callout>
       </calloutlist>
 
       <para>Care must be taken in a multi-server domain where the
 	server machines are also <acronym>NIS</acronym> clients.  It
 	is generally a good idea to force the servers to bind to
 	themselves rather than allowing them to broadcast bind
 	requests and possibly become bound to each other.  Strange
 	failure modes can result if one server goes down and others
 	are dependent upon it.  Eventually, all the clients will time
 	out and attempt to bind to other servers, but the delay
 	involved can be considerable and the failure mode is still
 	present since the servers might bind to each other all over
 	again.</para>
 
       <para>A server that is also a client can be forced to bind to a
 	particular server by adding these additional lines to
 	<filename>/etc/rc.conf</filename>:</para>
 
       <programlisting>nis_client_enable="YES" # run client stuff as well
 nis_client_flags="-S <replaceable>NIS domain</replaceable>,<replaceable>server</replaceable>"</programlisting>
 
       <para>After saving the edits, type
 	<command>/etc/netstart</command> to restart the network and
 	apply the values defined in <filename>/etc/rc.conf</filename>.
 	Before initializing the <acronym>NIS</acronym> maps, start
 	&man.ypserv.8;:</para>
 
       <screen>&prompt.root; <userinput>service ypserv start</userinput></screen>
 
       <sect3>
 	<title>Initializing the <acronym>NIS</acronym> Maps</title>
 
 	<indexterm>
 	  <primary>NIS</primary>
 	  <secondary>maps</secondary>
 	</indexterm>
 	<para><acronym>NIS</acronym> maps are generated from the
 	  configuration files in <filename>/etc</filename> on the
 	  <acronym>NIS</acronym> master, with one exception:
 	  <filename>/etc/master.passwd</filename>.  This is to prevent
 	  the propagation of passwords to all the servers in the
 	  <acronym>NIS</acronym> domain.  Therefore, before the
 	  <acronym>NIS</acronym> maps are initialized, configure the
 	  primary password files:</para>
 
 	<screen>&prompt.root; <userinput>cp /etc/master.passwd /var/yp/master.passwd</userinput>
 &prompt.root; <userinput>cd /var/yp</userinput>
 &prompt.root; <userinput>vi master.passwd</userinput></screen>
 
 	<para>It is advisable to remove all entries for system
 	  accounts as well as any user accounts that do not need to be
 	  propagated to the <acronym>NIS</acronym> clients, such as
 	  the <systemitem class="username">root</systemitem> and any
 	  other administrative accounts.</para>
 
 	<note>
 	  <para>Ensure that the
 	    <filename>/var/yp/master.passwd</filename> is neither
 	    group or world readable by setting its permissions to
 	    <literal>600</literal>.</para>
 	</note>
 
 	<para>After completing this task, initialize the
 	  <acronym>NIS</acronym> maps.  &os; includes the
 	  &man.ypinit.8; script to do this.  When generating maps
 	  for the master server, include <option>-m</option> and
 	  specify the <acronym>NIS</acronym> domain name:</para>
 
 	<screen>ellington&prompt.root; <userinput>ypinit -m test-domain</userinput>
 Server Type: MASTER Domain: test-domain
 Creating an YP server will require that you answer a few questions.
 Questions will all be asked at the beginning of the procedure.
 Do you want this procedure to quit on non-fatal errors? [y/n: n] <userinput>n</userinput>
 Ok, please remember to go back and redo manually whatever fails.
 If not, something might not work.
 At this point, we have to construct a list of this domains YP servers.
 rod.darktech.org is already known as master server.
 Please continue to add any slave servers, one per line. When you are
 done with the list, type a &lt;control D&gt;.
 master server   :  ellington
 next host to add:  <userinput>coltrane</userinput>
 next host to add:  <userinput>^D</userinput>
 The current list of NIS servers looks like this:
 ellington
 coltrane
 Is this correct?  [y/n: y] <userinput>y</userinput>
 
 [..output from map generation..]
 
 NIS Map update completed.
 ellington has been setup as an YP master server without any errors.</screen>
 
 	<para>This will create <filename>/var/yp/Makefile</filename>
 	  from <filename>/var/yp/Makefile.dist</filename>.  By
 	  default, this file assumes that the environment has a
 	  single <acronym>NIS</acronym> server with only &os; clients.
 	  Since <literal>test-domain</literal> has a slave server,
 	  edit this line in <filename>/var/yp/Makefile</filename> so
 	  that it begins with a  comment
 	  (<literal>#</literal>):</para>
 
 	<programlisting>NOPUSH = "True"</programlisting>
       </sect3>
 
       <sect3>
 	<title>Adding New Users</title>
 
 	<para>Every time a new user is created, the user account must
 	  be added to the master <acronym>NIS</acronym> server and the
 	  <acronym>NIS</acronym> maps rebuilt.  Until this occurs, the
 	  new user will not be able to login anywhere except on the
 	  <acronym>NIS</acronym> master.  For example, to add the new
 	  user <systemitem class="username">jsmith</systemitem> to the
 	  <literal>test-domain</literal> domain, run these commands on
 	  the master server:</para>
 
 	<screen>&prompt.root; <userinput>pw useradd jsmith</userinput>
 &prompt.root; <userinput>cd /var/yp</userinput>
 &prompt.root; <userinput>make test-domain</userinput></screen>
 
 	<para>The user could also be added using <command>adduser
 	    jsmith</command> instead of <command>pw useradd
 	    smith</command>.</para>
       </sect3>
     </sect2>
 
     <sect2>
       <title>Setting up a <acronym>NIS</acronym> Slave Server</title>
 
       <indexterm>
 	<primary>NIS</primary>
 	<secondary>slave server</secondary>
       </indexterm>
       <para>To set up an <acronym>NIS</acronym> slave server, log on
 	to the slave server and edit <filename>/etc/rc.conf</filename>
 	as for the master server.  Do not generate any
 	<acronym>NIS</acronym> maps, as these already exist on the
 	master server.  When running <command>ypinit</command> on the
 	slave server, use <option>-s</option> (for slave) instead of
 	<option>-m</option> (for master).  This option requires the
 	name of the <acronym>NIS</acronym> master in addition to the
 	domain name, as  seen in this example:</para>
 
       <screen>coltrane&prompt.root; <userinput>ypinit -s ellington test-domain</userinput>
 
 Server Type: SLAVE Domain: test-domain Master: ellington
 
 Creating an YP server will require that you answer a few questions.
 Questions will all be asked at the beginning of the procedure.
 
 Do you want this procedure to quit on non-fatal errors? [y/n: n]  <userinput>n</userinput>
 
 Ok, please remember to go back and redo manually whatever fails.
 If not, something might not work.
 There will be no further questions. The remainder of the procedure
 should take a few minutes, to copy the databases from ellington.
 Transferring netgroup...
 ypxfr: Exiting: Map successfully transferred
 Transferring netgroup.byuser...
 ypxfr: Exiting: Map successfully transferred
 Transferring netgroup.byhost...
 ypxfr: Exiting: Map successfully transferred
 Transferring master.passwd.byuid...
 ypxfr: Exiting: Map successfully transferred
 Transferring passwd.byuid...
 ypxfr: Exiting: Map successfully transferred
 Transferring passwd.byname...
 ypxfr: Exiting: Map successfully transferred
 Transferring group.bygid...
 ypxfr: Exiting: Map successfully transferred
 Transferring group.byname...
 ypxfr: Exiting: Map successfully transferred
 Transferring services.byname...
 ypxfr: Exiting: Map successfully transferred
 Transferring rpc.bynumber...
 ypxfr: Exiting: Map successfully transferred
 Transferring rpc.byname...
 ypxfr: Exiting: Map successfully transferred
 Transferring protocols.byname...
 ypxfr: Exiting: Map successfully transferred
 Transferring master.passwd.byname...
 ypxfr: Exiting: Map successfully transferred
 Transferring networks.byname...
 ypxfr: Exiting: Map successfully transferred
 Transferring networks.byaddr...
 ypxfr: Exiting: Map successfully transferred
 Transferring netid.byname...
 ypxfr: Exiting: Map successfully transferred
 Transferring hosts.byaddr...
 ypxfr: Exiting: Map successfully transferred
 Transferring protocols.bynumber...
 ypxfr: Exiting: Map successfully transferred
 Transferring ypservers...
 ypxfr: Exiting: Map successfully transferred
 Transferring hosts.byname...
 ypxfr: Exiting: Map successfully transferred
 
 coltrane has been setup as an YP slave server without any errors.
 Remember to update map ypservers on ellington.</screen>
 
       <para>This will generate a directory on the slave server called
 	<filename>/var/yp/test-domain</filename> which contains copies
 	of the <acronym>NIS</acronym> master server's maps.  Adding
 	these <filename>/etc/crontab</filename> entries on each slave
 	server will force the slaves to sync their maps with the maps
 	on the master server:</para>
 
       <programlisting>20      *       *       *       *       root   /usr/libexec/ypxfr passwd.byname
 21      *       *       *       *       root   /usr/libexec/ypxfr passwd.byuid</programlisting>
 
       <para>These entries are not mandatory because the master server
 	automatically attempts to push any map changes to its slaves.
 	However, since clients may depend upon the slave server to
 	provide correct password information, it is recommended to
 	force frequent password map updates.  This is especially
 	important on busy networks where map updates might not always
 	complete.</para>
 
       <para>To finish the configuration, run
 	<command>/etc/netstart</command> on the slave server in order
 	to start the <acronym>NIS</acronym> services.</para>
     </sect2>
 
     <sect2>
       <title>Setting Up an <acronym>NIS</acronym> Client</title>
 
       <para>An <acronym>NIS</acronym> client binds to an
 	<acronym>NIS</acronym> server using &man.ypbind.8;.  This
 	daemon broadcasts RPC requests on the local network.  These
 	requests specify the domain name configured on the client.  If
 	an <acronym>NIS</acronym> server in the same domain receives
 	one of the broadcasts, it will respond to
 	<application>ypbind</application>, which will record the
 	server's address.  If there are several servers available,
 	the client will use the address of the first server to respond
 	and will direct all of its <acronym>NIS</acronym> requests to
 	that server.  The client will automatically
 	<application>ping</application> the server on a regular basis
 	to make sure it is still available.  If it fails to receive a
 	reply within a reasonable amount of time,
 	<application>ypbind</application> will mark the domain as
 	unbound and begin broadcasting again in the hopes of locating
 	another server.</para>
 
       <indexterm><primary>NIS</primary>
 	<secondary>client configuration</secondary>
       </indexterm>
 
       <para>To configure a &os; machine to be an
 	<acronym>NIS</acronym> client:</para>
 
       <procedure>
 	<step>
 	  <para>Edit <filename>/etc/rc.conf</filename> and add the
 	    following lines in order to set the
 	    <acronym>NIS</acronym> domain name and start
 	    &man.ypbind.8; during network startup:</para>
 
 	  <programlisting>nisdomainname="test-domain"
 nis_client_enable="YES"</programlisting>
 	</step>
 
 	<step>
 	  <para>To import all possible password entries from the
 	    <acronym>NIS</acronym> server, use
 	    <command>vipw</command> to remove all user accounts
 	    except one from <filename>/etc/master.passwd</filename>.
 	    When removing the accounts, keep in mind that at least one
 	    local account should remain and this account should be a
 	    member of <systemitem
 	      class="groupname">wheel</systemitem>.  If there is a
 	    problem with <acronym>NIS</acronym>, this local account
 	    can be used to log in remotely, become the superuser, and
 	    fix the problem.  Before saving the edits, add the
 	    following line to the end of the file:</para>
 
 	  <programlisting>+:::::::::</programlisting>
 
 	  <para>This line configures the client to provide anyone with
 	    a valid account in the <acronym>NIS</acronym> server's
 	    password maps an account on the client.  There are many
 	    ways to configure the <acronym>NIS</acronym> client by
 	    modifying this line.  One method is described in <xref
 	      linkend="network-netgroups"/>.  For more detailed
 	    reading, refer to the book
 	    <literal>Managing NFS and NIS</literal>, published by
 	    O'Reilly Media.</para>
 	</step>
 
 	<step>
 	  <para>To import all possible group entries from the
 	    <acronym>NIS</acronym> server, add this line to
 	    <filename>/etc/group</filename>:</para>
 
 	  <programlisting>+:*::</programlisting>
 	</step>
       </procedure>
 
       <para>To start the <acronym>NIS</acronym> client immediately,
 	execute the following commands as the superuser:</para>
 
       <screen>&prompt.root; <userinput>/etc/netstart</userinput>
 &prompt.root; <userinput>service ypbind start</userinput></screen>
 
       <para>After completing these steps, running
 	<command>ypcat passwd</command> on the client should show
 	the server's <filename>passwd</filename> map.</para>
     </sect2>
 
     <sect2>
       <title><acronym>NIS</acronym> Security</title>
 
       <para>Since <acronym>RPC</acronym> is a broadcast-based service,
 	any system running <application>ypbind</application> within
 	the same domain can retrieve the contents of the
 	<acronym>NIS</acronym> maps.  To prevent unauthorized
 	transactions, &man.ypserv.8; supports a feature called
 	<quote>securenets</quote> which can be used to restrict access
 	to a given set of hosts.  By default, this information is
 	stored in <filename>/var/yp/securenets</filename>, unless
 	&man.ypserv.8; is started with <option>-p</option> and an
 	alternate path.  This file contains entries that consist of a
 	network specification and a network mask separated by white
 	space.  Lines starting with <literal>#</literal> are
 	considered to be comments.  A sample
 	<filename>securenets</filename> might look like this:</para>
 
       <programlisting># allow connections from local host -- mandatory
 127.0.0.1     255.255.255.255
 # allow connections from any host
 # on the 192.168.128.0 network
 192.168.128.0 255.255.255.0
 # allow connections from any host
 # between 10.0.0.0 to 10.0.15.255
 # this includes the machines in the testlab
 10.0.0.0      255.255.240.0</programlisting>
 
       <para>If &man.ypserv.8; receives a request from an address that
 	matches one of these rules, it will process the request
 	normally.  If the address fails to match a rule, the request
 	will be ignored and a warning message will be logged.  If the
 	<filename>securenets</filename> does not exist,
 	<command>ypserv</command> will allow connections from any
 	host.</para>
 
       <para><xref linkend="tcpwrappers"/> is an alternate mechanism
 	for providing access control instead of
 	<filename>securenets</filename>.  While either access control
 	mechanism adds some security, they are both vulnerable to
 	<quote><acronym>IP</acronym> spoofing</quote> attacks.  All
 	<acronym>NIS</acronym>-related traffic should be blocked at
 	the firewall.</para>
 
       <para>Servers using <filename>securenets</filename>
 	may fail to serve legitimate <acronym>NIS</acronym> clients
 	with archaic TCP/IP implementations.  Some of these
 	implementations set all host bits to zero when doing
 	broadcasts or fail to observe the subnet mask when
 	calculating the broadcast address.  While some of these
 	problems can be fixed by changing the client configuration,
 	other problems may force the retirement of these client
 	systems or the abandonment of
 	<filename>securenets</filename>.</para>
 
       <indexterm><primary>TCP Wrapper</primary></indexterm>
       <para>The use of <application>TCP Wrapper</application>
 	increases the latency of the <acronym>NIS</acronym> server.
 	The additional delay may be long enough to cause timeouts in
 	client programs, especially in busy networks with slow
 	<acronym>NIS</acronym> servers.  If one or more clients suffer
 	from latency, convert those clients into
 	<acronym>NIS</acronym> slave servers and force them to bind to
 	themselves.</para>
 
       <sect3>
 	<title>Barring Some Users</title>
 
 	<para>In this example, the <systemitem>basie</systemitem>
 	  system is a faculty workstation within the
 	  <acronym>NIS</acronym> domain.  The
 	  <filename>passwd</filename> map on the master
 	  <acronym>NIS</acronym> server contains accounts for both
 	  faculty and students.  This section demonstrates how to
 	  allow faculty logins on this system while refusing student
 	  logins.</para>
 
 	<para>To prevent specified users from logging on to a system,
 	  even if they are present in the <acronym>NIS</acronym>
 	  database, use <command>vipw</command> to add
 	  <literal>-<replaceable>username</replaceable></literal> with
 	  the correct number of colons towards the end of
 	  <filename>/etc/master.passwd</filename> on the client,
 	  where <replaceable>username</replaceable> is the username of
 	  a user to bar from logging in.  The line with the blocked
 	  user must be before the <literal>+</literal> line that
 	  allows <acronym>NIS</acronym> users.  In this example,
 	  <systemitem class="username">bill</systemitem> is barred
 	  from logging on to <systemitem>basie</systemitem>:</para>
 
 	<screen>basie&prompt.root; <userinput>cat /etc/master.passwd</userinput>
 root:[password]:0:0::0:0:The super-user:/root:/bin/csh
 toor:[password]:0:0::0:0:The other super-user:/root:/bin/sh
 daemon:*:1:1::0:0:Owner of many system processes:/root:/sbin/nologin
 operator:*:2:5::0:0:System &amp;:/:/sbin/nologin
 bin:*:3:7::0:0:Binaries Commands and Source,,,:/:/sbin/nologin
 tty:*:4:65533::0:0:Tty Sandbox:/:/sbin/nologin
 kmem:*:5:65533::0:0:KMem Sandbox:/:/sbin/nologin
 games:*:7:13::0:0:Games pseudo-user:/usr/games:/sbin/nologin
 news:*:8:8::0:0:News Subsystem:/:/sbin/nologin
 man:*:9:9::0:0:Mister Man Pages:/usr/share/man:/sbin/nologin
 bind:*:53:53::0:0:Bind Sandbox:/:/sbin/nologin
 uucp:*:66:66::0:0:UUCP pseudo-user:/var/spool/uucppublic:/usr/libexec/uucp/uucico
 xten:*:67:67::0:0:X-10 daemon:/usr/local/xten:/sbin/nologin
 pop:*:68:6::0:0:Post Office Owner:/nonexistent:/sbin/nologin
 nobody:*:65534:65534::0:0:Unprivileged user:/nonexistent:/sbin/nologin
 -bill:::::::::
 +:::::::::
 
 basie&prompt.root;</screen>
       </sect3>
     </sect2>
 
     <sect2 xml:id="network-netgroups">
       <!--
       <sect2info>
 	<authorgroup>
 	  <author>
 	    <firstname>Udo</firstname>
 	    <surname>Erdelhoff</surname>
 	    <contrib>Contributed by </contrib>
 	  </author>
 	</authorgroup>
       </sect2info>
       -->
 
       <title>Using Netgroups</title>
 
       <indexterm><primary>netgroups</primary></indexterm>
 
       <para>Barring specified users from logging on to individual
 	systems becomes unscaleable on larger networks and quickly
 	loses the main benefit of <acronym>NIS</acronym>:
 	<emphasis>centralized</emphasis> administration.</para>
 
       <para>Netgroups were developed to handle large, complex networks
 	with hundreds of users and machines.  Their use is comparable
 	to &unix; groups, where the main difference is the lack of a
 	numeric ID and the ability to define a netgroup by including
 	both user accounts and other netgroups.</para>
 
       <para>To expand on the example used in this chapter, the
 	<acronym>NIS</acronym> domain will be extended to add the
 	users and systems shown in Tables 28.2 and 28.3:</para>
 
       <table frame="none" pgwide="1">
 	<title>Additional Users</title>
 
 	<tgroup cols="2">
 	  <thead>
 	    <row>
 	      <entry>User Name(s)</entry>
 	      <entry>Description</entry>
 	    </row>
 	  </thead>
 
 	  <tbody>
 	    <row>
 	      <entry><systemitem class="username">alpha</systemitem>,
 		<systemitem class="username">beta</systemitem></entry>
 	      <entry>IT department employees</entry>
 	    </row>
 
 	    <row>
 	      <entry><systemitem
 		  class="username">charlie</systemitem>, <systemitem
 		  class="username">delta</systemitem></entry>
 	      <entry>IT department apprentices</entry>
 	    </row>
 
 	    <row>
 	      <entry><systemitem class="username">echo</systemitem>,
 		<systemitem class="username">foxtrott</systemitem>,
 		<systemitem class="username">golf</systemitem>,
 		...</entry>
 	      <entry>employees</entry>
 	    </row>
 
 	    <row>
 	      <entry><systemitem class="username">able</systemitem>,
 		<systemitem class="username">baker</systemitem>,
 		...</entry>
 	      <entry>interns</entry>
 	    </row>
 	  </tbody>
 	</tgroup>
       </table>
 
       <table frame="none" pgwide="1">
 	<title>Additional Systems</title>
 
 	<tgroup cols="2">
 	  <thead>
 	    <row>
 	      <entry>Machine Name(s)</entry>
 	      <entry>Description</entry>
 	    </row>
 	  </thead>
 
 	  <tbody>
 	    <row>
 	      <!--  Names taken from "Good Omens" by Neil Gaiman and Terry
 		    Pratchett.  Many thanks for a brilliant book.  -->
 	      <entry><systemitem>war</systemitem>,
 		<systemitem>death</systemitem>,
 		<systemitem>famine</systemitem>,
 		<systemitem>pollution</systemitem></entry>
 	      <entry>Only IT employees are allowed to log onto these
 		servers.</entry>
 	    </row>
 
 	    <row>
 	      <!-- gluttony was omitted because it was too fat -->
 	      <entry><systemitem>pride</systemitem>,
 		<systemitem>greed</systemitem>,
 		<systemitem>envy</systemitem>,
 		<systemitem>wrath</systemitem>,
 		<systemitem>lust</systemitem>,
 		<systemitem>sloth</systemitem></entry>
 	      <entry>All members of the IT department are allowed to
 		login onto these servers.</entry>
 	    </row>
 
 	    <row>
 	      <entry><systemitem>one</systemitem>,
 		<systemitem>two</systemitem>,
 		<systemitem>three</systemitem>,
 		<systemitem>four</systemitem>,
 		...</entry>
 	      <entry>Ordinary workstations used by
 		employees.</entry>
 	    </row>
 
 	    <row>
 	      <entry><systemitem>trashcan</systemitem></entry>
 	      <entry>A very old machine without any critical data.
 		Even interns are allowed to use this system.</entry>
 	    </row>
 	  </tbody>
 	</tgroup>
       </table>
 
       <para>When using netgroups to configure this scenario, each user
 	is assigned to one or more netgroups and logins are then
 	allowed or forbidden for all members of the netgroup.  When
 	adding a new machine, login restrictions must be defined for
 	all netgroups.  When a new user is added, the account must be
 	added to one or more netgroups.  If the
 	<acronym>NIS</acronym> setup is planned carefully, only one
 	central configuration file needs modification to grant or deny
 	access to machines.</para>
 
       <para>The first step is the initialization of the
 	<acronym>NIS</acronym> <literal>netgroup</literal> map.  In
 	&os;, this map is not created by default.  On the
 	<acronym>NIS</acronym> master server, use an editor to create
 	a map named <filename>/var/yp/netgroup</filename>.</para>
 
       <para>This example creates four netgroups to represent IT
 	employees, IT apprentices, employees, and interns:</para>
 
       <programlisting>IT_EMP  (,alpha,test-domain)    (,beta,test-domain)
 IT_APP  (,charlie,test-domain)  (,delta,test-domain)
 USERS   (,echo,test-domain)     (,foxtrott,test-domain) \
         (,golf,test-domain)
 INTERNS (,able,test-domain)     (,baker,test-domain)</programlisting>
 
       <para>Each entry configures a netgroup.  The first column in an
 	entry is the name of the netgroup.  Each set of brackets
 	represents  either a group of one or more users or the name of
 	another netgroup.  When specifying a user, the three
 	comma-delimited fields inside each group represent:</para>
 
       <orderedlist>
 	<listitem>
 	  <para>The name of the host(s) where the other fields
 	    representing the user are valid.  If a hostname is not
 	    specified, the entry is valid on all hosts.</para>
 	</listitem>
 
 	<listitem>
 	  <para>The name of the account that belongs to this
 	    netgroup.</para>
 	</listitem>
 
 	<listitem>
 	  <para>The <acronym>NIS</acronym> domain for the account.
 	    Accounts may be imported from other <acronym>NIS</acronym>
 	    domains into a netgroup.</para>
 	</listitem>
       </orderedlist>
 
       <para>If a group contains multiple users, separate each user
 	with  whitespace.  Additionally, each field may contain
 	wildcards.  See &man.netgroup.5; for details.</para>
 
       <indexterm><primary>netgroups</primary></indexterm>
       <para>Netgroup names longer than 8 characters should not be
 	used.  The names are case sensitive and using capital letters
 	for netgroup names is an easy way to distinguish between user,
 	machine and netgroup names.</para>
 
       <para>Some non-&os; <acronym>NIS</acronym> clients cannot
 	handle netgroups containing more than 15 entries.  This
 	limit may be circumvented by creating several sub-netgroups
 	with 15 users or fewer and a real netgroup consisting of the
 	sub-netgroups, as seen in this example:</para>
 
       <programlisting>BIGGRP1  (,joe1,domain)  (,joe2,domain)  (,joe3,domain) [...]
 BIGGRP2  (,joe16,domain)  (,joe17,domain) [...]
 BIGGRP3  (,joe31,domain)  (,joe32,domain)
 BIGGROUP  BIGGRP1 BIGGRP2 BIGGRP3</programlisting>
 
       <para>Repeat this process if more than 225 (15 times 15) users
 	exist within a single netgroup.</para>
 
       <para>To activate and distribute the new
 	<acronym>NIS</acronym> map:</para>
 
       <screen>ellington&prompt.root; <userinput>cd /var/yp</userinput>
 ellington&prompt.root; <userinput>make</userinput></screen>
 
       <para>This will generate the three <acronym>NIS</acronym> maps
 	<filename>netgroup</filename>,
 	<filename>netgroup.byhost</filename> and
 	<filename>netgroup.byuser</filename>.  Use the map key option
 	of &man.ypcat.1; to check if the new <acronym>NIS</acronym>
 	maps are available:</para>
 
       <screen>ellington&prompt.user; <userinput>ypcat -k netgroup</userinput>
 ellington&prompt.user; <userinput>ypcat -k netgroup.byhost</userinput>
 ellington&prompt.user; <userinput>ypcat -k netgroup.byuser</userinput></screen>
 
       <para>The output of the first command should resemble the
 	contents of <filename>/var/yp/netgroup</filename>.  The second
 	command only produces output if host-specific netgroups were
 	created.  The third command is used to get the list of
 	netgroups for a user.</para>
 
       <para>To configure a client, use &man.vipw.8; to specify the
 	name  of the netgroup.  For example, on the server named
 	<systemitem>war</systemitem>,  replace this line:</para>
 
       <programlisting>+:::::::::</programlisting>
 
       <para>with</para>
 
       <programlisting>+@IT_EMP:::::::::</programlisting>
 
       <para>This specifies that only the users defined in the netgroup
 	<literal>IT_EMP</literal> will be imported into this system's
 	password database and only those users are allowed to login to
 	this system.</para>
 
       <para>This configuration also applies to the
 	<literal>~</literal> function of the shell and all routines
 	which convert between user names and numerical user IDs.  In
 	other words,
 	<command>cd ~<replaceable>user</replaceable></command> will
 	not work, <command>ls -l</command> will show the numerical ID
 	instead of the username, and <command>find . -user joe
 	  -print</command> will fail with the message
 	<errorname>No such user</errorname>.  To fix this, import all
 	user entries without allowing them to login into the servers.
 	This can be achieved by adding an extra line:</para>
 
       <programlisting>+:::::::::/sbin/nologin</programlisting>
 
       <para>This line configures the client to import all entries but
 	to replace the shell in those entries with
 	<filename>/sbin/nologin</filename>.</para>
 
       <!-- Been there, done that, got the scars to prove it - ue -->
       <para>Make sure that extra line is placed
 	<emphasis>after</emphasis>
 	<literal>+@IT_EMP:::::::::</literal>.  Otherwise, all user
 	accounts imported from <acronym>NIS</acronym> will have
 	<filename>/sbin/nologin</filename> as their login
 	shell and no one will be able to login to the system.</para>
 
       <para>To configure the less important servers, replace the old
 	<literal>+:::::::::</literal> on the servers with these
 	lines:</para>
 
       <programlisting>+@IT_EMP:::::::::
 +@IT_APP:::::::::
 +:::::::::/sbin/nologin</programlisting>
 
       <para>The corresponding lines for the workstations
 	would be:</para>
 
       <programlisting>+@IT_EMP:::::::::
 +@USERS:::::::::
 +:::::::::/sbin/nologin</programlisting>
 
       <para>NIS supports the creation of netgroups from other
 	netgroups which can be useful if the policy regarding user
 	access changes.  One possibility is the creation of role-based
 	netgroups.  For example, one might create a netgroup called
 	<literal>BIGSRV</literal> to define the login restrictions for
 	the important servers, another netgroup called
 	<literal>SMALLSRV</literal> for the less important servers,
 	and a third netgroup called <literal>USERBOX</literal> for the
 	workstations.  Each of these netgroups contains the netgroups
 	that are allowed to login onto these machines.  The new
 	entries for the <acronym>NIS</acronym>
 	<literal>netgroup</literal> map would look like this:</para>
 
       <programlisting>BIGSRV    IT_EMP  IT_APP
 SMALLSRV  IT_EMP  IT_APP  ITINTERN
 USERBOX   IT_EMP  ITINTERN USERS</programlisting>
 
       <para>This method of defining login restrictions works
 	reasonably well when it is possible to define groups of
 	machines with identical restrictions.  Unfortunately, this is
 	the exception and not the rule.  Most of the time, the ability
 	to define login restrictions on a per-machine basis is
 	required.</para>
 
       <para>Machine-specific netgroup definitions are another
 	possibility to deal with the policy changes.  In this
 	scenario, the <filename>/etc/master.passwd</filename> of each
 	system contains two lines starting with <quote>+</quote>.
 	The first line adds a netgroup with the accounts allowed to
 	login onto this machine and the second line adds all other
 	accounts with <filename>/sbin/nologin</filename> as shell.  It
 	is recommended to use the <quote>ALL-CAPS</quote> version of
 	the hostname as the name of the netgroup:</para>
 
       <programlisting>+@<replaceable>BOXNAME</replaceable>:::::::::
 +:::::::::/sbin/nologin</programlisting>
 
       <para>Once this task is completed on all the machines, there is
 	no longer a need to modify the local versions of
 	<filename>/etc/master.passwd</filename> ever again.  All
 	further changes can be handled by modifying the
 	<acronym>NIS</acronym> map.  Here is an example of a possible
 	<literal>netgroup</literal> map for this scenario:</para>
 
       <programlisting># Define groups of users first
 IT_EMP    (,alpha,test-domain)    (,beta,test-domain)
 IT_APP    (,charlie,test-domain)  (,delta,test-domain)
 DEPT1     (,echo,test-domain)     (,foxtrott,test-domain)
 DEPT2     (,golf,test-domain)     (,hotel,test-domain)
 DEPT3     (,india,test-domain)    (,juliet,test-domain)
 ITINTERN  (,kilo,test-domain)     (,lima,test-domain)
 D_INTERNS (,able,test-domain)     (,baker,test-domain)
 #
 # Now, define some groups based on roles
 USERS     DEPT1   DEPT2     DEPT3
 BIGSRV    IT_EMP  IT_APP
 SMALLSRV  IT_EMP  IT_APP    ITINTERN
 USERBOX   IT_EMP  ITINTERN  USERS
 #
 # And a groups for a special tasks
 # Allow echo and golf to access our anti-virus-machine
 SECURITY  IT_EMP  (,echo,test-domain)  (,golf,test-domain)
 #
 # machine-based netgroups
 # Our main servers
 WAR       BIGSRV
 FAMINE    BIGSRV
 # User india needs access to this server
 POLLUTION  BIGSRV  (,india,test-domain)
 #
 # This one is really important and needs more access restrictions
 DEATH     IT_EMP
 #
 # The anti-virus-machine mentioned above
 ONE       SECURITY
 #
 # Restrict a machine to a single user
 TWO       (,hotel,test-domain)
 # [...more groups to follow]</programlisting>
 
       <para>It may not always be advisable
 	to use machine-based netgroups.  When deploying a couple of
 	dozen or hundreds of systems,
 	role-based netgroups instead of machine-based netgroups may be
 	used to keep the size of the <acronym>NIS</acronym> map within
 	reasonable limits.</para>
     </sect2>
 
     <sect2>
       <title>Password Formats</title>
 
       <indexterm>
 	<primary>NIS</primary>
 	  <secondary>password formats</secondary>
       </indexterm>
       <para><acronym>NIS</acronym> requires that all hosts within an
 	<acronym>NIS</acronym> domain use the same format for
 	encrypting passwords.  If users have trouble authenticating on
 	an <acronym>NIS</acronym> client, it may be due to a differing
 	password format.  In a heterogeneous network, the format must
 	be supported by all operating systems, where
 	<acronym>DES</acronym> is the lowest common standard.</para>
 
       <para>To check which format a server or client is using, look
 	at this section of
 	<filename>/etc/login.conf</filename>:</para>
 
       <programlisting>default:\
 	:passwd_format=des:\
 	:copyright=/etc/COPYRIGHT:\
 	[Further entries elided]</programlisting>
 
       <para>In this example, the system is using the
 	<acronym>DES</acronym> format.  Other possible values are
 	<literal>blf</literal> for Blowfish and <literal>md5</literal>
 	for MD5 encrypted passwords.</para>
 
       <para>If the format on a host needs to be edited to match the
 	one  being used in the <acronym>NIS</acronym> domain, the
 	login capability database must be rebuilt after saving the
 	change:</para>
 
       <screen>&prompt.root; <userinput>cap_mkdb /etc/login.conf</userinput></screen>
 
       <note>
 	<para>The format of passwords for existing user accounts will
 	  not be updated until each user changes their password
 	  <emphasis>after</emphasis> the login capability database is
 	  rebuilt.</para>
       </note>
     </sect2>
   </sect1>
 
   <sect1 xml:id="network-ldap">
     <info>
       <title>Lightweight Directory Access Protocol
 	(<acronym>LDAP</acronym>)</title>
 
       <authorgroup>
 	<author>
 	  <personname>
 	    <firstname>Tom</firstname>
 	    <surname>Rhodes</surname>
 	  </personname>
 	  <contrib>Written by </contrib>
 	</author>
       </authorgroup>
     </info>
 
     <indexterm><primary>LDAP</primary></indexterm>
 
     <para>The Lightweight Directory Access Protocol
       (<acronym>LDAP</acronym>) is an application layer protocol used
       to access, modify, and authenticate objects using a distributed
       directory information service.  Think of it as a phone or record
       book which stores several levels of hierarchical, homogeneous
       information.  It is used in Active Directory and
       <application>OpenLDAP</application> networks and allows users to
       access to several levels of internal information utilizing a
       single account.  For example, email authentication, pulling
       employee contact information, and internal website
       authentication might all make use of a single user account in
       the <acronym>LDAP</acronym> server's record base.</para>
 
     <para>This section provides a quick start guide for configuring an
       <acronym>LDAP</acronym> server on a &os; system.  It assumes
       that the administrator already has a design plan which includes
       the type of information to store, what that information will be
       used for, which users should have access to that information,
       and how to secure this information from unauthorized
       access.</para>
 
     <sect2>
       <title><acronym>LDAP</acronym> Terminology and Structure</title>
 
       <para><acronym>LDAP</acronym> uses several terms which should be
 	understood before starting the configuration.  All directory
 	entries consist of a group of
 	<firstterm>attributes</firstterm>.  Each of these attribute
 	sets contains a unique identifier known as a
 	<firstterm>Distinguished Name</firstterm>
 	(<acronym>DN</acronym>) which is normally built from several
 	other attributes such as the common or
 	<firstterm>Relative Distinguished Name</firstterm>
 	(<acronym>RDN</acronym>).  Similar to how directories have
 	absolute and relative paths, consider a <acronym>DN</acronym>
 	as an absolute path and the <acronym>RDN</acronym> as the
 	relative path.</para>
 
       <para>An example <acronym>LDAP</acronym> entry looks like the
 	following.  This example searches for the entry for the
 	specified user account (<literal>uid</literal>),
 	organizational unit (<literal>ou</literal>), and organization
 	(<literal>o</literal>):</para>
 
       <screen>&prompt.user; <userinput>ldapsearch -xb "uid=<replaceable>trhodes</replaceable>,ou=<replaceable>users</replaceable>,o=<replaceable>example.com</replaceable>"</userinput>
 # extended LDIF
 #
 # LDAPv3
 # base &lt;uid=trhodes,ou=users,o=example.com&gt; with scope subtree
 # filter: (objectclass=*)
 # requesting: ALL
 #
 
 # trhodes, users, example.com
 dn: uid=trhodes,ou=users,o=example.com
 mail: trhodes@example.com
 cn: Tom Rhodes
 uid: trhodes
 telephoneNumber: (123) 456-7890
 
 # search result
 search: 2
 result: 0 Success
 
 # numResponses: 2
 # numEntries: 1</screen>
 
       <para>This example entry shows the values for the
 	<literal>dn</literal>, <literal>mail</literal>,
 	<literal>cn</literal>, <literal>uid</literal>, and
 	<literal>telephoneNumber</literal> attributes.  The
 	<acronym>cn</acronym> attribute is the
 	<acronym>RDN</acronym>.</para>
 
       <para>More information about <acronym>LDAP</acronym> and its
 	terminology can be found at <uri
 	  xlink:href="http://www.openldap.org/doc/admin24/intro.html">http://www.openldap.org/doc/admin24/intro.html</uri>.</para>
     </sect2>
 
     <sect2 xml:id="ldap-config">
       <title>Configuring an <acronym>LDAP</acronym> Server</title>
 
       <indexterm><primary>LDAP Server</primary></indexterm>
 
       <para>&os; does not provide a built-in <acronym>LDAP</acronym>
 	server.  Begin the configuration by installing the <package
 	  role="port">net/openldap24-server</package> package or port.
 	Since the port has many configurable options, it is
 	recommended that the default options are reviewed to see if
 	the package is sufficient, and to instead compile the port if
 	any options should be changed.  In most cases, the defaults
 	are fine.  However, if SQL support is needed, this option must
 	be enabled and the port compiled using the instructions in
 	<xref linkend="ports-using"/>.</para>
 
       <para>Next, create the directories to hold the data and to store
 	the certificates:</para>
 
       <screen>&prompt.root; <userinput>mkdir /var/db/openldap-data</userinput>
 &prompt.root; <userinput>mkdir /usr/local/etc/openldap/private</userinput></screen>
 
       <para>Copy over the database configuration file:</para>
 
       <screen>&prompt.root; <userinput>cp /usr/local/etc/openldap/DB_CONFIG.example /var/db/openldap-data/DB_CONFIG</userinput></screen>
 
       <para>The next phase is to configure the certificate authority.
 	The following commands must be executed from
 	<filename>/usr/local/etc/openldap/private</filename>.  This is
 	important as the file permissions need to be restrictive and
 	users should not have access to these files.  To create the
 	certificate authority, start with this command and follow the
 	prompts:</para>
 
       <screen>&prompt.root; <userinput>openssl req -days <replaceable>365</replaceable> -nodes -new -x509 -keyout ca.key -out ../ca.crt</userinput></screen>
 
       <para>The entries for the prompts may be generic
 	<emphasis>except</emphasis> for the
 	<literal>Common Name</literal>.  This entry must be
 	<emphasis>different</emphasis> than the system hostname.  If
 	this will be a self signed certificate, prefix the hostname
 	with <literal>CA</literal> for certificate authority.</para>
 
       <para>The next task is to create a certificate signing request
 	and a private key.  Input this command and follow the
 	prompts:</para>
 
       <screen>&prompt.root; <userinput>openssl req -days <replaceable>365</replaceable> -nodes -new -keyout server.key -out server.csr</userinput></screen>
 
       <para>During the certificate generation process, be sure to
 	correctly set the <literal>Common Name</literal> attribute.
 	Once complete, sign the key:</para>
 
       <screen>&prompt.root; <userinput>openssl x509 -req -days <replaceable>365</replaceable> -in server.csr -out ../server.crt -CA ../ca.crt -CAkey ca.key -CAcreateserial</userinput></screen>
 
       <para>The final part of the certificate generation process is to
 	generate and sign the client certificates:</para>
 
       <screen>&prompt.root; <userinput>openssl req -days <replaceable>365</replaceable> -nodes -new -keyout client.key -out client.csr</userinput>
 &prompt.root; <userinput>openssl x509 -req -days 3650 -in client.csr -out ../client.crt -CA ../ca.crt -CAkey ca.key</userinput></screen>
 
       <para>Remember to use the same <literal>Common Name</literal>
 	attribute when prompted.  When finished, ensure that a total
 	of eight (8) new files have been generated through the
 	proceeding commands.  If so, the next step is to edit
 	<filename>/usr/local/etc/openldap/slapd.conf</filename> and
 	add the following options:</para>
 
       <programlisting>TLSCipherSuite HIGH:MEDIUM:+SSLv3
 TLSCertificateFile /usr/local/etc/openldap/server.crt
 TLSCertificateKeyFile /usr/local/etc/openldap/private/server.key
 TLSCACertificateFile /usr/local/etc/openldap/ca.crt</programlisting>
 
       <para>Then, edit
 	<filename>/usr/local/etc/openldap/ldap.conf</filename> and add
 	the following lines:</para>
 
       <programlisting>TLS_CACERT /usr/local/etc/openldap/ca.crt
 TLS_CIPHER_SUITE HIGH:MEDIUM:+SSLv3</programlisting>
 
       <para>While editing this file, uncomment the following entries
 	and set them to the desired values: <option>BASE</option>,
 	<option>URI</option>, <option>SIZELIMIT</option> and
 	<option>TIMELIMIT</option>.  Set the <option>URI</option> to
 	contain <option>ldap://</option> and
 	<option>ldaps://</option>.  Then, add two entries pointing to
 	the certificate authority.  When finished, the entries should
 	look similar to the following:</para>
 
       <programlisting>BASE    dc=example,dc=com
 URI     ldap:// ldaps://
 
 SIZELIMIT       12
 TIMELIMIT       15
 
 TLS_CACERT /usr/local/etc/openldap/ca.crt
 TLS_CIPHER_SUITE HIGH:MEDIUM:+SSLv3</programlisting>
 
       <para>The default password for the server should then be
 	changed:</para>
 
       <screen>&prompt.root; <userinput>slappasswd -h "{SHA}" &gt;&gt; /usr/local/etc/openldap/slapd.conf</userinput></screen>
 
       <para>This command will prompt for the password and, if the
 	process does not fail, a password hash will be added to the
 	end of <filename>slapd.conf</filename>.  Several hashing
 	formats are supported.  Refer to the manual page for
 	<command>slappasswd</command> for more information.</para>
 
       <para>Next, edit
 	<filename>/usr/local/etc/openldap/slapd.conf</filename> and
 	add the following lines:</para>
 
       <programlisting>password-hash {sha}
 allow bind_v2</programlisting>
 
       <para>The <option>suffix</option> in this file must be updated
 	to match the <option>BASE</option> used in
 	<filename>/usr/local/etc/openldap/ldap.conf</filename> and
 	<option>rootdn</option> should also be set.  A recommended
 	value for <option>rootdn</option> is something like
 	<option>cn=Manager</option>.  Before saving this file, place
 	the <option>rootpw</option> in front of the password output
 	from <command>slappasswd</command> and delete the old
 	<option>rootpw</option>.  The end result should
 	look similar to this:</para>
 
       <programlisting>TLSCipherSuite HIGH:MEDIUM:+SSLv3
 TLSCertificateFile /usr/local/etc/openldap/server.crt
 TLSCertificateKeyFile /usr/local/etc/openldap/private/server.key
 TLSCACertificateFile /usr/local/etc/openldap/ca.crt
 rootpw  {SHA}W6ph5Mm5Pz8GgiULbPgzG37mj9g=</programlisting>
 
       <para>Finally, enable the <application>OpenLDAP</application>
 	service in <filename>/etc/rc.conf</filename> and set the
 	<acronym>URI</acronym>:</para>
 
       <programlisting>slapd_enable="YES"
 slapd_flags="-4 -h ldaps:///"</programlisting>
 
       <para>At this point the server can be started and tested:</para>
 
       <screen>&prompt.root; <userinput>service slapd start</userinput></screen>
 
       <para>If everything is configured correctly, a search of the
 	directory should show a successful connection with a single
 	response as in this example:</para>
 
       <screen>&prompt.root; <userinput>ldapsearch -Z</userinput>
 # extended LDIF
 #
 # LDAPv3
 # base &lt;dc=example,dc=com&gt; (default) with scope subtree
 # filter: (objectclass=*)
 # requesting: ALL
 #
 
 # search result
 search: 3
 result: 32 No such object
 
 # numResponses: 1</screen>
 
       <note>
 	<para>If the command fails and the configuration looks
 	  correct, stop the <command>slapd</command> service and
 	  restart it with debugging options:</para>
 
 	<screen>&prompt.root; <userinput>service slapd stop</userinput>
 &prompt.root; <userinput>/usr/local/libexec/slapd -d -1</userinput></screen>
       </note>
 
       <para>Once the service is responding, the directory can be
 	populated using <command>ldapadd</command>.  In this example,
 	a file containing this list of users is first created.  Each
 	user should use the following format:</para>
 
       <programlisting>dn: dc=<replaceable>example</replaceable>,dc=<replaceable>com</replaceable>
 objectclass: dcObject
 objectclass: organization
 o: <replaceable>Example</replaceable>
 dc: <replaceable>Example</replaceable>
 
 dn: cn=<replaceable>Manager</replaceable>,dc=<replaceable>example</replaceable>,dc=<replaceable>com</replaceable>
 objectclass: organizationalRole
 cn: <replaceable>Manager</replaceable></programlisting>
 
       <para>To import this file, specify the file name.  The following
 	command will prompt for the password specified earlier and the
 	output should look something like this:</para>
 
       <screen>&prompt.root; <userinput>ldapadd -Z -D "cn=<replaceable>Manager</replaceable>,dc=<replaceable>example</replaceable>,dc=<replaceable>com</replaceable>" -W -f <replaceable>import.ldif</replaceable></userinput>
 Enter LDAP Password:
 adding new entry "dc=example,dc=com"
 
 adding new entry "cn=Manager,dc=example,dc=com"</screen>
 
       <para>Verify the data was added by issuing a search on the
 	server using <command>ldapsearch</command>:</para>
 
       <screen>&prompt.user; <userinput>ldapsearch -Z</userinput>
 # extended LDIF
 #
 # LDAPv3
 # base &lt;dc=example,dc=com&gt; (default) with scope subtree
 # filter: (objectclass=*)
 # requesting: ALL
 #
 
 # example.com
 dn: dc=example,dc=com
 objectClass: dcObject
 objectClass: organization
 o: Example
 dc: Example
 
 # Manager, example.com
 dn: cn=Manager,dc=example,dc=com
 objectClass: organizationalRole
 cn: Manager
 
 # search result
 search: 3
 result: 0 Success
 
 # numResponses: 3
 # numEntries: 2</screen>
 
       <para>At this point, the server should be configured and
 	functioning properly.</para>
     </sect2>
   </sect1>
 
   <sect1 xml:id="network-dhcp">
     <!--
     <sect1info>
       <authorgroup>
 	<author>
 	  <firstname>Greg</firstname>
 	  <surname>Sutter</surname>
 	  <contrib>Written by </contrib>
 	</author>
       </authorgroup>
     </sect1info>
     -->
     <title>Dynamic Host Configuration Protocol
       (<acronym>DHCP</acronym>)</title>
 
     <indexterm>
       <primary>Dynamic Host Configuration Protocol</primary>
       <see><acronym>DHCP</acronym></see>
     </indexterm>
     <indexterm>
       <primary>Internet Systems Consortium (ISC)</primary>
     </indexterm>
 
     <para>The Dynamic Host Configuration Protocol
       (<acronym>DHCP</acronym>) allows a system to connect to a
       network in order to be assigned the necessary addressing
       information for communication on that network.  &os; includes
       the OpenBSD version of <command>dhclient</command> which is used
       by the client to obtain the addressing information.  &os; does
       not install a <acronym>DHCP</acronym> server, but several
       servers are available in the &os; Ports Collection.  The
       <acronym>DHCP</acronym> protocol is fully described in <link
 	xlink:href="http://www.freesoft.org/CIE/RFC/2131/">RFC
 	2131</link>.
       Informational resources are also available at <link
 	xlink:href="http://www.isc.org/downloads/dhcp/">isc.org/downloads/dhcp/</link>.</para>
 
     <para>This section describes how to use the built-in
       <acronym>DHCP</acronym> client.  It then describes how to
       install and configure a <acronym>DHCP</acronym> server.</para>
 
     <note>
       <para>In &os;, the &man.bpf.4; device is needed by both the
 	<acronym>DHCP</acronym> server and <acronym>DHCP</acronym>
 	client.  This device is included in the
 	<filename>GENERIC</filename>  kernel that is installed with
 	&os;.  Users who prefer to create a custom kernel need to keep
 	this device if  <acronym>DHCP</acronym> is used.</para>
 
       <para>It should be noted that <filename>bpf</filename> also
 	allows privileged users to run network packet sniffers on
 	that system.</para>
     </note>
 
     <sect2>
       <title>Configuring a <acronym>DHCP</acronym> Client</title>
 
       <para><acronym>DHCP</acronym> client support is included in the
 	&os; installer, making it easy to configure a newly installed
 	system to automatically receive its networking addressing
 	information from an existing <acronym>DHCP</acronym> server.
 	Refer to <xref linkend="bsdinstall-post"/> for examples of
 	network configuration.</para>
 
       <indexterm><primary><acronym>UDP</acronym></primary></indexterm>
       <para>When <command>dhclient</command> is executed on the client
 	machine, it begins broadcasting requests for configuration
 	information.  By default, these requests use
 	<acronym>UDP</acronym> port 68.  The server replies on
 	<acronym>UDP</acronym> port 67, giving the client an
 	<acronym>IP</acronym> address and other relevant network
 	information such as a subnet mask, default gateway, and
 	<acronym>DNS</acronym> server addresses.  This information is
 	in the form of a <acronym>DHCP</acronym>
 	<quote>lease</quote> and is valid for a configurable time.
 	This allows stale <acronym>IP</acronym> addresses for clients
 	no longer connected to the network to automatically be reused.
 	<acronym>DHCP</acronym> clients can obtain a great deal of
 	information from the server.  An exhaustive list may be found
 	in &man.dhcp-options.5;.</para>
 
       <para>By default, when a &os; system boots, its
 	<acronym>DHCP</acronym> client runs in the background, or
 	<firstterm>asynchronously</firstterm>.  Other startup scripts
 	continue to run while the <acronym>DHCP</acronym> process
 	completes, which speeds up system startup.</para>
 
       <para>Background <acronym>DHCP</acronym> works well when the
 	<acronym>DHCP</acronym> server responds quickly to the
 	client's requests.  However, <acronym>DHCP</acronym> may take
 	a long time to complete on some systems.  If network services
 	attempt to run before <acronym>DHCP</acronym> has assigned the
 	network addressing information, they will fail.  Using
 	<acronym>DHCP</acronym> in <firstterm>synchronous</firstterm>
 	mode prevents this problem as it pauses startup until the
 	<acronym>DHCP</acronym> configuration has completed.</para>
 
       <para>This line in <filename>/etc/rc.conf</filename> is used to
 	configure background or asynchronous mode:</para>
 
       <programlisting>ifconfig_<replaceable>fxp0</replaceable>="DHCP"</programlisting>
 
       <para>This line may already exist if the system was configured
 	to use <acronym>DHCP</acronym> during installation.  Replace
 	the <replaceable>fxp0</replaceable> shown in these examples
 	with the name of the interface to be dynamically configured,
 	as described in <xref linkend="config-network-setup"/>.</para>
 
       <para>To instead configure the system to use synchronous mode,
 	and to pause during startup while <acronym>DHCP</acronym>
 	completes, use
 	<quote><literal>SYNCDHCP</literal></quote>:</para>
 
       <programlisting>ifconfig_<replaceable>fxp0</replaceable>="SYNCDHCP"</programlisting>
 
       <para>Additional client options are available.  Search for
 	<literal>dhclient</literal> in &man.rc.conf.5; for
 	details.</para>
 
       <indexterm>
 	<primary><acronym>DHCP</acronym></primary>
 	<secondary>configuration files</secondary>
       </indexterm>
 
       <para>The <acronym>DHCP</acronym> client uses the following
 	files:</para>
 
       <itemizedlist>
 	<listitem>
 	  <para><filename>/etc/dhclient.conf</filename></para>
 
 	  <para>The configuration file used by
 	    <command>dhclient</command>.  Typically, this file
 	    contains only comments as the defaults are suitable for
 	    most clients.  This configuration file is described in
 	    &man.dhclient.conf.5;.</para>
 	</listitem>
 
 	<listitem>
 	  <para><filename>/sbin/dhclient</filename></para>
 
 	  <para>More information about the command itself can
 	    be found in &man.dhclient.8;.</para>
 	</listitem>
 
 	<listitem>
 	  <para><filename>/sbin/dhclient-script</filename></para>
 
 	  <para>The
 	    &os;-specific <acronym>DHCP</acronym> client configuration
 	    script.  It is described in &man.dhclient-script.8;, but
 	    should not need any user modification to function
 	    properly.</para>
 	</listitem>
 
 	<listitem>
 	  <para><filename>/var/db/dhclient.leases.<replaceable>interface</replaceable></filename></para>
 
 	  <para>The <acronym>DHCP</acronym> client keeps a database of
 	    valid leases in this file, which is written as a log and
 	    is described in &man.dhclient.leases.5;.</para>
 	</listitem>
       </itemizedlist>
     </sect2>
 
     <sect2 xml:id="network-dhcp-server">
       <title>Installing and Configuring a <acronym>DHCP</acronym>
 	Server</title>
 
       <para>This section demonstrates how to configure a &os; system
 	to act as a <acronym>DHCP</acronym> server using the Internet
 	Systems Consortium (<acronym>ISC</acronym>) implementation of
 	the <acronym>DHCP</acronym> server.  This implementation and
 	its documentation can be installed using the
 	<package>net/isc-dhcp43-server</package> package or
 	port.</para>
 
       <indexterm>
 	<primary><acronym>DHCP</acronym></primary>
 	<secondary>server</secondary>
       </indexterm>
 
       <indexterm>
 	<primary><acronym>DHCP</acronym></primary>
 	  <secondary>installation</secondary>
       </indexterm>
 
       <para>The installation of
 	<package>net/isc-dhcp43-server</package> installs a sample
 	configuration file.  Copy
 	<filename>/usr/local/etc/dhcpd.conf.example</filename> to
 	<filename>/usr/local/etc/dhcpd.conf</filename> and make any
 	edits to this new file.</para>
 
       <indexterm>
 	<primary><acronym>DHCP</acronym></primary>
 	  <secondary>dhcpd.conf</secondary>
       </indexterm>
       <para>The configuration file is comprised of declarations for
 	subnets and hosts which define the  information that is
 	provided to <acronym>DHCP</acronym>  clients.  For example,
 	these  lines configure the following:</para>
 
       <programlisting>option domain-name "example.org";<co xml:id="domain-name"/>
 option domain-name-servers ns1.example.org;<co xml:id="domain-name-servers"/>
 option subnet-mask 255.255.255.0;<co xml:id="subnet-mask"/>
 
 default-lease-time 600;<co xml:id="default-lease-time"/>
 max-lease-time 72400;<co xml:id="max-lease-time"/>
 ddns-update-style none;<co xml:id="ddns-update-style"/>
 
 subnet 10.254.239.0 netmask 255.255.255.224 {
   range 10.254.239.10 10.254.239.20;<co xml:id="range"/>
   option routers rtr-239-0-1.example.org, rtr-239-0-2.example.org;<co xml:id="routers"/>
 }
 
 host fantasia {
   hardware ethernet 08:00:07:26:c0:a5;<co xml:id="hardware"/>
   fixed-address fantasia.fugue.com;<co xml:id="fixed-address"/>
 }</programlisting>
 
       <calloutlist>
 	<callout arearefs="domain-name">
 	  <para>This option specifies the default search domain that
 	    will be provided to clients.  Refer to
 	    &man.resolv.conf.5; for more information.</para>
 	</callout>
 
 	<callout arearefs="domain-name-servers">
 	  <para>This option specifies a comma separated list of
 	    <acronym>DNS</acronym> servers that the client should use.
 	    They can be listed by their Fully Qualified Domain Names
 	    (<acronym>FQDN</acronym>), as seen in the example, or by
 	    their <acronym>IP</acronym> addresses.</para>
 	</callout>
 
 	<callout arearefs="subnet-mask">
 	  <para>The subnet mask that will be provided to
 	    clients.</para>
 	</callout>
 
 	<callout arearefs="default-lease-time">
 	  <para>The default lease expiry time in seconds.  A client
 	    can be configured to override this value.  </para>
 	</callout>
 
 	<callout arearefs="max-lease-time">
 	  <para>The maximum allowed length of time, in seconds, for a
 	    lease.  Should a client request a longer lease, a lease
 	    will still be issued, but it will only be valid for
 	    <literal>max-lease-time</literal>.</para>
 	</callout>
 
 	<callout arearefs="ddns-update-style">
 	  <para>The default of <option>none</option> disables dynamic
 	    DNS updates.  Changing this to <option>interim</option>
 	    configures the <acronym>DHCP</acronym> server to update a
 	    <acronym>DNS</acronym> server whenever it hands out a
 	    lease so that the <acronym>DNS</acronym> server knows
 	    which <acronym>IP</acronym> addresses are associated with
 	    which computers in the network.  Do not change the default
 	    setting unless the <acronym>DNS</acronym> server has  been
 	    configured to support dynamic
 	    <acronym>DNS</acronym>.</para>
 	</callout>
 
 	<callout arearefs="range">
 	  <para>This line creates a pool of available
 	    <acronym>IP</acronym> addresses which are reserved for
 	    allocation to <acronym>DHCP</acronym> clients.  The range
 	    of addresses must be valid for the network or subnet
 	    specified in the previous line.</para>
 	</callout>
 
 	<callout arearefs="routers">
 	  <para>Declares the default gateway that is valid for the
 	    network or subnet specified before the opening
 	    <literal>{</literal> bracket.</para>
 	</callout>
 
 	<callout arearefs="hardware">
 	  <para>Specifies the hardware <acronym>MAC</acronym> address
 	    of a client so that the <acronym>DHCP</acronym> server can
 	    recognize the client when it makes a request.</para>
 	</callout>
 
 	<callout arearefs="fixed-address">
 	  <para>Specifies that this host should always be given the
 	    same <acronym>IP</acronym> address.  Using the hostname is
 	    correct, since the <acronym>DHCP</acronym> server will
 	    resolve the hostname before returning the lease
 	    information.</para>
 	</callout>
       </calloutlist>
 
       <para>This configuration file supports many more options.  Refer
 	to dhcpd.conf(5), installed with the server, for details and
 	examples.</para>
 
       <para>Once the configuration of <filename>dhcpd.conf</filename>
 	is complete, enable the <acronym>DHCP</acronym> server in
 	<filename>/etc/rc.conf</filename>:</para>
 
       <programlisting>dhcpd_enable="YES"
 dhcpd_ifaces="dc0"</programlisting>
 
       <para>Replace the <literal>dc0</literal> with the interface (or
 	interfaces, separated by whitespace) that the
 	<acronym>DHCP</acronym> server should listen on for
 	<acronym>DHCP</acronym> client requests.</para>
 
       <para>Start the server by issuing the following command:</para>
 
       <screen>&prompt.root; <userinput>service isc-dhcpd start</userinput></screen>
 
       <para>Any future changes to the configuration of the server will
 	require the <application>dhcpd</application> service to be
 	stopped and then started using &man.service.8;.</para>
 
       <para>The <acronym>DHCP</acronym> server uses the following
 	files.  Note that the manual pages are installed with the
 	server software.</para>
 
       <indexterm>
 	<primary><acronym>DHCP</acronym></primary>
 	<secondary>configuration files</secondary>
       </indexterm>
       <itemizedlist>
 	<listitem>
 	  <para><filename>/usr/local/sbin/dhcpd</filename></para>
 
 	  <para>More information about the
 	    <application>dhcpd</application> server can be found in
 	    dhcpd(8).</para>
 	</listitem>
 
 	<listitem>
 	  <para><filename>/usr/local/etc/dhcpd.conf</filename></para>
 
 	  <para>The server configuration file needs to contain all the
 	    information that should be provided to clients, along with
 	    information regarding the operation of the server.  This
 	    configuration file is described in dhcpd.conf(5).</para>
 	</listitem>
 
 	<listitem>
 	  <para><filename>/var/db/dhcpd.leases</filename></para>
 
 	  <para>The <acronym>DHCP</acronym> server keeps a database of
 	    leases it has issued in this file, which is written as a
 	    log.  Refer to dhcpd.leases(5), which gives a slightly
 	    longer description.</para>
 	</listitem>
 
 	<listitem>
 	  <para><filename>/usr/local/sbin/dhcrelay</filename></para>
 
 	  <para>This daemon is used in advanced environments where one
 	    <acronym>DHCP</acronym> server forwards a request from a
 	    client to another <acronym>DHCP</acronym> server on a
 	    separate network.  If this functionality is required,
 	    install the <package>net/isc-dhcp43-relay</package>
 	    package or port.  The installation includes dhcrelay(8)
 	    which provides more detail.</para>
 	</listitem>
       </itemizedlist>
     </sect2>
   </sect1>
 
   <sect1 xml:id="network-dns">
     <!--
     <sect1info>
       <authorgroup>
 	<author>
 	  <firstname>Chern</firstname>
 	  <surname>Lee</surname>
 	  <contrib>Contributed by </contrib>
 	</author>
 
 	<author>
 	  <firstname>Tom</firstname>
 	  <surname>Rhodes</surname>
 	</author>
 
 	<author>
 	  <firstname>Daniel</firstname>
 	  <surname>Gerzo</surname>
 	</author>
       </authorgroup>
     </sect1info>
     -->
     <title>Domain Name System (<acronym>DNS</acronym>)</title>
 
     <indexterm><primary>DNS</primary></indexterm>
 
     <para>Domain Name System (<acronym>DNS</acronym>) is the protocol
       through which domain names are mapped to <acronym>IP</acronym>
       addresses, and vice versa.  <acronym>DNS</acronym> is
       coordinated across the Internet through a somewhat complex
       system of authoritative root, Top Level Domain
       (<acronym>TLD</acronym>), and other smaller-scale name servers,
       which host and cache individual domain information.  It is not
       necessary to run a name server to perform
       <acronym>DNS</acronym> lookups on a system.</para>
 
     <indexterm><primary>BIND</primary></indexterm>
 
     <para>In &os; 10, the Berkeley Internet Name Domain
       (<acronym>BIND</acronym>) has been removed from the base system
       and replaced with Unbound.  Unbound as configured in the &os;
       Base is a local caching resolver.  <acronym>BIND</acronym> is
       still available from The Ports Collection as <package
       role="port">dns/bind99</package> or <package
       role="port">dns/bind98</package>.  In &os; 9 and lower,
       <acronym>BIND</acronym> is included in &os; Base.  The &os;
       version provides enhanced security features, a new file system
       layout, and automated &man.chroot.8; configuration.
       <acronym>BIND</acronym> is maintained by the <link
 	xlink:href="https://www.isc.org/">Internet Systems
 	Consortium</link>.</para>
 
     <indexterm><primary>resolver</primary></indexterm>
     <indexterm><primary>reverse
       <acronym>DNS</acronym></primary></indexterm>
     <indexterm><primary>root zone</primary></indexterm>
 
     <para>The following table describes some of the terms associated
       with <acronym>DNS</acronym>:</para>
 
     <table frame="none" pgwide="1">
       <title><acronym>DNS</acronym> Terminology</title>
 
       <tgroup cols="2">
 	<colspec colwidth="1*"/>
 	<colspec colwidth="3*"/>
 
 	<thead>
 	  <row>
 	    <entry>Term</entry>
 	    <entry>Definition</entry>
 	  </row>
 	</thead>
 
 	<tbody>
 	  <row>
 	    <entry>Forward <acronym>DNS</acronym></entry>
 	    <entry>Mapping of hostnames to <acronym>IP</acronym>
 	      addresses.</entry>
 	  </row>
 
 	  <row>
 	    <entry>Origin</entry>
 	    <entry>Refers to the domain covered in a particular zone
 	      file.</entry>
 	  </row>
 
 	  <row>
 	    <entry><application>named</application>, BIND</entry>
 	    <entry>Common names for the BIND name server package
 	      within &os;.</entry>
 	  </row>
 
 	  <row>
 	    <entry>Resolver</entry>
 	    <entry>A system process through which a machine queries
 	      a name server for zone information.</entry>
 	  </row>
 
 	  <row>
 	    <entry>Reverse <acronym>DNS</acronym></entry>
 	    <entry>Mapping of <acronym>IP</acronym> addresses to
 	      hostnames.</entry>
 	  </row>
 
 	  <row>
 	    <entry>Root zone</entry>
 
 	    <entry>The beginning of the Internet zone hierarchy.  All
 	      zones fall under the root zone, similar to how all files
 	      in a file system fall under the root directory.</entry>
 	  </row>
 
 	  <row>
 	    <entry>Zone</entry>
 	    <entry>An individual domain, subdomain, or portion of the
 	      <acronym>DNS</acronym> administered by the same
 	      authority.</entry>
 	  </row>
 	</tbody>
       </tgroup>
     </table>
 
     <indexterm>
       <primary>zones</primary>
       <secondary>examples</secondary>
     </indexterm>
 
     <para>Examples of zones:</para>
 
     <itemizedlist>
       <listitem>
 	<para><systemitem>.</systemitem> is how the root zone is
 	  usually referred to in documentation.</para>
       </listitem>
 
       <listitem>
 	<para><systemitem>org.</systemitem> is a Top Level Domain
 	  (<acronym>TLD</acronym>) under the root zone.</para>
       </listitem>
 
       <listitem>
 	<para><systemitem
 	    class="fqdomainname">example.org.</systemitem> is a zone
 	  under the <systemitem>org.</systemitem>
 	  <acronym>TLD</acronym>.</para>
       </listitem>
 
       <listitem>
 	<para><systemitem>1.168.192.in-addr.arpa</systemitem> is a
 	  zone referencing all <acronym>IP</acronym> addresses which
 	  fall under the <systemitem
 	      class="ipaddress">192.168.1.*</systemitem>
 	  <acronym>IP</acronym> address space.</para>
       </listitem>
     </itemizedlist>
 
     <para>As one can see, the more specific part of a hostname
       appears to its left.  For example, <systemitem
 	class="fqdomainname">example.org.</systemitem> is more
       specific than <systemitem>org.</systemitem>, as
       <systemitem>org.</systemitem> is more specific than the root
       zone.  The layout of each part of a hostname is much like a file
       system: the <filename>/dev</filename> directory falls within the
       root, and so on.</para>
 
     <sect2>
       <title>Reasons to Run a Name Server</title>
 
       <para>Name servers generally come in two forms: authoritative
 	name servers, and caching (also known as resolving) name
 	servers.</para>
 
       <para>An authoritative name server is needed when:</para>
 
       <itemizedlist>
 	<listitem>
 	  <para>One wants to serve <acronym>DNS</acronym> information
 	    to the world, replying authoritatively to queries.</para>
 	</listitem>
 
 	<listitem>
 	  <para>A domain, such as <systemitem
 	      class="fqdomainname">example.org</systemitem>, is
 	    registered and <acronym>IP</acronym> addresses need to be
 	    assigned to hostnames under it.</para>
 	</listitem>
 
 	<listitem>
 	  <para>An <acronym>IP</acronym> address block requires
 	    reverse <acronym>DNS</acronym> entries
 	    (<acronym>IP</acronym> to hostname).</para>
 	</listitem>
 
 	<listitem>
 	  <para>A backup or second name server, called a slave, will
 	    reply to queries.</para>
 	</listitem>
       </itemizedlist>
 
       <para>A caching name server is needed when:</para>
 
       <itemizedlist>
 	<listitem>
 	  <para>A local <acronym>DNS</acronym> server may cache and
 	    respond more quickly than querying an outside name
 	    server.</para>
 	</listitem>
       </itemizedlist>
 
       <para>When one queries for <systemitem
 	  class="fqdomainname">www.FreeBSD.org</systemitem>, the
 	resolver usually queries the uplink <acronym>ISP</acronym>'s
 	name server, and retrieves the reply.  With a local, caching
 	<acronym>DNS</acronym> server, the query only has to be made
 	once to the outside world by the caching
 	<acronym>DNS</acronym> server.  Additional queries will not
 	have to go outside the local network, since the information is
 	cached locally.</para>
     </sect2>
 
     <sect2>
       <title><acronym>DNS</acronym> Server Configuration in &os; 10.0
 	and Later</title>
 
       <para>In &os; 10.0, <application>BIND</application> has been
 	replaced with <application>Unbound</application>.
 	<application>Unbound</application> is a validating caching
 	resolver only.  If an authoritative server is needed, many are
 	available from the Ports Collection.</para>
 
       <para><application>Unbound</application> is provided in the &os;
 	base system.  By default, it will provide
 	<acronym>DNS</acronym> resolution to the local machine only.
 	While the base system package can be configured to provide
 	resolution services beyond the local machine, it is
 	recommended that such requirements be addressed by installing
 	<application>Unbound</application> from the &os; Ports
 	Collection.</para>
 
       <para>To enable <application>Unbound</application>, add the
 	following to <filename>/etc/rc.conf</filename>:</para>
 
       <programlisting>local_unbound_enable="YES"</programlisting>
 
       <para>Any existing nameservers in
 	<filename>/etc/resolv.conf</filename> will be configured as
 	forwarders in the new <application>Unbound</application>
 	configuration.</para>
 
       <note>
 	<para>If any of the listed nameservers do not support
 	  <acronym>DNSSEC</acronym>, local <acronym>DNS</acronym>
 	  resolution will fail.  Be sure to test each nameserver and
 	  remove any that fail the test.  The following command will
 	  show the trust tree or a failure for a nameserver running on
 	  <systemitem
 	    class="ipaddress">192.168.1.1</systemitem>:</para>
       </note>
 
       <screen>&prompt.user; <userinput>drill -S FreeBSD.org @<replaceable>192.168.1.1</replaceable></userinput></screen>
 
       <para>Once each nameserver is confirmed to support
 	<acronym>DNSSEC</acronym>, start
 	<application>Unbound</application>:</para>
 
       <screen>&prompt.root; <userinput>service local_unbound onestart</userinput></screen>
 
       <para>This will take care of updating
 	<filename>/etc/resolv.conf</filename> so that queries for
 	<acronym>DNSSEC</acronym> secured domains will now work.  For
 	example, run the following to validate the FreeBSD.org
 	<acronym>DNSSEC</acronym> trust tree:</para>
 
       <screen>&prompt.user; <userinput>drill -S FreeBSD.org</userinput>
 ;; Number of trusted keys: 1
 ;; Chasing: freebsd.org. A
 
 DNSSEC Trust tree:
 freebsd.org. (A)
 |---freebsd.org. (DNSKEY keytag: 36786 alg: 8 flags: 256)
     |---freebsd.org. (DNSKEY keytag: 32659 alg: 8 flags: 257)
     |---freebsd.org. (DS keytag: 32659 digest type: 2)
         |---org. (DNSKEY keytag: 49587 alg: 7 flags: 256)
             |---org. (DNSKEY keytag: 9795 alg: 7 flags: 257)
             |---org. (DNSKEY keytag: 21366 alg: 7 flags: 257)
             |---org. (DS keytag: 21366 digest type: 1)
             |   |---. (DNSKEY keytag: 40926 alg: 8 flags: 256)
             |       |---. (DNSKEY keytag: 19036 alg: 8 flags: 257)
             |---org. (DS keytag: 21366 digest type: 2)
                 |---. (DNSKEY keytag: 40926 alg: 8 flags: 256)
                     |---. (DNSKEY keytag: 19036 alg: 8 flags: 257)
 ;; Chase successful</screen>
     </sect2>
 
     <sect2>
       <title>DNS Server Configuration in &os;
 	9.<replaceable>X</replaceable></title>
 
       <para>In &os;, the BIND daemon is called
 	<application>named</application>.</para>
 
       <informaltable frame="none" pgwide="1">
 	<tgroup cols="2">
 	  <thead>
 	    <row>
 	      <entry>File</entry>
 	      <entry>Description</entry>
 	    </row>
 	  </thead>
 
 	  <tbody>
 	    <row>
 	      <entry>&man.named.8;</entry>
 	      <entry>The BIND daemon.</entry>
 	    </row>
 
 	    <row>
 	      <entry>&man.rndc.8;</entry>
 	      <entry>Name server control utility.</entry>
 	    </row>
 
 	    <row>
 	      <entry><filename>/etc/namedb</filename></entry>
 	      <entry>Directory where BIND zone information
 		resides.</entry>
 	    </row>
 
 	    <row>
 	      <entry><filename>/etc/namedb/named.conf</filename></entry>
 	      <entry>Configuration file of the daemon.</entry>
 	    </row>
 	  </tbody>
 	</tgroup>
       </informaltable>
 
       <para>Depending on how a given zone is configured on the server,
 	the files related to that zone can be found in the
 	<filename>master</filename>,
 	<filename>slave</filename>, or
 	<filename>dynamic</filename> subdirectories
 	of the <filename>/etc/namedb</filename>
 	directory.  These files contain the <acronym>DNS</acronym>
 	information that will be given out by the name server in
 	response to queries.</para>
 
       <sect3>
 	<title>Starting BIND</title>
 
 	<indexterm>
 	  <primary>BIND</primary>
 	  <secondary>starting</secondary>
 	</indexterm>
 
 	<para>Since BIND is installed by default, configuring it is
 	  relatively simple.</para>
 
 	<para>The default <application>named</application>
 	  configuration is that of a basic resolving name server,
 	  running in a &man.chroot.8; environment, and restricted to
 	  listening on the local IPv4 loopback address (127.0.0.1).
 	  To start the server one time with this configuration, use
 	  the following command:</para>
 
 	<screen>&prompt.root; <userinput>service named onestart</userinput></screen>
 
 	<para>To ensure the <application>named</application> daemon is
 	  started at boot each time, put the following line into the
 	  <filename>/etc/rc.conf</filename>:</para>
 
 	<programlisting>named_enable="YES"</programlisting>
 
 	<para>There are many configuration options for
 	  <filename>/etc/namedb/named.conf</filename> that are beyond
 	  the scope of this document.  Other startup options for
 	  <application>named</application> on &os; can be found in the
 	  <literal>named_<replaceable>*</replaceable></literal> flags
 	  in <filename>/etc/defaults/rc.conf</filename> and in
 	  &man.rc.conf.5;.  The <xref linkend="configtuning-rcd"/>
 	  section is also a good read.</para>
       </sect3>
 
       <sect3>
 	<title>Configuration Files</title>
 
 	<indexterm>
 	  <primary>BIND</primary>
 	  <secondary>configuration files</secondary>
 	</indexterm>
 
 	<para>Configuration files for <application>named</application>
 	  currently reside in <filename>/etc/namedb</filename>
 	  directory and will need modification before use unless all
 	  that is needed is a simple resolver.  This is where most of
 	  the configuration will be performed.</para>
 
 	<sect4>
 	  <title><filename>/etc/namedb/named.conf</filename></title>
 
 	  <programlisting>// &dollar;FreeBSD&dollar;
 //
 // Refer to the named.conf(5) and named(8) man pages, and the documentation
 // in /usr/share/doc/bind9 for more details.
 //
 // If you are going to set up an authoritative server, make sure you
 // understand the hairy details of how DNS works.  Even with
 // simple mistakes, you can break connectivity for affected parties,
 // or cause huge amounts of useless Internet traffic.
 
 options {
 	// All file and path names are relative to the chroot directory,
 	// if any, and should be fully qualified.
 	directory	"/etc/namedb/working";
 	pid-file	"/var/run/named/pid";
 	dump-file	"/var/dump/named_dump.db";
 	statistics-file	"/var/stats/named.stats";
 
 // If named is being used only as a local resolver, this is a safe default.
 // For named to be accessible to the network, comment this option, specify
 // the proper IP address, or delete this option.
 	listen-on	{ 127.0.0.1; };
 
 // If you have IPv6 enabled on this system, uncomment this option for
 // use as a local resolver.  To give access to the network, specify
 // an IPv6 address, or the keyword "any".
 //	listen-on-v6	{ ::1; };
 
 // These zones are already covered by the empty zones listed below.
 // If you remove the related empty zones below, comment these lines out.
 	disable-empty-zone "255.255.255.255.IN-ADDR.ARPA";
 	disable-empty-zone "0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.IP6.ARPA";
 	disable-empty-zone "1.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.IP6.ARPA";
 
 // If you have a DNS server around at your upstream provider, enter
 // its IP address here, and enable the line below.  This will make you
 // benefit from its cache, thus reduce overall DNS traffic in the Internet.
 /*
 	forwarders {
 		127.0.0.1;
 	};
 */
 
 // If the 'forwarders' clause is not empty the default is to 'forward first'
 // which will fall back to sending a query from your local server if the name
 // servers in 'forwarders' do not have the answer.  Alternatively you can
 // force your name server to never initiate queries of its own by enabling the
 // following line:
 //	forward only;
 
 // If you wish to have forwarding configured automatically based on
 // the entries in /etc/resolv.conf, uncomment the following line and
 // set named_auto_forward=yes in /etc/rc.conf.  You can also enable
 // named_auto_forward_only (the effect of which is described above).
 //	include "/etc/namedb/auto_forward.conf";</programlisting>
 
 	  <para>Just as the comment says, to benefit from an uplink's
 	    cache, <literal>forwarders</literal> can be enabled here.
 	    Under normal circumstances, a name server will recursively
 	    query the Internet looking at certain name servers until
 	    it finds the answer it is looking for.  Having this
 	    enabled will have it query the uplink's name server (or
 	    name server provided) first, taking advantage of its
 	    cache.  If the uplink name server in question is a heavily
 	    trafficked, fast name server, enabling this may be
 	    worthwhile.</para>
 
 	  <warning>
 	    <para><systemitem class="ipaddress">127.0.0.1</systemitem>
 	      will <emphasis>not</emphasis> work here.  Change this
 	      <acronym>IP</acronym> address to a name server at the
 	      uplink.</para>
 	  </warning>
 
 	  <programlisting>	/*
 	   Modern versions of BIND use a random <acronym>UDP</acronym> port for each outgoing
 	   query by default in order to dramatically reduce the possibility
 	   of cache poisoning.  All users are strongly encouraged to utilize
 	   this feature, and to configure their firewalls to accommodate it.
 
 	   AS A LAST RESORT in order to get around a restrictive firewall
 	   policy you can try enabling the option below.  Use of this option
 	   will significantly reduce your ability to withstand cache poisoning
 	   attacks, and should be avoided if at all possible.
 
 	   Replace NNNNN in the example with a number between 49160 and 65530.
 	*/
 	// query-source address * port NNNNN;
 };
 
 // If you enable a local name server, do not forget to enter 127.0.0.1
 // first in your /etc/resolv.conf so this server will be queried.
 // Also, make sure to enable it in /etc/rc.conf.
 
 // The traditional root hints mechanism. Use this, OR the slave zones below.
 zone "." { type hint; file "/etc/namedb/named.root"; };
 
 /*	Slaving the following zones from the root name servers has some
 	significant advantages:
 	1. Faster local resolution for your users
 	2. No spurious traffic will be sent from your network to the roots
 	3. Greater resilience to any potential root server failure/DDoS
 
 	On the other hand, this method requires more monitoring than the
 	hints file to be sure that an unexpected failure mode has not
 	incapacitated your server.  Name servers that are serving a lot
 	of clients will benefit more from this approach than individual
 	hosts.  Use with caution.
 
 	To use this mechanism, uncomment the entries below, and comment
 	the hint zone above.
 
 	As documented at http://dns.icann.org/services/axfr/ these zones:
 	"." (the root), ARPA, IN-ADDR.ARPA, IP6.ARPA, and ROOT-SERVERS.NET
 	are available for AXFR from these servers on IPv4 and IPv6:
 	xfr.lax.dns.icann.org, xfr.cjr.dns.icann.org
 */
 /*
 zone "." {
 	type slave;
 	file "/etc/namedb/slave/root.slave";
 	masters {
 		192.5.5.241;	// F.ROOT-SERVERS.NET.
 	};
 	notify no;
 };
 zone "arpa" {
 	type slave;
 	file "/etc/namedb/slave/arpa.slave";
 	masters {
 		192.5.5.241;	// F.ROOT-SERVERS.NET.
 	};
 	notify no;
 };
 */
 
 /*	Serving the following zones locally will prevent any queries
 	for these zones leaving your network and going to the root
 	name servers.  This has two significant advantages:
 	1. Faster local resolution for your users
 	2. No spurious traffic will be sent from your network to the roots
 */
 // RFCs 1912 and 5735 (and BCP 32 for localhost)
 zone "localhost"	{ type master; file "/etc/namedb/master/localhost-forward.db"; };
 zone "127.in-addr.arpa"	{ type master; file "/etc/namedb/master/localhost-reverse.db"; };
 zone "255.in-addr.arpa"	{ type master; file "/etc/namedb/master/empty.db"; };
 
 // RFC 1912-style zone for IPv6 localhost address
 zone "0.ip6.arpa"	{ type master; file "/etc/namedb/master/localhost-reverse.db"; };
 
 // "This" Network (RFCs 1912 and 5735)
 zone "0.in-addr.arpa"	{ type master; file "/etc/namedb/master/empty.db"; };
 
 // Private Use Networks (RFCs 1918 and 5735)
 zone "10.in-addr.arpa"	   { type master; file "/etc/namedb/master/empty.db"; };
 zone "16.172.in-addr.arpa" { type master; file "/etc/namedb/master/empty.db"; };
 zone "17.172.in-addr.arpa" { type master; file "/etc/namedb/master/empty.db"; };
 zone "18.172.in-addr.arpa" { type master; file "/etc/namedb/master/empty.db"; };
 zone "19.172.in-addr.arpa" { type master; file "/etc/namedb/master/empty.db"; };
 zone "20.172.in-addr.arpa" { type master; file "/etc/namedb/master/empty.db"; };
 zone "21.172.in-addr.arpa" { type master; file "/etc/namedb/master/empty.db"; };
 zone "22.172.in-addr.arpa" { type master; file "/etc/namedb/master/empty.db"; };
 zone "23.172.in-addr.arpa" { type master; file "/etc/namedb/master/empty.db"; };
 zone "24.172.in-addr.arpa" { type master; file "/etc/namedb/master/empty.db"; };
 zone "25.172.in-addr.arpa" { type master; file "/etc/namedb/master/empty.db"; };
 zone "26.172.in-addr.arpa" { type master; file "/etc/namedb/master/empty.db"; };
 zone "27.172.in-addr.arpa" { type master; file "/etc/namedb/master/empty.db"; };
 zone "28.172.in-addr.arpa" { type master; file "/etc/namedb/master/empty.db"; };
 zone "29.172.in-addr.arpa" { type master; file "/etc/namedb/master/empty.db"; };
 zone "30.172.in-addr.arpa" { type master; file "/etc/namedb/master/empty.db"; };
 zone "31.172.in-addr.arpa" { type master; file "/etc/namedb/master/empty.db"; };
 zone "168.192.in-addr.arpa" { type master; file "/etc/namedb/master/empty.db"; };
 
 // Link-local/APIPA (RFCs 3927 and 5735)
 zone "254.169.in-addr.arpa" { type master; file "/etc/namedb/master/empty.db"; };
 
 // IETF protocol assignments (RFCs 5735 and 5736)
 zone "0.0.192.in-addr.arpa" { type master; file "/etc/namedb/master/empty.db"; };
 
 // TEST-NET-[1-3] for Documentation (RFCs 5735 and 5737)
 zone "2.0.192.in-addr.arpa" { type master; file "/etc/namedb/master/empty.db"; };
 zone "100.51.198.in-addr.arpa" { type master; file "/etc/namedb/master/empty.db"; };
 zone "113.0.203.in-addr.arpa" { type master; file "/etc/namedb/master/empty.db"; };
 
 // IPv6 Range for Documentation (RFC 3849)
 zone "8.b.d.0.1.0.0.2.ip6.arpa" { type master; file "/etc/namedb/master/empty.db"; };
 
 // Domain Names for Documentation and Testing (BCP 32)
 zone "test" { type master; file "/etc/namedb/master/empty.db"; };
 zone "example" { type master; file "/etc/namedb/master/empty.db"; };
 zone "invalid" { type master; file "/etc/namedb/master/empty.db"; };
 zone "example.com" { type master; file "/etc/namedb/master/empty.db"; };
 zone "example.net" { type master; file "/etc/namedb/master/empty.db"; };
 zone "example.org" { type master; file "/etc/namedb/master/empty.db"; };
 
 // Router Benchmark Testing (RFCs 2544 and 5735)
 zone "18.198.in-addr.arpa" { type master; file "/etc/namedb/master/empty.db"; };
 zone "19.198.in-addr.arpa" { type master; file "/etc/namedb/master/empty.db"; };
 
 // IANA Reserved - Old Class E Space (RFC 5735)
 zone "240.in-addr.arpa"	{ type master; file "/etc/namedb/master/empty.db"; };
 zone "241.in-addr.arpa"	{ type master; file "/etc/namedb/master/empty.db"; };
 zone "242.in-addr.arpa"	{ type master; file "/etc/namedb/master/empty.db"; };
 zone "243.in-addr.arpa"	{ type master; file "/etc/namedb/master/empty.db"; };
 zone "244.in-addr.arpa"	{ type master; file "/etc/namedb/master/empty.db"; };
 zone "245.in-addr.arpa"	{ type master; file "/etc/namedb/master/empty.db"; };
 zone "246.in-addr.arpa"	{ type master; file "/etc/namedb/master/empty.db"; };
 zone "247.in-addr.arpa"	{ type master; file "/etc/namedb/master/empty.db"; };
 zone "248.in-addr.arpa"	{ type master; file "/etc/namedb/master/empty.db"; };
 zone "249.in-addr.arpa"	{ type master; file "/etc/namedb/master/empty.db"; };
 zone "250.in-addr.arpa"	{ type master; file "/etc/namedb/master/empty.db"; };
 zone "251.in-addr.arpa"	{ type master; file "/etc/namedb/master/empty.db"; };
 zone "252.in-addr.arpa"	{ type master; file "/etc/namedb/master/empty.db"; };
 zone "253.in-addr.arpa"	{ type master; file "/etc/namedb/master/empty.db"; };
 zone "254.in-addr.arpa"	{ type master; file "/etc/namedb/master/empty.db"; };
 
 // IPv6 Unassigned Addresses (RFC 4291)
 zone "1.ip6.arpa"	{ type master; file "/etc/namedb/master/empty.db"; };
 zone "3.ip6.arpa"	{ type master; file "/etc/namedb/master/empty.db"; };
 zone "4.ip6.arpa"	{ type master; file "/etc/namedb/master/empty.db"; };
 zone "5.ip6.arpa"	{ type master; file "/etc/namedb/master/empty.db"; };
 zone "6.ip6.arpa"	{ type master; file "/etc/namedb/master/empty.db"; };
 zone "7.ip6.arpa"	{ type master; file "/etc/namedb/master/empty.db"; };
 zone "8.ip6.arpa"	{ type master; file "/etc/namedb/master/empty.db"; };
 zone "9.ip6.arpa"	{ type master; file "/etc/namedb/master/empty.db"; };
 zone "a.ip6.arpa"	{ type master; file "/etc/namedb/master/empty.db"; };
 zone "b.ip6.arpa"	{ type master; file "/etc/namedb/master/empty.db"; };
 zone "c.ip6.arpa"	{ type master; file "/etc/namedb/master/empty.db"; };
 zone "d.ip6.arpa"	{ type master; file "/etc/namedb/master/empty.db"; };
 zone "e.ip6.arpa"	{ type master; file "/etc/namedb/master/empty.db"; };
 zone "0.f.ip6.arpa"	{ type master; file "/etc/namedb/master/empty.db"; };
 zone "1.f.ip6.arpa"	{ type master; file "/etc/namedb/master/empty.db"; };
 zone "2.f.ip6.arpa"	{ type master; file "/etc/namedb/master/empty.db"; };
 zone "3.f.ip6.arpa"	{ type master; file "/etc/namedb/master/empty.db"; };
 zone "4.f.ip6.arpa"	{ type master; file "/etc/namedb/master/empty.db"; };
 zone "5.f.ip6.arpa"	{ type master; file "/etc/namedb/master/empty.db"; };
 zone "6.f.ip6.arpa"	{ type master; file "/etc/namedb/master/empty.db"; };
 zone "7.f.ip6.arpa"	{ type master; file "/etc/namedb/master/empty.db"; };
 zone "8.f.ip6.arpa"	{ type master; file "/etc/namedb/master/empty.db"; };
 zone "9.f.ip6.arpa"	{ type master; file "/etc/namedb/master/empty.db"; };
 zone "a.f.ip6.arpa"	{ type master; file "/etc/namedb/master/empty.db"; };
 zone "b.f.ip6.arpa"	{ type master; file "/etc/namedb/master/empty.db"; };
 zone "0.e.f.ip6.arpa"	{ type master; file "/etc/namedb/master/empty.db"; };
 zone "1.e.f.ip6.arpa"	{ type master; file "/etc/namedb/master/empty.db"; };
 zone "2.e.f.ip6.arpa"	{ type master; file "/etc/namedb/master/empty.db"; };
 zone "3.e.f.ip6.arpa"	{ type master; file "/etc/namedb/master/empty.db"; };
 zone "4.e.f.ip6.arpa"	{ type master; file "/etc/namedb/master/empty.db"; };
 zone "5.e.f.ip6.arpa"	{ type master; file "/etc/namedb/master/empty.db"; };
 zone "6.e.f.ip6.arpa"	{ type master; file "/etc/namedb/master/empty.db"; };
 zone "7.e.f.ip6.arpa"	{ type master; file "/etc/namedb/master/empty.db"; };
 
 // IPv6 ULA (RFC 4193)
 zone "c.f.ip6.arpa"	{ type master; file "/etc/namedb/master/empty.db"; };
 zone "d.f.ip6.arpa"	{ type master; file "/etc/namedb/master/empty.db"; };
 
 // IPv6 Link Local (RFC 4291)
 zone "8.e.f.ip6.arpa"	{ type master; file "/etc/namedb/master/empty.db"; };
 zone "9.e.f.ip6.arpa"	{ type master; file "/etc/namedb/master/empty.db"; };
 zone "a.e.f.ip6.arpa"	{ type master; file "/etc/namedb/master/empty.db"; };
 zone "b.e.f.ip6.arpa"	{ type master; file "/etc/namedb/master/empty.db"; };
 
 // IPv6 Deprecated Site-Local Addresses (RFC 3879)
 zone "c.e.f.ip6.arpa"	{ type master; file "/etc/namedb/master/empty.db"; };
 zone "d.e.f.ip6.arpa"	{ type master; file "/etc/namedb/master/empty.db"; };
 zone "e.e.f.ip6.arpa"	{ type master; file "/etc/namedb/master/empty.db"; };
 zone "f.e.f.ip6.arpa"	{ type master; file "/etc/namedb/master/empty.db"; };
 
 // IP6.INT is Deprecated (RFC 4159)
 zone "ip6.int"		{ type master; file "/etc/namedb/master/empty.db"; };
 
 // NB: Do not use the IP addresses below, they are faked, and only
 // serve demonstration/documentation purposes!
 //
 // Example slave zone config entries.  It can be convenient to become
 // a slave at least for the zone your own domain is in.  Ask
 // your network administrator for the IP address of the responsible
 // master name server.
 //
 // Do not forget to include the reverse lookup zone!
 // This is named after the first bytes of the IP address, in reverse
 // order, with ".IN-ADDR.ARPA" appended, or ".IP6.ARPA" for IPv6.
 //
 // Before starting to set up a master zone, make sure you fully
 // understand how DNS and BIND work.  There are sometimes
 // non-obvious pitfalls.  Setting up a slave zone is usually simpler.
 //
 // NB: Do not blindly enable the examples below. :-)  Use actual names
 // and addresses instead.
 
 /* An example dynamic zone
 key "exampleorgkey" {
 	algorithm hmac-md5;
 	secret "sf87HJqjkqh8ac87a02lla==";
 };
 zone "example.org" {
 	type master;
 	allow-update {
 		key "exampleorgkey";
 	};
 	file "/etc/namedb/dynamic/example.org";
 };
 */
 
 /* Example of a slave reverse zone
 zone "1.168.192.in-addr.arpa" {
 	type slave;
 	file "/etc/namedb/slave/1.168.192.in-addr.arpa";
 	masters {
 		192.168.1.1;
 	};
 };
 */</programlisting>
 
 	  <para>In <filename>named.conf</filename>, these are examples
 	    of slave entries for a forward and reverse zone.</para>
 
 	  <para>For each new zone served, a new zone entry must be
 	    added to <filename>named.conf</filename>.</para>
 
 	  <para>For example, the simplest zone entry for
 	    <systemitem class="fqdomainname">example.org</systemitem>
 	    can look like:</para>
 
 	  <programlisting>zone "example.org" {
 	type master;
 	file "master/example.org";
 };</programlisting>
 
 	  <para>The zone is a master, as indicated by the
 	    <option>type</option> statement, holding its zone
 	    information in
 	    <filename>/etc/namedb/master/example.org</filename>
 	    indicated by the <option>file</option> statement.</para>
 
 	  <programlisting>zone "example.org" {
 	type slave;
 	file "slave/example.org";
 };</programlisting>
 
 	  <para>In the slave case, the zone information is transferred
 	    from the master name server for the particular zone, and
 	    saved in the file specified.  If and when the master
 	    server dies or is unreachable, the slave name server will
 	    have the transferred zone information and will be able to
 	    serve it.</para>
 	</sect4>
 
 	<sect4>
 	  <title>Zone Files</title>
 
 	  <indexterm>
 	    <primary>BIND</primary>
 	    <secondary>zone files</secondary>
 	  </indexterm>
 
 	  <para>An example master zone file for
 	    <systemitem class="fqdomainname">example.org</systemitem>
 	    (existing within
 	    <filename>/etc/namedb/master/example.org</filename>) is as
 	    follows:</para>
 
 	  <programlisting>&dollar;TTL 3600        ; 1 hour default TTL
 example.org.    IN      SOA      ns1.example.org. admin.example.org. (
                                 2006051501      ; Serial
                                 10800           ; Refresh
                                 3600            ; Retry
                                 604800          ; Expire
                                 300             ; Negative Response TTL
                         )
 
 ; DNS Servers
                 IN      NS      ns1.example.org.
                 IN      NS      ns2.example.org.
 
 ; MX Records
                 IN      MX 10   mx.example.org.
                 IN      MX 20   mail.example.org.
 
                 IN      A       192.168.1.1
 
 ; Machine Names
 localhost       IN      A       127.0.0.1
 ns1             IN      A       192.168.1.2
 ns2             IN      A       192.168.1.3
 mx              IN      A       192.168.1.4
 mail            IN      A       192.168.1.5
 
 ; Aliases
 www             IN      CNAME   example.org.</programlisting>
 
 	  <para>Note that every hostname ending in a <quote>.</quote>
 	    is an exact hostname, whereas everything without a
 	    trailing <quote>.</quote> is relative to the origin.  For
 	    example, <literal>ns1</literal> is translated into
 	    <literal>ns1.<replaceable>example.org.</replaceable></literal></para>
 
 	  <para>The format of a zone file follows:</para>
 
 	  <programlisting>recordname      IN recordtype   value</programlisting>
 
 	  <indexterm>
 	    <primary><acronym>DNS</acronym></primary>
 	    <secondary>records</secondary>
 	  </indexterm>
 
 	  <para>The most commonly used <acronym>DNS</acronym>
 	    records:</para>
 
 	  <variablelist>
 	    <varlistentry>
 	      <term>SOA</term>
 
 	      <listitem>
 		<para>start of zone authority</para>
 	      </listitem>
 	    </varlistentry>
 
 	    <varlistentry>
 	      <term>NS</term>
 
 	      <listitem>
 		<para>an authoritative name server</para>
 	      </listitem>
 	    </varlistentry>
 
 	    <varlistentry>
 	      <term>A</term>
 
 	      <listitem>
 		<para>a host address</para>
 	      </listitem>
 	    </varlistentry>
 
 	    <varlistentry>
 	      <term>CNAME</term>
 
 	      <listitem>
 		<para>the canonical name for an alias</para>
 	      </listitem>
 	    </varlistentry>
 
 	    <varlistentry>
 	      <term>MX</term>
 
 	      <listitem>
 		<para>mail exchanger</para>
 	      </listitem>
 	    </varlistentry>
 
 	    <varlistentry>
 	      <term>PTR</term>
 
 	      <listitem>
 		<para>a domain name pointer (used in reverse
 		  <acronym>DNS</acronym>)</para>
 	      </listitem>
 	    </varlistentry>
 	  </variablelist>
 
 	  <programlisting>example.org. IN SOA ns1.example.org. admin.example.org. (
                         2006051501      ; Serial
                         10800           ; Refresh after 3 hours
                         3600            ; Retry after 1 hour
                         604800          ; Expire after 1 week
                         300 )           ; Negative Response TTL</programlisting>
 
 	  <variablelist>
 	    <varlistentry>
 	      <term><systemitem
 		  class="fqdomainname">example.org.</systemitem></term>
 
 	      <listitem>
 		<para>the domain name, also the origin for this
 		  zone file.</para>
 	      </listitem>
 	    </varlistentry>
 
 	    <varlistentry>
 	      <term><systemitem
 		  class="fqdomainname">ns1.example.org.</systemitem></term>
 
 	      <listitem>
 		<para>the primary/authoritative name server for this
 		  zone.</para>
 	      </listitem>
 	    </varlistentry>
 
 	    <varlistentry>
 	      <term><literal>admin.example.org.</literal></term>
 
 	      <listitem>
 		<para>the responsible person for this zone,
 		  email address with <quote>@</quote>
 		  replaced.  (<email>admin@example.org</email> becomes
 		  <literal>admin.example.org</literal>)</para>
 	      </listitem>
 	    </varlistentry>
 
 	    <varlistentry>
 	      <term><literal>2006051501</literal></term>
 
 	      <listitem>
 		<para>the serial number of the file.  This must be
 		  incremented each time the zone file is modified.
 		  Nowadays, many admins prefer a
 		  <literal>yyyymmddrr</literal> format for the serial
 		  number.  <literal>2006051501</literal> would mean
 		  last modified 05/15/2006, the latter
 		  <literal>01</literal> being the first time the zone
 		  file has been modified this day.  The serial number
 		  is important as it alerts slave name servers for a
 		  zone when it is updated.</para>
 	      </listitem>
 	    </varlistentry>
 	  </variablelist>
 
 	  <programlisting>       IN NS           ns1.example.org.</programlisting>
 
 	  <para>This is an NS entry.  Every name server that is going
 	    to reply authoritatively for the zone must have one of
 	    these entries.</para>
 
 	  <programlisting>localhost       IN      A       127.0.0.1
 ns1             IN      A       192.168.1.2
 ns2             IN      A       192.168.1.3
 mx              IN      A       192.168.1.4
 mail            IN      A       192.168.1.5</programlisting>
 
 	  <para>The A record indicates machine names.  As seen above,
 	    <systemitem
 	      class="fqdomainname">ns1.example.org</systemitem> would
 	    resolve to <systemitem
 	      class="ipaddress">192.168.1.2</systemitem>.</para>
 
 	  <programlisting>                IN      A       192.168.1.1</programlisting>
 
 	  <para>This line assigns <acronym>IP</acronym> address
 	    <systemitem class="ipaddress">192.168.1.1</systemitem> to
 	    the current origin, in this case <systemitem
 	      class="fqdomainname">example.org</systemitem>.</para>
 
 	  <programlisting>www             IN CNAME        @</programlisting>
 
 	  <para>The canonical name record is usually used for giving
 	    aliases to a machine.  In the example,
 	    <systemitem>www</systemitem> is aliased to the
 	    <quote>master</quote> machine whose name happens to be the
 	    same as the domain name
 	    <systemitem class="fqdomainname">example.org</systemitem>
 	    (<systemitem class="ipaddress">192.168.1.1</systemitem>).
 	    CNAMEs can never be used together with another kind of
 	    record for the same hostname.</para>
 
 	  <indexterm>
 	    <primary>MX record</primary>
 	  </indexterm>
 
 	  <programlisting>               IN MX   10      mail.example.org.</programlisting>
 
 	  <para>The MX record indicates which mail servers are
 	    responsible for handling incoming mail for the zone.
 	    <systemitem
 	      class="fqdomainname">mail.example.org</systemitem> is
 	    the hostname of a mail server, and 10 is the priority of
 	    that mail server.</para>
 
 	  <para>One can have several mail servers, with priorities of
 	    10, 20 and so on.  A mail server attempting to deliver to
 	    <systemitem class="fqdomainname">example.org</systemitem>
 	    would first try the highest priority MX (the record with
 	    the lowest priority number), then the second highest, etc,
 	    until the mail can be properly delivered.</para>
 
 	  <para>For in-addr.arpa zone files (reverse
 	    <acronym>DNS</acronym>), the same format is used, except
 	    with PTR entries instead of A or CNAME.</para>
 
 	  <programlisting>$TTL 3600
 
 1.168.192.in-addr.arpa. IN SOA ns1.example.org. admin.example.org. (
                         2006051501      ; Serial
                         10800           ; Refresh
                         3600            ; Retry
                         604800          ; Expire
                         300 )           ; Negative Response TTL
 
         IN      NS      ns1.example.org.
         IN      NS      ns2.example.org.
 
 1       IN      PTR     example.org.
 2       IN      PTR     ns1.example.org.
 3       IN      PTR     ns2.example.org.
 4       IN      PTR     mx.example.org.
 5       IN      PTR     mail.example.org.</programlisting>
 
 	  <para>This file gives the proper <acronym>IP</acronym>
 	    address to hostname mappings for the above fictitious
 	    domain.</para>
 
 	  <para>It is worth noting that all names on the right side
 	    of a PTR record need to be fully qualified (i.e., end in
 	    a <quote>.</quote>).</para>
 	</sect4>
       </sect3>
 
       <sect3>
 	<title>Caching Name Server</title>
 
 	<indexterm>
 	  <primary>BIND</primary>
 	  <secondary>caching name server</secondary>
 	</indexterm>
 
 	<para>A caching name server is a name server whose primary
 	  role is to resolve recursive queries.  It simply asks
 	  queries of its own, and remembers the answers for later
 	  use.</para>
       </sect3>
 
       <sect3>
 	<title><acronym role="Domain Name Security
 	    Extensions">DNSSEC</acronym></title>
 
 	<indexterm>
 	  <primary>BIND</primary>
 	  <secondary><acronym>DNS</acronym> security
 	      extensions</secondary>
 	</indexterm>
 
 	<para>Domain Name System Security Extensions, or <acronym
 	    role="Domain Name Security Extensions">DNSSEC</acronym>
 	  for short, is a suite of specifications to protect resolving
 	  name servers from forged <acronym>DNS</acronym> data, such
 	  as spoofed <acronym>DNS</acronym> records.  By using digital
 	  signatures, a resolver can verify the integrity of the
 	  record.  Note that <acronym role="Domain Name Security
 	    Extensions">DNSSEC</acronym> only provides integrity via
 	  digitally signing the Resource Records (<acronym
 	    role="Resource Record">RR</acronym>s).  It provides
 	  neither confidentiality nor protection against false
 	  end-user assumptions.  This means that it cannot protect
 	  against people going to
 	  <systemitem class="fqdomainname">example.net</systemitem>
 	  instead of
 	  <systemitem class="fqdomainname">example.com</systemitem>.
 	  The only thing <acronym>DNSSEC</acronym> does is
 	  authenticate that the data has not been compromised in
 	  transit.  The security of <acronym>DNS</acronym> is an
 	  important step in securing the Internet in general.  For
 	  more in-depth details of how <acronym>DNSSEC</acronym>
 	  works, the relevant <acronym>RFC</acronym>s are a good place
 	  to start.  See the list in
 	  <xref linkend="dns-read"/>.</para>
 
 	<para>The following sections will demonstrate how to enable
 	  <acronym>DNSSEC</acronym> for an authoritative
 	  <acronym>DNS</acronym> server and a recursive (or caching)
 	  <acronym>DNS</acronym> server running
 	  <acronym>BIND</acronym> 9.  While all versions of
 	  <acronym>BIND</acronym> 9 support <acronym>DNSSEC</acronym>,
 	  it is necessary to have at least version 9.6.2 in order to
 	  be able to use the signed root zone when validating
 	  <acronym>DNS</acronym> queries.  This is because earlier
 	  versions lack the required algorithms to enable validation
 	  using the root zone key.  It is strongly recommended to use
 	  the latest version of <acronym>BIND</acronym> 9.7 or later
 	  to take advantage of automatic key updating for the root
 	  key, as well as other features to automatically keep zones
 	  signed and signatures up to date.  Where configurations
 	  differ between 9.6.2 and 9.7 and later, differences will be
 	  pointed out.</para>
 
 	<sect4>
 	  <title>Recursive <acronym>DNS</acronym> Server
 	    Configuration</title>
 
 	  <para>Enabling <acronym>DNSSEC</acronym> validation of
 	    queries performed by a recursive <acronym>DNS</acronym>
 	    server requires a few changes to
 	    <filename>named.conf</filename>.  Before making these
 	    changes the root zone key, or trust anchor, must be
 	    acquired.  Currently the root zone key is not available in
 	    a file format <acronym>BIND</acronym> understands, so it
 	    has to be manually converted into the proper format.  The
 	    key itself can be obtained by querying the root zone for
 	    it using <application>dig</application>.  By
 	    running</para>
 
 	  <screen>&prompt.user; <userinput>dig +multi +noall +answer DNSKEY . &gt; root.dnskey</userinput></screen>
 
 	  <para>the key will end up in
 	    <filename>root.dnskey</filename>.  The contents should
 	    look something like this:</para>
 
 	  <programlisting>. 93910 IN DNSKEY 257 3 8 (
 	AwEAAagAIKlVZrpC6Ia7gEzahOR+9W29euxhJhVVLOyQ
 	bSEW0O8gcCjFFVQUTf6v58fLjwBd0YI0EzrAcQqBGCzh
 	/RStIoO8g0NfnfL2MTJRkxoXbfDaUeVPQuYEhg37NZWA
 	JQ9VnMVDxP/VHL496M/QZxkjf5/Efucp2gaDX6RS6CXp
 	oY68LsvPVjR0ZSwzz1apAzvN9dlzEheX7ICJBBtuA6G3
 	LQpzW5hOA2hzCTMjJPJ8LbqF6dsV6DoBQzgul0sGIcGO
 	Yl7OyQdXfZ57relSQageu+ipAdTTJ25AsRTAoub8ONGc
 	LmqrAmRLKBP1dfwhYB4N7knNnulqQxA+Uk1ihz0=
 	) ; key id = 19036
 . 93910 IN DNSKEY 256 3 8 (
 	AwEAAcaGQEA+OJmOzfzVfoYN249JId7gx+OZMbxy69Hf
 	UyuGBbRN0+HuTOpBxxBCkNOL+EJB9qJxt+0FEY6ZUVjE
 	g58sRr4ZQ6Iu6b1xTBKgc193zUARk4mmQ/PPGxn7Cn5V
 	EGJ/1h6dNaiXuRHwR+7oWh7DnzkIJChcTqlFrXDW3tjt
 ) ; key id = 34525</programlisting>
 
 	  <para>Do not be alarmed if the obtained keys differ from
 	    this example.  They might have changed since these
 	    instructions were last updated.  This output actually
 	    contains two keys.  The first key in the listing, with the
 	    value 257 after the DNSKEY record type, is the one needed.
 	    This value indicates that this is a Secure Entry Point
 	    (<acronym role="Secure Entry Point">SEP</acronym>),
 	    commonly known as a Key Signing Key
 	    (<acronym role="Key Signing Key">KSK</acronym>).  The
 	    second key, with value 256, is a subordinate key, commonly
 	    called a Zone Signing Key
 	    (<acronym role="Zone Signing Key">ZSK</acronym>).  More on
 	    the different key types later in
 	    <xref linkend="dns-dnssec-auth"/>.</para>
 
 	  <para>Now the key must be verified and formatted so that
 	    <acronym>BIND</acronym> can use it.  To verify the key,
 	    generate a <acronym role="Delegation Signer">DS</acronym>
 	    <acronym role="Resource Record">RR</acronym> set.  Create
 	    a file containing these
 	    <acronym role="Resource Record">RR</acronym>s with</para>
 
 	  <screen>&prompt.user; <userinput>dnssec-dsfromkey -f root.dnskey . &gt; root.ds</userinput></screen>
 
 	  <para>These records use SHA-1 and SHA-256 respectively, and
 	    should look similar to the following example, where the
 	    longer is using SHA-256.</para>
 
 	  <programlisting>.  IN DS 19036 8 1
 	B256BD09DC8DD59F0E0F0D8541B8328DD986DF6E
 . IN DS 19036 8 2 49AAC11D7B6F6446702E54A1607371607A1A41855200FD2CE1CDDE32F24E8FB5</programlisting>
 
 	  <para>The SHA-256 <acronym>RR</acronym> can now be compared
 	    to the digest in <link
 	      xlink:href="https://data.iana.org/root-anchors/root-anchors.xml">https://data.iana.org/root-anchors/root-anchors.xml</link>.
 	    To be absolutely sure that the key has not been tampered
 	    with the data in the <acronym>XML</acronym> file can be
 	    verified using the <acronym>PGP</acronym> signature in
 	    <link
 	      xlink:href="https://data.iana.org/root-anchors/root-anchors.asc">https://data.iana.org/root-anchors/root-anchors.asc</link>.</para>
 
 	  <para>Next, the key must be formatted properly.  This
 	    differs a little between <acronym>BIND</acronym> versions
 	    9.6.2 and 9.7 and later.  In version 9.7 support was added
 	    to automatically track changes to the key and update it as
 	    necessary.  This is done using
 	    <literal>managed-keys</literal> as seen in the example
 	    below.  When using the older version, the key is added
 	    using a <literal>trusted-keys</literal> statement and
 	    updates must be done manually.  For
 	    <acronym>BIND</acronym> 9.6.2 the format should look
 	    like:</para>
 
 	  <programlisting>trusted-keys {
 	"." 257 3 8
 	"AwEAAagAIKlVZrpC6Ia7gEzahOR+9W29euxhJhVVLOyQbSEW0O8gcCjF
 	FVQUTf6v58fLjwBd0YI0EzrAcQqBGCzh/RStIoO8g0NfnfL2MTJRkxoX
 	bfDaUeVPQuYEhg37NZWAJQ9VnMVDxP/VHL496M/QZxkjf5/Efucp2gaD
 	X6RS6CXpoY68LsvPVjR0ZSwzz1apAzvN9dlzEheX7ICJBBtuA6G3LQpz
 	W5hOA2hzCTMjJPJ8LbqF6dsV6DoBQzgul0sGIcGOYl7OyQdXfZ57relS
 	Qageu+ipAdTTJ25AsRTAoub8ONGcLmqrAmRLKBP1dfwhYB4N7knNnulq
 	QxA+Uk1ihz0=";
 };</programlisting>
 
 	  <para>For 9.7 the format will instead be:</para>
 
 	  <programlisting>managed-keys {
 	"." initial-key 257 3 8
 	"AwEAAagAIKlVZrpC6Ia7gEzahOR+9W29euxhJhVVLOyQbSEW0O8gcCjF
 	FVQUTf6v58fLjwBd0YI0EzrAcQqBGCzh/RStIoO8g0NfnfL2MTJRkxoX
 	bfDaUeVPQuYEhg37NZWAJQ9VnMVDxP/VHL496M/QZxkjf5/Efucp2gaD
 	X6RS6CXpoY68LsvPVjR0ZSwzz1apAzvN9dlzEheX7ICJBBtuA6G3LQpz
 	W5hOA2hzCTMjJPJ8LbqF6dsV6DoBQzgul0sGIcGOYl7OyQdXfZ57relS
 	Qageu+ipAdTTJ25AsRTAoub8ONGcLmqrAmRLKBP1dfwhYB4N7knNnulq
 	QxA+Uk1ihz0=";
 };</programlisting>
 
 	  <para>The root key can now be added to
 	    <filename>named.conf</filename> either directly or by
 	    including a file containing the key.  After these steps,
 	    configure <acronym>BIND</acronym> to do
 	    <acronym>DNSSEC</acronym> validation on queries by editing
 	    <filename>named.conf</filename> and adding the following
 	    to the <literal>options</literal> directive:</para>
 
 	  <programlisting>dnssec-enable yes;
 dnssec-validation yes;</programlisting>
 
 	  <para>To verify that it is actually working use
 	    <application>dig</application> to make a query for a
 	    signed zone using the resolver just configured.  A
 	    successful reply will contain the <literal>AD</literal>
 	    flag to indicate the data was authenticated.  Running a
 	    query such as</para>
 
 	  <screen>&prompt.user; <userinput>dig @<replaceable>resolver</replaceable> +dnssec se ds </userinput></screen>
 
 	  <para>should return the <acronym>DS</acronym>
 	    <acronym>RR</acronym> for the <literal>.se</literal> zone.
 	    In the <literal>flags:</literal> section the
 	    <literal>AD</literal> flag should be set, as seen
 	    in:</para>
 
 	  <programlisting>...
 ;; flags: qr rd ra ad; QUERY: 1, ANSWER: 3, AUTHORITY: 0, ADDITIONAL: 1
 ...</programlisting>
 
 	  <para>The resolver is now capable of authenticating
 	    <acronym>DNS</acronym> queries.</para>
 	</sect4>
 
 	<sect4 xml:id="dns-dnssec-auth">
 	  <title>Authoritative <acronym>DNS</acronym> Server
 	    Configuration</title>
 
 	  <para>In order to get an authoritative name server to serve
 	    a <acronym>DNSSEC</acronym> signed zone a little more work
 	    is required.  A zone is signed using cryptographic keys
 	    which must be generated.  It is possible to use only one
 	    key for this.  The preferred method however is to have a
 	    strong well-protected Key Signing Key
 	    (<acronym role="Key Signing Key">KSK</acronym>) that is
 	    not rotated very often and a Zone Signing Key
 	    (<acronym role="Zone Signing Key">ZSK</acronym>) that is
 	    rotated more frequently.  Information on recommended
 	    operational practices can be found in <link
 	      xlink:href="http://tools.ietf.org/rfc/rfc4641.txt"><acronym>RFC</acronym>
 	      4641: <acronym>DNSSEC</acronym> Operational
 	      Practices</link>.  Practices regarding the root zone can
 	    be found in <link
 	      xlink:href="http://www.root-dnssec.org/wp-content/uploads/2010/06/icann-dps-00.txt"><acronym>DNSSEC</acronym>
 	      Practice Statement for the Root Zone
 	      <acronym>KSK</acronym> operator</link> and <link
 	      xlink:href="http://www.root-dnssec.org/wp-content/uploads/2010/06/vrsn-dps-00.txt"><acronym>DNSSEC</acronym>
 	      Practice Statement for the Root Zone
 	    <acronym>ZSK</acronym> operator</link>.  The
 	    <acronym role="Key Signing Key">KSK</acronym> is used to
 	    build a chain of authority to the data in need of
 	    validation and as such is also called a Secure Entry Point
 	    (<acronym role="Secure Entry Point">SEP</acronym>) key.  A
 	    message digest of this key, called a Delegation Signer
 	    (<acronym role="Delegation Signer">DS</acronym>) record,
 	    must be published in the parent zone to establish the
 	    trust chain.  How this is accomplished depends on the
 	    parent zone owner.  The
 	    <acronym role="Zone Signing Key">ZSK</acronym> is used to
 	    sign the zone, and only needs to be published
 	    there.</para>
 
 	  <para>To enable <acronym>DNSSEC</acronym> for the
 	    <systemitem class="fqdomainname">example.com</systemitem>
 	    zone depicted in previous examples, the first step is to
 	    use <application>dnssec-keygen</application> to generate
 	    the <acronym>KSK</acronym> and <acronym>ZSK</acronym> key
 	    pair.  This key pair can utilize different cryptographic
 	    algorithms.  It is recommended to use RSA/SHA256 for the
 	    keys and 2048 bits key length should be enough.  To
 	    generate the <acronym>KSK</acronym> for
 	    <systemitem class="fqdomainname">example.com</systemitem>,
 	    run</para>
 
 	  <screen>&prompt.user; <userinput>dnssec-keygen -f KSK -a RSASHA256 -b 2048 -n ZONE example.com</userinput></screen>
 
 	  <para>and to generate the <acronym>ZSK</acronym>, run</para>
 
 	  <screen>&prompt.user; <userinput>dnssec-keygen -a RSASHA256 -b 2048 -n ZONE example.com</userinput></screen>
 
 	  <para><application>dnssec-keygen</application> outputs two
 	    files, the public and the private keys in files named
 	    similar to
 	    <filename>Kexample.com.+005+nnnnn.key</filename> (public)
 	    and <filename>Kexample.com.+005+nnnnn.private</filename>
 	    (private).  The <literal>nnnnn</literal> part of the file
 	    name is a five digit key ID.  Keep track of which key ID
 	    belongs to which key.  This is especially important when
 	    having more than one key in a zone.  It is also possible
 	    to rename the keys.  For each <acronym>KSK</acronym> file
 	    do:</para>
 
 	  <screen>&prompt.user; <userinput>mv Kexample.com.+005+nnnnn.key Kexample.com.+005+nnnnn.KSK.key</userinput>
 &prompt.user; <userinput>mv Kexample.com.+005+nnnnn.private Kexample.com.+005+nnnnn.KSK.private</userinput></screen>
 
 	  <para>For the <acronym>ZSK</acronym> files, substitute
 	    <literal>KSK</literal> for <literal>ZSK</literal> as
 	    necessary.  The files can now be included in the zone
 	    file, using the <literal>$include</literal> statement.  It
 	    should look something like this:</para>
 
 	  <programlisting>$include Kexample.com.+005+nnnnn.KSK.key ; KSK
 $include Kexample.com.+005+nnnnn.ZSK.key    ; ZSK</programlisting>
 
 	  <para>Finally, sign the zone and tell
 	    <acronym>BIND</acronym> to use the signed zone file.  To
 	    sign a zone <application>dnssec-signzone</application> is
 	    used.  The command to sign the zone
 	    <systemitem class="fqdomainname">example.com</systemitem>,
 	    located in <filename>example.com.db</filename> would look
 	    similar to</para>
 
 	  <screen>&prompt.user; <userinput>dnssec-signzone -o
 	example.com -k Kexample.com.+005+nnnnn.KSK example.com.db
 	Kexample.com.+005+nnnnn.ZSK.key</userinput></screen>
 
 	  <para>The key supplied to the <option>-k</option> argument
 	    is the <acronym>KSK</acronym> and the other key file is
 	    the <acronym>ZSK</acronym> that should be used in the
 	    signing.  It is possible to supply more than one
 	    <acronym>KSK</acronym> and <acronym>ZSK</acronym>, which
 	    will result in the zone being signed with all supplied
 	    keys.  This can be needed to supply zone data signed using
 	    more than one algorithm.  The output of
 	    <application>dnssec-signzone</application> is a zone file
 	    with all <acronym>RR</acronym>s signed.  This output will
 	    end up in a file with the extension
 	    <literal>.signed</literal>, such as
 	    <filename>example.com.db.signed</filename>.  The
 	    <acronym role="Delegation Signer">DS</acronym> records
 	    will also be written to a separate file
 	    <filename>dsset-example.com</filename>.  To use this
 	    signed zone just modify the zone directive in
 	    <filename>named.conf</filename> to use
 	    <filename>example.com.db.signed</filename>.  By default,
 	    the signatures are only valid 30 days, meaning that the
 	    zone needs to be resigned in about 15 days to be sure
 	    that resolvers are not caching records with stale
 	    signatures.  It is possible to make a script and a cron
 	    job to do this.  See relevant manuals for details.</para>
 
 	  <para>Be sure to keep private keys confidential, as with all
 	    cryptographic keys.  When changing a key it is best to
 	    include the new key into the zone, while still signing
 	    with the old one, and then move over to using the new key
 	    to sign.  After these steps are done the old key can be
 	    removed from the zone.  Failure to do this might render
 	    the <acronym>DNS</acronym> data unavailable for a time,
 	    until the new key has propagated through the
 	    <acronym>DNS</acronym> hierarchy.  For more information on
 	    key rollovers and other <acronym>DNSSEC</acronym>
 	    operational issues, see <link
 	      xlink:href="http://www.ietf.org/rfc/rfc4641.txt"><acronym>RFC</acronym>
 	      4641: <acronym>DNSSEC</acronym> Operational
 	      practices</link>.</para>
 	</sect4>
 
 	<sect4>
 	  <title>Automation Using <acronym>BIND</acronym> 9.7 or
 	    Later</title>
 
 	  <para>Beginning with <acronym>BIND</acronym> version 9.7 a
 	    new feature called <emphasis>Smart Signing</emphasis> was
 	    introduced.  This feature aims to make the key management
 	    and signing process simpler by automating parts of the
 	    task.  By putting the keys into a directory called a
 	    <emphasis>key repository</emphasis>, and using the new
 	    option <literal>auto-dnssec</literal>, it is possible to
 	    create a dynamic zone which will be resigned as needed.
 	    To update this zone use
 	    <application>nsupdate</application> with the new option
 	    <option>-l</option>.  <application>rndc</application> has
 	    also grown the ability to sign zones with keys in the key
 	    repository, using the option <option>sign</option>.  To
 	    tell <acronym>BIND</acronym> to use this automatic signing
 	    and zone updating for <systemitem
 	      class="fqdomainname">example.com</systemitem>, add the
 	    following to <filename>named.conf</filename>:</para>
 
 	  <programlisting>zone example.com {
 	type master;
 	key-directory "/etc/named/keys";
 	update-policy local;
 	auto-dnssec maintain;
 	file "/etc/named/dynamic/example.com.zone";
 };</programlisting>
 
 	  <para>After making these changes, generate keys for the zone
 	    as explained in <xref linkend="dns-dnssec-auth"/>, put
 	    those keys in the key repository given as the argument to
 	    the <literal>key-directory</literal> in the zone
 	    configuration and the zone will be signed automatically.
 	    Updates to a zone configured this way must be done using
 	    <application>nsupdate</application>, which will take care
 	    of re-signing the zone with the new data added.  For
 	    further details, see <xref linkend="dns-read"/> and the
 	    <acronym>BIND</acronym> documentation.</para>
 	</sect4>
       </sect3>
 
       <sect3>
 	<title>Security</title>
 
 	<para>Although BIND is the most common implementation of
 	  <acronym>DNS</acronym>, there is always the issue of
 	  security.  Possible and exploitable security holes are
 	  sometimes found.</para>
 
 	<para>While &os; automatically drops
 	  <application>named</application> into a &man.chroot.8;
 	  environment; there are several other security mechanisms in
 	  place which could help to lure off possible
 	  <acronym>DNS</acronym> service attacks.</para>
 
 	<para>It is always good idea to read
 	  <link xlink:href="http://www.cert.org/">CERT</link>'s
 	  security advisories and to subscribe to the
 	  &a.security-notifications; to stay up to date with the
 	  current Internet and &os; security issues.</para>
 
 	<tip>
 	  <para>If a problem arises, keeping sources up to date and
 	    having a fresh build of <application>named</application>
 	    may help.</para>
 	</tip>
       </sect3>
 
       <sect3 xml:id="dns-read">
 	<title>Further Reading</title>
 
 	<para>BIND/<application>named</application> manual pages:
 	  &man.rndc.8; &man.named.8; &man.named.conf.5;
 	  &man.nsupdate.1; &man.dnssec-signzone.8;
 	  &man.dnssec-keygen.8;</para>
 
 	<itemizedlist>
 	  <listitem>
 	    <para><link
 		xlink:href="https://www.isc.org/software/bind">Official
 		ISC BIND Page</link></para>
 	  </listitem>
 
 	  <listitem>
 	    <para><link
 		xlink:href="https://www.isc.org/software/guild">Official
 		ISC BIND Forum</link></para>
 	  </listitem>
 
 	  <listitem>
 	    <para><link
 		xlink:href="http://www.oreilly.com/catalog/dns5/">O'Reilly
 		<acronym>DNS</acronym> and BIND 5th
 		Edition</link></para>
 	  </listitem>
 
 	  <listitem>
 	    <para><link
 		xlink:href="http://www.root-dnssec.org/documentation/">Root
 		<acronym>DNSSEC</acronym></link></para>
 	  </listitem>
 
 	  <listitem>
 	    <para><link
 		xlink:href="http://data.iana.org/root-anchors/draft-icann-dnssec-trust-anchor.html"><acronym>DNSSEC</acronym>
 		Trust Anchor Publication for the Root
 		Zone</link></para>
 	  </listitem>
 
 	  <listitem>
 	    <para><link
 		xlink:href="http://tools.ietf.org/html/rfc1034">RFC1034
 		- Domain Names - Concepts and Facilities</link></para>
 	  </listitem>
 
 	  <listitem>
 	    <para><link
 		xlink:href="http://tools.ietf.org/html/rfc1035">RFC1035
 		- Domain Names - Implementation and
 		Specification</link></para>
 	  </listitem>
 
 	  <listitem>
 	    <para><link
 		xlink:href="http://tools.ietf.org/html/rfc4033">RFC4033
 		- <acronym>DNS</acronym> Security Introduction and
 		Requirements</link></para>
 	  </listitem>
 
 	  <listitem>
 	    <para><link
 		xlink:href="http://tools.ietf.org/html/rfc4034">RFC4034
 		- Resource Records for the <acronym>DNS</acronym>
 		Security Extensions</link></para>
 	  </listitem>
 
 	  <listitem>
 	    <para><link
 		xlink:href="http://tools.ietf.org/html/rfc4035">RFC4035
 		- Protocol Modifications for the
 		<acronym>DNS</acronym> Security
 		Extensions</link></para>
 	  </listitem>
 
 	  <listitem>
 	    <para><link
 		xlink:href="http://tools.ietf.org/html/rfc4641">RFC4641
 		- DNSSEC Operational Practices</link></para>
 	  </listitem>
 
 	  <listitem>
 	    <para><link
 		xlink:href="http://tools.ietf.org/html/rfc5011">RFC
 		5011 - Automated Updates of <acronym>DNS</acronym>
 		Security (<acronym>DNSSEC</acronym>
 		Trust Anchors</link></para>
 	  </listitem>
 	</itemizedlist>
       </sect3>
     </sect2>
   </sect1>
 
   <sect1 xml:id="network-apache">
     <info>
       <title>Apache HTTP Server</title>
 
       <authorgroup>
 	<author>
 	  <personname>
 	    <firstname>Murray</firstname>
 	    <surname>Stokely</surname>
 	  </personname>
 	  <contrib>Contributed by </contrib>
 	</author>
       </authorgroup>
     </info>
 
     <indexterm><primary>web servers</primary>
       <secondary>setting up</secondary></indexterm>
     <indexterm><primary>Apache</primary></indexterm>
 
     <para>The open source
       <application>Apache HTTP Server</application> is the most widely
       used web server.  &os; does not install this web server by
       default, but it can be installed from the
       <package>www/apache24</package> package or port.</para>
 
     <para>This section summarizes how to configure and start version
       2.<replaceable>x</replaceable> of the <application>Apache HTTP
 	Server</application> on &os;.  For more detailed information
       about <application>Apache</application>&nbsp;2.X and its
       configuration directives, refer to <link
 	xlink:href="http://httpd.apache.org/">httpd.apache.org</link>.</para>
 
     <sect2>
       <title>Configuring and Starting Apache</title>
 
       <indexterm><primary>Apache</primary>
 	<secondary>configuration file</secondary></indexterm>
 
       <para>In &os;, the main <application>Apache HTTP
 	  Server</application> configuration file is installed as
 	<filename>/usr/local/etc/apache2<replaceable>x</replaceable>/httpd.conf</filename>,
 	where <replaceable>x</replaceable> represents the version
 	number.  This <acronym>ASCII</acronym> text file begins
 	comment lines with a <literal>#</literal>.  The most
 	frequently modified directives are:</para>
 
       <variablelist>
 	<varlistentry>
 	  <term><literal>ServerRoot "/usr/local"</literal></term>
 
 	  <listitem>
 	    <para>Specifies the default directory hierarchy for the
 	      <application>Apache</application> installation.
 	      Binaries are stored in the <filename>bin</filename> and
 	      <filename>sbin</filename> subdirectories of the server
 	      root and configuration files are stored in the <filename
 		>etc/apache2<replaceable>x</replaceable></filename>
 	      subdirectory.</para>
 	  </listitem>
 	</varlistentry>
 
 	<varlistentry>
 	  <term><literal>ServerAdmin you@example.com</literal></term>
 
 	  <listitem>
 	    <para>Change this to the email address to receive problems
 	      with the server.  This address also appears on some
 	      server-generated pages, such as error documents.</para>
 	  </listitem>
 	</varlistentry>
 
 	<varlistentry>
 	  <term><literal>ServerName
 	      www.example.com:80</literal></term>
 
 	  <listitem>
 	    <para>Allows an administrator to set a hostname which is
 	      sent back to clients for the server.  For example,
 	      <systemitem>www</systemitem> can be used instead of the
 	      actual hostname.  If the system does not have a
 	      registered <acronym>DNS</acronym> name, enter its
 	      <acronym>IP</acronym> address instead.  If the server
 	      will listen on an alternate report, change
 	      <literal>80</literal> to the alternate port
 	      number.</para>
 	  </listitem>
 	</varlistentry>
 
 	<varlistentry>
 	  <term><literal>DocumentRoot
 	    "/usr/local/www/apache2<replaceable>x</replaceable>/data"</literal></term>
 
 	  <listitem>
 	    <para>The directory where documents will be served from.
 	      By default, all requests are taken from this directory,
 	      but symbolic links and aliases may be used to point to
 	      other locations.</para>
 	  </listitem>
 	</varlistentry>
       </variablelist>
 
       <para>It is always a good idea to make a backup copy of the
 	default <application>Apache</application> configuration file
 	before making changes.  When the configuration of
 	<application>Apache</application> is complete, save the file
 	and verify the configuration using
 	<command>apachectl</command>.  Running <command>apachectl
 	  configtest</command> should return <literal>Syntax
 	  OK</literal>.</para>
 
       <indexterm><primary>Apache</primary>
 	<secondary>starting or stopping</secondary></indexterm>
 
       <para>To launch <application>Apache</application> at system
 	startup, add the following line to
 	<filename>/etc/rc.conf</filename>:</para>
 
       <programlisting>apache<replaceable>24</replaceable>_enable="YES"</programlisting>
 
       <para>If <application>Apache</application> should be started
 	with non-default options, the following line may be added to
 	<filename>/etc/rc.conf</filename> to specify the needed
 	flags:</para>
 
       <programlisting>apache<replaceable>24</replaceable>_flags=""</programlisting>
 
       <para>If <application>apachectl</application> does not report
 	configuration errors, start <command>httpd</command>
 	now:</para>
 
       <screen>&prompt.root; <userinput>service apache<replaceable>24</replaceable> start</userinput></screen>
 
       <para>The <command>httpd</command> service can be tested by
 	entering
 	<literal>http://<replaceable>localhost</replaceable></literal>
 	in a web browser, replacing
 	<replaceable>localhost</replaceable> with the fully-qualified
 	domain name of the machine running <command>httpd</command>.
 	The default web page that is displayed is
 	<filename>/usr/local/www/apache<replaceable>24</replaceable>/data/index.html</filename>.</para>
 
       <para>The <application>Apache</application> configuration can be
 	tested for errors after making subsequent configuration
 	changes while <command>httpd</command> is running using the
 	following command:</para>
 
       <screen>&prompt.root; <userinput>service apache<replaceable>24</replaceable> configtest</userinput></screen>
 
       <note>
 	<para>It is important to note that
 	  <literal>configtest</literal> is not an &man.rc.8; standard,
 	  and should not be expected to work for all startup
 	  scripts.</para>
       </note>
     </sect2>
 
     <sect2>
       <title>Virtual Hosting</title>
 
       <para>Virtual hosting allows multiple websites to run on one
 	<application>Apache</application> server.  The virtual hosts
 	can be <firstterm>IP-based</firstterm> or
 	<firstterm>name-based</firstterm>.
 	<acronym>IP</acronym>-based virtual hosting uses a different
 	<acronym>IP</acronym> address for each website.  Name-based
 	virtual hosting uses the clients HTTP/1.1 headers to figure
 	out the hostname, which allows the websites to share the same
 	<acronym>IP</acronym> address.</para>
 
       <para>To setup <application>Apache</application> to use
 	name-based virtual hosting, add a
 	<literal>VirtualHost</literal> block for each website.  For
 	example, for the webserver named <systemitem
 	  class="fqdomainname">www.domain.tld</systemitem> with a
 	virtual domain of <systemitem
 	  class="fqdomainname">www.someotherdomain.tld</systemitem>,
 	add the following entries to
 	<filename>httpd.conf</filename>:</para>
 
       <programlisting>&lt;VirtualHost *&gt;
     ServerName <replaceable>www.domain.tld</replaceable>
     DocumentRoot <replaceable>/www/domain.tld</replaceable>
 &lt;/VirtualHost&gt;
 
 &lt;VirtualHost *&gt;
     ServerName <replaceable>www.someotherdomain.tld</replaceable>
     DocumentRoot <replaceable>/www/someotherdomain.tld</replaceable>
 &lt;/VirtualHost&gt;</programlisting>
 
       <para>For each virtual host, replace the values for
 	<literal>ServerName</literal> and
 	<literal>DocumentRoot</literal> with the values to be
 	used.</para>
 
       <para>For more information about setting up virtual hosts,
 	consult the official <application>Apache</application>
 	documentation at: <uri
 	  xlink:href="http://httpd.apache.org/docs/vhosts/">http://httpd.apache.org/docs/vhosts/</uri>.</para>
     </sect2>
 
     <sect2>
       <title>Apache Modules</title>
 
       <indexterm><primary>Apache</primary>
 	<secondary>modules</secondary></indexterm>
 
       <para><application>Apache</application> uses modules to augment
 	the functionality provided by the basic server.  Refer to <uri
 	  xlink:href="http://httpd.apache.org/docs/current/mod/">http://httpd.apache.org/docs/current/mod/</uri>
 	for a complete listing of and the configuration details for
 	the available modules.</para>
 
       <para>In &os;, some modules can be compiled with the
 	<package>www/apache24</package> port.  Type <command>make
 	  config</command> within
 	<filename>/usr/ports/www/apache24</filename> to see which
 	modules are available and which are enabled by default.  If
 	the module is not compiled with the port, the &os; Ports
 	Collection provides an easy way to install many modules.  This
 	section describes three of the most commonly used
 	modules.</para>
 
       <sect3>
 	<title><filename>mod_ssl</filename></title>
 
 	<indexterm>
 	  <primary>web servers</primary>
 	  <secondary>secure</secondary>
 	</indexterm>
 	<indexterm><primary>SSL</primary></indexterm>
 	<indexterm><primary>cryptography</primary></indexterm>
 
 	<para>The <filename>mod_ssl</filename> module uses the
 	  <application>OpenSSL</application> library to provide strong
 	  cryptography via the Secure Sockets Layer
 	  (<acronym>SSLv3</acronym>) and Transport Layer Security
 	  (<acronym>TLSv1</acronym>) protocols.  This module provides
 	  everything necessary to request a signed certificate from a
 	  trusted certificate signing authority to run a secure web
 	  server on &os;.</para>
 
 	<para>In &os;, <filename>mod_ssl</filename> module is enabled
 	  by default in both the package and the port.  The available
 	  configuration directives are explained at <uri
 	    xlink:href="http://httpd.apache.org/docs/current/mod/mod_ssl.html">http://httpd.apache.org/docs/current/mod/mod_ssl.html</uri>.</para>
       </sect3>
 
       <sect3>
 	<title><filename>mod_perl</filename></title>
 
 	<indexterm>
 	  <primary>mod_perl</primary>
 	  <secondary>Perl</secondary>
 	</indexterm>
 
 	<para>The
 	  <filename>mod_perl</filename> module makes it possible to
 	  write <application>Apache</application> modules in
 	  <application>Perl</application>.  In addition, the
 	  persistent interpreter embedded in the server avoids the
 	  overhead of starting an external interpreter and the penalty
 	  of <application>Perl</application> start-up time.</para>
 
 	<para>The <filename>mod_perl</filename> can be installed using
 	  the <package>www/mod_perl2</package> package or port.
 	  Documentation for using this module can be found at <uri
 	    xlink:href="http://perl.apache.org/docs/2.0/index.html">http://perl.apache.org/docs/2.0/index.html</uri>.</para>
       </sect3>
 
       <sect3>
 	<info>
 	  <title><filename>mod_php</filename></title>
 
 	  <authorgroup>
 	    <author>
 	      <personname>
 		<firstname>Tom</firstname>
 		<surname>Rhodes</surname>
 	      </personname>
 	      <contrib>Written by </contrib>
 	    </author>
 	  </authorgroup>
 	</info>
 
 	<indexterm>
 	  <primary>mod_php</primary>
 	  <secondary>PHP</secondary>
 	</indexterm>
 
 	<para><firstterm>PHP: Hypertext Preprocessor</firstterm>
 	  (<acronym>PHP</acronym>) is a general-purpose scripting
 	  language that is especially suited for web development.
 	  Capable of being embedded into <acronym>HTML</acronym>, its
 	  syntax draws upon <application>C</application>, &java;, and
 	  <application>Perl</application> with the intention of
 	  allowing web developers to write dynamically generated
 	  webpages quickly.</para>
 
 	<para>To gain support for <acronym>PHP</acronym>5 for the
 	  <application>Apache</application> web server, install the
 	  <package>www/mod_php56</package> package or port.  This will
 	  install and configure the modules required to support
 	  dynamic <acronym>PHP</acronym> applications.  The
 	  installation will automatically add this line to
 	  <filename>/usr/local/etc/apache2<replaceable>4</replaceable>/httpd.conf</filename>:</para>
 
 	<programlisting>LoadModule php5_module        libexec/apache24/libphp5.so</programlisting>
 
 <!--
 I do not think this is still needed
 AddModule mod_php5.c
     &lt;IfModule mod_php5.c&gt;
         DirectoryIndex index.php index.html
     &lt;/IfModule&gt;
     &lt;IfModule mod_php5.c&gt;
         AddType application/x-httpd-php .php
         AddType application/x-httpd-php-source .phps
     &lt;/IfModule&gt;</programlisting>
 
     -->
 
 	<para>Then, perform a graceful restart to load the
 	  <acronym>PHP</acronym> module:</para>
 
 	<screen>&prompt.root; <userinput>apachectl graceful</userinput></screen>
 
 	<para>The <acronym>PHP</acronym> support provided by
 	  <package>www/mod_php56</package> is limited.  Additional
 	  support can be installed using the
 	  <package>lang/php56-extensions</package> port which provides
 	  a menu driven interface to the available
 	  <acronym>PHP</acronym> extensions.</para>
 
 	<para>Alternatively, individual extensions can be installed
 	  using the appropriate port.  For instance, to add
 	  <acronym>PHP</acronym> support for the
 	  <application>MySQL</application> database server, install
 	  <package>databases/php56-mysql</package>.</para>
 
 	<para>After installing an extension, the
 	  <application>Apache</application> server must be reloaded to
 	  pick up the new configuration changes:</para>
 
 	<screen>&prompt.root; <userinput>apachectl graceful</userinput></screen>
       </sect3>
     </sect2>
 
     <sect2>
       <title>Dynamic Websites</title>
 
       <indexterm>
 	<primary>web servers</primary>
 	<secondary>dynamic</secondary>
       </indexterm>
 
       <para>In addition to <application>mod_perl</application> and
 	<application>mod_php</application>, other languages are
 	available for creating dynamic web content.  These include
 	<application>Django</application> and
 	<application>Ruby on Rails</application>.</para>
 
       <sect3>
 	<title>Django</title>
 
 	<indexterm><primary>Python</primary></indexterm>
 	<indexterm><primary>Django</primary></indexterm>
 
 	<para><application>Django</application> is a BSD-licensed
 	  framework designed to allow developers to write high
 	  performance, elegant web applications quickly.  It provides
 	  an object-relational mapper so that data types are developed
 	  as <application>Python</application> objects.  A rich
 	  dynamic database-access <acronym>API</acronym> is provided
 	  for those objects without the developer ever having to write
 	  <acronym>SQL</acronym>.  It also provides an extensible
 	  template system so that the logic of the application is
 	  separated from the <acronym>HTML</acronym>
 	  presentation.</para>
 
 	<para>Django depends on <filename>mod_python</filename>, and
 	  an <acronym>SQL</acronym> database engine.  In &os;, the
 	  <package>www/py-django</package> port automatically installs
 	  <filename>mod_python</filename> and supports the
 	  <application>PostgreSQL</application>,
 	  <application>MySQL</application>, or
 	  <application>SQLite</application> databases, with the
 	  default being <application>SQLite</application>.  To change
 	  the database engine, type <command>make config</command>
 	  within <filename>/usr/ports/www/py-django</filename>, then
 	  install the port.</para>
 
 	<para>Once <application>Django</application> is installed, the
 	  application will need a project directory along with the
 	  <application>Apache</application> configuration in order to
 	  use the embedded <application>Python</application>
 	  interpreter.  This interpreter is used to call the
 	  application for specific <acronym>URL</acronym>s on the
 	  site.</para>
 
 	<para>To configure <application>Apache</application> to pass
 	  requests for certain <acronym>URL</acronym>s to the web
 	  application, add the following to
 	  <filename>httpd.conf</filename>, specifying the full path to
 	  the project directory:</para>
 
 	<programlisting>&lt;Location "/"&gt;
     SetHandler python-program
     PythonPath "['<replaceable>/dir/to/the/django/packages/</replaceable>'] + sys.path"
     PythonHandler django.core.handlers.modpython
     SetEnv DJANGO_SETTINGS_MODULE mysite.settings
     PythonAutoReload On
     PythonDebug On
 &lt;/Location&gt;</programlisting>
 
 	<para>Refer to <uri
 	    xlink:href="https://docs.djangoproject.com">https://docs.djangoproject.com</uri>
 	  for more information on how to use
 	  <application>Django</application>.</para>
       </sect3>
 
       <sect3>
 	<title>Ruby on Rails</title>
 
 	<indexterm><primary>Ruby on Rails</primary></indexterm>
 
 	<para><application>Ruby on Rails</application> is another open
 	  source web framework that provides a full development stack.
 	  It is optimized to make web developers more productive and
 	  capable of writing powerful applications quickly.  On &os;,
 	  it can be installed using the
 	  <package>www/rubygem-rails</package> package or port.</para>
 
 	<para>Refer to <uri
 	    xlink:href="http://guides.rubyonrails.org">http://guides.rubyonrails.org</uri>
 	  for more information on how to use <application>Ruby on
 	    Rails</application>.</para>
       </sect3>
     </sect2>
   </sect1>
 
   <sect1 xml:id="network-ftp">
     <!--
     <sect1info>
       <authorgroup>
 	<author>
 	  <firstname>Murray</firstname>
 	  <surname>Stokely</surname>
 	  <contrib>Contributed by </contrib>
 	</author>
       </authorgroup>
     </sect1info>
     -->
     <title>File Transfer Protocol (<acronym>FTP</acronym>)</title>
 
     <indexterm><primary><acronym>FTP</acronym>
 	servers</primary></indexterm>
 
     <para>The File Transfer Protocol (<acronym>FTP</acronym>) provides
       users with a simple way to transfer files to and from an
       <acronym>FTP</acronym> server.  &os; includes
       <acronym>FTP</acronym> server software,
       <application>ftpd</application>, in the base system.</para>
 
     <para>&os; provides several configuration files for controlling
       access to the <acronym>FTP</acronym> server.  This section
       summarizes these files.  Refer to &man.ftpd.8; for more details
       about the built-in <acronym>FTP</acronym> server.</para>
 
     <sect2>
       <title>Configuration</title>
 
       <para>The most important configuration step is deciding which
 	accounts will be allowed access to the <acronym>FTP</acronym>
 	server.  A &os; system has a number of system accounts which
 	should not be allowed <acronym>FTP</acronym> access.  The list
 	of users disallowed any <acronym>FTP</acronym> access can be
 	found in <filename>/etc/ftpusers</filename>.  By default, it
 	includes system accounts.  Additional users that should not be
 	allowed access to <acronym>FTP</acronym> can be added.</para>
 
       <para>In some cases it may be desirable to restrict the access
 	of some users without preventing them completely from using
 	<acronym>FTP</acronym>.  This can be accomplished be creating
 	<filename>/etc/ftpchroot</filename> as described in
 	&man.ftpchroot.5;.  This file lists users and groups subject
 	to <acronym>FTP</acronym> access restrictions.</para>
 
       <indexterm>
 	<primary><acronym>FTP</acronym></primary>
 	<secondary>anonymous</secondary>
       </indexterm>
 
       <para>To enable anonymous <acronym>FTP</acronym> access to the
 	server, create a user named <systemitem
 	  class="username">ftp</systemitem> on the &os; system.  Users
 	will then be able to log on to the
 	<acronym>FTP</acronym> server with a username of
 	<systemitem class="username">ftp</systemitem> or <systemitem
 	  class="username">anonymous</systemitem>.  When prompted for
 	the password, any input will be accepted, but by convention,
 	an email address should be used as the password.  The
 	<acronym>FTP</acronym> server will call &man.chroot.2; when an
 	anonymous user logs in, to restrict access to only the home
 	directory of the <systemitem
 	  class="username">ftp</systemitem> user.</para>
 
       <para>There are two text files that can be created to specify
 	welcome messages to be displayed to <acronym>FTP</acronym>
 	clients.  The contents of
 	<filename>/etc/ftpwelcome</filename> will be displayed to
 	users before they reach the login prompt.  After a successful
 	login, the contents of
 	<filename>/etc/ftpmotd</filename> will be displayed.  Note
 	that the path to this file is relative to the login
 	environment, so the contents of
 	<filename>~ftp/etc/ftpmotd</filename> would be displayed for
 	anonymous users.</para>
 
       <para>Once the <acronym>FTP</acronym> server has been
 	configured, set the appropriate variable in
 	<filename>/etc/rc.conf</filename> to start the service during
 	boot:</para>
 
       <programlisting>ftpd_enable="YES"</programlisting>
 
       <para>To start the service now:</para>
 
       <screen>&prompt.root; <userinput>service ftpd start</userinput></screen>
 
       <para>Test the connection to the <acronym>FTP</acronym> server
 	by typing:</para>
 
       <screen>&prompt.user; <userinput>ftp localhost</userinput></screen>
 
       <indexterm><primary>syslog</primary></indexterm>
       <indexterm><primary>log files</primary>
 	<secondary><acronym>FTP</acronym></secondary></indexterm>
 
       <para>The <application>ftpd</application> daemon uses
 	&man.syslog.3; to log messages.  By default, the system log
 	daemon will write messages related to <acronym>FTP</acronym>
 	in <filename>/var/log/xferlog</filename>.  The location of
 	the <acronym>FTP</acronym> log can be modified by changing the
 	following line in
 	<filename>/etc/syslog.conf</filename>:</para>
 
       <programlisting>ftp.info      /var/log/xferlog</programlisting>
 
       <indexterm>
 	<primary><acronym>FTP</acronym></primary>
 	<secondary>anonymous</secondary>
       </indexterm>
 
       <note>
 	<para>Be aware of the potential problems involved with running
 	  an anonymous <acronym>FTP</acronym> server.  In particular,
 	  think twice about allowing anonymous users to upload files.
 	  It may turn out that the <acronym>FTP</acronym> site becomes
 	  a forum for the trade of unlicensed commercial software or
 	  worse.  If anonymous <acronym>FTP</acronym> uploads are
 	  required, then verify the permissions so that these files
 	  cannot be read by other anonymous users until they have
 	  been reviewed by an administrator.</para>
       </note>
     </sect2>
   </sect1>
 
   <sect1 xml:id="network-samba">
     <!--
     <sect1info>
       <authorgroup>
 	<author>
 	  <firstname>Murray</firstname>
 	  <surname>Stokely</surname>
 	  <contrib>Contributed by </contrib>
 	</author>
       </authorgroup>
     </sect1info>
     -->
     <title>File and Print Services for &microsoft.windows; Clients
       (Samba)</title>
 
     <indexterm><primary>Samba server</primary></indexterm>
     <indexterm><primary>Microsoft Windows</primary></indexterm>
     <indexterm>
       <primary>file server</primary>
       <secondary>Windows clients</secondary>
     </indexterm>
     <indexterm>
       <primary>print server</primary>
       <secondary>Windows clients</secondary>
     </indexterm>
 
     <para><application>Samba</application> is a popular open source
       software package that provides file and print services using the
       <acronym>SMB/CIFS</acronym> protocol.  This protocol is built
       into &microsoft.windows; systems.  It can be added to
       non-&microsoft.windows; systems by installing the
       <application>Samba</application> client libraries.  The protocol
       allows clients to access shared data and printers.  These shares
       can be mapped as a local disk drive and shared printers can be
       used as if they were local printers.</para>
 
     <para>On &os;, the <application>Samba</application> client
       libraries can be installed using the
       <package>net/samba-smbclient</package> port or package.  The
       client provides the ability for a &os; system to access
       <acronym>SMB/CIFS</acronym> shares in a &microsoft.windows;
       network.</para>
 
     <para>A &os; system can also be configured to act as a
       <application>Samba</application> server by installing the
       <package>net/samba43</package> port or package.  This allows the
       administrator to create <acronym>SMB</acronym>/<acronym>CIFS</acronym>shares on
       the &os; system which can be accessed by clients running
       &microsoft.windows; or the <application>Samba</application>
       client libraries.</para>
 
     <sect2>
       <title>Server Configuration</title>
 
       <para><application>Samba</application> is configured in
 	<filename>/usr/local/etc/smb4.conf</filename>.  This file must
 	be created before <application>Samba</application>
 	can be used.</para>
 
       <para>A simple <filename>smb4.conf</filename> to share
 	directories and printers  with &windows; clients in a
 	workgroup is shown here.  For more complex setups
 	involving LDAP or Active Directory, it is easier to use
 	&man.samba-tool.8; to create the initial
 	<filename>smb4.conf</filename>.</para>
 
       <programlisting>[global]
 workgroup = WORKGROUP
 server string = Samba Server Version %v
 netbios name = ExampleMachine
 wins support = Yes
 security = user
 passdb backend = tdbsam
 
 # Example: share /usr/src accessible only to 'developer' user
 [src]
 path = /usr/src
 valid users = developer
 writable  = yes
 browsable = yes
 read only = no
 guest ok = no
 public = no
 create mask = 0666
 directory mask = 0755</programlisting>
 
       <sect3>
 	<title>Global Settings</title>
 
 	<para>Settings that describe the network are added in
 	  <filename>/usr/local/etc/smb4.conf</filename>:</para>
 
 	<variablelist>
 	  <varlistentry>
 	    <term><literal>workgroup</literal></term>
 
 	    <listitem>
 	      <para>The name of the workgroup to be served.</para>
 	    </listitem>
 	  </varlistentry>
 
 	  <varlistentry>
 	    <term><literal>netbios name</literal></term>
 
 	    <listitem>
 	      <para>The NetBIOS name by which a
 		<application>Samba</application> server is known.  By
 		default, it is the same as the first component of the
 		host's <acronym>DNS</acronym> name.</para>
 	    </listitem>
 	  </varlistentry>
 
 	  <varlistentry>
 	    <term><literal>server string</literal></term>
 
 	    <listitem>
 	      <para>The string that will be displayed in the output of
 		<command>net view</command> and some other
 		networking tools that seek to display descriptive text
 		about the server.</para>
 	    </listitem>
 	  </varlistentry>
 
 	  <varlistentry>
 	    <term><literal>wins support</literal></term>
 
 	    <listitem>
 	      <para>Whether <application>Samba</application> will
 		act as a <acronym>WINS</acronym> server.  Do not
 		enable support for <acronym>WINS</acronym> on more than
 		one server on the network.</para>
 	    </listitem>
 	  </varlistentry>
 	</variablelist>
       </sect3>
 
       <sect3>
 	<title>Security Settings</title>
 
 	<para>The most important settings in
 	  <filename>/usr/local/etc/smb4.conf</filename> are the
 	  security model and the backend password format.  These
 	  directives control the options:</para>
 
 	<variablelist>
 	  <varlistentry>
 	    <term><literal>security</literal></term>
 
 	    <listitem>
 	      <para>The most common settings are
 		<literal>security = share</literal> and
 		<literal>security = user</literal>.  If the clients
 		use usernames that are the same as their usernames on
 		the &os; machine, user level security should be
 		used.  This is the default security policy and it
 		requires clients to first log on before they can
 		access shared resources.</para>
 
 	      <para>In share level security, clients do not need to
 		log onto the server with a valid username and password
 		before attempting to connect to a shared resource.
 		This was the default security model for older versions
 		of <application>Samba</application>.</para>
 	    </listitem>
 	  </varlistentry>
 
 	  <varlistentry>
 	    <term><literal>passdb backend</literal></term>
 
 	    <listitem>
 	      <indexterm><primary>NIS+</primary></indexterm>
 	      <indexterm><primary>LDAP</primary></indexterm>
 	      <indexterm><primary>SQL database</primary></indexterm>
 
 	      <para><application>Samba</application> has several
 		different backend authentication models.  Clients may
 		be authenticated with LDAP, NIS+, an SQL database,
 		or a modified password file.  The recommended
 		authentication method, <literal>tdbsam</literal>,
 		is ideal for simple networks and is covered here.
 		For larger or more complex networks,
 		<literal>ldapsam</literal> is recommended.
 		<literal>smbpasswd</literal>
 		was the former default and is now obsolete.</para>
 	    </listitem>
 	  </varlistentry>
 	</variablelist>
 
       </sect3>
 
       <sect3>
 	<title><application>Samba</application> Users</title>
 
 	<para>&os; user accounts must be mapped to the
 	  <literal>SambaSAMAccount</literal> database for
 	  &windows; clients to access the share.
 	  Map existing &os; user accounts using
 	  &man.pdbedit.8;:</para>
 
 	<screen>&prompt.root; <userinput>pdbedit -a <replaceable>username</replaceable></userinput></screen>
 
 	<para>This section has only mentioned the most commonly used
 	  settings.  Refer to the <link
 	    xlink:href="http://www.samba.org/samba/docs/man/Samba-HOWTO-Collection/">Official
 	    Samba HOWTO</link> for additional information about the
 	  available configuration options.</para>
       </sect3>
     </sect2>
 
     <sect2>
       <title>Starting <application>Samba</application></title>
 
       <para>To enable <application>Samba</application> at boot time,
 	add the following line to
 	<filename>/etc/rc.conf</filename>:</para>
 
       <programlisting>samba_enable="YES"</programlisting>
 
-      <para>To enable Samba4 use:</para>
+      <para>To enable Samba4, use:</para>
       <programlisting>samba_server_enable="YES"</programlisting>
 
       <para>To start <application>Samba</application> now:</para>
 
       <screen>&prompt.root; <userinput>service samba start</userinput>
 Starting SAMBA: removing stale tdbs :
 Starting nmbd.
 Starting smbd.</screen>
 
       <para><application>Samba</application> consists of three
 	separate daemons.  Both the <application>nmbd</application>
 	and <application>smbd</application> daemons are started by
 	<varname>samba_enable</varname>.  If winbind name resolution
 	is also required, set:</para>
 
 	<programlisting>winbindd_enable="YES"</programlisting>
 
       <para><application>Samba</application> can be stopped at any
 	time by typing:</para>
 
       <screen>&prompt.root; <userinput>service samba stop</userinput></screen>
 
       <para><application>Samba</application> is a complex software
 	suite with functionality that allows broad integration with
 	&microsoft.windows; networks.  For more information about
 	functionality beyond the basic configuration described here,
 	refer to <uri
 	  xlink:href="http://www.samba.org">http://www.samba.org</uri>.</para>
     </sect2>
   </sect1>
 
   <sect1 xml:id="network-ntp">
     <!--
     <sect1info>
       <authorgroup>
 	<author>
 	  <firstname>Tom</firstname>
 	  <surname>Hukins</surname>
 	  <contrib>Contributed by </contrib>
 	</author>
       </authorgroup>
     </sect1info>
     -->
     <title>Clock Synchronization with NTP</title>
 
     <indexterm><primary>NTP</primary>
       <secondary>ntpd</secondary>
     </indexterm>
 
     <para>Over time, a computer's clock is prone to drift.   This is
       problematic as many network services require the computers on a
       network to share the same accurate time.  Accurate time is also
       needed to ensure that file timestamps stay consistent.  The
       Network Time Protocol (<acronym>NTP</acronym>) is one way to
       provide clock accuracy in a network.</para>
 
     <para>&os; includes &man.ntpd.8; which can be configured to query
       other <acronym>NTP</acronym> servers in order to synchronize the
       clock on that machine or to provide time services to other
       computers in the network.  The servers which are queried can be
       local to the network or provided by an <acronym>ISP</acronym>.
       In addition, an <link
 	xlink:href="http://support.ntp.org/bin/view/Servers/WebHome">online
 	list of publicly accessible <acronym>NTP</acronym>
       servers</link> is available.  When choosing a public
       <acronym>NTP</acronym> server, select one that is geographically
       close and review its usage policy.</para>
 
     <para>Choosing several <acronym>NTP</acronym> servers is
       recommended in case one of the servers becomes unreachable or
       its clock proves unreliable.  As <application>ntpd</application>
       receives responses, it favors reliable servers over the less
       reliable ones.</para>
 
     <para>This section describes how to configure
       <application>ntpd</application> on &os;.  Further documentation
       can be found in <filename>/usr/share/doc/ntp/</filename> in HTML
       format.</para>
 
     <sect2>
       <title><acronym>NTP</acronym> Configuration</title>
 
       <indexterm><primary>NTP</primary>
 	<secondary>ntp.conf</secondary>
       </indexterm>
 
       <para>On &os;, the built-in <application>ntpd</application> can
 	be used to synchronize a system's clock.  To enable
 	<application>ntpd</application> at boot time, add
 	<literal>ntpd_enable="YES"</literal> to
 	<filename>/etc/rc.conf</filename>.  Additional variables can
 	be specified in <filename>/etc/rc.conf</filename>.  Refer to
 	&man.rc.conf.5; and &man.ntpd.8; for
 	details.</para>
 
       <para>This application reads <filename>/etc/ntp.conf</filename>
 	to determine which <acronym>NTP</acronym> servers to query.
 	Here is a simple example of an
 	<filename>/etc/ntp.conf</filename>:</para>
 
       <example>
 	<title> Sample <filename>/etc/ntp.conf</filename></title>
 
 	<programlisting>server ntplocal.example.com prefer
 server timeserver.example.org
 server ntp2a.example.net
 
 driftfile /var/db/ntp.drift</programlisting>
       </example>
 
       <para>The format of this file is described in &man.ntp.conf.5;.
 	The <literal>server</literal> option specifies which servers
 	to query, with one server listed on each line.  If a server
 	entry includes <literal>prefer</literal>, that server is
 	preferred over other servers.  A response from a preferred
 	server will be discarded if it differs significantly from
 	other servers' responses; otherwise it will be used.  The
 	<literal>prefer</literal> argument should only be used for
 	<acronym>NTP</acronym> servers that are known to be highly
 	accurate, such as those with special time monitoring
 	hardware.</para>
 
       <para>The <literal>driftfile</literal> entry specifies which
 	file is used to store the system clock's frequency offset.
 	<application>ntpd</application> uses this to automatically
 	compensate for the clock's natural drift, allowing it to
 	maintain a reasonably correct setting even if it is cut off
 	from all external time sources for a period of time.  This
 	file also stores information about previous responses
 	from <acronym>NTP</acronym> servers.  Since this file contains
 	internal information for <acronym>NTP</acronym>, it should not
 	be modified.</para>
 
       <para>By default, an <acronym>NTP</acronym> server is accessible
 	to any network host.  The <literal>restrict</literal> option
 	in <filename>/etc/ntp.conf</filename> can be used to control
 	which systems can access the server.  For example, to deny all
 	machines from accessing the <acronym>NTP</acronym> server, add
 	the following line to
 	<filename>/etc/ntp.conf</filename>:</para>
 
       <programlisting>restrict default ignore</programlisting>
 
       <note>
 	<para>This will also prevent access from other
 	  <acronym>NTP</acronym> servers.  If there is a need to
 	  synchronize with an external <acronym>NTP</acronym> server,
 	  allow only that specific server.  Refer to &man.ntp.conf.5;
 	  for more information.</para>
       </note>
 
       <para>To allow machines within the network to synchronize their
 	clocks with the server, but ensure they are not allowed to
 	configure the server or be used as peers to synchronize
 	against, instead use:</para>
 
       <programlisting>restrict 192.168.1.0 mask 255.255.255.0 nomodify notrap</programlisting>
 
       <para>where <systemitem
 	  class="ipaddress">192.168.1.0</systemitem> is the local
 	network address and <systemitem
 	  class="netmask">255.255.255.0</systemitem> is the network's
 	subnet mask.</para>
 
       <para>Multiple <literal>restrict</literal> entries are
 	supported.  For more details, refer to the <literal>Access
 	  Control Support</literal> subsection of
 	&man.ntp.conf.5;.</para>
 
       <para>Once <literal>ntpd_enable="YES"</literal> has been added
 	to <filename>/etc/rc.conf</filename>,
 	<application>ntpd</application> can be started now without
 	rebooting the system by typing:</para>
 
       <screen>&prompt.root; <userinput>service ntpd start</userinput></screen>
     </sect2>
 
     <sect2>
       <title>Using <acronym>NTP</acronym> with a
 	<acronym>PPP</acronym> Connection</title>
 
       <para><application>ntpd</application> does not need a permanent
 	connection to the Internet to function properly.  However, if
 	a <acronym>PPP</acronym> connection is configured to dial out
 	on demand, <acronym>NTP</acronym> traffic should be prevented
 	from triggering a dial out or keeping the connection alive.
 	This can be configured with <literal>filter</literal>
 	directives in <filename>/etc/ppp/ppp.conf</filename>.  For
 	example:</para>
 
       <programlisting> set filter dial 0 deny udp src eq 123
  # Prevent NTP traffic from initiating dial out
  set filter dial 1 permit 0 0
  set filter alive 0 deny udp src eq 123
  # Prevent incoming NTP traffic from keeping the connection open
  set filter alive 1 deny udp dst eq 123
  # Prevent outgoing NTP traffic from keeping the connection open
  set filter alive 2 permit 0/0 0/0</programlisting>
 
       <para>For more details, refer to the
 	<literal>PACKET FILTERING</literal> section in &man.ppp.8; and
 	the examples in
 	<filename>/usr/share/examples/ppp/</filename>.</para>
 
       <note>
 	<para>Some Internet access providers block low-numbered ports,
 	  preventing NTP from functioning since replies never reach
 	  the machine.</para>
       </note>
     </sect2>
   </sect1>
 
   <sect1 xml:id="network-iscsi">
     <!--
     <sect1info>
       <authorgroup>
 	<author>
 	  <firstname>Edward Tomasz</firstname>
 	  <surname>Napierala</surname>
 	</author>
       </authorgroup>
     </sect1info>
           -->
 
     <title><acronym>iSCSI</acronym> Initiator and Target
       Configuration</title>
 
     <para><acronym>iSCSI</acronym> is a way to share storage over a
       network.  Unlike <acronym>NFS</acronym>, which works at the file
       system level, <acronym>iSCSI</acronym> works at the block device
       level.</para>
 
     <para>In <acronym>iSCSI</acronym> terminology, the system that
       shares the storage is known as the <emphasis>target</emphasis>.
       The storage can be a physical disk, or an area representing
       multiple disks or a portion of a physical disk.  For example, if
       the disk(s) are formatted with <acronym>ZFS</acronym>, a zvol
       can be created to use as the <acronym>iSCSI</acronym>
       storage.</para>
 
     <para>The clients which access the <acronym>iSCSI</acronym>
       storage are called <emphasis>initiators</emphasis>.  To
       initiators, the storage available through
       <acronym>iSCSI</acronym> appears as a raw, unformatted disk
       known as a <acronym>LUN</acronym>.  Device nodes for the disk
       appear in <filename>/dev/</filename> and the device must be
       separately formatted and mounted.</para>
 
     <para>Beginning with 10.0-RELEASE, &os; provides a native,
       kernel-based <acronym>iSCSI</acronym> target and initiator.
       This section describes how to configure a &os; system as a
       target or an initiator.</para>
 
     <sect2 xml:id="network-iscsi-target">
       <title>Configuring an <acronym>iSCSI</acronym> Target</title>
 
       <note>
 	<para>The native <acronym>iSCSI</acronym> target is supported
 	  starting with &os; 10.0-RELEASE.  To use
 	  <acronym>iSCSI</acronym> in older versions of &os;, install
 	  a userspace target from the Ports Collection, such as
 	  <package>net/istgt</package>.  This chapter only describes
 	  the native target.</para>
       </note>
 
       <para>To configure an <acronym>iSCSI</acronym> target, create
 	the <filename>/etc/ctl.conf</filename> configuration file, add
 	a line to <filename>/etc/rc.conf</filename> to make sure the
 	&man.ctld.8; daemon is automatically started at boot, and then
 	start the daemon.</para>
 
       <para>The following is an example of a simple
 	<filename>/etc/ctl.conf</filename> configuration file.  Refer
 	to &man.ctl.conf.5; for a more complete description of this
 	file's available options.</para>
 
       <programlisting>portal-group pg0 {
 	discovery-auth-group no-authentication
 	listen 0.0.0.0
 	listen [::]
 }
 
 target iqn.2012-06.com.example:target0 {
 	auth-group no-authentication
 	portal-group pg0
 
 	lun 0 {
 		path /data/target0-0
 		size 4G
 	}
 }</programlisting>
 
       <para>The first entry defines the <literal>pg0</literal> portal
 	group.  Portal groups define which network addresses the
 	&man.ctld.8; daemon will listen on.  The
 	<literal>discovery-auth-group no-authentication</literal>
 	entry indicates that any initiator is allowed to perform
 	<acronym>iSCSI</acronym> target discovery without
 	authentication.  Lines three and four configure &man.ctld.8;
 	to listen on all <acronym>IPv4</acronym>
 	(<literal>listen 0.0.0.0</literal>) and
 	<acronym>IPv6</acronym> (<literal>listen [::]</literal>)
 	addresses on the default port of 3260.</para>
 
       <para>It is not necessary to define a portal group as there is a
 	built-in portal group called <literal>default</literal>.  In
 	this case, the difference between <literal>default</literal>
 	and <literal>pg0</literal> is that with
 	<literal>default</literal>, target discovery is always denied,
 	while with <literal>pg0</literal>, it is always
 	allowed.</para>
 
       <para>The second entry defines a single target.  Target has two
 	possible meanings: a machine serving <acronym>iSCSI</acronym>
 	or a named group of <acronym>LUNs</acronym>.  This example
 	uses the latter meaning, where
 	<literal>iqn.2012-06.com.example:target0</literal> is the
 	target name.  This target name is suitable for testing
 	purposes.  For actual use, change
 	<literal>com.example</literal> to the real domain name,
 	reversed.  The <literal>2012-06</literal> represents the year
 	and month of acquiring control of that domain name, and
 	<literal>target0</literal> can be any value.  Any number of
 	targets can be defined in this configuration file.</para>
 
       <para>The <literal>auth-group no-authentication</literal> line
 	allows all initiators to connect to the specified target and
 	<literal>portal-group pg0</literal> makes the target reachable
 	through the <literal>pg0</literal> portal group.</para>
 
       <para>The next section defines the <acronym>LUN</acronym>.  To
 	the initiator, each <acronym>LUN</acronym> will be visible as
 	a separate disk device.  Multiple <acronym>LUNs</acronym> can
 	be defined for each target.  Each <acronym>LUN</acronym> is
 	identified by a number, where <acronym>LUN</acronym> 0 is
 	mandatory.  The <literal>path /data/target0-0</literal> line
 	defines the full path to a file or zvol backing the
 	<acronym>LUN</acronym>.  That path must exist before starting
 	&man.ctld.8;.  The second line is optional and specifies the
 	size of the <acronym>LUN</acronym>.</para>
 
       <para>Next, to make sure the &man.ctld.8; daemon is started at
 	boot, add this line to
 	<filename>/etc/rc.conf</filename>:</para>
 
       <programlisting>ctld_enable="YES"</programlisting>
 
       <para>To start &man.ctld.8; now, run this command:</para>
 
       <screen>&prompt.root; <userinput>service ctld start</userinput></screen>
 
       <para>As the &man.ctld.8; daemon is started, it reads
 	<filename>/etc/ctl.conf</filename>.  If this file is edited
 	after the daemon starts, use this command so that the changes
 	take effect immediately:</para>
 
       <screen>&prompt.root; <userinput>service ctld reload</userinput></screen>
 
       <sect3>
 	<title>Authentication</title>
 
 	<para>The previous example is inherently insecure as it uses
 	  no authentication, granting anyone full access to all
 	  targets.  To require a username and password to access
 	  targets, modify the configuration as follows:</para>
 
 	<programlisting>auth-group ag0 {
 	chap username1 secretsecret
 	chap username2 anothersecret
 }
 
 portal-group pg0 {
 	discovery-auth-group no-authentication
 	listen 0.0.0.0
 	listen [::]
 }
 
 target iqn.2012-06.com.example:target0 {
 	auth-group ag0
 	portal-group pg0
 	lun 0 {
 		path /data/target0-0
 		size 4G
 	}
 }</programlisting>
 
 	<para>The <literal>auth-group</literal> section defines
 	  username and password pairs.  An initiator trying to connect
 	  to <literal>iqn.2012-06.com.example:target0</literal> must
 	  first specify a defined username and secret.  However,
 	  target discovery is still permitted without authentication.
 	  To require target discovery authentication, set
 	  <literal>discovery-auth-group</literal> to a defined
 	  <literal>auth-group</literal> name instead of
 	  <literal>no-authentication</literal>.</para>
 
 	<para>It is common to define a single exported target for
 	  every initiator.  As a shorthand for the syntax above, the
 	  username and password can be specified directly in the
 	  target entry:</para>
 
 	<programlisting>target iqn.2012-06.com.example:target0 {
 	portal-group pg0
 	chap username1 secretsecret
 
 	lun 0 {
 		path /data/target0-0
 		size 4G
 	}
 }</programlisting>
       </sect3>
     </sect2>
 
     <sect2 xml:id="network-iscsi-initiator">
       <title>Configuring an <acronym>iSCSI</acronym> Initiator</title>
 
       <note>
 	<para>The <acronym>iSCSI</acronym> initiator described in this
 	  section is supported starting with &os; 10.0-RELEASE.  To
 	  use the <acronym>iSCSI</acronym> initiator available in
 	  older versions, refer to &man.iscontrol.8;.</para>
       </note>
 
       <para>The <acronym>iSCSI</acronym> initiator requires that the
 	&man.iscsid.8; daemon is running.  This daemon does not use a
 	configuration file.  To start it automatically at boot, add
 	this line to <filename>/etc/rc.conf</filename>:</para>
 
       <programlisting>iscsid_enable="YES"</programlisting>
 
       <para>To start &man.iscsid.8; now, run this command:</para>
 
       <screen>&prompt.root; <userinput>service iscsid start</userinput></screen>
 
       <para>Connecting to a target can be done with or without an
 	<filename>/etc/iscsi.conf</filename> configuration file.  This
 	section demonstrates both types of connections.</para>
 
       <sect3>
 	<title>Connecting to a Target Without a Configuration
 	  File</title>
 
 	<para>To connect an initiator to a single target, specify the
 	  <acronym>IP</acronym> address of the portal and the name of
 	  the target:</para>
 
 	<screen>&prompt.root; <userinput>iscsictl -A -p <replaceable>10.10.10.10</replaceable> -t <replaceable>iqn.2012-06.com.example:target0</replaceable></userinput></screen>
 
 	<para>To verify if the connection succeeded, run
 	  <command>iscsictl</command> without any arguments.  The
 	  output should look similar to this:</para>
 
 	<programlisting>Target name                                     Target portal   State
 iqn.2012-06.com.example:target0                 10.10.10.10     Connected: da0</programlisting>
 
 	<para>In this example, the <acronym>iSCSI</acronym> session
 	  was successfully established, with
 	  <filename>/dev/da0</filename> representing the attached
 	  <acronym>LUN</acronym>.  If the
 	  <literal>iqn.2012-06.com.example:target0</literal> target
 	  exports more than one <acronym>LUN</acronym>, multiple
 	  device nodes will be shown in that section of the
 	  output:</para>
 
 	<screen>Connected: da0 da1 da2.</screen>
 
 	<para>Any errors will be reported in the output, as well as
 	  the system logs.  For example, this message usually means
 	  that the &man.iscsid.8; daemon is not running:</para>
 
 	<programlisting>Target name                                     Target portal   State
 iqn.2012-06.com.example:target0                 10.10.10.10     Waiting for iscsid(8)</programlisting>
 
 	<para>The following message suggests a networking problem,
 	  such as a wrong <acronym>IP</acronym> address or
 	  port:</para>
 
 	<programlisting>Target name                                     Target portal   State
 iqn.2012-06.com.example:target0                 10.10.10.11     Connection refused</programlisting>
 
 	<para>This message means that the specified target name is
 	  wrong:</para>
 
 	<programlisting>Target name                                     Target portal   State
 iqn.2012-06.com.example:target0                 10.10.10.10     Not found</programlisting>
 
 	<para>This message means that the target requires
 	  authentication:</para>
 
 	<programlisting>Target name                                     Target portal   State
 iqn.2012-06.com.example:target0                 10.10.10.10     Authentication failed</programlisting>
 
 	<para>To specify a <acronym>CHAP</acronym> username and
 	  secret, use this syntax:</para>
 
 	<screen>&prompt.root; <userinput>iscsictl -A -p <replaceable>10.10.10.10</replaceable> -t <replaceable>iqn.2012-06.com.example:target0</replaceable> -u <replaceable>user</replaceable> -s <replaceable>secretsecret</replaceable></userinput></screen>
       </sect3>
 
       <sect3>
 	<title>Connecting to a Target with a Configuration
 	  File</title>
 
 	<para>To connect using a configuration file, create
 	  <filename>/etc/iscsi.conf</filename> with contents like
 	  this:</para>
 
 	<programlisting>t0 {
 	TargetAddress   = 10.10.10.10
 	TargetName      = iqn.2012-06.com.example:target0
 	AuthMethod      = CHAP
 	chapIName       = user
 	chapSecret      = secretsecret
 }</programlisting>
 
 	<para>The <literal>t0</literal> specifies a nickname for the
 	  configuration file section.  It will be used by the
 	  initiator to specify which configuration to use.  The other
 	  lines specify the parameters to use during connection.  The
 	  <literal>TargetAddress</literal> and
 	  <literal>TargetName</literal> are mandatory, whereas the
 	  other options are optional.  In this example, the
 	  <acronym>CHAP</acronym> username and secret are
 	  shown.</para>
 
 	<para>To connect to the defined target, specify the
 	  nickname:</para>
 
 	<screen>&prompt.root; <userinput>iscsictl -An <replaceable>t0</replaceable></userinput></screen>
 
 	<para>Alternately, to connect to all targets defined in the
 	  configuration file, use:</para>
 
 	<screen>&prompt.root; <userinput>iscsictl -Aa</userinput></screen>
 
 	<para>To make the initiator automatically connect to all
 	  targets in <filename>/etc/iscsi.conf</filename>, add the
 	  following to <filename>/etc/rc.conf</filename>:</para>
 
 	<programlisting>iscsictl_enable="YES"
 iscsictl_flags="-Aa"</programlisting>
 
       </sect3>
     </sect2>
   </sect1>
 
 </chapter>
Index: user/gjb/releng-rewrite/en_US.ISO8859-1/books/porters-handbook/versions/chapter.xml
===================================================================
--- user/gjb/releng-rewrite/en_US.ISO8859-1/books/porters-handbook/versions/chapter.xml	(revision 49724)
+++ user/gjb/releng-rewrite/en_US.ISO8859-1/books/porters-handbook/versions/chapter.xml	(revision 49725)
@@ -1,7831 +1,7842 @@
 <?xml version="1.0" encoding="iso-8859-1"?>
 
 <!--
      The FreeBSD Documentation Project
      $FreeBSD$
 -->
 
 <chapter xmlns="http://docbook.org/ns/docbook" xmlns:xlink=
   "http://www.w3.org/1999/xlink" version="5.0" xml:id="versions">
 
   <title><literal>__FreeBSD_version</literal> Values</title>
 
   <para>Here is a convenient list of
     <literal>__FreeBSD_version</literal> values as defined in
     <link
       xlink:href="http://svnweb.FreeBSD.org/base/head/sys/sys/param.h?view=markup">sys/param.h</link>:</para>
 
   <sect1 xml:id="versions-12">
     <title>&os; 12 Versions</title>
 
     <table frame="none" xml:id="freebsd-versions-table-12">
       <title>&os; 12 <literal>__FreeBSD_version</literal>
 	Values</title>
 
       <tgroup cols="4">
 	<thead>
 	  <row>
 	    <entry>Value</entry>
 
 	    <entry>Revision</entry>
 
 	    <entry>Date</entry>
 
 	    <entry>Release</entry>
 	  </row>
 	</thead>
 
 	<tbody>
 	  <row>
 	    <entry>1200000</entry>
 	    <entry><revnumber>302409</revnumber></entry>
 	    <entry>July 7, 2016</entry>
 	    <entry>12.0-CURRENT.</entry>
 	  </row>
 
 	  <row>
 	    <entry>1200001</entry>
 	    <entry><revnumber>302628</revnumber></entry>
 	    <entry>July 12, 2016</entry>
 	    <entry>12.0-CURRENT after removing collation from
 	      <literal>[a-z]</literal>-type ranges.</entry>
 	  </row>
 
 	  <row>
 	    <entry>1200002</entry>
 	    <entry><revnumber>304395</revnumber></entry>
 	    <entry>August 18, 2016</entry>
 	    <entry>12.0-CURRENT after removing unused and obsolete
 	      <literal>openbsd_poll</literal> system call.</entry>
 	  </row>
 
 	  <row>
 	    <entry>1200003</entry>
 	    <entry><revnumber>304608</revnumber></entry>
 	    <entry>August 22, 2016</entry>
 	    <entry>12.0-CURRENT after adding C++11 thread_local
 	      support in rev <revnumber>303795</revnumber>.</entry>
 	  </row>
 
 	  <row>
 	    <entry>1200004</entry>
 	    <entry><revnumber>304752</revnumber></entry>
 	    <entry>August 24, 2016</entry>
 	    <entry>12.0-CURRENT after fixing LC_*_MASK for
 	      &man.newlocale.3; and &man.querylocale.3; (rev
 	      <revnumber>304703</revnumber>).</entry>
 	  </row>
 
 	  <row>
 	    <entry>1200005</entry>
 	    <entry><revnumber>304789</revnumber></entry>
 	    <entry>August 25, 2016</entry>
 	    <entry>12.0-CURRENT after changing some ioctl interfaces
 	      in rev <revnumber>304787</revnumber> between the
 	      <acronym>iSCSI</acronym> userspace programs and the
 	      kernel.</entry>
 	  </row>
 
 	  <row>
 	    <entry>1200006</entry>
 	    <entry><revnumber>305256</revnumber></entry>
 	    <entry>September  1, 2016</entry>
 	    <entry>12.0-CURRENT after crunchgen META_MODE fix in
 	      <revnumber>305254</revnumber>.</entry>
 	  </row>
 
 	  <row>
 	    <entry>1200007</entry>
 	    <entry><revnumber>305421</revnumber></entry>
 	    <entry>September  5, 2016</entry>
 	    <entry>12.0-CURRENT after resolving a deadlock between
 	      <function>device_detach()</function> and
 	      &man.usbd.do.request.flags.9;.</entry>
 	  </row>
 
 	  <row>
 	    <entry>1200008</entry>
 	    <entry><revnumber>305833</revnumber></entry>
 	    <entry>September 15, 2016</entry>
 	    <entry>12.0-CURRENT after removing the 4.3BSD compatible
 	      macro <function>m_copy()</function> in
 	      <revnumber>305824</revnumber>.</entry>
 	  </row>
 
 	  <row>
 	    <entry>1200009</entry>
 	    <entry><revnumber>306077</revnumber></entry>
 	    <entry>September 21, 2016</entry>
 	    <entry>12.0-CURRENT after removing
 	      <function>bio_taskqueue()</function> in
 	      <revnumber>305988</revnumber>.</entry>
 	  </row>
 
 	  <row>
 	    <entry>1200010</entry>
 	    <entry><revnumber>306276</revnumber></entry>
 	    <entry>September 23, 2016</entry>
 	    <entry>12.0-CURRENT after mounting &man.msdosfs.5; with
 	      longnames support by default.</entry>
 	  </row>
 
 	  <row>
 	    <entry>1200011</entry>
 	    <entry><revnumber>306556</revnumber></entry>
 	    <entry>October  1, 2016</entry>
 	    <entry>12.0-CURRENT after adding
 	      <literal>fb_memattr</literal> field to
 	      <literal>fb_info</literal> in
 	      <revnumber>306555</revnumber>.</entry>
 	  </row>
 
 	  <row>
 	    <entry>1200012</entry>
 	    <entry><revnumber>306592</revnumber></entry>
 	    <entry>October  2, 2016</entry>
 	    <entry>12.0-CURRENT after &man.net80211.4; changes (rev
 	      <revnumber>306590</revnumber>,
 	      <revnumber>306591</revnumber>).</entry>
 	  </row>
 
 	  <row>
 	    <entry>1200013</entry>
 	    <entry><revnumber>307140</revnumber></entry>
 	    <entry>October 12, 2016</entry>
 	    <entry>12.0-CURRENT after installing header files required
 	      development with libzfs_core.</entry>
 	  </row>
 
 	  <row>
 	    <entry>1200014</entry>
 	    <entry><revnumber>307529</revnumber></entry>
 	    <entry>October 17, 2016</entry>
 	    <entry>12.0-CURRENT after merging common code in
 	      &man.rtwn.4; and &man.urtwn.4;, and adding support for
 	      802.11ac devices.</entry>
 	  </row>
 
 	  <row>
 	    <entry>1200015</entry>
 	    <entry><revnumber>308874</revnumber></entry>
 	    <entry>November 20, 2016</entry>
 	    <entry>12.0-CURRENT after some ABI change for unbreaking
 	      powerpc.</entry>
 	  </row>
 
 	  <row>
 	    <entry>1200016</entry>
 	    <entry><revnumber>309017</revnumber></entry>
 	    <entry>November 22, 2016</entry>
 	    <entry>12.0-CURRENT after removing
 	      <literal>PG_CACHED</literal>-related fields from
 	      <literal>vmmeter</literal>.</entry>
 	  </row>
 
 	  <row>
 	    <entry>1200017</entry>
 	    <entry><revnumber>309124</revnumber></entry>
 	    <entry>November 25, 2016</entry>
 	    <entry>12.0-CURRENT after upgrading our copies of clang,
 	      llvm, lldb, compiler-rt and libc++ to 3.9.0 release, and
 	      adding lld 3.9.0.</entry>
 	  </row>
+
+	  <row>
+	    <entry>1200018</entry>
+	    <entry><revnumber>309676</revnumber></entry>
+	    <entry>December 7, 2016</entry>
+	    <entry>12.0-CURRENT after adding the
+              <literal>ki_moretdname</literal> member to
+              <literal>struct kinfo_proc</literal> and
+              <literal>struct kinfo_proc32</literal> to export the whole
+              thread name to user-space utilities.</entry>
+	  </row>
 	</tbody>
       </tgroup>
     </table>
   </sect1>
 
   <sect1 xml:id="versions-11">
     <title>&os; 11 Versions</title>
 
     <table frame="none" xml:id="freebsd-versions-table-11">
       <title>&os; 11 <literal>__FreeBSD_version</literal>
 	Values</title>
 
       <tgroup cols="4">
 	<thead>
 	  <row>
 	    <entry>Value</entry>
 
 	    <entry>Revision</entry>
 
 	    <entry>Date</entry>
 
 	    <entry>Release</entry>
 	  </row>
 	</thead>
 
 	<tbody>
 	  <row>
 	    <entry>1100000</entry>
 	    <entry><revnumber>256284</revnumber></entry>
 	    <entry>October 10, 2013</entry>
 	    <entry>11.0-CURRENT.</entry>
 	  </row>
 
 	  <row>
 	    <entry>1100001</entry>
 	    <entry><revnumber>256776</revnumber></entry>
 	    <entry>October 19, 2013</entry>
 	    <entry>11.0-CURRENT after addition of support for "first
 	      boot" <filename>rc.d</filename> scripts, so ports can
 	      make use of this.</entry>
 	  </row>
 
 	  <row>
 	    <entry>1100002</entry>
 	    <entry><revnumber>257696</revnumber></entry>
 	    <entry>November 5, 2013</entry>
 	    <entry>11.0-CURRENT after dropping support for historic
 	      ioctls.</entry>
 	  </row>
 
 	  <row>
 	    <entry>1100003</entry>
 	    <entry><revnumber>258284</revnumber></entry>
 	    <entry>November 17, 2013</entry>
 	    <entry>11.0-CURRENT after iconv changes.</entry>
 	  </row>
 
 	  <row>
 	    <entry>1100004</entry>
 	    <entry><revnumber>259424</revnumber></entry>
 	    <entry>December 15, 2013</entry>
 	    <entry>11.0-CURRENT after the behavior change of
 	      <function>gss_pseudo_random</function> introduced in
 	      <revnumber>259286</revnumber>.</entry>
 	  </row>
 
 	  <row>
 	    <entry>1100005</entry>
 	    <entry><revnumber>260010</revnumber></entry>
 	    <entry>December 28, 2013</entry>
 	    <entry>11.0-CURRENT after <revnumber>259951</revnumber> -
 	      Do not coalesce entries in &man.vm.map.stack.9;.</entry>
 	  </row>
 
 	  <row>
 	    <entry>1100006</entry>
 	    <!-- The commit this happened in is:
 	    <entry><revnumber>261156</revnumber></entry>
 	    but it was a project branch, the relevant commit is the
 	    one where the branch was merged back into head, and that
 	    one is: -->
 	    <entry><revnumber>261246</revnumber></entry>
 	    <entry>January 28, 2014</entry>
 	    <entry>11.0-CURRENT after upgrades of libelf and
 	      libdwarf.</entry>
 	  </row>
 
 	  <row>
 	    <entry>1100007</entry>
 	    <entry><revnumber>261283</revnumber></entry>
 	    <entry>January 30, 2014</entry>
 	    <entry>11.0-CURRENT after upgrade of libc++ to 3.4
 	      release.</entry>
 	  </row>
 
 	  <row>
 	    <entry>1100008</entry>
 	    <entry><revnumber>261881</revnumber></entry>
 	    <entry>February 14, 2014</entry>
 	    <entry>11.0-CURRENT after libc++ 3.4 ABI compatibility
 	      fix.</entry>
 	  </row>
 
 	  <row>
 	    <entry>1100009</entry>
 	    <entry><revnumber>261991</revnumber></entry>
 	    <entry>February 16, 2014</entry>
 	    <entry>11.0-CURRENT after upgrade of llvm/clang to 3.4
 	      release.</entry>
 	  </row>
 
 	  <row>
 	    <entry>1100010</entry>
 	    <entry><revnumber>262630</revnumber></entry>
 	    <entry>February 28, 2014</entry>
 	    <entry>11.0-CURRENT after upgrade of ncurses to 5.9
 	      release (rev <revnumber>262629</revnumber>).</entry>
 	  </row>
 
 	  <row>
 	    <entry>1100011</entry>
 	    <entry><revnumber>263102</revnumber></entry>
 	    <entry>March 13, 2014</entry>
 	    <entry>11.0-CURRENT after ABI change in struct
 	      if_data.</entry>
 	  </row>
 
 	  <row>
 	    <entry>1100012</entry>
 	    <entry><revnumber>263140</revnumber></entry>
 	    <entry>March 14, 2014</entry>
 	    <entry>11.0-CURRENT after removal of Novell IPX protocol
 	      support.</entry>
 	  </row>
 
 	  <row>
 	    <entry>1100013</entry>
 	    <entry><revnumber>263152</revnumber></entry>
 	    <entry>March 14, 2014</entry>
 	    <entry>11.0-CURRENT after removal of AppleTalk protocol
 	      support.</entry>
 	  </row>
 
 	  <row>
 	    <entry>1100014</entry>
 	    <entry><revnumber>263235</revnumber></entry>
 	    <entry>March 16, 2014</entry>
 	    <entry>11.0-CURRENT after renaming
 	      <filename>&lt;sys/capability.h&gt;</filename> to
 	      <filename>&lt;sys/capsicum.h&gt;</filename> to avoid a
 	      clash with similarly named headers in other operating
 	      systems.  A compatibility header is left in place to
 	      limit build breakage, but will be deprecated in due
 	      course.</entry>
 	  </row>
 
 	  <row>
 	    <entry>1100015</entry>
 	    <entry><revnumber>263620</revnumber></entry>
 	    <entry>March 22, 2014</entry>
 	    <entry>11.0-CURRENT after <literal>cnt</literal> rename to
 	      <literal>vm_cnt</literal>.</entry>
 	  </row>
 
 	  <row>
 	    <entry>1100016</entry>
 	    <entry><revnumber>263660</revnumber></entry>
 	    <entry>March 23, 2014</entry>
 	    <entry>11.0-CURRENT after addition of
 	      <literal>armv6hf</literal>
 	      <varname>TARGET_ARCH</varname>.</entry>
 	  </row>
 
 	  <row>
 	    <entry>1100017</entry>
 	    <entry><revnumber>264121</revnumber></entry>
 	    <entry>April 4, 2014</entry>
 	    <entry>11.0-CURRENT after GCC support for
 	      <literal>__block</literal> definition.</entry>
 	  </row>
 
 	  <row>
 	    <entry>1100018</entry>
 	    <entry><revnumber>264212</revnumber></entry>
 	    <entry>April 6, 2014</entry>
 	    <entry>11.0-CURRENT after support for UDP-Lite protocol
 	      (RFC 3828).</entry>
 	  </row>
 
 	  <row>
 	    <entry>1100019</entry>
 	    <entry><revnumber>264289</revnumber></entry>
 	    <entry>April 8, 2014</entry>
 	    <entry>11.0-CURRENT after FreeBSD-SA-14:06.openssl (rev
 	      <revnumber>264265</revnumber>).</entry>
 	  </row>
 
 	  <row>
 	    <entry>1100020</entry>
 	    <entry><revnumber>265215</revnumber></entry>
 	    <entry>May 1, 2014</entry>
 	    <entry>11.0-CURRENT after removing lindev in favor of
 	      having /dev/full by default (rev
 	      <revnumber>265212</revnumber>).</entry>
 	  </row>
 
 	  <row>
 	    <entry>1100021</entry>
 	    <entry><revnumber>266151</revnumber></entry>
 	    <entry>May 6, 2014</entry>
 	    <entry>11.0-CURRENT after <filename>src.opts.mk</filename>
 	      changes, decoupling &man.make.conf.5; from
 	      <command>buildworld</command> (rev
 	      <revnumber>265419</revnumber>).</entry>
 	  </row>
 
 	  <row>
 	    <entry>1100022</entry>
 	    <entry><revnumber>266904</revnumber></entry>
 	    <entry>May 30, 2014</entry>
 	    <entry>11.0-CURRENT after changes to &man.strcasecmp.3;,
 	      moving &man.strcasecmp.l.3; and &man.strncasecmp.l.3;
 	      from <filename>&lt;string.h&gt;</filename> to
 	      <filename>&lt;strings.h&gt;</filename> for POSIX 2008
 	      compliance (rev <revnumber>266865</revnumber>).</entry>
 	  </row>
 
 	  <row>
 	    <entry>1100023</entry>
 	    <entry><revnumber>267440</revnumber></entry>
 	    <entry>June 13, 2014</entry>
 	    <entry>11.0-CURRENT after the CUSE library and kernel
 	      module have been attached to the build by
 	      default.</entry>
 	  </row>
 
 	  <row>
 	    <entry>1100024</entry>
 	    <entry><revnumber>267992</revnumber></entry>
 	    <entry>June 27, 2014</entry>
 	    <entry>11.0-CURRENT after &man.sysctl.3;
 	      <acronym>API</acronym> change.</entry>
 	  </row>
 
 	  <row>
 	    <entry>1100025</entry>
 	    <entry><revnumber>268066</revnumber></entry>
 	    <entry>June 30, 2014</entry>
 	    <entry>11.0-CURRENT after &man.regex.3; library update to
 	      add <quote>&gt;</quote> and <quote>&lt;</quote>
 	      delimiters.</entry>
 	  </row>
 
 	  <row>
 	    <entry>1100026</entry>
 	    <entry><revnumber>268118</revnumber></entry>
 	    <entry>July 1, 2014</entry>
 	    <entry>11.0-CURRENT after the internal interface between
 	      the NFS modules, including the krpc, was changed by (rev
 	      <revnumber>268115</revnumber>).</entry>
 	  </row>
 
 	  <row>
 	    <entry>1100027</entry>
 	    <entry><revnumber>268441</revnumber></entry>
 	    <entry>July 8, 2014</entry>
 	    <entry>11.0-CURRENT after FreeBSD-SA-14:17.kmem (rev
 	      <revnumber>268431</revnumber>).</entry>
 	  </row>
 
 	  <row>
 	    <entry>1100028</entry>
 	    <entry><revnumber>268945</revnumber></entry>
 	    <entry>July 21, 2014</entry>
 	    <entry>11.0-CURRENT after &man.hdestroy.3; compliance fix
 	      changed <acronym>ABI</acronym>.</entry>
 	  </row>
 
 	  <row>
 	    <entry>1100029</entry>
 	    <entry><revnumber>270173</revnumber></entry>
 	    <entry>August 3, 2014</entry>
 	    <entry>11.0-CURRENT after <literal>SOCK_DGRAM</literal>
 	      bug fix (rev <revnumber>269489</revnumber>).</entry>
 	  </row>
 
 	  <row>
 	    <entry>1100030</entry>
 	    <entry><revnumber>270929</revnumber></entry>
 	    <entry>September 1, 2014</entry>
 	    <entry>11.0-CURRENT after <literal>SOCK_RAW</literal>
 	      sockets were changed to not modify packets at
 	      all.</entry>
 	  </row>
 
 	  <row>
 	    <entry>1100031</entry>
 	    <entry><revnumber>271341</revnumber></entry>
 	    <entry>September 9, 2014</entry>
 	    <entry>11.0-CURRENT after FreeBSD-SA-14:18.openssl (rev
 	      <revnumber>269686</revnumber>).</entry>
 	  </row>
 
 	  <row>
 	    <entry>1100032</entry>
 	    <entry><revnumber>271438</revnumber></entry>
 	    <entry>September 11, 2014</entry>
 	    <entry>11.0-CURRENT after API changes to
 	      <literal>ifa_ifwithbroadaddr</literal>,
 	      <literal>ifa_ifwithdstaddr</literal>,
 	      <literal>ifa_ifwithnet</literal>, and
 	      <literal>ifa_ifwithroute</literal>.</entry>
 	  </row>
 
 	  <row>
 	    <entry>1100033</entry>
 	    <entry><revnumber>271657</revnumber></entry>
 	    <entry>September 9, 2014</entry>
 	    <entry>11.0-CURRENT after changing
 	      <literal>access</literal>, <literal>eaccess</literal>,
 	      and <literal>faccessat</literal> to validate the mode
 	      argument.</entry>
 	  </row>
 
 	  <row>
 	    <entry>1100034</entry>
 	    <entry><revnumber>271686</revnumber></entry>
 	    <entry>September 16, 2014</entry>
 	    <entry>11.0-CURRENT after FreeBSD-SA-14:19.tcp (rev
 	      <revnumber>271666</revnumber>).</entry>
 	  </row>
 
 	  <row>
 	    <entry>1100035</entry>
 	    <entry><revnumber>271705</revnumber></entry>
 	    <entry>September 17, 2014</entry>
 	    <entry>11.0-CURRENT after i915 HW context support.</entry>
 	  </row>
 
 	  <row>
 	    <entry>1100036</entry>
 	    <entry><revnumber>271724</revnumber></entry>
 	    <entry>September 17, 2014</entry>
 	    <entry>Version bump to have ABI note distinguish binaries
 	      ready for strict &man.mmap.2; flags checking (rev
 	      <revnumber>271724</revnumber>).</entry>
 	  </row>
 
 	  <row>
 	    <entry>1100037</entry>
 	    <entry><revnumber>272674</revnumber></entry>
 	    <entry>October 6, 2014</entry>
 	    <entry>11.0-CURRENT after addition of
 	      &man.explicit.bzero.3; (rev
 	      <revnumber>272673</revnumber>).</entry>
 	  </row>
 
 	  <row>
 	    <entry>1100038</entry>
 	    <entry><revnumber>272951</revnumber></entry>
 	    <entry>October 11, 2014</entry>
 	    <entry>11.0-CURRENT after cleanup of TCP wrapper
 	      headers.</entry>
 	  </row>
 
 	  <row>
 	    <entry>1100039</entry>
 	    <entry><revnumber>273250</revnumber></entry>
 	    <entry>October 18, 2014</entry>
 	    <entry>11.0-CURRENT after removal of
 	      <literal>MAP_RENAME</literal> and
 	      <literal>MAP_NORESERVE</literal>.</entry>
 	  </row>
 
 	  <row>
 	    <entry>1100040</entry>
 	    <entry><revnumber>273432</revnumber></entry>
 	    <entry>October 21, 2014</entry>
 	    <entry>11.0-CURRENT after FreeBSD-SA-14:23 (rev
 	      <revnumber>273146</revnumber>).</entry>
 	  </row>
 
 	  <row>
 	    <entry>1100041</entry>
 	    <entry><revnumber>273875</revnumber></entry>
 	    <entry>October 30, 2014</entry>
 	    <entry>11.0-CURRENT after API changes to
 	      <literal>syscall_register</literal>,
 	      <literal>syscall32_register</literal>,
 	      <literal>syscall_register_helper</literal> and
 	      <literal>syscall32_register_helper</literal> (rev
 	      <revnumber>273707</revnumber>).</entry>
 	  </row>
 
 	  <row>
 	    <entry>1100042</entry>
 	    <entry><revnumber>274046</revnumber></entry>
 	    <entry>November 3, 2014</entry>
 	    <entry>11.0-CURRENT after a change to <literal>struct
 		tcpcb</literal>.</entry>
 	  </row>
 
 	  <row>
 	    <entry>1100043</entry>
 	    <entry><revnumber>274085</revnumber></entry>
 	    <entry>November 4, 2014</entry>
 	    <entry>11.0-CURRENT after enabling &man.vt.4; by
 	      default.</entry>
 	  </row>
 
 	  <row>
 	    <entry>1100044</entry>
 	    <entry><revnumber>274116</revnumber></entry>
 	    <entry>November 4, 2014</entry>
 	    <entry>11.0-CURRENT after adding new libraries/utilities
 	      (dpv and figpar) for data throughput
 	      visualization.</entry>
 	  </row>
 
 	  <row>
 	    <entry>1100045</entry>
 	    <entry><revnumber>274162</revnumber></entry>
 	    <entry>November 4, 2014</entry>
 	    <entry>11.0-CURRENT after FreeBSD-SA-14:23,
 	      FreeBSD-SA-14:24, and FreeBSD-SA-14:25.</entry>
 	  </row>
 
 	  <row>
 	    <entry>1100046</entry>
 	    <entry><revnumber>274470</revnumber></entry>
 	    <entry>November 13, 2014</entry>
 	    <entry>11.0-CURRENT after <literal>kern_poll</literal>
 	      signature change (rev
 	      <revnumber>274462</revnumber>).</entry>
 	  </row>
 
 	  <row>
 	    <entry>1100047</entry>
 	    <entry><revnumber>274476</revnumber></entry>
 	    <entry>November 13, 2014</entry>
 	    <entry>11.0-CURRENT after removal of no-at version of VFS
 	      syscalls helpers, like
 	      <literal>kern_open</literal>.</entry>
 	  </row>
 
 	  <row>
 	    <entry>1100048</entry>
 	    <entry><revnumber>275358</revnumber></entry>
 	    <entry>December 1, 2014</entry>
 	    <entry>11.0-CURRENT after starting the process of removing
 	      the use of the deprecated "M_FLOWID" flag from the
 	      network code.</entry>
 	  </row>
 
 	  <row>
 	    <entry>1100049</entry>
 	    <entry><revnumber>275633</revnumber></entry>
 	    <entry>December 9, 2014</entry>
 	    <entry>11.0-CURRENT after importing an important fix to
 	      the LLVM vectorizer, which could lead to buffer overruns
 	      in some cases.</entry>
 	  </row>
 
 	  <row>
 	    <entry>1100050</entry>
 	    <entry><revnumber>275732</revnumber></entry>
 	    <entry>December 12, 2014</entry>
 	    <entry>11.0-CURRENT after adding AES-ICM and AES-GCM to
 	      OpenCrypto.</entry>
 	  </row>
 
 	  <row>
 	    <entry>1100051</entry>
 	    <entry><revnumber>276096</revnumber></entry>
 	    <entry>December 23, 2014</entry>
 	    <entry>11.0-CURRENT after removing old NFS client and
 	      server code from the kernel.</entry>
 	  </row>
 
 	  <row>
 	    <entry>1100052</entry>
 	    <entry><revnumber>276479</revnumber></entry>
 	    <entry>December 31, 2014</entry>
 	    <entry>11.0-CURRENT after upgrade of clang, llvm and lldb
 	      to 3.5.0 release.</entry>
 	  </row>
 
 	  <row>
 	    <entry>1100053</entry>
 	    <entry><revnumber>276781</revnumber></entry>
 	    <entry>January 7, 2015</entry>
 	    <entry>11.0-CURRENT after &man.MCLGET.9; gained a return
 	      value (rev <revnumber>276750</revnumber>).</entry>
 	  </row>
 
 	  <row>
 	    <entry>1100054</entry>
 	    <entry><revnumber>277213</revnumber></entry>
 	    <entry>January 15, 2015</entry>
 	    <entry>11.0-CURRENT after rewrite of callout
 	      subsystem.</entry>
 	  </row>
 
 	  <row>
 	    <entry>1100055</entry>
 	    <entry><revnumber>277528</revnumber></entry>
 	    <entry>January 22, 2015</entry>
 	    <entry>11.0-CURRENT after reverting callout changes in
 	      <revnumber>277213</revnumber>.</entry>
 	  </row>
 
 	  <row>
 	    <entry>1100056</entry>
 	    <entry><revnumber>277610</revnumber></entry>
 	    <entry>January 23, 2015</entry>
 	    <entry>11.0-CURRENT after addition of
 	      <literal>futimens</literal> and
 	      <literal>utimensat</literal> system calls.</entry>
 	  </row>
 
 	  <row>
 	    <entry>1100057</entry>
 	    <entry><revnumber>277897</revnumber></entry>
 	    <entry>January 29, 2015</entry>
 	    <entry>11.0-CURRENT after removal of d_thread_t.</entry>
 	  </row>
 
 	  <row>
 	    <entry>1100058</entry>
 	    <entry><revnumber>278228</revnumber></entry>
 	    <entry>February 5, 2015</entry>
 	    <entry>11.0-CURRENT after addition of support for probing
 	      the SCSI VPD Extended Inquiry page (0x86).</entry>
 	  </row>
 
 	  <row>
 	    <entry>1100059</entry>
 	    <entry><revnumber>278442</revnumber></entry>
 	    <entry>February 9, 2015</entry>
 	    <entry>11.0-CURRENT after import of xz 5.2.0, which added
 	      multi-threaded compression and lzma gained libthr
 	      dependency (rev <revnumber>278433</revnumber>).</entry>
 	  </row>
 
 	  <row>
 	    <entry>1100060</entry>
 	    <entry><revnumber>278846</revnumber></entry>
 	    <entry>February 16, 2015</entry>
 	    <entry>11.0-CURRENT after forwarding
 	      <literal>FBIO_BLANK</literal> to framebuffer
 	      clients.</entry>
 	  </row>
 
 	  <row>
 	    <entry>1100061</entry>
 	    <entry><revnumber>278964</revnumber></entry>
 	    <entry>February 18, 2015</entry>
 	    <entry>11.0-CURRENT after
 	      <literal>CDAI_FLAG_NONE</literal> addition.</entry>
 	  </row>
 
 	  <row>
 	    <entry>1100062</entry>
 	    <entry><revnumber>279221</revnumber></entry>
 	    <entry>February 23, 2015</entry>
 	    <entry>11.0-CURRENT after &man.mtio.4; and &man.sa.4;
 	      <acronym>API</acronym> and &man.ioctl.2;
 	      additions.</entry>
 	  </row>
 
 	  <row>
 	    <entry>1100063</entry>
 	    <entry><revnumber>279728</revnumber></entry>
 	    <entry>March 7, 2015</entry>
 	    <entry>11.0-CURRENT after adding mutex support to the
 	      <function>pps_ioctl()</function> API in the
 	      kernel.</entry>
 	  </row>
 
 	  <row>
 	    <entry>1100064</entry>
 	    <entry><revnumber>279729</revnumber></entry>
 	    <entry>March 7, 2015</entry>
 	    <entry>11.0-CURRENT after adding PPS support to USB serial
 	      drivers.</entry>
 	  </row>
 
 	  <row>
 	    <entry>1100065</entry>
 	    <!-- The commit this happened in is:
 	    <entry><revnumber>280028</revnumber></entry>
 	    but it was a project branch, the relevant commit is the
 	    one where the branch was merged back into head, and that
 	    one is: -->
 	    <entry><revnumber>280031</revnumber></entry>
 	    <entry>March 15, 2015</entry>
 	    <entry>11.0-CURRENT after upgrading clang, llvm and lldb
 	      to 3.6.0.</entry>
 	  </row>
 
 	  <row>
 	    <entry>1100066</entry>
 	    <entry><revnumber>280306</revnumber></entry>
 	    <entry>March 20, 2015</entry>
 	    <entry>11.0-CURRENT after removal of SSLv2 support from
 	      OpenSSL.</entry>
 	  </row>
 
 	  <row>
 	    <entry>1100067</entry>
 	    <entry><revnumber>280630</revnumber></entry>
 	    <entry>March 25, 2015</entry>
 	    <entry>11.0-CURRENT after removal of SSLv2 support from
 	      &man.fetch.1; and &man.fetch.3;.</entry>
 	  </row>
 
 	  <row>
 	    <entry>1100068</entry>
 	    <entry><revnumber>281172</revnumber></entry>
 	    <entry>April 6, 2015</entry>
 	    <entry>11.0-CURRENT after change to
 	      net.inet6.ip6.mif6table sysctl.</entry>
 	  </row>
 
 	  <row>
 	    <entry>1100069</entry>
 	    <entry><revnumber>281550</revnumber></entry>
 	    <entry>April 15, 2015</entry>
 	    <entry>11.0-CURRENT after removal of const qualifier from
 	      &man.iconv.3;.</entry>
 	  </row>
 
 	  <row>
 	    <entry>1100070</entry>
 	    <entry><revnumber>281613</revnumber></entry>
 	    <entry>April 16, 2015</entry>
 	    <entry>11.0-CURRENT after moving ALTQ from
 	      <filename>contrib</filename> to
 	      <filename>net/altq</filename>.</entry>
 	  </row>
 
 	  <row>
 	    <entry>1100071</entry>
 	    <entry><revnumber>282256</revnumber></entry>
 	    <entry>April 29, 2015</entry>
 	    <entry>11.0-CURRENT after API/ABI change to &man.smb.4;
 	      (rev <revnumber>281985</revnumber>).</entry>
 	  </row>
 
 	  <row>
 	    <entry>1100072</entry>
 	    <entry><revnumber>282319</revnumber></entry>
 	    <entry>May 1, 2015</entry>
 	    <entry>11.0-CURRENT after adding &man.reallocarray.3; in
 	      libc (rev <revnumber>282314</revnumber>).</entry>
 	  </row>
 
 	  <row>
 	    <entry>1100073</entry>
 	    <entry><revnumber>282650</revnumber></entry>
 	    <entry>May 8, 2015</entry>
 	    <entry>11.0-CURRENT after extending the maximum number of
 	      allowed PCM channels in a PCM stream to 127 and
 	      decreasing the maximum number of sub-channels to
 	      1.</entry>
 	  </row>
 
 	  <row>
 	    <entry>1100074</entry>
 	    <entry><revnumber>283526</revnumber></entry>
 	    <entry>May 25, 2015</entry>
 	    <entry>11.0-CURRENT after adding preliminary support for
 	      x86-64 Linux binaries (rev
 	      <revnumber>283424</revnumber>), and upgrading clang and
 	      llvm to 3.6.1.</entry>
 	  </row>
 
 	  <row>
 	    <entry>1100075</entry>
 	    <entry><revnumber>283623</revnumber></entry>
 	    <entry>May 27, 2015</entry>
 	    <entry>11.0-CURRENT after
 	      <function>dounmount()</function>requiring a reference on
 	      the passed struct mount (rev
 	      <revnumber>283602</revnumber>).</entry>
 	  </row>
 
 	  <row>
 	    <entry>1100076</entry>
 	    <entry><revnumber>283983</revnumber></entry>
 	    <entry>June 4, 2015</entry>
 	    <entry>11.0-CURRENT after disabled generation of legacy
 	      formatted password databases entries by default.</entry>
 	  </row>
 
 	  <row>
 	    <entry>1100077</entry>
 	    <entry><revnumber>284233</revnumber></entry>
 	    <entry>June 10, 2015</entry>
 	    <entry>11.0-CURRENT after API changes to
 	      <literal>lim_cur</literal>, <literal>lim_max</literal>,
 	      and <literal>lim_rlimit</literal> (rev
 	      <revnumber>284215</revnumber>).</entry>
 	  </row>
 
 	  <row>
 	    <entry>1100078</entry>
 	    <entry><revnumber>286672</revnumber></entry>
 	    <entry>August 12, 2015</entry>
 	    <entry>11.0-CURRENT after crunchgen changes from
 	      <revnumber>284356</revnumber> to
 	      <revnumber>285986</revnumber>.</entry>
 	  </row>
 
 	  <row>
 	    <entry>1100079</entry>
 	    <entry><revnumber>286874</revnumber></entry>
 	    <entry>August 18, 2015</entry>
 	    <entry>11.0-CURRENT after import of jemalloc 4.0.0 (rev
 	      <revnumber>286866</revnumber>).</entry>
 	  </row>
 
 	  <row>
 	    <entry>1100080</entry>
 	    <!-- The commit this happened in is:
 	    <entry><revnumber>288835</revnumber></entry>
 	    but it was a project branch, the relevant commit is the
 	    one where the branch was merged back into head, and that
 	    one is: -->
 	    <entry><revnumber>288943</revnumber></entry>
 	    <entry>October 5, 2015</entry>
 	    <entry>11.0-CURRENT after upgrading clang, llvm, lldb,
 	      compiler-rt and libc++ to 3.7.0.</entry>
 	  </row>
 
 	  <row>
 	    <entry>1100081</entry>
 	    <entry><revnumber>289415</revnumber></entry>
 	    <entry>October 16, 2015</entry>
 	    <entry>11.0-CURRENT after undating ZFS to support
 	      resumable send/receive (rev
 	      <revnumber>289362</revnumber>).</entry>
 	  </row>
 
 	  <row>
 	    <entry>1100082</entry>
 	    <entry><revnumber>289594</revnumber></entry>
 	    <entry>October 19, 2015</entry>
 	    <entry>11.0-CURRENT after Linux KPI updates.</entry>
 	  </row>
 
 	  <row>
 	    <entry>1100083</entry>
 	    <entry><revnumber>289749</revnumber></entry>
 	    <entry>October 22, 2015</entry>
 	    <entry>11.0-CURRENT after renaming
 	      <filename>linuxapi.ko</filename> to
 	      <filename>linuxkpi.ko</filename>.</entry>
 	  </row>
 
 	  <row>
 	    <entry>1100084</entry>
 	    <entry><revnumber>290135</revnumber></entry>
 	    <entry>October 29, 2015</entry>
 	    <entry>11.0-CURRENT after moving the LinuxKPI module into
 	      the default kernel build.</entry>
 	  </row>
 
 	  <row>
 	    <entry>1100085</entry>
 	    <entry><revnumber>290207</revnumber></entry>
 	    <entry>October 30, 2015</entry>
 	    <entry>11.0-CURRENT after import of OpenSSL
 	      1.0.2d.</entry>
 	  </row>
 
 	  <row>
 	    <entry>1100086</entry>
 	    <entry><revnumber>290275</revnumber></entry>
 	    <entry>November  2, 2015</entry>
 	    <entry>11.0-CURRENT after making &man.figpar.3; macros
 	      more unique.</entry>
 	  </row>
 
 	  <row>
 	    <entry>1100087</entry>
 	    <entry><revnumber>290479</revnumber></entry>
 	    <entry>November  7, 2015</entry>
 	    <entry>11.0-CURRENT after changing
 	      &man.sysctl.add.oid.9;'s ABI.</entry>
 	  </row>
 
 	  <row>
 	    <entry>1100088</entry>
 	    <entry><revnumber>290495</revnumber></entry>
 	    <entry>November 7, 2015</entry>
 	    <entry>11.0-CURRENT after string collation and locales
 	      rework.</entry>
 	  </row>
 
 	  <row>
 	    <entry>1100089</entry>
 	    <entry><revnumber>290505</revnumber></entry>
 	    <entry>November 7, 2015</entry>
 	    <entry>11.0-CURRENT after API change to
 	      &man.sysctl.add.oid.9; (rev
 	      <revnumber>290475</revnumber>).</entry>
 	  </row>
 
 	  <row>
 	    <entry>1100090</entry>
 	    <entry><revnumber>290715</revnumber></entry>
 	    <entry>November 10, 2015</entry>
 	    <entry>11.0-CURRENT after API change to callout_stop
 	      macro; (rev <revnumber>290664</revnumber>).</entry>
 	  </row>
 
 	  <row>
 	    <entry>1100091</entry>
 	    <entry><revnumber>291537</revnumber></entry>
 	    <entry>November 30, 2015</entry>
 	    <entry>11.0-CURRENT after changing the interface between
 	      the <filename>nfsd.ko</filename> and
 	      <filename>nfscommon.ko</filename> modules in
 	      <revnumber>291527</revnumber>.</entry>
 	  </row>
 
 	  <row>
 	    <entry>1100092</entry>
 	    <entry><revnumber>292499</revnumber></entry>
 	    <entry>December 19, 2015</entry>
 	    <entry>11.0-CURRENT after removal of vm_pageout_grow_cache
 	      (rev <revnumber>292469</revnumber>).</entry>
 	  </row>
 
 	  <row>
 	    <entry>1100093</entry>
 	    <entry><revnumber>292966</revnumber></entry>
 	    <entry>December 30, 2015</entry>
 	    <entry>11.0-CURRENT after removal of sys/crypto/sha2.h
 	      (rev <revnumber>292782</revnumber>).</entry>
 	  </row>
 
 	  <row>
 	    <entry>1100094</entry>
 	    <entry><revnumber>294086</revnumber></entry>
 	    <entry>January 15, 2016</entry>
 	    <entry>11.0-CURRENT after LinuxKPI PCI changes (rev
 	      <revnumber>294086</revnumber>).</entry>
 	  </row>
 
 	  <row>
 	    <entry>1100095</entry>
 	    <entry><revnumber>294327</revnumber></entry>
 	    <entry>January 19, 2016</entry>
 	    <entry>11.0-CURRENT after LRO optimizations.</entry>
 	  </row>
 
 	  <row>
 	    <entry>1100096</entry>
 	    <entry><revnumber>294505</revnumber></entry>
 	    <entry>January 21, 2016</entry>
 	    <entry>11.0-CURRENT after LinuxKPI idr_*
 	      additions.</entry>
 	  </row>
 
 	  <row>
 	    <entry>1100097</entry>
 	    <entry><revnumber>294860</revnumber></entry>
 	    <entry>January 26, 2016</entry>
 	    <entry>11.0-CURRENT after API change to
 	      &man.dpv.3;.</entry>
 	  </row>
 
 	  <row>
 	    <entry>1100098</entry>
 	    <entry><revnumber>295682</revnumber></entry>
 	    <entry>February 16, 2016</entry>
 	    <entry>11.0-CURRENT after API change to rman (rev
 	      <revnumber>294883</revnumber>).</entry>
 	  </row>
 
 	  <row>
 	    <entry>1100099</entry>
 	    <entry><revnumber>295739</revnumber></entry>
 	    <entry>February 18, 2016</entry>
 	    <entry>11.0-CURRENT after allowing drivers to set the TCP
 	      ACK/data segment aggregation limit.</entry>
 	  </row>
 
 	  <row>
 	    <entry>1100100</entry>
 	    <entry><revnumber>296136</revnumber></entry>
 	    <entry>February 26, 2016</entry>
 	    <entry>11.0-CURRENT after
 	      &man.bus.alloc.resource.anywhere.9; API
 	      addition.</entry>
 	  </row>
 
 	  <row>
 	    <entry>1100101</entry>
 	    <entry><revnumber>296417</revnumber></entry>
 	    <entry>March  5, 2016</entry>
 	    <entry>11.0-CURRENT after upgrading our copies of clang,
 	      llvm, lldb and compiler-rt to 3.8.0 release.</entry>
 	  </row>
 
 	  <row>
 	    <entry>1100102</entry>
 	    <entry><revnumber>296749</revnumber></entry>
 	    <entry>March 12, 2016</entry>
 	    <entry>11.0-CURRENT after libelf cross-endian fix in rev
 	      <revnumber>296685</revnumber>.</entry>
 	  </row>
 
 	  <row>
 	    <entry>1100103</entry>
 	    <entry><revnumber>297000</revnumber></entry>
 	    <entry>March 18, 2016</entry>
 	    <entry>11.0-CURRENT after using uintmax_t for rman
 	      ranges.</entry>
 	  </row>
 
 	  <row>
 	    <entry>1100104</entry>
 	    <entry><revnumber>297156</revnumber></entry>
 	    <entry>March 21, 2016</entry>
 	    <entry>11.0-CURRENT after tracking filemon usage via a
 	      proc.p_filemon pointer rather than its own
 	      lists.</entry>
 	  </row>
 
 	  <row>
 	    <entry>1100105</entry>
 	    <entry><revnumber>297602</revnumber></entry>
 	    <entry>April  6, 2016</entry>
 	    <entry>11.0-CURRENT after fixing sed functions
 	      <literal>i</literal> and <literal>a</literal> from
 	      discarding leading white space.</entry>
 	  </row>
 
 	  <row>
 	    <entry>1100106</entry>
 	    <entry><revnumber>298486</revnumber></entry>
 	    <entry>April 22, 2016</entry>
 	    <entry>11.0-CURRENT after fixes for using IPv6 addresses
 	      with RDMA.</entry>
 	  </row>
 
 	  <row>
 	    <entry>1100107</entry>
 	    <entry><revnumber>299090</revnumber></entry>
 	    <entry>May  4, 2016</entry>
 	    <entry>11.0-CURRENT after improving performance and
 	      functionality of the &man.bitstring.3; api.</entry>
 	  </row>
 
 	  <row>
 	    <entry>1100108</entry>
 	    <entry><revnumber>299530</revnumber></entry>
 	    <entry>May 12, 2016</entry>
 	    <entry>11.0-CURRENT after fixing handling of IOCTLs in the
 	      LinuxKPI.</entry>
 	  </row>
 
 	  <row>
 	    <entry>1100109</entry>
 	    <entry><revnumber>299933</revnumber></entry>
 	    <entry>May 16, 2016</entry>
 	    <entry>11.0-CURRENT after implementing more Linux device
 	      related functions in the LinuxKPI.</entry>
 	  </row>
 
 	  <row>
 	    <entry>1100110</entry>
 	    <entry><revnumber>300207</revnumber></entry>
 	    <entry>May 19, 2016</entry>
 	    <entry>11.0-CURRENT after adding support for managing
 	      Shingled Magnetic Recording (SMR) drives.</entry>
 	  </row>
 
 	  <row>
 	    <entry>1100111</entry>
 	    <entry><revnumber>300303</revnumber></entry>
 	    <entry>May 20, 2016</entry>
 	    <entry>11.0-CURRENT after removing brk and sbrk from
 	      arm64.</entry>
 	  </row>
 
 	  <row>
 	    <entry>1100112</entry>
 	    <entry><revnumber>300539</revnumber></entry>
 	    <entry>May 23, 2016</entry>
 	    <entry>11.0-CURRENT after adding bit_count to the
 	      &man.bitstring.3; API.</entry>
 	  </row>
 
 	  <row>
 	    <entry>1100113</entry>
 	    <entry><revnumber>300701</revnumber></entry>
 	    <entry>May 26, 2016</entry>
 	    <entry>11.0-CURRENT after disabling alignment faults on
 	      armv6.</entry>
 	  </row>
 
 	  <row>
 	    <entry>1100114</entry>
 	    <entry><revnumber>300806</revnumber></entry>
 	    <entry>May 26, 2016</entry>
 	    <entry>11.0-CURRENT after fixing &man.crunchgen.1; usage
 	      with <varname>MAKEOBJDIRPREFIX</varname>.</entry>
 	  </row>
 
 	  <row>
 	    <entry>1100115</entry>
 	    <entry><revnumber>300982</revnumber></entry>
 	    <entry>May 30, 2016</entry>
 	    <entry>11.0-CURRENT after adding an mbuf flag for
 	      <literal>M_HASHTYPE_</literal>.</entry>
 	  </row>
 
 	  <row>
 	    <entry>1100116</entry>
 	    <entry><revnumber>301011</revnumber></entry>
 	    <entry>May 31, 2016</entry>
 	    <entry>11.0-CURRENT after SHA-512t256 (rev
 	      <revnumber>300903</revnumber>) and Skein (rev
 	      <revnumber>300966</revnumber>) where added to libmd,
 	      libcrypt, the kernel, and ZFS (rev
 	      <revnumber>301010</revnumber>).</entry>
 	  </row>
 
 	  <row>
 	    <entry>1100117</entry>
 	    <entry><revnumber>301892</revnumber></entry>
 	    <entry>June 6, 2016</entry>
 	    <entry>11.0-CURRENT after libpam was synced with stock
 	      <revnumber>301602</revnumber>, bumping library
 	      version.</entry>
 	  </row>
 
 	  <row>
 	    <entry>1100118</entry>
 	    <entry><revnumber>302071</revnumber></entry>
 	    <entry>June 21, 2016</entry>
 	    <entry>11.0-CURRENT after breaking binary compatibility of
 	      struct disk <revnumber>302069</revnumber>.</entry>
 	  </row>
 
 	  <row>
 	    <entry>1100119</entry>
 	    <entry><revnumber>302150</revnumber></entry>
 	    <entry>June 23, 2016</entry>
 	    <entry>11.0-CURRENT after switching geom_disk to using a
 	      pool mutex.</entry>
 	  </row>
 
 	  <row>
 	    <entry>1100120</entry>
 	    <entry><revnumber>302153</revnumber></entry>
 	    <entry>June 23, 2016</entry>
 	    <entry>11.0-CURRENT after adding spares to struct
 	      ifnet.</entry>
 	  </row>
 
 	  <row>
 	    <entry>1100121</entry>
 	    <entry><revnumber>303979</revnumber></entry>
 	    <entry>August 12, 2015</entry>
 	    <entry>11-STABLE after <literal>releng/11.0</literal>
 	      branched from 11-STABLE (rev
 	      <revnumber>303975</revnumber>).</entry>
 	  </row>
 
 	  <row>
 	    <entry>1100500</entry>
 	    <entry><revnumber>303979</revnumber></entry>
 	    <entry>August 12, 2016</entry>
 	    <entry>11.0-STABLE adding branched
 	      <revnumber>303976</revnumber>.</entry>
 	  </row>
 
 	  <row>
 	    <entry>1100501</entry>
 	    <entry><revnumber>304609</revnumber></entry>
 	    <entry>August 22, 2016</entry>
 	    <entry>11.0-STABLE after adding C++11 thread_local
 	      support.</entry>
 	  </row>
 
 	  <row>
 	    <entry>1100502</entry>
 	    <entry><revnumber>304865</revnumber></entry>
 	    <entry>August 26, 2016</entry>
 	    <entry>11.0-STABLE after
 	      <varname>LC_<replaceable>*</replaceable>_MASK</varname>
 	      fix.</entry>
 	  </row>
 
 	  <row>
 	    <entry>1100503</entry>
 	    <entry><revnumber>305733</revnumber></entry>
 	    <entry>September 12, 2016</entry>
 	    <entry>11.0-STABLE after resolving a deadlock between
 	      <function>device_detach()</function> and
 	      &man.usbd.do.request.flags.9;.</entry>
 	  </row>
 
 	  <row>
 	    <entry>1100504</entry>
 	    <entry><revnumber>307330</revnumber></entry>
 	    <entry>October 14, 2016</entry>
 	    <entry>11.0-STABLE after ZFS merges.</entry>
 	  </row>
 
 	  <row>
 	    <entry>1100505</entry>
 	    <entry><revnumber>307590</revnumber></entry>
 	    <entry>October 19, 2016</entry>
 	    <entry>11.0-STABLE after <literal>struct fb_info</literal>
 	      change.</entry>
 	  </row>
 
 	  <row>
 	    <entry>1100506</entry>
 	    <entry><revnumber>308048</revnumber></entry>
 	    <entry>October 28, 2016</entry>
 	    <entry>11.0-STABLE after installing header files required
 	      development with libzfs_core.</entry>
 	  </row>
 	</tbody>
       </tgroup>
     </table>
   </sect1>
 
   <sect1 xml:id="versions-10">
     <title>&os; 10 Versions</title>
 
     <table frame="none" xml:id="freebsd-versions-table-10">
       <title>&os; 10 <literal>__FreeBSD_version</literal>
 	Values</title>
 
       <tgroup cols="4">
 	<thead>
 	  <row>
 	    <entry>Value</entry>
 
 	    <entry>Revision</entry>
 
 	    <entry>Date</entry>
 
 	    <entry>Release</entry>
 	  </row>
 	</thead>
 
 	<tbody>
 	  <row>
 	    <entry>1000000</entry>
 	    <entry><revnumber>225757</revnumber></entry>
 	    <entry>September 26, 2011</entry>
 	    <entry>10.0-CURRENT.</entry>
 	  </row>
 
 	  <row>
 	    <entry>1000001</entry>
 	    <entry><revnumber>227070</revnumber></entry>
 	    <entry>November 4, 2011</entry>
 	    <entry>10-CURRENT after addition of the
 	      &man.posix.fadvise.2; system call.</entry>
 	  </row>
 
 	  <row>
 	    <entry>1000002</entry>
 	    <entry><revnumber>228444</revnumber></entry>
 	    <entry>December 12, 2011</entry>
 	    <entry>10-CURRENT after defining boolean true/false in
 	      sys/types.h, sizeof(bool) may have changed (rev
 	      <revnumber>228444</revnumber>).  10-CURRENT after
 	      xlocale.h was introduced (rev
 	      <revnumber>227753</revnumber>).</entry>
 	  </row>
 
 	  <row>
 	    <entry>1000003</entry>
 	    <entry><revnumber>228571</revnumber></entry>
 	    <entry>December 16, 2011</entry>
 	    <entry>10-CURRENT after major changes to &man.carp.4;,
 	      changing size of struct&nbsp;in_aliasreq,
 	      struct&nbsp;in6_aliasreq (rev
 	      <revnumber>228571</revnumber>) and straitening arguments
 	      check of SIOCAIFADDR (rev
 	      <revnumber>228574</revnumber>).</entry>
 	  </row>
 
 	  <row>
 	    <entry>1000004</entry>
 	    <entry><revnumber>229204</revnumber></entry>
 	    <entry>January 1, 2012</entry>
 	    <entry>10-CURRENT after the removal of
 	      <function>skpc()</function> and the addition of
 	      &man.memcchr.9; (rev
 	      <revnumber>229200</revnumber>).</entry>
 	  </row>
 
 	  <row>
 	    <entry>1000005</entry>
 	    <entry><revnumber>230207</revnumber></entry>
 	    <entry>January 16, 2012</entry>
 	    <entry>10-CURRENT after the removal of support for
 	      SIOCSIFADDR, SIOCSIFNETMASK, SIOCSIFBRDADDR,
 	      SIOCSIFDSTADDR ioctls.</entry>
 	  </row>
 
 	  <row>
 	    <entry>1000006</entry>
 	    <entry><revnumber>230590</revnumber></entry>
 	    <entry>January 26, 2012</entry>
 	    <entry>10-CURRENT after introduction of read capacity data
 	      asynchronous notification in the &man.cam.4;
 	      layer.</entry>
 	  </row>
 
 	  <row>
 	    <entry>1000007</entry>
 	    <entry><revnumber>231025</revnumber></entry>
 	    <entry>February 5, 2012</entry>
 	    <entry>10-CURRENT after introduction of new &man.tcp.4;
 	      socket options: TCP_KEEPINIT, TCP_KEEPIDLE,
 	      TCP_KEEPINTVL, and TCP_KEEPCNT.</entry>
 	  </row>
 
 	  <row>
 	    <entry>1000008</entry>
 	    <entry><revnumber>231505</revnumber></entry>
 	    <entry>February 11, 2012</entry>
 	    <entry>10-CURRENT after introduction of the new extensible
 	      &man.sysctl.3; interface NET_RT_IFLISTL to query address
 	      lists.</entry>
 	  </row>
 
 	  <row>
 	    <entry>1000009</entry>
 	    <entry><revnumber>232154</revnumber></entry>
 	    <entry>February 25, 2012</entry>
 	    <entry>10-CURRENT after import of libarchive 3.0.3 (rev
 	      <revnumber>232153</revnumber>).</entry>
 	  </row>
 
 	  <row>
 	    <entry>1000010</entry>
 	    <entry><revnumber>233757</revnumber></entry>
 	    <entry>March 31, 2012</entry>
 	    <entry>10-CURRENT after xlocale cleanup.</entry>
 	  </row>
 
 	  <row>
 	    <entry>1000011</entry>
 	    <entry><revnumber>234355</revnumber></entry>
 	    <entry>April 16, 2012</entry>
 	    <entry>10-CURRENT import of LLVM/Clang 3.1 trunk
 	      <revnumber>154661</revnumber> (rev
 	      <revnumber>234353</revnumber>).</entry>
 	  </row>
 
 	  <row>
 	    <entry>1000012</entry>
 	    <entry><revnumber>234924</revnumber></entry>
 	    <entry>May 2, 2012</entry>
 	    <entry>10-CURRENT jemalloc import.</entry>
 	  </row>
 
 	  <row>
 	    <entry>1000013</entry>
 	    <entry><revnumber>235788</revnumber></entry>
 	    <entry>May 22, 2012</entry>
 	    <entry>10-CURRENT after byacc import.</entry>
 	  </row>
 
 	  <row>
 	    <entry>1000014</entry>
 	    <entry><revnumber>237631</revnumber></entry>
 	    <entry>June 27, 2012</entry>
 	    <entry>10-CURRENT after BSD sort becoming the default sort
 	      (rev <revnumber>237629</revnumber>).</entry>
 	  </row>
 
 	  <row>
 	    <entry>1000015</entry>
 	    <entry><revnumber>238405</revnumber></entry>
 	    <entry>July 12, 2012</entry>
 	    <entry>10-CURRENT after import of OpenSSL 1.0.1c.</entry>
 	  </row>
 
 	  <row>
 	    <entry>(not changed)</entry>
 	    <entry><revnumber>238429</revnumber></entry>
 	    <entry>July 13, 2012</entry>
 	    <entry>10-CURRENT after the fix for LLVM/Clang 3.1
 	      regression.</entry>
 	  </row>
 
 	  <row>
 	    <entry>1000016</entry>
 	    <entry><revnumber>239179</revnumber></entry>
 	    <entry>August 8, 2012</entry>
 	    <entry>10-CURRENT after KBI change in
 	      &man.ucom.4;.</entry>
 	  </row>
 
 	  <row>
 	    <entry>1000017</entry>
 	    <entry><revnumber>239214</revnumber></entry>
 	    <entry>August 8, 2012</entry>
 	    <entry>10-CURRENT after adding streams feature to the USB
 	      stack.</entry>
 	  </row>
 
 	  <row>
 	    <entry>1000018</entry>
 	    <entry><revnumber>240233</revnumber></entry>
 	    <entry>September 8, 2012</entry>
 	    <entry>10-CURRENT after major rewrite of
 	      &man.pf.4;.</entry>
 	  </row>
 
 	  <row>
 	    <entry>1000019</entry>
 	    <entry><revnumber>241245</revnumber></entry>
 	    <entry>October 6, 2012</entry>
 	    <entry>10-CURRENT after &man.pfil.9; KBI/KPI changed to
 	      supply packets in net byte order to AF_INET filter
 	      hooks.</entry>
 	  </row>
 
 	  <row>
 	    <entry>1000020</entry>
 	    <entry><revnumber>241610</revnumber></entry>
 	    <entry>October 16, 2012</entry>
 	    <entry>10-CURRENT after the network interface cloning KPI
 	      changed and struct if_clone becoming opaque.</entry>
 	  </row>
 
 	  <row>
 	    <entry>1000021</entry>
 	    <entry><revnumber>241897</revnumber></entry>
 	    <entry>October 22, 2012</entry>
 	    <entry>10-CURRENT after removal of support for non-MPSAFE
 	      filesystems and addition of support for FUSEFS (rev
 	      <revnumber>241519</revnumber>).</entry>
 	  </row>
 
 	  <row>
 	    <entry>1000022</entry>
 	    <entry><revnumber>241913</revnumber></entry>
 	    <entry>October 22, 2012</entry>
 	    <entry>10-CURRENT after the entire IPv4 stack switched to
 	      network byte order for IP packet header storage.</entry>
 	  </row>
 
 	  <row>
 	    <entry>1000023</entry>
 	    <entry><revnumber>242619</revnumber></entry>
 	    <entry>November 5, 2012</entry>
 	    <entry>10-CURRENT after jitter buffer in the common USB
 	      serial driver code, to temporarily store characters if
 	      the TTY buffer is full.  Add flow stop and start signals
 	      when this happens.</entry>
 	  </row>
 
 	  <row>
 	    <entry>1000024</entry>
 	    <entry><revnumber>242624</revnumber></entry>
 	    <entry>November 5, 2012</entry>
 	    <entry>10-CURRENT after clang was made the default
 	      compiler on i386 and amd64.</entry>
 	  </row>
 
 	  <row>
 	    <entry>1000025</entry>
 	    <entry><revnumber>243443</revnumber></entry>
 	    <entry>November 17, 2012</entry>
 	    <entry>10-CURRENT after the sin6_scope_id member variable
 	      in struct sockaddr_in6 was changed to being filled by
 	      the kernel before passing the structure to the userland
 	      via sysctl or routing socket.  This means the
 	      KAME-specific embedded scope id in sin6_addr.s6_addr[2]
 	      is always cleared in userland application.</entry>
 	  </row>
 
 	  <row>
 	    <entry>1000026</entry>
 	    <entry><revnumber>245313</revnumber></entry>
 	    <entry>January 11, 2013</entry>
 	    <entry>10-CURRENT after install gained the -N flag.  May
 	      also be used to indicate the presence of nmtree.</entry>
 	  </row>
 
 	  <row>
 	    <entry>1000027</entry>
 	    <entry><revnumber>246084</revnumber></entry>
 	    <entry>January 29, 2013</entry>
 	    <entry>10-CURRENT after cat gained the -l flag (rev
 	      <revnumber>246083</revnumber>).</entry>
 	  </row>
 
 	  <row>
 	    <entry>1000028</entry>
 	    <entry><revnumber>246759</revnumber></entry>
 	    <entry>February 13, 2013</entry>
 	    <entry>10-CURRENT after USB moved to the driver structure
 	      requiring a rebuild of all USB modules.</entry>
 	  </row>
 
 	  <row>
 	    <entry>1000029</entry>
 	    <entry><revnumber>247821</revnumber></entry>
 	    <entry>March 4, 2013</entry>
 	    <entry>10-CURRENT after the introduction of tickless
 	      callout facility which also changed the layout of struct
 	      callout (rev <revnumber>247777</revnumber>).</entry>
 	  </row>
 
 	  <row>
 	    <entry>1000030</entry>
 	    <entry><revnumber>248210</revnumber></entry>
 	    <entry>March 12, 2013</entry>
 	    <entry>10-CURRENT after KPI breakage introduced in the VM
 	      subsystem to support read/write locking (rev
 	      <revnumber>248084</revnumber>).</entry>
 	  </row>
 
 	  <row>
 	    <entry>1000031</entry>
 	    <entry><revnumber>249943</revnumber></entry>
 	    <entry>April 26, 2013</entry>
 	    <entry>10-CURRENT after the dst parameter of the ifnet
 	      <function>if_output</function> method was changed to
 	      take const qualifier (rev
 	      <revnumber>249925</revnumber>).</entry>
 	  </row>
 
 	  <row>
 	    <entry>1000032</entry>
 	    <entry><revnumber>250163</revnumber></entry>
 	    <entry>May 1, 2013</entry>
 	    <entry>10-CURRENT after the introduction of the
 	      &man.accept4.2; (rev <revnumber>250154</revnumber>) and
 	      &man.pipe2.2; (rev <revnumber>250159</revnumber>) system
 	      calls.</entry>
 	  </row>
 
 	  <row>
 	    <entry>1000033</entry>
 	    <entry><revnumber>250881</revnumber></entry>
 	    <entry>May 21, 2013</entry>
 	    <entry>10-CURRENT after flex 2.5.37 import.</entry>
 	  </row>
 
 	  <row>
 	    <entry>1000034</entry>
 	    <entry><revnumber>251294</revnumber></entry>
 	    <entry>June 3, 2013</entry>
 	    <entry>10-CURRENT after the addition of these functions to
 	      libm: &man.cacos.3;, &man.cacosf.3;, &man.cacosh.3;,
 	      &man.cacoshf.3;, &man.casin.3;, &man.casinf.3;,
 	      &man.casinh.3;, &man.casinhf.3;, &man.catan.3;,
 	      &man.catanf.3;, &man.catanh.3;, &man.catanhf.3;,
 	      &man.logl.3;, &man.log2l.3;, &man.log10l.3;,
 	      &man.log1pl.3;, &man.expm1l.3;.</entry>
 	  </row>
 
 	  <row>
 	    <entry>1000035</entry>
 	    <entry><revnumber>251527</revnumber></entry>
 	    <entry>June 8, 2013</entry>
 	    <entry>10-CURRENT after the introduction of the
 	      &man.aio.mlock.2; system call (rev
 	      <revnumber>251526</revnumber>).</entry>
 	  </row>
 
 	  <row>
 	    <entry>1000036</entry>
 	    <entry><revnumber>253049</revnumber></entry>
 	    <entry>July 9, 2013</entry>
 	    <entry>10-CURRENT after the addition of a new function to
 	      the kernel GSSAPI module's function call
 	      interface.</entry>
 	  </row>
 
 	  <row>
 	    <entry>1000037</entry>
 	    <entry><revnumber>253089</revnumber></entry>
 	    <entry>July 9, 2013</entry>
 	    <entry>10-CURRENT after the migration of statistics
 	      structures to PCPU counters.  Changed structures
 	      include: <literal>ahstat</literal>,
 	      <literal>arpstat</literal>, <literal>espstat</literal>,
 	      <literal>icmp6_ifstat</literal>,
 	      <literal>icmp6stat</literal>,
 	      <literal>in6_ifstat</literal>,
 	      <literal>ip6stat</literal>,
 	      <literal>ipcompstat</literal>,
 	      <literal>ipipstat</literal>,
 	      <literal>ipsecstat</literal>,
 	      <literal>mrt6stat</literal>, <literal>mrtstat</literal>,
 	      <literal>pfkeystat</literal>,
 	      <literal>pim6stat</literal>, <literal>pimstat</literal>,
 	      <literal>rip6stat</literal>, <literal>udpstat</literal>
 	      (rev <revnumber>253081</revnumber>).</entry>
 	  </row>
 
 	  <row>
 	    <entry>1000038</entry>
 	    <entry><revnumber>253396</revnumber></entry>
 	    <entry>July 16, 2013</entry>
 	    <entry>10-CURRENT after making <literal>ARM EABI</literal>
 	      the default ABI on arm, armeb, armv6, and armv6eb
 	      architectures.</entry>
 	  </row>
 
 	  <row>
 	    <entry>1000039</entry>
 	    <entry><revnumber>253549</revnumber></entry>
 	    <entry>July 22, 2013</entry>
 	    <entry>10-CURRENT after <literal>CAM</literal> and
 	      &man.mps.4; driver scanning changes.</entry>
 	  </row>
 
 	  <row>
 	    <entry>1000040</entry>
 	    <entry><revnumber>253638</revnumber></entry>
 	    <entry>July 24, 2013</entry>
 	    <entry>10-CURRENT after addition of libusb pkgconf
 	      files.</entry>
 	  </row>
 
 	  <row>
 	    <entry>1000041</entry>
 	    <entry><revnumber>253970</revnumber></entry>
 	    <entry>August 5, 2013</entry>
 	    <entry>10-CURRENT after change from
 	      <function>time_second</function> to
 	      <function>time_uptime</function> in
 	      <literal>PF_INET6</literal>.</entry>
 	  </row>
 
 	  <row>
 	    <entry>1000042</entry>
 	    <entry><revnumber>254138</revnumber></entry>
 	    <entry>August 9, 2013</entry>
 	    <entry>10-CURRENT after VM subsystem change to unify soft
 	      and hard busy mechanisms.</entry>
 	  </row>
 
 	  <row>
 	    <entry>1000043</entry>
 	    <entry><revnumber>254273</revnumber></entry>
 	    <entry>August 13, 2013</entry>
 	    <entry>10-CURRENT after <varname>WITH_ICONV</varname> is
 	      enabled by default.  A new &man.src.conf.5; option,
 	      <varname>WITH_LIBICONV_COMPAT</varname> (disabled by
 	      default) adds <function>libiconv_open</function> to
 	      provide compatibility with the
 	      <package>libiconv</package> port.</entry>
 	  </row>
 
 	  <row>
 	    <entry>1000044</entry>
 	    <entry><revnumber>254358</revnumber></entry>
 	    <entry>August 15, 2013</entry>
 	    <entry>10-CURRENT after <literal>libc.so</literal>
 	      conversion to an &man.ld.1; script (rev
 	      <revnumber>251668</revnumber>).</entry>
 	  </row>
 
 	  <row>
 	    <entry>1000045</entry>
 	    <entry><revnumber>254389</revnumber></entry>
 	    <entry>August 15, 2013</entry>
 	    <entry>10-CURRENT after devfs programming interface change
 	      by replacing the cdevsw flag
 	      <literal>D_UNMAPPED_IO</literal> with the struct cdev
 	      flag <literal>SI_UNMAPPED</literal>.</entry>
 	  </row>
 
 	  <row>
 	    <entry>1000046</entry>
 	    <entry><revnumber>254537</revnumber></entry>
 	    <entry>August 19, 2013</entry>
 	    <entry>10-CURRENT after addition of
 	      <literal>M_PROTO[9-12]</literal> and removal of
 	      <literal>M_FRAG|M_FIRSTFRAG|M_LASTFRAG</literal> mbuf
 	      flags (rev <revnumber>254524</revnumber>,
 	      <revnumber>254526</revnumber>).</entry>
 	  </row>
 
 	  <row>
 	    <entry>1000047</entry>
 	    <entry><revnumber>254627</revnumber></entry>
 	    <entry>August 21, 2013</entry>
 	    <entry>10-CURRENT after &man.stat.2; update to allow
 	      storing some Windows/DOS and CIFS file attributes as
 	      &man.stat.2; flags.</entry>
 	  </row>
 
 	  <row>
 	    <entry>1000048</entry>
 	    <entry><revnumber>254672</revnumber></entry>
 	    <entry>August 22, 2013</entry>
 	    <entry>10-CURRENT after modification of structure
 	      <literal>xsctp_inpcb</literal>.</entry>
 	  </row>
 
 	  <row>
 	    <entry>1000049</entry>
 	    <entry><revnumber>254760</revnumber></entry>
 	    <entry>August 24, 2013</entry>
 	    <entry>10-CURRENT after &man.physio.9; support for devices
 	      that do not function properly with split I/O, such as
 	      &man.sa.4;.</entry>
 	  </row>
 
 	  <row>
 	    <entry>1000050</entry>
 	    <entry><revnumber>254844</revnumber></entry>
 	    <entry>August 24, 2013</entry>
 	    <entry>10-CURRENT after modifications of structure
 	      <literal>mbuf</literal> (rev
 	      <revnumber>254780</revnumber>,
 	      <revnumber>254799</revnumber>,
 	      <revnumber>254804</revnumber>,
 	      <revnumber>254807</revnumber>
 	      <revnumber>254842</revnumber>).</entry>
 	  </row>
 
 	  <row>
 	    <entry>1000051</entry>
 	    <entry><revnumber>254887</revnumber></entry>
 	    <entry>August 25, 2013</entry>
 	    <entry>10-CURRENT after Radeon KMS driver import (rev
 	      <revnumber>254885</revnumber>).</entry>
 	  </row>
 
 	  <row>
 	    <entry>1000052</entry>
 	    <entry><revnumber>255180</revnumber></entry>
 	    <entry>September 3, 2013</entry>
 	    <entry>10-CURRENT after import of NetBSD
 	      <literal>libexecinfo</literal> is connected to the
 	      build.</entry>
 	  </row>
 
 	  <row>
 	    <entry>1000053</entry>
 	    <entry><revnumber>255305</revnumber></entry>
 	    <entry>September 6, 2013</entry>
 	    <entry>10-CURRENT after API and ABI changes to the
 	      Capsicum framework.</entry>
 	  </row>
 
 	  <row>
 	    <entry>1000054</entry>
 	    <entry><revnumber>255321</revnumber></entry>
 	    <entry>September 6, 2013</entry>
 	    <entry>10-CURRENT after <literal>gcc</literal> and
 	      <literal>libstdc++</literal> are no longer built by
 	      default.</entry>
 	  </row>
 
 	  <row>
 	    <entry>1000055</entry>
 	    <entry><revnumber>255449</revnumber></entry>
 	    <entry>September 6, 2013</entry>
 	    <entry>10-CURRENT after addition of
 	      <literal>MMAP_32BIT</literal> &man.mmap.2; flag (rev
 	      <revnumber>255426</revnumber>).</entry>
 	  </row>
 
 	  <row>
 	    <entry>1000100</entry>
 	    <entry><revnumber>259065</revnumber></entry>
 	    <entry>December 7, 2013</entry>
 	    <entry><literal>releng/10.0</literal> branched from
 	      <literal>stable/10</literal>.</entry>
 	  </row>
 
 	  <row>
 	    <entry>1000500</entry>
 	    <entry><revnumber>256283</revnumber></entry>
 	    <entry>October 10, 2013</entry>
 	    <entry>10-STABLE after branch from
 	      <literal>head/</literal>.</entry>
 	  </row>
 
 	  <row>
 	    <entry>1000501</entry>
 	    <entry><revnumber>256916</revnumber></entry>
 	    <entry>October 22, 2013</entry>
 	    <entry>10-STABLE after addition of first-boot &man.rc.8;
 	      support.</entry>
 	  </row>
 
 	  <row>
 	    <entry>1000502</entry>
 	    <entry><revnumber>258398</revnumber></entry>
 	    <entry>November 20, 2013</entry>
 	    <entry>10-STABLE after removal of iconv symbols from
 	      <literal>libc.so.7</literal>.</entry>
 	  </row>
 
 	  <row>
 	    <entry>1000510</entry>
 	    <entry><revnumber>259067</revnumber></entry>
 	    <entry>December 7, 2013</entry>
 	    <entry><literal>releng/10.0</literal> __FreeBSD_version
 	      update to prevent the value from going
 	      backwards.</entry>
 	  </row>
 
 	  <row>
 	    <entry>1000700</entry>
 	    <entry><revnumber>259069</revnumber></entry>
 	    <entry>December 7, 2013</entry>
 	    <entry>10-STABLE after <literal>releng/10.0</literal>
 	      branch.</entry>
 	  </row>
 
 	  <row>
 	    <entry>1000701</entry>
 	    <entry><revnumber>259447</revnumber></entry>
 	    <entry>December 15, 2013</entry>
 	    <entry>10.0-STABLE after Heimdal encoding fix.</entry>
 	  </row>
 
 	  <row>
 	    <entry>1000702</entry>
 	    <entry><revnumber>260135</revnumber></entry>
 	    <entry>December 31, 2013</entry>
 	    <entry>10-STABLE after MAP_STACK fixes.</entry>
 	  </row>
 
 	  <row>
 	    <entry>1000703</entry>
 	    <entry><revnumber>262801</revnumber></entry>
 	    <entry>March 5, 2014</entry>
 	    <entry>10-STABLE after upgrade of libc++ to 3.4
 	      release.</entry>
 	  </row>
 
 	  <row>
 	    <entry>1000704</entry>
 	    <entry><revnumber>262889</revnumber></entry>
 	    <entry>March 7, 2014</entry>
 	    <entry>10-STABLE after MFC of the &man.vt.4; driver (rev
 	      <revnumber>262861</revnumber>).</entry>
 	  </row>
 
 	  <row>
 	    <entry>1000705</entry>
 	    <entry><revnumber>263508</revnumber></entry>
 	    <entry>March 21, 2014</entry>
 	    <entry>10-STABLE after upgrade of llvm/clang to 3.4
 	      release.</entry>
 	  </row>
 
 	  <row>
 	    <entry>1000706</entry>
 	    <entry><revnumber>264214</revnumber></entry>
 	    <entry>April 6, 2014</entry>
 	    <entry>10-STABLE after GCC support for
 	      <literal>__block</literal> definition.</entry>
 	  </row>
 
 	  <row>
 	    <entry>1000707</entry>
 	    <entry><revnumber>264289</revnumber></entry>
 	    <entry>April 8, 2014</entry>
 	    <entry>10-STABLE after FreeBSD-SA-14:06.openssl.</entry>
 	  </row>
 
 	  <row>
 	    <entry>1000708</entry>
 	    <entry><revnumber>265122</revnumber></entry>
 	    <entry>April 30, 2014</entry>
 	    <entry>10-STABLE after FreeBSD-SA-14:07.devfs,
 	      FreeBSD-SA-14:08.tcp, and
 	      FreeBSD-SA-14:09.openssl.</entry>
 	  </row>
 
 	  <row>
 	    <entry>1000709</entry>
 	    <entry><revnumber>265946</revnumber></entry>
 	    <entry>May 13, 2014</entry>
 	    <entry>10-STABLE after support for UDP-Lite protocol (RFC
 	      3828).</entry>
 	  </row>
 
 	  <row>
 	    <entry>1000710</entry>
 	    <entry><revnumber>267465</revnumber></entry>
 	    <entry>June 13, 2014</entry>
 	    <entry>10-STABLE after changes to &man.strcasecmp.3;,
 	      moving &man.strcasecmp.l.3; and &man.strncasecmp.l.3;
 	      from <filename>&lt;string.h&gt;</filename> to
 	      <filename>&lt;strings.h&gt;</filename> for POSIX 2008
 	      compliance.</entry>
 	  </row>
 
 	  <row>
 	    <entry>1000711</entry>
 	    <entry><revnumber>268442</revnumber></entry>
 	    <entry>July 8, 2014</entry>
 	    <entry>10-STABLE after FreeBSD-SA-14:17.kmem (rev
 	      <revnumber>268432</revnumber>).</entry>
 	  </row>
 
 	  <row>
 	    <entry>1000712</entry>
 	    <entry><revnumber>269400</revnumber></entry>
 	    <entry>August 1, 2014</entry>
 	    <entry>10-STABLE after &man.nfsd.8;&nbsp;4.1 merge (rev
 	      <revnumber>269398</revnumber>).</entry>
 	  </row>
 
 	  <row>
 	    <entry>1000713</entry>
 	    <entry><revnumber>269484</revnumber></entry>
 	    <entry>August 3, 2014</entry>
 	    <entry>10-STABLE after &man.regex.3; library update to add
 	      <quote>&gt;</quote> and <quote>&lt;</quote>
 	      delimiters.</entry>
 	  </row>
 
 	  <row>
 	    <entry>1000714</entry>
 	    <entry><revnumber>270174</revnumber></entry>
 	    <entry>August 3, 2014</entry>
 	    <entry>10-STABLE after <literal>SOCK_DGRAM</literal> bug
 	      fix (rev <revnumber>269490</revnumber>).</entry>
 	  </row>
 
 	  <row>
 	    <entry>1000715</entry>
 	    <entry><revnumber>271341</revnumber></entry>
 	    <entry>September 9, 2014</entry>
 	    <entry>10-STABLE after FreeBSD-SA-14:18 (rev
 	      <revnumber>269686</revnumber>).</entry>
 	  </row>
 
 	  <row>
 	    <entry>1000716</entry>
 	    <entry><revnumber>271686</revnumber></entry>
 	    <entry>September 16, 2014</entry>
 	    <entry>10-STABLE after FreeBSD-SA-14:19 (rev
 	      <revnumber>271667</revnumber>).</entry>
 	  </row>
 
 	  <row>
 	    <entry>1000717</entry>
 	    <entry><revnumber>271816</revnumber></entry>
 	    <entry>September 18, 2014</entry>
 	    <entry>10-STABLE after i915 HW context support.</entry>
 	  </row>
 
 	  <row>
 	    <entry>1001000</entry>
 	    <entry><revnumber>272463</revnumber></entry>
 	    <entry>October 2, 2014</entry>
 	    <entry>10.1-RC1 after releng/10.1 branch.</entry>
 	  </row>
 
 	  <row>
 	    <entry>1001500</entry>
 	    <entry><revnumber>272464</revnumber></entry>
 	    <entry>October 2, 2014</entry>
 	    <entry>10-STABLE after releng/10.1 branch.</entry>
 	  </row>
 
 	  <row>
 	    <entry>1001501</entry>
 	    <entry><revnumber>273432</revnumber></entry>
 	    <entry>October 21, 2014</entry>
 	    <entry>10-STABLE after FreeBSD-SA-14:20, FreeBSD-SA-14:22,
 	      and FreeBSD-SA-14:23 (rev
 	      <revnumber>273411</revnumber>).</entry>
 	  </row>
 
 	  <row>
 	    <entry>1001502</entry>
 	    <entry><revnumber>274162</revnumber></entry>
 	    <entry>November 4, 2014</entry>
 	    <entry>10-STABLE after FreeBSD-SA-14:23, FreeBSD-SA-14:24,
 	      and FreeBSD-SA-14:25.</entry>
 	  </row>
 
 	  <row>
 	    <entry>1001503</entry>
 	    <entry><revnumber>275040</revnumber></entry>
 	    <entry>November 25, 2014</entry>
 	    <entry>10-STABLE after merging new libraries/utilities
 	      (&man.dpv.1;, &man.dpv.3;, and &man.figpar.3;) for data
 	      throughput visualization.</entry>
 	  </row>
 
 	  <row>
 	    <entry>1001504</entry>
 	    <entry><revnumber>275742</revnumber></entry>
 	    <entry>December 13, 2014</entry>
 	    <entry>10-STABLE after merging an important fix to the
 	      LLVM vectorizer, which could lead to buffer overruns in
 	      some cases.</entry>
 	  </row>
 
 	  <row>
 	    <entry>1001505</entry>
 	    <entry><revnumber>276633</revnumber></entry>
 	    <entry>January 3, 2015</entry>
 	    <entry>10-STABLE after merging some arm constants in
 	      <revnumber>276312</revnumber>.</entry>
 	  </row>
 
 	  <row>
 	    <entry>1001506</entry>
 	    <entry><revnumber>277087</revnumber></entry>
 	    <entry>January 12, 2015</entry>
 	    <entry>10-STABLE after merging max table size update for
 	      yacc.</entry>
 	  </row>
 
 	  <row>
 	    <entry>1001507</entry>
 	    <entry><revnumber>277790</revnumber></entry>
 	    <entry>January 27, 2015</entry>
 	    <entry>10-STABLE after changes to the UDP tunneling
 	      callback to provide a context pointer and the source
 	      sockaddr.</entry>
 	  </row>
 
 	  <row>
 	    <entry>1001508</entry>
 	    <entry><revnumber>278974</revnumber></entry>
 	    <entry>February 18, 2015</entry>
 	    <entry>10-STABLE after addition of the
 	      <literal>CDAI_TYPE_EXT_INQ</literal> request
 	      type.</entry>
 	  </row>
 
 	  <row>
 	    <entry>1001509</entry>
 	    <entry><revnumber>279287</revnumber></entry>
 	    <entry>February 25, 2015</entry>
 	    <entry>10-STABLE after FreeBSD-EN-15:01.vt,
 	      FreeBSD-EN-15:02.openssl,
 	      FreeBSD-EN-15:03.freebsd-update, FreeBSD-SA-15:04.igmp,
 	      and FreeBSD-SA-15:05.bind.</entry>
 	  </row>
 
 	  <row>
 	    <entry>1001510</entry>
 	    <entry><revnumber>279329</revnumber></entry>
 	    <entry>February 26, 2015</entry>
 	    <entry>10-STABLE after MFC of rev
 	      <revnumber>278964</revnumber>.</entry>
 	  </row>
 
 	  <row>
 	    <entry>1001511</entry>
 	    <entry><revnumber>280246</revnumber></entry>
 	    <entry>19 March, 2015</entry>
 	    <entry>10-STABLE after
 	      <filename>sys/capability.h</filename> is renamed to
 	      <filename>sys/capsicum.h</filename> (rev
 	      <revnumber>280224/</revnumber>).</entry>
 	  </row>
 
 	  <row>
 	    <entry>1001512</entry>
 	    <entry><revnumber>280438</revnumber></entry>
 	    <entry>24 March, 2015</entry>
 	    <entry>10-STABLE after addition of new &man.mtio.4;,
 	      &man.sa.4; ioctls.</entry>
 	  </row>
 
 	  <row>
 	    <entry>1001513</entry>
 	    <entry><revnumber>281955</revnumber></entry>
 	    <entry>24 April, 2015</entry>
 	    <entry>10-STABLE after starting the process of removing
 	      the use of the deprecated "M_FLOWID" flag from the
 	      network code.</entry>
 	  </row>
 
 	  <row>
 	    <entry>1001514</entry>
 	    <entry><revnumber>282275</revnumber></entry>
 	    <entry>April 30, 2015</entry>
 	    <entry>10-STABLE after MFC of &man.iconv.3; fixes.</entry>
 	  </row>
 
 	  <row>
 	    <entry>1001515</entry>
 	    <entry><revnumber>282781</revnumber></entry>
 	    <entry>May 11, 2015</entry>
 	    <entry>10-STABLE after adding back
 	      <literal>M_FLOWID</literal>.</entry>
 	  </row>
 
 	  <row>
 	    <entry>1001516</entry>
 	    <entry><revnumber>283341</revnumber></entry>
 	    <entry>May 24, 2015</entry>
 	    <entry>10-STABLE after MFC of many USB things.</entry>
 	  </row>
 
 	  <row>
 	    <entry>1001517</entry>
 	    <entry><revnumber>283950</revnumber></entry>
 	    <entry>June  3, 2015</entry>
 	    <entry>10-STABLE after MFC of sound related
 	      things.</entry>
 	  </row>
 
 	  <row>
 	    <entry>1001518</entry>
 	    <entry><revnumber>284204</revnumber></entry>
 	    <entry>June 10, 2015</entry>
 	    <entry>10-STABLE after MFC of zfs vfs fixes (rev
 	      <revnumber>284203</revnumber>).</entry>
 	  </row>
 
 	  <row>
 	    <entry>1001519</entry>
 	    <entry><revnumber>284720</revnumber></entry>
 	    <entry>June 23, 2015</entry>
 	    <entry>10-STABLE after reverting bumping
 	      <varname>MAXCPU</varname> on amd64.</entry>
 	  </row>
 
 	  <row>
 	    <entry>1002000</entry>
 	    <entry><revnumber>285830</revnumber></entry>
 	    <entry>24 July, 2015</entry>
 	    <entry><literal>releng/10.2</literal> branched from
 	      10-STABLE.</entry>
 	  </row>
 
 	  <row>
 	    <entry>1002500</entry>
 	    <entry><revnumber>285831</revnumber></entry>
 	    <entry>24 July, 2015</entry>
 	    <entry>10-STABLE after <literal>releng/10.2</literal>
 	      branched from 10-STABLE.</entry>
 	  </row>
 
 	  <row>
 	    <entry>1002501</entry>
 	    <entry><revnumber>289005</revnumber></entry>
 	    <entry>8 October, 2015</entry>
 	    <entry>10-STABLE after merge of ZFS changes that affected
 	      the internal interface of zfeature_info structure (rev
 	      <revnumber>288572</revnumber>).</entry>
 	  </row>
 
 	  <row>
 	    <entry>1002502</entry>
 	    <entry><revnumber>291243</revnumber></entry>
 	    <entry>24 November, 2015</entry>
 	    <entry>10-STABLE after merge of dump device changes that
 	      affected the arguments of
 	      <function>g_dev_setdumpdev()</function>(rev
 	      <revnumber>291215</revnumber>).</entry>
 	  </row>
 
 	  <row>
 	    <entry>1002503</entry>
 	    <entry><revnumber>292224</revnumber></entry>
 	    <entry>14 December, 2015</entry>
 	    <entry>10-STABLE after merge of changes to the internal
 	      interface between the nfsd.ko and nfscommon.ko modules,
 	      requiring them to be upgraded together (rev
 	      <revnumber>292223</revnumber>).</entry>
 	  </row>
 
 	  <row>
 	    <entry>1002504</entry>
 	    <entry><revnumber>292589</revnumber></entry>
 	    <entry>22 December, 2015</entry>
 	    <entry>10-STABLE after merge of xz 5.2.2 merge
 	      (multithread support) (rev
 	      <revnumber>292588</revnumber>).</entry>
 	  </row>
 
 	  <row>
 	    <entry>1002505</entry>
 	    <entry><revnumber>292908</revnumber></entry>
 	    <entry>30 December, 2015</entry>
 	    <entry>10-STABLE after merge of changes to &man.pci.4;
 	      (rev <revnumber>292907</revnumber>).</entry>
 	  </row>
 
 	  <row>
 	    <entry>1002506</entry>
 	    <entry><revnumber>293476</revnumber></entry>
 	    <entry>9 January, 2016</entry>
 	    <entry>10-STABLE after merge of &man.utimensat.2; (rev
 	      <revnumber>293473</revnumber>).</entry>
 	  </row>
 
 	  <row>
 	    <entry>1002507</entry>
 	    <entry><revnumber>293610</revnumber></entry>
 	    <entry>9 January, 2016</entry>
 	    <entry>10-STABLE after merge of changes to &man.linux.4;
 	      (rev <revnumber>293477</revnumber> through
 	      <revnumber>293609 </revnumber>).</entry>
 	  </row>
 
 	  <row>
 	    <entry>1002508</entry>
 	    <entry><revnumber>293619</revnumber></entry>
 	    <entry>9 January, 2016</entry>
 	    <entry>10-STABLE after merge of changes to &man.figpar.3;
 	      types/macros (rev
 	      <revnumber>290275</revnumber>).</entry>
 	  </row>
 
 	  <row>
 	    <entry>1002509</entry>
 	    <entry><revnumber>295107</revnumber></entry>
 	    <entry>1 February, 2016</entry>
 	    <entry>10-STABLE after merge of API change to
 	      &man.dpv.3;.</entry>
 	  </row>
 
 	  <row>
 	    <entry>1003000</entry>
 	    <entry><revnumber>296373</revnumber></entry>
 	    <entry>4 March, 2016</entry>
 	    <entry><literal>releng/10.3</literal> branched from
 	      10-STABLE.</entry>
 	  </row>
 
 	  <row>
 	    <entry>1003500</entry>
 	    <entry><revnumber>296374</revnumber></entry>
 	    <entry>4 March, 2016</entry>
 	    <entry>10-STABLE after <literal>releng/10.3</literal>
 	      branched from 10-STABLE.</entry>
 	  </row>
 
 	  <row>
 	    <entry>1003501</entry>
 	    <entry><revnumber>298299</revnumber></entry>
 	    <entry>19 June, 2016</entry>
 	    <entry>10-STABLE after adding kdbcontrol's -P option (rev
 	      <revnumber>298297</revnumber>).</entry>
 	  </row>
 
 	  <row>
 	    <entry>1003502</entry>
 	    <entry><revnumber>299966</revnumber></entry>
 	    <entry>19 June, 2016</entry>
 	    <entry>10-STABLE after libcrypto.so was made position
 	      independent.</entry>
 	  </row>
 
 	  <row>
 	    <entry>1003503</entry>
 	    <entry><revnumber>300235</revnumber></entry>
 	    <entry>19 June, 2016</entry>
 	    <entry>10-STABLE after allowing MK_ overrides (rev
 	      <revnumber>300233</revnumber>).</entry>
 	  </row>
 
 	  <row>
 	    <entry>1003504</entry>
 	    <entry><revnumber>302066</revnumber></entry>
 	    <entry>21 June, 2016</entry>
 	    <entry>10-STABLE after MFC of filemon changes from
 	      11-CURRENT.</entry>
 	  </row>
 
 	  <row>
 	    <entry>1003505</entry>
 	    <entry><revnumber>302228</revnumber></entry>
 	    <entry>27 June, 2016</entry>
 	    <entry>10-STABLE after converting sed to use REG_STARTEND,
 	      fixing a Mesa issue.</entry>
 	  </row>
 
 	  <row>
 	    <entry>1003506</entry>
 	    <entry><revnumber>304611</revnumber></entry>
 	    <entry>August 22, 2016</entry>
 	    <entry>10-STABLE after adding C++11 thread_local
 	      support.</entry>
 	  </row>
 
 	  <row>
 	    <entry>1003507</entry>
 	    <entry><revnumber>304864</revnumber></entry>
 	    <entry>August 26, 2016</entry>
 	    <entry>10-STABLE after
 	      <varname>LC_<replaceable>*</replaceable>_MASK</varname>
 	      fix.</entry>
 	  </row>
 
 	  <row>
 	    <entry>1003508</entry>
 	    <entry><revnumber>305734</revnumber></entry>
 	    <entry>September 12, 2016</entry>
 	    <entry>10-STABLE after resolving a deadlock between
 	      <function>device_detach()</function> and
 	      &man.usbd.do.request.flags.9;.</entry>
 	  </row>
 
 	  <row>
 	    <entry>1003509</entry>
 	    <entry><revnumber>307331</revnumber></entry>
 	    <entry>October 14, 2016</entry>
 	    <entry>10-STABLE after ZFS merges.</entry>
 	  </row>
 
 	  <row>
 	    <entry>1003510</entry>
 	    <entry><revnumber>308047</revnumber></entry>
 	    <entry>October 28, 2016</entry>
 	    <entry>10-STABLE after installing header files required
 	      development with libzfs_core.</entry>
 	  </row>
 	</tbody>
       </tgroup>
     </table>
   </sect1>
 
   <sect1 xml:id="versions-9">
     <title>&os; 9 Versions</title>
 
     <table frame="none" xml:id="freebsd-versions-table-9">
       <title>&os; 9 <literal>__FreeBSD_version</literal>
 	Values</title>
 
       <tgroup cols="4">
 	<thead>
 	  <row>
 	    <entry>Value</entry>
 
 	    <entry>Revision</entry>
 
 	    <entry>Date</entry>
 
 	    <entry>Release</entry>
 	  </row>
 	</thead>
 
 	<tbody>
 	  <row>
 	    <entry>900000</entry>
 	    <entry><revnumber>196432</revnumber></entry>
 	    <entry>August 22, 2009</entry>
 	    <entry>9.0-CURRENT.</entry>
 	  </row>
 
 	  <row>
 	    <entry>900001</entry>
 	    <entry><revnumber>197019</revnumber></entry>
 	    <entry>September 8, 2009</entry>
 	    <entry>9.0-CURRENT after importing x86emu, a software
 	      emulator for real mode x86 CPU from OpenBSD.</entry>
 	  </row>
 
 	  <row>
 	    <entry>900002</entry>
 	    <entry><revnumber>197430</revnumber></entry>
 	    <entry>September 23, 2009</entry>
 	    <entry>9.0-CURRENT after implementing the EVFILT_USER
 	      kevent filter functionality.</entry>
 	  </row>
 
 	  <row>
 	    <entry>900003</entry>
 	    <entry><revnumber>200039</revnumber></entry>
 	    <entry>December 2, 2009</entry>
 	    <entry>9.0-CURRENT after addition of
 	      &man.sigpause.2; and PIE support in
 	      csu.</entry>
 	  </row>
 
 	  <row>
 	    <entry>900004</entry>
 	    <entry><revnumber>200185</revnumber></entry>
 	    <entry>December 6, 2009</entry>
 	    <entry>9.0-CURRENT after addition of libulog and its
 	      libutempter compatibility interface.</entry>
 	  </row>
 
 	  <row>
 	    <entry>900005</entry>
 	    <entry><revnumber>200447</revnumber></entry>
 	    <entry>December 12, 2009</entry>
 	    <entry>9.0-CURRENT after addition of
 	      &man.sleepq.sleepcnt.9;, which can be
 	      used to query the number of waiters on a specific
 	      waiting queue.</entry>
 	  </row>
 
 	  <row>
 	    <entry>900006</entry>
 	    <entry><revnumber>201513</revnumber></entry>
 	    <entry>January 4, 2010</entry>
 	    <entry>9.0-CURRENT after change of the
 	      &man.scandir.3; and
 	      &man.alphasort.3; prototypes to conform
 	      to SUSv4.</entry>
 	  </row>
 
 	  <row>
 	    <entry>900007</entry>
 	    <entry><revnumber>202219</revnumber></entry>
 	    <entry>January 13, 2010</entry>
 	    <entry>9.0-CURRENT after the removal of &man.utmp.5; and
 	      the addition of utmpx (see
 	      &man.getutxent.3;) for improved logging
 	      of user logins and system events.</entry>
 	  </row>
 
 	  <row>
 	    <entry>900008</entry>
 	    <entry><revnumber>202722</revnumber></entry>
 	    <entry>January 20, 2010</entry>
 	    <entry>9.0-CURRENT after the import of BSDL bc/dc and the
 	      deprecation of GNU bc/dc.</entry>
 	  </row>
 
 	  <row>
 	    <entry>900009</entry>
 	    <entry><revnumber>203052</revnumber></entry>
 	    <entry>January 26, 2010</entry>
 	    <entry>9.0-CURRENT after the addition of SIOCGIFDESCR and
 	      SIOCSIFDESCR ioctls to network interfaces.  These ioctl
 	      can be used to manipulate interface description, as
 	      inspired by OpenBSD.</entry>
 	  </row>
 
 	  <row>
 	    <entry>900010</entry>
 	    <entry><revnumber>205471</revnumber></entry>
 	    <entry>March 22, 2010</entry>
 	    <entry>9.0-CURRENT after the import of zlib 1.2.4.</entry>
 	  </row>
 
 	  <row>
 	    <entry>900011</entry>
 	    <entry><revnumber>207410</revnumber></entry>
 	    <entry>April 24, 2010</entry>
 	    <entry>9.0-CURRENT after adding soft-updates
 	      journalling.</entry>
 	  </row>
 
 	  <row>
 	    <entry>900012</entry>
 	    <entry><revnumber>207842</revnumber></entry>
 	    <entry>May 10, 2010</entry>
 	    <entry>9.0-CURRENT after adding liblzma, xz, xzdec, and
 	      lzmainfo.</entry>
 	  </row>
 
 	  <row>
 	    <entry>900013</entry>
 	    <entry><revnumber>208486</revnumber></entry>
 	    <entry>May 24, 2010</entry>
 	    <entry>9.0-CURRENT after bringing in USB fixes for
 	      &man.linux.4;.</entry>
 	  </row>
 
 	  <row>
 	    <entry>900014</entry>
 	    <entry><revnumber>208973</revnumber></entry>
 	    <entry>June 10, 2010</entry>
 	    <entry>9.0-CURRENT after adding Clang.</entry>
 	  </row>
 
 	  <row>
 	    <entry>900015</entry>
 	    <entry><revnumber>210390</revnumber></entry>
 	    <entry>July 22, 2010</entry>
 	    <entry>9.0-CURRENT after the import of BSD grep.</entry>
 	  </row>
 
 	  <row>
 	    <entry>900016</entry>
 	    <entry><revnumber>210565</revnumber></entry>
 	    <entry>July 28, 2010</entry>
 	    <entry>9.0-CURRENT after adding mti_zone to struct
 	      malloc_type_internal.</entry>
 	  </row>
 
 	  <row>
 	    <entry>900017</entry>
 	    <entry><revnumber>211701</revnumber></entry>
 	    <entry>August 23, 2010</entry>
 	    <entry>9.0-CURRENT after changing back default grep to GNU
 	      grep and adding WITH_BSD_GREP knob.</entry>
 	  </row>
 
 	  <row>
 	    <entry>900018</entry>
 	    <entry><revnumber>211735</revnumber></entry>
 	    <entry>August 24, 2010</entry>
 	    <entry>9.0-CURRENT after the
 	      &man.pthread.kill.3; -generated signal
 	      is identified as SI_LWP in si_code.  Previously, si_code
 	      was SI_USER.</entry>
 	  </row>
 
 	  <row>
 	    <entry>900019</entry>
 	    <entry><revnumber>211937</revnumber></entry>
 	    <entry>August 28, 2010</entry>
 	    <entry>9.0-CURRENT after addition of the MAP_PREFAULT_READ
 	      flag to &man.mmap.2;.</entry>
 	  </row>
 
 	  <row>
 	    <entry>900020</entry>
 	    <entry><revnumber>212381</revnumber></entry>
 	    <entry>September 9, 2010</entry>
 	    <entry>9.0-CURRENT after adding drain functionality to
 	      sbufs, which also changed the layout of struct
 	      sbuf.</entry>
 	  </row>
 
 	  <row>
 	    <entry>900021</entry>
 	    <entry><revnumber>212568</revnumber></entry>
 	    <entry>September 13, 2010</entry>
 	    <entry>9.0-CURRENT after DTrace has grown support for
 	      userland tracing.</entry>
 	  </row>
 
 	  <row>
 	    <entry>900022</entry>
 	    <entry><revnumber>213395</revnumber></entry>
 	    <entry>October 2, 2010</entry>
 	    <entry>9.0-CURRENT after addition of the BSDL man
 	      utilities and retirement of GNU/GPL man
 	      utilities.</entry>
 	  </row>
 
 	  <row>
 	    <entry>900023</entry>
 	    <entry><revnumber>213700</revnumber></entry>
 	    <entry>October 11, 2010</entry>
 	    <entry>9.0-CURRENT after updating xz to git 20101010
 	      snapshot.</entry>
 	  </row>
 
 	  <row>
 	    <entry>900024</entry>
 	    <entry><revnumber>215127</revnumber></entry>
 	    <entry>November 11, 2010</entry>
 	    <entry>9.0-CURRENT after libgcc.a was replaced by
 	      libcompiler_rt.a.</entry>
 	  </row>
 
 	  <row>
 	    <entry>900025</entry>
 	    <entry><revnumber>215166</revnumber></entry>
 	    <entry>November 12, 2010</entry>
 	    <entry>9.0-CURRENT after the introduction of the
 	      modularised congestion control.</entry>
 	  </row>
 
 	  <row>
 	    <entry>900026</entry>
 	    <entry><revnumber>216088</revnumber></entry>
 	    <entry>November 30, 2010</entry>
 	    <entry>9.0-CURRENT after the introduction of Serial
 	      Management Protocol (SMP) passthrough and the XPT_SMP_IO
 	      and XPT_GDEV_ADVINFO CAM CCBs.</entry>
 	  </row>
 
 	  <row>
 	    <entry>900027</entry>
 	    <entry><revnumber>216212</revnumber></entry>
 	    <entry>December 5, 2010</entry>
 	    <entry>9.0-CURRENT after the addition of log2 to
 	      libm.</entry>
 	  </row>
 
 	  <row>
 	    <entry>900028</entry>
 	    <entry><revnumber>216615</revnumber></entry>
 	    <entry>December 21, 2010</entry>
 	    <entry>9.0-CURRENT after the addition of the Hhook (Helper
 	      Hook), Khelp (Kernel Helpers) and Object Specific Data
 	      (OSD) KPIs.</entry>
 	  </row>
 
 	  <row>
 	    <entry>900029</entry>
 	    <entry><revnumber>216758</revnumber></entry>
 	    <entry>December 28, 2010</entry>
 	    <entry>9.0-CURRENT after the modification of the TCP stack
 	      to allow Khelp modules to interact with it via helper
 	      hook points and store per-connection data in the TCP
 	      control block.</entry>
 	  </row>
 
 	  <row>
 	    <entry>900030</entry>
 	    <entry><revnumber>217309</revnumber></entry>
 	    <entry>January 12, 2011</entry>
 	    <entry>9.0-CURRENT after the update of libdialog to
 	      version 20100428.</entry>
 	  </row>
 
 	  <row>
 	    <entry>900031</entry>
 	    <entry><revnumber>218414</revnumber></entry>
 	    <entry>February 7, 2011</entry>
 	    <entry>9.0-CURRENT after the addition of
 	      &man.pthread.getthreadid.np.3;.</entry>
 	  </row>
 
 	  <row>
 	    <entry>900032</entry>
 	    <entry><revnumber>218425</revnumber></entry>
 	    <entry>February 8, 2011</entry>
 	    <entry>9.0-CURRENT after the removal of the uio_yield
 	      prototype and symbol.</entry>
 	  </row>
 
 	  <row>
 	    <entry>900033</entry>
 	    <entry><revnumber>218822</revnumber></entry>
 	    <entry>February 18, 2011</entry>
 	    <entry>9.0-CURRENT after the update of binutils to version
 	      2.17.50.</entry>
 	  </row>
 
 	  <row>
 	    <entry>900034</entry>
 	    <entry><revnumber>219406</revnumber></entry>
 	    <entry>March 8, 2011</entry>
 	    <entry>9.0-CURRENT after the struct sysvec (sv_schedtail)
 	      changes.</entry>
 	  </row>
 
 	  <row>
 	    <entry>900035</entry>
 	    <entry><revnumber>220150</revnumber></entry>
 	    <entry>March 29, 2011</entry>
 	    <entry>9.0-CURRENT after the update of base gcc and
 	      libstdc++ to the last GPLv2 licensed revision.</entry>
 	  </row>
 
 	  <row>
 	    <entry>900036</entry>
 	    <entry><revnumber>220770</revnumber></entry>
 	    <entry>April 18, 2011</entry>
 	    <entry>9.0-CURRENT after the removal of libobjc and
 	      Objective-C support from the base system.</entry>
 	  </row>
 
 	  <row>
 	    <entry>900037</entry>
 	    <entry><revnumber>221862</revnumber></entry>
 	    <entry>May 13, 2011</entry>
 	    <entry>9.0-CURRENT after importing the &man.libprocstat.3;
 	      library and &man.fuser.1; utility to the base
 	      system.</entry>
 	  </row>
 
 	  <row>
 	    <entry>900038</entry>
 	    <entry><revnumber>222167</revnumber></entry>
 	    <entry>May 22, 2011</entry>
 	    <entry>9.0-CURRENT after adding a lock flag argument to
 	      &man.VFS.FHTOVP.9;.</entry>
 	  </row>
 
 	  <row>
 	    <entry>900039</entry>
 	    <entry><revnumber>223637</revnumber></entry>
 	    <entry>June 28, 2011</entry>
 	    <entry>9.0-CURRENT after importing pf from OpenBSD
 	      4.5.</entry>
 	  </row>
 
 	  <row>
 	    <entry>900040</entry>
 	    <entry><revnumber>224217</revnumber></entry>
 	    <entry>July 19, 2011</entry>
 	    <entry>Increase default MAXCPU for FreeBSD to 64 on amd64
 	      and ia64 and to 128 for XLP (mips).</entry>
 	  </row>
 
 	  <row>
 	    <entry>900041</entry>
 	    <entry><revnumber>224834</revnumber></entry>
 	    <entry>August 13, 2011</entry>
 	    <entry>9.0-CURRENT after the implementation of Capsicum
 	      capabilities; fget(9) gains a rights argument.</entry>
 	  </row>
 
 	  <row>
 	    <entry>900042</entry>
 	    <entry><revnumber>225350</revnumber></entry>
 	    <entry>August 28, 2011</entry>
 	    <entry>Bump shared libraries' version numbers for
 	      libraries whose ABI has changed in preparation for
 	      9.0.</entry>
 	  </row>
 
 	  <row>
 	    <entry>900043</entry>
 	    <entry><revnumber>225350</revnumber></entry>
 	    <entry>September 2, 2011</entry>
 	    <entry>Add automatic detection of USB mass storage devices
 	      which do not support the no synchronize cache SCSI
 	      command.</entry>
 	  </row>
 
 	  <row>
 	    <entry>900044</entry>
 	    <entry><revnumber>225469</revnumber></entry>
 	    <entry>September 10, 2011</entry>
 	    <entry>Re-factor auto-quirk.  9.0-RELEASE.</entry>
 	  </row>
 
 	  <!-- Note: at one point 900045 was documented as follows, even
 	  though it was never committed:
 	  <row>
 	    <entry>900045</entry>
 	    <entry></entry>
 	    <entry>Oct 13, 2011</entry>
 	    <entry>All non-compatibility system call entry points have
 	      been prefixed with sys_.</entry>
 	  </row>
 	  -->
 
 	  <row>
 	    <entry>900045</entry>
 	    <entry><revnumber>229285</revnumber></entry>
 	    <entry>January 2, 2012</entry>
 	    <entry>9-STABLE after MFC of true/false from
 	      1000002.</entry>
 	  </row>
 
 	  <row>
 	    <entry>900500</entry>
 	    <entry><revnumber>229318</revnumber></entry>
 	    <entry>January 2, 2012</entry>
 	    <entry>9.0-STABLE.</entry>
 	  </row>
 
 	  <row>
 	    <entry>900501</entry>
 	    <entry><revnumber>229723</revnumber></entry>
 	    <entry>January 6, 2012</entry>
 	    <entry>9.0-STABLE after merging of addition of the
 	      &man.posix.fadvise.2; system call.</entry>
 	  </row>
 
 	  <row>
 	    <entry>900502</entry>
 	    <entry><revnumber>230237</revnumber></entry>
 	    <entry>January 16, 2012</entry>
 	    <entry>9.0-STABLE after merging gperf 3.0.3</entry>
 	  </row>
 
 	  <row>
 	    <entry>900503</entry>
 	    <entry><revnumber>231768</revnumber></entry>
 	    <entry>February 15, 2012</entry>
 	    <entry>9.0-STABLE after introduction of the new extensible
 	      &man.sysctl.3; interface NET_RT_IFLISTL to query address
 	      lists.</entry>
 	  </row>
 
 	  <row>
 	    <entry>900504</entry>
 	    <entry><revnumber>232728</revnumber></entry>
 	    <entry>March 3, 2012</entry>
 	    <entry>9.0-STABLE after changes related to mounting of
 	      filesystem inside a jail.</entry>
 	  </row>
 
 	  <row>
 	    <entry>900505</entry>
 	    <entry><revnumber>232945</revnumber></entry>
 	    <entry>March 13, 2012</entry>
 	    <entry>9.0-STABLE after introduction of new &man.tcp.4;
 	      socket options: TCP_KEEPINIT, TCP_KEEPIDLE,
 	      TCP_KEEPINTVL, and TCP_KEEPCNT.</entry>
 	  </row>
 
 	  <row>
 	    <entry>900506</entry>
 	    <entry><revnumber>235786</revnumber></entry>
 	    <entry>May 22, 2012</entry>
 	    <entry>9.0-STABLE after introduction of the
 	      <function>quick_exit</function> function and related
 	      changes required for C++11.</entry>
 	  </row>
 
 	  <row>
 	    <entry>901000</entry>
 	    <entry><revnumber>239082</revnumber></entry>
 	    <entry>August 5, 2012</entry>
 	    <entry>9.1-RELEASE.</entry>
 	  </row>
 
 	  <row>
 	    <entry>901500</entry>
 	    <entry><revnumber>239081</revnumber></entry>
 	    <entry>August 6, 2012</entry>
 	    <entry>9.1-STABLE after branching releng/9.1
 	      (RELENG_9_1).</entry>
 	  </row>
 
 	  <row>
 	    <entry>901501</entry>
 	    <entry><revnumber>240659</revnumber></entry>
 	    <entry>November 11, 2012</entry>
 	    <entry>9.1-STABLE after &man.LIST.PREV.3; added to queue.h
 	      (rev <revnumber>242893</revnumber>) and KBI change in
 	      USB serial devices.</entry>
 	  </row>
 
 	  <row>
 	    <entry>901502</entry>
 	    <entry><revnumber>243656</revnumber></entry>
 	    <entry>November 28, 2012</entry>
 	    <entry>9.1-STABLE after USB serial jitter buffer requires
 	      rebuild of USB serial device modules.</entry>
 	  </row>
 
 	  <row>
 	    <entry>901503</entry>
 	    <entry><revnumber>247090</revnumber></entry>
 	    <entry>February 21, 2013</entry>
 	    <entry>9.1-STABLE after USB moved to the driver structure
 	      requiring a rebuild of all USB modules.  Also indicates
 	      the presence of nmtree.</entry>
 	  </row>
 
 	  <row>
 	    <entry>901504</entry>
 	    <entry><revnumber>248338</revnumber></entry>
 	    <entry>March 15, 2013</entry>
 	    <entry>9.1-STABLE after install gained -l, -M, -N and
 	      related flags and cat gained the -l option.</entry>
 	  </row>
 
 	  <row>
 	    <entry>901505</entry>
 	    <entry><revnumber>251687</revnumber></entry>
 	    <entry>June 13, 2013</entry>
 	    <entry>9.1-STABLE after fixes in ctfmerge bootstrapping
 	      (rev <revnumber>249243</revnumber>).</entry>
 	  </row>
 
 	  <row>
 	    <entry>902001</entry>
 	    <entry><revnumber>253912</revnumber></entry>
 	    <entry>August 3, 2013</entry>
 	    <entry><literal>releng/9.2</literal> branched from
 	      <literal>stable/9</literal>.</entry>
 	  </row>
 
 	  <row>
 	    <entry>902501</entry>
 	    <entry><revnumber>253913</revnumber></entry>
 	    <entry>August 2, 2013</entry>
 	    <entry>9.2-STABLE after creation of
 	      <literal>releng/9.2</literal> branch.</entry>
 	  </row>
 
 	  <row>
 	    <entry>902502</entry>
 	    <entry><revnumber>254938</revnumber></entry>
 	    <entry>August 26, 2013</entry>
 	    <entry>9.2-STABLE after inclusion of the
 	      <literal>PIM_RESCAN</literal> CAM path inquiry
 	      flag.</entry>
 	  </row>
 
 	  <row>
 	    <entry>902503</entry>
 	    <entry><revnumber>254979</revnumber></entry>
 	    <entry>August 27, 2013</entry>
 	    <entry>9.2-STABLE after inclusion of the
 	      <literal>SI_UNMAPPED</literal> cdev flag.</entry>
 	  </row>
 
 	  <row>
 	    <entry>902504</entry>
 	    <entry><revnumber>256917</revnumber></entry>
 	    <entry>October 22, 2013</entry>
 	    <entry>9.2-STABLE after inclusion of support for
 	      <quote>first boot</quote> &man.rc.8; scripts.</entry>
 	  </row>
 
 	  <row>
 	    <entry>902505</entry>
 	    <entry><revnumber>259448</revnumber></entry>
 	    <entry>December 12, 2013</entry>
 	    <entry>9.2-STABLE after Heimdal encoding fix.</entry>
 	  </row>
 
 	  <row>
 	    <entry>902506</entry>
 	    <entry><revnumber>260136</revnumber></entry>
 	    <entry>December 31, 2013</entry>
 	    <entry>9-STABLE after MAP_STACK fixes (rev
 	      <revnumber>260082</revnumber>).</entry>
 	  </row>
 
 	  <row>
 	    <entry>902507</entry>
 	    <entry><revnumber>262801</revnumber></entry>
 	    <entry>March 5, 2014</entry>
 	    <entry>9-STABLE after upgrade of libc++ to 3.4
 	      release.</entry>
 	  </row>
 
 	  <row>
 	    <entry>902508</entry>
 	    <entry><revnumber>263171</revnumber></entry>
 	    <entry>March 14, 2014</entry>
 	    <entry>9-STABLE after merge of the Radeon KMS driver (rev
 	      <revnumber>263170</revnumber>).</entry>
 	  </row>
 
 	  <row>
 	    <entry>902509</entry>
 	    <entry><revnumber>263509</revnumber></entry>
 	    <entry>March 21, 2014</entry>
 	    <entry>9-STABLE after upgrade of llvm/clang to 3.4
 	      release.</entry>
 	  </row>
 
 	  <row>
 	    <entry>902510</entry>
 	    <entry><revnumber>263818</revnumber></entry>
 	    <entry>March 27, 2014</entry>
 	    <entry>9-STABLE after merge of the &man.vt.4;
 	      driver.</entry>
 	  </row>
 
 	  <row>
 	    <entry>902511</entry>
 	    <entry><revnumber>264289</revnumber></entry>
 	    <entry>March 27, 2014</entry>
 	    <entry>9-STABLE after FreeBSD-SA-14:06.openssl.</entry>
 	  </row>
 
 	  <row>
 	    <entry>902512</entry>
 	    <entry><revnumber>265123</revnumber></entry>
 	    <entry>April 30, 2014</entry>
 	    <entry>9-STABLE after FreeBSD-SA-14:08.tcp.</entry>
 	  </row>
 
 	  <row>
 	    <entry>903000</entry>
 	    <entry><revnumber>267656</revnumber></entry>
 	    <entry>June 20, 2014</entry>
 	    <entry>9-RC1 <literal>releng/9.3</literal> branch.</entry>
 	  </row>
 
 	  <row>
 	    <entry>903500</entry>
 	    <entry><revnumber>267657</revnumber></entry>
 	    <entry>June 20, 2014</entry>
 	    <entry>9.3-STABLE <literal>releng/9.3</literal>
 	      branch.</entry>
 	  </row>
 
 	  <row>
 	    <entry>903501</entry>
 	    <entry><revnumber>268443</revnumber></entry>
 	    <entry>July 8, 2014</entry>
 	    <entry>9-STABLE after FreeBSD-SA-14:17.kmem (rev
 	      <revnumber>268433</revnumber>).</entry>
 	  </row>
 
 	  <row>
 	    <entry>903502</entry>
 	    <entry><revnumber>270175</revnumber></entry>
 	    <entry>August 19, 2014</entry>
 	    <entry>9-STABLE after <literal>SOCK_DGRAM</literal> bug
 	      fix (rev <revnumber>269789</revnumber>).</entry>
 	  </row>
 
 	  <row>
 	    <entry>903503</entry>
 	    <entry><revnumber>271341</revnumber></entry>
 	    <entry>September 9, 2014</entry>
 	    <entry>9-STABLE after FreeBSD-SA-14:18 (rev
 	      <revnumber>269687</revnumber>).</entry>
 	  </row>
 
 	  <row>
 	    <entry>903504</entry>
 	    <entry><revnumber>271686</revnumber></entry>
 	    <entry>September 16, 2014</entry>
 	    <entry>9-STABLE after FreeBSD-SA-14:19 (rev
 	      <revnumber>271668</revnumber>).</entry>
 	  </row>
 
 	  <row>
 	    <entry>903505</entry>
 	    <entry><revnumber>273432</revnumber></entry>
 	    <entry>October 21, 2014</entry>
 	    <entry>9-STABLE after FreeBSD-SA-14:20, FreeBSD-SA-14:21,
 	      and FreeBSD-SA-14:22 (rev
 	      <revnumber>273412</revnumber>).</entry>
 	  </row>
 
 	  <row>
 	    <entry>903506</entry>
 	    <entry><revnumber>274162</revnumber></entry>
 	    <entry>November 4, 2014</entry>
 	    <entry>9-STABLE after FreeBSD-SA-14:23, FreeBSD-SA-14:24,
 	      and FreeBSD-SA-14:25.</entry>
 	  </row>
 
 	  <row>
 	    <entry>903507</entry>
 	    <entry><revnumber>275742</revnumber></entry>
 	    <entry>December 13, 2014</entry>
 	    <entry>9-STABLE after merging an important fix to the LLVM
 	      vectorizer, which could lead to buffer overruns in some
 	      cases.</entry>
 	  </row>
 
 	  <row>
 	    <entry>903508</entry>
 	    <entry><revnumber>279287</revnumber></entry>
 	    <entry>February 25, 2015</entry>
 	    <entry>9-STABLE after FreeBSD-EN-15:01.vt,
 	      FreeBSD-EN-15:02.openssl,
 	      FreeBSD-EN-15:03.freebsd-update, FreeBSD-SA-15:04.igmp,
 	      and FreeBSD-SA-15:05.bind.</entry>
 	  </row>
 
 	  <row>
 	    <entry>903509</entry>
 	    <entry><revnumber>296219</revnumber></entry>
 	    <entry>February 29, 2016</entry>
 	    <entry>9-STABLE after bumping the default value of
 	      <varname>compat.linux.osrelease</varname> to
 	      <literal>2.6.18</literal> to support the linux-c6-*
 	      ports out of the box.</entry>
 	  </row>
 
 	  <row>
 	    <entry>903510</entry>
 	    <entry><revnumber>300236</revnumber></entry>
 	    <entry>May 19, 2016</entry>
 	    <entry>9-STABLE after System Binary Interface (SBI) page
 	      was moved in latest version of Berkeley Boot Loader
 	      (BBL) due to code size increase in
 	      <revnumber>300234</revnumber>.</entry>
 	  </row>
 
 	  <row>
 	    <entry>903511</entry>
 	    <entry><revnumber>305735</revnumber></entry>
 	    <entry>September 12, 2016</entry>
 	    <entry>9-STABLE after resolving a deadlock between
 	      <function>device_detach()</function> and
 	      &man.usbd.do.request.flags.9;.</entry>
 	  </row>
 	</tbody>
       </tgroup>
     </table>
   </sect1>
 
   <sect1 xml:id="versions-8">
     <title>&os; 8 Versions</title>
 
     <table frame="none" xml:id="freebsd-versions-table-8">
       <title>&os; 8 <literal>__FreeBSD_version</literal>
 	Values</title>
 
       <tgroup cols="4">
 	<thead>
 	  <row>
 	    <entry>Value</entry>
 
 	    <entry>Revision</entry>
 
 	    <entry>Date</entry>
 
 	    <entry>Release</entry>
 	  </row>
 	</thead>
 
 	<tbody>
 	  <row>
 	    <entry>800000</entry>
 	    <entry><revnumber>172531</revnumber></entry>
 	    <entry>October 11, 2007</entry>
 	    <entry>8.0-CURRENT.  Separating wide and single byte
 	      ctype.</entry>
 	  </row>
 
 	  <row>
 	    <entry>800001</entry>
 	    <entry><revnumber>172688</revnumber></entry>
 	    <entry>October 16, 2007</entry>
 	    <entry>8.0-CURRENT after libpcap 0.9.8 and tcpdump 3.9.8
 	      import.</entry>
 	  </row>
 
 	  <row>
 	    <entry>800002</entry>
 	    <entry><revnumber>172841</revnumber></entry>
 	    <entry>October 21, 2007</entry>
 	    <entry>8.0-CURRENT after renaming &man.kthread.create.9;
 	      and friends to &man.kproc.create.9; etc.</entry>
 	  </row>
 
 	  <row>
 	    <entry>800003</entry>
 	    <entry><revnumber>172932</revnumber></entry>
 	    <entry>October 24, 2007</entry>
 	    <entry>8.0-CURRENT after ABI backwards compatibility to
 	      the FreeBSD 4/5/6 versions of the PCIOCGETCONF,
 	      PCIOCREAD and PCIOCWRITE IOCTLs was added, which
 	      required the ABI of the PCIOCGETCONF IOCTL to be broken
 	      again</entry>
 	  </row>
 
 	  <row>
 	    <entry>800004</entry>
 	    <entry><revnumber>173573</revnumber></entry>
 	    <entry>November 12, 2007</entry>
 	    <entry>8.0-CURRENT after &man.agp.4; driver moved from
 	      src/sys/pci to src/sys/dev/agp</entry>
 	  </row>
 
 	  <row>
 	    <entry>800005</entry>
 	    <entry><revnumber>174261</revnumber></entry>
 	    <entry>December 4, 2007</entry>
 	    <entry>8.0-CURRENT after changes to the jumbo frame
 	      allocator (rev <revnumber>174247</revnumber>).</entry>
 	  </row>
 
 	  <row>
 	    <entry>800006</entry>
 	    <entry><revnumber>174399</revnumber></entry>
 	    <entry>December 7, 2007</entry>
 	    <entry>8.0-CURRENT after the addition of callgraph capture
 	      functionality to &man.hwpmc.4;.</entry>
 	  </row>
 
 	  <row>
 	    <entry>800007</entry>
 	    <entry><revnumber>174901</revnumber></entry>
 	    <entry>December 25, 2007</entry>
 	    <entry>8.0-CURRENT after <function>kdb_enter()</function>
 	      gains a "why" argument.</entry>
 	  </row>
 
 	  <row>
 	    <entry>800008</entry>
 	    <entry><revnumber>174951</revnumber></entry>
 	    <entry>December 28, 2007</entry>
 	    <entry>8.0-CURRENT after LK_EXCLUPGRADE option
 	      removal.</entry>
 	  </row>
 
 	  <row>
 	    <entry>800009</entry>
 	    <entry><revnumber>175168</revnumber></entry>
 	    <entry>January 9, 2008</entry>
 	    <entry>8.0-CURRENT after introduction of
 	      &man.lockmgr.disown.9;</entry>
 	  </row>
 
 	  <row>
 	    <entry>800010</entry>
 	    <entry><revnumber>175204</revnumber></entry>
 	    <entry>January 10, 2008</entry>
 	    <entry>8.0-CURRENT after the &man.vn.lock.9; prototype
 	      change.</entry>
 	  </row>
 
 	  <row>
 	    <entry>800011</entry>
 	    <entry><revnumber>175295</revnumber></entry>
 	    <entry>January 13, 2008</entry>
 	    <entry>8.0-CURRENT after the &man.VOP.LOCK.9; and
 	      &man.VOP.UNLOCK.9; prototype changes.</entry>
 	  </row>
 
 	  <row>
 	    <entry>800012</entry>
 	    <entry><revnumber>175487</revnumber></entry>
 	    <entry>January 19, 2008</entry>
 	    <entry>8.0-CURRENT after introduction of
 	      &man.lockmgr.recursed.9;, &man.BUF.RECURSED.9; and
 	      &man.BUF.ISLOCKED.9; and the removal of
 	      <function>BUF_REFCNT()</function>.</entry>
 	  </row>
 
 	  <row>
 	    <entry>800013</entry>
 	    <entry><revnumber>175581</revnumber></entry>
 	    <entry>January 23, 2008</entry>
 	    <entry>8.0-CURRENT after introduction of the
 	      <quote>ASCII</quote> encoding.</entry>
 	  </row>
 
 	  <row>
 	    <entry>800014</entry>
 	    <entry><revnumber>175636</revnumber></entry>
 	    <entry>January 24, 2008</entry>
 	    <entry>8.0-CURRENT after changing the prototype of
 	      &man.lockmgr.9; and removal of
 	      <function>lockcount()</function> and
 	      <function>LOCKMGR_ASSERT()</function>.</entry>
 	  </row>
 
 	  <row>
 	    <entry>800015</entry>
 	    <entry><revnumber>175688</revnumber></entry>
 	    <entry>January 26, 2008</entry>
 	    <entry>8.0-CURRENT after extending the types of the
 	      &man.fts.3; structures.</entry>
 	  </row>
 
 	  <row>
 	    <entry>800016</entry>
 	    <entry><revnumber>175872</revnumber></entry>
 	    <entry>February 1, 2008</entry>
 	    <entry>8.0-CURRENT after adding an argument to
 	      &man.MEXTADD.9;</entry>
 	  </row>
 
 	  <row>
 	    <entry>800017</entry>
 	    <entry><revnumber>176015</revnumber></entry>
 	    <entry>February 6, 2008</entry>
 	    <entry>8.0-CURRENT after the introduction of LK_NODUP and
 	      LK_NOWITNESS options in the &man.lockmgr.9;
 	      space.</entry>
 	  </row>
 
 	  <row>
 	    <entry>800018</entry>
 	    <entry><revnumber>176112</revnumber></entry>
 	    <entry>February 8, 2008</entry>
 	    <entry>8.0-CURRENT after the addition of
 	      m_collapse.</entry>
 	  </row>
 
 	  <row>
 	    <entry>800019</entry>
 	    <entry><revnumber>176124</revnumber></entry>
 	    <entry>February 9, 2008</entry>
 	    <entry>8.0-CURRENT after the addition of current working
 	      directory, root directory, and jail directory support to
 	      the kern.proc.filedesc sysctl.</entry>
 	  </row>
 
 	  <row>
 	    <entry>800020</entry>
 	    <entry><revnumber>176251</revnumber></entry>
 	    <entry>February 13, 2008</entry>
 	    <entry>8.0-CURRENT after introduction of
 	      &man.lockmgr.assert.9; and
 	      <function>BUF_ASSERT</function> functions.</entry>
 	  </row>
 
 	  <row>
 	    <entry>800021</entry>
 	    <entry><revnumber>176321</revnumber></entry>
 	    <entry>February 15, 2008</entry>
 	    <entry>8.0-CURRENT after introduction of
 	      &man.lockmgr.args.9; and LK_INTERNAL flag
 	      removal.</entry>
 	  </row>
 
 	  <row>
 	    <entry>800022</entry>
 	    <entry><revnumber>176556</revnumber></entry>
 	    <entry>(backed out)</entry>
 	    <entry>8.0-CURRENT after changing the default system ar to
 	      BSD &man.ar.1;.</entry>
 	  </row>
 
 	  <row>
 	    <entry>800023</entry>
 	    <entry><revnumber>176560</revnumber></entry>
 	    <entry>February 25, 2008</entry>
 	    <entry>8.0-CURRENT after changing the prototypes of
 	      &man.lockstatus.9; and &man.VOP.ISLOCKED.9;, more
 	      specifically retiring the <literal>struct
 		thread</literal> argument.</entry>
 	  </row>
 
 	  <row>
 	    <entry>800024</entry>
 	    <entry><revnumber>176709</revnumber></entry>
 	    <entry>March 1, 2008</entry>
 	    <entry>8.0-CURRENT after axing out the
 	      <function>lockwaiters</function> and
 	      <function>BUF_LOCKWAITERS</function> functions, changing
 	      the return value of <function>brelvp</function> from
 	      void to int and introducing new flags for
 	      &man.lockinit.9;.</entry>
 	  </row>
 
 	  <row>
 	    <entry>800025</entry>
 	    <entry><revnumber>176958</revnumber></entry>
 	    <entry>March 8, 2008</entry>
 	    <entry>8.0-CURRENT after adding F_DUP2FD command to
 	      &man.fcntl.2;.</entry>
 	  </row>
 
 	  <row>
 	    <entry>800026</entry>
 	    <entry><revnumber>177086</revnumber></entry>
 	    <entry>March 12, 2008</entry>
 	    <entry>8.0-CURRENT after changing the priority parameter
 	      to cv_broadcastpri such that 0 means no
 	      priority.</entry>
 	  </row>
 
 	  <row>
 	    <entry>800027</entry>
 	    <entry><revnumber>177551</revnumber></entry>
 	    <entry>March 24, 2008</entry>
 	    <entry>8.0-CURRENT after changing the bpf monitoring ABI
 	      when zerocopy bpf buffers were added.</entry>
 	  </row>
 
 	  <row>
 	    <entry>800028</entry>
 	    <entry><revnumber>177637</revnumber></entry>
 	    <entry>March 26, 2008</entry>
 	    <entry>8.0-CURRENT after adding l_sysid to struct
 	      flock.</entry>
 	  </row>
 
 	  <row>
 	    <entry>800029</entry>
 	    <entry><revnumber>177688</revnumber></entry>
 	    <entry>March 28, 2008</entry>
 	    <entry>8.0-CURRENT after reintegration of the
 	      <function>BUF_LOCKWAITERS</function> function and the
 	      addition of &man.lockmgr.waiters.9;.</entry>
 	  </row>
 
 	  <row>
 	    <entry>800030</entry>
 	    <entry><revnumber>177844</revnumber></entry>
 	    <entry>April 1, 2008</entry>
 	    <entry>8.0-CURRENT after the introduction of the
 	      &man.rw.try.rlock.9; and &man.rw.try.wlock.9;
 	      functions.</entry>
 	  </row>
 
 	  <row>
 	    <entry>800031</entry>
 	    <entry><revnumber>177958</revnumber></entry>
 	    <entry>April 6, 2008</entry>
 	    <entry>8.0-CURRENT after the introduction of the
 	      <function>lockmgr_rw</function> and
 	      <function>lockmgr_args_rw</function> functions.</entry>
 	  </row>
 
 	  <row>
 	    <entry>800032</entry>
 	    <entry><revnumber>178006</revnumber></entry>
 	    <entry>April 8, 2008</entry>
 	    <entry>8.0-CURRENT after the implementation of the openat
 	      and related syscalls, introduction of the O_EXEC flag
 	      for the &man.open.2;, and providing the corresponding
 	      linux compatibility syscalls.</entry>
 	  </row>
 
 	  <row>
 	    <entry>800033</entry>
 	    <entry><revnumber>178017</revnumber></entry>
 	    <entry>April 8, 2008</entry>
 	    <entry>8.0-CURRENT after added &man.write.2; support for
 	      &man.psm.4; in native operation level.  Now arbitrary
 	      commands can be written to
 	      <filename>/dev/psm%d</filename> and status can be read
 	      back from it.</entry>
 	  </row>
 
 	  <row>
 	    <entry>800034</entry>
 	    <entry><revnumber>178051</revnumber></entry>
 	    <entry>April 10, 2008</entry>
 	    <entry>8.0-CURRENT after introduction of the
 	      <function>memrchr</function> function.</entry>
 	  </row>
 
 	  <row>
 	    <entry>800035</entry>
 	    <entry><revnumber>178256</revnumber></entry>
 	    <entry>April 16, 2008</entry>
 	    <entry>8.0-CURRENT after introduction of the
 	      <function>fdopendir</function> function.</entry>
 	  </row>
 
 	  <row>
 	    <entry>800036</entry>
 	    <entry><revnumber>178362</revnumber></entry>
 	    <entry>April 20, 2008</entry>
 	    <entry>8.0-CURRENT after switchover of 802.11 wireless to
 	      multi-bss support (aka vaps).</entry>
 	  </row>
 
 	  <row>
 	    <entry>800037</entry>
 	    <entry><revnumber>178892</revnumber></entry>
 	    <entry>May 9, 2008</entry>
 	    <entry>8.0-CURRENT after addition of multi routing table
 	      support (aka &man.setfib.1;, &man.setfib.2;).</entry>
 	  </row>
 
 	  <row>
 	    <entry>800038</entry>
 	    <entry><revnumber>179316</revnumber></entry>
 	    <entry>May 26, 2008</entry>
 	    <entry>8.0-CURRENT after removal of netatm and ISDN4BSD.
 	      Also, the addition of the Compact C Type (CTF)
 	      tools.</entry>
 	  </row>
 
 	  <row>
 	    <entry>800039</entry>
 	    <entry><revnumber>179784</revnumber></entry>
 	    <entry>June 14, 2008</entry>
 	    <entry>8.0-CURRENT after removal of sgtty.</entry>
 	  </row>
 
 	  <row>
 	    <entry>800040</entry>
 	    <entry><revnumber>180025</revnumber></entry>
 	    <entry>June 26, 2008</entry>
 	    <entry>8.0-CURRENT with kernel NFS lockd client.</entry>
 	  </row>
 
 	  <row>
 	    <entry>800041</entry>
 	    <entry><revnumber>180691</revnumber></entry>
 	    <entry>July 22, 2008</entry>
 	    <entry>8.0-CURRENT after addition of
 	      &man.arc4random.buf.3; and
 	      &man.arc4random.uniform.3;.</entry>
 	  </row>
 
 	  <row>
 	    <entry>800042</entry>
 	    <entry><revnumber>181439</revnumber></entry>
 	    <entry>August 8, 2008</entry>
 	    <entry>8.0-CURRENT after addition of
 	      &man.cpuctl.4;.</entry>
 	  </row>
 
 	  <row>
 	    <entry>800043</entry>
 	    <entry><revnumber>181694</revnumber></entry>
 	    <entry>August 13, 2008</entry>
 	    <entry>8.0-CURRENT after changing &man.bpf.4; to use a
 	      single device node, instead of device cloning.</entry>
 	  </row>
 
 	  <row>
 	    <entry>800044</entry>
 	    <entry><revnumber>181803</revnumber></entry>
 	    <entry>August 17, 2008</entry>
 	    <entry>8.0-CURRENT after the commit of the first step of
 	      the vimage project renaming global variables to be
 	      virtualized with a V_ prefix with macros to map them
 	      back to their global names.</entry>
 	  </row>
 
 	  <row>
 	    <entry>800045</entry>
 	    <entry><revnumber>181905</revnumber></entry>
 	    <entry>August 20, 2008</entry>
 	    <entry>8.0-CURRENT after the integration of the MPSAFE TTY
 	      layer, including changes to various drivers and
 	      utilities that interact with it.</entry>
 	  </row>
 
 	  <row>
 	    <entry>800046</entry>
 	    <entry><revnumber>182869</revnumber></entry>
 	    <entry>September 8, 2008</entry>
 	    <entry>8.0-CURRENT after the separation of the GDT per CPU
 	      on amd64 architecture.</entry>
 	  </row>
 
 	  <row>
 	    <entry>800047</entry>
 	    <entry><revnumber>182905</revnumber></entry>
 	    <entry>September 10, 2008</entry>
 	    <entry>8.0-CURRENT after removal of VSVTX, VSGID and
 	      VSUID.</entry>
 	  </row>
 
 	  <row>
 	    <entry>800048</entry>
 	    <entry><revnumber>183091</revnumber></entry>
 	    <entry>September 16, 2008</entry>
 	    <entry>8.0-CURRENT after converting the kernel NFS mount
 	      code to accept individual mount options in the
 	      &man.nmount.2; iovec, not just one big struct
 	      nfs_args.</entry>
 	  </row>
 
 	  <row>
 	    <entry>800049</entry>
 	    <entry><revnumber>183114</revnumber></entry>
 	    <entry>September 17, 2008</entry>
 	    <entry>8.0-CURRENT after the removal of &man.suser.9; and
 	      &man.suser.cred.9;.</entry>
 	  </row>
 
 	  <row>
 	    <entry>800050</entry>
 	    <entry><revnumber>184099</revnumber></entry>
 	    <entry>October 20, 2008</entry>
 	    <entry>8.0-CURRENT after buffer cache API change.</entry>
 	  </row>
 
 	  <row>
 	    <entry>800051</entry>
 	    <entry><revnumber>184205</revnumber></entry>
 	    <entry>October 23, 2008</entry>
 	    <entry>8.0-CURRENT after the removal of the &man.MALLOC.9;
 	      and &man.FREE.9; macros.</entry>
 	  </row>
 
 	  <row>
 	    <entry>800052</entry>
 	    <entry><revnumber>184419</revnumber></entry>
 	    <entry>October 28, 2008</entry>
 	    <entry>8.0-CURRENT after the introduction of accmode_t and
 	      renaming of VOP_ACCESS 'a_mode' argument to
 	      'a_accmode'.</entry>
 	  </row>
 
 	  <row>
 	    <entry>800053</entry>
 	    <entry><revnumber>184555</revnumber></entry>
 	    <entry>November 2, 2008</entry>
 	    <entry>8.0-CURRENT after the prototype change of
 	      &man.vfs.busy.9; and the introduction of its MBF_NOWAIT
 	      and MBF_MNTLSTLOCK flags.</entry>
 	  </row>
 
 	  <row>
 	    <entry>800054</entry>
 	    <entry><revnumber>185162</revnumber></entry>
 	    <entry>November 22, 2008</entry>
 	    <entry>8.0-CURRENT after the addition of buf_ring, memory
 	      barriers and ifnet functions to facilitate multiple
 	      hardware transmit queues for cards that support them,
 	      and a lockless ring-buffer implementation to enable
 	      drivers to more efficiently manage queuing of
 	      packets.</entry>
 	  </row>
 
 	  <row>
 	    <entry>800055</entry>
 	    <entry><revnumber>185363</revnumber></entry>
 	    <entry>November 27, 2008</entry>
 	    <entry>8.0-CURRENT after the addition of Intel&trade;
 	      Core, Core2, and Atom support to &man.hwpmc.4;.</entry>
 	  </row>
 
 	  <row>
 	    <entry>800056</entry>
 	    <entry><revnumber>185435</revnumber></entry>
 	    <entry>November 29, 2008</entry>
 	    <entry>8.0-CURRENT after the introduction of
 	      multi-/no-IPv4/v6 jails.</entry>
 	  </row>
 
 	  <row>
 	    <entry>800057</entry>
 	    <entry><revnumber>185522</revnumber></entry>
 	    <entry>December 1, 2008</entry>
 	    <entry>8.0-CURRENT after the switch to the ath hal source
 	      code.</entry>
 	  </row>
 
 	  <row>
 	    <entry>800058</entry>
 	    <entry><revnumber>185968</revnumber></entry>
 	    <entry>December 12, 2008</entry>
 	    <entry>8.0-CURRENT after the introduction of the
 	      VOP_VPTOCNP operation.</entry>
 	  </row>
 
 	  <row>
 	    <entry>800059</entry>
 	    <entry><revnumber>186119</revnumber></entry>
 	    <entry>December 15, 2008</entry>
 	    <entry>8.0-CURRENT incorporates the new arp-v2
 	      rewrite.</entry>
 	  </row>
 
 	  <row>
 	    <entry>800060</entry>
 	    <entry><revnumber>186344</revnumber></entry>
 	    <entry>December 19, 2008</entry>
 	    <entry>8.0-CURRENT after the addition of makefs.</entry>
 	  </row>
 
 	  <row>
 	    <entry>800061</entry>
 	    <entry><revnumber>187289</revnumber></entry>
 	    <entry>January 15, 2009</entry>
 	    <entry>8.0-CURRENT after TCP Appropriate Byte
 	      Counting.</entry>
 	  </row>
 
 	  <row>
 	    <entry>800062</entry>
 	    <entry><revnumber>187830</revnumber></entry>
 	    <entry>January 28, 2009</entry>
 	    <entry>8.0-CURRENT after removal of minor(), minor2unit(),
 	      unit2minor(), etc.</entry>
 	  </row>
 
 	  <row>
 	    <entry>800063</entry>
 	    <entry><revnumber>188745</revnumber></entry>
 	    <entry>February 18, 2009</entry>
 	    <entry>8.0-CURRENT after GENERIC config change to use the
 	      USB2 stack, but also the addition of
 	      &man.fdevname.3;.</entry>
 	  </row>
 
 	  <row>
 	    <entry>800064</entry>
 	    <entry><revnumber>188946</revnumber></entry>
 	    <entry>February 23, 2009</entry>
 	    <entry>8.0-CURRENT after the USB2 stack is moved to and
 	      replaces dev/usb.</entry>
 	  </row>
 
 	  <row>
 	    <entry>800065</entry>
 	    <entry><revnumber>189092</revnumber></entry>
 	    <entry>February 26, 2009</entry>
 	    <entry>8.0-CURRENT after the renaming of all functions in
 	      &man.libmp.3;.</entry>
 	  </row>
 
 	  <row>
 	    <entry>800066</entry>
 	    <entry><revnumber>189110</revnumber></entry>
 	    <entry>February 27, 2009</entry>
 	    <entry>8.0-CURRENT after changing USB devfs handling and
 	      layout.</entry>
 	  </row>
 
 	  <row>
 	    <entry>800067</entry>
 	    <entry><revnumber>189136</revnumber></entry>
 	    <entry>February 28, 2009</entry>
 	    <entry>8.0-CURRENT after adding getdelim(), getline(),
 	      stpncpy(), strnlen(), wcsnlen(), wcscasecmp(), and
 	      wcsncasecmp().</entry>
 	  </row>
 
 	  <row>
 	    <entry>800068</entry>
 	    <entry><revnumber>189276</revnumber></entry>
 	    <entry>March 2, 2009</entry>
 	    <entry>8.0-CURRENT after renaming the ushub devclass to
 	      uhub.</entry>
 	  </row>
 
 	  <row>
 	    <entry>800069</entry>
 	    <entry><revnumber>189585</revnumber></entry>
 	    <entry>March 9, 2009</entry>
 	    <entry>8.0-CURRENT after libusb20.so.1 was renamed to
 	      libusb.so.1.</entry>
 	  </row>
 
 	  <row>
 	    <entry>800070</entry>
 	    <entry><revnumber>189592</revnumber></entry>
 	    <entry>March 9, 2009</entry>
 	    <entry>8.0-CURRENT after merging IGMPv3 and
 	      Source-Specific Multicast (SSM) to the IPv4
 	      stack.</entry>
 	  </row>
 
 	  <row>
 	    <entry>800071</entry>
 	    <entry><revnumber>189825</revnumber></entry>
 	    <entry>March 14, 2009</entry>
 	    <entry>8.0-CURRENT after gcc was patched to use C99 inline
 	      semantics in c99 and gnu99 mode.</entry>
 	  </row>
 
 	  <row>
 	    <entry>800072</entry>
 	    <entry><revnumber>189853</revnumber></entry>
 	    <entry>March 15, 2009</entry>
 	    <entry>8.0-CURRENT after the IFF_NEEDSGIANT flag has been
 	      removed; non-MPSAFE network device drivers are no longer
 	      supported.</entry>
 	  </row>
 
 	  <row>
 	    <entry>800073</entry>
 	    <entry><revnumber>190265</revnumber></entry>
 	    <entry>March 18, 2009</entry>
 	    <entry>8.0-CURRENT after the dynamic string token
 	      substitution has been implemented for rpath and needed
 	      paths.</entry>
 	  </row>
 
 	  <row>
 	    <entry>800074</entry>
 	    <entry><revnumber>190373</revnumber></entry>
 	    <entry>March 24, 2009</entry>
 	    <entry>8.0-CURRENT after tcpdump 4.0.0 and libpcap 1.0.0
 	      import.</entry>
 	  </row>
 
 	  <row>
 	    <entry>800075</entry>
 	    <entry><revnumber>190787</revnumber></entry>
 	    <entry>April 6, 2009</entry>
 	    <entry>8.0-CURRENT after layout of structs vnet_net,
 	      vnet_inet and vnet_ipfw has been changed.</entry>
 	  </row>
 
 	  <row>
 	    <entry>800076</entry>
 	    <entry><revnumber>190866</revnumber></entry>
 	    <entry>April 9, 2009</entry>
 	    <entry>8.0-CURRENT after adding delay profiles in
 	      dummynet.</entry>
 	  </row>
 
 	  <row>
 	    <entry>800077</entry>
 	    <entry><revnumber>190914</revnumber></entry>
 	    <entry>April 14, 2009</entry>
 	    <entry>8.0-CURRENT after removing VOP_LEASE() and
 	      vop_vector.vop_lease.</entry>
 	  </row>
 
 	  <row>
 	    <entry>800078</entry>
 	    <entry><revnumber>191080</revnumber></entry>
 	    <entry>April 15, 2009</entry>
 	    <entry>8.0-CURRENT after struct rt_weight fields have been
 	      added to struct rt_metrics and struct rt_metrics_lite,
 	      changing the layout of struct rt_metrics_lite.  A bump
 	      to RTM_VERSION was made, but backed out.</entry>
 	  </row>
 
 	  <row>
 	    <entry>800079</entry>
 	    <entry><revnumber>191117</revnumber></entry>
 	    <entry>April 15, 2009</entry>
 	    <entry>8.0-CURRENT after struct llentry pointers are added
 	      to struct route and struct route_in6.</entry>
 	  </row>
 
 	  <row>
 	    <entry>800080</entry>
 	    <entry><revnumber>191126</revnumber></entry>
 	    <entry>April 15, 2009</entry>
 	    <entry>8.0-CURRENT after layout of struct inpcb has been
 	      changed.</entry>
 	  </row>
 
 	  <row>
 	    <entry>800081</entry>
 	    <entry><revnumber>191267</revnumber></entry>
 	    <entry>April 19, 2009</entry>
 	    <entry>8.0-CURRENT after the layout of struct malloc_type
 	      has been changed.</entry>
 	  </row>
 
 	  <row>
 	    <entry>800082</entry>
 	    <entry><revnumber>191368</revnumber></entry>
 	    <entry>April 21, 2009</entry>
 	    <entry>8.0-CURRENT after the layout of struct ifnet has
 	      changed, and with if_ref() and if_rele() ifnet
 	      refcounting.</entry>
 	  </row>
 
 	  <row>
 	    <entry>800083</entry>
 	    <entry><revnumber>191389</revnumber></entry>
 	    <entry>April 22, 2009</entry>
 	    <entry>8.0-CURRENT after the implementation of a low-level
 	      Bluetooth HCI API.</entry>
 	  </row>
 
 	  <row>
 	    <entry>800084</entry>
 	    <entry><revnumber>191672</revnumber></entry>
 	    <entry>April 29, 2009</entry>
 	    <entry>8.0-CURRENT after IPv6 SSM and MLDv2
 	      changes.</entry>
 	  </row>
 
 	  <row>
 	    <entry>800085</entry>
 	    <entry><revnumber>191688</revnumber></entry>
 	    <entry>April 30, 2009</entry>
 	    <entry>8.0-CURRENT after enabling support for VIMAGE
 	      kernel builds with one active image.</entry>
 	  </row>
 
 	  <row>
 	    <entry>800086</entry>
 	    <entry><revnumber>191910</revnumber></entry>
 	    <entry>May 8, 2009</entry>
 	    <entry>8.0-CURRENT after adding support for input lines of
 	      arbitrarily length in &man.patch.1;.</entry>
 	  </row>
 
 	  <row>
 	    <entry>800087</entry>
 	    <entry><revnumber>191990</revnumber></entry>
 	    <entry>May 11, 2009</entry>
 	    <entry>8.0-CURRENT after some VFS KPI changes.  The thread
 	      argument has been removed from the FSD parts of the VFS.
 	      <function>VFS_*</function> functions do not need the
 	      context any more because it always refers to
 	      <varname>curthread</varname>.  In some special cases,
 	      the old behavior is retained.</entry>
 	  </row>
 
 	  <row>
 	    <entry>800088</entry>
 	    <entry><revnumber>192470</revnumber></entry>
 	    <entry>May 20, 2009</entry>
 	    <entry>8.0-CURRENT after net80211 monitor mode
 	      changes.</entry>
 	  </row>
 
 	  <row>
 	    <entry>800089</entry>
 	    <entry><revnumber>192649</revnumber></entry>
 	    <entry>May 23, 2009</entry>
 	    <entry>8.0-CURRENT after adding UDP control block
 	      support.</entry>
 	  </row>
 
 	  <row>
 	    <entry>800090</entry>
 	    <entry><revnumber>192669</revnumber></entry>
 	    <entry>May 23, 2009</entry>
 	    <entry>8.0-CURRENT after virtualizing interface
 	      cloning.</entry>
 	  </row>
 
 	  <row>
 	    <entry>800091</entry>
 	    <entry><revnumber>192895</revnumber></entry>
 	    <entry>May 27, 2009</entry>
 	    <entry>8.0-CURRENT after adding hierarchical jails and
 	      removing global securelevel.</entry>
 	  </row>
 
 	  <row>
 	    <entry>800092</entry>
 	    <entry><revnumber>193011</revnumber></entry>
 	    <entry>May 29, 2009</entry>
 	    <entry>8.0-CURRENT after changing
 	      <function>sx_init_flags()</function> KPI.  The
 	      <constant>SX_ADAPTIVESPIN</constant> is retired and a
 	      new <constant>SX_NOADAPTIVE</constant> flag is
 	      introduced to handle the reversed logic.</entry>
 	  </row>
 
 	  <row>
 	    <entry>800093</entry>
 	    <entry><revnumber>193047</revnumber></entry>
 	    <entry>May 29, 2009</entry>
 	    <entry>8.0-CURRENT after adding mnt_xflag to struct
 	      mount.</entry>
 	  </row>
 
 	  <row>
 	    <entry>800094</entry>
 	    <entry><revnumber>193093</revnumber></entry>
 	    <entry>May 30, 2009</entry>
 	    <entry>8.0-CURRENT after adding
 	      &man.VOP.ACCESSX.9;.</entry>
 	  </row>
 
 	  <row>
 	    <entry>800095</entry>
 	    <entry><revnumber>193096</revnumber></entry>
 	    <entry>May 30, 2009</entry>
 	    <entry>8.0-CURRENT after changing the polling KPI.  The
 	      polling handlers now return the number of packets
 	      processed.  A new
 	      <constant>IFCAP_POLLING_NOCOUNT</constant> is also
 	      introduced to specify that the return value is not
 	      significant and the counting should be skipped.</entry>
 	  </row>
 
 	  <row>
 	    <entry>800096</entry>
 	    <entry><revnumber>193219</revnumber></entry>
 	    <entry>June 1, 2009</entry>
 	    <entry>8.0-CURRENT after updating to the new netisr
 	      implementation and after changing the way we store and
 	      access FIBs.</entry>
 	    <!--
 	    Had been 96 and 97 but were folded because we are
 	    running out of numbers.
 	    -->
 	  </row>
 
 	  <row>
 	    <entry>800097</entry>
 	    <entry><revnumber>193731</revnumber></entry>
 	    <entry>June 8, 2009</entry>
 	    <entry>8.0-CURRENT after the introduction of vnet
 	      destructor hooks and infrastructure.</entry>
 	  </row>
 
 	  <row>
 	    <entry>(not changed)</entry>
 	    <entry><revnumber>194012</revnumber></entry>
 	    <entry>June 11, 2009</entry>
 	    <entry>8.0-CURRENT after the introduction of netgraph
 	      outbound to inbound path call detection and queuing,
 	      which also changed the layout of struct thread.</entry>
 	  </row>
 
 	  <row>
 	    <entry>800098</entry>
 	    <entry><revnumber>194210</revnumber></entry>
 	    <entry>June 14, 2009</entry>
 	    <entry>8.0-CURRENT after OpenSSL 0.9.8k import.</entry>
 	  </row>
 
 	  <row>
 	    <entry>800099</entry>
 	    <entry><revnumber>194675</revnumber></entry>
 	    <entry>June 22, 2009</entry>
 	    <entry>8.0-CURRENT after NGROUPS update and moving route
 	      virtualization into its own VImage module.</entry>
 	  </row>
 
 	  <row>
 	    <entry>800100</entry>
 	    <entry><revnumber>194920</revnumber></entry>
 	    <entry>June 24, 2009</entry>
 	    <entry>8.0-CURRENT after SYSVIPC ABI change.</entry>
 	  </row>
 
 	  <row>
 	    <entry>800101</entry>
 	    <entry><revnumber>195175</revnumber></entry>
 	    <entry>June 29, 2009</entry>
 	    <entry>8.0-CURRENT after the removal of the /dev/net/*
 	      per-interface character devices.</entry>
 	  </row>
 
 	  <row>
 	    <entry>800102</entry>
 	    <entry><revnumber>195634</revnumber></entry>
 	    <entry>July 12, 2009</entry>
 	    <entry>8.0-CURRENT after padding was added to struct
 	      sackhint, struct tcpcb, and struct tcpstat.</entry>
 	  </row>
 
 	  <row>
 	    <entry>800103</entry>
 	    <entry><revnumber>195654</revnumber></entry>
 	    <entry>July 13, 2009</entry>
 	    <entry>8.0-CURRENT after replacing struct tcpopt with
 	      struct toeopt in the TOE driver interface to the TCP
 	      syncache.</entry>
 	  </row>
 
 	  <row>
 	    <entry>800104</entry>
 	    <entry><revnumber>195699</revnumber></entry>
 	    <entry>July 14, 2009</entry>
 	    <entry>8.0-CURRENT after the addition of the linker-set
 	      based per-vnet allocator.</entry>
 	  </row>
 
 	  <row>
 	    <entry>800105</entry>
 	    <entry><revnumber>195767</revnumber></entry>
 	    <entry>July 19, 2009</entry>
 	    <entry>8.0-CURRENT after version bump for all shared
 	      libraries that do not have symbol versioning turned
 	      on.</entry>
 	  </row>
 
 	  <row>
 	    <entry>800106</entry>
 	    <entry><revnumber>195852</revnumber></entry>
 	    <entry>July 24, 2009</entry>
 	    <entry>8.0-CURRENT after introduction of OBJT_SG VM object
 	      type.</entry>
 	  </row>
 
 	  <row>
 	    <entry>800107</entry>
 	    <entry><revnumber>196037</revnumber></entry>
 	    <entry>August 2, 2009</entry>
 	    <entry>8.0-CURRENT after making the newbus subsystem Giant
 	      free by adding the newbus sxlock and
 	      8.0-RELEASE.</entry>
 	  </row>
 
 	  <row>
 	    <entry>800108</entry>
 	    <entry><revnumber>199627</revnumber></entry>
 	    <entry>November 21, 2009</entry>
 	    <entry>8.0-STABLE after implementing EVFILT_USER kevent
 	      filter.</entry>
 	  </row>
 
 	  <row>
 	    <entry>800500</entry>
 	    <entry><revnumber>201749</revnumber></entry>
 	    <entry>January 7, 2010</entry>
 	    <entry>8.0-STABLE after
 	      <literal>__FreeBSD_version</literal> bump to make
 	      <command>pkg_add -r</command> use
 	      packages-8-stable.</entry>
 	  </row>
 
 	  <row>
 	    <entry>800501</entry>
 	    <entry><revnumber>202922</revnumber></entry>
 	    <entry>January 24, 2010</entry>
 	    <entry>8.0-STABLE after change of the
 	      &man.scandir.3; and
 	      &man.alphasort.3; prototypes to conform
 	      to SUSv4.</entry>
 	  </row>
 
 	  <row>
 	    <entry>800502</entry>
 	    <entry><revnumber>203299</revnumber></entry>
 	    <entry>January 31, 2010</entry>
 	    <entry>8.0-STABLE after addition of
 	      &man.sigpause.2;.</entry>
 	  </row>
 
 	  <row>
 	    <entry>800503</entry>
 	    <entry><revnumber>204344</revnumber></entry>
 	    <entry>February 25, 2010</entry>
 	    <entry>8.0-STABLE after addition of SIOCGIFDESCR and
 	      SIOCSIFDESCR ioctls to network interfaces.  These ioctl
 	      can be used to manipulate interface description, as
 	      inspired by OpenBSD.</entry>
 	  </row>
 
 	  <row>
 	    <entry>800504</entry>
 	    <entry><revnumber>204546</revnumber></entry>
 	    <entry>March 1, 2010</entry>
 	    <entry>8.0-STABLE after MFC of importing x86emu, a
 	      software emulator for real mode x86 CPU from
 	      OpenBSD.</entry>
 	  </row>
 
 	  <row>
 	    <entry>800505</entry>
 	    <entry><revnumber>208259</revnumber></entry>
 	    <entry>May 18, 2010</entry>
 	    <entry>8.0-STABLE after MFC of adding liblzma, xz, xzdec,
 	      and lzmainfo.</entry>
 	  </row>
 
 	  <row>
 	    <entry>801000</entry>
 	    <entry><revnumber>209150</revnumber></entry>
 	    <entry>June 14, 2010</entry>
 	    <entry>8.1-RELEASE</entry>
 	  </row>
 
 	  <row>
 	    <entry>801500</entry>
 	    <entry><revnumber>209146</revnumber></entry>
 	    <entry>June 14, 2010</entry>
 	    <entry>8.1-STABLE after 8.1-RELEASE.</entry>
 	  </row>
 
 	  <row>
 	    <entry>801501</entry>
 	    <entry><revnumber>214762</revnumber></entry>
 	    <entry>November 3, 2010</entry>
 	    <entry>8.1-STABLE after KBI change in struct sysentvec,
 	      and implementation of PL_FLAG_SCE/SCX/EXEC/SI and
 	      pl_siginfo for ptrace(PT_LWPINFO) .</entry>
 	  </row>
 
 	  <row>
 	    <entry>802000</entry>
 	    <entry><revnumber>216639</revnumber></entry>
 	    <entry>December 22, 2010</entry>
 	    <entry>8.2-RELEASE</entry>
 	  </row>
 
 	  <row>
 	    <entry>802500</entry>
 	    <entry><revnumber>216654</revnumber></entry>
 	    <entry>December 22, 2010</entry>
 	    <entry>8.2-STABLE after 8.2-RELEASE.</entry>
 	  </row>
 
 	  <row>
 	    <entry>802501</entry>
 	    <entry><revnumber>219107</revnumber></entry>
 	    <entry>February 28, 2011</entry>
 	    <entry>8.2-STABLE after merging DTrace changes, including
 	      support for userland tracing.</entry>
 	  </row>
 
 	  <row>
 	    <entry>802502</entry>
 	    <entry><revnumber>219324</revnumber></entry>
 	    <entry>March 6, 2011</entry>
 	    <entry>8.2-STABLE after merging log2 and log2f into
 	      libm.</entry>
 	  </row>
 
 	  <row>
 	    <entry>802503</entry>
 	    <entry><revnumber>221275</revnumber></entry>
 	    <entry>May 1, 2011</entry>
 	    <entry>8.2-STABLE after upgrade of the gcc to the last
 	      GPLv2 version from the FSF gcc-4_2-branch.</entry>
 	  </row>
 
 	  <row>
 	    <entry>802504</entry>
 	    <entry><revnumber>222401</revnumber></entry>
 	    <entry>May 28, 2011</entry>
 	    <entry>8.2-STABLE after introduction of the KPI and
 	      supporting infrastructure for modular congestion
 	      control.</entry>
 	  </row>
 
 	  <row>
 	    <entry>802505</entry>
 	    <entry><revnumber>222406</revnumber></entry>
 	    <entry>May 28, 2011</entry>
 	    <entry>8.2-STABLE after introduction of Hhook and Khelp
 	      KPIs.</entry>
 	  </row>
 
 	  <row>
 	    <entry>802506</entry>
 	    <entry><revnumber>222408</revnumber></entry>
 	    <entry>May 28, 2011</entry>
 	    <entry>8.2-STABLE after addition of OSD to struct
 	      tcpcb.</entry>
 	  </row>
 
 	  <row>
 	    <entry>802507</entry>
 	    <entry><revnumber>222741</revnumber></entry>
 	    <entry>June 6, 2011</entry>
 	    <entry>8.2-STABLE after ZFS v28 import.</entry>
 	  </row>
 
 	  <row>
 	    <entry>802508</entry>
 	    <entry><revnumber>222846</revnumber></entry>
 	    <entry>June 8, 2011</entry>
 	    <entry>8.2-STABLE after removal of the schedtail event
 	      handler and addition of the sv_schedtail method to
 	      struct sysvec.</entry>
 	  </row>
 
 	  <row>
 	    <entry>802509</entry>
 	    <entry><revnumber>224017</revnumber></entry>
 	    <entry>July 14, 2011</entry>
 	    <entry>8.2-STABLE after merging the SSSE3 support into
 	      binutils.</entry>
 	  </row>
 
 	  <row>
 	    <entry>802510</entry>
 	    <entry><revnumber>224214</revnumber></entry>
 	    <entry>July 19, 2011</entry>
 	    <entry>8.2-STABLE after addition of RFTSIGZMB flag for
 	      &man.rfork.2;.</entry>
 	  </row>
 
 	  <row>
 	    <entry>802511</entry>
 	    <entry><revnumber>225458</revnumber></entry>
 	    <entry>September 9, 2011</entry>
 	    <entry>8.2-STABLE after addition of automatic detection of
 	      USB mass storage devices which do not support the no
 	      synchronize cache SCSI command.</entry>
 	  </row>
 
 	  <row>
 	    <entry>802512</entry>
 	    <entry><revnumber>225470</revnumber></entry>
 	    <entry>September 10, 2011</entry>
 	    <entry>8.2-STABLE after merging of re-factoring of
 	      auto-quirk.</entry>
 	  </row>
 
 	  <row>
 	    <entry>802513</entry>
 	    <entry><revnumber>226763</revnumber></entry>
 	    <entry>October 25, 2011</entry>
 	    <entry>8.2-STABLE after merging of the MAP_PREFAULT_READ
 	      flag to &man.mmap.2;.</entry>
 	  </row>
 
 	  <row>
 	    <entry>802514</entry>
 	    <entry><revnumber>227573</revnumber></entry>
 	    <entry>November 16, 2011</entry>
 	    <entry>8.2-STABLE after merging of addition of
 	      &man.posix.fallocate.2; syscall.</entry>
 	  </row>
 
 	  <row>
 	    <entry>802515</entry>
 	    <entry><revnumber>229725</revnumber></entry>
 	    <entry>January 6, 2012</entry>
 	    <entry>8.2-STABLE after merging of addition of the
 	      &man.posix.fadvise.2; system call.</entry>
 	  </row>
 
 	  <row>
 	    <entry>802516</entry>
 	    <entry><revnumber>230239</revnumber></entry>
 	    <entry>January 16, 2012</entry>
 	    <entry>8.2-STABLE after merging gperf 3.0.3</entry>
 	  </row>
 
 	  <row>
 	    <entry>802517</entry>
 	    <entry><revnumber>231769</revnumber></entry>
 	    <entry>February 15, 2012</entry>
 	    <entry>8.2-STABLE after introduction of the new extensible
 	      &man.sysctl.3; interface NET_RT_IFLISTL to query address
 	      lists.</entry>
 	  </row>
 
 	  <row>
 	    <entry>803000</entry>
 	    <entry><revnumber>232446</revnumber></entry>
 	    <entry>March 3, 2012</entry>
 	    <entry>8.3-RELEASE.</entry>
 	  </row>
 
 	  <row>
 	    <entry>803500</entry>
 	    <entry><revnumber>232439</revnumber></entry>
 	    <entry>March 3, 2012</entry>
 	    <entry>8.3-STABLE after branching releng/8.3
 	      (RELENG_8_3).</entry>
 	  </row>
 
 	  <row>
 	    <entry>803501</entry>
 	    <entry><revnumber>247091</revnumber></entry>
 	    <entry>February 21, 2013</entry>
 	    <entry>8.3-STABLE after MFC of two USB fixes (rev
 	      <revnumber>246616</revnumber> and
 	      <revnumber>246759</revnumber>).</entry>
 	  </row>
 
 	  <row>
 	    <entry>804000</entry>
 	    <entry><revnumber>248850</revnumber></entry>
 	    <entry>March 28, 2013</entry>
 	    <entry>8.4-RELEASE.</entry>
 	  </row>
 
 	  <row>
 	    <entry>804500</entry>
 	    <entry><revnumber>248819</revnumber></entry>
 	    <entry>March 28, 2013</entry>
 	    <entry>8.4-STABLE after 8.4-RELEASE.</entry>
 	  </row>
 
 	  <row>
 	    <entry>804501</entry>
 	    <entry><revnumber>259449</revnumber></entry>
 	    <entry>December 16, 2013</entry>
 	    <entry>8.4-STABLE after MFC of upstream Heimdal encoding
 	      fix.</entry>
 	  </row>
 
 	  <row>
 	    <entry>804502</entry>
 	    <entry><revnumber>265123</revnumber></entry>
 	    <entry>April 30, 2014</entry>
 	    <entry>8.4-STABLE after FreeBSD-SA-14:08.tcp.</entry>
 	  </row>
 
 	  <row>
 	    <entry>804503</entry>
 	    <entry><revnumber>268444</revnumber></entry>
 	    <entry>July  9, 2014</entry>
 	    <entry>8.4-STABLE after FreeBSD-SA-14:17.kmem.</entry>
 	  </row>
 
 	  <row>
 	    <entry>804504</entry>
 	    <entry><revnumber>271341</revnumber></entry>
 	    <entry>September 9, 2014</entry>
 	    <entry>8.4-STABLE after FreeBSD-SA-14:18 (rev
 	      <revnumber>271305</revnumber>).</entry>
 	  </row>
 
 	  <row>
 	    <entry>804505</entry>
 	    <entry><revnumber>271686</revnumber></entry>
 	    <entry>September 16, 2014</entry>
 	    <entry>8.4-STABLE after FreeBSD-SA-14:19 (rev
 	      <revnumber>271668</revnumber>).</entry>
 	  </row>
 
 	  <row>
 	    <entry>804506</entry>
 	    <entry><revnumber>273432</revnumber></entry>
 	    <entry>October 21, 2014</entry>
 	    <entry>8.4-STABLE after FreeBSD-SA-14:21 (rev
 	      <revnumber>273413</revnumber>).</entry>
 	  </row>
 
 	  <row>
 	    <entry>804507</entry>
 	    <entry><revnumber>274162</revnumber></entry>
 	    <entry>November 4, 2014</entry>
 	    <entry>8.4-STABLE after FreeBSD-SA-14:23,
 	      FreeBSD-SA-14:24, and FreeBSD-SA-14:25.</entry>
 	  </row>
 
 	  <row>
 	    <entry>804508</entry>
 	    <entry><revnumber>279287</revnumber></entry>
 	    <entry>February 25, 2015</entry>
 	    <entry>8-STABLE after FreeBSD-EN-15:01.vt,
 	      FreeBSD-EN-15:02.openssl,
 	      FreeBSD-EN-15:03.freebsd-update, FreeBSD-SA-15:04.igmp,
 	      and FreeBSD-SA-15:05.bind.</entry>
 	  </row>
 
 	  <row>
 	    <entry>804509</entry>
 	    <entry><revnumber>305736</revnumber></entry>
 	    <entry>September 12, 2016</entry>
 	    <entry>8-STABLE after resolving a deadlock between
 	      <function>device_detach()</function> and
 	      &man.usbd.do.request.flags.9;.</entry>
 	  </row>
 	</tbody>
       </tgroup>
     </table>
   </sect1>
 
   <sect1 xml:id="versions-7">
     <title>&os; 7 Versions</title>
 
     <table frame="none" xml:id="freebsd-versions-table-7">
       <title>&os; 7 <literal>__FreeBSD_version</literal>
 	Values</title>
 
       <tgroup cols="4">
 	<thead>
 	  <row>
 	    <entry>Value</entry>
 
 	    <entry>Revision</entry>
 
 	    <entry>Date</entry>
 
 	    <entry>Release</entry>
 	  </row>
 	</thead>
 
 	<tbody>
 	  <row>
 	    <entry>700000</entry>
 	    <entry><revnumber>147925</revnumber></entry>
 	    <entry>July 11, 2005</entry>
 	    <entry>7.0-CURRENT.</entry>
 	  </row>
 
 	  <row>
 	    <entry>700001</entry>
 	    <entry><revnumber>148341</revnumber></entry>
 	    <entry>July 23, 2005</entry>
 	    <entry>7.0-CURRENT after bump of all shared library
 	      versions that had not been changed since
 	      RELENG_5.</entry>
 	  </row>
 
 	  <row>
 	    <entry>700002</entry>
 	    <entry><revnumber>149039</revnumber></entry>
 	    <entry>August 13, 2005</entry>
 	    <entry>7.0-CURRENT after credential argument is added to
 	      dev_clone event handler.</entry>
 	  </row>
 
 	  <row>
 	    <entry>700003</entry>
 	    <entry><revnumber>149470</revnumber></entry>
 	    <entry>August 25, 2005</entry>
 	    <entry>7.0-CURRENT after &man.memmem.3; is added to
 	      libc.</entry>
 	  </row>
 
 	  <row>
 	    <entry>700004</entry>
 	    <entry><revnumber>151888</revnumber></entry>
 	    <entry>October 30, 2005</entry>
 	    <entry>7.0-CURRENT after &man.solisten.9; kernel arguments
 	      are modified to accept a backlog parameter.</entry>
 	  </row>
 
 	  <row>
 	    <entry>700005</entry>
 	    <entry><revnumber>152296</revnumber></entry>
 	    <entry>November 11, 2005</entry>
 	    <entry>7.0-CURRENT after IFP2ENADDR() was changed to
 	      return a pointer to IF_LLADDR().</entry>
 	  </row>
 
 	  <row>
 	    <entry>700006</entry>
 	    <entry><revnumber>152315</revnumber></entry>
 	    <entry>November 11, 2005</entry>
 	    <entry>7.0-CURRENT after addition of
 	      <literal>if_addr</literal> member to <literal>struct
 		ifnet</literal> and IFP2ENADDR() removal.</entry>
 	  </row>
 
 	  <row>
 	    <entry>700007</entry>
 	    <entry><revnumber>153027</revnumber></entry>
 	    <entry>December 2, 2005</entry>
 	    <entry>7.0-CURRENT after incorporating scripts from the
 	      local_startup directories into the base
 	      &man.rcorder.8;.</entry>
 	  </row>
 
 	  <row>
 	    <entry>700008</entry>
 	    <entry><revnumber>153107</revnumber></entry>
 	    <entry>December 5, 2005</entry>
 	    <entry>7.0-CURRENT after removal of MNT_NODEV mount
 	      option.</entry>
 	  </row>
 
 	  <row>
 	    <entry>700009</entry>
 	    <entry><revnumber>153519</revnumber></entry>
 	    <entry>December 19, 2005</entry>
 	    <entry>7.0-CURRENT after ELF-64 type changes and symbol
 	      versioning.</entry>
 	  </row>
 
 	  <row>
 	    <entry>700010</entry>
 	    <entry><revnumber>153579</revnumber></entry>
 	    <entry>December 20, 2005</entry>
 	    <entry>7.0-CURRENT after addition of hostb and vgapci
 	      drivers, addition of pci_find_extcap(), and changing the
 	      AGP drivers to no longer map the aperture.</entry>
 	  </row>
 
 	  <row>
 	    <entry>700011</entry>
 	    <entry><revnumber>153936</revnumber></entry>
 	    <entry>December 31, 2005</entry>
 	    <entry>7.0-CURRENT after tv_sec was made time_t on all
 	      platforms but Alpha.</entry>
 	  </row>
 
 	  <row>
 	    <entry>700012</entry>
 	    <entry><revnumber>154114</revnumber></entry>
 	    <entry>January 8, 2006</entry>
 	    <entry>7.0-CURRENT after ldconfig_local_dirs
 	      change.</entry>
 	  </row>
 
 	  <row>
 	    <entry>700013</entry>
 	    <entry><revnumber>154269</revnumber></entry>
 	    <entry>January 12, 2006</entry>
 	    <entry>7.0-CURRENT after changes to
 	      <filename>/etc/rc.d/abi</filename> to support
 	      <filename>/compat/linux/etc/ld.so.cache</filename> being
 	      a symlink in a readonly filesystem.</entry>
 	  </row>
 
 	  <row>
 	    <entry>700014</entry>
 	    <entry><revnumber>154863</revnumber></entry>
 	    <entry>January 26, 2006</entry>
 	    <entry>7.0-CURRENT after pts import.</entry>
 	  </row>
 
 	  <row>
 	    <entry>700015</entry>
 	    <entry><revnumber>157144</revnumber></entry>
 	    <entry>March 26, 2006</entry>
 	    <entry>7.0-CURRENT after the introduction of version 2 of
 	      &man.hwpmc.4;'s ABI.</entry>
 	  </row>
 
 	  <row>
 	    <entry>700016</entry>
 	    <entry><revnumber>157962</revnumber></entry>
 	    <entry>April 22, 2006</entry>
 	    <entry>7.0-CURRENT after addition of &man.fcloseall.3; to
 	      libc.</entry>
 	  </row>
 
 	  <row>
 	    <entry>700017</entry>
 	    <entry><revnumber>158513</revnumber></entry>
 	    <entry>May 13, 2006</entry>
 	    <entry>7.0-CURRENT after removal of ip6fw.</entry>
 	  </row>
 
 	  <row>
 	    <entry>700018</entry>
 	    <entry><revnumber>160386</revnumber></entry>
 	    <entry>July 15, 2006</entry>
 	    <entry>7.0-CURRENT after import of snd_emu10kx.</entry>
 	  </row>
 
 	  <row>
 	    <entry>700019</entry>
 	    <entry><revnumber>160821</revnumber></entry>
 	    <entry>July 29, 2006</entry>
 	    <entry>7.0-CURRENT after import of OpenSSL 0.9.8b.</entry>
 	  </row>
 
 	  <row>
 	    <entry>700020</entry>
 	    <entry><revnumber>161931</revnumber></entry>
 	    <entry>September 3, 2006</entry>
 	    <entry>7.0-CURRENT after addition of bus_dma_get_tag
 	      function</entry>
 	  </row>
 
 	  <row>
 	    <entry>700021</entry>
 	    <entry><revnumber>162023</revnumber></entry>
 	    <entry>September 4, 2006</entry>
 	    <entry>7.0-CURRENT after libpcap 0.9.4 and tcpdump 3.9.4
 	      import.</entry>
 	  </row>
 
 	  <row>
 	    <entry>700022</entry>
 	    <entry><revnumber>162170</revnumber></entry>
 	    <entry>September 9, 2006</entry>
 	    <entry>7.0-CURRENT after dlsym change to look for a
 	      requested symbol both in specified dso and its implicit
 	      dependencies.</entry>
 	  </row>
 
 	  <row>
 	    <entry>700023</entry>
 	    <entry><revnumber>162588</revnumber></entry>
 	    <entry>September 23, 2006</entry>
 	    <entry>7.0-CURRENT after adding new sound IOCTLs for the
 	      OSSv4 mixer API.</entry>
 	  </row>
 
 	  <row>
 	    <entry>700024</entry>
 	    <entry><revnumber>162919</revnumber></entry>
 	    <entry>September 28, 2006</entry>
 	    <entry>7.0-CURRENT after import of OpenSSL 0.9.8d.</entry>
 	  </row>
 
 	  <row>
 	    <entry>700025</entry>
 	    <entry><revnumber>164190</revnumber></entry>
 	    <entry>November 11, 2006</entry>
 	    <entry>7.0-CURRENT after the addition of libelf.</entry>
 	  </row>
 
 	  <row>
 	    <entry>700026</entry>
 	    <entry><revnumber>164614</revnumber></entry>
 	    <entry>November 26, 2006</entry>
 	    <entry>7.0-CURRENT after major changes on sound
 	      sysctls.</entry>
 	  </row>
 
 	  <row>
 	    <entry>700027</entry>
 	    <entry><revnumber>164770</revnumber></entry>
 	    <entry>November 30, 2006</entry>
 	    <entry>7.0-CURRENT after the addition of Wi-Spy
 	      quirk.</entry>
 	  </row>
 
 	  <row>
 	    <entry>700028</entry>
 	    <entry><revnumber>165242</revnumber></entry>
 	    <entry>December 15, 2006</entry>
 	    <entry>7.0-CURRENT after the addition of sctp calls to
 	      libc</entry>
 	  </row>
 
 	  <row>
 	    <entry>700029</entry>
 	    <entry><revnumber>166259</revnumber></entry>
 	    <entry>January 26, 2007</entry>
 	    <entry>7.0-CURRENT after the GNU &man.gzip.1;
 	      implementation was replaced with a BSD licensed version
 	      ported from NetBSD.</entry>
 	  </row>
 
 	  <row>
 	    <entry>700030</entry>
 	    <entry><revnumber>166549</revnumber></entry>
 	    <entry>February 7, 2007</entry>
 	    <entry>7.0-CURRENT after the removal of IPIP tunnel
 	      encapsulation (VIFF_TUNNEL) from the IPv4 multicast
 	      forwarding code.</entry>
 	  </row>
 
 	  <row>
 	    <entry>700031</entry>
 	    <entry><revnumber>166907</revnumber></entry>
 	    <entry>February 23, 2007</entry>
 	    <entry>7.0-CURRENT after the modification of
 	      bus_setup_intr() (newbus).</entry>
 	  </row>
 
 	  <row>
 	    <entry>700032</entry>
 	    <entry><revnumber>167165</revnumber></entry>
 	    <entry>March 2, 2007</entry>
 	    <entry>7.0-CURRENT after the inclusion of &man.ipw.4; and
 	      &man.iwi.4; firmware.</entry>
 	  </row>
 
 	  <row>
 	    <entry>700033</entry>
 	    <entry><revnumber>167360</revnumber></entry>
 	    <entry>March 9, 2007</entry>
 	    <entry>7.0-CURRENT after the inclusion of ncurses wide
 	      character support.</entry>
 	  </row>
 
 	  <row>
 	    <entry>700034</entry>
 	    <entry><revnumber>167684</revnumber></entry>
 	    <entry>March 19, 2007</entry>
 	    <entry>7.0-CURRENT after changes to how insmntque(),
 	      getnewvnode(), and vfs_hash_insert() work.</entry>
 	  </row>
 
 	  <row>
 	    <entry>700035</entry>
 	    <entry><revnumber>167906</revnumber></entry>
 	    <entry>March 26, 2007</entry>
 	    <entry>7.0-CURRENT after addition of a notify mechanism
 	      for CPU frequency changes.</entry>
 	  </row>
 
 	  <row>
 	    <entry>700036</entry>
 	    <entry><revnumber>168413</revnumber></entry>
 	    <entry>April 6, 2007</entry>
 	    <entry>7.0-CURRENT after import of the ZFS
 	      filesystem.</entry>
 	  </row>
 
 	  <row>
 	    <entry>700037</entry>
 	    <entry><revnumber>168504</revnumber></entry>
 	    <entry>April 8, 2007</entry>
 	    <entry>7.0-CURRENT after addition of CAM 'SG' peripheral
 	      device, which implements a subset of Linux SCSI SG
 	      passthrough device API.</entry>
 	  </row>
 
 	  <row>
 	    <entry>700038</entry>
 	    <entry><revnumber>169151</revnumber></entry>
 	    <entry>April 30, 2007</entry>
 	    <entry>7.0-CURRENT after changing &man.getenv.3;,
 	      &man.putenv.3;, &man.setenv.3; and &man.unsetenv.3; to
 	      be POSIX conformant.</entry>
 	  </row>
 
 	  <row>
 	    <entry>700039</entry>
 	    <entry><revnumber>169190</revnumber></entry>
 	    <entry>May 1, 2007</entry>
 	    <entry>7.0-CURRENT after the changes in 700038 were backed
 	      out.</entry>
 	  </row>
 
 	  <row>
 	    <entry>700040</entry>
 	    <entry><revnumber>169453</revnumber></entry>
 	    <entry>May 10, 2007</entry>
 	    <entry>7.0-CURRENT after the addition of &man.flopen.3; to
 	      libutil.</entry>
 	  </row>
 
 	  <row>
 	    <entry>700041</entry>
 	    <entry><revnumber>169526</revnumber></entry>
 	    <entry>May 13, 2007</entry>
 	    <entry>7.0-CURRENT after enabling symbol versioning, and
 	      changing the default thread library to libthr.</entry>
 	  </row>
 
 	  <row>
 	    <entry>700042</entry>
 	    <entry><revnumber>169758</revnumber></entry>
 	    <entry>May 19, 2007</entry>
 	    <entry>7.0-CURRENT after the import of gcc 4.2.0.</entry>
 	  </row>
 
 	  <row>
 	    <entry>700043</entry>
 	    <entry><revnumber>169830</revnumber></entry>
 	    <entry>May 21, 2007</entry>
 	    <entry>7.0-CURRENT after bump of all shared library
 	      versions that had not been changed since
 	      RELENG_6.</entry>
 	  </row>
 
 	  <row>
 	    <entry>700044</entry>
 	    <entry><revnumber>170395</revnumber></entry>
 	    <entry>June 7, 2007</entry>
 	    <entry>7.0-CURRENT after changing the argument for
 	      vn_open()/VOP_OPEN() from file descriptor index to the
 	      struct file *.</entry>
 	  </row>
 
 	  <row>
 	    <entry>700045</entry>
 	    <entry><revnumber>170510</revnumber></entry>
 	    <entry>June 10, 2007</entry>
 	    <entry>7.0-CURRENT after changing &man.pam.nologin.8; to
 	      provide an account management function instead of an
 	      authentication function to the PAM framework.</entry>
 	  </row>
 
 	  <row>
 	    <entry>700046</entry>
 	    <entry><revnumber>170530</revnumber></entry>
 	    <entry>June 11, 2007</entry>
 	    <entry>7.0-CURRENT after updated 802.11 wireless
 	      support.</entry>
 	  </row>
 
 	  <row>
 	    <entry>700047</entry>
 	    <entry><revnumber>170579</revnumber></entry>
 	    <entry>June 11, 2007</entry>
 	    <entry>7.0-CURRENT after adding TCP LRO interface
 	      capabilities.</entry>
 	  </row>
 
 	  <row>
 	    <entry>700048</entry>
 	    <entry><revnumber>170613</revnumber></entry>
 	    <entry>June 12, 2007</entry>
 	    <entry>7.0-CURRENT after RFC 3678 API support added to the
 	      IPv4 stack.  Legacy RFC 1724 behavior of the
 	      IP_MULTICAST_IF ioctl has now been removed; 0.0.0.0/8
 	      may no longer be used to specify an interface index.
 	      Use struct ipmreqn instead.</entry>
 	  </row>
 
 	  <row>
 	    <entry>700049</entry>
 	    <entry><revnumber>171175</revnumber></entry>
 	    <entry>July 3, 2007</entry>
 	    <entry>7.0-CURRENT after importing pf from OpenBSD
 	      4.1</entry>
 	  </row>
 
 	  <row>
 	    <entry>(not changed)</entry>
 	    <entry><revnumber>171167</revnumber></entry>
 	    <entry></entry>
 	    <entry>7.0-CURRENT after adding IPv6 support for
 	      FAST_IPSEC, deleting KAME IPSEC, and renaming FAST_IPSEC
 	      to IPSEC.</entry>
 	  </row>
 
 	  <row>
 	    <entry>700050</entry>
 	    <entry><revnumber>171195</revnumber></entry>
 	    <entry>July 4, 2007</entry>
 	    <entry>7.0-CURRENT after converting setenv/putenv/etc.
 	      calls from traditional BSD to POSIX.</entry>
 	  </row>
 
 	  <row>
 	    <entry>700051</entry>
 	    <entry><revnumber>171211</revnumber></entry>
 	    <entry>July 4, 2007</entry>
 	    <entry>7.0-CURRENT after adding new mmap/lseek/etc
 	      syscalls.</entry>
 	  </row>
 
 	  <row>
 	    <entry>700052</entry>
 	    <entry><revnumber>171275</revnumber></entry>
 	    <entry>July 6, 2007</entry>
 	    <entry>7.0-CURRENT after moving I4B headers to
 	      include/i4b.</entry>
 	  </row>
 
 	  <row>
 	    <entry>700053</entry>
 	    <entry><revnumber>172394</revnumber></entry>
 	    <entry>September 30, 2007</entry>
 	    <entry>7.0-CURRENT after the addition of support for PCI
 	      domains</entry>
 	  </row>
 
 	  <row>
 	    <entry>700054</entry>
 	    <entry><revnumber>172988</revnumber></entry>
 	    <entry>October 25, 2007</entry>
 	    <entry>7.0-STABLE after MFC of wide and single byte ctype
 	      separation.</entry>
 	  </row>
 
 	  <row>
 	    <entry>700055</entry>
 	    <entry><revnumber>173104</revnumber></entry>
 	    <entry>October 28, 2007</entry>
 	    <entry>7.0-RELEASE, and 7.0-CURRENT after ABI backwards
 	      compatibility to the FreeBSD 4/5/6 versions of the
 	      PCIOCGETCONF, PCIOCREAD and PCIOCWRITE IOCTLs was MFCed,
 	      which required the ABI of the PCIOCGETCONF IOCTL to be
 	      broken again</entry>
 	  </row>
 
 	  <row>
 	    <entry>700100</entry>
 	    <entry><revnumber>174864</revnumber></entry>
 	    <entry>December 22, 2007</entry>
 	    <entry>7.0-STABLE after 7.0-RELEASE</entry>
 	  </row>
 
 	  <row>
 	    <entry>700101</entry>
 	    <entry><revnumber>176111</revnumber></entry>
 	    <entry>February 8, 2008</entry>
 	    <entry>7.0-STABLE after the MFC of m_collapse().</entry>
 	  </row>
 
 	  <row>
 	    <entry>700102</entry>
 	    <entry><revnumber>177735</revnumber></entry>
 	    <entry>March 30, 2008</entry>
 	    <entry>7.0-STABLE after the MFC of
 	      kdb_enter_why().</entry>
 	  </row>
 
 	  <row>
 	    <entry>700103</entry>
 	    <entry><revnumber>178061</revnumber></entry>
 	    <entry>April 10, 2008</entry>
 	    <entry>7.0-STABLE after adding l_sysid to struct
 	      flock.</entry>
 	  </row>
 
 	  <row>
 	    <entry>700104</entry>
 	    <entry><revnumber>178108</revnumber></entry>
 	    <entry>April 11, 2008</entry>
 	    <entry>7.0-STABLE after the MFC of
 	      &man.procstat.1;.</entry>
 	  </row>
 
 	  <row>
 	    <entry>700105</entry>
 	    <entry><revnumber>178120</revnumber></entry>
 	    <entry>April 11, 2008</entry>
 	    <entry>7.0-STABLE after the MFC of umtx features.</entry>
 	  </row>
 
 	  <row>
 	    <entry>700106</entry>
 	    <entry><revnumber>178225</revnumber></entry>
 	    <entry>April 15, 2008</entry>
 	    <entry>7.0-STABLE after the MFC of &man.write.2; support
 	      to &man.psm.4;.</entry>
 	  </row>
 
 	  <row>
 	    <entry>700107</entry>
 	    <entry><revnumber>178353</revnumber></entry>
 	    <entry>April 20, 2008</entry>
 	    <entry>7.0-STABLE after the MFC of F_DUP2FD command to
 	      &man.fcntl.2;.</entry>
 	  </row>
 
 	  <row>
 	    <entry>700108</entry>
 	    <entry><revnumber>178783</revnumber></entry>
 	    <entry>May 5, 2008</entry>
 	    <entry>7.0-STABLE after some &man.lockmgr.9; changes,
 	      which makes it necessary to include
 	      <filename>sys/lock.h</filename> to use
 	      &man.lockmgr.9;.</entry>
 	  </row>
 
 	  <row>
 	    <entry>700109</entry>
 	    <entry><revnumber>179367</revnumber></entry>
 	    <entry>May 27, 2008</entry>
 	    <entry>7.0-STABLE after MFC of the
 	      &man.memrchr.3; function.</entry>
 	  </row>
 
 	  <row>
 	    <entry>700110</entry>
 	    <entry><revnumber>181328</revnumber></entry>
 	    <entry>August 5, 2008</entry>
 	    <entry>7.0-STABLE after MFC of kernel NFS lockd
 	      client.</entry>
 	  </row>
 
 	  <row>
 	    <entry>700111</entry>
 	    <entry><revnumber>181940</revnumber></entry>
 	    <entry>August 20, 2008</entry>
 	    <entry>7.0-STABLE after addition of physically contiguous
 	      jumbo frame support.</entry>
 	  </row>
 
 	  <row>
 	    <entry>700112</entry>
 	    <entry><revnumber>182294</revnumber></entry>
 	    <entry>August 27, 2008</entry>
 	    <entry>7.0-STABLE after MFC of kernel DTrace
 	      support.</entry>
 	  </row>
 
 	  <row>
 	    <entry>701000</entry>
 	    <entry><revnumber>185315</revnumber></entry>
 	    <entry>November 25, 2008</entry>
 	    <entry>7.1-RELEASE</entry>
 	  </row>
 
 	  <row>
 	    <entry>701100</entry>
 	    <entry><revnumber>185302</revnumber></entry>
 	    <entry>November 25, 2008</entry>
 	    <entry>7.1-STABLE after 7.1-RELEASE.</entry>
 	  </row>
 
 	  <row>
 	    <entry>701101</entry>
 	    <entry><revnumber>187023</revnumber></entry>
 	    <entry>January 10, 2009</entry>
 	    <entry>7.1-STABLE after &man.strndup.3;
 	      merge.</entry>
 	  </row>
 
 	  <row>
 	    <entry>701102</entry>
 	    <entry><revnumber>187370</revnumber></entry>
 	    <entry>January 17, 2009</entry>
 	    <entry>7.1-STABLE after &man.cpuctl.4; support
 	      added.</entry>
 	  </row>
 
 	  <row>
 	    <entry>701103</entry>
 	    <entry><revnumber>188281</revnumber></entry>
 	    <entry>February 7, 2009</entry>
 	    <entry>7.1-STABLE after the merge of multi-/no-IPv4/v6
 	      jails.</entry>
 	  </row>
 
 	  <row>
 	    <entry>701104</entry>
 	    <entry><revnumber>188625</revnumber></entry>
 	    <entry>February 14, 2009</entry>
 	    <entry>7.1-STABLE after the store of the suspension owner
 	      in the struct mount, and introduction of vfs_susp_clean
 	      method into the struct vfsops.</entry>
 	  </row>
 
 	  <row>
 	    <entry>701105</entry>
 	    <entry><revnumber>189740</revnumber></entry>
 	    <entry>March 12, 2009</entry>
 	    <entry>7.1-STABLE after the incompatible change to the
 	      kern.ipc.shmsegs sysctl to allow allocating larger SysV
 	      shared memory segments on 64bit architectures.</entry>
 	  </row>
 
 	  <row>
 	    <entry>701106</entry>
 	    <entry><revnumber>189786</revnumber></entry>
 	    <entry>March 14, 2009</entry>
 	    <entry>7.1-STABLE after the merge of a fix for POSIX
 	      semaphore wait operations.</entry>
 	  </row>
 
 	  <row>
 	    <entry>702000</entry>
 	    <entry><revnumber>191099</revnumber></entry>
 	    <entry>April 15, 2009</entry>
 	    <entry>7.2-RELEASE</entry>
 	  </row>
 
 	  <row>
 	    <entry>702100</entry>
 	    <entry><revnumber>191091</revnumber></entry>
 	    <entry>April 15, 2009</entry>
 	    <entry>7.2-STABLE after 7.2-RELEASE.</entry>
 	  </row>
 
 	  <row>
 	    <entry>702101</entry>
 	    <entry><revnumber>192149</revnumber></entry>
 	    <entry>May 15, 2009</entry>
 	    <entry>7.2-STABLE after &man.ichsmb.4; was changed to use
 	      left-adjusted slave addressing to match other SMBus
 	      controller drivers.</entry>
 	  </row>
 
 	  <row>
 	    <entry>702102</entry>
 	    <entry><revnumber>193020</revnumber></entry>
 	    <entry>May 28, 2009</entry>
 	    <entry>7.2-STABLE after MFC of the
 	      &man.fdopendir.3; function.</entry>
 	  </row>
 
 	  <row>
 	    <entry>702103</entry>
 	    <entry><revnumber>193638</revnumber></entry>
 	    <entry>June 06, 2009</entry>
 	    <entry>7.2-STABLE after MFC of PmcTools.</entry>
 	  </row>
 
 	  <row>
 	    <entry>702104</entry>
 	    <entry><revnumber>195694</revnumber></entry>
 	    <entry>July 14, 2009</entry>
 	    <entry>7.2-STABLE after MFC of the
 	      &man.closefrom.2; system call.</entry>
 	  </row>
 
 	  <row>
 	    <entry>702105</entry>
 	    <entry><revnumber>196006</revnumber></entry>
 	    <entry>July 31, 2009</entry>
 	    <entry>7.2-STABLE after MFC of the SYSVIPC ABI
 	      change.</entry>
 	  </row>
 
 	  <row>
 	    <entry>702106</entry>
 	    <entry><revnumber>197198</revnumber></entry>
 	    <entry>September 14, 2009</entry>
 	    <entry>7.2-STABLE after MFC of the x86 PAT enhancements
 	      and addition of d_mmap_single() and the scatter/gather
 	      list VM object type.</entry>
 	  </row>
 
 	  <row>
 	    <entry>703000</entry>
 	    <entry><revnumber>203740</revnumber></entry>
 	    <entry>February 9, 2010</entry>
 	    <entry>7.3-RELEASE</entry>
 	  </row>
 
 	  <row>
 	    <entry>703100</entry>
 	    <entry><revnumber>203742</revnumber></entry>
 	    <entry>February 9, 2010</entry>
 	    <entry>7.3-STABLE after 7.3-RELEASE.</entry>
 	  </row>
 
 	  <row>
 	    <entry>704000</entry>
 	    <entry><revnumber>216647</revnumber></entry>
 	    <entry>December 22, 2010</entry>
 	    <entry>7.4-RELEASE</entry>
 	  </row>
 
 	  <row>
 	    <entry>704100</entry>
 	    <entry><revnumber>216658</revnumber></entry>
 	    <entry>December 22, 2010</entry>
 	    <entry>7.4-STABLE after 7.4-RELEASE.</entry>
 	  </row>
 
 	  <row>
 	    <entry>704101</entry>
 	    <entry><revnumber>221318</revnumber></entry>
 	    <entry>May  2, 2011</entry>
 	    <entry>7.4-STABLE after the gcc MFC in rev
 	      <revnumber>221317</revnumber>.</entry>
 	  </row>
 	</tbody>
       </tgroup>
     </table>
   </sect1>
 
   <sect1 xml:id="versions-6">
     <title>&os; 6 Versions</title>
 
     <table frame="none" xml:id="freebsd-versions-table-6">
       <title>&os; 6 <literal>__FreeBSD_version</literal>
 	Values</title>
 
       <tgroup cols="4">
 	<thead>
 	  <row>
 	    <entry>Value</entry>
 
 	    <entry>Revision</entry>
 
 	    <entry>Date</entry>
 
 	    <entry>Release</entry>
 	  </row>
 	</thead>
 
 	<tbody>
 	  <row>
 	    <entry>600000</entry>
 	    <entry><revnumber>133921</revnumber></entry>
 	    <entry>August 18, 2004</entry>
 	    <entry>6.0-CURRENT</entry>
 	  </row>
 
 	  <row>
 	    <entry>600001</entry>
 	    <entry><revnumber>134396</revnumber></entry>
 	    <entry>August 27, 2004</entry>
 	    <entry>6.0-CURRENT after permanently enabling PFIL_HOOKS
 	      in the kernel.</entry>
 	  </row>
 
 	  <row>
 	    <entry>600002</entry>
 	    <entry><revnumber>134514</revnumber></entry>
 	    <entry>August 30, 2004</entry>
 	    <entry>6.0-CURRENT after initial addition of ifi_epoch to
 	      struct if_data.  Backed out after a few days.  Do not
 	      use this value.</entry>
 	  </row>
 
 	  <row>
 	    <entry>600003</entry>
 	    <entry><revnumber>134933</revnumber></entry>
 	    <entry>September 8, 2004</entry>
 	    <entry>6.0-CURRENT after the re-addition of the ifi_epoch
 	      member of struct if_data.</entry>
 	  </row>
 
 	  <row>
 	    <entry>600004</entry>
 	    <entry><revnumber>135920</revnumber></entry>
 	    <entry>September 29, 2004</entry>
 	    <entry>6.0-CURRENT after addition of the struct inpcb
 	      argument to the pfil API.</entry>
 	  </row>
 
 	  <row>
 	    <entry>600005</entry>
 	    <entry><revnumber>136172</revnumber></entry>
 	    <entry>October 5, 2004</entry>
 	    <entry>6.0-CURRENT after addition of the "-d DESTDIR"
 	      argument to newsyslog.</entry>
 	  </row>
 
 	  <row>
 	    <entry>600006</entry>
 	    <entry><revnumber>137192</revnumber></entry>
 	    <entry>November 4, 2004</entry>
 	    <entry>6.0-CURRENT after addition of glibc style
 	      &man.strftime.3; padding options.</entry>
 	  </row>
 
 	  <row>
 	    <entry>600007</entry>
 	    <entry><revnumber>138760</revnumber></entry>
 	    <entry>December 12, 2004</entry>
 	    <entry>6.0-CURRENT after addition of 802.11 framework
 	      updates.</entry>
 	  </row>
 
 	  <row>
 	    <entry>600008</entry>
 	    <entry><revnumber>140809</revnumber></entry>
 	    <entry>January 25, 2005</entry>
 	    <entry>6.0-CURRENT after changes to VOP_*VOBJECT()
 	      functions and introduction of MNTK_MPSAFE flag for
 	      Giantfree filesystems.</entry>
 	  </row>
 
 	  <row>
 	    <entry>600009</entry>
 	    <entry><revnumber>141250</revnumber></entry>
 	    <entry>February 4, 2005</entry>
 	    <entry>6.0-CURRENT after addition of the cpufreq framework
 	      and drivers.</entry>
 	  </row>
 
 	  <row>
 	    <entry>600010</entry>
 	    <entry><revnumber>141394</revnumber></entry>
 	    <entry>February 6, 2005</entry>
 	    <entry>6.0-CURRENT after importing OpenBSD's
 	      &man.nc.1;.</entry>
 	  </row>
 
 	  <row>
 	    <entry>600011</entry>
 	    <entry><revnumber>141727</revnumber></entry>
 	    <entry>February 12, 2005</entry>
 	    <entry>6.0-CURRENT after removing semblance of SVID2
 	      <literal>matherr()</literal> support.</entry>
 	  </row>
 
 	  <row>
 	    <entry>600012</entry>
 	    <entry><revnumber>141940</revnumber></entry>
 	    <entry>February 15, 2005</entry>
 	    <entry>6.0-CURRENT after increase of default thread
 	      stacks' size.</entry>
 	  </row>
 
 	  <row>
 	    <entry>600013</entry>
 	    <entry><revnumber>142089</revnumber></entry>
 	    <entry>February 19, 2005</entry>
 	    <entry>6.0-CURRENT after fixes in
 	      <filename>&lt;src/include/stdbool.h&gt;</filename> and
 	      <filename>&lt;src/sys/i386/include/_types.h&gt;</filename>
 	      for using the GCC-compatibility of the Intel C/C++
 	      compiler.</entry>
 	  </row>
 
 	  <row>
 	    <entry>600014</entry>
 	    <entry><revnumber>142184</revnumber></entry>
 	    <entry>February 21, 2005</entry>
 	    <entry>6.0-CURRENT after EOVERFLOW checks in
 	      &man.vswprintf.3; fixed.</entry>
 	  </row>
 
 	  <row>
 	    <entry>600015</entry>
 	    <entry><revnumber>142501</revnumber></entry>
 	    <entry>February 25, 2005</entry>
 	    <entry>6.0-CURRENT after changing the struct if_data
 	      member, ifi_epoch, from wall clock time to
 	      uptime.</entry>
 	  </row>
 
 	  <row>
 	    <entry>600016</entry>
 	    <entry><revnumber>142582</revnumber></entry>
 	    <entry>February 26, 2005</entry>
 	    <entry>6.0-CURRENT after LC_CTYPE disk format
 	      changed.</entry>
 	  </row>
 
 	  <row>
 	    <entry>600017</entry>
 	    <entry><revnumber>142683</revnumber></entry>
 	    <entry>February 27, 2005</entry>
 	    <entry>6.0-CURRENT after NLS catalogs disk format
 	      changed.</entry>
 	  </row>
 
 	  <row>
 	    <entry>600018</entry>
 	    <entry><revnumber>142686</revnumber></entry>
 	    <entry>February 27, 2005</entry>
 	    <entry>6.0-CURRENT after LC_COLLATE disk format
 	      changed.</entry>
 	  </row>
 
 	  <row>
 	    <entry>600019</entry>
 	    <entry><revnumber>142752</revnumber></entry>
 	    <entry>February 28, 2005</entry>
 	    <entry>Installation of acpica includes into
 	      /usr/include.</entry>
 	  </row>
 
 	  <row>
 	    <entry>600020</entry>
 	    <entry><revnumber>143308</revnumber></entry>
 	    <entry>March 9, 2005</entry>
 	    <entry>Addition of MSG_NOSIGNAL flag to &man.send.2;
 	      API.</entry>
 	  </row>
 
 	  <row>
 	    <entry>600021</entry>
 	    <entry><revnumber>143746</revnumber></entry>
 	    <entry>March 17, 2005</entry>
 	    <entry>Addition of fields to cdevsw</entry>
 	  </row>
 
 	  <row>
 	    <entry>600022</entry>
 	    <entry><revnumber>143901</revnumber></entry>
 	    <entry>March 21, 2005</entry>
 	    <entry>Removed gtar from base system.</entry>
 	  </row>
 
 	  <row>
 	    <entry>600023</entry>
 	    <entry><revnumber>144980</revnumber></entry>
 	    <entry>April 13, 2005</entry>
 	    <entry>LOCAL_CREDS, LOCAL_CONNWAIT socket options added to
 	      &man.unix.4;.</entry>
 	  </row>
 
 	  <row>
 	    <entry>600024</entry>
 	    <entry><revnumber>145565</revnumber></entry>
 	    <entry>April 19, 2005</entry>
 	    <entry>&man.hwpmc.4; and related tools added to
 	      6.0-CURRENT.</entry>
 	  </row>
 
 	  <row>
 	    <entry>600025</entry>
 	    <entry><revnumber>145565</revnumber></entry>
 	    <entry>April 26, 2005</entry>
 	    <entry>struct icmphdr added to 6.0-CURRENT.</entry>
 	  </row>
 
 	  <row>
 	    <entry>600026</entry>
 	    <entry><revnumber>145843</revnumber></entry>
 	    <entry>May 3, 2005</entry>
 	    <entry>pf updated to 3.7.</entry>
 	  </row>
 
 	  <row>
 	    <entry>600027</entry>
 	    <entry><revnumber>145966</revnumber></entry>
 	    <entry>May 6, 2005</entry>
 	    <entry>Kernel libalias and ng_nat introduced.</entry>
 	  </row>
 
 	  <row>
 	    <entry>600028</entry>
 	    <entry><revnumber>146191</revnumber></entry>
 	    <entry>May 13, 2005</entry>
 	    <entry>POSIX &man.ttyname.r.3; made available through
 	      unistd.h and libc.</entry>
 	  </row>
 
 	  <row>
 	    <entry>600029</entry>
 	    <entry><revnumber>146780</revnumber></entry>
 	    <entry>May 29, 2005</entry>
 	    <entry>6.0-CURRENT after libpcap updated to v0.9.1 alpha
 	      096.</entry>
 	  </row>
 
 	  <row>
 	    <entry>600030</entry>
 	    <entry><revnumber>146988</revnumber></entry>
 	    <entry>June 5, 2005</entry>
 	    <entry>6.0-CURRENT after importing NetBSD's
 	      &man.if.bridge.4;.</entry>
 	  </row>
 
 	  <row>
 	    <entry>600031</entry>
 	    <entry><revnumber>147256</revnumber></entry>
 	    <entry>June 10, 2005</entry>
 	    <entry>6.0-CURRENT after struct ifnet was broken out of
 	      the driver softcs.</entry>
 	  </row>
 
 	  <row>
 	    <entry>600032</entry>
 	    <entry><revnumber>147898</revnumber></entry>
 	    <entry>July 11, 2005</entry>
 	    <entry>6.0-CURRENT after the import of libpcap
 	      v0.9.1.</entry>
 	  </row>
 
 	  <row>
 	    <entry>600033</entry>
 	    <entry><revnumber>148388</revnumber></entry>
 	    <entry>July 25, 2005</entry>
 	    <entry>6.0-STABLE after bump of all shared library
 	      versions that had not been changed since
 	      RELENG_5.</entry>
 	  </row>
 
 	  <row>
 	    <entry>600034</entry>
 	    <entry><revnumber>149040</revnumber></entry>
 	    <entry>August 13, 2005</entry>
 	    <entry>6.0-STABLE after credential argument is added to
 	      dev_clone event handler.  6.0-RELEASE.</entry>
 	  </row>
 
 	  <row>
 	    <entry>600100</entry>
 	    <entry><revnumber>151958</revnumber></entry>
 	    <entry>November 1, 2005</entry>
 	    <entry>6.0-STABLE after 6.0-RELEASE</entry>
 	  </row>
 
 	  <row>
 	    <entry>600101</entry>
 	    <entry><revnumber>153601</revnumber></entry>
 	    <entry>December 21, 2005</entry>
 	    <entry>6.0-STABLE after incorporating scripts from the
 	      local_startup directories into the base
 	      &man.rcorder.8;.</entry>
 	  </row>
 
 	  <row>
 	    <entry>600102</entry>
 	    <entry><revnumber>153912</revnumber></entry>
 	    <entry>December 30, 2005</entry>
 	    <entry>6.0-STABLE after updating the ELF types and
 	      constants.</entry>
 	  </row>
 
 	  <row>
 	    <entry>600103</entry>
 	    <entry><revnumber>154396</revnumber></entry>
 	    <entry>January 15, 2006</entry>
 	    <entry>6.0-STABLE after MFC of &man.pidfile.3;
 	      API.</entry>
 	  </row>
 
 	  <row>
 	    <entry>600104</entry>
 	    <entry><revnumber>154453</revnumber></entry>
 	    <entry>January 17, 2006</entry>
 	    <entry>6.0-STABLE after MFC of ldconfig_local_dirs
 	      change.</entry>
 	  </row>
 
 	  <row>
 	    <entry>600105</entry>
 	    <entry><revnumber>156019</revnumber></entry>
 	    <entry>February 26, 2006</entry>
 	    <entry>6.0-STABLE after NLS catalog support of
 	      &man.csh.1;.</entry>
 	  </row>
 
 	  <row>
 	    <entry>601000</entry>
 	    <entry><revnumber>158330</revnumber></entry>
 	    <entry>May 6, 2006</entry>
 	    <entry>6.1-RELEASE</entry>
 	  </row>
 
 	  <row>
 	    <entry>601100</entry>
 	    <entry><revnumber>158331</revnumber></entry>
 	    <entry>May 6, 2006</entry>
 	    <entry>6.1-STABLE after 6.1-RELEASE.</entry>
 	  </row>
 
 	  <row>
 	    <entry>601101</entry>
 	    <entry><revnumber>159861</revnumber></entry>
 	    <entry>June 22, 2006</entry>
 	    <entry>6.1-STABLE after the import of csup.</entry>
 	  </row>
 
 	  <row>
 	    <entry>601102</entry>
 	    <entry><revnumber>160253</revnumber></entry>
 	    <entry>July 11, 2006</entry>
 	    <entry>6.1-STABLE after the &man.iwi.4; update.</entry>
 	  </row>
 
 	  <row>
 	    <entry>601103</entry>
 	    <entry><revnumber>160429</revnumber></entry>
 	    <entry>July 17, 2006</entry>
 	    <entry>6.1-STABLE after the resolver update to BIND9, and
 	      exposure of reentrant version of netdb
 	      functions.</entry>
 	  </row>
 
 	  <row>
 	    <entry>601104</entry>
 	    <entry><revnumber>161098</revnumber></entry>
 	    <entry>August 8, 2006</entry>
 	    <entry>6.1-STABLE after DSO (dynamic shared objects)
 	      support has been enabled in OpenSSL.</entry>
 	  </row>
 
 	  <row>
 	    <entry>601105</entry>
 	    <entry><revnumber>161900</revnumber></entry>
 	    <entry>September 2, 2006</entry>
 	    <entry>6.1-STABLE after 802.11 fixups changed the api for
 	      the IEEE80211_IOC_STA_INFO ioctl.</entry>
 	  </row>
 
 	  <row>
 	    <entry>602000</entry>
 	    <entry><revnumber>164312</revnumber></entry>
 	    <entry>November 15, 2006</entry>
 	    <entry>6.2-RELEASE</entry>
 	  </row>
 
 	  <row>
 	    <entry>602100</entry>
 	    <entry><revnumber>162329</revnumber></entry>
 	    <entry>September 15, 2006</entry>
 	    <entry>6.2-STABLE after 6.2-RELEASE.</entry>
 	  </row>
 
 	  <row>
 	    <entry>602101</entry>
 	    <entry><revnumber>165122</revnumber></entry>
 	    <entry>December 12, 2006</entry>
 	    <entry>6.2-STABLE after the addition of Wi-Spy
 	      quirk.</entry>
 	  </row>
 
 	  <row>
 	    <entry>602102</entry>
 	    <entry><revnumber>165596</revnumber></entry>
 	    <entry>December 28, 2006</entry>
 	    <entry>6.2-STABLE after pci_find_extcap()
 	      addition.</entry>
 	  </row>
 
 	  <row>
 	    <entry>602103</entry>
 	    <entry><revnumber>166039</revnumber></entry>
 	    <entry>January 16, 2007</entry>
 	    <entry>6.2-STABLE after MFC of dlsym change to look for a
 	      requested symbol both in specified dso and its implicit
 	      dependencies.</entry>
 	  </row>
 
 	  <row>
 	    <entry>602104</entry>
 	    <entry><revnumber>166314</revnumber></entry>
 	    <entry>January 28, 2007</entry>
 	    <entry>6.2-STABLE after MFC of &man.ng.deflate.4; and
 	      &man.ng.pred1.4; netgraph nodes and new compression and
 	      encryption modes for &man.ng.ppp.4; node.</entry>
 	  </row>
 
 	  <row>
 	    <entry>602105</entry>
 	    <entry><revnumber>166840</revnumber></entry>
 	    <entry>February 20, 2007</entry>
 	    <entry>6.2-STABLE after MFC of BSD licensed version of
 	      &man.gzip.1; ported from NetBSD.</entry>
 	  </row>
 
 	  <row>
 	    <entry>602106</entry>
 	    <entry><revnumber>168133</revnumber></entry>
 	    <entry>March 31, 2007</entry>
 	    <entry>6.2-STABLE after MFC of PCI MSI and MSI-X
 	      support.</entry>
 	  </row>
 
 	  <row>
 	    <entry>602107</entry>
 	    <entry><revnumber>168438</revnumber></entry>
 	    <entry>April 6, 2007</entry>
 	    <entry>6.2-STABLE after MFC of ncurses 5.6 and wide
 	      character support.</entry>
 	  </row>
 
 	  <row>
 	    <entry>602108</entry>
 	    <entry><revnumber>168611</revnumber></entry>
 	    <entry>April 11, 2007</entry>
 	    <entry>6.2-STABLE after MFC of CAM 'SG' peripheral device,
 	      which implements a subset of Linux SCSI SG passthrough
 	      device API.</entry>
 	  </row>
 
 	  <row>
 	    <entry>602109</entry>
 	    <entry><revnumber>168805</revnumber></entry>
 	    <entry>April 17, 2007</entry>
 	    <entry>6.2-STABLE after MFC of readline 5.2 patchset
 	      002.</entry>
 	  </row>
 
 	  <row>
 	    <entry>602110</entry>
 	    <entry><revnumber>169222</revnumber></entry>
 	    <entry>May 2, 2007</entry>
 	    <entry>6.2-STABLE after MFC of pmap_invalidate_cache(),
 	      pmap_change_attr(), pmap_mapbios(), pmap_mapdev_attr(),
 	      and pmap_unmapbios() for amd64 and i386.</entry>
 	  </row>
 
 	  <row>
 	    <entry>602111</entry>
 	    <entry><revnumber>170556</revnumber></entry>
 	    <entry>June 11, 2007</entry>
 	    <entry>6.2-STABLE after MFC of BOP_BDFLUSH and caused
 	      breakage of the filesystem modules KBI.</entry>
 	  </row>
 
 	  <row>
 	    <entry>602112</entry>
 	    <entry><revnumber>172284</revnumber></entry>
 	    <entry>September 21, 2007</entry>
 	    <entry>6.2-STABLE after libutil(3) MFC's.</entry>
 	  </row>
 
 	  <row>
 	    <entry>602113</entry>
 	    <entry><revnumber>172986</revnumber></entry>
 	    <entry>October 25, 2007</entry>
 	    <entry>6.2-STABLE after MFC of wide and single byte ctype
 	      separation.  Newly compiled binary that references to
 	      ctype.h may require a new symbol, __mb_sb_limit, which
 	      is not available on older systems.</entry>
 	  </row>
 
 	  <row>
 	    <entry>602114</entry>
 	    <entry><revnumber>173170</revnumber></entry>
 	    <entry>October 30, 2007</entry>
 	    <entry>6.2-STABLE after ctype ABI forward compatibility
 	      restored.</entry>
 	  </row>
 
 	  <row>
 	    <entry>602115</entry>
 	    <entry><revnumber>173794</revnumber></entry>
 	    <entry>November 21, 2007</entry>
 	    <entry>6.2-STABLE after back out of wide and single byte
 	      ctype separation.</entry>
 	  </row>
 
 	  <row>
 	    <entry>603000</entry>
 	    <entry><revnumber>173897</revnumber></entry>
 	    <entry>November 25, 2007</entry>
 	    <entry>6.3-RELEASE</entry>
 	  </row>
 
 	  <row>
 	    <entry>603100</entry>
 	    <entry><revnumber>173891</revnumber></entry>
 	    <entry>November 25, 2007</entry>
 	    <entry>6.3-STABLE after 6.3-RELEASE.</entry>
 	  </row>
 
 	  <row>
 	    <entry>(not changed)</entry>
 	    <!-- There is no 603101 in the file's history -->
 	    <entry><revnumber>174434</revnumber></entry>
 	    <entry>December 7, 2007</entry>
 	    <entry>6.3-STABLE after fixing multibyte type support in
 	      bit macro.</entry>
 	  </row>
 
 	  <row>
 	    <entry>603102</entry>
 	    <entry><revnumber>178459</revnumber></entry>
 	    <entry>April 24, 2008</entry>
 	    <entry>6.3-STABLE after adding l_sysid to struct
 	      flock.</entry>
 	  </row>
 
 	  <row>
 	    <entry>603103</entry>
 	    <entry><revnumber>179367</revnumber></entry>
 	    <entry>May 27, 2008</entry>
 	    <entry>6.3-STABLE after MFC of the
 	      &man.memrchr.3; function.</entry>
 	  </row>
 
 	  <row>
 	    <entry>603104</entry>
 	    <entry><revnumber>179810</revnumber></entry>
 	    <entry>June 15, 2008</entry>
 	    <entry>6.3-STABLE after MFC of support for
 	      <literal>:u</literal> variable modifier in
 	      &man.make.1;.</entry>
 	  </row>
 
 	  <row>
 	    <entry>604000</entry>
 	    <entry><revnumber>183583</revnumber></entry>
 	    <entry>October 4, 2008</entry>
 	    <entry>6.4-RELEASE</entry>
 	  </row>
 
 	  <row>
 	    <entry>604100</entry>
 	    <entry><revnumber>183584</revnumber></entry>
 	    <entry>October 4, 2008</entry>
 	    <entry>6.4-STABLE after 6.4-RELEASE.</entry>
 	  </row>
 	</tbody>
       </tgroup>
     </table>
   </sect1>
 
   <sect1 xml:id="versions-5">
     <title>&os; 5 Versions</title>
 
     <table frame="none" xml:id="freebsd-versions-table-5">
       <title>&os; 5 <literal>__FreeBSD_version</literal>
 	Values</title>
 
       <tgroup cols="4">
 	<thead>
 	  <row>
 	    <entry>Value</entry>
 
 	    <entry>Revision</entry>
 
 	    <entry>Date</entry>
 
 	    <entry>Release</entry>
 	  </row>
 	</thead>
 
 	<tbody>
 	  <row>
 	    <entry>500000</entry>
 	    <entry><revnumber>58009</revnumber></entry>
 	    <entry>March 13, 2000</entry>
 	    <entry>5.0-CURRENT</entry>
 	  </row>
 
 	  <row>
 	    <entry>500001</entry>
 	    <entry><revnumber>59348</revnumber></entry>
 	    <entry>April 18, 2000</entry>
 	    <entry>5.0-CURRENT after adding addition ELF header
 	      fields, and changing our ELF binary branding
 	      method.</entry>
 	  </row>
 
 	  <row>
 	    <entry>500002</entry>
 	    <entry><revnumber>59906</revnumber></entry>
 	    <entry>May 2, 2000</entry>
 	    <entry>5.0-CURRENT after kld metadata changes.</entry>
 	  </row>
 
 	  <row>
 	    <entry>500003</entry>
 	    <entry><revnumber>60688</revnumber></entry>
 	    <entry>May 18, 2000</entry>
 	    <entry>5.0-CURRENT after buf/bio changes.</entry>
 	  </row>
 
 	  <row>
 	    <entry>500004</entry>
 	    <entry><revnumber>60936</revnumber></entry>
 	    <entry>May 26, 2000</entry>
 	    <entry>5.0-CURRENT after binutils upgrade.</entry>
 	  </row>
 
 	  <row>
 	    <entry>500005</entry>
 	    <entry><revnumber>61221</revnumber></entry>
 	    <entry>June 3, 2000</entry>
 	    <entry>5.0-CURRENT after merging libxpg4 code into libc
 	      and after TASKQ interface introduction.</entry>
 	  </row>
 
 	  <row>
 	    <entry>500006</entry>
 	    <entry><revnumber>61500</revnumber></entry>
 	    <entry>June 10, 2000</entry>
 	    <entry>5.0-CURRENT after the addition of AGP
 	      interfaces.</entry>
 	  </row>
 
 	  <row>
 	    <entry>500007</entry>
 	    <entry><revnumber>62235</revnumber></entry>
 	    <entry>June 29, 2000</entry>
 	    <entry>5.0-CURRENT after Perl upgrade to 5.6.0</entry>
 	  </row>
 
 	  <row>
 	    <entry>500008</entry>
 	    <entry><revnumber>62764</revnumber></entry>
 	    <entry>July 7, 2000</entry>
 	    <entry>5.0-CURRENT after the update of KAME code to
 	      2000/07 sources.</entry>
 	  </row>
 
 	  <row>
 	    <entry>500009</entry>
 	    <entry><revnumber>63154</revnumber></entry>
 	    <entry>July 14, 2000</entry>
 	    <entry>5.0-CURRENT after ether_ifattach() and
 	      ether_ifdetach() changes.</entry>
 	  </row>
 
 	  <row>
 	    <entry>500010</entry>
 	    <entry><revnumber>63265</revnumber></entry>
 	    <entry>July 16, 2000</entry>
 	    <entry>5.0-CURRENT after changing mtree defaults back to
 	      original variant, adding -L to follow symlinks.</entry>
 	  </row>
 
 	  <row>
 	    <entry>500011</entry>
 	    <entry><revnumber>63459</revnumber></entry>
 	    <entry>July 18, 2000</entry>
 	    <entry>5.0-CURRENT after kqueue API changed.</entry>
 	  </row>
 
 	  <row>
 	    <entry>500012</entry>
 	    <entry><revnumber>65353</revnumber></entry>
 	    <entry>September 2, 2000</entry>
 	    <entry>5.0-CURRENT after &man.setproctitle.3; moved from
 	      libutil to libc.</entry>
 	  </row>
 
 	  <row>
 	    <entry>500013</entry>
 	    <entry><revnumber>65671</revnumber></entry>
 	    <entry>September 10, 2000</entry>
 	    <entry>5.0-CURRENT after the first SMPng commit.</entry>
 	  </row>
 
 	  <row>
 	    <entry>500014</entry>
 	    <entry><revnumber>70650</revnumber></entry>
 	    <entry>January 4, 2001</entry>
 	    <entry>5.0-CURRENT after &lt;sys/select.h&gt; moved to
 	      &lt;sys/selinfo.h&gt;.</entry>
 	  </row>
 
 	  <row>
 	    <entry>500015</entry>
 	    <entry><revnumber>70894</revnumber></entry>
 	    <entry>January 10, 2001</entry>
 	    <entry>5.0-CURRENT after combining libgcc.a and
 	      libgcc_r.a, and associated GCC linkage changes.</entry>
 	  </row>
 
 	  <row>
 	    <entry>500016</entry>
 	    <entry><revnumber>71583</revnumber></entry>
 	    <entry>January 24, 2001</entry>
 	    <entry>5.0-CURRENT after change allowing libc and libc_r
 	      to be linked together, deprecating -pthread
 	      option.</entry>
 	  </row>
 
 	  <row>
 	    <entry>500017</entry>
 	    <entry><revnumber>72650</revnumber></entry>
 	    <entry>February 18, 2001</entry>
 	    <entry>5.0-CURRENT after switch from struct ucred to
 	      struct xucred to stabilize kernel-exported API for
 	      mountd et al.</entry>
 	  </row>
 
 	  <row>
 	    <entry>500018</entry>
 	    <entry><revnumber>72975</revnumber></entry>
 	    <entry>February 24, 2001</entry>
 	    <entry>5.0-CURRENT after addition of CPUTYPE make variable
 	      for controlling CPU-specific optimizations.</entry>
 	  </row>
 
 	  <row>
 	    <entry>500019</entry>
 	    <entry><revnumber>77937</revnumber></entry>
 	    <entry>June 9, 2001</entry>
 	    <entry>5.0-CURRENT after moving machine/ioctl_fd.h to
 	      sys/fdcio.h</entry>
 	  </row>
 
 	  <row>
 	    <entry>500020</entry>
 	    <entry><revnumber>78304</revnumber></entry>
 	    <entry>June 15, 2001</entry>
 	    <entry>5.0-CURRENT after locale names renaming.</entry>
 	  </row>
 
 	  <row>
 	    <entry>500021</entry>
 	    <entry><revnumber>78632</revnumber></entry>
 	    <entry>June 22, 2001</entry>
 	    <entry>5.0-CURRENT after Bzip2 import.  Also signifies
 	      removal of S/Key.</entry>
 	  </row>
 
 	  <row>
 	    <entry>500022</entry>
 	    <entry><revnumber>83435</revnumber></entry>
 	    <entry>July 12, 2001</entry>
 	    <entry>5.0-CURRENT after SSE support.</entry>
 	  </row>
 
 	  <row>
 	    <entry>500023</entry>
 	    <entry><revnumber>83435</revnumber></entry>
 	    <entry>September 14, 2001</entry>
 	    <entry>5.0-CURRENT after KSE Milestone 2.</entry>
 	  </row>
 
 	  <row>
 	    <entry>500024</entry>
 	    <entry><revnumber>84324</revnumber></entry>
 	    <entry>October 1, 2001</entry>
 	    <entry>5.0-CURRENT after d_thread_t, and moving UUCP to
 	      ports.</entry>
 	  </row>
 
 	  <row>
 	    <entry>500025</entry>
 	    <entry><revnumber>84481</revnumber></entry>
 	    <entry>October 4, 2001</entry>
 	    <entry>5.0-CURRENT after ABI change for descriptor and
 	      creds passing on 64 bit platforms.</entry>
 	  </row>
 
 	  <row>
 	    <entry>500026</entry>
 	    <entry><revnumber>84710</revnumber></entry>
 	    <entry>October 9, 2001</entry>
 	    <entry>5.0-CURRENT after moving to XFree86 4 by default
 	      for package builds, and after the new libc strnstr()
 	      function was added.</entry>
 	  </row>
 
 	  <row>
 	    <entry>500027</entry>
 	    <entry><revnumber>84743</revnumber></entry>
 	    <entry>October 10, 2001</entry>
 	    <entry>5.0-CURRENT after the new libc strcasestr()
 	      function was added.</entry>
 	  </row>
 
 	  <row>
 	    <entry>500028</entry>
 	    <entry><revnumber>87879</revnumber></entry>
 	    <entry>December 14, 2001</entry>
 	    <entry>5.0-CURRENT after the userland components of smbfs
 	      were imported.</entry>
 	  </row>
 
 	  <row>
 	    <entry>(not changed)</entry>
 	    <entry></entry>
 	    <entry></entry>
 	    <entry>5.0-CURRENT after the new C99 specific-width
 	      integer types were added.</entry>
 	  </row>
 
 	  <row>
 	    <entry>500029</entry>
 	    <entry><revnumber>89938</revnumber></entry>
 	    <entry>January 29, 2002</entry>
 	    <entry>5.0-CURRENT after a change was made in the return
 	      value of &man.sendfile.2;.</entry>
 	  </row>
 
 	  <row>
 	    <entry>500030</entry>
 	    <entry><revnumber>90711</revnumber></entry>
 	    <entry>February 15, 2002</entry>
 	    <entry>5.0-CURRENT after the introduction of the type
 	      <literal>fflags_t</literal>, which is the appropriate
 	      size for file flags.</entry>
 	  </row>
 
 	  <row>
 	    <entry>500031</entry>
 	    <entry><revnumber>91203</revnumber></entry>
 	    <entry>February 24, 2002</entry>
 	    <entry>5.0-CURRENT after the usb structure element
 	      rename.</entry>
 	  </row>
 
 	  <row>
 	    <entry>500032</entry>
 	    <entry><revnumber>92453</revnumber></entry>
 	    <entry>March 16, 2002</entry>
 	    <entry>5.0-CURRENT after the introduction of Perl
 	      5.6.1.</entry>
 	  </row>
 
 	  <row>
 	    <entry>500033</entry>
 	    <entry><revnumber>93722</revnumber></entry>
 	    <entry>April 3, 2002</entry>
 	    <entry>5.0-CURRENT after the
 	      <literal>sendmail_enable</literal> &man.rc.conf.5;
 	      variable was made to take the value
 	      <literal>NONE</literal>.</entry>
 	  </row>
 
 	  <row>
 	    <entry>500034</entry>
 	    <entry><revnumber>95831</revnumber></entry>
 	    <entry>April 30, 2002</entry>
 	    <entry>5.0-CURRENT after mtx_init() grew a third
 	      argument.</entry>
 	  </row>
 
 	  <row>
 	    <entry>500035</entry>
 	    <entry><revnumber>96498</revnumber></entry>
 	    <entry>May 13, 2002</entry>
 	    <entry>5.0-CURRENT with Gcc 3.1.</entry>
 	  </row>
 
 	  <row>
 	    <entry>500036</entry>
 	    <entry><revnumber>96781</revnumber></entry>
 	    <entry>May 17, 2002</entry>
 	    <entry>5.0-CURRENT without Perl in /usr/src</entry>
 	  </row>
 
 	  <row>
 	    <entry>500037</entry>
 	    <entry><revnumber>97516</revnumber></entry>
 	    <entry>May 29, 2002</entry>
 	    <entry>5.0-CURRENT after the addition of
 	      &man.dlfunc.3;</entry>
 	  </row>
 
 	  <row>
 	    <entry>500038</entry>
 	    <entry><revnumber>100591</revnumber></entry>
 	    <entry>July 24, 2002</entry>
 	    <entry>5.0-CURRENT after the types of some struct sockbuf
 	      members were changed and the structure was
 	      reordered.</entry>
 	  </row>
 
 	  <row>
 	    <entry>500039</entry>
 	    <entry><revnumber>102757</revnumber></entry>
 	    <entry>September 1, 2002</entry>
 	    <entry>5.0-CURRENT after GCC 3.2.1 import.  Also after
 	      headers stopped using _BSD_FOO_T_ and started using
 	      _FOO_T_DECLARED.  This value can also be used as a
 	      conservative estimate of the start of &man.bzip2.1;
 	      package support.</entry>
 	  </row>
 
 	  <row>
 	    <entry>500040</entry>
 	    <entry><revnumber>103675</revnumber></entry>
 	    <entry>September 20, 2002</entry>
 	    <entry>5.0-CURRENT after various changes to disk functions
 	      were made in the name of removing dependency on
 	      disklabel structure internals.</entry>
 	  </row>
 
 	  <row>
 	    <entry>500041</entry>
 	    <entry><revnumber>104250</revnumber></entry>
 	    <entry>October 1, 2002</entry>
 	    <entry>5.0-CURRENT after the addition of
 	      &man.getopt.long.3; to libc.</entry>
 	  </row>
 
 	  <row>
 	    <entry>500042</entry>
 	    <entry><revnumber>105178</revnumber></entry>
 	    <entry>October 15, 2002</entry>
 	    <entry>5.0-CURRENT after Binutils 2.13 upgrade, which
 	      included new FreeBSD emulation, vec, and output
 	      format.</entry>
 	  </row>
 
 	  <row>
 	    <entry>500043</entry>
 	    <entry><revnumber>106289</revnumber></entry>
 	    <entry>November 1, 2002</entry>
 	    <entry>5.0-CURRENT after adding weak pthread_XXX stubs to
 	      libc, obsoleting libXThrStub.so.  5.0-RELEASE.</entry>
 	  </row>
 
 	  <row>
 	    <entry>500100</entry>
 	    <entry><revnumber>109405</revnumber></entry>
 	    <entry>January 17, 2003</entry>
 	    <entry>5.0-CURRENT after branching for RELENG_5_0</entry>
 	  </row>
 
 	  <row>
 	    <entry>500101</entry>
 	    <entry><revnumber>111120</revnumber></entry>
 	    <entry>February 19, 2003</entry>
 	    <entry>&lt;sys/dkstat.h&gt; is empty.  Do not include
 	      it.</entry>
 	  </row>
 
 	  <row>
 	    <entry>500102</entry>
 	    <entry><revnumber>111482</revnumber></entry>
 	    <entry>February 25, 2003</entry>
 	    <entry>5.0-CURRENT after the d_mmap_t interface
 	      change.</entry>
 	  </row>
 
 	  <row>
 	    <entry>500103</entry>
 	    <entry><revnumber>111540</revnumber></entry>
 	    <entry>February 26, 2003</entry>
 	    <entry>5.0-CURRENT after taskqueue_swi changed to run
 	      without Giant, and taskqueue_swi_giant added to run with
 	      Giant.</entry>
 	  </row>
 
 	  <row>
 	    <entry>500104</entry>
 	    <entry><revnumber>111600</revnumber></entry>
 	    <entry>February 27, 2003</entry>
 	    <entry>cdevsw_add() and cdevsw_remove() no longer exists.
 	      Appearance of MAJOR_AUTO allocation facility.</entry>
 	  </row>
 
 	  <row>
 	    <entry>500105</entry>
 	    <entry><revnumber>111864</revnumber></entry>
 	    <entry>March 4, 2003</entry>
 	    <entry>5.0-CURRENT after new cdevsw initialization
 	      method.</entry>
 	  </row>
 
 	  <row>
 	    <entry>500106</entry>
 	    <entry><revnumber>112007</revnumber></entry>
 	    <entry>March 8, 2003</entry>
 	    <entry>devstat_add_entry() has been replaced by
 	      devstat_new_entry()</entry>
 	  </row>
 
 	  <row>
 	    <entry>500107</entry>
 	    <entry><revnumber>112288</revnumber></entry>
 	    <entry>March 15, 2003</entry>
 	    <entry>Devstat interface change; see sys/sys/param.h
 	      1.149</entry>
 	  </row>
 
 	  <row>
 	    <entry>500108</entry>
 	    <entry><revnumber>112300</revnumber></entry>
 	    <entry>March 15, 2003</entry>
 	    <entry>Token-Ring interface changes.</entry>
 	  </row>
 
 	  <row>
 	    <entry>500109</entry>
 	    <entry><revnumber>112571</revnumber></entry>
 	    <entry>March 25, 2003</entry>
 	    <entry>Addition of vm_paddr_t.</entry>
 	  </row>
 
 	  <row>
 	    <entry>500110</entry>
 	    <entry><revnumber>112741</revnumber></entry>
 	    <entry>March 28, 2003</entry>
 	    <entry>5.0-CURRENT after &man.realpath.3; has been made
 	      thread-safe</entry>
 	  </row>
 
 	  <row>
 	    <entry>500111</entry>
 	    <entry><revnumber>113273</revnumber></entry>
 	    <entry>April 9, 2003</entry>
 	    <entry>5.0-CURRENT after &man.usbhid.3; has been synced
 	      with NetBSD</entry>
 	  </row>
 
 	  <row>
 	    <entry>500112</entry>
 	    <entry><revnumber>113597</revnumber></entry>
 	    <entry>April 17, 2003</entry>
 	    <entry>5.0-CURRENT after new NSS implementation and
 	      addition of POSIX.1 getpw*_r, getgr*_r functions</entry>
 	  </row>
 
 	  <row>
 	    <entry>500113</entry>
 	    <entry><revnumber>114492</revnumber></entry>
 	    <entry>May 2, 2003</entry>
 	    <entry>5.0-CURRENT after removal of the old rc
 	      system.</entry>
 	  </row>
 
 	  <row>
 	    <entry>501000</entry>
 	    <entry><revnumber>115816</revnumber></entry>
 	    <entry>June 4, 2003</entry>
 	    <entry>5.1-RELEASE.</entry>
 	  </row>
 
 	  <row>
 	    <entry>501100</entry>
 	    <entry><revnumber>115710</revnumber></entry>
 	    <entry>June 2, 2003</entry>
 	    <entry>5.1-CURRENT after branching for RELENG_5_1.</entry>
 	  </row>
 
 	  <row>
 	    <entry>501101</entry>
 	    <entry><revnumber>117025</revnumber></entry>
 	    <entry>June 29, 2003</entry>
 	    <entry>5.1-CURRENT after correcting the semantics of
 	      &man.sigtimedwait.2; and &man.sigwaitinfo.2;.</entry>
 	  </row>
 
 	  <row>
 	    <entry>501102</entry>
 	    <entry><revnumber>117191</revnumber></entry>
 	    <entry>July 3, 2003</entry>
 	    <entry>5.1-CURRENT after adding the lockfunc and
 	      lockfuncarg fields to
 	      &man.bus.dma.tag.create.9;.</entry>
 	  </row>
 
 	  <row>
 	    <entry>501103</entry>
 	    <entry><revnumber>118241</revnumber></entry>
 	    <entry>July 31, 2003</entry>
 	    <entry>5.1-CURRENT after GCC 3.3.1-pre 20030711 snapshot
 	      integration.</entry>
 	  </row>
 
 	  <row>
 	    <entry>501104</entry>
 	    <entry><revnumber>118511</revnumber></entry>
 	    <entry>August 5, 2003</entry>
 	    <entry>5.1-CURRENT 3ware API changes to twe.</entry>
 	  </row>
 
 	  <row>
 	    <entry>501105</entry>
 	    <entry><revnumber>119021</revnumber></entry>
 	    <entry>August 17, 2003</entry>
 	    <entry>5.1-CURRENT dynamically-linked /bin and /sbin
 	      support and movement of libraries to /lib.</entry>
 	  </row>
 
 	  <row>
 	    <entry>501106</entry>
 	    <entry><revnumber>119881</revnumber></entry>
 	    <entry>September 8, 2003</entry>
 	    <entry>5.1-CURRENT after adding kernel support for Coda
 	      6.x.</entry>
 	  </row>
 
 	  <row>
 	    <entry>501107</entry>
 	    <entry><revnumber>120180</revnumber></entry>
 	    <entry>September 17, 2003</entry>
 	    <entry>5.1-CURRENT after 16550 UART constants moved from
 	      <filename>&lt;dev/sio/sioreg.h&gt;</filename> to
 	      <filename>&lt;dev/ic/ns16550.h&gt;</filename>.  Also
 	      when libmap functionality was unconditionally supported
 	      by rtld.</entry>
 	  </row>
 
 	  <row>
 	    <entry>501108</entry>
 	    <entry><revnumber>120386</revnumber></entry>
 	    <entry>September 23, 2003</entry>
 	    <entry>5.1-CURRENT after PFIL_HOOKS API update</entry>
 	  </row>
 
 	  <row>
 	    <entry>501109</entry>
 	    <entry><revnumber>120503</revnumber></entry>
 	    <entry>September 27, 2003</entry>
 	    <entry>5.1-CURRENT after adding &man.kiconv.3;</entry>
 	  </row>
 
 	  <row>
 	    <entry>501110</entry>
 	    <entry><revnumber>120556</revnumber></entry>
 	    <entry>September 28, 2003</entry>
 	    <entry>5.1-CURRENT after changing default operations for
 	      open and close in cdevsw</entry>
 	  </row>
 
 	  <row>
 	    <entry>501111</entry>
 	    <entry><revnumber>121125</revnumber></entry>
 	    <entry>October 16, 2003</entry>
 	    <entry>5.1-CURRENT after changed layout of cdevsw</entry>
 	  </row>
 
 	  <row>
 	    <entry>501112</entry>
 	    <entry><revnumber>121129</revnumber></entry>
 	    <entry>October 16, 2003</entry>
 	    <entry> 5.1-CURRENT after adding kobj multiple
 	      inheritance</entry>
 	  </row>
 
 	  <row>
 	    <entry>501113</entry>
 	    <entry><revnumber>121816</revnumber></entry>
 	    <entry>October 31, 2003</entry>
 	    <entry> 5.1-CURRENT after the if_xname change in struct
 	      ifnet</entry>
 	  </row>
 
 	  <row>
 	    <entry>501114</entry>
 	    <entry><revnumber>122779</revnumber></entry>
 	    <entry>November 16, 2003</entry>
 	    <entry> 5.1-CURRENT after changing /bin and /sbin to be
 	      dynamically linked</entry>
 	  </row>
 
 	  <row>
 	    <entry>502000</entry>
 	    <entry><revnumber>123198</revnumber></entry>
 	    <entry>December 7, 2003</entry>
 	    <entry>5.2-RELEASE</entry>
 	  </row>
 
 	  <row>
 	    <entry>502010</entry>
 	    <entry><revnumber>126150</revnumber></entry>
 	    <entry>February 23, 2004</entry>
 	    <entry>5.2.1-RELEASE</entry>
 	  </row>
 
 	  <row>
 	    <entry>502100</entry>
 	    <entry><revnumber>123196</revnumber></entry>
 	    <entry>December 7, 2003</entry>
 	    <entry>5.2-CURRENT after branching for RELENG_5_2</entry>
 	  </row>
 
 	  <row>
 	    <entry>502101</entry>
 	    <entry><revnumber>123677</revnumber></entry>
 	    <entry>December 19, 2003</entry>
 	    <entry>5.2-CURRENT after __cxa_atexit/__cxa_finalize
 	      functions were added to libc.</entry>
 	  </row>
 
 	  <row>
 	    <entry>502102</entry>
 	    <entry><revnumber>125236</revnumber></entry>
 	    <entry>January 30, 2004</entry>
 	    <entry>5.2-CURRENT after change of default thread library
 	      from libc_r to libpthread.</entry>
 	  </row>
 
 	  <row>
 	    <entry>502103</entry>
 	    <entry><revnumber>126083</revnumber></entry>
 	    <entry>February 21, 2004</entry>
 	    <entry>5.2-CURRENT after device driver API
 	      megapatch.</entry>
 	  </row>
 
 	  <row>
 	    <entry>502104</entry>
 	    <entry><revnumber>126208</revnumber></entry>
 	    <entry>February 25, 2004</entry>
 	    <entry>5.2-CURRENT after getopt_long_only()
 	      addition.</entry>
 	  </row>
 
 	  <row>
 	    <entry>502105</entry>
 	    <entry><revnumber>126644</revnumber></entry>
 	    <entry>March 5, 2004</entry>
 	    <entry>5.2-CURRENT after NULL is made into ((void *)0) for
 	      C, creating more warnings.</entry>
 	  </row>
 
 	  <row>
 	    <entry>502106</entry>
 	    <entry><revnumber>126757</revnumber></entry>
 	    <entry>March 8, 2004</entry>
 	    <entry>5.2-CURRENT after pf is linked to the build and
 	      install.</entry>
 	  </row>
 
 	  <row>
 	    <entry>502107</entry>
 	    <entry><revnumber>126819</revnumber></entry>
 	    <entry>March 10, 2004</entry>
 	    <entry>5.2-CURRENT after time_t is changed to a 64-bit
 	      value on sparc64.</entry>
 	  </row>
 
 	  <row>
 	    <entry>502108</entry>
 	    <entry><revnumber>126891</revnumber></entry>
 	    <entry>March 12, 2004</entry>
 	    <entry>5.2-CURRENT after Intel C/C++ compiler support in
 	      some headers and &man.execve.2; changes to be more
 	      strictly conforming to POSIX.</entry>
 	  </row>
 
 	  <row>
 	    <entry>502109</entry>
 	    <entry><revnumber>127312</revnumber></entry>
 	    <entry>March 22, 2004</entry>
 	    <entry>5.2-CURRENT after the introduction of the
 	      bus_alloc_resource_any API</entry>
 	  </row>
 
 	  <row>
 	    <entry>502110</entry>
 	    <entry><revnumber>127475</revnumber></entry>
 	    <entry>March 27, 2004</entry>
 	    <entry>5.2-CURRENT after the addition of UTF-8
 	      locales</entry>
 	  </row>
 
 	  <row>
 	    <entry>502111</entry>
 	    <entry><revnumber>128144</revnumber></entry>
 	    <entry>April 11, 2004</entry>
 	    <entry>5.2-CURRENT after the removal of the
 	      &man.getvfsent.3; API</entry>
 	  </row>
 
 	  <row>
 	    <entry>502112</entry>
 	    <entry><revnumber>128182</revnumber></entry>
 	    <entry>April 13, 2004</entry>
 	    <entry>5.2-CURRENT after the addition of the .warning
 	      directive for make.</entry>
 	  </row>
 
 	  <row>
 	    <entry>502113</entry>
 	    <entry><revnumber>130057</revnumber></entry>
 	    <entry>June 4, 2004</entry>
 	    <entry>5.2-CURRENT after ttyioctl() was made mandatory for
 	      serial drivers.</entry>
 	  </row>
 
 	  <row>
 	    <entry>502114</entry>
 	    <entry><revnumber>130418</revnumber></entry>
 	    <entry>June 13, 2004</entry>
 	    <entry>5.2-CURRENT after import of the ALTQ
 	      framework.</entry>
 	  </row>
 
 	  <row>
 	    <entry>502115</entry>
 	    <entry><revnumber>130481</revnumber></entry>
 	    <entry>June 14, 2004</entry>
 	    <entry>5.2-CURRENT after changing &man.sema.timedwait.9;
 	      to return 0 on success and a non-zero error code on
 	      failure.</entry>
 	  </row>
 
 	  <row>
 	    <entry>502116</entry>
 	    <entry><revnumber>130585</revnumber></entry>
 	    <entry>June 16, 2004</entry>
 	    <entry>5.2-CURRENT after changing kernel dev_t to be
 	      pointer to struct cdev *.</entry>
 	  </row>
 
 	  <row>
 	    <entry>502117</entry>
 	    <entry><revnumber>130640</revnumber></entry>
 	    <entry>June 17, 2004</entry>
 	    <entry>5.2-CURRENT after changing kernel udev_t to
 	      dev_t.</entry>
 	  </row>
 
 	  <row>
 	    <entry>502118</entry>
 	    <entry><revnumber>130656</revnumber></entry>
 	    <entry>June 17, 2004</entry>
 	    <entry>5.2-CURRENT after adding support for CLOCK_VIRTUAL
 	      and CLOCK_PROF to &man.clock.gettime.2; and
 	      &man.clock.getres.2;.</entry>
 	  </row>
 
 	  <row>
 	    <entry>502119</entry>
 	    <entry><revnumber>130934</revnumber></entry>
 	    <entry>June 22, 2004</entry>
 	    <entry>5.2-CURRENT after changing network interface
 	      cloning overhaul.</entry>
 	  </row>
 
 	  <row>
 	    <entry>502120</entry>
 	    <entry><revnumber>131429</revnumber></entry>
 	    <entry>July 2, 2004</entry>
 	    <entry>5.2-CURRENT after the update of the package tools
 	      to revision 20040629.</entry>
 	  </row>
 
 	  <row>
 	    <entry>502121</entry>
 	    <entry><revnumber>131883</revnumber></entry>
 	    <entry>July 9, 2004</entry>
 	    <entry>5.2-CURRENT after marking Bluetooth code as
 	      non-i386 specific.</entry>
 	  </row>
 
 	  <row>
 	    <entry>502122</entry>
 	    <entry><revnumber>131971</revnumber></entry>
 	    <entry>July 11, 2004</entry>
 	    <entry>5.2-CURRENT after the introduction of the KDB
 	      debugger framework, the conversion of DDB into a backend
 	      and the introduction of the GDB backend.</entry>
 	  </row>
 
 	  <row>
 	    <entry>502123</entry>
 	    <entry><revnumber>132025</revnumber></entry>
 	    <entry>July 12, 2004</entry>
 	    <entry>5.2-CURRENT after change to make VFS_ROOT take a
 	      struct thread argument as does vflush.  Struct
 	      kinfo_proc now has a user data pointer.  The switch of
 	      the default X implementation to <literal>xorg</literal>
 	      was also made at this time.</entry>
 	  </row>
 
 	  <row>
 	    <entry>502124</entry>
 	    <entry><revnumber>132597</revnumber></entry>
 	    <entry>July 24, 2004</entry>
 	    <entry>5.2-CURRENT after the change to separate the way
 	      ports rc.d and legacy scripts are started.</entry>
 	  </row>
 
 	  <row>
 	    <entry>502125</entry>
 	    <entry><revnumber>132726</revnumber></entry>
 	    <entry>July 28, 2004</entry>
 	    <entry>5.2-CURRENT after the backout of the previous
 	      change.</entry>
 	  </row>
 
 	  <row>
 	    <entry>502126</entry>
 	    <entry><revnumber>132914</revnumber></entry>
 	    <entry>July 31, 2004</entry>
 	    <entry>5.2-CURRENT after the removal of
 	      kmem_alloc_pageable() and the import of gcc
 	      3.4.2.</entry>
 	  </row>
 
 	  <row>
 	    <entry>502127</entry>
 	    <entry><revnumber>132991</revnumber></entry>
 	    <entry>August 2, 2004</entry>
 	    <entry>5.2-CURRENT after changing the UMA kernel API to
 	      allow ctors/inits to fail.</entry>
 	  </row>
 
 	  <row>
 	    <entry>502128</entry>
 	    <entry><revnumber>133306</revnumber></entry>
 	    <entry>August 8, 2004</entry>
 	    <entry>5.2-CURRENT after the change of the vfs_mount
 	      signature as well as global replacement of PRISON_ROOT
 	      with SUSER_ALLOWJAIL for the &man.suser.9; API.</entry>
 	  </row>
 
 	  <row>
 	    <entry>503000</entry>
 	    <entry><revnumber>134189</revnumber></entry>
 	    <entry>August 23, 2004</entry>
 	    <entry>5.3-BETA/RC before the pfil API change</entry>
 	  </row>
 
 	  <row>
 	    <entry>503001</entry>
 	    <entry><revnumber>135580</revnumber></entry>
 	    <entry>September 22, 2004</entry>
 	    <entry>5.3-RELEASE</entry>
 	  </row>
 
 	  <row>
 	    <entry>503100</entry>
 	    <entry><revnumber>136595</revnumber></entry>
 	    <entry>October 16, 2004</entry>
 	    <entry>5.3-STABLE after branching for RELENG_5_3</entry>
 	  </row>
 
 	  <row>
 	    <entry>503101</entry>
 	    <entry><revnumber>138459</revnumber></entry>
 	    <entry>December 3, 2004</entry>
 	    <entry>5.3-STABLE after addition of glibc style
 	      &man.strftime.3; padding options.</entry>
 	  </row>
 
 	  <row>
 	    <entry>503102</entry>
 	    <entry><revnumber>141788</revnumber></entry>
 	    <entry>February 13, 2005</entry>
 	    <entry>5.3-STABLE after OpenBSD's &man.nc.1; import
 	      MFC.</entry>
 	  </row>
 
 	  <row>
 	    <entry>503103</entry>
 	    <entry><revnumber>142639</revnumber></entry>
 	    <entry>February 27, 2005</entry>
 	    <entry>5.4-PRERELEASE after the MFC of the fixes in
 	      <filename>&lt;src/include/stdbool.h&gt;</filename> and
 	      <filename>&lt;src/sys/i386/include/_types.h&gt;</filename>
 	      for using the GCC-compatibility of the Intel C/C++
 	      compiler.</entry>
 	  </row>
 
 	  <row>
 	    <entry>503104</entry>
 	    <entry><revnumber>142835</revnumber></entry>
 	    <entry>February 28, 2005</entry>
 	    <entry>5.4-PRERELEASE after the MFC of the change of
 	      ifi_epoch from wall clock time to uptime.</entry>
 	  </row>
 
 	  <row>
 	    <entry>503105</entry>
 	    <entry><revnumber>143029</revnumber></entry>
 	    <entry>March 2, 2005</entry>
 	    <entry>5.4-PRERELEASE after the MFC of the fix of
 	      EOVERFLOW check in &man.vswprintf.3;.</entry>
 	  </row>
 
 	  <row>
 	    <entry>504000</entry>
 	    <entry><revnumber>144575</revnumber></entry>
 	    <entry>April 3, 2005</entry>
 	    <entry>5.4-RELEASE.</entry>
 	  </row>
 
 	  <row>
 	    <entry>504100</entry>
 	    <entry><revnumber>144581</revnumber></entry>
 	    <entry>April 3, 2005</entry>
 	    <entry>5.4-STABLE after branching for RELENG_5_4</entry>
 	  </row>
 
 	  <row>
 	    <entry>504101</entry>
 	    <entry><revnumber>146105</revnumber></entry>
 	    <entry>May 11, 2005</entry>
 	    <entry>5.4-STABLE after increasing the default thread
 	      stacksizes</entry>
 	  </row>
 
 	  <row>
 	    <entry>504102</entry>
 	    <entry><revnumber>504101</revnumber></entry>
 	    <entry>June 24, 2005</entry>
 	    <entry>5.4-STABLE after the addition of sha256</entry>
 	  </row>
 
 	  <row>
 	    <entry>504103</entry>
 	    <entry><revnumber>150892</revnumber></entry>
 	    <entry>October 3, 2005</entry>
 	    <entry>5.4-STABLE after the MFC of if_bridge</entry>
 	  </row>
 
 	  <row>
 	    <entry>504104</entry>
 	    <entry><revnumber>152370</revnumber></entry>
 	    <entry>November 13, 2005</entry>
 	    <entry>5.4-STABLE after the MFC of bsdiff and
 	      portsnap</entry>
 	  </row>
 
 	  <row>
 	    <entry>504105</entry>
 	    <entry><revnumber>154464</revnumber></entry>
 	    <entry>January 17, 2006</entry>
 	    <entry>5.4-STABLE after MFC of ldconfig_local_dirs
 	      change.</entry>
 	  </row>
 
 	  <row>
 	    <entry>505000</entry>
 	    <entry><revnumber>158481</revnumber></entry>
 	    <entry>May 12, 2006</entry>
 	    <entry>5.5-RELEASE.</entry>
 	  </row>
 
 	  <row>
 	    <entry>505100</entry>
 	    <entry><revnumber>158482</revnumber></entry>
 	    <entry>May 12, 2006</entry>
 	    <entry>5.5-STABLE after branching for RELENG_5_5</entry>
 	  </row>
 	</tbody>
       </tgroup>
     </table>
   </sect1>
 
   <sect1 xml:id="versions-4">
     <title>&os; 4 Versions</title>
 
     <table frame="none" xml:id="freebsd-versions-table-4">
       <title>&os; 4 <literal>__FreeBSD_version</literal>
 	Values</title>
 
       <tgroup cols="4">
 	<thead>
 	  <row>
 	    <entry>Value</entry>
 
 	    <entry>Revision</entry>
 
 	    <entry>Date</entry>
 
 	    <entry>Release</entry>
 	  </row>
 	</thead>
 
 	<tbody>
 	  <row>
 	    <entry>400000</entry>
 	    <entry><revnumber>43041</revnumber></entry>
 	    <entry>January 22, 1999</entry>
 	    <entry>4.0-CURRENT after 3.4 branch</entry>
 	  </row>
 
 	  <row>
 	    <entry>400001</entry>
 	    <entry><revnumber>44177</revnumber></entry>
 	    <entry>February 20, 1999</entry>
 	    <entry>4.0-CURRENT after change in dynamic linker
 	      handling</entry>
 	  </row>
 
 	  <row>
 	    <entry>400002</entry>
 	    <entry><revnumber>44699</revnumber></entry>
 	    <entry>March 13, 1999</entry>
 	    <entry>4.0-CURRENT after C++ constructor/destructor order
 	      change</entry>
 	  </row>
 
 	  <row>
 	    <entry>400003</entry>
 	    <entry><revnumber>45059</revnumber></entry>
 	    <entry>March 27, 1999</entry>
 	    <entry>4.0-CURRENT after functioning
 	      &man.dladdr.3;</entry>
 	  </row>
 
 	  <row>
 	    <entry>400004</entry>
 	    <entry><revnumber>45321</revnumber></entry>
 	    <entry>April 5, 1999</entry>
 	    <entry>4.0-CURRENT after __deregister_frame_info dynamic
 	      linker bug fix (also 4.0-CURRENT after EGCS 1.1.2
 	      integration)</entry>
 	  </row>
 
 	  <row>
 	    <entry>400005</entry>
 	    <entry><revnumber>46113</revnumber></entry>
 	    <entry>April 27, 1999</entry>
 	    <entry>4.0-CURRENT after &man.suser.9; API change (also
 	      4.0-CURRENT after newbus)</entry>
 	  </row>
 
 	  <row>
 	    <entry>400006</entry>
 	    <entry><revnumber>47640</revnumber></entry>
 	    <entry>May 31, 1999</entry>
 	    <entry>4.0-CURRENT after cdevsw registration
 	      change</entry>
 	  </row>
 
 	  <row>
 	    <entry>400007</entry>
 	    <entry><revnumber>47992</revnumber></entry>
 	    <entry>June 17, 1999</entry>
 	    <entry>4.0-CURRENT after the addition of so_cred for
 	      socket level credentials</entry>
 	  </row>
 
 	  <row>
 	    <entry>400008</entry>
 	    <entry><revnumber>48048</revnumber></entry>
 	    <entry>June 20, 1999</entry>
 	    <entry>4.0-CURRENT after the addition of a poll syscall
 	      wrapper to libc_r</entry>
 	  </row>
 
 	  <row>
 	    <entry>400009</entry>
 	    <entry><revnumber>48936</revnumber></entry>
 	    <entry>July 20, 1999</entry>
 	    <entry>4.0-CURRENT after the change of the kernel's
 	      <literal>dev_t</literal> type to <literal>struct
 		specinfo</literal> pointer</entry>
 	  </row>
 
 	  <row>
 	    <entry>400010</entry>
 	    <entry><revnumber>51649</revnumber></entry>
 	    <entry>September 25, 1999</entry>
 	    <entry>4.0-CURRENT after fixing a hole in
 	      &man.jail.2;</entry>
 	  </row>
 
 	  <row>
 	    <entry>400011</entry>
 	    <entry><revnumber>51791</revnumber></entry>
 	    <entry>September 29, 1999</entry>
 	    <entry>4.0-CURRENT after the <literal>sigset_t</literal>
 	      datatype change</entry>
 	  </row>
 
 	  <row>
 	    <entry>400012</entry>
 	    <entry><revnumber>53164</revnumber></entry>
 	    <entry>November 15, 1999</entry>
 	    <entry>4.0-CURRENT after the cutover to the GCC 2.95.2
 	      compiler</entry>
 	  </row>
 
 	  <row>
 	    <entry>400013</entry>
 	    <entry><revnumber>54123</revnumber></entry>
 	    <entry>December 4, 1999</entry>
 	    <entry>4.0-CURRENT after adding pluggable linux-mode ioctl
 	      handlers</entry>
 	  </row>
 
 	  <row>
 	    <entry>400014</entry>
 	    <entry><revnumber>56216</revnumber></entry>
 	    <entry>January 18, 2000</entry>
 	    <entry>4.0-CURRENT after importing OpenSSL</entry>
 	  </row>
 
 	  <row>
 	    <entry>400015</entry>
 	    <entry><revnumber>56700</revnumber></entry>
 	    <entry>January 27, 2000</entry>
 	    <entry>4.0-CURRENT after the C++ ABI change in GCC 2.95.2
 	      from -fvtable-thunks to -fno-vtable-thunks by
 	      default</entry>
 	  </row>
 
 	  <row>
 	    <entry>400016</entry>
 	    <entry><revnumber>57529</revnumber></entry>
 	    <entry>February 27, 2000</entry>
 	    <entry>4.0-CURRENT after importing OpenSSH</entry>
 	  </row>
 
 	  <row>
 	    <entry>400017</entry>
 	    <entry><revnumber>58005</revnumber></entry>
 	    <entry>March 13, 2000</entry>
 	    <entry>4.0-RELEASE</entry>
 	  </row>
 
 	  <row>
 	    <entry>400018</entry>
 	    <entry><revnumber>58170</revnumber></entry>
 	    <entry>March 17, 2000</entry>
 	    <entry>4.0-STABLE after 4.0-RELEASE</entry>
 	  </row>
 
 	  <row>
 	    <entry>400019</entry>
 	    <entry><revnumber>60047</revnumber></entry>
 	    <entry>May 5, 2000</entry>
 	    <entry>4.0-STABLE after the introduction of delayed
 	      checksums.</entry>
 	  </row>
 
 	  <row>
 	    <entry>400020</entry>
 	    <entry><revnumber>61262</revnumber></entry>
 	    <entry>June 4, 2000</entry>
 	    <entry>4.0-STABLE after merging libxpg4 code into
 	      libc.</entry>
 	  </row>
 
 	  <row>
 	    <entry>400021</entry>
 	    <entry><revnumber>62820</revnumber></entry>
 	    <entry>July 8, 2000</entry>
 	    <entry>4.0-STABLE after upgrading Binutils to 2.10.0, ELF
 	      branding changes, and tcsh in the base system.</entry>
 	  </row>
 
 	  <row>
 	    <entry>410000</entry>
 	    <entry><revnumber>63095</revnumber></entry>
 	    <entry>July 14, 2000</entry>
 	    <entry>4.1-RELEASE</entry>
 	  </row>
 
 	  <row>
 	    <entry>410001</entry>
 	    <entry><revnumber>64012</revnumber></entry>
 	    <entry>July 29, 2000</entry>
 	    <entry>4.1-STABLE after 4.1-RELEASE</entry>
 	  </row>
 
 	  <row>
 	    <entry>410002</entry>
 	    <entry><revnumber>65962</revnumber></entry>
 	    <entry>September 16, 2000</entry>
 	    <entry>4.1-STABLE after &man.setproctitle.3; moved from
 	      libutil to libc.</entry>
 	  </row>
 
 	  <row>
 	    <entry>411000</entry>
 	    <entry><revnumber>66336</revnumber></entry>
 	    <entry>September 25, 2000</entry>
 	    <entry>4.1.1-RELEASE</entry>
 	  </row>
 
 	  <row>
 	    <entry>411001</entry>
 	    <entry></entry>
 	    <entry></entry>
 	    <entry>4.1.1-STABLE after 4.1.1-RELEASE</entry>
 	  </row>
 
 	  <row>
 	    <entry>420000</entry>
 	    <entry><revnumber>68066</revnumber></entry>
 	    <entry>October 31, 2000</entry>
 	    <entry>4.2-RELEASE</entry>
 	  </row>
 
 	  <row>
 	    <entry>420001</entry>
 	    <entry><revnumber>70895</revnumber></entry>
 	    <entry>January 10, 2001</entry>
 	    <entry>4.2-STABLE after combining libgcc.a and libgcc_r.a,
 	      and associated GCC linkage changes.</entry>
 	  </row>
 
 	  <row>
 	    <entry>430000</entry>
 	    <entry><revnumber>73800</revnumber></entry>
 	    <entry>March 6, 2001</entry>
 	    <entry>4.3-RELEASE</entry>
 	  </row>
 
 	  <row>
 	    <entry>430001</entry>
 	    <entry><revnumber>76779</revnumber></entry>
 	    <entry>May 18, 2001</entry>
 	    <entry>4.3-STABLE after wint_t introduction.</entry>
 	  </row>
 
 	  <row>
 	    <entry>430002</entry>
 	    <entry><revnumber>80157</revnumber></entry>
 	    <entry>July 22, 2001</entry>
 	    <entry>4.3-STABLE after PCI powerstate API merge.</entry>
 	  </row>
 
 	  <row>
 	    <entry>440000</entry>
 	    <entry><revnumber>80923</revnumber></entry>
 	    <entry>August 1, 2001</entry>
 	    <entry>4.4-RELEASE</entry>
 	  </row>
 
 	  <row>
 	    <entry>440001</entry>
 	    <entry><revnumber>85341</revnumber></entry>
 	    <entry>October 23, 2001</entry>
 	    <entry>4.4-STABLE after d_thread_t introduction.</entry>
 	  </row>
 
 	  <row>
 	    <entry>440002</entry>
 	    <entry><revnumber>86038</revnumber></entry>
 	    <entry>November 4, 2001</entry>
 	    <entry>4.4-STABLE after mount structure changes (affects
 	      filesystem klds).</entry>
 	  </row>
 
 	  <row>
 	    <entry>440003</entry>
 	    <entry><revnumber>88130</revnumber></entry>
 	    <entry>December 18, 2001</entry>
 	    <entry>4.4-STABLE after the userland components of smbfs
 	      were imported.</entry>
 	  </row>
 
 	  <row>
 	    <entry>450000</entry>
 	    <entry><revnumber>88271</revnumber></entry>
 	    <entry>December 20, 2001</entry>
 	    <entry>4.5-RELEASE</entry>
 	  </row>
 
 	  <row>
 	    <entry>450001</entry>
 	    <entry><revnumber>91203</revnumber></entry>
 	    <entry>February 24, 2002</entry>
 	    <entry>4.5-STABLE after the usb structure element
 	      rename.</entry>
 	  </row>
 
 	  <row>
 	    <entry>450002</entry>
 	    <entry><revnumber>92151</revnumber></entry>
 	    <entry>March 12, 2002</entry>
 	    <entry>4.5-STABLE after locale changes.</entry>
 	  </row>
 
 	  <row>
 	    <entry>450003</entry>
 	    <entry></entry>
 	    <entry></entry>
 	    <entry>(Never created)</entry>
 	  </row>
 
 	  <row>
 	    <entry>450004</entry>
 	    <entry><revnumber>94840</revnumber></entry>
 	    <entry>April 16, 2002</entry>
 	    <entry>4.5-STABLE after the
 	      <literal>sendmail_enable</literal> &man.rc.conf.5;
 	      variable was made to take the value
 	      <literal>NONE</literal>.</entry>
 	  </row>
 
 	  <row>
 	    <entry>450005</entry>
 	    <entry><revnumber>95555</revnumber></entry>
 	    <entry>April 27, 2002</entry>
 	    <entry>4.5-STABLE after moving to XFree86 4 by default for
 	      package builds.</entry>
 	  </row>
 
 	  <row>
 	    <entry>450006</entry>
 	    <entry><revnumber>95846</revnumber></entry>
 	    <entry>May 1, 2002</entry>
 	    <entry>4.5-STABLE after accept filtering was fixed so that
 	      is no longer susceptible to an easy DoS.</entry>
 	  </row>
 
 	  <row>
 	    <entry>460000</entry>
 	    <entry><revnumber>97923</revnumber></entry>
 	    <entry>June 21, 2002</entry>
 	    <entry>4.6-RELEASE</entry>
 	  </row>
 
 	  <row>
 	    <entry>460001</entry>
 	    <entry><revnumber>98730</revnumber></entry>
 	    <entry>June 21, 2002</entry>
 	    <entry>4.6-STABLE &man.sendfile.2; fixed to comply with
 	      documentation, not to count any headers sent against the
 	      amount of data to be sent from the file.</entry>
 	  </row>
 
 	  <row>
 	    <entry>460002</entry>
 	    <entry><revnumber>100366</revnumber></entry>
 	    <entry>July 19, 2002</entry>
 	    <entry>4.6.2-RELEASE</entry>
 	  </row>
 
 	  <row>
 	    <entry>460100</entry>
 	    <entry><revnumber>98857</revnumber></entry>
 	    <entry>June 26, 2002</entry>
 	    <entry>4.6-STABLE</entry>
 	  </row>
 
 	  <row>
 	    <entry>460101</entry>
 	    <entry><revnumber>98880</revnumber></entry>
 	    <entry>June 26, 2002</entry>
 	    <entry>4.6-STABLE after MFC of `sed -i'.</entry>
 	  </row>
 
 	  <row>
 	    <entry>460102</entry>
 	    <entry><revnumber>102759</revnumber></entry>
 	    <entry>September 1, 2002</entry>
 	    <entry>4.6-STABLE after MFC of many new pkg_install
 	      features from the HEAD.</entry>
 	  </row>
 
 	  <row>
 	    <entry>470000</entry>
 	    <entry><revnumber>104655</revnumber></entry>
 	    <entry>October 8, 2002</entry>
 	    <entry>4.7-RELEASE</entry>
 	  </row>
 
 	  <row>
 	    <entry>470100</entry>
 	    <entry><revnumber>104717</revnumber></entry>
 	    <entry>October 9, 2002</entry>
 	    <entry>4.7-STABLE</entry>
 	  </row>
 
 	  <row>
 	    <entry>470101</entry>
 	    <entry><revnumber>106732</revnumber></entry>
 	    <entry>November 10, 2002</entry>
 	    <entry>Start generated __std{in,out,err}p references
 	      rather than __sF.  This changes std{in,out,err} from a
 	      compile time expression to a runtime one.</entry>
 	  </row>
 
 	  <row>
 	    <entry>470102</entry>
 	    <entry><revnumber>109753</revnumber></entry>
 	    <entry>January 23, 2003</entry>
 	    <entry>4.7-STABLE after MFC of mbuf changes to replace
 	      m_aux mbufs by m_tag's</entry>
 	  </row>
 
 	  <row>
 	    <entry>470103</entry>
 	    <entry><revnumber>110887</revnumber></entry>
 	    <entry>February 14, 2003</entry>
 	    <entry>4.7-STABLE gets OpenSSL 0.9.7</entry>
 	  </row>
 
 	  <row>
 	    <entry>480000</entry>
 	    <entry><revnumber>112852</revnumber></entry>
 	    <entry>March 30, 2003</entry>
 	    <entry>4.8-RELEASE</entry>
 	  </row>
 
 	  <row>
 	    <entry>480100</entry>
 	    <entry><revnumber>113107</revnumber></entry>
 	    <entry>April 5, 2003</entry>
 	    <entry>4.8-STABLE</entry>
 	  </row>
 
 	  <row>
 	    <entry>480101</entry>
 	    <entry><revnumber>115232</revnumber></entry>
 	    <entry>May 22, 2003</entry>
 	    <entry>4.8-STABLE after &man.realpath.3; has been made
 	      thread-safe</entry>
 	  </row>
 
 	  <row>
 	    <entry>480102</entry>
 	    <entry><revnumber>118737</revnumber></entry>
 	    <entry>August 10, 2003</entry>
 	    <entry>4.8-STABLE 3ware API changes to twe.</entry>
 	  </row>
 
 	  <row>
 	    <entry>490000</entry>
 	    <entry><revnumber>121592</revnumber></entry>
 	    <entry>October 27, 2003</entry>
 	    <entry>4.9-RELEASE</entry>
 	  </row>
 
 	  <row>
 	    <entry>490100</entry>
 	    <entry><revnumber>121593</revnumber></entry>
 	    <entry>October 27, 2003</entry>
 	    <entry>4.9-STABLE</entry>
 	  </row>
 
 	  <row>
 	    <entry>490101</entry>
 	    <entry><revnumber>124264</revnumber></entry>
 	    <entry>January 8, 2004</entry>
 	    <entry>4.9-STABLE after e_sid was added to struct
 	      kinfo_eproc.</entry>
 	  </row>
 
 	  <row>
 	    <entry>490102</entry>
 	    <entry><revnumber>125417</revnumber></entry>
 	    <entry>February 4, 2004</entry>
 	    <entry>4.9-STABLE after MFC of libmap functionality for
 	      rtld.</entry>
 	  </row>
 
 	  <row>
 	    <entry>491000</entry>
 	    <entry><revnumber>129700</revnumber></entry>
 	    <entry>May 25, 2004</entry>
 	    <entry>4.10-RELEASE</entry>
 	  </row>
 
 	  <row>
 	    <entry>491100</entry>
 	    <entry><revnumber>129918</revnumber></entry>
 	    <entry>June 1, 2004</entry>
 	    <entry>4.10-STABLE</entry>
 	  </row>
 
 	  <row>
 	    <entry>491101</entry>
 	    <entry><revnumber>133506</revnumber></entry>
 	    <entry>August 11, 2004</entry>
 	    <entry>4.10-STABLE after MFC of revision 20040629 of the
 	      package tools</entry>
 	  </row>
 
 	  <row>
 	    <entry>491102</entry>
 	    <entry><revnumber>137786</revnumber></entry>
 	    <entry>November 16, 2004</entry>
 	    <entry>4.10-STABLE after VM fix dealing with unwiring of
 	      fictitious pages</entry>
 	  </row>
 
 	  <row>
 	    <entry>492000</entry>
 	    <entry><revnumber>138960</revnumber></entry>
 	    <entry>December 17, 2004</entry>
 	    <entry>4.11-RELEASE</entry>
 	  </row>
 
 	  <row>
 	    <entry>492100</entry>
 	    <entry><revnumber>138959</revnumber></entry>
 	    <entry>December 17, 2004</entry>
 	    <entry>4.11-STABLE</entry>
 	  </row>
 
 	  <row>
 	    <entry>492101</entry>
 	    <entry><revnumber>157843</revnumber></entry>
 	    <entry>April 18, 2006</entry>
 	    <entry>4.11-STABLE after adding libdata/ldconfig
 	      directories to mtree files.</entry>
 	  </row>
 	</tbody>
       </tgroup>
     </table>
   </sect1>
 
   <sect1 xml:id="versions-3">
     <title>&os; 3 Versions</title>
 
     <table frame="none" xml:id="freebsd-versions-table-3">
       <title>&os; 3 <literal>__FreeBSD_version</literal>
 	Values</title>
 
       <tgroup cols="4">
 	<thead>
 	  <row>
 	    <entry>Value</entry>
 
 	    <entry>Revision</entry>
 
 	    <entry>Date</entry>
 
 	    <entry>Release</entry>
 	  </row>
 	</thead>
 
 	<tbody>
 	  <row>
 	    <entry>300000</entry>
 	    <entry><revnumber>22917</revnumber></entry>
 	    <entry>February 19, 1996</entry>
 	    <entry>3.0-CURRENT before &man.mount.2; change</entry>
 	  </row>
 
 	  <row>
 	    <entry>300001</entry>
 	    <entry><revnumber>36283</revnumber></entry>
 	    <entry>September 24, 1997</entry>
 	    <entry>3.0-CURRENT after &man.mount.2; change</entry>
 	  </row>
 
 	  <row>
 	    <entry>300002</entry>
 	    <entry><revnumber>36592</revnumber></entry>
 	    <entry>June 2, 1998</entry>
 	    <entry>3.0-CURRENT after &man.semctl.2; change</entry>
 	  </row>
 
 	  <row>
 	    <entry>300003</entry>
 	    <entry><revnumber>36735</revnumber></entry>
 	    <entry>June 7, 1998</entry>
 	    <entry>3.0-CURRENT after ioctl arg changes</entry>
 	  </row>
 
 	  <row>
 	    <entry>300004</entry>
 	    <entry><revnumber>38768</revnumber></entry>
 	    <entry>September 3, 1998</entry>
 	    <entry>3.0-CURRENT after ELF conversion</entry>
 	  </row>
 
 	  <row>
 	    <entry>300005</entry>
 	    <entry><revnumber>40438</revnumber></entry>
 	    <entry>October 16, 1998</entry>
 	    <entry>3.0-RELEASE</entry>
 	  </row>
 
 	  <row>
 	    <entry>300006</entry>
 	    <entry><revnumber>40445</revnumber></entry>
 	    <entry>October 16, 1998</entry>
 	    <entry>3.0-CURRENT after 3.0-RELEASE</entry>
 	  </row>
 
 	  <row>
 	    <entry>300007</entry>
 	    <entry><revnumber>43042</revnumber></entry>
 	    <entry>January 22, 1999</entry>
 	    <entry>3.0-STABLE after 3/4 branch</entry>
 	  </row>
 
 	  <row>
 	    <entry>310000</entry>
 	    <entry><revnumber>43807</revnumber></entry>
 	    <entry>February 9, 1999</entry>
 	    <entry>3.1-RELEASE</entry>
 	  </row>
 
 	  <row>
 	    <entry>310001</entry>
 	    <entry><revnumber>45060</revnumber></entry>
 	    <entry>March 27, 1999</entry>
 	    <entry>3.1-STABLE after 3.1-RELEASE</entry>
 	  </row>
 
 	  <row>
 	    <entry>310002</entry>
 	    <entry><revnumber>45689</revnumber></entry>
 	    <entry>April 14, 1999</entry>
 	    <entry>3.1-STABLE after C++ constructor/destructor order
 	      change</entry>
 	  </row>
 
 	  <row>
 	    <entry>320000</entry>
 	    <entry></entry>
 	    <entry></entry>
 	    <entry>3.2-RELEASE</entry>
 	  </row>
 
 	  <row>
 	    <entry>320001</entry>
 	    <entry><revnumber>46742</revnumber></entry>
 	    <entry>May 8, 1999</entry>
 	    <entry>3.2-STABLE</entry>
 	  </row>
 
 	  <row>
 	    <entry>320002</entry>
 	    <entry><revnumber>50563</revnumber></entry>
 	    <entry>August 29, 1999</entry>
 	    <entry>3.2-STABLE after binary-incompatible IPFW and
 	      socket changes</entry>
 	  </row>
 
 	  <row>
 	    <entry>330000</entry>
 	    <entry><revnumber>50813</revnumber></entry>
 	    <entry>September 2, 1999</entry>
 	    <entry>3.3-RELEASE</entry>
 	  </row>
 
 	  <row>
 	    <entry>330001</entry>
 	    <entry><revnumber>51328</revnumber></entry>
 	    <entry>September 16, 1999</entry>
 	    <entry>3.3-STABLE</entry>
 	  </row>
 
 	  <row>
 	    <entry>330002</entry>
 	    <entry><revnumber>53671</revnumber></entry>
 	    <entry>November 24, 1999</entry>
 	    <entry>3.3-STABLE after adding &man.mkstemp.3; to
 	      libc</entry>
 	  </row>
 
 	  <row>
 	    <entry>340000</entry>
 	    <entry><revnumber>54166</revnumber></entry>
 	    <entry>December 5, 1999</entry>
 	    <entry>3.4-RELEASE</entry>
 	  </row>
 
 	  <row>
 	    <entry>340001</entry>
 	    <entry><revnumber>54730</revnumber></entry>
 	    <entry>December 17, 1999</entry>
 	    <entry>3.4-STABLE</entry>
 	  </row>
 
 	  <row>
 	    <entry>350000</entry>
 	    <entry><revnumber>61876</revnumber></entry>
 	    <entry>June 20, 2000</entry>
 	    <entry>3.5-RELEASE</entry>
 	  </row>
 
 	  <row>
 	    <entry>350001</entry>
 	    <entry><revnumber>63043</revnumber></entry>
 	    <entry>July 12, 2000</entry>
 	    <entry>3.5-STABLE</entry>
 	  </row>
 	</tbody>
       </tgroup>
     </table>
   </sect1>
 
   <sect1 xml:id="versions-2.2">
     <title>&os; 2.2 Versions</title>
 
     <table frame="none" xml:id="freebsd-versions-table-2.2">
       <title>&os; 2.2 <literal>__FreeBSD_version</literal>
 	Values</title>
 
       <tgroup cols="4">
 	<thead>
 	  <row>
 	    <entry>Value</entry>
 
 	    <entry>Revision</entry>
 
 	    <entry>Date</entry>
 
 	    <entry>Release</entry>
 	  </row>
 	</thead>
 
 	<tbody>
 	  <row>
 	    <entry>220000</entry>
 	    <entry><revnumber>22918</revnumber></entry>
 	    <entry>February 19, 1997</entry>
 	    <entry>2.2-RELEASE</entry>
 	  </row>
 
 	  <row>
 	    <entry>(not changed)</entry>
 	    <entry></entry>
 	    <entry></entry>
 	    <entry>2.2.1-RELEASE</entry>
 	  </row>
 
 	  <row>
 	    <entry>(not changed)</entry>
 	    <entry></entry>
 	    <entry></entry>
 	    <entry>2.2-STABLE after 2.2.1-RELEASE</entry>
 	  </row>
 
 	  <row>
 	    <entry>221001</entry>
 	    <entry><revnumber>24941</revnumber></entry>
 	    <entry>April 15, 1997</entry>
 	    <entry>2.2-STABLE after texinfo-3.9</entry>
 	  </row>
 
 	  <row>
 	    <entry>221002</entry>
 	    <entry><revnumber>25325</revnumber></entry>
 	    <entry>April 30, 1997</entry>
 	    <entry>2.2-STABLE after top</entry>
 	  </row>
 
 	  <row>
 	    <entry>222000</entry>
 	    <entry><revnumber>25851</revnumber></entry>
 	    <entry>May 16, 1997</entry>
 	    <entry>2.2.2-RELEASE</entry>
 	  </row>
 
 	  <row>
 	    <entry>222001</entry>
 	    <entry><revnumber>25921</revnumber></entry>
 	    <entry>May 19, 1997</entry>
 	    <entry>2.2-STABLE after 2.2.2-RELEASE</entry>
 	  </row>
 
 	  <row>
 	    <entry>225000</entry>
 	    <entry><revnumber>30053</revnumber></entry>
 	    <entry>October 2, 1997</entry>
 	    <entry>2.2.5-RELEASE</entry>
 	  </row>
 
 	  <row>
 	    <entry>225001</entry>
 	    <entry><revnumber>31300</revnumber></entry>
 	    <entry>November 20, 1997</entry>
 	    <entry>2.2-STABLE after 2.2.5-RELEASE</entry>
 	  </row>
 
 	  <row>
 	    <entry>225002</entry>
 	    <entry><revnumber>32019</revnumber></entry>
 	    <entry>December 27, 1997</entry>
 	    <entry>2.2-STABLE after ldconfig -R merge</entry>
 	  </row>
 
 	  <row>
 	    <entry>226000</entry>
 	    <entry><revnumber>34445</revnumber></entry>
 	    <entry>March 24, 1998</entry>
 	    <entry>2.2.6-RELEASE</entry>
 	  </row>
 
 	  <row>
 	    <entry>227000</entry>
 	    <entry><revnumber>37803</revnumber></entry>
 	    <entry>July 21, 1998</entry>
 	    <entry>2.2.7-RELEASE</entry>
 	  </row>
 
 	  <row>
 	    <entry>227001</entry>
 	    <entry><revnumber>37809</revnumber></entry>
 	    <entry>July 21, 1998</entry>
 	    <entry>2.2-STABLE after 2.2.7-RELEASE</entry>
 	  </row>
 
 	  <row>
 	    <entry>227002</entry>
 	    <entry><revnumber>39489</revnumber></entry>
 	    <entry>September 19, 1998</entry>
 	    <entry>2.2-STABLE after &man.semctl.2; change</entry>
 	  </row>
 
 	  <row>
 	    <entry>228000</entry>
 	    <entry><revnumber>41403</revnumber></entry>
 	    <entry>November 29, 1998</entry>
 	    <entry>2.2.8-RELEASE</entry>
 	  </row>
 
 	  <row>
 	    <entry>228001</entry>
 	    <entry><revnumber>41418</revnumber></entry>
 	    <entry>November 29, 1998</entry>
 	    <entry>2.2-STABLE after 2.2.8-RELEASE</entry>
 	  </row>
 	</tbody>
       </tgroup>
     </table>
 
     <note>
       <para>Note that 2.2-STABLE sometimes identifies itself as
 	<quote>2.2.5-STABLE</quote> after the 2.2.5-RELEASE.  The
 	pattern used to be year followed by the month, but we decided
 	to change it to a more straightforward major/minor system
 	starting from 2.2.  This is because the parallel development
 	on several branches made it infeasible to classify the
 	releases merely by their real release dates.  Do not worry
 	about old -CURRENTs; they are listed here just for
 	reference.</para>
     </note>
   </sect1>
 
   <sect1 xml:id="versions-2">
     <title>&os; 2 Before 2.2-RELEASE Versions</title>
 
     <table frame="none" xml:id="freebsd-versions-table-2">
       <title>&os; 2 Before 2.2-RELEASE
 	<literal>__FreeBSD_version</literal> Values</title>
 
       <tgroup cols="4">
 	<thead>
 	  <row>
 	    <entry>Value</entry>
 
 	    <entry>Revision</entry>
 
 	    <entry>Date</entry>
 
 	    <entry>Release</entry>
 	  </row>
 	</thead>
 
 	<tbody>
 	  <row>
 	    <entry>119411</entry>
 	    <entry></entry>
 	    <entry></entry>
 	    <entry>2.0-RELEASE</entry>
 	  </row>
 
 	  <row>
 	    <entry>199501</entry>
 	    <entry><revnumber>7153</revnumber></entry>
 	    <entry>March 19, 1995</entry>
 	    <entry>2.1-CURRENT</entry>
 	  </row>
 
 	  <row>
 	    <entry>199503</entry>
 	    <entry><revnumber>7310</revnumber></entry>
 	    <entry>March 24, 1995</entry>
 	    <entry>2.1-CURRENT</entry>
 	  </row>
 
 	  <row>
 	    <entry>199504</entry>
 	    <entry><revnumber>7704</revnumber></entry>
 	    <entry>April 9, 1995</entry>
 	    <entry>2.0.5-RELEASE</entry>
 	  </row>
 
 	  <row>
 	    <entry>199508</entry>
 	    <entry><revnumber>10297</revnumber></entry>
 	    <entry>August 26, 1995</entry>
 	    <entry>2.2-CURRENT before 2.1</entry>
 	  </row>
 
 	  <row>
 	    <entry>199511</entry>
 	    <entry><revnumber>12189</revnumber></entry>
 	    <entry>November 10, 1995</entry>
 	    <entry>2.1.0-RELEASE</entry>
 	  </row>
 
 	  <row>
 	    <entry>199512</entry>
 	    <entry><revnumber>12196</revnumber></entry>
 	    <entry>November 10, 1995</entry>
 	    <entry>2.2-CURRENT before 2.1.5</entry>
 	  </row>
 
 	  <row>
 	    <entry>199607</entry>
 	    <entry><revnumber>17067</revnumber></entry>
 	    <entry>July 10, 1996</entry>
 	    <entry>2.1.5-RELEASE</entry>
 	  </row>
 
 	  <row>
 	    <entry>199608</entry>
 	    <entry><revnumber>17127</revnumber></entry>
 	    <entry>July 12, 1996</entry>
 	    <entry>2.2-CURRENT before 2.1.6</entry>
 	  </row>
 
 	  <row>
 	    <entry>199612</entry>
 	    <entry><revnumber>19358</revnumber></entry>
 	    <entry>November 15, 1996</entry>
 	    <entry>2.1.6-RELEASE</entry>
 	  </row>
 
 	  <row>
 	    <entry>199612</entry>
 	    <entry></entry>
 	    <entry></entry>
 	    <entry>2.1.7-RELEASE</entry>
 	  </row>
 	</tbody>
       </tgroup>
     </table>
   </sect1>
 </chapter>
Index: user/gjb/releng-rewrite/en_US.ISO8859-1/htdocs/advocacy/myths.xml
===================================================================
--- user/gjb/releng-rewrite/en_US.ISO8859-1/htdocs/advocacy/myths.xml	(revision 49724)
+++ user/gjb/releng-rewrite/en_US.ISO8859-1/htdocs/advocacy/myths.xml	(revision 49725)
@@ -1,412 +1,412 @@
 <?xml version="1.0" encoding="iso-8859-1"?>
 <!DOCTYPE html PUBLIC "-//FreeBSD//DTD XHTML 1.0 Transitional-Based Extension//EN"
 "http://www.FreeBSD.org/XML/share/xml/xhtml10-freebsd.dtd" [
 <!ENTITY title "FreeBSD Advocacy Project">
 <!ENTITY url.articles "../doc/en_US.ISO8859-1/articles">
 ]>
 
 <html xmlns="http://www.w3.org/1999/xhtml">
   <head>
       <title>&title;</title>
 
       <cvs:keyword xmlns:cvs="http://www.FreeBSD.org/XML/CVS">$FreeBSD$</cvs:keyword>
     </head>
 
     <body class="navinclude.about">
 
     <p>As the BSD projects (DragonFlyBSD, FreeBSD, NetBSD, and OpenBSD) have grown in size,
       a number of persistent myths have grown up around them. Some of these are
       perpetuated by well meaning but misguided individuals, others by people
       pursuing their own agendas.</p>
 
     <p>This page aims to dispel those myths while remaining as dispassionate
       as possible.</p>
 
     <blockquote><b>Note:</b> Throughout this page, ``*BSD'' refers to all
       four of the BSD Projects. Where a myth or response is specific to a
       particular project it is indicated as such.</blockquote>
 
     <blockquote>If you are aware of an omission or error on this page, please
       let the <a href="mailto:doc@freebsd.org">FreeBSD
       documentation project mailing list</a> know.</blockquote>
 
     <h2>Index</h2>
 
     <ul>
         <li><a href="#closed-model">*BSD has a closed development model,
 	  it's more ``Cathedral'' than ``Bazaar''</a></li>
 
         <li><a href="#own-distro">You can't make your own distributions or
 	  derivative works of *BSD</a></li>
 
         <li><a href="#server">*BSD makes a great server, but a poor
 	  desktop</a></li>
 
         <li><a href="#old-codebase">The *BSD codebase is old, outdated, and
 	  dying</a></li>
 
         <li><a href="#bsd-war">The *BSD projects are at war with one
 	  another, splinter groups form each week</a></li>
 
         <li><a href="#clustering">You can't cluster *BSD systems (parallel
 	  computing)</a></li>
 
         <li><a href="#support">There's no commercial support for
 	  *BSD</a></li>
 
         <li><a href="#applications">There are no applications for
 	  *BSD</a></li>
 
         <li><a href="#beats">*BSD is better than (some other system)</a></li>
 
         <li><a href="#beaten">(some other system) is better than *BSD</a></li>
 </ul>
 
     <h2>Myths</h2>
 
     <h3><a name="closed-model">*BSD</a> has a closed development
       model, it's more ``Cathedral'' than ``Bazaar''</h3>
 
     <p>Eric Raymond wrote an influential paper, ``<a href="http://www.catb.org/~esr/writings/cathedral-bazaar/">The
       Cathedral and the Bazaar</a>'' in which the Linux development model
       (and the model Eric used for <tt>fetchmail</tt>) is held up as an
       example of how to do ``open'' development. By contrast, the model
       employed by *BSD is often characterized as closed.</p>
 
     <p>The implicit value judgment is that ``bazaar'' (open) is good, and
       ``cathedral'' (closed) is bad.</p>
 
     <p>If anything, *BSD's development model is probably
       <strong>more</strong> akin to the ``bazaar'' that Eric describes than
       either Linux or <tt>fetchmail</tt>.</p>
 
     <p>Consider the following;</p>
 
     <ul>
         <li><p><b>All the *BSD projects:</b> The current, bleeding edge source
           code for FreeBSD, NetBSD, and OpenBSD is available for anyone to download
           from the Internet, 24 hours a day. You don't need to wait for
           someone else to roll a release.</p>
 
 	<p><b>FreeBSD:</b> An installable snapshot of the current
 	  progress is made weekly. These snapshots can be installed
 	  exactly like an ordinary release, and do not require installation
 	  over an existing system.</p>
 
 	<p><b>OpenBSD:</b> Installable snapshots are generated daily and if
 	  Theo thinks they are good enough, he uploads them to the mirrors.</p>
 
 	<p>Contrast this with Linux, where new kernel distributions are
 	  made available on an ad-hoc basis, and where the frequency of
 	  each Linux distribution release is at the whim of the individual
 	  vendor.</p>
 
 	<p>There's none of the Linux fanfare every time a new kernel is
 	  released, simply because for most *BSD users it is an every day
 	  event.</p></li>
 
         <li><p>Anyone can submit patches, bug reports, documentation, and
 	  other contributions. They can do this
 	  by using a web based
 	  interface.</p>
 
 	<p>Pointers to this system litter the documentation.</p></li>
 
         <li><p>Not everyone can commit code changes to the *BSD code. You
 	  need to be a <em>committer</em> first. Typically, people are offered
 	  ``commit privs'' after they have made a few well-thought out
 	  submissions to the project using Bugzilla or similar.</p>
 
 	<p>This is identical to the Linux mechanism. Only one person is
 	  (notionally) allowed to change the Kernel, Linus. But specific areas
 	  (such as the networking code) are delegated to other people.</p>
 
 	<p><i>Aside: Nik (nik@FreeBSD.org) is a case in point. After making
 	    several submissions to the FreeBSD Documentation Project and
 	    web pages, he was offered ``commit privs'' so that he did not
 	    have to keep bothering other committers to commit the changes. He
 	    never had to ask for them, they were freely given.</i></p></li>
 </ul>
 
     <hr noshade="noshade" size="1"/>
 
     <h3><a name="own-distro">You</a> cannot make your own distributions
       or derivative works of *BSD</h3>
 
     <p>You can. You just need to say in the documentation and source
       files where the code is derived from. A bunch of derivative
       projects exists:</p>
 
     <ul>
 	<li><p><a href="https://wiki.debian.org/Debian_GNU/kFreeBSD">Debian
 	    GNU/kFreeBSD</a> is a port of the Debian GNU userland
 	  tools to the &os; kernel.  It takes advantage of the devfs(8)
 	  implementation (versus three discordant Linux interfaces),
 	  security features (like jails, ipfw, and pf), and ZFS, among
 	  other things.</p></li>
 
 	<li><p><a href="http://www.desktopbsd.net/">DesktopBSD</a> is
 	  another FreeBSD based operating system
 	  customized for desktop usability.</p></li>
 
 	<li><p><a href="http://www.dragonflybsd.org/">DragonflyBSD</a>
 	  started as a code fork from
 	  FreeBSD 4.X, but it has since its own user community and
 	  development goals.</p></li>
 
 	<li><p><a href="http://frenzy.org.ua/eng/">Frenzy</a> is
 	  another live-CD distribution, but customized
 	  for administering tasks.  It contains software for hardware
 	  tests, file system checks, security checks, network setup
 	  and analysis.</p></li>
 
 	<li><p><a href="https://wiki.gentoo.org/wiki/Gentoo_FreeBSD">Gentoo/FreeBSD</a>
 	  is an effort by the Gentoo Project to port their complete
 	  administration facilities to take advantage of the reliable
 	  FreeBSD kernel and userland.  This project is purely
 	  incomplete and experimental.</p></li>
 
 	<li><p><a href="&url.articles;/nanobsd/index.html">NanoBSD</a> is another
 	  project to produce reduced versions
 	  of FreeBSD to put it on a Compact Flash card or other mass
 	  storage.  It is also a part of the FreeBSD source tree, see
 	  /usr/src/tools/tools/nanobsd.</p></li>
 
-	<li><p><a href="http://www.pcbsd.org/">PC-BSD</a> is a desktop
+	<li><p><a href="https://www.trueos.org">TrueOS</a> is a desktop
 	  oriented FreeBSD derivative. It is
 	  intended to be easy to install and well-supported by its
 	  community.</p></li>
 
 	<li><p><a
 	  href="http://www.FreeBSD.org/cgi/man.cgi?query=picobsd">PicoBSD</a>
 	  is a tailored distribution of FreeBSD that fits
 	  on a floppy.  It is great for turning diskless 386 PC into a
 	  router or a network print server.  It is a part of the FreeBSD
 	  source tree, see /usr/src/release/picobsd.</p></li>
 
 	<li><p><a href="http://thinbsd.zefyris.com/">ThinBSD</a> is a small
 	  FreeBSD based boot image that allows a standard PC to act as
 	  a diskless thin client for a Microsoft Windows RDP server or
 	  an X terminal.  It is entirely configured via DHCP.</p></li>
 
 	<li><p><a href="http://code.google.com/p/tinybsd/">TinyBSD</a> is
 	  a set of tools made up of shell scripts designed to allow easy
 	  development of Embedded Systems based on FreeBSD.</p></li>
 
 	<li><p><a href="http://www.trustedbsd.org/">TrustedBSD</a>
 	   provides a set of trusted operating system
 	   extensions to the FreeBSD operating system, targeting the
 	   Common Criteria for Information Technology Security
 	   Evaluation (CC).  This project is still under development,
 	   and much of the code is destined to make its way back into
 	   the base FreeBSD operating system, but the development
 	   takes place separately.</p></li>
 
 	<li><p><a href="http://www.pfsense.com">pfSense</a> is an open source
 	  firewall derived from the m0n0wall firewall system with several
 	  different goals and features, such as OpenBSD's Packet Filter (PF),
 	  FreeBSD 6.1, ALTQ support for excellent packet queuing and
 	  finally an integrated package management system for extending the
 	  environment with new features.</p></li>
 
 	<li><p>The Whistle Interjet: A ``network appliance'' that acts as a
 	  router, web server, mailhost (and other functionality), and can be
 	  configured using a web browser. The underlying operating system is
 	  FreeBSD, and Whistle have contributed many of their code
 	  enhancements back to the FreeBSD project (while keeping enough of
 	  them proprietary that they can stay in business).</p></li>
 
 </ul>
 
     <p>Similarly to DragonflyBSD, OpenBSD was not a standalone project,
       it started as a spinoff from the NetBSD project, and has since evolved
       its own distinctive approach.</p>
 
     <hr noshade="noshade" size="1"/>
 
     <h3><a name="server">*BSD</a> makes a great server, but a poor
       (&unix;) desktop</h3>
 
     <p>*BSD makes a great server. It also makes a great desktop. Many of
       the requirements for a server (responsiveness under load, stability,
       effective use of system resources) are the same requirements as for a
       desktop machine.</p>
 
     <p>*BSD has access to the same desktop tools (KDE, GNOME, Firefox,
       windowmanagers) as Linux. And ``office'' applications such as
       OpenOffice suite work under *BSD too.</p>
 
     <hr noshade="noshade" size="1"/>
 
     <h3><a name="old-codebase">The</a> BSD codebase is old, outdated, and
       dying</h3>
 
     <p>While the BSD codebase may be more than 20 years old, it is neither
       outdated nor dying.  Many professional users like the stability that years
       of testing has provided FreeBSD.</p>
 
     <p><a href="../features.html">Technological
       enhancements</a> continue to be added to *BSD.</p>
 
     <hr noshade="noshade" size="1"/>
 
     <h3><a name="bsd-war">The</a> *BSD projects are at war with one another,
       splinter groups form each week</h3>
 
     <p>No. While occasional advocacy may get a touch heated, the *BSD flavors
       continue to work with one another. FreeBSD's Alpha port was initially
       heavily based on the work done by the NetBSD team. Both NetBSD and
       OpenBSD used the FreeBSD ports collection to bootstrap their own port
       sets. FreeBSD and NetBSD both integrate security fixes first discovered
       by the OpenBSD team.</p>
 
     <p>The FreeBSD and NetBSD projects separated more than twenty years
       ago. OpenBSD and DragonflyBSD are the only new BSD projects to
       split off in the last twenty years.</p>
 
     <hr noshade="noshade" size="1"/>
 
     <h3><a name="clustering">You</a> can't cluster *BSD systems (parallel
       computing)</h3>
 
     <p>The following URLs should disprove this;</p>
 
     <ul>
         <li><a href="http://www.epm.ornl.gov/pvm/">http://www.epm.ornl.gov/pvm/</a>
           The Parallel Virtual Machine is nothing more than a software package that makes
           setting up a Cluster simple.  The source code is freely available, and will run
           on FreeBSD without much problem.</li>
 
 	<li><a href="http://people.freebsd.org/~brooks/papers/bsdcon2003/fbsdcluster/">
 	  http://people.freebsd.org/~brooks/papers/bsdcon2003/fbsdcluster/</a>
 	  Brooks Davis's paper about the implementation of a FreeBSD
 	  cluster with more than 300 CPU's</li>
 
 	<li><a href="http://www.openbsd.org/faq/pf/carp.html">
 	  http://www.openbsd.org/faq/pf/carp.html</a>
 	  OpenBSD's Common Address Redundancy Protocol (CARP) to
 	  build redundant clusters at the level of the firewall</li>
 
 	<li><a href="http://www.countersiege.com/doc/pfsync-carp">
 	  http://www.countersiege.com/doc/pfsync-carp</a>
 	  A good explanation of CARP</li>
 
 	<li><a href="http://pf4freebsd.love2party.net/carp.html">
 	  http://pf4freebsd.love2party.net/carp.html</a>
 	  OpenBSD's CARP ported to FreeBSD</li>
 
     </ul>
 
     <p>Note, that
       <a href="mailto:freebsd-cluster@FreeBSD.org">freebsd-cluster</a>
       mailing list is available for further discussion about
       clustering of FreeBSD.</p>
 
     <hr noshade="noshade" size="1"/>
 
     <h3><a name="support">There's no commercial support for *BSD</a></h3>
 
     <p><b>FreeBSD:</b> The <a href="../commercial/consult_bycat.html">FreeBSD
 	Commercial Vendors Page</a> lists companies that offer commercial
         support for FreeBSD.</p>
 
         <p>The <a href="http://www.freebsdmall.com">FreeBSD
 	  Mall</a> also offer commercial support, along with shirts,
 	  hats, books, software, and promotional items.</p>
 
         <p>For training, one might try <a href="http://www.bsdmall.com/">BSDMall.com</a>, but they sell
           other items too, like shirts, hats, books and software!  Definitely worth a look.</p>
 
     <p><b>OpenBSD:</b> The <a href="http://www.openbsd.org/support.html">OpenBSD Commercial
 	Consulting Page</a> lists companies that offer commercial support for
         OpenBSD.</p>
 
     <hr noshade="noshade" size="1"/>
 
     <h3><a name="applications">There</a> are no applications for *BSD</h3>
 
     <p>The free software community started running on predominantly BSD
       systems (SunOS and similar). *BSD users can generally compile software
       written for these systems without needing to make any changes.</p>
 
     <p>In addition, each *BSD project uses a ``ports'' system to make the
       building of ported software much easier.</p>
 
     <p><b>FreeBSD:</b> There are currently more than 24,000
       applications ready to download and install in the FreeBSD ports
       collection. On i386 and AMD64, the Linux emulation layer will
       also run the vast majority of Linux applications. On the AMD64 and Itanium
       architectures there is a compatibility layer to run 32-bit FreeBSD binaries.</p>
 
     <p><b>NetBSD:</b> The Linux emulation layer will run the vast majority of
       i386 Linux applications, and the majority of SunOS4 applications can be
       run on a SPARCStation.</p>
 
     <p><b>OpenBSD:</b> There are currently more than 3700 applications
       ready to download and install in the OpenBSD ports collection. The Linux
       emulation layer will also run the vast majority of i386 Linux
       applications, and the majority of SunOS4 applications can be run on a
       SPARCStation.</p>
 
     <p>Both NetBSD and OpenBSD are able to use applications in FreeBSD's ports
       collection with minimal effort. Their lower number of ported
       applications reflects this.</p>
 
     <p>It is true that most companies when porting to PC Unix will choose Linux
       first. Fortunately, *BSD's Linux emulation layer will run these
       programs (Acrobat, StarOffice, Mathematica, WordPerfect, Quake, Intel
       ICC compiler, Compaq's Alpha compiler ...)
       with few, if any, problems.</p>
 
     <p>As a historical note, the first version of Netscape Navigator that ran
       on FreeBSD with Java support was the Linux version. Now you can
       also use a native FreeBSD version of Mozilla with a native Java
       plugin, all compiled conveniently from the ports!</p>
 
     <hr noshade="noshade" size="1"/>
 
     <h3><a name="beats">*BSD</a> is better than (insert other system)</h3>
 
     <p>This is user opinion only.</p>
 
     <hr noshade="noshade" size="1"/>
 
     <h3><a name="beaten">(insert some</a> other system) is better than *BSD</h3>
 
     <p>This is user opinion only.</p>
 
     <hr noshade="noshade" size="1"/>
 
     <h2>Contributors</h2>
 
     <p>Members of the FreeBSD, NetBSD, and OpenBSD projects have contributed
       to this page;</p>
 
     <table width="100%">
 <tbody>
 <tr>
 <td>Nik Clayton
 	    &lt;<a href="mailto:nik@FreeBSD.org">nik@FreeBSD.org</a>&gt;</td>
 </tr>
 <tr>
 <td>Jordan Hubbard
 	    &lt;<a href="mailto:jkh@FreeBSD.org">jkh@FreeBSD.org</a>&gt;</td>
 </tr>
 <tr>
 <td>Ian F. Darwin
 	    &lt;<a href="mailto:ian@DarwinSys.com">ian@DarwinSys.com</a>&gt;</td>
 </tr>
 <tr>
 <td>Adrian Filipi-Martin
 	    &lt;<a href="mailto:adrian@ubergeeks.com">adrian@ubergeeks.com</a>&gt;</td>
 </tr>
 <tr>
 <td>Tom Rhodes
 		&lt;<a href="mailto:trhodes@FreeBSD.org">trhodes@FreeBSD.org</a>&gt;</td>
 </tr>
 </tbody>
 </table>
 
 
   </body>
 </html>
Index: user/gjb/releng-rewrite/en_US.ISO8859-1/htdocs/advocacy/whyusefreebsd.xml
===================================================================
--- user/gjb/releng-rewrite/en_US.ISO8859-1/htdocs/advocacy/whyusefreebsd.xml	(revision 49724)
+++ user/gjb/releng-rewrite/en_US.ISO8859-1/htdocs/advocacy/whyusefreebsd.xml	(revision 49725)
@@ -1,209 +1,209 @@
 <?xml version="1.0" encoding="iso-8859-1"?>
 <!DOCTYPE html PUBLIC "-//FreeBSD//DTD XHTML 1.0 Transitional-Based Extension//EN"
 "http://www.FreeBSD.org/XML/share/xml/xhtml10-freebsd.dtd" [
 <!ENTITY title "FreeBSD Advocacy Project">
 ]>
 
 <html xmlns="http://www.w3.org/1999/xhtml">
   <head>
       <title>&title;</title>
 
       <cvs:keyword xmlns:cvs="http://www.FreeBSD.org/XML/CVS">$FreeBSD$</cvs:keyword>
     </head>
 
     <body class="navinclude.about">
 
   <h1>Why Choose &os;?</h1>
 
     <p>Why would you consider using &os;?  We think that there are
       lots of reasons.  Here is a selection of reasons that some of
       our existing users gave for their choice of operating system.</p>
 
     <h2>The Community</h2>
 
       <p>&os; is a community-driven operating system despite it being
 	sponsored corporately.  &os; has active mailing lists,
 	forums, and IRC channels where experienced users and
 	developers are always willing to help the less
 	experienced.</p>
 
       <p>The community is largely driven by technology, not ideology,
 	and is focused on building the best possible system and making
 	&os; as widely used as possible, not on pushing any other
 	agendas.</p>
 
       <p>There is no dictator&mdash;benevolent or
 	otherwise&mdash;for the project.  The Core Team is elected and
 	is nominally responsible for overseeing the goals of the project,
 	but this is a very light touch.  Core mediates disputes between
 	developers, but rarely needs to take an active role in
 	development, beyond their separate contributions as individual
 	developers.</p>
 
     <h2>Stability</h2>
 
       <p>Stability means many different things.  &os; very rarely
 	crashes (and when it does it is usually due to hardware
 	faults), but while that was a great boast a decade ago, now it
 	is an expected feature for any operating system.</p>
 
       <p>Stability in &os; means much more than that.  It means that
 	upgrading the system doesn't require upgrading the user.
 	Configuration interfaces do change over time, but only when
 	there is a good reason.  If you learned how to use &os; in
 	2000, most of your knowledge would still be relevant.</p>
 
       <p>Backwards compatibility is very important to the &os; team,
 	and any release in a major release series is expected to
 	be able to run any code&mdash;including kernel
 	modules&mdash;that ran on an earlier version.  The entire base
 	system is developed together, including the kernel, the core
 	utilities, and the configuration system, so upgrades are
 	usually painless.  Included tools like mergemaster help update
 	configuration files with little or no manual intervention.</p>
 
     <h2>Early Adoption and Collaboration With Other Projects</h2>
 
       <p>&os; has been one of the first adopters of the LLVM
 	infrastructure, including the clang compiler and the libc++
 	stack.  The entire &os; 9.x system,  including kernel and
 	userspace, can build with clang, and from &os; 9.1 both clang
 	and the permissively-licensed libc++ are included, giving a
 	modern, BSD-licensed C++ stack.  Several &os; developers are
 	also active contributors to LLVM, ensuring that both projects
 	thrive together.</p>
 
       <p>This same collaboration works downstream, with projects like
-	PC-BSD and pfSense building on top of the &os; base to provide
+	TrueOS and pfSense building on top of the &os; base to provide
 	desktop and firewall oriented distributions, respectively.
 	These projects are not forks, they base their work on the
 	latest version of &os; and customize the system for specific
 	uses.</p>
 
     <h2>Simple Configuration</h2>
 
       <p>&os; service initialization is very simple.  Each service,
 	whether part of the base system or installed from a port, comes
 	with a script that is responsible for starting and stopping it
 	(and often some other options).  The /etc/rc.conf file
 	contains a list of variables for enabling and configuring
 	services.  Want to enable ssh?  Just add sshd_enable="YES" to
 	your rc.conf file.  This system makes it easy to see at a
 	glance everything that will be started when your system
 	boots.</p>
 
       <p>The rc system that reads this file understands dependencies
 	between services and so can automatically launch them in
 	parallel, or wait until one is finished before starting the
 	things that it needs.  You get all of the benefits of a modern
 	configuration system, without a complex interface.</p>
 
     <h2>Ports</h2>
 
       <p>The ports tree contains a large collection of third-party
 	software, including older versions of some things where the
 	userbase is divided about the benefits of upgrading, and a lot
 	of niche programs.  The chances are that anything you want to
 	run which works on &os; will be there.</p>
 
       <p>Unlike some other systems, &os; maintains a clean division
 	between the base system and third-party ports and packages.
 	All third-party software goes in /usr/local, so if you want to
 	repurpose a machine then it's trivial to simply delete all
 	installed packages and then start installing the ones that you
 	want.</p>
 
       <p>The pkg tool makes working with binary packages
 	even easier, although source installs are still supported for
 	people who want the level of configurability that this
 	implies.</p>
 
     <h2>Security</h2>
 
       <p>Security is vital in any network-connected machine.  &os;
 	provides a number of tools for ensuring that you can maintain a
 	secure system, such as:</p>
 
       <ul>
 	<li>Jails, allowing you to run applications or entire systems
 	  in a sandbox that can't access the rest of the system.  With
 	  tools like ezjail and ZFS you can instantly create a new
 	  jail with a clone of an existing system, using a tiny amount
 	  of disk space, and run untrusted code inside it.</li>
 	<li>Mandatory Access Control, from the TrustedBSD project,
 	  allowing you to configure access control policies for all
 	  operating system resources.</li>
 	<li>Capsicum, from &os; 9 onwards, allows developers to easily
 	  implement privilege separation, reducing the impact of
 	  compromised code.</li>
 	<li>The VuXML system for publishing vulnerabilities in ports,
 	  which integrates with tools such as pkg, so that your
 	  daily security email tells you about any known
 	  vulnerabilities in ported software.</li>
 	<li>Security event auditing, using the BSM standard.</li>
       </ul>
 
       <p>And, of course, all of the standard features that you'd
 	expect from a modern &unix; system including IPSec, SSH, and so
 	on.</p>
 
     <h2>ZFS</h2>
 
       <p>Cheap snapshots, clones, end-to-end checksums, deduplication,
 	compression, and no need to decide partition sizes on install.
 	Using ZFS for a few days makes going back to a more
 	traditional volume manager painful.  If you want to test
 	something with ZFS, then it's trivial to just create a
 	snapshot and roll back if it didn't work.</p>
 
       <p>If you're using jails, then ZFS lets you clone an existing
 	jail in under a second, irrespective of how big the jail
 	itself is.</p>
 
     <h2>GEOM</h2>
 
       <p>Even without ZFS, &os; comes with a rich storage system.
 	GEOM layers providers and consumers in arbitrary ways,
 	allowing you to use two networked machines for
 	high-availability storage, use your choice of RAID level, or
 	add features like compression or encryption.</p>
 
     <h2>Working Sound</h2>
 
       <p>&os; 4.x introduced in-kernel sound mixing, so that multiple
 	applications could play sound at the same time even with cheap
 	sound cards with no hardware mixing support.  &os; 5.x
 	automatically allocated new channels to applications, without
 	any configuration.</p>
 
       <p>Now, &os; has low-latency sound mixing with per-application
 	volume controls and full support for the OSS 4 APIs out of the
 	box.  There's no need to configure a userspace sound daemon.
 	The same audio APIs that were used a decade ago still work on
 	&os;,  including some compatibility modes to allow
 	applications that try to manipulate the global volume to only
 	change their own.  If you want to watch DVDs with 5.1 surround
 	sound, just install your favourite media player and press
 	play.</p>
 
     <h2>My System, How I Want It</h2>
 
       <p>&os; gives you an easy-to-use, working, &unix;-like system.
 	This base system can then be extended easily.  If you want to
 	run KDE or GNOME, then just install the metapackage for the
 	version that you prefer.  If you want a headless server, then
 	it's equally easy to install the server tools that you want.</p>
 
       <p>It's easy to run the &os; installer via a serial port and to
 	configure the entire system from the terminal.  It's also easy
 	to install and use an existing desktop environment.  The
 	decisions about the kind of system you want to use are left to
 	you.</p>
 
       <p>If you're deploying &os; in a corporate environment, then
 	it's very easy to customise both the base system and the set
 	of installed packages for your specific requirements.  The
 	build system provides numerous tuneable variables allowing you
 	to build exactly the base system that meets your needs.</p>
   </body>
 </html>
Index: user/gjb/releng-rewrite/en_US.ISO8859-1/htdocs/projects/newbies.xml
===================================================================
--- user/gjb/releng-rewrite/en_US.ISO8859-1/htdocs/projects/newbies.xml	(revision 49724)
+++ user/gjb/releng-rewrite/en_US.ISO8859-1/htdocs/projects/newbies.xml	(revision 49725)
@@ -1,123 +1,123 @@
 <?xml version="1.0" encoding="iso-8859-1"?>
 <!DOCTYPE html PUBLIC "-//FreeBSD//DTD XHTML 1.0 Transitional-Based Extension//EN"
 "http://www.FreeBSD.org/XML/share/xml/xhtml10-freebsd.dtd" [
 <!ENTITY title 'Resources for Newbies'>
 <!ENTITY url.articles "&base;/doc/en_US.ISO8859-1/articles">
 <!ENTITY url.books "&base;/doc/en_US.ISO8859-1/books">
 ]>
 
 <html xmlns="http://www.w3.org/1999/xhtml">
     <head>
       <title>&title;</title>
 
       <cvs:keyword xmlns:cvs="http://www.FreeBSD.org/XML/CVS">$FreeBSD$</cvs:keyword>
     </head>
 
     <body class="navinclude.docs">
 
     <h2><a>Getting &os;</a></h2>
 
     <p>The latest &os; releases are available <a
 	href="&enbase;/where.html">here</a>.  Before you begin,
       carefully read the <a
 	href="&url.books;/handbook/bsdinstall.html">installation
 	instructions</a>.</p>
 
     <h2><a>Learning about &os;</a></h2>
 
     <ul>
       <li><p>The <a href="&url.books;/handbook/index.html">&os;
 	Handbook</a> and <a
 	href="&url.books;/faq/index.html">Frequently Asked Questions
 	(FAQ)</a> are the main documents for &os;. Essential reading,
 	they contain a lot of material for newbies as well as advanced
 	users.  For users interested in installing a GUI, see the <a
 	href="&url.books;/handbook/x11.html">X Windows</a> chapter.
 	</p></li>
 
       <li><p><a href="&cgibase;/man.cgi">Manual pages</a> are good for
 	reference but not always the best introduction for a novice.
 	They generally provide information on a specific command,
 	driver or service.</p></li>
 
     </ul>
 
     <h2><a>Questions and Support</a></h2>
 
     <ul>
       <li><p>Join the &os;-Questions mailing list to see the questions
 	you were too afraid to ask, and their answers. Subscribe by
 	filling out the following form: <a
 	href="http://lists.FreeBSD.org/mailman/listinfo/freebsd-questions">http://lists.FreeBSD.org/mailman/listinfo/freebsd-questions</a>.
 	You can look up old questions and answers via the <a
 	href="&base;/search/search.html#mailinglists">search</a>
 	page.</p></li>
 
       <li><p>The &os; <a href="https://forums.freebsd.org">Forums</a>
 	offer another support channel.  Many users have written various
 	tutorials and lots of new users receive help there.</p></li>
 
       <li><p><a href="&base;/search/search.html">Search</a> the
 	Handbook and FAQ, the whole web site, or the &os; mailing list
 	archives.</p></li>
 
       <li><p>The <a href="&base;/support.html">Support</a> page
 	contains a wealth of information about &os;, including mailing
 	lists, user groups, web and FTP sites, release information,
 	and links to some sources of &unix; information.</p></li>
     </ul>
 
     <h2><a>Learning about &os;-derived projects</a></h2>
 
     <p>&os; is widely used as a building block for other commercial
       and open-source operating systems.  Some of the most widely used
       and publicly available systems are listed below.</p>
 
     <ul>
       <li><p><a href="http://www.freenas.org">FreeNAS</a> is a storage
 	solution that can be installed on virtually any hardware
 	platform to share data over a network.  It uses ZFS to protect,
 	store, backup, all of your data.</p></li>
 
-      <li><p><a href="http://www.pcbsd.org">PC-BSD</a> is a &os;
+      <li><p><a href="https://www.trueos.org">TrueOS</a> is a &os;
 	derivative with a graphical installer and impressive desktop
 	tools aimed at ease of use for the casual computer
 	user.</p></li>
 
       <li><p><a href="http://www.pfsense.org">pfSense</a> is a &os;
 	free network security solution, based on &os;.  pfSense
 	software, with the help of the package system, is able to
 	provide the same functionality or more of common commercial
 	firewalls, without any of the artificial limitations.  It has
 	successfully replaced every big name commercial firewall you can
 	imagine in numerous installations around the world.</p></li>
     </ul>
 
     <h2><a>How to Contribute</a></h2>
 
     <p>Everyone has something to contribute to the &os; community,
       even newbies! Some are busy working with the new advocacy group
       and some have become involved with the <a
 	href="&base;/docproj/docproj.html">Documentation Project</a> as
       reviewers.  Other &os; newbies might have particular skills and
       experiences to share, either computer related or not, or just
       want to meet new newbies and make them feel welcome. There are
       always people around who help others simply because they like
       to.</p>
 
     <p>Friends who run &os; are a great resource. No book can replace
       chatting on the phone or across a pizza with someone who has the
       same interests, enjoys similar accomplishments, and faces the
       same challenges. If you do not have many friends who use &os;,
       consider using your old &os; CDs to create some more.</p>
 
     <p><a href="&base;/usergroups.html">User groups</a> are good
       places to meet other &os; users. If there is no one nearby, you
       might consider starting one!</p>
 
     <p>For more information on getting involved in the community, see
       the <a
 	href="&enbase;/doc/en_US.ISO8859-1/articles/contributing/index.html">Contributing
 	to &os;</a> article.</p>
   </body>
 </html>
Index: user/gjb/releng-rewrite/en_US.ISO8859-1/htdocs/releases/10.3R/errata.html
===================================================================
--- user/gjb/releng-rewrite/en_US.ISO8859-1/htdocs/releases/10.3R/errata.html	(revision 49724)
+++ user/gjb/releng-rewrite/en_US.ISO8859-1/htdocs/releases/10.3R/errata.html	(revision 49725)
@@ -1,155 +1,159 @@
 <?xml version="1.0" encoding="iso-8859-1"?>
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd"><html xmlns="http://www.w3.org/1999/xhtml"><head><meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1" /><title>FreeBSD 10.3-RELEASE Errata</title><link rel="stylesheet" type="text/css" href="docbook.css" /><link rev="made" href="mailto:doc@FreeBSD.org" /><meta name="generator" content="DocBook XSL Stylesheets V1.78.1" /><meta name="description" content="This document lists errata items for FreeBSD 10.3-RELEASE, containing significant information discovered after the release or too late in the release cycle to be otherwise included in the release documentation. This information includes security advisories, as well as news relating to the software or documentation that could affect its operation or usability. An up-to-date version of this document should always be consulted before installing this version of FreeBSD. This errata document for FreeBSD 10.3-RELEASE will be maintained until the release of FreeBSD 10.3-RELEASE." /><script xmlns="" type="text/javascript" src="/layout/js/google.js"></script></head><body><div class="article"><div xmlns="" class="titlepage"><div><div><h1 xmlns="http://www.w3.org/1999/xhtml" class="title"><a id="idp56914936"></a>FreeBSD 10.3-RELEASE Errata </h1></div><div><div xmlns="http://www.w3.org/1999/xhtml" class="author"><h3 class="author"><span class="orgname">The FreeBSD Project</span></h3></div></div><div><p xmlns="http://www.w3.org/1999/xhtml" class="copyright">Copyright � 2016 The FreeBSD Documentation
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd"><html xmlns="http://www.w3.org/1999/xhtml"><head><meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1" /><title>FreeBSD 10.3-RELEASE Errata</title><link rel="stylesheet" type="text/css" href="docbook.css" /><link rev="made" href="mailto:doc@FreeBSD.org" /><meta name="generator" content="DocBook XSL Stylesheets V1.78.1" /><meta name="description" content="This document lists errata items for FreeBSD 10.3-RELEASE, containing significant information discovered after the release or too late in the release cycle to be otherwise included in the release documentation. This information includes security advisories, as well as news relating to the software or documentation that could affect its operation or usability. An up-to-date version of this document should always be consulted before installing this version of FreeBSD. This errata document for FreeBSD 10.3-RELEASE will be maintained until the release of FreeBSD 10.3-RELEASE." /><script xmlns="" type="text/javascript" src="/layout/js/google.js"></script></head><body><div class="article"><div xmlns="" class="titlepage"><div><div><h1 xmlns="http://www.w3.org/1999/xhtml" class="title"><a id="idp61012712"></a>FreeBSD 10.3-RELEASE Errata </h1></div><div><div xmlns="http://www.w3.org/1999/xhtml" class="author"><h3 class="author"><span class="orgname">The FreeBSD Project</span></h3></div></div><div><p xmlns="http://www.w3.org/1999/xhtml" class="copyright">Copyright � 2016 The FreeBSD Documentation
 	Project</p></div><div><div xmlns="http://www.w3.org/1999/xhtml" class="legalnotice"><a id="trademarks"></a><p xmlns="http://www.w3.org/TR/xhtml1/transitional">FreeBSD is a registered trademark of
   the FreeBSD Foundation. </p><p xmlns="http://www.w3.org/TR/xhtml1/transitional">Intel, Celeron, Centrino, Core, EtherExpress, i386,
   i486, Itanium, Pentium, and Xeon are trademarks or registered
   trademarks of Intel Corporation or its subsidiaries in the United
   States and other countries. </p><p xmlns="http://www.w3.org/TR/xhtml1/transitional">SPARC, SPARC64, and
   UltraSPARC are trademarks of SPARC International, Inc in the United
   States and other countries.  SPARC International, Inc owns all of the
   SPARC trademarks and under licensing agreements allows the proper use
   of these trademarks by its members. </p><p xmlns="http://www.w3.org/TR/xhtml1/transitional">Many of the designations used by
   manufacturers and sellers to distinguish their products are claimed
   as trademarks.  Where those designations appear in this document,
   and the FreeBSD Project was aware of the trademark claim, the
   designations have been followed by the <span xmlns="http://www.w3.org/1999/xhtml" class="quote">&#8220;<span class="quote">&#8482;</span>&#8221;</span> or the
   <span xmlns="http://www.w3.org/1999/xhtml" class="quote">&#8220;<span class="quote">�</span>&#8221;</span> symbol. </p></div></div><div>Last modified on 2016-03-07 10:56:38Z by hrs.</div><div><div xmlns="http://www.w3.org/1999/xhtml" class="abstract"><div class="abstract-title">Abstract</div><p xmlns="http://www.w3.org/TR/xhtml1/transitional">This document lists errata items for FreeBSD 10.3-RELEASE,
 	containing significant information discovered after the
 	release or too late in the release cycle to be otherwise
 	included in the release documentation.  This information
 	includes security advisories, as well as news relating to the
 	software or documentation that could affect its operation or
 	usability.  An up-to-date version of this document should
 	always be consulted before installing this version of
 	FreeBSD. </p><p xmlns="http://www.w3.org/TR/xhtml1/transitional">This errata document for FreeBSD 10.3-RELEASE will be
 	maintained until the release of FreeBSD 10.3-RELEASE. </p></div></div></div><hr /></div><div class="toc"><div class="toc-title">Table of Contents</div><dl class="toc"><dt><span class="sect1"><a href="#intro">1. Introduction</a></span></dt><dt><span class="sect1"><a href="#security">2. Security Advisories</a></span></dt><dt><span class="sect1"><a href="#errata">3. Errata Notices</a></span></dt><dt><span class="sect1"><a href="#open-issues">4. Open Issues</a></span></dt><dt><span class="sect1"><a href="#late-news">5. Late-Breaking News</a></span></dt></dl></div><div class="sect1"><div xmlns="" class="titlepage"><div><div><h2 xmlns="http://www.w3.org/1999/xhtml" class="title" style="clear: both"><a id="intro"></a>1.�Introduction</h2></div></div></div><p xmlns="http://www.w3.org/TR/xhtml1/transitional">This errata document contains <span xmlns="http://www.w3.org/1999/xhtml" class="quote">&#8220;<span class="quote">late-breaking
 	news</span>&#8221;</span> about FreeBSD 10.3-RELEASE Before installing this
       version, it is important to consult this document to learn about
       any post-release discoveries or problems that may already have
       been found and fixed. </p><p xmlns="http://www.w3.org/TR/xhtml1/transitional">Any version of this errata document actually distributed
       with the release (for example, on a CDROM distribution) will be
       out of date by definition, but other copies are kept updated on
       the Internet and should be consulted as the <span xmlns="http://www.w3.org/1999/xhtml" class="quote">&#8220;<span class="quote">current
 	errata</span>&#8221;</span> for this release.  These other copies of the
       errata are located at <a xmlns="http://www.w3.org/1999/xhtml" class="link" href="https://www.FreeBSD.org/releases/" target="_top">https://www.FreeBSD.org/releases/</a>, plus any
       sites which keep up-to-date mirrors of this location. </p><p xmlns="http://www.w3.org/TR/xhtml1/transitional">Source and binary snapshots of FreeBSD 10.3-STABLE also
       contain up-to-date copies of this document (as of the time of
       the snapshot). </p><p xmlns="http://www.w3.org/TR/xhtml1/transitional">For a list of all FreeBSD CERT security advisories, see <a xmlns="http://www.w3.org/1999/xhtml" class="link" href="https://www.FreeBSD.org/security/" target="_top">https://www.FreeBSD.org/security/</a>. </p></div><div class="sect1"><div xmlns="" class="titlepage"><div><div><h2 xmlns="http://www.w3.org/1999/xhtml" class="title" style="clear: both"><a id="security"></a>2.�Security Advisories</h2></div></div></div><div class="informaltable"><table width="100%" border="0"><colgroup><col width="40%" /><col width="30%" /><col width="30%" /></colgroup><thead><tr><th>Advisory</th><th>Date</th><th>Topic</th></tr></thead><tbody><tr><td><a class="link" href="https://www.FreeBSD.org/security/advisories/FreeBSD-SA-16:09.ntp.asc" target="_top">FreeBSD-SA-16:09.ntp</a></td><td>29�April�2016</td><td><p xmlns="http://www.w3.org/TR/xhtml1/transitional">Multiple <span xmlns="http://www.w3.org/1999/xhtml" class="application">ntp</span>
 	    vulnerabilities. </p></td></tr><tr><td><a class="link" href="https://www.FreeBSD.org/security/advisories/FreeBSD-SA-16:17.openssl.asc" target="_top">FreeBSD-SA-16:17.openssl</a></td><td>29�April�2016</td><td><p xmlns="http://www.w3.org/TR/xhtml1/transitional">Multiple <span xmlns="http://www.w3.org/1999/xhtml" class="application">OpenSSL</span>
 	    vulnerabilities. </p></td></tr><tr><td><a class="link" href="https://www.FreeBSD.org/security/advisories/FreeBSD-SA-16:18.atkbd.asc" target="_top">FreeBSD-SA-16:18.atkbd</a></td><td>17�May�2016</td><td><p xmlns="http://www.w3.org/TR/xhtml1/transitional">Keyboard driver buffer overflow </p></td></tr><tr><td><a class="link" href="https://www.FreeBSD.org/security/advisories/FreeBSD-SA-16:19.sendmsg.asc" target="_top">FreeBSD-SA-16:19.sendmsg</a></td><td>17�May�2016</td><td><p xmlns="http://www.w3.org/TR/xhtml1/transitional">Incorrect argument handling in
 	    <a xmlns="http://www.w3.org/1999/xhtml" class="citerefentry" href="http://www.FreeBSD.org/cgi/man.cgi?query=sendmsg&amp;sektion=2&amp;manpath=freebsd-release-ports"><span class="citerefentry"><span class="refentrytitle">sendmsg</span>(2)</span></a> </p></td></tr><tr><td><a class="link" href="https://www.FreeBSD.org/security/advisories/FreeBSD-SA-16:20.linux.asc" target="_top">FreeBSD-SA-16:20.linux</a></td><td>31�May�2016</td><td><p xmlns="http://www.w3.org/TR/xhtml1/transitional">Kernel stack disclosure in Linux compatibility
 	  layer </p></td></tr><tr><td><a class="link" href="https://www.FreeBSD.org/security/advisories/FreeBSD-SA-16:21.43bsd.asc" target="_top">FreeBSD-SA-16:21.43bsd</a></td><td>31�May�2016</td><td><p xmlns="http://www.w3.org/TR/xhtml1/transitional">Kernel stack disclosure in 4.3BSD compatibility
 	  layer </p></td></tr><tr><td><a class="link" href="https://www.FreeBSD.org/security/advisories/FreeBSD-SA-16:22.libarchive.asc" target="_top">FreeBSD-SA-16:22.libarchive</a></td><td>31�May�2016</td><td><p xmlns="http://www.w3.org/TR/xhtml1/transitional">Absolute path traversal
 	    vulnerability </p></td></tr><tr><td><a class="link" href="https://www.FreeBSD.org/security/advisories/FreeBSD-SA-16:23.libarchive.asc" target="_top">FreeBSD-SA-16:23.libarchive</a></td><td>31�May�2016</td><td><p xmlns="http://www.w3.org/TR/xhtml1/transitional">Absolute path traversal
 	    vulnerability </p></td></tr><tr><td><a class="link" href="https://www.FreeBSD.org/security/advisories/FreeBSD-SA-16:24.ntp.asc" target="_top">FreeBSD-SA-16:24.ntp</a></td><td>3�June�2016</td><td><p xmlns="http://www.w3.org/TR/xhtml1/transitional">Multiple <span xmlns="http://www.w3.org/1999/xhtml" class="application">ntp</span>
 	    vulnerabilties </p></td></tr><tr><td><a class="link" href="https://www.FreeBSD.org/security/advisories/FreeBSD-SA-16:25.bspatch.asc" target="_top">FreeBSD-SA-16:25.bspatch</a></td><td>25�July�2016</td><td><p xmlns="http://www.w3.org/TR/xhtml1/transitional">heap overflow vulnerability </p></td></tr><tr><td><a class="link" href="https://www.FreeBSD.org/security/advisories/FreeBSD-SA-16:26.openssl.asc" target="_top">FreeBSD-SA-16:26.openssl</a></td><td>23�September�2016</td><td><p xmlns="http://www.w3.org/TR/xhtml1/transitional">Multiple vulnerabilities </p></td></tr><tr><td><a class="link" href="https://www.FreeBSD.org/security/advisories/FreeBSD-SA-16:27.openssl.asc" target="_top">FreeBSD-SA-16:27.openssl</a></td><td>26�September�2016</td><td><p xmlns="http://www.w3.org/TR/xhtml1/transitional">Regression in <span xmlns="http://www.w3.org/1999/xhtml" class="application">OpenSSL</span>
 	    suite </p></td></tr><tr><td><a class="link" href="https://www.FreeBSD.org/security/advisories/FreeBSD-SA-16:29.bspatch.asc" target="_top">FreeBSD-SA-16:29.bspatch</a></td><td>10�October�2016</td><td><p xmlns="http://www.w3.org/TR/xhtml1/transitional">Heap overflow vulnerability </p></td></tr><tr><td><a class="link" href="https://www.FreeBSD.org/security/advisories/FreeBSD-SA-16:30.portsnap.asc" target="_top">FreeBSD-SA-16:30.portsnap</a></td><td>10�October�2016</td><td><p xmlns="http://www.w3.org/TR/xhtml1/transitional">Multiple vulnerabilities </p></td></tr><tr><td><a class="link" href="https://www.FreeBSD.org/security/advisories/FreeBSD-SA-16:31.libarchive.asc" target="_top">FreeBSD-SA-16:31.libarchive</a></td><td>10�October�2016</td><td><p xmlns="http://www.w3.org/TR/xhtml1/transitional">Multiple vulnerabilities </p></td></tr><tr><td><a class="link" href="https://www.FreeBSD.org/security/advisories/FreeBSD-SA-16:33.openssh.asc" target="_top">FreeBSD-SA-16:33.openssh</a></td><td>2�November�2016</td><td><p xmlns="http://www.w3.org/TR/xhtml1/transitional">Remote Denial of Service
 	    vulnerability </p></td></tr><tr><td><a class="link" href="https://www.FreeBSD.org/security/advisories/FreeBSD-SA-16:35.openssl.asc" target="_top">FreeBSD-SA-16:35.openssl</a></td><td>2�November�2016</td><td><p xmlns="http://www.w3.org/TR/xhtml1/transitional">Remote Denial of Service
-	    vulnerability </p></td></tr></tbody></table></div></div><div class="sect1"><div xmlns="" class="titlepage"><div><div><h2 xmlns="http://www.w3.org/1999/xhtml" class="title" style="clear: both"><a id="errata"></a>3.�Errata Notices</h2></div></div></div><div class="informaltable"><table width="100%" border="0"><colgroup><col width="40%" /><col width="30%" /><col width="30%" /></colgroup><thead><tr><th>Errata</th><th>Date</th><th>Topic</th></tr></thead><tbody><tr><td><a class="link" href="https://www.FreeBSD.org/security/advisories/FreeBSD-EN-16:06.libc.asc" target="_top">FreeBSD-EN-16:06.libc</a></td><td>4�May�2016</td><td><p xmlns="http://www.w3.org/TR/xhtml1/transitional">Performance regression in libc
+	    vulnerability </p></td></tr><tr><td><a class="link" href="https://www.FreeBSD.org/security/advisories/FreeBSD-SA-16:36.telnetd.asc" target="_top">FreeBSD-SA-16:36.telnetd</a></td><td>6�December�2016</td><td><p xmlns="http://www.w3.org/TR/xhtml1/transitional">Possible <a xmlns="http://www.w3.org/1999/xhtml" class="citerefentry" href="http://www.FreeBSD.org/cgi/man.cgi?query=login&amp;sektion=1&amp;manpath=freebsd-release-ports"><span class="citerefentry"><span class="refentrytitle">login</span>(1)</span></a> argument
+	    injection </p></td></tr><tr><td><a class="link" href="https://www.FreeBSD.org/security/advisories/FreeBSD-SA-16:37.libc.asc" target="_top">FreeBSD-SA-16:37.libc</a></td><td>6�December�2016</td><td><p xmlns="http://www.w3.org/TR/xhtml1/transitional"><a xmlns="http://www.w3.org/1999/xhtml" class="citerefentry" href="http://www.FreeBSD.org/cgi/man.cgi?query=link_ntoa&amp;sektion=3&amp;manpath=freebsd-release-ports"><span class="citerefentry"><span class="refentrytitle">link_ntoa</span>(3)</span></a> buffer overflow </p></td></tr><tr><td><a class="link" href="https://www.FreeBSD.org/security/advisories/FreeBSD-SA-16:38.bhyve.asc" target="_top">FreeBSD-SA-16:38.bhyve</a></td><td>6�December�2016</td><td><p xmlns="http://www.w3.org/TR/xhtml1/transitional">Possible escape from <a xmlns="http://www.w3.org/1999/xhtml" class="citerefentry" href="http://www.FreeBSD.org/cgi/man.cgi?query=bhyve&amp;sektion=8&amp;manpath=freebsd-release-ports"><span class="citerefentry"><span class="refentrytitle">bhyve</span>(8)</span></a> virtual
+	  machine </p></td></tr></tbody></table></div></div><div class="sect1"><div xmlns="" class="titlepage"><div><div><h2 xmlns="http://www.w3.org/1999/xhtml" class="title" style="clear: both"><a id="errata"></a>3.�Errata Notices</h2></div></div></div><div class="informaltable"><table width="100%" border="0"><colgroup><col width="40%" /><col width="30%" /><col width="30%" /></colgroup><thead><tr><th>Errata</th><th>Date</th><th>Topic</th></tr></thead><tbody><tr><td><a class="link" href="https://www.FreeBSD.org/security/advisories/FreeBSD-EN-16:06.libc.asc" target="_top">FreeBSD-EN-16:06.libc</a></td><td>4�May�2016</td><td><p xmlns="http://www.w3.org/TR/xhtml1/transitional">Performance regression in libc
 	    <a xmlns="http://www.w3.org/1999/xhtml" class="citerefentry" href="http://www.FreeBSD.org/cgi/man.cgi?query=hash&amp;sektion=3&amp;manpath=freebsd-release-ports"><span class="citerefentry"><span class="refentrytitle">hash</span>(3)</span></a> </p></td></tr><tr><td><a class="link" href="https://www.FreeBSD.org/security/advisories/FreeBSD-EN-16:07.ipi.asc" target="_top">FreeBSD-EN-16:07.ipi</a></td><td>4�May�2016</td><td><p xmlns="http://www.w3.org/TR/xhtml1/transitional">Excessive latency in x86 IPI
 	    delivery </p></td></tr><tr><td><a class="link" href="https://www.FreeBSD.org/security/advisories/FreeBSD-EN-16:08.zfs.asc" target="_top">FreeBSD-EN-16:08.zfs</a></td><td>4�May�2016</td><td><p xmlns="http://www.w3.org/TR/xhtml1/transitional">Memory leak in ZFS </p></td></tr><tr><td><a class="link" href="https://www.FreeBSD.org/security/advisories/FreeBSD-EN-16:09.freebsd-update.asc" target="_top">FreeBSD-EN-16:09.freebsd-update</a></td><td>25�July�2016</td><td><p xmlns="http://www.w3.org/TR/xhtml1/transitional">Fix <a xmlns="http://www.w3.org/1999/xhtml" class="citerefentry" href="http://www.FreeBSD.org/cgi/man.cgi?query=freebsd-update&amp;sektion=8&amp;manpath=freebsd-release-ports"><span class="citerefentry"><span class="refentrytitle">freebsd-update</span>(8)</span></a> support of
 	    FreeBSD�11.0-RELEASE </p></td></tr><tr><td><a class="link" href="https://www.FreeBSD.org/security/advisories/FreeBSD-EN-16:10.dhclient.asc" target="_top">FreeBSD-EN-16:10.dhclient</a></td><td>11�August�2016</td><td><p xmlns="http://www.w3.org/TR/xhtml1/transitional">Better handle unknown options received from
 	    aDHCP server </p></td></tr><tr><td><a class="link" href="https://www.FreeBSD.org/security/advisories/FreeBSD-EN-16:11.vmbus.asc" target="_top">FreeBSD-EN-16:11.vmbus</a></td><td>11�August�2016</td><td><p xmlns="http://www.w3.org/TR/xhtml1/transitional">Avoid using spin locks for channel message
 	    locks </p></td></tr><tr><td><a class="link" href="https://www.FreeBSD.org/security/advisories/FreeBSD-EN-16:12.hv_storvsc.asc" target="_top">FreeBSD-EN-16:12.hv_storvsc</a></td><td>11�August�2016</td><td><p xmlns="http://www.w3.org/TR/xhtml1/transitional">Enable INQUIRY result check only on
 	    Windows�10 host systems </p></td></tr><tr><td><a class="link" href="https://www.FreeBSD.org/security/advisories/FreeBSD-EN-16:13.vmbus.asc" target="_top">FreeBSD-EN-16:13.vmbus</a></td><td>11�August�2016</td><td><p xmlns="http://www.w3.org/TR/xhtml1/transitional">Register time counter early enough for TSC freq
 	    calibration </p></td></tr><tr><td><a class="link" href="https://www.FreeBSD.org/security/advisories/FreeBSD-EN-16:14.hv_storvsc.asc" target="_top">FreeBSD-EN-16:14.hv_storvsc</a></td><td>11�August�2016</td><td><p xmlns="http://www.w3.org/TR/xhtml1/transitional">Disable incorrect callout in
 	    <a xmlns="http://www.w3.org/1999/xhtml" class="citerefentry" href="http://www.FreeBSD.org/cgi/man.cgi?query=hv_storvsc&amp;sektion=4&amp;manpath=freebsd-release-ports"><span class="citerefentry"><span class="refentrytitle">hv_storvsc</span>(4)</span></a> </p></td></tr><tr><td><a class="link" href="https://www.FreeBSD.org/security/advisories/FreeBSD-EN-16:15.vmbus.asc" target="_top">FreeBSD-EN-16:15.vmbus</a></td><td>11�August�2016</td><td><p xmlns="http://www.w3.org/TR/xhtml1/transitional">Better handle the GPADL setup failure in
 	    Hyper-V </p></td></tr><tr><td><a class="link" href="https://www.FreeBSD.org/security/advisories/FreeBSD-EN-16:16.hv_storvsc.asc" target="_top">FreeBSD-EN-16:16.hv_storvsc</a></td><td>11�August�2016</td><td><p xmlns="http://www.w3.org/TR/xhtml1/transitional">Fix SCSI INQUIRY checks and error
-	    handling </p></td></tr><tr><td><a class="link" href="https://www.FreeBSD.org/security/advisories/FreeBSD-EN-16:17.vm.asc" target="_top">FreeBSD-EN-16:17.vm</a></td><td>25�October�2016</td><td><p xmlns="http://www.w3.org/TR/xhtml1/transitional">Several virtual memory issues </p></td></tr></tbody></table></div></div><div class="sect1"><div xmlns="" class="titlepage"><div><div><h2 xmlns="http://www.w3.org/1999/xhtml" class="title" style="clear: both"><a id="open-issues"></a>4.�Open Issues</h2></div></div></div><div class="itemizedlist"><ul class="itemizedlist" style="list-style-type: disc; "><li class="listitem"><p xmlns="http://www.w3.org/TR/xhtml1/transitional">FreeBSD/i386 10.3-RELEASE running as a guest
+	    handling </p></td></tr><tr><td><a class="link" href="https://www.FreeBSD.org/security/advisories/FreeBSD-EN-16:17.vm.asc" target="_top">FreeBSD-EN-16:17.vm</a></td><td>25�October�2016</td><td><p xmlns="http://www.w3.org/TR/xhtml1/transitional">Several virtual memory issues </p></td></tr><tr><td><a class="link" href="https://www.FreeBSD.org/security/advisories/FreeBSD-EN-16:19.tzcode.asc" target="_top">FreeBSD-EN-16:19.tzcode</a></td><td>6�December�2016</td><td><p xmlns="http://www.w3.org/TR/xhtml1/transitional">Fix warnings about invalid timezone
+	    abbreviations </p></td></tr><tr><td><a class="link" href="https://www.FreeBSD.org/security/advisories/FreeBSD-EN-16:20.tzdata.asc" target="_top">FreeBSD-EN-16:20.tzdata</a></td><td>6�December�2016</td><td><p xmlns="http://www.w3.org/TR/xhtml1/transitional">Update timezone database
+	    information </p></td></tr></tbody></table></div></div><div class="sect1"><div xmlns="" class="titlepage"><div><div><h2 xmlns="http://www.w3.org/1999/xhtml" class="title" style="clear: both"><a id="open-issues"></a>4.�Open Issues</h2></div></div></div><div class="itemizedlist"><ul class="itemizedlist" style="list-style-type: disc; "><li class="listitem"><p xmlns="http://www.w3.org/TR/xhtml1/transitional">FreeBSD/i386 10.3-RELEASE running as a guest
 	  operating system on <span xmlns="http://www.w3.org/1999/xhtml" class="application">VirtualBox</span>
 	  can have a problem with disk I/O access.  It depends on some
 	  specific hardware configuration and does not depend on a
 	  specific version of <span xmlns="http://www.w3.org/1999/xhtml" class="application">VirtualBox</span> or
 	  host operating system. </p><p xmlns="http://www.w3.org/TR/xhtml1/transitional">It has been reported that instability may be present on
 	  virtual machines running on other hypervisors, such as Xen
 	  or KVM. </p><p xmlns="http://www.w3.org/TR/xhtml1/transitional">It causes various errors and makes FreeBSD quite unstable.
 	  Although the cause is still unclear, disabling unmapped I/O
 	  works as a workaround.  To disable it, choose
 	  <code xmlns="http://www.w3.org/1999/xhtml" class="literal">Escape to loader prompt</code> in the boot menu
 	  and enter the following lines from <a xmlns="http://www.w3.org/1999/xhtml" class="citerefentry" href="http://www.FreeBSD.org/cgi/man.cgi?query=loader&amp;sektion=8&amp;manpath=freebsd-release-ports"><span class="citerefentry"><span class="refentrytitle">loader</span>(8)</span></a> prompt,
 	  after an <code xmlns="http://www.w3.org/1999/xhtml" class="literal">OK</code>: </p><pre class="screen">set vfs.unmapped_buf_allowed=0
 boot</pre><p xmlns="http://www.w3.org/TR/xhtml1/transitional">Note that the following line has to be added to
 	  <code xmlns="http://www.w3.org/1999/xhtml" class="filename">/boot/loader.conf</code> after a boot.  It
 	  disables unmapped I/O at every boot: </p><pre class="programlisting">vfs.unmapped_buf_allowed=0</pre></li><li class="listitem"><p xmlns="http://www.w3.org/TR/xhtml1/transitional">FreeBSD/i386�10.3-RELEASE installed on ZFS
 	  may crash during boot when the ZFS pool mount is attempted
 	  while booting an unmodified <code xmlns="http://www.w3.org/1999/xhtml" class="literal">GENERIC</code>
 	  kernel. </p><p xmlns="http://www.w3.org/TR/xhtml1/transitional">As described in <code xmlns="http://www.w3.org/1999/xhtml" class="filename">/usr/src/UPDATING</code>
 	  entry <code xmlns="http://www.w3.org/1999/xhtml" class="literal">20121223</code>, rebuilding the kernel
 	  with <code xmlns="http://www.w3.org/1999/xhtml" class="literal">options KSTACK_PAGES=4</code> has been
 	  observed to resolve the boot-time crash.  This, however, is
 	  not an ideal solution for inclusion in the
 	  <code xmlns="http://www.w3.org/1999/xhtml" class="literal">GENERIC</code> kernel configuration, as
 	  increasing <code xmlns="http://www.w3.org/1999/xhtml" class="literal">KSTACK_PAGES</code> implicitly
 	  decreases available usermode threads in an environment that
 	  is already resource-starved. </p><p xmlns="http://www.w3.org/TR/xhtml1/transitional">Taking into account the heavy resource requirements of
 	  ZFS, in addition to the i386-specific tuning
 	  requirements for general workloads, using ZFS with the
 	  FreeBSD/i386�<code xmlns="http://www.w3.org/1999/xhtml" class="literal">GENERIC</code> kernel
 	  is strongly discouraged. </p><p xmlns="http://www.w3.org/TR/xhtml1/transitional">If installing FreeBSD/i386 on ZFS, it is possible to
 	  configure the system after installation to increase the
 	  <code xmlns="http://www.w3.org/1999/xhtml" class="literal">KSTACK_PAGES</code>. </p><p xmlns="http://www.w3.org/TR/xhtml1/transitional">When prompted by <a xmlns="http://www.w3.org/1999/xhtml" class="citerefentry" href="http://www.FreeBSD.org/cgi/man.cgi?query=bsdinstall&amp;sektion=8&amp;manpath=freebsd-release-ports"><span class="citerefentry"><span class="refentrytitle">bsdinstall</span>(8)</span></a> to perform
 	  additional post-installation configuration to the system,
 	  select <span xmlns="http://www.w3.org/1999/xhtml" class="guibutton">[�YES�]</span>. </p><p xmlns="http://www.w3.org/TR/xhtml1/transitional">This procedure requires the system sources available
 	  locally.  If the <code xmlns="http://www.w3.org/1999/xhtml" class="literal">System source code</code>
 	  distribution was not selected during installation, it can
 	  be obtained using <span xmlns="http://www.w3.org/1999/xhtml" class="application">svnlite</span>: </p><pre class="screen"><code class="prompt">#</code> mkdir -p /usr/src
 <code class="prompt">#</code> svnlite co svn://svn.freebsd.org/base/releng/10.2 /usr/src</pre><p xmlns="http://www.w3.org/TR/xhtml1/transitional">Build the <code xmlns="http://www.w3.org/1999/xhtml" class="literal">kernel-toolchain</code> required
 	  to rebuild the kernel: </p><pre class="screen"><code class="prompt">#</code> make -C /usr/src kernel-toolchain</pre><p xmlns="http://www.w3.org/TR/xhtml1/transitional">Next, create a kernel configuration file to increase the
 	  <code xmlns="http://www.w3.org/1999/xhtml" class="literal">KSTACK_PAGES</code> option: </p><pre class="screen"><code class="prompt">#</code> printf "include GENERIC\noptions KSTACK_PAGES=4\n" &gt; <code class="filename">/usr/src/sys/i386/conf/<em class="replaceable"><code>ZFS</code></em></code></pre><p xmlns="http://www.w3.org/TR/xhtml1/transitional">Then build and install the
 	  <em xmlns="http://www.w3.org/1999/xhtml" class="replaceable"><code>ZFS</code></em> kernel: </p><pre class="screen"><code class="prompt">#</code> make -C /usr/src buildkernel KERNCONF=<em class="replaceable"><code>ZFS</code></em>
 <code class="prompt">#</code> make -C /usr/src installkernel KERNCONF=<em class="replaceable"><code>ZFS</code></em></pre><div xmlns="" class="warning"><h3 class="admontitle">Warning: </h3><p xmlns="http://www.w3.org/TR/xhtml1/transitional">It is extremely important to take note that, by
 	    default, <a xmlns="http://www.w3.org/1999/xhtml" class="citerefentry" href="http://www.FreeBSD.org/cgi/man.cgi?query=freebsd-update&amp;sektion=8&amp;manpath=freebsd-release-ports"><span class="citerefentry"><span class="refentrytitle">freebsd-update</span>(8)</span></a> will install the
 	    <code xmlns="http://www.w3.org/1999/xhtml" class="literal">GENERIC</code> kernel configuration, and
 	    as such, <a xmlns="http://www.w3.org/1999/xhtml" class="citerefentry" href="http://www.FreeBSD.org/cgi/man.cgi?query=freebsd-update&amp;sektion=8&amp;manpath=freebsd-release-ports"><span class="citerefentry"><span class="refentrytitle">freebsd-update</span>(8)</span></a> consumers are strongly
 	    encouraged to avoid FreeBSD-provided kernel binary upgrades
 	    with such configurations. </p></div></li><li class="listitem"><p xmlns="http://www.w3.org/TR/xhtml1/transitional">Due to an incompatibility between <a xmlns="http://www.w3.org/1999/xhtml" class="citerefentry" href="http://www.FreeBSD.org/cgi/man.cgi?query=bsdconfig&amp;sektion=8&amp;manpath=freebsd-release-ports"><span class="citerefentry"><span class="refentrytitle">bsdconfig</span>(8)</span></a>
 	  and <a xmlns="http://www.w3.org/1999/xhtml" class="citerefentry" href="http://www.FreeBSD.org/cgi/man.cgi?query=pkg&amp;sektion=8&amp;manpath=freebsd-release-ports"><span class="citerefentry"><span class="refentrytitle">pkg</span>(8)</span></a>, packages included on the FreeBSD�dvd
 	  installer will not be recognized by
 	  <a xmlns="http://www.w3.org/1999/xhtml" class="citerefentry" href="http://www.FreeBSD.org/cgi/man.cgi?query=bsdconfig&amp;sektion=8&amp;manpath=freebsd-release-ports"><span class="citerefentry"><span class="refentrytitle">bsdconfig</span>(8)</span></a>. </p><p xmlns="http://www.w3.org/TR/xhtml1/transitional">To install packages from the <code xmlns="http://www.w3.org/1999/xhtml" class="literal">dvd1.iso</code>
 	  installer, create the <code xmlns="http://www.w3.org/1999/xhtml" class="filename">/dist</code> target directory, and
 	  manually mount the <code xmlns="http://www.w3.org/1999/xhtml" class="literal">dvd1.iso</code>
 	  <acronym xmlns="http://www.w3.org/1999/xhtml" class="acronym">ISO</acronym>: </p><pre class="screen"><code class="prompt">#</code> mkdir -p /dist
 <code class="prompt">#</code> mount -t cd9660 /dev/<em class="replaceable"><code>cd0</code></em> /dist</pre><div xmlns="" class="note"><h3 class="admontitle">Note: </h3><p xmlns="http://www.w3.org/TR/xhtml1/transitional">Be sure to use the correct <code xmlns="http://www.w3.org/1999/xhtml" class="filename">/dev</code> device path for the
 	    <code xmlns="http://www.w3.org/1999/xhtml" class="literal">dvd1.iso</code> <acronym xmlns="http://www.w3.org/1999/xhtml" class="acronym">ISO</acronym>
 	    installer. </p></div><p xmlns="http://www.w3.org/TR/xhtml1/transitional">Next, set <code xmlns="http://www.w3.org/1999/xhtml" class="envar">REPOS_DIR</code> to the path of the
 	  <code xmlns="http://www.w3.org/1999/xhtml" class="filename">repos/</code> directory
 	  within the installer so <a xmlns="http://www.w3.org/1999/xhtml" class="citerefentry" href="http://www.FreeBSD.org/cgi/man.cgi?query=pkg&amp;sektion=8&amp;manpath=freebsd-release-ports"><span class="citerefentry"><span class="refentrytitle">pkg</span>(8)</span></a> will use the correct
 	  repository metadata. </p><p xmlns="http://www.w3.org/TR/xhtml1/transitional">If using <a xmlns="http://www.w3.org/1999/xhtml" class="citerefentry" href="http://www.FreeBSD.org/cgi/man.cgi?query=sh&amp;sektion=1&amp;manpath=freebsd-release-ports"><span class="citerefentry"><span class="refentrytitle">sh</span>(1)</span></a>: </p><pre class="screen"><code class="prompt">#</code> export REPOS_DIR=/dist/packages/repos</pre><p xmlns="http://www.w3.org/TR/xhtml1/transitional">If using <a xmlns="http://www.w3.org/1999/xhtml" class="citerefentry" href="http://www.FreeBSD.org/cgi/man.cgi?query=csh&amp;sektion=1&amp;manpath=freebsd-release-ports"><span class="citerefentry"><span class="refentrytitle">csh</span>(1)</span></a>: </p><pre class="screen"><code class="prompt">#</code> setenv REPOS_DIR /dist/packages/repos</pre><div xmlns="" class="note"><h3 class="admontitle">Note: </h3><p xmlns="http://www.w3.org/TR/xhtml1/transitional">Keep in mind that <code xmlns="http://www.w3.org/1999/xhtml" class="envar">REPOS_DIR</code> will need
 	    to be set again after the current shell session is
 	    terminated, if continuing to use the packages provided on
 	    the <code xmlns="http://www.w3.org/1999/xhtml" class="literal">dvd1.iso</code> installer. </p></div><p xmlns="http://www.w3.org/TR/xhtml1/transitional">Finally, bootstrap <a xmlns="http://www.w3.org/1999/xhtml" class="citerefentry" href="http://www.FreeBSD.org/cgi/man.cgi?query=pkg&amp;sektion=8&amp;manpath=freebsd-release-ports"><span class="citerefentry"><span class="refentrytitle">pkg</span>(8)</span></a> from the
 	  <acronym xmlns="http://www.w3.org/1999/xhtml" class="acronym">ISO</acronym>, and install required
 	  packages: </p><pre class="screen"><code class="prompt">#</code> pkg bootstrap
 <code class="prompt">#</code> pkg install <em class="replaceable"><code>xorg-server</code></em> <em class="replaceable"><code>xorg</code></em> <em class="replaceable"><code>gnome3</code></em> [...]</pre></li><li class="listitem"><p xmlns="http://www.w3.org/TR/xhtml1/transitional">An issue was discovered where the <a xmlns="http://www.w3.org/1999/xhtml" class="citerefentry" href="http://www.FreeBSD.org/cgi/man.cgi?query=netstat&amp;sektion=1&amp;manpath=freebsd-release-ports"><span class="citerefentry"><span class="refentrytitle">netstat</span>(1)</span></a>
 	  <code xmlns="http://www.w3.org/1999/xhtml" class="literal">-s</code> option will cause a segmentation fault
 	  on systems with <code xmlns="http://www.w3.org/1999/xhtml" class="literal">IPSEC</code> compiled into the
 	  kernel.  The issue was resolved in the
 	  <code xmlns="http://www.w3.org/1999/xhtml" class="literal">stable/10</code> branch, and an Errata Notice is
 	  planned after 10.3-RELEASE is released. </p><p xmlns="http://www.w3.org/TR/xhtml1/transitional">[2015-08-19] Resolved as FreeBSD-EN-15:12. </p></li><li class="listitem"><p xmlns="http://www.w3.org/TR/xhtml1/transitional">An issue was discovered that causes <a xmlns="http://www.w3.org/1999/xhtml" class="citerefentry" href="http://www.FreeBSD.org/cgi/man.cgi?query=make&amp;sektion=1&amp;manpath=freebsd-release-ports"><span class="citerefentry"><span class="refentrytitle">make</span>(1)</span></a> to
 	  generate noisy output when doing source-based upgrades from
 	  FreeBSD 9.3 and earlier.  The issue was reported in PR 202277,
 	  and after investigation and determining the issue does not
 	  cause source-based upgrades to fail, a post-release Errata
 	  Notice is planned. </p><p xmlns="http://www.w3.org/TR/xhtml1/transitional">[2015-08-19] Resolved as FreeBSD-EN-15:11. </p></li><li class="listitem"><p xmlns="http://www.w3.org/TR/xhtml1/transitional">An issue with FreeBSD virtual machines with
 	  <span xmlns="http://www.w3.org/1999/xhtml" class="application">vagrant</span> was discovered that
 	  affects the <span xmlns="http://www.w3.org/1999/xhtml" class="application">VirtualBox</span> where the
 	  virtual machine will not start on the initial boot invoked
 	  with <code xmlns="http://www.w3.org/1999/xhtml" class="literal">vagrant up</code>. </p><p xmlns="http://www.w3.org/TR/xhtml1/transitional">The issue is due to the virtual machine
 	  <acronym xmlns="http://www.w3.org/1999/xhtml" class="acronym">MAC</acronym> being unset, as FreeBSD does not provide
 	  a default <code xmlns="http://www.w3.org/1999/xhtml" class="filename">Vagrantfile</code>. </p><p xmlns="http://www.w3.org/TR/xhtml1/transitional">It has been observed, however, that a subsequent
 	  invocation of <code xmlns="http://www.w3.org/1999/xhtml" class="literal">vagrant up</code> will allow the
 	  virtual machine to successfully boot, allowing access via
 	  <code xmlns="http://www.w3.org/1999/xhtml" class="literal">vagrant ssh</code>. </p></li><li class="listitem"><p xmlns="http://www.w3.org/TR/xhtml1/transitional">[2015-08-16] An error was discovered in the release
 	  notes for FreeBSD 10.3-RELEASE regarding the
 	  <code xmlns="http://www.w3.org/1999/xhtml" class="literal">drm</code> device driver.  The entry for r282199
 	  states the driver was updated to match the version <span xmlns="http://www.w3.org/1999/xhtml" class="trademark">Linux</span>�
 	  3.8.13 version, however the entry should have noted the
 	  change affects device-independent code, and does not bring
 	  the <code xmlns="http://www.w3.org/1999/xhtml" class="literal">drm</code> driver fully in line with the
 	  stated <span xmlns="http://www.w3.org/1999/xhtml" class="trademark">Linux</span>� version. </p></li></ul></div></div><div class="sect1"><div xmlns="" class="titlepage"><div><div><h2 xmlns="http://www.w3.org/1999/xhtml" class="title" style="clear: both"><a id="late-news"></a>5.�Late-Breaking News</h2></div></div></div><p xmlns="http://www.w3.org/TR/xhtml1/transitional">No news. </p></div></div><p xmlns="http://www.w3.org/TR/xhtml1/transitional" align="center"><small>This file, and other release-related documents,
       can be downloaded from <a href="https://www.FreeBSD.org/snapshots/">https://www.FreeBSD.org/snapshots/</a>.</small></p><p xmlns="http://www.w3.org/TR/xhtml1/transitional" align="center"><small>For questions about FreeBSD, read the
       <a href="http://www.FreeBSD.org/docs.html">documentation</a> before
       contacting &lt;<a href="mailto:questions@FreeBSD.org">questions@FreeBSD.org</a>&gt;.</small></p><p xmlns="http://www.w3.org/TR/xhtml1/transitional" align="center"><small>All users of FreeBSD 10.3-STABLE should
       subscribe to the &lt;<a href="mailto:stable@FreeBSD.org">stable@FreeBSD.org</a>&gt;
       mailing list.</small></p><p xmlns="http://www.w3.org/TR/xhtml1/transitional" align="center"><small>For questions about this documentation,
       e-mail &lt;<a href="mailto:doc@FreeBSD.org">doc@FreeBSD.org</a>&gt;.</small></p></body></html>
\ No newline at end of file
Index: user/gjb/releng-rewrite/en_US.ISO8859-1/htdocs/releases/11.0R/errata.html
===================================================================
--- user/gjb/releng-rewrite/en_US.ISO8859-1/htdocs/releases/11.0R/errata.html	(revision 49724)
+++ user/gjb/releng-rewrite/en_US.ISO8859-1/htdocs/releases/11.0R/errata.html	(revision 49725)
@@ -1,138 +1,143 @@
 <?xml version="1.0" encoding="iso-8859-1"?>
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd"><html xmlns="http://www.w3.org/1999/xhtml"><head><meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1" /><title>FreeBSD 11.0-RELEASE Errata</title><link rel="stylesheet" type="text/css" href="docbook.css" /><link rev="made" href="mailto:doc@FreeBSD.org" /><meta name="generator" content="DocBook XSL Stylesheets V1.78.1" /><meta name="description" content="This document lists errata items for FreeBSD 11.0-RELEASE, containing significant information discovered after the release or too late in the release cycle to be otherwise included in the release documentation. This information includes security advisories, as well as news relating to the software or documentation that could affect its operation or usability. An up-to-date version of this document should always be consulted before installing this version of FreeBSD. This errata document for FreeBSD 11.0-RELEASE will be maintained until the release of FreeBSD 11.1-RELEASE." /><script xmlns="" type="text/javascript" src="/layout/js/google.js"></script></head><body><div class="article"><div xmlns="" class="titlepage"><div><div><h1 xmlns="http://www.w3.org/1999/xhtml" class="title"><a id="idp56961016"></a>FreeBSD 11.0-RELEASE Errata </h1></div><div><div xmlns="http://www.w3.org/1999/xhtml" class="author"><h3 class="author"><span class="orgname">The FreeBSD Project</span></h3></div></div><div><p xmlns="http://www.w3.org/1999/xhtml" class="copyright">Copyright � 2016 The FreeBSD Documentation Project</p></div><div><div xmlns="http://www.w3.org/1999/xhtml" class="legalnotice"><a id="trademarks"></a><p xmlns="http://www.w3.org/TR/xhtml1/transitional">FreeBSD is a registered trademark of
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd"><html xmlns="http://www.w3.org/1999/xhtml"><head><meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1" /><title>FreeBSD 11.0-RELEASE Errata</title><link rel="stylesheet" type="text/css" href="docbook.css" /><link rev="made" href="mailto:doc@FreeBSD.org" /><meta name="generator" content="DocBook XSL Stylesheets V1.78.1" /><meta name="description" content="This document lists errata items for FreeBSD 11.0-RELEASE, containing significant information discovered after the release or too late in the release cycle to be otherwise included in the release documentation. This information includes security advisories, as well as news relating to the software or documentation that could affect its operation or usability. An up-to-date version of this document should always be consulted before installing this version of FreeBSD. This errata document for FreeBSD 11.0-RELEASE will be maintained until the release of FreeBSD 11.1-RELEASE." /><script xmlns="" type="text/javascript" src="/layout/js/google.js"></script></head><body><div class="article"><div xmlns="" class="titlepage"><div><div><h1 xmlns="http://www.w3.org/1999/xhtml" class="title"><a id="idp32593640"></a>FreeBSD 11.0-RELEASE Errata </h1></div><div><div xmlns="http://www.w3.org/1999/xhtml" class="author"><h3 class="author"><span class="orgname">The FreeBSD Project</span></h3></div></div><div><p xmlns="http://www.w3.org/1999/xhtml" class="copyright">Copyright � 2016 The FreeBSD Documentation Project</p></div><div><div xmlns="http://www.w3.org/1999/xhtml" class="legalnotice"><a id="trademarks"></a><p xmlns="http://www.w3.org/TR/xhtml1/transitional">FreeBSD is a registered trademark of
   the FreeBSD Foundation. </p><p xmlns="http://www.w3.org/TR/xhtml1/transitional">Intel, Celeron, Centrino, Core, EtherExpress, i386,
   i486, Itanium, Pentium, and Xeon are trademarks or registered
   trademarks of Intel Corporation or its subsidiaries in the United
   States and other countries. </p><p xmlns="http://www.w3.org/TR/xhtml1/transitional">SPARC, SPARC64, and
   UltraSPARC are trademarks of SPARC International, Inc in the United
   States and other countries.  SPARC International, Inc owns all of the
   SPARC trademarks and under licensing agreements allows the proper use
   of these trademarks by its members. </p><p xmlns="http://www.w3.org/TR/xhtml1/transitional">Many of the designations used by
   manufacturers and sellers to distinguish their products are claimed
   as trademarks.  Where those designations appear in this document,
   and the FreeBSD Project was aware of the trademark claim, the
   designations have been followed by the <span xmlns="http://www.w3.org/1999/xhtml" class="quote">&#8220;<span class="quote">&#8482;</span>&#8221;</span> or the
   <span xmlns="http://www.w3.org/1999/xhtml" class="quote">&#8220;<span class="quote">�</span>&#8221;</span> symbol. </p></div></div><div>Last modified on 2016-10-21 19:23:51Z by gjb.</div><div><div xmlns="http://www.w3.org/1999/xhtml" class="abstract"><div class="abstract-title">Abstract</div><p xmlns="http://www.w3.org/TR/xhtml1/transitional">This document lists errata items for FreeBSD 11.0-RELEASE,
 	containing significant information discovered after the release
 	or too late in the release cycle to be otherwise included in the
 	release documentation.
 	This information includes security advisories, as well as news
 	relating to the software or documentation that could affect its
 	operation or usability.  An up-to-date version of this document
 	should always be consulted before installing this version of
 	FreeBSD. </p><p xmlns="http://www.w3.org/TR/xhtml1/transitional">This errata document for FreeBSD 11.0-RELEASE
 	will be maintained until the release of FreeBSD 11.1-RELEASE. </p></div></div></div><hr /></div><div class="toc"><div class="toc-title">Table of Contents</div><dl class="toc"><dt><span class="sect1"><a href="#intro">1. Introduction</a></span></dt><dt><span class="sect1"><a href="#security">2. Security Advisories</a></span></dt><dt><span class="sect1"><a href="#errata">3. Errata Notices</a></span></dt><dt><span class="sect1"><a href="#open-issues">4. Open Issues</a></span></dt><dt><span class="sect1"><a href="#late-news">5. Late-Breaking News</a></span></dt></dl></div><div class="sect1"><div xmlns="" class="titlepage"><div><div><h2 xmlns="http://www.w3.org/1999/xhtml" class="title" style="clear: both"><a id="intro"></a>1.�Introduction</h2></div></div></div><p xmlns="http://www.w3.org/TR/xhtml1/transitional">This errata document contains <span xmlns="http://www.w3.org/1999/xhtml" class="quote">&#8220;<span class="quote">late-breaking news</span>&#8221;</span>
       about FreeBSD 11.0-RELEASE
       Before installing this version, it is important to consult this
       document to learn about any post-release discoveries or problems
       that may already have been found and fixed. </p><p xmlns="http://www.w3.org/TR/xhtml1/transitional">Any version of this errata document actually distributed
       with the release (for example, on a CDROM distribution) will be
       out of date by definition, but other copies are kept updated on
       the Internet and should be consulted as the <span xmlns="http://www.w3.org/1999/xhtml" class="quote">&#8220;<span class="quote">current
       errata</span>&#8221;</span> for this release.  These other copies of the
       errata are located at
       <a xmlns="http://www.w3.org/1999/xhtml" class="link" href="https://www.FreeBSD.org/releases/" target="_top">https://www.FreeBSD.org/releases/</a>,
       plus any sites
       which keep up-to-date mirrors of this location. </p><p xmlns="http://www.w3.org/TR/xhtml1/transitional">Source and binary snapshots of FreeBSD 11.0-STABLE also
       contain up-to-date copies of this document (as of the time of
       the snapshot). </p><p xmlns="http://www.w3.org/TR/xhtml1/transitional">For a list of all FreeBSD CERT security advisories, see
       <a xmlns="http://www.w3.org/1999/xhtml" class="link" href="https://www.FreeBSD.org/security/" target="_top">https://www.FreeBSD.org/security/</a>. </p></div><div class="sect1"><div xmlns="" class="titlepage"><div><div><h2 xmlns="http://www.w3.org/1999/xhtml" class="title" style="clear: both"><a id="security"></a>2.�Security Advisories</h2></div></div></div><div class="informaltable"><table width="100%" border="0"><colgroup><col width="40%" /><col width="30%" /><col width="30%" /></colgroup><thead><tr><th>Advisory</th><th>Date</th><th>Topic</th></tr></thead><tbody><tr><td><a class="link" href="https://www.FreeBSD.org/security/advisories/FreeBSD-SA-16:32.bhyve.asc" target="_top">FreeBSD-SA-16:32.bhyve</a></td><td>25�October�2016</td><td><p xmlns="http://www.w3.org/TR/xhtml1/transitional">Privilege escalation vulnerability </p></td></tr><tr><td><a class="link" href="https://www.FreeBSD.org/security/advisories/FreeBSD-SA-16:33.openssh.asc" target="_top">FreeBSD-SA-16:33.openssh</a></td><td>2�November�2016</td><td><p xmlns="http://www.w3.org/TR/xhtml1/transitional">Remote Denial of Service
-	    vulnerability </p></td></tr></tbody></table></div></div><div class="sect1"><div xmlns="" class="titlepage"><div><div><h2 xmlns="http://www.w3.org/1999/xhtml" class="title" style="clear: both"><a id="errata"></a>3.�Errata Notices</h2></div></div></div><div class="informaltable"><table width="100%" border="0"><colgroup><col width="40%" /><col width="30%" /><col width="30%" /></colgroup><thead><tr><th>Errata</th><th>Date</th><th>Topic</th></tr></thead><tbody><tr><td><a class="link" href="https://www.FreeBSD.org/security/advisories/FreeBSD-EN-16:18.loader.asc" target="_top">FreeBSD-EN-16:18.loader</a></td><td>25�October�2016</td><td><p xmlns="http://www.w3.org/TR/xhtml1/transitional">Loader may hang during boot </p></td></tr></tbody></table></div></div><div class="sect1"><div xmlns="" class="titlepage"><div><div><h2 xmlns="http://www.w3.org/1999/xhtml" class="title" style="clear: both"><a id="open-issues"></a>4.�Open Issues</h2></div></div></div><div class="itemizedlist"><ul class="itemizedlist" style="list-style-type: disc; "><li class="listitem"><p xmlns="http://www.w3.org/TR/xhtml1/transitional">An issue was discovered with Amazon� EC2&#8482;
+	    vulnerability </p></td></tr><tr><td><a class="link" href="https://www.FreeBSD.org/security/advisories/FreeBSD-SA-16:36.telnetd.asc" target="_top">FreeBSD-SA-16:36.telnetd</a></td><td>6�December�2016</td><td><p xmlns="http://www.w3.org/TR/xhtml1/transitional">Possible <a xmlns="http://www.w3.org/1999/xhtml" class="citerefentry" href="http://www.FreeBSD.org/cgi/man.cgi?query=login&amp;sektion=1&amp;manpath=freebsd-release-ports"><span class="citerefentry"><span class="refentrytitle">login</span>(1)</span></a> argument
+	    injection </p></td></tr><tr><td><a class="link" href="https://www.FreeBSD.org/security/advisories/FreeBSD-SA-16:37.libc.asc" target="_top">FreeBSD-SA-16:37.libc</a></td><td>6�December�2016</td><td><p xmlns="http://www.w3.org/TR/xhtml1/transitional"><a xmlns="http://www.w3.org/1999/xhtml" class="citerefentry" href="http://www.FreeBSD.org/cgi/man.cgi?query=link_ntoa&amp;sektion=3&amp;manpath=freebsd-release-ports"><span class="citerefentry"><span class="refentrytitle">link_ntoa</span>(3)</span></a> buffer overflow </p></td></tr><tr><td><a class="link" href="https://www.FreeBSD.org/security/advisories/FreeBSD-SA-16:38.bhyve.asc" target="_top">FreeBSD-SA-16:38.bhyve</a></td><td>6�December�2016</td><td><p xmlns="http://www.w3.org/TR/xhtml1/transitional">Possible escape from <a xmlns="http://www.w3.org/1999/xhtml" class="citerefentry" href="http://www.FreeBSD.org/cgi/man.cgi?query=bhyve&amp;sektion=8&amp;manpath=freebsd-release-ports"><span class="citerefentry"><span class="refentrytitle">bhyve</span>(8)</span></a> virtual
+	  machine </p></td></tr></tbody></table></div></div><div class="sect1"><div xmlns="" class="titlepage"><div><div><h2 xmlns="http://www.w3.org/1999/xhtml" class="title" style="clear: both"><a id="errata"></a>3.�Errata Notices</h2></div></div></div><div class="informaltable"><table width="100%" border="0"><colgroup><col width="40%" /><col width="30%" /><col width="30%" /></colgroup><thead><tr><th>Errata</th><th>Date</th><th>Topic</th></tr></thead><tbody><tr><td><a class="link" href="https://www.FreeBSD.org/security/advisories/FreeBSD-EN-16:18.loader.asc" target="_top">FreeBSD-EN-16:18.loader</a></td><td>25�October�2016</td><td><p xmlns="http://www.w3.org/TR/xhtml1/transitional">Loader may hang during boot </p></td></tr><tr><td><a class="link" href="https://www.FreeBSD.org/security/advisories/FreeBSD-EN-16:19.tzcode.asc" target="_top">FreeBSD-EN-16:19.tzcode</a></td><td>6�December�2016</td><td><p xmlns="http://www.w3.org/TR/xhtml1/transitional">Fix warnings about invalid timezone
+	    abbreviations </p></td></tr><tr><td><a class="link" href="https://www.FreeBSD.org/security/advisories/FreeBSD-EN-16:20.tzdata.asc" target="_top">FreeBSD-EN-16:20.tzdata</a></td><td>6�December�2016</td><td><p xmlns="http://www.w3.org/TR/xhtml1/transitional">Update timezone database
+	    information </p></td></tr><tr><td><a class="link" href="https://www.FreeBSD.org/security/advisories/FreeBSD-EN-16:21.localedef.asc" target="_top">FreeBSD-EN-16:21.localedef</a></td><td>6�December�2016</td><td><p xmlns="http://www.w3.org/TR/xhtml1/transitional">Fix incorrectly defined unicode
+	    characters </p></td></tr></tbody></table></div></div><div class="sect1"><div xmlns="" class="titlepage"><div><div><h2 xmlns="http://www.w3.org/1999/xhtml" class="title" style="clear: both"><a id="open-issues"></a>4.�Open Issues</h2></div></div></div><div class="itemizedlist"><ul class="itemizedlist" style="list-style-type: disc; "><li class="listitem"><p xmlns="http://www.w3.org/TR/xhtml1/transitional">An issue was discovered with Amazon� EC2&#8482;
 	  images which would cause the virtual machine to hang during
 	  boot when upgrading from previous FreeBSD versions.  New
 	  EC2&#8482; installations are not affected, but existing
 	  installations running earlier releases are advised to wait
 	  until the issue is resolved in an Errata Notice before
 	  upgrading.  An Errata Notice to address this is planned
 	  following the release. </p></li><li class="listitem"><p xmlns="http://www.w3.org/TR/xhtml1/transitional">FreeBSD/i386 installed on ZFS may crash during boot
 	  when the ZFS pool mount is attempted while booting an
 	  unmodified <code xmlns="http://www.w3.org/1999/xhtml" class="literal">GENERIC</code> kernel. </p><p xmlns="http://www.w3.org/TR/xhtml1/transitional">A system tunable has been added as of revision
 	  <code xmlns="http://www.w3.org/1999/xhtml" class="literal">r286584</code> to make the
 	  <code xmlns="http://www.w3.org/1999/xhtml" class="literal">kern.kstack_pages</code> tunable configurable
 	  without recompiling the kernel. </p><p xmlns="http://www.w3.org/TR/xhtml1/transitional">To mitigate system crashes with such configurations,
 	  chose <code xmlns="http://www.w3.org/1999/xhtml" class="literal">Escape to loader prompt</code> in the boot
 	  menu and enter the following lines from <a xmlns="http://www.w3.org/1999/xhtml" class="citerefentry" href="http://www.FreeBSD.org/cgi/man.cgi?query=loader&amp;sektion=8&amp;manpath=freebsd-release-ports"><span class="citerefentry"><span class="refentrytitle">loader</span>(8)</span></a>
 	  prompt, after an <code xmlns="http://www.w3.org/1999/xhtml" class="literal">OK</code>: </p><pre class="screen">set kern.kstack_pages=4
 boot</pre><p xmlns="http://www.w3.org/TR/xhtml1/transitional">Add this line to
 	  <code xmlns="http://www.w3.org/1999/xhtml" class="filename">/boot/loader.conf</code> for the change to
 	  persist across reboots: </p><pre class="programlisting">kern.kstack_pages=4</pre></li><li class="listitem"><p xmlns="http://www.w3.org/TR/xhtml1/transitional">A bug was diagnosed in interaction of the
 	  <code xmlns="http://www.w3.org/1999/xhtml" class="literal">pmap_activate()</code> function and
 	  <acronym xmlns="http://www.w3.org/1999/xhtml" class="acronym">TLB</acronym> shootdown <acronym xmlns="http://www.w3.org/1999/xhtml" class="acronym">IPI</acronym>
 	  handler on amd64 systems which have <acronym xmlns="http://www.w3.org/1999/xhtml" class="acronym">PCID</acronym>
 	  features but do not implement the <acronym xmlns="http://www.w3.org/1999/xhtml" class="acronym">INVPCID</acronym>
 	  instruction.  On such machines, such as SandyBridge&#8482;
 	  and IvyBridge&#8482; microarchitectures, set the loader
 	  tunable <code xmlns="http://www.w3.org/1999/xhtml" class="literal">vm.pmap.pcid_enabled=0</code> during
 	  boot: </p><pre class="screen">set vm.pmap.pcid_enabled=0
 boot</pre><p xmlns="http://www.w3.org/TR/xhtml1/transitional">Add this line to
 	  <code xmlns="http://www.w3.org/1999/xhtml" class="filename">/boot/loader.conf</code> for the change to
 	  persist across reboots: </p><p xmlns="http://www.w3.org/TR/xhtml1/transitional">To check if the system is affected, check
 	  <a xmlns="http://www.w3.org/1999/xhtml" class="citerefentry" href="http://www.FreeBSD.org/cgi/man.cgi?query=dmesg&amp;sektion=8&amp;manpath=freebsd-release-ports"><span class="citerefentry"><span class="refentrytitle">dmesg</span>(8)</span></a> for <acronym xmlns="http://www.w3.org/1999/xhtml" class="acronym">PCID</acronym> listed in the
 	  "Features2", and absence of
 	  <acronym xmlns="http://www.w3.org/1999/xhtml" class="acronym">INVPCID</acronym> in the "Structured Extended
 	  Features".  If the <acronym xmlns="http://www.w3.org/1999/xhtml" class="acronym">PCID</acronym> feature is
 	  not present, or <acronym xmlns="http://www.w3.org/1999/xhtml" class="acronym">INVPCID</acronym> is present,
 	  system is not affected. </p><pre class="programlisting">vm.pmap.pcid_enabled=0</pre></li><li class="listitem"><p xmlns="http://www.w3.org/TR/xhtml1/transitional">The Release Notes erroneously states the
 	  <code xmlns="http://www.w3.org/1999/xhtml" class="literal">WITH_SYSTEM_COMPILER</code> <a xmlns="http://www.w3.org/1999/xhtml" class="citerefentry" href="http://www.FreeBSD.org/cgi/man.cgi?query=src.conf&amp;sektion=5&amp;manpath=freebsd-release-ports"><span class="citerefentry"><span class="refentrytitle">src.conf</span>(5)</span></a>
 	  option is enabled by default, however this was disabled
 	  prior to the final release build. </p></li><li class="listitem"><p xmlns="http://www.w3.org/TR/xhtml1/transitional">The release announcement stated "Wireless support
 	  for 802.11n has been added."  This was intended to
 	  state "Wireless support for 802.11n has been added for
 	  additional wireless network drivers." </p></li><li class="listitem"><p xmlns="http://www.w3.org/TR/xhtml1/transitional">Some release notes pertaining to the Cavium ThunderX
 	  platform (the FreeBSD/arm64 reference platform) were
 	  omitted: </p><div class="itemizedlist"><ul class="itemizedlist" style="list-style-type: circle; "><li class="listitem"><p xmlns="http://www.w3.org/TR/xhtml1/transitional">Support for the Cavium Virtualized
 	      NIC ethernet driver has been added. <a href="http://svn.freebsd.org/viewvc/base?view=revision&amp;revision=289550">[r289550]</a><span class="contrib">
 		  (Sponsored by
 		  Cavium)</span></p></li><li class="listitem"><p xmlns="http://www.w3.org/TR/xhtml1/transitional">Support for the GICv3 and ITS device
 	      drivers has been added. <a href="http://svn.freebsd.org/viewvc/base?view=revision&amp;revision=286919">[r286919]</a><span class="contrib">
 		  (Sponsored by
 		  Cavium)</span></p></li><li class="listitem"><p xmlns="http://www.w3.org/TR/xhtml1/transitional">Support for PCI Enhanced Allocation
 	      support has been added. <a href="http://svn.freebsd.org/viewvc/base?view=revision&amp;revision=296308">[r296308]</a><span class="contrib">
 		  (Sponsored by
 		  Cavium)</span></p></li></ul></div></li><li class="listitem"><p xmlns="http://www.w3.org/TR/xhtml1/transitional">[2016-10-20] Several recent Dell
 	  systems fail to find a bootable disk when the system boots
 	  in Legacy/BIOS/CSM mode, the boot disk is partitioned with
 	  <acronym xmlns="http://www.w3.org/1999/xhtml" class="acronym">GPT</acronym>, and the Active flag in the
 	  Protective <acronym xmlns="http://www.w3.org/1999/xhtml" class="acronym">MBR</acronym> is not set.  To work
 	  around this issue, either configure the system to boot in
 	  <acronym xmlns="http://www.w3.org/1999/xhtml" class="acronym">UEFI</acronym> mode, or choose the "GPT
 	  + Active" scheme. <a href="http://svn.freebsd.org/viewvc/base?view=revision&amp;revision=293860">[r293860]</a></p></li><li class="listitem"><p xmlns="http://www.w3.org/TR/xhtml1/transitional">[2016-10-21] Support for <code xmlns="http://www.w3.org/1999/xhtml" class="literal">sha512</code> and
 	  <code xmlns="http://www.w3.org/1999/xhtml" class="literal">skein</code> checksumming has been added to the
 	  <acronym xmlns="http://www.w3.org/1999/xhtml" class="acronym">ZFS</acronym> filesystem.  This was not mentioned
 	  in the release notes. </p><p xmlns="http://www.w3.org/TR/xhtml1/transitional">Systems being upgraded from earlier FreeBSD releases with
 	  <acronym xmlns="http://www.w3.org/1999/xhtml" class="acronym">ZFS</acronym> will see a message in <code xmlns="http://www.w3.org/1999/xhtml" class="literal">zpool
 	    status</code> output noting the pool is not at the
 	  latest version, and some features may not be enabled.
 	  Additional instructions on how to update
 	  <acronym xmlns="http://www.w3.org/1999/xhtml" class="acronym">ZFS</acronym> pools to the latest version and
 	  update the boot blocks for all boot drives in the pool will
 	  also be provided in the output. </p><p xmlns="http://www.w3.org/TR/xhtml1/transitional">This information is also documented in
 	  <code xmlns="http://www.w3.org/1999/xhtml" class="filename">/usr/src/UPDATING</code>, which is included if
 	  the <code xmlns="http://www.w3.org/1999/xhtml" class="literal">src</code> component is selected during
 	  installation. </p></li><li class="listitem"><p xmlns="http://www.w3.org/TR/xhtml1/transitional">[2016-10-21] The size of the <acronym xmlns="http://www.w3.org/1999/xhtml" class="acronym">GPT</acronym>
 	  enabled <acronym xmlns="http://www.w3.org/1999/xhtml" class="acronym">ZFS</acronym> boot blocks
 	  (<code xmlns="http://www.w3.org/1999/xhtml" class="filename">/boot/gptzfsboot</code>) has increased past
 	  64K.  Systems upgraded from older releases may experience
 	  a problem where the size of the existing
 	  "freebsd-boot" partition is too small to hold the
 	  new <code xmlns="http://www.w3.org/1999/xhtml" class="filename">gptzfsboot</code>. </p><p xmlns="http://www.w3.org/TR/xhtml1/transitional">Systems where the boot partition is immediately followed
 	  by the swap partition, such as those installed via
 	  <a xmlns="http://www.w3.org/1999/xhtml" class="citerefentry" href="http://www.FreeBSD.org/cgi/man.cgi?query=bsdinstall&amp;sektion=8&amp;manpath=freebsd-release-ports"><span class="citerefentry"><span class="refentrytitle">bsdinstall</span>(8)</span></a>, can resize the swap partition slightly
 	  using the <a xmlns="http://www.w3.org/1999/xhtml" class="citerefentry" href="http://www.FreeBSD.org/cgi/man.cgi?query=gpart&amp;sektion=8&amp;manpath=freebsd-release-ports"><span class="citerefentry"><span class="refentrytitle">gpart</span>(8)</span></a> <code xmlns="http://www.w3.org/1999/xhtml" class="literal">resize</code> command,
 	  so space can be reclaimed to increase the size of the
 	  freebsd-boot partition. </p></li><li class="listitem"><p xmlns="http://www.w3.org/TR/xhtml1/transitional">[2016-10-21] Due to a bug in earlier versions of
 	  <a xmlns="http://www.w3.org/1999/xhtml" class="citerefentry" href="http://www.FreeBSD.org/cgi/man.cgi?query=clang&amp;sektion=1&amp;manpath=freebsd-release-ports"><span class="citerefentry"><span class="refentrytitle">clang</span>(1)</span></a> that is difficult to work around in the
 	  upgrade process, to upgrade the system from sources via
 	  buildworld to -CURRENT or 11.0-RELEASE, it is necessary to
 	  upgrade machines running 9.x to at least revision r286035,
 	  or machines running 10.x to revision r286033.  Source-based
 	  upgrades from 10.3-RELEASE are not affected.  This differs
 	  from the historical situation where one could generally
 	  upgrade from anywhere on earlier stable branches, so caution
 	  should be exercised. </p></li></ul></div></div><div class="sect1"><div xmlns="" class="titlepage"><div><div><h2 xmlns="http://www.w3.org/1999/xhtml" class="title" style="clear: both"><a id="late-news"></a>5.�Late-Breaking News</h2></div></div></div><p xmlns="http://www.w3.org/TR/xhtml1/transitional">No news. </p></div></div><p xmlns="http://www.w3.org/TR/xhtml1/transitional" align="center"><small>This file, and other release-related documents,
       can be downloaded from <a href="https://www.FreeBSD.org/snapshots/">https://www.FreeBSD.org/snapshots/</a>.</small></p><p xmlns="http://www.w3.org/TR/xhtml1/transitional" align="center"><small>For questions about FreeBSD, read the
       <a href="http://www.FreeBSD.org/docs.html">documentation</a> before
       contacting &lt;<a href="mailto:questions@FreeBSD.org">questions@FreeBSD.org</a>&gt;.</small></p><p xmlns="http://www.w3.org/TR/xhtml1/transitional" align="center"><small>All users of FreeBSD 11.0-STABLE should
       subscribe to the &lt;<a href="mailto:stable@FreeBSD.org">stable@FreeBSD.org</a>&gt;
       mailing list.</small></p><p xmlns="http://www.w3.org/TR/xhtml1/transitional" align="center"><small>For questions about this documentation,
       e-mail &lt;<a href="mailto:doc@FreeBSD.org">doc@FreeBSD.org</a>&gt;.</small></p></body></html>
\ No newline at end of file
Index: user/gjb/releng-rewrite/en_US.ISO8859-1/htdocs/releases/9.3R/errata.html
===================================================================
--- user/gjb/releng-rewrite/en_US.ISO8859-1/htdocs/releases/9.3R/errata.html	(revision 49724)
+++ user/gjb/releng-rewrite/en_US.ISO8859-1/htdocs/releases/9.3R/errata.html	(revision 49725)
@@ -1,98 +1,101 @@
 <?xml version="1.0" encoding="iso-8859-1"?>
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd"><html xmlns="http://www.w3.org/1999/xhtml"><head><meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1" /><title>FreeBSD 9.3-RELEASE Errata</title><link rel="stylesheet" type="text/css" href="docbook.css" /><link rev="made" href="mailto:doc@FreeBSD.org" /><meta name="generator" content="DocBook XSL Stylesheets V1.78.1" /><meta name="description" content="This document lists errata items for FreeBSD 9.3-RELEASE, containing significant information discovered after the release or too late in the release cycle to be otherwise included in the release documentation. This information includes security advisories, as well as news relating to the software or documentation that could affect its operation or usability. An up-to-date version of this document should always be consulted before installing this version of FreeBSD. This errata document for FreeBSD 9.3-RELEASE will be maintained until the EoL of FreeBSD 9.3-STABLE." /><script xmlns="" type="text/javascript" src="/layout/js/google.js"></script></head><body><div class="article"><div xmlns="" class="titlepage"><div><div><h1 xmlns="http://www.w3.org/1999/xhtml" class="title"><a id="idp57587064"></a>FreeBSD 9.3-RELEASE Errata</h1></div><div><div xmlns="http://www.w3.org/1999/xhtml" class="author"><h3 class="author"><span class="orgname">
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd"><html xmlns="http://www.w3.org/1999/xhtml"><head><meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1" /><title>FreeBSD 9.3-RELEASE Errata</title><link rel="stylesheet" type="text/css" href="docbook.css" /><link rev="made" href="mailto:doc@FreeBSD.org" /><meta name="generator" content="DocBook XSL Stylesheets V1.78.1" /><meta name="description" content="This document lists errata items for FreeBSD 9.3-RELEASE, containing significant information discovered after the release or too late in the release cycle to be otherwise included in the release documentation. This information includes security advisories, as well as news relating to the software or documentation that could affect its operation or usability. An up-to-date version of this document should always be consulted before installing this version of FreeBSD. This errata document for FreeBSD 9.3-RELEASE will be maintained until the EoL of FreeBSD 9.3-STABLE." /><script xmlns="" type="text/javascript" src="/layout/js/google.js"></script></head><body><div class="article"><div xmlns="" class="titlepage"><div><div><h1 xmlns="http://www.w3.org/1999/xhtml" class="title"><a id="idp61013096"></a>FreeBSD 9.3-RELEASE Errata</h1></div><div><div xmlns="http://www.w3.org/1999/xhtml" class="author"><h3 class="author"><span class="orgname">
     The FreeBSD Project
     </span></h3></div></div><div><p xmlns="http://www.w3.org/1999/xhtml" class="copyright">Copyright � 2016 The FreeBSD Documentation Project</p></div><div><div xmlns="http://www.w3.org/1999/xhtml" class="legalnotice"><a id="trademarks"></a><p xmlns="http://www.w3.org/TR/xhtml1/transitional">FreeBSD is a registered trademark of
   the FreeBSD Foundation. </p><p xmlns="http://www.w3.org/TR/xhtml1/transitional">Intel, Celeron, Centrino, Core, EtherExpress, i386,
   i486, Itanium, Pentium, and Xeon are trademarks or registered
   trademarks of Intel Corporation or its subsidiaries in the United
   States and other countries. </p><p xmlns="http://www.w3.org/TR/xhtml1/transitional">SPARC, SPARC64, and
   UltraSPARC are trademarks of SPARC International, Inc in the United
   States and other countries.  SPARC International, Inc owns all of the
   SPARC trademarks and under licensing agreements allows the proper use
   of these trademarks by its members. </p><p xmlns="http://www.w3.org/TR/xhtml1/transitional">Many of the designations used by
   manufacturers and sellers to distinguish their products are claimed
   as trademarks.  Where those designations appear in this document,
   and the FreeBSD Project was aware of the trademark claim, the
   designations have been followed by the <span xmlns="http://www.w3.org/1999/xhtml" class="quote">&#8220;<span class="quote">&#8482;</span>&#8221;</span> or the
   <span xmlns="http://www.w3.org/1999/xhtml" class="quote">&#8220;<span class="quote">�</span>&#8221;</span> symbol. </p></div></div><div>Last modified on 2016-01-14 11:11:46Z by gjb.</div><div><div xmlns="http://www.w3.org/1999/xhtml" class="abstract"><div class="abstract-title">Abstract</div><p xmlns="http://www.w3.org/TR/xhtml1/transitional">This document lists errata items for FreeBSD 9.3-RELEASE,
         containing significant information discovered after the release
         or too late in the release cycle to be otherwise included in the
         release documentation.
         This information includes security advisories, as well as news
         relating to the software or documentation that could affect its
         operation or usability.  An up-to-date version of this document
         should always be consulted before installing this version of
         FreeBSD. </p><p xmlns="http://www.w3.org/TR/xhtml1/transitional">This errata document for FreeBSD 9.3-RELEASE
         will be maintained until the EoL of FreeBSD 9.3-STABLE. </p></div></div></div><hr /></div><div class="toc"><div class="toc-title">Table of Contents</div><dl class="toc"><dt><span class="sect1"><a href="#intro">1. Introduction</a></span></dt><dt><span class="sect1"><a href="#security">2. Security Advisories</a></span></dt><dt><span class="sect1"><a href="#errata">3. Errata Notices</a></span></dt><dt><span class="sect1"><a href="#late-news">4. Late-Breaking News</a></span></dt></dl></div><div class="sect1"><div xmlns="" class="titlepage"><div><div><h2 xmlns="http://www.w3.org/1999/xhtml" class="title" style="clear: both"><a id="intro"></a>1.�Introduction</h2></div></div></div><p xmlns="http://www.w3.org/TR/xhtml1/transitional">This errata document contains <span xmlns="http://www.w3.org/1999/xhtml" class="quote">&#8220;<span class="quote">late-breaking news</span>&#8221;</span>
       about FreeBSD 9.3-RELEASE
       Before installing this version, it is important to consult this
       document to learn about any post-release discoveries or problems
       that may already have been found and fixed. </p><p xmlns="http://www.w3.org/TR/xhtml1/transitional">Any version of this errata document actually distributed
       with the release (for example, on a CDROM distribution) will be
       out of date by definition, but other copies are kept updated on
       the Internet and should be consulted as the <span xmlns="http://www.w3.org/1999/xhtml" class="quote">&#8220;<span class="quote">current
       errata</span>&#8221;</span> for this release.  These other copies of the
       errata are located at <code xmlns="http://www.w3.org/1999/xhtml" class="uri"><a class="uri" href="https://www.FreeBSD.org/releases/" target="_top">https://www.FreeBSD.org/releases/</a></code>, plus any sites
       which keep up-to-date mirrors of this location. </p><p xmlns="http://www.w3.org/TR/xhtml1/transitional">Source and binary snapshots of FreeBSD 9.3-STABLE also
       contain up-to-date copies of this document (as of the time of
       the snapshot). </p><p xmlns="http://www.w3.org/TR/xhtml1/transitional">For a list of all FreeBSD CERT security advisories, see <code xmlns="http://www.w3.org/1999/xhtml" class="uri"><a class="uri" href="https://www.FreeBSD.org/security/" target="_top">https://www.FreeBSD.org/security/</a></code>. </p></div><div class="sect1"><div xmlns="" class="titlepage"><div><div><h2 xmlns="http://www.w3.org/1999/xhtml" class="title" style="clear: both"><a id="security"></a>2.�Security Advisories</h2></div></div></div><p xmlns="http://www.w3.org/TR/xhtml1/transitional">Problems described in the following security advisories have
       been fixed in 9.3-RELEASE. For more information, consult
       the individual advisories available from
       <code xmlns="http://www.w3.org/1999/xhtml" class="uri"><a class="uri" href="http://security.FreeBSD.org/" target="_top">http://security.FreeBSD.org/</a></code>. </p><div class="informaltable"><table width="100%" border="0"><colgroup><col width="40%" /><col width="30%" /><col width="30%" /></colgroup><thead><tr><th>Advisory</th><th>Date</th><th>Topic</th></tr></thead><tbody><tr><td><a class="link" href="https://www.FreeBSD.org/security/advisories/FreeBSD-SA-14:18.openssl.asc" target="_top">FreeBSD-SA-14:18.openssl</a></td><td>9�September�2014</td><td><p xmlns="http://www.w3.org/TR/xhtml1/transitional">Multiple vulnerabilities </p></td></tr><tr><td><a class="link" href="https://www.FreeBSD.org/security/advisories/FreeBSD-SA-14:19.tcp.asc" target="_top">FreeBSD-SA-14:19.tcp</a></td><td>16�September�2014</td><td><p xmlns="http://www.w3.org/TR/xhtml1/transitional">Denial of Service in TCP packet
 	    processing. </p></td></tr><tr><td><a class="link" href="https://www.FreeBSD.org/security/advisories/FreeBSD-SA-14:20.rtsold.asc" target="_top">FreeBSD-SA-14:20.rtsold</a></td><td>21�October�2014</td><td><p xmlns="http://www.w3.org/TR/xhtml1/transitional">Remote buffer overflow
 	    vulnerability. </p></td></tr><tr><td><a class="link" href="https://www.FreeBSD.org/security/advisories/FreeBSD-SA-14:21.routed.asc" target="_top">FreeBSD-SA-14:21.routed</a></td><td>21�October�2014</td><td><p xmlns="http://www.w3.org/TR/xhtml1/transitional">Remote denial of service
 	    vulnerability. </p></td></tr><tr><td><a class="link" href="https://www.FreeBSD.org/security/advisories/FreeBSD-SA-14:22.namei.asc" target="_top">FreeBSD-SA-14:22.namei</a></td><td>21�October�2014</td><td><p xmlns="http://www.w3.org/TR/xhtml1/transitional">Memory leak in sandboxed namei
 	    lookup. </p></td></tr><tr><td><a class="link" href="https://www.FreeBSD.org/security/advisories/FreeBSD-SA-14:23.openssl.asc" target="_top">FreeBSD-SA-14:23.openssl</a></td><td>21�October�2014</td><td><p xmlns="http://www.w3.org/TR/xhtml1/transitional">Multiple vulerabilities. </p></td></tr><tr><td><a class="link" href="https://www.FreeBSD.org/security/advisories/FreeBSD-SA-14:25.setlogin.asc" target="_top">FreeBSD-SA-14:25.setlogin</a></td><td>04�November�2014</td><td><p xmlns="http://www.w3.org/TR/xhtml1/transitional">Kernel stack disclosure. </p></td></tr><tr><td><a class="link" href="https://www.FreeBSD.org/security/advisories/FreeBSD-SA-14:26.ftp.asc" target="_top">FreeBSD-SA-14:26.ftp</a></td><td>04�November�2014</td><td><p xmlns="http://www.w3.org/TR/xhtml1/transitional">Remote code execution. </p></td></tr><tr><td><a class="link" href="https://www.FreeBSD.org/security/advisories/FreeBSD-SA-14:28.file.asc" target="_top">FreeBSD-SA-14:28.file</a></td><td>10�December�2014</td><td><p xmlns="http://www.w3.org/TR/xhtml1/transitional">Multiple vulnerabilities in <a xmlns="http://www.w3.org/1999/xhtml" class="citerefentry" href="http://www.FreeBSD.org/cgi/man.cgi?query=file&amp;sektion=1&amp;manpath=freebsd-release-ports"><span class="citerefentry"><span class="refentrytitle">file</span>(1)</span></a> and
 	    <a xmlns="http://www.w3.org/1999/xhtml" class="citerefentry" href="http://www.FreeBSD.org/cgi/man.cgi?query=libmagic&amp;sektion=3&amp;manpath=freebsd-release-ports"><span class="citerefentry"><span class="refentrytitle">libmagic</span>(3)</span></a> </p></td></tr><tr><td><a class="link" href="https://www.FreeBSD.org/security/advisories/FreeBSD-SA-14:29.bind.asc" target="_top">FreeBSD-SA-14:29.bind</a></td><td>10�December�2014</td><td><p xmlns="http://www.w3.org/TR/xhtml1/transitional">Remote denial of service
 	    vulnerability </p></td></tr><tr><td><a class="link" href="https://www.FreeBSD.org/security/advisories/FreeBSD-SA-14:31.ntp.asc" target="_top">FreeBSD-SA-14:31.ntp</a></td><td>23�December�2014</td><td><p xmlns="http://www.w3.org/TR/xhtml1/transitional">Multiple vulnerabilities </p></td></tr><tr><td><a class="link" href="https://www.FreeBSD.org/security/advisories/FreeBSD-SA-15:01.openssl.asc" target="_top">FreeBSD-SA-15:01.openssl</a></td><td>14�January�2015</td><td><p xmlns="http://www.w3.org/TR/xhtml1/transitional">Multiple vulnerabilities </p></td></tr><tr><td><a class="link" href="https://www.FreeBSD.org/security/advisories/FreeBSD-SA-15:02.kmem.asc" target="_top">FreeBSD-SA-15:02.kmem</a></td><td>27�January�2015</td><td><p xmlns="http://www.w3.org/TR/xhtml1/transitional">SCTP kernel memory corruption and
 	    disclosure vulnerability </p></td></tr><tr><td><a class="link" href="https://www.FreeBSD.org/security/advisories/FreeBSD-SA-15:03.sctp.asc" target="_top">FreeBSD-SA-15:03.sctp</a></td><td>27�January�2015</td><td><p xmlns="http://www.w3.org/TR/xhtml1/transitional">SCTP stream reset
 	    vulnerability </p></td></tr><tr><td><a class="link" href="https://www.FreeBSD.org/security/advisories/FreeBSD-SA-15:04.igmp.asc" target="_top">FreeBSD-SA-15:04.igmp</a></td><td>25�February�2015</td><td><p xmlns="http://www.w3.org/TR/xhtml1/transitional">Integer overflow in IGMP protocol </p></td></tr><tr><td><a class="link" href="https://www.FreeBSD.org/security/advisories/FreeBSD-SA-15:05.bind.asc" target="_top">FreeBSD-SA-15:05.igmp</a></td><td>25�February�2015</td><td><p xmlns="http://www.w3.org/TR/xhtml1/transitional">Remote denial of service
 	    vulnerability </p></td></tr><tr><td><a class="link" href="https://www.FreeBSD.org/security/advisories/FreeBSD-SA-15:06.openssl.asc" target="_top">FreeBSD-SA-15:06.openssl</a></td><td>19�March�2015</td><td><p xmlns="http://www.w3.org/TR/xhtml1/transitional">Multiple vulnerabilities </p></td></tr><tr><td><a class="link" href="https://www.FreeBSD.org/security/advisories/FreeBSD-SA-15:07.ntp.asc" target="_top">FreeBSD-SA-15:07.ntp</a></td><td>7�April�2015</td><td><p xmlns="http://www.w3.org/TR/xhtml1/transitional">Multiple vulnerabilities </p></td></tr><tr><td><a class="link" href="https://www.FreeBSD.org/security/advisories/FreeBSD-SA-15:09.ipv6.asc" target="_top">FreeBSD-SA-15:09.ipv6</a></td><td>7�April�2015</td><td><p xmlns="http://www.w3.org/TR/xhtml1/transitional">Router advertisement Denial of
 	    Service </p></td></tr><tr><td><a class="link" href="https://www.FreeBSD.org/security/advisories/FreeBSD-SA-15:10.openssl.asc" target="_top">FreeBSD-SA-15:10.openssl</a></td><td>16�June�2015</td><td><p xmlns="http://www.w3.org/TR/xhtml1/transitional">Multiple vulnerabilities </p></td></tr><tr><td><a class="link" href="https://www.FreeBSD.org/security/advisories/FreeBSD-SA-15:11.bind.asc" target="_top">FreeBSD-SA-15:11.bind</a></td><td>7�July�2015</td><td><p xmlns="http://www.w3.org/TR/xhtml1/transitional">Resolver remote denial of service </p></td></tr><tr><td><a class="link" href="https://www.FreeBSD.org/security/advisories/FreeBSD-SA-15:13.tcp.asc" target="_top">FreeBSD-SA-15:13.tcp</a></td><td>21�July�2015</td><td><p xmlns="http://www.w3.org/TR/xhtml1/transitional">resource exhaustion due to sessions stuck in
 	    <code xmlns="http://www.w3.org/1999/xhtml" class="literal">LAST_ACK</code> state. </p></td></tr><tr><td><a class="link" href="https://www.FreeBSD.org/security/advisories/FreeBSD-SA-15:15.tcp.asc" target="_top">FreeBSD-SA-15:15.tcp</a></td><td>28�July�2015</td><td><p xmlns="http://www.w3.org/TR/xhtml1/transitional">resource exhaustion in <acronym xmlns="http://www.w3.org/1999/xhtml" class="acronym">TCP</acronym>
 	    reassembly </p></td></tr><tr><td><a class="link" href="https://www.FreeBSD.org/security/advisories/FreeBSD-SA-15:16.openssh.asc" target="_top">FreeBSD-SA-15:16.openssh</a></td><td>28�July�2015</td><td><p xmlns="http://www.w3.org/TR/xhtml1/transitional">Multiple vulnerabilities </p></td></tr><tr><td><a class="link" href="https://www.FreeBSD.org/security/advisories/FreeBSD-SA-15:17.bind.asc" target="_top">FreeBSD-SA-15:17.bind</a></td><td>28�July�2015</td><td><p xmlns="http://www.w3.org/TR/xhtml1/transitional">Remote denial of service
 	    vulnerability </p></td></tr><tr><td><a class="link" href="https://www.FreeBSD.org/security/advisories/FreeBSD-SA-15:19.routed.asc" target="_top">FreeBSD-SA-15:19.routed</a></td><td>5�August�2015</td><td><p xmlns="http://www.w3.org/TR/xhtml1/transitional">Remote denial of service
 	    vulnerability </p></td></tr><tr><td><a class="link" href="https://www.FreeBSD.org/security/advisories/FreeBSD-SA-15:20.expat.asc" target="_top">FreeBSD-SA-15:20.expat</a></td><td>18�August�2015</td><td><p xmlns="http://www.w3.org/TR/xhtml1/transitional">Fix multiple integer overflows in
 	    <a xmlns="http://www.w3.org/1999/xhtml" class="citerefentry" href="http://www.FreeBSD.org/cgi/man.cgi?query=libbsdxml&amp;sektion=3&amp;manpath=freebsd-release-ports"><span class="citerefentry"><span class="refentrytitle">libbsdxml</span>(3)</span></a>. </p></td></tr><tr><td><a class="link" href="https://www.FreeBSD.org/security/advisories/FreeBSD-SA-15:21.amd64.asc" target="_top">FreeBSD-SA-15:21.amd64</a></td><td>25�August�2015</td><td><p xmlns="http://www.w3.org/TR/xhtml1/transitional">Fix local privilege escalation in IRET
 	    handler. </p></td></tr><tr><td><a class="link" href="https://www.FreeBSD.org/security/advisories/FreeBSD-SA-15:22.openssh.asc" target="_top">FreeBSD-SA-15:22.openssh</a></td><td>25�August�2015</td><td><p xmlns="http://www.w3.org/TR/xhtml1/transitional">Multiple vulnerabilities </p></td></tr><tr><td><a class="link" href="https://www.FreeBSD.org/security/advisories/FreeBSD-SA-15:23.bind.asc" target="_top">FreeBSD-SA-15:23.bind</a></td><td>2�September�2015</td><td><p xmlns="http://www.w3.org/TR/xhtml1/transitional">Remote denial of service
 	    vulnerability </p></td></tr><tr><td><a class="link" href="https://www.FreeBSD.org/security/advisories/FreeBSD-SA-15:24.rpcbind.asc" target="_top">FreeBSD-SA-15:24.rpcbind</a></td><td>29�September�2015</td><td><p xmlns="http://www.w3.org/TR/xhtml1/transitional">Remote denial of service </p></td></tr><tr><td><a class="link" href="https://www.FreeBSD.org/security/advisories/FreeBSD-SA-15:25.ntp.asc" target="_top">FreeBSD-SA-15:25.ntp</a></td><td>26�October�2015</td><td><p xmlns="http://www.w3.org/TR/xhtml1/transitional">Multiple vulnerabilities </p></td></tr><tr><td><a class="link" href="https://www.FreeBSD.org/security/advisories/FreeBSD-SA-15:26.openssl.asc" target="_top">FreeBSD-SA-15:26.openssl</a></td><td>5�December�2015</td><td><p xmlns="http://www.w3.org/TR/xhtml1/transitional">Multiple vulnerabilities </p></td></tr><tr><td><a class="link" href="https://www.FreeBSD.org/security/advisories/FreeBSD-SA-15:27.bind.asc" target="_top">FreeBSD-SA-15:27.bind</a></td><td>16�December�2015</td><td><p xmlns="http://www.w3.org/TR/xhtml1/transitional">Remote denial of service </p></td></tr><tr><td><a class="link" href="https://www.FreeBSD.org/security/advisories/FreeBSD-SA-16:01.sctp.asc" target="_top">FreeBSD-SA-16:01.sctp</a></td><td>14�January�2016</td><td><p xmlns="http://www.w3.org/TR/xhtml1/transitional">ICMPv6 error message vulnerability </p></td></tr><tr><td><a class="link" href="https://www.FreeBSD.org/security/advisories/FreeBSD-SA-16:02.ntp.asc" target="_top">FreeBSD-SA-16:02.ntp</a></td><td>14�January�2016</td><td><p xmlns="http://www.w3.org/TR/xhtml1/transitional">Panic threshold bypass
 	    vulnerability </p></td></tr><tr><td><a class="link" href="https://www.FreeBSD.org/security/advisories/FreeBSD-SA-16:03.linux.asc" target="_top">FreeBSD-SA-16:03.linux</a></td><td>14�January�2016</td><td><p xmlns="http://www.w3.org/TR/xhtml1/transitional">Incorrect <code xmlns="http://www.w3.org/1999/xhtml" class="literal">futex</code>
 	    handling </p></td></tr><tr><td><a class="link" href="https://www.FreeBSD.org/security/advisories/FreeBSD-SA-16:04.linux.asc" target="_top">FreeBSD-SA-16:04.linux</a></td><td>14�January�2016</td><td><p xmlns="http://www.w3.org/TR/xhtml1/transitional"><a xmlns="http://www.w3.org/1999/xhtml" class="citerefentry" href="http://www.FreeBSD.org/cgi/man.cgi?query=setgroups&amp;sektion=2&amp;manpath=freebsd-release-ports"><span class="citerefentry"><span class="refentrytitle">setgroups</span>(2)</span></a> system call
 	    vulnerability </p></td></tr><tr><td><a class="link" href="https://www.FreeBSD.org/security/advisories/FreeBSD-SA-16:05.tcp.asc" target="_top">FreeBSD-SA-16:05.tcp</a></td><td>14�January�2016</td><td><p xmlns="http://www.w3.org/TR/xhtml1/transitional">MD5 signature denial of service </p></td></tr><tr><td><a class="link" href="https://www.FreeBSD.org/security/advisories/FreeBSD-SA-16:06.bsnmpd.asc" target="_top">FreeBSD-SA-16:06.bsnmpd</a></td><td>14�January�2016</td><td><p xmlns="http://www.w3.org/TR/xhtml1/transitional">Insecure default configuration file
 	  permissions </p></td></tr><tr><td><a class="link" href="https://www.FreeBSD.org/security/advisories/FreeBSD-SA-16:07.openssh.asc" target="_top">FreeBSD-SA-16:07.openssh</a></td><td>14�January�2016</td><td><p xmlns="http://www.w3.org/TR/xhtml1/transitional"><span xmlns="http://www.w3.org/1999/xhtml" class="application">OpenSSH</span> client
 	    information leak </p></td></tr><tr><td><a class="link" href="https://www.FreeBSD.org/security/advisories/FreeBSD-SA-16:08.bind.asc" target="_top">FreeBSD-SA-16:08.bind</a></td><td>27�January�2016</td><td><p xmlns="http://www.w3.org/TR/xhtml1/transitional">Remote denial of service
 	    vulnerability. </p></td></tr><tr><td><a class="link" href="https://www.FreeBSD.org/security/advisories/FreeBSD-SA-16:09.ntp.asc" target="_top">FreeBSD-SA-16:09.ntp</a></td><td>27�January�2016</td><td><p xmlns="http://www.w3.org/TR/xhtml1/transitional">Multiple vulnerabilities. </p></td></tr><tr><td><a class="link" href="https://www.FreeBSD.org/security/advisories/FreeBSD-SA-16:10.linux.asc" target="_top">FreeBSD-SA-16:10.linux</a></td><td>27�January�2016</td><td><p xmlns="http://www.w3.org/TR/xhtml1/transitional"><a xmlns="http://www.w3.org/1999/xhtml" class="citerefentry" href="http://www.FreeBSD.org/cgi/man.cgi?query=issetugid&amp;sektion=2&amp;manpath=freebsd-release-ports"><span class="citerefentry"><span class="refentrytitle">issetugid</span>(2)</span></a> system call
 	    vulnerability. </p></td></tr><tr><td><a class="link" href="https://www.FreeBSD.org/security/advisories/FreeBSD-SA-16:11.openssl.asc" target="_top">FreeBSD-SA-16:11.openssl</a></td><td>30�January�2016</td><td><p xmlns="http://www.w3.org/TR/xhtml1/transitional">SSLv2 cipher suite downgrade
 	    vulnerability. </p></td></tr><tr><td><a class="link" href="https://www.FreeBSD.org/security/advisories/FreeBSD-SA-16:12.openssl.asc" target="_top">FreeBSD-SA-16:12.openssl</a></td><td>7�March�2016</td><td><p xmlns="http://www.w3.org/TR/xhtml1/transitional">Multiple vulnerabilities </p></td></tr><tr><td><a class="link" href="https://www.FreeBSD.org/security/advisories/FreeBSD-SA-16:13.bind.asc" target="_top">FreeBSD-SA-16:13.bind</a></td><td>10�March�2016</td><td><p xmlns="http://www.w3.org/TR/xhtml1/transitional">Multiple vulnerabilities </p></td></tr><tr><td><a class="link" href="https://www.FreeBSD.org/security/advisories/FreeBSD-SA-16:14.openssh-xauth.asc" target="_top">FreeBSD-SA-16:14.openssh-xauth</a></td><td>16�March�2016</td><td><p xmlns="http://www.w3.org/TR/xhtml1/transitional">OpenSSH xauth injection
 	    vulnerability </p></td></tr><tr><td><a class="link" href="https://www.FreeBSD.org/security/advisories/FreeBSD-SA-16:15.sysarch.asc" target="_top">FreeBSD-SA-16:15.sysarch</a></td><td>16�March�2016</td><td><p xmlns="http://www.w3.org/TR/xhtml1/transitional">Incorrect argument validation in
 	    <a xmlns="http://www.w3.org/1999/xhtml" class="citerefentry" href="http://www.FreeBSD.org/cgi/man.cgi?query=sysarch&amp;sektion=2&amp;manpath=freebsd-release-ports"><span class="citerefentry"><span class="refentrytitle">sysarch</span>(2)</span></a> </p></td></tr><tr><td><a class="link" href="https://www.FreeBSD.org/security/advisories/FreeBSD-SA-16:09.ntp.asc" target="_top">FreeBSD-SA-16:09.ntp</a></td><td>29�April�2016</td><td><p xmlns="http://www.w3.org/TR/xhtml1/transitional">Multiple <span xmlns="http://www.w3.org/1999/xhtml" class="application">ntp</span>
 	    vulnerabilities. </p></td></tr><tr><td><a class="link" href="https://www.FreeBSD.org/security/advisories/FreeBSD-SA-16:17.openssl.asc" target="_top">FreeBSD-SA-16:17.openssl</a></td><td>29�April�2016</td><td><p xmlns="http://www.w3.org/TR/xhtml1/transitional">Multiple <span xmlns="http://www.w3.org/1999/xhtml" class="application">OpenSSL</span>
 	    vulnerabilities. </p></td></tr><tr><td><a class="link" href="https://www.FreeBSD.org/security/advisories/FreeBSD-SA-16:18.atkbd.asc" target="_top">FreeBSD-SA-16:18.atkbd</a></td><td>17�May�2016</td><td><p xmlns="http://www.w3.org/TR/xhtml1/transitional">Keyboard driver buffer overflow </p></td></tr><tr><td><a class="link" href="https://www.FreeBSD.org/security/advisories/FreeBSD-SA-16:19.sendmsg.asc" target="_top">FreeBSD-SA-16:19.sendmsg</a></td><td>17�May�2016</td><td><p xmlns="http://www.w3.org/TR/xhtml1/transitional">Incorrect argument handling in
 	    <a xmlns="http://www.w3.org/1999/xhtml" class="citerefentry" href="http://www.FreeBSD.org/cgi/man.cgi?query=sendmsg&amp;sektion=2&amp;manpath=freebsd-release-ports"><span class="citerefentry"><span class="refentrytitle">sendmsg</span>(2)</span></a> </p></td></tr><tr><td><a class="link" href="https://www.FreeBSD.org/security/advisories/FreeBSD-SA-16:20.linux.asc" target="_top">FreeBSD-SA-16:20.linux</a></td><td>31�May�2016</td><td><p xmlns="http://www.w3.org/TR/xhtml1/transitional">Kernel stack disclosure in Linux compatibility
 	  layer </p></td></tr><tr><td><a class="link" href="https://www.FreeBSD.org/security/advisories/FreeBSD-SA-16:21.43bsd.asc" target="_top">FreeBSD-SA-16:21.43bsd</a></td><td>31�May�2016</td><td><p xmlns="http://www.w3.org/TR/xhtml1/transitional">Kernel stack disclosure in 4.3BSD compatibility
 	  layer </p></td></tr><tr><td><a class="link" href="https://www.FreeBSD.org/security/advisories/FreeBSD-SA-16:22.libarchive.asc" target="_top">FreeBSD-SA-16:22.libarchive</a></td><td>31�May�2016</td><td><p xmlns="http://www.w3.org/TR/xhtml1/transitional">Absolute path traversal
 	    vulnerability </p></td></tr><tr><td><a class="link" href="https://www.FreeBSD.org/security/advisories/FreeBSD-SA-16:23.libarchive.asc" target="_top">FreeBSD-SA-16:23.libarchive</a></td><td>31�May�2016</td><td><p xmlns="http://www.w3.org/TR/xhtml1/transitional">Absolute path traversal
 	    vulnerability </p></td></tr><tr><td><a class="link" href="https://www.FreeBSD.org/security/advisories/FreeBSD-SA-16:24.ntp.asc" target="_top">FreeBSD-SA-16:24.ntp</a></td><td>3�June�2016</td><td><p xmlns="http://www.w3.org/TR/xhtml1/transitional">Multiple <span xmlns="http://www.w3.org/1999/xhtml" class="application">ntp</span>
 	    vulnerabilties </p></td></tr><tr><td><a class="link" href="https://www.FreeBSD.org/security/advisories/FreeBSD-SA-16:25.bspatch.asc" target="_top">FreeBSD-SA-16:25.bspatch</a></td><td>25�July�2016</td><td><p xmlns="http://www.w3.org/TR/xhtml1/transitional">heap overflow vulnerability </p></td></tr><tr><td><a class="link" href="https://www.FreeBSD.org/security/advisories/FreeBSD-SA-16:26.openssl.asc" target="_top">FreeBSD-SA-16:26.openssl</a></td><td>23�September�2016</td><td><p xmlns="http://www.w3.org/TR/xhtml1/transitional">Multiple vulnerabilities </p></td></tr><tr><td><a class="link" href="https://www.FreeBSD.org/security/advisories/FreeBSD-SA-16:27.openssl.asc" target="_top">FreeBSD-SA-16:27.openssl</a></td><td>26�September�2016</td><td><p xmlns="http://www.w3.org/TR/xhtml1/transitional">Regression in <span xmlns="http://www.w3.org/1999/xhtml" class="application">OpenSSL</span>
 	    suite </p></td></tr><tr><td><a class="link" href="https://www.FreeBSD.org/security/advisories/FreeBSD-SA-16:28.bind.asc" target="_top">FreeBSD-SA-16:28.bind</a></td><td>10�October�2016</td><td><p xmlns="http://www.w3.org/TR/xhtml1/transitional"><span xmlns="http://www.w3.org/1999/xhtml" class="application">BIND</span> denial of
 	    service </p></td></tr><tr><td><a class="link" href="https://www.FreeBSD.org/security/advisories/FreeBSD-SA-16:29.bspatch.asc" target="_top">FreeBSD-SA-16:29.bspatch</a></td><td>10�October�2016</td><td><p xmlns="http://www.w3.org/TR/xhtml1/transitional">Heap overflow vulnerability </p></td></tr><tr><td><a class="link" href="https://www.FreeBSD.org/security/advisories/FreeBSD-SA-16:30.portsnap.asc" target="_top">FreeBSD-SA-16:30.portsnap</a></td><td>10�October�2016</td><td><p xmlns="http://www.w3.org/TR/xhtml1/transitional">Multiple vulnerabilities </p></td></tr><tr><td><a class="link" href="https://www.FreeBSD.org/security/advisories/FreeBSD-SA-16:31.libarchive.asc" target="_top">FreeBSD-SA-16:31.libarchive</a></td><td>10�October�2016</td><td><p xmlns="http://www.w3.org/TR/xhtml1/transitional">Multiple vulnerabilities </p></td></tr><tr><td><a class="link" href="https://www.FreeBSD.org/security/advisories/FreeBSD-SA-16:34.bind.asc" target="_top">FreeBSD-SA-16:34.bind</a></td><td>2�November�2016</td><td><p xmlns="http://www.w3.org/TR/xhtml1/transitional">Remote Denial of Service
 	    vulnerability </p></td></tr><tr><td><a class="link" href="https://www.FreeBSD.org/security/advisories/FreeBSD-SA-16:35.openssl.asc" target="_top">FreeBSD-SA-16:35.openssl</a></td><td>2�November�2016</td><td><p xmlns="http://www.w3.org/TR/xhtml1/transitional">Remote Denial of Service
-	    vulnerability </p></td></tr></tbody></table></div></div><div class="sect1"><div xmlns="" class="titlepage"><div><div><h2 xmlns="http://www.w3.org/1999/xhtml" class="title" style="clear: both"><a id="errata"></a>3.�Errata Notices</h2></div></div></div><div class="informaltable"><table width="100%" border="0"><colgroup><col width="40%" /><col width="30%" /><col width="30%" /></colgroup><thead><tr><th>Errata</th><th>Date</th><th>Topic</th></tr></thead><tbody><tr><td><a class="link" href="https://www.FreeBSD.org/security/advisories/FreeBSD-EN-14:10.tzdata.asc" target="_top">FreeBSD-EN-14:10.tzdata</a></td><td>21�October�2014</td><td><p xmlns="http://www.w3.org/TR/xhtml1/transitional">Time zone data file update </p></td></tr><tr><td><a class="link" href="https://www.FreeBSD.org/security/advisories/FreeBSD-EN-14:11.crypt.asc" target="_top">FreeBSD-EN-14:11.crypt</a></td><td>21�October�2014</td><td><p xmlns="http://www.w3.org/TR/xhtml1/transitional">Change <a xmlns="http://www.w3.org/1999/xhtml" class="citerefentry" href="http://www.FreeBSD.org/cgi/man.cgi?query=crypt&amp;sektion=3&amp;manpath=freebsd-release-ports"><span class="citerefentry"><span class="refentrytitle">crypt</span>(3)</span></a> default hashing algorithm
+	    vulnerability </p></td></tr><tr><td><a class="link" href="https://www.FreeBSD.org/security/advisories/FreeBSD-SA-16:36.telnetd.asc" target="_top">FreeBSD-SA-16:36.telnetd</a></td><td>6�December�2016</td><td><p xmlns="http://www.w3.org/TR/xhtml1/transitional">Possible <a xmlns="http://www.w3.org/1999/xhtml" class="citerefentry" href="http://www.FreeBSD.org/cgi/man.cgi?query=login&amp;sektion=1&amp;manpath=freebsd-release-ports"><span class="citerefentry"><span class="refentrytitle">login</span>(1)</span></a> argument
+	    injection </p></td></tr><tr><td><a class="link" href="https://www.FreeBSD.org/security/advisories/FreeBSD-SA-16:37.libc.asc" target="_top">FreeBSD-SA-16:37.libc</a></td><td>6�December�2016</td><td><p xmlns="http://www.w3.org/TR/xhtml1/transitional"><a xmlns="http://www.w3.org/1999/xhtml" class="citerefentry" href="http://www.FreeBSD.org/cgi/man.cgi?query=link_ntoa&amp;sektion=3&amp;manpath=freebsd-release-ports"><span class="citerefentry"><span class="refentrytitle">link_ntoa</span>(3)</span></a> buffer overflow </p></td></tr></tbody></table></div></div><div class="sect1"><div xmlns="" class="titlepage"><div><div><h2 xmlns="http://www.w3.org/1999/xhtml" class="title" style="clear: both"><a id="errata"></a>3.�Errata Notices</h2></div></div></div><div class="informaltable"><table width="100%" border="0"><colgroup><col width="40%" /><col width="30%" /><col width="30%" /></colgroup><thead><tr><th>Errata</th><th>Date</th><th>Topic</th></tr></thead><tbody><tr><td><a class="link" href="https://www.FreeBSD.org/security/advisories/FreeBSD-EN-14:10.tzdata.asc" target="_top">FreeBSD-EN-14:10.tzdata</a></td><td>21�October�2014</td><td><p xmlns="http://www.w3.org/TR/xhtml1/transitional">Time zone data file update </p></td></tr><tr><td><a class="link" href="https://www.FreeBSD.org/security/advisories/FreeBSD-EN-14:11.crypt.asc" target="_top">FreeBSD-EN-14:11.crypt</a></td><td>21�October�2014</td><td><p xmlns="http://www.w3.org/TR/xhtml1/transitional">Change <a xmlns="http://www.w3.org/1999/xhtml" class="citerefentry" href="http://www.FreeBSD.org/cgi/man.cgi?query=crypt&amp;sektion=3&amp;manpath=freebsd-release-ports"><span class="citerefentry"><span class="refentrytitle">crypt</span>(3)</span></a> default hashing algorithm
 	    back to DES </p></td></tr><tr><td><a class="link" href="https://www.FreeBSD.org/security/advisories/FreeBSD-EN-14:12.zfs.asc" target="_top">FreeBSD-EN-14:12.zfs</a></td><td>11�November�2014</td><td><p xmlns="http://www.w3.org/TR/xhtml1/transitional">Fix NFSv4 and ZFS cache consistency
 	    issue </p></td></tr><tr><td><a class="link" href="https://www.FreeBSD.org/security/advisories/FreeBSD-EN-14:13.freebsd-update.asc" target="_top">FreeBSD-EN-14:13.freebsd-update</a></td><td>23�December�2014</td><td><p xmlns="http://www.w3.org/TR/xhtml1/transitional">Fixed directory deletion issue in
 	    <a xmlns="http://www.w3.org/1999/xhtml" class="citerefentry" href="http://www.FreeBSD.org/cgi/man.cgi?query=freebsd-update&amp;sektion=8&amp;manpath=freebsd-release-ports"><span class="citerefentry"><span class="refentrytitle">freebsd-update</span>(8)</span></a> </p></td></tr><tr><td><a class="link" href="https://www.FreeBSD.org/security/advisories/FreeBSD-EN-15:01.vt.asc" target="_top">FreeBSD-EN-15:01.vt</a></td><td>25�February�2015</td><td><p xmlns="http://www.w3.org/TR/xhtml1/transitional"><a xmlns="http://www.w3.org/1999/xhtml" class="citerefentry" href="http://www.FreeBSD.org/cgi/man.cgi?query=vt&amp;sektion=4&amp;manpath=freebsd-release-ports"><span class="citerefentry"><span class="refentrytitle">vt</span>(4)</span></a> crash with improper ioctl
 	    parameters </p></td></tr><tr><td><a class="link" href="https://www.FreeBSD.org/security/advisories/FreeBSD-EN-15:02.openssl.asc" target="_top">FreeBSD-EN-15:02.openssl</a></td><td>25�February�2015</td><td><p xmlns="http://www.w3.org/TR/xhtml1/transitional">OpenSSL update </p></td></tr><tr><td><a class="link" href="https://www.FreeBSD.org/security/advisories/FreeBSD-EN-15:03.freebsd-update.asc" target="_top">FreeBSD-EN-15:03.freebsd-update</a></td><td>25�February�2015</td><td><p xmlns="http://www.w3.org/TR/xhtml1/transitional"><a xmlns="http://www.w3.org/1999/xhtml" class="citerefentry" href="http://www.FreeBSD.org/cgi/man.cgi?query=freebsd-update&amp;sektion=8&amp;manpath=freebsd-release-ports"><span class="citerefentry"><span class="refentrytitle">freebsd-update</span>(8)</span></a> updates libraries in
 	    suboptimal order </p></td></tr><tr><td><a class="link" href="https://www.FreeBSD.org/security/advisories/FreeBSD-EN-15:04.freebsd-update.asc" target="_top">FreeBSD-EN-15:04.freebsd-update</a></td><td>13�May�2015</td><td><p xmlns="http://www.w3.org/TR/xhtml1/transitional"><a xmlns="http://www.w3.org/1999/xhtml" class="citerefentry" href="http://www.FreeBSD.org/cgi/man.cgi?query=freebsd-update&amp;sektion=8&amp;manpath=freebsd-release-ports"><span class="citerefentry"><span class="refentrytitle">freebsd-update</span>(8)</span></a> does not ensure the
 	    previous upgrade has completed </p></td></tr><tr><td><a class="link" href="https://www.FreeBSD.org/security/advisories/FreeBSD-EN-15:06.file.asc" target="_top">FreeBSD-EN-15:06.file</a></td><td>9�June�2015</td><td><p xmlns="http://www.w3.org/TR/xhtml1/transitional">Multiple denial of service issues </p></td></tr><tr><td><a class="link" href="https://www.FreeBSD.org/security/advisories/FreeBSD-EN-15:08.sendmail.asc" target="_top">FreeBSD-EN-15:08.sendmail</a></td><td>30�June�2015 (revised)</td><td><p xmlns="http://www.w3.org/TR/xhtml1/transitional">Sendmail TLS/DH interoperability improvement </p></td></tr><tr><td><a class="link" href="https://www.FreeBSD.org/security/advisories/FreeBSD-EN-15:09.xlocale.asc" target="_top">FreeBSD-EN-15:09.xlocale</a></td><td>30�June�2015</td><td><p xmlns="http://www.w3.org/TR/xhtml1/transitional">Fix inconsistency between locale and rune locale states </p></td></tr><tr><td><a class="link" href="https://www.FreeBSD.org/security/advisories/FreeBSD-EN-15:15.pkg.asc" target="_top">FreeBSD-EN-15:15.pkg</a></td><td>25�August�2015</td><td><p xmlns="http://www.w3.org/TR/xhtml1/transitional">Insufficient check of supported <a xmlns="http://www.w3.org/1999/xhtml" class="citerefentry" href="http://www.FreeBSD.org/cgi/man.cgi?query=pkg&amp;sektion=7&amp;manpath=freebsd-release-ports"><span class="citerefentry"><span class="refentrytitle">pkg</span>(7)</span></a>
 	  signature methods. </p></td></tr><tr><td><a class="link" href="https://www.FreeBSD.org/security/advisories/FreeBSD-EN-15:18.pkg.asc" target="_top">FreeBSD-EN-15:18.pkg</a></td><td>16�September�2015</td><td><p xmlns="http://www.w3.org/TR/xhtml1/transitional">Implement <code xmlns="http://www.w3.org/1999/xhtml" class="literal">pubkey</code> support for
 	    <a xmlns="http://www.w3.org/1999/xhtml" class="citerefentry" href="http://www.FreeBSD.org/cgi/man.cgi?query=pkg&amp;sektion=7&amp;manpath=freebsd-release-ports"><span class="citerefentry"><span class="refentrytitle">pkg</span>(7)</span></a> bootstrap. </p></td></tr><tr><td><a class="link" href="https://www.FreeBSD.org/security/advisories/FreeBSD-EN-15:19.kqueue.asc" target="_top">FreeBSD-EN-15:19.kqueue</a></td><td>4�November�2015</td><td><p xmlns="http://www.w3.org/TR/xhtml1/transitional"><a xmlns="http://www.w3.org/1999/xhtml" class="citerefentry" href="http://www.FreeBSD.org/cgi/man.cgi?query=kqueue&amp;sektion=2&amp;manpath=freebsd-release-ports"><span class="citerefentry"><span class="refentrytitle">kqueue</span>(2)</span></a> write events never fire for files
 	    larger than 2GB. </p></td></tr><tr><td><a class="link" href="https://www.FreeBSD.org/security/advisories/FreeBSD-EN-15:20.vm.asc" target="_top">FreeBSD-EN-15:20.vm</a></td><td>4�November�2015</td><td><p xmlns="http://www.w3.org/TR/xhtml1/transitional">Applications exiting due to segmentation
 	    violation on a correct memory address. </p></td></tr><tr><td><a class="link" href="https://www.FreeBSD.org/security/advisories/FreeBSD-EN-16:02.pf.asc" target="_top">FreeBSD-EN-16:02.pf</a></td><td>14�January�2016</td><td><p xmlns="http://www.w3.org/TR/xhtml1/transitional">Invalid TCP checksum issue. </p></td></tr><tr><td><a class="link" href="https://www.FreeBSD.org/security/advisories/FreeBSD-EN-16:03.yplib.asc" target="_top">FreeBSD-EN-16:03.yplib</a></td><td>14�January�2016</td><td><p xmlns="http://www.w3.org/TR/xhtml1/transitional"><span xmlns="http://www.w3.org/1999/xhtml" class="application">YP/NIS</span> library
 	    bug. </p></td></tr><tr><td><a class="link" href="https://www.FreeBSD.org/security/advisories/FreeBSD-EN-16:08.zfs.asc" target="_top">FreeBSD-EN-16:08.zfs</a></td><td>4�May�2016</td><td><p xmlns="http://www.w3.org/TR/xhtml1/transitional">Memory leak in ZFS </p></td></tr><tr><td><a class="link" href="https://www.FreeBSD.org/security/advisories/FreeBSD-EN-16:09.freebsd-update.asc" target="_top">FreeBSD-EN-16:09.freebsd-update</a></td><td>25�July�2016</td><td><p xmlns="http://www.w3.org/TR/xhtml1/transitional">Fix <a xmlns="http://www.w3.org/1999/xhtml" class="citerefentry" href="http://www.FreeBSD.org/cgi/man.cgi?query=freebsd-update&amp;sektion=8&amp;manpath=freebsd-release-ports"><span class="citerefentry"><span class="refentrytitle">freebsd-update</span>(8)</span></a> support of
-	    FreeBSD�11.0-RELEASE </p></td></tr></tbody></table></div></div><div class="sect1"><div xmlns="" class="titlepage"><div><div><h2 xmlns="http://www.w3.org/1999/xhtml" class="title" style="clear: both"><a id="late-news"></a>4.�Late-Breaking News</h2></div></div></div><p xmlns="http://www.w3.org/TR/xhtml1/transitional">No late-breaking news. </p></div></div><p xmlns="http://www.w3.org/TR/xhtml1/transitional" align="center"><small>This file, and other release-related documents,
+	    FreeBSD�11.0-RELEASE </p></td></tr><tr><td><a class="link" href="https://www.FreeBSD.org/security/advisories/FreeBSD-EN-16:19.tzcode.asc" target="_top">FreeBSD-EN-16:19.tzcode</a></td><td>6�December�2016</td><td><p xmlns="http://www.w3.org/TR/xhtml1/transitional">Fix warnings about invalid timezone
+	    abbreviations </p></td></tr><tr><td><a class="link" href="https://www.FreeBSD.org/security/advisories/FreeBSD-EN-16:20.tzdata.asc" target="_top">FreeBSD-EN-16:20.tzdata</a></td><td>6�December�2016</td><td><p xmlns="http://www.w3.org/TR/xhtml1/transitional">Update timezone database
+	    information </p></td></tr></tbody></table></div></div><div class="sect1"><div xmlns="" class="titlepage"><div><div><h2 xmlns="http://www.w3.org/1999/xhtml" class="title" style="clear: both"><a id="late-news"></a>4.�Late-Breaking News</h2></div></div></div><p xmlns="http://www.w3.org/TR/xhtml1/transitional">No late-breaking news. </p></div></div><p xmlns="http://www.w3.org/TR/xhtml1/transitional" align="center"><small>This file, and other release-related documents,
       can be downloaded from <a href="https://www.FreeBSD.org/releases/">https://www.FreeBSD.org/releases/</a>.</small></p><p xmlns="http://www.w3.org/TR/xhtml1/transitional" align="center"><small>For questions about FreeBSD, read the
       <a href="http://www.FreeBSD.org/docs.html">documentation</a> before
       contacting &lt;<a href="mailto:questions@FreeBSD.org">questions@FreeBSD.org</a>&gt;.</small></p><p xmlns="http://www.w3.org/TR/xhtml1/transitional" align="center"><small>All users of FreeBSD 9.3-STABLE should
       subscribe to the &lt;<a href="mailto:stable@FreeBSD.org">stable@FreeBSD.org</a>&gt;
       mailing list.</small></p><p xmlns="http://www.w3.org/TR/xhtml1/transitional" align="center"><small>For questions about this documentation,
       e-mail &lt;<a href="mailto:doc@FreeBSD.org">doc@FreeBSD.org</a>&gt;.</small></p></body></html>
\ No newline at end of file
Index: user/gjb/releng-rewrite/en_US.ISO8859-1/htdocs/releases/index.xml
===================================================================
--- user/gjb/releng-rewrite/en_US.ISO8859-1/htdocs/releases/index.xml	(revision 49724)
+++ user/gjb/releng-rewrite/en_US.ISO8859-1/htdocs/releases/index.xml	(revision 49725)
@@ -1,717 +1,713 @@
 <?xml version="1.0" encoding="iso-8859-1"?>
 <!DOCTYPE html PUBLIC "-//FreeBSD//DTD XHTML 1.0 Transitional-Based Extension//EN"
 "http://www.FreeBSD.org/XML/share/xml/xhtml10-freebsd.dtd" [
 <!ENTITY title "Release Information">
 ]>
 <!-- $FreeBSD$ -->
 
 <html xmlns="http://www.w3.org/1999/xhtml">
 <head>
       <title>&title;</title>
 
       <cvs:keyword xmlns:cvs="http://www.FreeBSD.org/XML/CVS">$FreeBSD$</cvs:keyword>
     </head>
 
     <body class="navinclude.download">
       <img alt="FreeBSD Releases" src="../gifs/releases.jpg" height="200" width="300" align="right" border="0"/>
 
-  <p>FreeBSD releases are classified into "Production Releases" and
-    "Legacy Releases".  The former are best suited to users looking
-    for the latest new features; the latter are for users wishing to
+  <p>FreeBSD releases are classified into <i>Production Releases</i> and
+    <i>Legacy Releases</i>.  Production releases are best suited to users looking
+    for the latest new features.  Legacy releases are for users wishing to
     stay with a more conservative upgrade strategy.</p>
 
-  <p>Releases are further classified by the length of time they will
-    be supported by the Security Officer into "Normal" and "Extended"
-    releases.</p>
-
   <p>Documentation files for each release are available for viewing in
     HTML format on the <a href="&base;/relnotes.html">Release
     Documentation</a> page.</p>
 
   <a name="supported-releases"></a>
   <h2>Currently Supported Releases</h2>
 
-  <p>Complete information about the release date, the classification
-    type, and the estimated End-Of-Life (EOL) for currently supported
+  <p>Complete information about the release date
+    and the estimated End-Of-Life (EOL) for currently supported
     releases can be found on the <a
       href="&base;/security/security.html#sup"> Supported Releases</a>
     section of the <a href="&base;/security/security.html">FreeBSD
     Security Information</a> page.</p>
 
   <a name="current"></a>
   <h2>Most Recent Releases</h2>
 
     <h3>Production Release</h3>
       <p><b>Release &rel.current;</b> (&rel.current.date;)
 	<em>
 	<a href="&u.rel.announce;">Announcement</a> :
 	<a href="&u.rel.notes;">Release Notes</a> :
 	<a href="&u.rel.installation;">Installation Instructions</a> :
 	<a href="&u.rel.hardware;">Hardware Notes</a> :
 	<a href="&u.rel.readme;">Readme</a> :
 	<a href="&u.rel.errata;">Errata</a> :
 	<a href="&u.rel.signatures;">Checksums</a>
       </em></p>
 
       <p><b>Release &rel0.current;</b> (&rel0.current.date;)
 	<em>
 	<a href="&u.rel0.announce;">Announcement</a> :
 	<a href="&u.rel0.notes;">Release Notes</a> :
 	<a href="&u.rel0.installation;">Installation
 	Instructions</a> :
 	<a href="&u.rel0.hardware;">Hardware Notes</a> :
 	<a href="&u.rel0.readme;">Readme</a> :
 	<a href="&u.rel0.errata;">Errata</a> :
 	<a href="&u.rel0.signatures;">Checksums</a>
 	</em></p>
 
       <p><b>Release &rel1.current;</b> (&rel1.current.date;)
 	<em>
 	<a href="&u.rel1.announce;">Announcement</a> :
 	<a href="&u.rel1.notes;">Release Notes</a> :
 	<a href="&u.rel1.installation;">Installation
 	Instructions</a> :
 	<a href="&u.rel1.hardware;">Hardware Notes</a> :
 	<a href="&u.rel1.readme;">Readme</a> :
 	<a href="&u.rel1.errata;">Errata</a> :
 	<a href="&u.rel1.signatures;">Checksums</a>
 	</em></p>
 
       <p><b>Release &rel2.current;</b> (&rel2.current.date;)
 	<em>
 	<a href="&u.rel2.announce;">Announcement</a> :
 	<a href="&u.rel2.notes;">Release Notes</a> :
 	<a href="&u.rel2.installation;">Installation Instructions</a> :
 	<a href="&u.rel2.hardware;">Hardware Notes</a> :
 	<a href="&u.rel2.readme;">Readme</a> :
 	<a href="&u.rel2.errata;">Errata</a>
       </em></p>
 
     <h3>Legacy Release</h3>
       <p><b>Release &rel3.current;</b> (&rel3.current.date;)
 	<em>
 	<a href="&u.rel3.announce;">Announcement</a> :
 	<a href="&u.rel3.notes;">Release Notes</a> :
 	<a href="&u.rel3.installation;">Installation Instructions</a> :
 	<a href="&u.rel3.hardware;">Hardware Notes</a> :
 	<a href="&u.rel3.readme;">Readme</a> :
 	<a href="&u.rel3.errata;">Errata</a>
       </em></p>
 
   <a name="future"></a>
   <h2>Future Releases</h2>
 
     <p>For the schedule of upcoming releases, or for more information
       about the release engineering process, please visit the <a
 	href="&base;/releng/index.html">Release Engineering</a>
       page.</p>
 
     <p>The latest snapshots from our <a
 	href="&base;/doc/en_US.ISO8859-1/books/handbook/current-stable.html#STABLE">FreeBSD-STABLE</a>
       and <a
 	href="&base;/doc/en_US.ISO8859-1/books/handbook/current-stable.html#CURRENT">FreeBSD-CURRENT</a>
       branches are also available.  Please see <a
 	href="../where.html">Getting FreeBSD</a> for details.</p>
 
   <!-- temporary disable entry: RL 20150303
   <a name="prior-supported"></a>
   <h2>Prior Releases Still Being Supported</h2>
 
   <ul>
   </ul>
   -->
 
   <a name="prior-unsupported"></a>
   <h2>Prior Releases Which Have Reached End-Of-Life</h2>
 
     <p>Complete historical information about the release date, the
       classification type, and the effective End-Of-Life (EOL) for
-      these releases may be found on the <a
+      these releases can be found on the <a
 	href="&base;/security/unsupported.html">Unsupported
 	Releases</a> section of the <a
 	href="&base;/security/security.html">FreeBSD Security
 	Information</a> page.</p>
 
     <ul>
       <li><b>10.0</b> (January 2014)
 	<em>
 	  <a href="10.0R/announce.html">Announcement</a>:
 	  <a href="10.0R/relnotes.html">Release Notes</a>:
 	  <a href="10.0R/installation.html">Installation Instructions</a>:
 	  <a href="10.0R/hardware.html">Hardware Notes</a>:
 	  <a href="10.0R/readme.html">Readme</a>:
 	  <a href="10.0R/errata.html">Errata</a>
 	</em>
       </li>
 
       <li><b>9.2</b> (September 2013)
 	<em>
 	  <a href="9.2R/announce.html">Announcement</a>:
 	  <a href="9.2R/relnotes.html">Release Notes</a>:
 	  <a href="9.2R/installation.html">Installation Instructions</a>:
 	  <a href="9.2R/hardware.html">Hardware Notes</a>:
 	  <a href="9.2R/readme.html">Readme</a>:
 	  <a href="9.2R/errata.html">Errata</a>
 	</em>
       </li>
 
       <li><b>9.1</b> (December 2012)
 	<em>
 	  <a href="9.1R/announce.html">Announcement</a>:
 	  <a href="9.1R/relnotes.html">Release Notes</a>:
 	  <a href="9.1R/installation.html">Installation Instructions</a>:
 	  <a href="9.1R/hardware.html">Hardware Notes</a>:
 	  <a href="9.1R/readme.html">Readme</a>:
 	  <a href="9.1R/errata.html">Errata</a>
 	</em>
       </li>
 
       <li><b>9.0</b> (January 2012)
 	<em>
 	  <a href="9.0R/announce.html">Announcement</a>:
 	  <a href="9.0R/relnotes.html">Release Notes</a>:
 	  <a href="9.0R/installation.html">Installation Instructions</a>:
 	  <a href="9.0R/hardware.html">Hardware Notes</a>:
 	  <a href="9.0R/readme.html">Readme</a>:
 	  <a href="9.0R/errata.html">Errata</a>
 	</em>
       </li>
 
       <li><b>8.4</b> (June 2013)
 	<em>
 	  <a href="8.4R/announce.html">Announcement</a>:
 	  <a href="8.4R/relnotes.html">Release Notes</a>:
 	  <a href="8.4R/installation.html">Installation Instructions</a>:
 	  <a href="8.4R/hardware.html">Hardware Notes</a>:
 	  <a href="8.4R/readme.html">Readme</a>:
 	  <a href="8.4R/errata.html">Errata</a>
 	</em>
       </li>
 
       <li><b>8.3</b> (April 2012)
 	<em>
 	  <a href="8.3R/announce.html">Announcement</a>:
 	  <a href="8.3R/relnotes.html">Release Notes</a>:
 	  <a href="8.3R/installation.html">Installation Instructions</a>:
 	  <a href="8.3R/hardware.html">Hardware Notes</a>:
 	  <a href="8.3R/readme.html">Readme</a>:
 	  <a href="8.3R/errata.html">Errata</a>
 	</em>
       </li>
 
       <li><b>8.2</b> (February 2011)
 	<em>
 	  <a href="8.2R/announce.html">Announcement</a>:
 	  <a href="8.2R/relnotes.html">Release Notes</a>:
 	  <a href="8.2R/hardware.html">Hardware Notes</a>:
 	  <a href="8.2R/readme.html">Readme</a>:
 	  <a href="8.2R/errata.html">Errata</a>
 	</em>
       </li>
 
       <li><b>8.1</b> (July 2010)
 	<em>
 	  <a href="8.1R/announce.html">Announcement</a>:
 	  <a href="8.1R/relnotes.html">Release Notes</a>:
 	  <a href="8.1R/hardware.html">Hardware Notes</a>:
 	  <a href="8.1R/readme.html">Readme</a>:
 	  <a href="8.1R/errata.html">Errata</a>
 	</em>
       </li>
 
       <li><b>8.0</b> (November 2009)
 	<em>
 	  <a href="8.0R/announce.html">Announcement</a>:
 	  <a href="8.0R/relnotes.html">Release Notes</a>:
 	  <a href="8.0R/hardware.html">Hardware Notes</a>:
 	  <a href="8.0R/readme.html">Readme</a>:
 	  <a href="8.0R/errata.html">Errata</a>
 	</em>
       </li>
 
       <li><b>7.4</b> (February 2011)
 	<em>
 	  <a href="7.4R/announce.html">Announcement</a>:
 	  <a href="7.4R/relnotes.html">Release Notes</a>:
 	  <a href="7.4R/hardware.html">Hardware Notes</a>:
 	  <a href="7.4R/readme.html">Readme</a>:
 	  <a href="7.4R/errata.html">Errata</a>
 	</em>
       </li>
 
       <li><b>7.3</b> (March 2010)
 	<em>
 	  <a href="7.3R/announce.html">Announcement</a>:
 	  <a href="7.3R/relnotes.html">Release Notes</a>:
 	  <a href="7.3R/hardware.html">Hardware Notes</a>:
 	  <a href="7.3R/readme.html">Readme</a>:
 	  <a href="7.3R/errata.html">Errata</a>
 	</em>
       </li>
 
       <li><b>7.2</b> (May 2009)
 	<em>
 	  <a href="7.2R/announce.html">Announcement</a>:
 	  <a href="7.2R/relnotes.html">Release Notes</a>:
 	  <a href="7.2R/hardware.html">Hardware Notes</a>:
 	  <a href="7.2R/readme.html">Readme</a>:
 	  <a href="7.2R/errata.html">Errata</a>
 	</em>
       </li>
 
       <li><b>7.1</b> (January 2009)
 	<em>
 	  <a href="7.1R/announce.html">Announcement</a>:
 	  <a href="7.1R/relnotes.html">Release Notes</a>:
 	  <a href="7.1R/hardware.html">Hardware Notes</a>:
 	  <a href="7.1R/readme.html">Readme</a>:
 	  <a href="7.1R/errata.html">Errata</a>
 	</em>
       </li>
 
       <li><b>7.0</b> (February 2008)
 	<em>
 	  <a href="7.0R/announce.html">Announcement</a>:
 	  <a href="7.0R/relnotes.html">Release Notes</a>:
 	  <a href="7.0R/hardware.html">Hardware Notes</a>:
 	  <a href="7.0R/readme.html">Readme</a>:
 	  <a href="7.0R/errata.html">Errata</a>
 	</em>
       </li>
 
       <li><b>6.4</b> (November 2008)
 	<em>
 	  <a href="6.4R/announce.html">Announcement</a>:
 	  <a href="6.4R/relnotes.html">Release Notes</a>:
 	  <a href="6.4R/hardware.html">Hardware Notes</a>:
 	  <a href="6.4R/installation.html">Installation Notes</a>:
 	  <a href="6.4R/readme.html">Readme</a>:
 	  <a href="6.4R/errata.html">Errata</a>
 	</em>
       </li>
 
       <li><b>6.3</b> (January 2008)
 	<em>
 	  <a href="6.3R/announce.html">Announcement</a>:
 	  <a href="6.3R/relnotes.html">Release Notes</a>:
 	  <a href="6.3R/hardware.html">Hardware Notes</a>:
 	  <a href="6.3R/installation.html">Installation Notes</a>:
 	  <a href="6.3R/readme.html">Readme</a>:
 	  <a href="6.3R/errata.html">Errata</a>
 	</em>
       </li>
 
       <li><b>6.2</b> (January 2007)
 	<em>
 	  <a href="6.2R/announce.html">Announcement</a>:
 	  <a href="6.2R/relnotes.html">Release Notes</a>:
 	  <a href="6.2R/hardware.html">Hardware Notes</a>:
 	  <a href="6.2R/installation.html">Installation Notes</a>:
 	  <a href="6.2R/readme.html">Readme</a>:
 	  <a href="6.2R/errata.html">Errata</a>
 	</em>
       </li>
 
       <li><b>6.1</b> (May 2006)
 	<em>
 	  <a href="6.1R/announce.html">Announcement</a>:
 	  <a href="6.1R/relnotes.html">Release Notes</a>:
 	  <a href="6.1R/hardware.html">Hardware Notes</a>:
 	  <a href="6.1R/installation.html">Installation Notes</a>:
 	  <a href="6.1R/readme.html">Readme</a>:
 	  <a href="6.1R/errata.html">Errata</a>
 	</em>
       </li>
 
       <li><b>6.0</b> (November 2005)
 	<em>
 	  <a href="6.0R/announce.html">Announcement</a>:
 	  <a href="6.0R/relnotes.html">Release Notes</a>:
 	  <a href="6.0R/hardware.html">Hardware Notes</a>:
 	  <a href="6.0R/installation.html">Installation Notes</a>:
 	  <a href="6.0R/readme.html">Readme</a>:
 	  <a href="6.0R/errata.html">Errata</a>
 	</em>
       </li>
 
       <li><b>5.5</b> (May 2006)
 	<em>
 	  <a href="./5.5R/announce.html">Announcement</a>:
 	  <a href="./5.5R/relnotes.html">Release Notes</a>:
 	  <a href="./5.5R/hardware.html">Hardware Notes</a>:
 	  <a href="./5.5R/installation.html">Installation Notes</a>:
 	  <a href="./5.5R/readme.html">Readme</a>:
 	  <a href="./5.5R/errata.html">Errata</a>:
 	</em>
       </li>
 
       <li><b>5.4</b> (May 2005)
 	<em>
 	  <a href="./5.4R/announce.html">Announcement</a>:
 	  <a href="./5.4R/relnotes.html">Release Notes</a>:
 	  <a href="./5.4R/hardware.html">Hardware Notes</a>:
 	  <a href="./5.4R/installation.html">Installation Notes</a>:
 	  <a href="./5.4R/readme.html">Readme</a>:
 	  <a href="./5.4R/errata.html">Errata</a>:
 	  <a href="./5.4R/migration-guide.html">Migration Guide</a>
 	</em>
       </li>
 
       <li><b>5.3</b> (November 2004)
 	<em>
 	  <a href="./5.3R/announce.html">Announcement</a>:
 	  <a href="./5.3R/relnotes.html">Release Notes</a>:
 	  <a href="./5.3R/hardware.html">Hardware Notes</a>:
 	  <a href="./5.3R/installation.html">Installation Notes</a>:
 	  <a href="./5.3R/readme.html">Readme</a>:
 	  <a href="./5.3R/errata.html">Errata</a>:
 	  <a href="./5.3R/migration-guide.html">Migration Guide</a>
 	</em>
       </li>
 
       <li><b>5.2.1</b> (February 2004)
 	<em>
 	  <a href="./5.2.1R/announce.html">Announcement</a>:
 	  <a href="./5.2.1R/relnotes.html">Release Notes</a>:
 	  <a href="./5.2.1R/hardware.html">Hardware Notes</a>:
 	  <a href="./5.2.1R/installation.html">Installation Notes</a>:
 	  <a href="./5.2.1R/readme.html">Readme</a>:
 	  <a href="./5.2.1R/errata.html">Errata</a>:
 	  <a href="./5.2.1R/early-adopter.html">Early Adopter's Guide</a>
 	</em>
       </li>
 
       <li><b>5.2</b> (January 2004)
 	<em>
 	  <a href="./5.2R/announce.html">Announcement</a>:
 	  <a href="./5.2R/relnotes.html">Release Notes</a>:
 	  <a href="./5.2R/hardware.html">Hardware Notes</a>:
 	  <a href="./5.2R/installation.html">Installation Notes</a>:
 	  <a href="./5.2R/readme.html">Readme</a>:
 	  <a href="./5.2R/errata.html">Errata</a>:
 	  <a href="./5.2R/early-adopter.html">Early Adopter's Guide</a>
 	</em>
       </li>
 
       <li><b>5.1</b> (June, 2003)
 	<em>
 	  <a href="./5.1R/announce.html">Announcement</a>:
 	  <a href="./5.1R/relnotes.html">Release Notes</a>:
 	  <a href="./5.1R/hardware.html">Hardware Notes</a>:
 	  <a href="./5.1R/installation.html">Installation Notes</a>:
 	  <a href="./5.1R/readme.html">Readme</a>:
 	  <a href="./5.1R/errata.html">Errata</a>:
 	  <a href="./5.1R/early-adopter.html">Early Adopter's Guide</a>
 	</em>
       </li>
 
       <li><b>5.0</b> (January, 2003)
 	<em>
 	  <a href="./5.0R/announce.html">Announcement</a>:
 	  <a href="./5.0R/relnotes.html">Release Notes</a>:
 	  <a href="./5.0R/hardware.html">Hardware Notes</a>:
 	  <a href="./5.0R/installation.html">Installation Notes</a>:
 	  <a href="./5.0R/readme.html">Readme</a>:
 	  <a href="./5.0R/errata.html">Errata</a>:
 	  <a href="./5.0R/early-adopter.html">Early Adopter's Guide</a>
 	</em>
       </li>
 
       <li><b>4.11</b> (January, 2005)
 	<em>
 	  <a href="./4.11R/announce.html">Announcement</a>:
 	  <a href="./4.11R/relnotes.html">Release Notes</a>:
 	  <a href="./4.11R/hardware.html">Hardware Notes</a>:
 	  <a href="./4.11R/installation.html">Installation Notes</a>:
 	  <a href="./4.11R/readme.html">Readme</a>:
 	  <a href="./4.11R/errata.html">Errata</a>
 	</em>
       </li>
 
       <li><b>4.10</b> (May, 2004)
 	<em>
 	  <a href="./4.10R/announce.html">Announcement</a>:
 	  <a href="./4.10R/relnotes.html">Release Notes</a>:
 	  <a href="./4.10R/hardware.html">Hardware Notes</a>:
 	  <a href="./4.10R/installation.html">Installation Notes</a>:
 	  <a href="./4.10R/readme.html">Readme</a>:
 	  <a href="./4.10R/errata.html">Errata</a>
 	</em>
       </li>
 
       <li><b>4.9</b> (October, 2003)
 	<em>
 	  <a href="./4.9R/announce.html">Announcement</a>:
 	  <a href="./4.9R/relnotes.html">Release Notes</a>:
 	  <a href="./4.9R/hardware.html">Hardware Notes</a>:
 	  <a href="./4.9R/installation.html">Installation Notes</a>:
 	  <a href="./4.9R/readme.html">Readme</a>:
 	  <a href="./4.9R/errata.html">Errata</a>
 	</em>
       </li>
 
       <li><b>4.8</b> (April, 2003)
 	<em>
 	  <a href="./4.8R/announce.html">Announcement</a>:
 	  <a href="./4.8R/relnotes.html">Release Notes</a>:
 	  <a href="./4.8R/hardware.html">Hardware Notes</a>:
 	  <a href="./4.8R/installation.html">Installation Notes</a>:
 	  <a href="./4.8R/readme.html">Readme</a>:
 	  <a href="./4.8R/errata.html">Errata</a>
 	</em>
       </li>
 
       <li><b>4.7</b> (October, 2002)
 	<em>
 	  <a href="./4.7R/announce.html">Announcement</a>:
 	  <a href="./4.7R/relnotes.html">Release Notes</a>:
 	  <a href="./4.7R/hardware.html">Hardware Notes</a>:
 	  <a href="./4.7R/installation.html">Installation Notes</a>:
 	  <a href="./4.7R/readme.html">Readme</a>:
 	  <a href="./4.7R/errata.html">Errata</a>
 	</em>
       </li>
 
       <li><b>4.6.2</b> (August, 2002)
 	<em>
 	  <a href="./4.6.2R/announce.html">Announcement</a>:
 	  <a href="./4.6.2R/relnotes.html">Release Notes</a>:
 	  <a href="./4.6.2R/hardware.html">Hardware Notes</a>:
 	  <a href="./4.6.2R/readme.html">Readme</a>:
 	  <a href="./4.6.2R/errata.html">Errata</a>
 	</em>
       </li>
 
       <li><b>4.6</b> (June, 2002)
 	<em>
 	  <a href="./4.6R/announce.html">Announcement</a>:
 	  <a href="./4.6R/relnotes.html">Release Notes</a>:
 	  <a href="./4.6R/hardware.html">Hardware Notes</a>:
 	  <a href="./4.6R/installation.html">Installation Notes</a>:
 	  <a href="./4.6R/errata.html">Errata</a>
 	</em>
       </li>
 
       <li><b>4.5</b> (January, 2002)
 	<em>
 	  <a href="./4.5R/announce.html">Announcement</a>:
 	  <a href="./4.5R/notes.html">Release Notes</a>:
 	  <a href="./4.5R/hardware.html">Hardware Notes</a>:
 	  <a href="./4.5R/errata.html">Errata</a>
 	</em>
       </li>
 
       <li><b>4.4</b> (September, 2001)
 	<em>
 	  <a href="./4.4R/announce.html">Announcement</a>:
 	  <a href="./4.4R/notes.html">Release Notes</a>:
 	  <a href="./4.4R/hardware.html">Hardware Notes</a>:
 	  <a href="./4.4R/errata.html">Errata</a>
 	</em>
       </li>
 
       <li><b>4.3</b> (April, 2001)
 	<em>
 	  <a href="./4.3R/announce.html">Announcement</a>:
 	  <a href="./4.3R/notes.html">Release Notes</a>:
 	  <a href="./4.3R/errata.html">Errata</a>
 	</em>
       </li>
 
       <li><b>4.2</b> (November, 2000)
 	<em>
 	  <a href="./4.2R/announce.html">Announcement</a>:
 	  <a href="./4.2R/notes.html">Release Notes</a>:
 	  <a href="./4.2R/errata.html">Errata</a>
 	</em>
       </li>
 
       <li><b>4.1.1</b> (September, 2000)
 	<em>
 	<a href="./4.1.1R/announce.html">Announcement</a> :
 	<a href="./4.1.1R/notes.html">Release Notes</a> :
 	<a href="./4.1.1R/errata.html">Errata</a>
 	</em>
       </li>
 
       <li><b>4.1</b> (July, 2000)
 	<em>
 	  <a href="./4.1R/announce.html">Announcement</a>:
 	  <a href="./4.1R/notes.html">Release Notes</a>:
 	  <a href="./4.1R/errata.html">Errata</a>
 	</em>
       </li>
 
       <li><b>4.0</b> (March, 2000)
 	<em>
 	  <a href="./4.0R/announce.html">Announcement</a>:
 	  <a href="./4.0R/notes.html">Release Notes</a>:
 	  <a href="./4.0R/errata.html">Errata</a>
 	</em>
       </li>
 
       <li><b>3.5</b> (June, 2000)
 	<em>
 	  <a href="./3.5R/announce.html">Announcement</a>:
 	  <a href="./3.5R/notes.html">Release Notes</a>:
 	  <a href="./3.5R/errata.html">Errata</a>
 	</em>
       </li>
 
       <li><b>3.4</b> (December, 1999)
 	<em>
 	  <a href="./3.4R/announce.html">Announcement</a>:
 	  <a href="./3.4R/notes.html">Release Notes</a>:
 	  <a href="./3.4R/errata.html">Errata</a>
 	</em>
       </li>
 
       <li><b>3.3</b> (September, 1999)
 	<em>
 	  <a href="./3.3R/announce.html">Announcement</a> :
 	  <a href="./3.3R/notes.html">Release Notes</a> :
 	  <a href="./3.3R/errata.html">Errata</a>
 	</em>
       </li>
 
       <li><b>3.2</b> (May, 1999)
 	<em>
 	  <a href="./3.2R/announce.html">Announcement</a> :
 	  <a href="./3.2R/notes.html">Release Notes</a> :
 	  <a href="./3.2R/errata.html">Errata</a>
 	</em>
       </li>
 
       <li><b>3.1</b> (February, 1999)
 	<em>
 	  <a href="./3.1R/announce.html">Announcement</a> :
 	  <a href="./3.1R/notes.html">Release Notes</a> :
 	  <a href="./3.1R/errata.html">Errata</a>
 	</em>
       </li>
 
       <li><b>3.0</b> (October, 1998)
 	<em>
 	  <a href="./3.0R/announce.html">Announcement</a> :
 	  <a href="./3.0R/notes.html">Release Notes</a> :
 	  <a href="./3.0R/errata.html">Errata</a>
 	</em>
       </li>
 
       <li><b>2.2.8</b> (December, 1998)
 	<em>
 	  <a href="./2.2.8R/announce.html">Announcement</a> :
 	  <a href="./2.2.8R/notes.html">Release Notes</a> :
 	  <a href="./2.2.8R/errata.html">Errata</a>
 	</em>
       </li>
 
       <li><b>2.2.7</b> (July, 1998)
 	<em>
 	  <a href="./2.2.7R/announce.html">Announcement</a> :
 	  <a href="./2.2.7R/notes.html">Release Notes</a> :
 	  <a href="./2.2.7R/errata.html">Errata</a>
 	</em>
       </li>
 
       <li><b>2.2.6</b> (March, 1998)
 	<em>
 	  <a href="./2.2.6R/announce.html">Announcement</a> :
 	  <a href="./2.2.6R/notes.html">Release Notes</a> :
 	  <a href="./2.2.6R/errata.html">Errata</a>
 	</em>
       </li>
 
       <li><b>2.2.5</b> (October, 1997)
 	<em>
 	  <a href="./2.2.5R/announce.html">Announcement</a> :
 	  <a href="./2.2.5R/notes.html">Release Notes</a> :
 	  <a href="./2.2.5R/errata.html">Errata</a>
 	</em>
       </li>
 
       <li><b>2.2.2</b> (May, 1997)
 	<em>
 	  <a href="./2.2.2R/notes.html">Release Notes</a> :
 	  <a href="./2.2.2R/errata.html">Errata</a>
 	</em>
       </li>
 
       <li><b>2.2.1</b> (April, 1997)
         <em>
 	  <a href="./2.2.1R/notes.html">Release Notes</a>
         </em>
       </li>
 
       <li><b>2.2</b> (March, 1997)
 	<em>
 	  <a href="./2.2R/announce.html">Announcement</a> :
 	  <a href="./2.2R/notes.html">Release Notes</a>
 	</em>
       </li>
 
       <li><b>2.1.7</b> (February, 1997)
 	<em>
 	  <a href="./2.1.7R/announce.html">Announcement</a> :
 	  <a href="./2.1.7R/notes.html">Release Notes</a>
 	</em>
       </li>
 
       <li><b>2.1.6</b> (December, 1996)
 	<em>
 	  <a href="./2.1.6R/announce.html">Announcement</a> :
 	  <a href="./2.1.6R/notes.html">Release Notes</a>
 	</em>
       </li>
 
       <li><b>2.1.5</b> (July, 1996)
 	<em>
 	  <a href="./2.1.5R/announce.html">Announcement</a> :
 	  <a href="./2.1.5R/notes.html">Release Notes</a>
 	</em>
       </li>
 
       <li><b>2.1</b> (November, 1995)
 	<em>
 	  <a href="./2.1R/announce.html">Announcement</a> :
 	  <a href="./2.1R/notes.html">Release Notes</a>
 	</em>
       </li>
 
       <li><b>2.0.5</b> (June, 1995)
 	<em>
 	  <a href="./2.0.5R/announce.html">Announcement</a> :
 	  <a href="./2.0.5R/notes.html">Release Notes</a>
 	</em>
       </li>
 
       <li><b>2.0</b> (November, 1994)
 	<em>
 	  <a href="./2.0/announce.html">Announcement</a> :
 	  <a href="./2.0/notes.html">Release Notes</a>
 	</em>
       </li>
 
       <li><b>1.1.5.1</b> (July, 1994)</li>
 
       <li><b>1.1.5</b>
 	<em>
 	  <a href="./1.1.5/RELNOTES.FreeBSD">Release Notes</a>
 	</em>
       </li>
 
       <li><b>1.1</b> (May, 1994)
 	<em>
 	  <a href="./1.1/RELNOTES.FreeBSD">Release Notes</a>
 	</em>
       </li>
 
       <li><b>1.0</b> (November, 1993)
 	<em>
 	  <a href="./1.0/announce.html">Announcement</a>
 	</em>
       </li>
     </ul>
 
   </body>
 </html>
Index: user/gjb/releng-rewrite/en_US.ISO8859-1/htdocs/releng/index.xml
===================================================================
--- user/gjb/releng-rewrite/en_US.ISO8859-1/htdocs/releng/index.xml	(revision 49724)
+++ user/gjb/releng-rewrite/en_US.ISO8859-1/htdocs/releng/index.xml	(revision 49725)
@@ -1,520 +1,523 @@
 <?xml version="1.0" encoding="iso-8859-1"?>
 <!DOCTYPE html PUBLIC "-//FreeBSD//DTD XHTML 1.0 Transitional-Based Extension//EN"
 "http://www.FreeBSD.org/XML/share/xml/xhtml10-freebsd.dtd" [
 <!ENTITY email 're'>
 <!ENTITY title "Release Engineering Information">
 <!ENTITY contact.re '<a xmlns="http://www.w3.org/1999/xhtml" href="mailto:re@FreeBSD.org">re@FreeBSD.org</a>'>
 <!ENTITY contact.so '<a xmlns="http://www.w3.org/1999/xhtml" href="mailto:security-officer@FreeBSD.org">security-officer@FreeBSD.org</a>'>
 <!ENTITY contact.portmgr '<a xmlns="http://www.w3.org/1999/xhtml" href="mailto:portmgr@FreeBSD.org">portmgr@FreeBSD.org</a>'>
 <!ENTITY contact.doc '<a xmlns="http://www.w3.org/1999/xhtml" href="mailto:freebsd-doc@FreeBSD.org">freebsd-doc@FreeBSD.org</a>'>
 <!ENTITY contact.doceng '<a xmlns="http://www.w3.org/1999/xhtml" href="mailto:doceng@FreeBSD.org">doceng@FreeBSD.org</a>'>
 <!ENTITY contact.www '<a xmlns="http://www.w3.org/1999/xhtml" href="mailto:freebsd-www@FreeBSD.org">freebsd-www@FreeBSD.org</a>'>
 ]>
 
 <html xmlns="http://www.w3.org/1999/xhtml">
   <head>
       <title>&title;</title>
 
       <cvs:keyword xmlns:cvs="http://www.FreeBSD.org/XML/CVS">$FreeBSD$</cvs:keyword>
     </head>
 
     <body class="navinclude.developers">
 
   <p>This page contains documentation about the FreeBSD release
     engineering process.</p>
 
   <ul>
-    <!--<li><a href="#schedule">Upcoming Release Schedule</a></li>-->
+    <li><a href="#schedule">Upcoming Release Schedule</a></li>
     <li><a href="#freeze">Code Freeze Status</a></li>
     <li><a href="&base;/releng/charter.html">Charter for the Release
 	Engineering Team</a></li>
     <li><a href="#docs">Release Engineering Documentation</a></li>
     <li><a href="#team">Current Release Engineering Team</a></li>
     <li><a href="#old">Old Releases</a></li>
 
     <!--
     <li>General information about committing to -STABLE.</li>
     -->
   </ul>
 
-  <!--
   <h2><a name="schedule" id="schedule">Upcoming Release Schedule</a></h2>
 
   <p>NOTE: Release dates are approximate and may be subject to
     schedule slippage.</p>
 
+  <p>As of 2016-12-09, the next release has not yet been
+    announced.</p>
+  <!-- 20161014 until announced
   <table class="tblbasic">
     <tr>
       <th>Date</th>
       <th>Event</th>
       <th>Information</th>
     </tr>
 
     <tr>
       <td>September&nbsp;2016</td>
       <td>&os;&nbsp;11.0</td>
       <td><a href="&base;/releases/11.0R/schedule.html">Target Schedule</a></td>
     </tr>
   </table>
   -->
 
   <h2><a name="freeze" id="freeze">Code-Freeze Status</a></h2>
 
-  <p>The following table lists the code freeze status for the major
+  <!-- cf https://svnweb.freebsd.org/base/svnadmin/conf/approvers?view=log -->
+
+  <p>This table lists the code freeze status for major
     branches of the <tt>src/</tt> subtree of the FreeBSD Subversion
     repository.  Commits to any branch listed as "frozen" must first
     be reviewed and approved by the relevant contact party.  The
-    status of other subtrees such as <tt>ports/</tt> and <tt>doc/</tt>,
+    status of other subtrees such as <tt>ports/</tt> and <tt>doc/</tt>
     is also provided below.</p>
 
   <table class="tblbasic">
     <tr>
       <th>Branch</th>
       <th>Status</th>
       <th>Contact</th>
       <th>Notes</th>
     </tr>
 
     <tr>
       <td><tt>head</tt></td>
       <td>Open</td>
       <td>committers</td>
       <td>Active development branch for 12.0-CURRENT.</td>
     </tr>
 
     <tr>
       <td><tt>stable/11</tt></td>
       <td>Open</td>
       <td>committers</td>
       <td>Development branch for FreeBSD 11-STABLE.</td>
     </tr>
 
     <tr>
       <td><tt>releng/11.0</tt></td>
       <td>Frozen</td>
       <td>&contact.so;</td>
       <td>FreeBSD 11.0 supported errata fix branch.</td>
     </tr>
 
     <tr>
       <td><tt>stable/10</tt></td>
       <td>Open</td>
       <td>committers</td>
       <td>Development branch for FreeBSD 10-STABLE.</td>
     </tr>
 
     <tr>
       <td><tt>releng/10.3</tt></td>
       <td>Frozen</td>
       <td>&contact.so;</td>
       <td>FreeBSD 10.3 supported errata fix branch.</td>
     </tr>
 
     <tr>
       <td><tt>releng/10.2</tt></td>
       <td>Frozen</td>
       <td>&contact.so;</td>
       <td>FreeBSD 10.2 supported errata fix branch.</td>
     </tr>
 
     <tr>
       <td><tt>releng/10.1</tt></td>
       <td>Frozen</td>
       <td>&contact.so;</td>
       <td>FreeBSD 10.1 supported errata fix branch.</td>
     </tr>
 
     <tr>
       <td><tt>releng/10.0</tt></td>
       <td>Frozen</td>
       <td>&contact.so;</td>
       <td>FreeBSD 10.0 errata fix branch (not officially supported).</td>
     </tr>
 
     <tr>
       <td><tt>stable/9</tt></td>
       <td>Open</td>
       <td>committers</td>
       <td>Development branch for FreeBSD 9-STABLE.</td>
     </tr>
 
     <tr>
       <td><tt>releng/9.3</tt></td>
       <td>Frozen</td>
       <td>&contact.so;</td>
       <td>FreeBSD 9.3 supported errata fix branch.</td>
     </tr>
 
     <tr>
       <td><tt>releng/9.2</tt></td>
       <td>Frozen</td>
       <td>&contact.so;</td>
       <td>FreeBSD 9.2 errata fix branch (not officially supported).</td>
     </tr>
 
     <tr>
       <td><tt>releng/9.1</tt></td>
       <td>Frozen</td>
       <td>&contact.so;</td>
       <td>FreeBSD 9.1 errata fix branch (not officially supported).</td>
     </tr>
 
     <tr>
       <td><tt>releng/9.0</tt></td>
       <td>Frozen</td>
       <td>&contact.so;</td>
       <td>FreeBSD 9.0 errata fix branch (not officially supported).</td>
     </tr>
 
     <tr>
       <td><tt>stable/8</tt></td>
       <td>Open</td>
       <td>committers</td>
       <td>Maintenance branch for 8-STABLE (not officially supported).</td>
     </tr>
 
     <tr>
       <td><tt>releng/8.4</tt></td>
       <td>Frozen</td>
       <td>&contact.so;</td>
       <td>FreeBSD 8.4 errata fix branch (not officially supported).</td>
     </tr>
 
     <tr>
       <td><tt>releng/8.3</tt></td>
       <td>Frozen</td>
       <td>&contact.so;</td>
       <td>FreeBSD 8.3 errata fix branch (not officially supported).</td>
     </tr>
 
     <tr>
       <td><tt>releng/8.2</tt></td>
       <td>Frozen</td>
       <td>&contact.so;</td>
       <td>FreeBSD 8.2 errata fix branch (not officially supported).</td>
     </tr>
 
     <tr>
       <td><tt>releng/8.1</tt></td>
       <td>Frozen</td>
       <td>&contact.so;</td>
       <td>FreeBSD 8.1 errata fix branch (not officially supported).</td>
     </tr>
 
     <tr>
       <td><tt>releng/8.0</tt></td>
       <td>Frozen</td>
       <td>&contact.so;</td>
       <td>FreeBSD 8.0 errata fix branch (not officially supported).</td>
     </tr>
 
     <tr>
       <td><tt>stable/7</tt></td>
       <td>Open</td>
       <td>committers</td>
       <td>Maintenance branch for 7-STABLE (not officially supported).</td>
     </tr>
 
     <tr>
       <td><tt>releng/7.4</tt></td>
       <td>Frozen</td>
       <td>&contact.so;</td>
       <td>FreeBSD 7.4 errata fix branch (not officially supported).</td>
     </tr>
 
     <tr>
       <td><tt>releng/7.3</tt></td>
       <td>Frozen</td>
       <td>&contact.so;</td>
       <td>FreeBSD 7.3 errata fix branch (not officially supported).</td>
     </tr>
 
     <tr>
       <td><tt>releng/7.2</tt></td>
       <td>Frozen</td>
       <td>&contact.so;</td>
       <td>FreeBSD 7.2 errata fix branch (not officially supported).</td>
     </tr>
 
     <tr>
       <td><tt>releng/7.1</tt></td>
       <td>Frozen</td>
       <td>&contact.so;</td>
       <td>FreeBSD 7.1 errata fix branch (not officially supported).</td>
     </tr>
 
     <tr>
       <td><tt>releng/7.0</tt></td>
       <td>Frozen</td>
       <td>&contact.so;</td>
       <td>FreeBSD 7.0 errata fix branch (not officially supported).</td>
     </tr>
 
     <tr>
       <td><tt>stable/6</tt></td>
       <td>Open</td>
       <td>committers</td>
       <td>Maintenance branch for 6-STABLE (not officially supported).</td>
     </tr>
 
     <tr>
       <td><tt>releng/6.4</tt></td>
       <td>Frozen</td>
       <td>&contact.so;</td>
       <td>FreeBSD 6.4 errata fix branch (not officially supported).</td>
     </tr>
 
     <tr>
       <td><tt>releng/6.3</tt></td>
       <td>Frozen</td>
       <td>&contact.so;</td>
       <td>FreeBSD 6.3 errata fix branch (not officially supported).</td>
     </tr>
 
     <tr>
       <td><tt>releng/6.2</tt></td>
       <td>Frozen</td>
       <td>&contact.so;</td>
       <td>FreeBSD 6.2 errata fix branch (not officially supported).</td>
     </tr>
 
     <tr>
       <td><tt>releng/6.1</tt></td>
       <td>Frozen</td>
       <td>&contact.so;</td>
       <td>FreeBSD 6.1 errata fix branch (not officially supported).</td>
     </tr>
 
     <tr>
       <td><tt>releng/6.0</tt></td>
       <td>Frozen</td>
       <td>&contact.so;</td>
       <td>FreeBSD 6.0 errata fix branch (not officially supported).</td>
     </tr>
 
     <tr>
       <td><tt>stable/5</tt></td>
       <td>Open</td>
       <td>committers</td>
       <td>Maintenance branch for 5-STABLE (not officially supported).</td>
     </tr>
 
     <tr>
       <td><tt>releng/5.5</tt></td>
       <td>Frozen</td>
       <td>&contact.so;</td>
       <td>FreeBSD 5.5 errata fix branch (not officially supported).</td>
     </tr>
 
     <tr>
       <td><tt>releng/5.4</tt></td>
       <td>Frozen</td>
       <td>&contact.so;</td>
       <td>FreeBSD 5.4 errata fix branch (not officially supported).</td>
     </tr>
 
     <tr>
       <td><tt>releng/5.3</tt></td>
       <td>Frozen</td>
       <td>&contact.so;</td>
       <td>FreeBSD 5.3 errata fix branch (not officially supported).</td>
     </tr>
 
     <tr>
       <td><tt>releng/5.2</tt></td>
       <td>Frozen</td>
       <td>&contact.so;</td>
       <td>FreeBSD 5.2 / 5.2.1 security fix branch (not officially supported).</td>
     </tr>
 
     <tr>
       <td><tt>releng/5.1</tt></td>
       <td>Frozen</td>
       <td>&contact.so;</td>
       <td>FreeBSD 5.1 security fix branch (not officially supported).</td>
     </tr>
 
     <tr>
       <td><tt>releng/5.0</tt></td>
       <td>Frozen</td>
       <td>&contact.so;</td>
       <td>FreeBSD 5.0 security fix branch (not officially supported).</td>
     </tr>
 
     <tr>
       <td><tt>stable/4</tt></td>
       <td>Open</td>
       <td>committers</td>
       <td>Maintenance branch for 4-STABLE (not officially supported).</td>
     </tr>
 
     <tr>
       <td><tt>releng/4.11</tt></td>
       <td>Frozen</td>
       <td>&contact.so;</td>
       <td>FreeBSD 4.11 errata fix branch (not officially supported).</td>
     </tr>
 
     <tr>
       <td><tt>releng/4.10</tt></td>
       <td>Frozen</td>
       <td>&contact.so;</td>
       <td>FreeBSD 4.10 security fix branch (not officially supported).</td>
     </tr>
 
     <tr>
       <td><tt>releng/4.9</tt></td>
       <td>Frozen</td>
       <td>&contact.so;</td>
       <td>FreeBSD 4.9 security fix branch (not officially supported).</td>
     </tr>
 
     <tr>
       <td><tt>releng/4.8</tt></td>
       <td>Frozen</td>
       <td>&contact.so;</td>
       <td>FreeBSD 4.8 security fix branch (not officially supported).</td>
     </tr>
 
     <tr>
       <td><tt>releng/4.7</tt></td>
       <td>Frozen</td>
       <td>&contact.so;</td>
       <td>FreeBSD 4.7 security fix branch (not officially supported).</td>
     </tr>
 
     <tr>
       <td><tt>releng/4.6</tt></td>
       <td>Frozen</td>
       <td>&contact.so;</td>
       <td>FreeBSD 4.6 security fix branch (not officially supported).</td>
     </tr>
 
     <tr>
       <td><tt>releng/4.5</tt></td>
       <td>Frozen</td>
       <td>&contact.so;</td>
       <td>FreeBSD 4.5 security fix branch (not officially supported).</td>
     </tr>
 
     <tr>
       <td><tt>releng/4.4</tt></td>
       <td>Frozen</td>
       <td>&contact.so;</td>
       <td>FreeBSD 4.4 security fix branch (not officially supported).</td>
     </tr>
 
     <tr>
       <td><tt>releng/4.3</tt></td>
       <td>Frozen</td>
       <td>&contact.so;</td>
       <td>FreeBSD 4.3 security fix branch (not officially supported).</td>
     </tr>
 
     <tr>
       <td><tt>stable/3</tt></td>
       <td>Open</td>
       <td>committers</td>
       <td>Maintenance branch for 3-STABLE (not officially supported).</td>
     </tr>
 
     <tr>
       <td><tt>stable/2.2</tt></td>
       <td>Open</td>
       <td>committers</td>
       <td>Maintenance branch for 2.2-STABLE (not officially supported).</td>
     </tr>
 
     <tr class="heading">
       <th>Subtree</th>
       <th>Status</th>
       <th>Contact</th>
       <th>Notes</th>
     </tr>
 
     <tr>
       <td><tt>ports/</tt></td>
       <td>Open</td>
       <td>&contact.portmgr;</td>
       <td>FreeBSD Ports Collection.</td>
     </tr>
 
     <tr>
       <td><tt>doc/</tt></td>
       <td>Open</td>
       <td>&contact.doc;</td>
-      <td>SGML/XML based documentation set.</td>
+      <td>DocBook XML-based documentation set.</td>
     </tr>
   </table>
 
   <h2><a name="docs" id="docs">Release Engineering Documentation</a></h2>
 
   <ul>
     <li><p><a href="&base;/doc/en_US.ISO8859-1/articles/releng/index.html">FreeBSD
 	  Release Engineering</a><br/>
 
-	  <small>Describes the approach used by the FreeBSD release
-	    engineering team to make production quality releases of the
+	  <small>This document details the approach used by the FreeBSD release
+	    engineering team to make production-quality releases of the
 	    FreeBSD Operating System. It describes the tools available
 	    for those interested in producing customized FreeBSD releases
 	    for corporate rollouts or commercial
 	    productization.</small></p></li>
 
     <!--
     <li><p><a href="&base;/doc/en_US.ISO8859-1/articles/releng-packages/index.html">FreeBSD
 	  Release Engineering for Third Party Packages</a><br/>
 
 	  <small>Describes the approach used by the FreeBSD release
 	    engineering team to produce a high quality package set
 	    suitable for official FreeBSD release media.  This document is
 	    a work in progress, but eventually it will cover the process
 	    used to build a clean package set on the FreeBSD.org "Ports
 	    Cluster", how to configure any other set of machines as a
 	    ports cluster, how to split up the packages for the release
 	    media, and how to verify that a package set is
 	    consistent.</small></p></li>
     -->
   </ul>
 
   <h2><a name="team" id="team">Release Engineering Team</a></h2>
 
   <p>The primary release engineering team is responsible for approving
     <a href="&base;/doc/en_US.ISO8859-1/books/handbook/freebsd-glossary.html#mfc-glossary">MFC</a>
     requests during code freezes, setting release schedules, and all of
     the other responsibilities laid out in our <a
       href="&base;/releng/charter.html">charter</a>.</p>
 
   <p><strong>Primary RE Team
       (<a href="mailto:re@FreeBSD.org">re@FreeBSD.org</a>)</strong> :
 	&a.re.members; form the primary release engineering
 	decision-making group.</p>
 
   <p>The builders release engineering team is responsible
     for building and packaging FreeBSD releases on the various supported
     platforms.</p>
 
   <p><strong>Builders REs (<a
 	href="mailto:re-builders@FreeBSD.org">re-builders@FreeBSD.org</a>)</strong> :
     &a.re-builders;</p>
 
   <p>The third party packages in the Ports Collection are managed by the
     portmgr@ team.  Among many other responsibilities, the port managers
     keep the ports cluster running smoothly to produce binary
     packages.</p>
 
   <p><strong>Package Builders (&contact.portmgr;)</strong> :
     &a.portmgr.members;</p>
 
   <h2><a name="old" id="old">Old Releases</a></h2>
 
   <p>The &os; Project does not maintain a complete
-    archive of old release ISO images but many
+    archive of old release ISO images, but many
     of them are available at <a
     href="ftp://ftp-archive.FreeBSD.org/pub/FreeBSD-Archive/old-releases/">
     ftp://ftp-archive.FreeBSD.org/pub/FreeBSD-Archive/old-releases/</a>.</p>
 
-  <p>If you are unable to find an FTP mirror that still contains the
-    release you are looking for, then you can email CD-ROM vendors to
-    see if they have any old releases available.</p>
+  <p>Older releases that are no longer present on any FTP mirror might
+    still be available from CD-ROM vendors.</p>
   </body>
 </html>
Index: user/gjb/releng-rewrite/en_US.ISO8859-1/htdocs/relnotes.xml
===================================================================
--- user/gjb/releng-rewrite/en_US.ISO8859-1/htdocs/relnotes.xml	(revision 49724)
+++ user/gjb/releng-rewrite/en_US.ISO8859-1/htdocs/relnotes.xml	(revision 49725)
@@ -1,115 +1,127 @@
 <?xml version="1.0" encoding="iso-8859-1"?>
 <!DOCTYPE html PUBLIC "-//FreeBSD//DTD XHTML 1.0 Transitional-Based Extension//EN"
 "http://www.FreeBSD.org/XML/share/xml/xhtml10-freebsd.dtd" [
 <!ENTITY title "Release Documentation">
 ]>
 
 <html xmlns="http://www.w3.org/1999/xhtml">
     <head>
       <title>&title;</title>
 
       <cvs:keyword xmlns:cvs="http://www.FreeBSD.org/XML/CVS">$FreeBSD$</cvs:keyword>
     </head>
 
     <body class="navinclude.about">
 
     <img src="gifs/doc.jpg" alt="BSD daemon reading documentation" align="right" border="0" width="274" height="163"/>
 
     <p>Each distribution of FreeBSD includes several documentation
       files describing the particular distribution (RELEASE,
       SNAPSHOTs, etc.).  These files typically include:</p>
 
     <ul>
       <li>README:  General introduction.</li>
 
       <li>Release Notes:  Information about changes from the
         previous release of FreeBSD.</li>
 
       <li>Hardware Notes:  A list of hardware devices known to work
         with FreeBSD.</li>
 
       <li>Installation Instructions:  A brief guide to installing
         FreeBSD.</li>
 
       <li>Errata:  Late-breaking news, including corrections,
         security advisories, and potential problems found after each
         release.</li>
     </ul>
 
-    <p>Of the files listed above, the release notes, hardware notes, and
+    <p>The release notes, hardware notes, and
     installation instructions are customized for each architecture
     supported by FreeBSD.</p>
 
     <h2>RELEASE versions of FreeBSD</h2>
 
     <p>The release documentation for each -RELEASE version of FreeBSD
       (for example, &rel.current;-RELEASE) can be found on the
       <a href="releases/index.html">releases</a> page of
-      the FreeBSD Web site, as well as its mirrors.</p>
+      the FreeBSD web site and on mirror sites.</p>
 
-    <p>These files (usually in both HTML and text forms) can be found
-      in the top-level directory of each distribution (whether on
-      CD-ROM, an FTP site, or the install floppy disks).</p>
+    <p>These files are located
+      in the top-level directory of each distribution.  Both
+      HTML and text forms are usually provided.</p>
 
-    <h2>Snapshot versions of FreeBSD</h2>
+    <h2>Snapshot Versions of FreeBSD</h2>
 
-    <p>The release documentation files for snapshots can generally be
-      found in the top-level directory of each snapshot.</p>
+    <p>The release documentation files for snapshots are generally
+      in the top-level directory of each snapshot.</p>
 
     <h2>Documentation for -CURRENT and -STABLE</h2>
 
-    <p>Automatically-generated HTML versions of the release
+    <p>HTML versions of the release
       documentation for FreeBSD -CURRENT and FreeBSD -STABLE are
-      available on the FreeBSD Web site.  These documents are
-      continually changing; the versions on the Web site are rebuilt
-      at the same time that the rest of the Web site is updated.</p>
+      available on the FreeBSD web site.  These documents are
+      continually changing and automatically generated. The versions on the web site are rebuilt
+      at the same time that the rest of the web site is updated.</p>
 
     <h3>FreeBSD -CURRENT Release Documentation</h3>
 
     <ul>
       <li><a href="&base;/relnotes/CURRENT/readme/index.html">README</a></li>
 
       <li><a href="&base;/relnotes/CURRENT/relnotes/index.html">Release Notes</a></li>
 
       <li><a href="&base;/relnotes/CURRENT/hardware/index.html">Hardware Notes</a></li>
 
       <li><a href="&base;/relnotes/CURRENT/errata/index.html">Errata</a></li>
+    </ul>
+
+    <h3>FreeBSD 11-STABLE Release Documentation</h3>
+
+    <ul>
+      <li><a href="&base;/relnotes/11-STABLE/readme/index.html">README</a></li>
+
+      <li><a href="&base;/relnotes/11-STABLE/relnotes/index.html">Release Notes</a></li>
+
+      <li><a href="&base;/relnotes/11-STABLE/hardware/index.html">Hardware Notes</a></li>
+
+      <li><a href="&base;/relnotes/11-STABLE/errata/index.html">Errata</a></li>
     </ul>
 
     <h3>FreeBSD 10-STABLE Release Documentation</h3>
 
     <ul>
       <li><a href="&base;/relnotes/10-STABLE/readme/index.html">README</a></li>
 
       <li><a href="&base;/relnotes/10-STABLE/relnotes/index.html">Release Notes</a></li>
 
       <li><a href="&base;/relnotes/10-STABLE/hardware/index.html">Hardware Notes</a></li>
 
       <li><a href="&base;/relnotes/10-STABLE/errata/index.html">Errata</a></li>
     </ul>
 
     <h3>FreeBSD 9-STABLE Release Documentation</h3>
 
     <ul>
       <li><a href="&base;/relnotes/9-STABLE/readme/index.html">README</a></li>
 
       <li><a href="&base;/relnotes/9-STABLE/relnotes/index.html">Release Notes</a></li>
 
       <li><a href="&base;/relnotes/9-STABLE/hardware/index.html">Hardware Notes</a></li>
 
       <li><a href="&base;/relnotes/9-STABLE/errata/index.html">Errata</a></li>
     </ul>
 
 <!-- note: not found as of 20151112
     <h2>Other Sites</h2>
 
     <p>Single-file HTML, PDF, and text renderings of the release
       documentation for FreeBSD -CURRENT, -STABLE, and recent -RELEASE
       versions can be found at the <a
       href="http://people.FreeBSD.org/~bmah/relnotes/">Release
       Documentation Snapshot Site</a>.  The renderings on this page
       are updated at irregular, but frequent intervals.</p>
 -->
 
   </body>
 </html>
Index: user/gjb/releng-rewrite/en_US.ISO8859-1
===================================================================
--- user/gjb/releng-rewrite/en_US.ISO8859-1	(revision 49724)
+++ user/gjb/releng-rewrite/en_US.ISO8859-1	(revision 49725)

Property changes on: user/gjb/releng-rewrite/en_US.ISO8859-1
___________________________________________________________________
Modified: svn:mergeinfo
## -0,0 +0,1 ##
   Merged /head/en_US.ISO8859-1:r49706-49724
Index: user/gjb/releng-rewrite/ja_JP.eucJP/books/handbook/bibliography/chapter.xml
===================================================================
--- user/gjb/releng-rewrite/ja_JP.eucJP/books/handbook/bibliography/chapter.xml	(revision 49724)
+++ user/gjb/releng-rewrite/ja_JP.eucJP/books/handbook/bibliography/chapter.xml	(revision 49725)
@@ -1,674 +1,674 @@
 <?xml version="1.0" encoding="euc-jp"?>
 <!--
      The FreeBSD Documentation Project
      The FreeBSD Japanese Documentation Project
 
-     Original revision: r45637
+     Original revision: r49531
      $FreeBSD$
 -->
 <appendix xmlns="http://docbook.org/ns/docbook"
   xmlns:xlink="http://www.w3.org/1999/xlink" version="5.0"
   xml:id="bibliography">
 
   <title>���Ϳ޽�</title>
 
   <para><emphasis>��: &a.jp.nakai;, 1996 ǯ 10 �� 12 ����</emphasis></para>
 
   <para>&os; ���ڥ졼�ƥ��󥰥����ƥ�θġ�����ʬ�ˤĤ��Ƥ�
     �ޥ˥奢��ڡ���������Τ褦���������ʤ���Ƥ��ޤ���,
     �ɤ���äƤ�����ʬ�ɤ�����Ĥʤ����碌��
     ���ڥ졼�ƥ��󥰥����ƥ����Τ�߳��ư����뤫�ˤĤ��Ƥ�,
     �ۤȤ����������Ƥ��ޤ���
     ������䤦����ˤϤΤ褤�ܤ�, &unix; �����ƥ�����ˤĤ��Ƥ�
     ���ѼԸ����Υޥ˥奢�뤬�礫���ޤ���</para>
 
   <sect1 xml:id="bibliography-freebsd">
     <title>&os; ������</title>
 
     <para><emphasis>��Ѹ�ʸ�����ν���:</emphasis></para>
 
     <itemizedlist>
       <listitem>
 	<para><link
 	    xlink:href="http://jdli.tw.FreeBSD.org/publication/book/freebsd2/index.htm">
 	    FreeBSD ����������</link> (�������)��
 	  <link
 	    xlink:href="http://www.drmaster.com.tw/">Drmaster</link>
 	  ȯ��, 1997. ISBN 9-578-39435-7.</para>
       </listitem>
 
       <listitem>
 	<para>FreeBSD Unleashed (���������),
 	  <link xlink:href="http://www.hzbook.com/">China Machine
 	    Press</link> ȯ��. ISBN 7-111-10201-0.</para>
       </listitem>
 
       <listitem>
 	<para>FreeBSD From Scratch Second Edition (�������),
 	  China Machine Press ȯ��. ISBN
 	  7-111-10286-X.</para>
       </listitem>
 
       <listitem>
 	<para>FreeBSD �ϥ�ɥ֥å��� 2 �� (���λ�������), <link
 	    xlink:href="http://www.ptpress.com.cn/">Posts &amp;
 	    Telecom Press</link> ȯ��. ISBN 7-115-10541-3.</para>
       </listitem>
 
       <listitem>
 	<para>FreeBSD &amp; Windows (�������),
 	  <link xlink:href="http://www.tdpress.com/">China Railway
 	    Publishing House</link> ȯ��. ISBN 7-113-03845-X</para>
       </listitem>
 
       <listitem>
 	<para>FreeBSD Internet Services HOWTO (�������),
 	  China Railway Publishing House ȯ��. ISBN
 	  7-113-03423-3</para>
       </listitem>
 
       <listitem>
 	<para>FreeBSD���祭�å� AT�ߴ����� �����ǡ� ��ֿ��� ����
 	  ���¥����ƥࡣ ISBN 4-87966-535-5 C3055 2900 �ߡ�</para>
       </listitem>
 
       <listitem>
 	<para>�����ޤǤǤ��� FreeBSD �ѥ�����ɡ�
 	  ���� ��, ��ƻ ����, ���� ���� ���� ���¥����ƥࡣ
 	  ISBN 4-87966-637-8 2600�ߡ�</para>
       </listitem>
 
       <listitem>
 	<para><link
 	    xlink:href="http://www.shoeisha.co.jp/book/Detail.asp?bid=650">
 	    FreeBSD������</link>��
 	  ������ ������ / ŷ�� ��ʿ / ��ƣ �Ҽ� / ���� ľ�� / ���� ã�� / ���� ��Ϻ ����
 	  <link xlink:href="http://www.shoeisha.co.jp/">�Ʊ˼�</link>��
 	  ISBN 4-88135-473-6 3600 �ߡ�</para>
       </listitem>
 
       <listitem>
 	<para><link
 	    xlink:href="http://www.ascii.co.jp/pb/book1/shinkan/detail/1322785.html">�ѡ����ʥ�
 	    UNIX �������������å� FreeBSD</link>��
 	  ̱�� ���� / �ž� ���� / ���� ���� / ŷ�� �� / ���� �� ������
 	  <link xlink:href="http://www.ascii.co.jp/">��������</link>��
 	  ISBN 4-7561-1733-3 3000 �ߡ�</para>
       </listitem>
 
       <listitem>
 	<para>FreeBSD �ϥ�ɥ֥å� (���ܸ���)��
 	  <link xlink:href="http://www.ascii.co.jp/">��������</link>��
 	  ISBN 4-7561-1580-2 3800 �ߡ�</para>
       </listitem>
 
       <listitem>
 	<para>FreeBSD mit Methode (�ɥ��ĸ���)��
 	  <link xlink:href="http://www.cul.de">Computer und Literatur
 	    Verlag</link>/Vertrieb Hanser ȯ�ԡ�1998�� ISBN
 	  3-932311-31-0</para>
       </listitem>
 
       <listitem>
 	<para><link
 	    xlink:href="http://www.mitp.de/vmi/mitp/detail/pWert/1343/">
 	    FreeBSD de Luxe</link> (�ɥ��ĸ�),
 	  <link xlink:href="http://www.mitp.de">Verlag Modere
 	    Industrie</link> ȯ��, 2003 ǯ��ISBN 3-8266-1343-0.
 	</para>
       </listitem>
 
       <listitem>
 	<para><link
 	    xlink:href="http://www.pc.mycom.co.jp/FreeBSD/install-manual.html">FreeBSD
 	    ���󥹥ȡ��� &amp; ���ѥޥ˥奢��</link>,
 	  <link xlink:href="http://www.pc.mycom.co.jp/">
 	    �������ߥ�˥��������</link>ȯ�ԡ�1998 ǯ. ISBN
 	  4-8399-0112-0.</para>
       </listitem>
 
       <listitem>
 	<para>Onno W Purbo, Dodi Maryanto, Syahrial Hubbany, Widjil
 	  Widodo �� <emphasis><link
 	    xlink:href="http://maxwell.itb.ac.id/">FreeBSD
 	    ��Ȥä����󥿡��ͥåȥ����Фι��� (Building Internet Server
 	    with FreeBSD)</link></emphasis> (����ɥͥ�����),
 	  <link xlink:href="http://www.elexmedia.co.id/">Elex
 	    Media Komputindo</link> ȯ�ԡ�</para>
       </listitem>
 
       <listitem>
 	<para>Absolute BSD: The Ultimate Guide to FreeBSD
 	  (���������) <link
 	    xlink:href="http://www.grandtech.com.tw/">GrandTech
 	    Press</link> ȯ�� (2003 ǯ)��ISBN 986-7944-92-5.</para>
       </listitem>
 
       <listitem>
 	<para><link xlink:href="http://www.twbsd.org/cht/book/">The
 	    FreeBSD 6.0 Book</link> (�������),
 	  Drmaster ȯ�� (2006 ǯ)��ISBN 9-575-27878-X.</para>
       </listitem>
 
     </itemizedlist>
 
     <para><emphasis>�Ѹ�ν���:</emphasis></para>
 
     <itemizedlist>
       <listitem>
 	<para><link
 	    xlink:href="http://www.absoluteFreeBSD.com/">Absolute
 	    FreeBSD, 2nd Edition:  The Complete Guide to
 	    FreeBSD</link>, <link
 	    xlink:href="http://www.nostarch.com/">No Starch
 	    Press</link> ����2007 ǯ��ISBN: 978-1-59327-151-0</para>
       </listitem>
 
       <listitem>
 	<para><link
 	    xlink:href="http://www.freebsdmall.com/cgi-bin/fm/bsdcomp">
 	    The Complete FreeBSD</link>,
 	  <link xlink:href="http://www.oreilly.com/">O'Reilly</link>��
 	  2003 ǯ��ISBN: 0596005164</para>
       </listitem>
 
       <listitem>
 	<para><link
 	    xlink:href="http://www.freebsd-corp-net-guide.com/">The
 	    FreeBSD Corporate Networker's Guide</link>,
 	  <link
 	    xlink:href="http://www.awl.com/aw/">Addison-Wesley</link> ����
 	  2000 ǯ��ISBN: 0201704811</para>
       </listitem>
 
       <listitem>
 	<para><link
 	    xlink:href="http://andrsn.stanford.edu/FreeBSD/introbook/">
 	    FreeBSD: An Open-Source Operating System for Your Personal
 	    Computer</link>��The Bit Tree Press ����2001 ǯ��
 	  ISBN: 0971204500</para>
       </listitem>
 
       <listitem>
 	<para>Teach Yourself FreeBSD in 24 Hours, <link
 	    xlink:href="http://www.samspublishing.com/">Sams</link> ����
 	  2002 ǯ��ISBN: 0672324245</para>
       </listitem>
 
       <listitem>
 	<para>FreeBSD 6 unleashed, <link
 	    xlink:href="http://www.samspublishing.com/">Sams</link> ����
 	  2006 ǯ��ISBN: 0672328755</para>
       </listitem>
 
       <listitem>
 	<para>FreeBSD: The Complete Reference, <link
 	    xlink:href="http://books.mcgraw-hill.com">McGrawHill</link> ����
 	  2003 ǯ��ISBN: 0072224096</para>
       </listitem>
     </itemizedlist>
   </sect1>
 
   <sect1 xml:id="bibliography-userguides">
     <title>���ѼԸ����Υ�����</title>
 
     <itemizedlist>
       <listitem>
 	<para>���ϥ�����Ω��ؤˤ�� <link
 	    xlink:href="http://www.cs.duke.edu/csl/docs/unix_course/">UNIX
 	    Introductory Course</link>��
 	  ����饤��� HTML �Ǥ� PostScript �Ǥ����Ѳ�ǽ��</para>
 
 	<para>FreeBSD �����ꥢ��ɥ�����ơ������ץ��������Ȥΰ��
 	  �Ȥ��ơ����Υɥ�����Ȥ� <link
 	    xlink:href="&url.doc.base;/it_IT.ISO8859-15/books/unix-introduction/index.html">�����ꥢ����</link>
 	  ���Ѱդ���Ƥ��ޤ���</para>
       </listitem>
 
       <listitem>
 	<para><link xlink:href="http://www.jp.FreeBSD.org/">FreeBSD
 	    ͧ�β� jpman �ץ���������</link>��<link
 	    xlink:href="http://www.pc.mycom.co.jp/FreeBSD/urm.html">FreeBSD
 	    User's Reference Manual</link> (���ܸ���)��
 	  <link xlink:href="http://www.pc.mycom.co.jp/">�������ߥ�˥��������</link>,
 	  1998��ISBN4-8399-0088-4 P3800E��</para>
       </listitem>
 
       <listitem>
 	<para><link xlink:href="http://www.ed.ac.uk/">Edinburgh
 	    University</link> �ˤ�� UNIX �Ķ��ν鿴�Ը���
 	  <link xlink:href="http://unixhelp.ed.ac.uk/">����饤�󥬥���</link>��</para>
       </listitem>
     </itemizedlist>
   </sect1>
 
   <sect1 xml:id="bibliography-adminguides">
     <title>�����Ը����Υ�����</title>
 
     <itemizedlist>
       <listitem>
 	<para><link xlink:href="http://www.jp.FreeBSD.ORG/">FreeBSD
 	    ͧ�β� jpman �ץ���������</link>��<link
 	    xlink:href="http://www.pc.mycom.co.jp/FreeBSD/sam.html">FreeBSD
 	    System Administrator's Manual</link> (���ܸ���)��
 	  <link xlink:href="http://www.pc.mycom.co.jp/">�������ߥ�˥��������</link>,
 	  1998.  ISBN4-8399-0109-0
 	  P3300E.</para>
       </listitem>
 
       <listitem>
 	<para>Dreyfus, Emmanuel.  <link
 	    xlink:href="http://www.eyrolles.com/Informatique/Livre/9782212114638/">Cahiers
 	  de l'Admin: BSD</link> �� 2 �ǡ�(�ե�󥹸졢�ִ����ԥΡ��ȡ�)��Eyrolles,
 	  2004.  ISBN 2-212-11463-X</para>
       </listitem>
     </itemizedlist>
   </sect1>
 
   <sect1>
     <title>�ץ�����޸����Υ�����</title>
 
     <itemizedlist>
       <listitem>
 	<para>Computer Systems Research Group, UC Berkeley.
 	  <emphasis>4.4BSD Programmer's Reference Manual</emphasis>.
 	  O'Reilly &amp; Associates, Inc., 1994.  ISBN
 	  1-56592-078-3</para>
       </listitem>
 
       <listitem>
 	<para>Computer Systems Research Group, UC Berkeley.
 	  <emphasis>4.4BSD Programmer's Supplementary
 	    Documents</emphasis>.  O'Reilly &amp; Associates, Inc.,
 	  1994.  ISBN 1-56592-079-1</para>
       </listitem>
 
       <listitem>
 	<para>Harbison, Samuel P. and Steele, Guy L. Jr. <emphasis>C:
 	    A Reference Manual</emphasis>.  4th Ed. Prentice Hall,
 	  1995.  ISBN 0-13-326224-3
 	  (����: ˮ���ϰʲ��Τ�Τ����Ǥ���Ƥ��ޤ���
 	  ��ƣ ���˴�����
 	  <emphasis>�������� C �����ե����
 	    [H&amp;S��ե����]</emphasis>��
 	  ���եȥХ�, 1994��
 	  ISBN 4-89052-506-8
 	  ���ܤ��� 4 �Ǥ���, ���Ф��� 3 �ǤΤߡ�)</para>
       </listitem>
 
       <listitem>
 	<para>Kernighan, Brian and Dennis M. Ritchie.  <emphasis>The C
 	    Programming Language</emphasis>.  2nd Ed. PTR Prentice
 	  Hall, 1988.  ISBN 0-13-110362-8
 	  (����: ˮ���ϰʲ��Τ�Τ����Ǥ���Ƥ��ޤ���
 	  ���� ���� ����
 	  <emphasis>�ץ�����ߥ󥰸��� C �� 2 ��(����������)</emphasis>
 	  ������, 1989��
 	  ISBN 4-320-02692-6)</para>
       </listitem>
 
       <listitem>
 	<para>Lehey, Greg.  <emphasis>Porting UNIX
 	    Software</emphasis>.  O'Reilly &amp; Associates, Inc.,
 	  1995.  ISBN 1-56592-126-7</para>
       </listitem>
 
       <listitem>
 	<para>Plauger, P. J. <emphasis>The Standard C
 	    Library</emphasis>. Prentice Hall, 1992.
 	  ISBN 0-13-131509-9
 	  (����: ˮ���ϰʲ��Τ�Τ����Ǥ���Ƥ��ޤ���
 	  ʡ�� �� / ���� ��ɧ / ���� �ò� ����
 	  <emphasis>ɸ�� C �饤�֥�� ANSI/ISO/JIS C����</emphasis>.
 	  �ȥåѥ�, 1995��
 	  ISBN 4-8101-8541-9)</para>
       </listitem>
 
       <listitem>
 	<para>Spinellis, Diomidis.  <link
 	    xlink:href="http://www.spinellis.gr/codereading/"><emphasis>Code
 	      Reading: The Open Source Perspective</emphasis></link>.
 	  Addison-Wesley, 2003.  ISBN 0-201-79940-5</para>
       </listitem>
 
       <listitem>
 	<para>Spinellis, Diomidis.  <link
 	    xlink:href="http://www.spinellis.gr/codequality/"><emphasis>Code
 	      Quality: The Open Source Perspective</emphasis></link>.
 	  Addison-Wesley, 2006.  ISBN 0-321-16607-8</para>
       </listitem>
 
       <listitem>
 	<para>Stevens, W. Richard and Stephen A. Rago.
 	  <emphasis>Advanced Programming in the UNIX
 	    Environment</emphasis>.  2nd Ed. Reading, Mass. :
 	  Addison-Wesley, 2005.  ISBN 0-201-43307-9
 	  (����: �� 1 �Ǥ�ˮ���ϰʲ��Τ�Τ����Ǥ���Ƥ��ޤ���
 	  ���� ��ͺ ����
 	  <emphasis>�ܲ� UNIX �ץ�����ߥ�</emphasis>���ȥåѥ�, 1994��
 	  ISBN 4-89052-524-6)</para>
       </listitem>
 
       <listitem>
 	<para>Stevens, W. Richard. <emphasis>UNIX Network
 	    Programming</emphasis>. 2nd Ed. PTR Prentice Hall, 1998.
 	  ISBN 0-13-949876-1
 	  (����:
 	  �� 1 �Ǥ�ˮ���ϰʲ��Τ�Τ����Ǥ���Ƥ��ޤ�.
 	  ���� �۰� ��.
 	  <emphasis>UNIX �ͥåȥ���ץ�����ߥ�</emphasis>��
 	  �ȥåѥ�, 1992.
 	  ISBN 4-8101-8509-5)
 	  �� 2 �Ǥ�ˮ���ϰʲ��Τ�Τ����Ǥ���Ƥ��ޤ���
 	  ���� �۰� ��.
 	  <emphasis>UNIX �ͥåȥ���ץ�����ߥ� �� 2 �� Vol.1</emphasis>��
 	  �ȥåѥ�, 1999��
 	  ISBN 4-8101-8612-1)</para>
       </listitem>
     </itemizedlist>
   </sect1>
 
   <sect1>
     <title>���ڥ졼�ƥ��󥰥����ƥ�����</title>
 
     <itemizedlist>
       <listitem>
 	<para>Andleigh, Prabhat K.  <emphasis>UNIX System
 	    Architecture</emphasis>.  Prentice-Hall, Inc., 1990.  ISBN
 	  0-13-949843-5</para>
       </listitem>
 
       <listitem>
 	<para>Jolitz, William.  <quote>Porting UNIX to the
 	    386</quote>.  <emphasis>Dr. Dobb's Journal</emphasis>.
 	  January 1991-July 1992.</para>
       </listitem>
 
       <listitem>
 	<para>Leffler, Samuel J., Marshall Kirk McKusick, Michael J
 	  Karels and John Quarterman <emphasis>The Design and
 	    Implementation of the 4.3BSD UNIX Operating
 	    System</emphasis>.  Reading, Mass. : Addison-Wesley, 1989.
 	  ISBN 0-201-06196-1
 	  (����: ˮ���ϰʲ��Τ�Τ����Ǥ���Ƥ��ޤ���
 	  ��¼ �� / ���� �� / �� ���� / ���� ��ʿ ����
 	  <emphasis>UNIX 4.3BSD���߷פȼ���</emphasis>������, 1991��
 	  ISBN 4-621-03607-6)</para>
       </listitem>
 
       <listitem>
 	<para>Leffler, Samuel J., Marshall Kirk McKusick,
 	  <emphasis>The Design and Implementation of the 4.3BSD UNIX
 	    Operating System: Answer Book</emphasis>.  Reading, Mass.
 	  : Addison-Wesley, 1991.  ISBN 0-201-54629-9
 	  (����: ˮ���ϰʲ��Τ�Τ����Ǥ���Ƥ��ޤ���
 	  ���� �� / �� ���� / ���� ��ʿ ����
 	  <emphasis>UNIX 4.3BSD���߷פȼ���</emphasis>��
 	  ���󥵡��֥å�, �ȥåѥ�, 1991��
 	  ISBN 4-8101-8039-5)</para>
       </listitem>
 
       <listitem>
 	<para>McKusick, Marshall Kirk, Keith Bostic, Michael J Karels,
 	  and John Quarterman. <emphasis>The Design and
 	    Implementation of the 4.4BSD Operating System</emphasis>.
 	  Reading, Mass. : Addison-Wesley, 1996.  ISBN
 	  0-201-54979-4</para>
 
 	<para>(�����ܤ�����Ϥ� FreeBSD �ɥ�����ơ������ץ���������
 	  �ΰ����Ȥ��� <link
 	    xlink:href="&url.books.design-44bsd;/book.html">����饤��</link>
 	  �Ǹ�������Ƥ��ޤ���)</para>
       </listitem>
 
       <listitem>
 	<para>Marshall Kirk McKusick, George V. Neville-Neil
 	  <emphasis>The Design and Implementation of the FreeBSD
 	    Operating System</emphasis>.  Boston, Mass. :
 	  Addison-Wesley, 2004.  ISBN 0-201-70245-2</para>
       </listitem>
 
       <listitem>
 	<para>Marshall Kirk McKusick, George V. Neville-Neil,
 	  Robert N. M. Watson <emphasis>The Design and Implementation
 	    of the FreeBSD Operating System, 2nd Ed.</emphasis>.
 	  Westford, Mass. : Pearson Education, Inc., 2014.
 	  ISBN 0-321-96897-2</para>
       </listitem>
 
       <listitem>
 	<para>Stevens, W. Richard.  <emphasis>TCP/IP Illustrated,
 	    Volume 1: The Protocols</emphasis>.  Reading, Mass. :
 	  Addison-Wesley, 1996. ISBN 0-201-63346-9</para>
       </listitem>
 
       <listitem>
 	<para>Schimmel, Curt.  <emphasis>Unix Systems for Modern
 	    Architectures</emphasis>.  Reading, Mass. :
 	  Addison-Wesley, 1994.  ISBN 0-201-63338-8</para>
       </listitem>
 
       <listitem>
 	<para>Stevens, W. Richard. <emphasis>TCP/IP Illustrated,
 	    Volume 3: TCP for Transactions, HTTP, NNTP and the UNIX
 	    Domain Protocols</emphasis>.  Reading, Mass. :
 	  Addison-Wesley, 1996.  ISBN 0-201-63495-3
 	  (����: ˮ���ϰʲ��Τ�Τ����Ǥ���Ƥ��ޤ���
 	  ���� ���� / ���� ͵�� / ���� ���� ����
 	  <emphasis>�ܲ� TCP/IP Vol.3: �ȥ�󥶥������
 	    TCP, HTTP, NNTP, UNIX �ɥᥤ��ץ��ȥ���</emphasis>,
 	  �������󥦥����쥤�ѥ֥�å��㡼������ѥ�, 1998��
 	  ISBN 4-8101-8039-5)</para>
       </listitem>
 
       <listitem>
 	<para>Vahalia, Uresh.  <emphasis>UNIX Internals -- The New
 	  Frontiers</emphasis>.	 Prentice Hall, 1996.  ISBN
 	  0-13-101908-2
 	  (����: ˮ���ϰʲ��Τ�Τ����Ǥ���Ƥ��ޤ���
 	  ���� �ѹ� / ��¼ �� / ���� ���� / ���� �ٹ� ����
 	  <emphasis>������UNIX�Υ����ͥ�</emphasis>,
 	  �ԥ����󥨥ǥ奱�������, 2000��
 	  ISBN 4-89471-189-3)</para>
       </listitem>
 
       <listitem>
 	<para>Wright, Gary R. and W. Richard Stevens.
 	  <emphasis>TCP/IP Illustrated, Volume 2: The
 	    Implementation</emphasis>.  Reading, Mass. :
 	  Addison-Wesley, 1995.  ISBN 0-201-63354-X</para>
       </listitem>
 
       <listitem>
 	<para>Messmer, Hans-Peter.  <emphasis>The Indispensable PC
 	    Hardware Book</emphasis>, 4th Ed. Reading, Mass :
 	  Addison-Wesley Pub. Co., 2002.  ISBN 0-201-59616-4</para>
       </listitem>
 
     </itemizedlist>
   </sect1>
 
   <sect1>
     <title>�������ƥ��λ��ͻ���</title>
 
     <itemizedlist>
       <listitem>
 	<para>Cheswick, William R. and Steven M. Bellovin.
 	  <emphasis>Firewalls and Internet Security: Repelling the
 	    Wily Hacker</emphasis>.  Reading, Mass. : Addison-Wesley,
 	  1995.  ISBN 0-201-63357-4
 	  (����: ˮ���ϰʲ��Τ�Τ����Ǥ���Ƥ��ޤ���
 	  ���� �� ������<emphasis>�ե�������������</emphasis>��
 	  ���եȥХ�, 1995��
 	  ISBN 4-89052-672-2)</para>
       </listitem>
 
       <listitem>
 	<para>Garfinkel, Simson.  <emphasis>PGP Pretty Good
 	    Privacy</emphasis> O'Reilly &amp; Associates, Inc., 1995.
 	  ISBN 1-56592-098-8</para>
       </listitem>
     </itemizedlist>
   </sect1>
 
   <sect1 xml:id="bibliography-hardware">
     <title>�ϡ��ɥ������λ��ͻ���</title>
 
     <itemizedlist>
       <listitem>
 	<para>Anderson, Don and Tom Shanley.  <emphasis>Pentium
 	    Processor System Architecture</emphasis>.  2nd Ed.
 	  Reading, Mass. : Addison-Wesley, 1995.  ISBN
 	  0-201-40992-5</para>
       </listitem>
 
       <listitem>
 	<para>Ferraro, Richard F. <emphasis>Programmer's Guide to the
 	    EGA, VGA, and Super VGA Cards</emphasis>.  3rd ed.
 	  Reading, Mass. : Addison-Wesley, 1995.  ISBN
 	  0-201-62490-7</para>
       </listitem>
 
       <listitem>
 	<para>Intel Corporation �ϡ����Ҥ� CPU
 	  ����åץ��åȤ˴ؤ���ʸ��򼫼Ҥ�
 	  <link xlink:href="http://developer.intel.com/">��ȯ�Ը��� Web
 	    ������</link> �Ǹ������Ƥ��ޤ���ʸ��Υե����ޥåȤ��̾�
 	  PDF �Ǥ���</para>
       </listitem>
 
       <listitem>
 	<para>Shanley, Tom. <emphasis>80486 System
 	    Architecture</emphasis>.  3rd Ed. Reading, Mass. :
 	  Addison-Wesley, 1995.  ISBN 0-201-40994-1</para>
       </listitem>
 
       <listitem>
 	<para>Shanley, Tom. <emphasis>ISA System
 	    Architecture</emphasis>.  3rd Ed. Reading, Mass. :
 	  Addison-Wesley, 1995.  ISBN 0-201-40996-8</para>
       </listitem>
 
       <listitem>
  	<para>Shanley, Tom.  <emphasis>PCI System
 	    Architecture</emphasis>.  4th Ed. Reading, Mass. :
 	  Addison-Wesley, 1999.  ISBN 0-201-30974-2</para>
       </listitem>
 
       <listitem>
 	<para>Van Gilluwe, Frank.  <emphasis>The Undocumented
 	    PC</emphasis>, 2nd Ed.  Reading, Mass: Addison-Wesley Pub.
 	  Co., 1996.  ISBN 0-201-47950-8</para>
       </listitem>
     </itemizedlist>
   </sect1>
 
   <sect1 xml:id="bibliography-history">
     <title>&unix; �����</title>
 
     <itemizedlist>
       <listitem>
 	<para>Lion, John <emphasis>Lion's Commentary on UNIX, 6th Ed.
 	    With Source Code</emphasis>.  ITP Media Group, 1996.  ISBN
 	  1573980137</para>
       </listitem>
 
       <listitem>
 	<para>Raymond, Eric s. <emphasis>The New Hacker's Dictionary,
 	    3rd edition</emphasis>.  MIT Press, 1996.  ISBN
 	  0-262-68092-0 ����� <link
 	    xlink:href="http://www.catb.org/~esr/jargon/html/index.html">���㡼����ե�����
 	    (Jargon File)</link> �Ȥ����Τ��Ƥ��ޤ���</para>
       </listitem>
 
       <listitem>
 	<para>Saulus, Peter H.  <emphasis>A quarter century of
 	    UNIX</emphasis>.  Addison-Wesley Publishing Company, Inc.,
 	  1994.  ISBN 0-201-54777-5</para>
       </listitem>
 
       <listitem>
 	<para>Simon Garfinkel, Daniel Weise, Steven Strassmann.
 	  <emphasis>The UNIX-HATERS Handbook</emphasis>.  IDG Books
 	  Worldwide, Inc., 1994.  ISBN 1-56884-203-1.  ���ǤȤʤ�ޤ�������<link
 	    xlink:href="http://www.simson.net/ref/ugh.pdf">����饤��</link>
 	  ������Ǥ��ޤ���</para>
       </listitem>
 
       <listitem>
 	<para>Don Libes, Sandy Ressler <emphasis>Life with
 	    UNIX</emphasis> &mdash; special edition.  Prentice-Hall,
 	  Inc., 1989.  ISBN 0-13-536657-7
 	  (����: ˮ���ϰʲ��Τ�Τ����Ǥ���Ƥ��ޤ���
 	  ���� ʸ ����. <emphasis>Life with UNIX</emphasis>.
 	  ��������, 1990��
 	  ISBN 4-7561-0783-4
 	  ˮ���� Special �Ǥ����Ф��ݤ�������)</para>
       </listitem>
 
       <listitem>
 	<para><emphasis>BSD �� OS ����</emphasis>��
 	  <uri
 	    xlink:href="https://svnweb.freebsd.org/base/head/share/misc/bsd-family-tree?view=co">https://svnweb.freebsd.org/base/head/share/misc/bsd-family-tree?view=co</uri>
 	  �����⤷���ϡ�FreeBSD �ޥ���ˤ��� <link
 	    xlink:href="file://localhost/usr/share/misc/bsd-family-tree"><filename>/usr/share/misc/bsd-family-tree</filename></link>��</para>
       </listitem>
 
       <listitem>
 	<para><emphasis>Networked Computer Science Technical Reports
 	    Library</emphasis>.  <uri
 	    xlink:href="http://www.ncstrl.org/">http://www.ncstrl.org/</uri></para>
       </listitem>
 
       <listitem>
 	<para><emphasis>Computer Systems Research group (CSRG) ����θŤ�
 	    BSD ��꡼����</emphasis>��<uri
 	    xlink:href="http://www.mckusick.com/csrg/">http://www.mckusick.com/csrg/</uri>:
 	  ���� 4 �� CD ���åȤˤϡ�1BSD ���� 4.4BSD �ޤǤ� 4.4BSD-Lite2
 	  ���ޤޤ�ޤ� (��ǰ�ʤ��� 2.11BSD �ϴޤޤ�Ƥ��ޤ���)��
 	  �ޤ� 4 ���ܤ� CD �ˤϡ��ǽ������������ SCCS
 	  �ե����뤬�ޤޤ�Ƥ��ޤ���</para>
       </listitem>
     </itemizedlist>
   </sect1>
 
   <sect1 xml:id="bibliography-journals">
     <title>�������ʪ�����浪��ӥ��㡼�ʥ�</title>
 
     <itemizedlist>
       <listitem>
 	<para><link
 	    xlink:href="http://www.admin-magazin.de/">Admin
 	    Magazin</link> (in German), published by
 	  Medialinx AG. ISSN: 2190-1066</para>
       </listitem>
 
       <listitem>
 	<para><link xlink:href="http://www.bsdmag.org/">BSD
 	    Magazine</link>, published by Software Press Sp. z o.o.
 	  SK. ISSN: 1898-9144</para>
       </listitem>
 
       <listitem>
 	<para><link
 	    xlink:href="http://www.bsdnow.tv/">BSD Now
 	    &mdash; Video Podcast</link>, published by
 	  Jupiter Broadcasting LLC</para>
       </listitem>
 
       <listitem>
 	<para><link
 	    xlink:href="http://bsdtalk.blogspot.com/">BSD
 	    Talk Podcast</link>, by Will Backman</para>
       </listitem>
 
       <listitem>
 	<para><link
 	    xlink:href="http://freebsdjournal.com/">FreeBSD
 	    Journal</link>, published by S&amp;W
 	  Publishing, sponsored by The FreeBSD Foundation.
 	  ISBN: 978-0-615-88479-0</para>
       </listitem>
     </itemizedlist>
   </sect1>
 </appendix>
Index: user/gjb/releng-rewrite/ja_JP.eucJP/books/handbook/cutting-edge/chapter.xml
===================================================================
--- user/gjb/releng-rewrite/ja_JP.eucJP/books/handbook/cutting-edge/chapter.xml	(revision 49724)
+++ user/gjb/releng-rewrite/ja_JP.eucJP/books/handbook/cutting-edge/chapter.xml	(revision 49725)
@@ -1,2347 +1,2347 @@
 <?xml version="1.0" encoding="euc-jp"?>
 <!--
      The FreeBSD Documentation Project
      The FreeBSD Japanese Documentation Project
 
-     Original revision: r48637
+     Original revision: r49531
      $FreeBSD$
 -->
 <chapter xmlns="http://docbook.org/ns/docbook"
   xmlns:xlink="http://www.w3.org/1999/xlink" version="5.0"
   xml:id="updating-upgrading">
 
   <info>
     <title>&os; �Υ��åץǡ��Ȥȥ��åץ��졼��</title>
 
     <authorgroup>
       <author>
 	<personname>
 	  <firstname>Jim</firstname>
 	  <surname>Mock</surname>
 	</personname>
 	<contrib>�ƹ���������������Ӳ���: </contrib>
       </author>
       <!-- Mar 2000 -->
     </authorgroup>
 
     <authorgroup>
       <author>
 	<personname>
 	  <firstname>Jordan</firstname>
 	  <surname>Hubbard</surname>
 	</personname>
 	<contrib>����: </contrib>
       </author>
 
       <author>
 	<personname>
 	  <firstname>Poul-Henning</firstname>
 	  <surname>Kamp</surname>
 	</personname>
       </author>
 
       <author>
 	<personname>
 	  <firstname>John</firstname>
 	  <surname>Polstra</surname>
 	</personname>
       </author>
 
       <author>
 	<personname>
 	  <firstname>Nik</firstname>
 	  <surname>Clayton</surname>
 	</personname>
       </author>
     </authorgroup>
   </info>
 
   <sect1 xml:id="updating-upgrading-synopsis">
     <title>���ξϤǤ�</title>
 
     <para>�����꡼�����鼡�Υ�꡼���ޤǤδ��֤ˤ⡢
       &os; �γ�ȯ�ϵ٤ߤʤ�³�����Ƥ��ޤ���
       �ǿ��γ�ȯ�ĥ꡼��Ʊ�����뤳�Ȥ򹥤�ͤ⤤�ޤ�����
       �����Υ�꡼���Ǥ򹥤�ǻȤ����⤤�ޤ���
       �������ʤ��顢�����Υ�꡼���Ȥ����ɤ⡢
       �������ƥ���¾�ν��פʽ����Τ��ᡢ���ˤϥ��åץǡ��Ȥ�Ԥ�ɬ�פ�����ޤ���
       ���Ѥ��Ƥ���С������˴ؤ�餺��&os; �ϡ�
       �긵�Υ����ƥ��ǿ��γ�ȯ�ĥ꡼��Ʊ�����뤿���ɬ�פʥġ���򤹤٤��Ѱդ��Ƥ��ޤ���
       �����ơ������Υġ���ϡ�&os; �ΥС������򥢥åץ��졼�ɤ��뤿��˻Ȥ��ޤ���
       ���ξϤǤϡ���ȯ�֥������ɤ���������ˡ������ӡ�&os;
       �����ƥ�򥢥åץǡ��Ȥ������Ū�ʥġ���ˤĤ��Ʋ��⤷�Ƥ��ޤ���</para>
 
     <para>���ξϤ��ɤ��ʬ����Τ�:</para>
 
     <itemizedlist>
       <listitem>
 	<para><application>freebsd-update</application> �⤷����
 	  <application>Subversion</application> 
 	  ��Ȥä� &os; �����ƥ�ι�����ˡ</para>
       </listitem>
 
       <listitem>
 	<para>���󥹥ȡ��뤵��Ƥ��륷���ƥ�ȡ��ѹ����Ԥ��Ƥ��ʤ����֤Ȥ������ˡ��</para>
       </listitem>
 
       <listitem>
 	<para><application>Subversion</application>
 	  �ޤ��ϥɥ�������Ѥ� ports<!-- and
 	  <application>Docsnap</application>--> ��Ȥäơ�
 	  ���󥹥ȡ��뤵��Ƥ���ɥ�����Ȥ�ǿ��Ǥ˥��åץǡ��Ȥ�����ˡ��</para>
       </listitem>
 
       <listitem>
 	<para>2 �Ĥγ�ȯ�֥�����&os.stable; �� &os.current; �ΰ㤤</para>
       </listitem>
 
       <listitem>
 	<para>�١��������ƥ����Τ�ƹ��ۤ����󥹥ȡ��뤹����ˡ</para>
       </listitem>
 
     </itemizedlist>
 
     <para>���ξϤ��ɤ����ˡ��ʲ��ν����򤷤ޤ��礦��</para>
 
     <itemizedlist>
       <listitem>
 	<para>�ͥåȥ����³��Ŭ�ڤ�����
 	  (<xref linkend="advanced-networking"/>)</para>
       </listitem>
       <listitem><para>�����ɥѡ��ƥ����Υ��եȥ������Υ��󥹥ȡ�����ˡ�ν���
         (<xref linkend="ports"/>)</para></listitem>
     </itemizedlist>
 
     <note>
       <para>���ξϤ��̤��ơ�
 	&os; �Υ����������ɤ����������ɤ����ꥢ�åץǡ��Ȥ���Τ�
 	<command>svn</command> ���Ѥ����ޤ���
 	���Υ��ޥ�ɤ�Ȥ�����ˤϡ�<package>devel/subversion</package> port �ޤ��� package
 	�򥤥󥹥ȡ��뤷�Ƥ���ɬ�פ�����ޤ���</para>
     </note>
   </sect1>
 
   <sect1 xml:id="updating-upgrading-freebsdupdate">
     <info>
       <title>&os; Update</title>
 
       <authorgroup>
 	<author>
 	  <personname>
 	    <firstname>Tom</firstname>
 	    <surname>Rhodes</surname>
 	  </personname>
 	  <contrib>���: </contrib>
 	</author>
       </authorgroup>
 
       <authorgroup>
 	<author>
 	  <personname>
 	    <firstname>Colin</firstname>
 	    <surname>Percival</surname>
 	  </personname>
 	  <contrib>�١����Ȥʤä��Ρ��Ȥ���: </contrib>
 	</author>
       </authorgroup>
     </info>
 
     <indexterm>
       <primary>Updating and Upgrading</primary>
     </indexterm>
     <indexterm>
       <primary>freebsd-update</primary>
       <see>updating-upgrading</see>
     </indexterm>
 
     <para>�����ƥ�����ˤ�������פ�¦�̤Ȥ��ơ�
       ���ߤ䤫�˥������ƥ��ѥå���Ŭ�Ѥ���
       ���ڥ졼�ƥ��󥰥����ƥ�򿷤�����꡼���˥��åץ��졼�ɤ��뤳�Ȥ��������ޤ���
       &os; �ˤϡ������ν�����Ԥ������ <command>freebsd-update</command>
       �ȸƤФ��桼�ƥ���ƥ����Ѱդ���Ƥ��ޤ���</para>
 
     <para>���Υ桼�ƥ���ƥ����Ѥ���ȡ�&os; �Υ������ƥ������
       eratta ���åץǡ��Ȥ�Х��ʥ�ˤ�äƹԤ����Ȥ��Ǥ��ޤ���
       ��ư�ǥѥå��⤷���Ͽ����������ͥ�򥳥�ѥ��뤷��
       ���󥹥ȡ��뤹��ɬ�פϤ���ޤ���
       �Х��ʥꥢ�åץǡ��Ȥϡ�
       �������ƥ������ब���ݡ��Ȥ��Ƥ��뤹�٤ƤΥ������ƥ�����ȥ�꡼�������ѤǤ��ޤ���
       <uri xlink:href="http://www.FreeBSD.org/ja/security/">http://www.FreeBSD.org/ja/security/</uri> �ˤϡ�
       ���ݡ��Ȥ��Ԥ��Ƥ����꡼�����ݼ齪λͽ�����ΰ���������ޤ���</para>
 
     <para>���Υ桼�ƥ���ƥ��ϡ��ޥ��ʡ���꡼���Ǥ��ä��ꡢ
       ¾�Υ�꡼���֥����ؤΥ��åץ��졼�ɤˤ��б����Ƥ��ޤ���
       ��������꡼���˥��åץǡ��Ȥ������ˡ�
       ���åץǡ��Ȥ��褦�Ȥ��Ƥ����꡼���Υ��ʥ��󥹤��ܤ��̤���
       ���פʾ��󤬤ʤ����ɤ������ǧ���Ƥ���������
       ��꡼���Υ��ʥ��󥹤� <uri
 	xlink:href="http://www.FreeBSD.org/ja/releases/">http://www.FreeBSD.org/ja/releases/</uri>
       �dz�ǧ�Ǥ��ޤ���</para>
 
     <note>
       <para>�⤷ <command>crontab</command> �����
 	&man.freebsd-update.8; �ε�ǽ���ޤޤ�Ƥ����顢
 	���ڥ졼�ƥ��󥰥����ƥ�Υ��åץ��졼�ɺ�Ȥ򽪤���ޤǤ�̵���ˤ��Ƥ���������</para>
     </note>
 
     <para>������Ǥϡ�<command>freebsd-update</command>
       �ǻȤ�������ե������������
       �������ƥ��ѥå���Ŭ����ˡ�Υǥ�󥹥ȥ졼�����
       ���ڥ졼�ƥ��󥰥����ƥ�򥢥åץ��졼�ɤ���ݤ˹�θ���٤����ȤˤĤ����������ޤ���</para>
 
     <sect2 xml:id="freebsdupdate-config-file">
       <title>����ե�����</title>
 
       <para><command>freebsd-update</command> �Υǥե���Ȥ�����ե�����ϡ�
 	���ΤޤޤǤ��Ѥ��뤳�Ȥ��Ǥ��ޤ���      
 	<filename>/etc/freebsd-update.conf</filename>
 	�������ǥե���Ȥ��餭��٤���Ĵ�����ơ�
 	���åץǡ��ȥץ����������椹��桼���⤤�ޤ���
 	���Υե�����Υ����Ȥˤ��������Ѳ�ǽ�ʥ��ץ������������Ƥ��ޤ�����
 	�ʲ��ι��ܤˤĤ��Ƥ���­��ɬ�פǤ��礦��</para>
 
       <programlisting># Components of the base system which should be kept updated.
 Components world kernel</programlisting>
 
       <para>���Υѥ�᡼���ϡ�&os; �Τɤ���ʬ��ǿ��˰ݻ����뤫�����ꤷ�ޤ���
 	�ǥե���ȤǤϡ��١��������ƥ����Ρ�
 	�����ƥ����ͥ�򥢥åץǡ��Ȥ��ޤ���
 	<literal>src/base</literal> �� <literal>src/sys</literal>
 	�Τ褦�ˡ��ġ��ι��ܤ���ꤹ�뤳�Ȥ�Ǥ��ޤ���
 	������ʬ�ˤĤ��Ƥϥǥե���ȤΤޤޤˤ��Ƥ�����
 	���åץǡ��Ȥ�����ܤ�桼�����ꥹ�Ȥ˲ä�����ˤ���Τ��٥��ȤǤ��礦��
 	�����������ɤȥХ��ʥ꤬Ʊ�����Ƥ��ʤ��ȡ�
 	Ĺ��ǯ��δ֤��Ỵ�ʷ�̤��⤿�餵����ǽ��������ޤ���</para>
 
       <programlisting># Paths which start with anything matching an entry in an IgnorePaths
 # statement will be ignored.
 IgnorePaths /boot/kernel/linker.hints</programlisting>
 
       <para><filename>/bin</filename> �� <filename>/sbin</filename>
 	��������Υǥ��쥯�ȥ�򥢥åץǡ��Ȥ��ѹ����ʤ��褦�ˡ�
 	�����Υѥ����ɲä��Ƥ���������
 	���Υ��ץ����ϡ�����������ѹ����� <command>freebsd-update</command>
 	����񤭤��뤳�Ȥ��ɤ���Ū�ˤ����ѤǤ��ޤ���</para>
 
       <programlisting># Paths which start with anything matching an entry in an UpdateIfUnmodified
 # statement will only be updated if the contents of the file have not been
 # modified by the user (unless changes are merged; see below).
 UpdateIfUnmodified /etc/ /var/ /root/ /.cshrc /.profile</programlisting>
 
       <para>���Υ��ץ����ϡ����ꤷ���ǥ��쥯�ȥ�ˤ�������ե������
 	����������ѹ�����Ƥ��ʤ����Τߥ��åץǡ��Ȥ��ޤ���
 	�桼���������Υե�������ѹ����Ƥ���ȡ�
 	�����Υե�����μ�ư���åץǡ��Ȥ�˸�����ޤ���
 	¾�ˡ�<literal>KeepModifiedMetadata</literal>
 	�Ȥ����̤Υ��ץ����¸�ߤ��ޤ���
 	���Υ��ץ����ϡ�<command>freebsd-update</command>
 	���ޡ�������ѹ�������¸����褦�ˤ��ޤ���</para>
 
       <programlisting># When upgrading to a new &os; release, files which match MergeChanges
 # will have any local changes merged into the version from the new release.
 MergeChanges /etc/ /var/named/etc/ /boot/device.hints</programlisting>
 
       <para><command>freebsd-update</command>
 	���ޡ������٤��ե����뤬¸�ߤ���ǥ��쥯�ȥ�ΰ����Ǥ���
 	�ե�����Υޡ����Υץ������ϡ�
 	&man.mergemaster.8; ��Ʊ�� &man.diff.1; �ѥå���Ϣ³�Ǥ�����
 	�����Ͼ��ʤ����ޡ�����ǧ���뤫�����ǥ�����ư���뤫��
 	<command>freebsd-update</command>
 	�����Ǥ��뤫�ɤ���������Ǥ���������
 	�⤷�����ۤ���������С�
 	<filename>/etc</filename>
 	��Хå����åפ��Ƥ���ޡ�����ǧ���Ƥ���������
 	<command>mergemaster</command> �ξܺ٤ʾ���ˤĤ��Ƥϡ�
 	<xref linkend="mergemaster"/> �dz�ǧ���Ƥ���������</para>
 
       <programlisting># Directory in which to store downloaded updates and temporary
 # files used by &os; Update.
 # WorkDir /var/db/freebsd-update</programlisting>
 
       <para>�����ǤϤ��٤ƤΥѥå���켡�ե�������֤��ǥ��쥯�ȥ����ꤷ�Ƥ��ޤ���
 	�С������򥢥åץ��졼�ɤ���ΤǤ���С�
 	���ξ��ˤϾ��ʤ��Ȥ⥮���Х��Ȥζ������̤�ɬ�פǤ���</para>
 
       <programlisting># When upgrading between releases, should the list of Components be
 # read strictly (StrictComponents yes) or merely as a list of components
 # which *might* be installed of which &os; Update should figure out
 # which actually are installed and upgrade those (StrictComponents no)?
 # StrictComponents no</programlisting>
 
       <para>���Υ��ץ����� <literal>yes</literal> �����ꤹ��ȡ�
 	<command>freebsd-update</command> ��
 	<literal>Components</literal> �Υꥹ�Ȥ���������������Ƚ�Ǥ���
 	���Υꥹ�Ȱʳ����ѹ����ˤĤ��Ƥϼ�갷���ޤ���
 	<command>freebsd-update</command> �ϡ���ΨŪ��
 	<literal>Components</literal>
 	�ꥹ�Ȥ�°����ե�����򥢥åץǡ��Ȥ��ޤ���</para>
     </sect2>
 
     <sect2 xml:id="freebsdupdate-security-patches">
       <title>�������ƥ��ѥå���Ŭ��</title>
 
       <para>&os; �Υ������ƥ��ѥå���Ŭ�Ѥ�������ϴ�ñ�ˤʤ�ޤ�����
 	�����Ԥ� <command>freebsd-update</command> ��Ȥ����Ȥǡ�
 	�����ƥ�����˥ѥå��������ä����֤��ݤĻ����Ǥ��ޤ���
 	&os; �������ƥ�����ξܺ٤ˤĤ��Ƥϡ�
 	<link xlink:href="&url.books.handbook.en;/security-advisories.html">&os; �������ƥ�����</link>
 	<!-- <xref linkend="security-advisories"/> -->
 	�������������Ƥ��ޤ���</para>
 
       <para>�ʲ��Υ��ޥ�ɤ�¹Ԥ���ȡ�&os;
 	�Υ������ƥ��ѥå�������������ɤ��졢���󥹥ȡ��뤵��ޤ���
 	�ǽ�Υ��ޥ�ɤϡ�̤�б��Υѥå������뤫�ɤ�����Ĵ�٤ޤ���
 	�⤷̤�б��Υѥå���������ˤϡ�
 	�ѥå������Ƥ�줿�ݤ��ѹ������ե�����Υꥹ�Ȥ���������ޤ���
 	2 ���ܤΥ��ޥ�ɤϥѥå���Ŭ�Ѥ��ޤ���</para>
 
       <screen>&prompt.root; <userinput>freebsd-update fetch</userinput>
 &prompt.root; <userinput>freebsd-update install</userinput></screen>
 
       <para>���åץǡ��Ȥˤ�äƥ����ͥ�˥ѥå��������ä����ˤϡ�
 	�ѥå��������ä������ͥ�ǵ�ư����褦�ˡ�
 	�����ƥ��Ƶ�ư����ɬ�פ�����ޤ���
 	�⤷���¹���ΥХ��ʥ�˥ѥå������Ƥ�줿���ˤϡ�
 	�ѥå������Ƥ�줿�С������ΥХ��ʥ꤬�Ȥ���褦�ˡ�
 	�ƶ��Τ��륢�ץꥱ��������Ƶ�ư����ɬ�פ�����ޤ���</para>
 
       <para>�������٥��åץǡ��Ȥ��ʤ����ɤ�����ưŪ�˳�ǧ����褦�����ꤹ��ˤϡ�
 	�ʲ��Υ���ȥ�� <filename>/etc/crobntab</filename>
 	���ɲä��Ƥ���������</para>
 
       <programlisting>@daily                                  root    freebsd-update cron</programlisting>
 
       <para>�ѥå���¸�ߤ���ȡ�
 	��ưŪ�˥���������ɤ���ޤ�����Ŭ�ѤϤ���ޤ���
 	<systemitem class="username">root</systemitem>���Ƥ˥᡼��ǡ�
 	����������ɤ��줿�ѥå����ǧ����
 	<command>freebsd-update install</command>
 	�ȤȤ�˼�ư�ǥ��󥹥ȡ��뤹��ɬ�פΤ��뤳�Ȥ����Τ���ޤ���</para>
 
       <para>���ޤ��Ԥ��ʤ��ä����ˤϡ�<command>freebsd-update</command>
 	��ʲ��Τ褦�˼¹Ԥ���ȡ��Ǹ���ѹ��ޤǥ�����Хå��Ǥ��ޤ���</para>
 
       <screen>&prompt.root; <userinput>freebsd-update rollback</userinput>
 Uninstalling updates... done.</screen>
 
       <para>�����ͥ�ޤ��ϥ����ͥ�⥸�塼�뤬���åץǡ��Ȥ��줿���ˤϡ�
 	��λ��ˤ⤦���٥����ƥ��Ƶ�ư���ơ�
 	�ƶ��Τ��ä��Х��ʥ��Ƶ�ư���Ƥ���������</para>
 
       <para><command>freebsd-update</command>
 	�桼�ƥ���ƥ�����ưŪ�˥��åץǡ��Ȥ��륫���ͥ��
 	<filename>GENERIC</filename> �ΤߤǤ���
 	�������५���ͥ뤬���󥹥ȡ��뤵��Ƥ�����ˤϡ�
 	<command>freebsd-update</command> �����󥹥ȡ��뤷���塢
 	�����ͥ��ƹ��ۤ����⤦���٥��󥹥ȡ��뤹��ɬ�פ�����ޤ���
 	�������ʤ��顢<filename>GENERIC</filename> �����ͥ뤬
 	<filename>/boot/GENERIC</filename> ��¸�ߤ�����ˤϡ�
 	���ߤΥ����ƥ�Ǽ¹Ԥ���Ƥ��륫���ͥ�Ǥʤ��Ȥ⡢
 	<command>freebsd-update</command>
 	�ˤ�ꥢ�åץǡ��Ȥ���ޤ���</para>
 
       <note>
 	<para><filename>GENERIC</filename> �����ͥ��
 	  ��� <filename>/boot/GENERIC</filename> ���֤��Ƥ����Ƥ���������
 	  ���ޤ��ޤ�������褹��ݤ䡢
 	  �С������򥢥åץ��졼�ɤ���ݤ˽����Ȥʤ�ޤ���
 	  <filename>GENERIC</filename> �����ͥ���Ѱդ�����ˡ�ˤĤ��Ƥϡ�
 	  <xref linkend="freebsd-update-custom-kernel-9x"/>
 	  �򻲾Ȥ��Ƥ���������</para>
       </note>
 
       <para><filename>/etc/freebsd-update.conf</filename>
 	�Υǥե���Ȥ�������ѹ����ʤ��¤ꡢ
 	<command>freebsd-update</command> �ϡ�
 	¾�ι����ȶ��˥����ͥ륽�����򥢥åץǡ��Ȥ��ޤ���
 	�������������५���ͥ�κƹ��ۤȺƥ��󥹥ȡ���ϡ�
 	�̾��̤�Ԥ����Ȥ��Ǥ��ޤ���</para>
 
       <para><command>freebsd-update</command> �ϡ�
 	��˥����ͥ�򥢥åץǡ��Ȥ���Ȥϸ¤�ޤ���
 	<command>freebsd-update install</command>
 	�ˤ�äƥ����ͥ륽�������ѹ�����ʤ��ä����ˤϡ�
 	�������५���ͥ��ƹ��ۤ���ɬ�פϤ���ޤ���
 	�������ʤ��� <command>freebsd-update</command> �ϡ�
 	<filename>/usr/src/sys/conf/newvers.sh</filename>
 	���˥��åץǡ��Ȥ��ޤ���
 	����ϡ����ߤΥ����ƥ�Υѥå���٥��
 	<command>uname -r</command> �� <literal>-p</literal>
 	��ɽ��������ˤ��Υե����뤬���Ȥ���ޤ���
 	���Τ��ᡢ�����ѹ�����Ƥ��ʤ����Ǥ⡢
 	�������५���ͥ��ƹ��ۤ��뤳�Ȥˤ�ꡢ
 	<command>uname</command> �������ƥ�����Τʥѥå���٥����𤹤�褦�ˤʤ�ޤ���
 	�ƥ����ƥ�˥��󥹥ȡ��뤵��Ƥ��륢�åץǡ��Ȥ򤹤Ф䤯�İ��Ǥ���褦�ˤʤ�Τǡ�
 	�ä�ʣ���Υ����ƥ���������Ȥ��˽����Ȥʤ�ޤ���</para>
     </sect2>
 
     <sect2 xml:id="freebsdupdate-upgrade">
       <title>�᥸�㡼����ӥޥ��ʡ��С������Υ��åץ��졼�ɤ�Ԥ�</title>
 
       <para>&os; �Υޥ��ʡ��С������֤Υ��åץ��졼�ɡ�
 	���Ȥ��С�&os;&nbsp;9.0 ���� &os;&nbsp;9.1 �ؤΥ��åץ��졼�ɤϡ�
 	<emphasis>�ޥ��ʡ��С������</emphasis> ���åץ��졼�ɤȸƤФ�ޤ���
 	<emphasis>�᥸�㡼�С������</emphasis> ���åץ��졼�ɤϡ�
 	&os;&nbsp;9.X ���� &os;&nbsp;10.X �ؤΥ��åץ��졼�ɤȤ��ä���
 	&os; �Υ᥸�㡼�С�������Ѥ��褦�ʥ��åץ��졼�ɤΤ��ȤǤ���
 	�ɤ���Υ��åץ��졼�ɤ��꡼���ֹ�Υ������åȤ���ꤹ����ǡ�
 	<command>freebsd-update</command> �ˤ�äƹԤ������Ǥ��ޤ���</para>
 
       <note>
 	<para>�������५���ͥ��ȤäƤ��륷���ƥ�Ǥϡ�
 	  ���åץ��졼�ɤ�Ԥ�����
 	  <filename>GENERIC</filename> �����ͥ뤬��
 	  <filename>/boot/GENERIC</filename>
 	  ���֤���Ƥ�������ǧ���Ƥ���������
 	  <filename>GENERIC</filename> �����ͥ���Ѱդ�����ˡ�ˤĤ��Ƥϡ�
 	  <xref linkend="freebsd-update-custom-kernel-9x"/>
 	  �򻲾Ȥ��Ƥ���������</para>
       </note>
 
       <para>�ʲ��Υ��ޥ�ɤ�¹Ԥ���ȡ�&os;&nbsp;9.0
 	�Υ����ƥ�� &os;&nbsp;9.1 �˥��åץ��졼�ɤ��ޤ���</para>
 
       <screen>&prompt.root; <userinput>freebsd-update -r 9.1-RELEASE upgrade</userinput></screen>
 
       <para>���ޥ�ɤ�¹Ԥ���ȡ�<command>freebsd-update</command>
 	������ե�����ȸ��ߤΥ����ƥ��ɾ������
 	���åץǡ��Ȥ��뤿���ɬ�פʾ����������ޤ���
 	���̤ˤϡ��ɤΥ���ݡ��ͥ�Ȥ�ǧ�����졢
 	�ɤΥ���ݡ��ͥ�Ȥ�ǧ������Ƥ��ʤ��Ȥ��ä��ꥹ�Ȥ�ɽ������ޤ���
 	���Ȥ��аʲ��Τ褦��ɽ������ޤ���</para>
 
       <screen>Looking up update.FreeBSD.org mirrors... 1 mirrors found.
 Fetching metadata signature for 9.0-RELEASE from update1.FreeBSD.org... done.
 Fetching metadata index... done.
 Inspecting system... done.
 
 The following components of FreeBSD seem to be installed:
 kernel/smp src/base src/bin src/contrib src/crypto src/etc src/games
 src/gnu src/include src/krb5 src/lib src/libexec src/release src/rescue
 src/sbin src/secure src/share src/sys src/tools src/ubin src/usbin
 world/base world/info world/lib32 world/manpages
 
 The following components of FreeBSD do not seem to be installed:
 kernel/generic world/catpages world/dict world/doc world/games
 world/proflibs
 
 Does this look reasonable (y/n)? <userinput>y</userinput></screen>
 
       <para>�����ǡ�<command>freebsd-update</command>
 	�ϥ��åץ��졼�ɤ�ɬ�פʤ��٤ƤΥե���������������ɤ��ޤ���
 	���򥤥󥹥ȡ��뤷���ɤΤ褦�˿ʤफ�Ȥ��ä�����򤵤�뤳�Ȥ⤢��ޤ���</para>
 
       <para>�������५���ͥ��ȤäƤ���ȡ�
 	�嵭�Υ��ƥåפǰʲ��Τ褦�ʷٹ�ɽ������ޤ���</para>
 
       <screen>WARNING: This system is running a "<replaceable>MYKERNEL</replaceable>" kernel, which is not a
 kernel configuration distributed as part of FreeBSD 9.0-RELEASE.
 This kernel will not be updated: you MUST update the kernel manually
 before running "/usr/sbin/freebsd-update install"</screen>
 
       <para>���λ����ǤϤ��ηٹ��̵�뤷�Ƥ⤫�ޤ��ޤ���
 	���åץǡ��Ȥ��줿 <filename>GENERIC</filename> �����ͥ�ϡ�
 	���åץ��졼�ɥץ���������������Ѥ���ޤ���</para>
 
       <para>���٤ƤΥѥå����������륷���ƥ�إ���������ɤ��줿�顢
 	���˥ѥå���Ŭ�Ѥ���ޤ���
 	���Υץ������ˤϻ��֤�������ޤ���
 	���λ��֤ϥ���ԥ塼������ǽ�ȥ�������ɤ˰�¸���ޤ���
 	���θ塢����ե����뤬�ޡ�������ޤ���
 	���Υץ������Ǥϡ��桼���ϥե������ޡ������뤫��
 	���̾�˥��ǥ�����Ω���夲�Ƽ�ư�ǥޡ������뤫��Ҥͤ��ޤ���
 	�ץ��������ʤऴ�Ȥˡ����������ޡ����Τ��٤Ƥη�̤ξ��󤬥桼���˼�����ޤ���
 	�ޡ����˼��Ԥ����ꡢ̵�뤷�����ˤϡ��ץ����������Ǥ��ޤ���
 	�桼���ˤ�äƤ� <filename>/etc</filename>
 	�ΥХå����åפ��ꡢ
 	<filename>master.passwd</filename> �� <filename>group</filename>
 	�Τ褦�ʽ��פʥե�������Ǽ�ư�ǥޡ����������⤤�ޤ���</para>
 
       <note>
 	<para>���٤ƤΥѥå����̤Υǥ��쥯�ȥ�ǥޡ�������Ƥ��ꡢ
 	  �ޤ��������ƥ�ˤ�ȿ�Ǥ���Ƥ��ޤ���
 	  ���٤ƤΥѥå���������Ŭ�Ѥ��졢
 	  ���٤Ƥ�����ե����뤬�ޡ�������ƥץ����������ࡼ���˿ʤ���顢
 	  �桼���ϰʲ��Υ��ޥ�ɤ��Ѥ��ơ�
 	  �ѹ�����ǥ�������ȿ�Ǥ��Ƥ���������</para>
 
 	<screen>&prompt.root; <userinput>freebsd-update install</userinput></screen>
 
       </note>
 
       <para>�ѥå��Ϻǽ�˥����ͥ�ȥ����ͥ�⥸�塼����Ф������Ƥ��ޤ���
 	�����ƥब�������५���ͥ��¹Ԥ��Ƥ�����ˤϡ�
 	&man.nextboot.8; ��ȤäƼ���κƵ�ư���Υ����ͥ��
 	���åץǡ��Ȥ��줿 <filename>/boot/GENERIC</filename>
 	�����ꤷ�Ƥ���������</para>
 
       <screen>&prompt.root; <userinput>nextboot -k GENERIC</userinput></screen>
 
       <warning>
 	<para><filename>GENERIC</filename> �����ͥ�ǺƵ�ư�������ˡ�
 	  �����ͥ�˥����ƥबŬ�ڤ˵�ư���뤿���ɬ�פʤ��٤ƤΥɥ饤�Ф��ޤޤ�Ƥ��뤳�ȡ�
 	  �⤷���åץǡ��Ȥ��Ƥ��륳��ԥ塼������⡼�Ȥǥ����������Ƥ���ΤǤ���С�
 	  �ͥåȥ����³��ɬ�פʤ��٤ƤΥɥ饤�Ф�ޤޤ�Ƥ��뤳�Ȥ��ǧ���Ƥ���������
 	  �äˡ�����ޤǼ¹Ԥ��Ƥ��륫�����५���ͥ뤬��
 	  �����ͥ�⥸�塼��Ȥ����󶡤���Ƥ���ӥ�ɥ���ε�ǽ��ޤ�Ǥ���ΤǤ���С�
 	  �����Υ⥸�塼�����Ū�� <filename>/boot/loader.conf</filename>
 	  �ε�ǽ���Ѥ��ơ�
 	  <filename>GENERIC</filename> ���ɤ߹���Ǥ���������
 	  ���åץ��졼�ɥץ������������ޤǤϡ�
 	  ���פǤϤʤ������ӥ���̵���ˤ���ȤȤ�ˡ�
 	  ɬ�פΤʤ��ǥ�������ͥåȥ���Υޥ���Ȥʤɤ��򤱤뤳�Ȥ��侩����Ƥ��ޤ���</para>
       </warning>
 
       <para>���åץǡ��Ȥ��줿�����ͥ�ǥ���ԥ塼����Ƶ�ư���Ƥ���������</para>
 
       <screen>&prompt.root; <userinput>shutdown -r now</userinput></screen>
 
       <para>�����ƥब����饤�����ä��顢�ʲ��Υ��ޥ�ɤ�Ȥä�
 	<command>freebsd-update</command> ��ƤӼ¹Ԥ��Ƥ���������
 	���åץǡ��ȥץ������ξ��֤���¸����Ƥ���Τǡ�
 	<command>freebsd-update</command> ��¹Ԥ���ȡ�
 	�ǽ餫��ǤϤʤ������Υ��ƥåפ˿ʤߡ�
 	�Ť���ͭ�饤�֥��ȥ��֥������ȥե�����������ޤ���</para>
 
       <screen>&prompt.root; <userinput>freebsd-update install</userinput></screen>
 
       <note>
 	<para>���Ѥ��Ƥ���饤�֥��ΥС�������ֹ���դ�������ˤ�äơ�
 	  3 �ĤΥ��󥹥ȡ���ե������� 2 �Ĥˤʤ���⤢��ޤ���</para>
       </note>
 
       <para>���åץ��졼�ɤϤ���ǽ�λ�Ǥ���
 	�⤷�᥸�㡼���åץ��졼�ɤ�Ԥä����ˤϡ�
 	<xref linkend="freebsdupdate-portsrebuild"/>
 	����������Ƥ���褦�ˤ��٤Ƥ� ports ����� package
 	��ƹ��ۤ��Ƥ���������</para>
 
       <sect3 xml:id="freebsd-update-custom-kernel-9x">
 	<title>&os;&nbsp;9.X �ʹߤΥ����ƥ�ˤ����륫�����५���ͥ�</title>
 
 	<para><command>freebsd-update</command> ��Ȥ����ˡ�
 	  <filename>GENERIC</filename> �����ͥ뤬
 	  <filename>/boot/GENERIC</filename>
 	  ���֤���Ƥ��뤳�Ȥ��ǧ���Ƥ���������
 	  �������٤����������५���ͥ���ۤ����ΤǤ���С�
 	  <filename>/boot/kernel.old</filename>
 	  �� <filename>GENERIC</filename> �����ͥ뤽�Τ�ΤǤ���
 	  ���Υǥ��쥯�ȥ��̾����
 	  <filename>/boot/kernel</filename>
 	  �ؤ��ѹ����Ƥ���������</para>
 
 	<para>�⤷��2 ��ʾ奫�����५���ͥ���ۤ�����Ǥ��ä��ꡢ
 	  �������५���ͥ���ۤ���������狼��ʤ���С�
 	  ���ߤΥ��ڥ졼�ƥ��󥰥����ƥ�ΥС�������
 	  <filename>GENERIC</filename> �����ͥ�����ꤷ�Ƥ���������
 	  ����ԥ塼���ؤ�ʪ��Ū�ʥ�����������ǽ�Ǥ���С�
 	  ���󥹥ȡ����ǥ������� <filename>GENERIC</filename>
 	  �����ͥ�򥤥󥹥ȡ���Ǥ��ޤ���</para>
 
 	<screen>&prompt.root; <userinput>mount /cdrom</userinput>
 &prompt.root; <userinput>cd /cdrom/usr/freebsd-dist</userinput>
 &prompt.root; <userinput>tar -C/ -xvf kernel.txz boot/kernel/kernel</userinput></screen>
 
 	<para>�̤���ˡ�Ȥ��Ƥϡ�
 	  <filename>GENERIC</filename> �����ͥ�򥽡�������ƹ��ۤ��ơ�
 	  ���󥹥ȡ��뤷�Ƥ���������</para>
 
 	<screen>&prompt.root; <userinput>cd /usr/src</userinput>
 &prompt.root; <userinput>make kernel __MAKE_CONF=/dev/null SRCCONF=/dev/null</userinput></screen>
 
 	<para><command>freebsd-update</command> �����Υ����ͥ��
 	  <filename>GENERIC</filename> �����ͥ�Ȥ���ǧ�����뤿��ˡ�
 	  <filename>GENERIC</filename> ����ե����졼�����ե�����ϡ�
 	  �Ȥˤ����ѹ����ƤϤ����ޤ���
 	  �ޤ������̤ʥ��ץ�������ꤷ�ʤ��ǹ��ۤ��Ƥ���������</para>
 
 	<para><command>freebsd-update</command> �ϡ�
 	  <filename>/boot/GENERIC</filename>
 	  ��¸�ߤ����������ɬ�פȤ���Τǡ�
 	  <filename>GENERIC</filename>
 	  �����ͥ�ǺƵ�ư����ɬ�פϤ���ޤ���</para>
       </sect3>
 
       <sect3 xml:id="freebsdupdate-portsrebuild">
 	<title>�᥸�㡼�С�����󥢥åץ��졼�ɸ��
 	  package �Υ��åץ��졼��</title>
 
 	<para>����Ū�ˡ��ޥ��ʡ��С�����󥢥åץ��졼�ɤθ�Ǥϡ�
 	  ���󥹥ȡ��뤵��Ƥ��륢�ץꥱ�������ϡ�����ʤ�ư���Ǥ��礦��
 	  �᥸�㡼�С�����󤬰ۤʤ�ȥ��ץꥱ�������Х��ʥ꡼���󥿥ե�����
 	  (<acronym>ABI</acronym>) ���ۤʤ뤿�ᡢ
 	  �����ɥѡ��ƥ����Υ��ץꥱ��������¿����ư��ʤ��ʤ�Ǥ��礦��
 	  �᥸�㡼�С�����󥢥åץ��졼�ɸ�ˤϡ�
 	  ���󥹥ȡ��뤵��Ƥ��뤹�٤Ƥ� packages, ports
 	  �򥢥åץ��졼�ɤ���ɬ�פ�����ޤ���
 	  package �ϡ�<command>pkg upgrade</command>
 	  ��Ȥäƥ��åץ��졼�ɤǤ��ޤ���
 	  ���󥹥ȡ��뤵��Ƥ��� ports �򥢥åץ��졼�ɤ�����ˤϡ�
 	  <package>ports-mgmt/portmaster</package>
 	  �Ȥ��ä��桼�ƥ���ƥ���ȤäƤ���������</para>
 
 	<para>���٤Ƥ� package �ζ���Ū�ʥ��åץ��졼�ɤǤϡ�
 	  �С�������ֹ椬�夬��ʤ� package ���Ф��Ƥ⡢
 	  ��ݥ��ȥ꤫��ǿ��ΥС������ǡ����󥹥ȡ��뤵��Ƥ���
 	  package ���֤������ޤ���
 	  &os; �Υ᡼���㡼�С�������Ѥ��褦�ʥ��åץ��졼�ɤǤϡ�
 	  ABI �ΥС��������Ѥ�뤿�ᡢ
 	  ���Τ褦�ʥ��åץ��졼�ɤ�ɬ�פˤʤ�ޤ���
 	  ����Ū�ʥ��åץ��졼�ɤ�Ԥ��ˤϡ��ʲ��Τ褦�˼¹Ԥ��Ƥ���������</para>
 
 	<screen>&prompt.root; <userinput>pkg-static upgrade -f</userinput></screen>
 
 	<para>���󥹥ȡ��뤵��Ƥ��뤹�٤ƤΥ��ץꥱ��������ƹ��ۤ���ˤϡ�
 	  �ʲ��Υ��ޥ�ɤ�¹Ԥ��Ƥ���������</para>
 
 	<screen>&prompt.root; <userinput>portmaster -af</userinput></screen>
 
 	<para>���Υ��ޥ�ɤ�¹Ԥ���ȡ�
 	  ������ѹ����륪�ץ�������ĥ��ץꥱ�������ϡ�
 	  �����ѹ��Υ����꡼���ɽ������
 	  �桼������λؼ��Ԥ��ξ��֤���ߤ��ޤ���
 	  ���ο����񤤤��ᡢ�ǥե���ȤΥ��ץ�������Ѥ���ˤϡ�
 	  �嵭�Υ��ޥ�ɤ� <option>-G</option> ��ޤ�Ƥ���������</para>
 
 	<para>���եȥ������Υ��åץ��졼�ɤ�����ä��顢�Ǹ�ˤ⤦����
 	  <command>freebsd-update</command>
 	  ��¹Ԥ��ơ�
 	  ���٤ƤΥ��åץ��졼�ɥץ������Τ��Ĥ���Ȥ�Ԥ���
 	  ���åץ��졼�ɤΥץ�������λ���Ƥ���������</para>
 
 	<screen>&prompt.root; <userinput>freebsd-update install</userinput></screen>
 
 	<para><filename>GENERIC</filename>
 	  �����ͥ����Ū���ɤ߹���Ǥ����ΤǤ���С�<xref
 	    linkend="kernelconfig"/> �˽񤫤�Ƥ�����˽��äơ�
 	  ����������������ۤ������󥹥ȡ��뤷�Ƥ���������</para>
 
 	<para>����ԥ塼����Ƶ�ư���������� &os; ��Ω���夲�Ƥ���������
 	  ����ǥ��åץ��졼�ɤΥץ������ϴ�λ�Ǥ���</para>
       </sect3>
     </sect2>
 
     <sect2 xml:id="freebsdupdate-system-comparison">
       <title>�����ƥ�ξ��֤����</title>
 
       <para><command>freebsd-update</command> ���Ѥ��ơ�
 	���󥹥ȡ��뤵��Ƥ��� &os; �ξ��֤ȡ�
 	������ư��뤳�Ȥ�ʬ���äƤ�����֤Ȥ���ӤǤ��ޤ���
 	���Υ��ޥ�ɤϡ����ߤΥ����ƥ�Υ桼�ƥ���ƥ����饤�֥�ꡢ
 	����ե������ɾ������Τǡ�
 	�Ȥ߹��ߤο������Υ����ƥ� (<acronym>IDS</acronym>)
 	�Ȥ��ƻȤ����Ȥ��Ǥ��ޤ���</para>
 
       <warning>
 	<para>���Υ��ޥ�ɤϡ�<package>security/snort</package>
 	  �Τ褦�������� <acronym>IDS</acronym>
 	  ���֤������ˤʤ��ΤǤϤ���ޤ���
 	  <command>freebsd-update</command> �ϥǡ�����ǥ���������¸����Τǡ�
 	  �������ѹ����Ԥ����ǽ��������ޤ���
 	  <varname>kern.securelevel</varname> �ȡ�
 	  <command>freebsd-update</command> �Υǡ�������Ѥ��ʤ��Ȥ��ˡ�
 	  �ɤ߼��Τߤε���°�������ꤵ��Ƥ���ե����륷���ƥ���֤����Ȥǡ�
 	  �������ѹ��β�ǽ�����㤯�Ǥ��ޤ�����
 	  ���褤�����ˡ�ϡ�
 	  <acronym>DVD</acronym>
 	  �ޤ��ϰ�������¸����Ƥ��볰�� <acronym>USB</acronym>
 	  �ǥ������Τ褦�ʰ����ʥǥ������ȥ����ƥ����Ӥ��뤳�ȤǤ���
 	  �Ȥ߹��ޤ�Ƥ���桼�ƥ���ƥ����Ѥ������̤���ˡ�ˤ��
 	  <acronym>IDS</acronym> ��ǽ�ˤĤ��Ƥϡ�
 	  <link xlink:href="&url.books.handbook.en;/security-intro.html#security-ids">&os; �Х��ʥ�ˤ�븡��</link>
 	  <!-- <xref linkend="security-ids"/> -->
 	  �����������������</para>
       </warning>
 
       <para>��Ӥ�Ԥ��ˤϡ�
 	��̤ν�����Υե�����̾����ꤷ�Ƥ���������</para>
 
       <screen>&prompt.root; <userinput>freebsd-update IDS &gt;&gt; outfile.ids</userinput></screen>
 
       <para>�����ƥ�ϸ������졢��꡼���ե������ <acronym>SHA256</acronym>
 	�ϥå����ͤȸ��ߥ��󥹥ȡ��뤵��Ƥ���ե�����Υϥå����ͤ��ե�����ΰ����ȶ��ˡ�
 	���ꤷ��������Υե�����������ޤ���</para>
 
       <para>�����ιԤ϶ˤ��Ĺ���ΤǤ��������Ϸ����ϴ�ñ�ˤ����˲��ϤǤ��ޤ���
 	���Ȥ��С������Υ�꡼���ǰۤʤäƤ��뤹�٤ƤΥե�������Τꤿ���ΤǤ���С�
 	�ʲ��Υ��ޥ�ɤ�¹Ԥ��Ƥ���������</para>
 
       <screen>&prompt.root; <userinput>cat outfile.ids | awk '{ print $1 }' | more</userinput>
 /etc/master.passwd
 /etc/motd
 /etc/passwd
 /etc/pf.conf</screen>
 
       <para>���ɽ����ǤϽ��Ϥ��ڤ�ΤƤ��Ƥ��ꡢ
 	�ºݤˤϤ�ä�¿���Υե����뤬¸�ߤ��ޤ���
 	�����Υե�����ˤϡ���������ѹ������ե����뤬����ޤ���
 	���Ȥ��С�<filename>/etc/passwd</filename>
 	�ϥ桼���������ƥ���ɲä������ѹ�����ޤ���
 	�ޤ��������ͥ�⥸�塼��ϡ�
 	<command>freebsd-update</command>
 	�ˤ�ꥢ�åץǡ��Ȥ���뤿�ᡢ�ѹ�����ޤ���
 	���Τ褦�����̤ʥե������ǥ��쥯�ȥ���������ˤϡ�
 	������ <filename>/etc/freebsd-update.conf</filename> ��
 	<literal>IDSIgnorePaths</literal> ���ץ������ɲä��Ƥ���������</para>
     </sect2>
   </sect1>
 
   <sect1 xml:id="updating-upgrading-documentation">
     <title>�ɥ�����ȤΥ��åץǡ���</title>
 
     <indexterm><primary>Updating and Upgrading</primary></indexterm>
 
     <indexterm>
       <primary>Documentation</primary>
       <see>Updating and Upgrading</see>
     </indexterm>
 
     <para>�ɥ�����Ȥϡ�&os; ���ڥ졼�ƥ��󥰥����ƥ��ɬ�����ǤǤ���
       &os; �ɥ�����Ȥκǿ��С������ϡ�&os; �����֥����� (<link
 	xlink:href="&url.base;/doc/">http://www.freebsd.org/doc/</link>)
       ��������Ǥ��ޤ�����
       &os; �����֥����ȡ��ϥ�ɥ֥å���<acronym>FAQ</acronym>
       �����ʸ��κǿ��Ǥ����������Ѱդ��Ƥ����������Ǥ���</para>
 
     <para>���ξϤǤϡ��������ޤ��� Ports Collection ��Ȥäơ�
       ��������� &os; �ɥ�����Ȥ�ǿ����ݤ���ˡ���������ޤ���</para>
 
     <para>�ɥ�����Ȥ��Խ������ꡢ
       �ɥ�����Ȥθ������𤹤���ˡ�ˤĤ��Ƥϡ�
       �������׸��ԤΤ���� &os; �ɥ�����ơ������ץ������������� (<link
 	xlink:href="&url.books.fdp-primer.en;">http://www.freebsd.org/doc/en_US.ISO8859-1/books/fdp-primer/</link>)
       ��������������</para>
 
     <sect2 xml:id="updating-installed-documentation">
       <title>���������� &os; �ɥ�����Ȥ򥤥󥹥ȡ��뤹��</title>
 
       <para>���������� &os; �ɥ�����Ȥ��ۤ���Τ�ɬ�פʥġ���ϡ�
 	&os; �Υ١��������ƥ�ˤϴޤޤ�ƤϤ��ޤ���
 	<application>svn</application> �ʤɤ�ɬ�פʥġ���ϡ�
 	&os; �ɥ�����ơ������ץ��������Ȥ���ȯ���Ƥ���
 	<package>textproc/docproj</package> package �ޤ��� port 
 	���饤�󥹥ȡ���Ǥ��ޤ���</para>
 
       <para>���󥹥ȡ��뤷���顢<application>svn</application>
 	��Ȥäơ��ɥ�����ȤΥ����������������ɤ��Ƥ���������</para>
 
       <screen>&prompt.root; <userinput>svn checkout https://svn.FreeBSD.org/doc/head /usr/doc</userinput></screen>
 
       <para>�ǽ�˥ɥ�����ȤΥ����������������ɤ���ˤϾ������֤�������ޤ���
 	����������ɤ������ޤǤ��Ԥ�����������</para>
 
       <para>����������ɤ����ɥ�����ȤΥ������򥢥åץǡ��Ȥ���ˤϡ�
 	�ʲ��Υ��ޥ�ɤ�¹Ԥ��Ƥ���������</para>
 
       <screen>&prompt.root; <userinput>svn update /usr/doc</userinput></screen>
 
       <para>�ǿ��Υɥ�����ȤΥ������Υ��ʥåץ���åȤ�
 	<filename>/usr/doc</filename> ���ѰդǤ����顢
 	���󥹥ȡ��뤵��Ƥ���ɥ�����Ȥ򥢥åץǡ��Ȥ�������Ϥ��٤������ޤ�����</para>
 
       <para>���Ѳ�ǽ�ʤ��٤Ƥθ���Υɥ�����Ȥ򥢥åץǡ��Ȥ���ˤϡ�
 	�ʲ��Τ褦�����Ϥ��Ƥ���������</para>
 
       <screen>&prompt.root; <userinput>cd /usr/doc</userinput>
 &prompt.root; <userinput>make install clean</userinput></screen>
 
       <para>�⤷����������θ���Τߤ򥢥åץǡ��Ȥ������ΤǤ���С�
 	<filename>/usr/doc</filename>
 	�β��ˤ���Ƹ���Υ��֥ǥ��쥯�ȥ�� <command>make</command>
 	��¹Ԥ��Ƥ���������</para>
 
       <screen>&prompt.root; <userinput>cd /usr/doc/en_US.ISO8859-1</userinput>
 &prompt.root; <userinput>make install clean</userinput></screen>
 
       <para>�ɥ�����Ȥ򥢥åץǡ��Ȥ����̤���ˡ�ϡ�
 	<filename>/usr/doc</filename>
 	�ޤ��ϳƸ���Υ��֥ǥ��쥯�ȥ�ǰʲ��Υ��ޥ�ɤ�¹Ԥ��Ƥ���������</para>
 
       <screen>&prompt.root; <userinput>make update</userinput></screen>
 
       <para><varname>FORMATS</varname> �����ꤷ�ơ�
 	�ʲ��Τ褦�˥��󥹥ȡ��뤹����Ϸ��������Ǥ��ޤ���</para>
 
       <screen>&prompt.root; <userinput>cd /usr/doc</userinput>
 &prompt.root; <userinput>make FORMATS='html html-split' install clean</userinput></screen>
 
       <para>�ɥ�����ơ������ΰ����Υ��åץǡ��Ȥ��ñ�ˤ��륪�ץ����䡢
 	����������Υӥ�ɤ�Ԥ�����Υ��ץ�����Ѱդ���Ƥ��ޤ���
  	�����Υ��ץ����ϡ������ƥ����̤Υ��ץ����Ǥ���
 	<filename>/etc/make.conf</filename> �䡢<command>make</command>
 	��Ϳ���륳�ޥ�ɥ饤�󥪥ץ���������Ǥ��ޤ���</para>
 
       <para>���ץ����ˤϰʲ��Τ褦�ʤ�Τ�����ޤ���</para>
 
       <variablelist>
 	<varlistentry>
 	  <term><varname>DOC_LANG</varname></term>
 
 	  <listitem>
 	    <para>�ӥ�ɤ���ӥ��󥹥ȡ���θ��줪��ӥ��󥳡��ǥ��󥰤ΰ�����
 	      ���Ȥ��С��Ѹ�Υɥ�����Ȥ���ꤹ��ˤ�
 	      <literal>en_US.ISO8859-1</literal> �����ꤷ�ޤ���</para>
 	  </listitem>
 	</varlistentry>
 
 	<varlistentry>
 	  <term><varname>FORMATS</varname></term>
 
 	  <listitem>
 	    <para>�ӥ�ɤ�Ԥ��ե����ޥåȡ��ޤ��Ͻ��ϥե����ޥåȤΰ�����
 	      ���ߤ� <literal>html</literal>,
 	      <literal>html-split</literal>, <literal>txt</literal>,
 	      <literal>ps</literal> ������ <literal>pdf</literal>
 	      ���б����Ƥ��ޤ���</para>
 	  </listitem>
 	</varlistentry>
 
 	<varlistentry>
 	  <term><varname>DOCDIR</varname></term>
 
 	  <listitem>
 	    <para>�ɥ�����Ȥ򥤥󥹥ȡ��뤹���ꡣ�ǥե���Ȥ�
 	      <filename>/usr/share/doc</filename> �Ǥ���</para>
 	  </listitem>
 	</varlistentry>
       </variablelist>
 
       <para>&os; �Υ����ƥ����̤Υ��ץ����˴�Ϣ�����ä�¿����
 	<command>make</command> �ѿ��ˤĤ��Ƥϡ�
 	&man.make.conf.5; ��������������</para>
     </sect2>
 
     <sect2 xml:id="doc-ports-install-package">
       <info>
 	<title>ports ���Ѥ����ɥ�����ơ������Υ��åץǡ���</title>
 
 	<authorgroup>
 	  <author>
 	    <personname>
 	      <firstname>Marc</firstname>
 	      <surname>Fonvieille</surname>
 	    </personname>
 	    <contrib>�١����Ȥʤä����:</contrib>
 	  </author>
 	</authorgroup>
       </info>
 
       <indexterm>
 	<primary>Updating and Upgrading</primary>
       </indexterm>
 
       <indexterm>
 	<primary>documentation package</primary>
 	<see>Updating and Upgrading</see>
       </indexterm>
 
       <para>����ޤǤΥ��������Ǥϡ������������ɤ��Ѥ��� &os;
 	�ɥ�����ȤΥ��åץǡ�����ˡ�ˤĤ����������Ƥ��ޤ�����
 	������Ǥϡ����󥹥ȡ��뤵��Ƥ���
 	&os; �Υɥ�����Ȥ򥢥åץǡ��Ȥ���⤦��Ĥ���ˡ�Ǥ��롢
 	Ports Collection ���Ѥ�����ˡ�ˤĤ�����������
 	�ʲ��ˤĤ����������ޤ���</para>
 
       <itemizedlist>
 	<listitem>
 	  <para>���ۺѤΥɥ�����Ȥ� packages �򥤥󥹥ȡ��뤹����ˡ��
 	    ��������Ǥι��ۺ�Ȥ�ɥ�����ơ������ġ����������򥤥󥹥ȡ��뤹��ɬ�פϤ���ޤ���</para>
 	</listitem>
 
 	<listitem>
 	  <para>ports �ե졼������Ȥä��ɥ�����ȤΥ������ι�����ˡ��
 	    �����å������Ȥ���ӹ��ۺ�Ȥ���ñ�ˤʤ�ޤ���</para>
 	</listitem>
       </itemizedlist>
 
       <para>&os; �Υɥ�����Ȥ򥢥åץǡ��Ȥ��뤳������ˡ�ϡ�
 	&a.doceng; �����åץǡ��Ȥ��Ƥ���
         �ɥ�����ơ������ ports ����� packages
 	�ˤ�ꥵ�ݡ��Ȥ���Ƥ��ޤ���
 	������ ports �ϡ�&os; Ports&nbsp;Collection ��
 	docs ���ƥ��� (<link
 	  xlink:href="http://www.freshports.org/docs/">http://www.freshports.org/docs/</link>)
 	�ˤޤȤ���Ƥ��ޤ���</para>
 
       <para>�ɥ�����ơ������ ports �ι����ϰʲ����̤�Ǥ���</para>
 
       <itemizedlist>
 	<listitem>
 	  <para><package>misc/freebsd-doc-en</package> package �ޤ��� port�ϡ�
 	    ���٤ƤαѸ�ʸ��򥤥󥹥ȡ��뤷�ޤ���</para>
 	</listitem>
 
 	<listitem>
 	  <para><package>misc/freebsd-doc-all</package> �᥿ package
 	    �⤷���� port �ϡ�
 	    ���٤Ƥ����Ѳ�ǽ�ʸ���Τ��٤ƤΥɥ�����Ȥ��ۤ��ޤ���</para>
 	</listitem>
 
 	<listitem>
 	  <para>�Ƹ���Τ���� package �ޤ��� port
 	    ���Ѱդ���Ƥ��ޤ������Ȥ��С�
 	    <package>misc/freebsd-doc-hu</package>
 	    �ϥϥ󥬥꡼��Υɥ�����ơ������ port �Ǥ���</para>
 	</listitem>
       </itemizedlist>
 
       <para>�Х��ʥ� package ��Ȥ��ȡ�
 	���󥹥ȡ��뤹�������Ѱդ���Ƥ��뤹�٤Ƥη�����
 	&os; �ɥ�����Ȥ����󥹥ȡ��뤵��ޤ���
 	���Ȥ��С��ʲ��Υ��ޥ�ɤ�¹Ԥ���ȡ�
 	�ϥ󥬥꡼��Υɥ�����Ȥκǿ� package
 	�����󥹥ȡ��뤵��ޤ���</para>
 
       <screen>&prompt.root; <userinput>pkg install hu-freebsd-doc</userinput></screen>
 
       <note>
 	<para>�ɥ�����Ȥ� package �ϡ��б����� port ̾�Ȥϰۤʤꡢ
 	  <literal><replaceable>lang</replaceable>-freebsd-doc</literal>
 	  �η�����̾�����Ĥ����Ƥ��ޤ���
 	  �����ǡ�<replaceable>lang</replaceable> �ϸ��쥳���ɤ�û�̷��Ǥ���
 	  �ϥ󥬥꡼��ξ��� <literal>hu</literal>�����λ��ξ��ˤ�
 	  <literal>zh_cn</literal> �Ǥ���</para>
       </note>
 
       <para>�ɥ�����ȤΥե����ޥåȤ���ꤹ����ˤϡ�package �ǤϤʤ�
 	port ���鹽�ۤ򤷤Ƥ������������Ȥ��С�
 	�Ѹ�Υɥ�����Ȥ��ۤ��ƥ��󥹥ȡ��뤹��ˤϰʲ��Τ褦�ˤ��Ʋ�������</para>
 
       <screen>&prompt.root; <userinput>cd /usr/ports/misc/freebsd-doc-en</userinput>
 &prompt.root; <userinput>make install clean</userinput></screen>
 
       <para>���� port �ˤϡ�
 	���ۤ���ӥ��󥹥ȡ��뤹��ե����ޥåȤ����ꤹ���˥塼������ޤ���
 	�ǥե���ȤǤϡ�<uri
 	  xlink:href="http://www.FreeBSD.org">http://www.FreeBSD.org</uri>
 	��Ʊ�������Ǥ���ʬ���Ǥ� <acronym>HTML</acronym> ������
 	<acronym>PDF</acronym> �����򤵤�Ƥ��ޤ���</para>
 
       <para>�ʲ��Τ褦�ˡ��ɥ�����ơ������ ports ���ۤ���ݤ�
 	<command>make</command> ���ץ�����Ѱդ���Ƥ��ޤ���</para>
 
       <variablelist>
 	<varlistentry>
 	  <term><varname>WITH_HTML</varname></term>
 
 	  <listitem>
 	    <para>HTML �������ۤ��ޤ���
 	      �ƥɥ�����Ȥ��Ф���ñ���Ǥ� HTML �ե����뤬���ۤ���ޤ���
 	      �������줿�ɥ�����Ȥϡ�
 	      <filename>article.html</filename> ��
 	      <filename>book.html</filename>
 	      �Ȥ��ä�̾���ǥ��󥹥ȡ��뤵��ޤ���</para>
 	  </listitem>
 	</varlistentry>
 
 	<varlistentry>
 	  <term><varname>WITH_PDF</varname></term>
 
 	  <listitem>
 	    <para>�������줿�ɥ�����Ȥϡ�
 	      <filename>article.pdf</filename> ��
 	      <filename>book.pdf</filename>
 	      �Ȥ��ä�̾���ǥ��󥹥ȡ��뤵��ޤ���</para>
 	  </listitem>
 	</varlistentry>
 
 	<varlistentry>
 	  <term><varname>DOCBASE</varname></term>
 
 	  <listitem>
 	    <para>�ɥ�����ȤΥ��󥹥ȡ���������ꤷ�ޤ���
 	      �ǥե���ȤΥ��󥹥ȡ������
 	      <filename>/usr/local/share/doc/freebsd</filename>
 	      �Ǥ���</para>
 	  </listitem>
 	</varlistentry>
       </variablelist>
 
       <para>�ʲ��ϡ��嵭���ѿ����Ѥ��ƥϥ󥬥꡼��Υɥ�����Ȥ�
 	<acronym>PDF</acronym> �����ǥ��󥹥ȡ��뤹����ˡ�Ǥ���</para>
 
       <screen>&prompt.root; cd /usr/ports/misc/freebsd-doc-hu
 &prompt.root; make -DWITH_PDF DOCBASE=share/doc/freebsd/hu install clean</screen>
 
       <para><xref linkend="ports"/> �˽񤫤�Ƥ������Ȥäơ�
 	�ɥ�����ơ������ package �ޤ��� port
 	�򥢥åץǡ��ȤǤ��ޤ���
 	���Ȥ��С��ʲ��Υ��ޥ�ɤ�¹Ԥ���ȡ�
 	<package>ports-mgmt/portupgrade</package>
 	���顢package
 	������Ȥäƥ��󥹥ȡ��뤵��Ƥ���ϥ󥬥꡼��Υɥ�����Ȥ򥢥åץǡ��Ȥ��ޤ���</para>
 
       <screen>&prompt.root; <userinput>portmaster -PP hu-freebsd-doc</userinput></screen>
     </sect2>
   </sect1>
 
   <sect1 xml:id="current-stable">
     <title>��ȯ�֥������ɤ�������</title>
     <indexterm><primary>-CURRENT</primary></indexterm>
     <indexterm><primary>-STABLE</primary></indexterm>
 
     <para>&os; �ˤ���Ĥγ�ȯ�֥���������ޤ���
       ����� &os.current; �� &os.stable; �Ǥ���</para>
 
     <para>������ǤϤ��줾��Υ֥������оݤȤ��Ƥ����ɼԤˤĤ��Ƥ������ȡ�
       �ɤΤ褦�ˤ��ƥ����ƥ���б�����֥�����ǿ��ξ��֤��ݤĤ��ˤĤ����������ޤ���</para>
 
     <para><emphasis>��: &a.hanai;��1996 ǯ 11 �� 6 ��</emphasis></para>
 
     <sect2 xml:id="current">
       <title>&os.current; ��Ȥ�</title>
 
       <para>&os.current; �Ȥ� &os; �γ�ȯ�� <quote>������</quote> �ʤΤǡ�
 	&os.current; �Υ桼���Ϲ⤤�����Ϥ���Ĥ��Ȥ��׵ᤵ��ޤ���
 	�����ޤǤε����Ϥ���äƤ��ʤ�����
 	��ȯ�֥������ɤ����������ȹͤ��Ƥ���桼���ϡ�
 	������ &os.stable; ���ɤ���������ɤ��Ǥ��礦��</para>
 
       <para>&os.current; �� &os; �κǿ��Υ����������ɤǤ��ꡢ
 	��ˤϸ��߳�ȯ�Ӿ�Υ��եȥ�������
 	�¸�Ū���ѹ������뤤�ϲ���Ū�ʵ�ǽ�ʤɤ��ޤޤ�Ƥ��ޤ���
 	�ޤ�������������äƤ��뵡ǽ�����٤ơ�
 	���θ�����꡼��������Ȥϸ¤�ޤ���&os.current;
 	�򥽡�������ۤ���������ѥ��뤷�Ƥ���ͤϤ������󤤤ޤ�����
 	û�����֤Ǥϥ���ѥ��뤵���Ǥ��ʤ����֤ˤʤäƤ�������⤢��ޤ���
 	����������ϲ�ǽ�ʸ¤��®�˲�褵��ޤ�����
 	&os.current; ���Թ���⤿�餹����
 	����Ȥ⿷������ǽ��⤿�餹���ϡ�
 	�ޤ��˥����������ɤ�Ʊ�������ִ֤ˤ��ΤǤ�!</para>
 
       <para>&os.current; �ϡ�
 	���� 3 �Ĥν��פʥ��롼�פ��оݤȤ��Ƥ��ޤ���</para>
 
       <orderedlist>
 	<listitem>
 	  <para>�������ĥ꡼�Τ�����ʬ�˴ؤ��Ƴ�ȯ�˺�Ȥ��Ƥ���
 	    &os; ���ߥ�˥ƥ��Υ��С�</para>
 	</listitem>
 
 	<listitem>
 	  <para>��ȯ�˥ƥ��Ȥ��Ƥ��� &os; ���ߥ�˥ƥ��Υ��С�
 	    ���ϡ����������褹��Τ˻��֤��ˤ��ޤʤ��͡��Ǥ��ꡢ
 	    ���ޤ��ޤ��ѹ��˴ؤ�����Ƥ�
 	    &os; ����ޤ��������դ���Ԥʤ������ȻפäƤ���͡��Ǥ⤢�ꡢ
 	    �ѥå�����Ф��ޤ���</para>
 	</listitem>
 
 	<listitem>
 	  <para>���ޤ��ޤʻ����ܤ������
 	    ���ͤΤ���˺ǿ��Υ�������Ȥ������ȻפäƤ����ꡢ
 	    ���������Ȥ䥳���ɤ��Ƥ������ȹͤ��Ƥ���桼����</para>
 	</listitem>
       </orderedlist>
 
       <para>&os.current; �ϡ����Υ�꡼�������ˡ�
 	�Ǥ��᤯��������ǽ�����ꤹ����ʤȤ��ơ�
 	���Ԥ��Ƥ�<emphasis>�����ޤ���</emphasis>��
 	��꡼�����ε�ǽ�Ͻ�ʬ�˥ƥ��Ȥ���Ƥ��ʤ����ᡢ
 	�Х���ޤ�Ǥ����ǽ�����礤�ˤ��뤿��Ǥ���
 	�ޤ����Х��������뤿������ᤤ��ˡ�Ǥ⤢��ޤ���
 	�����ʤ륳�ߥåȤϡ������餢��Х���������Τ�Ʊ������
 	�������Х������߽Ф������줬����ޤ���
 	&os.current; �ˤ� <quote>�����Υ��ݡ���</quote> �Ϥ���ޤ���</para>
 
       <indexterm>
 	<primary>-CURRENT</primary>
 	<secondary>using</secondary>
       </indexterm>
 
       <para>&os.current; ���ɤ�������ˤ�</para>
 	
       <orderedlist>
 	<listitem>
 	  <para>&a.current.name; �� &a.svn-src-head.name;
 	    <indexterm>
 	      <primary>-CURRENT</primary>
 	      <secondary>����</secondary>
 	    </indexterm>
 	    �᡼��󥰥ꥹ�Ȥ˲ä�äƤ���������
 	    ���ޤ��ޤʿͤ������ƥ�θ��ߤξ��֤ˤĤ��ƽҤ٤Ƥ��륳���Ȥ򸫤��ꡢ
 	    &os.current; �θ��ߤξ��֤˴ؤ�����פʾ����ƨ���ʤ�����ˡ�
 	    <emphasis>ɬ�ܤ�</emphasis> ���ȤǤ���</para>
 
 	  <para>&a.svn-src-head.name; �᡼��󥰥ꥹ�ȤǤϡ�
 	    ���줾����ѹ��ˤĤ��Ƥ� commit ��������Ͽ����Ƥ��ޤ���
 	    �ޤ�������˴ؤ��Ƶ��������������Ѥξ�������뤳�Ȥ��Ǥ��ޤ��Τǡ�
 	    ���ä�����ͤΤ���᡼��󥰥ꥹ�ȤǤ���</para>
 
 	  <para>�����Υ᡼��󥰥ꥹ�Ȥ�����ˤϡ�
 	    &a.mailman.lists.link;
 	    �򤿤ɤäƻ��ä������᡼��󥰥ꥹ�Ȥ򥯥�å�����
 	    ���������ˤ������äƤ���������
 	    &os.current; �����Ǥʤ���
 	    �������ĥ꡼���Τ��ѹ������ɤ�������ΤǤ���С�
 	    &a.svn-src-all.name; �᡼��󥰥ꥹ�Ȥ���ɤ��Ƥ���������</para>
 	</listitem>
 
 	<listitem>
 	  <para>&os.current; �Υ�������Ʊ�����Ƥ���������
 	    �ä� <link linkend="svn">svn</link> ��Ȥä�
 	    <xref linkend="svn-mirrors"/> �ΰ����ˤ���
 	    Subversion �ߥ顼�����ȤΤҤȤĤ�
 	    <literal>head</literal> �֥�������
 	    -CURRENT �����ɤ�����å������Ȥ��Ƥ���������</para>
 	</listitem>
 
 	<listitem>
 	  <para>��ݥ��ȥ�Υ��������礭�����ᡢ��̣�Τ�����ʬ�䡢
 	    �ѥå������Ƥ���ʬ�Υ������Τߤ�Ʊ������桼���⤤�ޤ���
 	    �������ʤ��顢
 	    ���������饪�ڥ졼�ƥ��󥰥����ƥ�򥳥�ѥ��뤷�褦�ȻפäƤ���桼���ϡ�
 	    ����ʬ�����ǤϤʤ���&os.current; �� <emphasis>���٤�</emphasis>
 	    �����������ɤ���ɬ�פ�����ޤ���</para>
 
 	  <para>&os.current; �򥳥�ѥ���
 	    <indexterm>
 	      <primary>-CURRENT</primary>
 	      <secondary>����ѥ���</secondary>
 	    </indexterm> ��������
 	    <filename>/usr/src/Makefile</filename> �����տ����ɤߡ�
 	    <xref linkend="makeworld"/>
 	    �˽񤫤�Ƥ�����˽��äƤ���������
 	    &a.current; �� <filename>/usr/src/UPDATING</filename> ���ɤ�С�
 	    ���Υ�꡼���ظ����ưܤäƤ椯�������äơ�
 	    �Ȥ��ɤ�ɬ�פȤʤ��¸�����ƥफ��ο������ƥ�ι��ۼ��ˤĤ��Ƥκǿ�����������Ǥ��礦��</para>
 	</listitem>
 
 	<listitem>
 	  <para>�����ƥ��֤ˤʤäƤ�������!
 	    &os.current; �Υ桼���ˤϡ�
 	    ��ĥ��Х��٤��˴ؤ�����Ƥ��뤳�Ȥ�������Ƥ��ޤ���
 	    �����ɤ�ȼ����ƤϤ��ĤǤⴿ�ޤ���ޤ�!</para>
 	</listitem>
       </orderedlist>
     </sect2>
 
     <sect2 xml:id="stable">
       <title>&os.stable; ��Ȥ�</title>
 
       <para><emphasis>��: &a.jp.iwasaki;</emphasis></para>
 
       <para>&os.stable;
 	�Ȥ����Ū�˸���������꡼����������뤿��γ�ȯ�֥����Ǥ���
 	���Υ֥����˲ä������ѹ��� &os.current; ����ä���ǡ�
 	��§�Ȥ��ơ������� &os.current; �ǻ���ߤǤ���Ȥ�����ħ������ޤ���
 	����<emphasis>�����Ǥ��äƤ�</emphasis>��
 	����ϳ�ȯ�ѥ֥����ΰ�ĤǤ��ꡢ��������ˤ����� &os.stable;
 	�Υ��������ɤ�ʾ��ˤ�Ȥ����ΤǤ���Ȥϸ¤�ޤ���
 	���Υ֥����Ϥ⤦��Ĥγ�ȯ��ή��Ȥ��������Ǥ��äơ�
 	����ɥ桼�������Τ�ΤǤϤ���ޤ���
 	�⤷��򤹤��Ū��;͵���ʤ����ϡ�����˺ǿ���
 	&os; ��꡼����ȤäƤ���������</para>
 
       <para>&os; �γ�ȯ�ץ������˶�̣�����ä��ꡢ
 	������Ф���׸���ͤ��Ƥ��ơ��äˤ��줬�����
 	&os; �Υ�꡼���˴ط������ΤǤ���ʤ�
 	&os.stable; ���ɤ����Ȥ�ͤ�����ɤ��Ǥ��礦��</para>
 
       <para>&os.stable; �֥����Ϥ��Ĥ⥳��ѥ��뤬�Ǥ���
 	�����ư��٤��Ǥ�����
 	���줬�ݾڤ���Ƥ���Ȥ����櫓�ǤϤ���ޤ���
 	&os.stable; �Υ桼���� &os.current; ����¿�����ᡢ&os.current;
 	��ȯ������ʤ��ä��Х��� &os.stable; ��ȯ�����졢
 	�Ȥ��ɤ����줬����Ȥʤ뤳�Ȥ�����Τ��򤱤뤳�Ȥ��Ǥ��ޤ���
 	���Τ褦����ͳ���顢����Ū�� &os.stable;
 	���ɤ�������٤��ǤϤ���ޤ���
 	�äˡ���ȯ�Ķ��⤷���ϥƥ��ȴĶ��ǥ����ɤ�ʬ�˻�����ˡ�
 	�ץ�����������ʼ����׵ᤵ��륵���Ф� &os.stable;
 	�˥��åץ��졼�ɤ��Ƥ�<emphasis>�����ޤ���</emphasis>��</para>
 
       <para>&os.stable; ���ɤ�������ˤ�</para>
 
       <indexterm>
 	<primary>-STABLE</primary>
 	<secondary>���Ѥ���</secondary>
       </indexterm>
 
       <orderedlist>
 	<listitem>
 	  <para>&os.stable; �ι��ۤ˴�Ϣ��������䡢
 	    ����¾�����դ��٤��� �˴ؤ����������뤿��ˡ�
 	    &a.stable.name; �᡼��󥰥ꥹ�Ȥ˲ä�äƤ���������
 	    �ޤ���ȯ�Ԥϵ�����;�Ϥ����뽤�����ѹ���ͤ��Ƥ�����ˡ�
 	    ���Υ᡼��󥰥ꥹ�ȤǸ�ɽ����
 	    ��Ƥ��줿�ѹ��˴ؤ������꤬�����뤫�ɤ������������뵡���桼����Ϳ���ޤ���</para>
 
 	  <para>�ɤ������Ƥ���֥����˴�Ϣ����
 	    <application>svn</application> �᡼��󥰥ꥹ�Ȥ˻��ä��Ƥ���������
 	    ���Ȥ��С�9-STABLE �֥������ɤ������Ƥ���桼����
 	    &a.svn-src-stable-9.name; �᡼��󥰥ꥹ�Ȥ˻��ä��Ƥ���������
 	    ���Υꥹ�ȤǤϡ��ѹ����ʤ���뤴�Ȥ˺�������� commit log
 	    �䤽���ȼ�������ꤦ�������ѤˤĤ��Ƥξ��󤬵�Ͽ����Ƥ��ޤ���</para>
 
 	  <para>�����Υ᡼��󥰥ꥹ�Ȥ�����ˤϡ�&a.mailman.lists.link;
 	    �򤿤ɤäƻ��ä������᡼��󥰥ꥹ�Ȥ򥯥�å�����
 	    ���������ˤ������äƤ���������
 	    �������ĥ꡼���Τ��ѹ������ɤ�������ˤϡ�
 	    &a.svn-src-all.name; �᡼��󥰥ꥹ�Ȥ���ɤ��Ƥ���������</para>
 	</listitem>
 
 	<listitem>
 	  <para>������ &os.stable; �����ƥ�򥤥󥹥ȡ��뤹��ˤϡ�
 	    <link linkend="mirrors">�ߥ顼������</link> ����Ƕ��
 	    &os.stable; ��꡼���򥤥󥹥ȡ��뤹�뤫��
 	    ����������Ƥ��� &os.stable;
 	    ����ӥ�ɤ��줿���ʥåץ���åȤ�ȤäƤ���������
 	    ���ʥåץ���åȤξܺ٤ˤĤ��Ƥϡ�<link
 	      xlink:href="&url.base;/ja/snapshots/">www.freebsd.org/ja/snapshots</link>
 	    ��������������</para>
 
 	  <para>���� &os; ��ư���Ƥ��륷���ƥ��
 	    &os.stable; �˥��åץ��졼�ɤ���ˤϡ�
 	    <link linkend="svn">svn</link>
 	      <indexterm>
 		<primary>Subversion</primary>
 	      </indexterm> ��Ȥäơ�
 	    ��˾���볫ȯ�֥����Υ�����������å��������Ƥ���������
 	    <literal>stable/9</literal> �Ȥ��ä��֥���̾�ϡ�
 	    <link xlink:href="&url.base;/releng/">www.freebsd.org/releng</link>
 	    ����������Ƥ��ޤ���</para>
 	</listitem>
 
 	<listitem>
 	  <para>&os.stable; �򥳥�ѥ��뤷���� &os.stable; �ؤȥ��åץ��졼��
 	    <indexterm>
 	      <primary>-STABLE</primary>
 	      <secondary>���ۡ�����ѥ���</secondary>
 	    </indexterm> �������ˡ�
 	    <filename>/usr/src/Makefile</filename> �����տ����ɤߡ�
 	    <xref linkend="makeworld"/>
 	    �˽񤫤�Ƥ�����˽��äƤ���������
 	    &a.stable; �� <filename>/usr/src/UPDATING</filename> ���ɤ�ǡ�
 	    ���Υ�꡼���ظ����ưܤäƤ椯�������äơ�
 	    �Ȥ��ɤ�ɬ�פȤʤ��¸�����ƥफ��ο������ƥ�ι��ۼ��ˤĤ��Ƥκǿ���������Ƥ���������</para>
 	</listitem>
       </orderedlist>
     </sect2>
   </sect1>
 
   <sect1 xml:id="synching">
     <title>��������Ʊ��</title>
 
     <para><emphasis>��: &a.jp.iwasaki;��1997 ǯ 9 �� 13 ��</emphasis></para>
 
     <para>&os; �Υ������κǿ����ɤ���������ˡ�Ͽ�������ޤ���
       ������Ǥϡ�����Ū�ʥ����ӥ��Ǥ���
       <application>Subversion</application>
       �ˤĤ����������ޤ���</para>
 
     <warning>
       <para>�������ĥ꡼�ΰ�����ǿ��Τ�Τ˹������뤳�Ȥϲ�ǽ�Ǥ���
 	�����������ݡ��Ȥ���Ƥ��륢�åץǡ��ȼ��ϡ�
 	�������ĥ꡼���Τ�ǿ��Τ�Τ˹�������
 	<filename>/bin</filename>, <filename>/sbin</filename>
 	�Ȥ��ä��桼�����֤�ư����Ρ�
 	����ӥ����ͥ륽������ƹ��ۤ��뤳�ȤΤߤǤ���
 	�������ĥ꡼�ΰ��������Ǥ��ä��ꡢ�����ͥ������
 	�⤷���ϥ桼�����ɤΥץ����������򹹿��������ϡ�
 	���꤬�����뤳�Ȥ��褯����ޤ���
         ���λ���ȯ����������ϥ���ѥ�����Υ��顼���饫���ͥ�ѥ˥å���
         �ǡ������˲��Ȥ��ޤ��ޤǤ���</para>
     </warning>
 
     <indexterm>
       <primary>Subversion</primary>
     </indexterm>
 
     <para><application>Subversion</application>
       �� <emphasis>pull</emphasis> Ʊ����ǥ����Ѥ��Ƥ��ޤ���
       �桼�� (�ޤ��� <command>cron</command> ������ץ�) ��
       <command>svn</command> �ץ�������ư����
       ��������ˤ��륽������ǿ����֤ˤ��ޤ���
       ��������Ϥ��λ����κǿ��Τ�ΤǤ��ꡢ
       ���ĥ���������ɤ��뤫�ϥ桼��������ȥ����뤹��Τǡ�
       <application>Subversion</application>
       �ϥ�������Υ������ĥ꡼�򥢥åץǡ��Ȥ��빥�ޤ�����ˡ�Ǥ���
       ����Υե������ǥ��쥯�ȥ�˸��ꤷ�ƹ������뤳�Ȥ��ñ�ˤǤ��ޤ���
       ��������ϥ����Фˤ�ä����᤯��������ޤ���
       <application>Subversion</application> �ˤ�륽������Ʊ����ˡ�ˤĤ��Ƥϡ�
       <xref linkend="svn"/> ����������Ƥ��ޤ���</para>
 
     <para><application>Subversion</application> �Ǥ���С�
       ���ä����������Υ��������֤ΰ�����ä��Ƥ��ޤäƤ⡢
       ���줿��ʬ�򸡽Ф��ƺƹ��ۤ��Ƥ���ޤ���</para>
   </sect1>
 
   <sect1 xml:id="makeworld">
     <title>world �κƹ���</title>
 
     <indexterm>
       <primary><quote>world</quote> �κƹ���</primary>
     </indexterm>
     <para>&os.stable;��&os.current; �ʤɤ�
       &os; �Τɤ줫����ΥС������ˤĤ��ơ�
       ��������Υ������ĥ꡼��Ʊ���������顢
       ���Υ������ĥ꡼��Ȥäƥ����ƥ��ƹ��ۤǤ��ޤ���
       ���Υץ������� world �κƹ��ۤȸƤФ�ޤ���</para>
 
     <para>world ��ƹ��ۤ���<emphasis>��</emphasis>�ˡ�
       �ʲ���ԤäƤ���������</para>
 
     <procedure>
       <title>world �ι���<emphasis>��</emphasis>�˹Ԥ����</title>
 
       <step>
 	<para>���פʥǡ�����¾�Υ����ƥ���ࡼ�Х֥��ǥ����˥Хå����åפ���
 	  ������ȥХå����åפ���������Ƥ��뤳�Ȥ��ǧ�����顢
 	  ��ư��ǽ�ʥ��󥹥ȡ����ǥ������Ѱդ��Ƥ���������
 	  �����ƥ��ƹ��ۤ���<emphasis>����</emphasis>��
 	  �Хå����åפ�������뤳�Ȥν������ϡ�
 	  �����鶯Ĵ���Ƥ⤷�᤮��ȸ������ȤϤ���ޤ���
 	  �����ƥ����Τκƹ��ۤ��񤷤���ȤǤϤ���ޤ��󤬡�
 	  �ɤ�ʤ����դ��Ƥ����Ȥ��Ƥ⡢<!-- hrs:2000/01/12 inevitably -->
 	  �������ĥ꡼���Τ�Τ˼�㤤�����ä����ˤϡ�
 	  �����ƥब��ư���ʤ��ʤäƤ��ޤ����֤ˤʤ뤳�Ȥ�����ΤǤ���
 	  ¿ʬ�������Ȥ����ȤϤʤ��Ȼפ��ޤ�����
 	  ���ȤǸ�����뤳�ȤΤʤ��褦��ǰ�Τ����Ѱդ��Ƥ����ޤ��礦!</para>
       </step>
 
       <step>
 	<indexterm><primary>�᡼��󥰥ꥹ��</primary></indexterm>
 	<para>�ɤ������Ƥ���֥����˱����ơ�
 	  &a.stable.name; �⤷���� &a.current.name;
 	  �κǶ�Υ���ȥ��Ĵ�٤ơ�
 	  ���Τ������ƶ�������륷���ƥ���ǧ���Ƥ���������
 	  ���Τ����꤬Ʊ�����Ƥ���С������Υ����ɤ˱ƶ�������ϡ�
 	  �������꤬��褵�줿���Ȥ���𤹤�
 	  <quote>������ (all clear)</quote>
 	  �Υ��ʥ��󥹤���Ƥ����ޤ��ԤäƤ��顢��������Ʊ�����ơ�
 	  ��������Υ�������ɬ�פʽ���������Ƥ���������</para>
       </step>
     
       <step>
 	<para><filename>/usr/src/UPDATING</filename> ���ɤߡ�
 	  Ʊ�����Ƥ��륽�����ΥС�������ɬ�פȤʤ륹�ƥåפ��ʤ����ɤ�����Ĵ�٤Ʋ�������
 	  ���Υե�����ˤ�����Ū�����������Υ��ޥ�ɤ�¹Ԥ�����֤ʤɤν��פʾ��󤬴ޤޤ�Ƥ��ޤ���
 	  �礭�ʥ��åץ��졼�ɤǤϡ�world
 	  �򥤥󥹥ȡ��뤹����������Υե������̾�����ѹ������ꡢ
 	  �������Ȥ��ä������̤ʥ��ƥåפ��ɲä�ɬ�פȤʤ뤳�Ȥ�����ޤ���
 	  �ե�����κǸ�ˤϡ�
 	  ���߿侩����Ƥ��륢�åץ��졼�ɤμ�礬�ܤ������Τ���������Ƥ��ޤ���
 	  �⤷��<filename>UPDATING</filename> �˽񤫤�Ƥ����礬��
 	  ������˽񤫤�Ƥ����Τ�̷�⤷�Ƥ����顢
 	  <filename>UPDATING</filename> �μ�����Ѥ��Ƥ���������</para>
       </step>
     </procedure>
 
     <warning>
       <title><command>make world</command> �ϻȤ�ʤ�����</title>
 
       <para>�Ť��ɥ�����Ȥ���ˤϡ�
 	<command>make world</command> ��Ȥ����Ȥ�����Ƥ����Τ�����ޤ���
 	����ϡ����פʼ��򤤤��Ĥ�ȴ�����Ƥ��ޤ��Τǡ�
 	�������ѡ��ȤǤʤ���лȤ��٤��ǤϤ���ޤ���
 	�ۤܤ�������ˤ����ơ�<command>make world</command>
 	��¹Ԥ���Τϴְ�äƤ��ꡢ
 	��������������Ƥ�������Ѥ���٤��Ǥ���</para>
     </warning>
 
     <sect2 xml:id="canonical-build">
       <title>�����ƥ๹���γ���</title>
 
       <para>world �ι��ۤǤϡ�<xref linkend="synching"/>
 	�˽񤫤�Ƥ���������ꤷ�����������Ѥ��ơ�
 	�Ť� &os; �ΥС������򥢥åץǡ��Ȥ��ޤ���</para>
 
       <para>&os; �Ǥϡ�<quote>world</quote> �ϡ�
 	�����ͥ롢���������ƥ�ΥХ��ʥꡢ
 	�饤�֥�ꡢ�ץ�����ߥ󥰥ե����롢�Ȥ߹��ߤΥ���ѥ�����̣���ޤ���
 	�����Υ���ݡ��ͥ�Ȥι��ۤ���ӥ��󥹥ȡ���ν��֤Ͻ��פǤ���</para>
 
       <para>�㤨�С��Ť�����ѥ���ϡ�
 	�Х���ޤߡ������������ͥ�򥳥�ѥ���Ǥ��ʤ���ǽ��������ޤ���
 	���Τ��ᡢ�����������ͥ�Ͽ���������ѥ���ǹ��ۤ��ʤ���Фʤ�ʤ��Τǡ�
 	����������ѥ���ι��ۤ�ɬ�פȤʤ�ޤ�����
 	ɬ�����⡢
 	����������ѥ��餬���󥹥ȡ��뤵��Ƥ���ɬ�פϤ���ޤ���</para>
 
       <para>������ world �ϡ�
 	�����������ͥ�ε�ǽ�˰�¸���Ƥ����ǽ��������Τǡ�
 	������ world �򥤥󥹥ȡ��뤹�����ˡ�
 	�����������ͥ뤬���󥹥ȡ��뤵��Ƥ��ʤ���Фʤ�ޤ���
 	�Ť� world �ϡ������������ͥ�Ǥ�������ư���ʤ������Τ�ޤ���
 	���Τ��ᡢ�����������ͥ�򥤥󥹥ȡ��뤷���顢
 	ľ���˿����� world �򥤥󥹥ȡ��뤷�Ƥ���������</para>
 
       <para>�������ˤϡ������� world
 	�򥤥󥹥ȡ��뤹�������ѹ����٤���Τ�����ޤ�����
 	�Ť� world �������ǽ��������ޤ���
 	���Τ��ᡢ����Υ��åץǡ��Ȥ� 2 �Ĥμ��ǹԤ��ޤ���
 	¿���ξ�硢���åץǡ��ȤΥץ������ϡ��ե�������֤��������ꡢ
 	�ɲäΤߤ�Ԥ����Ť��ե�����������ޤ���
 	���Τ��Ȥ�����������������ǽ�������뤿�ᡢ
 	<filename>/usr/src/UPDATING</filename> �ˤϡ�
 	��ư�Ǻ�����٤��ե������ɤΥ��ƥåפǺ�����٤������񤫤�Ƥ��ޤ���</para>
 
       <para>��������θ������̡��ʲ����������륢�åץ��졼�ɤο侩��礬����ޤ�����</para>
 
       <note>
 	<para><command>make</command> ��¹Ԥ����Ȥ��ν��Ϥϡ�
 	  �ե��������¸������ɤ��Ǥ��礦��
 	  �����㳲��ȯ���������ˤϡ����顼��å������Υ��ԡ���
 	  &os; �᡼��󥰥ꥹ�Ȥ���Ƥ��Ƥ���������</para>
 
 	<para>�ե��������¸����Ǥ��ñ����ˡ�ϡ�
 	  �����Ȥ��ƽ��Ϥ���¸��Υե�����̾����ꤷ��
 	  <command>script</command> ���ޥ�ɤ�Ȥ����ȤǤ���
 	  <filename>/tmp</filename> �ϡ�
 	  �Ƶ�ư�򤹤�Ⱥ������Ƥ��ޤ���ǽ��������Τǡ�
 	  ���Υǥ��쥯�ȥ�ˤϽ��Ϥ���¸���ʤ��褦�ˤ��Ƥ���������
 	  ���Ϥ���¸�ˤϡ�<filename>/var/tmp</filename> ��Ŭ���Ƥ��ޤ���
 	  ���Υ��ޥ�ɤ� world �ι��ۤ�ľ���˹Ԥʤ����ƹ��ۤ���λ������
 	  <userinput>exit</userinput> �����Ϥ��Ƥ���������</para>
 
 	<screen>&prompt.root; <userinput>script <replaceable>/var/tmp/mw.out</replaceable></userinput>
 Script started, output file is /var/tmp/mw.out</screen>
       </note>
 
       <procedure>
 	<title>world �ι��ۥץ������γ���</title>
 
 	<para>world �ι��ۥץ��������Ѥ����륳�ޥ�ɤϡ�
 	  �����Ǽ�����Ƥ�����֤Ǽ¹Ԥ��Ƥ���������
 	  ������Ǥϳƥ��ޥ�ɤε�ǽ�ˤĤ��ƤޤȤ�ޤ���</para>
 
 	<step>
 	  <para>�����ƥ��� world �ι��ۤ����٤Ǥ�Ԥ��Ƥ���ȡ�
 	    ����ι��ۤκݤΥ��ԡ���
 	    <filename>/usr/obj</filename>
 	    ��¸�ߤ���Ϥ��Ǥ���
 	    ���Υǥ��쥯�ȥ꤬¸�ߤ��Ƥ���ΤǤ���С�
 	    ���Υǥ��쥯�ȥ�������뤳�Ȥ�
 	    <command>make buildworld</command> �ι����ˤ�������֤�û�̤���
 	    ��¸�����Ǻ�ޤ����褦�ʥȥ�֥�����Ǥ��ޤ���</para>
 
 	  <screen>&prompt.root; <userinput>chflags -R noschg /usr/obj/*</userinput>
 &prompt.root; <userinput>rm -rf /usr/obj</userinput></screen>
 	</step>
 
 	<step>
 	  <para>����������ѥ���ȴ�Ϣ�ġ����ǽ�˥���ѥ��뤷��
 	    ���θ塢����������ѥ���ǡ�
 	    ������ world �λĤ����ʬ�򥳥�ѥ��뤷�ޤ���
 	    ����ѥ��뤵�줿��Τϡ�
 	    <filename>/usr/obj</filename> �˳�Ǽ����ޤ���</para>
 
 	  <screen>&prompt.root; <userinput>cd /usr/src</userinput>
 &prompt.root; <userinput>make buildworld</userinput></screen>
 	</step>
 
 	<step>
 	  <para>����ѥ���ȥ����ͥ�Υߥ��ޥå����ɤ����ᡢ
 	    <filename>/usr/obj</filename>
 	    �ˤ��뿷��������ѥ�����Ѥ��ƿ����������ͥ���ۤ��ޤ���
 	    �ƹ��ۤϡ������Υ��깽¤�Τ��ѹ����줿�褦�ʾ��ˤ�ɬ�ܤǡ�
 	    <command>ps</command> �� <command>top</command>
 	    �Τ褦�ʥץ������ϡ�
 	    �����ͥ�ȥ����������ɤΥС�����󤬰��פ��ʤ��������ư��ʤ����Ȥ�����ޤ���</para>
 
 	  <screen>&prompt.root; <userinput>make buildkernel</userinput></screen>
 	</step>
 
 	<step>
 	  <para>���������åץǡ��Ȥ��줿�����ͥ�ǵ�ư�Ǥ���褦�ˡ�
 	    �����������ͥ�ȥ����ͥ�⥸�塼���ǥ�����������֤��ޤ���
 	    <varname>kern.securelevel</varname> �� 1 ����礭�����Ƥ��ơ�
 	    <emphasis>����</emphasis> �����ͥ�ΥХ��ʥ�ե������
 	    <literal>noschg</literal> �Τ褦�ʥե饰�����ꤷ�Ƥ�����ϡ�
 	    �ޤ������󥰥�桼���⡼�ɤ˰ܹԤ��Ƥ���������
 	    ����ʳ��ξ��ϡ�
 	    �ޥ���桼���⡼�ɤǤ����Υ��ޥ�ɤ�����ʤ�ư������Ϥ��Ǥ���
 	    <varname>kern.securelevel</varname> �ˤĤ��ƾܤ�����
 	    &man.init.8; �򡢥ե�������Ф��뤵�ޤ��ޤʥե饰�ˤĤ��ƾܤ�����
 	    &man.chflags.1; ��������������</para>
 
 	  <screen>&prompt.root; <userinput>make installkernel</userinput></screen>
 	</step>
 
  	<step>
 	  <para>���Ǥ˼¹Ԥ���Ƥ��륽�եȥ������򥢥åץǡ��Ȥ���ݤ������Ǿ��¤ˤ��뤿�ᡢ���󥰥�桼���⡼�ɤ˰ܹԤ��Ƥ���������
 	    ���󥰥�桼���⡼�ɤ˰ܹԤ��뤳�Ȥˤ�ꡢ
 	    �����������ͥ��ǸŤ� world
 	    ���¹Ԥ����ݤ������Ǿ��¤ˤ��ޤ���</para>
 
 	  <screen>&prompt.root; <userinput>shutdown now</userinput></screen>
 
 	  <para>���󥰥�桼���⡼�ɤ˰ܹԤ����顢UFS
 	    �ǥե����ޥåȤ���Ƥ��륷���ƥ�Ǥϡ�
 	    �ʲ��Υ��ޥ�ɤ�¹Ԥ��Ƥ���������</para>
 
 	  <screen>&prompt.root; <userinput>mount -u /</userinput>
 &prompt.root; <userinput>mount -a -t ufs</userinput>
 &prompt.root; <userinput>swapon -a</userinput></screen>
 
 	  <para>�⤷�����ƥब ZFS �ǥե����ޥåȤ���Ƥ�����ˤϡ�
 	    �ʲ��� 2 �ĤΥ��ޥ�ɤ�¹Ԥ��Ƥ���������
 	    ������Ǥϡ�zpool ��̾���� <literal>zroot</literal>
 	    �Ǥ���Ȳ��ꤷ�ޤ���</para>
 
 	  <screen>&prompt.root; <userinput>zfs set readonly=off zroot</userinput>
 &prompt.root; <userinput>zfs mount -a</userinput></screen>
 	</step>
 
  	<step>
 	  <para>���ץ����: �⤷���ǥե���Ȥ� US English
 	    �ʳ��Υ����ܡ��ɥޥåפ�ɬ�פǤ���С�
 	    &man.kbdmap.1; ���ѹ����Ƥ���������</para>
 
 	  <screen>&prompt.root; <userinput>kbdmap</userinput></screen>
 	</step>
 
 	<step>
 	  <para>���θ塢�ɤ���Υե����륷���ƥ�Ǥ⡢
 	    <acronym>CMOS</acronym> �����å����ϰ���֤����ꤵ��Ƥ���
 	    GMT �ǤϤʤ����
 	    (&man.date.1; �����������֤��ϰ��ɽ�����ʤ��ʤ����ƤϤޤ�ޤ�)
 	    �ˤϡ����Υ��ޥ�ɤ�¹Ԥ��Ƥ���������</para>
 
 	  <screen>&prompt.root; <userinput>adjkerntz -i</userinput></screen>
 	</step>
 
 	<step>
 	  <para>�����ƥ�κƹ��ۤǤϡ�
 	    <filename>/etc</filename>,
 	    <filename>/var</filename> ��
 	    <filename>/usr</filename>
 	    �Ȥ��ä��ǥ��쥯�ȥ�˿�����Ƴ�����줿�ե�����䡢
 	    �ѹ����줿����ե�������Ф��빹���ϹԤʤ��ޤ���
 	    ���ˡ������� world
 	    ������ <filename>/etc</filename>
 	    �κǽ������ե�����Υ��åץǡ��Ȥ�Ԥ��ޤ���
 	    �ʲ��Υ��ޥ�ɤ�
 	    <buildtarget>installworld</buildtarget>
 	    ���������뤿����ܼ�Ū�ʥե�����Τߤ���Ӥ��ޤ���
 	    ���Ȥ��С�
 	    ���Υ��ƥåפǤϡ��Ǹ�Υ��åץǡ��ȸ�� &os; ���ɲä��줿��
 	    ���������롼�פ俷���������ƥॢ������ȡ�
 	    �⤷���ϥ������ȥ��åץ�����ץȤ������ƥ���ɲä���뤳�Ȥ�����ޤ���
 	    ���Υ��ޥ�ɤ˴ؤ���ܺ٤ʾ���ˤĤ��Ƥϡ�
 	    <xref linkend="mergemaster"/> �򻲾Ȥ��Ƥ���������</para>
 
 	  <screen>&prompt.root; <userinput>mergemaster -iF</userinput></screen>
 	</step>
 
 	<step>
 	  <para><filename>/usr/obj</filename>
 	    �ˤ��뿷���� world
 	    ����ӥ����ƥ�ΥХ��ʥ�򥤥󥹥ȡ��뤷�ޤ���</para>
 
 	  <screen>&prompt.root; <userinput>cd /usr/src</userinput>
 &prompt.root; <userinput>make installworld</userinput></screen>
 	</step>
 
 	<step>
 	  <para>�Ĥ������ե�����򥢥åץǡ��Ȥ��ޤ���</para>
 
 	  <screen>&prompt.root; <userinput>mergemaster -p</userinput></screen>
 	</step>
 
 	<step>
 	  <para>�Ȥ��ʤ��ʤä��ե�����������ޤ���
 	    �⤷�Ȥ��ʤ��ʤä��ե����뤬�ǥ������˻ĤäƤ���ȡ�
 	    ���꤬�������ǽ��������Τǽ��פʺ�ȤǤ���</para>
 
 	  <screen>&prompt.root; <userinput>make delete-old</userinput></screen>
 	</step>
 
 	<step>
 	  <para>�Ƶ�ư��Ԥ��������������ͥ롢
 	    world ����������ե����������ɤ��ޤ���</para>
 
 	  <screen>&prompt.root; <userinput>reboot</userinput></screen>
 	</step>
 
 	<step>
 	  <para>�Ť��饤�֥������������ˡ�
 	    <xref linkend="ports-upgrading"/>
 	    �˽񤫤�Ƥ�����ˤ������äơ�
 	    ���٤Ƥ� ports ��ƹ��ۤ���ɬ�פ�����ޤ���
 	    �ƹ��ۤ�����ä��顢�������饤�֥��ȶ��礹�뤳�Ȥ��򤱤뤿�ᡢ
 	    �Ȥ��ʤ��ʤä��饤�֥��������ޤ���
 	    ���β����˴ؤ���ܺ٤ϡ�<xref linkend="make-delete-old"/>
 	    �򻲾Ȥ��Ʋ�������</para>
 
 	  <screen>&prompt.root; <userinput>make delete-old-libs</userinput></screen>
 	</step>
       </procedure>
 
      <indexterm><primary>���󥰥�桼���⡼��</primary></indexterm>
 
       <para>�⤷�����ƥब�����󥿥������Ĥ��Ȥ��Ǥ���ΤǤ���С�
 	�����ƥ�Υ���ѥ����ޥ���桼���⡼�ɤǤ����ʤ���
 	���󥹥ȡ���Τ���˥��󥰥�桼���⡼�ɤ˰ܹԤ���Ȥ�����ˡ�ǤϤʤ���
 	����ѥ���򥷥󥰥�桼���⡼�ɤǹԤ����Ȥ�ͤ��Ƥ���������
 	�����ƥ�κƥ��󥹥ȡ���Ǥϡ���������ν��פʥ����ƥ�ե����롢
 	���٤Ƥ�ɸ��Ū�ʥ����ƥ�Х��ʥꡢ�饤�֥�ꡢ
 	���󥯥롼�ɥե����뤬�ѹ������Τǡ�
 	�ºݤ�ư��Ƥ��륷���ƥ�ˤ����ơ�
 	�ä˥����ƥ��֤ʥ桼���ϡ��ȥ�֥�˸�������ǽ��������ޤ���</para>
     </sect2>
 
     <sect2 xml:id="src-updating">
       <title>����ե�����</title>
 
       <indexterm>
         <primary><filename>make.conf</filename></primary>
       </indexterm>
 
       <para>world
 	�ι��ۥץ������Ǥϡ������Ĥ�������ե����뤬�Ȥ��ޤ���</para>
 
       <para><filename>/usr/src</filename> ���֤���Ƥ���
 	<filename>Makefile</filename> �ˤϡ�
 	&os; ��������ץ������ι�����ˡ�䡢
 	�ɤ��������֤Ǥ������ۤ��٤����Ȥ��ä��ؼ������Ҥ���Ƥ��ޤ���</para>
 
       <para><command>make</command> �����Ѳ�ǽ�ʥ��ץ�����������
 	&man.make.conf.5; �䡢���̤��㤬
 	<filename>/usr/share/examples/etc/make.conf</filename> �ˤ���ޤ���
 	����������� <filename>/etc/make.conf</filename> ���ɲä���ȡ�
 	<command>make</command> �μ¹Ԥ�ץ������ι�����ˡ������Ǥ��ޤ���
 	�����Υ��ץ����ϡ�
 	<command>make</command> ���Ȥ���ݤˤϾ��ͭ���Ȥʤ뤿�ᡢ
 	Ports Collection �ǤΥ��ץꥱ�������Υ���ѥ������
 	�桼�����񤤤� C �ץ������� &os;
 	���ڥ졼�ƥ��󥰥����ƥ���ۤ���ݤ˱ƶ���ڤܤ��ޤ���
 	����������ѹ��������Ȥˤ�ꡢ�ƶ��������ϰϤˤ���ӡ�
 	�ä��٤���̤�⤿�餹��ǽ��������ޤ���
 	ξ���Υե�����˽񤫤�Ƥ��륳���Ȥ��ɤळ�Ȥȡ�
 	�ǥե���Ȥ�����ϡ��ѥե����ޥ󥹤Ȱ������δ����������Ф�Ƥ��뤳�Ȥ�Ф��Ƥ����Ƥ���������</para>
 
       <indexterm>
 	<primary><filename>src.conf</filename></primary>
       </indexterm>
 
       <para><filename>/etc/src.conf</filename> �ϡ�
 	�����������ɤ��Ѥ������ڥ졼�ƥ��󥰥����ƥ�ι��ۤ򥳥�ȥ����뤷�ޤ���
 	<filename>/etc/make.conf</filename> �Ȥϰۤʤꡢ
 	<filename>/etc/src.conf</filename> �˽񤫤줿����ϡ�
 	&os; ���ڥ졼�ƥ��󥰥����ƥऽ�Τ�Τ��ۤ���Ȥ��ˤΤ߱ƶ����ޤ���
 	���Υե�����������ǽ��¿���Υ��ץ����ˤĤ��Ƥϡ�
 	&man.src.conf.5; �˵��Ҥ���Ƥ��ޤ���
 	�츫�����Ȥ���̵���ˤ���Ƥ��롢
 	�Ȥ��Ƥ��ʤ������ͥ�⥸�塼���ӥ�ɥ��ץ��������դ��Ƥ���������
 	�Ȥ��ɤ�ͽ�����ʤ��ä��ꡢ�鷺���ʱƶ���Ϳ���뤳�Ȥ�����ޤ���</para>
     </sect2>
 
     <sect2 xml:id="make-buildworld">
       <title>�ѿ��ȥ������å�</title>
 
       <para><command>make</command> �λ��Ѥˤ��������Ū�ʽ񼰤ϡ�
 	���ΤȤ���Ǥ���</para>
 
       <screen>&prompt.root; <userinput>make -<replaceable>x</replaceable> -D<replaceable>VARIABLE</replaceable> <replaceable>target</replaceable></userinput></screen>
 
       <para>������Ǥϡ�<option>-<replaceable>x</replaceable></option> ��
 	<command>make</command> ���Ϥ���륪�ץ����ˤʤ�ޤ���
 	���Ѳ�ǽ�ʥ��ץ����ˤĤ��Ƥϡ�&man.make.1;
 	�򻲾Ȥ��Ƥ���������</para>
 
       <para>�ѿ����Ϥ��ˤϡ��ѿ���̾����
 	<option>-D<replaceable>VARIABLE</replaceable></option>
 	�Τ褦�˻��ꤷ�Ƥ���������
 	�����ѿ��� <filename>Makefile</filename> ��ư��򥳥�ȥ����뤷�ޤ���
 	�ѿ��λ���ϡ�<filename>/etc/make.conf</filename> �����ꤹ�뤫��
 	<command>make</command> �μ¹Ի��˻��ꤹ�뤫�Τɤ��餫�ǹԤ��ޤ���
 	���Ȥ��С��ʲ����ѿ��ϡ��ץ��ե������ǤΥ饤�֥����ۤ��ʤ����Ȥ���ꤷ�ޤ���</para>
 
       <screen>&prompt.root; <userinput>make -DNO_PROFILE <replaceable>target</replaceable></userinput></screen>
 
       <para>����ϡ�<filename>/etc/make.conf</filename>
 	����ǰʲ��Τ褦�����ꤹ�뤳�Ȥ��б����ޤ���</para>
 
       <programlisting>NO_PROFILE=    true     #    Avoid compiling profiled libraries</programlisting>
 
       <para><replaceable>target</replaceable> �ϡ�<command>make</command> ��
 	�ɤΤ褦��ư���Τ���ؼ����뤿��Τ�ΤǤ���
 	<filename>Makefile</filename> �����Ѳ�ǽ�ʥ������åȤ�������Ƥ��ޤ���
 	�������åȤˤϡ�
 	�����ƥ�κƹ��ۤ�ɬ�פ��ʳ���
 	¿���Τ���˺٤����ʳ���ʬ�䤹�뤿�ᡢ
 	���ۤβ��������Ѥ�����Τ�����ޤ���</para>
 
       <para>����褬ʬ�����Ƥ��뤳�Ȥϡ���Ĥ���ͳ����ͭ�ѤǤ���
 	�ޤ����ˡ����ۺ�Ȥϲ�Ư��Υ����ƥ�ˤޤä����ƶ���Ϳ���ޤ���
 	���Τ��ᡢ�ޥ���桼���⡼�ɤDz�Ư��Υ����ƥ�Ǥ⡢������
 	<buildtarget>buildworld</buildtarget> ��¹ԤǤ��ޤ���
 	��������<buildtarget>installworld</buildtarget> ��
 	���󥰥�桼���⡼�ɤǹԤʤ����Ȥ򤪤����ᤷ�ޤ���</para>
 
       <para>����ˡ�<acronym>NFS</acronym> �ޥ���Ȥ����Ѥ��뤳�Ȥǡ�<xref
 	  linkend="small-lan"/> ����������Ƥ���褦�ˡ�
 	�ͥåȥ�����ʣ���Υޥ���򥢥åץ��졼�ɤ��뤳�Ȥ���ǽ�������������ޤ���</para>
 
       <para><command>make</command> ��
 	<option>-j</option> ��Ĥ���ȡ�
 	Ʊ����ʣ���Υץ������������Ǥ��ޤ���
 	���۲���������ʬ�Ǥ� <acronym>CPU</acronym> ��ǽ�θ³����
 	<acronym>I/O</acronym> ��ǽ�θ³�����������Ȥʤ뤿�ᡢ
 	���󥰥� <acronym>CPU</acronym> �ȥޥ�� <acronym>CPU</acronym>
 	�ޥ����ξ���˸��̤�����ޤ���</para>
 
       <para>���̤Υ��󥰥� <acronym>CPU</acronym> �ޥ���ǰʲ��Υ��ޥ��
 	��¹Ԥ���ȡ����� 4 �ĤޤǤΥץ�������Ʊ���˼¹Ԥ��ޤ���
 	�᡼��󥰥ꥹ�Ȥ���Ƥ��줿�и�Ū�����ˤ��ȡ�
 	4 �ĤȤ������꤬�Ǥ��ɤ��ѥե����ޥ󥹤򼨤��褦�Ǥ���</para>
 
       <screen>&prompt.root; <userinput>make -j4 buildworld</userinput></screen>
 
       <para>�ޥ�� <acronym>CPU</acronym> �ޥ���Ǥϡ�
 	<literal>6</literal> ���� <literal>10</literal> �δ֤��ͤ����ꤷ��
 	®�٤��ɤ줯�餤���夹�뤫��ǧ���ƤߤƤ���������</para>
 
       <indexterm>
 	<primary><quote>world</quote> �κƹ���</primary>
 	<secondary>����</secondary>
       </indexterm>
 
       <note>
 	<para><command>make buildworld</command>
 	  ���ѿ�����ꤷ�����ϡ�Ʊ�������
           <command>make installworld</command> �ˤ���ꤷ�ʤ���Фʤ�ޤ���
 	  ������ <buildtarget>installworld</buildtarget>
 	  �Ǥϡ�<option>-j</option> ��
 	  <emphasis>���Ф˻ȤäƤϤ����ޤ���</emphasis>��</para>
 
 	<para>���Ȥ��С��ʲ��Υ��ޥ�ɤ�¹Ԥ����ʤ顢</para>
 
 	<screen>&prompt.root; <userinput>make -DNO_PROFILE buildworld</userinput></screen>
 
 	<para>�ʲ��Τ褦�ˤ��ƥ��󥹥ȡ��뤷�ʤ���Фʤ�ޤ���</para>
 
 	<screen>&prompt.root; <userinput>make -DNO_PROFILE installworld</userinput></screen>
 
 	<para>�⤷�������ʤ��ä���硢2 ���ܤΥ��ޥ�ɤϡ�
           <command>make buildworld</command>
 	  ���ʳ��ǹ��ۤ���Ƥ��ʤ��ץ��ե������ǥ饤�֥��򥤥󥹥ȡ��뤷�褦�Ȥ��Ƥ��ޤ��Ǥ��礦��</para>
       </note>
     </sect2>
 
     <sect2 xml:id="mergemaster">
       <info>
 	<title>����ե������Ʊ��</title>
 
 	<authorgroup>
 	  <author>
 	    <personname>
 	      <firstname>Tom</firstname>
 	      <surname>Rhodes</surname>
 	    </personname>
 	    <contrib>���: </contrib>
 	  </author>
 	</authorgroup>
       </info>
       
       <indexterm>
 	<primary>
 	  <command>mergemaster</command>
 	</primary>
       </indexterm>
 
       <para>&os; �� &man.mergemaster.8; Bourne �����륹����ץȤϡ�
 	<filename>/etc</filename> �ˤ�������ե�����ȡ�
 	<filename>/usr/src/etc</filename>
 	�ˤ�������ե�����ΰ㤤���ǧ���뤿��Τ�ΤǤ���
 	�����ƥ������ե�����򥽡����ĥ꡼�ˤ�������ե�����˥��åץǡ��Ȥ���ˤϡ�
         ������ˡ���侩����Ƥ��ޤ���</para>
 
       <para><command>mergemaster</command> ��Ȥ����ˡ�
 	��¸�� <filename>/etc</filename>
 	��ɤ��������ʾ��˥��ԡ����Ƥ����ޤ��礦��
 	�Ƶ�Ū�ʥ��ԡ���Ԥʤ� <option>-R</option> �ȡ�
 	�ե�����ι������֤��ͭ�Ԥʤɤ���¸����
 	<option>-p</option> �ȶ��˼¹Ԥ��Ƥ���������</para>
 
       <screen>&prompt.root; <userinput>cp -Rp /etc /etc.old</userinput></screen>
 
       <para><command>mergemaster</command> ��¹Ԥ���ȡ�
 	<filename>/</filename> �����Ȥ������Ū�ʥ롼�ȴĶ����ۤ���
 	���ޤ��ޤʥ����ƥ�����ե������
 	(����: �ǥե���ȤǤ� <filename>/var/tmp/temproot</filename> ��)
 	�֤��Ƥ����ޤ���
 	�����Υե�����ϸ��ߥ����ƥ�˥��󥹥ȡ��뤵��Ƥ���ե��������Ӥ���ޤ���
 	�ۤʤ�ե������ &man.diff.1; �����Ǽ����졢
 	<option>+</option> �ε�����ɲäޤ����ѹ����줿�Ԥ�ɽ����
 	<option>-</option> �ϴ����˺�����줿���������֤�������줿�Ԥ�ɽ���ޤ���
 	�ե�����ΰ㤤��ɽ����ˡ�ˤĤ��ƤΤ��ܤ�������ϡ�
 	&man.diff.1; �򻲾Ȥ��Ƥ���������</para>
 
       <para>���� <command>mergemaster</command>
 	�ϰ㤤�Τ���ե�����򤽤줾�켨����
 	�����ǽ�ʥ��ץ�����ɽ�����ޤ���
 	�����Ǥϡ�����ե�����ȸƤФ�뿷�����ե�����������뤫��
 	����ե�����򤽤Τޤޥ��󥹥ȡ��뤹�뤫��
 	����ե�����ȸ��ߥ��󥹥ȡ��뤵��Ƥ���ե���������礹�뤫��
 	�⤷���Ϸ�̤�⤦���ٸ��뤫��
 	�Ȥ��ä����ץ���󤫤�����Ǥ��ޤ���</para>
 
       <para>����ե�����κ�������֤ȡ�<command>mergemaster</command>
 	�ϸ��ߤΥե�������ѹ����ʤ��ǿ������С������������ޤ���
 	��������ϡ�������Ǥ��ޤ���
 	<command>mergemaster</command>
 	�Υץ���ץȤ� <keycap>?</keycap> �ȥ����פ���С�
 	���ĤǤ�إ�פ������ޤ���
 	�ե�����Υ����åפ����֤ȡ�¾�Τ��٤ƤΥե�����򽪤������ȡ�
 	�⤦���٤��Υե����뤬�󼨤���ޤ���</para>
 
       <para>����ե�����򤽤Τޤޥ��󥹥ȡ��뤹�뤳�Ȥ����֤ȡ�
 	���ߤΥե�����򿷤����ե�������֤������ޤ���
 	�ۤȤ�ɤμ��ä��Ƥ��ʤ��ե�����ϡ�
 	���줬���֤褤����Ǥ���</para>
 
       <para>�ե������������������硢
 	�ƥ����ȥ��ǥ�������ư���졢ξ���Υե��������Ȥ��󼨤���ޤ���
 	���̾���¤�ξ���Υե�����򸫤ƿ������ե������������뤿���ξ������ɬ�פ���ʬ�����򤷡�
 	2 �ĤΥե���������礹�뤳�Ȥ��Ǥ��ޤ���
 	�¤�Ǥ���ե��������Ӥ���Ȥ���
 	<keycap>l</keycap> �Ǻ�¦����Ȥ����򤷡�
 	<keycap>r</keycap> �DZ�¦����Ȥ����򤷤ޤ���
 	�ǽ����ϤϺ���ξ������ʬ�ǤǤ����ե�����ˤʤ�Ǥ��礦��
 	���Υե�����򥤥󥹥ȡ��뤹�뤳�Ȥ��Ǥ��ޤ���
 	�����Ƥ������Υ��ץ����ϥ桼����������ѹ������ե�����˻Ȥ��ޤ���</para>
 
       <para>��̤�⤦���ٸ��롢�����򤹤�ȡ�
 	�ե�������������⤦���ٸ��뤳�Ȥ��Ǥ��ޤ���</para>
 
       <para><command>mergemaster</command>
 	�������ƥ�ե��������Ӥ򽪤������ȡ�
 	¾�Υ��ץ����ˤĤ��ƤΥץ���ץȤ�ɽ������ޤ���
 	���Ȥ��С�
 	�ѥ���ɥե������ƹ��ۤ��뤫�ɤ�����Ҥͤ뤳�Ȥ�����ޤ���
 	�Ǹ�˻Ĥä�����ե�����������뤫�ɤ�����Ҥͤƽ�λ���ޤ���</para>
 
 <!--
 Probably not needed as changes should be minimal and mergemaster does
 a good job of merging.
       <tip>
 	<title>������ root �ǥ��쥯�ȥ�
 	  (<filename>/var/tmp/root</filename>) ��̾����
           �����ॹ����פ��դ��Ƥ����ȡ�
           �ۤʤ�С������֤���Ӥ�ڤ˹Ԥʤ����Ȥ��Ǥ��ޤ���</title>
 
 	<para>���ˤ˥����ƥ�κƹ��ۤ�Ԥʤ��Ȥ������Ȥϡ�
 	  <filename>/etc</filename> �ι�����ޤ���
 	  ���ˤ˹Ԥ�ɬ�פ�����Ȥ������ȤǤ���
 	  ����Ϥ���äȼ�֤Τ������ȤǤ���</para>
 
 	<para>���κ�Ȥϡ����ʤ��� <filename>/etc</filename>
 	  �˥ޡ���������
           �������ѹ����줿�ե�����κǿ��Υ��åȤΥ��ԡ�����¸���Ƥ������Ȥ�
           ���᤯�Ԥʤ����Ȥ��Ǥ��ޤ���</para>
 
 	<procedure>
 	  <step>
 	    <para>���̤� make world ���ޤ���
 	      <filename>/etc</filename> ��
 	      ¾�Υǥ��쥯�ȥ�򹹿��������ʤä��Ȥ��ϡ��������å�
 	      �ǥ��쥯�ȥ�ˡ����ΤȤ������դ˴�Ť�̾����Ĥ��Ƥ���������</para>
 
 	      <screen>&prompt.root; <userinput>mkdir /var/tmp/root-20130214</userinput>
 &prompt.root; <userinput>cd /usr/src/etc</userinput>
 &prompt.root; <userinput>make DESTDIR=/var/tmp/root-20130214 \
     distrib-dirs distribution</userinput></screen>
 	  </step>
 
 	  <step>
 	    <para>�����������Ƥ���褦�ˡ�
 	      ���Υǥ��쥯�ȥ꤫���ѹ�����ޡ������ޤ���
               ���κ�Ȥ���λ���Ƥ⡢
               <filename>/var/tmp/root-20130214</filename>
 	      �������Ƥ�<emphasis>�����ޤ���</emphasis>��</para>
 	  </step>
 
 	  <step>
 	    <para>�ǿ��ǤΥ����������������ɤ��ƺƹ��ۤ����顢
 	      ���ƥå� 1 �ˤ������äƤ������������٤ϡ�
 	      ���������դ�ȿ�Ǥ����ǥ��쥯�ȥ��������Ƥ���������
 	      ������Ǥϡ�<filename>/var/tmp/root-20130221</filename>
 	      �Ȥ����������ǥ��쥯�ȥ��Ĥ���ޤ���</para>
 	  </step>
 
 	  <step>
 	    <para>&man.diff.1; ����Ѥ���
               ��ĤΥǥ��쥯�ȥ����Ӥ���Ƶ�Ū diff ��������뤳�Ȥǡ�
               �콵�֤δ֤˹Ԥʤ�줿�������ؤ��ѹ��ˤ���������Ĵ�٤ޤ���
             </para>
 
 	    <screen>&prompt.root; <userinput>cd /var/tmp</userinput>
 &prompt.root; <userinput>diff -r root-20130214 root-20130221</userinput></screen>
 
 	    <para>����ˤ�ä���𤵤��������ϡ�����ξ�硢
 	      <filename>/var/tmp/root-20130221/etc</filename> ��
 	      <filename>/etc</filename>
 	      �Ȥ����������٤����˾��ʤ���Τˤʤ�ޤ���
 	      ����������ʤ����ᡢ�ѹ������¸��
 	      <filename>/etc</filename>
 	      �˥ޡ������뤳�Ȥϡ����Ū�ưפˤʤ�ޤ���</para>
 	  </step>
 
 	  <step>
 	    <para>�����ޤǽ�λ�����顢
 	      <filename>/var/tmp/root-*</filename>
               ����ĤΤ������Ť����Υǥ��쥯�ȥ�Ϻ�����ƹ����ޤ���
             </para>
 
 	      <screen>&prompt.root; <userinput>rm -rf /var/tmp/root-20130214</userinput></screen>
 	  </step>
 
 	  <step>
 	    <para>�������
 	      <filename>/etc</filename>
 	      ���ѹ�����ޡ�������ɬ�פ����뤿�ӡ������֤��Ƥ���������</para>
 	  </step>
 	</procedure>
 
 	<para>�ǥ��쥯�ȥ�̾��������ư������ˤϡ�&man.date.1;
 	  �����Ѥ��Ƥ���������</para>
 
 	<screen>&prompt.root; <userinput>mkdir /var/tmp/root-`date "+%Y%m%d"`</userinput></screen>
       </tip>
       -->
     </sect2>
 
     <sect2 xml:id="make-delete-old">
       <info>
 	<title>�Ȥ��ʤ��ʤä��ե����롢�饤�֥��κ��</title>
 
 	<authorgroup>
 	  <author>
 	    <personname>
 	      <firstname>Anton</firstname>
 	      <surname>Shterenlikht</surname>
 	    </personname>
 	    <contrib>�١����Ȥʤä��Ρ��Ȥ���: </contrib>
 	  </author>
 	</authorgroup>
       </info>
 
       <indexterm>
 	<primary>Deleting obsolete files and directories</primary>
       </indexterm>
 
       <para>&os; �γ�ȯ��������ˤ����ơ�
 	�ե�����䥷���ƥ�ΰ������Ȥ��ʤ��ʤ뤳�Ȥ�����ޤ���
 	�����ε�ǽ���̤ξ��Ǽ������줿�ꡢ
 	�饤�֥��ΥС�������ֹ椬�Ѥ�ä��ꡢ
 	�����ƥफ�鴰���˺������뤳�Ȥ����뤿��Ǥ���
 	�����ƥ�Υ��åץǡ��Ȼ��˺����ɬ�פˤʤ�Τϡ�
 	�Ť��ե����롢�饤�֥�ꤽ���ƥǥ��쥯�ȥ�Ǥ���
 	�����Υե�����������뤳�Ȥǡ�
 	�������Τ�Хå����å����Τˤ�������ɬ�פ����̤����Ƥ���Ť��ե����뤬��
 	�����ƥ��˻��𤹤뤳�Ȥ��ʤ��ʤ�ޤ���
 	�ޤ����Ť��饤�֥��Υ������ƥ�������������꤬����ȡ�
 	�饤�֥��򿷤������ƥ����ƥ�����ʾ��֤ˤ���
 	�Ť��饤�֥��ˤ�ꥷ���ƥब����å��夹�뤳�Ȥ��ɤ��ʤ���Фʤ�ޤ���
 	�Ȥ��ʤ��ʤä��ե����롢�ǥ��쥯�ȥꡢ�饤�֥���
 	<filename>/usr/src/ObsoleteFiles.inc</filename>
 	�ˤޤȤ���Ƥ��ޤ����ʲ��μ��ˤ�ꡢ
 	���åץ��졼�ɤβ����Ǥ����Υե���������Ǥ��ޤ���</para>
 
       <para>
 	<command>make installworld</command>
 	�ȡ����θ�� <command>mergemaster</command> ��̵���˽���ä��顢
 	�Ȥ��ʤ��ʤä��ե������饤�֥����ǧ���Ƥ���������</para>
 
       <screen>&prompt.root; <userinput>cd /usr/src</userinput>
 &prompt.root; <userinput>make check-old</userinput></screen>
 
       <para>���Ĥ��ä��Ť��ե�����ϡ��ʲ��Υ��ޥ�ɤǺ���Ǥ��ޤ���</para>
 
       <screen>&prompt.root; <userinput>make delete-old</userinput></screen>
 
       <para>�Ȥ��ʤ��ʤä��ե������������ݡ�
 	�ե����뤴�Ȥ˳�ǧ�������ޤ���
 	��ǧ���ά������ưŪ�˥ե������������ˤϡ�
 	�ʲ��Τ褦�� <varname>BATCH_DELETE_OLD_FILES</varname>
 	�����ꤷ�Ƥ���������</para>
 
       <screen>&prompt.root; <userinput>make -DBATCH_DELETE_OLD_FILES delete-old</userinput></screen>
 
       <para><command>yes</command>
 	�򥳥ޥ�ɤإѥ��פǤĤʤ��Ƥ��ά�Ǥ��ޤ���</para>
 
       <screen>&prompt.root; <userinput>yes|make delete-old</userinput></screen>
 
       <warning>
 	<title>Warning</title>
 
         <para>�Ȥ��ʤ��ʤä��ե������������ȡ�
 	  ��������ե�����˰�¸���Ƥ������ץꥱ��������ư���ʤ��ʤäƤ��ޤ��ޤ���
 	  �äˡ��Ť��饤�֥�����������˵��������ޤ���
 	  �̾<command>make delete-old-libs</command>
 	  ��¹Ԥ������ˡ�
 	  �����θŤ��饤�֥���ȤäƤ���ץ�����ࡢports��
 	  �饤�֥���ƹ��ۤ���ɬ�פ�����ޤ���</para>
       </warning>
 
       <para>��ͭ�饤�֥��ΰ�¸������å�����桼�ƥ���ƥ��Ȥ��ơ�
 	<package>sysutils/libchk</package> ��
 	<package>sysutils/bsdadminscripts</package>
 	���Ѱդ���Ƥ��ޤ���</para>
 
       <para>�Ȥ��ʤ��ʤä���ͭ�饤�֥��ϡ�
 	�������饤�֥��ȶ��礷��
 	�ʲ��Τ褦�ʥ�å�������ɽ�����뤳�Ȥ�����ޤ���</para>
 
       <screen>/usr/bin/ld: warning: libz.so.4, needed by /usr/local/lib/libtiff.so, may conflict with libz.so.5
 /usr/bin/ld: warning: librpcsvc.so.4, needed by /usr/local/lib/libXext.so, may conflict with librpcsvc.so.5</screen>
 
       <para>����������褹��ˤϡ�
 	�饤�֥�꤬�ɤ� port �ˤ�äƥ��󥹥ȡ��뤵�줿����Ĵ�٤Ʋ�������</para>
 
       <screen>&prompt.root; <userinput>pkg which /usr/local/lib/libtiff.so</userinput>
   /usr/local/lib/libtiff.so was installed by package tiff-3.9.4
 &prompt.root; <userinput>pkg which /usr/local/lib/libXext.so</userinput>
   /usr/local/lib/libXext.so was installed by package libXext-1.1.1,1</screen>
 
       <para>���Ĥ��ä� port �򥢥󥤥󥹥ȡ��뤷��
 	�ƹ��ۡ��ƥ��󥹥ȡ��뤷�Ƥ���������
 	������� <package>ports-mgmt/portmaster</package>
 	�Ǽ�ư���Ǥ��ޤ���
 	���٤Ƥ� ports ���ƹ��ۤ��졢
 	�Ť��饤�֥�꤬�ɤ��ˤ�Ȥ��Ƥ��ʤ����Ȥ��ǧ�����顢
 	�ʲ��Υ��ޥ�ɤǸŤ��饤�֥��������Ƥ���������</para>
 
       <screen>&prompt.root; <userinput>make delete-old-libs</userinput></screen>
 
       <para>�⤷����äȤ������꤬���ä����Ǥ⡢
         �����ƥ�ΰ�����ƹ��ۤ���Τϴ�ñ�Ǥ���
 	���Ȥ��С����åץ��졼�ɤ� <filename>/etc</filename>
 	�Υޡ���������Ǹ��ä�
 	<filename>/etc/magic</filename> �������Ƥ��ޤ���
 	���� <command>file</command>
 	��ư��ʤ��ʤäƤ��ޤä��褦�ʾ��ˤϡ�
 	���Υ��ޥ�ɤ�¹Ԥ��ƽ������Ƥ���������</para>
 
 	<screen>&prompt.root; <userinput>cd /usr/src/usr.bin/file</userinput>
 &prompt.root; <userinput>make all install</userinput></screen>
     </sect2>
 
     <sect2 xml:id="updating-questions">
       <title>�褯�������</title>
 
       <variablelist>
 	<varlistentry>
 	  <term>�ѹ����Ԥʤ�줿�顢
 	    �����٤˥����ƥ�κƹ��ۤ�ɬ�פˤʤ�ΤǤ��礦��?</term>
 
 	  <listitem>
 	    <para>������ѹ������Ƥˤ��ޤ���
 	      ���Ȥ��С�<application>svn</application> ��¹Ԥ����Ȥ���
 	      ���ˤ�����褦�ʥե����뤬��������Ƥ����Ȥ��ޤ���</para>
 
 	    <screen><filename>src/games/cribbage/instr.c</filename>
 <filename>src/games/sail/pl_main.c</filename>
 <filename>src/release/sysinstall/config.c</filename>
 <filename>src/release/sysinstall/media.c</filename>
 <filename>src/share/mk/bsd.port.mk</filename></screen>
 
 	    <para>���ΤȤ��ˤϡ�����ƥ����ƥ����Τ�ƹ��ۤ���ɬ�פϤʤ��Ǥ��礦��
 	      ���Τ���ꡢŬ�ڤʥ��֥ǥ��쥯�ȥ�˰ܤä�
 	      <command>make all install</command> ��ԤäƤ���������
 	      �����������Ȥ��� <filename>src/lib/libc/stdlib</filename>
 	      �Τ褦���礭���ѹ����Ԥʤ�줿���ˤϡ�
 	      �����ƥ����Τ�ƹ��ۤ��뤳�Ȥ�Ƥ���Ƥ���������</para>
 
 	    <para>2 ���֤��Ȥ˥����ƥ��ƹ��ۤ��ơ�
 	      ���� 2 ����ʬ���ѹ��������桼���⤤�ޤ�����
 	      �ѹ��Τ��ä���ʬ�����ƹ��ۤ���
 	      ���٤Ƥΰ�¸�ط���Τ��᤿���ȹͤ���桼���⤤�ޤ���
 	      �����ϤɤΤ��餤�����٤ǥ��åץ��졼�ɤ���������
 	      ������ &os.stable; �� &os.current;
 	      �Τɤ�����ɤ������Ƥ���Τ��ˤ���ޤ���</para>
 	  </listitem>
 	</varlistentry>
 
 	<varlistentry>
 	  <term>�ɤ�����
 	      signal 11<indexterm>
 	        <primary>signal 11</primary>
 	      </indexterm>
 	      (�⤷����¾�Υ����ʥ��ֹ�)
 	      �Υ��顼����������Фƥ���ѥ��뤬���Ԥ���ΤǤ��礦����</term>
 
 	  <listitem>
 	    <para>������̾�ϡ��ɥ����������꤬���뤳�Ȥ򼨤��Ƥ��ޤ���
 	      world �κƹ��ۤϡ�
 	      �ϡ��ɥ����� (�ä˥���)
 	      ���Ф�������ѵ׻��Ԥʤ������ͭ���ʼ��ʤǤ���
 	      �����ˤ�������ˤ���Τ��ɤ����ϡ�
 	      <application>make</application>
 	      ��⤦���ټ¹Ԥ����ۤʤ��ʳ��ǰ۾ｪλ��ȯ�����뤫��
 	      �Ȥ������Ȥ����ǧ�Ǥ��ޤ���</para>
 
 	    <para>���Υ��顼���б�����ˤϡ�RAM ��Ϥ�Ȥ��ơ�
 	      �ޥ�������ʤ���꤫��򴹤��ơ�
 	      �ɤ���ʬ�������Τ���Ĵ�٤ƤߤƤ���������</para>
 	  </listitem>
 	</varlistentry>
 
 	<varlistentry>
 	  <term>������� <filename>/usr/obj</filename>
 	      �������Ƥ⤫�ޤ��ޤ���?</term>
 
 	  <listitem>
 	    <para>���Υǥ��쥯�ȥ�ˤϡ�
 	      ����ѥ�����ʳ����������줿
 	      ���٤ƤΥ��֥������ȥե����뤬�ޤޤ�Ƥ��ޤ���
 	      �̾� <command>make buildworld</command> �κǽ���ʳ��Ǥϡ�
 	      ���Υǥ��쥯�ȥ�������ƿ������Ĥ���ľ���褦�ˤʤäƤ��ޤ���
 	      ���۽�λ��� <filename>/usr/obj</filename>
 	      ����¸���Ƥ����Ƥ⡢���ޤ��̣�Ϥ���ޤ���
 	      ���������������� 2GB
 	      �Υǥ��������ڡ�����������뤳�Ȥ��Ǥ��ޤ���</para>
 	  </listitem>
 	</varlistentry>
 
 	<varlistentry>
 	  <term>���ۤ����Ǥ�����硢
 	    ���ι��ۤ����椫��Ƴ����뤳�ȤϤǤ��ޤ���?</term>
 
 	  <listitem>
 	    <para>����ϡ����꤬������ޤǤˡ�
 	      �ɤ�����κ�Ȥ򽪤��Ƥ��뤫�ˤ��ޤ���
 	      ����Ū�� <command>make buildworld</command> �ϡ�
 	      ����Ū�ʥġ���䡢
 	      �����ƥ�饤�֥��ο��������ԡ���������ޤ���
 	      ���θ塢�����Υġ����饤�֥�꤬���󥹥ȡ��뤵��Ƥ��顢
 	      ��ʬ���Ȥκƹ��ۤ˻Ȥ�졢�⤦���١����󥹥ȡ��뤵��ޤ���
 	      �����ƥ�λĤ����ʬ�����ο����������ƥ�ե�������Ѥ��ƺ��ľ����ޤ���</para>
 
 	    <para>�ƹ��ۤκǽ��ʳ��Ǥϡ�
 	      �ޤä��������˰ʲ��Υ��ޥ�ɤ�¹Ԥ��뤳�Ȥ��Ǥ��ޤ���
 	      ����ϡ������ <command>make buildworld</command>
 	      �κ�Ȥ���ľ���ޤ���</para>
 
 	    <screen>&prompt.root; <userinput>cd /usr/src</userinput>
 &prompt.root; <userinput>make -DNO_CLEAN all</userinput></screen>
 
 	    <para>���Υ�å�����</para>
 
 	      <screen>--------------------------------------------------------------
 Building everything..
 --------------------------------------------------------------</screen>
 
 	    <para>�� <command>make buildworld</command> �ν��Ϥˤ�����ˤϡ�
 	      ��Τ褦�ˤ��Ƥ�ۤȤ�ɰ��ƶ�������뤳�ȤϤ���ޤ���</para>
 
 	    <para>�⤷���Υ�å��������ʤ����ˤϡ�
 	      ��������ݤ����������褦�ʤ��Ȥ��ʤ��褦��
               �����ƥ�κƹ��ۤ�ǽ餫����ľ���ޤ��礦��</para>
 	  </listitem>
 	</varlistentry>
 
 	<varlistentry>
 	  <term>make world ���®���Ǥ��ޤ���?</term>
 
 	  <listitem>
 	    <para>�����Ĥ�����ˡ�� build world �Υץ��������®���Ǥ��ޤ���
 	      ���Ȥ��С����ΤΥץ������ϡ�
 	      ���󥰥�桼���⡼�ɤ�ư�������Ȥǹ�®�ˤʤ�ޤ���
 	      �������ʤ��顢������ˡ�Ǥϡ��ץ���������λ����ޤǡ�
 	      �桼���������ƥ�˥����������뤳�ȤϤǤ��ޤ���</para>
 
 	    <para>�ե����륷���ƥ�����տ����߷פ����ꡢ
 	      ZFS �ǡ������åȤ�Ȥ����ȤǤ��Ѥ��ޤ���
 	      <filename>/usr/src</filename> ��
 	      <filename>/usr/obj</filename>
 	      �򡢰ۤʤ�ǥ���������̤Υե����륷���ƥ���֤����Ȥ�Ƥ���Ƥ���������
 	      �ޤ���ǽ�ʤ�С�
 	      �ۤʤ�ǥ���������ȥ��������³���줿�ۤʤ�ǥ������˥ե����륷���ƥ���֤��Ƥ���������
 	      <filename>/usr/src</filename>
 	      ��ޥ���Ȥ�����ˤϡ�
 	      �Ǹ�˥����������줿����ν񤭹��ߤ���������褦�ˡ�
 	      <option>noatime</option>
 	      ���ץ������դ��ƥޥ���Ȥ��Ƥ���������
 	      �⤷��<filename>/usr/src</filename> ����
 	      ��Ω�����ե����륷���ƥ�ǤϤʤ��Ȥ��ˤϡ�
 	      <option>noatime</option> ���ץ����ǡ�<filename
 		class="directory">/usr</filename>
 	      ��ƥޥ���Ȥ��Ƥ���������</para>
 
 	    <para><filename>/usr/obj</filename>
 	      �Τ���ե����륷���ƥ��<option>async</option>
 	      ���ץ�����Ĥ��ƥޥ���Ȥ⤷���Ϻƥޥ���Ȥ��Ƥ���������
 	      ����ˤ�äơ��ǥ������ؤν񤭹��ߤ���Ʊ���ˤʤ�ޤ���
 	      �Ĥޤꡢ�񤭹���̿��Ϥ����˴�λ����Τ��Ф���
 	      �ºݤ˥ǡ������ǥ������˽񤭹��ޤ��Τϡ����ο��ø�ˤʤ�ޤ���
 	      ����ˤ�äơ��񤭹��߽����ΰ�粽����ǽ�ˤʤ뤿�ᡢ
 	      ��Ū�ʥѥե����ޥ󥹤θ��夬���ԤǤ��ޤ���
 	      <!-- hrs:2000/02/15 (for ja-translators)
 		"be clusterd togather" is translated into "clusterization" -->
 	    </para>
 
 	    <warning>
 	      <para>
 		���Υ��ץ�������ꤹ��ȡ��ե����륷���ƥ��
 		����䤹���ʤäƤ��ޤ����Ȥ����դ��Ƥ���������
 		���Υ��ץ������դ��Ƥ��ơ������Ÿ�����������ˤϡ�
 		�Ƶ�ư��˥ե����륷���ƥब������ǽ�ˤʤ��ǽ����
 		���˹⤯�ʤ�ޤ���</para>
 
 	      <para>�⤷��<filename>/usr/obj</filename>
 		�����ե����륷���ƥ�ˤ���ͣ��Υǥ��쥯�ȥ�Ǥ���С�
 		���������ˤʤ�ޤ���
                 ��������Ʊ���ե����륷���ƥ�ˡ�
 		¾�ε��Ťʥǡ������֤��Ƥ���Ȥ��ˤϡ�
 		���Υ��ץ�����ͭ���ˤ������ˡ�
 		�Хå����åפ򤭤���ȼ�äƤ����ޤ��礦��</para>
 	    </warning>
 
 	    <para><filename>/etc/make.conf</filename> ��
 	      <quote>NO_PROFILE=true</quote> �򥻥åȤ��ơ�
 	      �ץ��ե������Ǥκ�����̵�������Ƥ���������</para>
 
 	    <para>&man.make.1; ��
 	      <option>-j<replaceable>n</replaceable></option>
 	      ����ꤷ�ơ�ʣ���Υץ�����������˼¹Ԥ����Ƥ���������
 	      ����ϡ�ñ��Υץ����å��Ǥ�ʣ���Υץ����å��Ǥ⡢
 	      Ʊ�ͤ˲��ä����뤳�Ȥ��Ǥ��ޤ���</para>
 	  </listitem>
 	</varlistentry>
 
 	<varlistentry>
           <term>�ʤˤ��������Ȥ����ä���ɤ�����Ф����Ǥ���?</term>
 
 	  <listitem>
             <para>�ޤ�����ʬ�δĶ������Υӥ�ɤ�;�פʥ��ߤ��ĤäƤ��ʤ����Ȥ�Ϥä���ȳ�ǧ���Ƥ���������</para>
 
             <screen>&prompt.root; <userinput>chflags -R noschg /usr/obj/usr</userinput>
 &prompt.root; <userinput>rm -rf /usr/obj/usr</userinput>
 &prompt.root; <userinput>cd /usr/src</userinput>
 &prompt.root; <userinput>make cleandir</userinput>
 &prompt.root; <userinput>make cleandir</userinput></screen>
 
 	    <para>������<command>make cleandir</command>
 	      �������� 2 ��¹Ԥ���ΤǤ���</para>
 
 	    <para>�����ơ�<command>make buildworld</command> ��Ԥ���
 	      ���ץ�������ǽ餫����ľ���Ƥ���������</para>
 
 	    <para>�ޤ����꤬����С����顼�� <command>uname -a</command>
 	      �ν��Ϥ� &a.questions; �����äƤ���������
 	      ����ˤĤ��Ƥ���˼��䤵��Ƥ���������褦�Ѱդ��Ƥ�������!</para>
 	  </listitem>
 	</varlistentry>
       </variablelist>
     </sect2>
   </sect1>
 
   <sect1 xml:id="small-lan">
     <info>
       <title>ʣ���Υޥ�����ɤ�������</title>
 
       <authorgroup>
 	<author>
 	  <personname>
 	    <firstname>Mike</firstname>
 	    <surname>Meyer</surname>
 	  </personname>
 	  <contrib>���: </contrib>
 	</author>
       </authorgroup>
     </info>
     
     <indexterm>
       <primary>NFS</primary>
       <secondary>ʣ���Υޥ���˥��󥹥ȡ���</secondary>
     </indexterm>
 
     <para>ʣ���Υ���ԥ塼����Ʊ���������ĥ꡼���ɤ������Ƥ��ơ�
       �����Υޥ���˥����������������ɤ���������ƹ��ۤ���Τϡ�
       �ǥ��������ڡ������ͥåȥ���Ӱ衢
       ������ <acronym>CPU</acronym> ���������̵�̻Ȥ��Ǥ���
       ������ 1 �ĤΥޥ���˻Ż��ΤۤȤ�ɤ򤵤���
       �Ĥ�Υޥ���� <acronym>NFS</acronym>
       ��ͳ�Ǥ����ޥ���Ȥ��롢�Ȥ�����ΤǤ���
       ���Υ��������ǤϤ��Τ�����򳵴Ѥ��ޤ���
       <acronym>NFS</acronym> �λȤ����ξܺ٤ˤĤ��Ƥϡ�<xref
 	linkend="network-nfs"/> ������������</para>
 
     <para>�ޤ����ˡ�Ʊ���Х��ʥ��ư�������Ȥ���ޥ��󤿤�����ޤ���
       ���Υޥ��󤿤��Τ��Ȥ�<firstterm>�ӥ�ɥ��å�</firstterm>�ȸƤӤޤ���
       ���줾��Υޥ���ϥ������५���ͥ����äƤ��뤫�⤷��ޤ��󤬡�
       Ʊ���桼�����ɥХ��ʥ��ư�������Ȥ����ΤǤ���
       ���Υӥ�ɥ��åȤ��顢
       <firstterm>�ӥ�ɥޥ���</firstterm>�Ȥʤ�ޥ���� 1 �����Ӥޤ���
       �١��������ƥ�ȥ����ͥ���ۤ���ΤϤ��Υޥ���ˤʤ�ޤ���
       ����Ū�ˤϡ����Υޥ���� <command>make buildworld</command>
       �� <command>make buildkernel</command>
       ��¹Ԥ���Τ˽�ʬ�� <acronym>CPU</acronym>
       ����ä�®���ޥ���Ǥ���٤��Ǥ���</para>
 	
     <para><firstterm>�ƥ��ȥޥ���</firstterm>
       �Ȥʤ�٤��ޥ��������Ǥ���������
       �������줿���եȥ�������Ȥ����ˤ��Υޥ���ǥƥ��Ȥ���ΤǤ���
       �ƥ��ȥޥ���Ϥ��ʤ�Ĺ����������Ƥ��Ƥ�
       �������礦�֤ʥޥ���<emphasis>�Ǥ��ä��ۤ��������Ǥ��礦</emphasis>��
       �ӥ�ɥޥ���Ǥ⤫�ޤ��ޤ��󤬡�
       �ӥ�ɥޥ���Ǥ���ɬ�פϤ���ޤ���</para>
 
     <para>���Υӥ�ɥ��åȤΥޥ���Ϥ��٤�
       <filename>/usr/obj</filename> ��
       <filename>/usr/src</filename>
       ��ӥ�ɥޥ��󤫤� <acronym>FTP</acronym>
       ��ͳ�ǥޥ���Ȥ���ɬ�פ�����ޤ���
       �ӥ�ɥ��åȼ��Τ�ʣ��������ϡ�
       <filename>/usr/src</filename>
       �ϤҤȤĤΥӥ�ɥޥ����ˤ���٤��Ǥ���
       ¾�Υޥ��󤫤�Ϥ���� <acronym>NFS</acronym>
       �ޥ���Ȥ���褦�ˤ��ޤ��礦��</para>
 
     <para>�ӥ�ɥ��åȤΤ��٤ƤΥޥ�����
       <filename>/etc/make.conf</filename> ��
       <filename>/etc/src.conf</filename>
       ���ӥ�ɥޥ���Ȱ��פ��Ƥ��뤳�Ȥ��ǧ���Ƥ����������Ĥޤꡢ
       �ӥ�ɥޥ���ϥӥ�ɥ��åȤΤɤΥޥ���⥤�󥹥ȡ��뤷�褦�Ȥ��Ƥ���
       �١��������ƥ�������ӥ�ɤ��ʤ���Фʤ�ʤ��Ȥ������ȤǤ���
       �ޤ����ƥӥ�ɥޥ���� <filename>/etc/make.conf</filename>
       �ˤ��줾��Υӥ�ɥޥ���Υ����ͥ�̾��
       <varname>KERNCONF</varname> �ǻ��ꤷ��
       �ӥ�ɥޥ���ϼ�ʬ���ȤΥ����ͥ뤫���������Υ����ͥ�̾��
       <varname>KERNCONF</varname> �˥ꥹ�ȥ��åפ��Ƥ���������
       �ӥ�ɥޥ���ϳƥޥ���Υ����ͥ�����ե������ <filename
 	>/usr/src/sys/<replaceable>arch</replaceable>/conf</filename>
       �˻��äƤ��ʤ���Фʤ�ޤ���</para>
 
     <para>�ӥ�ɥޥ���ˤơ�
       <xref linkend="makeworld"/>
       �˽񤤤Ƥ���褦�˥����ͥ�ȥ١��������ƥ���ۤ��Ƥ���������
       �Ǥ⡢�ޤ��ӥ�ɥޥ���ˤϥ��󥹥ȡ��뤷�ʤ��Ǥ���������
       ���Τ���ꡢ
       �ӥ�ɤ��������ͥ��ƥ��ȥޥ���˥��󥹥ȡ��뤷�Ƥ���������
       <acronym>FTP</acronym> ��ͳ��
       <filename>/usr/src</filename> ����� <filename>/usr/obj</filename>
       ��ƥ��ȥޥ���˥ޥ���Ȥ��Ƥ���������
       ���θ塢<command>shutdown now</command>
       ��¹Ԥ��ƥ��󥰥�桼���⡼�ɤ˰ܹԤ���
       �����������ͥ�ȥ١��������ƥ�򥤥󥹥ȡ��뤷��
       ���Ĥ⤹��褦��
       <command>mergemaster</command> ��¹Ԥ��Ƥ���������
       ����ä��顢�Ƶ�ư�����̾�Υޥ���桼��ư����ᤷ�ޤ���</para>
 
     <para>�ƥ��ȥޥ���ˤ����Τ��٤Ƥ�������ư���Ƥ���ο�������줿�顢
       Ʊ�����ǥӥ�ɥ��åȤ�¾�Υޥ���ˤ⿷�������եȥ������򥤥󥹥ȡ��뤷�ޤ���</para>
 
     <para>ports �ĥ꡼�ˤ�Ʊ����ˡ���Ȥ��ޤ���
       �ǽ�Υ��ƥåפϡ�
       �ӥ�ɥ��åȤΤ��٤ƤΥޥ��� <acronym>NFS</acronym> ��ͳ��
       <filename>/usr/ports</filename> ��ޥ���Ȥ��뤳�ȤǤ���
       �����ơ�distfiles ��ͭ����褦��
       <filename>/etc/make.conf</filename> �����ꤷ�ޤ���
       <acronym>NFS</acronym> �ޥ���Ȥˤ�äƥޥåפ����
       <systemitem class="username">root</systemitem>
       �桼�������Ǥ��졢<varname>DISTDIR</varname>
       �Ϥ��Υ桼�����񤭹���붦�̤ζ�ͭ�ǥ��쥯�ȥ�����ꤹ��ɬ�פ�����ޤ���
       ports ���������ǥӥ�ɤ�����ˤϡ�
       �ƥޥ���� <varname>WRKDIRPREFIX</varname>
       ��ʬ�Υޥ���Υӥ�ɥǥ��쥯�ȥ�����ꤷ�ʤ���Фʤ�ޤ���
       �ޤ����ӥ�ɥ����ƥब packages
       ��ӥ�ɤ��ƥӥ�ɥ��åȤΥ���ԥ塼�������ۤ���ΤǤ���С�
       <varname>DISTDIR</varname> ��Ʊ���褦�˥ӥ�ɥ����ƥ���
       <varname>PACKAGES</varname>
       �ǥ��쥯�ȥ�����ꤷ�Ƥ���������</para>
   </sect1>
 </chapter>
Index: user/gjb/releng-rewrite/ja_JP.eucJP/htdocs/docproj/submitting.xml
===================================================================
--- user/gjb/releng-rewrite/ja_JP.eucJP/htdocs/docproj/submitting.xml	(revision 49724)
+++ user/gjb/releng-rewrite/ja_JP.eucJP/htdocs/docproj/submitting.xml	(revision 49725)
@@ -1,151 +1,118 @@
 <?xml version="1.0" encoding="euc-jp"?>
 <!DOCTYPE html PUBLIC "-//FreeBSD//DTD XHTML 1.0 Transitional-Based Extension//EN"
 "http://www.FreeBSD.org/XML/doc/share/xml/xhtml10-freebsd.dtd" [
 <!ENTITY url.articles "../../doc/ja_JP.eucJP/articles">
 <!ENTITY title "FreeBSD �ɥ�����ơ������ץ���������: �ɥ�����Ȥδ��">
 ]>
 <!-- The FreeBSD Japanese Documentation Project -->
-<!-- Original revision: r45075 -->
+<!-- Original revision: r45415 -->
 
 <html xmlns="http://www.w3.org/1999/xhtml">
     <head>
       <title>&title;</title>
 
       <cvs:keyword xmlns:cvs="http://www.FreeBSD.org/XML/CVS">$FreeBSD$</cvs:keyword>
     </head>
 
     <body class="navinclude.docs">
 
     <h2>�ɥ�����ơ�������񤭤ޤ������ɤ���äƴ�Ƥ�����ɤ���?</h2>
 
     <p>�Ϥ���ˡ�
       �ɥ�����ơ�������񤯺�Ȥ˻��֤�䤤�Ƥ������ä����Ȥ򴶼դ��ޤ���
     </p>
 
     <p>��ӥ塼�Τ���ˡ��ɥ�����ơ��������������ɬ�פ�����ޤ���
-      �⤷��ǽ�ʤ顢�ɥ�����ơ������� FTP �䥦���֥����Ȥ��֤��Ƥ���������
-    </p>
+      �⤷��ǽ�ʤ顢�ɥ�����ơ�������ɤ����Υ����֥����Ȥ˥��åץ����ɤ��Ƥ���������</p>
 
     <p>���줫�顢<tt>FreeBSD-doc</tt> �᡼��󥰥ꥹ�Ȥإɥ�����ơ������γ��פȸ�����ꡢ
       �����Ȥ�������򵭤�����å���������Ƥ��Ƥ���������</p>
 
-    <p>��ͳ�����äƥɥ�����Ȥ� FTP �䥦���֥����Ȥˤ����ʤ��Ȥ��ϡ�
+    <p>��ͳ�����äƥɥ�����Ȥ򥦥��֥����Ȥˤ����ʤ��Ȥ��ϡ�
        <tt>FreeBSD-doc</tt> �᡼��󥰥ꥹ�Ȥ�ľ�����ä�ĺ���Ƥ⹽���ޤ���
        ���λ��ϥץ쥤��ƥ����ȤǤ������ꤤ���ޤ���</p>
 
     <p>���Υ�å�������¾��Ŭ�ڤʥ᡼��󥰥ꥹ�Ȥ� cc:
       ���������褤����¿���Ǥ��礦��
       �㤨�С����Υɥ�����ơ�����󤬡�
       �������ĥ꡼��ǿ��ξ��֤��ݤĤ���� SVN
       �λ���ˡ�ˤĤ��Ƹ��ڤ��Ƥ���ʤ顢
-      �������Ƥ� <tt>FreeBSD-current</tt> �� <tt>FreeBSD-stable</tt>
-      �᡼��󥰥ꥹ�Ȥι��ɼԤˤȤäƤⶽ̣�����ΤǤ��礦��</p>
+      �������Ƥ� <tt>FreeBSD-stable</tt>
+      �᡼��󥰥ꥹ�Ȥι��ɼԤˤȤäƤⶽ̣�����ΤǤ��礦��
+      cc: �ϡ�¿����¾�ΰ�ĤΥ᡼��󥰥ꥹ�Ȥ������ˤȤɤ�Ƥ���������</p>
 
     <p>�ɥ�����ơ��������ܤ��̤��졢
       �ɼԤ������Ƥ��Ȥ�����뵡��������ʤ顢
       �ɥ�����ơ��������Ƥ���������Ǥ����ȸ����ޤ���</p>
 
-    <p>�ɥ�����ơ��������Ƥ����硢
-      �ե������ tar �����ˤޤȤ�Ƥ���������
-      �ɥ�����ơ������ <tt>one</tt>��<tt>two</tt>��<tt>three</tt>
-      �Ȥ������ĤΥե����뤫�鹽������Ƥ��ꡢ
-      ���٤Ƥ� <tt>doc.tar</tt> �ˤޤȤ����ϡ�</p>
+    <p>�ɥ�����ơ��������Ƥ����硢�㳲���Ȥ�����Ф��Ƥ���������
+      �㳲���ˤĤ��Ƥϡ�
+      <a href="https://www.FreeBSD.org/ja/support/bugreports.html">https://www.FreeBSD.org/ja/support/bugreports.html</a>
+      ����������Ƥ��ޤ���</p>
 
-    <pre>
-    % <b>tar cf doc.tar one two three</b>
-    </pre>
-
-    <p>�����Ϥ��Ƥ������������줫�� tar �����Υե�����򰵽̤��ޤ���</p>
-
-    <pre>
-    % <b>gzip -9 doc.tar</b>
-    </pre>
-
-    <p><tt>doc.tar.gz</tt> �Ȥ����ե����뤬��������ޤ���</p>
-
-    <p>�Ǹ�ˤ��Υե����뤬�᡼��ץ������˲�����ʤ��褦�˥��󥳡��ɤ��ޤ���</p>
-
-    <pre>
-      % <b>uuencode doc.tar.gz doc.tar.gz > doc.uue</b>
-    </pre>
-
-    <p>���줫�顢
-	���Τ��Ȥ�ɥ�����ơ������ץ��������Ȥ��Τ餻��ɬ�פ�����ޤ���
-	����ѤΥޥ���ˤ⥤�󥹥ȡ��뤵��Ƥ���Ϥ���
-	<b>send-pr</b> �Ȥ������ޥ�ɤ�Ȥ��Τ���������ˡ�Ǥ���
-	<a href="https://bugs.freebsd.org/bugzilla/enter_bug.cgi">WWW �������ե�����</a>����Ѥ��Ƥ⤫�ޤ��ޤ���</p>
-
 	<p>���Υ��ޥ�ɤ�Ȥ��Τϡ�
 	���ʤ�����Ƥ������Ȥ�夫���ǧ���뤳�Ȥ��Ǥ��뤫��Ǥ���
 	PR (Problem Report) ������ȡ����줾��˸�ͭ���ֹ椬������Ƥ��ޤ���
 	���θ塢Commiter ��ï�������� PR ��ô������
 	�������ɥ�����ơ������� commit
 	�˴ؤ��Ƥ��ʤ���Ϣ�����뤳�Ȥˤʤ�ޤ���
 	�ܤ����ϡ�
 	<a href="&url.articles;/problem-reports/">FreeBSD �������ν���</a>�򻲾Ȥ��Ƥ���������</p>
 
-	<p><b>send-pr</b> ���Τ�����ñ��Ǥ�������ä��ü�ʷ����� e-mail
-	������Υ��ɥ쥹���������������Ǥ���
-	<b>send-pr</b> �����餻��ȡ����ǥ��� (¿ʬ <b>vi</b> ��
-	<b>emacs</b> �Ǥ��礦) ��Ω���夬�ꡢ
-	�����ѤΥƥ�ץ졼�Ȥȵ�������������ɽ�������Ϥ��Ǥ���</p>
+      <p>"Product" �� "Documentation" �����򤷡�
+	"Component" ����𤹤����Ƥ˹�碌�� "Documentation" �⤷����
+	"Website" �����򤷤Ƥ���������
+	PR �ˤϡ��ե������ź�դ��Ƥ���������
+	�⤷�����ѹ��ˤĤ��ƥ᡼��󥰥ꥹ�Ȥǵ����򤷤Ƥ����ΤǤ���С�
+	������ƤؤΥ�󥯤�ä��Ƥ���������</p>
 
-	<p>"Category" �� "docs" �ˡ�"Class" �� "change-request"
-	�����ꤷ�Ƥ�����������˺�äƤ����� <tt>.uue</tt>
-	�ե������ PR ����ʸ�˴ޤ�ޤ��礦��</p>
-
-	<p>���ǥ�����λ������ȡ�PR �� e-mail �Ȥ������������������ޤ���
-	������⤷�ʤ������ˡ����ʤ������ä� PR
-	���ֹ���������ǧ�Υ�å������������Ƥ���Ϥ��Ǥ���
-	�����ֹ�Ͽ�Ÿ�������ǧ����Τ˻��Ѥ��뤳�Ȥ��Ǥ��ޤ���</p>
-
 	<h2>��¸�Υɥ�����ơ��������ѹ���ä��ޤ�����
 	�ɤ���äƴ�Ƥ�����ɤ���?</h2>
 
 	<p>�����֤��ˤʤ�ޤ����������֤�䤤�Ƥ������ä����Ȥ򴶼դ��ޤ���</p>
 
 	<p>�ޤ��ǽ�ˡ�<i>diff</i>
 	�ȸƤФ���ü�ʥե��������������ɬ�פ�����ޤ���
 	���� diff �ϡ����ʤ����ܤ����ѹ��������Τˤ���路�Ƥ��ޤ���
 	Diff ��Ȥ��С�commit ��Ԥ��ͤ��ѹ������ưפ��Τ뤳�Ȥ��Ǥ���
 	�������äơ��ɤ����ѹ������Τ���������Τ˻��֤�ϲ�񤷤ʤ��Ƥ��ߤޤ�
 	(�������
 	�ʤ������ѹ��򤷤������褤�ȹͤ���Τ��ˤĤ��Ƥ���������ɬ�פ�����ΤǤ���)��
         </p>
 
 	<p>'diff' ��Ĥ���ˤϡ�</p>
 
 	<ol>
 	<li><p>�ѹ�����ե�����Υ��ԡ����äƤ���������
 	�⤷ <tt>foo.xml</tt> ���ѹ�������Ϥ����Ǥ���</p>
 
 	<pre>
     % <b>cp foo.xml foo.xml.old</b>
 	</pre></li>
 
 	<li><p>���줫�顢foo.xml ���ѹ����ޤ���</p>
 
 	<pre>
     % <b>vi foo.xml</b>
     ... �����ȡ������򤳤����ơ������Ѥ��� ...
 
     ... �ѹ������������ơ��������ʤ�����ǧ���ơ���ˤ��ˤ��ˤ� ...
 	</pre></li>
 
       <li><p>diff ��Ĥ���ޤ��������ѤΥ��ޥ�ɤϰʲ��Τ褦�ˤʤ�ޤ���</p>
 
 	<pre>
     % <b>diff -u foo.xml.old foo.xml > foo.diff</b>
 	</pre>
 
 	<p>��ĤΥե�������������Ĵ�١������� <tt>foo.diff</tt>
 	�ؽ񤭽Ф��ޤ���</p></li>
     </ol>
 
-	<p>�ץ��������Ȥ� <tt>foo.diff</tt> ������ޤ��� ��Ҥ����褦�� PR ��
-	<tt>foo.diff</tt> �ե������ PR ����ʸ�˴ޤ������ޤ���</p>
+	<p>�ץ��������Ȥ� <tt>foo.diff</tt> ������ޤ��� ��Ҥ����褦��
+	<tt>foo.diff</tt> �ե������ PR ��ź�դ�������ޤ���</p>
 
 	<p></p><a href="docproj.html">FreeBSD
 	�ɥ�����ơ������ץ��������ȤΥڡ���</a>
   </body>
 </html>
Index: user/gjb/releng-rewrite/ja_JP.eucJP/htdocs/projects/newbies.xml
===================================================================
--- user/gjb/releng-rewrite/ja_JP.eucJP/htdocs/projects/newbies.xml	(revision 49724)
+++ user/gjb/releng-rewrite/ja_JP.eucJP/htdocs/projects/newbies.xml	(revision 49725)
@@ -1,126 +1,126 @@
 <?xml version="1.0" encoding="euc-jp"?>
 <!DOCTYPE html PUBLIC "-//FreeBSD//DTD XHTML 1.0 Transitional-Based Extension//EN"
 "http://www.FreeBSD.org/XML/share/xml/xhtml10-freebsd.dtd" [
 <!ENTITY title 'FreeBSD �����ƤȤ�������'>
 <!ENTITY url.articles "&enbase;/doc/ja_JP.eucJP/articles">
 <!ENTITY url.books "&enbase;/doc/ja_JP.eucJP/books">
 ]>
 <!-- The FreeBSD Japanese Documentation Project -->
-<!-- Original revision: r49050 -->
+<!-- Original revision: r49707 -->
 
 <html xmlns="http://www.w3.org/1999/xhtml">
     <head>
       <title>&title;</title>
 
       <cvs:keyword xmlns:cvs="http://www.FreeBSD.org/XML/CVS">$FreeBSD$</cvs:keyword>
     </head>
 
     <body class="navinclude.docs">
 
     <h2><a>&os; �����ꤹ��</a></h2>
 
     <p>�ǿ��� &os; ��꡼���ϡ�<a
 	href="&base;/where.html">����</a> �������Ѳ�ǽ�Ǥ���
       ���󥹥ȡ����Ϥ������ <a
 	href="&url.books;/handbook/bsdinstall.html">&os;
 	�Υ��󥹥ȡ��륬����</a>
       �����տ����ɤ�Dz�������</p>
 
     <h2><a>&os; �ˤĤ��Ƴؤ�</a></h2>
 
     <ul>
       <li><p><a href="&url.books;/handbook/index.html">&os; �ϥ�ɥ֥å�</a>
 	�� <a href="&url.books;/faq/index.html">�褯������������ (FAQ)</a>
 	�� &os; �˴ؤ����濴Ū��ʸ��Ǥ���
 	�鿴�Ԥ�����ԤޤǤ��оݤȤ�����¿�������꤬�񤫤�Ƥ��ޤ���
 	GUI �Υ��󥹥ȡ���˶�̣����äƤ���桼���ϡ�<a
 	  href="&url.books;/handbook/x11.html">X Windows</a>
 	�ξϤ�������������</p></li>
 	
       <li><p><a href="&cgibase;/man.cgi">�ޥ˥奢��ڡ���</a>
 	(<a href="http://www.jp.FreeBSD.org/man-jp/search.html">���ܸ���</a>)
 	�ϡ��褤��ե���󥹤Ǥ�����
 	ɬ������鿴�ԤˤȤäƺ�Ŭ����������Ǥ���Ȥϸ¤�ޤ���
 	����Ū������Υ��ޥ�ɡ�
 	�ɥ饤�Ф���ӥ����ӥ��ˤĤ��Ƥξ�����󶡤��ޤ���</p></li>
     </ul>
 
     <h2><a>���䤪��ӥ��ݡ���</a></h2>
 
     <ul>
       <li><p>�����ƤȤƤ�ʹ�����Ȥ��Ǥ��ʤ��褦�ʼ���䡢
 	������Ф������������뤿��� <a
 	href="http://lists.FreeBSD.org/mailman/listinfo/freebsd-questions">http://lists.FreeBSD.org/mailman/listinfo/freebsd-questions</a>
 	��������˵������ơ��᡼��󥰥ꥹ�Ȥ˻��ä��ޤ��礦��
         ���Ǥˤʤ��줿����䤽�β����ϡ�
 	<a href="&base;/search/search.html#mailinglists">����</a>
 	�ڡ�����õ�����Ȥ��Ǥ��ޤ���</p></li>
 
       <li><p>&os; <a href="https://forums.freebsd.org">�ե������</a> �ϡ�
 	�⤦��ĤΥ��ݡ��ȥ���ͥ���󶡤��ޤ���
 	��������Υ桼�������ޤ��ޤʥ��塼�ȥꥢ���񤭡�
 	¿���ο������桼���Ϥ����Ǽ���������Ƥ��ޤ���</p></li>
 
       <li><p>�ϥ�ɥ֥å��� FAQ�������֥����Ⱦ�Τ��٤Ƥ����ơ�
 	&os; �᡼��󥰥ꥹ�ȤΥ��������֤�
 	<a href="&base;/search/search.html">����</a>
 	���Ƥ���������</p></li>
 
       <li><p><a href="&base;/support.html">���ݡ���</a> �ڡ����ˤϡ�
 	�᡼��󥰥ꥹ�ȡ��桼�����롼�ס������֥����ȡ�FTP �����ȡ�
 	��꡼�����󤪤�� &unix; �ˤĤ��Ƥξ���ؤΥ�󥯤ʤɡ�
 	&os; �ˤĤ��Ƥ�˭�٤ʾ��󤬤���ޤ���</p></li>
     </ul>
 
     <h2><a>&os; ͳ��Υץ��������ȤˤĤ��Ƴؤ�</a></h2>
 
     <p>&os; �ϡ����Ѥ䥪���ץ󥽡����Υ��ڥ졼�ƥ��󥰥����ƥ�Υ١����Ȥ��ơ�
       ���������Ѥ���Ƥ��ޤ���
       ������ڤ��Ƥ��ơ������ǽ�ʥ����ƥ��ʲ��ǾҲ𤷤ޤ���</p>
 
     <ul>
       <li><p><a href="http://www.freenas.org">FreeNAS</a> �ϡ�
 	�ɤΥϡ��ɥ������ץ�åȥۡ����ǤⲾ��Ū�˥��󥹥ȡ����ǽ�ʡ�
 	�ͥåȥ����ǥǡ�����ͭ���뤿��Υ��ȥ졼������塼�����Ǥ���
 	���٤ƤΥǡ������ݸ��¸���Хå����åפΤ���� ZFS ��ȤäƤ��ޤ���</p></li>
-      <li><p><a href="http://www.pcbsd.org">PC-BSD</a> �ϡ�
+      <li><p><a href="https://www.trueos.org">TrueOS</a> �ϡ�
 	&os; ��١����Ȥ��ơ�
 	����ե�����ʥ��󥹥ȡ�����������ǥ������ȥåץġ����ä���
 	�����奢��ʥ���ԥ塼���桼���Ǥ��ñ�˻Ȥ��뤳�Ȥ��ܻؤ��Ƥ��ޤ���</p></li>
 
       <li><p><a href="http://www.pfsense.org">pfSense</a> �ϡ�
 	&os; �١����Υե꡼�ʥͥåȥ������塼�����Ǥ���
 	pfSense ���եȥ������� package �����ƥ�ˤ�ꡢ
 	���ѤΥե��������������Ʊ���⤷���Ϥ���ʾ�ε�ǽ�����¤ʤ��󶡤��ޤ���
 	������ǥ��󥹥ȡ��뤵��Ƥ����������ʤ��ۤɤ�ͭ̾�ʾ��ѤΥե���������������֤��������������Ƥ��ޤ���</p></li>
     </ul>
 
     <h2><a>�׸��λ���</a></h2>
 
     <p>���٤Ƥοͤ� &os;
       ���ߥ�˥ƥ��ز��餫�η��ǹ׸����뤳�Ȥ��Ǥ��ޤ���
       �鿴�ԤǤ�׸��Ǥ��ޤ�!
       �������ٻ����Τ���Ż���˻�����ͤ⤤�ޤ�����<a
 	href="&base;/docproj/docproj.html">�ɥ�����ơ������ץ���������</a>
       �˺��ɼԤȤ��ƴؤ�äƤ���ͤ⤤�ޤ���
       ����ԥ塼���˴�Ϣ���뤫�ɤ����˴ؤ�餺��
       ������ͭ������ͤ������̤ʵ��Ѥ�и�����Ľ鿴�Ԥ����뤫�⤷��ʤ�����
       ��������äƤ����鿴�ԤȽв񤤡����ޤ������Ȼפ��ͤ⤤��Ǥ��礦��
       ����ñ�ˤ�������Τ����������餤�Ĥ�¾�ͤ�����Ƥ���ͤ⤤�ޤ���</p>
 
     <p>&os; ��ȤäƤ���ͧ�ͤϰ���ʾ��󸻤Ǥ���
       Ʊ�����Ȥ˶�̣����äƤ���ͤ�������ʬ�����礨��͡�
       Ʊ�����Ȥ�ĩ�路�Ƥ���ͤ����ä��ä򤷤��ꡢ
       ���˥ԥ��򿩤٤ʤ����ä����Ȥϡ��ɤ���ܤˤ⿿���Ǥ��ޤ���
       �⤷�ޤ��� &os; ��ȤäƤ���ͧ�ͤ����ʤ��ä��顢
       &os; �� CDROM ��ȤäƤ�������ͧ�ͤ����䤷�ޤ��礦 :-)</p>
 
     <p><a href="&base;/usergroups.html">�桼�����롼��</a>
       �ϡ�¾�� &os; �桼���Ƚв񤦤Τˤ褤���Ǥ���
       �⤷���˽���Ǥ���ͤ������ˤϤ��ʤ��ä��顢
       ���ʤ����ǽ�ΰ�ͤˤʤäƤߤƤϤ������Ǥ��礦����</p>
 
     <p>���ߥ�˥ƥ��˴�Ϳ���뤿��Τ��ܺ٤ʾ��������ˤϡ�<a
 	href="&enbase;/doc/ja_JP.eucJP/articles/contributing/index.html">&os; �ؤι׸�</a> �Ȥ���ʸ����ɤ�Ǥ���������</p>
   </body>
 </html>
Index: user/gjb/releng-rewrite/ja_JP.eucJP/htdocs/releases/index.xml
===================================================================
--- user/gjb/releng-rewrite/ja_JP.eucJP/htdocs/releases/index.xml	(revision 49724)
+++ user/gjb/releng-rewrite/ja_JP.eucJP/htdocs/releases/index.xml	(revision 49725)
@@ -1,715 +1,713 @@
 <?xml version="1.0" encoding="euc-jp"?>
 <!DOCTYPE html PUBLIC "-//FreeBSD//DTD XHTML 1.0 Transitional-Based Extension//EN"
 "http://www.FreeBSD.org/XML/share/xml/xhtml10-freebsd.dtd" [
 <!ENTITY title "��꡼������">
 ]>
 <!-- $FreeBSD$ -->
 <!-- The FreeBSD Japanese Documentation Project -->
-<!-- Original revision: r49541 -->
+<!-- Original revision: r49718 -->
 
 <html xmlns="http://www.w3.org/1999/xhtml">
 <head>
       <title>&title;</title>
 
       <cvs:keyword xmlns:cvs="http://www.FreeBSD.org/XML/CVS">$FreeBSD$</cvs:keyword>
     </head>
 
     <body class="navinclude.download">
   <img alt="FreeBSD Releases" src="../../gifs/releases.jpg" height="200" width="300" align="right" border="0"/>
 
-  <p>FreeBSD �Υ�꡼���ϡ�"�ץ�����������꡼��" ��
-    "�쥬������꡼��" ��ʬ�����ޤ���
-    ���ԤϺǿ���ǽ�����桼��������
-    ��Ԥ��ݼ�Ū�ʥ��åץǡ��Ȥ����ˤ���Ѥ��Ƥ���桼�������Τ�ΤǤ���</p>
+  <p>FreeBSD �Υ�꡼���ϡ�<i>�ץ�����������꡼��</i> ��
+    <i>�쥬������꡼��</i> ��ʬ�����ޤ���
+    �ץ�����������꡼���Ϻǿ���ǽ�����桼��������
+    �쥬������꡼�����ݼ�Ū�ʥ��åץǡ��Ȥ����ˤ���Ѥ��Ƥ���桼�������Τ�ΤǤ���</p>
 
-  <p>��꡼���Ϥ���ˡ��������ƥ����ե����ˤ�륵�ݡ��ȴ��֤ˤ�äơ�
-    "Normal" ����� "Extended" ��꡼����ʬ�व��ޤ���</p>
-
   <p>�ƥ�꡼���δ�Ϣʸ��ե�����ϡ�
     <a href="&base;/relnotes.html">��꡼��ʸ��</a> �Υڡ����ˤ�����
     HTML �������󶡤���Ƥ��ޤ���</p>
 
   <a name="supported-releases"></a>
   <h2>���ݡ��Ȥ���Ƥ����꡼��</h2>
 
-  <p>���ߥ��ݡ��Ȥ���Ƥ����꡼���Υ�꡼������ʬ�ࡢ�ݼ齪λͽ���� (End-Of-Life (EOL))
+  <p>���ߥ��ݡ��Ȥ���Ƥ����꡼���Υ�꡼������
+    �ݼ齪λͽ���� (End-Of-Life (EOL))
     �δ����ʾ���ϡ�<a href="&base;/security/security.html#sup">FreeBSD
     �������ƥ�����</a> �� <a
       href="&base;/security/security.html#sup">���ݡ��Ȥ���Ƥ����꡼��</a>
     �ˤޤȤ���Ƥ��ޤ���</p>
 
   <a name="current"></a>
   <h2>�ǿ���꡼��</h2>
 
     <h3>�ץ�����������꡼��</h3>
       <p><b>��꡼�� &rel.current;</b> (&rel.current.date;)
 	<em>
 	<a href="&u.rel.announce;">���ʥ���</a> :
 	<a href="&u.rel.notes;">��꡼���Ρ���</a> :
 	<a href="&u.rel.installation;">���󥹥ȡ��륬����</a> :
 	<a href="&u.rel.hardware;">�ϡ��ɥ������Ρ���</a> :
 	<a href="&u.rel.readme;">README</a> :
 	<a href="&u.rel.errata;">Errata (����ɽ)</a> :
 	<a href="&u.rel.signatures;">���������</a>
       </em></p>
 
       <p><b>��꡼�� &rel0.current;</b> (&rel0.current.date;)
 	<em>
 	<a href="&u.rel0.announce;">���ʥ���</a> :
 	<a href="&u.rel0.notes;">��꡼���Ρ���</a> :
 	<a href="&u.rel0.installation;">���󥹥ȡ��륬����</a> :
 	<a href="&u.rel0.hardware;">�ϡ��ɥ������Ρ���</a> :
 	<a href="&u.rel0.readme;">README</a> :
 	<a href="&u.rel0.errata;">Errata (����ɽ)</a> :
 	<a href="&u.rel0.signatures;">���������</a>
 	</em></p>
 
       <p><b>��꡼�� &rel1.current;</b> (&rel1.current.date;)
 	<em>
 	<a href="&u.rel1.announce;">���ʥ���</a> :
 	<a href="&u.rel1.notes;">��꡼���Ρ���</a> :
 	<a href="&u.rel1.installation;">���󥹥ȡ��륬����</a> :
 	<a href="&u.rel1.hardware;">�ϡ��ɥ������Ρ���</a> :
 	<a href="&u.rel1.readme;">README</a> :
 	<a href="&u.rel1.errata;">Errata (����ɽ)</a> :
 	<a href="&u.rel1.signatures;">���������</a>
 	</em></p>
 
       <p><b>��꡼�� &rel2.current;</b> (&rel2.current.date;)
 	<em>
 	<a href="&u.rel2.announce;">���ʥ���</a> :
 	<a href="&u.rel2.notes;">��꡼���Ρ���</a> :
 	<a href="&u.rel2.installation;">���󥹥ȡ��륬����</a> :
 	<a href="&u.rel2.hardware;">�ϡ��ɥ������Ρ���</a> :
 	<a href="&u.rel2.readme;">README</a> :
 	<a href="&u.rel2.errata;">Errata (����ɽ)</a>
       </em></p>
 
     <h3>�쥬������꡼��</h3>
 
       <p><b>��꡼�� &rel3.current;</b> (&rel3.current.date;)
 	<em>
 	<a href="&u.rel3.announce;">���ʥ���</a> :
 	<a href="&u.rel3.notes;">��꡼���Ρ���</a> :
 	<a href="&u.rel3.installation;">���󥹥ȡ��륬����</a> :
 	<a href="&u.rel3.hardware;">�ϡ��ɥ������Ρ���</a> :
 	<a href="&u.rel3.readme;">README</a> :
 	<a href="&u.rel3.errata;">Errata (����ɽ)</a>
       </em></p>
 
   <a name="future"></a>
   <h2>����Υ�꡼��</h2>
 
     <p>����Υ�꡼���������塼��䡢
       ��꡼�����󥸥˥���󥰤ι����˴ؤ���ܺ٤��ä��Τꤿ�����ϡ�
       <a href="&enbase;/releng/index.html">��꡼�����󥸥˥����</a>
       �Υڡ�����������������</p>
 
     <p><a href="&enbase;/doc/ja_JP.eucJP/books/handbook/current-stable.html#STABLE">FreeBSD-STABLE</a>
       �����
       <a href="&enbase;/doc/ja_JP.eucJP/books/handbook/current-stable.html#CURRENT">FreeBSD-CURRENT</a>
       �֥�������κǿ��Υ��ʥåץ���åȤ����ѤǤ��ޤ���
       �ܺ٤ˤĤ��Ƥϡ�<a href="&base;/where.html">FreeBSD ���ˤ����</a>
       ��������������</p>
 
   <!-- temporary disable entry: RL 20150303
   <a name="prior-supported"></a>
   <h2>���ݡ��Ȥ���Ƥ�����Υ�꡼��</h2>
 
   <ul>
   </ul>
   -->
 
   <a name="prior-unsupported"></a>
   <h2>���ݡ��Ȥ���λ������꡼��</h2>
 
     <p>����ޤǤΥ�꡼���Υ�꡼������ʬ�ࡢ�ݼ齪λ�� (End-Of-Life (EOL))
       �δ����ʾ���ϡ�<a href="&base;/security/security.html">FreeBSD
-      �������ƥ�����</a> ��
-      <a href="&base;/security/unsupported.html">���ݡ��Ȥ���λ������꡼��</a>
+      �������ƥ�����</a> �� <a
+	href="&base;/security/unsupported.html">���ݡ��Ȥ���λ������꡼��</a>
       �ˤޤȤ���Ƥ��ޤ���</p>
 
     <ul>
       <li><b>10.0</b> (2014 ǯ 1 ��)
 	<em>
 	  <a href="10.0R/announce.html">���ʥ���</a>:
 	  <a href="&enbase;/releases/10.0R/relnotes.html">��꡼���Ρ���</a>:
 	  <a href="&enbase;/releases/10.0R/installation.html">���󥹥ȡ��륬����</a>:
 	  <a href="&enbase;/releases/10.0R/hardware.html">�ϡ��ɥ������Ρ���</a>:
 	  <a href="&enbase;/releases/10.0R/readme.html">Readme</a>:
 	  <a href="&enbase;/releases/10.0R/errata.html">Errata (����ɽ)</a>
 	</em>
       </li>
       <li><b>9.2</b> (2013 ǯ 9 ��)
 	<em>
 	  <a href="9.2R/announce.html">���ʥ���</a>:
 	  <a href="&enbase;/releases/9.2R/relnotes.html">��꡼���Ρ���</a>:
 	  <a href="&enbase;/releases/9.2R/installation.html">���󥹥ȡ��륬����</a>:
 	  <a href="&enbase;/releases/9.2R/hardware.html">�ϡ��ɥ������Ρ���</a>
 	  <a href="&enbase;/releases/9.2R/readme.html">README</a>:
 	  <a href="&enbase;/releases/9.2R/errata.html">Errata (����ɽ)</a>
 	</em>
       </li>
 
       <li><b>9.1</b> (2012 ǯ 12 ��)
 	<em>
 	  <a href="&enbase;/releases/9.1R/announce.html">���ʥ���</a>:
 	  <a href="&enbase;/releases/9.1R/relnotes.html">��꡼���Ρ���</a>:
 	  <a href="&enbase;/releases/9.1R/installation.html">���󥹥ȡ��륬����</a>:
 	  <a href="&enbase;/releases/9.1R/hardware.html">�ϡ��ɥ������Ρ���</a>
 	  <a href="&enbase;/releases/9.1R/readme.html">README</a>:
 	  <a href="&enbase;/releases/9.1R/errata.html">Errata (����ɽ)</a>
 	</em>
       </li>
 
       <li><b>9.0</b> (2012 ǯ 1 ��)
 	<em>
 	  <a href="9.0R/announce.html">���ʥ���</a>:
 	  <a href="&enbase;/releases/9.0R/relnotes.html">��꡼���Ρ���</a>:
 	  <a href="&enbase;/releases/9.0R/readme.html">���󥹥ȡ��륬����</a>:
 	  <a href="&enbase;/releases/9.0R/hardware.html">�ϡ��ɥ������Ρ���</a>:
 	  <a href="&enbase;/releases/9.0R/readme.html">README</a>:
 	  <a href="&enbase;/releases/9.0R/errata.html">Errata (����ɽ)</a>
 	</em>
       </li>
       
       <li><b>8.4</b> (2013 ǯ 6 ��)
 	<em>
 	  <a href="8.4R/announce.html">���ʥ���</a>:
 	  <a href="&enbase;/releases/8.4R/relnotes.html">��꡼���Ρ���</a>:
 	  <a href="&enbase;/releases/8.4R/installation.html">���󥹥ȡ��륬����</a>:
 	  <a href="&enbase;/releases/8.4R/hardware.html">�ϡ��ɥ������Ρ���</a>
 	  <a href="&enbase;/releases/8.4R/readme.html">README</a>:
 	  <a href="&enbase;/releases/8.4R/errata.html">Errata (����ɽ)</a>
 	</em>
       </li>
 
       <li><b>8.3</b> (2012 ǯ 4 ��)
 	<em>
 	  <a href="8.3R/announce.html">���ʥ���</a>:
 	  <a href="&enbase;/releases/8.3R/relnotes.html">��꡼���Ρ���</a>:
 	  <a href="&enbase;/releases/8.3R/installation.html">���󥹥ȡ��륬����</a>:
 	  <a href="&enbase;/releases/8.3R/hardware.html">�ϡ��ɥ������Ρ���</a>
 	  <a href="&enbase;/releases/8.3R/readme.html">README</a>:
 	  <a href="&enbase;/releases/8.3R/errata.html">Errata (����ɽ)</a>
 	</em>
       </li>
 
       <li><b>8.2</b> (2011 ǯ 2 ��)
 	<em>
 	  <a href="8.2R/announce.html">���ʥ���</a>:
 	  <a href="&enbase;/releases/8.2R/relnotes.html">��꡼���Ρ���</a>:
 	  <a href="&enbase;/releases/8.2R/hardware.html">�ϡ��ɥ������Ρ���</a>:
 	  <a href="&enbase;/releases/8.2R/readme.html">README</a>:
 	  <a href="&enbase;/releases/8.2R/errata.html">Errata (����ɽ)</a>
 	</em>
       </li>
 
       <li><b>8.1</b> (2010 ǯ 7 ��)
 	<em>
 	  <a href="&enbase;/releases/8.1R/announce.html">���ʥ���</a>:
 	  <a href="&enbase;/releases/8.1R/relnotes.html">��꡼���Ρ���</a>:
 	  <a href="&enbase;/releases/8.1R/hardware.html">�ϡ��ɥ������Ρ���</a>:
 	  <a href="&enbase;/releases/8.1R/readme.html">README</a>:
 	  <a href="&enbase;/releases/8.1R/errata.html">Errata (����ɽ)</a>
 	</em>
       </li>
     </ul>
 
     <ul>
       <li><b>8.0</b> (2009 ǯ 11 ��)
 	<em>
 	  <a href="&enbase;/releases/8.0R/announce.html">���ʥ���</a>:
 	  <a href="&enbase;/releases/8.0R/relnotes.html">��꡼���Ρ���</a>:
 	  <a href="&enbase;/releases/8.0R/hardware.html">�ϡ��ɥ������Ρ���</a>:
 	  <a href="&enbase;/releases/8.0R/readme.html">README</a>:
 	  <a href="&enbase;/releases/8.0R/errata.html">Errata (����ɽ)</a>
 	</em>
       </li>
 
       <li><b>7.4</b> (2011 ǯ 2 ��)
 	<em>
 	  <a href="&enbase;/releases/7.4R/announce.html">���ʥ���</a>:
 	  <a href="&enbase;/releases/7.4R/relnotes.html">��꡼���Ρ���</a>:
 	  <a href="&enbase;/releases/7.4R/hardware.html">�ϡ��ɥ������Ρ���</a>:
 	  <a href="&enbase;/releases/7.4R/readme.html">README</a>:
 	  <a href="&enbase;/releases/7.4R/errata.html">Errata (����ɽ)</a>
 	</em>
       </li>
 
       <li><b>7.3</b> (2010 ǯ 3 ��)
 	<em>
 	  <a href="&enbase;/releases/7.3R/announce.html">���ʥ���</a>:
 	  <a href="&enbase;/releases/7.3R/relnotes.html">��꡼���Ρ���</a>:
 	  <a href="&enbase;/releases/7.3R/hardware.html">�ϡ��ɥ������Ρ���</a>:
 	  <a href="&enbase;/releases/7.3R/readme.html">README</a>:
 	  <a href="&enbase;/releases/7.3R/errata.html">Errata (����ɽ)</a>
 	</em>
       </li>
 
       <li><b>7.2</b> (2009 ǯ 5 ��)
 	<em>
 	  <a href="&enbase;/releases/7.2R/announce.html">���ʥ���</a>:
 	  <a href="&enbase;/releases/7.2R/relnotes.html">��꡼���Ρ���</a>:
 	  <a href="&enbase;/releases/7.2R/hardware.html">�ϡ��ɥ������Ρ���</a>:
 	  <a href="&enbase;/releases/7.2R/readme.html">README</a>:
 	  <a href="&enbase;/releases/7.2R/errata.html">Errata (����ɽ)</a>
 	</em>
       </li>
 
       <li><b>7.1</b> (2009 ǯ 1 ��)
 	<em>
 	  <a href="&enbase;/releases/7.1R/announce.html">���ʥ���</a>:
 	  <a href="&enbase;/releases/7.1R/relnotes.html">��꡼���Ρ���</a>:
 	  <a href="&enbase;/releases/7.1R/hardware.html">�ϡ��ɥ������Ρ���</a>:
 	  <a href="&enbase;/releases/7.1R/readme.html">README</a>:
 	  <a href="&enbase;/releases/7.1R/errata.html">Errata (����ɽ)</a>
 	</em>
       </li>
 
       <li><b>7.0</b> (2008 ǯ 2 ��)
 	<em>
 	  <a href="&enbase;/releases/7.0R/announce.html">���ʥ���</a>:
 	  <a href="&enbase;/releases/7.0R/relnotes.html">��꡼���Ρ���</a>:
 	  <a href="&enbase;/releases/7.0R/hardware.html">�ϡ��ɥ������Ρ���</a>:
 	  <a href="&enbase;/releases/7.0R/readme.html">README</a>:
 	  <a href="&enbase;/releases/7.0R/errata.html">Errata (����ɽ)</a>
 	</em>
       </li>
 
       <li><b>6.4</b> (2008 ǯ 11 ��)
 	<em>
 	  <a href="&enbase;/releases/6.4R/announce.html">���ʥ���</a>:
 	  <a href="&enbase;/releases/6.4R/relnotes.html">��꡼���Ρ���</a>:
 	  <a href="&enbase;/releases/6.4R/hardware.html">�ϡ��ɥ������Ρ���</a>:
 	  <a href="&enbase;/releases/6.4R/installation.html">���󥹥ȡ��륬����</a>:
 	  <a href="&enbase;/releases/6.4R/readme.html">README</a>:
 	  <a href="&enbase;/releases/6.4R/errata.html">Errata (����ɽ)</a>
 	</em>
       </li>
 
       <li><b>6.3</b> (2008 ǯ 1 ��)
 	<em>
 	  <a href="&enbase;/releases/6.3R/announce.html">���ʥ���</a>:
 	  <a href="&enbase;/releases/6.3R/relnotes.html">��꡼���Ρ���</a>:
 	  <a href="&enbase;/releases/6.3R/hardware.html">�ϡ��ɥ������Ρ���</a>:
 	  <a href="&enbase;/releases/6.3R/installation.html">���󥹥ȡ��륬����</a>:
 	  <a href="&enbase;/releases/6.3R/readme.html">README</a>:
 	  <a href="&enbase;/releases/6.3R/errata.html">Errata (����ɽ)</a>
 	</em>
       </li>
 
       <li><b>6.2</b> (2007 ǯ 1 ��)
 	<em>
 	  <a href="&enbase;/releases/6.2R/announce.html">���ʥ���</a>:
 	  <a href="&enbase;/releases/6.2R/relnotes.html">��꡼���Ρ���</a>:
 	  <a href="&enbase;/releases/6.2R/hardware.html">�ϡ��ɥ������Ρ���</a>:
 	  <a href="&enbase;/releases/6.2R/installation.html">���󥹥ȡ��륬����</a>:
 	  <a href="&enbase;/releases/6.2R/readme.html">README</a>:
 	  <a href="&enbase;/releases/6.2R/errata.html">Errata (����ɽ)</a>
 	</em>
       </li>
 
       <li><b>6.1</b> (2006 ǯ 5 ��)
 	<em>
 	  <a href="&enbase;/releases/6.1R/announce.html">���ʥ���</a>:
 	  <a href="&enbase;/releases/6.1R/relnotes.html">��꡼���Ρ���</a>:
 	  <a href="&enbase;/releases/6.1R/hardware.html">�ϡ��ɥ������Ρ���</a>:
 	  <a href="&enbase;/releases/6.1R/installation.html">���󥹥ȡ��륬����</a>:
 	  <a href="&enbase;/releases/6.1R/readme.html">README</a>:
 	  <a href="&enbase;/releases/6.1R/errata.html">Errata (����ɽ)</a>
 	</em>
       </li>
 
       <li><b>6.0</b> (2005 ǯ 11 ��)
 	<em>
 	  <a href="&enbase;/releases/6.0R/announce.html">���ʥ���</a>:
 	  <a href="&enbase;/releases/6.0R/relnotes.html">��꡼���Ρ���</a>:
 	  <a href="&enbase;/releases/6.0R/hardware.html">�ϡ��ɥ������Ρ���</a>:
 	  <a href="&enbase;/releases/6.0R/installation.html">���󥹥ȡ��륬����</a>:
 	  <a href="&enbase;/releases/6.0R/readme.html">README</a>:
 	  <a href="&enbase;/releases/6.0R/errata.html">Errata (����ɽ)</a>
 	</em>
       </li>
 
       <li><b>5.5</b> (2006 ǯ 5 ��)
 	<em>
 	  <a href="&enbase;/releases/5.5R/announce.html">���ʥ���</a>:
 	  <a href="&enbase;/releases/5.5R/relnotes.html">��꡼���Ρ���</a>:
 	  <a href="&enbase;/releases/5.5R/hardware.html">�ϡ��ɥ������Ρ���</a>:
 	  <a href="&enbase;/releases/5.5R/installation.html">���󥹥ȡ��륬����</a>:
 	  <a href="&enbase;/releases/5.5R/readme.html">README</a>:
 	  <a href="&enbase;/releases/5.5R/errata.html">Errata (����ɽ)</a>:
 	</em>
       </li>
 
       <li><b>5.4</b> (2005 ǯ 5 ��)
 	<em>
 	  <a href="&enbase;/releases/5.4R/announce.html">���ʥ���</a>:
 	  <a href="&enbase;/releases/5.4R/relnotes.html">��꡼���Ρ���</a>:
 	  <a href="./5.4R/hardware.html">�ϡ��ɥ������Ρ���</a>:
 	  <a href="&enbase;/releases/5.4R/installation.html">���󥹥ȡ��륬����</a>:
 	  <a href="&enbase;/releases/5.4R/readme.html">README</a>:
 	  <a href="&enbase;/releases/5.4R/errata.html">Errata (����ɽ)</a>:
 	  <a href="&enbase;/releases/5.4R/migration-guide.html">�ܹԤΤ���μ����</a>
 	</em>
       </li>
 
       <li><b>5.3</b> (2004 ǯ 11 ��)
 	<em>
 	  <a href="&enbase;/releases/5.3R/announce.html">���ʥ���</a>:
 	  <a href="&enbase;/releases/5.3R/relnotes.html">��꡼���Ρ���</a>:
 	  <a href="./5.3R/hardware.html">�ϡ��ɥ������Ρ���</a>:
 	  <a href="&enbase;/releases/5.3R/installation.html">���󥹥ȡ��륬����</a>:
 	  <a href="&enbase;/releases/5.3R/readme.html">README</a>:
 	  <a href="&enbase;/releases/5.3R/errata.html">Errata (����ɽ)</a>:
 	  <a href="&enbase;/releases/5.3R/migration-guide.html">�ܹԤΤ���μ����</a>
 	</em>
       </li>
 
       <li><b>5.2.1</b> (2004 ǯ 2 ��)
 	<em>
 	  <a href="./5.2.1R/announce.html">���ʥ���</a>:
 	  <a href="./5.2.1R/relnotes.html">��꡼���Ρ���</a>:
 	  <a href="./5.2.1R/hardware.html">�ϡ��ɥ������Ρ���</a>:
 	  <a href="&enbase;/releases/5.2.1R/installation.html">���󥹥ȡ��륬����</a>:
 	  <a href="&enbase;/releases/5.2.1R/readme.html">README</a>:
 	  <a href="./5.2.1R/errata.html">Errata (����ɽ)</a>:
 	  <a href="./5.2.1R/early-adopter.html">������ѼԤΤ���μ����</a>
 	</em>
       </li>
 
       <li><b>5.2</b> (2004 ǯ 1 ��)
 	<em>
 	  <a href="./5.2R/announce.html">���ʥ���</a>:
 	  <a href="./5.2R/relnotes.html">��꡼���Ρ���</a>:
 	  <a href="./5.2R/hardware.html">�ϡ��ɥ������Ρ���</a>:
 	  <a href="&enbase;/releases/5.2R/installation.html">���󥹥ȡ��륬����</a>:
 	  <a href="&enbase;/releases/5.2R/readme.html">README</a>:
 	  <a href="./5.2R/errata.html">Errata (����ɽ)</a>:
 	  <a href="./5.2R/early-adopter.html">������ѼԤΤ���μ����</a>
 	</em>
       </li>
 
       <li><b>5.1</b> (2003 ǯ 6 ��)
 	<em>
 	  <a href="./5.1R/announce.html">���ʥ���</a>:
 	  <a href="./5.1R/relnotes.html">��꡼���Ρ���</a>:
 	  <a href="./5.1R/hardware.html">�ϡ��ɥ������Ρ���</a>:
 	  <a href="&enbase;/releases/5.1R/installation.html">���󥹥ȡ��륬����</a>:
 	  <a href="&enbase;/releases/5.1R/readme.html">README</a>:
 	  <a href="./5.1R/errata.html">Errata (����ɽ)</a>:
 	  <a href="./5.1R/early-adopter.html">������ѼԤΤ���μ����</a>
 	</em>
       </li>
 
       <li><b>5.0</b> (2003 ǯ 1 ��)
 	<em>
 	  <a href="./5.0R/announce.html">���ʥ���</a>:
 	  <a href="./5.0R/relnotes.html">��꡼���Ρ���</a>:
 	  <a href="./5.0R/hardware.html">�ϡ��ɥ������Ρ���</a>:
 	  <a href="&enbase;/releases/5.0R/installation.html">���󥹥ȡ��륬����</a>:
 	  <a href="&enbase;/releases/5.0R/readme.html">README</a>:
 	  <a href="./5.0R/errata.html">Errata (����ɽ)</a>:
 	  <a href="./5.0R/early-adopter.html">������ѼԤΤ���μ����</a>
 	</em>
       </li>
 
       <li><b>4.11</b> (2005 ǯ 1 ��)
 	<em>
 	  <a href="./4.11R/announce.html">���ʥ���</a>:
 	  <a href="./4.11R/relnotes.html">��꡼���Ρ���</a>:
 	  <a href="./4.11R/hardware.html">�ϡ��ɥ������Ρ���</a>:
 	  <a href="&enbase;/releases/4.11R/installation.html">���󥹥ȡ��륬����</a>:
 	  <a href="&enbase;/releases/4.11R/readme.html">README</a>:
 	  <a href="./4.11R/errata.html">Errata (����ɽ)</a>
 	</em>
       </li>
 
       <li><b>4.10</b> (2004 ǯ 5 ��)
 	<em>
 	  <a href="./4.10R/announce.html">���ʥ���</a>:
 	  <a href="./4.10R/relnotes.html">��꡼���Ρ���</a>:
 	  <a href="./4.10R/hardware.html">�ϡ��ɥ������Ρ���</a>:
 	  <a href="&enbase;/releases/4.10R/installation.html">���󥹥ȡ��륬����</a>:
 	  <a href="&enbase;/releases/4.10R/readme.html">README</a>:
 	  <a href="&enbase;/releases/4.10R/errata.html">Errata (����ɽ)</a>
 	</em>
       </li>
 
       <li><b>4.9</b> (2003 ǯ 10 ��)
 	<em>
 	  <a href="./4.9R/announce.html">���ʥ���</a>:
 	  <a href="./4.9R/relnotes.html">��꡼���Ρ���</a>:
 	  <a href="./4.9R/hardware.html">�ϡ��ɥ������Ρ���</a>:
 	  <a href="&enbase;/releases/4.9R/installation.html">���󥹥ȡ��륬����</a>:
 	  <a href="&enbase;/releases/4.9R/readme.html">README</a>:
 	  <a href="./4.9R/errata.html">Errata (����ɽ)</a>
 	</em>
       </li>
 
       <li><b>4.8</b> (2003 ǯ 4 ��)
 	<em>
 	  <a href="./4.8R/announce.html">���ʥ���</a>:
 	  <a href="./4.8R/relnotes.html">��꡼���Ρ���</a>:
 	  <a href="./4.8R/hardware.html">�ϡ��ɥ������Ρ���</a>:
 	  <a href="&enbase;/releases/4.8R/installation.html">���󥹥ȡ��륬����</a>:
 	  <a href="&enbase;/releases/4.8R/readme.html">README</a>:
 	  <a href="./4.8R/errata.html">Errata (����ɽ)</a>
 	</em>
       </li>
 
       <li><b>4.7</b> (2002 ǯ 10 ��)
 	<em>
 	  <a href="./4.7R/announce.html">���ʥ���</a>:
 	  <a href="./4.7R/relnotes.html">��꡼���Ρ���</a>:
 	  <a href="./4.7R/hardware.html">�ϡ��ɥ������Ρ���</a>:
 	  <a href="&enbase;/releases/4.7R/installation.html">���󥹥ȡ��륬����</a>:
 	  <a href="&enbase;/releases/4.7R/readme.html">README</a>:
 	  <a href="./4.7R/errata.html">Errata (����ɽ)</a>
 	</em>
       </li>
 
       <li><b>4.6.2</b> (2002 ǯ 8 ��)
 	<em>
 	  <a href="./4.6.2R/announce.html">���ʥ���</a>:
 	  <a href="./4.6.2R/relnotes.html">��꡼���Ρ���</a>:
 	  <a href="&enbase;/releases/4.6.2R/hardware.html">�ϡ��ɥ������Ρ���</a>:
 	  <a href="&enbase;/releases/4.6.2R/readme.html">README</a>:
 	  <a href="&enbase;/releases/4.6.2R/errata.html">Errata (����ɽ)</a>
 	</em>
       </li>
 
       <li><b>4.6</b> (2002 ǯ 6 ��)
 	<em>
 	  <a href="./4.6R/announce.html">���ʥ���</a> :
 	  <a href="./4.6R/relnotes.html">��꡼���Ρ���</a> :
 	  <a href="./4.6R/hardware.html">�ϡ��ɥ������Ρ���</a>:
 	  <a href="&enbase;/releases/4.6R/installation.html">���󥹥ȡ��륬����</a>:
 	  <a href="&enbase;/releases/4.6R/errata.html">Errata (����ɽ)</a>.
 	</em>
       </li>
 
       <li><b>4.5</b> (2002 ǯ 1 ��)
 	<em>
 	  <a href="./4.5R/announce.html">���ʥ���</a> :
 	  <a href="./4.5R/notes.html">��꡼���Ρ���</a> :
 	  <a href="./4.5R/hardware.html">�ϡ��ɥ������Ρ���</a>:
 	  <a href="./4.5R/errata.html">Errata (����ɽ)</a>.
 	</em>
       </li>
 
       <li><b>4.4</b> (2001 ǯ 9 ��)
 	<em>
 	  <a href="./4.4R/announce.html">���ʥ���</a> :
 	  <a href="./4.4R/notes.html">��꡼���Ρ���</a> :
 	  <a href="./4.4R/hardware.html">�ϡ��ɥ������Ρ���</a>:
 	  <a href="./4.4R/errata.html">Errata (����ɽ)</a>.
 	</em>
       </li>
 
       <li><b>4.3</b> (2001 ǯ 4 ��)
 	<em>
 	  <a href="./4.3R/announce.html">���ʥ���</a> :
 	  <a href="./4.3R/notes.html">��꡼���Ρ���</a> :
 	  <a href="./4.3R/errata.html">Errata (����ɽ)</a>.
 	</em>
       </li>
 
       <li><b>4.2</b> (2000 ǯ 11 ��)
 	<em>
 	  <a href="./4.2R/announce.html">���ʥ���</a> :
 	  <a href="./4.2R/notes.html">��꡼���Ρ���</a> :
 	  <a href="./4.2R/errata.html">Errata (����ɽ)</a>.
 	</em>
       </li>
 
       <li><b>4.1.1</b> (2000 ǯ 9 ��)
 	<em>
 	  <a href="./4.1.1R/announce.html">���ʥ���</a> :
 	  <a href="./4.1.1R/notes.html">��꡼���Ρ���</a> :
 	  <a href="./4.1.1R/errata.html">Errata (����ɽ)</a>.
 	</em>
       </li>
 
       <li><b>4.1</b> (2000 ǯ 7 ��)
 	<em>
 	  <a href="./4.1R/announce.html">���ʥ���</a>:
 	  <a href="./4.1R/notes.html">��꡼���Ρ���</a>:
 	  <a href="./4.1R/errata.html">Errata (����ɽ)</a>.
 	</em>
       </li>
 
       <li><b>4.0</b> (2000 ǯ 3 ��)
 	<em>
 	  <a href="./4.0R/announce.html">���ʥ���</a>:
 	  <a href="./4.0R/notes.html">��꡼���Ρ���</a>:
 	  <a href="./4.0R/errata.html">Errata (����ɽ)</a>
 	</em>
       </li>
 
       <li><b>3.5</b> (2000 ǯ 6 ��)
 	<em>
 	  <a href="./3.5R/announce.html">���ʥ���</a>:
 	  <a href="./3.5R/notes.html">��꡼���Ρ���</a>:
 	  <a href="./3.5R/errata.html">Errata (����ɽ)</a>
 	</em>
       </li>
 
       <li><b>3.4</b> (1999 ǯ 12 ��)
 	<em>
 	  <a href="./3.4R/announce.html">���ʥ���</a>:
 	  <a href="./3.4R/notes.html">��꡼���Ρ���</a>:
 	  <a href="./3.4R/errata.html">Errata (����ɽ)</a>
 	</em>
       </li>
 
       <li><b>3.3</b> (1999 ǯ 9 ��)
 	<em>
 	  <a href="./3.3R/announce.html">���ʥ���</a> :
 	  <a href="./3.3R/notes.html">��꡼���Ρ���</a> :
 	  <a href="./3.3R/errata.html">Errata (����ɽ)</a>
 	</em>
       </li>
 
       <li><b>3.2</b> (1999 ǯ 5 ��)
 	<em>
 	  <a href="./3.2R/announce.html">���ʥ���</a> :
 	  <a href="./3.2R/notes.html">��꡼���Ρ���</a> :
 	  <a href="./3.2R/errata.html">Errata (����ɽ)</a>
 	</em>
       </li>
 
       <li><b>3.1</b> (1999 ǯ 2 ��)
 	<em>
 	  <a href="./3.1R/announce.html">���ʥ���</a> :
 	  <a href="./3.1R/notes.html">��꡼���Ρ���</a> :
 	  <a href="./3.1R/errata.html">Errata (����ɽ)</a>
 	</em>
       </li>
 
       <li><b>3.0</b> (1998 ǯ 10 ��)
 	<em>
 	  <a href="./3.0R/announce.html">���ʥ���</a> :
 	  <a href="./3.0R/notes.html">��꡼���Ρ���</a> :
 	  <a href="./3.0R/errata.html">Errata (����ɽ)</a>
 	</em>
       </li>
 
       <li><b>2.2.8</b> (1998 ǯ 12 ��)
 	<em>
 	  <a href="./2.2.8R/announce.html">���ʥ���</a> :
 	  <a href="./2.2.8R/notes.html">��꡼���Ρ���</a> :
 	  <a href="./2.2.8R/errata.html">Errata (����ɽ)</a>
 	</em>
       </li>
 
       <li><b>2.2.7</b> (1998 ǯ 7 ��)
 	<em>
 	 <a href="./2.2.7R/announce.html">���ʥ���</a> :
 	 <a href="./2.2.7R/notes.html">��꡼���Ρ���</a> :
 	 <a href="./2.2.7R/errata.html">Errata (����ɽ)</a>
 	</em>
       </li>
 
       <li><b>2.2.6</b> (1998 ǯ 3 ��)
 	<em>
 	 <a href="./2.2.6R/announce.html">���ʥ���</a> :
 	 <a href="./2.2.6R/notes.html">��꡼���Ρ���</a> :
 	 <a href="./2.2.6R/errata.html">Errata (����ɽ)</a>
 	</em>
       </li>
 
       <li><b>2.2.5</b> (1997 ǯ 10 ��)
 	<em>
 	 <a href="./2.2.5R/announce.html">���ʥ���</a> :
 	 <a href="./2.2.5R/notes.html">��꡼���Ρ���</a> :
 	 <a href="./2.2.5R/errata.html">Errata (����ɽ)</a>
 	</em>
       </li>
 
       <li><b>2.2.2</b> (1997 ǯ 5 ��)
 	<em>
 	  <a href="./2.2.2R/notes.html">��꡼���Ρ���</a> :
 	  <a href="./2.2.2R/errata.html">Errata Notes (����ɽ)</a>.
 	</em>
       </li>
 
       <li><b>2.2.1</b> (1997 ǯ 4 ��)
 	<em>
  	  <a href="./2.2.1R/notes.html">��꡼���Ρ���</a>.
 	</em>
       </li>
 
       <li><b>2.2</b> (1997 ǯ 3 ��)
 	<em>
 	  <a href="./2.2R/announce.html">���ʥ���</a> :
 	  <a href="./2.2R/notes.html">��꡼���Ρ���</a>.
 	</em>
       </li>
 
       <li><b>2.1.7</b> (1997 ǯ 2 ��)
 	<em>
 	  <a href="../../releases/2.1.7R/announce.html">���ʥ���</a> :
 	  <a href="./2.1.7R/notes.html">��꡼���Ρ���</a>.
 	</em>
       </li>
 
       <li><b>2.1.6</b> (1996 ǯ 12 ��)
 	<em>
 	  <a href="../../releases/2.1.6R/announce.html">���ʥ���</a> :
 	  <a href="./2.1.6R/notes.html">��꡼���Ρ���</a>.
 	</em>
       </li>
 
       <li><b>2.1.5</b> (1996 ǯ 7 ��)
 	<em>
 	  <a href="../../releases/2.1.5R/announce.html">���ʥ���</a> :
 	  <a href="./2.1.5R/notes.html">��꡼���Ρ���</a>.
 	</em>
       </li>
 
       <li><b>2.1</b> (1995 ǯ 11 ��)
 	<em>
 	  <a href="../../releases/2.1R/announce.html">���ʥ���</a> :
 	  <a href="../../releases/2.1R/notes.html">��꡼���Ρ���</a>.
 	</em>
       </li>
 
       <li><b>2.0.5</b> (1995 ǯ 6 ��)
 	<em>
 	  <a href="../../releases/2.0.5R/announce.html">���ʥ���</a> :
 	  <a href="../../releases/2.0.5R/notes.html">��꡼���Ρ���</a>.
 	</em>
       </li>
 
       <li><b>2.0</b> (1994 ǯ 11 ��)
 	<em>
 	  <a href="../../releases/2.0/announce.html">���ʥ���</a> :
 	  <a href="../../releases/2.0/notes.html">��꡼���Ρ���</a>
 	</em>
       </li>
 
       <li><b>1.1.5.1</b> (1994 ǯ 7 ��)</li>
 
       <li><b>1.1.5</b>
 	<em>
 	  <a href="../../releases/1.1.5/RELNOTES.FreeBSD">��꡼���Ρ���</a>
 	</em>
       </li>
 
       <li><b>1.1</b> (1994 ǯ 3 ��)
 	<em>
 	  <a href="../../releases/1.1/RELNOTES.FreeBSD">��꡼���Ρ���</a>
 	</em>
       </li>
 
       <li><b>1.0</b> (1993 ǯ 11 ��)
 	<em>
 	  <a href="&enbase;/releases/1.0/announce.html">Announcement</a>
 	</em>
       </li>
     </ul>
 
   </body>
 </html>
Index: user/gjb/releng-rewrite/ja_JP.eucJP/htdocs/relnotes.xml
===================================================================
--- user/gjb/releng-rewrite/ja_JP.eucJP/htdocs/relnotes.xml	(revision 49724)
+++ user/gjb/releng-rewrite/ja_JP.eucJP/htdocs/relnotes.xml	(revision 49725)
@@ -1,118 +1,130 @@
 <?xml version="1.0" encoding="euc-jp"?>
 <!DOCTYPE html PUBLIC "-//FreeBSD//DTD XHTML 1.0 Transitional-Based Extension//EN"
 "http://www.FreeBSD.org/XML/share/xml/xhtml10-freebsd.dtd" [
 <!ENTITY title "��꡼��ʸ��">
 ]>
 <!-- The FreeBSD Japanese Documentation Project -->
-<!-- Original revision: r47800 -->
+<!-- Original revision: r49718 -->
 
 <html xmlns="http://www.w3.org/1999/xhtml">
     <head>
       <title>&title;</title>
 
       <cvs:keyword xmlns:cvs="http://www.FreeBSD.org/XML/CVS">$FreeBSD$</cvs:keyword>
     </head>
 
     <body class="navinclude.about">
 
     <img src="&enbase;/gifs/doc.jpg" alt="BSD daemon reading documentation" align="right" border="0" width="274" height="163"/>
 
     <p>FreeBSD �γƥǥ����ȥ�ӥ塼�����ˤϡ�
       �ġ��Υǥ����ȥ�ӥ塼����� (RELEASE, SNAPSHOT ��)
       �ˤĤ��Ƶ��Ҥ���ʸ��ե����뤬��°���Ƥ��ޤ���
       �̾�ϡ��ʲ��Τ褦�ʥե����뤬�ޤޤ�Ƥ��ޤ���</p>
 
     <ul>
       <li>README: ����Ū�ʾ���</li>
 
       <li>��꡼���Ρ���:
 	FreeBSD �ΰ����Υ�꡼��������ѹ����ˤĤ��Ƥξ���</li>
 
       <li>�ϡ��ɥ������ꥹ��:
 	FreeBSD	�ˤ�����ư�������Τ��Ƥ���ϡ��ɥ��������֤Υꥹ�ȡ�</li>
 
       <li>���󥹥ȡ��륬����: FreeBSD �򥤥󥹥ȡ��뤹�뤿���û�������ɡ�</li>
 
       <li>Errata (����ɽ): �������������ƥ�����
 	�����Ƴƥ�꡼�����ȯ�����줿���������ʤɤ������롢
 	�ǿ��Υ˥塼����</li>
     </ul>
 
-    <p>�����󤷤��ե�����Τ�����
-      ��꡼���Ρ��ȡ��ϡ��ɥ������ꥹ�ȡ����󥹥ȡ��륬���ɤˤĤ��Ƥϡ�
+    <p>��꡼���Ρ��ȡ��ϡ��ɥ������ꥹ�Ȥ���ӥ��󥹥ȡ��륬���ɤˤĤ��Ƥϡ�
       FreeBSD ���б����Ƥ���ƥ������ƥ����㤴�Ȥ��Ѱդ���Ƥ��ޤ���</p>
 
     <h2>FreeBSD �Υ�꡼����</h2>
 
     <p>FreeBSD �γ� -RELEASE �� (���Ȥ��С�&rel.current;-RELEASE)
-      �Υ�꡼��ʸ��ˤĤ��Ƥϡ�FreeBSD �Υ����֥����� (�ޤ��Ϥ��Υߥ顼������) ��
+      �Υ�꡼��ʸ��ˤĤ��Ƥϡ�FreeBSD
+      �Υ����֥����Ȥ���Ӥ��Υߥ顼�����Ȥ�
       <a href="releases/index.html">��꡼��</a>
       �ڡ����Ǹ�������Ƥ��ޤ���</p>
 
     <p>�����Υե�����ϡ�
-      (CD-ROM, FTP �����ȡ����󥹥ȡ����ѥե��åԡ��ǥ������ˤ�餺)
       �ƥǥ����ȥ�ӥ塼�����ˤ�����Ǿ�̤Υǥ��쥯�ȥ��
-      (�����Ƥ� HTML �ȥƥ����ȷ�����ξ����) �Ѱդ���Ƥ��ޤ���</p>
+      �Ѱդ���Ƥ��ޤ���
+      �̾�ϡ�HTML �ȥƥ����ȷ�����ξ�����󶡤���Ƥ��ޤ���</p>
 
     <h2>FreeBSD �Υ��ʥåץ���å���</h2>
 
     <p>���ʥåץ���å��ѤΥ�꡼��ʸ��ե�����ϡ�
       �̾�ƥ��ʥåץ���åȤκǾ�̤Υǥ��쥯�ȥ�ˤ���ޤ���</p>
 
     <h2>-CURRENT ����� -STABLE �Ѥ�ʸ��</h2>
 
     <p>FreeBSD-CURRENT ����� -STABLE �ѤΥ�꡼��ʸ���
       HTML �Ǥϡ�FreeBSD �Υ����֥����Ȥ��󶡤���Ƥ��ޤ���
-      ������ʸ��ϼ�ư�������졢�����������Ƥ��ޤ�
-      (�����֥����Ⱦ��ʸ��ϡ������֥�������ξ��󤬹���������Ʊ���ˡ�
-      �ƹ��ۤ���ޤ�)��</p>
+      ������ʸ��Ϸ�³Ū�˹������졢��ưŪ����������Ƥ��ޤ�
+      �����֥����Ⱦ��ʸ��ϡ������֥�������ξ��󤬹���������Ʊ���ˡ�
+      �ƹ��ۤ���ޤ���</p>
 
     <h3>FreeBSD-CURRENT ��꡼��ʸ��</h3>
 
     <ul>
       <li><a href="&enbase;/relnotes/CURRENT/readme/index.html">README</a></li>
 
       <li><a href="&enbase;/relnotes/CURRENT/relnotes/index.html">��꡼���Ρ���</a></li>
 
       <li><a href="&enbase;/relnotes/CURRENT/hardware/index.html">�ϡ��ɥ������ꥹ��</a></li>
 
       <li><a href="&enbase;/relnotes/CURRENT/errata/index.html">Errata (����ɽ)</a></li>
+    </ul>
+
+    <h3>FreeBSD 11-STABLE ��꡼��ʸ��</h3>
+
+    <ul>
+      <li><a href="&enbase;/relnotes/11-STABLE/readme/index.html">README</a></li>
+
+      <li><a href="&enbase;/relnotes/11-STABLE/relnotes/index.html">��꡼���Ρ���</a></li>
+
+      <li><a href="&enbase;/relnotes/11-STABLE/hardware/index.html">�ϡ��ɥ������ꥹ��</a></li>
+
+      <li><a href="&enbase;/relnotes/11-STABLE/errata/index.html">Errata (����ɽ)</a></li>
     </ul>
 
     <h3>FreeBSD 10-STABLE ��꡼��ʸ��</h3>
 
     <ul>
       <li><a href="&enbase;/relnotes/10-STABLE/readme/index.html">README</a></li>
 
       <li><a href="&enbase;/relnotes/10-STABLE/relnotes/index.html">��꡼���Ρ���</a></li>
 
       <li><a href="&enbase;/relnotes/10-STABLE/hardware/index.html">�ϡ��ɥ������ꥹ��</a></li>
 
       <li><a href="&enbase;/relnotes/10-STABLE/errata/index.html">Errata (����ɽ)</a></li>
     </ul>
 
     <h3>FreeBSD 9-STABLE ��꡼��ʸ��</h3>
 
     <ul>
       <li><a href="&enbase;/relnotes/9-STABLE/readme/index.html">README</a></li>
 
       <li><a href="&enbase;/relnotes/9-STABLE/relnotes/index.html">��꡼���Ρ���</a></li>
 
       <li><a href="&enbase;/relnotes/9-STABLE/hardware/index.html">�ϡ��ɥ������ꥹ��</a></li>
 
       <li><a href="&enbase;/relnotes/9-STABLE/errata/index.html">Errata (����ɽ)</a></li>
     </ul>
 
 <!-- note: not found as of 20151112
     <h2>¾�Υ�����</h2>
 
     <p>FreeBSD -CURRENT, -STABLE �����ƺǶ�� -RELEASE �Ѥ�
       HTML, PDF ����ӥƥ����ȷ�����ñ��ե�����Υ�꡼��ʸ��ϡ�
     <a
       href="http://people.FreeBSD.org/~bmah/relnotes/">Release
       Documentation Snapshot Site</a> �Ǹ�������Ƥ��ޤ���
       ���Υڡ�����ʸ������Ū�˹�������ޤ���</p>
 -->
 
   </body>
 </html>
Index: user/gjb/releng-rewrite/ja_JP.eucJP
===================================================================
--- user/gjb/releng-rewrite/ja_JP.eucJP	(revision 49724)
+++ user/gjb/releng-rewrite/ja_JP.eucJP	(revision 49725)

Property changes on: user/gjb/releng-rewrite/ja_JP.eucJP
___________________________________________________________________
Modified: svn:mergeinfo
## -0,0 +0,1 ##
   Merged /head/ja_JP.eucJP:r49706-49724
Index: user/gjb/releng-rewrite/share/security/advisories/FreeBSD-EN-16:19.tzcode.asc
===================================================================
--- user/gjb/releng-rewrite/share/security/advisories/FreeBSD-EN-16:19.tzcode.asc	(nonexistent)
+++ user/gjb/releng-rewrite/share/security/advisories/FreeBSD-EN-16:19.tzcode.asc	(revision 49725)
@@ -0,0 +1,133 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA512
+
+=============================================================================
+FreeBSD-EN-16:19.tzcode                                         Errata Notice
+                                                          The FreeBSD Project
+
+Topic:          Avoid warnings about valid time zone abbreviations
+
+Category:       contrib
+Module:         tzcode
+Announced:      2016-12-06
+Credits:        Baptiste Daroussin
+Affects:        All supported versions of FreeBSD
+Corrected:      2016-10-15 12:37:57 UTC (stable/11, 11.0-STABLE)
+                2016-12-05 23:17:05 UTC (releng/11.0, 11.0-RELEASE-p4)
+                2016-10-15 12:38:21 UTC (stable/10, 10.3-STABLE)
+                2016-12-05 23:13:16 UTC (releng/10.3, 10.3-RELEASE-p13)
+                2016-12-05 23:12:22 UTC (releng/10.2, 10.2-RELEASE-p26)
+                2016-12-05 23:09:54 UTC (releng/10.1, 10.1-RELEASE-p43)
+                2016-10-15 12:38:50 UTC (stable/9, 9.3-STABLE)
+                2016-12-05 22:43:24 UTC (releng/9.3, 9.3-RELEASE-p51)
+
+For general information regarding FreeBSD Errata Notices and Security
+Advisories, including descriptions of the fields above, security
+branches, and the following sections, please visit
+<URL:https://security.FreeBSD.org/>.
+
+I.   Background
+
+The zic(8) utility reads text from the file(s) named on the command line
+and creates the time conversion information files specified in this input.
+
+The zdump(8) utility prints the current time in each zonename named on the
+command line.
+
+II.  Problem Description
+
+Until 2000, timezone abbreviations starting with ':', and could not contain
+',', '-', '+', NUL, or a digit for POSIX compatibility.  In 2001, the POSIX
+compatibility rules changed, and timezone abbreviations can contain only
+'-', '+', and alphanumeric characters from the portable character set in the
+current locale.
+
+III. Impact
+
+This is needed to be able to update tzdata to a newer version.
+
+IV.  Workaround
+
+No workaround is available, however systems configured to use Coordinated
+Universal Time (UTC) are not affected.
+
+V.   Solution
+
+1) Upgrade your system to a supported FreeBSD stable or release / security
+branch (releng) dated after the correction date.
+
+2) To update your system via a binary patch:
+
+Systems running a RELEASE version of FreeBSD on the i386 or amd64
+platforms can be updated via the freebsd-update(8) utility:
+
+# freebsd-update fetch
+# freebsd-update install
+
+3) To update your system via a source code patch:
+
+The following patches have been verified to apply to the applicable
+FreeBSD release branches.
+
+a) Download the relevant patch from the location below, and verify the
+detached PGP signature using your PGP utility.
+
+# fetch https://security.FreeBSD.org/patches/EN-16:19/tzcode.patch
+# fetch https://security.FreeBSD.org/patches/EN-16:19/tzcode.patch.asc
+# gpg --verify tzcode.patch.asc
+
+b) Apply the patch.  Execute the following commands as root:
+
+# cd /usr/src
+# patch < /path/to/patch
+
+c) Recompile the operating system using buildworld and installworld as
+described in <URL:https://www.FreeBSD.org/handbook/makeworld.html>.
+
+VI.  Correction details
+
+The following list contains the correction revision numbers for each
+affected branch.
+
+Branch/path                                                      Revision
+- -------------------------------------------------------------------------
+stable/9/                                                         r307360
+releng/9.3/                                                       r309567
+stable/10/                                                        r307359
+releng/10.1/                                                      r309570
+releng/10.2/                                                      r309571
+releng/10.3/                                                      r309572
+stable/11/                                                        r307358
+releng/11.0/                                                      r309573
+- -------------------------------------------------------------------------
+
+To see which files were modified by a particular revision, run the
+following command, replacing NNNNNN with the revision number, on a
+machine with Subversion installed:
+
+# svn diff -cNNNNNN --summarize svn://svn.freebsd.org/base
+
+Or visit the following URL, replacing NNNNNN with the revision number:
+
+<URL:https://svnweb.freebsd.org/base?view=revision&revision=NNNNNN>
+
+VII. References
+
+The latest revision of this advisory is available at
+<URL:https://security.FreeBSD.org/advisories/FreeBSD-EN-16:19.tzcode.asc>
+-----BEGIN PGP SIGNATURE-----
+
+iQIcBAEBCgAGBQJYRw1nAAoJEO1n7NZdz2rnaowQAM/QDvH9LzIUfnydfZklBvPM
+vCF0M6aDsGZNONQCik/ZdyICZ8lws/DcVKG4cz3Fth8XRI0GYsFQPO1m1AJICdVX
+CH8bVmgFN0ajChezScYgXNG3qIlQKkeZK1dMaZwLkI02wtn9InqPW4vdecIUcegr
+cLK8ppPTB51iWZp0HGXcURzCJRy444l6KhFwfPJdB0dzjrBRkQZXP4ewW1hVuZMK
+/trACy5TzKahEzwbqtyNjC22Ou73rb39kH5XweGIx38WfyXeqh3mLwC1qny7PCcI
+44V60ovwNyxzUHFFueriDeTeNp+rPkzn6MbjMbtJIhN4K3rO3ekw3KyR6lpZN0WI
+VM9Lvz0+vuTHjDuJqte/yiztyexj+aol7xOMv0Ak/0JlXigFwsOVqx0zHn6cHUey
+oB9cgNlmb8N51HRX0UiI6x/MJO5ZQm53LsD+YTr1y8iQDHtE2JJfnLj9v/rnFK/q
+cPqwxD1vYWQa9rnImFMdI6Ahix3LvSNQLQybWYgSkq+AH5Nbsqfl3CbJdE5ry7Xn
+bllPD5cbLTZVqA4hdGpptEAPFBiHgsExxPHswn1uvkMQEettVKb7hzNXkVF4p1GB
+CSq80neXh2GyvyA+G07I/7uNmFqzthnGQRsI0PJAItazZnwGlnyGDDtF7okpOkYO
+M70LiIMI27QIqMdiWfO5
+=68Rp
+-----END PGP SIGNATURE-----

Property changes on: user/gjb/releng-rewrite/share/security/advisories/FreeBSD-EN-16:19.tzcode.asc
___________________________________________________________________
Added: fbsd:nokeywords
## -0,0 +1 ##
+yes
\ No newline at end of property
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Added: svn:mime-type
## -0,0 +1 ##
+text/plain
\ No newline at end of property
Index: user/gjb/releng-rewrite/share/security/advisories/FreeBSD-EN-16:20.tzdata.asc
===================================================================
--- user/gjb/releng-rewrite/share/security/advisories/FreeBSD-EN-16:20.tzdata.asc	(nonexistent)
+++ user/gjb/releng-rewrite/share/security/advisories/FreeBSD-EN-16:20.tzdata.asc	(revision 49725)
@@ -0,0 +1,176 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA512
+
+=============================================================================
+FreeBSD-EN-16:20.tzdata                                         Errata Notice
+                                                          The FreeBSD Project
+
+Topic:          Timezone database information update
+
+Category:       contrib
+Module:         zoneinfo
+Announced:      2016-12-06
+Credits:        Maxim Sobolev
+Affects:        All supported versions of FreeBSD
+Corrected:      2016-11-04 17:55:50 UTC (stable/11, 11.0-STABLE)
+                2016-12-06 00:06:16 UTC (releng/11.0, 11.0-RELEASE-p4)
+                2016-11-04 17:55:50 UTC (stable/10, 10.3-STABLE)
+                2016-12-05 23:30:13 UTC (releng/10.3, 10.3-RELEASE-p13)
+                2016-12-05 23:26:06 UTC (releng/10.2, 10.2-RELEASE-p26)
+                2016-12-05 23:23:13 UTC (releng/10.1, 10.1-RELEASE-p43)
+                2016-11-04 17:55:50 UTC (stable/9, 9.3-STABLE)
+                2016-12-05 23:02:02 UTC (releng/9.3, 9.3-RELEASE-p51)
+
+For general information regarding FreeBSD Errata Notices and Security
+Advisories, including descriptions of the fields above, security
+branches, and the following sections, please visit
+<URL:https://security.FreeBSD.org/>.
+
+I.   Background
+
+The tzsetup(8) program allows the user to specify the default local
+timezone.  Based on the selected timezone, tzsetup(8) copies one of the
+files from /usr/share/zoneinfo to /etc/localtime.  This file actually
+controls the conversion.
+
+II.  Problem Description
+
+Several changes in Daylight Savings Time happened after previous
+FreeBSD releases were released that would affect many people who
+live in different countries.  Because of these changes, the data in
+the zoneinfo files need to be updated, and if the local timezone on
+the running system is affected, tzsetup(8) needs to be run so the
+/etc/localtime is updated.
+
+III. Impact
+
+An incorrect time will be displayed on a system configured to use one
+of the affected timezones if the /usr/share/zoneinfo and /etc/localtime
+files are not updated, and all applications on the system that rely on
+the system time, such as cron(8) and syslog(8), will be affected.
+
+IV.  Workaround
+
+The system administrator can install an updated timezone database from
+the misc/zoneinfo port and run tzsetup(8) to get the timezone database
+corrected.
+
+Applications that store and display times in Coordinated Universal Time
+(UTC) are not affected.
+
+V.   Solution
+
+Please note that some third party software, for instance PHP, Ruby,
+Java and Perl, may be using different zoneinfo data source, in such
+cases these software has to be updated separately.  For software
+packages that is installed via package collection, they can be
+upgraded by doing a `pkg upgrade'.
+
+Following the instructions in this Errata Notice will update all of
+the zoneinfo files to be the same as what was released with FreeBSD
+release.
+
+Perform one of the following:
+
+1) Upgrade your system to a supported FreeBSD stable or release / security
+branch (releng) dated after the correction date.  Restart all the affected
+applications and daemons, or reboot the system.
+
+2) To update your system via a binary patch:
+
+Systems running a RELEASE version of FreeBSD on the i386 or amd64
+platforms can be updated via the freebsd-update(8) utility:
+
+# freebsd-update fetch
+# freebsd-update install
+
+Restart all the affected applications and daemons, or reboot the system.
+
+3) To update your system via a source code patch:
+
+The following patches have been verified to apply to the applicable
+FreeBSD release branches.
+
+a) Download the relevant patch from the location below, and verify the
+detached PGP signature using your PGP utility.
+
+[FreeBSD 11.0]
+# fetch https://security.FreeBSD.org/patches/EN-16:20/tzdata-11.0.patch
+# fetch https://security.FreeBSD.org/patches/EN-16:20/tzdata-11.0.patch.asc
+# gpg --verify tzdata-11.0.patch.asc
+
+[FreeBSD 10.3]
+# fetch https://security.FreeBSD.org/patches/EN-16:20/tzdata-10.3.patch
+# fetch https://security.FreeBSD.org/patches/EN-16:20/tzdata-10.3.patch.asc
+# gpg --verify tzdata-10.3.patch.asc
+
+[FreeBSD 10.2]
+# fetch https://security.FreeBSD.org/patches/EN-16:20/tzdata-10.2.patch
+# fetch https://security.FreeBSD.org/patches/EN-16:20/tzdata-10.2.patch.asc
+# gpg --verify tzdata-10.2.patch.asc
+
+[FreeBSD 10.1]
+# fetch https://security.FreeBSD.org/patches/EN-16:20/tzdata-10.1.patch
+# fetch https://security.FreeBSD.org/patches/EN-16:20/tzdata-10.1.patch.asc
+# gpg --verify tzdata-10.1.patch.asc
+
+[FreeBSD 9.3]
+# fetch https://security.FreeBSD.org/patches/EN-16:20/tzdata-9.3.patch
+# fetch https://security.FreeBSD.org/patches/EN-16:20/tzdata-9.3.patch.asc
+# gpg --verify tzdata-9.3.patch.asc
+
+b) Apply the patch.  Execute the following commands as root:
+
+# cd /usr/src
+# patch < /path/to/patch
+
+c) Recompile the operating system using buildworld and installworld as
+described in <URL:https://www.FreeBSD.org/handbook/makeworld.html>.
+
+Restart all the affected applications and daemons, or reboot the system.
+
+VI.  Correction details
+
+The following list contains the correction revision numbers for each
+affected branch.
+
+Branch/path                                                      Revision
+- -------------------------------------------------------------------------
+stable/9/                                                         r308302
+releng/9.3/                                                       r309568
+stable/10/                                                        r308302
+releng/10.1/                                                      r309574
+releng/10.2/                                                      r309576
+releng/10.3/                                                      r309577
+stable/11/                                                        r308302
+releng/11.0/                                                      r309583
+- -------------------------------------------------------------------------
+
+To see which files were modified by a particular revision, run the
+following command, replacing NNNNNN with the revision number, on a
+machine with Subversion installed:
+
+# svn diff -cNNNNNN --summarize svn://svn.freebsd.org/base
+
+Or visit the following URL, replacing NNNNNN with the revision number:
+
+<URL:https://svnweb.freebsd.org/base?view=revision&revision=NNNNNN>
+
+The latest revision of this advisory is available at
+<URL:https://security.FreeBSD.org/advisories/FreeBSD-EN-16:20.tzdata.asc>
+-----BEGIN PGP SIGNATURE-----
+
+iQIcBAEBCgAGBQJYRw1qAAoJEO1n7NZdz2rnGCwQALsF2A+HnuJMUsbVUXfLCa92
+zzId31hBC039WwyAjsSeYO1GjKu/KRfsjV4yzJ9uArLBsx+wRRltMeuoMgl4P/z4
+huqh9huQJaRACPdgPoGfrPZItbKeo63sAOzMpBa0Z9TBaxN8NzTCAkcFt+iFM/Oi
+eQaGH3JlfASFwIRN+CIlVhhUwfufsXf5KI5Vk2k3CmF88n5uQCUwybwckZYp2Cl5
+vHGJh5wkyh/pkZ3W4NljQdRXQYkosj27IIaAym4RCQnQgOlJYRxxEJWMw631EFRw
+PIUgDfOcLKwG1e2V9XF0TnyKXvj7Uwt8lSUNyGUmfiBAdrWiSzfbL81+puKYzwOY
+wisSNnEXpXBBhAMSVvWvt91o/Oe4HxJ7ZAT4w9FlUjbaJ3ahPh3phb9VPBXPuHhT
+IJ+mWoEG3atQafJCPAwNmuIXh4V+Vo0UyimCrNBqWNOMqepyto93sdlYYcYhV/Bg
+zhOWxbSObKPhoLrsaIKVRVVEvTeotDEZKNgKu6U+twaBv5JMnyUdlqQKfxYfmzAR
+4N8YwFFSwrYiSVfGVBOM62AicSICNBxvzzb0xrvEw8c2KYbNv+MnE7/sQ/Wd/aR2
+t6PJIwYk7hAPSFmKLNf3ebYaTuybCyYWjYmzpplcRxBF9MuHxdd8bGuVvo/ZK1Jv
+Lb0DmoBUk7O77KJxeqTI
+=Pj/k
+-----END PGP SIGNATURE-----

Property changes on: user/gjb/releng-rewrite/share/security/advisories/FreeBSD-EN-16:20.tzdata.asc
___________________________________________________________________
Added: fbsd:nokeywords
## -0,0 +1 ##
+yes
\ No newline at end of property
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Added: svn:mime-type
## -0,0 +1 ##
+text/plain
\ No newline at end of property
Index: user/gjb/releng-rewrite/share/security/advisories/FreeBSD-EN-16:21.localedef.asc
===================================================================
--- user/gjb/releng-rewrite/share/security/advisories/FreeBSD-EN-16:21.localedef.asc	(nonexistent)
+++ user/gjb/releng-rewrite/share/security/advisories/FreeBSD-EN-16:21.localedef.asc	(revision 49725)
@@ -0,0 +1,132 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA512
+
+=============================================================================
+FreeBSD-EN-16:21.localedef                                      Errata Notice
+                                                          The FreeBSD Project
+
+Topic:          Incorrectly defined unicode character(s)
+
+Category:       core
+Module:         localedef
+Announced:      2016-12-06
+Credits:        
+Affects:        FreeBSD 11.0
+Corrected:      2016-11-05 09:46:48 UTC (stable/11, 11.0-STABLE)
+                2016-12-06 00:09:52 UTC (releng/11.0, 11.0-RELEASE-p4)
+
+For general information regarding FreeBSD Errata Notices and Security
+Advisories, including descriptions of the fields above, security
+branches, and the following sections, please visit
+<URL:https://security.FreeBSD.org/>.
+
+I.   Background
+
+The localedef(1) utility converts source definitions for locale categories
+into a format usable by the functions and utilities whose operational
+behavior is determined by the setting of the locale environment variables.
+
+II.  Problem Description
+
+When compiling character class definitions, localedef(1) may incorrectly
+coalesce non-consecutive ranges, so that unused codepoints located in a
+gap between two ranges of characters belonging to a same class will be
+included in that class.
+
+III. Impact
+
+Some Unicode codepoints that are reserved for later use may be reported as
+valid by the ctype(3) / wctype(3) functions.  Incorrect classification may
+result in input validation errors.
+
+IV.  Workaround
+
+No workaround is available.
+
+V.   Solution
+
+Perform one of the following:
+
+1) Upgrade your system to a supported FreeBSD stable or release / security
+branch (releng) dated after the correction date.
+
+2) To update your system via a binary patch:
+
+Systems running a RELEASE version of FreeBSD on the i386 or amd64
+platforms can be updated via the freebsd-update(8) utility:
+
+# freebsd-update fetch
+# freebsd-update install
+
+Restart all daemons that are running with unicode locale, or reboot the
+system.
+
+3) To update your system via a source code patch:
+
+The following patches have been verified to apply to the applicable
+FreeBSD release branches.
+
+a) Download the relevant patch from the location below, and verify the
+detached PGP signature using your PGP utility.
+
+# fetch https://security.FreeBSD.org/patches/EN-16:21/localedef.patch
+# fetch https://security.FreeBSD.org/patches/EN-16:21/localedef.patch.asc
+# gpg --verify localedef.patch.asc
+
+b) Apply the patch.  Execute the following commands as root:
+
+# cd /usr/src
+# patch < /path/to/patch
+
+c) Recompile the operating system using buildworld and installworld as
+described in <URL:https://www.FreeBSD.org/handbook/makeworld.html>.
+
+Note that rebuilding the localedef(1) utility only isn't enough to
+fix already installed locales on your system.
+
+Restart all daemons that are running with unicode locale, or reboot the
+system.
+
+VI.  Correction details
+
+The following list contains the correction revision numbers for each
+affected branch.
+
+Branch/path                                                      Revision
+- -------------------------------------------------------------------------
+stable/11/                                                        r308330
+releng/11.0/                                                      r309584
+- -------------------------------------------------------------------------
+
+To see which files were modified by a particular revision, run the
+following command, replacing NNNNNN with the revision number, on a
+machine with Subversion installed:
+
+# svn diff -cNNNNNN --summarize svn://svn.freebsd.org/base
+
+Or visit the following URL, replacing NNNNNN with the revision number:
+
+<URL:https://svnweb.freebsd.org/base?view=revision&revision=NNNNNN>
+
+VII. References
+
+<URL:https://bugs.freebsd.org/bugzilla/show_bug.cgi?id=213013>
+
+The latest revision of this advisory is available at
+<URL:https://security.FreeBSD.org/advisories/FreeBSD-EN-16:21.localedef.asc>
+-----BEGIN PGP SIGNATURE-----
+
+iQIcBAEBCgAGBQJYRw1tAAoJEO1n7NZdz2rn+l8QAKBNhMxJ4Gkqh/B8EwU0MR/v
+flI0pOWEnxSyzGdMgL8KFng1YXCp77SlSp+uG5ASNBbJDroEVGQ2LcDQWEsr2QfE
+I6a7xLNXx5l3ytiR50/eZRyIhWt7/aLzrtYvabJckvxkZCUZ8Itolvha7gu8HGk/
+Is5chXNQxOAYXOjJuiOY99o6oe9tXqGA+eKBkyjOyEUoYK0D402fkPaXvEajmYqD
+ynS2N72zmyNp9ZT6d/UWwCPBr7VM9yXgx9cYhYBwxlYBfOeAAHIfjG6LULGyr+7Y
+tDj+Q+1I1vEE3OtsnLeGFJw21sPZtnXVM4Dmly4OJoSngYrM+mb8DY96QGqAgRjh
+5G4EqxIKUQQsoiCmqfFSy9zT2o0RHLjfCvMgBJS4jznijsY6YufodmG6P2Px+yMw
+vW4PeCravUvCjMtJTfYDMoyxW1068m8JZk2X2ehDMCLh6gk8ytJn9z/E1TpEzEiM
+5coP//KPmBQFrgYkSmj2FH1fuWCrU6Cw5JrWhATgw8+GLi5r42r44BQ5mj3rW8rz
+5VVugAht06hR9jmkH8+c/OEOkhyrnU+Psvk9YfqN4yn5Etoa03taZw/L0UHRk0M1
+vb/krFMtbGBeh4XOH4N8YJ+jaO2pw1bLIBKpdGB6fSgyHuN5vNhi0eO3NOy7HSuh
+hEh9Vaqvzd8mefLV653c
+=XdaZ
+-----END PGP SIGNATURE-----

Property changes on: user/gjb/releng-rewrite/share/security/advisories/FreeBSD-EN-16:21.localedef.asc
___________________________________________________________________
Added: fbsd:nokeywords
## -0,0 +1 ##
+yes
\ No newline at end of property
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Added: svn:mime-type
## -0,0 +1 ##
+text/plain
\ No newline at end of property
Index: user/gjb/releng-rewrite/share/security/advisories/FreeBSD-SA-16:36.telnetd.asc
===================================================================
--- user/gjb/releng-rewrite/share/security/advisories/FreeBSD-SA-16:36.telnetd.asc	(nonexistent)
+++ user/gjb/releng-rewrite/share/security/advisories/FreeBSD-SA-16:36.telnetd.asc	(revision 49725)
@@ -0,0 +1,157 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA512
+
+=============================================================================
+FreeBSD-SA-16:36.telnetd                                    Security Advisory
+                                                          The FreeBSD Project
+
+Topic:          Possible login(1) argument injection in telnetd(8)
+
+Category:       core
+Module:         telnetd
+Announced:      2016-12-06
+Credits:        Brooks Davis (sponsored by: DARPA, AFRL)
+Affects:        All supported versions of FreeBSD.
+Corrected:      2016-12-06 18:52:02 UTC (stable/11, 11.0-STABLE)
+                2016-12-06 18:49:38 UTC (releng/11.0, 11.0-RELEASE-p4)
+                2016-12-06 18:52:18 UTC (stable/10, 10.3-STABLE)
+                2016-12-06 18:49:48 UTC (releng/10.3, 10.3-RELEASE-p13)
+                2016-12-06 18:49:54 UTC (releng/10.2, 10.2-RELEASE-p26)
+                2016-12-06 18:49:59 UTC (releng/10.1, 10.1-RELEASE-p43)
+                2016-12-06 18:52:33 UTC (stable/9, 9.3-STABLE)
+                2016-12-06 18:50:06 UTC (releng/9.3, 9.3-RELEASE-p51)
+CVE Name:       CVE-2016-1888
+
+For general information regarding FreeBSD Security Advisories,
+including descriptions of the fields above, security branches, and the
+following sections, please visit <URL:https://security.FreeBSD.org/>.
+
+I.   Background
+
+The FreeBSD telnet daemon, telnetd(8), implements the server side of the
+TELNET virtual terminal protocol.  It has been disabled by default in
+FreeBSD since August 2001, and due to the lack of cryptographic security
+in the TELNET protocol, it is strongly recommended that the SSH protocol
+be used instead.  The FreeBSD telnet daemon can be enabled via the
+/etc/inetd.conf configuration file and the inetd(8) daemon.
+
+After a user is connected, telnetd executes the login(1) program or a
+similar program specified by the -p <loginprog> argument.  In order to do
+so, it constructs an array of command line arguments which are passed to
+execv(3).
+
+II.  Problem Description
+
+An unexpected sequence of memory allocation failures combined with
+insufficient error checking could result in the construction and
+execution of an argument sequence that was not intended.
+
+III. Impact
+
+An attacker who controls the sequence of memory allocation failures and
+success may cause login(1) to run without authentication and may be able
+to cause misbehavior of login(1) replacements.
+
+No practical way of controlling these memory allocation failures is
+known at this time.
+
+IV.  Workaround
+
+No workaround is available, but systems not running the telnet daemon
+are not vulnerable.
+
+Note that the telnet daemon is usually run via inetd, and consequently
+will not show up in a process listing unless a connection is currently
+active; to determine if it is enabled, run
+
+$ ps ax | grep telnetd | grep -v grep
+$ grep telnetd /etc/inetd.conf | grep -vE '^#'
+
+If any output is produced, your system may be vulnerable.
+
+V.   Solution
+
+Perform one of the following:
+
+1) Upgrade your vulnerable system to a supported FreeBSD stable or
+release / security branch (releng) dated after the correction date.
+
+2) To update your vulnerable system via a binary patch:
+
+Systems running a RELEASE version of FreeBSD on the i386 or amd64
+platforms can be updated via the freebsd-update(8) utility:
+
+# freebsd-update fetch
+# freebsd-update install
+
+3) To update your vulnerable system via a source code patch:
+
+The following patches have been verified to apply to the applicable
+FreeBSD release branches.
+
+a) Download the relevant patch from the location below, and verify the
+detached PGP signature using your PGP utility.
+
+# fetch https://security.FreeBSD.org/patches/SA-16:36/telnetd.patch
+# fetch https://security.FreeBSD.org/patches/SA-16:36/telnetd.patch.asc
+# gpg --verify telnetd.patch.asc
+
+b) Apply the patch.  Execute the following commands as root:
+
+# cd /usr/src
+# patch < /path/to/patch
+
+c) Recompile the operating system using buildworld and installworld as
+described in <URL:https://www.FreeBSD.org/handbook/makeworld.html>.
+
+Kill any running telnetd processes, or reboot the system.
+
+VI.  Correction details
+
+The following list contains the correction revision numbers for each
+affected branch.
+
+Branch/path                                                      Revision
+- -------------------------------------------------------------------------
+stable/9/                                                         r309643
+releng/9.3/                                                       r309637
+stable/10/                                                        r309642
+releng/10.1/                                                      r309636
+releng/10.2/                                                      r309635
+releng/10.3/                                                      r309634
+stable/11/                                                        r309641
+releng/11.0/                                                      r309633
+- -------------------------------------------------------------------------
+
+To see which files were modified by a particular revision, run the
+following command, replacing NNNNNN with the revision number, on a
+machine with Subversion installed:
+
+# svn diff -cNNNNNN --summarize svn://svn.freebsd.org/base
+
+Or visit the following URL, replacing NNNNNN with the revision number:
+
+<URL:https://svnweb.freebsd.org/base?view=revision&revision=NNNNNN>
+
+VII. References
+
+<URL:https://cve.mitre.org/cgi-bin/cvename.cgi?name=CVE-2016-1888>
+
+The latest revision of this advisory is available at
+<URL:https://security.FreeBSD.org/advisories/FreeBSD-SA-16:36.telnetd.asc>
+-----BEGIN PGP SIGNATURE-----
+
+iQIcBAEBCgAGBQJYRw1uAAoJEO1n7NZdz2rnUC0P/3R7UoeNFknnYEXs25NnTS3h
+oDZnGEbLloqQC4mAtPsC2v9WdSRh318J7UMOpko+uYlvxwsJe9TXRgUwP24atdtJ
+a0Al8BvbmIHckIxG7cFJ6Xsw5NDXBgHo2JWBgdU2xvRafZYvFmjlGyxGrvg6Ok0s
+LCz+cnOwni+J4R0CUHTb7eyoeW4HYsg5bVBnzmDwdqQTiig4PsIBVSu+VbOM8kTT
+u7JCzxibzwm9TE0orxDBsY60//hbJRMm12SXj+tVJS3w+qK2iY+Aq02llyTqlGHd
+Tpz4++d9UlS5QSPnu42ev/wzfPDZoxhbb5yciEUDSZA7vG5RD0pCfxfOf+8zORXA
+PLp8XRrl76DJonULUjtNPo8xE3gFOztbUZyTFpxChXUPzZGp0oPRQgTIBTMEPejH
+jC7O5ic0q7aA8UcQk5tqn6lNS6eK6z2UoKGYN4qCjTlC18s1u9dPwHzeSAzjg5YF
+fHX0t/MB8zJ5ts0pUs6OTMOu6umrP4SUJF9hpACFG16vzjJ1S573tuPr9L4HMNCv
+XTX9kjcFwmHqpbrFYW38Fk90x14TT3tigi+xYvCruS1XQeLQM48ThgYAdEboGJvT
+8LGVI8rbwjaglrEk670RlnWVKQInqtPBmbV/GXL9AtE4zzsTHXDT/7iJ30pb4RJq
+rA+cnK1Bog6FHCWGTxjF
+=uYUg
+-----END PGP SIGNATURE-----

Property changes on: user/gjb/releng-rewrite/share/security/advisories/FreeBSD-SA-16:36.telnetd.asc
___________________________________________________________________
Added: fbsd:nokeywords
## -0,0 +1 ##
+yes
\ No newline at end of property
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Added: svn:mime-type
## -0,0 +1 ##
+text/plain
\ No newline at end of property
Index: user/gjb/releng-rewrite/share/security/advisories/FreeBSD-SA-16:37.libc.asc
===================================================================
--- user/gjb/releng-rewrite/share/security/advisories/FreeBSD-SA-16:37.libc.asc	(nonexistent)
+++ user/gjb/releng-rewrite/share/security/advisories/FreeBSD-SA-16:37.libc.asc	(revision 49725)
@@ -0,0 +1,156 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA512
+
+=============================================================================
+FreeBSD-SA-16:37.libc                                       Security Advisory
+                                                          The FreeBSD Project
+
+Topic:          link_ntoa(3) buffer overflow 
+
+Category:       core
+Module:         libc
+Announced:      2016-12-06, revised on 2016-12-08
+Affects:        All supported versions of FreeBSD.
+Corrected:      2016-12-07 23:19:46 UTC (stable/11, 11.0-STABLE)
+                2016-12-07 23:29:42 UTC (releng/11.0, 11.0-RELEASE-p5)
+                2016-12-07 23:20:26 UTC (stable/10, 10.3-STABLE)
+                2016-12-07 23:31:07 UTC (releng/10.3, 10.3-RELEASE-p14)
+                2016-12-07 23:32:42 UTC (releng/10.2, 10.2-RELEASE-p27)
+                2016-12-07 23:34:06 UTC (releng/10.1, 10.1-RELEASE-p44)
+                2016-12-07 23:20:50 UTC (stable/9, 9.3-STABLE)
+                2016-12-07 23:35:15 UTC (releng/9.3, 9.3-RELEASE-p52)
+CVE Name:       CVE-2016-6559
+
+For general information regarding FreeBSD Security Advisories,
+including descriptions of the fields above, security branches, and the
+following sections, please visit <URL:https://security.FreeBSD.org/>.
+
+0.   Revision history.
+
+v1.0  2016-12-06 Initial release.
+v1.1  2016-12-08 Revised patches to address regressions.
+
+I.   Background
+
+The link_ntoa(3) function generates ASCII representation of a link-level
+address and is avaliable as part of standard C library (libc).
+
+II.  Problem Description
+
+A specially crafted argument can trigger a static buffer overflow in the
+library, with possibility to rewrite following static buffers that belong to
+other library functions.
+
+III. Impact
+
+Due to very limited use of the function in the existing applications,
+and limited length of the overflow, exploitation of the vulnerability
+does not seem feasible.  None of the utilities and daemons in the base
+system are known to be vulnerable.  However, careful review of third
+party software that may use the function was not performed.
+
+IV.  Workaround
+
+No workaround is available.
+
+V.   Solution
+
+Perform one of the following:
+
+1) Upgrade your vulnerable system to a supported FreeBSD stable or
+release / security branch (releng) dated after the correction date.
+
+2) To update your vulnerable system via a binary patch:
+
+Systems running a RELEASE version of FreeBSD on the i386 or amd64
+platforms can be updated via the freebsd-update(8) utility:
+
+# freebsd-update fetch
+# freebsd-update install
+
+Restart all daemons that use the library, or reboot the system.
+
+3) To update your vulnerable system via a source code patch:
+
+The following patches have been verified to apply to the applicable
+FreeBSD release branches.
+
+a) Download the relevant patch from the location below, and verify the
+detached PGP signature using your PGP utility.
+
+[*** v1.1 NOTE ***] If your sources are not yet patched using the initially
+published patch, then you need to apply libc.patch.  If your sources are
+already updated, or patched with patch from the initial advisory, then you
+need to apply the incremental patch, named libc-inc.patch.
+
+[FreeBSD system, not patched with initial SA-16:37 patch]
+# fetch https://security.FreeBSD.org/patches/SA-16:37/libc.patch
+# fetch https://security.FreeBSD.org/patches/SA-16:37/libc.patch.asc
+# gpg --verify libc.patch.asc
+
+[FreeBSD system, initial SA-16:37 patch already applied]
+# fetch https://security.FreeBSD.org/patches/SA-16:37/libc-inc.patch
+# fetch https://security.FreeBSD.org/patches/SA-16:37/libc-inc.patch.asc
+# gpg --verify libc-inc.patch.asc
+
+b) Apply the patch.  Execute the following commands as root:
+
+# cd /usr/src
+# patch < /path/to/patch
+
+c) Recompile the operating system using buildworld and installworld as
+described in <URL:https://www.FreeBSD.org/handbook/makeworld.html>.
+
+Restart all daemons that use the library, or reboot the system.
+
+VI.  Correction details
+
+The following list contains the correction revision numbers for each
+affected branch.
+
+Branch/path                                                      Revision
+- -------------------------------------------------------------------------
+stable/9/                                                         r309691
+releng/9.3/                                                       r309697
+stable/10/                                                        r309690
+releng/10.1/                                                      r309696
+releng/10.2/                                                      r309694
+releng/10.3/                                                      r309693
+stable/11/                                                        r309689
+releng/11.0/                                                      r309692
+- -------------------------------------------------------------------------
+
+To see which files were modified by a particular revision, run the
+following command, replacing NNNNNN with the revision number, on a
+machine with Subversion installed:
+
+# svn diff -cNNNNNN --summarize svn://svn.freebsd.org/base
+
+Or visit the following URL, replacing NNNNNN with the revision number:
+
+<URL:https://svnweb.freebsd.org/base?view=revision&revision=NNNNNN>
+
+VII. References
+
+<URL:http://www.kb.cert.org/vuls/id/548487>
+<URL:https://cve.mitre.org/cgi-bin/cvename.cgi?name=CVE-2016-6559>
+<URL:https://bugs.freebsd.org/bugzilla/show_bug.cgi?id=215105>
+
+The latest revision of this advisory is available at
+<URL:https://security.FreeBSD.org/advisories/FreeBSD-SA-16:37.libc.asc>
+-----BEGIN PGP SIGNATURE-----
+
+iQIcBAEBCgAGBQJYSNoxAAoJEO1n7NZdz2rnQfQP/0oJ8WdTTVMpjEHRBQ7WbayB
+f7Y8MeVFErNLL8caQDxRyiF/ex07m5m2morik84ggDTkHiWnllaP0H3MadivP9Ly
+XspViMU73r49PmYTAsrMARyW2ncufgGpsvaEcVOVKEAiwcm0ATu7gnTf+cyrfWoe
+k9HlTS18bN18zQ/FFSJPjmIsTh8Cb+cdF6SrVEt7bIcoVzZWMU/sDJP9JDnRFa3+
+o7bWDQg3kfA8k3XEzrL9FSO52Sr9jNslZGAaycFFQjxecgC/05mTbqPsJOpdhkaC
+mfcARX/8+iwxsE/3h7R5OK6vsu6piUE6vi8HsnTwK7ZMz/IYkPpe4C9WroRYAG29
+mqBl+qdVElk/DXPgsz6F7PHqG3SUY3Kkn/bMGT4B3yLjNvWs4+pjh74uyvVLPKkQ
+meQEs3VLl+c0VkpAxbieMS1KChJwBAKAD7Cevg83YfosC8/LFRoqS6kofjXjVqCd
+dd0cSWyOE6y/eFy2187lncnz1BNW1Eg8AEH02vEkXOI5hrnhmO6t0cH9dQcj3nHa
+6yULqFHJJJGsGqPD1/FkXjn7hAMKsMMROCGpY0txNVA2a3Z6zf593nZL7Vr1nPy7
+7C7/sKToSilR3OJGoSFxNlRHqkgb08dQOzsof/355M94baKw82QAULuQoOBYu0DU
+PZ21bNtGfZSN4rThyVuQ
+=Id1+
+-----END PGP SIGNATURE-----

Property changes on: user/gjb/releng-rewrite/share/security/advisories/FreeBSD-SA-16:37.libc.asc
___________________________________________________________________
Added: fbsd:nokeywords
## -0,0 +1 ##
+yes
\ No newline at end of property
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Added: svn:mime-type
## -0,0 +1 ##
+text/plain
\ No newline at end of property
Index: user/gjb/releng-rewrite/share/security/advisories/FreeBSD-SA-16:38.bhyve.asc
===================================================================
--- user/gjb/releng-rewrite/share/security/advisories/FreeBSD-SA-16:38.bhyve.asc	(nonexistent)
+++ user/gjb/releng-rewrite/share/security/advisories/FreeBSD-SA-16:38.bhyve.asc	(revision 49725)
@@ -0,0 +1,143 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA512
+
+=============================================================================
+FreeBSD-SA-16:38.bhyve                                      Security Advisory
+                                                          The FreeBSD Project
+
+Topic:          bhyve(8) virtual machine escape
+
+Category:       core
+Module:         bhyve
+Announced:      2016-12-06
+Credits:        Felix Wilhelm
+Affects:	FreeBSD 10.x, FreeBSD 11.0
+Corrected:      2016-12-06 18:54:43 UTC (stable/11, 11.0-STABLE)
+                2016-12-06 18:49:38 UTC (releng/11.0, 11.0-RELEASE-p4)
+                2016-12-06 18:55:01 UTC (stable/10, 10.3-STABLE)
+                2016-12-06 18:49:48 UTC (releng/10.3, 10.3-RELEASE-p13)
+                2016-12-06 18:49:54 UTC (releng/10.2, 10.2-RELEASE-p26)
+                2016-12-06 18:49:59 UTC (releng/10.1, 10.1-RELEASE-p43)
+CVE Name:       CVE-2016-1889
+
+For general information regarding FreeBSD Security Advisories,
+including descriptions of the fields above, security branches, and the
+following sections, please visit <URL:https://security.FreeBSD.org/>.
+
+I.   Background
+
+bhyve(8) is a hypervisor that supports running a variety of virtual
+machines (guests).
+
+II.  Problem Description
+
+The bounds checking of accesses to guest memory greater than 4GB by
+device emulations is subject to integer overflow.
+
+III. Impact
+
+For a bhyve virtual machine with more than 3GB of guest memory configured,
+a malicious guest could craft device descriptors that could give it access
+to the heap of the bhyve process.  Since the bhyve process is running as root,
+this may allow guests to obtain full control of the hosts they're running on.
+
+IV.  Workaround
+
+No workaround is available, however, systems not using bhyve(8) for
+virtualization are not vulnerable. Additionally, systems using bhyve(8) with
+3GB or less of configured guest memory are not vulnerable.
+
+V.   Solution
+
+Upgrade your vulnerable system to a supported FreeBSD stable or
+release / security branch (releng) dated after the correction date.
+
+No reboot is needed.  Rather the bhyve(8) process for vulnerable virtual
+machines should be restarted.
+
+Perform one of the following:
+
+1) Upgrade your vulnerable system to a supported FreeBSD stable or
+release / security branch (releng) dated after the correction date.
+
+2) To update your vulnerable system via a binary patch:
+
+Systems running a RELEASE version of FreeBSD on the amd64
+platform can be updated via the freebsd-update(8) utility:
+
+# freebsd-update fetch
+# freebsd-update install
+
+3) To update your vulnerable system via a source code patch:
+
+The following patches have been verified to apply to the applicable
+FreeBSD release branches.
+
+a) Download the relevant patch from the location below, and verify the
+detached PGP signature using your PGP utility.
+
+[FreeBSD 11.0, FreeBSD 10.3]
+# fetch https://security.FreeBSD.org/patches/SA-16:38/bhyve.patch
+# fetch https://security.FreeBSD.org/patches/SA-16:38/bhyve.patch.asc
+# gpg --verify bhyve.patch.asc
+
+[FreeBSD 10.2, FreeBSD 10.1]
+# fetch https://security.FreeBSD.org/patches/SA-16:38/bhyve-10.patch
+# fetch https://security.FreeBSD.org/patches/SA-16:38/bhyve-10.patch.asc
+# gpg --verify bhyve-10.patch.asc
+
+b) Apply the patch.  Execute the following commands as root:
+
+# cd /usr/src
+# patch < /path/to/patch
+
+Recompile the operating system using buildworld and installworld as
+described in <URL:https://www.FreeBSD.org/handbook/makeworld.html>.
+
+VI.  Correction details
+
+The following list contains the correction revision numbers for each
+affected branch.
+
+Branch/path                                                      Revision
+- -------------------------------------------------------------------------
+stable/10/                                                        r309648
+releng/10.1/                                                      r309636
+releng/10.2/                                                      r309635
+releng/10.3/                                                      r309634
+stable/11/                                                        r309647
+releng/11.0/                                                      r309633
+- -------------------------------------------------------------------------
+
+To see which files were modified by a particular revision, run the
+following command, replacing NNNNNN with the revision number, on a
+machine with Subversion installed:
+
+# svn diff -cNNNNNN --summarize svn://svn.freebsd.org/base
+
+Or visit the following URL, replacing NNNNNN with the revision number:
+
+<URL:https://svnweb.freebsd.org/base?view=revision&revision=NNNNNN>
+
+VII. References
+
+<URL:https://cve.mitre.org/cgi-bin/cvename.cgi?name=CVE-2016-1889>
+
+The latest revision of this advisory is available at
+<URL:https://security.FreeBSD.org/advisories/FreeBSD-SA-16:38.bhyve.asc>
+-----BEGIN PGP SIGNATURE-----
+
+iQIcBAEBCgAGBQJYRw1wAAoJEO1n7NZdz2rnepoP/1b6uXh8BFW8Qi9cVyfUkldC
+aRfAdmE3azyJCwTY2cipIA+qp9SJUxnLf1lPicERIPZY6iiC6Zm1Qi+cfwCvgczu
+ksY9aYOM7/v1jKuUrPf7tJZ5OokRzkL8W2uCKqAn2BODBK1mA4yy8yGthgyCT6bH
+JzvINPnlQzJKHCdp/8goRVITxa+kMF7UBbpPDAkHuBNKKNRLOYb50Z9G7BZp9/u6
+/Y8avPVCOnU7WKDehG6FgyfE0Z+pUw6dAgpYNblsdQc148xGCSoHyHjXIX1jHzCv
+ZChUhj+6m7CQkjh/GG6x1Bz1lCcsIgsnPAAuQC0WqsaQRnUWJXjTyPMHwkxIHlD7
+sFGPdM4RdMI0O95xMm9Dy05baNsAtBr6DExd48jFv/qbUio9FhUNUJ5rfQEAnyp2
+aAZL34rd90KPFn5zp8EhskOPWGJp7lr+5FpV1m85R07qRES9875eWWYUW5H+yZK+
+kwUcRKiYyvAFTx7Ag38pCtH4SVZ4zRV0mBZnOvchNosMSJz+tZYxApaXHY/nBJck
+wCr+v4DlB9x4LKt9CnB1ow+YqVsMuPyXwyj4e9Pyw/zkvW1aA/TJeUonmm1c2vI4
+07b64wnTsvLGgbhN2ei8LPtAEwpN/DBn7D098Zwf4CfCGQ2VZQeC5AjyTSX9bvy/
+WnKlRTDLDrFSpAD/1/Dz
+=ts3q
+-----END PGP SIGNATURE-----

Property changes on: user/gjb/releng-rewrite/share/security/advisories/FreeBSD-SA-16:38.bhyve.asc
___________________________________________________________________
Added: fbsd:nokeywords
## -0,0 +1 ##
+yes
\ No newline at end of property
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Added: svn:mime-type
## -0,0 +1 ##
+text/plain
\ No newline at end of property
Index: user/gjb/releng-rewrite/share/security/patches/EN-16:19/tzcode.patch
===================================================================
--- user/gjb/releng-rewrite/share/security/patches/EN-16:19/tzcode.patch	(nonexistent)
+++ user/gjb/releng-rewrite/share/security/patches/EN-16:19/tzcode.patch	(revision 49725)
@@ -0,0 +1,70 @@
+--- contrib/tzcode/zic/zdump.c.orig
++++ contrib/tzcode/zic/zdump.c
+@@ -212,24 +212,16 @@
+ 		return;
+ 	cp = abbrp;
+ 	wp = NULL;
+-	while (isascii((unsigned char) *cp) && isalpha((unsigned char) *cp))
++	while (isascii((unsigned char) *cp) &&
++		(isalnum((unsigned char)*cp) || *cp == '-' || *cp == '+'))
+ 		++cp;
+-	if (cp - abbrp == 0)
+-		wp = _("lacks alphabetic at start");
+-	else if (cp - abbrp < 3)
+-		wp = _("has fewer than 3 alphabetics");
++	if (cp - abbrp < 3)
++		wp = _("has fewer than 3 characters");
+ 	else if (cp - abbrp > 6)
+-		wp = _("has more than 6 alphabetics");
+-	if (wp == NULL && (*cp == '+' || *cp == '-')) {
+-		++cp;
+-		if (isascii((unsigned char) *cp) &&
+-			isdigit((unsigned char) *cp))
+-				if (*cp++ == '1' && *cp >= '0' && *cp <= '4')
+-					++cp;
+-		if (*cp != '\0')
+-			wp = _("differs from POSIX standard");
+-	}
+-	if (wp == NULL)
++		wp = _("has more than 6 characters");
++	else if (*cp)
++		wp = "has characters other than ASCII alphanumerics, '-' or '+'";
++	else
+ 		return;
+ 	(void) fflush(stdout);
+ 	(void) fprintf(stderr,
+--- contrib/tzcode/zic/zic.c.orig
++++ contrib/tzcode/zic/zic.c
+@@ -2615,29 +2615,15 @@
+ 		register const char *	cp;
+ 		register char *		wp;
+ 
+-		/*
+-		** Want one to ZIC_MAX_ABBR_LEN_WO_WARN alphabetics
+-		** optionally followed by a + or - and a number from 1 to 14.
+-		*/
+ 		cp = string;
+ 		wp = NULL;
+ 		while (isascii((unsigned char) *cp) &&
+-			isalpha((unsigned char) *cp))
++			(isalnum((unsigned char)*cp) || *cp == '-' || *cp == '+'))
+ 				++cp;
+-		if (cp - string == 0)
+-wp = _("time zone abbreviation lacks alphabetic at start");
+ 		if (noise && cp - string > 3)
+-wp = _("time zone abbreviation has more than 3 alphabetics");
++wp = _("time zone abbreviation has more than 3 characters");
+ 		if (cp - string > ZIC_MAX_ABBR_LEN_WO_WARN)
+-wp = _("time zone abbreviation has too many alphabetics");
+-		if (wp == NULL && (*cp == '+' || *cp == '-')) {
+-			++cp;
+-			if (isascii((unsigned char) *cp) &&
+-				isdigit((unsigned char) *cp))
+-					if (*cp++ == '1' &&
+-						*cp >= '0' && *cp <= '4')
+-							++cp;
+-		}
++wp = _("time zone abbreviation has too many characters");
+ 		if (*cp != '\0')
+ wp = _("time zone abbreviation differs from POSIX standard");
+ 		if (wp != NULL) {

Property changes on: user/gjb/releng-rewrite/share/security/patches/EN-16:19/tzcode.patch
___________________________________________________________________
Added: fbsd:nokeywords
## -0,0 +1 ##
+yes
\ No newline at end of property
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Added: svn:mime-type
## -0,0 +1 ##
+text/plain
\ No newline at end of property
Index: user/gjb/releng-rewrite/share/security/patches/EN-16:19/tzcode.patch.asc
===================================================================
--- user/gjb/releng-rewrite/share/security/patches/EN-16:19/tzcode.patch.asc	(nonexistent)
+++ user/gjb/releng-rewrite/share/security/patches/EN-16:19/tzcode.patch.asc	(revision 49725)
@@ -0,0 +1,16 @@
+-----BEGIN PGP SIGNATURE-----
+
+iQIcBAABCgAGBQJYRw1pAAoJEO1n7NZdz2rn52EP/itjGSb9xqDAmCNvcNxFgPvJ
+fBZ+bBre8eh908lmMbnLJvXRmz/wTxljqmt+6dHwsoAPDo+FGLudZyWTrA2dqTZm
+fPu8GBTtFlynmwAqXjNePTk+Z4EcqkY1ZwyNuJuOVtnsOpqTb9gTRDlNyrVwcz19
+IlUUJuylCC7hf7v51nheVXY799EywUYznKqPfsfTp0qRxQfwvi1dku1nbCc/dR+/
+qjLhFzl58yjiprpnWxUsU+SJKie2svsM9UEg62aZgs7ZWXZ2RP7QP4rSrwJSf5x1
+6NI7PUM17HqQK1peG8pwwoeeKjP7r1kbFY5udGHY/KWrtLg/0U2erENScUvv8RkJ
+8Dl8FMdWUpoWd3/Xs/W82b0r0sEVDS65JPZJNYy2iMegZUHji6+y1i4UUywhXtoj
+5GU0p1voD8g+6JmP90NC7w2mg7UgYvBovW9osKH5s01CntG+XmWoQLwCCHWJwK9G
+Uan949xMT5VoaUn9UyXhLQ9xAD5mUTkNRy8JFbUjblBR6Rrk1mdHdhZq6I3pQ/3i
+QSsH44cyrVLCZ3j0AeITPZDtvN8Iw34D8yM0uTenRXWTRdzQEEFBoxwl7QBGD3I6
+Og9lZJ5J53GCx37vyMmyb+FHaMjZnWFBMUDnrNfK0eImlEXjSH797Iz7JAlDEv2e
+jSrQ0ZFzbbUgMN9f1xxj
+=DGoh
+-----END PGP SIGNATURE-----

Property changes on: user/gjb/releng-rewrite/share/security/patches/EN-16:19/tzcode.patch.asc
___________________________________________________________________
Added: fbsd:nokeywords
## -0,0 +1 ##
+yes
\ No newline at end of property
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Added: svn:mime-type
## -0,0 +1 ##
+text/plain
\ No newline at end of property
Index: user/gjb/releng-rewrite/share/security/patches/EN-16:20/tzdata-10.1.patch
===================================================================
--- user/gjb/releng-rewrite/share/security/patches/EN-16:20/tzdata-10.1.patch	(nonexistent)
+++ user/gjb/releng-rewrite/share/security/patches/EN-16:20/tzdata-10.1.patch	(revision 49725)
@@ -0,0 +1,15859 @@
+--- contrib/tzdata/CONTRIBUTING.orig
++++ contrib/tzdata/CONTRIBUTING
+@@ -0,0 +1,73 @@
++Contributing to the tz code and data
++
++The time zone database is by no means authoritative: governments
++change timekeeping rules erratically and sometimes with little
++warning, the data entries do not cover all of civil time before
++1970, and undoubtedly errors remain in the code and data.  Feel
++free to fill gaps or fix mistakes, and please email improvements
++to tz@iana.org for use in the future.
++
++To email small changes, please run a POSIX shell command like
++'diff -u old/europe new/europe >myfix.patch', and attach
++myfix.patch to the email.
++
++For more-elaborate changes, please read the Theory file and browse
++the mailing list archives <http://mm.icann.org/pipermail/tz/> for
++examples of patches that tend to work well.  Ideally, additions to
++data should contain commentary citing reliable sources as
++justification.
++
++Please submit changes against either the latest release in
++<ftp://ftp.iana.org/tz/> or the master branch of the experimental
++Git repository.  If you use Git the following workflow may be helpful:
++
++  * Copy the experimental repository.
++
++      git clone https://github.com/eggert/tz.git
++      cd tz
++
++  * Get current with the master branch.
++
++      git checkout master
++      git pull
++
++  * Switch to a new branch for the changes.  Choose a different
++    branch name for each change set.
++
++      git checkout -b mybranch
++
++  * Edit source files.  Include commentary that justifies the
++    changes by citing reliable sources.
++
++  * Debug the changes, e.g.:
++
++      make check
++      make install
++      ./zdump -v America/Los_Angeles
++
++  * For each separable change, commit it in the new branch, e.g.:
++
++      git add northamerica
++      git commit
++
++    See recent 'git log' output for the commit-message style.
++
++  * Create patch files 0001-*, 0002-*, ...
++
++      git format-patch master
++
++  * After reviewing the patch files, send the patches to tz@iana.org
++    for others to review.
++
++      git send-email master
++
++  * Start anew by getting current with the master branch again
++    (the second step above).
++
++Please do not create issues or pull requests on GitHub, as the
++proper procedure for proposing and distributing patches is via
++email as illustrated above.
++
++-----
++
++This file is in the public domain.
+--- contrib/tzdata/LICENSE.orig
++++ contrib/tzdata/LICENSE
+@@ -0,0 +1,4 @@
++With a few exceptions, all files in the tz code and data (including
++this one) are in the public domain.  The exceptions are date.c,
++newstrftime.3, and strftime.c, which contain material derived from BSD
++and which use the BSD 3-clause license.
+--- contrib/tzdata/Makefile.orig
++++ contrib/tzdata/Makefile
+@@ -0,0 +1,793 @@
++# This file is in the public domain, so clarified as of
++# 2009-05-17 by Arthur David Olson.
++
++# Package name for the code distribution.
++PACKAGE=	tzcode
++
++# Version number for the distribution, overridden in the 'tarballs' rule below.
++VERSION=	unknown
++
++# Email address for bug reports.
++BUGEMAIL=	tz@iana.org
++
++# Change the line below for your time zone (after finding the zone you want in
++# the time zone files, or adding it to a time zone file).
++# Alternately, if you discover you've got the wrong time zone, you can just
++#	zic -l rightzone
++# to correct things.
++# Use the command
++#	make zonenames
++# to get a list of the values you can use for LOCALTIME.
++
++LOCALTIME=	GMT
++
++# If you want something other than Eastern United States time as a template
++# for handling POSIX-style time zone environment variables,
++# change the line below (after finding the zone you want in the
++# time zone files, or adding it to a time zone file).
++# (When a POSIX-style environment variable is handled, the rules in the
++# template file are used to determine "spring forward" and "fall back" days and
++# times; the environment variable itself specifies UT offsets of standard and
++# summer time.)
++# Alternately, if you discover you've got the wrong time zone, you can just
++#	zic -p rightzone
++# to correct things.
++# Use the command
++#	make zonenames
++# to get a list of the values you can use for POSIXRULES.
++# If you want POSIX compatibility, use "America/New_York".
++
++POSIXRULES=	America/New_York
++
++# Also see TZDEFRULESTRING below, which takes effect only
++# if the time zone files cannot be accessed.
++
++# Everything gets put in subdirectories of. . .
++
++TOPDIR=		/usr/local
++
++# "Compiled" time zone information is placed in the "TZDIR" directory
++# (and subdirectories).
++# Use an absolute path name for TZDIR unless you're just testing the software.
++
++TZDIR_BASENAME=	zoneinfo
++TZDIR=		$(TOPDIR)/etc/$(TZDIR_BASENAME)
++
++# Types to try, as an alternative to time_t.  int64_t should be first.
++TIME_T_ALTERNATIVES= int64_t int32_t uint32_t uint64_t
++
++# The "tzselect", "zic", and "zdump" commands get installed in. . .
++
++ETCDIR=		$(TOPDIR)/etc
++
++# If you "make INSTALL", the "date" command gets installed in. . .
++
++BINDIR=		$(TOPDIR)/bin
++
++# Manual pages go in subdirectories of. . .
++
++MANDIR=		$(TOPDIR)/man
++
++# Library functions are put in an archive in LIBDIR.
++
++LIBDIR=		$(TOPDIR)/lib
++
++# If you always want time values interpreted as "seconds since the epoch
++# (not counting leap seconds)", use
++#	REDO=		posix_only
++# below.  If you always want right time values interpreted as "seconds since
++# the epoch" (counting leap seconds)", use
++#	REDO=		right_only
++# below.  If you want both sets of data available, with leap seconds not
++# counted normally, use
++#	REDO=		posix_right
++# below.  If you want both sets of data available, with leap seconds counted
++# normally, use
++#	REDO=		right_posix
++# below.  POSIX mandates that leap seconds not be counted; for compatibility
++# with it, use "posix_only" or "posix_right".
++
++REDO=		posix_right
++
++# If you want out-of-scope and often-wrong data from the file 'backzone', use
++#	PACKRATDATA=	backzone
++# To omit this data, use
++#	PACKRATDATA=
++
++PACKRATDATA=
++
++# Since "." may not be in PATH...
++
++YEARISTYPE=	./yearistype
++
++# Non-default libraries needed to link.
++LDLIBS=
++
++# Add the following to the end of the "CFLAGS=" line as needed.
++#  -DBIG_BANG=-9999999LL if the Big Bang occurred at time -9999999 (see zic.c)
++#  -DHAVE_DECL_ASCTIME_R=0 if <time.h> does not declare asctime_r
++#  -DHAVE_DIRECT_H if mkdir needs <direct.h> (MS-Windows)
++#  -DHAVE_DOS_FILE_NAMES if file names have drive specifiers etc. (MS-DOS)
++#  -DHAVE_GETTEXT=1 if 'gettext' works (e.g., GNU/Linux, FreeBSD, Solaris)
++#  -DHAVE_INCOMPATIBLE_CTIME_R=1 if your system's time.h declares
++#	ctime_r and asctime_r incompatibly with the POSIX standard
++#	(Solaris when _POSIX_PTHREAD_SEMANTICS is not defined).
++#  -DHAVE_INTTYPES_H=1 if you have a pre-C99 compiler with "inttypes.h"
++#  -DHAVE_LINK=0 if your system lacks a link function
++#  -DHAVE_LOCALTIME_R=0 if your system lacks a localtime_r function
++#  -DHAVE_LOCALTIME_RZ=0 if you do not want zdump to use localtime_rz
++#	This defaults to 1 if a working localtime_rz seems to be available.
++#	localtime_rz can make zdump significantly faster, but is nonstandard.
++#  -DHAVE_POSIX_DECLS=0 if your system's include files do not declare
++#	functions like 'link' or variables like 'tzname' required by POSIX
++#  -DHAVE_STDINT_H=1 if you have a pre-C99 compiler with "stdint.h"
++#  -DHAVE_STRFTIME_L=1 if <time.h> declares locale_t and strftime_l
++#	This defaults to 0 if _POSIX_VERSION < 200809, 1 otherwise.
++#  -DHAVE_STRDUP=0 if your system lacks the strdup function
++#  -DHAVE_SYMLINK=0 if your system lacks the symlink function
++#  -DHAVE_SYS_STAT_H=0 if your compiler lacks a "sys/stat.h"
++#  -DHAVE_SYS_WAIT_H=0 if your compiler lacks a "sys/wait.h"
++#  -DHAVE_TZSET=0 if your system lacks a tzset function
++#  -DHAVE_UNISTD_H=0 if your compiler lacks a "unistd.h" (Microsoft C++ 7?)
++#  -DEPOCH_LOCAL=1 if the 'time' function returns local time not UT
++#  -DEPOCH_OFFSET=N if the 'time' function returns a value N greater
++#	than what POSIX specifies, assuming local time is UT.
++#	For example, N is 252460800 on AmigaOS.
++#  -DNO_RUN_TIME_WARNINGS_ABOUT_YEAR_2000_PROBLEMS_THANK_YOU=1
++#	if you do not want run time warnings about formats that may cause
++#	year 2000 grief
++#  -Dssize_t=long on ancient hosts that lack ssize_t
++#  -DTHREAD_SAFE=1 to make localtime.c thread-safe, as POSIX requires;
++#	not needed by the main-program tz code, which is single-threaded.
++#	Append other compiler flags as needed, e.g., -pthread on GNU/Linux.
++#  -Dtime_tz=\"T\" to use T as the time_t type, rather than the system time_t
++#  -DTZ_DOMAIN=\"foo\" to use "foo" for gettext domain name; default is "tz"
++#  -DTZ_DOMAINDIR=\"/path\" to use "/path" for gettext directory;
++#	the default is system-supplied, typically "/usr/lib/locale"
++#  -DTZDEFRULESTRING=\",date/time,date/time\" to default to the specified
++#	DST transitions if the time zone files cannot be accessed
++#  -DUNINIT_TRAP=1 if reading uninitialized storage can cause problems
++#	other than simply getting garbage data
++#  -DUSE_LTZ=0 to build zdump with the system time zone library
++#	Also set TZDOBJS=zdump.o and CHECK_TIME_T_ALTERNATIVES= below.
++#  -DZIC_MAX_ABBR_LEN_WO_WARN=3
++#	(or some other number) to set the maximum time zone abbreviation length
++#	that zic will accept without a warning (the default is 6)
++#  $(GCC_DEBUG_FLAGS) if you are using recent GCC and want lots of checking
++GCC_DEBUG_FLAGS = -Dlint -g3 -O3 -fno-common -fstrict-aliasing \
++	-Wall -Wextra \
++	-Wbad-function-cast -Wcast-align -Wdate-time \
++	-Wdeclaration-after-statement \
++	-Wdouble-promotion \
++	-Wformat=2 -Winit-self -Wjump-misses-init \
++	-Wlogical-op -Wmissing-prototypes -Wnested-externs \
++	-Wold-style-definition -Woverlength-strings -Wpointer-arith \
++	-Wshadow -Wstrict-prototypes -Wsuggest-attribute=const \
++	-Wsuggest-attribute=format -Wsuggest-attribute=noreturn \
++	-Wsuggest-attribute=pure -Wtrampolines \
++	-Wunused -Wwrite-strings \
++	-Wno-address -Wno-format-nonliteral -Wno-sign-compare \
++	-Wno-type-limits -Wno-unused-parameter
++#
++# If you want to use System V compatibility code, add
++#	-DUSG_COMPAT
++# to the end of the "CFLAGS=" line.  This arrange for "timezone" and "daylight"
++# variables to be kept up-to-date by the time conversion functions.  Neither
++# "timezone" nor "daylight" is described in X3J11's work.
++#
++# If your system has a "GMT offset" field in its "struct tm"s
++# (or if you decide to add such a field in your system's "time.h" file),
++# add the name to a define such as
++#	-DTM_GMTOFF=tm_gmtoff
++# to the end of the "CFLAGS=" line.  If not defined, the code attempts to
++# guess TM_GMTOFF from other macros; define NO_TM_GMTOFF to suppress this.
++# Similarly, if your system has a "zone abbreviation" field, define
++#	-DTM_ZONE=tm_zone
++# and define NO_TM_ZONE to suppress any guessing.  These two fields are not
++# required by POSIX, but are widely available on GNU/Linux and BSD systems.
++#
++# If you want functions that were inspired by early versions of X3J11's work,
++# add
++#	-DSTD_INSPIRED
++# to the end of the "CFLAGS=" line.  This arranges for the functions
++# "tzsetwall", "offtime", "timelocal", "timegm", "timeoff",
++# "posix2time", and "time2posix" to be added to the time conversion library.
++# "tzsetwall" is like "tzset" except that it arranges for local wall clock
++# time (rather than the time specified in the TZ environment variable)
++# to be used.
++# "offtime" is like "gmtime" except that it accepts a second (long) argument
++# that gives an offset to add to the time_t when converting it.
++# "timelocal" is equivalent to "mktime".
++# "timegm" is like "timelocal" except that it turns a struct tm into
++# a time_t using UT (rather than local time as "timelocal" does).
++# "timeoff" is like "timegm" except that it accepts a second (long) argument
++# that gives an offset to use when converting to a time_t.
++# "posix2time" and "time2posix" are described in an included manual page.
++# X3J11's work does not describe any of these functions.
++# Sun has provided "tzsetwall", "timelocal", and "timegm" in SunOS 4.0.
++# These functions may well disappear in future releases of the time
++# conversion package.
++#
++# If you don't want functions that were inspired by NetBSD, add
++#	-DNETBSD_INSPIRED=0
++# to the end of the "CFLAGS=" line.  Otherwise, the functions
++# "localtime_rz", "mktime_z", "tzalloc", and "tzfree" are added to the
++# time library, and if STD_INSPIRED is also defined the functions
++# "posix2time_z" and "time2posix_z" are added as well.
++# The functions ending in "_z" (or "_rz") are like their unsuffixed
++# (or suffixed-by-"_r") counterparts, except with an extra first
++# argument of opaque type timezone_t that specifies the time zone.
++# "tzalloc" allocates a timezone_t value, and "tzfree" frees it.
++#
++# If you want to allocate state structures in localtime, add
++#	-DALL_STATE
++# to the end of the "CFLAGS=" line.  Storage is obtained by calling malloc.
++#
++# If you want an "altzone" variable (a la System V Release 3.1), add
++#	-DALTZONE
++# to the end of the "CFLAGS=" line.
++# This variable is not described in X3J11's work.
++#
++# NIST-PCTS:151-2, Version 1.4, (1993-12-03) is a test suite put
++# out by the National Institute of Standards and Technology
++# which claims to test C and Posix conformance.  If you want to pass PCTS, add
++#	-DPCTS
++# to the end of the "CFLAGS=" line.
++#
++# If you want strict compliance with XPG4 as of 1994-04-09, add
++#	-DXPG4_1994_04_09
++# to the end of the "CFLAGS=" line.  This causes "strftime" to always return
++# 53 as a week number (rather than 52 or 53) for those days in January that
++# before the first Monday in January when a "%V" format is used and January 1
++# falls on a Friday, Saturday, or Sunday.
++
++CFLAGS=
++
++# Linker flags.  Default to $(LFLAGS) for backwards compatibility
++# to release 2012h and earlier.
++
++LDFLAGS=	$(LFLAGS)
++
++# For leap seconds, this Makefile uses LEAPSECONDS='-L leapseconds' in
++# submake command lines.  The default is no leap seconds.
++
++LEAPSECONDS=
++
++# The zic command and its arguments.
++
++zic=		./zic
++ZIC=		$(zic) $(ZFLAGS)
++
++ZFLAGS=
++
++# How to use zic to install tz binary files.
++
++ZIC_INSTALL=	$(ZIC) -y $(YEARISTYPE) -d $(DESTDIR)$(TZDIR) $(LEAPSECONDS)
++
++# The name of a Posix-compliant 'awk' on your system.
++AWK=		awk
++
++# The full path name of a Posix-compliant shell, preferably one that supports
++# the Korn shell's 'select' statement as an extension.
++# These days, Bash is the most popular.
++# It should be OK to set this to /bin/sh, on platforms where /bin/sh
++# lacks 'select' or doesn't completely conform to Posix, but /bin/bash
++# is typically nicer if it works.
++KSHELL=		/bin/bash
++
++# The path where SGML DTDs are kept and the catalog file(s) to use when
++# validating.  The default should work on both Debian and Red Hat.
++SGML_TOPDIR= /usr
++SGML_DTDDIR= $(SGML_TOPDIR)/share/xml/w3c-sgml-lib/schema/dtd
++SGML_SEARCH_PATH= $(SGML_DTDDIR)/REC-html401-19991224
++SGML_CATALOG_FILES= \
++  $(SGML_TOPDIR)/share/doc/w3-recs/html/www.w3.org/TR/1999/REC-html401-19991224/HTML4.cat:$(SGML_TOPDIR)/share/sgml/html/4.01/HTML4.cat
++
++# The name, arguments and environment of a program to validate your web pages.
++# See <http://openjade.sourceforge.net/doc/> for a validator, and
++# <https://validator.w3.org/source/> for a validation library.
++VALIDATE = nsgmls
++VALIDATE_FLAGS = -s -B -wall -wno-unused-param
++VALIDATE_ENV = \
++  SGML_CATALOG_FILES=$(SGML_CATALOG_FILES) \
++  SGML_SEARCH_PATH=$(SGML_SEARCH_PATH) \
++  SP_CHARSET_FIXED=YES \
++  SP_ENCODING=UTF-8
++
++# This expensive test requires USE_LTZ.
++# To suppress it, define this macro to be empty.
++CHECK_TIME_T_ALTERNATIVES = check_time_t_alternatives
++
++# SAFE_CHAR is a regular expression that matches a safe character.
++# Some parts of this distribution are limited to safe characters;
++# others can use any UTF-8 character.
++# For now, the safe characters are a safe subset of ASCII.
++# The caller must set the shell variable 'sharp' to the character '#',
++# since Makefile macros cannot contain '#'.
++# TAB_CHAR is a single tab character, in single quotes.
++TAB_CHAR=	'	'
++SAFE_CHARSET1=	$(TAB_CHAR)' !\"'$$sharp'$$%&'\''()*+,./0123456789:;<=>?@'
++SAFE_CHARSET2=	'ABCDEFGHIJKLMNOPQRSTUVWXYZ[\\^_`'
++SAFE_CHARSET3=	'abcdefghijklmnopqrstuvwxyz{|}~'
++SAFE_CHARSET=	$(SAFE_CHARSET1)$(SAFE_CHARSET2)$(SAFE_CHARSET3)
++SAFE_CHAR=	'[]'$(SAFE_CHARSET)'-]'
++
++# OK_CHAR matches any character allowed in the distributed files.
++# This is the same as SAFE_CHAR, except that multibyte letters are
++# also allowed so that commentary can contain people's names and quote
++# non-English sources.  For non-letters the sources are limited to
++# ASCII renderings for the convenience of maintainers whose text editors
++# mishandle UTF-8 by default (e.g., XEmacs 21.4.22).
++OK_CHAR=	'[][:alpha:]'$(SAFE_CHARSET)'-]'
++
++# SAFE_LINE matches a line of safe characters.
++# SAFE_SHARP_LINE is similar, except any OK character can follow '#';
++# this is so that comments can contain non-ASCII characters.
++# OK_LINE matches a line of OK characters.
++SAFE_LINE=	'^'$(SAFE_CHAR)'*$$'
++SAFE_SHARP_LINE='^'$(SAFE_CHAR)'*('$$sharp$(OK_CHAR)'*)?$$'
++OK_LINE=	'^'$(OK_CHAR)'*$$'
++
++# Flags to give 'tar' when making a distribution.
++# Try to use flags appropriate for GNU tar.
++GNUTARFLAGS= --numeric-owner --owner=0 --group=0 --mode=go+u,go-w --sort=name
++TARFLAGS=	`if tar $(GNUTARFLAGS) --version >/dev/null 2>&1; \
++		 then echo $(GNUTARFLAGS); \
++		 else :; \
++		 fi`
++
++# Flags to give 'gzip' when making a distribution.
++GZIPFLAGS=	-9n
++
++###############################################################################
++
++#MAKE=		make
++
++cc=		cc
++CC=		$(cc) -DTZDIR=\"$(TZDIR)\"
++
++AR=		ar
++
++# ':' on typical hosts; 'ranlib' on the ancient hosts that still need ranlib.
++RANLIB=		:
++
++TZCOBJS=	zic.o
++TZDOBJS=	zdump.o localtime.o asctime.o
++DATEOBJS=	date.o localtime.o strftime.o asctime.o
++LIBSRCS=	localtime.c asctime.c difftime.c
++LIBOBJS=	localtime.o asctime.o difftime.o
++HEADERS=	tzfile.h private.h
++NONLIBSRCS=	zic.c zdump.c
++NEWUCBSRCS=	date.c strftime.c
++SOURCES=	$(HEADERS) $(LIBSRCS) $(NONLIBSRCS) $(NEWUCBSRCS) \
++			tzselect.ksh workman.sh
++MANS=		newctime.3 newstrftime.3 newtzset.3 time2posix.3 \
++			tzfile.5 tzselect.8 zic.8 zdump.8
++MANTXTS=	newctime.3.txt newstrftime.3.txt newtzset.3.txt \
++			time2posix.3.txt \
++			tzfile.5.txt tzselect.8.txt zic.8.txt zdump.8.txt \
++			date.1.txt
++COMMON=		CONTRIBUTING LICENSE Makefile NEWS README Theory version
++WEB_PAGES=	tz-art.htm tz-how-to.html tz-link.htm
++DOCS=		$(MANS) date.1 $(MANTXTS) $(WEB_PAGES)
++PRIMARY_YDATA=	africa antarctica asia australasia \
++		europe northamerica southamerica
++YDATA=		$(PRIMARY_YDATA) pacificnew etcetera backward
++NDATA=		systemv factory
++TDATA=		$(YDATA) $(NDATA)
++ZONETABLES=	zone1970.tab zone.tab
++TABDATA=	iso3166.tab leapseconds $(ZONETABLES)
++LEAP_DEPS=	leapseconds.awk leap-seconds.list
++DATA=		$(YDATA) $(NDATA) backzone $(TABDATA) \
++			leap-seconds.list yearistype.sh
++AWK_SCRIPTS=	checklinks.awk checktab.awk leapseconds.awk
++MISC=		$(AWK_SCRIPTS) zoneinfo2tdf.pl
++TZS_YEAR=	2050
++TZS=		to$(TZS_YEAR).tzs
++TZS_NEW=	to$(TZS_YEAR)new.tzs
++TZS_DEPS=	$(PRIMARY_YDATA) asctime.c localtime.c \
++			private.h tzfile.h zdump.c zic.c
++ENCHILADA=	$(COMMON) $(DOCS) $(SOURCES) $(DATA) $(MISC) $(TZS)
++
++# Consult these files when deciding whether to rebuild the 'version' file.
++# This list is not the same as the output of 'git ls-files', since
++# .gitignore is not distributed.
++VERSION_DEPS= \
++		CONTRIBUTING LICENSE Makefile NEWS README Theory \
++		africa antarctica asctime.c asia australasia \
++		backward backzone \
++		checklinks.awk checktab.awk \
++		date.1 date.c difftime.c \
++		etcetera europe factory iso3166.tab \
++		leap-seconds.list leapseconds.awk localtime.c \
++		newctime.3 newstrftime.3 newtzset.3 northamerica \
++		pacificnew private.h \
++		southamerica strftime.c systemv \
++		time2posix.3 tz-art.htm tz-how-to.html tz-link.htm \
++		tzfile.5 tzfile.h tzselect.8 tzselect.ksh \
++		workman.sh yearistype.sh \
++		zdump.8 zdump.c zic.8 zic.c \
++		zone.tab zone1970.tab zoneinfo2tdf.pl
++
++# And for the benefit of csh users on systems that assume the user
++# shell should be used to handle commands in Makefiles. . .
++
++SHELL=		/bin/sh
++
++all:		tzselect yearistype zic zdump libtz.a $(TABDATA)
++
++ALL:		all date $(ENCHILADA)
++
++install:	all $(DATA) $(REDO) $(MANS)
++		mkdir -p $(DESTDIR)$(ETCDIR) $(DESTDIR)$(TZDIR) \
++			$(DESTDIR)$(LIBDIR) \
++			$(DESTDIR)$(MANDIR)/man3 $(DESTDIR)$(MANDIR)/man5 \
++			$(DESTDIR)$(MANDIR)/man8
++		$(ZIC_INSTALL) -l $(LOCALTIME) -p $(POSIXRULES)
++		cp -f iso3166.tab $(ZONETABLES) $(DESTDIR)$(TZDIR)/.
++		cp tzselect zic zdump $(DESTDIR)$(ETCDIR)/.
++		cp libtz.a $(DESTDIR)$(LIBDIR)/.
++		$(RANLIB) $(DESTDIR)$(LIBDIR)/libtz.a
++		cp -f newctime.3 newtzset.3 $(DESTDIR)$(MANDIR)/man3/.
++		cp -f tzfile.5 $(DESTDIR)$(MANDIR)/man5/.
++		cp -f tzselect.8 zdump.8 zic.8 $(DESTDIR)$(MANDIR)/man8/.
++
++INSTALL:	ALL install date.1
++		mkdir -p $(DESTDIR)$(BINDIR) $(DESTDIR)$(MANDIR)/man1
++		cp date $(DESTDIR)$(BINDIR)/.
++		cp -f date.1 $(DESTDIR)$(MANDIR)/man1/.
++
++version:	$(VERSION_DEPS)
++		{ (type git) >/dev/null 2>&1 && \
++		  V=`git describe --match '[0-9][0-9][0-9][0-9][a-z]*' \
++				--abbrev=7 --dirty` || \
++		  V=$(VERSION); } && \
++		printf '%s\n' "$$V" >$@.out
++		mv $@.out $@
++
++version.h:	version
++		VERSION=`cat version` && printf '%s\n' \
++		  'static char const PKGVERSION[]="($(PACKAGE)) ";' \
++		  "static char const TZVERSION[]=\"$$VERSION\";" \
++		  'static char const REPORT_BUGS_TO[]="$(BUGEMAIL)";' \
++		  >$@.out
++		mv $@.out $@
++
++zdump:		$(TZDOBJS)
++		$(CC) -o $@ $(CFLAGS) $(LDFLAGS) $(TZDOBJS) $(LDLIBS)
++
++zic:		$(TZCOBJS)
++		$(CC) -o $@ $(CFLAGS) $(LDFLAGS) $(TZCOBJS) $(LDLIBS)
++
++yearistype:	yearistype.sh
++		cp yearistype.sh yearistype
++		chmod +x yearistype
++
++leapseconds:	$(LEAP_DEPS)
++		$(AWK) -f leapseconds.awk leap-seconds.list >$@.out
++		mv $@.out $@
++
++# Arguments to pass to submakes of install_data.
++# They can be overridden by later submake arguments.
++INSTALLARGS = \
++ DESTDIR=$(DESTDIR) \
++ LEAPSECONDS='$(LEAPSECONDS)' \
++ PACKRATDATA='$(PACKRATDATA)' \
++ TZDIR=$(TZDIR) \
++ YEARISTYPE=$(YEARISTYPE) \
++ ZIC='$(ZIC)'
++
++# 'make install_data' installs one set of tz binary files.
++# It can be tailored by setting LEAPSECONDS, PACKRATDATA, etc.
++install_data:	zic leapseconds yearistype $(PACKRATDATA) $(TDATA)
++		$(ZIC_INSTALL) $(TDATA)
++		$(AWK) '/^Rule/' $(TDATA) | $(ZIC_INSTALL) - $(PACKRATDATA)
++
++posix_only:
++		$(MAKE) $(INSTALLARGS) LEAPSECONDS= install_data
++
++right_only:
++		$(MAKE) $(INSTALLARGS) LEAPSECONDS='-L leapseconds' \
++			install_data
++
++# In earlier versions of this makefile, the other two directories were
++# subdirectories of $(TZDIR).  However, this led to configuration errors.
++# For example, with posix_right under the earlier scheme,
++# TZ='right/Australia/Adelaide' got you localtime with leap seconds,
++# but gmtime without leap seconds, which led to problems with applications
++# like sendmail that subtract gmtime from localtime.
++# Therefore, the other two directories are now siblings of $(TZDIR).
++# You must replace all of $(TZDIR) to switch from not using leap seconds
++# to using them, or vice versa.
++right_posix:	right_only
++		rm -fr $(DESTDIR)$(TZDIR)-leaps
++		ln -s $(TZDIR_BASENAME) $(DESTDIR)$(TZDIR)-leaps || \
++		  $(MAKE) $(INSTALLARGS) TZDIR=$(TZDIR)-leaps right_only
++		$(MAKE) $(INSTALLARGS) TZDIR=$(TZDIR)-posix posix_only
++
++posix_right:	posix_only
++		rm -fr $(DESTDIR)$(TZDIR)-posix
++		ln -s $(TZDIR_BASENAME) $(DESTDIR)$(TZDIR)-posix || \
++		  $(MAKE) $(INSTALLARGS) TZDIR=$(TZDIR)-posix posix_only
++		$(MAKE) $(INSTALLARGS) TZDIR=$(TZDIR)-leaps right_only
++
++# This obsolescent rule is present for backwards compatibility with
++# tz releases 2014g through 2015g.  It should go away eventually.
++posix_packrat:
++		$(MAKE) $(INSTALLARGS) PACKRATDATA=backzone posix_only
++
++zones:		$(REDO)
++
++$(TZS_NEW):	$(TDATA) zdump zic
++		mkdir -p tzs.dir
++		$(zic) -d tzs.dir $(TDATA)
++		$(AWK) '/^Link/{print $$1 "\t" $$2 "\t" $$3}' \
++		   $(TDATA) | LC_ALL=C sort >$@.out
++		wd=`pwd` && \
++		zones=`$(AWK) -v wd="$$wd" \
++				'/^Zone/{print wd "/tzs.dir/" $$2}' $(TDATA) \
++			 | LC_ALL=C sort` && \
++		./zdump -i -c $(TZS_YEAR) $$zones >>$@.out
++		sed 's,^TZ=".*tzs\.dir/,TZ=",' $@.out >$@.sed.out
++		rm -fr tzs.dir $@.out
++		mv $@.sed.out $@
++
++# If $(TZS) does not already exist (e.g., old-format tarballs), create it.
++# If it exists but 'make check_tzs' fails, a maintainer should inspect the
++# failed output and fix the inconsistency, perhaps by running 'make force_tzs'.
++$(TZS):
++		$(MAKE) force_tzs
++
++force_tzs:	$(TZS_NEW)
++		cp $(TZS_NEW) $(TZS)
++
++libtz.a:	$(LIBOBJS)
++		$(AR) ru $@ $(LIBOBJS)
++		$(RANLIB) $@
++
++date:		$(DATEOBJS)
++		$(CC) -o $@ $(CFLAGS) $(LDFLAGS) $(DATEOBJS) $(LDLIBS)
++
++tzselect:	tzselect.ksh version
++		VERSION=`cat version` && sed \
++			-e 's|#!/bin/bash|#!$(KSHELL)|g' \
++			-e 's|AWK=[^}]*|AWK=$(AWK)|g' \
++			-e 's|\(PKGVERSION\)=.*|\1='\''($(PACKAGE)) '\''|' \
++			-e 's|\(REPORT_BUGS_TO\)=.*|\1=$(BUGEMAIL)|' \
++			-e 's|TZDIR=[^}]*|TZDIR=$(TZDIR)|' \
++			-e 's|\(TZVERSION\)=.*|\1='"$$VERSION"'|' \
++			<$@.ksh >$@.out
++		chmod +x $@.out
++		mv $@.out $@
++
++check:		check_character_set check_white_space check_links check_sorted \
++		  check_tables check_tzs check_web
++
++check_character_set: $(ENCHILADA)
++		LC_ALL=en_US.utf8 && export LC_ALL && \
++		sharp='#' && \
++		! grep -Env $(SAFE_LINE) $(MANS) date.1 $(MANTXTS) \
++			$(MISC) $(SOURCES) $(WEB_PAGES) \
++			CONTRIBUTING LICENSE Makefile README version && \
++		! grep -Env $(SAFE_SHARP_LINE) $(TDATA) backzone \
++			leapseconds yearistype.sh zone.tab && \
++		! grep -Env $(OK_LINE) $(ENCHILADA)
++
++check_white_space: $(ENCHILADA)
++		patfmt=' \t|[\f\r\v]' && pat=`printf "$$patfmt\\n"` && \
++		! grep -En "$$pat" $(ENCHILADA)
++		! grep -n '[[:space:]]$$' $(ENCHILADA)
++
++CHECK_CC_LIST = { n = split($$1,a,/,/); for (i=2; i<=n; i++) print a[1], a[i]; }
++
++check_sorted: backward backzone iso3166.tab zone.tab zone1970.tab
++		$(AWK) '/^Link/ {print $$3}' backward | LC_ALL=C sort -cu
++		$(AWK) '/^Zone/ {print $$2}' backzone | LC_ALL=C sort -cu
++		$(AWK) '/^[^#]/ {print $$1}' iso3166.tab | LC_ALL=C sort -cu
++		$(AWK) '/^[^#]/ {print $$1}' zone.tab | LC_ALL=C sort -c
++		$(AWK) '/^[^#]/ {print substr($$0, 1, 2)}' zone1970.tab | \
++		  LC_ALL=C sort -c
++		$(AWK) '/^[^#]/ $(CHECK_CC_LIST)' zone1970.tab | \
++		  LC_ALL=C sort -cu
++
++check_links:	checklinks.awk $(TDATA)
++		$(AWK) -f checklinks.awk $(TDATA)
++
++check_tables:	checktab.awk $(PRIMARY_YDATA) $(ZONETABLES)
++		for tab in $(ZONETABLES); do \
++		  $(AWK) -f checktab.awk -v zone_table=$$tab $(PRIMARY_YDATA) \
++		    || exit; \
++		done
++
++check_tzs:	$(TZS) $(TZS_NEW)
++		diff -u $(TZS) $(TZS_NEW)
++
++check_web:	$(WEB_PAGES)
++		$(VALIDATE_ENV) $(VALIDATE) $(VALIDATE_FLAGS) $(WEB_PAGES)
++
++clean_misc:
++		rm -f core *.o *.out \
++		  date tzselect version.h zdump zic yearistype libtz.a
++clean:		clean_misc
++		rm -fr *.dir tzdb-*/ $(TZS_NEW)
++
++maintainer-clean: clean
++		@echo 'This command is intended for maintainers to use; it'
++		@echo 'deletes files that may need special tools to rebuild.'
++		rm -f leapseconds version $(MANTXTS) $(TZS) *.asc *.tar.*
++
++names:
++		@echo $(ENCHILADA)
++
++public:		check check_public $(CHECK_TIME_T_ALTERNATIVES) \
++		tarballs signatures
++
++date.1.txt:	date.1
++newctime.3.txt:	newctime.3
++newstrftime.3.txt: newstrftime.3
++newtzset.3.txt:	newtzset.3
++time2posix.3.txt: time2posix.3
++tzfile.5.txt:	tzfile.5
++tzselect.8.txt:	tzselect.8
++zdump.8.txt:	zdump.8
++zic.8.txt:	zic.8
++
++$(MANTXTS):	workman.sh
++		LC_ALL=C sh workman.sh `expr $@ : '\(.*\)\.txt$$'` >$@.out
++		mv $@.out $@
++
++# Set the time stamps to those of the git repository, if available,
++# and if the files have not changed since then.
++# This uses GNU 'touch' syntax 'touch -d@N FILE',
++# where N is the number of seconds since 1970.
++# If git or GNU 'touch' is absent, don't bother to sync with git timestamps.
++# Also, set the timestamp of each prebuilt file like 'leapseconds'
++# to be the maximum of the files it depends on.
++set-timestamps.out: $(ENCHILADA)
++		rm -f $@
++		if (type git) >/dev/null 2>&1 && \
++		   files=`git ls-files $(ENCHILADA)` && \
++		   touch -md @1 test.out; then \
++		  rm -f test.out && \
++		  for file in $$files; do \
++		    if git diff --quiet $$file; then \
++		      time=`git log -1 --format='tformat:%ct' $$file` && \
++		      touch -cmd @$$time $$file; \
++		    else \
++		      echo >&2 "$$file: warning: does not match repository"; \
++		    fi || exit; \
++		  done; \
++		fi
++		touch -cmr `ls -t $(LEAP_DEPS) | sed 1q` leapseconds
++		for file in `ls $(MANTXTS) | sed 's/\.txt$$//'`; do \
++		  touch -cmr `ls -t $$file workman.sh | sed 1q` $$file.txt || \
++		    exit; \
++		done
++		touch -cmr `ls -t $(TZS_DEPS) | sed 1q` $(TZS)
++		touch -cmr `ls -t $(VERSION_DEPS) | sed 1q` version
++		touch $@
++
++# The zics below ensure that each data file can stand on its own.
++# We also do an all-files run to catch links to links.
++
++check_public:
++		$(MAKE) maintainer-clean
++		$(MAKE) "CFLAGS=$(GCC_DEBUG_FLAGS)" ALL
++		mkdir -p public.dir
++		for i in $(TDATA) ; do \
++		  $(zic) -v -d public.dir $$i 2>&1 || exit; \
++		done
++		$(zic) -v -d public.dir $(TDATA)
++		rm -fr public.dir
++
++# Check that the code works under various alternative
++# implementations of time_t.
++check_time_t_alternatives:
++		if diff -q Makefile Makefile 2>/dev/null; then \
++		  quiet_option='-q'; \
++		else \
++		  quiet_option=''; \
++		fi && \
++		wd=`pwd` && \
++		zones=`$(AWK) '/^[^#]/ { print $$3 }' <zone1970.tab` && \
++		for type in $(TIME_T_ALTERNATIVES); do \
++		  mkdir -p time_t.dir/$$type && \
++		  $(MAKE) clean_misc && \
++		  $(MAKE) TOPDIR="$$wd/time_t.dir/$$type" \
++		    CFLAGS='$(CFLAGS) -Dtime_tz='"'$$type'" \
++		    REDO='$(REDO)' \
++		    install && \
++		  diff $$quiet_option -r \
++		    time_t.dir/int64_t/etc/zoneinfo \
++		    time_t.dir/$$type/etc/zoneinfo && \
++		  case $$type in \
++		  int32_t) range=-2147483648,2147483647;; \
++		  uint32_t) range=0,4294967296;; \
++		  int64_t) continue;; \
++		  *u*) range=0,10000000000;; \
++		  *) range=-10000000000,10000000000;; \
++		  esac && \
++		  echo checking $$type zones ... && \
++		  time_t.dir/int64_t/etc/zdump -V -t $$range $$zones \
++		      >time_t.dir/int64_t.out && \
++		  time_t.dir/$$type/etc/zdump -V -t $$range $$zones \
++		      >time_t.dir/$$type.out && \
++		  diff -u time_t.dir/int64_t.out time_t.dir/$$type.out \
++		    || exit; \
++		done
++		rm -fr time_t.dir
++
++tarballs traditional_tarballs signatures traditional_signatures: version
++		VERSION=`cat version` && \
++		$(MAKE) VERSION="$$VERSION" $@_version
++
++tarballs_version: traditional_tarballs_version tzdb-$(VERSION).tar.lz
++traditional_tarballs_version: \
++  tzcode$(VERSION).tar.gz tzdata$(VERSION).tar.gz
++signatures_version: traditional_signatures_version tzdb-$(VERSION).tar.lz.asc
++traditional_signatures_version: \
++  tzcode$(VERSION).tar.gz.asc tzdata$(VERSION).tar.gz.asc \
++
++tzcode$(VERSION).tar.gz: set-timestamps.out
++		LC_ALL=C && export LC_ALL && \
++		tar $(TARFLAGS) -cf - \
++		    $(COMMON) $(DOCS) $(SOURCES) | \
++		  gzip $(GZIPFLAGS) >$@.out
++		mv $@.out $@
++
++tzdata$(VERSION).tar.gz: set-timestamps.out
++		LC_ALL=C && export LC_ALL && \
++		tar $(TARFLAGS) -cf - $(COMMON) $(DATA) $(MISC) | \
++		  gzip $(GZIPFLAGS) >$@.out
++		mv $@.out $@
++
++tzdb-$(VERSION).tar.lz: set-timestamps.out
++		rm -fr tzdb-$(VERSION)
++		mkdir tzdb-$(VERSION)
++		ln $(ENCHILADA) tzdb-$(VERSION)
++		touch -cmr `ls -t tzdb-$(VERSION)/* | sed 1q` tzdb-$(VERSION)
++		LC_ALL=C && export LC_ALL && \
++		tar $(TARFLAGS) -cf - tzdb-$(VERSION) | lzip -9 >$@.out
++		mv $@.out $@
++
++tzcode$(VERSION).tar.gz.asc: tzcode$(VERSION).tar.gz
++		gpg --armor --detach-sign $?
++
++tzdata$(VERSION).tar.gz.asc: tzdata$(VERSION).tar.gz
++		gpg --armor --detach-sign $?
++
++tzdb-$(VERSION).tar.lz.asc: tzdb-$(VERSION).tar.lz
++		gpg --armor --detach-sign $?
++
++typecheck:
++		$(MAKE) clean
++		for i in "long long" unsigned; \
++		do \
++			$(MAKE) CFLAGS="-DTYPECHECK -D__time_t_defined -D_TIME_T \"-Dtime_t=$$i\"" ; \
++			./zdump -v Europe/Rome ; \
++			$(MAKE) clean ; \
++		done
++
++zonenames:	$(TDATA)
++		@$(AWK) '/^Zone/ { print $$2 } /^Link/ { print $$3 }' $(TDATA)
++
++asctime.o:	private.h tzfile.h
++date.o:		private.h
++difftime.o:	private.h
++localtime.o:	private.h tzfile.h
++strftime.o:	private.h tzfile.h
++zdump.o:	version.h
++zic.o:		private.h tzfile.h version.h
++
++.KEEP_STATE:
++
++.PHONY: ALL INSTALL all
++.PHONY: check check_character_set check_links
++.PHONY: check_public check_sorted check_tables
++.PHONY: check_time_t_alternatives check_tzs check_web check_white_space
++.PHONY: clean clean_misc force_tzs
++.PHONY: install install_data maintainer-clean names
++.PHONY: posix_only posix_packrat posix_right
++.PHONY: public right_only right_posix signatures signatures_version
++.PHONY: tarballs tarballs_version typecheck
++.PHONY: zonenames zones
++native
+\ No newline at end of property
++FreeBSD=%H
+\ No newline at end of property
++text/plain
+\ No newline at end of property
+--- contrib/tzdata/NEWS.orig
++++ contrib/tzdata/NEWS
+@@ -0,0 +1,3782 @@
++News for the tz database
++
++Release 2016i - 2016-11-01 23:19:52 -0700
++
++  Briefly: Cyprus split into two time zones on 2016-10-30, and Tonga
++  reintroduces DST on 2016-11-06.
++
++  Changes to future time stamps
++
++    Pacific/Tongatapu begins DST on 2016-11-06 at 02:00, ending on
++    2017-01-15 at 03:00.  Assume future observances in Tonga will be
++    from the first Sunday in November through the third Sunday in
++    January, like Fiji.  (Thanks to Pulu ʻAnau.)  Switch to numeric
++    time zone abbreviations for this zone.
++
++  Changes to past and future time stamps
++
++    Northern Cyprus is now +03 year round, causing a split in Cyprus
++    time zones starting 2016-10-30 at 04:00.  This creates a zone
++    Asia/Famagusta.  (Thanks to Even Scharning and Matt Johnson.)
++
++    Antarctica/Casey switched from +08 to +11 on 2016-10-22.
++    (Thanks to Steffen Thorsen.)
++
++  Changes to past time stamps
++
++    Several corrections were made for pre-1975 time stamps in Italy.
++    These affect Europe/Malta, Europe/Rome, Europe/San_Marino, and
++    Europe/Vatican.
++
++    First, the 1893-11-01 00:00 transition in Italy used the new UT
++    offset (+01), not the old (+00:49:56).  (Thanks to Michael
++    Deckers.)
++
++    Second, rules for daylight saving in Italy were changed to agree
++    with Italy's National Institute of Metrological Research (INRiM)
++    except for 1944, as follows (thanks to Pierpaolo Bernardi, Brian
++    Inglis, and Michael Deckers):
++
++      The 1916-06-03 transition was at 24:00, not 00:00.
++
++      The 1916-10-01, 1919-10-05, and 1920-09-19 transitions were at
++      00:00, not 01:00.
++
++      The 1917-09-30 and 1918-10-06 transitions were at 24:00, not
++      01:00.
++
++      The 1944-09-17 transition was at 03:00, not 01:00.  This
++      particular change is taken from Italian law as INRiM's table,
++      (which says 02:00) appears to have a typo here.  Also, keep the
++      1944-04-03 transition for Europe/Rome, as Rome was controlled by
++      Germany then.
++
++      The 1967-1970 and 1972-1974 fallback transitions were at 01:00,
++      not 00:00.
++
++  Changes to code
++
++    The code should now be buildable on AmigaOS merely by setting the
++    appropriate Makefile variables.  (From a patch by Carsten Larsen.)
++
++
++Release 2016h - 2016-10-19 23:17:57 -0700
++
++  Changes to future time stamps
++
++    Asia/Gaza and Asia/Hebron end DST on 2016-10-29 at 01:00, not
++    2016-10-21 at 00:00.  (Thanks to Sharef Mustafa.)  Predict that
++    future fall transitions will be on the last Saturday of October
++    at 01:00, which is consistent with predicted spring transitions
++    on the last Saturday of March.  (Thanks to Tim Parenti.)
++
++  Changes to past time stamps
++
++    In Turkey, transitions in 1986-1990 were at 01:00 standard time
++    not at 02:00, and the spring 1994 transition was on March 20, not
++    March 27.  (Thanks to Kıvanç Yazan.)
++
++  Changes to past and future time zone abbreviations
++
++    Asia/Colombo now uses numeric time zone abbreviations like "+0530"
++    instead of alphabetic ones like "IST" and "LKT".  Various
++    English-language sources use "IST", "LKT" and "SLST", with no
++    working consensus.  (Usage of "SLST" mentioned by Sadika
++    Sumanapala.)
++
++  Changes to code
++
++    zic no longer mishandles relativizing file names when creating
++    symbolic links like /etc/localtime, when these symbolic links
++    are outside the usual directory hierarchy.  This fixes a bug
++    introduced in 2016g.  (Problem reported by Andreas Stieger.)
++
++  Changes to build procedure
++
++    New rules 'traditional_tarballs' and 'traditional_signatures' for
++    building just the traditional-format distribution.  (Requested by
++    Deborah Goldsmith.)
++
++    The file 'version' is now put into the tzdata tarball too.
++    (Requested by Howard Hinnant.)
++
++  Changes to documentation and commentary
++
++    The 'Theory' file now has a section on interface stability.
++    (Requested by Paul Koning.)  It also mentions features like
++    tm_zone and localtime_rz that have long been supported by the
++    reference code.
++
++    tz-link.htm has improved coverage of time zone boundaries suitable
++    for geolocation.  (Thanks to heads-ups from Evan Siroky and Matt
++    Johnson.)
++
++    The US commentary now mentions Allen and the "day of two noons".
++
++    The Fiji commentary mentions the government's 2016-10-03 press
++    release.  (Thanks to Raymond Kumar.)
++
++
++Release 2016g - 2016-09-13 08:56:38 -0700
++
++  Changes to future time stamps
++
++    Turkey switched from EET/EEST (+02/+03) to permanent +03,
++    effective 2016-09-07.  (Thanks to Burak AYDIN.)  Use "+03" rather
++    than an invented abbreviation for the new time.
++
++    New leap second 2016-12-31 23:59:60 UTC as per IERS Bulletin C 52.
++    (Thanks to Tim Parenti.)
++
++  Changes to past time stamps
++
++    For America/Los_Angeles, spring-forward transition times have been
++    corrected from 02:00 to 02:01 in 1948, and from 02:00 to 01:00 in
++    1950-1966.
++
++    For zones using Soviet time on 1919-07-01, transitions to UT-based
++    time were at 00:00 UT, not at 02:00 local time.  The affected
++    zones are Europe/Kirov, Europe/Moscow, Europe/Samara, and
++    Europe/Ulyanovsk.  (Thanks to Alexander Belopolsky.)
++
++  Changes to past and future time zone abbreviations
++
++    The Factory zone now uses the time zone abbreviation -00 instead
++    of a long English-language string, as -00 is now the normal way to
++    represent an undefined time zone.
++
++    Several zones in Antarctica and the former Soviet Union, along
++    with zones intended for ships at sea that cannot use POSIX TZ
++    strings, now use numeric time zone abbreviations instead of
++    invented or obsolete alphanumeric abbreviations.  The affected
++    zones are Antarctica/Casey, Antarctica/Davis,
++    Antarctica/DumontDUrville, Antarctica/Mawson, Antarctica/Rothera,
++    Antarctica/Syowa, Antarctica/Troll, Antarctica/Vostok,
++    Asia/Anadyr, Asia/Ashgabat, Asia/Baku, Asia/Bishkek, Asia/Chita,
++    Asia/Dushanbe, Asia/Irkutsk, Asia/Kamchatka, Asia/Khandyga,
++    Asia/Krasnoyarsk, Asia/Magadan, Asia/Omsk, Asia/Sakhalin,
++    Asia/Samarkand, Asia/Srednekolymsk, Asia/Tashkent, Asia/Tbilisi,
++    Asia/Ust-Nera, Asia/Vladivostok, Asia/Yakutsk, Asia/Yekaterinburg,
++    Asia/Yerevan, Etc/GMT-14, Etc/GMT-13, Etc/GMT-12, Etc/GMT-11,
++    Etc/GMT-10, Etc/GMT-9, Etc/GMT-8, Etc/GMT-7, Etc/GMT-6, Etc/GMT-5,
++    Etc/GMT-4, Etc/GMT-3, Etc/GMT-2, Etc/GMT-1, Etc/GMT+1, Etc/GMT+2,
++    Etc/GMT+3, Etc/GMT+4, Etc/GMT+5, Etc/GMT+6, Etc/GMT+7, Etc/GMT+8,
++    Etc/GMT+9, Etc/GMT+10, Etc/GMT+11, Etc/GMT+12, Europe/Kaliningrad,
++    Europe/Minsk, Europe/Samara, Europe/Volgograd, and
++    Indian/Kerguelen.  For Europe/Moscow the invented abbreviation MSM
++    was replaced by +05, whereas MSK and MSD were kept as they are not
++    our invention and are widely used.
++
++  Changes to zone names
++
++    Rename Asia/Rangoon to Asia/Yangon, with a backward compatibility link.
++    (Thanks to David Massoud.)
++
++  Changes to code
++
++    zic no longer generates binary files containing POSIX TZ-like
++    strings that disagree with the local time type after the last
++    explicit transition in the data.  This fixes a bug with
++    Africa/Casablanca and Africa/El_Aaiun in some year-2037 time
++    stamps on the reference platform.  (Thanks to Alexander Belopolsky
++    for reporting the bug and suggesting a way forward.)
++
++    If the installed localtime and/or posixrules files are symbolic
++    links, zic now keeps them symbolic links when updating them, for
++    compatibility with platforms like OpenSUSE where other programs
++    configure these files as symlinks.
++
++    zic now avoids hard linking to symbolic links, avoids some
++    unnecessary mkdir and stat system calls, and uses shorter file
++    names internally.
++
++    zdump has a new -i option to generate transitions in a
++    more-compact but still human-readable format.  This option is
++    experimental, and the output format may change in future versions.
++    (Thanks to Jon Skeet for suggesting that an option was needed,
++    and thanks to Tim Parenti and Chris Rovick for further comments.)
++
++  Changes to build procedure
++
++    An experimental distribution format is available, in addition
++    to the traditional format which will continue to be distributed.
++    The new format is a tarball tzdb-VERSION.tar.lz with signature
++    file tzdb-VERSION.tar.lz.asc.  It unpacks to a top-level directory
++    tzdb-VERSION containing the code and data of the traditional
++    two-tarball format, along with extra data that may be useful.
++    (Thanks to Antonio Diaz Diaz, Oscar van Vlijmen, and many others
++    for comments about the experimental format.)
++
++    The release version number is now more accurate in the usual case
++    where releases are built from a Git repository.  For example, if
++    23 commits and some working-file changes have been made since
++    release 2016g, the version number is now something like
++    '2016g-23-g50556e3-dirty' instead of the misleading '2016g'.
++    Official releases uses the same version number format as before,
++    e.g., '2016g'.  To support the more-accurate version number, its
++    specification has moved from a line in the Makefile to a new
++    source file 'version'.
++
++    The experimental distribution contains a file to2050.tzs that
++    contains what should be the output of 'zdump -i -c 2050' on
++    primary zones.  If this file is available, 'make check' now checks
++    that zdump generates this output.
++
++    'make check_web' now works on Fedora-like distributions.
++
++  Changes to documentation and commentary
++
++    tzfile.5 now documents the new restriction on POSIX TZ-like
++    strings that is now implemented by zic.
++
++    Comments now cite URLs for some 1917-1921 Russian DST decrees.
++    (Thanks to Alexander Belopolsky.)
++
++    tz-link.htm mentions JuliaTime (thanks to Curtis Vogt) and Time4J
++    (thanks to Meno Hochschild) and ThreeTen-Extra, and its
++    description of Java 8 has been brought up to date (thanks to
++    Stephen Colebourne).  Its description of local time on Mars has
++    been updated to match current practice, and URLs have been updated
++    and some obsolete ones removed.
++
++
++Release 2016f - 2016-07-05 16:26:51 +0200
++
++  Changes affecting future time stamps
++
++    The Egyptian government changed its mind on short notice, and
++    Africa/Cairo will not introduce DST starting 2016-07-07 after all.
++    (Thanks to Mina Samuel.)
++
++    Asia/Novosibirsk switches from +06 to +07 on 2016-07-24 at 02:00.
++    (Thanks to Stepan Golosunov.)
++
++  Changes to past and future time stamps
++
++    Asia/Novokuznetsk and Asia/Novosibirsk now use numeric time zone
++    abbreviations instead of invented ones.
++
++  Changes affecting past time stamps
++
++    Europe/Minsk's 1992-03-29 spring-forward transition was at 02:00 not 00:00.
++    (Thanks to Stepan Golosunov.)
++
++
++Release 2016e - 2016-06-14 08:46:16 -0700
++
++  Changes affecting future time stamps
++
++    Africa/Cairo observes DST in 2016 from July 7 to the end of October.
++    Guess October 27 and 24:00 transitions.  (Thanks to Steffen Thorsen.)
++    For future years, guess April's last Thursday to October's last
++    Thursday except for Ramadan.
++
++  Changes affecting past time stamps
++
++    Locations while uninhabited now use '-00', not 'zzz', as a
++    placeholder time zone abbreviation.  This is inspired by Internet
++    RFC 3339 and is more consistent with numeric time zone
++    abbreviations already used elsewhere.  The change affects several
++    arctic and antarctic locations, e.g., America/Cambridge_Bay before
++    1920 and Antarctica/Troll before 2005.
++
++    Asia/Baku's 1992-09-27 transition from +04 (DST) to +04 (non-DST) was
++    at 03:00, not 23:00 the previous day.  (Thanks to Michael Deckers.)
++
++  Changes to code
++
++    zic now outputs a dummy transition at time 2**31 - 1 in zones
++    whose POSIX-style TZ strings contain a '<'.  This mostly works
++    around Qt bug 53071 <https://bugreports.qt.io/browse/QTBUG-53071>.
++    (Thanks to Zhanibek Adilbekov for reporting the Qt bug.)
++
++  Changes affecting documentation and commentary
++
++    tz-link.htm says why governments should give plenty of notice for
++    time zone or DST changes, and refers to Matt Johnson's blog post.
++
++    tz-link.htm mentions Tzdata for Elixir.  (Thanks to Matt Johnson.)
++
++
++Release 2016d - 2016-04-17 22:50:29 -0700
++
++  Changes affecting future time stamps
++
++    America/Caracas switches from -0430 to -04 on 2016-05-01 at 02:30.
++    (Thanks to Alexander Krivenyshev for the heads-up.)
++
++    Asia/Magadan switches from +10 to +11 on 2016-04-24 at 02:00.
++    (Thanks to Alexander Krivenyshev and Matt Johnson.)
++
++    New zone Asia/Tomsk, split off from Asia/Novosibirsk.  It covers
++    Tomsk Oblast, Russia, which switches from +06 to +07 on 2016-05-29
++    at 02:00.  (Thanks to Stepan Golosunov.)
++
++  Changes affecting past time stamps
++
++    New zone Europe/Kirov, split off from Europe/Volgograd.  It covers
++    Kirov Oblast, Russia, which switched from +04/+05 to +03/+04 on
++    1989-03-26 at 02:00, roughly a year after Europe/Volgograd made
++    the same change.  (Thanks to Stepan Golosunov.)
++
++    Russia and nearby locations had daylight-saving transitions on
++    1992-03-29 at 02:00 and 1992-09-27 at 03:00, instead of on
++    1992-03-28 at 23:00 and 1992-09-26 at 23:00.  (Thanks to Stepan
++    Golosunov.)
++
++    Many corrections to historical time in Kazakhstan from 1991
++    through 2005.  (Thanks to Stepan Golosunov.)  Replace Kazakhstan's
++    invented time zone abbreviations with numeric abbreviations.
++
++  Changes to commentary
++
++    Mention Internet RFCs 7808 (TZDIST) and 7809 (CalDAV time zone references).
++
++
++Release 2016c - 2016-03-23 00:51:27 -0700
++
++  Changes affecting future time stamps
++
++    Azerbaijan no longer observes DST.  (Thanks to Steffen Thorsen.)
++
++    Chile reverts from permanent to seasonal DST.  (Thanks to Juan
++    Correa for the heads-up, and to Tim Parenti for corrections.)
++    Guess that future transitions are August's and May's second
++    Saturdays at 24:00 mainland time.  Also, call the period from
++    2014-09-07 through 2016-05-14 daylight saving time instead of
++    standard time, as that seems more appropriate now.
++
++  Changes affecting past time stamps
++
++    Europe/Kaliningrad and Europe/Vilnius changed from +03/+04 to
++    +02/+03 on 1989-03-26, not 1991-03-31.  Europe/Volgograd changed
++    from +04/+05 to +03/+04 on 1988-03-27, not 1989-03-26.
++    (Thanks to Stepan Golosunov.)
++
++  Changes to commentary
++
++    Several updates and URLs for historical and proposed Russian changes.
++    (Thanks to Stepan Golosunov, Matt Johnson, and Alexander Krivenyshev.)
++
++
++Release 2016b - 2016-03-12 17:30:14 -0800
++
++  Compatibility note
++
++    Starting with release 2016b, some data entries cause zic implementations
++    derived from tz releases 2005j through 2015e to issue warnings like
++    "time zone abbreviation differs from POSIX standard (+03)".
++    These warnings should not otherwise affect zic's output and can safely be
++    ignored on today's platforms, as the warnings refer to a restriction in
++    POSIX.1-1988 that was removed in POSIX.1-2001.  One way to suppress the
++    warnings is to upgrade to zic derived from tz releases 2015f and later.
++
++  Changes affecting future time stamps
++
++    New zones Europe/Astrakhan and Europe/Ulyanovsk for Astrakhan and
++    Ulyanovsk Oblasts, Russia, both of which will switch from +03 to +04 on
++    2016-03-27 at 02:00 local time.  They need distinct zones since their
++    post-1970 histories disagree.  New zone Asia/Barnaul for Altai Krai and
++    Altai Republic, Russia, which will switch from +06 to +07 on the same date
++    and local time.  The Astrakhan change is already official; the others have
++    passed the first reading in the State Duma and are extremely likely.
++    Also, Asia/Sakhalin moves from +10 to +11 on 2016-03-27 at 02:00.
++    (Thanks to Alexander Krivenyshev for the heads-up, and to Matt Johnson
++    and Stepan Golosunov for followup.)
++
++    As a trial of a new system that needs less information to be made up,
++    the new zones use numeric time zone abbreviations like "+04"
++    instead of invented abbreviations like "ASTT".
++
++    Haiti will not observe DST in 2016.  (Thanks to Jean Antoine via
++    Steffen Thorsen.)
++
++    Palestine's spring-forward transition on 2016-03-26 is at 01:00, not 00:00.
++    (Thanks to Hannah Kreitem.) Guess future transitions will be March's last
++    Saturday at 01:00, not March's last Friday at 24:00.
++
++  Changes affecting past time stamps
++
++    Europe/Chisinau observed DST during 1990, and switched from +04 to
++    +03 at 1990-05-06 02:00, instead of switching from +03 to +02.
++    (Thanks to Stepan Golosunov.)
++
++    1991 abbreviations in Europe/Samara should be SAMT/SAMST, not
++    KUYT/KUYST.  (Thanks to Stepan Golosunov.)
++
++  Changes to code
++
++    tzselect's diagnostics and checking, and checktab.awk's checking,
++    have been improved.  (Thanks to J William Piggott.)
++
++    tzcode now builds under MinGW.  (Thanks to Ian Abbott and Esben Haabendal.)
++
++    tzselect now tests Julian-date TZ settings more accurately.
++    (Thanks to J William Piggott.)
++
++  Changes to commentary
++
++    Comments in zone tables have been improved.  (Thanks to J William Piggott.)
++
++    tzselect again limits its menu comments so that menus fit on a
++    24x80 alphanumeric display.
++
++    A new web page tz-how-to.html.  (Thanks to Bill Seymour.)
++
++    In the Theory file, the description of possible time zone abbreviations in
++    tzdata has been cleaned up, as the old description was unclear and
++    inconsistent.  (Thanks to Alain Mouette for reporting the problem.)
++
++
++Release 2016a - 2016-01-26 23:28:02 -0800
++
++  Changes affecting future time stamps
++
++    America/Cayman will not observe daylight saving this year after all.
++    Revert our guess that it would.  (Thanks to Matt Johnson.)
++
++    Asia/Chita switches from +0800 to +0900 on 2016-03-27 at 02:00.
++    (Thanks to Alexander Krivenyshev.)
++
++    Asia/Tehran now has DST predictions for the year 2038 and later,
++    to be March 21 00:00 to September 21 00:00.  This is likely better
++    than predicting no DST, albeit off by a day every now and then.
++
++  Changes affecting past and future time stamps
++
++    America/Metlakatla switched from PST all year to AKST/AKDT on
++    2015-11-01 at 02:00.  (Thanks to Steffen Thorsen.)
++
++    America/Santa_Isabel has been removed, and replaced with a
++    backward compatibility link to America/Tijuana.  Its contents were
++    apparently based on a misreading of Mexican legislation.
++
++  Changes affecting past time stamps
++
++    Asia/Karachi's two transition times in 2002 were off by a minute.
++    (Thanks to Matt Johnson.)
++
++  Changes affecting build procedure
++
++    An installer can now combine leap seconds with use of the backzone file,
++    e.g., with 'make PACKRATDATA=backzone REDO=posix_right zones'.
++    The old 'make posix_packrat' rule is now marked as obsolescent.
++    (Thanks to Ian Abbott for an initial implementation.)
++
++  Changes affecting documentation and commentary
++
++    A new file LICENSE makes it easier to see that the code and data
++    are mostly public-domain.  (Thanks to James Knight.)  The three
++    non-public-domain files now use the current (3-clause) BSD license
++    instead of older versions of that license.
++
++    tz-link.htm mentions the BDE library (thanks to Andrew Paprocki),
++    CCTZ (thanks to Tim Parenti), TimeJones.com, and has a new section
++    on editing tz source files (with a mention of Sublime zoneinfo,
++    thanks to Gilmore Davidson).
++
++    The Theory and asia files now mention the 2015 book "The Global
++    Transformation of Time, 1870-1950", and cite a couple of reviews.
++
++    The America/Chicago entry now documents the informal use of US
++    central time in Fort Pierre, South Dakota.  (Thanks to Rick
++    McDermid, Matt Johnson, and Steve Jones.)
++
++
++Release 2015g - 2015-10-01 00:39:51 -0700
++
++  Changes affecting future time stamps
++
++    Turkey's 2015 fall-back transition is scheduled for Nov. 8, not Oct. 25.
++    (Thanks to Fatih.)
++
++    Norfolk moves from +1130 to +1100 on 2015-10-04 at 02:00 local time.
++    (Thanks to Alexander Krivenyshev.)
++
++    Fiji's 2016 fall-back transition is scheduled for January 17, not 24.
++    (Thanks to Ken Rylander.)
++
++    Fort Nelson, British Columbia will not fall back on 2015-11-01.  It has
++    effectively been on MST (-0700) since it advanced its clocks on 2015-03-08.
++    New zone America/Fort_Nelson.  (Thanks to Matt Johnson.)
++
++  Changes affecting past time stamps
++
++    Norfolk observed DST from 1974-10-27 02:00 to 1975-03-02 02:00.
++
++  Changes affecting code
++
++    localtime no longer mishandles America/Anchorage after 2037.
++    (Thanks to Bradley White for reporting the bug.)
++
++    On hosts with signed 32-bit time_t, localtime no longer mishandles
++    Pacific/Fiji after 2038-01-16 14:00 UTC.
++
++    The localtime module allows the variables 'timezone', 'daylight',
++    and 'altzone' to be in common storage shared with other modules,
++    and declares them in case the system <time.h> does not.
++    (Problems reported by Kees Dekker.)
++
++    On platforms with tm_zone, strftime.c now assumes it is not NULL.
++    This simplifies the code and is consistent with zdump.c.
++    (Problem reported by Christos Zoulas.)
++
++  Changes affecting documentation
++
++   The tzfile man page now documents that transition times denote the
++   starts (not the ends) of the corresponding time periods.
++   (Ambiguity reported by Bill Seymour.)
++
++
++Release 2015f - 2015-08-10 18:06:56 -0700
++
++  Changes affecting future time stamps
++
++    North Korea switches to +0830 on 2015-08-15.  (Thanks to Steffen Thorsen.)
++    The abbreviation remains "KST".  (Thanks to Robert Elz.)
++
++    Uruguay no longer observes DST.  (Thanks to Steffen Thorsen
++    and Pablo Camargo.)
++
++  Changes affecting past and future time stamps
++
++    Moldova starts and ends DST at 00:00 UTC, not at 01:00 UTC.
++    (Thanks to Roman Tudos.)
++
++  Changes affecting data format and code
++
++    zic's '-y YEARISTYPE' option is no longer documented.  The TYPE
++    field of a Rule line should now be '-'; the old values 'even',
++    'odd', 'uspres', 'nonpres', 'nonuspres' were already undocumented.
++    Although the implementation has not changed, these features do not
++    work in the default installation, they are not used in the data,
++    and they are now considered obsolescent.
++
++    zic now checks that two rules don't take effect at the same time.
++    (Thanks to Jon Skeet and Arthur David Olson.)  Constraints on
++    simultaneity are now documented.
++
++    The two characters '%z' in a zone format now stand for the UTC
++    offset, e.g., '-07' for seven hours behind UTC and '+0530' for
++    five hours and thirty minutes ahead.  This better supports time
++    zone abbreviations conforming to POSIX.1-2001 and later.
++
++  Changes affecting installed data files
++
++    Comments for America/Halifax and America/Glace_Bay have been improved.
++    (Thanks to Brian Inglis.)
++
++    Data entries have been simplified for Atlantic/Canary, Europe/Simferopol,
++    Europe/Sofia, and Europe/Tallinn.  This yields slightly smaller
++    installed data files for Europe/Simferopol and Europe/Tallinn.
++    It does not affect timestamps.  (Thanks to Howard Hinnant.)
++
++  Changes affecting code
++
++    zdump and zic no longer warn about valid time zone abbreviations
++    like '-05'.
++
++    Some Visual Studio 2013 warnings have been suppressed.
++    (Thanks to Kees Dekker.)
++
++    'date' no longer sets the time of day and its -a, -d, -n and -t
++    options have been removed.  Long obsolescent, the implementation
++    of these features had porting problems.  Builders no longer need
++    to configure HAVE_ADJTIME, HAVE_SETTIMEOFDAY, or HAVE_UTMPX_H.
++    (Thanks to Kees Dekker for pointing out the problem.)
++
++  Changes affecting documentation
++
++    The Theory file mentions naming issues earlier, as these seem to be
++    poorly publicized (thanks to Gilmore Davidson for reporting the problem).
++
++    tz-link.htm mentions Time Zone Database Parser (thanks to Howard Hinnant).
++
++    Mention that Herbert Samuel introduced the term "Summer Time".
++
++
++Release 2015e - 2015-06-13 10:56:02 -0700
++
++  Changes affecting future time stamps
++
++    Morocco will suspend DST from 2015-06-14 03:00 through 2015-07-19 02:00,
++    not 06-13 and 07-18 as we had guessed.  (Thanks to Milamber.)
++
++    Assume Cayman Islands will observe DST starting next year, using US rules.
++    Although it isn't guaranteed, it is the most likely.
++
++  Changes affecting data format
++
++    The file 'iso3166.tab' now uses UTF-8, so that its entries can better
++    spell the names of Åland Islands, Côte d'Ivoire, and Réunion.
++
++  Changes affecting code
++
++    When displaying data, tzselect converts it to the current locale's
++    encoding if the iconv command works.  (Problem reported by random832.)
++
++    tzselect no longer mishandles Dominica, fixing a bug introduced
++    in Release 2014f.  (Problem reported by Owen Leibman.)
++
++    zic -l no longer fails when compiled with -DTZDEFAULT=\"/etc/localtime\".
++    This fixes a bug introduced in Release 2014f.
++    (Problem reported by Leonardo Chiquitto.)
++
++
++Release 2015d - 2015-04-24 08:09:46 -0700
++
++  Changes affecting future time stamps
++
++    Egypt will not observe DST in 2015 and will consider canceling it
++    permanently.  For now, assume no DST indefinitely.
++    (Thanks to Ahmed Nazmy and Tim Parenti.)
++
++  Changes affecting past time stamps
++
++    America/Whitehorse switched from UT -09 to -08 on 1967-05-28, not
++    1966-07-01.  Also, Yukon's time zone history is documented better.
++    (Thanks to Brian Inglis and Dennis Ferguson.)
++
++  Change affecting past and future time zone abbreviations
++
++    The abbreviations for Hawaii-Aleutian standard and daylight times
++    have been changed from HAST/HADT to HST/HDT, as per US Government
++    Printing Office style.  This affects only America/Adak since 1983,
++    as America/Honolulu was already using the new style.
++
++  Changes affecting code
++
++   zic has some minor performance improvements.
++
++
++Release 2015c - 2015-04-11 08:55:55 -0700
++
++  Changes affecting future time stamps
++
++    Egypt's spring-forward transition is at 24:00 on April's last Thursday,
++    not 00:00 on April's last Friday.  2015's transition will therefore be on
++    Thursday, April 30 at 24:00, not Friday, April 24 at 00:00.  Similar fixes
++    apply to 2026, 2037, 2043, etc.  (Thanks to Steffen Thorsen.)
++
++  Changes affecting past time stamps
++
++    The following changes affect some pre-1991 Chile-related time stamps
++    in America/Santiago, Antarctica/Palmer, and Pacific/Easter.
++
++      The 1910 transition was January 10, not January 1.
++
++      The 1918 transition was September 10, not September 1.
++
++      The UT -04 time observed from 1932 to 1942 is now considered to
++      be standard time, not year-round DST.
++
++      Santiago observed DST (UT -03) from 1946-07-15 through
++      1946-08-31, then reverted to standard time, then switched to -05
++      on 1947-04-01.
++
++      Assume transitions before 1968 were at 00:00, since we have no data
++      saying otherwise.
++
++      The spring 1988 transition was 1988-10-09, not 1988-10-02.
++      The fall 1990 transition was 1990-03-11, not 1990-03-18.
++
++      Assume no UTC offset change for Pacific/Easter on 1890-01-01,
++      and omit all transitions on Pacific/Easter from 1942 through 1946
++      since we have no data suggesting that they existed.
++
++    One more zone has been turned into a link, as it differed
++    from an existing zone only for older time stamps.  As usual,
++    this change affects UTC offsets in pre-1970 time stamps only.
++    The zone's old contents have been moved to the 'backzone' file.
++    The affected zone is America/Montreal.
++
++  Changes affecting commentary
++
++    Mention the TZUpdater tool.
++
++    Mention "The Time Now".  (Thanks to Brandon Ramsey.)
++
++
++Release 2015b - 2015-03-19 23:28:11 -0700
++
++  Changes affecting future time stamps
++
++    Mongolia will start observing DST again this year, from the last
++    Saturday in March at 02:00 to the last Saturday in September at 00:00.
++    (Thanks to Ganbold Tsagaankhuu.)
++
++    Palestine will start DST on March 28, not March 27.  Also,
++    correct the fall 2014 transition from September 26 to October 24.
++    Adjust future predictions accordingly.  (Thanks to Steffen Thorsen.)
++
++  Changes affecting past time stamps
++
++    The 1982 zone shift in Pacific/Easter has been corrected, fixing a 2015a
++    regression.  (Thanks to Stuart Bishop for reporting the problem.)
++
++    Some more zones have been turned into links, when they differed
++    from existing zones only for older time stamps.  As usual,
++    these changes affect UTC offsets in pre-1970 time stamps only.
++    Their old contents have been moved to the 'backzone' file.
++    The affected zones are: America/Antigua, America/Cayman,
++    Pacific/Midway, and Pacific/Saipan.
++
++  Changes affecting time zone abbreviations
++
++    Correct the 1992-2010 DST abbreviation in Volgograd from "MSK" to "MSD".
++    (Thanks to Hank W.)
++
++  Changes affecting code
++
++    Fix integer overflow bug in reference 'mktime' implementation.
++    (Problem reported by Jörg Richter.)
++
++    Allow -Dtime_tz=time_t compilations, and allow -Dtime_tz=... libraries
++    to be used in the same executable as standard-library time_t functions.
++    (Problems reported by Bradley White.)
++
++  Changes affecting commentary
++
++    Cite the recent Mexican decree changing Quintana Roo's time zone.
++    (Thanks to Carlos Raúl Perasso.)
++
++    Likewise for the recent Chilean decree.  (Thanks to Eduardo Romero Urra.)
++
++    Update info about Mars time.
++
++
++Release 2015a - 2015-01-29 22:35:20 -0800
++
++  Changes affecting future time stamps
++
++    The Mexican state of Quintana Roo, represented by America/Cancun,
++    will shift from Central Time with DST to Eastern Time without DST
++    on 2015-02-01 at 02:00.  (Thanks to Steffen Thorsen and Gwillim Law.)
++
++    Chile will not change clocks in April or thereafter; its new standard time
++    will be its old daylight saving time.  This affects America/Santiago,
++    Pacific/Easter, and Antarctica/Palmer.  (Thanks to Juan Correa.)
++
++    New leap second 2015-06-30 23:59:60 UTC as per IERS Bulletin C 49.
++    (Thanks to Tim Parenti.)
++
++  Changes affecting past time stamps
++
++    Iceland observed DST in 1919 and 1921, and its 1939 fallback
++    transition was Oct. 29, not Nov. 29.  Remove incorrect data from
++    Shanks about time in Iceland between 1837 and 1908.
++
++    Some more zones have been turned into links, when they differed
++    from existing zones only for older time stamps.  As usual,
++    these changes affect UTC offsets in pre-1970 time stamps only.
++    Their old contents have been moved to the 'backzone' file.
++    The affected zones are: Asia/Aden, Asia/Bahrain, Asia/Kuwait,
++    and Asia/Muscat.
++
++  Changes affecting code
++
++    tzalloc now scrubs time zone abbreviations compatibly with the way
++    that tzset always has, by replacing invalid bytes with '_' and by
++    shortening too-long abbreviations.
++
++    tzselect ports to POSIX awk implementations, no longer mishandles
++    POSIX TZ settings when GNU awk is used, and reports POSIX TZ
++    settings to the user.  (Thanks to Stefan Kuhn.)
++
++  Changes affecting build procedure
++
++    'make check' now checks for links to links in the data.
++    One such link (for Africa/Asmera) has been fixed.
++    (Thanks to Stephen Colebourne for pointing out the problem.)
++
++  Changes affecting commentary
++
++    The leapseconds file commentary now mentions the expiration date.
++    (Problem reported by Martin Burnicki.)
++
++    Update Mexican Library of Congress URL.
++
++
++Release 2014j - 2014-11-10 17:37:11 -0800
++
++  Changes affecting current and future time stamps
++
++    Turks & Caicos' switch from US eastern time to UT -04 year-round
++    did not occur on 2014-11-02 at 02:00.  It's currently scheduled
++    for 2015-11-01 at 02:00.  (Thanks to Chris Walton.)
++
++  Changes affecting past time stamps
++
++    Many pre-1989 time stamps have been corrected for Asia/Seoul and
++    Asia/Pyongyang, based on sources for the Korean-language Wikipedia
++    entry for time in Korea.  (Thanks to Sanghyuk Jung.)  Also, no
++    longer guess that Pyongyang mimicked Seoul time after World War II,
++    as this is politically implausible.
++
++    Some more zones have been turned into links, when they differed
++    from existing zones only for older time stamps.  As usual,
++    these changes affect UTC offsets in pre-1970 time stamps only.
++    Their old contents have been moved to the 'backzone' file.
++    The affected zones are: Africa/Addis_Ababa, Africa/Asmara,
++    Africa/Dar_es_Salaam, Africa/Djibouti, Africa/Kampala,
++    Africa/Mogadishu, Indian/Antananarivo, Indian/Comoro, and
++    Indian/Mayotte.
++
++  Changes affecting commentary
++
++    The commentary is less enthusiastic about Shanks as a source,
++    and is more careful to distinguish UT from UTC.
++
++
++Release 2014i - 2014-10-21 22:04:57 -0700
++
++  Changes affecting future time stamps
++
++    Pacific/Fiji will observe DST from 2014-11-02 02:00 to 2015-01-18 03:00.
++    (Thanks to Ken Rylander for the heads-up.)  Guess that future
++    years will use a similar pattern.
++
++    A new Zone Pacific/Bougainville, for the part of Papua New Guinea
++    that plans to switch from UT +10 to +11 on 2014-12-28 at 02:00.
++    (Thanks to Kiley Walbom for the heads-up.)
++
++  Changes affecting time zone abbreviations
++
++    Since Belarus is not changing its clocks even though Moscow is,
++    the time zone abbreviation in Europe/Minsk is changing from FET
++    to its more-traditional value MSK on 2014-10-26 at 01:00.
++    (Thanks to Alexander Bokovoy for the heads-up about Belarus.)
++
++    The new abbreviation IDT stands for the pre-1976 use of UT +08 in
++    Indochina, to distinguish it better from ICT (+07).
++
++  Changes affecting past time stamps
++
++    Many time stamps have been corrected for Asia/Ho_Chi_Minh before 1976
++    (thanks to Trần Ngọc Quân for an indirect pointer to Trần Tiến Bình's
++    authoritative book).  Asia/Ho_Chi_Minh has been added to
++    zone1970.tab, to give tzselect users in Vietnam two choices,
++    since north and south Vietnam disagreed after our 1970 cutoff.
++
++    Asia/Phnom_Penh and Asia/Vientiane have been turned into links, as
++    they differed from existing zones only for older time stamps.  As
++    usual, these changes affect pre-1970 time stamps only.  Their old
++    contents have been moved to the 'backzone' file.
++
++  Changes affecting code
++
++    The time-related library functions now set errno on failure, and
++    some crashes in the new tzalloc-related library functions have
++    been fixed.  (Thanks to Christos Zoulas for reporting most of
++    these problems and for suggesting fixes.)
++
++    If USG_COMPAT is defined and the requested time stamp is standard time,
++    the tz library's localtime and mktime functions now set the extern
++    variable timezone to a value appropriate for that time stamp; and
++    similarly for ALTZONE, daylight saving time, and the altzone variable.
++    This change is a companion to the tzname change in 2014h, and is
++    designed to make timezone and altzone more compatible with tzname.
++
++    The tz library's functions now set errno to EOVERFLOW if they fail
++    because the result cannot be represented.  ctime and ctime_r now
++    return NULL and set errno when a time stamp is out of range, rather
++    than having undefined behavior.
++
++    Some bugs associated with the new 2014g functions have been fixed.
++    This includes a bug that largely incapacitated the new functions
++    time2posix_z and posix2time_z.  (Thanks to Christos Zoulas.)
++    It also includes some uses of uninitialized variables after tzalloc.
++    The new code uses the standard type 'ssize_t', which the Makefile
++    now gives porting advice about.
++
++  Changes affecting commentary
++
++    Updated URLs for NRC Canada (thanks to Matt Johnson and Brian Inglis).
++
++
++Release 2014h - 2014-09-25 18:59:03 -0700
++
++  Changes affecting past time stamps
++
++    America/Jamaica's 1974 spring-forward transition was Jan. 6, not Apr. 28.
++
++    Shanks says Asia/Novokuznetsk switched from LMT (not "NMT") on 1924-05-01,
++    not 1920-01-06.  The old entry was based on a misinterpretation of Shanks.
++
++    Some more zones have been turned into links, when they differed
++    from existing zones only for older time stamps.  As usual,
++    these changes affect UTC offsets in pre-1970 time stamps only.
++    Their old contents have been moved to the 'backzone' file.
++    The affected zones are: Africa/Blantyre, Africa/Bujumbura,
++    Africa/Gaborone, Africa/Harare, Africa/Kigali, Africa/Lubumbashi,
++    Africa/Lusaka, Africa/Maseru, and Africa/Mbabane.
++
++  Changes affecting code
++
++    zdump -V and -v now output gmtoff= values on all platforms,
++    not merely on platforms defining TM_GMTOFF.
++
++    The tz library's localtime and mktime functions now set tzname to a value
++    appropriate for the requested time stamp, and zdump now uses this
++    on platforms not defining TM_ZONE, fixing a 2014g regression.
++    (Thanks to Tim Parenti for reporting the problem.)
++
++    The tz library no longer sets tzname if localtime or mktime fails.
++
++    zdump -c no longer mishandles transitions near year boundaries.
++    (Thanks to Tim Parenti for reporting the problem.)
++
++    An access to uninitialized data has been fixed.
++    (Thanks to Jörg Richter for reporting the problem.)
++
++    When THREAD_SAFE is defined, the code ports to the C11 memory model.
++    A memory leak has been fixed if ALL_STATE and THREAD_SAFE are defined
++    and two threads race to initialize data used by gmtime-like functions.
++    (Thanks to Andy Heninger for reporting the problems.)
++
++  Changes affecting build procedure
++
++    'make check' now checks better for properly-sorted data.
++
++  Changes affecting documentation and commentary
++
++    zdump's gmtoff=N output is now documented, and its isdst=D output
++    is now documented to possibly output D values other than 0 or 1.
++
++    zdump -c's treatment of years is now documented to use the
++    Gregorian calendar and Universal Time without leap seconds,
++    and its behavior at cutoff boundaries is now documented better.
++    (Thanks to Arthur David Olson and Tim Parenti for reporting the problems.)
++
++    Programs are now documented to use the proleptic Gregorian calendar.
++    (Thanks to Alan Barrett for the suggestion.)
++
++    Fractional-second GMT offsets have been documented for civil time
++    in 19th-century Chennai, Jakarta, and New York.
++
++
++Release 2014g - 2014-08-28 12:31:23 -0700
++
++  Changes affecting future time stamps
++
++    Turks & Caicos is switching from US eastern time to UT -04
++    year-round, modeled as a switch on 2014-11-02 at 02:00.
++    [As noted in 2014j, this switch was later delayed.]
++
++  Changes affecting past time stamps
++
++    Time in Russia or the USSR before 1926 or so has been corrected by
++    a few seconds in the following zones: Asia/Irkutsk,
++    Asia/Krasnoyarsk, Asia/Omsk, Asia/Samarkand, Asia/Tbilisi,
++    Asia/Vladivostok, Asia/Yakutsk, Europe/Riga, Europe/Samara.  For
++    Asia/Yekaterinburg the correction is a few minutes.  (Thanks to
++    Vladimir Karpinsky.)
++
++    The Portuguese decree of 1911-05-26 took effect on 1912-01-01.
++    This affects 1911 time stamps in Africa/Bissau, Africa/Luanda,
++    Atlantic/Azores, and Atlantic/Madeira.  Also, Lisbon's pre-1912
++    GMT offset was -0:36:45 (rounded from -0:36:44.68), not -0:36:32.
++    (Thanks to Stephen Colebourne for pointing to the decree.)
++
++    Asia/Dhaka ended DST on 2009-12-31 at 24:00, not 23:59.
++
++    A new file 'backzone' contains data which may appeal to
++    connoisseurs of old time stamps, although it is out of scope for
++    the tz database, is often poorly sourced, and contains some data
++    that is known to be incorrect.  The new file is not recommended
++    for ordinary use and its entries are not installed by default.
++    (Thanks to Lester Caine for the high-quality Jersey, Guernsey, and
++    Isle of Man entries.)
++
++    Some more zones have been turned into links, when they differed
++    from existing zones only for older time stamps.  As usual,
++    these changes affect UTC offsets in pre-1970 time stamps only.
++    Their old contents have been moved to the 'backzone' file.
++    The affected zones are: Africa/Bangui, Africa/Brazzaville,
++    Africa/Douala, Africa/Kinshasa, Africa/Libreville, Africa/Luanda,
++    Africa/Malabo, Africa/Niamey, and Africa/Porto-Novo.
++
++  Changes affecting code
++
++    Unless NETBSD_INSPIRED is defined to 0, the tz library now
++    supplies functions for creating and using objects that represent
++    time zones. The new functions are tzalloc, tzfree, localtime_rz,
++    mktime_z, and (if STD_INSPIRED is also defined) posix2time_z and
++    time2posix_z.  They are intended for performance: for example,
++    localtime_rz (unlike localtime_r) is trivially thread-safe without
++    locking.  (Thanks to Christos Zoulas for proposing NetBSD-inspired
++    functions, and to Alan Barrett and Jonathan Lennox for helping to
++    debug the change.)
++
++    zdump now builds with the tz library unless USE_LTZ is defined to 0,
++    This lets zdump use tz features even if the system library lacks them.
++    To build zdump with the system library, use 'make CFLAGS=-DUSE_LTZ=0
++    TZDOBJS=zdump.o CHECK_TIME_T_ALTERNATIVES='.
++
++    zdump now uses localtime_rz if available, as it's significantly faster,
++    and it can help zdump better diagnose invalid time zone names.
++    Define HAVE_LOCALTIME_RZ to 0 to suppress this.  HAVE_LOCALTIME_RZ
++    defaults to 1 if NETBSD_INSPIRED && USE_LTZ.  When localtime_rz is
++    not available, zdump now uses localtime_r and tzset if available,
++    as this is a bit cleaner and faster than plain localtime.  Compile
++    with -DHAVE_LOCALTIME_R=0 and/or -DHAVE_TZSET=0 if your system
++    lacks these two functions.
++
++    If THREAD_SAFE is defined to 1, the tz library is now thread-safe.
++    Although not needed for tz's own applications, which are single-threaded,
++    this supports POSIX better if the tz library is used in multithreaded apps.
++
++    Some crashes have been fixed when zdump or the tz library is given
++    invalid or outlandish input.
++
++    The tz library no longer mishandles leap seconds on platforms with
++    unsigned time_t in time zones that lack ordinary transitions after 1970.
++
++    The tz code now attempts to infer TM_GMTOFF and TM_ZONE if not
++    already defined, to make it easier to configure on common platforms.
++    Define NO_TM_GMTOFF and NO_TM_ZONE to suppress this.
++
++    Unless the new macro UNINIT_TRAP is defined to 1, the tz code now
++    assumes that reading uninitialized memory yields garbage values
++    but does not cause other problems such as traps.
++
++    If TM_GMTOFF is defined and UNINIT_TRAP is 0, mktime is now
++    more likely to guess right for ambiguous time stamps near
++    transitions where tm_isdst does not change.
++
++    If HAVE_STRFTIME_L is defined to 1, the tz library now defines
++    strftime_l for compatibility with recent versions of POSIX.
++    Only the C locale is supported, though.  HAVE_STRFTIME_L defaults
++    to 1 on recent POSIX versions, and to 0 otherwise.
++
++    tzselect -c now uses a hybrid distance measure that works better
++    in Africa.  (Thanks to Alan Barrett for noting the problem.)
++
++    The C source code now ports to NetBSD when GCC_DEBUG_FLAGS is used,
++    or when time_tz is defined.
++
++    When HAVE_UTMPX_H is set the 'date' command now builds on systems
++    whose <utmpx.h> file does not define WTMPX_FILE, and when setting
++    the date it updates the wtmpx file if _PATH_WTMPX is defined.
++    This affects GNU/Linux and similar systems.
++
++    For easier maintenance later, some C code has been simplified,
++    some lint has been removed, and the code has been tweaked so that
++    plain 'make' is more likely to work.
++
++    The C type 'bool' is now used for boolean values, instead of 'int'.
++
++    The long-obsolete LOCALE_HOME code has been removed.
++
++    The long-obsolete 'gtime' function has been removed.
++
++  Changes affecting build procedure
++
++    'zdump' no longer links in ialloc.o, as it's not needed.
++
++    'make check_time_t_alternatives' no longer assumes GNU diff.
++
++  Changes affecting distribution tarballs
++
++    The files checktab.awk and zoneinfo2tdf.pl are now distributed in
++    the tzdata tarball instead of the tzcode tarball, since they help
++    maintain the data.  The NEWS and Theory files are now also
++    distributed in the tzdata tarball, as they're relevant for data.
++    (Thanks to Alan Barrett for pointing this out.)  Also, the
++    leapseconds.awk file is no longer distributed in the tzcode
++    tarball, since it belongs in the tzdata tarball (where 2014f
++    inadvertently also distributed it).
++
++  Changes affecting documentation and commentary
++
++    A new file CONTRIBUTING is distributed.  (Thanks to Tim Parenti for
++    suggesting a CONTRIBUTING file, and to Tony Finch and Walter Harms
++    for debugging it.)
++
++    The man pages have been updated to use function prototypes,
++    to document thread-safe variants like localtime_r, and to document
++    the NetBSD-inspired functions tzalloc, tzfree, localtime_rz, and
++    mktime_z.
++
++    The fields in Link lines have been renamed to be more descriptive
++    and more like the parameters of 'ln'.  LINK-FROM has become TARGET,
++    and LINK-TO has become LINK-NAME.
++
++    tz-link.htm mentions the IETF's tzdist working group; Windows
++    Runtime etc. (thanks to Matt Johnson); and HP-UX's tztab.
++
++    Some broken URLs have been fixed in the commentary.  (Thanks to
++    Lester Caine.)
++
++    Commentary about Philippines DST has been updated, and commentary
++    on pre-1970 time in India has been added.
++
++
++Release 2014f - 2014-08-05 17:42:36 -0700
++
++  Changes affecting future time stamps
++
++    Russia will subtract an hour from most of its time zones on 2014-10-26
++    at 02:00 local time.  (Thanks to Alexander Krivenyshev.)
++    There are a few exceptions: Magadan Oblast (Asia/Magadan) and Zabaykalsky
++    Krai are subtracting two hours; conversely, Chukotka Autonomous Okrug
++    (Asia/Anadyr), Kamchatka Krai (Asia/Kamchatka), Kemerovo Oblast
++    (Asia/Novokuznetsk), and the Samara Oblast and the Udmurt Republic
++    (Europe/Samara) are not changing their clocks.  The changed zones are
++    Europe/Kaliningrad, Europe/Moscow, Europe/Simferopol, Europe/Volgograd,
++    Asia/Yekaterinburg, Asia/Omsk, Asia/Novosibirsk, Asia/Krasnoyarsk,
++    Asia/Irkutsk, Asia/Yakutsk, Asia/Vladivostok, Asia/Khandyga,
++    Asia/Sakhalin, and Asia/Ust-Nera; Asia/Magadan will have two hours
++    subtracted; and Asia/Novokuznetsk's time zone abbreviation is affected,
++    but not its UTC offset.  Two zones are added: Asia/Chita (split
++    from Asia/Yakutsk, and also with two hours subtracted) and
++    Asia/Srednekolymsk (split from Asia/Magadan, but with only one hour
++    subtracted).  (Thanks to Tim Parenti for much of the above.)
++
++  Changes affecting time zone abbreviations
++
++    Australian eastern time zone abbreviations are now AEST/AEDT not EST,
++    and similarly for the other Australian zones.  That is, for eastern
++    standard and daylight saving time the abbreviations are AEST and AEDT
++    instead of the former EST for both; similarly, ACST/ACDT, ACWST/ACWDT,
++    and AWST/AWDT are now used instead of the former CST, CWST, and WST.
++    This change does not affect UTC offsets, only time zone abbreviations.
++    (Thanks to Rich Tibbett and many others.)
++
++    Asia/Novokuznetsk shifts from NOVT to KRAT (remaining on UT +07)
++    effective 2014-10-26 at 02:00 local time.
++
++    The time zone abbreviation for Xinjiang Time (observed in Ürümqi)
++    has been changed from URUT to XJT.  (Thanks to Luther Ma.)
++
++    Prefer MSK/MSD for Moscow time in Russia, even in other cities.
++    Similarly, prefer EET/EEST for eastern European time in Russia.
++
++    Change time zone abbreviations in (western) Samoa to use "ST" and
++    "DT" suffixes, as this is more likely to match common practice.
++    Prefix "W" to (western) Samoa time when its standard-time offset
++    disagrees with that of American Samoa.
++
++    America/Metlakatla now uses PST, not MeST, to abbreviate its time zone.
++
++    Time zone abbreviations have been updated for Japan's two time
++    zones used 1896-1937.  JWST now stands for Western Standard
++    Time, and JCST for Central Standard Time (formerly this was CJT).
++    These abbreviations are now used for time in Korea, Taiwan,
++    and Sakhalin while controlled by Japan.
++
++  Changes affecting past time stamps
++
++    China's five zones have been simplified to two, since the post-1970
++    differences in the other three seem to have been imaginary.  The
++    zones Asia/Harbin, Asia/Chongqing, and Asia/Kashgar have been
++    removed; backwards-compatibility links still work, albeit with
++    different behaviors for time stamps before May 1980.  Asia/Urumqi's
++    1980 transition to UT +08 has been removed, so that it is now at
++    +06 and not +08.  (Thanks to Luther Ma and to Alois Treindl;
++    Treindl sent helpful translations of two papers by Guo Qingsheng.)
++
++    Some zones have been turned into links, when they differed from existing
++    zones only for older UTC offsets where data entries were likely invented.
++    These changes affect UTC offsets in pre-1970 time stamps only.  This is
++    similar to the change in release 2013e, except this time for western
++    Africa.  The affected zones are: Africa/Bamako, Africa/Banjul,
++    Africa/Conakry, Africa/Dakar, Africa/Freetown, Africa/Lome,
++    Africa/Nouakchott, Africa/Ouagadougou, Africa/Sao_Tome, and
++    Atlantic/St_Helena.  This also affects the backwards-compatibility
++    link Africa/Timbuktu.  (Thanks to Alan Barrett, Stephen Colebourne,
++    Tim Parenti, and David Patte for reporting problems in earlier
++    versions of this change.)
++
++    Asia/Shanghai's pre-standard-time UT offset has been changed from
++    8:05:57 to 8:05:43, the location of Xujiahui Observatory.  Its
++    transition to standard time has been changed from 1928 to 1901.
++
++    Asia/Taipei switched to JWST on 1896-01-01, then to JST on 1937-10-01,
++    then to CST on 1945-09-21 at 01:00, and did not observe DST in 1945.
++    In 1946 it observed DST from 05-15 through 09-30; in 1947
++    from 04-15 through 10-31; and in 1979 from 07-01 through 09-30.
++    (Thanks to Yu-Cheng Chuang.)
++
++    Asia/Riyadh's transition to standard time is now 1947-03-14, not 1950.
++
++    Europe/Helsinki's 1942 fall-back transition was 10-04 at 01:00, not
++    10-03 at 00:00.  (Thanks to Konstantin Hyppönen.)
++
++    Pacific/Pago_Pago has been changed from UT -11:30 to -11 for the
++    period from 1911 to 1950.
++
++    Pacific/Chatham has been changed to New Zealand standard time plus
++    45 minutes for the period before 1957, reflecting a 1956 remark in
++    the New Zealand parliament.
++
++    Europe/Budapest has several pre-1946 corrections: in 1918 the transition
++    out of DST was on 09-16, not 09-29; in 1919 it was on 11-24, not 09-15; in
++    1945 it was on 11-01, not 11-03; in 1941 the transition to DST was 04-08
++    not 04-06 at 02:00; and there was no DST in 1920.
++
++    Africa/Accra is now assumed to have observed DST from 1920 through 1935.
++
++    Time in Russia before 1927 or so has been corrected by a few seconds in
++    the following zones: Europe/Moscow, Asia/Irkutsk, Asia/Tbilisi,
++    Asia/Tashkent, Asia/Vladivostok, Asia/Yekaterinburg, Europe/Helsinki, and
++    Europe/Riga.  Also, Moscow's location has been changed to its Kilometer 0
++    point.  (Thanks to Vladimir Karpinsky for the Moscow changes.)
++
++  Changes affecting data format
++
++    A new file 'zone1970.tab' supersedes 'zone.tab' in the installed data.
++    The new file's extended format allows multiple country codes per zone.
++    The older file is still installed but is deprecated; its format is
++    not changing and it will still be distributed for a while, but new
++    applications should use the new file.
++
++    The new file format simplifies maintenance of obscure locations.
++    To test this, it adds coverage for the Crozet Islands and the
++    Scattered Islands.  (Thanks to Tobias Conradi and Antoine Leca.)
++
++    The file 'iso3166.tab' is planned to switch from ASCII to UTF-8.
++    It is still ASCII now, but commentary about the switch has been added.
++    The new file 'zone1970.tab' already uses UTF-8.
++
++  Changes affecting code
++
++    'localtime', 'mktime', etc. now use much less stack space if ALL_STATE
++    is defined.  (Thanks to Elliott Hughes for reporting the problem.)
++
++    'zic' no longer mishandles input when ignoring case in locales that
++    are not compatible with English, e.g., unibyte Turkish locales when
++    compiled with HAVE_GETTEXT.
++
++    Error diagnostics of 'zic' and 'yearistype' have been reworded so that
++    they no longer use ASCII '-' as if it were a dash.
++
++    'zic' now rejects output file names that contain '.' or '..' components.
++    (Thanks to Tim Parenti for reporting the problem.)
++
++    'zic -v' now warns about output file names that do not follow
++    POSIX rules, or that contain a digit or '.'.  (Thanks to Arthur
++    David Olson for starting the ball rolling on this.)
++
++    Some lint has been removed when using GCC_DEBUG_FLAGS with GCC 4.9.0.
++
++  Changes affecting build procedure
++
++    'zic' no longer links in localtime.o and asctime.o, as they're not needed.
++    (Thanks to John Cochran.)
++
++  Changes affecting documentation and commentary
++
++    The 'Theory' file documents legacy names, the longstanding
++    exceptions to the POSIX-inspired file name rules.
++
++    The 'zic' documentation clarifies the role of time types when
++    interpreting dates.  (Thanks to Arthur David Olson.)
++
++    Documentation and commentary now prefer UTF-8 to US-ASCII,
++    allowing the use of proper accents in foreign words and names.
++    Code and data have not changed because of this.  (Thanks to
++    Garrett Wollman, Ian Abbott, and Guy Harris for helping to debug
++    this.)
++
++    Non-HTML documentation and commentary now use plain-text URLs instead of
++    HTML insertions, and are more consistent about bracketing URLs when they
++    are not already surrounded by white space.  (Thanks to suggestions by
++    Steffen Nurpmeso.)
++
++    There is new commentary about Xujiahui Observatory, the five time-zone
++    project in China from 1918 to 1949, timekeeping in Japanese-occupied
++    Shanghai, and Tibet Time in the 1950s.  The sharp-eyed can spot the
++    warlord Jin Shuren in the data.
++
++    Commentary about the coverage of each Russian zone has been standardized.
++    (Thanks to Tim Parenti).
++
++    There is new commentary about contemporary timekeeping in Ethiopia.
++
++    Obsolete comments about a 2007 proposal for DST in Kuwait has been removed.
++
++    There is new commentary about time in Poland in 1919.
++
++    Proper credit has been given to DST inventor George Vernon Hudson.
++
++    Commentary about time in Metlakatla, AK and Resolute, NU has been
++    improved, with a new source for the former.
++
++    In zone.tab, Pacific/Easter no longer mentions Salas y Gómez, as it
++    is uninhabited.
++
++    Commentary about permanent Antarctic bases has been updated.
++
++    Several typos have been corrected.  (Thanks to Tim Parenti for
++    contributing some of these fixes.)
++
++    tz-link.htm now mentions the JavaScript libraries Moment Timezone,
++    TimezoneJS.Date, Walltime-js, and Timezone.  (Thanks to a heads-up
++    from Matt Johnson.)  Also, it mentions the Go 'latlong' package.
++    (Thanks to a heads-up from Dirkjan Ochtman.)
++
++    The files usno1988, usno1989, usno1989a, usno1995, usno1997, and usno1998
++    have been removed.  These obsolescent US Naval Observatory entries were no
++    longer helpful for maintenance.  (Thanks to Tim Parenti for the suggestion.)
++
++
++Release 2014e - 2014-06-12 21:53:52 -0700
++
++  Changes affecting near-future time stamps
++
++    Egypt's 2014 Ramadan-based transitions are June 26 and July 31 at 24:00.
++    (Thanks to Imed Chihi.)  Guess that from 2015 on Egypt will temporarily
++    switch to standard time at 24:00 the last Thursday before Ramadan, and
++    back to DST at 00:00 the first Friday after Ramadan.
++
++    Similarly, Morocco's are June 28 at 03:00 and August 2 at 02:00.  (Thanks
++    to Milamber Space Network.)  Guess that from 2015 on Morocco will
++    temporarily switch to standard time at 03:00 the last Saturday before
++    Ramadan, and back to DST at 02:00 the first Saturday after Ramadan.
++
++  Changes affecting past time stamps
++
++    The abbreviation "MSM" (Moscow Midsummer Time) is now used instead of
++    "MSD" for Moscow's double daylight time in summer 1921.  Also, a typo
++    "VLASST" has been repaired to be "VLAST" for Vladivostok summer time
++    in 1991.  (Thanks to Hank W. for reporting the problems.)
++
++  Changes affecting commentary
++
++    tz-link.htm now cites RFC 7265 for jCal, mentions PTP and the
++    draft CalDAV extension, updates URLs for TSP, TZInfo, IATA, and
++    removes stale pointers to World Time Explorer and WORLDTIME.
++
++
++Release 2014d - 2014-05-27 21:34:40 -0700
++
++  Changes affecting code
++
++    zic no longer generates files containing time stamps before the Big Bang.
++    This works around GNOME bug 730332
++    <https://bugzilla.gnome.org/show_bug.cgi?id=730332>.
++    (Thanks to Leonardo Chiquitto for reporting the bug, and to
++    Arthur David Olson and James Cloos for suggesting improvements to the fix.)
++
++  Changes affecting documentation
++
++    tz-link.htm now mentions GNOME.
++
++
++Release 2014c - 2014-05-13 07:44:13 -0700
++
++  Changes affecting near-future time stamps
++
++    Egypt observes DST starting 2014-05-15 at 24:00.
++    (Thanks to Ahmad El-Dardiry and Gunther Vermier.)
++    Details have not been announced, except that DST will not be observed
++    during Ramadan.  Guess that DST will stop during the same Ramadan dates as
++    Morocco, and that Egypt's future spring and fall transitions will be the
++    same as 2010 when it last observed DST, namely April's last Friday at
++    00:00 to September's last Thursday at 23:00 standard time.  Also, guess
++    that Ramadan transitions will be at 00:00 standard time.
++
++  Changes affecting code
++
++    zic now generates transitions for minimum time values, eliminating guesswork
++    when handling low-valued time stamps.  (Thanks to Arthur David Olson.)
++
++    Port to Cygwin sans glibc.  (Thanks to Arthur David Olson.)
++
++  Changes affecting commentary and documentation
++
++    Remove now-confusing comment about Jordan.  (Thanks to Oleksii Nochovnyi.)
++
++
++Release 2014b - 2014-03-24 21:28:50 -0700
++
++  Changes affecting near-future time stamps
++
++    Crimea switches to Moscow time on 2014-03-30 at 02:00 local time.
++    (Thanks to Alexander Krivenyshev.)  Move its zone.tab entry from UA to RU.
++
++    New entry for Troll station, Antarctica.  (Thanks to Paul-Inge Flakstad and
++    Bengt-Inge Larsson.)  This is currently an approximation; a better version
++    will require the zic and localtime fixes mentioned below, and the plan is
++    to wait for a while until at least the zic fixes propagate.
++
++  Changes affecting code
++
++    'zic' and 'localtime' no longer reject locations needing four transitions
++    per year for the foreseeable future.  (Thanks to Andrew Main (Zefram).)
++    Also, 'zic' avoids some unlikely failures due to integer overflow.
++
++  Changes affecting build procedure
++
++    'make check' now detects Rule lines defined but never used.
++    The NZAQ rules, an instance of this problem, have been removed.
++
++  Changes affecting commentary and documentation
++
++    Fix Tuesday/Thursday typo in description of time in Israel.
++    (Thanks to Bert Katz via Pavel Kharitonov and Mike Frysinger.)
++
++    Microsoft Windows 8.1 doesn't support tz database names.  (Thanks
++    to Donald MacQueen.)  Instead, the Microsoft Windows Store app
++    library supports them.
++
++    Add comments about Johnston Island time in the 1960s.
++    (Thanks to Lyle McElhaney.)
++
++    Morocco's 2014 DST start will be as predicted.
++    (Thanks to Sebastien Willemijns.)
++
++
++Release 2014a - 2014-03-07 23:30:29 -0800
++
++  Changes affecting near-future time stamps
++
++    Turkey begins DST on 2014-03-31, not 03-30.  (Thanks to Faruk Pasin for
++    the heads-up, and to Tim Parenti for simplifying the update.)
++
++  Changes affecting past time stamps
++
++    Fiji ended DST on 2014-01-19 at 02:00, not the previously-scheduled 03:00.
++    (Thanks to Steffen Thorsen.)
++
++    Ukraine switched from Moscow to Eastern European time on 1990-07-01
++    (not 1992-01-01), and observed DST during the entire next winter.
++    (Thanks to Vladimir in Moscow via Alois Treindl.)
++
++    In 1988 Israel observed DST from 04-10 to 09-04, not 04-09 to 09-03.
++    (Thanks to Avigdor Finkelstein.)
++
++  Changes affecting code
++
++    A uninitialized-storage bug in 'localtime' has been fixed.
++    (Thanks to Logan Chien.)
++
++  Changes affecting the build procedure
++
++    The settings for 'make check_web' now default to Ubuntu 13.10.
++
++  Changes affecting commentary and documentation
++
++    The boundary of the US Pacific time zone is given more accurately.
++    (Thanks to Alan Mintz.)
++
++    Chile's 2014 DST will be as predicted.  (Thanks to José Miguel Garrido.)
++
++    Paraguay's 2014 DST will be as predicted.  (Thanks to Carlos Raúl Perasso.)
++
++    Better descriptions of countries with same time zone history as
++    Trinidad and Tobago since 1970.  (Thanks to Alan Barrett for suggestion.)
++
++    Several changes affect tz-link.htm, the main web page.
++
++      Mention Time.is (thanks to Even Scharning) and WX-now (thanks to
++      David Braverman).
++
++      Mention xCal (Internet RFC 6321) and jCal.
++
++      Microsoft has some support for tz database names.
++
++      CLDR data formats include both XML and JSON.
++
++      Mention Maggiolo's map of solar vs standard time.
++      (Thanks to Arthur David Olson.)
++
++      Mention TZ4Net.  (Thanks to Matt Johnson.)
++
++      Mention the timezone-olson Haskell package.
++
++      Mention zeitverschiebung.net.  (Thanks to Martin Jäger.)
++
++      Remove moribund links to daylight-savings-time.info and to
++      Simple Timer + Clocks.
++
++      Update two links.  (Thanks to Oscar van Vlijmen.)
++
++      Fix some formatting glitches, e.g., remove random newlines from
++      abbr elements' title attributes.
++
++
++Release 2013i - 2013-12-17 07:25:23 -0800
++
++  Changes affecting near-future time stamps:
++
++    Jordan switches back to standard time at 00:00 on December 20, 2013.
++    The 2006-2011 transition schedule is planned to resume in 2014.
++    (Thanks to Steffen Thorsen.)
++
++  Changes affecting past time stamps:
++
++    In 2004, Cuba began DST on March 28, not April 4.
++    (Thanks to Steffen Thorsen.)
++
++  Changes affecting code
++
++    The compile-time flag NOSOLAR has been removed, as nowadays the
++    benefit of slightly shrinking runtime table size is outweighed by the
++    cost of disallowing potential future updates that exceed old limits.
++
++  Changes affecting documentation and commentary
++
++    The files solar87, solar88, and solar89 are no longer distributed.
++    They were a negative experiment - that is, a demonstration that
++    tz data can represent solar time only with some difficulty and error.
++    Their presence in the distribution caused confusion, as Riyadh
++    civil time was generally not solar time in those years.
++
++    tz-link.htm now mentions Noda Time.  (Thanks to Matt Johnson.)
++
++
++Release 2013h - 2013-10-25 15:32:32 -0700
++
++  Changes affecting current and future time stamps:
++
++    Libya has switched its UT offset back to +02 without DST, instead
++    of +01 with DST.  (Thanks to Even Scharning.)
++
++    Western Sahara (Africa/El_Aaiun) uses Morocco's DST rules.
++    (Thanks to Gwillim Law.)
++
++  Changes affecting future time stamps:
++
++    Acre and (we guess) western Amazonas will switch from UT -04 to -05
++    on 2013-11-10.  This affects America/Rio_Branco and America/Eirunepe.
++    (Thanks to Steffen Thorsen.)
++
++    Add entries for DST transitions in Morocco in the year 2038.
++    This avoids some year-2038 glitches introduced in 2013g.
++    (Thanks to Yoshito Umaoka for reporting the problem.)
++
++  Changes affecting API
++
++    The 'tzselect' command no longer requires the 'select' command,
++    and should now work with /bin/sh on more platforms.  It also works
++    around a bug in BusyBox awk before version 1.21.0.  (Thanks to
++    Patrick 'P. J.' McDermott and Alan Barrett.)
++
++  Changes affecting code
++
++    Fix localtime overflow bugs with 32-bit unsigned time_t.
++
++    zdump no longer assumes sscanf returns maximal values on overflow.
++
++  Changes affecting the build procedure
++
++    The builder can specify which programs to use, if any, instead of
++    'ar' and 'ranlib', and libtz.a is now built locally before being
++    installed.  (Thanks to Michael Forney.)
++
++    A dependency typo in the 'zdump' rule has been fixed.
++    (Thanks to Andrew Paprocki.)
++
++    The Makefile has been simplified by assuming that 'mkdir -p' and 'cp -f'
++    work as specified by POSIX.2-1992 or later; this is portable nowadays.
++
++    'make clean' no longer removes 'leapseconds', since it's
++    host-independent and is part of the distribution.
++
++    The unused makefile macros TZCSRCS, TZDSRCS, DATESRCS have been removed.
++
++  Changes affecting documentation and commentary
++
++    tz-link.htm now mentions TC TIMEZONE's draft time zone service protocol
++    (thanks to Mike Douglass) and TimezoneJS.Date (thanks to Jim Fehrle).
++
++    Update URLs in tz-link page.  Add URLs for Microsoft Windows, since
++    8.1 introduces tz support.  Remove URLs for Tru64 and UnixWare (no
++    longer maintained) and for old advisories.  SOFA now does C.
++
++Release 2013g - 2013-09-30 21:08:26 -0700
++
++  Changes affecting current and near-future time stamps
++
++    Morocco now observes DST from the last Sunday in March to the last
++    Sunday in October, not April to September respectively.  (Thanks
++    to Steffen Thorsen.)
++
++  Changes affecting 'zic'
++
++    'zic' now runs on platforms that lack both hard links and symlinks.
++    (Thanks to Theo Veenker for reporting the problem, for MinGW.)
++    Also, fix some bugs on platforms that lack hard links but have symlinks.
++
++    'zic -v' again warns that Asia/Tehran has no POSIX environment variable
++    to predict the far future, fixing a bug introduced in 2013e.
++
++  Changes affecting the build procedure
++
++    The 'leapseconds' file is again put into the tzdata tarball.
++    Also, 'leapseconds.awk', so tzdata is self-contained.  (Thanks to
++    Matt Burgess and Ian Abbott.)  The timestamps of these and other
++    dependent files in tarballs are adjusted more consistently.
++
++  Changes affecting documentation and commentary
++
++    The README file is now part of the data tarball as well as the code.
++    It now states that files are public domain unless otherwise specified.
++    (Thanks to Andrew Main (Zefram) for asking for clarifications.)
++    Its details about the 1989 release moved to a place of honor near
++    the end of NEWS.
++
++
++Release 2013f - 2013-09-24 23:37:36 -0700
++
++  Changes affecting near-future time stamps
++
++    Tocantins will very likely not observe DST starting this spring.
++    (Thanks to Steffen Thorsen.)
++
++    Jordan will likely stay at UT +03 indefinitely, and will not fall
++    back this fall.
++
++    Palestine will fall back at 00:00, not 01:00.  (Thanks to Steffen Thorsen.)
++
++  Changes affecting API
++
++    The types of the global variables 'timezone' and 'altzone' (if present)
++    have been changed back to 'long'.  This is required for 'timezone'
++    by POSIX, and for 'altzone' by common practice, e.g., Solaris 11.
++    These variables were originally 'long' in the tz code, but were
++    mistakenly changed to 'time_t' in 1987; nobody reported the
++    incompatibility until now.  The difference matters on x32, where
++    'long' is 32 bits and 'time_t' is 64.  (Thanks to Elliott Hughes.)
++
++  Changes affecting the build procedure
++
++    Avoid long strings in leapseconds.awk to work around a mawk bug.
++    (Thanks to Cyril Baurand.)
++
++  Changes affecting documentation and commentary
++
++    New file 'NEWS' that contains release notes like this one.
++
++    Paraguay's law does not specify DST transition time; 00:00 is customary.
++    (Thanks to Waldemar Villamayor-Venialbo.)
++
++    Minor capitalization fixes.
++
++  Changes affecting version-control only
++
++    The experimental GitHub repository now contains annotated and
++    signed tags for recent releases, e.g., '2013e' for Release 2013e.
++    Releases are tagged starting with 2012e; earlier releases were
++    done differently, and tags would either not have a simple name or
++    not exactly match what was released.
++
++    'make set-timestamps' is now simpler and a bit more portable.
++
++
++Release 2013e - 2013-09-19 23:50:04 -0700
++
++  Changes affecting near-future time stamps
++
++    This year Fiji will start DST on October 27, not October 20.
++    (Thanks to David Wheeler for the heads-up.)  For now, guess that
++    Fiji will continue to spring forward the Sunday before the fourth
++    Monday in October.
++
++  Changes affecting current and future time zone abbreviations
++
++    Use WIB/WITA/WIT rather than WIT/CIT/EIT for alphabetic Indonesian
++    time zone abbreviations since 1932.  (Thanks to George Ziegler,
++    Priyadi Iman Nurcahyo, Zakaria, Jason Grimes, Martin Pitt, and
++    Benny Lin.)  This affects Asia/Dili, Asia/Jakarta, Asia/Jayapura,
++    Asia/Makassar, and Asia/Pontianak.
++
++    Use ART (UT -03, standard time), rather than WARST (also -03, but
++    daylight saving time) for San Luis, Argentina since 2009.
++
++  Changes affecting Godthåb time stamps after 2037 if version mismatch
++
++    Allow POSIX-like TZ strings where the transition time's hour can
++    range from -167 through 167, instead of the POSIX-required 0
++    through 24.  E.g., TZ='FJT-12FJST,M10.3.1/146,M1.3.4/75' for the
++    new Fiji rules.  This is a more-compact way to represent
++    far-future time stamps for America/Godthab, America/Santiago,
++    Antarctica/Palmer, Asia/Gaza, Asia/Hebron, Asia/Jerusalem,
++    Pacific/Easter, and Pacific/Fiji.  Other zones are unaffected by
++    this change.  (Derived from a suggestion by Arthur David Olson.)
++
++    Allow POSIX-like TZ strings where daylight saving time is in
++    effect all year.  E.g., TZ='WART4WARST,J1/0,J365/25' for Western
++    Argentina Summer Time all year.  This supports a more-compact way
++    to represent the 2013d data for America/Argentina/San_Luis.
++    Because of the change for San Luis noted above this change does not
++    affect the current data.  (Thanks to Andrew Main (Zefram) for
++    suggestions that improved this change.)
++
++    Where these two TZ changes take effect, there is a minor extension
++    to the tz file format in that it allows new values for the
++    embedded TZ-format string, and the tz file format version number
++    has therefore been increased from 2 to 3 as a precaution.
++    Version-2-based client code should continue to work as before for
++    all time stamps before 2038.  Existing version-2-based client code
++    (tzcode, GNU/Linux, Solaris) has been tested on version-3-format
++    files, and typically works in practice even for time stamps after
++    2037; the only known exception is America/Godthab.
++
++  Changes affecting time stamps before 1970
++
++    Pacific/Johnston is now a link to Pacific/Honolulu.  This corrects
++    some errors before 1947.
++
++    Some zones have been turned into links, when they differ from existing
++    zones only in older data entries that were likely invented or that
++    differ only in LMT or transitions from LMT.  These changes affect
++    only time stamps before 1943.  The affected zones are:
++    Africa/Juba, America/Anguilla, America/Aruba, America/Dominica,
++    America/Grenada, America/Guadeloupe, America/Marigot,
++    America/Montserrat, America/St_Barthelemy, America/St_Kitts,
++    America/St_Lucia, America/St_Thomas, America/St_Vincent,
++    America/Tortola, and Europe/Vaduz.  (Thanks to Alois Treindl for
++    confirming that the old Europe/Vaduz zone was wrong and the new
++    link is better for WWII-era times.)
++
++    Change Kingston Mean Time from -5:07:12 to -5:07:11.  This affects
++    America/Cayman, America/Jamaica and America/Grand_Turk time stamps
++    from 1890 to 1912.
++
++    Change the UT offset of Bern Mean Time from 0:29:44 to 0:29:46.
++    This affects Europe/Zurich time stamps from 1853 to 1894.  (Thanks
++    to Alois Treindl).
++
++    Change the date of the circa-1850 Zurich transition from 1849-09-12
++    to 1853-07-16, overriding Shanks with data from Messerli about
++    postal and telegraph time in Switzerland.
++
++  Changes affecting time zone abbreviations before 1970
++
++    For Asia/Jakarta, use BMT (not JMT) for mean time from 1923 to 1932,
++    as Jakarta was called Batavia back then.
++
++  Changes affecting API
++
++    The 'zic' command now outputs a dummy transition when far-future
++    data can't be summarized using a TZ string, and uses a 402-year
++    window rather than a 400-year window.  For the current data, this
++    affects only the Asia/Tehran file.  It does not affect any of the
++    time stamps that this file represents, so zdump outputs the same
++    information as before.  (Thanks to Andrew Main (Zefram).)
++
++    The 'date' command has a new '-r' option, which lets you specify
++    the integer time to display, a la FreeBSD.
++
++    The 'tzselect' command has two new options '-c' and '-n', which lets you
++    select a zone based on latitude and longitude.
++
++    The 'zic' command's '-v' option now warns about constructs that
++    require the new version-3 binary file format.  (Thanks to Arthur
++    David Olson for the suggestion.)
++
++    Support for floating-point time_t has been removed.
++    It was always dicey, and POSIX no longer requires it.
++    (Thanks to Eric Blake for suggesting to the POSIX committee to
++    remove it, and thanks to Alan Barrett, Clive D.W. Feather, Andy
++    Heninger, Arthur David Olson, and Alois Treindl, for reporting
++    bugs and elucidating some of the corners of the old floating-point
++    implementation.)
++
++    The signatures of 'offtime', 'timeoff', and 'gtime' have been
++    changed back to the old practice of using 'long' to represent UT
++    offsets.  This had been inadvertently and mistakenly changed to
++    'int_fast32_t'.  (Thanks to Christos Zoulas.)
++
++    The code avoids undefined behavior on integer overflow in some
++    more places, including gmtime, localtime, mktime and zdump.
++
++  Changes affecting the zdump utility
++
++    zdump now outputs "UT" when referring to Universal Time, not "UTC".
++    "UTC" does not make sense for time stamps that predate the introduction
++    of UTC, whereas "UT", a more-generic term, does.  (Thanks to Steve Allen
++    for clarifying UT vs UTC.)
++
++  Data changes affecting behavior of tzselect and similar programs
++
++    Country code BQ is now called the more-common name "Caribbean Netherlands"
++    rather than the more-official "Bonaire, St Eustatius & Saba".
++
++    Remove from zone.tab the names America/Montreal, America/Shiprock,
++    and Antarctica/South_Pole, as they are equivalent to existing
++    same-country-code zones for post-1970 time stamps.  The data entries for
++    these names are unchanged, so the names continue to work as before.
++
++  Changes affecting code internals
++
++    zic -c now runs way faster on 64-bit hosts when given large numbers.
++
++    zic now uses vfprintf to avoid allocating and freeing some memory.
++
++    tzselect now computes the list of continents from the data,
++    rather than have it hard-coded.
++
++    Minor changes pacify GCC 4.7.3 and GCC 4.8.1.
++
++  Changes affecting the build procedure
++
++    The 'leapseconds' file is now generated automatically from a
++    new file 'leap-seconds.list', which is a copy of
++    <ftp://time.nist.gov/pub/leap-seconds.list>.
++    A new source file 'leapseconds.awk' implements this.
++    The goal is simplification of the future maintenance of 'leapseconds'.
++
++    When building the 'posix' or 'right' subdirectories, if the
++    subdirectory would be a copy of the default subdirectory, it is
++    now made a symbolic link if that is supported.  This saves about
++    2 MB of file system space.
++
++    The links America/Shiprock and Antarctica/South_Pole have been
++    moved to the 'backward' file.  This affects only nondefault builds
++    that omit 'backward'.
++
++  Changes affecting version-control only
++
++    .gitignore now ignores 'date'.
++
++  Changes affecting documentation and commentary
++
++    Changes to the 'tzfile' man page
++
++      It now mentions that the binary file format may be extended in
++      future versions by appending data.
++
++      It now refers to the 'zdump' and 'zic' man pages.
++
++    Changes to the 'zic' man page
++
++      It lists conditions that elicit a warning with '-v'.
++
++      It says that the behavior is unspecified when duplicate names
++      are given, or if the source of one link is the target of another.
++
++      Its examples are updated to match the latest data.
++
++      The definition of white space has been clarified slightly.
++      (Thanks to Michael Deckers.)
++
++    Changes to the 'Theory' file
++
++      There is a new section about the accuracy of the tz database,
++      describing the many ways that errors can creep in, and
++      explaining why so many of the pre-1970 time stamps are wrong or
++      misleading (thanks to Steve Allen, Lester Caine, and Garrett
++      Wollman for discussions that contributed to this).
++
++      The 'Theory' file describes LMT better (this follows a
++      suggestion by Guy Harris).
++
++      It refers to the 2013 edition of POSIX rather than the 2004 edition.
++
++      It's mentioned that excluding 'backward' should not affect the
++      other data, and it suggests at least one zone.tab name per
++      inhabited country (thanks to Stephen Colebourne).
++
++      Some longstanding restrictions on names are documented, e.g.,
++      'America/New_York' precludes 'America/New_York/Bronx'.
++
++      It gives more reasons for the 1970 cutoff.
++
++      It now mentions which time_t variants are supported, such as
++      signed integer time_t.  (Thanks to Paul Goyette for reporting
++      typos in an experimental version of this change.)
++
++      (Thanks to Philip Newton for correcting typos in these changes.)
++
++    Documentation and commentary is more careful to distinguish UT in
++    general from UTC in particular.  (Thanks to Steve Allen.)
++
++    Add a better source for the Zurich 1894 transition.
++    (Thanks to Pierre-Yves Berger.)
++
++    Update shapefile citations in tz-link.htm.  (Thanks to Guy Harris.)
++
++
++Release 2013d - 2013-07-05 07:38:01 -0700
++
++  Changes affecting future time stamps:
++
++    Morocco's midsummer transitions this year are July 7 and August 10,
++    not July 9 and August 8.  (Thanks to Andrew Paprocki.)
++
++    Israel now falls back on the last Sunday of October.
++    (Thanks to Ephraim Silverberg.)
++
++  Changes affecting past time stamps:
++
++    Specify Jerusalem's location more precisely; this changes the pre-1880
++    times by 2 s.
++
++  Changing affecting metadata only:
++
++    Fix typos in the entries for country codes BQ and SX.
++
++  Changes affecting code:
++
++    Rework the code to fix a bug with handling Australia/Macquarie on
++    32-bit hosts (thanks to Arthur David Olson).
++
++    Port to platforms like NetBSD, where time_t can be wider than long.
++
++    Add support for testing time_t types other than the system's.
++    Run 'make check_time_t_alternatives' to try this out.
++    Currently, the tests fail for unsigned time_t;
++    this should get fixed at some point.
++
++  Changes affecting documentation and commentary:
++
++    Deemphasize the significance of national borders.
++
++    Update the zdump man page.
++
++    Remove obsolete NOID comment (thanks to Denis Excoffier).
++
++    Update several URLs and comments in the web pages.
++
++    Spelling fixes (thanks to Kevin Lyda and Jonathan Leffler).
++
++    Update URL for CLDR Zone->Tzid table (thanks to Yoshito Umaoka).
++
++
++Release 2013c - 2013-04-19 16:17:40 -0700
++
++  Changes affecting current and future time stamps:
++
++    Palestine observed DST starting March 29, 2013.  (Thanks to
++    Steffen Thorsen.)  From 2013 on, Gaza and Hebron both observe DST,
++    with the predicted rules being the last Thursday in March at 24:00
++    to the first Friday on or after September 21 at 01:00.
++
++    Assume that the recent change to Paraguay's DST rules is permanent,
++    by moving the end of DST to the 4th Sunday in March every year.
++    (Thanks to Carlos Raúl Perasso.)
++
++  Changes affecting past time stamps:
++
++    Fix some historical data for Palestine to agree with that of
++    timeanddate.com, as follows:
++
++	  The spring 2008 change in Gaza and Hebron was on 00:00 Mar 28, not
++	  00:00 Apr 1.
++
++	  The fall 2009 change in Gaza and Hebron on Sep 4 was at 01:00, not
++	  02:00.
++
++	  The spring 2010 change in Hebron was 00:00 Mar 26, not 00:01 Mar 27.
++
++	  The spring 2011 change in Gaza was 00:01 Apr 1, not 12:01 Apr 2.
++
++	  The spring 2011 change in Hebron on Apr 1 was at 00:01, not 12:01.
++
++	  The fall 2011 change in Hebron on Sep 30 was at 00:00, not 03:00.
++
++    Fix times of habitation for Macquarie to agree with the Tasmania
++    Parks & Wildlife Service history, which indicates that permanent
++    habitation was 1899-1919 and 1948 on.
++
++  Changing affecting metadata only:
++
++    Macquarie Island is politically part of Australia, not Antarctica.
++    (Thanks to Tobias Conradi.)
++
++    Sort Macquarie more-consistently with other parts of Australia.
++    (Thanks to Tim Parenti.)
++
++
++Release 2013b - 2013-03-10 22:33:40 -0700
++
++  Changes affecting current and future time stamps:
++
++    Haiti uses US daylight-saving rules this year, and presumably future years.
++    This changes time stamps starting today.  (Thanks to Steffen Thorsen.)
++
++    Paraguay will end DST on March 24 this year.
++    (Thanks to Steffen Thorsen.)  For now, assume it's just this year.
++
++    Morocco does not observe DST during Ramadan;
++    try to predict Ramadan in Morocco as best we can.
++    (Thanks to Erik Homoet for the heads-up.)
++
++  Changes affecting commentary:
++
++    Update URLs in tz-link page.  Add URLs for webOS, BB10, iOS.
++    Update URL for Solaris.  Mention Internet RFC 6557.
++    Update Internet RFCs 2445->5545, 2822->5322.
++    Switch from FTP to HTTP for Internet RFCs.
++
++
++Release 2013a - 2013-02-27 09:20:35 -0800
++
++  Change affecting binary data format:
++
++    The zone offset at the end of version-2-format zone files is now
++    allowed to be 24:00, as per POSIX.1-2008.  (Thanks to Arthur David Olson.)
++
++  Changes affecting current and future time stamps:
++
++    Chile's 2013 rules, and we guess rules for 2014 and later, will be
++    the same as 2012, namely Apr Sun>=23 03:00 UTC to Sep Sun>=2 04:00 UTC.
++    (Thanks to Steffen Thorsen and Robert Elz.)
++
++    New Zones Asia/Khandyga, Asia/Ust-Nera, Europe/Busingen.
++    (Thanks to Tobias Conradi and Arthur David Olson.)
++
++  Many changes affect historical time stamps before 1940.
++  These were deduced from: Milne J. Civil time. Geogr J. 1899
++  Feb;13(2):173-94 <http://www.jstor.org/stable/1774359>.
++
++  Changes affecting the code:
++
++    Fix zic bug that mishandled Egypt's 2010 changes (this also affected
++    the data).  (Thanks to Arthur David Olson.)
++
++    Fix localtime bug when time_t is unsigned and data files were generated
++    by a signed time_t system.  (Thanks to Doug Bailey for reporting and
++    to Arthur David Olson for fixing.)
++
++    Allow the email address for bug reports to be set by the packager.
++    The default is tz@iana.org, as before.  (Thanks to Joseph S. Myers.)
++
++    Update HTML checking to be compatible with Ubuntu 12.10.
++
++    Check that files are a safe subset of ASCII.  At some point we may
++    relax this requirement to a safe subset of UTF-8.  Without the
++    check, some non-UTF-8 encodings were leaking into the distribution.
++
++  Commentary changes:
++
++    Restore a comment about copyright notices that was inadvertently deleted.
++    (Thanks to Arthur David Olson.)
++
++    Improve the commentary about which districts observe what times
++    in Russia.  (Thanks to Oscar van Vlijmen and Arthur David Olson).
++
++    Add web page links to tz.js.
++
++    Add "Run by the Monkeys" to tz-art.  (Thanks to Arthur David Olson.)
++
++
++Release 2012j - 2012-11-12 18:34:49 -0800
++
++  Libya moved to CET this weekend, but with DST planned next year.
++  (Thanks to Even Scharning, Steffen Thorsen, and Tim Parenti.)
++
++  Signatures now have the extension .asc, not .sign, as that's more
++  standard.  (Thanks to Phil Pennock.)
++
++  The output of 'zdump --version', and of 'zic --version', now
++  uses a format that is more typical for --version.
++  (Thanks to Joseph S. Myers.)
++
++  The output of 'tzselect --help', 'zdump --help', and 'zic --help'
++  now uses tz@iana.org rather than the old elsie address.
++
++  zic -v now complains about abbreviations that are less than 3
++  or more than 6 characters, as per Posix.  Formerly, it checked
++  for abbreviations that were more than 3.
++
++  'make public' no longer puts its temporary directory under /tmp,
++  and uses the just-built zic rather than the system zic.
++
++  Various fixes to documentation and commentary.
++
++
++Release 2012i - 2012-11-03 12:57:09 -0700
++
++  Cuba switches from DST tomorrow at 01:00.  (Thanks to Steffen Thorsen.)
++
++  Linker flags can now be specified via LDFLAGS.
++  AWK now defaults to 'awk', not 'nawk'.
++  The shell in tzselect now defaults to /bin/bash, but this can
++  be overridden by specifying KSHELL.
++  The main web page now mentions the unofficial GitHub repository.
++  (Thanks to Mike Frysinger.)
++
++  Tarball signatures can now be built by running 'make signatures'.
++  There are also new makefile rules 'tarballs', 'check_public', and
++  separate makefile rules for each tarball and signature file.
++  A few makefile rules are now more portable to strict POSIX.
++
++  The main web page now lists the canonical IANA URL.
++
++
++Release 2012h - 2012-10-26 22:49:10 -0700
++
++  Bahia no longer has DST.  (Thanks to Kelley Cook.)
++
++  Tocantins has DST.  (Thanks to Rodrigo Severo.)
++
++  Israel has new DST rules next year.  (Thanks to Ephraim Silverberg.)
++
++  Jordan stays on DST this winter.  (Thanks to Steffen Thorsen.)
++
++  Web page updates.
++
++  More C modernization, except that at Arthur David Olson's suggestion
++  the instances of 'register' were kept.
++
++
++Release 2012g - 2012-10-17 20:59:45 -0700
++
++  Samoa fall 2012 and later.  (Thanks to Nicholas Pereira and Robert Elz.)
++
++  Palestine fall 2012.  (Thanks to Steffen Thorsen.)
++
++  Assume C89.
++
++  To attack the version-number problem, this release ships the file
++  'Makefile' (which contains the release number) in both the tzcode and
++  the tzdata tarballs.  The two Makefiles are identical, and should be
++  identical in any matching pair of tarballs, so it shouldn't matter
++  which order you extract the tarballs.  Perhaps we can come up with a
++  better version-number scheme at some point; this scheme does have the
++  virtue of not adding more files.
++
++
++Release 2012f - 2012-09-12 23:17:03 -0700
++
++  * australasia (Pacific/Fiji): Fiji DST is October 21 through January
++    20 this year.  (Thanks to Steffen Thorsen.)
++
++
++Release 2012e - 2012-08-02 20:44:55 -0700
++
++  * australasia (Pacific/Fakaofo): Tokelau is UT +13, not +14.
++    (Thanks to Steffen Thorsen.)
++
++  * Use a single version number for both code and data.
++
++  * .gitignore: New file.
++
++  * Remove trailing white space.
++
++
++Release code2012c-data2012d - 2012-07-19 16:35:33 -0700
++
++  Changes for Morocco's time stamps, which take effect in a couple of
++  hours, along with infrastructure changes to accommodate how the tz
++  code and data are released on IANA.
++
++
++Release data2012c - 2012-03-27 12:17:25 -0400
++
++  africa
++	Summer time changes for Morocco (to start late April 2012)
++
++  asia
++	Changes for 2012 for Gaza & the West Bank (Hebron) and Syria
++
++  northamerica
++	Haiti following US/Canada rules for 2012 (and we're assuming,
++	for now anyway, for the future).
++
++
++Release 2012b - 2012-03-02 12:29:15 +0700
++
++  There is just one change to tzcode2012b (compared with 2012a):
++  the Makefile that was accidentally included with 2012a has been
++  replaced with the version that should have been there, which is
++  identical with the previous version (from tzcode2011i).
++
++  There are just two changes in tzdata2012b compared with 2012a.
++
++  Most significantly, summer time in Cuba has been delayed 3 weeks
++  (now starts April 1 rather than March 11).   Since Mar 11 (the old start
++  date, as listed in 2012a) is just a little over a week away, this
++  change is urgent.
++
++  Less importantly, an excess tab in one of the changes in zone.tab
++  in 2012a has been removed.
++
++
++Release 2012a - 2012-03-01 18:28:10 +0700
++
++  The changes in tzcode2012a (compared to the previous version, 2011i)
++  are entirely to the README and tz-art.htm and tz-link.htm files, if
++  none of those concern you, you can ignore the code update.  The changes
++  reflect the changed addresses for the mailing list and the code and
++  data distribution points & methods (and a link to DateTime::TimeZone::Tzfile
++  has been added to tz-link.htm).
++
++  In tzdata2012a (compared to the previous release, which was 2011n)
++  the major changes are:
++	Chile 2011/2012 and 2012/2013 summer time date adjustments.
++	Falkland Islands onto permanent summer time (we're assuming for the
++		foreseeable future, though 2012 is all we're fairly certain of.)
++	Armenia has abolished Summer Time.
++	Tokelau jumped the International Date Line back last December
++		(just the same as their near neighbour, Samoa).
++	America/Creston is a new zone for a small area of British Columbia
++	There will be a leapsecond 2012-06-30 23:59:60 UTC.
++
++  Other minor changes are:
++	Corrections to 1918 Canadian summer time end dates.
++	Updated URL for UK time zone history (in comments)
++	A few typos in Le Corre's list of free French place names (comments)
++
++
++Release data2011n - 2011-10-30 14:57:54 +0700
++
++  There are three changes of note - most urgently, Cuba (America/Havana)
++  has extended summer time by two weeks, now to end on Nov 13, rather than
++  the (already past) Oct 30.   Second, the Pridnestrovian Moldavian Republic
++  (Europe/Tiraspol) decided not to split from the rest of Moldova after
++  all, and consequently that zone has been removed (again) and reinstated
++  in the "backward" file as a link to Europe/Chisinau.   And third, the
++  end date for Fiji's summer time this summer was moved forward from the
++  earlier planned Feb 26, to Jan 22.
++
++  Apart from that, Moldova (MD) returns to a single entry in zone.tab
++  (and the incorrect syntax that was in the 2011m version of that file
++  is so fixed - it would have been fixed in a different way had this
++  change not happened - that's the "missing" sccs version id).
++
++
++Release data2011m - 2011-10-24 21:42:16 +0700
++
++  In particular, the typos in comments in the data (2011-11-17 should have
++  been 2011-10-17 as Alan Barrett noted, and spelling of Tiraspol that
++  Tim Parenti noted) have been fixed, and the change for Ukraine has been
++  made in all 4 Ukrainian zones, rather than just Kiev (again, thanks to
++  Tim Parenti, and also Denys Gavrysh)
++
++  In addition, I added Europe/Tiraspol to zone.tab.
++
++  This time, all the files have new version numbers...  (including the files
++  otherwise unchanged in 2011m that were changed in 2011l but didn't get new
++  version numbers there...)
++
++
++Release data2011l - 2011-10-10 11:15:43 +0700
++
++  There are just 2 changes that cause different generated tzdata files from
++  zic, to Asia/Hebron and Pacific/Fiji - the possible change for Bahia, Brazil
++  is included, but commented out.  Compared with the diff I sent out last week,
++  this version also includes attributions for the sources for the changes
++  (in much the same format as ado used, but the html tags have not been
++  checked, verified, or used in any way at all, so if there are errors there,
++  please let me know.)
++
++
++Release data2011k - 2011-09-20 17:54:03 -0400
++
++  [not summarized]
++
++
++Release data2011j - 2011-09-12 09:22:49 -0400
++
++  (contemporary changes for Samoa; past changes for Kenya, Uganda, and
++  Tanzania); there are also two spelling corrections to comments in
++  the australasia file (with thanks to Christos Zoulas).
++
++
++Release 2011i - 2011-08-29 05:56:32 -0400
++
++  [not summarized]
++
++
++Release data2011h - 2011-06-15 18:41:48 -0400
++
++  Russia and Curaçao changes
++
++
++Release 2011g - 2011-04-25 09:07:22 -0400
++
++  update the rules for Egypt to reflect its abandonment of DST this year
++
++
++Release 2011f - 2011-04-06 17:14:53 -0400
++
++  [not summarized]
++
++
++Release 2011e - 2011-03-31 16:04:38 -0400
++
++  Morocco, Chile, and tz-link changes
++
++
++Release 2011d - 2011-03-14 09:18:01 -0400
++
++  changes that impact present-day time stamps in Cuba, Samoa, and Turkey
++
++
++Release 2011c - 2011-03-07 09:30:09 -0500
++
++  These do affect current time stamps in Chile and Annette Island, Canada.
++
++
++Release 2011b - 2011-02-07 08:44:50 -0500
++
++  [not summarized]
++
++
++Release 2011a - 2011-01-24 10:30:16 -0500
++
++  [not summarized]
++
++
++Release data2010o - 2010-11-01 09:18:23 -0400
++
++  change to the end of DST in Fiji in 2011
++
++
++Release 2010n - 2010-10-25 08:19:17 -0400
++
++  [not summarized]
++
++
++Release 2010m - 2010-09-27 09:24:48 -0400
++
++  Hong Kong, Vostok, and zic.c changes
++
++
++Release 2010l - 2010-08-16 06:57:25 -0400
++
++  [not summarized]
++
++
++Release 2010k - 2010-07-26 10:42:27 -0400
++
++  [not summarized]
++
++
++Release 2010j - 2010-05-10 09:07:48 -0400
++
++  changes for Bahía de Banderas and for version naming
++
++
++Release data2010i - 2010-04-16 18:50:45 -0400
++
++  the end of DST in Morocco on 2010-08-08
++
++
++Release data2010h - 2010-04-05 09:58:56 -0400
++
++  [not summarized]
++
++
++Release data2010g - 2010-03-24 11:14:53 -0400
++
++  [not summarized]
++
++
++Release 2010f - 2010-03-22 09:45:46 -0400
++
++  [not summarized]
++
++
++Release data2010e - 2010-03-08 14:24:27 -0500
++
++  corrects the Dhaka bug found by Danvin Ruangchan
++
++
++Release data2010d - 2010-03-06 07:26:01 -0500
++
++  [not summarized]
++
++
++Release 2010c - 2010-03-01 09:20:58 -0500
++
++  changes including KRE's suggestion for earlier initialization of
++  "goahead" and "goback" structure elements
++
++
++Release code2010a - 2010-02-16 10:40:04 -0500
++
++  [not summarized]
++
++
++Release data2010b - 2010-01-20 12:37:01 -0500
++
++  Mexico changes
++
++
++Release data2010a - 2010-01-18 08:30:04 -0500
++
++  changes to Dhaka
++
++
++Release data2009u - 2009-12-26 08:32:28 -0500
++
++  changes to DST in Bangladesh
++
++
++Release 2009t - 2009-12-21 13:24:27 -0500
++
++  [not summarized]
++
++
++Release data2009s - 2009-11-14 10:26:32 -0500
++
++  (cosmetic) Antarctica change and the DST-in-Fiji-in-2009-and-2010 change
++
++
++Release 2009r - 2009-11-09 10:10:31 -0500
++
++  "antarctica" and "tz-link.htm" changes
++
++
++Release 2009q - 2009-11-02 09:12:40 -0500
++
++  with two corrections as reported by Eric Muller and Philip Newton
++
++
++Release data2009p - 2009-10-23 15:05:27 -0400
++
++  Argentina (including San Luis) changes (with the correction from
++  Mariano Absatz)
++
++
++Release data2009o - 2009-10-14 16:49:38 -0400
++
++  Samoa (commentary only), Pakistan, and Bangladesh changes
++
++
++Release data2009n - 2009-09-22 15:13:38 -0400
++
++  added commentary for Argentina and a change to the end of DST in
++  2009 in Pakistan
++
++
++Release data2009m - 2009-09-03 10:23:43 -0400
++
++  Samoa and Palestine changes
++
++
++Release data2009l - 2009-08-14 09:13:07 -0400
++
++  Samoa (comments only) and Egypt
++
++
++Release 2009k - 2009-07-20 09:46:08 -0400
++
++  [not summarized]
++
++
++Release data2009j - 2009-06-15 06:43:59 -0400
++
++  Bangladesh change (with a short turnaround since the DST change is
++  impending)
++
++
++Release 2009i - 2009-06-08 09:21:22 -0400
++
++  updating for DST in Bangladesh this year
++
++
++Release 2009h - 2009-05-26 09:19:14 -0400
++
++  [not summarized]
++
++
++Release data2009g - 2009-04-20 16:34:07 -0400
++
++  Cairo
++
++
++Release data2009f - 2009-04-10 11:00:52 -0400
++
++  correct DST in Pakistan
++
++
++Release 2009e - 2009-04-06 09:08:11 -0400
++
++  [not summarized]
++
++
++Release 2009d - 2009-03-23 09:38:12 -0400
++
++  Morocco, Tunisia, Argentina, and American Astronomical Society changes
++
++
++Release data2009c - 2009-03-16 09:47:51 -0400
++
++  change to the start of Cuban DST
++
++
++Release 2009b - 2009-02-09 11:15:22 -0500
++
++  [not summarized]
++
++
++Release 2009a - 2009-01-21 10:09:39 -0500
++
++  [not summarized]
++
++
++Release data2008i - 2008-10-21 12:10:25 -0400
++
++  southamerica and zone.tab files, with Argentina DST rule changes and
++  United States zone reordering and recommenting
++
++
++Release 2008h - 2008-10-13 07:33:56 -0400
++
++  [not summarized]
++
++
++Release 2008g - 2008-10-06 09:03:18 -0400
++
++  Fix a broken HTML anchor and update Brazil's DST transitions;
++  there's also a slight reordering of information in tz-art.htm.
++
++
++Release data2008f - 2008-09-09 22:33:26 -0400
++
++  [not summarized]
++
++
++Release 2008e - 2008-07-28 14:11:17 -0400
++
++  changes by Arthur David Olson and Jesper Nørgaard Welen
++
++
++Release data2008d - 2008-07-07 09:51:38 -0400
++
++  changes by Arthur David Olson, Paul Eggert, and Rodrigo Severo
++
++
++Release data2008c - 2008-05-19 17:48:03 -0400
++
++  Pakistan, Morocco, and Mongolia
++
++
++Release data2008b - 2008-03-24 08:30:59 -0400
++
++  including renaming Asia/Calcutta to Asia/Kolkata, with a backward
++  link provided
++
++
++Release 2008a - 2008-03-08 05:42:16 -0500
++
++  [not summarized]
++
++
++Release 2007k - 2007-12-31 10:25:22 -0500
++
++  most importantly, changes to the "southamerica" file based on
++  Argentina's readoption of daylight saving time
++
++
++Release 2007j - 2007-12-03 09:51:01 -0500
++
++  1. eliminate the "P" (parameter) macro;
++
++  2. the "noncontroversial" changes circulated on the time zone
++  mailing list (less the changes to "logwtmp.c");
++
++  3. eliminate "too many transition" errors when "min" is used in time
++  zone rules;
++
++  4. changes by Paul Eggert (including updated information for Venezuela).
++
++
++Release data2007i - 2007-10-30 10:28:11 -0400
++
++  changes for Cuba and Syria
++
++
++Release 2007h - 2007-10-01 10:05:51 -0400
++
++  changes by Paul Eggert, as well as an updated link to the ICU
++  project in tz-link.htm
++
++
++Release 2007g - 2007-08-20 10:47:59 -0400
++
++  changes by Paul Eggert
++
++  The "leapseconds" file has been updated to incorporate the most
++  recent International Earth Rotation and Reference Systems Service
++  (IERS) bulletin.
++
++  There's an addition to tz-art.htm regarding the television show "Medium".
++
++
++Release 2007f - 2007-05-07 10:46:46 -0400
++
++  changes by Paul Eggert (including Haiti, Turks and Caicos, and New
++  Zealand)
++
++  changes to zic.c to allow hour values greater than 24 (along with
++  Paul's improved time value overflow checking)
++
++
++Release 2007e - 2007-04-02 10:11:52 -0400
++
++  Syria and Honduras changes by Paul Eggert
++
++  zic.c variable renaming changes by Arthur David Olson
++
++
++Release 2007d - 2007-03-20 08:48:30 -0400
++
++  changes by Paul Eggert
++
++  the elimination of white space at the ends of lines
++
++
++Release 2007c - 2007-02-26 09:09:37 -0500
++
++  changes by Paul Eggert
++
++
++Release 2007b - 2007-02-12 09:34:20 -0500
++
++  Paul Eggert's proposed change to the quotation handling logic in zic.c.
++
++  changes to the commentary in "leapseconds" reflecting the IERS
++  announcement that there is to be no positive leap second at the end
++  of June 2007.
++
++
++Release 2007a - 2007-01-08 12:28:29 -0500
++
++  changes by Paul Eggert
++
++  Derick Rethan's Asmara change
++
++  Oscar van Vlijmen's Easter Island local mean time change
++
++  symbolic link changes
++
++
++Release 2006p - 2006-11-27 08:54:27 -0500
++
++  changes by Paul Eggert
++
++
++Release 2006o - 2006-11-06 09:18:07 -0500
++
++  changes by Paul Eggert
++
++
++Release 2006n - 2006-10-10 11:32:06 -0400
++
++  changes by Paul Eggert
++
++
++Release 2006m - 2006-10-02 15:32:35 -0400
++
++  changes for Uruguay, Palestine, and Egypt by Paul Eggert
++
++  (minimalist) changes to zic.8 to clarify "until" information
++
++
++Release data2006l - 2006-09-18 12:58:11 -0400
++
++  Paul's best-effort work on this coming weekend's Egypt time change
++
++
++Release 2006k - 2006-08-28 12:19:09 -0400
++
++  changes by Paul Eggert
++
++
++Release 2006j - 2006-08-21 09:56:32 -0400
++
++  changes by Paul Eggert
++
++
++Release code2006i - 2006-08-07 12:30:55 -0400
++
++  localtime.c fixes
++
++  Ken Pizzini's conversion script
++
++
++Release code2006h - 2006-07-24 09:19:37 -0400
++
++  adds public domain notices to four files
++
++  includes a fix for transition times being off by a second
++
++  adds a new recording to the "arts" file (information courtesy Colin Bowern)
++
++
++Release 2006g - 2006-05-08 17:18:09 -0400
++
++  northamerica changes by Paul Eggert
++
++
++Release 2006f - 2006-05-01 11:46:00 -0400
++
++  a missing version number problem is fixed (with thanks to Bradley
++  White for catching the problem)
++
++
++Release 2006d - 2006-04-17 14:33:43 -0400
++
++  changes by Paul Eggert
++
++  added new items to tz-arts.htm that were found by Paul
++
++
++Release 2006c - 2006-04-03 10:09:32 -0400
++
++  two sets of data changes by Paul Eggert
++
++  a fencepost error fix in zic.c
++
++  changes to zic.c and the "europe" file to minimize differences
++  between output produced by the old 32-bit zic and the new 64-bit
++  version
++
++
++Release 2006b - 2006-02-20 10:08:18 -0500
++  [tz32code2006b + tz64code2006b + tzdata2006b]
++
++  64-bit code
++
++  All SCCS IDs were bumped to "8.1" for this release.
++
++
++Release 2006a - 2006-01-30 08:59:31 -0500
++
++  changes by Paul Eggert (in particular, Indiana time zone moves)
++
++  an addition to the zic manual page to describe how special-case
++  transitions are handled
++
++
++Release 2005r - 2005-12-27 09:27:13 -0500
++
++  Canadian changes by Paul Eggert
++
++  They also add "<pre>" directives to time zone data files and reflect
++  changes to warning message logic in "zdump.c" (but with calls to
++  "gettext" kept unbundled at the suggestion of Ken Pizzini).
++
++
++Release 2005q - 2005-12-13 09:17:09 -0500
++
++  Nothing earth-shaking here:
++	1.  Electronic mail addresses have been removed.
++	2.  Casts of the return value of exit have been removed.
++	3.  Casts of the argument of is.* macros have been added.
++	4.  Indentation in one section of zic.c has been fixed.
++	5.  References to dead URLs in the data files have been dealt with.
++
++
++Release 2005p - 2005-12-05 10:30:53 -0500
++
++  "systemv", "tz-link.htm", and "zdump.c" changes
++  (less the casts of arguments to the is* macros)
++
++
++Release 2005o - 2005-11-28 10:55:26 -0500
++
++  Georgia, Cuba, Nicaragua, and Jordan changes by Paul Eggert
++
++  zdump.c lint fixes by Arthur David Olson
++
++
++Release 2005n - 2005-10-03 09:44:09 -0400
++
++  changes by Paul Eggert (both the Uruguay changes and the Kyrgyzstan
++  et al. changes)
++
++
++Release 2005m - 2005-08-29 12:15:40 -0400
++
++  changes by Paul Eggert (with a small tweak to the tz-art change)
++
++  a declaration of an unused variable has been removed from zdump.c
++
++
++Release 2005l - 2005-08-22 12:06:39 -0400
++
++  changes by Paul Eggert
++
++  overflow/underflow checks by Arthur David Olson, minus changes to
++  the "Theory" file about the pending addition of 64-bit data (I grow
++  less confident of the changes being accepted with each passing day,
++  and the changes no longer increase the data files nine-fold--there's
++  less than a doubling in size by my local Sun's reckoning)
++
++
++Release 2005k - 2005-07-14 14:14:24 -0400
++
++  The "leapseconds" file has been edited to reflect the recently
++  announced leap second at the end of 2005.
++
++  I've also deleted electronic mail addresses from the files as an
++  anti-spam measure.
++
++
++Release 2005j - 2005-06-13 14:34:13 -0400
++
++  These reflect changes to limit the length of time zone abbreviations
++  and the characters used in those abbreviations.
++
++  There are also changes to handle POSIX-style "quoted" time zone
++  environment variables.
++
++  The changes were circulated on the time zone mailing list; the only
++  change since then was the removal of a couple of minimum-length of
++  abbreviation checks.
++
++
++Release data2005i - 2005-04-21 15:04:16 -0400
++
++  changes (most importantly to Nicaragua and Haiti) by Paul Eggert
++
++
++Release 2005h - 2005-04-04 11:24:47 -0400
++
++  changes by Paul Eggert
++
++  minor changes to Makefile and zdump.c to produce more useful output
++  when doing a "make typecheck"
++
++
++Release 2005g - 2005-03-14 10:11:21 -0500
++
++  changes by Paul Eggert (a change to current DST rules in Uruguay and
++  an update to a link to time zone software)
++
++
++Release 2005f - 2005-03-01 08:45:32 -0500
++
++  data and documentation changes by Paul Eggert
++
++
++Release 2005e - 2005-02-10 15:59:44 -0500
++
++  [not summarized]
++
++
++Release code2005d - 2005-01-31 09:21:47 -0500
++
++  make zic complain about links to links if the -v flag is used
++
++  have "make public" do more code checking
++
++  add an include to "localtime.c" for the benefit of gcc systems
++
++
++Release 2005c - 2005-01-17 18:36:29 -0500
++
++  get better results when mktime runs on a system where time_t is double
++
++  changes to the data files (most importantly to Paraguay)
++
++
++Release 2005b - 2005-01-10 09:19:54 -0500
++
++  Get localtime and gmtime working on systems with exotic time_t types.
++
++  Update the leap second commentary in the "leapseconds" file.
++
++
++Release 2005a - 2005-01-01 13:13:44 -0500
++
++  [not summarized]
++
++
++Release code2004i - 2004-12-14 13:42:58 -0500
++
++  Deal with systems where time_t is unsigned.
++
++
++Release code2004h - 2004-12-07 11:40:18 -0500
++
++  64-bit-time_t changes
++
++
++Release 2004g - 2004-11-02 09:06:01 -0500
++
++  update to Cuba (taking effect this weekend)
++
++  other changes by Paul Eggert
++
++  correction of the spelling of Oslo
++
++  changed versions of difftime.c and private.h
++
++
++Release code2004f - 2004-10-21 10:25:22 -0400
++
++  Cope with wide-ranging tm_year values.
++
++
++Release 2004e - 2004-10-11 14:47:21 -0400
++
++  Brazil/Argentina/Israel changes by Paul Eggert
++
++  changes to tz-link.htm by Paul
++
++  one small fix to Makefile
++
++
++Release 2004d - 2004-09-22 08:27:29 -0400
++
++  Avoid overflow problems when TM_YEAR_BASE is added to an integer.
++
++
++Release 2004c - 2004-08-11 12:06:26 -0400
++
++  asctime-related changes
++
++  (variants of) some of the documentation changes suggested by Paul Eggert
++
++
++Release 2004b - 2004-07-19 14:33:35 -0400
++
++  data changes by Paul Eggert - most importantly, updates for Argentina
++
++
++Release 2004a - 2004-05-27 12:00:47 -0400
++
++  changes by Paul Eggert
++
++  Handle DST transitions that occur at the end of a month in some
++  years but at the start of the following month in other years.
++
++  Add a copy of the correspondence that's the basis for claims about
++  DST in the Navajo Nation.
++
++
++Release 2003e - 2003-12-15 09:36:47 -0500
++
++  changes by Arthur David Olson (primarily code changes)
++
++  changes by Paul Eggert (primarily data changes)
++
++  minor changes to "Makefile" and "northamerica" (in the latter case,
++  optimization of the "Toronto" rules)
++
++
++Release 2003d - 2003-10-06 09:34:44 -0400
++
++  changes by Paul Eggert
++
++
++Release 2003c - 2003-09-16 10:47:05 -0400
++
++  Fix bad returns in zic.c's inleap function.
++  Thanks to Bradley White for catching the problem!
++
++
++Release 2003b - 2003-09-16 07:13:44 -0400
++
++  Add a "--version" option (and documentation) to the zic and zdump commands.
++
++  changes to overflow/underflow checking in zic
++
++  a localtime typo fix.
++
++  Update the leapseconds and tz-art.htm files.
++
++
++Release 2003a - 2003-03-24 09:30:54 -0500
++
++  changes by Paul Eggert
++
++  a few additions and modifications to the tz-art.htm file
++
++
++Release 2002d - 2002-10-15 13:12:42 -0400
++
++  changes by Paul Eggert, less the "Britain (UK)" change in iso3166.tab
++
++  There's also a new time zone quote in "tz-art.htm".
++
++
++Release 2002c - 2002-04-04 11:55:20 -0500
++
++  changes by Paul Eggert
++
++  Change zic.c to avoid creating symlinks to files that don't exist.
++
++
++Release 2002b - 2002-01-28 12:56:03 -0500
++
++  [These change notes are for Release 2002a, which was corrupted.
++  2002b was a corrected version of 2002a.]
++
++  changes by Paul Eggert
++
++  Update the "leapseconds" file to note that there'll be no leap
++  second at the end of June, 2002.
++
++  Change "zic.c" to deal with a problem in handling the "Asia/Bishkek" zone.
++
++  Change to "difftime.c" to avoid sizeof problems.
++
++
++Release 2001d - 2001-10-09 13:31:32 -0400
++
++  changes by Paul Eggert
++
++
++Release 2001c - 2001-06-05 13:59:55 -0400
++
++  changes by Paul Eggert and Andrew Brown
++
++
++Release 2001b - 2001-04-05 16:44:38 -0400
++
++  changes by Paul Eggert (modulo jnorgard's typo fix)
++
++  tz-art.htm has been HTMLified.
++
++
++Release 2001a - 2001-03-13 12:57:44 -0500
++
++  changes by Paul Eggert
++
++  An addition to the "leapseconds" file: comments with the text of the
++  latest IERS leap second notice.
++
++  Trailing white space has been removed from data file lines, and
++  repeated spaces in "Rule Jordan" lines in the "asia" file have been
++  converted to tabs.
++
++
++Release 2000h - 2000-12-14 15:33:38 -0500
++
++  changes by Paul Eggert
++
++  one typo fix in the "art" file
++
++  With providence, this is the last update of the millennium.
++
++
++Release 2000g - 2000-10-10 11:35:22 -0400
++
++  changes by Paul Eggert
++
++  correction of John Mackin's name submitted by Robert Elz
++
++  Garry Shandling's Daylight Saving Time joke (!?!) from the recent
++  Emmy Awards broadcast.
++
++
++Release 2000f - 2000-08-10 09:31:58 -0400
++
++  changes by Paul Eggert
++
++  Added information in "tz-art.htm" on a Seinfeld reference to DST.
++
++  Error checking and messages in the "yearistype" script have been
++  improved.
++
++
++Release 2000e - 2000-07-31 09:27:54 -0400
++
++  data changes by Paul Eggert
++
++  a change to the default value of the defined constant HAVE_STRERROR
++
++  the addition of a Dave Barry quote on DST to the tz-arts file
++
++
++Release 2000d - 2000-04-20 15:43:04 -0400
++
++  changes to the documentation and code of strftime for C99 conformance
++
++  a bug fix for date.c
++
++  These are based on (though modified from) changes by Paul Eggert.
++
++
++Release 2000c - 2000-03-04 10:31:43 -0500
++
++  changes by Paul Eggert
++
++
++Release 2000b - 2000-02-21 12:16:29 -0500
++
++  changes by Paul Eggert and Joseph Myers
++
++  modest tweaks to the tz-art.htm and tz-link.htm files
++
++
++Release 2000a - 2000-01-18 09:21:26 -0500
++
++  changes by Paul Eggert
++
++  The two hypertext documents have also been renamed.
++
++
++Release code1999i-data1999j - 1999-11-15 18:43:22 -0500
++
++  Paul Eggert's changes
++
++  additions to the "zic" manual page and the "Arts.htm" file
++
++
++Release code1999h-data1999i - 1999-11-08 14:55:21 -0500
++
++  [not summarized]
++
++
++Release data1999h - 1999-10-07 03:50:29 -0400
++
++  changes by Paul Eggert to "europe" (most importantly, fixing
++  Lithuania and Estonia)
++
++
++Release 1999g - 1999-09-28 11:06:18 -0400
++
++  data changes by Paul Eggert (most importantly, the change for
++  Lebanon that buys correctness for this coming Sunday)
++
++  The "code" file contains changes to "Makefile" and "checktab.awk" to
++  allow better checking of time zone files before they are published.
++
++
++Release 1999f - 1999-09-23 09:48:14 -0400
++
++  changes by Arthur David Olson and Paul Eggert
++
++
++Release 1999e - 1999-08-17 15:20:54 -0400
++
++  changes circulated by Paul Eggert, although the change to handling
++  of DST-specifying time zone names has been commented out for now
++  (search for "XXX" in "localtime.c" for details).  These files also
++  do not make any changes to the start of DST in Brazil.
++
++  In addition to Paul's changes, there are updates to "Arts.htm" and
++  cleanups of URLs.
++
++
++Release 1999d - 1999-03-30 11:31:07 -0500
++
++  changes by Paul Eggert
++
++  The Makefile's "make public" rule has also been changed to do a test
++  compile of each individual time zone data file (which should help
++  avoid problems such as the one we had with Nicosia).
++
++
++Release 1999c - 1999-03-25 09:47:47 -0500
++
++  changes by Paul Eggert, most importantly the change for Chile.
++
++
++Release 1999b - 1999-02-01 17:51:44 -0500
++
++  changes by Paul Eggert
++
++  code changes (suggested by Mani Varadarajan, mani at be.com) for
++  correct handling of symbolic links when building using a relative directory
++
++  code changes to generate correct messages for failed links
++
++  updates to the URLs in Arts.htm
++
++
++Release 1999a - 1999-01-19 16:20:29 -0500
++
++  error message internationalizations and corrections in zic.c and
++  zdump.c (as suggested by Vladimir Michl, vladimir.michl at upol.cz,
++  to whom thanks!)
++
++
++Release code1998h-data1998i - 1998-10-01 09:56:10 -0400
++
++  changes for Brazil, Chile, and Germany
++
++  support for use of "24:00" in the input files for the time zone compiler
++
++
++Release code1998g-data1998h - 1998-09-24 10:50:28 -0400
++
++  changes by Paul Eggert
++
++  correction to a define in the "private.h" file
++
++
++Release data1998g - 1998-08-11 03:28:35 -0000
++  [tzdata1998g.tar.gz is missing!]
++
++  Lithuanian change provided by mgedmin at pub.osf.it
++
++  Move creation of the GMT link with Etc/GMT to "etcetera" (from
++  "backward") to ensure that the GMT file is created even where folks
++  don't want the "backward" links (as suggested by Paul Eggert).
++
++
++Release data1998f - 1998-07-20 13:50:00 -0000
++  [tzdata1998f.tar.gz is missing!]
++
++  Update the "leapseconds" file to include the newly-announced
++  insertion at the end of 1998.
++
++
++Release code1998f - 1998-06-01 10:18:31 -0400
++
++  addition to localtime.c by Guy Harris
++
++
++Release 1998e - 1998-05-28 09:56:26 -0400
++
++  The Makefile is changed to produce zoneinfo-posix rather than
++  zoneinfo/posix, and to produce zoneinfo-leaps rather than
++  zoneinfo/right.
++
++  data changes by Paul Eggert
++
++  changes from Guy Harris to provide asctime_r and ctime_r
++
++  A usno1998 file (substantially identical to usno1997) has been added.
++
++
++Release 1998d - 1998-05-14 11:58:34 -0400
++
++  changes to comments (in particular, elimination of references to CIA maps).
++  "Arts.htm", "WWW.htm", "asia", and "australasia" are the only places
++  where changes occur.
++
++
++Release 1998c - 1998-02-28 12:32:26 -0500
++
++  changes by Paul Eggert (save the "French correction," on which I'll
++  wait for the dust to settle)
++
++  symlink changes
++
++  changes and additions to Arts.htm
++
++
++Release 1998b - 1998-01-17 14:31:51 -0500
++
++  URL cleanups and additions
++
++
++Release 1998a - 1998-01-13 12:37:35 -0500
++
++  changes by Paul Eggert
++
++
++Release code1997i-data1997k - 1997-12-29 09:53:41 -0500
++
++  changes by Paul Eggert, with minor modifications from Arthur David
++  Olson to make the files more browser friendly
++
++
++Release code1997h-data1997j - 1997-12-18 17:47:35 -0500
++
++  minor changes to put "TZif" at the start of each time zone information file
++
++  a rule has also been added to the Makefile so you can
++	make zones
++  to just recompile the zone information files (rather than doing a
++  full "make install" with its other effects).
++
++
++Release data1997i - 1997-10-07 08:45:38 -0400
++
++  changes to Africa by Paul Eggert
++
++
++Release code1997g-data1997h - 1997-09-04 16:56:54 -0400
++
++  corrections for Uruguay (and other locations)
++
++  Arthur David Olson's simple-minded fix allowing mktime to both
++  correctly handle leap seconds and correctly handle tm_sec values
++  upon which arithmetic has been performed.
++
++
++Release code1997f-data1997g - 1997-07-19 13:15:02 -0400
++
++  Paul Eggert's updates
++
++  a small change to a function prototype;
++
++  "Music" has been renamed "Arts.htm", HTMLified, and augmented to
++  include information on Around the World in Eighty Days.
++
++
++Release code1997e-data1997f - 1997-05-03 18:52:34 -0400
++
++  fixes to zic's error handling
++
++  changes inspired by the item circulated on Slovenia
++
++  The description of Web resources has been HTMLified for browsing
++  convenience.
++
++  A new piece of tz-related music has been added to the "Music" file.
++
++
++Release code1997d-data1997e - 1997-03-29 12:48:52 -0500
++
++  Paul Eggert's latest suggestions
++
++
++Release code1997c-data1997d - 1997-03-07 20:37:54 -0500
++
++  changes to "zic.c" to correct performance of the "-s" option
++
++  a new file "usno1997"
++
++
++Release data1997c - 1997-03-04 09:58:18 -0500
++
++  changes in Israel
++
++
++Release 1997b - 1997-02-27 18:34:19 -0500
++
++  The data file incorporates the 1997 leap second.
++
++  The code file incorporates Arthur David Olson's take on the
++  zic/multiprocessor/directory-creation situation.
++
++
++Release 1997a - 1997-01-21 09:11:10 -0500
++
++  Paul Eggert's Antarctica (and other changes)
++
++  Arthur David Olson finessed the "getopt" issue by checking against
++  both -1 and EOF (regardless of POSIX, SunOS 4.1.1's manual says -1
++  is returned while SunOS 5.5's manual says EOF is returned).
++
++
++Release code1996o-data1996n - 1996-12-27 21:42:05 -0500
++
++  Paul Eggert's latest changes
++
++
++Release code1996n - 1996-12-16 09:42:02 -0500
++
++  link snapping fix from Bruce Evans (via Garrett Wollman)
++
++
++Release data1996m - 1996-11-24 02:37:34 -0000
++  [tzdata1996m.tar.gz is missing!]
++
++  Paul Eggert's batch of changes
++
++
++Release code1996m-data1996l - 1996-11-05 14:00:12 -0500
++
++  No functional changes here; the files have simply been changed to
++  make more use of ISO style dates in comments. The names of the above
++  files now include the year in full.
++
++
++Release code96l - 1996-09-08 17:12:20 -0400
++
++  tzcode96k was missing a couple of pieces.
++
++
++Release 96k - 1996-09-08 16:06:22 -0400
++
++  the latest round of changes from Paul Eggert
++
++  the recent Year 2000 material
++
++
++Release code96j - 1996-07-30 13:18:53 -0400
++
++  Set sp->typecnt as suggested by Timothy Patrick Murphy.
++
++
++Release code96i - 1996-07-27 20:11:35 -0400
++
++  Paul's suggested patch for strftime %V week numbers
++
++
++Release data96i - 1996-07-01 18:13:04 -0400
++
++  "northamerica" and "europe" changes by Paul Eggert
++
++
++Release code96h - 1996-06-05 08:02:21 -0400
++
++  fix for handling transitions specified in Universal Time
++
++  Some "public domain" notices have also been added.
++
++
++Release code96g - 1996-05-16 14:00:26 -0400
++
++  fix for the simultaneous-DST-and-zone-change challenge
++
++
++Release data96h - 1996-05-09 17:40:51 -0400
++
++  changes by Paul Eggert
++
++
++Release code96f-data96g - 1996-05-03 03:09:59 -0000
++  [tzcode96f.tar.gz + tzdata96g.tar.gz are both missing!]
++
++  The changes get us some of the way to fixing the problems noted in Paul
++  Eggert's letter yesterday (in addition to a few others).  The approach
++  has been to make zic a bit smarter about figuring out what time zone
++  abbreviations apply just after the time specified in the "UNTIL" part
++  of a zone line.  Putting the smarts in zic means avoiding having
++  transition times show up in both "Zone" lines and "Rule" lines, which
++  in turn avoids multiple transition time entries in time zone files.
++  (This also makes the zic input files such as "europe" a bit shorter and
++  should ease maintenance.)
++
++
++Release data96f - 1996-04-19 19:20:03 -0000
++  [tzdata96f.tar.gz is missing!]
++
++  The only changes are to the "northamerica" file; the time zone
++  abbreviation for Denver is corrected to MST (and MDT), and the
++  comments for Mexico have been updated.
++
++
++Release data96e - 1996-03-19 17:37:26 -0500
++
++  Proposals by Paul Eggert, in particular the Portugal change that
++  comes into play at the end of this month.
++
++
++Release data96d - 1996-03-18 20:49:39 -0500
++
++  [not summarized]
++
++
++Release code96e - 1996-02-29 15:43:27 -0000
++  [tzcode96e.tar.gz is missing!]
++
++  internationalization changes and the fix to the documentation for strftime
++
++
++Release code96d-data96c - 1996-02-12 11:05:27 -0500
++
++  The "code" file simply updates Bob Kridle's electronic address.
++
++  The "data" file updates rules for Mexico.
++
++
++Release data96b - 1996-01-27 15:44:42 -0500
++
++  Kiribati change
++
++
++Release code96c - 1996-01-16 16:58:15 -0500
++
++  leap-year streamlining and binary-search changes
++
++  fix to newctime.3
++
++
++Release code96b - 1996-01-10 20:42:39 -0500
++
++  fixes and enhancements from Paul Eggert, including code that
++  emulates the behavior of recent versions of the SunOS "date"
++  command.
++
++
++Release 96a - 1996-01-06 09:08:24 -0500
++
++  Israel updates
++
++  fixes to strftime.c for correct ISO 8601 week number generation,
++  plus support for two new formats ('G' and 'g') to give ISO 8601 year
++  numbers (which are not necessarily the same as calendar year numbers)
++
++
++Release code95i-data95m - 1995-12-21 12:46:47 -0500
++
++  The latest revisions from Paul Eggert are included, the usno1995
++  file has been updated, and a new file ("WWW") covering useful URLs
++  has been added.
++
++
++Release code95h-data95l - 1995-12-19 18:10:12 -0500
++
++  A simplification of a macro definition, a change to data for Sudan,
++  and (for last minute shoppers) notes in the "Music" file on the CD
++  "Old Man Time".
++
++
++Release code95g-data95k - 1995-10-30 10:32:47 -0500
++
++  (slightly reformatted) 8-bit-clean proposed patch
++
++  minor patch: US/Eastern -> America/New_York
++
++  snapshot of the USNO's latest data ("usno1995")
++
++  some other minor cleanups
++
++
++Release code95f-data95j - 1995-10-28 21:01:34 -0000
++  [tzcode95f.tar.gz + tzdata95j.tar.gz are both missing!]
++
++  European cleanups
++
++  support for 64-bit time_t's
++
++  optimization in localtime.c
++
++
++Release code95e - 1995-10-13 13:23:57 -0400
++
++  the mktime change to scan from future to past when trying to find time zone
++  offsets
++
++
++Release data95i - 1995-09-26 10:43:26 -0400
++
++  For Canada/Central, guess that the Sun customer's "one week too
++  early" was just a approximation, and the true error is one month
++  too early.  This is consistent with the rest of Canada.
++
++
++Release data95h - 1995-09-21 11:26:48 -0400
++
++  latest changes from Paul Eggert
++
++
++Release code95d - 1995-09-14 11:14:45 -0400
++
++  the addition of a "Music" file, which documents four recorded
++  versions of the tune "Save That Time".
++
++
++Release data95g - 1995-09-01 17:21:36 -0400
++
++  "yearistype" correction
++
++
++Release data95f - 1995-08-28 20:46:56 -0400
++
++  Paul Eggert's change to the australasia file
++
++
++Release data95e - 1995-07-08 18:02:34 -0400
++
++  The only change is a leap second at the end of this year.
++  Thanks to Bradley White for forwarding news on the leap second.
++
++
++Release data95d - 1995-07-03 13:26:22 -0400
++
++  Paul Eggert's changes
++
++
++Release data95c - 1995-07-02 19:19:28 -0400
++
++  changes to "asia", "backward", "europe", and "southamerica"
++  (read: northamericacentrics need not apply)
++
++
++Release code95c - 1995-03-13 14:00:46 -0500
++
++  one-line fix for sign extension problems in detzcode
++
++
++Release 95b - 1995-03-04 11:22:38 -0500
++
++  Minor changes in both:
++
++  The "code" file contains a workaround for the lack of "unistd.h" in
++  Microsoft C++ version 7.
++
++  The "data" file contains a fixed "Link" for America/Shiprock.
++
++
++Release 94h - 1994-12-10 12:51:14 -0500
++
++  The files:
++
++  *	incorporate the changes to "zdump" and "date" to make changes to
++	the "TZ" environment variable permanent;
++
++  *	incorporate the table changes by Paul Eggert;
++
++  *	include (and document) support for universal time specifications in
++	data files - but do not (yet) include use of this feature in the
++	data files.
++
++  Think of this as "TZ Classic" - the software has been set up not to break if
++  universal time shows up in its input, and data entries have been
++  left as is so as not to break existing implementations.
++
++
++Release data94f - 1994-08-20 12:56:09 -0400
++
++  (with thanks!) the latest data updates from Paul Eggert
++
++
++Release data94e - 1994-06-04 13:13:53 -0400
++
++  [not summarized]
++
++
++Release code94g - 1994-05-05 12:14:07 -0400
++
++  fix missing "optind.c" and a reference to it in the Makefile
++
++
++Release code94f - 1994-05-05 13:00:33 -0000
++  [tzcode94f.tar.gz is missing!]
++
++  changes to avoid overflow in difftime, as well as changes to cope
++  with the 52/53 challenge in strftime
++
++
++Release code94e - 1994-03-30 23:32:59 -0500
++
++  change for the benefit of PCTS
++
++
++Release 94d - 1994-02-24 15:42:25 -0500
++
++  Avoid clashes with POSIX semantics for zones such as GMT+4.
++
++  Some other very minor housekeeping is also present.
++
++
++Release code94c - 1994-02-10 08:52:40 -0500
++
++  Fix bug where mkdirs was broken unless you compile with
++  -fwritable-strings (which is generally losing to do).
++
++
++Release 94b - 1994-02-07 10:04:33 -0500
++
++  work by Paul Eggert who notes:
++
++  I found another book of time zone histories by E W Whitman; it's not
++  as extensive as Shanks but has a few goodies of its own.  I used it
++  to update the tables.  I also fixed some more as a result of
++  correspondence with Adam David and Peter Ilieve, and move some stray
++  links from 'europe' to 'backward'.  I corrected some scanning errors
++  in usno1989.
++
++  As far as the code goes, I fixed zic to allow years in the range
++  INT_MIN to INT_MAX; this fixed a few boundary conditions around 1900.
++  And I cleaned up the zic documentation a little bit.
++
++
++Release data94a - 1994-02-03 08:58:54 -0500
++
++  It simply incorporates the recently announced leap second into the
++  "leapseconds" file.
++
++
++Release 93g - 1993-11-22 17:28:27 -0500
++
++  Paul Eggert has provided a good deal of historic information (based
++  on Shanks), and there are some code changes to deal with the buglets
++  that crawled out in dealing with the new information.
++
++
++Release 93f - 1993-10-15 12:27:46 -0400
++
++  Paul Eggert's changes
++
++
++Release 93e - 1993-09-05 21:21:44 -0400
++
++  This has updated data for Israel, England, and Kwajalein.  There's
++  also an update to "zdump" to cope with Kwajalein's 24-hour jump.
++  Thanks to Paul Eggert and Peter Ilieve for the changes.
++
++
++Release 93d - 1993-06-17 23:34:17 -0400
++
++  new fix and new data on Israel
++
++
++Release 93c - 1993-06-06 19:31:55 -0400
++
++  [not summarized]
++
++
++Release 93b - 1993-02-02 14:53:58 -0500
++
++  updated "leapseconds" file
++
++
++Release 93 - 1993-01-08 07:01:06 -0500
++
++  At kre's suggestion, the package has been split in two - a code piece
++  (which also includes documentation) that's only of use to folks who
++  want to recompile things and a data piece useful to anyone who can
++  run "zic".
++
++  The new version has a few changes to the data files, a few
++  portability changes, and an off-by-one fix (with thanks to
++  Tom Karzes at deshaw.com for providing a description and a
++  solution).
++
++
++Release 92c - 1992-11-21 17:35:36 -0000
++  [tz92c.tar.Z is missing!]
++
++  The fallout from the latest round of DST transitions.
++
++  There are changes for Portugal, Saskatchewan, and "Pacific-New";
++  there's also a change to "zic.c" that makes it portable to more systems.
++
++
++Release 92 - 1992-04-25 18:17:03 -0000
++  [tz92.tar.Z is missing!]
++
++  By popular demand (well, at any rate, following a request by kre at munnari)
++
++
++The 1989 update of the time zone package featured:
++
++  *	POSIXization (including interpretation of POSIX-style TZ environment
++	variables, provided by Guy Harris),
++  *	ANSIfication (including versions of "mktime" and "difftime"),
++  *	SVIDulation (an "altzone" variable)
++  *	MACHination (the "gtime" function)
++  *	corrections to some time zone data (including corrections to the rules
++	for Great Britain and New Zealand)
++  *	reference data from the United States Naval Observatory for folks who
++	want to do additional time zones
++  *	and the 1989 data for Saudi Arabia.
++
++  (Since this code will be treated as "part of the implementation" in some
++  places and as "part of the application" in others, there's no good way to
++  name functions, such as timegm, that are not part of the proposed ANSI C
++  standard; such functions have kept their old, underscore-free names in this
++  update.)
++
++  And the "dysize" function has disappeared; it was present to allow
++  compilation of the "date" command on old BSD systems, and a version of "date"
++  is now provided in the package.  The "date" command is not created when you
++  "make all" since it may lack options provided by the version distributed with
++  your operating system, or may not interact with the system in the same way
++  the native version does.
++
++  Since POSIX frowns on correct leap second handling, the default behavior of
++  the "zic" command (in the absence of a "-L" option) has been changed to omit
++  leap second information from its output files.
++
++
++-----
++Notes
++
++This file contains copies of the part of each release announcement
++that talks about the changes in that release.  The text has been
++adapted and reformatted for the purposes of this file.
++
++Traditionally a release R consists of a pair of tarball files,
++tzcodeR.tar.gz and tzdataR.tar.gz.  However, some releases (e.g.,
++code2010a, data2012c) consist of just one or the other tarball, and a
++few (e.g., code2012c-data2012d) have tarballs with mixed version
++numbers.  Recent releases also come in an experimental format
++consisting of a single tarball tzdb-R.tar.lz with extra data.
++
++Release time stamps are taken from the release's commit (for newer,
++Git-based releases), from the newest file in the tarball (for older
++releases, where this info is available) or from the email announcing
++the release (if all else fails; these are marked with a time zone of
++-0000 and an "is missing!" comment).
++
++Earlier versions of the code and data were not announced on the tz
++list and are not summarized here.
++
++This file is in the public domain.
++
++Local Variables:
++coding: utf-8
++End:
+--- contrib/tzdata/README.orig
++++ contrib/tzdata/README
+@@ -0,0 +1,71 @@
++README for the tz distribution
++
++"What time is it?" -- Richard Deacon as The King
++"Any time you want it to be." -- Frank Baxter as The Scientist
++					(from the Bell System film "About Time")
++
++The Time Zone Database (often called tz or zoneinfo) contains code and
++data that represent the history of local time for many representative
++locations around the globe.  It is updated periodically to reflect
++changes made by political bodies to time zone boundaries, UTC offsets,
++and daylight-saving rules.
++
++Here is a recipe for acquiring, building, installing, and testing the
++tz distribution on a GNU/Linux or similar host.
++
++To acquire the distribution, run the following shell commands:
++
++	mkdir tz
++	cd tz
++	wget --retr-symlinks 'ftp://ftp.iana.org/tz/tz*-latest.tar.gz'
++	gzip -dc tzcode-latest.tar.gz | tar -xf -
++	gzip -dc tzdata-latest.tar.gz | tar -xf -
++
++Alternatively, the following shell commands acquire the same
++distribution, with extra data useful for regression testing:
++
++	wget --retr-symlinks 'ftp://ftp.iana.org/tz/tzdb-latest.tar.lz'
++	lzip -dc tzdb-latest.tar.lz | tar -xf -
++
++Be sure to read the comments in "Makefile" and make any changes needed
++to make things right for your system, especially if you are using some
++platform other than GNU/Linux.  Then run the following commands,
++substituting your desired installation directory for "$HOME/tzdir":
++
++	make TOPDIR=$HOME/tzdir install
++	$HOME/tzdir/etc/zdump -v America/Los_Angeles
++
++Historical local time information has been included here to:
++
++*	provide a compendium of data about the history of civil time
++	that is useful even if not 100% accurate;
++
++*	give an idea of the variety of local time rules that have
++	existed in the past and thus an idea of the variety that may be
++	expected in the future;
++
++*	provide a test of the generality of the local time rule description
++	system.
++
++The information in the time zone data files is by no means authoritative;
++fixes and enhancements are welcome.  Please see the file CONTRIBUTING
++for details.
++
++Thanks to these Time Zone Caballeros who've made major contributions to the
++time conversion package: Keith Bostic; Bob Devine; Paul Eggert; Robert Elz;
++Guy Harris; Mark Horton; John Mackin; and Bradley White.  Thanks also to
++Michael Bloom, Art Neilson, Stephen Prince, John Sovereign, and Frank Wales
++for testing work, and to Gwillim Law for checking local mean time data.
++Thanks in particular to Arthur David Olson, the project's founder and first
++maintainer, to whom the time zone community owes the greatest debt of all.
++None of them are responsible for remaining errors.
++
++Look in <ftp://ftp.iana.org/tz/releases/> for updated versions of these files.
++
++Please send comments or information to tz@iana.org.
++
++-----
++
++This file is in the public domain, so clarified as of 2009-05-17 by
++Arthur David Olson.  The other files in this distribution are either
++public domain or BSD licensed; see the file LICENSE for details.
+--- contrib/tzdata/Theory.orig
++++ contrib/tzdata/Theory
+@@ -0,0 +1,840 @@
++Theory and pragmatics of the tz code and data
++
++
++----- Outline -----
++
++	Scope of the tz database
++	Names of time zone rules
++	Time zone abbreviations
++	Accuracy of the tz database
++	Time and date functions
++	Calendrical issues
++	Time and time zones on Mars
++
++
++----- Scope of the tz database -----
++
++The tz database attempts to record the history and predicted future of
++all computer-based clocks that track civil time.  To represent this
++data, the world is partitioned into regions whose clocks all agree
++about time stamps that occur after the somewhat-arbitrary cutoff point
++of the POSIX Epoch (1970-01-01 00:00:00 UTC).  For each such region,
++the database records all known clock transitions, and labels the region
++with a notable location.  Although 1970 is a somewhat-arbitrary
++cutoff, there are significant challenges to moving the cutoff earlier
++even by a decade or two, due to the wide variety of local practices
++before computer timekeeping became prevalent.
++
++Clock transitions before 1970 are recorded for each such location,
++because most systems support time stamps before 1970 and could
++misbehave if data entries were omitted for pre-1970 transitions.
++However, the database is not designed for and does not suffice for
++applications requiring accurate handling of all past times everywhere,
++as it would take far too much effort and guesswork to record all
++details of pre-1970 civil timekeeping.
++
++As described below, reference source code for using the tz database is
++also available.  The tz code is upwards compatible with POSIX, an
++international standard for UNIX-like systems.  As of this writing, the
++current edition of POSIX is:
++
++  The Open Group Base Specifications Issue 7
++  IEEE Std 1003.1, 2013 Edition
++  <http://pubs.opengroup.org/onlinepubs/9699919799/>
++
++
++
++----- Names of time zone rules -----
++
++Each of the database's time zone rules has a unique name.
++Inexperienced users are not expected to select these names unaided.
++Distributors should provide documentation and/or a simple selection
++interface that explains the names; for one example, see the 'tzselect'
++program in the tz code.  The Unicode Common Locale Data Repository
++<http://cldr.unicode.org/> contains data that may be useful for other
++selection interfaces.
++
++The time zone rule naming conventions attempt to strike a balance
++among the following goals:
++
++ * Uniquely identify every region where clocks have agreed since 1970.
++   This is essential for the intended use: static clocks keeping local
++   civil time.
++
++ * Indicate to experts where that region is.
++
++ * Be robust in the presence of political changes.  For example, names
++   of countries are ordinarily not used, to avoid incompatibilities
++   when countries change their name (e.g. Zaire->Congo) or when
++   locations change countries (e.g. Hong Kong from UK colony to
++   China).
++
++ * Be portable to a wide variety of implementations.
++
++ * Use a consistent naming conventions over the entire world.
++
++Names normally have the form AREA/LOCATION, where AREA is the name
++of a continent or ocean, and LOCATION is the name of a specific
++location within that region.  North and South America share the same
++area, 'America'.  Typical names are 'Africa/Cairo', 'America/New_York',
++and 'Pacific/Honolulu'.
++
++Here are the general rules used for choosing location names,
++in decreasing order of importance:
++
++	Use only valid POSIX file name components (i.e., the parts of
++		names other than '/').  Do not use the file name
++		components '.' and '..'.  Within a file name component,
++		use only ASCII letters, '.', '-' and '_'.  Do not use
++		digits, as that might create an ambiguity with POSIX
++		TZ strings.  A file name component must not exceed 14
++		characters or start with '-'.  E.g., prefer 'Brunei'
++		to 'Bandar_Seri_Begawan'.  Exceptions: see the discussion
++		of legacy names below.
++	A name must not be empty, or contain '//', or start or end with '/'.
++	Do not use names that differ only in case.  Although the reference
++		implementation is case-sensitive, some other implementations
++		are not, and they would mishandle names differing only in case.
++	If one name A is an initial prefix of another name AB (ignoring case),
++		then B must not start with '/', as a regular file cannot have
++		the same name as a directory in POSIX.  For example,
++		'America/New_York' precludes 'America/New_York/Bronx'.
++	Uninhabited regions like the North Pole and Bouvet Island
++		do not need locations, since local time is not defined there.
++	There should typically be at least one name for each ISO 3166-1
++		officially assigned two-letter code for an inhabited country
++		or territory.
++	If all the clocks in a region have agreed since 1970,
++		don't bother to include more than one location
++		even if subregions' clocks disagreed before 1970.
++		Otherwise these tables would become annoyingly large.
++	If a name is ambiguous, use a less ambiguous alternative;
++		e.g. many cities are named San José and Georgetown, so
++		prefer 'Costa_Rica' to 'San_Jose' and 'Guyana' to 'Georgetown'.
++	Keep locations compact.  Use cities or small islands, not countries
++		or regions, so that any future time zone changes do not split
++		locations into different time zones.  E.g. prefer 'Paris'
++		to 'France', since France has had multiple time zones.
++	Use mainstream English spelling, e.g. prefer 'Rome' to 'Roma', and
++		prefer 'Athens' to the Greek 'Αθήνα' or the Romanized 'Athína'.
++		The POSIX file name restrictions encourage this rule.
++	Use the most populous among locations in a zone,
++		e.g. prefer 'Shanghai' to 'Beijing'.  Among locations with
++		similar populations, pick the best-known location,
++		e.g. prefer 'Rome' to 'Milan'.
++	Use the singular form, e.g. prefer 'Canary' to 'Canaries'.
++	Omit common suffixes like '_Islands' and '_City', unless that
++		would lead to ambiguity.  E.g. prefer 'Cayman' to
++		'Cayman_Islands' and 'Guatemala' to 'Guatemala_City',
++		but prefer 'Mexico_City' to 'Mexico' because the country
++		of Mexico has several time zones.
++	Use '_' to represent a space.
++	Omit '.' from abbreviations in names, e.g. prefer 'St_Helena'
++		to 'St._Helena'.
++	Do not change established names if they only marginally
++		violate the above rules.  For example, don't change
++		the existing name 'Rome' to 'Milan' merely because
++		Milan's population has grown to be somewhat greater
++		than Rome's.
++	If a name is changed, put its old spelling in the 'backward' file.
++		This means old spellings will continue to work.
++
++The file 'zone1970.tab' lists geographical locations used to name time
++zone rules.  It is intended to be an exhaustive list of names for
++geographic regions as described above; this is a subset of the names
++in the data.  Although a 'zone1970.tab' location's longitude
++corresponds to its LMT offset with one hour for every 15 degrees east
++longitude, this relationship is not exact.
++
++Older versions of this package used a different naming scheme,
++and these older names are still supported.
++See the file 'backward' for most of these older names
++(e.g., 'US/Eastern' instead of 'America/New_York').
++The other old-fashioned names still supported are
++'WET', 'CET', 'MET', and 'EET' (see the file 'europe').
++
++Older versions of this package defined legacy names that are
++incompatible with the first rule of location names, but which are
++still supported.  These legacy names are mostly defined in the file
++'etcetera'.  Also, the file 'backward' defines the legacy names
++'GMT0', 'GMT-0', 'GMT+0' and 'Canada/East-Saskatchewan', and the file
++'northamerica' defines the legacy names 'EST5EDT', 'CST6CDT',
++'MST7MDT', and 'PST8PDT'.
++
++Excluding 'backward' should not affect the other data.  If
++'backward' is excluded, excluding 'etcetera' should not affect the
++remaining data.
++
++
++----- Time zone abbreviations -----
++
++When this package is installed, it generates time zone abbreviations
++like 'EST' to be compatible with human tradition and POSIX.
++Here are the general rules used for choosing time zone abbreviations,
++in decreasing order of importance:
++
++	Use three or more characters that are ASCII alphanumerics or '+' or '-'.
++		Previous editions of this database also used characters like
++		' ' and '?', but these characters have a special meaning to
++		the shell and cause commands like
++			set `date`
++		to have unexpected effects.
++		Previous editions of this rule required upper-case letters,
++		but the Congressman who introduced Chamorro Standard Time
++		preferred "ChST", so lower-case letters are now allowed.
++		Also, POSIX from 2001 on relaxed the rule to allow '-', '+',
++		and alphanumeric characters from the portable character set
++		in the current locale.  In practice ASCII alphanumerics and
++		'+' and '-' are safe in all locales.
++
++		In other words, in the C locale the POSIX extended regular
++		expression [-+[:alnum:]]{3,} should match the abbreviation.
++		This guarantees that all abbreviations could have been
++		specified by a POSIX TZ string.
++
++	Use abbreviations that are in common use among English-speakers,
++		e.g. 'EST' for Eastern Standard Time in North America.
++		We assume that applications translate them to other languages
++		as part of the normal localization process; for example,
++		a French application might translate 'EST' to 'HNE'.
++
++	For zones whose times are taken from a city's longitude, use the
++		traditional xMT notation, e.g. 'PMT' for Paris Mean Time.
++		The only name like this in current use is 'GMT'.
++
++	Use 'LMT' for local mean time of locations before the introduction
++		of standard time; see "Scope of the tz database".
++
++	If there is no common English abbreviation, use numeric offsets like
++		-05 and +0830 that are generated by zic's %z notation.
++
++    [The remaining guidelines predate the introduction of %z.
++    They are problematic as they mean tz data entries invent
++    notation rather than record it.  These guidelines are now
++    deprecated and the plan is to gradually move to %z for
++    inhabited locations and to "-00" for uninhabited locations.]
++
++	If there is no common English abbreviation, abbreviate the English
++		translation of the usual phrase used by native speakers.
++		If this is not available or is a phrase mentioning the country
++		(e.g. "Cape Verde Time"), then:
++
++		When a country is identified with a single or principal zone,
++			append 'T' to the country's ISO	code, e.g. 'CVT' for
++			Cape Verde Time.  For summer time append 'ST';
++			for double summer time append 'DST'; etc.
++		Otherwise, take the first three letters of an English place
++			name identifying each zone and append 'T', 'ST', etc.
++			as before; e.g. 'VLAST' for VLAdivostok Summer Time.
++
++	Use UT (with time zone abbreviation '-00') for locations while
++		uninhabited.  The leading '-' is a flag that the time
++		zone is in some sense undefined; this notation is
++		derived from Internet RFC 3339.
++
++Application writers should note that these abbreviations are ambiguous
++in practice: e.g. 'CST' has a different meaning in China than
++it does in the United States.  In new applications, it's often better
++to use numeric UT offsets like '-0600' instead of time zone
++abbreviations like 'CST'; this avoids the ambiguity.
++
++
++----- Accuracy of the tz database -----
++
++The tz database is not authoritative, and it surely has errors.
++Corrections are welcome and encouraged; see the file CONTRIBUTING.
++Users requiring authoritative data should consult national standards
++bodies and the references cited in the database's comments.
++
++Errors in the tz database arise from many sources:
++
++ * The tz database predicts future time stamps, and current predictions
++   will be incorrect after future governments change the rules.
++   For example, if today someone schedules a meeting for 13:00 next
++   October 1, Casablanca time, and tomorrow Morocco changes its
++   daylight saving rules, software can mess up after the rule change
++   if it blithely relies on conversions made before the change.
++
++ * The pre-1970 entries in this database cover only a tiny sliver of how
++   clocks actually behaved; the vast majority of the necessary
++   information was lost or never recorded.  Thousands more zones would
++   be needed if the tz database's scope were extended to cover even
++   just the known or guessed history of standard time; for example,
++   the current single entry for France would need to split into dozens
++   of entries, perhaps hundreds.  And in most of the world even this
++   approach would be misleading due to widespread disagreement or
++   indifference about what times should be observed.  In her 2015 book
++   "The Global Transformation of Time, 1870-1950", Vanessa Ogle writes
++   "Outside of Europe and North America there was no system of time
++   zones at all, often not even a stable landscape of mean times,
++   prior to the middle decades of the twentieth century".  See:
++   Timothy Shenk, Booked: A Global History of Time. Dissent 2015-12-17
++   https://www.dissentmagazine.org/blog/booked-a-global-history-of-time-vanessa-ogle
++
++ * Most of the pre-1970 data entries come from unreliable sources, often
++   astrology books that lack citations and whose compilers evidently
++   invented entries when the true facts were unknown, without
++   reporting which entries were known and which were invented.
++   These books often contradict each other or give implausible entries,
++   and on the rare occasions when they are checked they are
++   typically found to be incorrect.
++
++ * For the UK the tz database relies on years of first-class work done by
++   Joseph Myers and others; see <http://www.polyomino.org.uk/british-time/>.
++   Other countries are not done nearly as well.
++
++ * Sometimes, different people in the same city would maintain clocks
++   that differed significantly.  Railway time was used by railroad
++   companies (which did not always agree with each other),
++   church-clock time was used for birth certificates, etc.
++   Often this was merely common practice, but sometimes it was set by law.
++   For example, from 1891 to 1911 the UT offset in France was legally
++   0:09:21 outside train stations and 0:04:21 inside.
++
++ * Although a named location in the tz database stands for the
++   containing region, its pre-1970 data entries are often accurate for
++   only a small subset of that region.  For example, Europe/London
++   stands for the United Kingdom, but its pre-1847 times are valid
++   only for locations that have London's exact meridian, and its 1847
++   transition to GMT is known to be valid only for the L&NW and the
++   Caledonian railways.
++
++ * The tz database does not record the earliest time for which a zone's
++   data entries are thereafter valid for every location in the region.
++   For example, Europe/London is valid for all locations in its
++   region after GMT was made the standard time, but the date of
++   standardization (1880-08-02) is not in the tz database, other than
++   in commentary.  For many zones the earliest time of validity is
++   unknown.
++
++ * The tz database does not record a region's boundaries, and in many
++   cases the boundaries are not known.  For example, the zone
++   America/Kentucky/Louisville represents a region around the city of
++   Louisville, the boundaries of which are unclear.
++
++ * Changes that are modeled as instantaneous transitions in the tz
++   database were often spread out over hours, days, or even decades.
++
++ * Even if the time is specified by law, locations sometimes
++   deliberately flout the law.
++
++ * Early timekeeping practices, even assuming perfect clocks, were
++   often not specified to the accuracy that the tz database requires.
++
++ * Sometimes historical timekeeping was specified more precisely
++   than what the tz database can handle.  For example, from 1909 to
++   1937 Netherlands clocks were legally UT +00:19:32.13, but the tz
++   database cannot represent the fractional second.
++
++ * Even when all the timestamp transitions recorded by the tz database
++   are correct, the tz rules that generate them may not faithfully
++   reflect the historical rules.  For example, from 1922 until World
++   War II the UK moved clocks forward the day following the third
++   Saturday in April unless that was Easter, in which case it moved
++   clocks forward the previous Sunday.  Because the tz database has no
++   way to specify Easter, these exceptional years are entered as
++   separate tz Rule lines, even though the legal rules did not change.
++
++ * The tz database models pre-standard time using the proleptic Gregorian
++   calendar and local mean time (LMT), but many people used other
++   calendars and other timescales.  For example, the Roman Empire used
++   the Julian calendar, and had 12 varying-length daytime hours with a
++   non-hour-based system at night.
++
++ * Early clocks were less reliable, and data entries do not represent
++   this unreliability.
++
++ * As for leap seconds, civil time was not based on atomic time before
++   1972, and we don't know the history of earth's rotation accurately
++   enough to map SI seconds to historical solar time to more than
++   about one-hour accuracy.  See: Morrison LV, Stephenson FR.
++   Historical values of the Earth's clock error Delta T and the
++   calculation of eclipses. J Hist Astron. 2004;35:327-36
++   <http://adsabs.harvard.edu/full/2004JHA....35..327M>;
++   Historical values of the Earth's clock error. J Hist Astron. 2005;36:339
++   <http://adsabs.harvard.edu/full/2005JHA....36..339M>.
++
++ * The relationship between POSIX time (that is, UTC but ignoring leap
++   seconds) and UTC is not agreed upon after 1972.  Although the POSIX
++   clock officially stops during an inserted leap second, at least one
++   proposed standard has it jumping back a second instead; and in
++   practice POSIX clocks more typically either progress glacially during
++   a leap second, or are slightly slowed while near a leap second.
++
++ * The tz database does not represent how uncertain its information is.
++   Ideally it would contain information about when data entries are
++   incomplete or dicey.  Partial temporal knowledge is a field of
++   active research, though, and it's not clear how to apply it here.
++
++In short, many, perhaps most, of the tz database's pre-1970 and future
++time stamps are either wrong or misleading.  Any attempt to pass the
++tz database off as the definition of time should be unacceptable to
++anybody who cares about the facts.  In particular, the tz database's
++LMT offsets should not be considered meaningful, and should not prompt
++creation of zones merely because two locations differ in LMT or
++transitioned to standard time at different dates.
++
++
++----- Time and date functions -----
++
++The tz code contains time and date functions that are upwards
++compatible with those of POSIX.
++
++POSIX has the following properties and limitations.
++
++*	In POSIX, time display in a process is controlled by the
++	environment variable TZ.  Unfortunately, the POSIX TZ string takes
++	a form that is hard to describe and is error-prone in practice.
++	Also, POSIX TZ strings can't deal with other (for example, Israeli)
++	daylight saving time rules, or situations where more than two
++	time zone abbreviations are used in an area.
++
++	The POSIX TZ string takes the following form:
++
++		stdoffset[dst[offset][,date[/time],date[/time]]]
++
++	where:
++
++	std and dst
++		are 3 or more characters specifying the standard
++		and daylight saving time (DST) zone names.
++		Starting with POSIX.1-2001, std and dst may also be
++		in a quoted form like "<UTC+10>"; this allows
++		"+" and "-" in the names.
++	offset
++		is of the form '[+-]hh:[mm[:ss]]' and specifies the
++		offset west of UT.  'hh' may be a single digit; 0<=hh<=24.
++		The default DST offset is one hour ahead of standard time.
++	date[/time],date[/time]
++		specifies the beginning and end of DST.  If this is absent,
++		the system supplies its own rules for DST, and these can
++		differ from year to year; typically US DST rules are used.
++	time
++		takes the form 'hh:[mm[:ss]]' and defaults to 02:00.
++		This is the same format as the offset, except that a
++		leading '+' or '-' is not allowed.
++	date
++		takes one of the following forms:
++		Jn (1<=n<=365)
++			origin-1 day number not counting February 29
++		n (0<=n<=365)
++			origin-0 day number counting February 29 if present
++		Mm.n.d (0[Sunday]<=d<=6[Saturday], 1<=n<=5, 1<=m<=12)
++			for the dth day of week n of month m of the year,
++			where week 1 is the first week in which day d appears,
++			and '5' stands for the last week in which day d appears
++			(which may be either the 4th or 5th week).
++			Typically, this is the only useful form;
++			the n and Jn forms are rarely used.
++
++	Here is an example POSIX TZ string, for US Pacific time using rules
++	appropriate from 1987 through 2006:
++
++		TZ='PST8PDT,M4.1.0/02:00,M10.5.0/02:00'
++
++	This POSIX TZ string is hard to remember, and mishandles time stamps
++	before 1987 and after 2006.  With this package you can use this
++	instead:
++
++		TZ='America/Los_Angeles'
++
++*	POSIX does not define the exact meaning of TZ values like "EST5EDT".
++	Typically the current US DST rules are used to interpret such values,
++	but this means that the US DST rules are compiled into each program
++	that does time conversion.  This means that when US time conversion
++	rules change (as in the United States in 1987), all programs that
++	do time conversion must be recompiled to ensure proper results.
++
++*	The TZ environment variable is process-global, which makes it hard
++	to write efficient, thread-safe applications that need access
++	to multiple time zones.
++
++*	In POSIX, there's no tamper-proof way for a process to learn the
++	system's best idea of local wall clock.  (This is important for
++	applications that an administrator wants used only at certain times -
++	without regard to whether the user has fiddled the "TZ" environment
++	variable.  While an administrator can "do everything in UTC" to get
++	around the problem, doing so is inconvenient and precludes handling
++	daylight saving time shifts - as might be required to limit phone
++	calls to off-peak hours.)
++
++*	POSIX provides no convenient and efficient way to determine the UT
++	offset and time zone abbreviation of arbitrary time stamps,
++	particularly for time zone settings that do not fit into the
++	POSIX model.
++
++*	POSIX requires that systems ignore leap seconds.
++
++*	The tz code attempts to support all the time_t implementations
++	allowed by POSIX.  The time_t type represents a nonnegative count of
++	seconds since 1970-01-01 00:00:00 UTC, ignoring leap seconds.
++	In practice, time_t is usually a signed 64- or 32-bit integer; 32-bit
++	signed time_t values stop working after 2038-01-19 03:14:07 UTC, so
++	new implementations these days typically use a signed 64-bit integer.
++	Unsigned 32-bit integers are used on one or two platforms,
++	and 36-bit and 40-bit integers are also used occasionally.
++	Although earlier POSIX versions allowed time_t to be a
++	floating-point type, this was not supported by any practical
++	systems, and POSIX.1-2013 and the tz code both require time_t
++	to be an integer type.
++
++These are the extensions that have been made to the POSIX functions:
++
++*	The "TZ" environment variable is used in generating the name of a file
++	from which time zone information is read (or is interpreted a la
++	POSIX); "TZ" is no longer constrained to be a three-letter time zone
++	name followed by a number of hours and an optional three-letter
++	daylight time zone name.  The daylight saving time rules to be used
++	for a particular time zone are encoded in the time zone file;
++	the format of the file allows U.S., Australian, and other rules to be
++	encoded, and allows for situations where more than two time zone
++	abbreviations are used.
++
++	It was recognized that allowing the "TZ" environment variable to
++	take on values such as "America/New_York" might cause "old" programs
++	(that expect "TZ" to have a certain form) to operate incorrectly;
++	consideration was given to using some other environment variable
++	(for example, "TIMEZONE") to hold the string used to generate the
++	time zone information file name.  In the end, however, it was decided
++	to continue using "TZ": it is widely used for time zone purposes;
++	separately maintaining both "TZ" and "TIMEZONE" seemed a nuisance;
++	and systems where "new" forms of "TZ" might cause problems can simply
++	use TZ values such as "EST5EDT" which can be used both by
++	"new" programs (a la POSIX) and "old" programs (as zone names and
++	offsets).
++
++*	The code supports platforms with a UT offset member in struct tm,
++	e.g., tm_gmtoff.
++
++*	The code supports platforms with a time zone abbreviation member in
++	struct tm, e.g., tm_zone.
++
++*	Since the "TZ" environment variable can now be used to control time
++	conversion, the "daylight" and "timezone" variables are no longer
++	needed.  (These variables are defined and set by "tzset"; however, their
++	values will not be used by "localtime.")
++
++*	Functions tzalloc, tzfree, localtime_rz, and mktime_z for
++	more-efficient thread-safe applications that need to use
++	multiple time zones.  The tzalloc and tzfree functions
++	allocate and free objects of type timezone_t, and localtime_rz
++	and mktime_z are like localtime_r and mktime with an extra
++	timezone_t argument.  The functions were inspired by NetBSD.
++
++*	A function "tzsetwall" has been added to arrange for the system's
++	best approximation to local wall clock time to be delivered by
++	subsequent calls to "localtime."  Source code for portable
++	applications that "must" run on local wall clock time should call
++	"tzsetwall();" if such code is moved to "old" systems that don't
++	provide tzsetwall, you won't be able to generate an executable program.
++	(These time zone functions also arrange for local wall clock time to be
++	used if tzset is called - directly or indirectly - and there's no "TZ"
++	environment variable; portable applications should not, however, rely
++	on this behavior since it's not the way SVR2 systems behave.)
++
++*	Negative time_t values are supported, on systems where time_t is signed.
++
++*	These functions can account for leap seconds, thanks to Bradley White.
++
++Points of interest to folks with other systems:
++
++*	Code compatible with this package is already part of many platforms,
++	including GNU/Linux, Android, the BSDs, Chromium OS, Cygwin, AIX, iOS,
++	BlackBery 10, macOS, Microsoft Windows, OpenVMS, and Solaris.
++	On such hosts, the primary use of this package
++	is to update obsolete time zone rule tables.
++	To do this, you may need to compile the time zone compiler
++	'zic' supplied with this package instead of using the system 'zic',
++	since the format of zic's input is occasionally extended,
++	and a platform may still be shipping an older zic.
++
++*	The UNIX Version 7 "timezone" function is not present in this package;
++	it's impossible to reliably map timezone's arguments (a "minutes west
++	of GMT" value and a "daylight saving time in effect" flag) to a
++	time zone abbreviation, and we refuse to guess.
++	Programs that in the past used the timezone function may now examine
++	tzname[localtime(&clock)->tm_isdst] to learn the correct time
++	zone abbreviation to use.  Alternatively, use
++	localtime(&clock)->tm_zone if this has been enabled.
++
++*	The 4.2BSD gettimeofday function is not used in this package.
++	This formerly let users obtain the current UTC offset and DST flag,
++	but this functionality was removed in later versions of BSD.
++
++*	In SVR2, time conversion fails for near-minimum or near-maximum
++	time_t values when doing conversions for places that don't use UT.
++	This package takes care to do these conversions correctly.
++	A comment in the source code tells how to get compatibly wrong
++	results.
++
++The functions that are conditionally compiled if STD_INSPIRED is defined
++should, at this point, be looked on primarily as food for thought.  They are
++not in any sense "standard compatible" - some are not, in fact, specified in
++*any* standard.  They do, however, represent responses of various authors to
++standardization proposals.
++
++Other time conversion proposals, in particular the one developed by folks at
++Hewlett Packard, offer a wider selection of functions that provide capabilities
++beyond those provided here.  The absence of such functions from this package
++is not meant to discourage the development, standardization, or use of such
++functions.  Rather, their absence reflects the decision to make this package
++contain valid extensions to POSIX, to ensure its broad acceptability.  If
++more powerful time conversion functions can be standardized, so much the
++better.
++
++
++----- Interface stability -----
++
++The tz code and data supply the following interfaces:
++
++ * A set of zone names as per "Names of time zone rules" above.
++
++ * Library functions described in "Time and date functions" above.
++
++ * The programs tzselect, zdump, and zic, documented in their man pages.
++
++ * The format of zic input files, documented in the zic man page.
++
++ * The format of zic output files, documented in the tzfile man page.
++
++ * The format of zone table files, documented in zone1970.tab.
++
++ * The format of the country code file, documented in iso3166.tab.
++
++When these interfaces are changed, an effort is made to preserve
++backward compatibility.  For example, tz data files typically do not
++rely on recently-added zic features, so that users can run older zic
++versions to process newer data files.
++
++Interfaces not listed above are less stable.  For example, users
++should not rely on particular UT offsets or abbreviations for time
++stamps, as data entries are often based on guesswork and these guesses
++may be corrected or improved.
++
++
++----- Calendrical issues -----
++
++Calendrical issues are a bit out of scope for a time zone database,
++but they indicate the sort of problems that we would run into if we
++extended the time zone database further into the past.  An excellent
++resource in this area is Nachum Dershowitz and Edward M. Reingold,
++Calendrical Calculations: Third Edition, Cambridge University Press (2008)
++<http://emr.cs.iit.edu/home/reingold/calendar-book/third-edition/>.
++Other information and sources are given below.  They sometimes disagree.
++
++
++France
++
++Gregorian calendar adopted 1582-12-20.
++French Revolutionary calendar used 1793-11-24 through 1805-12-31,
++and (in Paris only) 1871-05-06 through 1871-05-23.
++
++
++Russia
++
++From Chris Carrier (1996-12-02):
++On 1929-10-01 the Soviet Union instituted an "Eternal Calendar"
++with 30-day months plus 5 holidays, with a 5-day week.
++On 1931-12-01 it changed to a 6-day week; in 1934 it reverted to the
++Gregorian calendar while retaining the 6-day week; on 1940-06-27 it
++reverted to the 7-day week.  With the 6-day week the usual days
++off were the 6th, 12th, 18th, 24th and 30th of the month.
++(Source: Evitiar Zerubavel, _The Seven Day Circle_)
++
++
++Mark Brader reported a similar story in "The Book of Calendars", edited
++by Frank Parise (1982, Facts on File, ISBN 0-8719-6467-8), page 377.  But:
++
++From: Petteri Sulonen (via Usenet)
++Date: 14 Jan 1999 00:00:00 GMT
++...
++
++If your source is correct, how come documents between 1929 and 1940 were
++still dated using the conventional, Gregorian calendar?
++
++I can post a scan of a document dated December 1, 1934, signed by
++Yenukidze, the secretary, on behalf of Kalinin, the President of the
++Executive Committee of the Supreme Soviet, if you like.
++
++
++
++Sweden (and Finland)
++
++From: Mark Brader
++Subject: Re: Gregorian reform - a part of locale?
++<news:1996Jul6.012937.29190@sq.com>
++Date: 1996-07-06
++
++In 1700, Denmark made the transition from Julian to Gregorian.  Sweden
++decided to *start* a transition in 1700 as well, but rather than have one of
++those unsightly calendar gaps :-), they simply decreed that the next leap
++year after 1696 would be in 1744 - putting the whole country on a calendar
++different from both Julian and Gregorian for a period of 40 years.
++
++However, in 1704 something went wrong and the plan was not carried through;
++they did, after all, have a leap year that year.  And one in 1708.  In 1712
++they gave it up and went back to Julian, putting 30 days in February that
++year!...
++
++Then in 1753, Sweden made the transition to Gregorian in the usual manner,
++getting there only 13 years behind the original schedule.
++
++(A previous posting of this story was challenged, and Swedish readers
++produced the following references to support it: "Tideräkning och historia"
++by Natanael Beckman (1924) and "Tid, en bok om tideräkning och
++kalenderväsen" by Lars-Olof Lodén (1968).
++
++
++Grotefend's data
++
++From: "Michael Palmer" [with one obvious typo fixed]
++Subject: Re: Gregorian Calendar (was Re: Another FHC related question
++Newsgroups: soc.genealogy.german
++Date: Tue, 9 Feb 1999 02:32:48 -800
++...
++
++The following is a(n incomplete) listing, arranged chronologically, of
++European states, with the date they converted from the Julian to the
++Gregorian calendar:
++
++04/15 Oct 1582 - Italy (with exceptions), Spain, Portugal, Poland (Roman
++                 Catholics and Danzig only)
++09/20 Dec 1582 - France, Lorraine
++
++21 Dec 1582/
++   01 Jan 1583 - Holland, Brabant, Flanders, Hennegau
++10/21 Feb 1583 - bishopric of Liege (Lüttich)
++13/24 Feb 1583 - bishopric of Augsburg
++04/15 Oct 1583 - electorate of Trier
++05/16 Oct 1583 - Bavaria, bishoprics of Freising, Eichstedt, Regensburg,
++                 Salzburg, Brixen
++13/24 Oct 1583 - Austrian Oberelsaß and Breisgau
++20/31 Oct 1583 - bishopric of Basel
++02/13 Nov 1583 - duchy of Jülich-Berg
++02/13 Nov 1583 - electorate and city of Köln
++04/15 Nov 1583 - bishopric of Würzburg
++11/22 Nov 1583 - electorate of Mainz
++16/27 Nov 1583 - bishopric of Strassburg and the margraviate of Baden
++17/28 Nov 1583 - bishopric of Münster and duchy of Cleve
++14/25 Dec 1583 - Steiermark
++
++06/17 Jan 1584 - Austria and Bohemia
++11/22 Jan 1584 - Lucerne, Uri, Schwyz, Zug, Freiburg, Solothurn
++12/23 Jan 1584 - Silesia and the Lausitz
++22 Jan/
++   02 Feb 1584 - Hungary (legally on 21 Oct 1587)
++      Jun 1584 - Unterwalden
++01/12 Jul 1584 - duchy of Westfalen
++
++16/27 Jun 1585 - bishopric of Paderborn
++
++14/25 Dec 1590 - Transylvania
++
++22 Aug/
++   02 Sep 1612 - duchy of Prussia
++
++13/24 Dec 1614 - Pfalz-Neuburg
++
++          1617 - duchy of Kurland (reverted to the Julian calendar in
++                 1796)
++
++          1624 - bishopric of Osnabrück
++
++          1630 - bishopric of Minden
++
++15/26 Mar 1631 - bishopric of Hildesheim
++
++          1655 - Kanton Wallis
++
++05/16 Feb 1682 - city of Strassburg
++
++18 Feb/
++   01 Mar 1700 - Protestant Germany (including Swedish possessions in
++                 Germany), Denmark, Norway
++30 Jun/
++   12 Jul 1700 - Gelderland, Zutphen
++10 Nov/
++   12 Dec 1700 - Utrecht, Overijssel
++
++31 Dec 1700/
++   12 Jan 1701 - Friesland, Groningen, Zürich, Bern, Basel, Geneva,
++                 Turgau, and Schaffhausen
++
++          1724 - Glarus, Appenzell, and the city of St. Gallen
++
++01 Jan 1750    - Pisa and Florence
++
++02/14 Sep 1752 - Great Britain
++
++17 Feb/
++   01 Mar 1753 - Sweden
++
++1760-1812      - Graubünden
++
++The Russian empire (including Finland and the Baltic states) did not
++convert to the Gregorian calendar until the Soviet revolution of 1917.
++
++Source: H. Grotefend, _Taschenbuch der Zeitrechnung des deutschen
++Mittelalters und der Neuzeit_, herausgegeben von Dr. O. Grotefend
++(Hannover: Hahnsche Buchhandlung, 1941), pp. 26-28.
++
++
++----- Time and time zones on Mars -----
++
++Some people's work schedules use Mars time.  Jet Propulsion Laboratory
++(JPL) coordinators have kept Mars time on and off at least since 1997
++for the Mars Pathfinder mission.  Some of their family members have
++also adapted to Mars time.  Dozens of special Mars watches were built
++for JPL workers who kept Mars time during the Mars Exploration
++Rovers mission (2004).  These timepieces look like normal Seikos and
++Citizens but use Mars seconds rather than terrestrial seconds.
++
++A Mars solar day is called a "sol" and has a mean period equal to
++about 24 hours 39 minutes 35.244 seconds in terrestrial time.  It is
++divided into a conventional 24-hour clock, so each Mars second equals
++about 1.02749125 terrestrial seconds.
++
++The prime meridian of Mars goes through the center of the crater
++Airy-0, named in honor of the British astronomer who built the
++Greenwich telescope that defines Earth's prime meridian.  Mean solar
++time on the Mars prime meridian is called Mars Coordinated Time (MTC).
++
++Each landed mission on Mars has adopted a different reference for
++solar time keeping, so there is no real standard for Mars time zones.
++For example, the Mars Exploration Rover project (2004) defined two
++time zones "Local Solar Time A" and "Local Solar Time B" for its two
++missions, each zone designed so that its time equals local true solar
++time at approximately the middle of the nominal mission.  Such a "time
++zone" is not particularly suited for any application other than the
++mission itself.
++
++Many calendars have been proposed for Mars, but none have achieved
++wide acceptance.  Astronomers often use Mars Sol Date (MSD) which is a
++sequential count of Mars solar days elapsed since about 1873-12-29
++12:00 GMT.
++
++The tz database does not currently support Mars time, but it is
++documented here in the hopes that support will be added eventually.
++
++Sources:
++
++Michael Allison and Robert Schmunk,
++"Technical Notes on Mars Solar Time as Adopted by the Mars24 Sunclock"
++<http://www.giss.nasa.gov/tools/mars24/help/notes.html> (2012-08-08).
++
++Jia-Rui Chong, "Workdays Fit for a Martian", Los Angeles Times
++<http://articles.latimes.com/2004/jan/14/science/sci-marstime14>
++(2004-01-14), pp A1, A20-A21.
++
++Tom Chmielewski, "Jet Lag Is Worse on Mars", The Atlantic (2015-02-26)
++<http://www.theatlantic.com/technology/archive/2015/02/jet-lag-is-worse-on-mars/386033/>
++
++-----
++
++This file is in the public domain, so clarified as of 2009-05-17 by
++Arthur David Olson.
++
++-----
++Local Variables:
++coding: utf-8
++End:
+--- contrib/tzdata/africa.orig
++++ contrib/tzdata/africa
+@@ -1,32 +1,32 @@
+ # This file is in the public domain, so clarified as of
+ # 2009-05-17 by Arthur David Olson.
+ 
+-# This data is by no means authoritative; if you think you know better,
++# This file is by no means authoritative; if you think you know better,
+ # go ahead and edit the file (and please send any changes to
+-# tz@iana.org for general use in the future).
++# tz@iana.org for general use in the future).  For more, please see
++# the file CONTRIBUTING in the tz distribution.
+ 
+-# From Paul Eggert (2013-02-21):
++# From Paul Eggert (2014-10-31):
+ #
+-# A good source for time zone historical data outside the U.S. is
++# Unless otherwise specified, the source for data through 1990 is:
+ # Thomas G. Shanks and Rique Pottenger, The International Atlas (6th edition),
+ # San Diego: ACS Publications, Inc. (2003).
++# Unfortunately this book contains many errors and cites no sources.
+ #
+ # Gwillim Law writes that a good source
+ # for recent time zone data is the International Air Transport
+ # Association's Standard Schedules Information Manual (IATA SSIM),
+ # published semiannually.  Law sent in several helpful summaries
+-# of the IATA's data after 1990.
+-#
+-# Except where otherwise noted, Shanks & Pottenger is the source for
+-# entries through 1990, and IATA SSIM is the source for entries afterwards.
++# of the IATA's data after 1990.  Except where otherwise noted,
++# IATA SSIM is the source for entries after 1990.
+ #
+ # Another source occasionally used is Edward W. Whitman, World Time Differences,
+ # Whitman Publishing Co, 2 Niagara Av, Ealing, London (undated), which
+ # I found in the UCLA library.
+ #
+ # For data circa 1899, a common source is:
+-# Milne J. Civil time. Geogr J. 1899 Feb;13(2):173-94
+-# <http://www.jstor.org/stable/1774359>.
++# Milne J. Civil time. Geogr J. 1899 Feb;13(2):173-94.
++# http://www.jstor.org/stable/1774359
+ #
+ # A reliable and entertaining source about time zones is
+ # Derek Howse, Greenwich time and longitude, Philip Wilson Publishers (1997).
+@@ -64,7 +64,6 @@
+ #	 3:00	CAST	Central Africa Summer Time (no longer used)
+ #	 3:00	SAST	South Africa Summer Time (no longer used)
+ #	 3:00	EAT	East Africa Time
+-#	 4:00	EAST	East Africa Summer Time (no longer used)
+ 
+ # Algeria
+ # Rule	NAME	FROM	TO	TYPE	IN	ON	AT	SAVE	LETTER/S
+@@ -93,9 +92,9 @@
+ # Shanks & Pottenger give 0:09:20 for Paris Mean Time; go with Howse's
+ # more precise 0:09:21.
+ # Zone	NAME		GMTOFF	RULES	FORMAT	[UNTIL]
+-Zone	Africa/Algiers	0:12:12 -	LMT	1891 Mar 15 0:01
+-			0:09:21	-	PMT	1911 Mar 11    # Paris Mean Time
+-			0:00	Algeria	WE%sT	1940 Feb 25 2:00
++Zone	Africa/Algiers	0:12:12 -	LMT	1891 Mar 15  0:01
++			0:09:21	-	PMT	1911 Mar 11 # Paris Mean Time
++			0:00	Algeria	WE%sT	1940 Feb 25  2:00
+ 			1:00	Algeria	CE%sT	1946 Oct  7
+ 			0:00	-	WET	1956 Jan 29
+ 			1:00	-	CET	1963 Apr 14
+@@ -105,82 +104,55 @@
+ 			1:00	-	CET
+ 
+ # Angola
+-# Zone	NAME		GMTOFF	RULES	FORMAT	[UNTIL]
+-Zone	Africa/Luanda	0:52:56	-	LMT	1892
+-			0:52:04	-	AOT	1911 May 26 # Angola Time
+-			1:00	-	WAT
+-
+ # Benin
+-# Whitman says they switched to 1:00 in 1946, not 1934;
+-# go with Shanks & Pottenger.
+-# Zone	NAME		GMTOFF	RULES	FORMAT	[UNTIL]
+-Zone Africa/Porto-Novo	0:10:28	-	LMT	1912
+-			0:00	-	GMT	1934 Feb 26
+-			1:00	-	WAT
++# See Africa/Lagos.
+ 
+ # Botswana
+-# From Paul Eggert (2013-02-21):
+-# Milne says they were regulated by the Cape Town Signal in 1899;
+-# assume they switched to 2:00 when Cape Town did.
+-# Zone	NAME		GMTOFF	RULES	FORMAT	[UNTIL]
+-Zone	Africa/Gaborone	1:43:40 -	LMT	1885
+-			1:30	-	SAST	1903 Mar
+-			2:00	-	CAT	1943 Sep 19 2:00
+-			2:00	1:00	CAST	1944 Mar 19 2:00
+-			2:00	-	CAT
++# See Africa/Maputo.
+ 
+ # Burkina Faso
+ # See Africa/Abidjan.
+ 
+ # Burundi
+-# Zone	NAME		GMTOFF	RULES	FORMAT	[UNTIL]
+-Zone Africa/Bujumbura	1:57:28	-	LMT	1890
+-			2:00	-	CAT
++# See Africa/Maputo.
+ 
+ # Cameroon
+-# Whitman says they switched to 1:00 in 1920; go with Shanks & Pottenger.
+-# Zone	NAME		GMTOFF	RULES	FORMAT	[UNTIL]
+-Zone	Africa/Douala	0:38:48	-	LMT	1912
+-			1:00	-	WAT
++# See Africa/Lagos.
+ 
+ # Cape Verde
++#
++# Shanks gives 1907 for the transition to CVT.
++# Perhaps the 1911-05-26 Portuguese decree
++# http://dre.pt/pdf1sdip/1911/05/12500/23132313.pdf
++# merely made it official?
++#
+ # Zone	NAME		GMTOFF	RULES	FORMAT	[UNTIL]
+-Zone Atlantic/Cape_Verde -1:34:04 -	LMT	1907			# Praia
++Zone Atlantic/Cape_Verde -1:34:04 -	LMT	1907        # Praia
+ 			-2:00	-	CVT	1942 Sep
+ 			-2:00	1:00	CVST	1945 Oct 15
+-			-2:00	-	CVT	1975 Nov 25 2:00
++			-2:00	-	CVT	1975 Nov 25  2:00
+ 			-1:00	-	CVT
+ 
+ # Central African Republic
+-# Zone	NAME		GMTOFF	RULES	FORMAT	[UNTIL]
+-Zone	Africa/Bangui	1:14:20	-	LMT	1912
+-			1:00	-	WAT
++# See Africa/Lagos.
+ 
+ # Chad
+ # Zone	NAME		GMTOFF	RULES	FORMAT	[UNTIL]
+-Zone	Africa/Ndjamena	1:00:12 -	LMT	1912 # N'Djamena
++Zone	Africa/Ndjamena	1:00:12 -	LMT	1912        # N'Djamena
+ 			1:00	-	WAT	1979 Oct 14
+ 			1:00	1:00	WAST	1980 Mar  8
+ 			1:00	-	WAT
+ 
+ # Comoros
+-# Zone	NAME		GMTOFF	RULES	FORMAT	[UNTIL]
+-Zone	Indian/Comoro	2:53:04 -	LMT	1911 Jul   # Moroni, Gran Comoro
+-			3:00	-	EAT
++# See Africa/Nairobi.
+ 
+-# Democratic Republic of Congo
+-# Zone	NAME		GMTOFF	RULES	FORMAT	[UNTIL]
+-Zone Africa/Kinshasa	1:01:12 -	LMT	1897 Nov 9
+-			1:00	-	WAT
+-Zone Africa/Lubumbashi	1:49:52 -	LMT	1897 Nov 9
+-			2:00	-	CAT
++# Democratic Republic of the Congo
++# See Africa/Lagos for the western part and Africa/Maputo for the eastern.
+ 
+ # Republic of the Congo
+-# Zone	NAME		GMTOFF	RULES	FORMAT	[UNTIL]
+-Zone Africa/Brazzaville	1:01:08 -	LMT	1912
+-			1:00	-	WAT
++# See Africa/Lagos.
+ 
+-# Côte D'Ivoire / Ivory Coast
++# Côte d'Ivoire / Ivory Coast
+ # Zone	NAME		GMTOFF	RULES	FORMAT	[UNTIL]
+ Zone	Africa/Abidjan	-0:16:08 -	LMT	1912
+ 			 0:00	-	GMT
+@@ -196,9 +168,7 @@
+ Link Africa/Abidjan Atlantic/St_Helena	# St Helena
+ 
+ # Djibouti
+-# Zone	NAME		GMTOFF	RULES	FORMAT	[UNTIL]
+-Zone	Africa/Djibouti	2:52:36 -	LMT	1911 Jul
+-			3:00	-	EAT
++# See Africa/Nairobi.
+ 
+ ###############################################################################
+ 
+@@ -327,7 +297,7 @@
+ # Egypt is to change back to Daylight system on May 15
+ # http://english.ahram.org.eg/NewsContent/1/64/100735/Egypt/Politics-/Egypts-government-to-reapply-daylight-saving-time-.aspx
+ 
+-# From Gunther Vermier (2015-05-13):
++# From Gunther Vermier (2014-05-13):
+ # our Egypt office confirms that the change will be at 15 May "midnight" (24:00)
+ 
+ # From Imed Chihi (2014-06-04):
+@@ -349,35 +319,36 @@
+ # above) says DST had no affect on electricity consumption.  There is
+ # no information about when DST will end this fall.  See:
+ # http://abcnews.go.com/International/wireStory/el-sissi-pushes-egyptians-line-23614833
+-#
+-# For now, guess that later spring and fall transitions will use
+-# 2010's rules, and guess that Egypt will switch to standard time at
+-# 24:00 the last Thursday before Ramadan, and back to DST at 00:00 the
+-# first Friday after Ramadan.  To implement this,
+-# transition dates for 2015 through 2037 were determined by running
+-# the following program under GNU Emacs 24.3, with the results integrated
+-# by hand into the table below.  Ramadan again intrudes on the guessed
+-# DST starting in 2038, but that's beyond our somewhat-arbitrary cutoff.
+-# (let ((islamic-year 1436))
+-#   (while (< islamic-year 1460)
+-#     (let ((a (calendar-islamic-to-absolute (list 9 1 islamic-year)))
+-#           (b (calendar-islamic-to-absolute (list 10 1 islamic-year)))
+-#           (friday 5))
+-#       (while (/= friday (mod a 7))
+-#         (setq a (1- a)))
+-#       (while (/= friday (mod b 7))
+-#         (setq b (1+ b)))
+-#       (setq a (1- a))
+-#       (setq b (1- b))
+-#       (setq a (calendar-gregorian-from-absolute a))
+-#       (setq b (calendar-gregorian-from-absolute b))
+-#       (insert
+-#        (format
+-#         (concat "Rule\tEgypt\t%d\tonly\t-\t%s\t%2d\t24:00\t0\t-\n"
+-#                 "Rule\tEgypt\t%d\tonly\t-\t%s\t%2d\t24:00\t1:00\tS\n")
+-#         (car (cdr (cdr a))) (calendar-month-name (car a) t) (car (cdr a))
+-#         (car (cdr (cdr b))) (calendar-month-name (car b) t) (car (cdr b)))))
+-#     (setq islamic-year (+ 1 islamic-year))))
++
++# From Steffen Thorsen (2015-04-08):
++# Egypt will start DST on midnight after Thursday, April 30, 2015.
++# This is based on a law (no 35) from May 15, 2014 saying it starts the last
++# Thursday of April....  Clocks will still be turned back for Ramadan, but
++# dates not yet announced....
++# http://almogaz.com/news/weird-news/2015/04/05/1947105 ...
++# http://www.timeanddate.com/news/time/egypt-starts-dst-2015.html
++
++# From Ahmed Nazmy (2015-04-20):
++# Egypt's ministers cabinet just announced ... that it will cancel DST at
++# least for 2015.
++#
++# From Tim Parenti (2015-04-20):
++# http://english.ahram.org.eg/WriterArticles/NewsContentP/1/128195/Egypt/No-daylight-saving-this-summer-Egypts-prime-minist.aspx
++# "Egypt's cabinet agreed on Monday not to switch clocks for daylight saving
++# time this summer, and carry out studies on the possibility of canceling the
++# practice altogether in future years."
++#
++# From Paul Eggert (2015-04-24):
++# Yesterday the office of Egyptian President El-Sisi announced his
++# decision to abandon DST permanently.  See Ahram Online 2015-04-24.
++# http://english.ahram.org.eg/NewsContent/1/64/128509/Egypt/Politics-/Sisi-cancels-daylight-saving-time-in-Egypt.aspx
++
++# From Steffen Thorsen (2016-04-29):
++# Egypt will have DST from July 7 until the end of October....
++# http://english.ahram.org.eg/NewsContentP/1/204655/Egypt/Daylight-savings-time-returning-to-Egypt-on--July.aspx
++# From Mina Samuel (2016-07-04):
++# Egyptian government took the decision to cancel the DST,
++
+ Rule	Egypt	2008	only	-	Aug	lastThu	24:00	0	-
+ Rule	Egypt	2009	only	-	Aug	20	24:00	0	-
+ Rule	Egypt	2010	only	-	Aug	10	24:00	0	-
+@@ -386,59 +357,21 @@
+ Rule	Egypt	2014	only	-	May	15	24:00	1:00	S
+ Rule	Egypt	2014	only	-	Jun	26	24:00	0	-
+ Rule	Egypt	2014	only	-	Jul	31	24:00	1:00	S
+-Rule	Egypt	2014	max	-	Sep	lastThu	24:00	0	-
+-Rule	Egypt	2015	2019	-	Apr	lastFri	 0:00s	1:00	S
+-Rule	Egypt	2015	only	-	Jun	11	24:00	0	-
+-Rule	Egypt	2015	only	-	Jul	23	24:00	1:00	S
+-Rule	Egypt	2016	only	-	Jun	 2	24:00	0	-
+-Rule	Egypt	2016	only	-	Jul	 7	24:00	1:00	S
+-Rule	Egypt	2017	only	-	May	25	24:00	0	-
+-Rule	Egypt	2017	only	-	Jun	29	24:00	1:00	S
+-Rule	Egypt	2018	only	-	May	10	24:00	0	-
+-Rule	Egypt	2018	only	-	Jun	14	24:00	1:00	S
+-Rule	Egypt	2019	only	-	May	 2	24:00	0	-
+-Rule	Egypt	2019	only	-	Jun	 6	24:00	1:00	S
+-Rule	Egypt	2020	only	-	May	28	24:00	1:00	S
+-Rule	Egypt	2021	only	-	May	13	24:00	1:00	S
+-Rule	Egypt	2022	only	-	May	 5	24:00	1:00	S
+-Rule	Egypt	2023	max	-	Apr	lastFri	 0:00s	1:00	S
++Rule	Egypt	2014	only	-	Sep	lastThu	24:00	0	-
+ 
+ # Zone	NAME		GMTOFF	RULES	FORMAT	[UNTIL]
+ Zone	Africa/Cairo	2:05:09 -	LMT	1900 Oct
+ 			2:00	Egypt	EE%sT
+ 
+ # Equatorial Guinea
+-# Zone	NAME		GMTOFF	RULES	FORMAT	[UNTIL]
+-Zone	Africa/Malabo	0:35:08 -	LMT	1912
+-			0:00	-	GMT	1963 Dec 15
+-			1:00	-	WAT
++# See Africa/Lagos.
+ 
+ # Eritrea
+-# Zone	NAME		GMTOFF	RULES	FORMAT	[UNTIL]
+-Zone	Africa/Asmara	2:35:32 -	LMT	1870
+-			2:35:32	-	AMT	1890	      # Asmara Mean Time
+-			2:35:20	-	ADMT	1936 May 5    # Adis Dera MT
+-			3:00	-	EAT
+-
+ # Ethiopia
+-# From Paul Eggert (2014-07-31):
+-# Like the Swahili of Kenya and Tanzania, many Ethiopians keep a
+-# 12-hour clock starting at our 06:00, so their "8 o'clock" is our
+-# 02:00 or 14:00.  Keep this in mind when you ask the time in Amharic.
+-#
+-# Shanks & Pottenger write that Ethiopia had six narrowly-spaced time
+-# zones between 1870 and 1890, that they merged to 38E50 (2:35:20) in
+-# 1890, and that they switched to 3:00 on 1936-05-05.  Perhaps 38E50
+-# was for Adis Dera.  Quite likely the Shanks data are wrong anyway.
+-# Zone	NAME		GMTOFF	RULES	FORMAT	[UNTIL]
+-Zone Africa/Addis_Ababa	2:34:48 -	LMT	1870
+-			2:35:20	-	ADMT	1936 May 5    # Adis Dera MT
+-			3:00	-	EAT
++# See Africa/Nairobi.
+ 
+ # Gabon
+-# Zone	NAME		GMTOFF	RULES	FORMAT	[UNTIL]
+-Zone Africa/Libreville	0:37:48 -	LMT	1912
+-			1:00	-	WAT
++# See Africa/Lagos.
+ 
+ # Gambia
+ # See Africa/Abidjan.
+@@ -461,8 +394,14 @@
+ # See Africa/Abidjan.
+ 
+ # Guinea-Bissau
++#
++# Shanks gives 1911-05-26 for the transition to WAT,
++# evidently confusing the date of the Portuguese decree
++# http://dre.pt/pdf1sdip/1911/05/12500/23132313.pdf
++# with the date that it took effect, namely 1912-01-01.
++#
+ # Zone	NAME		GMTOFF	RULES	FORMAT	[UNTIL]
+-Zone	Africa/Bissau	-1:02:20 -	LMT	1911 May 26
++Zone	Africa/Bissau	-1:02:20 -	LMT	1912 Jan  1
+ 			-1:00	-	WAT	1975
+ 			 0:00	-	GMT
+ 
+@@ -473,13 +412,18 @@
+ 			2:30	-	BEAT	1940
+ 			2:45	-	BEAUT	1960
+ 			3:00	-	EAT
++Link Africa/Nairobi Africa/Addis_Ababa	 # Ethiopia
++Link Africa/Nairobi Africa/Asmara	 # Eritrea
++Link Africa/Nairobi Africa/Dar_es_Salaam # Tanzania
++Link Africa/Nairobi Africa/Djibouti
++Link Africa/Nairobi Africa/Kampala	 # Uganda
++Link Africa/Nairobi Africa/Mogadishu	 # Somalia
++Link Africa/Nairobi Indian/Antananarivo	 # Madagascar
++Link Africa/Nairobi Indian/Comoro
++Link Africa/Nairobi Indian/Mayotte
+ 
+ # Lesotho
+-# Zone	NAME		GMTOFF	RULES	FORMAT	[UNTIL]
+-Zone	Africa/Maseru	1:50:00 -	LMT	1903 Mar
+-			2:00	-	SAST	1943 Sep 19 2:00
+-			2:00	1:00	SAST	1944 Mar 19 2:00
+-			2:00	-	SAST
++# See Africa/Johannesburg.
+ 
+ # Liberia
+ # From Paul Eggert (2006-03-22):
+@@ -520,7 +464,7 @@
+ # http://www.libyaherald.com/2013/10/24/correction-no-time-change-tomorrow/
+ #
+ # From Paul Eggert (2013-10-25):
+-# For now, assume they're reverting to the pre-2012 rules of permanent UTC+2.
++# For now, assume they're reverting to the pre-2012 rules of permanent UT +02.
+ 
+ # Rule	NAME	FROM	TO	TYPE	IN	ON	AT	SAVE	LETTER/S
+ Rule	Libya	1951	only	-	Oct	14	2:00	1:00	S
+@@ -546,24 +490,18 @@
+ 			2:00	-	EET	1982
+ 			1:00	Libya	CE%sT	1990 May  4
+ # The 1996 and 1997 entries are from Shanks & Pottenger;
+-# the IATA SSIM data contain some obvious errors.
++# the IATA SSIM data entries contain some obvious errors.
+ 			2:00	-	EET	1996 Sep 30
+ 			1:00	Libya	CE%sT	1997 Oct  4
+-			2:00	-	EET	2012 Nov 10 2:00
+-			1:00	Libya	CE%sT	2013 Oct 25 2:00
++			2:00	-	EET	2012 Nov 10  2:00
++			1:00	Libya	CE%sT	2013 Oct 25  2:00
+ 			2:00	-	EET
+ 
+ # Madagascar
+-# Zone	NAME		GMTOFF	RULES	FORMAT	[UNTIL]
+-Zone Indian/Antananarivo 3:10:04 -	LMT	1911 Jul
+-			3:00	-	EAT	1954 Feb 27 23:00s
+-			3:00	1:00	EAST	1954 May 29 23:00s
+-			3:00	-	EAT
++# See Africa/Nairobi.
+ 
+ # Malawi
+-# Zone	NAME		GMTOFF	RULES	FORMAT	[UNTIL]
+-Zone	Africa/Blantyre	2:20:00 -	LMT	1903 Mar
+-			2:00	-	CAT
++# See Africa/Maputo.
+ 
+ # Mali
+ # Mauritania
+@@ -606,7 +544,7 @@
+ 
+ # From Alex Krivenyshev (2008-07-11):
+ # Seems that English language article "The revival of daylight saving
+-# time:  Energy conservation?"-# No. 16578 (07/11/2008) was originally
++# time: Energy conservation?"- No. 16578 (07/11/2008) was originally
+ # published on Monday, June 30, 2008...
+ #
+ # I guess that article in French "Le gouvernement avance l'introduction
+@@ -657,15 +595,13 @@
+ Rule Mauritius	2008	only	-	Oct	lastSun	2:00	1:00	S
+ Rule Mauritius	2009	only	-	Mar	lastSun	2:00	0	-
+ # Zone	NAME		GMTOFF	RULES	FORMAT	[UNTIL]
+-Zone Indian/Mauritius	3:50:00 -	LMT	1907		# Port Louis
++Zone Indian/Mauritius	3:50:00 -	LMT	1907 # Port Louis
+ 			4:00 Mauritius	MU%sT	# Mauritius Time
+ # Agalega Is, Rodriguez
+ # no information; probably like Indian/Mauritius
+ 
+ # Mayotte
+-# Zone	NAME		GMTOFF	RULES	FORMAT	[UNTIL]
+-Zone	Indian/Mayotte	3:00:56 -	LMT	1911 Jul	# Mamoutzou
+-			3:00	-	EAT
++# See Africa/Nairobi.
+ 
+ # Morocco
+ # See the 'europe' file for Spanish Morocco (Africa/Ceuta).
+@@ -682,7 +618,8 @@
+ # http://en.afrik.com/news11892.html
+ 
+ # From Alex Krivenyshev (2008-05-09):
+-# The Morocco time change can be confirmed on Morocco web site Maghreb Arabe Presse:
++# The Morocco time change can be confirmed on Morocco web site Maghreb Arabe
++# Presse:
+ # http://www.map.ma/eng/sections/box3/morocco_shifts_to_da/view
+ #
+ # Morocco shifts to daylight time on June 1st through September 27, Govt.
+@@ -739,7 +676,7 @@
+ # Here is a link to official document from Royaume du Maroc Premier Ministre,
+ # Ministère de la Modernisation des Secteurs Publics
+ #
+-# Under Article 1 of Royal Decree No. 455-67 of Act 23 safar 1387 (2 june 1967)
++# Under Article 1 of Royal Decree No. 455-67 of Act 23 safar 1387 (2 June 1967)
+ # concerning the amendment of the legal time, the Ministry of Modernization of
+ # Public Sectors announced that the official time in the Kingdom will be
+ # advanced 60 minutes from Sunday 31 May 2009 at midnight.
+@@ -760,8 +697,8 @@
+ 
+ # From Dan Abitol (2011-03-30):
+ # ...Rules for Africa/Casablanca are the following (24h format)
+-# The 3rd april 2011 at 00:00:00, [it] will be 3rd april 1:00:00
+-# The 31th july 2011 at 00:59:59,  [it] will be 31th July 00:00:00
++# The 3rd April 2011 at 00:00:00, [it] will be 3rd April 01:00:00
++# The 31st July 2011 at 00:59:59, [it] will be 31st July 00:00:00
+ # ...Official links of change in morocco
+ # The change was broadcast on the FM Radio
+ # I ve called ANRT (telecom regulations in Morocco) at
+@@ -831,7 +768,7 @@
+ # announced a bit in advance.  On 2012-07-11 the Moroccan government
+ # announced that year's Ramadan daylight-saving transitions would be
+ # 2012-07-20 and 2012-08-20; see
+-# <http://www.mmsp.gov.ma/fr/actualites.aspx?id=288>.
++# http://www.mmsp.gov.ma/fr/actualites.aspx?id=288
+ 
+ # From Andrew Paprocki (2013-07-02):
+ # Morocco announced that the year's Ramadan daylight-savings
+@@ -857,20 +794,41 @@
+ # will resume again at 02:00 on Saturday, August 2, 2014....
+ # http://www.mmsp.gov.ma/fr/actualites.aspx?id=586
+ 
+-# From Paul Eggert (2014-06-05):
+-# For now, guess that later spring and fall transitions will use 2014's rules,
++# From Milamber (2015-06-08):
++# (Google Translation) The hour will thus be delayed 60 minutes
++# Sunday, June 14 at 3:00, the ministry said in a statement, adding
++# that the time will be advanced again 60 minutes Sunday, July 19,
++# 2015 at 2:00.  The move comes under 2.12.126 Decree of 26 Jumada I
++# 1433 (18 April 2012) and the decision of the Head of Government of
++# 16 N. 3-29-15 Chaaban 1435 (4 June 2015).
++# Source (french):
++# http://lnt.ma/le-maroc-reculera-dune-heure-le-dimanche-14-juin/
++#
++# From Milamber (2015-06-09):
++# http://www.mmsp.gov.ma/fr/actualites.aspx?id=863
++#
++# From Michael Deckers (2015-06-09):
++# [The gov.ma announcement] would (probably) make the switch on 2015-07-19 go
++# from 03:00 to 04:00 rather than from 02:00 to 03:00, as in the patch....
++# I think the patch is correct and the quoted text is wrong; the text in
++# <http://lnt.ma/le-maroc-reculera-dune-heure-le-dimanche-14-juin/> agrees
++# with the patch.
++
++# From Paul Eggert (2015-06-08):
++# For now, guess that later spring and fall transitions will use 2015's rules,
+ # and guess that Morocco will switch to standard time at 03:00 the last
+-# Saturday before Ramadan, and back to DST at 02:00 the first Saturday after
+-# Ramadan.  To implement this, transition dates for 2015 through 2037 were
++# Sunday before Ramadan, and back to DST at 02:00 the first Sunday after
++# Ramadan.  To implement this, transition dates for 2016 through 2037 were
+ # determined by running the following program under GNU Emacs 24.3, with the
+ # results integrated by hand into the table below.
+-# (let ((islamic-year 1436))
++# (let ((islamic-year 1437))
++#   (require 'cal-islam)
+ #   (while (< islamic-year 1460)
+ #     (let ((a (calendar-islamic-to-absolute (list 9 1 islamic-year)))
+ #           (b (calendar-islamic-to-absolute (list 10 1 islamic-year)))
+-#           (saturday 6))
+-#       (while (/= saturday (mod (setq a (1- a)) 7)))
+-#       (while (/= saturday (mod b 7))
++#           (sunday 0))
++#       (while (/= sunday (mod (setq a (1- a)) 7)))
++#       (while (/= sunday (mod b 7))
+ #         (setq b (1+ b)))
+ #       (setq a (calendar-gregorian-from-absolute a))
+ #       (setq b (calendar-gregorian-from-absolute b))
+@@ -906,40 +864,38 @@
+ Rule	Morocco	2010	only	-	May	 2	 0:00	1:00	S
+ Rule	Morocco	2010	only	-	Aug	 8	 0:00	0	-
+ Rule	Morocco	2011	only	-	Apr	 3	 0:00	1:00	S
+-Rule	Morocco	2011	only	-	Jul	31	 0	0	-
++Rule	Morocco	2011	only	-	Jul	31	 0:00	0	-
+ Rule	Morocco	2012	2013	-	Apr	lastSun	 2:00	1:00	S
+-Rule	Morocco	2012	only	-	Sep	30	 3:00	0	-
+ Rule	Morocco	2012	only	-	Jul	20	 3:00	0	-
+ Rule	Morocco	2012	only	-	Aug	20	 2:00	1:00	S
++Rule	Morocco	2012	only	-	Sep	30	 3:00	0	-
+ Rule	Morocco	2013	only	-	Jul	 7	 3:00	0	-
+ Rule	Morocco	2013	only	-	Aug	10	 2:00	1:00	S
+ Rule	Morocco	2013	max	-	Oct	lastSun	 3:00	0	-
+-Rule	Morocco	2014	2022	-	Mar	lastSun	 2:00	1:00	S
++Rule	Morocco	2014	2021	-	Mar	lastSun	 2:00	1:00	S
+ Rule	Morocco	2014	only	-	Jun	28	 3:00	0	-
+ Rule	Morocco	2014	only	-	Aug	 2	 2:00	1:00	S
+-Rule	Morocco	2015	only	-	Jun	13	 3:00	0	-
+-Rule	Morocco	2015	only	-	Jul	18	 2:00	1:00	S
+-Rule	Morocco	2016	only	-	Jun	 4	 3:00	0	-
+-Rule	Morocco	2016	only	-	Jul	 9	 2:00	1:00	S
+-Rule	Morocco	2017	only	-	May	20	 3:00	0	-
+-Rule	Morocco	2017	only	-	Jul	 1	 2:00	1:00	S
+-Rule	Morocco	2018	only	-	May	12	 3:00	0	-
+-Rule	Morocco	2018	only	-	Jun	16	 2:00	1:00	S
+-Rule	Morocco	2019	only	-	May	 4	 3:00	0	-
+-Rule	Morocco	2019	only	-	Jun	 8	 2:00	1:00	S
+-Rule	Morocco	2020	only	-	Apr	18	 3:00	0	-
+-Rule	Morocco	2020	only	-	May	30	 2:00	1:00	S
+-Rule	Morocco	2021	only	-	Apr	10	 3:00	0	-
+-Rule	Morocco	2021	only	-	May	15	 2:00	1:00	S
+-Rule	Morocco	2022	only	-	Apr	 2	 3:00	0	-
+-Rule	Morocco	2022	only	-	May	 7	 2:00	1:00	S
+-Rule	Morocco	2023	only	-	Apr	22	 2:00	1:00	S
+-Rule	Morocco	2024	only	-	Apr	13	 2:00	1:00	S
+-Rule	Morocco	2025	only	-	Apr	 5	 2:00	1:00	S
++Rule	Morocco	2015	only	-	Jun	14	 3:00	0	-
++Rule	Morocco	2015	only	-	Jul	19	 2:00	1:00	S
++Rule	Morocco	2016	only	-	Jun	 5	 3:00	0	-
++Rule	Morocco	2016	only	-	Jul	10	 2:00	1:00	S
++Rule	Morocco	2017	only	-	May	21	 3:00	0	-
++Rule	Morocco	2017	only	-	Jul	 2	 2:00	1:00	S
++Rule	Morocco	2018	only	-	May	13	 3:00	0	-
++Rule	Morocco	2018	only	-	Jun	17	 2:00	1:00	S
++Rule	Morocco	2019	only	-	May	 5	 3:00	0	-
++Rule	Morocco	2019	only	-	Jun	 9	 2:00	1:00	S
++Rule	Morocco	2020	only	-	Apr	19	 3:00	0	-
++Rule	Morocco	2020	only	-	May	24	 2:00	1:00	S
++Rule	Morocco	2021	only	-	Apr	11	 3:00	0	-
++Rule	Morocco	2021	only	-	May	16	 2:00	1:00	S
++Rule	Morocco	2022	only	-	May	 8	 2:00	1:00	S
++Rule	Morocco	2023	only	-	Apr	23	 2:00	1:00	S
++Rule	Morocco	2024	only	-	Apr	14	 2:00	1:00	S
++Rule	Morocco	2025	only	-	Apr	 6	 2:00	1:00	S
+ Rule	Morocco	2026	max	-	Mar	lastSun	 2:00	1:00	S
+-Rule	Morocco	2035	only	-	Oct	27	 3:00	0	-
+-Rule	Morocco	2036	only	-	Oct	18	 3:00	0	-
+-Rule	Morocco	2037	only	-	Oct	10	 3:00	0	-
++Rule	Morocco	2036	only	-	Oct	19	 3:00	0	-
++Rule	Morocco	2037	only	-	Oct	 4	 3:00	0	-
+ 
+ # Zone	NAME		GMTOFF	RULES	FORMAT	[UNTIL]
+ Zone Africa/Casablanca	-0:30:20 -	LMT	1913 Oct 26
+@@ -963,16 +919,29 @@
+ 			 0:00	Morocco	WE%sT
+ 
+ # Mozambique
++#
++# Shanks gives 1903-03-01 for the transition to CAT.
++# Perhaps the 1911-05-26 Portuguese decree
++# http://dre.pt/pdf1sdip/1911/05/12500/23132313.pdf
++# merely made it official?
++#
+ # Zone	NAME		GMTOFF	RULES	FORMAT	[UNTIL]
+ Zone	Africa/Maputo	2:10:20 -	LMT	1903 Mar
+ 			2:00	-	CAT
++Link Africa/Maputo Africa/Blantyre	# Malawi
++Link Africa/Maputo Africa/Bujumbura	# Burundi
++Link Africa/Maputo Africa/Gaborone	# Botswana
++Link Africa/Maputo Africa/Harare	# Zimbabwe
++Link Africa/Maputo Africa/Kigali	# Rwanda
++Link Africa/Maputo Africa/Lubumbashi	# E Dem. Rep. of Congo
++Link Africa/Maputo Africa/Lusaka	# Zambia
+ 
+ # Namibia
+ # The 1994-04-03 transition is from Shanks & Pottenger.
+ # Shanks & Pottenger report no DST after 1998-04; go with IATA.
+ 
+-# From Petronella Sibeene (2007-03-30) in
+-# <http://allafrica.com/stories/200703300178.html>:
++# From Petronella Sibeene (2007-03-30):
++# http://allafrica.com/stories/200703300178.html
+ # While the entire country changes its time, Katima Mulilo and other
+ # settlements in Caprivi unofficially will not because the sun there
+ # rises and sets earlier compared to other regions.  Chief of
+@@ -989,28 +958,33 @@
+ Rule	Namibia	1995	max	-	Apr	Sun>=1	2:00	0	-
+ # Zone	NAME		GMTOFF	RULES	FORMAT	[UNTIL]
+ Zone	Africa/Windhoek	1:08:24 -	LMT	1892 Feb 8
+-			1:30	-	SWAT	1903 Mar	# SW Africa Time
+-			2:00	-	SAST	1942 Sep 20 2:00
+-			2:00	1:00	SAST	1943 Mar 21 2:00
++			1:30	-	SWAT	1903 Mar    # SW Africa Time
++			2:00	-	SAST	1942 Sep 20  2:00
++			2:00	1:00	SAST	1943 Mar 21  2:00
+ 			2:00	-	SAST	1990 Mar 21 # independence
+ 			2:00	-	CAT	1994 Apr  3
+ 			1:00	Namibia	WA%sT
+ 
+ # Niger
+-# Zone	NAME		GMTOFF	RULES	FORMAT	[UNTIL]
+-Zone	Africa/Niamey	 0:08:28 -	LMT	1912
+-			-1:00	-	WAT	1934 Feb 26
+-			 0:00	-	GMT	1960
+-			 1:00	-	WAT
++# See Africa/Lagos.
+ 
+ # Nigeria
+ # Zone	NAME		GMTOFF	RULES	FORMAT	[UNTIL]
+ Zone	Africa/Lagos	0:13:36 -	LMT	1919 Sep
+ 			1:00	-	WAT
++Link Africa/Lagos Africa/Bangui	     # Central African Republic
++Link Africa/Lagos Africa/Brazzaville # Rep. of the Congo
++Link Africa/Lagos Africa/Douala	     # Cameroon
++Link Africa/Lagos Africa/Kinshasa    # Dem. Rep. of the Congo (west)
++Link Africa/Lagos Africa/Libreville  # Gabon
++Link Africa/Lagos Africa/Luanda	     # Angola
++Link Africa/Lagos Africa/Malabo	     # Equatorial Guinea
++Link Africa/Lagos Africa/Niamey	     # Niger
++Link Africa/Lagos Africa/Porto-Novo  # Benin
+ 
+ # Réunion
+ # Zone	NAME		GMTOFF	RULES	FORMAT	[UNTIL]
+-Zone	Indian/Reunion	3:41:52 -	LMT	1911 Jun	# Saint-Denis
++Zone	Indian/Reunion	3:41:52 -	LMT	1911 Jun # Saint-Denis
+ 			4:00	-	RET	# Réunion Time
+ #
+ # Crozet Islands also observes Réunion time; see the 'antarctica' file.
+@@ -1028,9 +1002,7 @@
+ # Tromelin - inhabited until at least 1958
+ 
+ # Rwanda
+-# Zone	NAME		GMTOFF	RULES	FORMAT	[UNTIL]
+-Zone	Africa/Kigali	2:00:16 -	LMT	1935 Jun
+-			2:00	-	CAT
++# See Africa/Maputo.
+ 
+ # St Helena
+ # See Africa/Abidjan.
+@@ -1047,7 +1019,7 @@
+ 
+ # Seychelles
+ # Zone	NAME		GMTOFF	RULES	FORMAT	[UNTIL]
+-Zone	Indian/Mahe	3:41:48 -	LMT	1906 Jun	# Victoria
++Zone	Indian/Mahe	3:41:48 -	LMT	1906 Jun # Victoria
+ 			4:00	-	SCT	# Seychelles Time
+ # From Paul Eggert (2001-05-30):
+ # Aldabra, Farquhar, and Desroches, originally dependencies of the
+@@ -1060,11 +1032,7 @@
+ # See Africa/Abidjan.
+ 
+ # Somalia
+-# Zone	NAME		GMTOFF	RULES	FORMAT	[UNTIL]
+-Zone Africa/Mogadishu	3:01:28 -	LMT	1893 Nov
+-			3:00	-	EAT	1931
+-			2:30	-	BEAT	1957
+-			3:00	-	EAT
++# See Africa/Nairobi.
+ 
+ # South Africa
+ # Rule	NAME	FROM	TO	TYPE	IN	ON	AT	SAVE	LETTER/S
+@@ -1074,6 +1042,9 @@
+ Zone Africa/Johannesburg 1:52:00 -	LMT	1892 Feb 8
+ 			1:30	-	SAST	1903 Mar
+ 			2:00	SA	SAST
++Link Africa/Johannesburg Africa/Maseru	   # Lesotho
++Link Africa/Johannesburg Africa/Mbabane    # Swaziland
++#
+ # Marion and Prince Edward Is
+ # scientific station since 1947
+ # no information
+@@ -1101,16 +1072,10 @@
+ Link Africa/Khartoum Africa/Juba
+ 
+ # Swaziland
+-# Zone	NAME		GMTOFF	RULES	FORMAT	[UNTIL]
+-Zone	Africa/Mbabane	2:04:24 -	LMT	1903 Mar
+-			2:00	-	SAST
++# See Africa/Johannesburg.
+ 
+ # Tanzania
+-# Zone	NAME		GMTOFF	RULES	FORMAT	[UNTIL]
+-Zone Africa/Dar_es_Salaam 2:37:08 -	LMT	1931
+-			3:00	-	EAT	1948
+-			2:45	-	BEAUT	1961
+-			3:00	-	EAT
++# See Africa/Nairobi.
+ 
+ # Togo
+ # See Africa/Abidjan.
+@@ -1128,7 +1093,7 @@
+ #
+ # From Oscar van Vlijmen (2005-05-02):
+ # La Presse, the first national daily newspaper ...
+-# <http://www.lapresse.tn/archives/archives280405/actualites/lheure.html>
++# http://www.lapresse.tn/archives/archives280405/actualites/lheure.html
+ # ... DST for 2005: on: Sun May 1 0h standard time, off: Fri Sept. 30,
+ # 1h standard time.
+ #
+@@ -1212,23 +1177,12 @@
+ # Shanks & Pottenger say the 1911 switch was on Mar 9; go with Howse's Mar 11.
+ # Zone	NAME		GMTOFF	RULES	FORMAT	[UNTIL]
+ Zone	Africa/Tunis	0:40:44 -	LMT	1881 May 12
+-			0:09:21	-	PMT	1911 Mar 11    # Paris Mean Time
++			0:09:21	-	PMT	1911 Mar 11 # Paris Mean Time
+ 			1:00	Tunisia	CE%sT
+ 
+ # Uganda
+-# Zone	NAME		GMTOFF	RULES	FORMAT	[UNTIL]
+-Zone	Africa/Kampala	2:09:40 -	LMT	1928 Jul
+-			3:00	-	EAT	1930
+-			2:30	-	BEAT	1948
+-			2:45	-	BEAUT	1957
+-			3:00	-	EAT
++# See Africa/Nairobi.
+ 
+ # Zambia
+-# Zone	NAME		GMTOFF	RULES	FORMAT	[UNTIL]
+-Zone	Africa/Lusaka	1:53:08 -	LMT	1903 Mar
+-			2:00	-	CAT
+-
+ # Zimbabwe
+-# Zone	NAME		GMTOFF	RULES	FORMAT	[UNTIL]
+-Zone	Africa/Harare	2:04:12 -	LMT	1903 Mar
+-			2:00	-	CAT
++# See Africa/Maputo.
+--- contrib/tzdata/antarctica.orig
++++ contrib/tzdata/antarctica
+@@ -4,51 +4,14 @@
+ # From Paul Eggert (1999-11-15):
+ # To keep things manageable, we list only locations occupied year-round; see
+ # COMNAP - Stations and Bases
+-# <http://www.comnap.aq/comnap/comnap.nsf/P/Stations/>
++# http://www.comnap.aq/comnap/comnap.nsf/P/Stations/
+ # and
+ # Summary of the Peri-Antarctic Islands (1998-07-23)
+-# <http://www.spri.cam.ac.uk/bob/periant.htm>
++# http://www.spri.cam.ac.uk/bob/periant.htm
+ # for information.
+ # Unless otherwise specified, we have no time zone information.
+-#
+-# Except for the French entries,
+-# I made up all time zone abbreviations mentioned here; corrections welcome!
+-# FORMAT is 'zzz' and GMTOFF is 0 for locations while uninhabited.
+ 
+-# These rules are stolen from the 'southamerica' file.
+-# Rule	NAME	FROM	TO	TYPE	IN	ON	AT	SAVE	LETTER/S
+-Rule	ArgAQ	1964	1966	-	Mar	 1	0:00	0	-
+-Rule	ArgAQ	1964	1966	-	Oct	15	0:00	1:00	S
+-Rule	ArgAQ	1967	only	-	Apr	 2	0:00	0	-
+-Rule	ArgAQ	1967	1968	-	Oct	Sun>=1	0:00	1:00	S
+-Rule	ArgAQ	1968	1969	-	Apr	Sun>=1	0:00	0	-
+-Rule	ArgAQ	1974	only	-	Jan	23	0:00	1:00	S
+-Rule	ArgAQ	1974	only	-	May	 1	0:00	0	-
+-Rule	ChileAQ	1972	1986	-	Mar	Sun>=9	3:00u	0	-
+-Rule	ChileAQ	1974	1987	-	Oct	Sun>=9	4:00u	1:00	S
+-Rule	ChileAQ	1987	only	-	Apr	12	3:00u	0	-
+-Rule	ChileAQ	1988	1989	-	Mar	Sun>=9	3:00u	0	-
+-Rule	ChileAQ	1988	only	-	Oct	Sun>=1	4:00u	1:00	S
+-Rule	ChileAQ	1989	only	-	Oct	Sun>=9	4:00u	1:00	S
+-Rule	ChileAQ	1990	only	-	Mar	18	3:00u	0	-
+-Rule	ChileAQ	1990	only	-	Sep	16	4:00u	1:00	S
+-Rule	ChileAQ	1991	1996	-	Mar	Sun>=9	3:00u	0	-
+-Rule	ChileAQ	1991	1997	-	Oct	Sun>=9	4:00u	1:00	S
+-Rule	ChileAQ	1997	only	-	Mar	30	3:00u	0	-
+-Rule	ChileAQ	1998	only	-	Mar	Sun>=9	3:00u	0	-
+-Rule	ChileAQ	1998	only	-	Sep	27	4:00u	1:00	S
+-Rule	ChileAQ	1999	only	-	Apr	 4	3:00u	0	-
+-Rule	ChileAQ	1999	2010	-	Oct	Sun>=9	4:00u	1:00	S
+-Rule	ChileAQ	2000	2007	-	Mar	Sun>=9	3:00u	0	-
+-# N.B.: the end of March 29 in Chile is March 30 in Universal time,
+-# which is used below in specifying the transition.
+-Rule	ChileAQ	2008	only	-	Mar	30	3:00u	0	-
+-Rule	ChileAQ	2009	only	-	Mar	Sun>=9	3:00u	0	-
+-Rule	ChileAQ	2010	only	-	Apr	Sun>=1	3:00u	0	-
+-Rule	ChileAQ	2011	only	-	May	Sun>=2	3:00u	0	-
+-Rule	ChileAQ	2011	only	-	Aug	Sun>=16	4:00u	1:00	S
+-Rule	ChileAQ	2012	max	-	Apr	Sun>=23	3:00u	0	-
+-Rule	ChileAQ	2012	max	-	Sep	Sun>=2	4:00u	1:00	S
++# FORMAT is '-00' and GMTOFF is 0 for locations while uninhabited.
+ 
+ # Argentina - year-round bases
+ # Belgrano II, Confin Coast, -770227-0343737, since 1972-02-05
+@@ -63,8 +26,8 @@
+ # Heard Island, McDonald Islands (uninhabited)
+ #	previously sealers and scientific personnel wintered
+ #	Margaret Turner reports
+-#	<http://web.archive.org/web/20021204222245/http://www.dstc.qut.edu.au/DST/marg/daylight.html>
+-#	(1999-09-30) that they're UTC+5, with no DST;
++#	http://web.archive.org/web/20021204222245/http://www.dstc.qut.edu.au/DST/marg/daylight.html
++#	(1999-09-30) that they're UT +05, with no DST;
+ #	presumably this is when they have visitors.
+ #
+ # year-round bases
+@@ -101,34 +64,36 @@
+ # Background:
+ # http://www.timeanddate.com/news/time/antartica-time-changes-2010.html
+ 
++# From Steffen Thorsen (2016-10-28):
++# Australian Antarctica Division informed us that Casey changed time
++# zone to UTC+11 in "the morning of 22nd October 2016".
++
+ # Zone	NAME		GMTOFF	RULES	FORMAT	[UNTIL]
+-Zone Antarctica/Casey	0	-	zzz	1969
+-			8:00	-	AWST	2009 Oct 18 2:00
+-						# Australian Western Std Time
+-			11:00	-	CAST	2010 Mar 5 2:00
+-						# Casey Time
+-			8:00	-	AWST	2011 Oct 28 2:00
+-			11:00	-	CAST	2012 Feb 21 17:00u
+-			8:00	-	AWST
+-Zone Antarctica/Davis	0	-	zzz	1957 Jan 13
+-			7:00	-	DAVT	1964 Nov # Davis Time
+-			0	-	zzz	1969 Feb
+-			7:00	-	DAVT	2009 Oct 18 2:00
+-			5:00	-	DAVT	2010 Mar 10 20:00u
+-			7:00	-	DAVT	2011 Oct 28 2:00
+-			5:00	-	DAVT	2012 Feb 21 20:00u
+-			7:00	-	DAVT
+-Zone Antarctica/Mawson	0	-	zzz	1954 Feb 13
+-			6:00	-	MAWT	2009 Oct 18 2:00
+-						# Mawson Time
+-			5:00	-	MAWT
++Zone Antarctica/Casey	0	-	-00	1969
++			8:00	-	+08	2009 Oct 18  2:00
++			11:00	-	+11	2010 Mar  5  2:00
++			8:00	-	+08	2011 Oct 28  2:00
++			11:00	-	+11	2012 Feb 21 17:00u
++			8:00	-	+08	2016 Oct 22
++			11:00	-	+11
++Zone Antarctica/Davis	0	-	-00	1957 Jan 13
++			7:00	-	+07	1964 Nov
++			0	-	-00	1969 Feb
++			7:00	-	+07	2009 Oct 18  2:00
++			5:00	-	+05	2010 Mar 10 20:00u
++			7:00	-	+07	2011 Oct 28  2:00
++			5:00	-	+05	2012 Feb 21 20:00u
++			7:00	-	+07
++Zone Antarctica/Mawson	0	-	-00	1954 Feb 13
++			6:00	-	+06	2009 Oct 18  2:00
++			5:00	-	+05
+ # References:
+ # Casey Weather (1998-02-26)
+-# <http://www.antdiv.gov.au/aad/exop/sfo/casey/casey_aws.html>
++# http://www.antdiv.gov.au/aad/exop/sfo/casey/casey_aws.html
+ # Davis Station, Antarctica (1998-02-26)
+-# <http://www.antdiv.gov.au/aad/exop/sfo/davis/video.html>
++# http://www.antdiv.gov.au/aad/exop/sfo/davis/video.html
+ # Mawson Station, Antarctica (1998-02-25)
+-# <http://www.antdiv.gov.au/aad/exop/sfo/mawson/video.html>
++# http://www.antdiv.gov.au/aad/exop/sfo/mawson/video.html
+ 
+ # Belgium - year-round base
+ # Princess Elisabeth, Queen Maud Land, -713412+0231200, since 2007
+@@ -154,7 +119,7 @@
+ # France - year-round bases (also see "France & Italy")
+ #
+ # From Antoine Leca (1997-01-20):
+-# Time data are from Nicole Pailleau at the IFRTP
++# Time data entries are from Nicole Pailleau at the IFRTP
+ # (French Institute for Polar Research and Technology).
+ # She confirms that French Southern Territories and Terre Adélie bases
+ # don't observe daylight saving time, even if Terre Adélie supplies came
+@@ -174,8 +139,8 @@
+ #	fishing stations operated variously 1819/1931
+ #
+ # Zone	NAME		GMTOFF	RULES	FORMAT	[UNTIL]
+-Zone Indian/Kerguelen	0	-	zzz	1950	# Port-aux-Français
+-			5:00	-	TFT	# ISO code TF Time
++Zone Indian/Kerguelen	0	-	-00	1950 # Port-aux-Français
++			5:00	-	+05
+ #
+ # year-round base in the main continent
+ # Dumont d'Urville, Île des Pétrels, -6640+14001, since 1956-11
+@@ -185,10 +150,10 @@
+ # It was destroyed by fire on 1952-01-14.
+ #
+ # Zone	NAME		GMTOFF	RULES	FORMAT	[UNTIL]
+-Zone Antarctica/DumontDUrville 0 -	zzz	1947
+-			10:00	-	PMT	1952 Jan 14 # Port-Martin Time
+-			0	-	zzz	1956 Nov
+-			10:00	-	DDUT	# Dumont-d'Urville Time
++Zone Antarctica/DumontDUrville 0 -	-00	1947
++			10:00	-	+10	1952 Jan 14
++			0	-	-00	1956 Nov
++			10:00	-	+10
+ 
+ # France & Italy - year-round base
+ # Concordia, -750600+1232000, since 2005
+@@ -213,11 +178,11 @@
+ # was established on 1957-01-29.  Since Syowa station is still the main
+ # station of Japan, it's appropriate for the principal location.
+ # Zone	NAME		GMTOFF	RULES	FORMAT	[UNTIL]
+-Zone Antarctica/Syowa	0	-	zzz	1957 Jan 29
+-			3:00	-	SYOT	# Syowa Time
++Zone Antarctica/Syowa	0	-	-00	1957 Jan 29
++			3:00	-	+03
+ # See:
+ # NIPR Antarctic Research Activities (1999-08-17)
+-# <http://www.nipr.ac.jp/english/ara01.html>
++# http://www.nipr.ac.jp/english/ara01.html
+ 
+ # S Korea - year-round base
+ # Jang Bogo, Terra Nova Bay, -743700+1641205 since 2014
+@@ -251,20 +216,20 @@
+ # correct, but they should be quite close to the actual dates.
+ #
+ # From Paul Eggert (2014-03-21):
+-# The CET-switching Troll rules require zic from tzcode 2014b or later, so as
++# The CET-switching Troll rules require zic from tz 2014b or later, so as
+ # suggested by Bengt-Inge Larsson comment them out for now, and approximate
+ # with only UTC and CEST.  Uncomment them when 2014b is more prevalent.
+ #
+ # Rule	NAME	FROM	TO	TYPE	IN	ON	AT	SAVE	LETTER/S
+-#Rule	Troll	2005	max	-	Mar	 1	1:00u	1:00	CET
+-Rule	Troll	2005	max	-	Mar	lastSun	1:00u	2:00	CEST
+-#Rule	Troll	2005	max	-	Oct	lastSun	1:00u	1:00	CET
+-#Rule	Troll	2004	max	-	Nov	 7	1:00u	0:00	UTC
++#Rule	Troll	2005	max	-	Mar	 1	1:00u	1:00	+01
++Rule	Troll	2005	max	-	Mar	lastSun	1:00u	2:00	+02
++#Rule	Troll	2005	max	-	Oct	lastSun	1:00u	1:00	+01
++#Rule	Troll	2004	max	-	Nov	 7	1:00u	0:00	+00
+ # Remove the following line when uncommenting the above '#Rule' lines.
+-Rule	Troll	2004	max	-	Oct	lastSun	1:00u	0:00	UTC
++Rule	Troll	2004	max	-	Oct	lastSun	1:00u	0:00	+00
+ # Zone	NAME		GMTOFF	RULES	FORMAT	[UNTIL]
+-Zone Antarctica/Troll	0	-	zzz	2005 Feb 12
+-     			0:00	Troll	%s
++Zone Antarctica/Troll	0	-	-00	2005 Feb 12
++			0:00	Troll	%s
+ 
+ # Poland - year-round base
+ # Arctowski, King George Island, -620945-0582745, since 1977
+@@ -281,8 +246,8 @@
+ #	year-round from 1960/61 to 1992
+ 
+ # Vostok, since 1957-12-16, temporarily closed 1994-02/1994-11
+-# From Craig Mundell (1994-12-15)
+-# <http://quest.arc.nasa.gov/antarctica/QA/computers/Directions,Time,ZIP>:
++# From Craig Mundell (1994-12-15):
++# http://quest.arc.nasa.gov/antarctica/QA/computers/Directions,Time,ZIP
+ # Vostok, which is one of the Russian stations, is set on the same
+ # time as Moscow, Russia.
+ #
+@@ -302,10 +267,10 @@
+ # changes during the year and does not necessarily correspond to mean
+ # solar noon.  So the Vostok time might have been whatever the clocks
+ # happened to be during their visit.  So we still don't really know what time
+-# it is at Vostok.  But we'll guess UTC+6.
++# it is at Vostok.  But we'll guess +06.
+ #
+-Zone Antarctica/Vostok	0	-	zzz	1957 Dec 16
+-			6:00	-	VOST	# Vostok time
++Zone Antarctica/Vostok	0	-	-00	1957 Dec 16
++			6:00	-	+06
+ 
+ # S Africa - year-round bases
+ # Marion Island, -4653+03752
+@@ -337,8 +302,8 @@
+ # <http://webexhibits.org/daylightsaving/g.html> says Rothera is -03 all year.
+ #
+ # Zone	NAME		GMTOFF	RULES	FORMAT	[UNTIL]
+-Zone Antarctica/Rothera	0	-	zzz	1976 Dec  1
+-			-3:00	-	ROTT	# Rothera time
++Zone Antarctica/Rothera	0	-	-00	1976 Dec  1
++			-3:00	-	-03
+ 
+ # Uruguay - year round base
+ # Artigas, King George Island, -621104-0585107
+@@ -346,20 +311,7 @@
+ # USA - year-round bases
+ #
+ # Palmer, Anvers Island, since 1965 (moved 2 miles in 1968)
+-#
+-# From Ethan Dicks (1996-10-06):
+-# It keeps the same time as Punta Arenas, Chile, because, just like us
+-# and the South Pole, that's the other end of their supply line....
+-# I verified with someone who was there that since 1980,
+-# Palmer has followed Chile.  Prior to that, before the Falklands War,
+-# Palmer used to be supplied from Argentina.
+-#
+-# Zone	NAME		GMTOFF	RULES	FORMAT	[UNTIL]
+-Zone Antarctica/Palmer	0	-	zzz	1965
+-			-4:00	ArgAQ	AR%sT	1969 Oct 5
+-			-3:00	ArgAQ	AR%sT	1982 May
+-			-4:00	ChileAQ	CL%sT
+-#
++# See 'southamerica' for Antarctica/Palmer, since it uses South American DST.
+ #
+ # McMurdo Station, Ross Island, since 1955-12
+ # Amundsen-Scott South Pole Station, continuously occupied since 1956-11-20
+--- contrib/tzdata/asia.orig
++++ contrib/tzdata/asia
+@@ -1,32 +1,36 @@
+ # This file is in the public domain, so clarified as of
+ # 2009-05-17 by Arthur David Olson.
+ 
+-# This data is by no means authoritative; if you think you know better,
++# This file is by no means authoritative; if you think you know better,
+ # go ahead and edit the file (and please send any changes to
+-# tz@iana.org for general use in the future).
++# tz@iana.org for general use in the future).  For more, please see
++# the file CONTRIBUTING in the tz distribution.
+ 
+-# From Paul Eggert (2013-08-11):
++# From Paul Eggert (2015-08-08):
+ #
+-# A good source for time zone historical data outside the U.S. is
++# Unless otherwise specified, the source for data through 1990 is:
+ # Thomas G. Shanks and Rique Pottenger, The International Atlas (6th edition),
+ # San Diego: ACS Publications, Inc. (2003).
++# Unfortunately this book contains many errors and cites no sources.
+ #
+ # Gwillim Law writes that a good source
+ # for recent time zone data is the International Air Transport
+ # Association's Standard Schedules Information Manual (IATA SSIM),
+ # published semiannually.  Law sent in several helpful summaries
+-# of the IATA's data after 1990.
+-#
+-# Except where otherwise noted, Shanks & Pottenger is the source for
+-# entries through 1990, and IATA SSIM is the source for entries afterwards.
++# of the IATA's data after 1990.  Except where otherwise noted,
++# IATA SSIM is the source for entries after 1990.
+ #
+ # Another source occasionally used is Edward W. Whitman, World Time Differences,
+ # Whitman Publishing Co, 2 Niagara Av, Ealing, London (undated), which
+ # I found in the UCLA library.
+ #
+ # For data circa 1899, a common source is:
+-# Milne J. Civil time. Geogr J. 1899 Feb;13(2):173-94
+-# <http://www.jstor.org/stable/1774359>.
++# Milne J. Civil time. Geogr J. 1899 Feb;13(2):173-94.
++# http://www.jstor.org/stable/1774359
++#
++# For Russian data circa 1919, a source is:
++# Byalokoz EL. New Counting of Time in Russia since July 1, 1919.
++# (See the 'europe' file for a fuller citation.)
+ #
+ # A reliable and entertaining source about time zones is
+ # Derek Howse, Greenwich time and longitude, Philip Wilson Publishers (1997).
+@@ -39,18 +43,20 @@
+ #	2:00 EET  EEST	Eastern European Time
+ #	2:00 IST  IDT	Israel
+ #	3:00 AST  ADT	Arabia*
+-#	3:30 IRST IRDT	Iran
++#	3:30 IRST IRDT	Iran*
+ #	4:00 GST	Gulf*
+ #	5:30 IST	India
+-#	7:00 ICT	Indochina*
++#	7:00 ICT	Indochina, most times and locations*
+ #	7:00 WIB	west Indonesia (Waktu Indonesia Barat)
+ #	8:00 WITA	central Indonesia (Waktu Indonesia Tengah)
+ #	8:00 CST	China
++#	8:00 IDT	Indochina, 1943-45, 1947-55, 1960-75 (some locations)*
+ #	8:00 JWST	Western Standard Time (Japan, 1896/1937)*
++#	8:30 KST  KDT	Korea when at +0830*
+ #	9:00 JCST	Central Standard Time (Japan, 1896/1937)
+ #	9:00 WIT	east Indonesia (Waktu Indonesia Timur)
+ #	9:00 JST  JDT	Japan
+-#	9:00 KST  KDT	Korea
++#	9:00 KST  KDT	Korea when at +09
+ #	9:30 ACST	Australian Central Standard Time
+ #
+ # See the 'europe' file for Russia and Turkey in Asia.
+@@ -73,13 +79,9 @@
+ Rule E-EurAsia	1996	max	-	Oct	lastSun	 0:00	0	-
+ Rule RussiaAsia	1981	1984	-	Apr	1	 0:00	1:00	S
+ Rule RussiaAsia	1981	1983	-	Oct	1	 0:00	0	-
+-Rule RussiaAsia	1984	1991	-	Sep	lastSun	 2:00s	0	-
+-Rule RussiaAsia	1985	1991	-	Mar	lastSun	 2:00s	1:00	S
+-Rule RussiaAsia	1992	only	-	Mar	lastSat	23:00	1:00	S
+-Rule RussiaAsia	1992	only	-	Sep	lastSat	23:00	0	-
+-Rule RussiaAsia	1993	max	-	Mar	lastSun	 2:00s	1:00	S
+-Rule RussiaAsia	1993	1995	-	Sep	lastSun	 2:00s	0	-
+-Rule RussiaAsia	1996	max	-	Oct	lastSun	 2:00s	0	-
++Rule RussiaAsia	1984	1995	-	Sep	lastSun	 2:00s	0	-
++Rule RussiaAsia	1985	2011	-	Mar	lastSun	 2:00s	1:00	S
++Rule RussiaAsia	1996	2011	-	Oct	lastSun	 2:00s	0	-
+ 
+ # Afghanistan
+ # Zone	NAME		GMTOFF	RULES	FORMAT	[UNTIL]
+@@ -114,36 +116,40 @@
+ # http://www.worldtimezone.com/dst_news/dst_news_armenia03.html
+ # Zone	NAME		GMTOFF	RULES	FORMAT	[UNTIL]
+ Zone	Asia/Yerevan	2:58:00 -	LMT	1924 May  2
+-			3:00	-	YERT	1957 Mar    # Yerevan Time
+-			4:00 RussiaAsia YER%sT	1991 Mar 31 2:00s
+-			3:00	1:00	YERST	1991 Sep 23 # independence
+-			3:00 RussiaAsia	AM%sT	1995 Sep 24 2:00s
+-			4:00	-	AMT	1997
+-			4:00 RussiaAsia	AM%sT	2012 Mar 25 2:00s
+-			4:00	-	AMT
++			3:00	-	+03	1957 Mar
++			4:00 RussiaAsia +04/+05	1991 Mar 31  2:00s
++			3:00 RussiaAsia	+03/+04	1995 Sep 24  2:00s
++			4:00	-	+04	1997
++			4:00 RussiaAsia	+04/+05
+ 
+ # Azerbaijan
++
+ # From Rustam Aliyev of the Azerbaijan Internet Forum (2005-10-23):
+ # According to the resolution of Cabinet of Ministers, 1997
+-# Resolution available at: http://aif.az/docs/daylight_res.pdf
++# From Paul Eggert (2015-09-17): It was Resolution No. 21 (1997-03-17).
++# http://code.az/files/daylight_res.pdf
++
++# From Steffen Thorsen (2016-03-17):
++# ... the Azerbaijani Cabinet of Ministers has cancelled switching to
++# daylight saving time....
++# http://www.azernews.az/azerbaijan/94137.html
++# http://vestnikkavkaza.net/news/Azerbaijani-Cabinet-of-Ministers-cancels-daylight-saving-time.html
++# http://en.apa.az/xeber_azerbaijan_abolishes_daylight_savings_ti_240862.html
++
+ # Rule	NAME	FROM	TO	TYPE	IN	ON	AT	SAVE	LETTER/S
+-Rule	Azer	1997	max	-	Mar	lastSun	 4:00	1:00	S
+-Rule	Azer	1997	max	-	Oct	lastSun	 5:00	0	-
++Rule	Azer	1997	2015	-	Mar	lastSun	 4:00	1:00	S
++Rule	Azer	1997	2015	-	Oct	lastSun	 5:00	0	-
+ # Zone	NAME		GMTOFF	RULES	FORMAT	[UNTIL]
+ Zone	Asia/Baku	3:19:24 -	LMT	1924 May  2
+-			3:00	-	BAKT	1957 Mar    # Baku Time
+-			4:00 RussiaAsia BAK%sT	1991 Mar 31 2:00s
+-			3:00	1:00	BAKST	1991 Aug 30 # independence
+-			3:00 RussiaAsia	AZ%sT	1992 Sep lastSat 23:00
+-			4:00	-	AZT	1996 # Azerbaijan time
+-			4:00	EUAsia	AZ%sT	1997
+-			4:00	Azer	AZ%sT
++			3:00	-	+03	1957 Mar
++			4:00 RussiaAsia +04/+05	1991 Mar 31  2:00s
++			3:00 RussiaAsia	+03/+04	1992 Sep lastSun  2:00s
++			4:00	-	+04	1996
++			4:00	EUAsia	+04/+05	1997
++			4:00	Azer	+04/+05
+ 
+ # Bahrain
+-# Zone	NAME		GMTOFF	RULES	FORMAT	[UNTIL]
+-Zone	Asia/Bahrain	3:22:20 -	LMT	1920		# Manamah
+-			4:00	-	GST	1972 Jun
+-			3:00	-	AST
++# See Asia/Qatar.
+ 
+ # Bangladesh
+ # From Alexander Krivenyshev (2009-05-13):
+@@ -219,7 +225,7 @@
+ 
+ # Rule	NAME	FROM	TO	TYPE	IN	ON	AT	SAVE	LETTER/S
+ Rule	Dhaka	2009	only	-	Jun	19	23:00	1:00	S
+-Rule	Dhaka	2009	only	-	Dec	31	23:59	0	-
++Rule	Dhaka	2009	only	-	Dec	31	24:00	0	-
+ 
+ # Zone	NAME		GMTOFF	RULES	FORMAT	[UNTIL]
+ Zone	Asia/Dhaka	6:01:40 -	LMT	1890
+@@ -250,7 +256,7 @@
+ 
+ # Brunei
+ # Zone	NAME		GMTOFF	RULES	FORMAT	[UNTIL]
+-Zone	Asia/Brunei	7:39:40 -	LMT	1926 Mar   # Bandar Seri Begawan
++Zone	Asia/Brunei	7:39:40 -	LMT	1926 Mar # Bandar Seri Begawan
+ 			7:30	-	BNT	1933
+ 			8:00	-	BNT
+ 
+@@ -259,19 +265,15 @@
+ # Milne says 6:24:40 was the meridian of the time ball observatory at Rangoon.
+ 
+ # Zone	NAME		GMTOFF	RULES	FORMAT	[UNTIL]
+-Zone	Asia/Rangoon	6:24:40 -	LMT	1880		# or Yangon
+-			6:24:40	-	RMT	1920	   # Rangoon Mean Time?
+-			6:30	-	BURT	1942 May   # Burma Time
+-			9:00	-	JST	1945 May 3
+-			6:30	-	MMT		   # Myanmar Time
++Zone	Asia/Yangon	6:24:40 -	LMT	1880        # or Rangoon
++			6:24:40	-	RMT	1920        # Rangoon Mean Time?
++			6:30	-	BURT	1942 May    # Burma Time
++			9:00	-	JST	1945 May  3
++			6:30	-	MMT	# Myanmar Time
+ 
+ # Cambodia
+-# Zone	NAME		GMTOFF	RULES	FORMAT	[UNTIL]
+-Zone	Asia/Phnom_Penh	6:59:40 -	LMT	1906 Jun  9
+-			7:06:20	-	SMT	1911 Mar 11 0:01 # Saigon MT?
+-			7:00	-	ICT	1912 May
+-			8:00	-	ICT	1931 May
+-			7:00	-	ICT
++# See Asia/Bangkok.
++
+ 
+ # China
+ 
+@@ -356,8 +358,8 @@
+ #   * The Republic of China instituted Beijing mean solar time effective
+ #     the official calendar book of 1914.
+ #   * The French Concession in Shanghai set up signal stations in
+-#     French docks in the 1890s, controled by Xujiahui (Zikawei)
+-#     Obervatory and set to local mean time.
++#     French docks in the 1890s, controlled by Xujiahui (Zikawei)
++#     Observatory and set to local mean time.
+ #   * "From the end of the 19th century" it changed to UT+8.
+ #   * Chinese Customs (by then reduced to a tool of foreign powers)
+ #     eventually standardized on this time for all ports, and it
+@@ -378,35 +380,35 @@
+ # Lewiston (ME) Daily Sun (1939-05-29), p 17, said "Even the time is
+ # different - the occupied districts going by Tokyo time, an hour
+ # ahead of that prevailing in the rest of Shanghai."  Guess that the
+-# Xujiahui Observatory was under French control and stuck with UT+8.
++# Xujiahui Observatory was under French control and stuck with UT +08.
+ #
+ # In earlier versions of this file, China had many separate Zone entries, but
+-# this was based on what was apparently incorrect data in Shanks & Pottenger.
++# this was based on what were apparently incorrect data in Shanks & Pottenger.
+ # This has now been simplified to the two entries Asia/Shanghai and
+ # Asia/Urumqi, with the others being links for backward compatibility.
+ # Proposed in 1918 and theoretically in effect until 1949 (although in practice
+ # mainly observed in coastal areas), the five zones were:
+ #
+-# Changbai Time ("Long-white Time", Long-white = Heilongjiang area) UT+8.5
++# Changbai Time ("Long-white Time", Long-white = Heilongjiang area) UT +08:30
+ # Asia/Harbin (currently a link to Asia/Shanghai)
+ # Heilongjiang (except Mohe county), Jilin
+ #
+-# Zhongyuan Time ("Central plain Time") UT+8
++# Zhongyuan Time ("Central plain Time") UT +08
+ # Asia/Shanghai
+ # most of China
+ # This currently represents most other zones as well,
+ # as apparently these regions have been the same since 1970.
+ # Milne gives 8:05:43.2 for Xujiahui Observatory time; round to nearest.
+-# Guo says Shanghai switched to UT+8 "from the end of the 19th century".
++# Guo says Shanghai switched to UT +08 "from the end of the 19th century".
+ #
+-# Long-shu Time (probably due to Long and Shu being two names of that area) UT+7
++# Long-shu Time (probably due to Long and Shu being two names of the area) UT +07
+ # Asia/Chongqing (currently a link to Asia/Shanghai)
+ # Guangxi, Guizhou, Hainan, Ningxia, Sichuan, Shaanxi, and Yunnan;
+ # most of Gansu; west Inner Mongolia; west Qinghai; and the Guangdong
+ # counties Deqing, Enping, Kaiping, Luoding, Taishan, Xinxing,
+ # Yangchun, Yangjiang, Yu'nan, and Yunfu.
+ #
+-# Xin-zang Time ("Xinjiang-Tibet Time") UT+6
++# Xin-zang Time ("Xinjiang-Tibet Time") UT +06
+ # Asia/Urumqi
+ # This currently represents Kunlun Time as well,
+ # as apparently the two regions have been the same since 1970.
+@@ -419,7 +421,7 @@
+ # Shihezi, Changji, Yanqi, Heshuo, Tuokexun, Tulufan, Shanshan, Hami,
+ # Fukang, Kuitun, Kumukuli, Miquan, Qitai, and Turfan.
+ #
+-# Kunlun Time UT+5.5
++# Kunlun Time UT +05:30
+ # Asia/Kashgar (currently a link to Asia/Urumqi)
+ # West Tibet, including Pulan, Aheqi, Shufu, Shule;
+ # West Xinjiang, including Aksu, Atushi, Yining, Hetian, Cele, Luopu, Nileke,
+@@ -435,7 +437,7 @@
+ #
+ # On the other hand, ethnic Uyghurs, who make up about half the
+ # population of Xinjiang, typically use "Xinjiang time" which is two
+-# hours behind Beijing time, or UTC +0600. The government of the Xinjiang
++# hours behind Beijing time, or UT +06. The government of the Xinjiang
+ # Uyghur Autonomous Region, (XAUR, or just Xinjiang for short) as well as
+ # local governments such as the Ürümqi city government use both times in
+ # publications, referring to what is popularly called Xinjiang time as
+@@ -491,8 +493,8 @@
+ # having the same time as Beijing.
+ 
+ # From Paul Eggert (2014-06-30):
+-# In the early days of the PRC, Tibet was given its own time zone (UT+6) but
+-# this was withdrawn in 1959 and never reinstated; see Tubten Khétsun,
++# In the early days of the PRC, Tibet was given its own time zone (UT +06)
++# but this was withdrawn in 1959 and never reinstated; see Tubten Khétsun,
+ # Memories of life in Lhasa under Chinese Rule, Columbia U Press, ISBN
+ # 978-0231142861 (2008), translator's introduction by Matthew Akester, p x.
+ # As this is before our 1970 cutoff, Tibet doesn't need a separate zone.
+@@ -501,17 +503,17 @@
+ # "The Working-Calendar for The Xinjiang Uygur Autonomous Region Government"
+ # <http://www.sinkiang.gov.cn/service/ourworking/> (2014-04-22).
+ # Unfortunately, we have no good records of time in Xinjiang before 1986.
+-# During the 20th century parts of Xinjiang were ruled by the Qing dyansty,
++# During the 20th century parts of Xinjiang were ruled by the Qing dynasty,
+ # the Republic of China, various warlords, the First and Second East Turkestan
+ # Republics, the Soviet Union, the Kuomintang, and the People's Republic of
+ # China, and tracking down all these organizations' timekeeping rules would be
+ # quite a trick.  Approximate this lost history by a transition from LMT to
+-# XJT at the start of 1928, the year of accession of the warlord Jin Shuren,
++# UT +06 at the start of 1928, the year of accession of the warlord Jin Shuren,
+ # which happens to be the date given by Shanks & Pottenger (no doubt as a
+-# guess) as the transition from LMT.  Ignore the usage of UT+8 before
+-# 1986-02-01 under the theory that the transition date to UT+8 is unknown and
++# guess) as the transition from LMT.  Ignore the usage of +08 before
++# 1986-02-01 under the theory that the transition date to +08 is unknown and
+ # that the sort of users who prefer Asia/Urumqi now typically ignored the
+-# UT+8 mandate back then.
++# +08 mandate back then.
+ 
+ # Zone	NAME		GMTOFF	RULES	FORMAT	[UNTIL]
+ # Beijing time, used throughout China; represented by Shanghai.
+@@ -698,25 +700,25 @@
+ # Central Weather Bureau website was not correct.
+ #
+ # Original Bulletin:
+-# <http://subtpg.tpg.gov.tw/og/image2.asp?f=03502F0AKM1AF>
+-# <http://subtpg.tpg.gov.tw/og/image2.asp?f=0350300AKM1B0> (cont.)
++# http://subtpg.tpg.gov.tw/og/image2.asp?f=03502F0AKM1AF
++# http://subtpg.tpg.gov.tw/og/image2.asp?f=0350300AKM1B0 (cont.)
+ #
+ # In 1947, DST in Taiwan was expanded to Oct 31. There is a backup of that
+ # telegram announcement from Taiwan Province Government:
+ #
+-# <http://subtpg.tpg.gov.tw/og/image2.asp?f=0360310AKZ431>
++# http://subtpg.tpg.gov.tw/og/image2.asp?f=0360310AKZ431
+ #
+ # Here is a brief translation:
+ #
+ #   The Summer Time this year is adopted from midnight Apr 15 until Sep 20
+ #   midnight. To save (energy?) consumption, we're expanding Summer Time
+-#   adption till Oct 31 midnight.
++#   adoption till Oct 31 midnight.
+ #
+ # The Central Weather Bureau website didn't mention that, however it can
+ # be found from historical government announcement database.
+ 
+ # From Paul Eggert (2014-07-03):
+-# As per Yu-Cheng Chuang, say that Taiwan was at UT+9 from 1937-10-01
++# As per Yu-Cheng Chuang, say that Taiwan was at UT +09 from 1937-10-01
+ # until 1945-09-21 at 01:00, overriding Shanks & Pottenger.
+ # Likewise, use Yu-Cheng Chuang's data for DST in Taiwan.
+ 
+@@ -741,7 +743,7 @@
+ # Taipei or Taibei or T'ai-pei
+ Zone	Asia/Taipei	8:06:00 -	LMT	1896 Jan  1
+ 			8:00	-	JWST	1937 Oct  1
+-			9:00	-	JST	1945 Sep 21 01:00
++			9:00	-	JST	1945 Sep 21  1:00
+ 			8:00	Taiwan	C%sT
+ 
+ # Macau (Macao, Aomen)
+@@ -761,7 +763,7 @@
+ Rule	Macau	1978	1980	-	Apr	Sun>=15	0:00	1:00	S
+ Rule	Macau	1978	1980	-	Oct	Sun>=15	0:00	0	-
+ # Zone	NAME		GMTOFF	RULES	FORMAT	[UNTIL]
+-Zone	Asia/Macau	7:34:20 -	LMT	1912
++Zone	Asia/Macau	7:34:20 -	LMT	1912 Jan  1
+ 			8:00	Macau	MO%sT	1999 Dec 20 # return to China
+ 			8:00	PRC	C%sT
+ 
+@@ -769,9 +771,19 @@
+ ###############################################################################
+ 
+ # Cyprus
+-#
++
+ # Milne says the Eastern Telegraph Company used 2:14:00.  Stick with LMT.
+-#
++# IATA SSIM (1998-09) has Cyprus using EU rules for the first time.
++
++# From Paul Eggert (2016-09-09):
++# Yesterday's Cyprus Mail reports that Northern Cyprus followed Turkey's
++# lead and switched from +02/+03 to +03 year-round.
++# http://cyprus-mail.com/2016/09/08/two-time-zones-cyprus-turkey-will-not-turn-clocks-back-next-month/
++#
++# From Even Scharning (2016-10-31):
++# Looks like the time zone split in Cyprus went through last night.
++# http://cyprus-mail.com/2016/10/30/cyprus-new-division-two-time-zones-now-reality/
++
+ # Rule	NAME	FROM	TO	TYPE	IN	ON	AT	SAVE	LETTER/S
+ Rule	Cyprus	1975	only	-	Apr	13	0:00	1:00	S
+ Rule	Cyprus	1975	only	-	Oct	12	0:00	0	-
+@@ -786,7 +798,10 @@
+ Zone	Asia/Nicosia	2:13:28 -	LMT	1921 Nov 14
+ 			2:00	Cyprus	EE%sT	1998 Sep
+ 			2:00	EUAsia	EE%sT
+-# IATA SSIM (1998-09) has Cyprus using EU rules for the first time.
++Zone	Asia/Famagusta	2:15:48	-	LMT	1921 Nov 14
++			2:00	Cyprus	EE%sT	1998 Sep
++			2:00	EUAsia	EE%sT	2016 Sep  8
++			3:00	-	+03
+ 
+ # Classically, Cyprus belongs to Asia; e.g. see Herodotus, Histories, I.72.
+ # However, for various reasons many users expect to find it under Europe.
+@@ -823,21 +838,22 @@
+ # I don't know what can be done, especially knowing that some years ago our
+ # DST rules where changed THREE TIMES during one month.
+ 
+-# Milne says Tbilisi (Tiflis) time was 2:59:05.7; round to nearest.)
+-
+-# Zone	NAME		GMTOFF	RULES	FORMAT	[UNTIL]
+-Zone	Asia/Tbilisi	2:59:06 -	LMT	1880
+-			2:59:06	-	TBMT	1924 May  2 # Tbilisi Mean Time
+-			3:00	-	TBIT	1957 Mar    # Tbilisi Time
+-			4:00 RussiaAsia TBI%sT	1991 Mar 31 2:00s
+-			3:00	1:00	TBIST	1991 Apr  9 # independence
+-			3:00 RussiaAsia GE%sT	1992 # Georgia Time
+-			3:00 E-EurAsia	GE%sT	1994 Sep lastSun
+-			4:00 E-EurAsia	GE%sT	1996 Oct lastSun
+-			4:00	1:00	GEST	1997 Mar lastSun
+-			4:00 E-EurAsia	GE%sT	2004 Jun 27
+-			3:00 RussiaAsia	GE%sT	2005 Mar lastSun 2:00
+-			4:00	-	GET
++# Milne 1899 says Tbilisi (Tiflis) time was 2:59:05.7.
++# Byalokoz 1919 says Georgia was 2:59:11.
++# Go with Byalokoz.
++
++# Zone	NAME		GMTOFF	RULES	FORMAT	[UNTIL]
++Zone	Asia/Tbilisi	2:59:11 -	LMT	1880
++			2:59:11	-	TBMT	1924 May  2 # Tbilisi Mean Time
++			3:00	-	+03	1957 Mar
++			4:00 RussiaAsia +04/+05	1991 Mar 31  2:00s
++			3:00 RussiaAsia +03/+04	1992
++			3:00 E-EurAsia	+03/+04	1994 Sep lastSun
++			4:00 E-EurAsia	+04/+05	1996 Oct lastSun
++			4:00	1:00	+05	1997 Mar lastSun
++			4:00 E-EurAsia	+04/+05	2004 Jun 27
++			3:00 RussiaAsia	+03/+04	2005 Mar lastSun  2:00
++			4:00	-	+04
+ 
+ # East Timor
+ 
+@@ -864,16 +880,25 @@
+ # midnight on Saturday, September 16.
+ 
+ # Zone	NAME		GMTOFF	RULES	FORMAT	[UNTIL]
+-Zone	Asia/Dili	8:22:20 -	LMT	1912
++Zone	Asia/Dili	8:22:20 -	LMT	1912 Jan  1
+ 			8:00	-	TLT	1942 Feb 21 23:00 # E Timor Time
+ 			9:00	-	JST	1945 Sep 23
+ 			9:00	-	TLT	1976 May  3
+-			8:00	-	WITA	2000 Sep 17 00:00
++			8:00	-	WITA	2000 Sep 17  0:00
+ 			9:00	-	TLT
+ 
+ # India
++
++# From Ian P. Beacock, in "A brief history of (modern) time", The Atlantic
++# http://www.theatlantic.com/technology/archive/2015/12/the-creation-of-modern-time/421419/
++# (2015-12-22):
++# In January 1906, several thousand cotton-mill workers rioted on the
++# outskirts of Bombay....  They were protesting the proposed abolition of
++# local time in favor of Indian Standard Time....  Journalists called this
++# dispute the "Battle of the Clocks."  It lasted nearly half a century.
++
+ # Zone	NAME		GMTOFF	RULES	FORMAT	[UNTIL]
+-Zone	Asia/Kolkata	5:53:28 -	LMT	1880	# Kolkata
++Zone	Asia/Kolkata	5:53:28 -	LMT	1880        # Kolkata
+ 			5:53:20	-	HMT	1941 Oct    # Howrah Mean Time?
+ 			6:30	-	BURT	1942 May 15 # Burma Time
+ 			5:30	-	IST	1942 Sep
+@@ -886,8 +911,12 @@
+ 
+ # Indonesia
+ #
++# From Paul Eggert (2014-09-06):
++# The 1876 Report of the Secretary of the [US] Navy, p 306 says that Batavia
++# civil time was 7:07:12.5; round to even for Jakarta.
++#
+ # From Gwillim Law (2001-05-28), overriding Shanks & Pottenger:
+-# <http://www.sumatera-inc.com/go_to_invest/about_indonesia.asp#standtime>
++# http://www.sumatera-inc.com/go_to_invest/about_indonesia.asp#standtime
+ # says that Indonesia's time zones changed on 1988-01-01.  Looking at some
+ # time zone maps, I think that must refer to Western Borneo (Kalimantan Barat
+ # and Kalimantan Tengah) switching from UTC+8 to UTC+7.
+@@ -901,7 +930,7 @@
+ # These would be the earliest possible times for a change.
+ # Régimes horaires pour le monde entier, by Henri Le Corre, (Éditions
+ # Traditionnelles, 1987, Paris) says that Java and Madura switched
+-# from JST to UTC+07:30 on 1945-09-23, and gives 1944-09-01 for Jayapura
++# from UT +09 to +07:30 on 1945-09-23, and gives 1944-09-01 for Jayapura
+ # (Hollandia).  For now, assume all Indonesian locations other than Jayapura
+ # switched on 1945-09-23.
+ #
+@@ -912,11 +941,11 @@
+ # summary published by the Time and Frequency Laboratory of the
+ # Research Center for Calibration, Instrumentation and Metrology,
+ # Indonesia, <http://time.kim.lipi.go.id/time-eng.php> (2006-09-29).
+-# The abbreviations are:
++# The time zone abbreviations and UT offsets are:
+ #
+-# WIB  - UTC+7 - Waktu Indonesia Barat (Indonesia western time)
+-# WITA - UTC+8 - Waktu Indonesia Tengah (Indonesia central time)
+-# WIT  - UTC+9 - Waktu Indonesia Timur (Indonesia eastern time)
++# WIB  - +07 - Waktu Indonesia Barat (Indonesia western time)
++# WITA - +08 - Waktu Indonesia Tengah (Indonesia central time)
++# WIT  - +09 - Waktu Indonesia Timur (Indonesia eastern time)
+ #
+ # Zone	NAME		GMTOFF	RULES	FORMAT	[UNTIL]
+ # Java, Sumatra
+@@ -924,7 +953,7 @@
+ # Shanks & Pottenger say the next transition was at 1924 Jan 1 0:13,
+ # but this must be a typo.
+ 			7:07:12	-	BMT	1923 Dec 31 23:47:12 # Batavia
+-			7:20	-	JAVT	1932 Nov	 # Java Time
++			7:20	-	JAVT	1932 Nov    # Java Time
+ 			7:30	-	WIB	1942 Mar 23
+ 			9:00	-	JST	1945 Sep 23
+ 			7:30	-	WIB	1948 May
+@@ -1023,7 +1052,7 @@
+ #
+ # From Roozbeh Pournader (2007-11-05):
+ # This is quoted from Official Gazette of the Islamic Republic of
+-# Iran, Volume 63, Number 18242, dated Tuesday 1386/6/24
++# Iran, Volume 63, No. 18242, dated Tuesday 1386/6/24
+ # [2007-10-16]. I am doing the best translation I can:...
+ # The official time of the country will be moved forward for one hour
+ # on the 24 hours of the first day of the month of Farvardin and will
+@@ -1078,11 +1107,18 @@
+ Rule	Iran	2032	2033	-	Sep	21	0:00	0	S
+ Rule	Iran	2034	2035	-	Mar	22	0:00	1:00	D
+ Rule	Iran	2034	2035	-	Sep	22	0:00	0	S
+-Rule	Iran	2036	2037	-	Mar	21	0:00	1:00	D
+-Rule	Iran	2036	2037	-	Sep	21	0:00	0	S
++#
++# The following rules are approximations starting in the year 2038.
++# These are the best post-2037 approximations available, given the
++# restrictions of a single rule using a Gregorian-based data format.
++# At some point this table will need to be extended, though quite
++# possibly Iran will change the rules first.
++Rule	Iran	2036	max	-	Mar	21	0:00	1:00	D
++Rule	Iran	2036	max	-	Sep	21	0:00	0	S
++
+ # Zone	NAME		GMTOFF	RULES	FORMAT	[UNTIL]
+ Zone	Asia/Tehran	3:25:44	-	LMT	1916
+-			3:25:44	-	TMT	1946	# Tehran Mean Time
++			3:25:44	-	TMT	1946     # Tehran Mean Time
+ 			3:30	-	IRST	1977 Nov
+ 			4:00	Iran	IR%sT	1979
+ 			3:30	Iran	IR%sT
+@@ -1127,7 +1163,7 @@
+ Rule	Iraq	1991	2007	-	Oct	 1	3:00s	0	S
+ # Zone	NAME		GMTOFF	RULES	FORMAT	[UNTIL]
+ Zone	Asia/Baghdad	2:57:40	-	LMT	1890
+-			2:57:36	-	BMT	1918	    # Baghdad Mean Time?
++			2:57:36	-	BMT	1918     # Baghdad Mean Time?
+ 			3:00	-	AST	1982 May
+ 			3:00	Iraq	A%sT
+ 
+@@ -1355,7 +1391,7 @@
+ 
+ # Zone	NAME		GMTOFF	RULES	FORMAT	[UNTIL]
+ Zone	Asia/Jerusalem	2:20:54 -	LMT	1880
+-			2:20:40	-	JMT	1918	# Jerusalem Mean Time?
++			2:20:40	-	JMT	1918 # Jerusalem Mean Time?
+ 			2:00	Zion	I%sT
+ 
+ 
+@@ -1371,8 +1407,8 @@
+ # daylight saving between 1948 and 1951, but "the system was discontinued
+ # because the public believed it would lead to longer working hours."
+ 
+-# From Mayumi Negishi in the 2005-08-10 Japan Times
+-# <http://www.japantimes.co.jp/cgi-bin/getarticle.pl5?nn20050810f2.htm>:
++# From Mayumi Negishi in the 2005-08-10 Japan Times:
++# http://www.japantimes.co.jp/cgi-bin/getarticle.pl5?nn20050810f2.htm
+ # Occupation authorities imposed daylight-saving time on Japan on
+ # [1948-05-01]....  But lack of prior debate and the execution of
+ # daylight-saving time just three days after the bill was passed generated
+@@ -1396,7 +1432,8 @@
+ 
+ # From Hideyuki Suzuki (1998-11-09):
+ # 'Tokyo' usually stands for the former location of Tokyo Astronomical
+-# Observatory: 139 degrees 44' 40.90" E (9h 18m 58.727s), 35 degrees 39' 16.0" N.
++# Observatory: 139 degrees 44' 40.90" E (9h 18m 58.727s),
++# 35 degrees 39' 16.0" N.
+ # This data is from 'Rika Nenpyou (Chronological Scientific Tables) 1996'
+ # edited by National Astronomical Observatory of Japan....
+ # JST (Japan Standard Time) has been used since 1888-01-01 00:00 (JST).
+@@ -1535,24 +1572,7 @@
+ 
+ # Kazakhstan
+ 
+-# From Paul Eggert (1996-11-22):
+-# Andrew Evtichov (1996-04-13) writes that Kazakhstan
+-# stayed in sync with Moscow after 1990, and that Aqtobe (formerly Aktyubinsk)
+-# and Aqtau (formerly Shevchenko) are the largest cities in their zones.
+-# Guess that Aqtau and Aqtobe diverged in 1995, since that's the first time
+-# IATA SSIM mentions a third time zone in Kazakhstan.
+-
+-# From Paul Eggert (2006-03-22):
+-# German Iofis, ELSI, Almaty (2001-10-09) reports that Kazakhstan uses
+-# RussiaAsia rules, instead of switching at 00:00 as the IATA has it.
+-# Go with Shanks & Pottenger, who have them always using RussiaAsia rules.
+-# Also go with the following claims of Shanks & Pottenger:
+-#
+-# - Kazakhstan did not observe DST in 1991.
+-# - Qyzylorda switched from +5:00 to +6:00 on 1992-01-19 02:00.
+-# - Oral switched from +5:00 to +4:00 in spring 1989.
+-
+-# From Kazakhstan Embassy's News Bulletin #11
++# From Kazakhstan Embassy's News Bulletin No. 11
+ # <http://www.kazsociety.org.uk/news/2005/03/30.htm> (2005-03-21):
+ # The Government of Kazakhstan passed a resolution March 15 abolishing
+ # daylight saving time citing lack of economic benefits and health
+@@ -1568,68 +1588,239 @@
+ # everything else....  I guess that would make Kazakhstan time zones
+ # de jure UTC+5 and UTC+6 respectively.
+ 
++# From Stepan Golosunov (2016-03-27) ([*] means see later comments below):
++# Review of the linked documents from http://adilet.zan.kz/
++# produced the following data for post-1991 Kazakhstan:
++#
++# 0. Act of the Cabinet of Ministers of the USSR
++# from 1991-02-04 No. 20
++# http://pravo.gov.ru/proxy/ips/?docbody=&nd=102010545
++# removed the extra hour ("decree time") on the territory of the USSR
++# starting with the last Sunday of March 1991.
++# It also allowed (but not mandated) Kazakh SSR, Kirghiz SSR, Tajik SSR,
++# Turkmen SSR and Uzbek SSR to not have "summer" time.
++#
++# The 1992-01-13 act also refers to the act of the Cabinet of Ministers
++# of the Kazakh SSR from 1991-03-20 No. 170 "About the act of the Cabinet
++# of Ministers of the USSR from 1991-02-04 No. 20" but I didn't found its
++# text.
++#
++# According to Izvestia newspaper No. 68 (23334) from 1991-03-20
++# (page 6; available at http://libinfo.org/newsr/newsr2574.djvu via
++# http://libinfo.org/index.php?id=58564) on 1991-03-31 at 2:00 during
++# transition to "summer" time:
++# Republic of Georgia, Latvian SSR, Lithuanian SSR, SSR Moldova,
++# Estonian SSR; Komi ASSR; Kaliningrad oblast; Nenets autonomous okrug
++# were to move clocks 1 hour forward.
++# Kazakh SSR (excluding Uralsk oblast); Republic of Kyrgyzstan, Tajik
++# SSR; Andijan, Jizzakh, Namangan, Sirdarya, Tashkent, Fergana oblasts
++# of the Uzbek SSR were to move clocks 1 hour backwards.
++# Other territories were to not move clocks.
++# When the "summer" time would end on 1991-09-29, clocks were to be
++# moved 1 hour backwards on the territory of the USSR excluding
++# Kazakhstan, Kirghizia, Uzbekistan, Turkmenia, Tajikistan.
++#
++# Apparently there were last minute changes. Apparently Kazakh act No. 170
++# was one of such changes.
++#
++# https://ru.wikipedia.org/wiki/Декретное время
++# claims that Sovetskaya Rossiya newspaper on 1991-03-29 published that
++# Nenets autonomous okrug, Komi and Kazakhstan (excluding Uralsk oblast)
++# were to not move clocks and Uralsk oblast was to move clocks
++# forward; on 1991-09-29 Kazakhstan was to move clocks backwards.
++# (Probably there were changes even after that publication. There is an
++# article claiming that Kaliningrad oblast decided on 1991-03-29 to not
++# move clocks.)
++#
++# This implies that on 1991-03-31 Asia/Oral remained on +04/+05 while
++# the rest of Kazakhstan switched from +06/+07 to +05/06 or from +05/06
++# to +04/+05. It's unclear how Kzyl-Orda oblast moved into the fifth
++# time belt. (By switching from +04/+05 to +05/+06 on 1991-09-29?) ...
++#
++# 1. Act of the Cabinet of Ministers of the Republic of Kazakhstan
++# from 1992-01-13 No. 28
++# http://adilet.zan.kz/rus/docs/P920000028_
++# (text includes modification from the 1996 act)
++# introduced new rules for calculation of time, mirroring Russian
++# 1992-01-08 act.  It specified that time would be calculated
++# according to time belts plus extra hour ("decree time"), moved clocks
++# on the whole territory of Kazakhstan 1 hour forward on 1992-01-19 at
++# 2:00, specified DST rules.  It acknowledged that Kazakhstan was
++# located in the fourth and the fifth time belts and specified the
++# border between them to be located east of Kustanay and Aktyubinsk
++# oblasts (notably including Turgai and Kzyl-Orda oblasts into the fifth
++# time belt).
++#
++# This means switch on 1992-01-19 at 2:00 from +04/+05 to +05/+06 for
++# Asia/Aqtau, Asia/Aqtobe, Asia/Oral, Atyrau and Kustanay oblasts; from
++# +05/+06 to +06/+07 for Asia/Almaty and Asia/Qyzylorda (and Arkalyk) [*]....
++#
++# 2. Act of the Cabinet of Ministers of the Republic of Kazakhstan
++# from 1992-03-27 No. 284
++# http://adilet.zan.kz/rus/docs/P920000284_
++# cancels extra hour ("decree time") for Uralsk and Kzyl-Orda oblasts
++# since the last Sunday of March 1992, while keeping them in the fourth
++# and the fifth time belts respectively.
++#
++# 3. Order of the Prime Minister of the Republic of Kazakhstan
++# from 1994-09-23 No. 384
++# http://adilet.zan.kz/rus/docs/R940000384_
++# cancels the extra hour ("decree time") on the territory of Mangystau
++# oblast since the last Sunday of September 1994 (saying that time on
++# the territory would correspond to the third time belt as a
++# result)....
++#
++# 4. Act of the Government of the Republic of Kazakhstan
++# from 1996-05-08 No. 575
++# http://adilet.zan.kz/rus/docs/P960000575_
++# amends the 1992-01-13 act to end summer time in October instead
++# of September, mirroring identical Russian change from 1996-04-23 act.
++#
++# 5. Act of the Government of the Republic of Kazakhstan
++# from 1999-03-26 No. 305
++# http://adilet.zan.kz/rus/docs/P990000305_
++# cancels the extra hour ("decree time") for Atyrau oblast since the
++# last Sunday of March 1999 while retaining the oblast in the fourth
++# time belt.
++#
++# This means change from +05/+06 to +04/+05.
++#
++# There is no zone for Atyrau currently (listed under Asia/Aqtau in
++# zone1970.tab).[*]
++#
++# 6. Act of the Government of the Republic of Kazakhstan
++# from 2000-11-23 No. 1749
++# http://adilet.zan.kz/rus/archive/docs/P000001749_/23.11.2000
++# replaces the previous five documents.
++#
++# The only changes I noticed are in definition of the border between the
++# fourth and the fifth time belts.  They account for changes in spelling
++# and administrative division (splitting of Turgai oblast in 1997
++# probably changed time in territories incorporated into Kostanay oblast
++# (including Arkalyk) from +06/+07 to +05/+06) and move Kyzylorda oblast
++# from being in the fifth time belt and not using decree time into the
++# fourth time belt (no change in practice).[*]
++#
++# 7. Act of the Government of the Republic of Kazakhstan
++# from 2003-12-29 No. 1342
++# http://adilet.zan.kz/rus/docs/P030001342_
++# modified the 2000-11-23 act.  No relevant changes, apparently.
++#
++# 8. Act of the Government of the Republic of Kazakhstan
++# from 2004-07-20 No. 775
++# http://adilet.zan.kz/rus/archive/docs/P040000775_/20.07.2004
++# modified the 2000-11-23 act to move Kostanay and Kyzylorda oblasts into
++# the fifth time belt and add Aktobe oblast to the list of regions not
++# using extra hour ("decree time"), leaving Kazakhstan with only 2 time
++# zones (+04/+05 and +06/+07).  The changes were to be implemented
++# during DST transitions in 2004 and 2005 but the acts got radically
++# amended before implementation happened.
++#
++# 9. Act of the Government of the Republic of Kazakhstan
++# from 2004-09-15 No. 1059
++# http://adilet.zan.kz/rus/docs/P040001059_
++# modified the 2000-11-23 act to remove exceptions from the "decree time"
++# (leaving Kazakhstan in +05/+06 and +06/+07 zones), amended the
++# 2004-07-20 act to implement changes for Atyrau, West Kazakhstan,
++# Kostanay, Kyzylorda and Mangystau oblasts by not moving clocks
++# during the 2014 transition to "winter" time.
++#
++# This means transition from +04/+05 to +05/+06 for Atyrau oblast (no
++# zone currently), Asia/Oral, Asia/Aqtau and transition from +05/+06 to
++# +06/+07 for Kostanay oblast (Kostanay and Arkalyk, no zones currently)
++# and Asia/Qyzylorda on 2004-10-31 at 3:00....[*]
++#
++# 10. Act of the Government of the Republic of Kazakhstan
++# from 2005-03-15 No. 231
++# http://adilet.zan.kz/rus/docs/P050000231_
++# removes DST provisions from the 2000-11-23 act, removes most of the
++# (already implemented) provisions from the 2004-07-20 and 2004-09-15
++# acts, comes into effect 10 days after official publication.
++# The only practical effect seems to be the abolition of the summer
++# time.
++#
++# Unamended version of the act of the Government of the Russian Federation
++# No. 23 from 1992-01-08 [See 'europe' file for details].
++# Kazakh 1992-01-13 act appears to provide the same rules and 1992-03-27
++# act was to be enacted on the last Sunday of March 1992.
++
++# From Paul Eggert (2016-04-15):
++# The tables below should reflect Stepan Golosunov's remarks above,
++# except for the items marked "[*]" which I haven't gotten to yet.
++# It looks like we will need new zones Asia/Atyrau and Asia/Qostanay
++# to handle changes from 1992 through 2004 that we did not previously
++# know about.
++
+ #
+ # Zone	NAME		GMTOFF	RULES	FORMAT	[UNTIL]
+ #
+ # Almaty (formerly Alma-Ata), representing most locations in Kazakhstan
++# This includes KZ-AKM, KZ-ALA, KZ-ALM, KZ-AST, KZ-BAY, KZ-VOS, KZ-ZHA,
++# KZ-KAR, KZ-SEV, KZ-PAV, and KZ-YUZ.
+ Zone	Asia/Almaty	5:07:48 -	LMT	1924 May  2 # or Alma-Ata
+-			5:00	-	ALMT	1930 Jun 21 # Alma-Ata Time
+-			6:00 RussiaAsia ALM%sT	1991
+-			6:00	-	ALMT	1992
+-			6:00 RussiaAsia	ALM%sT	2005 Mar 15
+-			6:00	-	ALMT
+-# Qyzylorda (aka Kyzylorda, Kizilorda, Kzyl-Orda, etc.)
++			5:00	-	+05	1930 Jun 21
++			6:00 RussiaAsia +06/+07	1991 Mar 31  2:00s
++			5:00 RussiaAsia	+05/+06	1992 Jan 19  2:00s
++			6:00 RussiaAsia	+06/+07	2004 Oct 31  2:00s
++			6:00	-	+06
++# Qyzylorda (aka Kyzylorda, Kizilorda, Kzyl-Orda, etc.) (KZ-KZY)
+ Zone	Asia/Qyzylorda	4:21:52 -	LMT	1924 May  2
+-			4:00	-	KIZT	1930 Jun 21 # Kizilorda Time
+-			5:00	-	KIZT	1981 Apr  1
+-			5:00	1:00	KIZST	1981 Oct  1
+-			6:00	-	KIZT	1982 Apr  1
+-			5:00 RussiaAsia	KIZ%sT	1991
+-			5:00	-	KIZT	1991 Dec 16 # independence
+-			5:00	-	QYZT	1992 Jan 19 2:00
+-			6:00 RussiaAsia	QYZ%sT	2005 Mar 15
+-			6:00	-	QYZT
+-# Aqtobe (aka Aktobe, formerly Akt'ubinsk)
++			4:00	-	+04	1930 Jun 21
++			5:00	-	+05	1981 Apr  1
++			5:00	1:00	+06	1981 Oct  1
++			6:00	-	+06	1982 Apr  1
++			5:00 RussiaAsia	+05/+06	1991 Mar 31  2:00s
++			4:00 RussiaAsia	+04/+05	1991 Sep 29  2:00s
++			5:00 RussiaAsia	+05/+06	1992 Jan 19  2:00s
++			6:00 RussiaAsia	+06/+07	1992 Mar 29  2:00s
++			5:00 RussiaAsia	+05/+06	2004 Oct 31  2:00s
++			6:00	-	+06
++# Aqtobe (aka Aktobe, formerly Aktyubinsk) (KZ-AKT)
+ Zone	Asia/Aqtobe	3:48:40	-	LMT	1924 May  2
+-			4:00	-	AKTT	1930 Jun 21 # Aktyubinsk Time
+-			5:00	-	AKTT	1981 Apr  1
+-			5:00	1:00	AKTST	1981 Oct  1
+-			6:00	-	AKTT	1982 Apr  1
+-			5:00 RussiaAsia	AKT%sT	1991
+-			5:00	-	AKTT	1991 Dec 16 # independence
+-			5:00 RussiaAsia	AQT%sT	2005 Mar 15 # Aqtobe Time
+-			5:00	-	AQTT
+-# Mangghystau
++			4:00	-	+04	1930 Jun 21
++			5:00	-	+05	1981 Apr  1
++			5:00	1:00	+06	1981 Oct  1
++			6:00	-	+06	1982 Apr  1
++			5:00 RussiaAsia	+05/+06	1991 Mar 31  2:00s
++			4:00 RussiaAsia	+04/+05	1992 Jan 19  2:00s
++			5:00 RussiaAsia	+05/+06	2004 Oct 31  2:00s
++			5:00	-	+05
++# Qostanay (KZ-KUS)
++
++# Mangghystau (KZ-MAN)
+ # Aqtau was not founded until 1963, but it represents an inhabited region,
+ # so include time stamps before 1963.
+ Zone	Asia/Aqtau	3:21:04	-	LMT	1924 May  2
+-			4:00	-	FORT	1930 Jun 21 # Fort Shevchenko T
+-			5:00	-	FORT	1963
+-			5:00	-	SHET	1981 Oct  1 # Shevchenko Time
+-			6:00	-	SHET	1982 Apr  1
+-			5:00 RussiaAsia	SHE%sT	1991
+-			5:00	-	SHET	1991 Dec 16 # independence
+-			5:00 RussiaAsia	AQT%sT	1995 Mar lastSun 2:00 # Aqtau Time
+-			4:00 RussiaAsia	AQT%sT	2005 Mar 15
+-			5:00	-	AQTT
+-# West Kazakhstan
++			4:00	-	+04	1930 Jun 21
++			5:00	-	+05	1963
++			5:00	-	+05	1981 Oct  1
++			6:00	-	+06	1982 Apr  1
++			5:00 RussiaAsia	+05/+06	1991 Mar 31  2:00s
++			4:00 RussiaAsia	+04/+05	1992 Jan 19  2:00s
++			5:00 RussiaAsia	+05/+06	1994 Sep 25  2:00s
++			4:00 RussiaAsia	+04/+05	2004 Oct 31  2:00s
++			5:00	-	+05
++
++# West Kazakhstan (KZ-ZAP)
++# From Paul Eggert (2016-03-18):
++# The 1989 transition is from USSR act No. 227 (1989-03-14).
+ Zone	Asia/Oral	3:25:24	-	LMT	1924 May  2 # or Ural'sk
+-			4:00	-	URAT	1930 Jun 21 # Ural'sk time
+-			5:00	-	URAT	1981 Apr  1
+-			5:00	1:00	URAST	1981 Oct  1
+-			6:00	-	URAT	1982 Apr  1
+-			5:00 RussiaAsia	URA%sT	1989 Mar 26 2:00
+-			4:00 RussiaAsia	URA%sT	1991
+-			4:00	-	URAT	1991 Dec 16 # independence
+-			4:00 RussiaAsia	ORA%sT	2005 Mar 15 # Oral Time
+-			5:00	-	ORAT
++			4:00	-	+04	1930 Jun 21
++			5:00	-	+05	1981 Apr  1
++			5:00	1:00	+06	1981 Oct  1
++			6:00	-	+06	1982 Apr  1
++			5:00 RussiaAsia	+05/+06	1989 Mar 26  2:00s
++			4:00 RussiaAsia	+04/+05	1992 Jan 19  2:00s
++			5:00 RussiaAsia	+05/+06	1992 Mar 29  2:00s
++			4:00 RussiaAsia	+04/+05	2004 Oct 31  2:00s
++			5:00	-	+05
+ 
+ # Kyrgyzstan (Kirgizstan)
+ # Transitions through 1991 are from Shanks & Pottenger.
+ 
+ # From Paul Eggert (2005-08-15):
+ # According to an article dated today in the Kyrgyzstan Development Gateway
+-# <http://eng.gateway.kg/cgi-bin/page.pl?id=1&story_name=doc9979.shtml>
++# http://eng.gateway.kg/cgi-bin/page.pl?id=1&story_name=doc9979.shtml
+ # Kyrgyzstan is canceling the daylight saving time system.  I take the article
+ # to mean that they will leave their clocks at 6 hours ahead of UTC.
+ # From Malik Abdugaliev (2005-09-21):
+@@ -1643,71 +1834,103 @@
+ Rule	Kyrgyz	1997	2004	-	Oct	lastSun	2:30	0	-
+ # Zone	NAME		GMTOFF	RULES	FORMAT	[UNTIL]
+ Zone	Asia/Bishkek	4:58:24 -	LMT	1924 May  2
+-			5:00	-	FRUT	1930 Jun 21 # Frunze Time
+-			6:00 RussiaAsia FRU%sT	1991 Mar 31 2:00s
+-			5:00	1:00	FRUST	1991 Aug 31 2:00 # independence
+-			5:00	Kyrgyz	KG%sT	2005 Aug 12    # Kyrgyzstan Time
+-			6:00	-	KGT
++			5:00	-	+05	1930 Jun 21
++			6:00 RussiaAsia +06/+07	1991 Mar 31  2:00s
++			5:00 RussiaAsia	+05/+06	1991 Aug 31  2:00
++			5:00	Kyrgyz	+05/+06	2005 Aug 12
++			6:00	-	+06
+ 
+ ###############################################################################
+ 
+ # Korea (North and South)
+ 
+-# From Annie I. Bang (2006-07-10) in
+-# <http://www.koreaherald.co.kr/SITE/data/html_dir/2006/07/10/200607100012.asp>:
+-# The Ministry of Commerce, Industry and Energy has already
+-# commissioned a research project [to reintroduce DST] and has said
+-# the system may begin as early as 2008....  Korea ran a daylight
+-# saving program from 1949-61 but stopped it during the 1950-53 Korean War.
+-
+-# From Shanks & Pottenger:
+-# Rule	NAME	FROM	TO	TYPE	IN	ON	AT	SAVE	LETTER/S
+-Rule	ROK	1960	only	-	May	15	0:00	1:00	D
+-Rule	ROK	1960	only	-	Sep	13	0:00	0	S
+-Rule	ROK	1987	1988	-	May	Sun>=8	0:00	1:00	D
+-Rule	ROK	1987	1988	-	Oct	Sun>=8	0:00	0	S
+-
+-# From Paul Eggert (2014-07-01):
+-# The following entries are from Shanks & Pottenger, except that I
+-# guessed that time zone abbreviations through 1945 followed the same
++# From Annie I. Bang (2006-07-10):
++# http://www.koreaherald.com/view.php?ud=200607100012
++# Korea ran a daylight saving program from 1949-61 but stopped it
++# during the 1950-53 Korean War.  The system was temporarily enforced
++# between 1987 and 1988 ...
++
++# From Sanghyuk Jung (2014-10-29):
++# http://mm.icann.org/pipermail/tz/2014-October/021830.html
++# According to the Korean Wikipedia
++# http://ko.wikipedia.org/wiki/한국_표준시
++# [oldid=12896437 2014-09-04 08:03 UTC]
++# DST in Republic of Korea was as follows....  And I checked old
++# newspapers in Korean, all articles correspond with data in Wikipedia.
++# For example, the article in 1948 (Korean Language) proved that DST
++# started at June 1 in that year.  For another example, the article in
++# 1988 said that DST started at 2:00 AM in that year.
++
++# Rule	NAME	FROM	TO	TYPE	IN	ON	AT	SAVE	LETTER/S
++Rule	ROK	1948	only	-	Jun	 1	0:00	1:00	D
++Rule	ROK	1948	only	-	Sep	13	0:00	0	S
++Rule	ROK	1949	only	-	Apr	 3	0:00	1:00	D
++Rule	ROK	1949	1951	-	Sep	Sun>=8	0:00	0	S
++Rule	ROK	1950	only	-	Apr	 1	0:00	1:00	D
++Rule	ROK	1951	only	-	May	 6	0:00	1:00	D
++Rule	ROK	1955	only	-	May	 5	0:00	1:00	D
++Rule	ROK	1955	only	-	Sep	 9	0:00	0	S
++Rule	ROK	1956	only	-	May	20	0:00	1:00	D
++Rule	ROK	1956	only	-	Sep	30	0:00	0	S
++Rule	ROK	1957	1960	-	May	Sun>=1	0:00	1:00	D
++Rule	ROK	1957	1960	-	Sep	Sun>=18	0:00	0	S
++Rule	ROK	1987	1988	-	May	Sun>=8	2:00	1:00	D
++Rule	ROK	1987	1988	-	Oct	Sun>=8	3:00	0	S
++
++# From Paul Eggert (2016-08-23):
++# The Korean Wikipedia entry gives the following sources for UT offsets:
++#
++# 1908: Official Journal Article No. 3994 (decree No. 5)
++# 1912: Governor-General of Korea Official Gazette Issue No. 367
++#       (Announcement No. 338)
++# 1954: Presidential Decree No. 876 (1954-03-17)
++# 1961: Law No. 676 (1961-08-07)
++#
++# (Another source "1987: Law No. 3919 (1986-12-31)" was in the 2014-10-30
++# edition of the Korean Wikipedia entry.)
++#
++# I guessed that time zone abbreviations through 1945 followed the same
+ # rules as discussed under Taiwan, with nominal switches from JST to KST
+ # when the respective cities were taken over by the Allies after WWII.
++#
++# For Pyongyang, guess no changes from World War II until 2015, as we
++# have no information otherwise.
++
++# From Steffen Thorsen (2015-08-07):
++# According to many news sources, North Korea is going to change to
++# the 8:30 time zone on August 15, one example:
++# http://www.bbc.com/news/world-asia-33815049
++#
++# From Paul Eggert (2015-08-15):
++# Bells rang out midnight (00:00) Friday as part of the celebrations.  See:
++# Talmadge E. North Korea celebrates new time zone, 'Pyongyang Time'
++# http://news.yahoo.com/north-korea-celebrates-time-zone-pyongyang-time-164038128.html
++# There is no common English-language abbreviation for this time zone.
++# Use KST, as that's what we already use for 1954-1961 in ROK.
+ 
+ # Zone	NAME		GMTOFF	RULES	FORMAT	[UNTIL]
+-Zone	Asia/Seoul	8:27:52	-	LMT	1890
+-			8:30	-	KST	1904 Dec
+-			9:00	-	JCST	1928
+-			8:30	-	KST	1932
++Zone	Asia/Seoul	8:27:52	-	LMT	1908 Apr  1
++			8:30	-	KST	1912 Jan  1
+ 			9:00	-	JCST	1937 Oct  1
+ 			9:00	-	JST	1945 Sep  8
+ 			9:00	-	KST	1954 Mar 21
+-			8:00	ROK	K%sT	1961 Aug 10
+-			8:30	-	KST	1968 Oct
++			8:30	ROK	K%sT	1961 Aug 10
+ 			9:00	ROK	K%sT
+-Zone	Asia/Pyongyang	8:23:00 -	LMT	1890
+-			8:30	-	KST	1904 Dec
+-			9:00	-	JCST	1928
+-			8:30	-	KST	1932
++Zone	Asia/Pyongyang	8:23:00 -	LMT	1908 Apr  1
++			8:30	-	KST	1912 Jan  1
+ 			9:00	-	JCST	1937 Oct  1
+ 			9:00	-	JST	1945 Aug 24
+-			9:00	-	KST	1954 Mar 21
+-			8:00	-	KST	1961 Aug 10
+-			9:00	-	KST
++			9:00	-	KST	2015 Aug 15 00:00
++			8:30	-	KST
+ 
+ ###############################################################################
+ 
+ # Kuwait
+-# Zone	NAME		GMTOFF	RULES	FORMAT	[UNTIL]
+-Zone	Asia/Kuwait	3:11:56 -	LMT	1950
+-			3:00	-	AST
++# See Asia/Riyadh.
+ 
+ # Laos
+-# Zone	NAME		GMTOFF	RULES	FORMAT	[UNTIL]
+-Zone	Asia/Vientiane	6:50:24 -	LMT	1906 Jun  9 # or Viangchan
+-			7:06:20	-	SMT	1911 Mar 11 0:01 # Saigon MT?
+-			7:00	-	ICT	1912 May
+-			8:00	-	ICT	1931 May
+-			7:00	-	ICT
++# See Asia/Bangkok.
++
+ 
+ # Lebanon
+ # Rule	NAME	FROM	TO	TYPE	IN	ON	AT	SAVE	LETTER/S
+@@ -1745,8 +1968,8 @@
+ Rule	NBorneo	1935	1941	-	Dec	14	0:00	0	-
+ #
+ # peninsular Malaysia
+-# The data here are taken from Mok Ly Yng (2003-10-30)
+-# <http://www.math.nus.edu.sg/aslaksen/teaching/timezone.html>.
++# taken from Mok Ly Yng (2003-10-30)
++# http://www.math.nus.edu.sg/aslaksen/teaching/timezone.html
+ # Zone	NAME		GMTOFF	RULES	FORMAT	[UNTIL]
+ Zone Asia/Kuala_Lumpur	6:46:46 -	LMT	1901 Jan  1
+ 			6:55:25	-	SMT	1905 Jun  1 # Singapore M.T.
+@@ -1758,12 +1981,12 @@
+ 			7:30	-	MALT	1982 Jan  1
+ 			8:00	-	MYT	# Malaysia Time
+ # Sabah & Sarawak
+-# From Paul Eggert (2006-03-22):
+-# The data here are mostly from Shanks & Pottenger, but the 1942, 1945 and 1982
+-# transition dates are from Mok Ly Yng.
++# From Paul Eggert (2014-08-12):
++# The data entries here are mostly from Shanks & Pottenger, but the 1942, 1945
++# and 1982 transition dates are from Mok Ly Yng.
+ # Zone	NAME		GMTOFF	RULES	FORMAT	[UNTIL]
+ Zone Asia/Kuching	7:21:20	-	LMT	1926 Mar
+-			7:30	-	BORT	1933	# Borneo Time
++			7:30	-	BORT	1933        # Borneo Time
+ 			8:00	NBorneo	BOR%sT	1942 Feb 16
+ 			9:00	-	JST	1945 Sep 12
+ 			8:00	-	BORT	1982 Jan  1
+@@ -1771,9 +1994,9 @@
+ 
+ # Maldives
+ # Zone	NAME		GMTOFF	RULES	FORMAT	[UNTIL]
+-Zone	Indian/Maldives	4:54:00 -	LMT	1880	# Male
+-			4:54:00	-	MMT	1960	# Male Mean Time
+-			5:00	-	MVT		# Maldives Time
++Zone	Indian/Maldives	4:54:00 -	LMT	1880 # Male
++			4:54:00	-	MMT	1960 # Male Mean Time
++			5:00	-	MVT	# Maldives Time
+ 
+ # Mongolia
+ 
+@@ -1831,11 +2054,11 @@
+ # Bill Bonnet (2005-05-19) reports that the US Embassy in Ulaanbaatar says
+ # there is only one time zone and that DST is observed, citing Microsoft
+ # Windows XP as the source.  Risto Nykänen (2005-05-16) reports that
+-# travelmongolia.org says there are two time zones (UTC+7, UTC+8) with no DST.
++# travelmongolia.org says there are two time zones (UT +07, +08) with no DST.
+ # Oscar van Vlijmen (2005-05-20) reports that the Mongolian Embassy in
+ # Washington, DC says there are two time zones, with DST observed.
+ # He also found
+-# <http://ubpost.mongolnews.mn/index.php?subaction=showcomments&id=1111634894&archive=&start_from=&ucat=1&>
++# http://ubpost.mongolnews.mn/index.php?subaction=showcomments&id=1111634894&archive=&start_from=&ucat=1&
+ # which also says that there is DST, and which has a comment by "Toddius"
+ # (2005-03-31 06:05 +0700) saying "Mongolia actually has 3.5 time zones.
+ # The West (OLGII) is +7 GMT, most of the country is ULAT is +8 GMT
+@@ -1879,6 +2102,13 @@
+ # was at the start of 2008-03-31 (the day of Steffen Thorsen's report);
+ # this is almost surely wrong.
+ 
++# From Ganbold Tsagaankhuu (2015-03-10):
++# It seems like yesterday Mongolian Government meeting has concluded to use
++# daylight saving time in Mongolia....  Starting at 2:00AM of last Saturday of
++# March 2015, daylight saving time starts.  And 00:00AM of last Saturday of
++# September daylight saving time ends.  Source:
++# http://zasag.mn/news/view/8969
++
+ # Rule	NAME	FROM	TO	TYPE	IN	ON	AT	SAVE	LETTER/S
+ Rule	Mongol	1983	1984	-	Apr	1	0:00	1:00	S
+ Rule	Mongol	1983	only	-	Oct	1	0:00	0	-
+@@ -1899,17 +2129,19 @@
+ Rule	Mongol	2001	only	-	Apr	lastSat	2:00	1:00	S
+ Rule	Mongol	2001	2006	-	Sep	lastSat	2:00	0	-
+ Rule	Mongol	2002	2006	-	Mar	lastSat	2:00	1:00	S
++Rule	Mongol	2015	max	-	Mar	lastSat	2:00	1:00	S
++Rule	Mongol	2015	max	-	Sep	lastSat	0:00	0	-
+ 
+ # Zone	NAME		GMTOFF	RULES	FORMAT	[UNTIL]
+ # Hovd, a.k.a. Chovd, Dund-Us, Dzhargalant, Khovd, Jirgalanta
+ Zone	Asia/Hovd	6:06:36 -	LMT	1905 Aug
+-			6:00	-	HOVT	1978	# Hovd Time
++			6:00	-	HOVT	1978     # Hovd Time
+ 			7:00	Mongol	HOV%sT
+ # Ulaanbaatar, a.k.a. Ulan Bataar, Ulan Bator, Urga
+ Zone	Asia/Ulaanbaatar 7:07:32 -	LMT	1905 Aug
+-			7:00	-	ULAT	1978	# Ulaanbaatar Time
++			7:00	-	ULAT	1978     # Ulaanbaatar Time
+ 			8:00	Mongol	ULA%sT
+-# Choibalsan, a.k.a. Bajan Tuemen, Bajan Tumen, Chojbalsan,
++# Choibalsan, a.k.a. Bajan Tümen, Bajan Tumen, Chojbalsan,
+ # Choybalsan, Sanbejse, Tchoibalsan
+ Zone	Asia/Choibalsan	7:38:00 -	LMT	1905 Aug
+ 			7:00	-	ULAT	1978
+@@ -1924,12 +2156,7 @@
+ 			5:45	-	NPT	# Nepal Time
+ 
+ # Oman
+-
+-# Milne says 3:54:24 was the meridian of the Muscat Tidal Observatory.
+-
+-# Zone	NAME		GMTOFF	RULES	FORMAT	[UNTIL]
+-Zone	Asia/Muscat	3:54:24 -	LMT	1920
+-			4:00	-	GST
++# See Asia/Dubai.
+ 
+ # Pakistan
+ 
+@@ -1973,10 +2200,9 @@
+ # Here is an article that Pakistan plan to introduce Daylight Saving Time
+ # on June 1, 2008 for 3 months.
+ #
+-# "... The federal cabinet on Wednesday announced a new conservation plan to help
+-# reduce load shedding by approving the closure of commercial centres at 9pm and
+-# moving clocks forward by one hour for the next three months.
+-# ...."
++# "... The federal cabinet on Wednesday announced a new conservation plan to
++# help reduce load shedding by approving the closure of commercial centres at
++# 9pm and moving clocks forward by one hour for the next three months. ...."
+ #
+ # http://www.worldtimezone.net/dst_news/dst_news_pakistan01.html
+ # http://www.dailytimes.com.pk/default.asp?page=2008%5C05%5C15%5Cstory_15-5-2008_pg1_4
+@@ -2023,19 +2249,14 @@
+ 
+ # From Alexander Krivenyshev (2009-09-28):
+ # According to Associated Press Of Pakistan, it is confirmed that
+-# Pakistan clocks across the country would be turned back by an hour from October
+-# 1, 2009.
++# Pakistan clocks across the country would be turned back by an hour from
++# October 1, 2009.
+ #
+ # "Clocks to go back one hour from 1 Oct"
+ # http://www.app.com.pk/en_/index.php?option=com_content&task=view&id=86715&Itemid=2
+ # http://www.worldtimezone.com/dst_news/dst_news_pakistan07.htm
+-
+-# From Steffen Thorsen (2009-09-29):
+-# Alexander Krivenyshev wrote:
+-# > According to Associated Press Of Pakistan, it is confirmed that
+-# > Pakistan clocks across the country would be turned back by an hour from October
+-# > 1, 2009.
+ #
++# From Steffen Thorsen (2009-09-29):
+ # Now they seem to have changed their mind, November 1 is the new date:
+ # http://www.thenews.com.pk/top_story_detail.asp?Id=24742
+ # "The country's clocks will be reversed by one hour on November 1.
+@@ -2073,12 +2294,11 @@
+ # http://www.app.com.pk/en_/index.php?option=com_content&task=view&id=99374&Itemid=2
+ 
+ # Rule	NAME	FROM	TO	TYPE	IN	ON	AT	SAVE	LETTER/S
+-Rule Pakistan	2002	only	-	Apr	Sun>=2	0:01	1:00	S
+-Rule Pakistan	2002	only	-	Oct	Sun>=2	0:01	0	-
++Rule Pakistan	2002	only	-	Apr	Sun>=2	0:00	1:00	S
++Rule Pakistan	2002	only	-	Oct	Sun>=2	0:00	0	-
+ Rule Pakistan	2008	only	-	Jun	1	0:00	1:00	S
+-Rule Pakistan	2008	only	-	Nov	1	0:00	0	-
++Rule Pakistan	2008	2009	-	Nov	1	0:00	0	-
+ Rule Pakistan	2009	only	-	Apr	15	0:00	1:00	S
+-Rule Pakistan	2009	only	-	Nov	1	0:00	0	-
+ 
+ # Zone	NAME		GMTOFF	RULES	FORMAT	[UNTIL]
+ Zone	Asia/Karachi	4:28:12 -	LMT	1907
+@@ -2153,7 +2373,7 @@
+ 
+ # From Paul Eggert (1999-09-20):
+ # Daoud Kuttab writes in Holiday havoc
+-# <http://www.jpost.com/com/Archive/22.Apr.1999/Opinion/Article-2.html>
++# http://www.jpost.com/com/Archive/22.Apr.1999/Opinion/Article-2.html
+ # (Jerusalem Post, 1999-04-22) that
+ # the Palestinian National Authority changed to DST on 1999-04-15.
+ # I vaguely recall that they switch back in October (sorry, forgot the source).
+@@ -2329,13 +2549,38 @@
+ # official source...:
+ # http://www.palestinecabinet.gov.ps/ar/Views/ViewDetails.aspx?pid=1252
+ 
+-# From Paul Eggert (2013-09-24):
+-# For future dates, guess the last Thursday in March at 24:00 through
+-# the first Friday on or after September 21 at 00:00.  This is consistent with
+-# the predictions in today's editions of the following URLs,
+-# which are for Gaza and Hebron respectively:
+-# http://www.timeanddate.com/worldclock/timezone.html?n=702
+-# http://www.timeanddate.com/worldclock/timezone.html?n=2364
++# From Steffen Thorsen (2015-03-03):
++# Sources such as http://www.alquds.com/news/article/view/id/548257
++# and http://www.raya.ps/ar/news/890705.html say Palestine areas will
++# start DST on 2015-03-28 00:00 which is one day later than expected.
++#
++# From Paul Eggert (2015-03-03):
++# http://www.timeanddate.com/time/change/west-bank/ramallah?year=2014
++# says that the fall 2014 transition was Oct 23 at 24:00.
++
++# From Hannah Kreitem (2016-03-09):
++# http://www.palestinecabinet.gov.ps/WebSite/ar/ViewDetails?ID=31728
++# [Google translation]: "The Council also decided to start daylight
++# saving in Palestine as of one o'clock on Saturday morning,
++# 2016-03-26, to provide the clock 60 minutes ahead."
++#
++# From Paul Eggert (2016-03-12):
++# Predict spring transitions on March's last Saturday at 01:00 from now on.
++
++# From Sharef Mustafa (2016-10-19):
++# [T]he Palestinian cabinet decision (Mar 8th 2016) published on
++# http://www.palestinecabinet.gov.ps/WebSite/Upload/Decree/GOV_17/16032016134830.pdf
++# states that summer time will end on Oct 29th at 01:00.
++#
++# From Tim Parenti (2016-10-19):
++# Predict fall transitions on October's last Saturday at 01:00 from now on.
++# This is consistent with the 2016 transition as well as our spring
++# predictions.
++#
++# From Paul Eggert (2016-10-19):
++# It's also consistent with predictions in the following URLs today:
++# http://www.timeanddate.com/time/change/gaza-strip/gaza
++# http://www.timeanddate.com/time/change/west-bank/hebron
+ 
+ # Rule	NAME	FROM	TO	TYPE	IN	ON	AT	SAVE	LETTER/S
+ Rule EgyptAsia	1957	only	-	May	10	0:00	1:00	S
+@@ -2361,9 +2606,13 @@
+ Rule Palestine	2011	only	-	Aug	 1	0:00	0	-
+ Rule Palestine	2011	only	-	Aug	30	0:00	1:00	S
+ Rule Palestine	2011	only	-	Sep	30	0:00	0	-
+-Rule Palestine	2012	max	-	Mar	lastThu	24:00	1:00	S
++Rule Palestine	2012	2014	-	Mar	lastThu	24:00	1:00	S
+ Rule Palestine	2012	only	-	Sep	21	1:00	0	-
+-Rule Palestine	2013	max	-	Sep	Fri>=21	0:00	0	-
++Rule Palestine	2013	only	-	Sep	Fri>=21	0:00	0	-
++Rule Palestine	2014	2015	-	Oct	Fri>=21	0:00	0	-
++Rule Palestine	2015	only	-	Mar	lastFri	24:00	1:00	S
++Rule Palestine	2016	max	-	Mar	lastSat	1:00	1:00	S
++Rule Palestine	2016	max	-	Oct	lastSat	1:00	0	-
+ 
+ # Zone	NAME		GMTOFF	RULES	FORMAT	[UNTIL]
+ Zone	Asia/Gaza	2:17:52	-	LMT	1900 Oct
+@@ -2371,10 +2620,10 @@
+ 			2:00 EgyptAsia	EE%sT	1967 Jun  5
+ 			2:00	Zion	I%sT	1996
+ 			2:00	Jordan	EE%sT	1999
+-			2:00 Palestine	EE%sT	2008 Aug 29 0:00
++			2:00 Palestine	EE%sT	2008 Aug 29  0:00
+ 			2:00	-	EET	2008 Sep
+ 			2:00 Palestine	EE%sT	2010
+-			2:00	-	EET	2010 Mar 27 0:01
++			2:00	-	EET	2010 Mar 27  0:01
+ 			2:00 Palestine	EE%sT	2011 Aug  1
+ 			2:00	-	EET	2012
+ 			2:00 Palestine	EE%sT
+@@ -2394,22 +2643,23 @@
+ # Philippines, issued a proclamation announcing that 1844-12-30 was to
+ # be immediately followed by 1845-01-01; see R.H. van Gent's
+ # History of the International Date Line
+-# <http://www.staff.science.uu.nl/~gent0113/idl/idl_philippines.htm>.
+-# The rest of the data are from Shanks & Pottenger.
++# http://www.staff.science.uu.nl/~gent0113/idl/idl_philippines.htm
++# The rest of the data entries are from Shanks & Pottenger.
+ 
+-# From Paul Eggert (2006-04-25):
+-# Tomorrow's Manila Standard reports that the Philippines Department of
+-# Trade and Industry is considering adopting DST this June when the
+-# rainy season begins.  See
+-# <http://www.manilastandardtoday.com/?page=politics02_april26_2006>.
+-# For now, we'll ignore this, since it's not definite and we lack details.
+-#
+ # From Jesper Nørgaard Welen (2006-04-26):
+ # ... claims that Philippines had DST last time in 1990:
+ # http://story.philippinetimes.com/p.x/ct/9/id/145be20cc6b121c0/cid/3e5bbccc730d258c/
+ # [a story dated 2006-04-25 by Cris Larano of Dow Jones Newswires,
+ # but no details]
+ 
++# From Paul Eggert (2014-08-14):
++# The following source says DST may be instituted November-January and again
++# March-June, but this is not definite.  It also says DST was last proclaimed
++# during the Ramos administration (1992-1998); but again, no details.
++# Carcamo D. PNoy urged to declare use of daylight saving time.
++# Philippine Star 2014-08-05
++# http://www.philstar.com/headlines/2014/08/05/1354152/pnoy-urged-declare-use-daylight-saving-time
++
+ # Rule	NAME	FROM	TO	TYPE	IN	ON	AT	SAVE	LETTER/S
+ Rule	Phil	1936	only	-	Nov	1	0:00	1:00	S
+ Rule	Phil	1937	only	-	Feb	1	0:00	0	-
+@@ -2426,9 +2676,10 @@
+ 
+ # Qatar
+ # Zone	NAME		GMTOFF	RULES	FORMAT	[UNTIL]
+-Zone	Asia/Qatar	3:26:08 -	LMT	1920	# Al Dawhah / Doha
++Zone	Asia/Qatar	3:26:08 -	LMT	1920     # Al Dawhah / Doha
+ 			4:00	-	GST	1972 Jun
+ 			3:00	-	AST
++Link Asia/Qatar Asia/Bahrain
+ 
+ # Saudi Arabia
+ #
+@@ -2449,16 +2700,18 @@
+ # earlier date.
+ #
+ # Shanks & Pottenger also state that until 1968-05-01 Saudi Arabia had two
+-# time zones; the other zone, at UTC+4, was in the far eastern part of
++# time zones; the other zone, at UT +04, was in the far eastern part of
+ # the country.  Ignore this, as it's before our 1970 cutoff.
+ #
+ # Zone	NAME		GMTOFF	RULES	FORMAT	[UNTIL]
+ Zone	Asia/Riyadh	3:06:52 -	LMT	1947 Mar 14
+ 			3:00	-	AST
++Link Asia/Riyadh Asia/Aden	# Yemen
++Link Asia/Riyadh Asia/Kuwait
+ 
+ # Singapore
+-# The data here are taken from Mok Ly Yng (2003-10-30)
+-# <http://www.math.nus.edu.sg/aslaksen/teaching/timezone.html>.
++# taken from Mok Ly Yng (2003-10-30)
++# http://www.math.nus.edu.sg/aslaksen/teaching/timezone.html
+ # Zone	NAME		GMTOFF	RULES	FORMAT	[UNTIL]
+ Zone	Asia/Singapore	6:55:25 -	LMT	1901 Jan  1
+ 			6:55:25	-	SMT	1905 Jun  1 # Singapore M.T.
+@@ -2501,7 +2754,7 @@
+ # at present, become 2400 hours of April 14, 2006 (midnight of April 14, 2006).
+ 
+ # From Peter Apps and Ranga Sirila of Reuters (2006-04-12) in:
+-# <http://today.reuters.co.uk/news/newsArticle.aspx?type=scienceNews&storyID=2006-04-12T172228Z_01_COL295762_RTRIDST_0_SCIENCE-SRILANKA-TIME-DC.XML>
++# http://today.reuters.co.uk/news/newsArticle.aspx?type=scienceNews&storyID=2006-04-12T172228Z_01_COL295762_RTRIDST_0_SCIENCE-SRILANKA-TIME-DC.XML
+ # [The Tamil Tigers] never accepted the original 1996 time change and simply
+ # kept their clocks set five and a half hours ahead of Greenwich Mean
+ # Time (GMT), in line with neighbor India.
+@@ -2509,45 +2762,31 @@
+ # People who live in regions under Tamil control can use [TZ='Asia/Kolkata'],
+ # as that zone has agreed with the Tamil areas since our cutoff date of 1970.
+ 
+-# From K Sethu (2006-04-25):
+-# I think the abbreviation LKT originated from the world of computers at
+-# the time of or subsequent to the time zone changes by SL Government
+-# twice in 1996 and probably SL Government or its standardization
+-# agencies never declared an abbreviation as a national standard.
+-#
+-# I recollect before the recent change the government announcements
+-# mentioning it as simply changing Sri Lanka Standard Time or Sri Lanka
+-# Time and no mention was made about the abbreviation.
+-#
+-# If we look at Sri Lanka Department of Government's "Official News
+-# Website of Sri Lanka" ... http://www.news.lk/ we can see that they
+-# use SLT as abbreviation in time stamp at the beginning of each news
+-# item....
+-#
+-# Within Sri Lanka I think LKT is well known among computer users and
+-# administrators.  In my opinion SLT may not be a good choice because the
+-# nation's largest telcom / internet operator Sri Lanka Telcom is well
+-# known by that abbreviation - simply as SLT (there IP domains are
+-# slt.lk and sltnet.lk).
+-#
+-# But if indeed our government has adopted SLT as standard abbreviation
+-# (that we have not known so far) then  it is better that it be used for
+-# all computers.
+-
+-# From Paul Eggert (2006-04-25):
+-# One possibility is that we wait for a bit for the dust to settle down
+-# and then see what people actually say in practice.
++# From Sadika Sumanapala (2016-10-19):
++# According to http://www.sltime.org (maintained by Measurement Units,
++# Standards & Services Department, Sri Lanka) abbreviation for Sri Lanka
++# standard time is SLST.
++#
++# From Paul Eggert (2016-10-18):
++# "SLST" seems to be reasonably recent and rarely-used outside time
++# zone nerd sources.  I searched Google News and found three uses of
++# it in the International Business Times of India in February and
++# March of this year when discussing cricket match times, but nothing
++# since then (though there has been a lot of cricket) and nothing in
++# other English-language news sources.  Our old abbreviation "LKT" is
++# even worse.  For now, let's use a numeric abbreviation; we can
++# switch to "SLST" if it catches on.
+ 
+ # Zone	NAME		GMTOFF	RULES	FORMAT	[UNTIL]
+ Zone	Asia/Colombo	5:19:24 -	LMT	1880
+-			5:19:32	-	MMT	1906	# Moratuwa Mean Time
+-			5:30	-	IST	1942 Jan  5
+-			5:30	0:30	IHST	1942 Sep
+-			5:30	1:00	IST	1945 Oct 16 2:00
+-			5:30	-	IST	1996 May 25 0:00
+-			6:30	-	LKT	1996 Oct 26 0:30
+-			6:00	-	LKT	2006 Apr 15 0:30
+-			5:30	-	IST
++			5:19:32	-	MMT	1906        # Moratuwa Mean Time
++			5:30	-	+0530	1942 Jan  5
++			5:30	0:30	+0530/+06 1942 Sep
++			5:30	1:00	+0530/+0630 1945 Oct 16  2:00
++			5:30	-	+0530	1996 May 25  0:00
++			6:30	-	+0630	1996 Oct 26  0:30
++			6:00	-	+06	2006 Apr 15  0:30
++			5:30	-	+0530
+ 
+ # Syria
+ # Rule	NAME	FROM	TO	TYPE	IN	ON	AT	SAVE	LETTER/S
+@@ -2622,8 +2861,7 @@
+ 
+ # From Stephen Colebourne (2008-03-17):
+ # For everyone's info, I saw an IATA time zone change for [Syria] for
+-# this month (March 2008) in the last day or so...This is the data IATA
+-# are now using:
++# this month (March 2008) in the last day or so....
+ # Country     Time Standard   --- DST Start ---   --- DST End ---  DST
+ # Name        Zone Variation   Time    Date        Time    Date
+ # Variation
+@@ -2710,82 +2948,120 @@
+ Rule	Syria	2009	max	-	Oct	lastFri	0:00	0	-
+ 
+ # Zone	NAME		GMTOFF	RULES	FORMAT	[UNTIL]
+-Zone	Asia/Damascus	2:25:12 -	LMT	1920	# Dimashq
++Zone	Asia/Damascus	2:25:12 -	LMT	1920 # Dimashq
+ 			2:00	Syria	EE%sT
+ 
+ # Tajikistan
+ # From Shanks & Pottenger.
+ # Zone	NAME		GMTOFF	RULES	FORMAT	[UNTIL]
+ Zone	Asia/Dushanbe	4:35:12 -	LMT	1924 May  2
+-			5:00	-	DUST	1930 Jun 21 # Dushanbe Time
+-			6:00 RussiaAsia DUS%sT	1991 Mar 31 2:00s
+-			5:00	1:00	DUSST	1991 Sep  9 2:00s
+-			5:00	-	TJT		    # Tajikistan Time
++			5:00	-	+05	1930 Jun 21
++			6:00 RussiaAsia +06/+07	1991 Mar 31  2:00s
++			5:00	1:00	+05/+06	1991 Sep  9  2:00s
++			5:00	-	+05
+ 
+ # Thailand
+ # Zone	NAME		GMTOFF	RULES	FORMAT	[UNTIL]
+ Zone	Asia/Bangkok	6:42:04	-	LMT	1880
+ 			6:42:04	-	BMT	1920 Apr # Bangkok Mean Time
+ 			7:00	-	ICT
++Link Asia/Bangkok Asia/Phnom_Penh	# Cambodia
++Link Asia/Bangkok Asia/Vientiane	# Laos
+ 
+ # Turkmenistan
+ # From Shanks & Pottenger.
+ # Zone	NAME		GMTOFF	RULES	FORMAT	[UNTIL]
+ Zone	Asia/Ashgabat	3:53:32 -	LMT	1924 May  2 # or Ashkhabad
+-			4:00	-	ASHT	1930 Jun 21 # Ashkhabad Time
+-			5:00 RussiaAsia	ASH%sT	1991 Mar 31 2:00
+-			4:00 RussiaAsia	ASH%sT	1991 Oct 27 # independence
+-			4:00 RussiaAsia	TM%sT	1992 Jan 19 2:00
+-			5:00	-	TMT
++			4:00	-	+04	1930 Jun 21
++			5:00 RussiaAsia	+05/+06	1991 Mar 31  2:00
++			4:00 RussiaAsia	+04/+05	1992 Jan 19  2:00
++			5:00	-	+05
+ 
+ # United Arab Emirates
+ # Zone	NAME		GMTOFF	RULES	FORMAT	[UNTIL]
+ Zone	Asia/Dubai	3:41:12 -	LMT	1920
+ 			4:00	-	GST
++Link Asia/Dubai Asia/Muscat	# Oman
+ 
+ # Uzbekistan
++# Byalokoz 1919 says Uzbekistan was 4:27:53.
+ # Zone	NAME		GMTOFF	RULES	FORMAT	[UNTIL]
+-Zone	Asia/Samarkand	4:27:12 -	LMT	1924 May  2
+-			4:00	-	SAMT	1930 Jun 21 # Samarkand Time
+-			5:00	-	SAMT	1981 Apr  1
+-			5:00	1:00	SAMST	1981 Oct  1
+-			6:00	-	TAST	1982 Apr  1 # Tashkent Time
+-			5:00 RussiaAsia	SAM%sT	1991 Sep  1 # independence
+-			5:00 RussiaAsia	UZ%sT	1992
+-			5:00	-	UZT
++Zone	Asia/Samarkand	4:27:53 -	LMT	1924 May  2
++			4:00	-	+04	1930 Jun 21
++			5:00	-	+05	1981 Apr  1
++			5:00	1:00	+06	1981 Oct  1
++			6:00	-	+06	1982 Apr  1
++			5:00 RussiaAsia	+05/+06	1992
++			5:00	-	+05
+ # Milne says Tashkent was 4:37:10.8; round to nearest.
+ Zone	Asia/Tashkent	4:37:11 -	LMT	1924 May  2
+-			5:00	-	TAST	1930 Jun 21 # Tashkent Time
+-			6:00 RussiaAsia	TAS%sT	1991 Mar 31 2:00
+-			5:00 RussiaAsia	TAS%sT	1991 Sep  1 # independence
+-			5:00 RussiaAsia	UZ%sT	1992
+-			5:00	-	UZT
++			5:00	-	+05	1930 Jun 21
++			6:00 RussiaAsia	+06/+07	1991 Mar 31  2:00
++			5:00 RussiaAsia	+05/+06	1992
++			5:00	-	+05
+ 
+ # Vietnam
+ 
+-# From Paul Eggert (2013-02-21):
++# From Paul Eggert (2014-10-04):
+ # Milne gives 7:16:56 for the meridian of Saigon in 1899, as being
+ # used in Lower Laos, Cambodia, and Annam.  But this is quite a ways
+ # from Saigon's location.  For now, ignore this and stick with Shanks
+-# and Pottenger.
++# and Pottenger for LMT before 1906.
+ 
+ # From Arthur David Olson (2008-03-18):
+ # The English-language name of Vietnam's most populous city is "Ho Chi Minh
+ # City"; use Ho_Chi_Minh below to avoid a name of more than 14 characters.
+ 
+-# From Shanks & Pottenger:
+-# Zone	NAME		GMTOFF	RULES	FORMAT	[UNTIL]
+-Zone	Asia/Ho_Chi_Minh	7:06:40 -	LMT	1906 Jun  9
+-			7:06:20	-	SMT	1911 Mar 11 0:01 # Saigon MT?
+-			7:00	-	ICT	1912 May
+-			8:00	-	ICT	1931 May
++# From Paul Eggert (2014-10-21) after a heads-up from Trần Ngọc Quân:
++# Trần Tiến Bình's authoritative book "Lịch Việt Nam: thế kỷ XX-XXI (1901-2100)"
++# (Nhà xuất bản Văn Hoá - Thông Tin, Hanoi, 2005), pp 49-50,
++# is quoted verbatim in:
++# http://www.thoigian.com.vn/?mPage=P80D01
++# is translated by Brian Inglis in:
++# http://mm.icann.org/pipermail/tz/2014-October/021654.html
++# and is the basis for the information below.
++#
++# The 1906 transition was effective July 1 and standardized Indochina to
++# Phù Liễn Observatory, legally 104 deg. 17'17" east of Paris.
++# It's unclear whether this meant legal Paris Mean Time (00:09:21) or
++# the Paris Meridian (2 deg. 20'14.03" E); the former yields 07:06:30.1333...
++# and the latter 07:06:29.333... so either way it rounds to 07:06:30,
++# which is used below even though the modern-day Phù Liễn Observatory
++# is closer to 07:06:31.  Abbreviate Phù Liễn Mean Time as PLMT.
++#
++# The following transitions occurred in Indochina in general (before 1954)
++# and in South Vietnam in particular (after 1954):
++# To 07:00 on 1911-05-01.
++# To 08:00 on 1942-12-31 at 23:00.
++# To 09:00 in 1945-03-14 at 23:00.
++# To 07:00 on 1945-09-02 in Vietnam.
++# To 08:00 on 1947-04-01 in French-controlled Indochina.
++# To 07:00 on 1955-07-01 in South Vietnam.
++# To 08:00 on 1959-12-31 at 23:00 in South Vietnam.
++# To 07:00 on 1975-06-13 in South Vietnam.
++#
++# Trần cites the following sources; it's unclear which supplied the info above.
++#
++# Hoàng Xuân Hãn: "Lịch và lịch Việt Nam". Tập san Khoa học Xã hội,
++# No. 9, Paris, February 1982.
++#
++# Lê Thành Lân: "Lịch và niên biểu lịch sử hai mươi thế kỷ (0001-2010)",
++# NXB Thống kê, Hanoi, 2000.
++#
++# Lê Thành Lân: "Lịch hai thế kỷ (1802-2010) và các lịch vĩnh cửu",
++# NXB Thuận Hoá, Huế, 1995.
++
++# Zone	NAME		GMTOFF	RULES	FORMAT	[UNTIL]
++Zone Asia/Ho_Chi_Minh	7:06:40 -	LMT	1906 Jul  1
++			7:06:30	-	PLMT	1911 May  1
++			7:00	-	ICT	1942 Dec 31 23:00
++			8:00	-	IDT	1945 Mar 14 23:00
++			9:00	-	JST	1945 Sep  2
++			7:00	-	ICT	1947 Apr  1
++			8:00	-	IDT	1955 Jul  1
++			7:00	-	ICT	1959 Dec 31 23:00
++			8:00	-	IDT	1975 Jun 13
+ 			7:00	-	ICT
+ 
+ # Yemen
+-
+-# Milne says 2:59:54 was the meridian of the saluting battery at Aden,
+-# and that Yemen was at 1:55:56, the meridian of the Hagia Sophia.
+-
+-# Zone	NAME		GMTOFF	RULES	FORMAT	[UNTIL]
+-Zone	Asia/Aden	2:59:54	-	LMT	1950
+-			3:00	-	AST
++# See Asia/Riyadh.
+--- contrib/tzdata/australasia.orig
++++ contrib/tzdata/australasia
+@@ -60,6 +60,14 @@
+ # Hamilton is the largest, but there is also a Hamilton in Victoria,
+ # so use Lindeman.
+ #
++# From J William Piggott (2016-02-20):
++# There is no location named Holiday Islands in Queensland Australia; holiday
++# islands is a colloquial term used globally.  Hayman and Lindeman are at the
++# north and south extremes of the Whitsunday Islands archipelago, and
++# Hamilton is in between; it is reasonable to believe that this time zone
++# applies to all of the Whitsundays.
++# http://www.australia.gov.au/about-australia/australian-story/austn-islands
++#
+ # Rule	NAME	FROM	TO	TYPE	IN	ON	AT	SAVE	LETTER/S
+ Rule	AQ	1971	only	-	Oct	lastSun	2:00s	1:00	D
+ Rule	AQ	1972	only	-	Feb	lastSun	2:00s	0	S
+@@ -101,7 +109,7 @@
+ # Tasmania
+ #
+ # From Paul Eggert (2005-08-16):
+-# <http://www.bom.gov.au/climate/averages/tables/dst_times.shtml>
++# http://www.bom.gov.au/climate/averages/tables/dst_times.shtml
+ # says King Island didn't observe DST from WWII until late 1971.
+ #
+ # Rule	NAME	FROM	TO	TYPE	IN	ON	AT	SAVE	LETTER/S
+@@ -126,12 +134,12 @@
+ Rule	AT	2008	max	-	Apr	Sun>=1	2:00s	0	S
+ # Zone	NAME		GMTOFF	RULES	FORMAT	[UNTIL]
+ Zone Australia/Hobart	9:49:16	-	LMT	1895 Sep
+-			10:00	-	AEST	1916 Oct 1 2:00
++			10:00	-	AEST	1916 Oct  1  2:00
+ 			10:00	1:00	AEDT	1917 Feb
+ 			10:00	Aus	AE%sT	1967
+ 			10:00	AT	AE%sT
+ Zone Australia/Currie	9:35:28	-	LMT	1895 Sep
+-			10:00	-	AEST	1916 Oct 1 2:00
++			10:00	-	AEST	1916 Oct  1  2:00
+ 			10:00	1:00	AEDT	1917 Feb
+ 			10:00	Aus	AE%sT	1971 Jul
+ 			10:00	AT	AE%sT
+@@ -220,8 +228,8 @@
+ # Permanent occupation (scientific station) 1911-1915 and since 25 March 1948;
+ # sealing and penguin oil station operated Nov 1899 to Apr 1919.  See the
+ # Tasmania Parks & Wildlife Service history of sealing at Macquarie Island
+-# <http://www.parks.tas.gov.au/index.aspx?base=1828>
+-# <http://www.parks.tas.gov.au/index.aspx?base=1831>.
++# http://www.parks.tas.gov.au/index.aspx?base=1828
++# http://www.parks.tas.gov.au/index.aspx?base=1831
+ # Guess that it was like Australia/Hobart while inhabited before 2010.
+ #
+ # From Steffen Thorsen (2010-03-10):
+@@ -235,13 +243,13 @@
+ # will produce a binary file with an [A]EST-type as the first 32-bit type;
+ # this is required for correct handling of times before 1916 by
+ # pre-2013 versions of localtime.
+-Zone Antarctica/Macquarie 0	-	zzz	1899 Nov
+-			10:00	-	AEST	1916 Oct 1 2:00
++Zone Antarctica/Macquarie 0	-	-00	1899 Nov
++			10:00	-	AEST	1916 Oct  1  2:00
+ 			10:00	1:00	AEDT	1917 Feb
+-			10:00	Aus	AE%sT	1919 Apr 1 0:00s
+-			0	-	zzz	1948 Mar 25
++			10:00	Aus	AE%sT	1919 Apr  1  0:00s
++			0	-	-00	1948 Mar 25
+ 			10:00	Aus	AE%sT	1967
+-			10:00	AT	AE%sT	2010 Apr 4 3:00
++			10:00	AT	AE%sT	2010 Apr  4  3:00
+ 			11:00	-	MIST	# Macquarie I Standard Time
+ 
+ # Christmas
+@@ -331,31 +339,51 @@
+ # Fiji will end DST on 2014-01-19 02:00:
+ # http://www.fiji.gov.fj/Media-Center/Press-Releases/DAYLIGHT-SAVINGS-TO-END-THIS-MONTH-%281%29.aspx
+ 
+-# From Paul Eggert (2014-01-10):
+-# For now, guess that Fiji springs forward the Sunday before the fourth
+-# Monday in October, and springs back the penultimate Sunday in January.
+-# This is ad hoc, but matches recent practice.
++# From Ken Rylander (2014-10-20):
++# DST will start Nov. 2 this year.
++# http://www.fiji.gov.fj/Media-Center/Press-Releases/DAYLIGHT-SAVING-STARTS-ON-SUNDAY,-NOVEMBER-2ND.aspx
++
++# From a government order dated 2015-08-26 and published as Legal Notice No. 77
++# in the Government of Fiji Gazette Supplement No. 24 (2015-08-28),
++# via Ken Rylander (2015-09-02):
++# the daylight saving period is 1 hour in advance of the standard time
++# commencing at 2.00 am on Sunday 1st November, 2015 and ending at
++# 3.00 am on Sunday 17th January, 2016.
++
++# From Raymond Kumar (2016-10-04):
++# http://www.fiji.gov.fj/Media-Center/Press-Releases/DAYLIGHT-SAVING-STARTS-ON-6th-NOVEMBER,-2016.aspx
++# "Fiji's daylight savings will begin on Sunday, 6 November 2016, when
++# clocks go forward an hour at 2am to 3am....  Daylight Saving will
++# end at 3.00am on Sunday 15th January 2017."
++
++# From Paul Eggert (2016-10-03):
++# For now, guess DST from 02:00 the first Sunday in November to
++# 03:00 the third Sunday in January.  Although ad hoc, it matches
++# transitions since late 2014 and seems more likely to match future
++# practice than guessing no DST.
+ 
+ # Rule	NAME	FROM	TO	TYPE	IN	ON	AT	SAVE	LETTER/S
+ Rule	Fiji	1998	1999	-	Nov	Sun>=1	2:00	1:00	S
+ Rule	Fiji	1999	2000	-	Feb	lastSun	3:00	0	-
+ Rule	Fiji	2009	only	-	Nov	29	2:00	1:00	S
+ Rule	Fiji	2010	only	-	Mar	lastSun	3:00	0	-
+-Rule	Fiji	2010	max	-	Oct	Sun>=21	2:00	1:00	S
++Rule	Fiji	2010	2013	-	Oct	Sun>=21	2:00	1:00	S
+ Rule	Fiji	2011	only	-	Mar	Sun>=1	3:00	0	-
+ Rule	Fiji	2012	2013	-	Jan	Sun>=18	3:00	0	-
+-Rule	Fiji	2014	max	-	Jan	Sun>=18	2:00	0	-
++Rule	Fiji	2014	only	-	Jan	Sun>=18	2:00	0	-
++Rule	Fiji	2014	max	-	Nov	Sun>=1	2:00	1:00	S
++Rule	Fiji	2015	max	-	Jan	Sun>=15	3:00	0	-
+ # Zone	NAME		GMTOFF	RULES	FORMAT	[UNTIL]
+-Zone	Pacific/Fiji	11:55:44 -	LMT	1915 Oct 26	# Suva
++Zone	Pacific/Fiji	11:55:44 -	LMT	1915 Oct 26 # Suva
+ 			12:00	Fiji	FJ%sT	# Fiji Time
+ 
+ # French Polynesia
+ # Zone	NAME		GMTOFF	RULES	FORMAT	[UNTIL]
+-Zone	Pacific/Gambier	 -8:59:48 -	LMT	1912 Oct	# Rikitea
++Zone	Pacific/Gambier	 -8:59:48 -	LMT	1912 Oct # Rikitea
+ 			 -9:00	-	GAMT	# Gambier Time
+ Zone	Pacific/Marquesas -9:18:00 -	LMT	1912 Oct
+ 			 -9:30	-	MART	# Marquesas Time
+-Zone	Pacific/Tahiti	 -9:58:16 -	LMT	1912 Oct	# Papeete
++Zone	Pacific/Tahiti	 -9:58:16 -	LMT	1912 Oct # Papeete
+ 			-10:00	-	TAHT	# Tahiti Time
+ # Clipperton (near North America) is administered from French Polynesia;
+ # it is uninhabited.
+@@ -363,14 +391,15 @@
+ # Guam
+ # Zone	NAME		GMTOFF	RULES	FORMAT	[UNTIL]
+ Zone	Pacific/Guam	-14:21:00 -	LMT	1844 Dec 31
+-			 9:39:00 -	LMT	1901		# Agana
+-			10:00	-	GST	2000 Dec 23	# Guam
++			 9:39:00 -	LMT	1901        # Agana
++			10:00	-	GST	2000 Dec 23 # Guam
+ 			10:00	-	ChST	# Chamorro Standard Time
++Link Pacific/Guam Pacific/Saipan # N Mariana Is
+ 
+ # Kiribati
+ # Zone	NAME		GMTOFF	RULES	FORMAT	[UNTIL]
+-Zone Pacific/Tarawa	 11:32:04 -	LMT	1901		# Bairiki
+-			 12:00	-	GILT		 # Gilbert Is Time
++Zone Pacific/Tarawa	 11:32:04 -	LMT	1901 # Bairiki
++			 12:00	-	GILT	# Gilbert Is Time
+ Zone Pacific/Enderbury	-11:24:20 -	LMT	1901
+ 			-12:00	-	PHOT	1979 Oct # Phoenix Is Time
+ 			-11:00	-	PHOT	1995
+@@ -381,12 +410,7 @@
+ 			 14:00	-	LINT
+ 
+ # N Mariana Is
+-# Zone	NAME		GMTOFF	RULES	FORMAT	[UNTIL]
+-Zone Pacific/Saipan	-14:17:00 -	LMT	1844 Dec 31
+-			 9:43:00 -	LMT	1901
+-			 9:00	-	MPT	1969 Oct # N Mariana Is Time
+-			10:00	-	MPT	2000 Dec 23
+-			10:00	-	ChST	# Chamorro Standard Time
++# See Pacific/Guam.
+ 
+ # Marshall Is
+ # Zone	NAME		GMTOFF	RULES	FORMAT	[UNTIL]
+@@ -395,24 +419,24 @@
+ 			12:00	-	MHT
+ Zone Pacific/Kwajalein	11:09:20 -	LMT	1901
+ 			11:00	-	MHT	1969 Oct
+-			-12:00	-	KWAT	1993 Aug 20	# Kwajalein Time
++			-12:00	-	KWAT	1993 Aug 20 # Kwajalein Time
+ 			12:00	-	MHT
+ 
+ # Micronesia
+ # Zone	NAME		GMTOFF	RULES	FORMAT	[UNTIL]
+ Zone Pacific/Chuuk	10:07:08 -	LMT	1901
+-			10:00	-	CHUT			# Chuuk Time
+-Zone Pacific/Pohnpei	10:32:52 -	LMT	1901		# Kolonia
+-			11:00	-	PONT			# Pohnpei Time
++			10:00	-	CHUT	# Chuuk Time
++Zone Pacific/Pohnpei	10:32:52 -	LMT	1901 # Kolonia
++			11:00	-	PONT	# Pohnpei Time
+ Zone Pacific/Kosrae	10:51:56 -	LMT	1901
+-			11:00	-	KOST	1969 Oct	# Kosrae Time
++			11:00	-	KOST	1969 Oct # Kosrae Time
+ 			12:00	-	KOST	1999
+ 			11:00	-	KOST
+ 
+ # Nauru
+ # Zone	NAME		GMTOFF	RULES	FORMAT	[UNTIL]
+-Zone	Pacific/Nauru	11:07:40 -	LMT	1921 Jan 15	# Uaobe
+-			11:30	-	NRT	1942 Mar 15	# Nauru Time
++Zone	Pacific/Nauru	11:07:40 -	LMT	1921 Jan 15 # Uaobe
++			11:30	-	NRT	1942 Mar 15 # Nauru Time
+ 			9:00	-	JST	1944 Aug 15
+ 			11:30	-	NRT	1979 May
+ 			12:00	-	NRT
+@@ -489,8 +513,8 @@
+ Rule	Cook	1979	1991	-	Mar	Sun>=1	0:00	0	-
+ Rule	Cook	1979	1990	-	Oct	lastSun	0:00	0:30	HS
+ # Zone	NAME		GMTOFF	RULES	FORMAT	[UNTIL]
+-Zone Pacific/Rarotonga	-10:39:04 -	LMT	1901		# Avarua
+-			-10:30	-	CKT	1978 Nov 12	# Cook Is Time
++Zone Pacific/Rarotonga	-10:39:04 -	LMT	1901        # Avarua
++			-10:30	-	CKT	1978 Nov 12 # Cook Is Time
+ 			-10:00	Cook	CK%sT
+ 
+ ###############################################################################
+@@ -498,40 +522,68 @@
+ 
+ # Niue
+ # Zone	NAME		GMTOFF	RULES	FORMAT	[UNTIL]
+-Zone	Pacific/Niue	-11:19:40 -	LMT	1901		# Alofi
+-			-11:20	-	NUT	1951	# Niue Time
+-			-11:30	-	NUT	1978 Oct 1
++Zone	Pacific/Niue	-11:19:40 -	LMT	1901        # Alofi
++			-11:20	-	NUT	1951        # Niue Time
++			-11:30	-	NUT	1978 Oct  1
+ 			-11:00	-	NUT
+ 
+ # Norfolk
+ # Zone	NAME		GMTOFF	RULES	FORMAT	[UNTIL]
+-Zone	Pacific/Norfolk	11:11:52 -	LMT	1901		# Kingston
+-			11:12	-	NMT	1951	# Norfolk Mean Time
+-			11:30	-	NFT		# Norfolk Time
++Zone	Pacific/Norfolk	11:11:52 -	LMT	1901 # Kingston
++			11:12	-	NMT	1951 # Norfolk Mean Time
++			11:30	-	NFT	1974 Oct 27 02:00 # Norfolk T.
++			11:30	1:00	NFST	1975 Mar  2 02:00
++			11:30	-	NFT	2015 Oct  4 02:00
++			11:00	-	NFT
+ 
+ # Palau (Belau)
+ # Zone	NAME		GMTOFF	RULES	FORMAT	[UNTIL]
+-Zone Pacific/Palau	8:57:56 -	LMT	1901		# Koror
++Zone Pacific/Palau	8:57:56 -	LMT	1901 # Koror
+ 			9:00	-	PWT	# Palau Time
+ 
+ # Papua New Guinea
+ # Zone	NAME		GMTOFF	RULES	FORMAT	[UNTIL]
+ Zone Pacific/Port_Moresby 9:48:40 -	LMT	1880
+-			9:48:32	-	PMMT	1895	# Port Moresby Mean Time
+-			10:00	-	PGT		# Papua New Guinea Time
++			9:48:32	-	PMMT	1895 # Port Moresby Mean Time
++			10:00	-	PGT	# Papua New Guinea Time
++#
++# From Paul Eggert (2014-10-13):
++# Base the Bougainville entry on the Arawa-Kieta region, which appears to have
++# the most people even though it was devastated in the Bougainville Civil War.
++#
++# Although Shanks gives 1942-03-15 / 1943-11-01 for UT +09, these dates
++# are apparently rough guesswork from the starts of military campaigns.
++# The World War II entries below are instead based on Arawa-Kieta.
++# The Japanese occupied Kieta in July 1942,
++# according to the Pacific War Online Encyclopedia
++# http://pwencycl.kgbudge.com/B/o/Bougainville.htm
++# and seem to have controlled it until their 1945-08-21 surrender.
++#
++# The Autonomous Region of Bougainville switched from UT +10 to +11
++# on 2014-12-28 at 02:00.  They call +11 "Bougainville Standard Time";
++# abbreviate this as BST.  See:
++# http://www.bougainville24.com/bougainville-issues/bougainville-gets-own-timezone/
++#
++Zone Pacific/Bougainville 10:22:16 -	LMT	1880
++			 9:48:32 -	PMMT	1895
++			10:00	-	PGT	1942 Jul
++			 9:00	-	JST	1945 Aug 21
++			10:00	-	PGT	2014 Dec 28  2:00
++			11:00	-	BST
+ 
+ # Pitcairn
+ # Zone	NAME		GMTOFF	RULES	FORMAT	[UNTIL]
+-Zone Pacific/Pitcairn	-8:40:20 -	LMT	1901		# Adamstown
+-			-8:30	-	PNT	1998 Apr 27 00:00
++Zone Pacific/Pitcairn	-8:40:20 -	LMT	1901        # Adamstown
++			-8:30	-	PNT	1998 Apr 27  0:00
+ 			-8:00	-	PST	# Pitcairn Standard Time
+ 
+ # American Samoa
+ Zone Pacific/Pago_Pago	 12:37:12 -	LMT	1879 Jul  5
+ 			-11:22:48 -	LMT	1911
+-			-11:00	-	NST	1967 Apr	# N=Nome
+-			-11:00	-	BST	1983 Nov 30	# B=Bering
+-			-11:00	-	SST			# S=Samoa
++			-11:00	-	NST	1967 Apr    # N=Nome
++			-11:00	-	BST	1983 Nov 30 # B=Bering
++			-11:00	-	SST	            # S=Samoa
++Link Pacific/Pago_Pago Pacific/Midway # in US minor outlying islands
+ 
+ # Samoa (formerly and also known as Western Samoa)
+ 
+@@ -574,7 +626,7 @@
+ # From Paul Eggert (2014-06-27):
+ # The International Date Line Act 2011
+ # http://www.parliament.gov.ws/images/ACTS/International_Date_Line_Act__2011_-_Eng.pdf
+-# changed Samoa from UTC-11 to UTC+13, effective "12 o'clock midnight, on
++# changed Samoa from UT -11 to +13, effective "12 o'clock midnight, on
+ # Thursday 29th December 2011".  The International Date Line was adjusted
+ # accordingly.
+ 
+@@ -617,7 +669,7 @@
+ # Solomon Is
+ # excludes Bougainville, for which see Papua New Guinea
+ # Zone	NAME		GMTOFF	RULES	FORMAT	[UNTIL]
+-Zone Pacific/Guadalcanal 10:39:48 -	LMT	1912 Oct	# Honiara
++Zone Pacific/Guadalcanal 10:39:48 -	LMT	1912 Oct # Honiara
+ 			11:00	-	SBT	# Solomon Is Time
+ 
+ # Tokelau Is
+@@ -641,7 +693,7 @@
+ 
+ # Zone	NAME		GMTOFF	RULES	FORMAT	[UNTIL]
+ Zone	Pacific/Fakaofo	-11:24:56 -	LMT	1901
+-			-11:00	-	TKT 2011 Dec 30	# Tokelau Time
++			-11:00	-	TKT	2011 Dec 30 # Tokelau Time
+ 			13:00	-	TKT
+ 
+ # Tonga
+@@ -650,11 +702,13 @@
+ Rule	Tonga	2000	only	-	Mar	19	2:00s	0	-
+ Rule	Tonga	2000	2001	-	Nov	Sun>=1	2:00	1:00	S
+ Rule	Tonga	2001	2002	-	Jan	lastSun	2:00	0	-
++Rule	Tonga	2016	max	-	Nov	Sun>=1	2:00	1:00	S
++Rule	Tonga	2017	max	-	Jan	Sun>=15	3:00	0	-
+ # Zone	NAME		GMTOFF	RULES	FORMAT	[UNTIL]
+ Zone Pacific/Tongatapu	12:19:20 -	LMT	1901
+-			12:20	-	TOT	1941 # Tonga Time
+-			13:00	-	TOT	1999
+-			13:00	Tonga	TO%sT
++			12:20	-	+1220	1941
++			13:00	-	+13	1999
++			13:00	Tonga	+13/+14
+ 
+ # Tuvalu
+ # Zone	NAME		GMTOFF	RULES	FORMAT	[UNTIL]
+@@ -669,7 +723,7 @@
+ # 1886-1891; Baker was similar but exact dates are not known.
+ # Inhabited by civilians 1935-1942; U.S. military bases 1943-1944;
+ # uninhabited thereafter.
+-# Howland observed Hawaii Standard Time (UT-10:30) in 1937;
++# Howland observed Hawaii Standard Time (UT -10:30) in 1937;
+ # see page 206 of Elgen M. Long and Marie K. Long,
+ # Amelia Earhart: the Mystery Solved, Simon & Schuster (2000).
+ # So most likely Howland and Baker observed Hawaii Time from 1935
+@@ -701,8 +755,8 @@
+ # time from Operation Newsreel (Hardtack I/Teak shot, 1958-08-01) to the last
+ # Operation Fishbowl shot (Tightrope, 1962-11-04).... [See] Herman Hoerlin,
+ # "The United States High-Altitude Test Experience: A Review Emphasizing the
+-# Impact on the Environment", Los Alamos LA-6405, Oct 1976
+-# <http://www.fas.org/sgp/othergov/doe/lanl/docs1/00322994.pdf>.
++# Impact on the Environment", Los Alamos LA-6405, Oct 1976.
++# http://www.fas.org/sgp/othergov/doe/lanl/docs1/00322994.pdf
+ # See the table on page 4 where he lists GMT and local times for the tests; a
+ # footnote for the JI tests reads that local time is "JI time = Hawaii Time
+ # Minus One Hour".
+@@ -713,23 +767,7 @@
+ # uninhabited
+ 
+ # Midway
+-#
+-# From Mark Brader (2005-01-23):
+-# [Fallacies and Fantasies of Air Transport History, by R.E.G. Davies,
+-# published 1994 by Paladwr Press, McLean, VA, USA; ISBN 0-9626483-5-3]
+-# reproduced a Pan American Airways timeables from 1936, for their weekly
+-# "Orient Express" flights between San Francisco and Manila, and connecting
+-# flights to Chicago and the US East Coast.  As it uses some time zone
+-# designations that I've never seen before:....
+-# Fri. 6:30A Lv. HONOLOLU (Pearl Harbor), H.I.   H.L.T. Ar. 5:30P Sun.
+-#  "   3:00P Ar. MIDWAY ISLAND . . . . . . . . . M.L.T. Lv. 6:00A  "
+-#
+-Zone Pacific/Midway	-11:49:28 -	LMT	1901
+-			-11:00	-	NST	1956 Jun  3
+-			-11:00	1:00	NDT	1956 Sep  2
+-			-11:00	-	NST	1967 Apr	# N=Nome
+-			-11:00	-	BST	1983 Nov 30	# B=Bering
+-			-11:00	-	SST			# S=Samoa
++# See Pacific/Pago_Pago.
+ 
+ # Palmyra
+ # uninhabited since World War II; was probably like Pacific/Kiritimati
+@@ -749,7 +787,7 @@
+ Rule	Vanuatu	1992	1993	-	Jan	Sun>=23	0:00	0	-
+ Rule	Vanuatu	1992	only	-	Oct	Sun>=23	0:00	1:00	S
+ # Zone	NAME		GMTOFF	RULES	FORMAT	[UNTIL]
+-Zone	Pacific/Efate	11:13:16 -	LMT	1912 Jan 13		# Vila
++Zone	Pacific/Efate	11:13:16 -	LMT	1912 Jan 13 # Vila
+ 			11:00	Vanuatu	VU%sT	# Vanuatu Time
+ 
+ # Wallis and Futuna
+@@ -761,31 +799,32 @@
+ 
+ # NOTES
+ 
+-# This data is by no means authoritative; if you think you know better,
++# This file is by no means authoritative; if you think you know better,
+ # go ahead and edit the file (and please send any changes to
+-# tz@iana.org for general use in the future).
++# tz@iana.org for general use in the future).  For more, please see
++# the file CONTRIBUTING in the tz distribution.
+ 
+-# From Paul Eggert (2013-02-21):
+-# A good source for time zone historical data outside the U.S. is
++# From Paul Eggert (2014-10-31):
++#
++# Unless otherwise specified, the source for data through 1990 is:
+ # Thomas G. Shanks and Rique Pottenger, The International Atlas (6th edition),
+ # San Diego: ACS Publications, Inc. (2003).
++# Unfortunately this book contains many errors and cites no sources.
+ #
+ # Gwillim Law writes that a good source
+ # for recent time zone data is the International Air Transport
+ # Association's Standard Schedules Information Manual (IATA SSIM),
+ # published semiannually.  Law sent in several helpful summaries
+-# of the IATA's data after 1990.
+-#
+-# Except where otherwise noted, Shanks & Pottenger is the source for
+-# entries through 1990, and IATA SSIM is the source for entries afterwards.
++# of the IATA's data after 1990.  Except where otherwise noted,
++# IATA SSIM is the source for entries after 1990.
+ #
+ # Another source occasionally used is Edward W. Whitman, World Time Differences,
+ # Whitman Publishing Co, 2 Niagara Av, Ealing, London (undated), which
+ # I found in the UCLA library.
+ #
+ # For data circa 1899, a common source is:
+-# Milne J. Civil time. Geogr J. 1899 Feb;13(2):173-94
+-# <http://www.jstor.org/stable/1774359>.
++# Milne J. Civil time. Geogr J. 1899 Feb;13(2):173-94.
++# http://www.jstor.org/stable/1774359
+ #
+ # A reliable and entertaining source about time zones is
+ # Derek Howse, Greenwich time and longitude, Philip Wilson Publishers (1997).
+@@ -802,6 +841,7 @@
+ #	 10:00	AEST	AEDT	Eastern Australia
+ #	 10:00	ChST		Chamorro
+ #	 10:30	LHST	LHDT	Lord Howe*
++#	 11:00	BST		Bougainville*
+ #	 11:30	NZMT	NZST	New Zealand through 1945
+ #	 12:00	NZST	NZDT	New Zealand 1946-present
+ #	 12:15	CHAST		Chatham through 1945*
+@@ -834,12 +874,12 @@
+ 
+ # From Paul Eggert (2005-12-08):
+ # Implementation Dates of Daylight Saving Time within Australia
+-# <http://www.bom.gov.au/climate/averages/tables/dst_times.shtml>
++# http://www.bom.gov.au/climate/averages/tables/dst_times.shtml
+ # summarizes daylight saving issues in Australia.
+ 
+ # From Arthur David Olson (2005-12-12):
+ # Lawlink NSW:Daylight Saving in New South Wales
+-# <http://www.lawlink.nsw.gov.au/lawlink/Corporate/ll_agdinfo.nsf/pages/community_relations_daylight_saving>
++# http://www.lawlink.nsw.gov.au/lawlink/Corporate/ll_agdinfo.nsf/pages/community_relations_daylight_saving
+ # covers New South Wales in particular.
+ 
+ # From John Mackin (1991-03-06):
+@@ -976,13 +1016,13 @@
+ #
+ # NSW (including LHI and Broken Hill):
+ # Standard Time Act 1987 (updated 1995-04-04)
+-# <http://www.austlii.edu.au/au/legis/nsw/consol_act/sta1987137/index.html>
++# http://www.austlii.edu.au/au/legis/nsw/consol_act/sta1987137/index.html
+ # ACT
+ # Standard Time and Summer Time Act 1972
+-# <http://www.austlii.edu.au/au/legis/act/consol_act/stasta1972279/index.html>
++# http://www.austlii.edu.au/au/legis/act/consol_act/stasta1972279/index.html
+ # SA
+ # Standard Time Act, 1898
+-# <http://www.austlii.edu.au/au/legis/sa/consol_act/sta1898137/index.html>
++# http://www.austlii.edu.au/au/legis/sa/consol_act/sta1898137/index.html
+ 
+ # From David Grosz (2005-06-13):
+ # It was announced last week that Daylight Saving would be extended by
+@@ -1048,7 +1088,7 @@
+ # it matches what was used in the past.
+ 
+ # The Australian Bureau of Meteorology FAQ
+-# <http://www.bom.gov.au/faq/faqgen.htm>
++# http://www.bom.gov.au/faq/faqgen.htm
+ # (1999-09-27) writes that Giles Meteorological Station uses
+ # South Australian time even though it's located in Western Australia.
+ 
+@@ -1092,7 +1132,7 @@
+ # From Christopher Hunt (2006-11-21), after an advance warning
+ # from Jesper Nørgaard Welen (2006-11-01):
+ # WA are trialing DST for three years.
+-# <http://www.parliament.wa.gov.au/parliament/bills.nsf/9A1B183144403DA54825721200088DF1/$File/Bill175-1B.pdf>
++# http://www.parliament.wa.gov.au/parliament/bills.nsf/9A1B183144403DA54825721200088DF1/$File/Bill175-1B.pdf
+ 
+ # From Rives McDow (2002-04-09):
+ # The most interesting region I have found consists of three towns on the
+@@ -1106,7 +1146,7 @@
+ # From Paul Eggert (2002-04-09):
+ # This is confirmed by the section entitled
+ # "What's the deal with time zones???" in
+-# <http://www.earthsci.unimelb.edu.au/~awatkins/null.html>.
++# http://www.earthsci.unimelb.edu.au/~awatkins/null.html
+ #
+ # From Alex Livingston (2006-12-07):
+ # ... it was just on four years ago that I drove along the Eyre Highway,
+@@ -1262,33 +1302,32 @@
+ 
+ # From Eric Ulevik (1999-05-26):
+ # DST will start in NSW on the last Sunday of August, rather than the usual
+-# October in 2000.  [See: Matthew Moore,
+-# Two months more daylight saving
+-# Sydney Morning Herald (1999-05-26)
+-# <http://www.smh.com.au/news/9905/26/pageone/pageone4.html>]
++# October in 2000.  See: Matthew Moore,
++# Two months more daylight saving, Sydney Morning Herald (1999-05-26).
++# http://www.smh.com.au/news/9905/26/pageone/pageone4.html
+ 
+ # From Paul Eggert (1999-09-27):
+ # See the following official NSW source:
+ # Daylight Saving in New South Wales.
+-# <http://dir.gis.nsw.gov.au/cgi-bin/genobject/document/other/daylightsaving/tigGmZ>
++# http://dir.gis.nsw.gov.au/cgi-bin/genobject/document/other/daylightsaving/tigGmZ
+ #
+ # Narrabri Shire (NSW) council has announced it will ignore the extension of
+ # daylight saving next year.  See:
+ # Narrabri Council to ignore daylight saving
+-# <http://abc.net.au/news/regionals/neweng/monthly/regeng-22jul1999-1.htm>
++# http://abc.net.au/news/regionals/neweng/monthly/regeng-22jul1999-1.htm
+ # (1999-07-22).  For now, we'll wait to see if this really happens.
+ #
+ # Victoria will following NSW.  See:
+ # Vic to extend daylight saving (1999-07-28)
+-# <http://abc.net.au/local/news/olympics/1999/07/item19990728112314_1.htm>
++# http://abc.net.au/local/news/olympics/1999/07/item19990728112314_1.htm
+ #
+ # However, South Australia rejected the DST request.  See:
+ # South Australia rejects Olympics daylight savings request (1999-07-19)
+-# <http://abc.net.au/news/olympics/1999/07/item19990719151754_1.htm>
++# http://abc.net.au/news/olympics/1999/07/item19990719151754_1.htm
+ #
+ # Queensland also will not observe DST for the Olympics.  See:
+ # Qld says no to daylight savings for Olympics
+-# <http://abc.net.au/news/olympics/1999/06/item19990601114608_1.htm>
++# http://abc.net.au/news/olympics/1999/06/item19990601114608_1.htm
+ # (1999-06-01), which quotes Queensland Premier Peter Beattie as saying
+ # "Look you've got to remember in my family when this came up last time
+ # I voted for it, my wife voted against it and she said to me it's all very
+@@ -1298,7 +1337,7 @@
+ #
+ # Broken Hill will stick with South Australian time in 2000.  See:
+ # Broken Hill to be behind the times (1999-07-21)
+-# <http://abc.net.au/news/regionals/brokenh/monthly/regbrok-21jul1999-6.htm>
++# http://abc.net.au/news/regionals/brokenh/monthly/regbrok-21jul1999-6.htm
+ 
+ # IATA SSIM (1998-09) says that the spring 2000 change for Australian
+ # Capital Territory, New South Wales except Lord Howe Island and Broken
+@@ -1434,15 +1473,15 @@
+ 
+ # From Paul Eggert (2014-07-14):
+ # Chatham Island time was formally standardized on 1957-01-01 by
+-# New Zealand's Standard Time Amendment Act 1956 (1956-10-26)
+-# <http://www.austlii.edu.au/nz/legis/hist_act/staa19561956n100244.pdf>.
++# New Zealand's Standard Time Amendment Act 1956 (1956-10-26).
++# http://www.austlii.edu.au/nz/legis/hist_act/staa19561956n100244.pdf
+ # According to Google Books snippet view, a speaker in the New Zealand
+ # parliamentary debates in 1956 said "Clause 78 makes provision for standard
+ # time in the Chatham Islands.  The time there is 45 minutes in advance of New
+ # Zealand time.  I understand that is the time they keep locally, anyhow."
+ # For now, assume this practice goes back to the introduction of standard time
+ # in New Zealand, as this would make Chatham Islands time almost exactly match
+-# LMT back when New Zealand was at UTC+11:30; also, assume Chatham Islands did
++# LMT back when New Zealand was at UT +11:30; also, assume Chatham Islands did
+ # not observe New Zealand's prewar DST.
+ 
+ ###############################################################################
+@@ -1498,7 +1537,7 @@
+ # For now, we assume the Ladrones switched at the same time as the Philippines;
+ # see Asia/Manila.
+ 
+-# US Public Law 106-564 (2000-12-23) made UTC+10 the official standard time,
++# US Public Law 106-564 (2000-12-23) made UT +10 the official standard time,
+ # under the name "Chamorro Standard Time".  There is no official abbreviation,
+ # but Congressman Robert A. Underwood, author of the bill that became law,
+ # wrote in a press release (2000-12-27) that he will seek the use of "ChST".
+@@ -1510,15 +1549,15 @@
+ # "I am certain, having lived there for the past decade, that 'Truk'
+ # (now properly known as Chuuk) ... is in the time zone GMT+10."
+ #
+-# Shanks & Pottenger write that Truk switched from UTC+10 to UTC+11
++# Shanks & Pottenger write that Truk switched from UT +10 to +11
+ # on 1978-10-01; ignore this for now.
+ 
+ # From Paul Eggert (1999-10-29):
+ # The Federated States of Micronesia Visitors Board writes in
+ # The Federated States of Micronesia - Visitor Information (1999-01-26)
+-# <http://www.fsmgov.org/info/clocks.html>
+-# that Truk and Yap are UTC+10, and Ponape and Kosrae are UTC+11.
+-# We don't know when Kosrae switched from UTC+12; assume January 1 for now.
++# http://www.fsmgov.org/info/clocks.html
++# that Truk and Yap are UT +10, and Ponape and Kosrae are +11.
++# We don't know when Kosrae switched from +12; assume January 1 for now.
+ 
+ 
+ # Midway
+@@ -1537,6 +1576,20 @@
+ # started DST on June 3.  Possibly DST was observed other years
+ # in Midway, but we have no record of it.
+ 
++# Norfolk
++
++# From Alexander Krivenyshev (2015-09-23):
++# Norfolk Island will change ... from +1130 to +1100:
++# https://www.comlaw.gov.au/Details/F2015L01483/Explanatory%20Statement/Text
++# ... at 12.30 am (by legal time in New South Wales) on 4 October 2015.
++# http://www.norfolkisland.gov.nf/nia/MediaRelease/Media%20Release%20Norfolk%20Island%20Standard%20Time%20Change.pdf
++
++# From Paul Eggert (2015-09-23):
++# Transitions before 2015 are from timeanddate.com, which consulted
++# the Norfolk Island Museum and the Australian Bureau of Meteorology's
++# Norfolk Island station, and found no record of Norfolk observing DST
++# other than in 1974/5.  See:
++# http://www.timeanddate.com/time/australia/norfolk-island.html
+ 
+ # Pitcairn
+ 
+@@ -1570,11 +1623,11 @@
+ # ordaining - by a masterpiece of diplomatic flattery - that
+ # the Fourth of July should be celebrated twice in that year."
+ 
+-# Although Shanks & Pottenger says they both switched to UTC-11:30
+-# in 1911, and to UTC-11 in 1950. many earlier sources give UTC-11
++# Although Shanks & Pottenger says they both switched to UT -11:30
++# in 1911, and to -11 in 1950. many earlier sources give -11
+ # for American Samoa, e.g., the US National Bureau of Standards
+ # circular "Standard Time Throughout the World", 1932.
+-# Assume American Samoa switched to UTC-11 in 1911, not 1950,
++# Assume American Samoa switched to -11 in 1911, not 1950,
+ # and that after 1950 they agreed until (western) Samoa skipped a
+ # day in 2011.  Assume also that the Samoas follow the US and New
+ # Zealand's "ST"/"DT" style of daylight-saving abbreviations.
+@@ -1587,9 +1640,9 @@
+ # Since Kiribati has moved the Date Line it's not clear what Tonga will do.
+ 
+ # Don Mundell writes in the 1997-02-20 Tonga Chronicle
+-# How Tonga became 'The Land where Time Begins'
+-# <http://www.tongatapu.net.to/tonga/homeland/timebegins.htm>:
+-
++# How Tonga became 'The Land where Time Begins':
++# http://www.tongatapu.net.to/tonga/homeland/timebegins.htm
++#
+ # Until 1941 Tonga maintained a standard time 50 minutes ahead of NZST
+ # 12 hours and 20 minutes ahead of GMT.  When New Zealand adjusted its
+ # standard time in 1940s, Tonga had the choice of subtracting from its
+@@ -1661,9 +1714,17 @@
+ # of January the standard time in the Kingdom shall be moved backward by one
+ # hour to 1:00am.
+ 
+-# From Pulu 'Anau (2002-11-05):
++# From Pulu ʻAnau (2002-11-05):
+ # The law was for 3 years, supposedly to get renewed.  It wasn't.
+ 
++# From Pulu ʻAnau (2016-10-27):
++# http://mic.gov.to/news-today/press-releases/6375-daylight-saving-set-to-run-from-6-november-2016-to-15-january-2017
++# Cannot find anyone who knows the rules, has seen the duration or has seen
++# the cabinet decision, but it appears we are following Fiji's rule set.
++#
++# From Tim Parenti (2016-10-26):
++# Assume Tonga will observe DST from the first Sunday in November at 02:00
++# through the third Sunday in January at 03:00, like Fiji, for now.
+ 
+ # Wake
+ 
+@@ -1723,6 +1784,6 @@
+ # (2005-03-20):
+ #
+ # The American Practical Navigator (2002)
+-# <http://pollux.nss.nima.mil/pubs/pubs_j_apn_sections.html?rid=187>
++# http://pollux.nss.nima.mil/pubs/pubs_j_apn_sections.html?rid=187
+ # talks only about the 180-degree meridian with respect to ships in
+ # international waters; it ignores the international date line.
+--- contrib/tzdata/backward.orig
++++ contrib/tzdata/backward
+@@ -4,7 +4,8 @@
+ # This file provides links between current names for time zones
+ # and their old names.  Many names changed in late 1993.
+ 
+-Link	Africa/Asmara		Africa/Asmera
++# Link	TARGET			LINK-NAME
++Link	Africa/Nairobi		Africa/Asmera
+ Link	Africa/Abidjan		Africa/Timbuktu
+ Link	America/Argentina/Catamarca	America/Argentina/ComodRivadavia
+ Link	America/Adak		America/Atka
+@@ -19,8 +20,10 @@
+ Link	America/Indiana/Knox	America/Knox_IN
+ Link	America/Kentucky/Louisville	America/Louisville
+ Link	America/Argentina/Mendoza	America/Mendoza
++Link	America/Toronto		America/Montreal
+ Link	America/Rio_Branco	America/Porto_Acre
+ Link	America/Argentina/Cordoba	America/Rosario
++Link	America/Tijuana		America/Santa_Isabel
+ Link	America/Denver		America/Shiprock
+ Link	America/Port_of_Spain	America/Virgin
+ Link	Pacific/Auckland	Antarctica/South_Pole
+@@ -33,6 +36,7 @@
+ Link	Asia/Urumqi		Asia/Kashgar
+ Link	Asia/Kathmandu		Asia/Katmandu
+ Link	Asia/Macau		Asia/Macao
++Link	Asia/Yangon		Asia/Rangoon
+ Link	Asia/Ho_Chi_Minh	Asia/Saigon
+ Link	Asia/Jerusalem		Asia/Tel_Aviv
+ Link	Asia/Thimphu		Asia/Thimbu
+--- contrib/tzdata/backzone.orig
++++ contrib/tzdata/backzone
+@@ -0,0 +1,677 @@
++# Zones that go back beyond the scope of the tz database
++
++# This file is in the public domain.
++
++# This file is by no means authoritative; if you think you know
++# better, go ahead and edit it (and please send any changes to
++# tz@iana.org for general use in the future).  For more, please see
++# the file CONTRIBUTING in the tz distribution.
++
++
++# From Paul Eggert (2014-10-31):
++
++# This file contains data outside the normal scope of the tz database,
++# in that its zones do not differ from normal tz zones after 1970.
++# Links in this file point to zones in this file, superseding links in
++# the file 'backward'.
++
++# Although zones in this file may be of some use for analyzing
++# pre-1970 time stamps, they are less reliable, cover only a tiny
++# sliver of the pre-1970 era, and cannot feasibly be improved to cover
++# most of the era.  Because the zones are out of normal scope for the
++# database, less effort is put into maintaining this file.  Many of
++# the zones were formerly in other source files, but were removed or
++# replaced by links as their data entries were questionable and/or they
++# differed from other zones only in pre-1970 time stamps.
++
++# Unless otherwise specified, the source for data through 1990 is:
++# Thomas G. Shanks and Rique Pottenger, The International Atlas (6th edition),
++# San Diego: ACS Publications, Inc. (2003).
++# Unfortunately this book contains many errors and cites no sources.
++
++# This file is not intended to be compiled standalone, as it
++# assumes rules from other files.  In the tz distribution, use
++# 'make PACKRATDATA=backzone zones' to compile and install this file.
++
++# Zones are sorted by zone name.  Each zone is preceded by the
++# name of the country that the zone is in, along with any other
++# commentary and rules associated with the entry.
++#
++# As explained in the zic man page, the zone columns are:
++# Zone	NAME		GMTOFF	RULES	FORMAT	[UNTIL]
++
++# Ethiopia
++# From Paul Eggert (2014-07-31):
++# Like the Swahili of Kenya and Tanzania, many Ethiopians keep a
++# 12-hour clock starting at our 06:00, so their "8 o'clock" is our
++# 02:00 or 14:00.  Keep this in mind when you ask the time in Amharic.
++#
++# Shanks & Pottenger write that Ethiopia had six narrowly-spaced time
++# zones between 1870 and 1890, that they merged to 38E50 (2:35:20) in
++# 1890, and that they switched to 3:00 on 1936-05-05.  Perhaps 38E50
++# was for Adis Dera.  Quite likely the Shanks data entries are wrong
++# anyway.
++Zone Africa/Addis_Ababa	2:34:48 -	LMT	1870
++			2:35:20	-	ADMT	1936 May  5 # Adis Dera MT
++			3:00	-	EAT
++
++# Eritrea
++Zone	Africa/Asmara	2:35:32 -	LMT	1870
++			2:35:32	-	AMT	1890        # Asmara Mean Time
++			2:35:20	-	ADMT	1936 May  5 # Adis Dera MT
++			3:00	-	EAT
++Link Africa/Asmara Africa/Asmera
++
++# Mali (southern)
++Zone	Africa/Bamako	-0:32:00 -	LMT	1912
++			 0:00	-	GMT	1934 Feb 26
++			-1:00	-	WAT	1960 Jun 20
++			 0:00	-	GMT
++
++# Central African Republic
++Zone	Africa/Bangui	1:14:20	-	LMT	1912
++			1:00	-	WAT
++
++# Gambia
++Zone	Africa/Banjul	-1:06:36 -	LMT	1912
++			-1:06:36 -	BMT	1935 # Banjul Mean Time
++			-1:00	-	WAT	1964
++			 0:00	-	GMT
++
++# Malawi
++Zone	Africa/Blantyre	2:20:00 -	LMT	1903 Mar
++			2:00	-	CAT
++
++# Republic of the Congo
++Zone Africa/Brazzaville	1:01:08 -	LMT	1912
++			1:00	-	WAT
++
++# Burundi
++Zone Africa/Bujumbura	1:57:28	-	LMT	1890
++			2:00	-	CAT
++
++# Guinea
++Zone	Africa/Conakry	-0:54:52 -	LMT	1912
++			 0:00	-	GMT	1934 Feb 26
++			-1:00	-	WAT	1960
++			 0:00	-	GMT
++
++# Senegal
++Zone	Africa/Dakar	-1:09:44 -	LMT	1912
++			-1:00	-	WAT	1941 Jun
++			 0:00	-	GMT
++
++# Tanzania
++Zone Africa/Dar_es_Salaam 2:37:08 -	LMT	1931
++			3:00	-	EAT	1948
++			2:45	-	BEAUT	1961
++			3:00	-	EAT
++
++# Djibouti
++Zone	Africa/Djibouti	2:52:36 -	LMT	1911 Jul
++			3:00	-	EAT
++
++# Cameroon
++# Whitman says they switched to 1:00 in 1920; go with Shanks & Pottenger.
++Zone	Africa/Douala	0:38:48	-	LMT	1912
++			1:00	-	WAT
++# Sierra Leone
++# From Paul Eggert (2014-08-12):
++# The following table is from Shanks & Pottenger, but it can't be right.
++# Whitman gives Mar 31 - Aug 31 for 1931 on.
++# The International Hydrographic Bulletin, 1932-33, p 63 says that
++# Sierra Leone would advance its clocks by 20 minutes on 1933-10-01.
++# Rule	NAME	FROM	TO	TYPE	IN	ON	AT	SAVE	LETTER/S
++Rule	SL	1935	1942	-	Jun	 1	0:00	0:40	SLST
++Rule	SL	1935	1942	-	Oct	 1	0:00	0	WAT
++Rule	SL	1957	1962	-	Jun	 1	0:00	1:00	SLST
++Rule	SL	1957	1962	-	Sep	 1	0:00	0	GMT
++Zone	Africa/Freetown	-0:53:00 -	LMT	1882
++			-0:53:00 -	FMT	1913 Jun # Freetown Mean Time
++			-1:00	SL	%s	1957
++			 0:00	SL	%s
++
++# Botswana
++# From Paul Eggert (2013-02-21):
++# Milne says they were regulated by the Cape Town Signal in 1899;
++# assume they switched to 2:00 when Cape Town did.
++Zone	Africa/Gaborone	1:43:40 -	LMT	1885
++			1:30	-	SAST	1903 Mar
++			2:00	-	CAT	1943 Sep 19  2:00
++			2:00	1:00	CAST	1944 Mar 19  2:00
++			2:00	-	CAT
++
++# Zimbabwe
++Zone	Africa/Harare	2:04:12 -	LMT	1903 Mar
++			2:00	-	CAT
++
++# South Sudan
++Zone	Africa/Juba	2:06:24 -	LMT	1931
++			2:00	Sudan	CA%sT	2000 Jan 15 12:00
++			3:00	-	EAT
++
++# Uganda
++Zone	Africa/Kampala	2:09:40 -	LMT	1928 Jul
++			3:00	-	EAT	1930
++			2:30	-	BEAT	1948
++			2:45	-	BEAUT	1957
++			3:00	-	EAT
++
++# Rwanda
++Zone	Africa/Kigali	2:00:16 -	LMT	1935 Jun
++			2:00	-	CAT
++
++# Democratic Republic of the Congo (west)
++Zone Africa/Kinshasa	1:01:12 -	LMT	1897 Nov  9
++			1:00	-	WAT
++
++# Gabon
++Zone Africa/Libreville	0:37:48 -	LMT	1912
++			1:00	-	WAT
++
++# Togo
++Zone	Africa/Lome	0:04:52 -	LMT	1893
++			0:00	-	GMT
++
++# Angola
++#
++# Shanks gives 1911-05-26 for the transition to WAT,
++# evidently confusing the date of the Portuguese decree
++# http://dre.pt/pdf1sdip/1911/05/12500/23132313.pdf
++# with the date that it took effect, namely 1912-01-01.
++#
++Zone	Africa/Luanda	0:52:56	-	LMT	1892
++			0:52:04	-	AOT	1912 Jan  1 # Angola Time
++			1:00	-	WAT
++
++# Democratic Republic of the Congo (east)
++Zone Africa/Lubumbashi	1:49:52 -	LMT	1897 Nov 9
++			2:00	-	CAT
++
++# Zambia
++Zone	Africa/Lusaka	1:53:08 -	LMT	1903 Mar
++			2:00	-	CAT
++
++# Equatorial Guinea
++#
++# Although Shanks says that Malabo switched from UT +00 to +01 on 1963-12-15,
++# a Google Books search says that London Calling, Issues 432-465 (1948), p 19,
++# says that Spanish Guinea was at +01 back then.  The Shanks data entries
++# are most likely wrong, but we have nothing better; use them here for now.
++#
++Zone	Africa/Malabo	0:35:08 -	LMT	1912
++			0:00	-	GMT	1963 Dec 15
++			1:00	-	WAT
++
++# Lesotho
++Zone	Africa/Maseru	1:50:00 -	LMT	1903 Mar
++			2:00	-	SAST	1943 Sep 19  2:00
++			2:00	1:00	SAST	1944 Mar 19  2:00
++			2:00	-	SAST
++
++# Swaziland
++Zone	Africa/Mbabane	2:04:24 -	LMT	1903 Mar
++			2:00	-	SAST
++
++# Somalia
++Zone Africa/Mogadishu	3:01:28 -	LMT	1893 Nov
++			3:00	-	EAT	1931
++			2:30	-	BEAT	1957
++			3:00	-	EAT
++
++# Niger
++Zone	Africa/Niamey	 0:08:28 -	LMT	1912
++			-1:00	-	WAT	1934 Feb 26
++			 0:00	-	GMT	1960
++			 1:00	-	WAT
++
++# Mauritania
++Zone Africa/Nouakchott	-1:03:48 -	LMT	1912
++			 0:00	-	GMT	1934 Feb 26
++			-1:00	-	WAT	1960 Nov 28
++			 0:00	-	GMT
++
++# Burkina Faso
++Zone Africa/Ouagadougou	-0:06:04 -	LMT	1912
++			 0:00	-	GMT
++
++# Benin
++# Whitman says they switched to 1:00 in 1946, not 1934;
++# go with Shanks & Pottenger.
++Zone Africa/Porto-Novo	0:10:28	-	LMT	1912 Jan  1
++			0:00	-	GMT	1934 Feb 26
++			1:00	-	WAT
++
++# São Tomé and Príncipe
++Zone	Africa/Sao_Tome	 0:26:56 -	LMT	1884
++			-0:36:32 -	LMT	1912 # Lisbon Mean Time
++			 0:00	-	GMT
++
++# Mali (northern)
++Zone	Africa/Timbuktu	-0:12:04 -	LMT	1912
++			 0:00	-	GMT
++
++# Anguilla
++Zone America/Anguilla	-4:12:16 -	LMT	1912 Mar  2
++			-4:00	-	AST
++
++# Antigua and Barbuda
++Zone	America/Antigua	-4:07:12 -	LMT	1912 Mar 2
++			-5:00	-	EST	1951
++			-4:00	-	AST
++
++# Chubut, Argentina
++# The name "Comodoro Rivadavia" exceeds the 14-byte POSIX limit.
++Zone America/Argentina/ComodRivadavia -4:30:00 - LMT	1894 Oct 31
++			-4:16:48 -	CMT	1920 May
++			-4:00	-	ART	1930 Dec
++			-4:00	Arg	AR%sT	1969 Oct  5
++			-3:00	Arg	AR%sT	1991 Mar  3
++			-4:00	-	WART	1991 Oct 20
++			-3:00	Arg	AR%sT	1999 Oct  3
++			-4:00	Arg	AR%sT	2000 Mar  3
++			-3:00	-	ART	2004 Jun  1
++			-4:00	-	WART	2004 Jun 20
++			-3:00	-	ART
++
++# Aruba
++Zone	America/Aruba	-4:40:24 -	LMT	1912 Feb 12 # Oranjestad
++			-4:30	-	ANT	1965 # Netherlands Antilles Time
++			-4:00	-	AST
++
++# Cayman Is
++Zone	America/Cayman	-5:25:32 -	LMT	1890     # Georgetown
++			-5:07:11 -	KMT	1912 Feb # Kingston Mean Time
++			-5:00	-	EST
++
++# Canada
++Zone America/Coral_Harbour -5:32:40 -	LMT	1884
++			-5:00	NT_YK	E%sT	1946
++			-5:00	-	EST
++
++# Dominica
++Zone America/Dominica	-4:05:36 -	LMT	1911 Jul  1  0:01 # Roseau
++			-4:00	-	AST
++
++# Baja California
++# See 'northamerica' for why this entry is here rather than there.
++Zone America/Ensenada	-7:46:28 -	LMT	1922 Jan  1  0:13:32
++			-8:00	-	PST	1927 Jun 10 23:00
++			-7:00	-	MST	1930 Nov 16
++			-8:00	-	PST	1942 Apr
++			-7:00	-	MST	1949 Jan 14
++			-8:00	-	PST	1996
++			-8:00	Mexico	P%sT
++
++# Grenada
++Zone	America/Grenada	-4:07:00 -	LMT	1911 Jul # St George's
++			-4:00	-	AST
++
++# Guadeloupe
++Zone America/Guadeloupe	-4:06:08 -	LMT	1911 Jun  8 # Pointe-à-Pitre
++			-4:00	 -	AST
++
++# Canada
++#
++# From Paul Eggert (2015-03-24):
++# Since 1970 most of Quebec has been like Toronto; see
++# America/Toronto.  However, earlier versions of the tz database
++# mistakenly relied on data from Shanks & Pottenger saying that Quebec
++# differed from Ontario after 1970, and the following rules and zone
++# were created for most of Quebec from the incorrect Shanks &
++# Pottenger data.  The post-1970 entries have been corrected, but the
++# pre-1970 entries are unchecked and probably have errors.
++#
++# Rule	NAME	FROM	TO	TYPE	IN	ON	AT	SAVE	LETTER/S
++Rule	Mont	1917	only	-	Mar	25	2:00	1:00	D
++Rule	Mont	1917	only	-	Apr	24	0:00	0	S
++Rule	Mont	1919	only	-	Mar	31	2:30	1:00	D
++Rule	Mont	1919	only	-	Oct	25	2:30	0	S
++Rule	Mont	1920	only	-	May	 2	2:30	1:00	D
++Rule	Mont	1920	1922	-	Oct	Sun>=1	2:30	0	S
++Rule	Mont	1921	only	-	May	 1	2:00	1:00	D
++Rule	Mont	1922	only	-	Apr	30	2:00	1:00	D
++Rule	Mont	1924	only	-	May	17	2:00	1:00	D
++Rule	Mont	1924	1926	-	Sep	lastSun	2:30	0	S
++Rule	Mont	1925	1926	-	May	Sun>=1	2:00	1:00	D
++Rule	Mont	1927	1937	-	Apr	lastSat	24:00	1:00	D
++Rule	Mont	1927	1937	-	Sep	lastSat	24:00	0	S
++Rule	Mont	1938	1940	-	Apr	lastSun	0:00	1:00	D
++Rule	Mont	1938	1939	-	Sep	lastSun	0:00	0	S
++Rule	Mont	1946	1973	-	Apr	lastSun	2:00	1:00	D
++Rule	Mont	1945	1948	-	Sep	lastSun	2:00	0	S
++Rule	Mont	1949	1950	-	Oct	lastSun	2:00	0	S
++Rule	Mont	1951	1956	-	Sep	lastSun	2:00	0	S
++Rule	Mont	1957	1973	-	Oct	lastSun	2:00	0	S
++Zone America/Montreal	-4:54:16 -	LMT	1884
++			-5:00	Mont	E%sT	1918
++			-5:00	Canada	E%sT	1919
++			-5:00	Mont	E%sT	1942 Feb  9  2:00s
++			-5:00	Canada	E%sT	1946
++			-5:00	Mont	E%sT	1974
++			-5:00	Canada	E%sT
++
++# Montserrat
++# From Paul Eggert (2006-03-22):
++# In 1995 volcanic eruptions forced evacuation of Plymouth, the capital.
++# world.gazetteer.com says Cork Hill is the most populous location now.
++Zone America/Montserrat	-4:08:52 -	LMT	1911 Jul  1  0:01 # Cork Hill
++			-4:00	-	AST
++
++# Argentina
++# This entry was intended for the following areas, but has been superseded by
++# more detailed zones.
++# Santa Fe (SF), Entre Ríos (ER), Corrientes (CN), Misiones (MN), Chaco (CC),
++# Formosa (FM), La Pampa (LP), Chubut (CH)
++Zone America/Rosario	-4:02:40 -	LMT	1894 Nov
++			-4:16:44 -	CMT	1920 May
++			-4:00	-	ART	1930 Dec
++			-4:00	Arg	AR%sT	1969 Oct  5
++			-3:00	Arg	AR%sT	1991 Jul
++			-3:00	-	ART	1999 Oct  3  0:00
++			-4:00	Arg	AR%sT	2000 Mar  3  0:00
++			-3:00	-	ART
++
++# St Kitts-Nevis
++Zone America/St_Kitts	-4:10:52 -	LMT	1912 Mar  2 # Basseterre
++			-4:00	-	AST
++
++# St Lucia
++Zone America/St_Lucia	-4:04:00 -	LMT	1890 # Castries
++			-4:04:00 -	CMT	1912 # Castries Mean Time
++			-4:00	-	AST
++
++# Virgin Is
++Zone America/St_Thomas	-4:19:44 -	LMT	1911 Jul # Charlotte Amalie
++			-4:00	-	AST
++
++# St Vincent and the Grenadines
++Zone America/St_Vincent	-4:04:56 -	LMT	1890 # Kingstown
++			-4:04:56 -	KMT	1912 # Kingstown Mean Time
++			-4:00	-	AST
++
++# British Virgin Is
++Zone America/Tortola	-4:18:28 -	LMT	1911 Jul # Road Town
++			-4:00	-	AST
++
++# McMurdo, Ross Island, since 1955-12
++Zone Antarctica/McMurdo	0	-	-00	1956
++			12:00	NZ	NZ%sT
++Link Antarctica/McMurdo Antarctica/South_Pole
++
++# Yemen
++# Milne says 2:59:54 was the meridian of the saluting battery at Aden,
++# and that Yemen was at 1:55:56, the meridian of the Hagia Sophia.
++Zone	Asia/Aden	2:59:54	-	LMT	1950
++			3:00	-	AST
++
++# Bahrain
++Zone	Asia/Bahrain	3:22:20 -	LMT	1920     # Manamah
++			4:00	-	GST	1972 Jun
++			3:00	-	AST
++
++# India
++#
++# From Paul Eggert (2014-09-06):
++# The 1876 Report of the Secretary of the [US] Navy, p 305 says that Madras
++# civil time was 5:20:57.3.
++#
++# From Paul Eggert (2014-08-21):
++# In tomorrow's The Hindu, Nitya Menon reports that India had two civil time
++# zones starting in 1884, one in Bombay and one in Calcutta, and that railways
++# used a third time zone based on Madras time (80 deg. 18'30" E).  Also,
++# in 1881 Bombay briefly switched to Madras time, but switched back.  See:
++# http://www.thehindu.com/news/cities/chennai/madras-375-when-madras-clocked-the-time/article6339393.ece
++#Zone	  Asia/Chennai  [not enough info to complete]
++
++# China
++# Long-shu Time (probably due to Long and Shu being two names of that area)
++# Guangxi, Guizhou, Hainan, Ningxia, Sichuan, Shaanxi, and Yunnan;
++# most of Gansu; west Inner Mongolia; west Qinghai; and the Guangdong
++# counties Deqing, Enping, Kaiping, Luoding, Taishan, Xinxing,
++# Yangchun, Yangjiang, Yu'nan, and Yunfu.
++Zone	Asia/Chongqing	7:06:20	-	LMT	1928     # or Chungking
++			7:00	-	LONT	1980 May # Long-shu Time
++			8:00	PRC	C%sT
++Link Asia/Chongqing Asia/Chungking
++
++# Vietnam
++# From Paul Eggert (2014-10-13):
++# See Asia/Ho_Chi_Minh for the source for this data.
++# Trần's book says the 1954-55 transition to 07:00 in Hanoi was in
++# October 1954, with exact date and time unspecified.
++Zone	Asia/Hanoi	7:03:24 -	LMT	1906 Jul  1
++			7:06:30	-	PLMT	1911 May  1
++			7:00	-	ICT	1942 Dec 31 23:00
++			8:00	-	IDT	1945 Mar 14 23:00
++			9:00	-	JST	1945 Sep  2
++			7:00	-	ICT	1947 Apr  1
++			8:00	-	IDT	1954 Oct
++			7:00	-	ICT
++
++# China
++# Changbai Time ("Long-white Time", Long-white = Heilongjiang area)
++# Heilongjiang (except Mohe county), Jilin
++Zone	Asia/Harbin	8:26:44	-	LMT	1928     # or Haerbin
++			8:30	-	CHAT	1932 Mar # Changbai Time
++			8:00	-	CST	1940
++			9:00	-	CHAT	1966 May
++			8:30	-	CHAT	1980 May
++			8:00	PRC	C%sT
++
++# far west China
++Zone	Asia/Kashgar	5:03:56	-	LMT	1928     # or Kashi or Kaxgar
++			5:30	-	KAST	1940     # Kashgar Time
++			5:00	-	KAST	1980 May
++			8:00	PRC	C%sT
++
++# Kuwait
++Zone	Asia/Kuwait	3:11:56 -	LMT	1950
++			3:00	-	AST
++
++
++# Oman
++# Milne says 3:54:24 was the meridian of the Muscat Tidal Observatory.
++Zone	Asia/Muscat	3:54:24 -	LMT	1920
++			4:00	-	GST
++
++# India
++# From Paul Eggert (2014-08-11), after a heads-up from Stephen Colebourne:
++# According to a Portuguese decree (1911-05-26)
++# http://dre.pt/pdf1sdip/1911/05/12500/23132313.pdf
++# Portuguese India switched to UT +05 on 1912-01-01.
++#Zone	Asia/Panaji	[not enough info to complete]
++
++# Cambodia
++# From Paul Eggert (2014-10-11):
++# See Asia/Ho_Chi_Minh for the source for most of this data.  Also, guess
++# (1) Cambodia reverted to UT +07 on 1945-09-02, when Vietnam did, and
++# (2) they also reverted to +07 on 1953-11-09, the date of independence.
++# These guesses are probably wrong but they're better than guessing no
++# transitions there.
++Zone	Asia/Phnom_Penh	6:59:40 -	LMT	1906 Jul  1
++			7:06:30	-	PLMT	1911 May  1
++			7:00	-	ICT	1942 Dec 31 23:00
++			8:00	-	IDT	1945 Mar 14 23:00
++			9:00	-	JST	1945 Sep  2
++			7:00	-	ICT	1947 Apr  1
++			8:00	-	IDT	1953 Nov  9
++			7:00	-	ICT
++
++# Israel
++Zone	Asia/Tel_Aviv	2:19:04 -	LMT	1880
++			2:21	-	JMT	1918
++			2:00	Zion	I%sT
++
++# Laos
++# From Paul Eggert (2014-10-11):
++# See Asia/Ho_Chi_Minh for the source for most of this data.
++# Trần's book says that Laos reverted to UT +07 on 1955-04-15.
++# Also, guess that Laos reverted to +07 on 1945-09-02, when Vietnam did;
++# this is probably wrong but it's better than guessing no transition.
++Zone	Asia/Vientiane	6:50:24 -	LMT	1906 Jul  1
++			7:06:30	-	PLMT	1911 May  1
++			7:00	-	ICT	1942 Dec 31 23:00
++			8:00	-	IDT	1945 Mar 14 23:00
++			9:00	-	JST	1945 Sep  2
++			7:00	-	ICT	1947 Apr  1
++			8:00	-	IDT	1955 Apr 15
++			7:00	-	ICT
++
++# Jan Mayen
++# From Whitman:
++Zone Atlantic/Jan_Mayen	-1:00	-	EGT
++
++# St Helena
++Zone Atlantic/St_Helena	-0:22:48 -	LMT	1890 # Jamestown
++			-0:22:48 -	JMT	1951 # Jamestown Mean Time
++			 0:00	-	GMT
++
++# Northern Ireland
++Zone	Europe/Belfast	-0:23:40 -	LMT	1880 Aug  2
++			-0:25:21 -	DMT	1916 May 21  2:00
++						# DMT = Dublin/Dunsink MT
++			-0:25:21 1:00	IST	1916 Oct  1  2:00s
++						# IST = Irish Summer Time
++			 0:00	GB-Eire	%s	1968 Oct 27
++			 1:00	-	BST	1971 Oct 31  2:00u
++			 0:00	GB-Eire	%s	1996
++			 0:00	EU	GMT/BST
++
++# Guernsey
++# Data from Joseph S. Myers
++# http://mm.icann.org/pipermail/tz/2013-September/019883.html
++# References to be added
++# LMT Location - 49.27N -2.33E - St.Peter Port
++Zone	Europe/Guernsey	-0:09:19 -	LMT	1913 Jun 18
++			 0:00	GB-Eire	%s	1940 Jul  2
++			 1:00	C-Eur	CE%sT	1945 May  8
++			 0:00	GB-Eire	%s	1968 Oct 27
++			 1:00	-	BST	1971 Oct 31  2:00u
++			 0:00	GB-Eire	%s	1996
++			 0:00	EU	GMT/BST
++
++# Isle of Man
++#
++# From Lester Caine (2013-09-04):
++# The Isle of Man legislation is now on-line at
++# <http://www.legislation.gov.im>, starting with the original Statutory
++# Time Act in 1883 and including additional confirmation of some of
++# the dates of the 'Summer Time' orders originating at
++# Westminster.  There is a little uncertainty as to the starting date
++# of the first summer time in 1916 which may have be announced a
++# couple of days late.  There is still a substantial number of
++# documents to work through, but it is thought that every GB change
++# was also implemented on the island.
++#
++# AT4 of 1883 - The Statutory Time et cetera Act 1883 -
++# LMT Location - 54.1508N -4.4814E - Tynwald Hill ( Manx parliament )
++Zone Europe/Isle_of_Man	-0:17:55 -	LMT	1883 Mar 30  0:00s
++			 0:00	GB-Eire	%s	1968 Oct 27
++			 1:00	-	BST	1971 Oct 31  2:00u
++			 0:00	GB-Eire	%s	1996
++			 0:00	EU	GMT/BST
++
++# Jersey
++# Data from Joseph S. Myers
++# http://mm.icann.org/pipermail/tz/2013-September/019883.html
++# References to be added
++# LMT Location - 49.187N -2.107E - St. Helier
++Zone	Europe/Jersey	-0:08:25 -	LMT	1898 Jun 11 16:00u
++			 0:00	GB-Eire	%s	1940 Jul  2
++			 1:00	C-Eur	CE%sT	1945 May  8
++			 0:00	GB-Eire	%s	1968 Oct 27
++			 1:00	-	BST	1971 Oct 31  2:00u
++			 0:00	GB-Eire	%s	1996
++			 0:00	EU	GMT/BST
++
++# Slovenia
++Zone Europe/Ljubljana	0:58:04	-	LMT	1884
++			1:00	-	CET	1941 Apr 18 23:00
++			1:00	C-Eur	CE%sT	1945 May  8  2:00s
++			1:00	1:00	CEST	1945 Sep 16  2:00s
++			1:00	-	CET	1982 Nov 27
++			1:00	EU	CE%sT
++
++# Bosnia and Herzegovina
++Zone	Europe/Sarajevo	1:13:40	-	LMT	1884
++			1:00	-	CET	1941 Apr 18 23:00
++			1:00	C-Eur	CE%sT	1945 May  8  2:00s
++			1:00	1:00	CEST	1945 Sep 16  2:00s
++			1:00	-	CET	1982 Nov 27
++			1:00	EU	CE%sT
++
++# Macedonia
++Zone	Europe/Skopje	1:25:44	-	LMT	1884
++			1:00	-	CET	1941 Apr 18 23:00
++			1:00	C-Eur	CE%sT	1945 May  8  2:00s
++			1:00	1:00	CEST	1945 Sep 16  2:00s
++			1:00	-	CET	1982 Nov 27
++			1:00	EU	CE%sT
++
++# Moldova / Transnistria
++Zone	Europe/Tiraspol	1:58:32	-	LMT	1880
++			1:55	-	CMT	1918 Feb 15 # Chisinau MT
++			1:44:24	-	BMT	1931 Jul 24 # Bucharest MT
++			2:00	Romania	EE%sT	1940 Aug 15
++			2:00	1:00	EEST	1941 Jul 17
++			1:00	C-Eur	CE%sT	1944 Aug 24
++			3:00	Russia	MSK/MSD	1991 Mar 31  2:00
++			2:00	Russia	EE%sT	1992 Jan 19  2:00
++			3:00	Russia	MSK/MSD
++
++# Liechtenstein
++Zone	Europe/Vaduz	0:38:04 -	LMT	1894 Jun
++			1:00	-	CET	1981
++			1:00	EU	CE%sT
++
++# Croatia
++Zone	Europe/Zagreb	1:03:52	-	LMT	1884
++			1:00	-	CET	1941 Apr 18 23:00
++			1:00	C-Eur	CE%sT	1945 May  8  2:00s
++			1:00	1:00	CEST	1945 Sep 16  2:00s
++			1:00	-	CET	1982 Nov 27
++			1:00	EU	CE%sT
++
++# Madagascar
++Zone Indian/Antananarivo 3:10:04 -	LMT	1911 Jul
++			3:00	-	EAT	1954 Feb 27 23:00s
++			3:00	1:00	EAST	1954 May 29 23:00s
++			3:00	-	EAT
++
++# Comoros
++Zone	Indian/Comoro	2:53:04 -	LMT	1911 Jul # Moroni, Gran Comoro
++			3:00	-	EAT
++
++# Mayotte
++Zone	Indian/Mayotte	3:00:56 -	LMT	1911 Jul # Mamoutzou
++			3:00	-	EAT
++
++# US minor outlying islands
++Zone Pacific/Johnston	-10:00	-	HST
++
++# US minor outlying islands
++#
++# From Mark Brader (2005-01-23):
++# [Fallacies and Fantasies of Air Transport History, by R.E.G. Davies,
++# published 1994 by Paladwr Press, McLean, VA, USA; ISBN 0-9626483-5-3]
++# reproduced a Pan American Airways timetable from 1936, for their weekly
++# "Orient Express" flights between San Francisco and Manila, and connecting
++# flights to Chicago and the US East Coast.  As it uses some time zone
++# designations that I've never seen before:....
++# Fri. 6:30A Lv. HONOLOLU (Pearl Harbor), H.I.   H.L.T. Ar. 5:30P Sun.
++#  "   3:00P Ar. MIDWAY ISLAND . . . . . . . . . M.L.T. Lv. 6:00A  "
++#
++Zone Pacific/Midway	-11:49:28 -	LMT	1901
++			-11:00	-	NST	1956 Jun  3
++			-11:00	1:00	NDT	1956 Sep  2
++			-11:00	-	NST	1967 Apr    # N=Nome
++			-11:00	-	BST	1983 Nov 30 # B=Bering
++			-11:00	-	SST	            # S=Samoa
++
++# N Mariana Is
++Zone Pacific/Saipan	-14:17:00 -	LMT	1844 Dec 31
++			 9:43:00 -	LMT	1901
++			 9:00	-	MPT	1969 Oct    # N Mariana Is Time
++			10:00	-	MPT	2000 Dec 23
++			10:00	-	ChST	# Chamorro Standard Time
+--- contrib/tzdata/checklinks.awk.orig
++++ contrib/tzdata/checklinks.awk
+@@ -0,0 +1,48 @@
++# Check links in tz tables.
++
++# Contributed by Paul Eggert.  This file is in the public domain.
++
++BEGIN {
++    # Special marker indicating that the name is defined as a Zone.
++    # It is a newline so that it cannot match a valid name.
++    # It is not null so that its slot does not appear unset.
++    Zone = "\n"
++}
++
++/^Zone/ {
++    if (defined[$2]) {
++	if (defined[$2] == Zone) {
++	    printf "%s: Zone has duplicate definition\n", $2
++	} else {
++	    printf "%s: Link with same name as Zone\n", $2
++	}
++	status = 1
++    }
++    defined[$2] = Zone
++}
++
++/^Link/ {
++    if (defined[$3]) {
++	if (defined[$3] == Zone) {
++	    printf "%s: Link with same name as Zone\n", $3
++	} else if (defined[$3] == $2) {
++	    printf "%s: Link has duplicate definition\n", $3
++	} else {
++	    printf "%s: Link to both %s and %s\n", $3, defined[$3], $2
++	}
++	status = 1
++    }
++    used[$2] = 1
++    defined[$3] = $2
++}
++
++END {
++    for (tz in used) {
++	if (defined[tz] != Zone) {
++	    printf "%s: Link to non-zone\n", tz
++	    status = 1
++	}
++    }
++
++    exit status
++}
++native
+\ No newline at end of property
++FreeBSD=%H
+\ No newline at end of property
++text/plain
+\ No newline at end of property
+--- contrib/tzdata/checktab.awk.orig
++++ contrib/tzdata/checktab.awk
+@@ -0,0 +1,177 @@
++# Check tz tables for consistency.
++
++# Contributed by Paul Eggert.  This file is in the public domain.
++
++BEGIN {
++	FS = "\t"
++
++	if (!iso_table) iso_table = "iso3166.tab"
++	if (!zone_table) zone_table = "zone1970.tab"
++	if (!want_warnings) want_warnings = -1
++
++	while (getline <iso_table) {
++		iso_NR++
++		if ($0 ~ /^#/) continue
++		if (NF != 2) {
++			printf "%s:%d: wrong number of columns\n", \
++				iso_table, iso_NR >>"/dev/stderr"
++			status = 1
++		}
++		cc = $1
++		name = $2
++		if (cc !~ /^[A-Z][A-Z]$/) {
++			printf "%s:%d: invalid country code '%s'\n", \
++				iso_table, iso_NR, cc >>"/dev/stderr"
++			status = 1
++		}
++		if (cc <= cc0) {
++			if (cc == cc0) {
++				s = "duplicate";
++			} else {
++				s = "out of order";
++			}
++
++			printf "%s:%d: country code '%s' is %s\n", \
++				iso_table, iso_NR, cc, s \
++				>>"/dev/stderr"
++			status = 1
++		}
++		cc0 = cc
++		if (name2cc[name]) {
++			printf "%s:%d: '%s' and '%s' have the same name\n", \
++				iso_table, iso_NR, name2cc[name], cc \
++				>>"/dev/stderr"
++			status = 1
++		}
++		name2cc[name] = cc
++		cc2name[cc] = name
++		cc2NR[cc] = iso_NR
++	}
++
++	cc0 = ""
++
++	while (getline <zone_table) {
++		zone_NR++
++		if ($0 ~ /^#/) continue
++		if (NF != 3 && NF != 4) {
++			printf "%s:%d: wrong number of columns\n", \
++				zone_table, zone_NR >>"/dev/stderr"
++			status = 1
++		}
++		split($1, cca, /,/)
++		cc = cca[1]
++		coordinates = $2
++		tz = $3
++		comments = $4
++		if (cc < cc0) {
++			printf "%s:%d: country code '%s' is out of order\n", \
++				zone_table, zone_NR, cc >>"/dev/stderr"
++			status = 1
++		}
++		cc0 = cc
++		tztab[tz] = 1
++		tz2comments[tz] = comments
++		tz2NR[tz] = zone_NR
++		for (i in cca) {
++		    cc = cca[i]
++		    cctz = cc tz
++		    cctztab[cctz] = 1
++		    if (cc2name[cc]) {
++			cc_used[cc]++
++		    } else {
++			printf "%s:%d: %s: unknown country code\n", \
++				zone_table, zone_NR, cc >>"/dev/stderr"
++			status = 1
++		    }
++		}
++		if (coordinates !~ /^[-+][0-9][0-9][0-5][0-9][-+][01][0-9][0-9][0-5][0-9]$/ \
++		    && coordinates !~ /^[-+][0-9][0-9][0-5][0-9][0-5][0-9][-+][01][0-9][0-9][0-5][0-9][0-5][0-9]$/) {
++			printf "%s:%d: %s: invalid coordinates\n", \
++				zone_table, zone_NR, coordinates >>"/dev/stderr"
++			status = 1
++		}
++	}
++
++	for (cctz in cctztab) {
++		cc = substr (cctz, 1, 2)
++		tz = substr (cctz, 3)
++		if (1 < cc_used[cc]) {
++			comments_needed[tz] = cc
++		}
++	}
++	for (cctz in cctztab) {
++	  cc = substr (cctz, 1, 2)
++	  tz = substr (cctz, 3)
++	  if (!comments_needed[tz] && tz2comments[tz]) {
++	    printf "%s:%d: unnecessary comment '%s'\n", \
++		zone_table, tz2NR[tz], tz2comments[tz] \
++		>>"/dev/stderr"
++	    tz2comments[tz] = 0
++	    status = 1
++	  } else if (comments_needed[tz] && !tz2comments[tz]) {
++	    printf "%s:%d: missing comment for %s\n", \
++	      zone_table, tz2NR[tz], comments_needed[tz] \
++	      >>"/dev/stderr"
++	    tz2comments[tz] = 1
++	    status = 1
++	  }
++	}
++	FS = " "
++}
++
++$1 ~ /^#/ { next }
++
++{
++	tz = rules = ""
++	if ($1 == "Zone") {
++		tz = $2
++		ruleUsed[$4] = 1
++	} else if ($1 == "Link" && zone_table == "zone.tab") {
++		# Ignore Link commands if source and destination basenames
++		# are identical, e.g. Europe/Istanbul versus Asia/Istanbul.
++		src = $2
++		dst = $3
++		while ((i = index(src, "/"))) src = substr(src, i+1)
++		while ((i = index(dst, "/"))) dst = substr(dst, i+1)
++		if (src != dst) tz = $3
++	} else if ($1 == "Rule") {
++		ruleDefined[$2] = 1
++	} else {
++		ruleUsed[$2] = 1
++	}
++	if (tz && tz ~ /\//) {
++		if (!tztab[tz]) {
++			printf "%s: no data for '%s'\n", zone_table, tz \
++				>>"/dev/stderr"
++			status = 1
++		}
++		zoneSeen[tz] = 1
++	}
++}
++
++END {
++	for (tz in ruleDefined) {
++		if (!ruleUsed[tz]) {
++			printf "%s: Rule never used\n", tz
++			status = 1
++		}
++	}
++	for (tz in tztab) {
++		if (!zoneSeen[tz]) {
++			printf "%s:%d: no Zone table for '%s'\n", \
++				zone_table, tz2NR[tz], tz >>"/dev/stderr"
++			status = 1
++		}
++	}
++	if (0 < want_warnings) {
++		for (cc in cc2name) {
++			if (!cc_used[cc]) {
++				printf "%s:%d: warning: " \
++					"no Zone entries for %s (%s)\n", \
++					iso_table, cc2NR[cc], cc, cc2name[cc]
++			}
++		}
++	}
++
++	exit status
++}
++native
+\ No newline at end of property
++FreeBSD=%H
+\ No newline at end of property
++text/plain
+\ No newline at end of property
+--- contrib/tzdata/etcetera.orig
++++ contrib/tzdata/etcetera
+@@ -8,6 +8,13 @@
+ # need now for the entries that are not on UTC are for ships at sea
+ # that cannot use POSIX TZ settings.
+ 
++# Starting with POSIX 1003.1-2001, the entries below are all
++# unnecessary as settings for the TZ environment variable.  E.g.,
++# instead of TZ='Etc/GMT+4' one can use the POSIX setting TZ='<-04>+4'.
++#
++# Do not use a POSIX TZ setting like TZ='GMT+4', which is four hours
++# behind GMT but uses the completely misleading abbreviation "GMT".
++
+ Zone	Etc/GMT		0	-	GMT
+ Zone	Etc/UTC		0	-	UTC
+ Zone	Etc/UCT		0	-	UCT
+@@ -26,23 +33,13 @@
+ Link	Etc/GMT				Etc/GMT+0
+ Link	Etc/GMT				Etc/GMT0
+ 
+-# We use POSIX-style signs in the Zone names and the output abbreviations,
++# Be consistent with POSIX TZ settings in the Zone names,
+ # even though this is the opposite of what many people expect.
+ # POSIX has positive signs west of Greenwich, but many people expect
+ # positive signs east of Greenwich.  For example, TZ='Etc/GMT+4' uses
+-# the abbreviation "GMT+4" and corresponds to 4 hours behind UT
++# the abbreviation "-04" and corresponds to 4 hours behind UT
+ # (i.e. west of Greenwich) even though many people would expect it to
+ # mean 4 hours ahead of UT (i.e. east of Greenwich).
+-#
+-# In the draft 5 of POSIX 1003.1-200x, the angle bracket notation allows for
+-# TZ='<GMT-4>+4'; if you want time zone abbreviations conforming to
+-# ISO 8601 you can use TZ='<-0400>+4'.  Thus the commonly-expected
+-# offset is kept within the angle bracket (and is used for display)
+-# while the POSIX sign is kept outside the angle bracket (and is used
+-# for calculation).
+-#
+-# Do not use a TZ setting like TZ='GMT+4', which is four hours behind
+-# GMT but uses the completely misleading abbreviation "GMT".
+ 
+ # Earlier incarnations of this package were not POSIX-compliant,
+ # and had lines such as
+@@ -51,30 +48,31 @@
+ # way does a
+ #		zic -l GMT-12
+ # so we moved the names into the Etc subdirectory.
++# Also, the time zone abbreviations are now compatible with %z.
+ 
+-Zone	Etc/GMT-14	14	-	GMT-14	# 14 hours ahead of GMT
+-Zone	Etc/GMT-13	13	-	GMT-13
+-Zone	Etc/GMT-12	12	-	GMT-12
+-Zone	Etc/GMT-11	11	-	GMT-11
+-Zone	Etc/GMT-10	10	-	GMT-10
+-Zone	Etc/GMT-9	9	-	GMT-9
+-Zone	Etc/GMT-8	8	-	GMT-8
+-Zone	Etc/GMT-7	7	-	GMT-7
+-Zone	Etc/GMT-6	6	-	GMT-6
+-Zone	Etc/GMT-5	5	-	GMT-5
+-Zone	Etc/GMT-4	4	-	GMT-4
+-Zone	Etc/GMT-3	3	-	GMT-3
+-Zone	Etc/GMT-2	2	-	GMT-2
+-Zone	Etc/GMT-1	1	-	GMT-1
+-Zone	Etc/GMT+1	-1	-	GMT+1
+-Zone	Etc/GMT+2	-2	-	GMT+2
+-Zone	Etc/GMT+3	-3	-	GMT+3
+-Zone	Etc/GMT+4	-4	-	GMT+4
+-Zone	Etc/GMT+5	-5	-	GMT+5
+-Zone	Etc/GMT+6	-6	-	GMT+6
+-Zone	Etc/GMT+7	-7	-	GMT+7
+-Zone	Etc/GMT+8	-8	-	GMT+8
+-Zone	Etc/GMT+9	-9	-	GMT+9
+-Zone	Etc/GMT+10	-10	-	GMT+10
+-Zone	Etc/GMT+11	-11	-	GMT+11
+-Zone	Etc/GMT+12	-12	-	GMT+12
++Zone	Etc/GMT-14	14	-	+14
++Zone	Etc/GMT-13	13	-	+13
++Zone	Etc/GMT-12	12	-	+12
++Zone	Etc/GMT-11	11	-	+11
++Zone	Etc/GMT-10	10	-	+10
++Zone	Etc/GMT-9	9	-	+09
++Zone	Etc/GMT-8	8	-	+08
++Zone	Etc/GMT-7	7	-	+07
++Zone	Etc/GMT-6	6	-	+06
++Zone	Etc/GMT-5	5	-	+05
++Zone	Etc/GMT-4	4	-	+04
++Zone	Etc/GMT-3	3	-	+03
++Zone	Etc/GMT-2	2	-	+02
++Zone	Etc/GMT-1	1	-	+01
++Zone	Etc/GMT+1	-1	-	-01
++Zone	Etc/GMT+2	-2	-	-02
++Zone	Etc/GMT+3	-3	-	-03
++Zone	Etc/GMT+4	-4	-	-04
++Zone	Etc/GMT+5	-5	-	-05
++Zone	Etc/GMT+6	-6	-	-06
++Zone	Etc/GMT+7	-7	-	-07
++Zone	Etc/GMT+8	-8	-	-08
++Zone	Etc/GMT+9	-9	-	-09
++Zone	Etc/GMT+10	-10	-	-10
++Zone	Etc/GMT+11	-11	-	-11
++Zone	Etc/GMT+12	-12	-	-12
+--- contrib/tzdata/europe.orig
++++ contrib/tzdata/europe
+@@ -1,20 +1,24 @@
+ # This file is in the public domain, so clarified as of
+ # 2009-05-17 by Arthur David Olson.
+ 
+-# This data is by no means authoritative; if you think you know better,
++# This file is by no means authoritative; if you think you know better,
+ # go ahead and edit the file (and please send any changes to
+-# tz@iana.org for general use in the future).
++# tz@iana.org for general use in the future).  For more, please see
++# the file CONTRIBUTING in the tz distribution.
+ 
+-# From Paul Eggert (2014-05-31):
+-# A good source for time zone historical data outside the U.S. is
++# From Paul Eggert (2014-10-31):
++#
++# Unless otherwise specified, the source for data through 1990 is:
+ # Thomas G. Shanks and Rique Pottenger, The International Atlas (6th edition),
+ # San Diego: ACS Publications, Inc. (2003).
++# Unfortunately this book contains many errors and cites no sources.
+ #
+ # Gwillim Law writes that a good source
+ # for recent time zone data is the International Air Transport
+ # Association's Standard Schedules Information Manual (IATA SSIM),
+ # published semiannually.  Law sent in several helpful summaries
+-# of the IATA's data after 1990.
++# of the IATA's data after 1990.  Except where otherwise noted,
++# IATA SSIM is the source for entries after 1990.
+ #
+ # A reliable and entertaining source about time zones is
+ # Derek Howse, Greenwich time and longitude, Philip Wilson Publishers (1997).
+@@ -38,6 +42,16 @@
+ #	may be sent to Mr. John Milne, Royal Geographical Society,
+ #	Savile Row, London."  Nowadays please email them to tz@iana.org.
+ #
++#	Byalokoz EL. New Counting of Time in Russia since July 1, 1919.
++#	This Russian-language source was consulted by Vladimir Karpinsky; see
++#	http://mm.icann.org/pipermail/tz/2014-August/021320.html
++#	The full Russian citation is:
++#	Бялокоз, Евгений Людвигович. Новый счет времени в течении суток
++#	введенный декретом Совета народных комиссаров для всей России с 1-го
++#	июля 1919 г. / Изд. 2-е Междуведомственной комиссии. - Петроград:
++#	Десятая гос. тип., 1919.
++#	http://resolver.gpntb.ru/purl?docushare/dsweb/Get/Resource-2011/Byalokoz__E.L.__Novyy__schet__vremeni__v__techenie__sutok__izd__2(1).pdf
++#
+ #	Brazil's Divisão Serviço da Hora (DSHO),
+ #	History of Summer Time
+ #	<http://pcdsh01.on.br/HISTHV.htm>
+@@ -57,11 +71,11 @@
+ #        0:00       WET WEST WEMT Western Europe
+ #        0:19:32.13 AMT NST       Amsterdam, Netherlands Summer (1835-1937)*
+ #        0:20       NET NEST      Netherlands (1937-1940)*
++#        1:00       BST           British Standard (1968-1971)
+ #        1:00       CET CEST CEMT Central Europe
+ #        1:00:14    SET           Swedish (1879-1899)*
+ #        2:00       EET EEST      Eastern Europe
+-#        3:00       FET           Further-eastern Europe*
+-#        3:00       MSK MSD  MSM* Moscow
++#        3:00       MSK MSD       Moscow
+ 
+ # From Peter Ilieve (1994-12-04),
+ # The original six [EU members]: Belgium, France, (West) Germany, Italy,
+@@ -174,14 +188,18 @@
+ # between 160 and 170 hours more daylight leisure, to a war which
+ # plunged Europe into darkness for four years, and shook the
+ # foundations of civilization throughout the world.
+-#	<http://www.winstonchurchill.org/images/finesthour/Vol.01%20No.114.pdf>
+-#	"A Silent Toast to William Willett", Pictorial Weekly
++#	-- "A Silent Toast to William Willett", Pictorial Weekly;
++#	republished in Finest Hour (Spring 2002) 1(114):26
++#	http://www.winstonchurchill.org/images/finesthour/Vol.01%20No.114.pdf
+ 
+-# From Paul Eggert (1996-09-03):
++# From Paul Eggert (2015-08-08):
+ # The OED Supplement says that the English originally said "Daylight Saving"
+ # when they were debating the adoption of DST in 1908; but by 1916 this
+ # term appears only in quotes taken from DST's opponents, whereas the
+ # proponents (who eventually won the argument) are quoted as using "Summer".
++# The term "Summer Time" was introduced by Herbert Samuel, Home Secretary; see:
++# Viscount Samuel. Leisure in a Democracy. Cambridge University Press
++# ISBN 978-1-107-49471-8 (1949, reissued 2015), p 8.
+ 
+ # From Arthur David Olson (1989-01-19):
+ # A source at the British Information Office in New York avers that it's
+@@ -210,8 +228,8 @@
+ # official designation; the reply of the 21st was that there wasn't
+ # but he couldn't think of anything better than the "Double British
+ # Summer Time" that the BBC had been using informally.
+-# http://student.cusu.cam.ac.uk/~jsm28/british-time/bbc-19410418.png
+-# http://student.cusu.cam.ac.uk/~jsm28/british-time/ho-19410421.png
++# http://www.polyomino.org.uk/british-time/bbc-19410418.png
++# http://www.polyomino.org.uk/british-time/ho-19410421.png
+ 
+ # From Sir Alexander Maxwell in the above-mentioned letter (1941-04-21):
+ # [N]o official designation has as far as I know been adopted for the time
+@@ -228,15 +246,13 @@
+ # the history of summer time legislation in the United Kingdom.
+ # Since 1998 Joseph S. Myers has been updating
+ # and extending this list, which can be found in
+-# http://student.cusu.cam.ac.uk/~jsm28/british-time/
+-# History of legal time in Britain
+ # http://www.polyomino.org.uk/british-time/
+ 
+ # From Joseph S. Myers (1998-01-06):
+ #
+ # The legal time in the UK outside of summer time is definitely GMT, not UTC;
+ # see Lord Tanlaw's speech
+-# <http://www.parliament.the-stationery-office.co.uk/pa/ld199697/ldhansrd/pdvn/lds97/text/70611-20.htm#70611-20_head0>
++# http://www.publications.parliament.uk/pa/ld199798/ldhansrd/vo970611/text/70611-10.htm#70611-10_head0
+ # (Lords Hansard 11 June 1997 columns 964 to 976).
+ 
+ # From Paul Eggert (2006-03-22):
+@@ -276,6 +292,14 @@
+ #   "Timeball on the ballast office is down.  Dunsink time."
+ #   -- James Joyce, Ulysses
+ 
++# "Countess Markievicz ... claimed that the [1916] abolition of Dublin Mean Time
++# was among various actions undertaken by the 'English' government that
++# would 'put the whole country into the SF (Sinn Féin) camp'.  She claimed
++# Irish 'public feeling (was) outraged by forcing of English time on us'."
++# -- Parsons M. Dublin lost its time zone - and 25 minutes - after 1916 Rising.
++# Irish Times 2014-10-27.
++# http://www.irishtimes.com/news/politics/dublin-lost-its-time-zone-and-25-minutes-after-1916-rising-1.1977411
++
+ # From Joseph S. Myers (2005-01-26):
+ # Irish laws are available online at <http://www.irishstatutebook.ie>.
+ # These include various relating to legal time, for example:
+@@ -321,7 +345,7 @@
+ 
+ # From an anonymous contributor (1996-06-02):
+ # The law governing time in Ireland is under Statutory Instrument SI 395/94,
+-# which gives force to European Union 7th Council Directive # 94/21/EC.
++# which gives force to European Union 7th Council Directive No. 94/21/EC.
+ # Under this directive, the Minister for Justice in Ireland makes appropriate
+ # regulations. I spoke this morning with the Secretary of the Department of
+ # Justice (tel +353 1 678 9711) who confirmed to me that the correct name is
+@@ -440,25 +464,27 @@
+ # Use Europe/London for Jersey, Guernsey, and the Isle of Man.
+ 
+ # Zone	NAME		GMTOFF	RULES	FORMAT	[UNTIL]
+-Zone	Europe/London	-0:01:15 -	LMT	1847 Dec  1 0:00s
++Zone	Europe/London	-0:01:15 -	LMT	1847 Dec  1  0:00s
+ 			 0:00	GB-Eire	%s	1968 Oct 27
+-			 1:00	-	BST	1971 Oct 31 2:00u
++			 1:00	-	BST	1971 Oct 31  2:00u
+ 			 0:00	GB-Eire	%s	1996
+ 			 0:00	EU	GMT/BST
+ Link	Europe/London	Europe/Jersey
+ Link	Europe/London	Europe/Guernsey
+ Link	Europe/London	Europe/Isle_of_Man
++
++# Zone	NAME		GMTOFF	RULES	FORMAT	[UNTIL]
+ Zone	Europe/Dublin	-0:25:00 -	LMT	1880 Aug  2
+-			-0:25:21 -	DMT	1916 May 21 2:00
+-			-0:25:21 1:00	IST	1916 Oct  1 2:00s
++			-0:25:21 -	DMT	1916 May 21  2:00
++			-0:25:21 1:00	IST	1916 Oct  1  2:00s
+ 			 0:00	GB-Eire	%s	1921 Dec  6 # independence
+-			 0:00	GB-Eire	GMT/IST	1940 Feb 25 2:00
+-			 0:00	1:00	IST	1946 Oct  6 2:00
+-			 0:00	-	GMT	1947 Mar 16 2:00
+-			 0:00	1:00	IST	1947 Nov  2 2:00
+-			 0:00	-	GMT	1948 Apr 18 2:00
++			 0:00	GB-Eire	GMT/IST	1940 Feb 25  2:00
++			 0:00	1:00	IST	1946 Oct  6  2:00
++			 0:00	-	GMT	1947 Mar 16  2:00
++			 0:00	1:00	IST	1947 Nov  2  2:00
++			 0:00	-	GMT	1948 Apr 18  2:00
+ 			 0:00	GB-Eire	GMT/IST	1968 Oct 27
+-			 1:00	-	IST	1971 Oct 31 2:00u
++			 1:00	-	IST	1971 Oct 31  2:00u
+ 			 0:00	GB-Eire	GMT/IST	1996
+ 			 0:00	EU	GMT/IST
+ 
+@@ -479,7 +505,7 @@
+ # The most recent directive covers the years starting in 2002.  See:
+ # Directive 2000/84/EC of the European Parliament and of the Council
+ # of 19 January 2001 on summer-time arrangements.
+-# <http://eur-lex.europa.eu/LexUriServ/LexUriServ.do?uri=CELEX:32000L0084:EN:NOT>
++# http://eur-lex.europa.eu/LexUriServ/LexUriServ.do?uri=CELEX:32000L0084:EN:NOT
+ 
+ # W-Eur differs from EU only in that W-Eur uses standard time.
+ Rule	W-Eur	1977	1980	-	Apr	Sun>=1	 1:00s	1:00	S
+@@ -513,7 +539,7 @@
+ #    0:00 France WE%sT 1945 Sep 16  3:00
+ #
+ # Zone Europe/Monaco 0:29:32 - LMT 1891 Mar 15
+-#    0:00 France WE%sT 1945 Sep 16 3:00
++#    0:00 France WE%sT 1945 Sep 16  3:00
+ #
+ # Zone Europe/Belgrade 1:22:00 - LMT 1884
+ #    1:00 1:00 CEST 1945 Sep 16  2:00s
+@@ -556,31 +582,73 @@
+ Rule	E-Eur	1981	max	-	Mar	lastSun	 0:00	1:00	S
+ Rule	E-Eur	1996	max	-	Oct	lastSun	 0:00	0	-
+ 
++
++# Daylight saving time for Russia and the Soviet Union
++#
++# The 1917-1921 decree URLs are from Alexander Belopolsky (2016-08-23).
++
+ # Rule	NAME	FROM	TO	TYPE	IN	ON	AT	SAVE	LETTER/S
+-Rule	Russia	1917	only	-	Jul	 1	23:00	1:00	MST	# Moscow Summer Time
+-Rule	Russia	1917	only	-	Dec	28	 0:00	0	MMT	# Moscow Mean Time
+-Rule	Russia	1918	only	-	May	31	22:00	2:00	MDST	# Moscow Double Summer Time
++Rule	Russia	1917	only	-	Jul	 1	23:00	1:00	MST  # Moscow Summer Time
++#
++# Decree No. 142 (1917-12-22) http://istmat.info/node/28137
++Rule	Russia	1917	only	-	Dec	28	 0:00	0	MMT  # Moscow Mean Time
++#
++# Decree No. 497 (1918-05-30) http://istmat.info/node/30001
++Rule	Russia	1918	only	-	May	31	22:00	2:00	MDST # Moscow Double Summer Time
+ Rule	Russia	1918	only	-	Sep	16	 1:00	1:00	MST
++#
++# Decree No. 258 (1919-05-29) http://istmat.info/node/37949
+ Rule	Russia	1919	only	-	May	31	23:00	2:00	MDST
+-Rule	Russia	1919	only	-	Jul	 1	 2:00	1:00	MSD
++#
++Rule	Russia	1919	only	-	Jul	 1	 0:00u	1:00	MSD
+ Rule	Russia	1919	only	-	Aug	16	 0:00	0	MSK
++#
++# Decree No. 63 (1921-02-03) http://istmat.info/node/45840
+ Rule	Russia	1921	only	-	Feb	14	23:00	1:00	MSD
+-Rule	Russia	1921	only	-	Mar	20	23:00	2:00	MSM # Midsummer
++#
++# Decree No. 121 (1921-03-07) http://istmat.info/node/45949
++Rule	Russia	1921	only	-	Mar	20	23:00	2:00	+05
++#
+ Rule	Russia	1921	only	-	Sep	 1	 0:00	1:00	MSD
+ Rule	Russia	1921	only	-	Oct	 1	 0:00	0	-
+-# Act No.925 of the Council of Ministers of the USSR (1980-10-24):
++# Act No. 925 of the Council of Ministers of the USSR (1980-10-24):
+ Rule	Russia	1981	1984	-	Apr	 1	 0:00	1:00	S
+ Rule	Russia	1981	1983	-	Oct	 1	 0:00	0	-
+-# Act No.967 of the Council of Ministers of the USSR (1984-09-13), repeated in
+-# Act No.227 of the Council of Ministers of the USSR (1989-03-14):
+-Rule	Russia	1984	1991	-	Sep	lastSun	 2:00s	0	-
+-Rule	Russia	1985	1991	-	Mar	lastSun	 2:00s	1:00	S
+-#
+-Rule	Russia	1992	only	-	Mar	lastSat	 23:00	1:00	S
+-Rule	Russia	1992	only	-	Sep	lastSat	 23:00	0	-
+-Rule	Russia	1993	2010	-	Mar	lastSun	 2:00s	1:00	S
+-Rule	Russia	1993	1995	-	Sep	lastSun	 2:00s	0	-
++# Act No. 967 of the Council of Ministers of the USSR (1984-09-13), repeated in
++# Act No. 227 of the Council of Ministers of the USSR (1989-03-14):
++Rule	Russia	1984	1995	-	Sep	lastSun	 2:00s	0	-
++Rule	Russia	1985	2010	-	Mar	lastSun	 2:00s	1:00	S
++#
+ Rule	Russia	1996	2010	-	Oct	lastSun	 2:00s	0	-
++# As described below, Russia's 2014 change affects Zone data, not Rule data.
++
++# From Stepan Golosunov (2016-03-07):
++# Wikipedia and other sources refer to the Act of the Council of
++# Ministers of the USSR from 1988-01-04 No. 5 and the Act of the
++# Council of Ministers of the USSR from 1989-03-14 No. 227.
++#
++# I did not find full texts of these acts.  For the 1989 one we have
++# title at http://base.garant.ru/70754136/ :
++# "About change in calculation of time on the territories of
++# Lithuanian SSR, Latvian SSR and Estonian SSR, Astrakhan,
++# Kaliningrad, Kirov, Kuybyshev, Ulyanovsk and Uralsk oblasts".
++# And http://astrozet.net/files/Zones/DOC/RU/1980-925.txt appears to
++# contain quotes from both acts: Since last Sunday of March 1988 rules
++# of the second time belt are installed in Volgograd and Saratov
++# oblasts.  Since last Sunday of March 1989:
++# a) Lithuanian SSR, Latvian SSR, Estonian SSR, Kaliningrad oblast:
++# second time belt rules without extra hour (Moscow-1);
++# b) Astrakhan, Kirov, Kuybyshev, Ulyanovsk oblasts: second time belt
++# rules (Moscow time)
++# c) Uralsk oblast: third time belt rules (Moscow+1).
++
++# From Stepan Golosunov (2016-03-27):
++# Unamended version of the act of the
++# Government of the Russian Federation No. 23 from 08.01.1992
++# http://pravo.gov.ru/proxy/ips/?docbody=&nd=102014034&rdk=0
++# says that every year clocks were to be moved forward on last Sunday
++# of March at 2 hours and moved backwards on last Sunday of September
++# at 3 hours.  It was amended in 1996 to replace September with October.
+ 
+ # From Alexander Krivenyshev (2011-06-14):
+ # According to Kremlin press service, Russian President Dmitry Medvedev
+@@ -669,7 +737,7 @@
+ # Zone	NAME		GMTOFF	RULES	FORMAT	[UNTIL]
+ Zone	Europe/Andorra	0:06:04 -	LMT	1901
+ 			0:00	-	WET	1946 Sep 30
+-			1:00	-	CET	1985 Mar 31 2:00
++			1:00	-	CET	1985 Mar 31  2:00
+ 			1:00	EU	CE%sT
+ 
+ # Austria
+@@ -695,14 +763,22 @@
+ # Zone	NAME		GMTOFF	RULES	FORMAT	[UNTIL]
+ Zone	Europe/Vienna	1:05:21 -	LMT	1893 Apr
+ 			1:00	C-Eur	CE%sT	1920
+-			1:00	Austria	CE%sT	1940 Apr  1 2:00s
+-			1:00	C-Eur	CE%sT	1945 Apr  2 2:00s
+-			1:00	1:00	CEST	1945 Apr 12 2:00s
++			1:00	Austria	CE%sT	1940 Apr  1  2:00s
++			1:00	C-Eur	CE%sT	1945 Apr  2  2:00s
++			1:00	1:00	CEST	1945 Apr 12  2:00s
+ 			1:00	-	CET	1946
+ 			1:00	Austria	CE%sT	1981
+ 			1:00	EU	CE%sT
+ 
+ # Belarus
++#
++# From Stepan Golosunov (2016-07-02):
++# http://www.lawbelarus.com/repub/sub30/texf9611.htm
++# (Act of the Cabinet of Ministers of the Republic of Belarus from
++# 1992-03-25 No. 157) ... says clocks were to be moved forward at 2:00
++# on last Sunday of March and backward at 3:00 on last Sunday of September
++# (the same as previous USSR and contemporary Russian regulations).
++#
+ # From Yauhen Kharuzhy (2011-09-16):
+ # By latest Belarus government act Europe/Minsk timezone was changed to
+ # GMT+3 without DST (was GMT+2 with DST).
+@@ -711,19 +787,21 @@
+ # http://www.belta.by/ru/all_news/society/V-Belarusi-otmenjaetsja-perexod-na-sezonnoe-vremja_i_572952.html
+ # http://naviny.by/rubrics/society/2011/09/16/ic_articles_116_175144/
+ # http://news.tut.by/society/250578.html
++#
++# From Alexander Bokovoy (2014-10-09):
++# Belarussian government decided against changing to winter time....
++# http://eng.belta.by/all_news/society/Belarus-decides-against-adjusting-time-in-Russias-wake_i_76335.html
++#
+ # Zone	NAME		GMTOFF	RULES	FORMAT	[UNTIL]
+ Zone	Europe/Minsk	1:50:16 -	LMT	1880
+-			1:50	-	MMT	1924 May 2 # Minsk Mean Time
++			1:50	-	MMT	1924 May  2 # Minsk Mean Time
+ 			2:00	-	EET	1930 Jun 21
+ 			3:00	-	MSK	1941 Jun 28
+ 			1:00	C-Eur	CE%sT	1944 Jul  3
+ 			3:00	Russia	MSK/MSD	1990
+-			3:00	-	MSK	1991 Mar 31 2:00s
+-			2:00	1:00	EEST	1991 Sep 29 2:00s
+-			2:00	-	EET	1992 Mar 29 0:00s
+-			2:00	1:00	EEST	1992 Sep 27 0:00s
+-			2:00	Russia	EE%sT	2011 Mar 27 2:00s
+-			3:00	-	FET
++			3:00	-	MSK	1991 Mar 31  2:00s
++			2:00	Russia	EE%sT	2011 Mar 27  2:00s
++			3:00	-	+03
+ 
+ # Belgium
+ #
+@@ -780,7 +858,7 @@
+ Rule	Belgium	1946	only	-	Oct	 7	 2:00s	0	-
+ # Zone	NAME		GMTOFF	RULES	FORMAT	[UNTIL]
+ Zone	Europe/Brussels	0:17:30 -	LMT	1880
+-			0:17:30	-	BMT	1892 May  1 12:00 # Brussels MT
++			0:17:30	-	BMT	1892 May  1 12:00  # Brussels MT
+ 			0:00	-	WET	1914 Nov  8
+ 			1:00	-	CET	1916 May  1  0:00
+ 			1:00	C-Eur	CE%sT	1918 Nov 11 11:00u
+@@ -795,7 +873,7 @@
+ # Bulgaria
+ #
+ # From Plamen Simenov via Steffen Thorsen (1999-09-09):
+-# A document of Government of Bulgaria (No.94/1997) says:
++# A document of Government of Bulgaria (No. 94/1997) says:
+ # EET -> EETDST is in 03:00 Local time in last Sunday of March ...
+ # EETDST -> EET is in 04:00 Local time in last Sunday of October
+ #
+@@ -810,9 +888,9 @@
+ 			1:56:56	-	IMT	1894 Nov 30 # Istanbul MT?
+ 			2:00	-	EET	1942 Nov  2  3:00
+ 			1:00	C-Eur	CE%sT	1945
+-			1:00	-	CET	1945 Apr 2 3:00
++			1:00	-	CET	1945 Apr  2  3:00
+ 			2:00	-	EET	1979 Mar 31 23:00
+-			2:00	Bulg	EE%sT	1982 Sep 26  2:00
++			2:00	Bulg	EE%sT	1982 Sep 26  3:00
+ 			2:00	C-Eur	EE%sT	1991
+ 			2:00	E-Eur	EE%sT	1997
+ 			2:00	EU	EE%sT
+@@ -834,8 +912,8 @@
+ Rule	Czech	1949	only	-	Apr	 9	2:00s	1:00	S
+ # Zone	NAME		GMTOFF	RULES	FORMAT	[UNTIL]
+ Zone	Europe/Prague	0:57:44 -	LMT	1850
+-			0:57:44	-	PMT	1891 Oct     # Prague Mean Time
+-			1:00	C-Eur	CE%sT	1944 Sep 17 2:00s
++			0:57:44	-	PMT	1891 Oct    # Prague Mean Time
++			1:00	C-Eur	CE%sT	1944 Sep 17  2:00s
+ 			1:00	Czech	CE%sT	1979
+ 			1:00	EU	CE%sT
+ # Use Europe/Prague also for Slovakia.
+@@ -891,11 +969,11 @@
+ # Zone	NAME		GMTOFF	RULES	FORMAT	[UNTIL]
+ Zone Europe/Copenhagen	 0:50:20 -	LMT	1890
+ 			 0:50:20 -	CMT	1894 Jan  1 # Copenhagen MT
+-			 1:00	Denmark	CE%sT	1942 Nov  2 2:00s
+-			 1:00	C-Eur	CE%sT	1945 Apr  2 2:00
++			 1:00	Denmark	CE%sT	1942 Nov  2  2:00s
++			 1:00	C-Eur	CE%sT	1945 Apr  2  2:00
+ 			 1:00	Denmark	CE%sT	1980
+ 			 1:00	EU	CE%sT
+-Zone Atlantic/Faroe	-0:27:04 -	LMT	1908 Jan 11	# Tórshavn
++Zone Atlantic/Faroe	-0:27:04 -	LMT	1908 Jan 11 # Tórshavn
+ 			 0:00	-	WET	1981
+ 			 0:00	EU	WE%sT
+ #
+@@ -969,6 +1047,12 @@
+ # startkart.no says Thule does not observe DST, but this is clearly an error,
+ # so go with Shanks & Pottenger for Thule transitions until this year.
+ # For 2007 on assume Thule will stay in sync with US DST rules.
++
++# From J William Piggott (2016-02-20):
++# "Greenland north of the community of Scoresbysund" is officially named
++# "National Park" by Executive Order:
++# http://naalakkersuisut.gl/~/media/Nanoq/Files/Attached%20Files/Engelske-tekster/Legislation/Executive%20Order%20National%20Park.rtf
++# It is their only National Park.
+ #
+ # Rule	NAME	FROM	TO	TYPE	IN	ON	AT	SAVE	LETTER/S
+ Rule	Thule	1991	1992	-	Mar	lastSun	2:00	1:00	D
+@@ -980,20 +1064,24 @@
+ #
+ # Zone	NAME		GMTOFF	RULES	FORMAT	[UNTIL]
+ Zone America/Danmarkshavn -1:14:40 -	LMT	1916 Jul 28
+-			-3:00	-	WGT	1980 Apr  6 2:00
++			-3:00	-	WGT	1980 Apr  6  2:00
+ 			-3:00	EU	WG%sT	1996
+ 			0:00	-	GMT
+ Zone America/Scoresbysund -1:27:52 -	LMT	1916 Jul 28 # Ittoqqortoormiit
+-			-2:00	-	CGT	1980 Apr  6 2:00
++			-2:00	-	CGT	1980 Apr  6  2:00
+ 			-2:00	C-Eur	CG%sT	1981 Mar 29
+ 			-1:00	EU	EG%sT
+ Zone America/Godthab	-3:26:56 -	LMT	1916 Jul 28 # Nuuk
+-			-3:00	-	WGT	1980 Apr  6 2:00
++			-3:00	-	WGT	1980 Apr  6  2:00
+ 			-3:00	EU	WG%sT
+ Zone America/Thule	-4:35:08 -	LMT	1916 Jul 28 # Pituffik air base
+ 			-4:00	Thule	A%sT
+ 
+ # Estonia
++#
++# From Paul Eggert (2016-03-18):
++# The 1989 transition is from USSR act No. 227 (1989-03-14).
++#
+ # From Peter Ilieve (1994-10-15):
+ # A relative in Tallinn confirms the accuracy of the data for 1989 onwards
+ # [through 1994] and gives the legal authority for it,
+@@ -1011,7 +1099,7 @@
+ 
+ # From Peter Ilieve (1998-11-04), heavily edited:
+ # The 1998-09-22 Estonian time law
+-# <http://trip.rk.ee/cgi-bin/thw?${BASE}=akt&${OOHTML}=rtd&TA=1998&TO=1&AN=1390>
++# http://trip.rk.ee/cgi-bin/thw?${BASE}=akt&${OOHTML}=rtd&TA=1998&TO=1&AN=1390
+ # refers to the Eighth Directive and cites the association agreement between
+ # the EU and Estonia, ratified by the Estonian law (RT II 1995, 22-27, 120).
+ #
+@@ -1029,8 +1117,8 @@
+ # after that.
+ 
+ # From Mart Oruaas (2000-01-29):
+-# Regulation no. 301 (1999-10-12) obsoletes previous regulation
+-# no. 206 (1998-09-22) and thus sticks Estonia to +02:00 GMT for all
++# Regulation No. 301 (1999-10-12) obsoletes previous regulation
++# No. 206 (1998-09-22) and thus sticks Estonia to +02:00 GMT for all
+ # the year round.  The regulation is effective 1999-11-01.
+ 
+ # From Toomas Soome (2002-02-21):
+@@ -1042,16 +1130,16 @@
+ 
+ # Zone	NAME		GMTOFF	RULES	FORMAT	[UNTIL]
+ Zone	Europe/Tallinn	1:39:00	-	LMT	1880
+-			1:39:00	-	TMT	1918 Feb # Tallinn Mean Time
++			1:39:00	-	TMT	1918 Feb    # Tallinn Mean Time
+ 			1:00	C-Eur	CE%sT	1919 Jul
+ 			1:39:00	-	TMT	1921 May
+ 			2:00	-	EET	1940 Aug  6
+ 			3:00	-	MSK	1941 Sep 15
+ 			1:00	C-Eur	CE%sT	1944 Sep 22
+-			3:00	Russia	MSK/MSD	1989 Mar 26 2:00s
+-			2:00	1:00	EEST	1989 Sep 24 2:00s
++			3:00	Russia	MSK/MSD	1989 Mar 26  2:00s
++			2:00	1:00	EEST	1989 Sep 24  2:00s
+ 			2:00	C-Eur	EE%sT	1998 Sep 22
+-			2:00	EU	EE%sT	1999 Nov  1
++			2:00	EU	EE%sT	1999 Oct 31  4:00
+ 			2:00	-	EET	2002 Feb 21
+ 			2:00	EU	EE%sT
+ 
+@@ -1195,7 +1283,7 @@
+ # on PMT-0:09:21 until 1978-08-09, when the time base finally switched to UTC.
+ # Zone	NAME		GMTOFF	RULES	FORMAT	[UNTIL]
+ Zone	Europe/Paris	0:09:21 -	LMT	1891 Mar 15  0:01
+-			0:09:21	-	PMT	1911 Mar 11  0:01  # Paris MT
++			0:09:21	-	PMT	1911 Mar 11  0:01 # Paris MT
+ # Shanks & Pottenger give 1940 Jun 14 0:00; go with Excoffier and Le Corre.
+ 			0:00	France	WE%sT	1940 Jun 14 23:00
+ # Le Corre says Paris stuck with occupied-France time after the liberation;
+@@ -1214,14 +1302,14 @@
+ 
+ # From Jörg Schilling (2002-10-23):
+ # In 1945, Berlin was switched to Moscow Summer time (GMT+4) by
+-# <http://www.dhm.de/lemo/html/biografien/BersarinNikolai/>
++# http://www.dhm.de/lemo/html/biografien/BersarinNikolai/
+ # General [Nikolai] Bersarin.
+ 
+ # From Paul Eggert (2003-03-08):
+ # http://www.parlament-berlin.de/pds-fraktion.nsf/727459127c8b66ee8525662300459099/defc77cb784f180ac1256c2b0030274b/$FILE/bersarint.pdf
+ # says that Bersarin issued an order to use Moscow time on May 20.
+ # However, Moscow did not observe daylight saving in 1945, so
+-# this was equivalent to CEMT (GMT+3), not GMT+4.
++# this was equivalent to UT +03, not +04.
+ 
+ 
+ # Rule	NAME	FROM	TO	TYPE	IN	ON	AT	SAVE	LETTER/S
+@@ -1243,7 +1331,7 @@
+ 
+ # Zone	NAME		GMTOFF	RULES	FORMAT	[UNTIL]
+ Zone	Europe/Berlin	0:53:28 -	LMT	1893 Apr
+-			1:00	C-Eur	CE%sT	1945 May 24 2:00
++			1:00	C-Eur	CE%sT	1945 May 24  2:00
+ 			1:00 SovietZone	CE%sT	1946
+ 			1:00	Germany	CE%sT	1980
+ 			1:00	EU	CE%sT
+@@ -1259,7 +1347,7 @@
+ # http://www.srf.ch/player/video?id=c012c029-03b7-4c2b-9164-aa5902cd58d3
+ 
+ # From Arthur David Olson (2012-03-03):
+-# Busingen and Zurich have shared clocks since 1970.
++# Büsingen and Zurich have shared clocks since 1970.
+ 
+ Link	Europe/Zurich	Europe/Busingen
+ 
+@@ -1270,8 +1358,8 @@
+ 
+ # Gibraltar
+ # Zone	NAME		GMTOFF	RULES	FORMAT	[UNTIL]
+-Zone Europe/Gibraltar	-0:21:24 -	LMT	1880 Aug  2 0:00s
+-			0:00	GB-Eire	%s	1957 Apr 14 2:00
++Zone Europe/Gibraltar	-0:21:24 -	LMT	1880 Aug  2  0:00s
++			0:00	GB-Eire	%s	1957 Apr 14  2:00
+ 			1:00	-	CET	1982
+ 			1:00	EU	CE%sT
+ 
+@@ -1302,7 +1390,7 @@
+ Rule	Greece	1980	only	-	Sep	28	0:00	0	-
+ # Zone	NAME		GMTOFF	RULES	FORMAT	[UNTIL]
+ Zone	Europe/Athens	1:34:52 -	LMT	1895 Sep 14
+-			1:34:52	-	AMT	1916 Jul 28 0:01     # Athens MT
++			1:34:52	-	AMT	1916 Jul 28  0:01 # Athens MT
+ 			2:00	Greece	EE%sT	1941 Apr 30
+ 			1:00	Greece	CE%sT	1944 Apr  4
+ 			2:00	Greece	EE%sT	1981
+@@ -1374,36 +1462,33 @@
+ # might be a reference to the Julian calendar as opposed to Gregorian, or it
+ # might mean something else (???).
+ #
+-# From Paul Eggert (2006-03-22):
+-# The Iceland Almanak, Shanks & Pottenger, and Whitman disagree on many points.
+-# We go with the Almanak, except for one claim from Shanks & Pottenger, namely
+-# that Reykavik was 21W57 from 1837 to 1908, local mean time before that.
++# From Paul Eggert (2014-11-22):
++# The information below is taken from the 1988 Almanak; see
++# http://www.almanak.hi.is/klukkan.html
+ #
+ # Rule	NAME	FROM	TO	TYPE	IN	ON	AT	SAVE	LETTER/S
+-Rule	Iceland	1917	1918	-	Feb	19	23:00	1:00	S
++Rule	Iceland	1917	1919	-	Feb	19	23:00	1:00	S
+ Rule	Iceland	1917	only	-	Oct	21	 1:00	0	-
+-Rule	Iceland	1918	only	-	Nov	16	 1:00	0	-
++Rule	Iceland	1918	1919	-	Nov	16	 1:00	0	-
++Rule	Iceland	1921	only	-	Mar	19	23:00	1:00	S
++Rule	Iceland	1921	only	-	Jun	23	 1:00	0	-
+ Rule	Iceland	1939	only	-	Apr	29	23:00	1:00	S
+-Rule	Iceland	1939	only	-	Nov	29	 2:00	0	-
++Rule	Iceland	1939	only	-	Oct	29	 2:00	0	-
+ Rule	Iceland	1940	only	-	Feb	25	 2:00	1:00	S
+-Rule	Iceland	1940	only	-	Nov	 3	 2:00	0	-
+-Rule	Iceland	1941	only	-	Mar	 2	 1:00s	1:00	S
+-Rule	Iceland	1941	only	-	Nov	 2	 1:00s	0	-
+-Rule	Iceland	1942	only	-	Mar	 8	 1:00s	1:00	S
+-Rule	Iceland	1942	only	-	Oct	25	 1:00s	0	-
++Rule	Iceland	1940	1941	-	Nov	Sun>=2	 1:00s	0	-
++Rule	Iceland	1941	1942	-	Mar	Sun>=2	 1:00s	1:00	S
+ # 1943-1946 - first Sunday in March until first Sunday in winter
+ Rule	Iceland	1943	1946	-	Mar	Sun>=1	 1:00s	1:00	S
+-Rule	Iceland	1943	1948	-	Oct	Sun>=22	 1:00s	0	-
++Rule	Iceland	1942	1948	-	Oct	Sun>=22	 1:00s	0	-
+ # 1947-1967 - first Sunday in April until first Sunday in winter
+ Rule	Iceland	1947	1967	-	Apr	Sun>=1	 1:00s	1:00	S
+-# 1949 Oct transition delayed by 1 week
++# 1949 and 1967 Oct transitions delayed by 1 week
+ Rule	Iceland	1949	only	-	Oct	30	 1:00s	0	-
+ Rule	Iceland	1950	1966	-	Oct	Sun>=22	 1:00s	0	-
+ Rule	Iceland	1967	only	-	Oct	29	 1:00s	0	-
+ # Zone	NAME		GMTOFF	RULES	FORMAT	[UNTIL]
+-Zone Atlantic/Reykjavik	-1:27:24 -	LMT	1837
+-			-1:27:48 -	RMT	1908 # Reykjavik Mean Time?
+-			-1:00	Iceland	IS%sT	1968 Apr 7 1:00s
++Zone Atlantic/Reykjavik	-1:28	-	LMT	1908
++			-1:00	Iceland	IS%sT	1968 Apr  7  1:00s
+ 			 0:00	-	GMT
+ 
+ # Italy
+@@ -1415,73 +1500,84 @@
+ # But these events all occurred before the 1970 cutoff,
+ # so record only the time in Rome.
+ #
+-# From Paul Eggert (2006-03-22):
+-# For Italian DST we have three sources: Shanks & Pottenger, Whitman, and
+-# F. Pollastri
+-# Day-light Saving Time in Italy (2006-02-03)
+-# <http://toi.iriti.cnr.it/uk/ienitlt.html>
+-# ('FP' below), taken from an Italian National Electrotechnical Institute
+-# publication. When the three sources disagree, guess who's right, as follows:
+-#
+-# year	FP	Shanks&P. (S)	Whitman (W)	Go with:
+-# 1916	06-03	06-03 24:00	06-03 00:00	FP & W
+-#	09-30	09-30 24:00	09-30 01:00	FP; guess 24:00s
+-# 1917	04-01	03-31 24:00	03-31 00:00	FP & S
+-#	09-30	09-29 24:00	09-30 01:00	FP & W
+-# 1918	03-09	03-09 24:00	03-09 00:00	FP & S
+-#	10-06	10-05 24:00	10-06 01:00	FP & W
+-# 1919	03-01	03-01 24:00	03-01 00:00	FP & S
+-#	10-04	10-04 24:00	10-04 01:00	FP; guess 24:00s
+-# 1920	03-20	03-20 24:00	03-20 00:00	FP & S
+-#	09-18	09-18 24:00	10-01 01:00	FP; guess 24:00s
+-# 1944	04-02	04-03 02:00			S (see C-Eur)
+-#	09-16	10-02 03:00			FP; guess 24:00s
+-# 1945	09-14	09-16 24:00			FP; guess 24:00s
+-# 1970	05-21	05-31 00:00			S
+-#	09-20	09-27 00:00			S
+-#
+-# Rule	NAME	FROM	TO	TYPE	IN	ON	AT	SAVE	LETTER/S
+-Rule	Italy	1916	only	-	Jun	 3	0:00s	1:00	S
+-Rule	Italy	1916	only	-	Oct	 1	0:00s	0	-
+-Rule	Italy	1917	only	-	Apr	 1	0:00s	1:00	S
+-Rule	Italy	1917	only	-	Sep	30	0:00s	0	-
+-Rule	Italy	1918	only	-	Mar	10	0:00s	1:00	S
+-Rule	Italy	1918	1919	-	Oct	Sun>=1	0:00s	0	-
+-Rule	Italy	1919	only	-	Mar	 2	0:00s	1:00	S
+-Rule	Italy	1920	only	-	Mar	21	0:00s	1:00	S
+-Rule	Italy	1920	only	-	Sep	19	0:00s	0	-
+-Rule	Italy	1940	only	-	Jun	15	0:00s	1:00	S
+-Rule	Italy	1944	only	-	Sep	17	0:00s	0	-
+-Rule	Italy	1945	only	-	Apr	 2	2:00	1:00	S
+-Rule	Italy	1945	only	-	Sep	15	0:00s	0	-
+-Rule	Italy	1946	only	-	Mar	17	2:00s	1:00	S
+-Rule	Italy	1946	only	-	Oct	 6	2:00s	0	-
+-Rule	Italy	1947	only	-	Mar	16	0:00s	1:00	S
+-Rule	Italy	1947	only	-	Oct	 5	0:00s	0	-
+-Rule	Italy	1948	only	-	Feb	29	2:00s	1:00	S
+-Rule	Italy	1948	only	-	Oct	 3	2:00s	0	-
+-Rule	Italy	1966	1968	-	May	Sun>=22	0:00	1:00	S
+-Rule	Italy	1966	1969	-	Sep	Sun>=22	0:00	0	-
+-Rule	Italy	1969	only	-	Jun	 1	0:00	1:00	S
+-Rule	Italy	1970	only	-	May	31	0:00	1:00	S
+-Rule	Italy	1970	only	-	Sep	lastSun	0:00	0	-
+-Rule	Italy	1971	1972	-	May	Sun>=22	0:00	1:00	S
+-Rule	Italy	1971	only	-	Sep	lastSun	1:00	0	-
+-Rule	Italy	1972	only	-	Oct	 1	0:00	0	-
+-Rule	Italy	1973	only	-	Jun	 3	0:00	1:00	S
+-Rule	Italy	1973	1974	-	Sep	lastSun	0:00	0	-
+-Rule	Italy	1974	only	-	May	26	0:00	1:00	S
+-Rule	Italy	1975	only	-	Jun	 1	0:00s	1:00	S
+-Rule	Italy	1975	1977	-	Sep	lastSun	0:00s	0	-
+-Rule	Italy	1976	only	-	May	30	0:00s	1:00	S
+-Rule	Italy	1977	1979	-	May	Sun>=22	0:00s	1:00	S
+-Rule	Italy	1978	only	-	Oct	 1	0:00s	0	-
+-Rule	Italy	1979	only	-	Sep	30	0:00s	0	-
++# From Michael Deckers (2016-10-24):
++# http://www.ac-ilsestante.it/MERIDIANE/ora_legale quotes a law of 1893-08-10
++# ... [translated as] "The preceding dispositions will enter into
++# force at the instant at which, according to the time specified in
++# the 1st article, the 1st of November 1893 will begin...."
++#
++# From Pierpaolo Bernardi (2016-10-20):
++# The authoritative source for time in Italy is the national metrological
++# institute, which has a summary page of historical DST data at
++# http://www.inrim.it/res/tf/ora_legale_i.shtml
++# (2016-10-24):
++# http://www.renzobaldini.it/le-ore-legali-in-italia/
++# has still different data for 1944.  It divides Italy in two, as
++# there were effectively two governments at the time, north of Gothic
++# Line German controlled territory, official government RSI, and south
++# of the Gothic Line, controlled by allied armies.
++#
++# From Brian Inglis (2016-10-23):
++# Viceregal LEGISLATIVE DECREE. 14 September 1944, no. 219.
++# Restoration of Standard Time. (044U0219) (OJ 62 of 30.9.1944) ...
++# Given the R. law decreed on 1944-03-29, no. 92, by which standard time is
++# advanced to sixty minutes later starting at hour two on 1944-04-02; ...
++# Starting at hour three on the date 1944-09-17 standard time will be resumed.
++#
++# From Paul Eggert (2016-10-27):
++# Go with INRiM for DST rules, except as corrected by Inglis for 1944
++# for the Kingdom of Italy.  This is consistent with Renzo Baldini.
++# Model Rome's occupation by using using C-Eur rules from 1943-09-10
++# to 1944-06-04; although Rome was an open city during this period, it
++# was effectively controlled by Germany.
++#
++# Rule	NAME	FROM	TO	TYPE	IN	ON	AT	SAVE	LETTER/S
++Rule	Italy	1916	only	-	Jun	 3	24:00	1:00	S
++Rule	Italy	1916	1917	-	Sep	30	24:00	0	-
++Rule	Italy	1917	only	-	Mar	31	24:00	1:00	S
++Rule	Italy	1918	only	-	Mar	 9	24:00	1:00	S
++Rule	Italy	1918	only	-	Oct	 6	24:00	0	-
++Rule	Italy	1919	only	-	Mar	 1	24:00	1:00	S
++Rule	Italy	1919	only	-	Oct	 4	24:00	0	-
++Rule	Italy	1920	only	-	Mar	20	24:00	1:00	S
++Rule	Italy	1920	only	-	Sep	18	24:00	0	-
++Rule	Italy	1940	only	-	Jun	14	24:00	1:00	S
++Rule	Italy	1942	only	-	Nov	 2	 2:00s	0	-
++Rule	Italy	1943	only	-	Mar	29	 2:00s	1:00	S
++Rule	Italy	1943	only	-	Oct	 4	 2:00s	0	-
++Rule	Italy	1944	only	-	Apr	 2	 2:00s	1:00	S
++Rule	Italy	1944	only	-	Sep	17	 2:00s	0	-
++Rule	Italy	1945	only	-	Apr	 2	 2:00	1:00	S
++Rule	Italy	1945	only	-	Sep	15	 1:00	0	-
++Rule	Italy	1946	only	-	Mar	17	 2:00s	1:00	S
++Rule	Italy	1946	only	-	Oct	 6	 2:00s	0	-
++Rule	Italy	1947	only	-	Mar	16	 0:00s	1:00	S
++Rule	Italy	1947	only	-	Oct	 5	 0:00s	0	-
++Rule	Italy	1948	only	-	Feb	29	 2:00s	1:00	S
++Rule	Italy	1948	only	-	Oct	 3	 2:00s	0	-
++Rule	Italy	1966	1968	-	May	Sun>=22	 0:00s	1:00	S
++Rule	Italy	1966	only	-	Sep	24	24:00	0	-
++Rule	Italy	1967	1969	-	Sep	Sun>=22	 0:00s	0	-
++Rule	Italy	1969	only	-	Jun	 1	 0:00s	1:00	S
++Rule	Italy	1970	only	-	May	31	 0:00s	1:00	S
++Rule	Italy	1970	only	-	Sep	lastSun	 0:00s	0	-
++Rule	Italy	1971	1972	-	May	Sun>=22	 0:00s	1:00	S
++Rule	Italy	1971	only	-	Sep	lastSun	 0:00s	0	-
++Rule	Italy	1972	only	-	Oct	 1	 0:00s	0	-
++Rule	Italy	1973	only	-	Jun	 3	 0:00s	1:00	S
++Rule	Italy	1973	1974	-	Sep	lastSun	 0:00s	0	-
++Rule	Italy	1974	only	-	May	26	 0:00s	1:00	S
++Rule	Italy	1975	only	-	Jun	 1	 0:00s	1:00	S
++Rule	Italy	1975	1977	-	Sep	lastSun	 0:00s	0	-
++Rule	Italy	1976	only	-	May	30	 0:00s	1:00	S
++Rule	Italy	1977	1979	-	May	Sun>=22	 0:00s	1:00	S
++Rule	Italy	1978	only	-	Oct	 1	 0:00s	0	-
++Rule	Italy	1979	only	-	Sep	30	 0:00s	0	-
+ # Zone	NAME		GMTOFF	RULES	FORMAT	[UNTIL]
+ Zone	Europe/Rome	0:49:56 -	LMT	1866 Sep 22
+-			0:49:56	-	RMT	1893 Nov  1 0:00s # Rome Mean
+-			1:00	Italy	CE%sT	1942 Nov  2 2:00s
+-			1:00	C-Eur	CE%sT	1944 Jul
++			0:49:56	-	RMT	1893 Oct 31 23:49:56 # Rome Mean
++			1:00	Italy	CE%sT	1943 Sep 10
++			1:00	C-Eur	CE%sT	1944 Jun  4
+ 			1:00	Italy	CE%sT	1980
+ 			1:00	EU	CE%sT
+ 
+@@ -1497,21 +1593,21 @@
+ # correct data in juridical acts and I found some juridical documents about
+ # changes in the counting of time in Latvia from 1981....
+ #
+-# Act No.35 of the Council of Ministers of Latvian SSR of 1981-01-22 ...
+-# according to the Act No.925 of the Council of Ministers of USSR of 1980-10-24
++# Act No. 35 of the Council of Ministers of Latvian SSR of 1981-01-22 ...
++# according to the Act No. 925 of the Council of Ministers of USSR of 1980-10-24
+ # ...: all year round the time of 2nd time zone + 1 hour, in addition turning
+ # the hands of the clock 1 hour forward on 1 April at 00:00 (GMT 31 March 21:00)
+ # and 1 hour backward on the 1 October at 00:00 (GMT 30 September 20:00).
+ #
+-# Act No.592 of the Council of Ministers of Latvian SSR of 1984-09-24 ...
+-# according to the Act No.967 of the Council of Ministers of USSR of 1984-09-13
++# Act No. 592 of the Council of Ministers of Latvian SSR of 1984-09-24 ...
++# according to the Act No. 967 of the Council of Ministers of USSR of 1984-09-13
+ # ...: all year round the time of 2nd time zone + 1 hour, in addition turning
+ # the hands of the clock 1 hour forward on the last Sunday of March at 02:00
+ # (GMT 23:00 on the previous day) and 1 hour backward on the last Sunday of
+ # September at 03:00 (GMT 23:00 on the previous day).
+ #
+-# Act No.81 of the Council of Ministers of Latvian SSR of 1989-03-22 ...
+-# according to the Act No.227 of the Council of Ministers of USSR of 1989-03-14
++# Act No. 81 of the Council of Ministers of Latvian SSR of 1989-03-22 ...
++# according to the Act No. 227 of the Council of Ministers of USSR of 1989-03-14
+ # ...: since the last Sunday of March 1989 in Lithuanian SSR, Latvian SSR,
+ # Estonian SSR and Kaliningrad region of Russian Federation all year round the
+ # time of 2nd time zone (Moscow time minus one hour). On the territory of Latvia
+@@ -1528,17 +1624,17 @@
+ # From Andrei Ivanov (2000-03-06):
+ # This year Latvia will not switch to Daylight Savings Time (as specified in
+ # The Regulations of the Cabinet of Ministers of the Rep. of Latvia of
+-# 29-Feb-2000 (#79) <http://www.lv-laiks.lv/wwwraksti/2000/071072/vd4.htm>,
++# 29-Feb-2000 (No. 79) <http://www.lv-laiks.lv/wwwraksti/2000/071072/vd4.htm>,
+ # in Latvian for subscribers only).
+ 
+ # From RFE/RL Newsline
+-# <http://www.rferl.org/newsline/2001/01/3-CEE/cee-030101.html>
++# http://www.rferl.org/newsline/2001/01/3-CEE/cee-030101.html
+ # (2001-01-03), noted after a heads-up by Rives McDow:
+ # The Latvian government on 2 January decided that the country will
+ # institute daylight-saving time this spring, LETA reported.
+ # Last February the three Baltic states decided not to turn back their
+ # clocks one hour in the spring....
+-# Minister of Economy Aigars Kalvitis noted that Latvia had too few
++# Minister of Economy Aigars Kalvītis noted that Latvia had too few
+ # daylight hours and thus decided to comply with a draft European
+ # Commission directive that provides for instituting daylight-saving
+ # time in EU countries between 2002 and 2006. The Latvian government
+@@ -1549,20 +1645,22 @@
+ Rule	Latvia	1989	1996	-	Mar	lastSun	 2:00s	1:00	S
+ Rule	Latvia	1989	1996	-	Sep	lastSun	 2:00s	0	-
+ 
+-# Milne says Riga time was 1:36:28 (Polytechnique House time).
++# Milne 1899 says Riga was 1:36:28 (Polytechnique House time).
++# Byalokoz 1919 says Latvia was 1:36:34.
++# Go with Byalokoz.
+ 
+ # Zone	NAME		GMTOFF	RULES	FORMAT	[UNTIL]
+-Zone	Europe/Riga	1:36:28	-	LMT	1880
+-			1:36:28	-	RMT	1918 Apr 15 2:00 #Riga Mean Time
+-			1:36:28	1:00	LST	1918 Sep 16 3:00 #Latvian Summer
+-			1:36:28	-	RMT	1919 Apr  1 2:00
+-			1:36:28	1:00	LST	1919 May 22 3:00
+-			1:36:28	-	RMT	1926 May 11
++Zone	Europe/Riga	1:36:34	-	LMT	1880
++			1:36:34	-	RMT	1918 Apr 15  2:00 # Riga MT
++			1:36:34	1:00	LST	1918 Sep 16  3:00 # Latvian ST
++			1:36:34	-	RMT	1919 Apr  1  2:00
++			1:36:34	1:00	LST	1919 May 22  3:00
++			1:36:34	-	RMT	1926 May 11
+ 			2:00	-	EET	1940 Aug  5
+ 			3:00	-	MSK	1941 Jul
+ 			1:00	C-Eur	CE%sT	1944 Oct 13
+-			3:00	Russia	MSK/MSD	1989 Mar lastSun 2:00s
+-			2:00	1:00	EEST	1989 Sep lastSun 2:00s
++			3:00	Russia	MSK/MSD	1989 Mar lastSun  2:00s
++			2:00	1:00	EEST	1989 Sep lastSun  2:00s
+ 			2:00	Latvia	EE%sT	1997 Jan 21
+ 			2:00	EU	EE%sT	2000 Feb 29
+ 			2:00	-	EET	2001 Jan  2
+@@ -1588,6 +1686,9 @@
+ 
+ # Lithuania
+ 
++# From Paul Eggert (2016-03-18):
++# The 1989 transition is from USSR act No. 227 (1989-03-14).
++
+ # From Paul Eggert (1996-11-22):
+ # IATA SSIM (1992/1996) says Lithuania uses W-Eur rules, but since it is
+ # known to be wrong about Estonia and Latvia, assume it's wrong here too.
+@@ -1620,18 +1721,18 @@
+ 
+ # Zone	NAME		GMTOFF	RULES	FORMAT	[UNTIL]
+ Zone	Europe/Vilnius	1:41:16	-	LMT	1880
+-			1:24:00	-	WMT	1917	    # Warsaw Mean Time
++			1:24:00	-	WMT	1917        # Warsaw Mean Time
+ 			1:35:36	-	KMT	1919 Oct 10 # Kaunas Mean Time
+ 			1:00	-	CET	1920 Jul 12
+ 			2:00	-	EET	1920 Oct  9
+ 			1:00	-	CET	1940 Aug  3
+ 			3:00	-	MSK	1941 Jun 24
+ 			1:00	C-Eur	CE%sT	1944 Aug
+-			3:00	Russia	MSK/MSD	1991 Mar 31 2:00s
+-			2:00	1:00	EEST	1991 Sep 29 2:00s
++			3:00	Russia	MSK/MSD	1989 Mar 26  2:00s
++			2:00	Russia	EE%sT	1991 Sep 29  2:00s
+ 			2:00	C-Eur	EE%sT	1998
+-			2:00	-	EET	1998 Mar 29 1:00u
+-			1:00	EU	CE%sT	1999 Oct 31 1:00u
++			2:00	-	EET	1998 Mar 29  1:00u
++			1:00	EU	CE%sT	1999 Oct 31  1:00u
+ 			2:00	-	EET	2003 Jan  1
+ 			2:00	EU	EE%sT
+ 
+@@ -1665,9 +1766,9 @@
+ # Zone	NAME		GMTOFF	RULES	FORMAT	[UNTIL]
+ Zone Europe/Luxembourg	0:24:36 -	LMT	1904 Jun
+ 			1:00	Lux	CE%sT	1918 Nov 25
+-			0:00	Lux	WE%sT	1929 Oct  6 2:00s
+-			0:00	Belgium	WE%sT	1940 May 14 3:00
+-			1:00	C-Eur	WE%sT	1944 Sep 18 3:00
++			0:00	Lux	WE%sT	1929 Oct  6  2:00s
++			0:00	Belgium	WE%sT	1940 May 14  3:00
++			1:00	C-Eur	WE%sT	1944 Sep 18  3:00
+ 			1:00	Belgium	CE%sT	1977
+ 			1:00	EU	CE%sT
+ 
+@@ -1675,6 +1776,10 @@
+ # See Europe/Belgrade.
+ 
+ # Malta
++#
++# From Paul Eggert (2016-10-21):
++# Assume 1900-1972 was like Rome, overriding Shanks.
++#
+ # Rule	NAME	FROM	TO	TYPE	IN	ON	AT	SAVE	LETTER/S
+ Rule	Malta	1973	only	-	Mar	31	0:00s	1:00	S
+ Rule	Malta	1973	only	-	Sep	29	0:00s	0	-
+@@ -1684,15 +1789,23 @@
+ Rule	Malta	1975	1980	-	Sep	Sun>=15	2:00	0	-
+ Rule	Malta	1980	only	-	Mar	31	2:00	1:00	S
+ # Zone	NAME		GMTOFF	RULES	FORMAT	[UNTIL]
+-Zone	Europe/Malta	0:58:04 -	LMT	1893 Nov  2 0:00s # Valletta
+-			1:00	Italy	CE%sT	1942 Nov  2 2:00s
+-			1:00	C-Eur	CE%sT	1945 Apr  2 2:00s
++Zone	Europe/Malta	0:58:04 -	LMT	1893 Nov  2  0:00s # Valletta
+ 			1:00	Italy	CE%sT	1973 Mar 31
+ 			1:00	Malta	CE%sT	1981
+ 			1:00	EU	CE%sT
+ 
+ # Moldova
+ 
++# From Stepan Golosunov (2016-03-07):
++# the act of the government of the Republic of Moldova Nr. 132 from 1990-05-04
++# http://lex.justice.md/viewdoc.php?action=view&view=doc&id=298782&lang=2
++# ... says that since 1990-05-06 on the territory of the Moldavian SSR
++# time would be calculated as the standard time of the second time belt
++# plus one hour of the "summer" time. To implement that clocks would be
++# adjusted one hour backwards at 1990-05-06 2:00. After that "summer"
++# time would be cancelled last Sunday of September at 3:00 and
++# reintroduced last Sunday of March at 2:00.
++
+ # From Paul Eggert (2006-03-22):
+ # A previous version of this database followed Shanks & Pottenger, who write
+ # that Tiraspol switched to Moscow time on 1992-01-19 at 02:00.
+@@ -1731,6 +1844,18 @@
+ # News from Moldova (in russian):
+ # http://ru.publika.md/link_317061.html
+ 
++# From Roman Tudos (2015-07-02):
++# http://lex.justice.md/index.php?action=view&view=doc&lang=1&id=355077
++# From Paul Eggert (2015-07-01):
++# The abovementioned official link to IGO1445-868/2014 states that
++# 2014-10-26's fallback transition occurred at 03:00 local time.  Also,
++# http://www.trm.md/en/social/la-30-martie-vom-trece-la-ora-de-vara
++# says the 2014-03-30 spring-forward transition was at 02:00 local time.
++# Guess that since 1997 Moldova has switched one hour before the EU.
++
++# Rule	NAME	FROM	TO	TYPE	IN	ON	AT	SAVE	LETTER/S
++Rule	Moldova	1997	max	-	Mar	lastSun	 2:00	1:00	S
++Rule	Moldova	1997	max	-	Oct	lastSun	 3:00	0	-
+ 
+ # Zone	NAME		GMTOFF	RULES	FORMAT	[UNTIL]
+ Zone	Europe/Chisinau	1:55:20 -	LMT	1880
+@@ -1739,21 +1864,19 @@
+ 			2:00	Romania	EE%sT	1940 Aug 15
+ 			2:00	1:00	EEST	1941 Jul 17
+ 			1:00	C-Eur	CE%sT	1944 Aug 24
+-			3:00	Russia	MSK/MSD	1990
+-			3:00	-	MSK	1990 May 6
+-			2:00	-	EET	1991
++			3:00	Russia	MSK/MSD	1990 May  6  2:00
+ 			2:00	Russia	EE%sT	1992
+ 			2:00	E-Eur	EE%sT	1997
+ # See Romania commentary for the guessed 1997 transition to EU rules.
+-			2:00	EU	EE%sT
++			2:00	Moldova	EE%sT
+ 
+ # Monaco
+ # Shanks & Pottenger give 0:09:20 for Paris Mean Time; go with Howse's
+ # more precise 0:09:21.
+ # Zone	NAME		GMTOFF	RULES	FORMAT	[UNTIL]
+ Zone	Europe/Monaco	0:29:32 -	LMT	1891 Mar 15
+-			0:09:21	-	PMT	1911 Mar 11    # Paris Mean Time
+-			0:00	France	WE%sT	1945 Sep 16 3:00
++			0:09:21	-	PMT	1911 Mar 11 # Paris Mean Time
++			0:00	France	WE%sT	1945 Sep 16  3:00
+ 			1:00	France	CE%sT	1977
+ 			1:00	EU	CE%sT
+ 
+@@ -1797,8 +1920,8 @@
+ # was not until 1866 when they were all required by law to observe
+ # Amsterdam mean time.
+ 
+-# The data before 1945 are taken from
+-# <http://www.phys.uu.nl/~vgent/wettijd/wettijd.htm>.
++# The data entries before 1945 are taken from
++# http://www.staff.science.uu.nl/~gent0113/wettijd/wettijd.htm
+ 
+ # Rule	NAME	FROM	TO	TYPE	IN	ON	AT	SAVE	LETTER/S
+ Rule	Neth	1916	only	-	May	 1	0:00	1:00	NST	# Netherlands Summer Time
+@@ -1829,8 +1952,8 @@
+ # Zone	NAME		GMTOFF	RULES	FORMAT	[UNTIL]
+ Zone Europe/Amsterdam	0:19:32 -	LMT	1835
+ 			0:19:32	Neth	%s	1937 Jul  1
+-			0:20	Neth	NE%sT	1940 May 16 0:00 # Dutch Time
+-			1:00	C-Eur	CE%sT	1945 Apr  2 2:00
++			0:20	Neth	NE%sT	1940 May 16  0:00 # Dutch Time
++			1:00	C-Eur	CE%sT	1945 Apr  2  2:00
+ 			1:00	Neth	CE%sT	1977
+ 			1:00	EU	CE%sT
+ 
+@@ -1893,7 +2016,7 @@
+ # <http://www.svalbard.com/SvalbardFAQ.html> says that the Germans were
+ # expelled on 1942-05-14.  However, small parties of Germans did return,
+ # and according to Wilhelm Dege's book "War North of 80" (1954)
+-# <http://www.ucalgary.ca/UofC/departments/UP/1-55238/1-55238-110-2.html>
++# http://www.ucalgary.ca/UofC/departments/UP/1-55238/1-55238-110-2.html
+ # the German armed forces at the Svalbard weather station code-named
+ # Haudegen did not surrender to the Allies until September 1945.
+ #
+@@ -1917,7 +2040,7 @@
+ Rule	Poland	1945	only	-	Nov	 1	0:00	0	-
+ # For 1946 on the source is Kazimierz Borkowski,
+ # Toruń Center for Astronomy, Dept. of Radio Astronomy, Nicolaus Copernicus U.,
+-# <http://www.astro.uni.torun.pl/~kb/Artykuly/U-PA/Czas2.htm#tth_tAb1>
++# http://www.astro.uni.torun.pl/~kb/Artykuly/U-PA/Czas2.htm#tth_tAb1
+ # Thanks to Przemysław Augustyniak (2005-05-28) for this reference.
+ # He also gives these further references:
+ # Mon Pol nr 13, poz 162 (1995) <http://www.abc.com.pl/serwis/mp/1995/0162.htm>
+@@ -1938,10 +2061,10 @@
+ Rule	Poland	1962	1964	-	Sep	lastSun	1:00s	0	-
+ # Zone	NAME		GMTOFF	RULES	FORMAT	[UNTIL]
+ Zone	Europe/Warsaw	1:24:00 -	LMT	1880
+-			1:24:00	-	WMT	1915 Aug  5   # Warsaw Mean Time
+-			1:00	C-Eur	CE%sT	1918 Sep 16 3:00
++			1:24:00	-	WMT	1915 Aug  5 # Warsaw Mean Time
++			1:00	C-Eur	CE%sT	1918 Sep 16  3:00
+ 			2:00	Poland	EE%sT	1922 Jun
+-			1:00	Poland	CE%sT	1940 Jun 23 2:00
++			1:00	Poland	CE%sT	1940 Jun 23  2:00
+ 			1:00	C-Eur	CE%sT	1944 Oct
+ 			1:00	Poland	CE%sT	1977
+ 			1:00	W-Eur	CE%sT	1988
+@@ -1949,6 +2072,14 @@
+ 
+ # Portugal
+ #
++# From Paul Eggert (2014-08-11), after a heads-up from Stephen Colebourne:
++# According to a Portuguese decree (1911-05-26)
++# http://dre.pt/pdf1sdip/1911/05/12500/23132313.pdf
++# Lisbon was at -0:36:44.68, but switched to GMT on 1912-01-01 at 00:00.
++# Round the old offset to -0:36:45.  This agrees with Willett but disagrees
++# with Shanks, who says the transition occurred on 1911-05-24 at 00:00 for
++# Europe/Lisbon, Atlantic/Azores, and Atlantic/Madeira.
++#
+ # From Rui Pedro Salgueiro (1992-11-12):
+ # Portugal has recently (September, 27) changed timezone
+ # (from WET to MET or CET) to harmonize with EEC.
+@@ -2028,28 +2159,27 @@
+ Rule	Port	1980	only	-	Mar	lastSun	 0:00s	1:00	S
+ Rule	Port	1981	1982	-	Mar	lastSun	 1:00s	1:00	S
+ Rule	Port	1983	only	-	Mar	lastSun	 2:00s	1:00	S
++#
+ # Zone	NAME		GMTOFF	RULES	FORMAT	[UNTIL]
+-# Shanks & Pottenger say the transition from LMT to WET occurred 1911-05-24;
+-# Willett says 1912-01-01.  Go with Willett.
+-Zone	Europe/Lisbon	-0:36:32 -	LMT	1884
+-			-0:36:32 -	LMT	1912 Jan  1  # Lisbon Mean Time
+-			 0:00	Port	WE%sT	1966 Apr  3 2:00
+-			 1:00	-	CET	1976 Sep 26 1:00
+-			 0:00	Port	WE%sT	1983 Sep 25 1:00s
+-			 0:00	W-Eur	WE%sT	1992 Sep 27 1:00s
+-			 1:00	EU	CE%sT	1996 Mar 31 1:00u
++Zone	Europe/Lisbon	-0:36:45 -	LMT	1884
++			-0:36:45 -	LMT	1912 Jan  1 # Lisbon Mean Time
++			 0:00	Port	WE%sT	1966 Apr  3  2:00
++			 1:00	-	CET	1976 Sep 26  1:00
++			 0:00	Port	WE%sT	1983 Sep 25  1:00s
++			 0:00	W-Eur	WE%sT	1992 Sep 27  1:00s
++			 1:00	EU	CE%sT	1996 Mar 31  1:00u
+ 			 0:00	EU	WE%sT
+-Zone Atlantic/Azores	-1:42:40 -	LMT	1884		# Ponta Delgada
+-			-1:54:32 -	HMT	1911 May 24  # Horta Mean Time
+-			-2:00	Port	AZO%sT	1966 Apr  3 2:00 # Azores Time
+-			-1:00	Port	AZO%sT	1983 Sep 25 1:00s
+-			-1:00	W-Eur	AZO%sT	1992 Sep 27 1:00s
+-			 0:00	EU	WE%sT	1993 Mar 28 1:00u
++Zone Atlantic/Azores	-1:42:40 -	LMT	1884        # Ponta Delgada
++			-1:54:32 -	HMT	1912 Jan  1 # Horta Mean Time
++			-2:00	Port	AZO%sT	1966 Apr  3  2:00  # Azores Time
++			-1:00	Port	AZO%sT	1983 Sep 25  1:00s
++			-1:00	W-Eur	AZO%sT	1992 Sep 27  1:00s
++			 0:00	EU	WE%sT	1993 Mar 28  1:00u
+ 			-1:00	EU	AZO%sT
+-Zone Atlantic/Madeira	-1:07:36 -	LMT	1884		# Funchal
+-			-1:07:36 -	FMT	1911 May 24  # Funchal Mean Time
+-			-1:00	Port	MAD%sT	1966 Apr  3 2:00 # Madeira Time
+-			 0:00	Port	WE%sT	1983 Sep 25 1:00s
++Zone Atlantic/Madeira	-1:07:36 -	LMT	1884        # Funchal
++			-1:07:36 -	FMT	1912 Jan  1 # Funchal Mean Time
++			-1:00	Port	MAD%sT	1966 Apr  3  2:00 # Madeira Time
++			 0:00	Port	WE%sT	1983 Sep 25  1:00s
+ 			 0:00	EU	WE%sT
+ 
+ # Romania
+@@ -2073,8 +2203,8 @@
+ Rule	Romania	1991	1993	-	Sep	lastSun	 0:00s	0	-
+ # Zone	NAME		GMTOFF	RULES	FORMAT	[UNTIL]
+ Zone Europe/Bucharest	1:44:24 -	LMT	1891 Oct
+-			1:44:24	-	BMT	1931 Jul 24	# Bucharest MT
+-			2:00	Romania	EE%sT	1981 Mar 29 2:00s
++			1:44:24	-	BMT	1931 Jul 24 # Bucharest MT
++			2:00	Romania	EE%sT	1981 Mar 29  2:00s
+ 			2:00	C-Eur	EE%sT	1991
+ 			2:00	Romania	EE%sT	1994
+ 			2:00	E-Eur	EE%sT	1997
+@@ -2084,7 +2214,7 @@
+ # Russia
+ 
+ # From Alexander Krivenyshev (2011-09-15):
+-# Based on last Russian Government Decree # 725 on August 31, 2011
++# Based on last Russian Government Decree No. 725 on August 31, 2011
+ # (Government document
+ # http://www.government.ru/gov/results/16355/print/
+ # in Russian)
+@@ -2094,7 +2224,7 @@
+ # http://www.worldtimezone.com/dst_news/dst_news_russia36.htm
+ 
+ # From Sanjeev Gupta (2011-09-27):
+-# Scans of [Decree #23 of January 8, 1992] are available at:
++# Scans of [Decree No. 23 of January 8, 1992] are available at:
+ # http://government.consultant.ru/page.aspx?1223966
+ # They are in Cyrillic letters (presumably Russian).
+ 
+@@ -2105,19 +2235,19 @@
+ # One source is
+ # http://government.ru/gov/results/16355/
+ # which, according to translate.google.com, begins "Decree of August 31,
+-# 2011 No 725" and contains no other dates or "effective date" information.
++# 2011 No. 725" and contains no other dates or "effective date" information.
+ #
+ # Another source is
+ # http://www.rg.ru/2011/09/06/chas-zona-dok.html
+ # which, according to translate.google.com, begins "Resolution of the
+ # Government of the Russian Federation on August 31, 2011 N 725" and also
+ # contains "Date first official publication: September 6, 2011 Posted on:
+-# in the 'RG' - Federal Issue number 5573 September 6, 2011" but which
++# in the 'RG' - Federal Issue No. 5573 September 6, 2011" but which
+ # does not contain any "effective date" information.
+ #
+ # Another source is
+ # http://en.wikipedia.org/wiki/Oymyakonsky_District#cite_note-RuTime-7
+-# which, in note 8, contains "Resolution #725 of August 31, 2011...
++# which, in note 8, contains "Resolution No. 725 of August 31, 2011...
+ # Effective as of after 7 days following the day of the official publication"
+ # but which does not contain any reference to September 6, 2011.
+ #
+@@ -2156,7 +2286,6 @@
+ # http://www.worldtimezone.com/dst_news/dst_news_russia-map-2014-07.html
+ 
+ # From Paul Eggert (2006-03-22):
+-# Except for Moscow after 1919-07-01, I invented the time zone abbreviations.
+ # Moscow time zone abbreviations after 1919-07-01, and Moscow rules after 1991,
+ # are from Andrey A. Chernov.  The rest is from Shanks & Pottenger,
+ # except we follow Chernov's report that 1992 DST transitions were Sat
+@@ -2210,73 +2339,179 @@
+ 
+ # From Tim Parenti (2014-07-03):
+ # Europe/Kaliningrad covers...
+-# 39	RU-KGD 	Kaliningrad Oblast
++# 39	RU-KGD	Kaliningrad Oblast
++
++# From Paul Eggert (2016-03-18):
++# The 1989 transition is from USSR act No. 227 (1989-03-14).
++
++# From Stepan Golosunov (2016-03-07):
++# http://www.rgo.ru/ru/kaliningradskoe-oblastnoe-otdelenie/ob-otdelenii/publikacii/kak-nam-zhilos-bez-letnego-vremeni
++# confirms that the 1989 change to Moscow-1 was implemented.
++# (The article, though, is misattributed to 1990 while saying that
++# summer->winter transition would be done on the 24 of September. But
++# 1990-09-24 was Monday, while 1989-09-24 was Sunday as expected.)
++# ...
++# http://www.kaliningradka.ru/site_pc/cherez/index.php?ELEMENT_ID=40091
++# says that Kaliningrad switched to Moscow-1 on 1989-03-26, avoided
++# at the last moment switch to Moscow-1 on 1991-03-31, switched to
++# Moscow on 1991-11-03, switched to Moscow-1 on 1992-01-19.
+ 
+ Zone Europe/Kaliningrad	 1:22:00 -	LMT	1893 Apr
+ 			 1:00	C-Eur	CE%sT	1945
+ 			 2:00	Poland	CE%sT	1946
+-			 3:00	Russia	MSK/MSD	1991 Mar 31 2:00s
+-			 2:00	Russia	EE%sT	2011 Mar 27 2:00s
+-			 3:00	-	FET	2014 Oct 26 2:00s
++			 3:00	Russia	MSK/MSD	1989 Mar 26  2:00s
++			 2:00	Russia	EE%sT	2011 Mar 27  2:00s
++			 3:00	-	+03	2014 Oct 26  2:00s
+ 			 2:00	-	EET
+ 
+ 
+-# From Tim Parenti (2014-07-03), per Oscar van Vlijmen (2001-08-25):
++# From Paul Eggert (2016-02-21), per Tim Parenti (2014-07-03) and
++# Oscar van Vlijmen (2001-08-25):
+ # Europe/Moscow covers...
+-# 01	RU-AD 	Adygea, Republic of
+-# 05	RU-DA 	Dagestan, Republic of
+-# 06	RU-IN 	Ingushetia, Republic of
+-# 07	RU-KB 	Kabardino-Balkar Republic
+-# 08	RU-KL 	Kalmykia, Republic of
+-# 09	RU-KC 	Karachay-Cherkess Republic
+-# 10	RU-KR 	Karelia, Republic of
+-# 11	RU-KO 	Komi Republic
+-# 12	RU-ME 	Mari El Republic
+-# 13	RU-MO 	Mordovia, Republic of
+-# 15	RU-SE 	North Ossetia-Alania, Republic of
+-# 16	RU-TA 	Tatarstan, Republic of
+-# 20	RU-CE 	Chechen Republic
+-# 21	RU-CU 	Chuvash Republic
+-# 23	RU-KDA 	Krasnodar Krai
+-# 26 	RU-STA 	Stavropol Krai
+-# 29	RU-ARK 	Arkhangelsk Oblast
+-# 31	RU-BEL 	Belgorod Oblast
+-# 32	RU-BRY 	Bryansk Oblast
+-# 33	RU-VLA 	Vladimir Oblast
+-# 35	RU-VLG 	Vologda Oblast
+-# 36	RU-VOR 	Voronezh Oblast
+-# 37	RU-IVA 	Ivanovo Oblast
+-# 40	RU-KLU 	Kaluga Oblast
+-# 44	RU-KOS 	Kostroma Oblast
+-# 46	RU-KRS 	Kursk Oblast
+-# 47	RU-LEN 	Leningrad Oblast
+-# 48	RU-LIP 	Lipetsk Oblast
+-# 50	RU-MOS 	Moscow Oblast
+-# 51	RU-MUR 	Murmansk Oblast
+-# 52	RU-NIZ 	Nizhny Novgorod Oblast
+-# 53	RU-NGR 	Novgorod Oblast
+-# 57	RU-ORL 	Oryol Oblast
+-# 58	RU-PNZ 	Penza Oblast
+-# 60	RU-PSK 	Pskov Oblast
+-# 61	RU-ROS 	Rostov Oblast
+-# 62	RU-RYA 	Ryazan Oblast
+-# 67	RU-SMO 	Smolensk Oblast
+-# 68	RU-TAM 	Tambov Oblast
+-# 69	RU-TVE 	Tver Oblast
+-# 71	RU-TUL 	Tula Oblast
+-# 73	RU-ULY 	Ulyanovsk Oblast
+-# 76	RU-YAR 	Yaroslavl Oblast
+-# 77	RU-MOW 	Moscow
+-# 78	RU-SPE 	Saint Petersburg
+-# 83	RU-NEN 	Nenets Autonomous Okrug
++# 01	RU-AD	Adygea, Republic of
++# 05	RU-DA	Dagestan, Republic of
++# 06	RU-IN	Ingushetia, Republic of
++# 07	RU-KB	Kabardino-Balkar Republic
++# 08	RU-KL	Kalmykia, Republic of
++# 09	RU-KC	Karachay-Cherkess Republic
++# 10	RU-KR	Karelia, Republic of
++# 11	RU-KO	Komi Republic
++# 12	RU-ME	Mari El Republic
++# 13	RU-MO	Mordovia, Republic of
++# 15	RU-SE	North Ossetia-Alania, Republic of
++# 16	RU-TA	Tatarstan, Republic of
++# 20	RU-CE	Chechen Republic
++# 21	RU-CU	Chuvash Republic
++# 23	RU-KDA	Krasnodar Krai
++# 26	RU-STA	Stavropol Krai
++# 29	RU-ARK	Arkhangelsk Oblast
++# 31	RU-BEL	Belgorod Oblast
++# 32	RU-BRY	Bryansk Oblast
++# 33	RU-VLA	Vladimir Oblast
++# 35	RU-VLG	Vologda Oblast
++# 36	RU-VOR	Voronezh Oblast
++# 37	RU-IVA	Ivanovo Oblast
++# 40	RU-KLU	Kaluga Oblast
++# 44	RU-KOS	Kostroma Oblast
++# 46	RU-KRS	Kursk Oblast
++# 47	RU-LEN	Leningrad Oblast
++# 48	RU-LIP	Lipetsk Oblast
++# 50	RU-MOS	Moscow Oblast
++# 51	RU-MUR	Murmansk Oblast
++# 52	RU-NIZ	Nizhny Novgorod Oblast
++# 53	RU-NGR	Novgorod Oblast
++# 57	RU-ORL	Oryol Oblast
++# 58	RU-PNZ	Penza Oblast
++# 60	RU-PSK	Pskov Oblast
++# 61	RU-ROS	Rostov Oblast
++# 62	RU-RYA	Ryazan Oblast
++# 67	RU-SMO	Smolensk Oblast
++# 68	RU-TAM	Tambov Oblast
++# 69	RU-TVE	Tver Oblast
++# 71	RU-TUL	Tula Oblast
++# 76	RU-YAR	Yaroslavl Oblast
++# 77	RU-MOW	Moscow
++# 78	RU-SPE	Saint Petersburg
++# 83	RU-NEN	Nenets Autonomous Okrug
++
++# From Paul Eggert (2016-08-23):
++# The Soviets switched to UT-based time in 1919.  Decree No. 59
++# (1919-02-08) http://istmat.info/node/35567 established UT-based time
++# zones, and Decree No. 147 (1919-03-29) http://istmat.info/node/35854
++# specified a transition date of 1919-07-01, apparently at 00:00 UT.
++# No doubt only the Soviet-controlled regions switched on that date;
++# later transitions to UT-based time in other parts of Russia are
++# taken from what appear to be guesses by Shanks.
++# (Thanks to Alexander Belopolsky for pointers to the decrees.)
++
++# From Stepan Golosunov (2016-03-07):
++# 11. Regions-violators, 1981-1982.
++# Wikipedia refers to
++# http://maps.monetonos.ru/maps/raznoe/Old_Maps/Old_Maps/Articles/022/3_1981.html
++# http://besp.narod.ru/nauka_1981_3.htm
++#
++# The second link provides two articles scanned from the Nauka i Zhizn
++# magazine No. 3, 1981 and a scan of the short article attributed to
++# the Trud newspaper from February 1982.  The first link provides the
++# same Nauka i Zhizn articles converted to the text form (but misses
++# time belt changes map).
++#
++# The second Nauka i Zhizn article says that in addition to
++# introduction of summer time on 1981-04-01 there are some time belt
++# border changes on 1981-10-01, mostly affecting Nenets Autonomous
++# Okrug, Krasnoyarsk Krai, Yakutia, Magadan Oblast and Chukotka
++# according to the provided map (colored one).  In addition to that
++# "time violators" (regions which were not using rules of the time
++# belts in which they were located) would not be moving off the DST on
++# 1981-10-01 to restore the decree time usage.  (Komi ASSR was
++# supposed to repeat that move in October 1982 to account for the 2
++# hour difference.)  Map depicting "time violators" before 1981-10-01
++# is also provided.
++#
++# The article from Trud says that 1981-10-01 changes caused problems
++# and some territories would be moved to pre-1981-10-01 time by not
++# moving to summer time on 1982-04-01.  Namely: Dagestan,
++# Kabardino-Balkar, Kalmyk, Komi, Mari, Mordovian, North Ossetian,
++# Tatar, Chechen-Ingush and Chuvash ASSR, Krasnodar and Stavropol
++# krais, Arkhangelsk, Vladimir, Vologda, Voronezh, Gorky, Ivanovo,
++# Kostroma, Lipetsk, Penza, Rostov, Ryazan, Tambov, Tyumen and
++# Yaroslavl oblasts, Nenets and Evenk autonomous okrugs, Khatangsky
++# district of Taymyr Autonomous Okrug.  As a result Evenk Autonomous
++# Okrug and Khatangsky district of Taymyr Autonomous Okrug would end
++# up on Moscow+4, Tyumen Oblast on Moscow+2 and the rest on Moscow
++# time.
++#
++# http://astrozet.net/files/Zones/DOC/RU/1980-925.txt
++# attributes the 1982 changes to the Act of the Council of Ministers
++# of the USSR No. 126 from 18.02.1982.  1980-925.txt also adds
++# Udmurtia to the list of affected territories and lists Khatangsky
++# district separately from Taymyr Autonomous Okrug.  Probably erroneously.
++#
++# The affected territories are currently listed under Europe/Moscow,
++# Asia/Yekaterinburg and Asia/Krasnoyarsk.
++#
++# 12. Udmurtia
++# The fact that Udmurtia is depicted as a violator in the Nauka i
++# Zhizn article hints at Izhevsk being on different time from
++# Kuybyshev before 1981-10-01. Udmurtia is not mentioned in the 1989 act.
++# http://astrozet.net/files/Zones/DOC/RU/1980-925.txt
++# implies Udmurtia was on Moscow time after 1982-04-01.
++# Wikipedia implies Udmurtia being on Moscow+1 until 1991.
++#
++# ...
++#
++# All Russian zones are supposed to have by default a -1 change at
++# 1991-03-31 2:00 (cancellation of the decree time in the USSR) and a +1
++# change at 1992-01-19 2:00 (restoration of the decree time in Russia).
++#
++# There were some exceptions, though.
++# Wikipedia says newspapers listed Astrakhan, Saratov, Kirov, Volgograd,
++# Izhevsk, Grozny, Kazan and Samara as such exceptions for the 1992
++# change. (Different newspapers providing different lists. And some
++# lists found in the internet are quite wild.)
++#
++# And apparently some exceptions were reverted in the last moment.
++# http://www.kaliningradka.ru/site_pc/cherez/index.php?ELEMENT_ID=40091
++# says that Kaliningrad decided not to be an exception 2 days before the
++# 1991-03-31 switch and one person at
++# http://izhevsk.ru/forum_light_message/50/682597-m8369040.html
++# says he remembers that Samara opted out of the 1992-01-19 exception
++# 2 days before the switch.
++#
++#
++# From Paul Eggert (2016-03-18):
++# Given the above, we appear to be missing some Zone entries for the
++# chaotic early 1980s in Russia.  It's not clear what these entries
++# should be.  For now, sweep this under the rug and just document the
++# time in Moscow.
+ 
+ # From Vladimir Karpinsky (2014-07-08):
+ # LMT in Moscow (before Jul 3, 1916) is 2:30:17, that was defined by Moscow
+ # Observatory (coordinates: 55 deg. 45'29.70", 37 deg. 34'05.30")....
+ # LMT in Moscow since Jul 3, 1916 is 2:31:01 as a result of new standard.
+-# (The info is from the book by Byalokoz E.L. New Counting of Time in Russia
+-# since July 1, 1919, p. 18.)  The time in St. Petersburg as capital of Russia
+-# was defined by Pulkov observatory, near St. Petersburg.  In 1916 LMT Moscow
++# (The info is from the book by Byalokoz ... p. 18.)
++# The time in St. Petersburg as capital of Russia was defined by
++# Pulkov observatory, near St. Petersburg.  In 1916 LMT Moscow
+ # was synchronized with LMT St. Petersburg (+30 minutes), (Pulkov observatory
+ # coordinates: 59 deg. 46'18.70", 30 deg. 19'40.70") so 30 deg. 19'40.70" >
+ # 2h01m18.7s = 2:01:19.  LMT Moscow = LMT St.Petersburg + 30m 2:01:19 + 0:30 =
+@@ -2290,14 +2525,14 @@
+ 
+ Zone Europe/Moscow	 2:30:17 -	LMT	1880
+ 			 2:30:17 -	MMT	1916 Jul  3 # Moscow Mean Time
+-			 2:31:19 Russia	%s	1919 Jul  1 2:00
++			 2:31:19 Russia	%s	1919 Jul  1  0:00u
+ 			 3:00	Russia	%s	1921 Oct
+ 			 3:00	Russia	MSK/MSD	1922 Oct
+ 			 2:00	-	EET	1930 Jun 21
+-			 3:00	Russia	MSK/MSD	1991 Mar 31 2:00s
+-			 2:00	Russia	EE%sT	1992 Jan 19 2:00s
+-			 3:00	Russia	MSK/MSD	2011 Mar 27 2:00s
+-			 4:00	-	MSK	2014 Oct 26 2:00s
++			 3:00	Russia	MSK/MSD	1991 Mar 31  2:00s
++			 2:00	Russia	EE%sT	1992 Jan 19  2:00s
++			 3:00	Russia	MSK/MSD	2011 Mar 27  2:00s
++			 4:00	-	MSK	2014 Oct 26  2:00s
+ 			 3:00	-	MSK
+ 
+ 
+@@ -2312,7 +2547,7 @@
+ 			 3:00	-	MSK	1941 Nov
+ 			 1:00	C-Eur	CE%sT	1944 Apr 13
+ 			 3:00	Russia	MSK/MSD	1990
+-			 3:00	-	MSK	1990 Jul  1 2:00
++			 3:00	-	MSK	1990 Jul  1  2:00
+ 			 2:00	-	EET	1992
+ # Central Crimea used Moscow time 1994/1997.
+ #
+@@ -2325,12 +2560,12 @@
+ # changed in May.
+ 			 2:00	E-Eur	EE%sT	1994 May
+ # From IATA SSIM (1994/1997), which also says that Kerch is still like Kiev.
+-			 3:00	E-Eur	MSK/MSD	1996 Mar 31 3:00s
+-			 3:00	1:00	MSD	1996 Oct 27 3:00s
++			 3:00	E-Eur	MSK/MSD	1996 Mar 31  0:00s
++			 3:00	1:00	MSD	1996 Oct 27  3:00s
+ # IATA SSIM (1997-09) says Crimea switched to EET/EEST.
+ # Assume it happened in March by not changing the clocks.
+ 			 3:00	Russia	MSK/MSD	1997
+-			 3:00	-	MSK	1997 Mar lastSun 1:00u
++			 3:00	-	MSK	1997 Mar lastSun  1:00u
+ # From Alexander Krivenyshev (2014-03-17):
+ # time change at 2:00 (2am) on March 30, 2014
+ # http://vz.ru/news/2014/3/17/677464.html
+@@ -2338,113 +2573,268 @@
+ # Simferopol and Sevastopol reportedly changed their central town clocks
+ # late the previous day, but this appears to have been ceremonial
+ # and the discrepancies are small enough to not worry about.
+-			 2:00	EU	EE%sT	2014 Mar 30 2:00
+-			 4:00	-	MSK	2014 Oct 26 2:00s
++			 2:00	EU	EE%sT	2014 Mar 30  2:00
++			 4:00	-	MSK	2014 Oct 26  2:00s
+ 			 3:00	-	MSK
+ 
+ 
+-# From Tim Parenti (2014-07-03):
+-# Europe/Volgograd covers...
+-# 30	RU-AST 	Astrakhan Oblast
+-# 34	RU-VGG 	Volgograd Oblast
+-# 43	RU-KIR 	Kirov Oblast
+-# 64	RU-SAR 	Saratov Oblast
+-
+-# From Paul Eggert (2006-05-09):
+-# Shanks & Pottenger say Kirov is still at +0400 but Wikipedia says +0300.
+-# Perhaps it switched after the others?  But we have no data.
++# From Paul Eggert (2016-03-18):
++# Europe/Astrakhan covers:
++# 30	RU-AST	Astrakhan Oblast
++#
++# The 1989 transition is from USSR act No. 227 (1989-03-14).
++
++# From Alexander Krivenyshev (2016-01-12):
++# On February 10, 2016 Astrakhan Oblast got approval by the Federation
++# Council to change its time zone to UTC+4 (from current UTC+3 Moscow time)....
++# This Federal Law shall enter into force on 27 March 2016 at 02:00.
++# From Matt Johnson (2016-03-09):
++# http://publication.pravo.gov.ru/Document/View/0001201602150056
++
++Zone Europe/Astrakhan	 3:12:12 -	LMT	1924 May
++			 3:00	-	+03	1930 Jun 21
++			 4:00	Russia	+04/+05	1989 Mar 26  2:00s
++			 3:00	Russia	+03/+04	1991 Mar 31  2:00s
++			 4:00	-	+04	1992 Mar 29  2:00s
++			 3:00	Russia	+03/+04	2011 Mar 27  2:00s
++			 4:00	-	+04	2014 Oct 26  2:00s
++			 3:00	-	+03	2016 Mar 27  2:00s
++			 4:00	-	+04
++
++# From Paul Eggert (2016-03-18):
++# Europe/Volgograd covers:
++# 34	RU-VGG	Volgograd Oblast
++# 64	RU-SAR	Saratov Oblast
++# The 1988 transition is from USSR act No. 5 (1988-01-04).
+ 
+ Zone Europe/Volgograd	 2:57:40 -	LMT	1920 Jan  3
+-			 3:00	-	TSAT	1925 Apr  6 # Tsaritsyn Time
+-			 3:00	-	STAT	1930 Jun 21 # Stalingrad Time
+-			 4:00	-	STAT	1961 Nov 11
+-			 4:00	Russia	VOL%sT	1989 Mar 26 2:00s # Volgograd T
+-			 3:00	Russia	VOL%sT	1991 Mar 31 2:00s
+-			 4:00	-	VOLT	1992 Mar 29 2:00s
+-			 3:00	Russia	MSK	2011 Mar 27 2:00s
+-			 4:00	-	MSK	2014 Oct 26 2:00s
+-			 3:00	-	MSK
+-
++			 3:00	-	+03	1930 Jun 21
++			 4:00	-	+04	1961 Nov 11
++			 4:00	Russia	+04/+05	1988 Mar 27  2:00s
++			 3:00	Russia	+03/+04	1991 Mar 31  2:00s
++			 4:00	-	+04	1992 Mar 29  2:00s
++			 3:00	Russia	+03/+04	2011 Mar 27  2:00s
++			 4:00	-	+04	2014 Oct 26  2:00s
++			 3:00	-	+03
++
++# From Paul Eggert (2016-03-18):
++# Europe/Kirov covers:
++# 43	RU-KIR	Kirov Oblast
++# The 1989 transition is from USSR act No. 227 (1989-03-14).
++#
++Zone Europe/Kirov	 3:18:48 -	LMT	1919 Jul  1  0:00u
++			 3:00	-	+03	1930 Jun 21
++			 4:00	Russia	+04/+05	1989 Mar 26  2:00s
++			 3:00	Russia	+03/+04	1991 Mar 31  2:00s
++			 4:00	-	+04	1992 Mar 29  2:00s
++			 3:00	Russia	+03/+04	2011 Mar 27  2:00s
++			 4:00	-	+04	2014 Oct 26  2:00s
++			 3:00	-	+03
+ 
+ # From Tim Parenti (2014-07-03), per Oscar van Vlijmen (2001-08-25):
+ # Europe/Samara covers...
+-# 18	RU-UD 	Udmurt Republic
+-# 63	RU-SAM 	Samara Oblast
+-
+-Zone Europe/Samara	 3:20:36 -	LMT	1919 Jul  1 2:00
+-			 3:00	-	SAMT	1930 Jun 21
+-			 4:00	-	SAMT	1935 Jan 27
+-			 4:00	Russia	KUY%sT	1989 Mar 26 2:00s # Kuybyshev
+-			 3:00	Russia	MSK/MSD	1991 Mar 31 2:00s
+-			 2:00	Russia	EE%sT	1991 Sep 29 2:00s
+-			 3:00	-	KUYT	1991 Oct 20 3:00
+-			 4:00	Russia	SAM%sT	2010 Mar 28 2:00s # Samara Time
+-			 3:00	Russia	SAM%sT	2011 Mar 27 2:00s
+-			 4:00	-	SAMT
++# 18	RU-UD	Udmurt Republic
++# 63	RU-SAM	Samara Oblast
+ 
++# From Paul Eggert (2016-03-18):
++# Byalokoz 1919 says Samara was 3:20:20.
++# The 1989 transition is from USSR act No. 227 (1989-03-14).
++
++Zone Europe/Samara	 3:20:20 -	LMT	1919 Jul  1  0:00u
++			 3:00	-	+03	1930 Jun 21
++			 4:00	-	+04	1935 Jan 27
++			 4:00	Russia	+04/+05	1989 Mar 26  2:00s
++			 3:00	Russia	+03/+04	1991 Mar 31  2:00s
++			 2:00	Russia	+02/+03	1991 Sep 29  2:00s
++			 3:00	-	+03	1991 Oct 20  3:00
++			 4:00	Russia	+04/+05	2010 Mar 28  2:00s
++			 3:00	Russia	+03/+04	2011 Mar 27  2:00s
++			 4:00	-	+04
++
++# From Paul Eggert (2016-03-18):
++# Europe/Ulyanovsk covers:
++# 73	RU-ULY	Ulyanovsk Oblast
++
++# The 1989 transition is from USSR act No. 227 (1989-03-14).
++
++# From Alexander Krivenyshev (2016-02-17):
++# Ulyanovsk ... on their way to change time zones by March 27, 2016 at 2am.
++# Ulyanovsk Oblast ... from MSK to MSK+1 (UTC+3 to UTC+4) ...
++# 920582-6 ... 02/17/2016 The State Duma passed the bill in the first reading.
++# From Matt Johnson (2016-03-09):
++# http://publication.pravo.gov.ru/Document/View/0001201603090051
++
++Zone Europe/Ulyanovsk	 3:13:36 -	LMT	1919 Jul  1  0:00u
++			 3:00	-	+03	1930 Jun 21
++			 4:00	Russia	+04/+05	1989 Mar 26  2:00s
++			 3:00	Russia	+03/+04	1991 Mar 31  2:00s
++			 2:00	Russia	+02/+03	1992 Jan 19  2:00s
++			 3:00	Russia	+03/+04	2011 Mar 27  2:00s
++			 4:00	-	+04	2014 Oct 26  2:00s
++			 3:00	-	+03	2016 Mar 27  2:00s
++			 4:00	-	+04
+ 
+ # From Tim Parenti (2014-07-03), per Oscar van Vlijmen (2001-08-25):
+ # Asia/Yekaterinburg covers...
+-# 02	RU-BA 	Bashkortostan, Republic of
+-# 90	RU-PER 	Perm Krai
+-# 45	RU-KGN 	Kurgan Oblast
+-# 56	RU-ORE 	Orenburg Oblast
+-# 66	RU-SVE 	Sverdlovsk Oblast
+-# 72	RU-TYU 	Tyumen Oblast
+-# 74	RU-CHE 	Chelyabinsk Oblast
+-# 86	RU-KHM 	Khanty-Mansi Autonomous Okrug - Yugra
+-# 89	RU-YAN 	Yamalo-Nenets Autonomous Okrug
++# 02	RU-BA	Bashkortostan, Republic of
++# 90	RU-PER	Perm Krai
++# 45	RU-KGN	Kurgan Oblast
++# 56	RU-ORE	Orenburg Oblast
++# 66	RU-SVE	Sverdlovsk Oblast
++# 72	RU-TYU	Tyumen Oblast
++# 74	RU-CHE	Chelyabinsk Oblast
++# 86	RU-KHM	Khanty-Mansi Autonomous Okrug - Yugra
++# 89	RU-YAN	Yamalo-Nenets Autonomous Okrug
+ #
+ # Note: Effective 2005-12-01, (59) Perm Oblast and (81) Komi-Permyak
+ # Autonomous Okrug merged to form (90, RU-PER) Perm Krai.
+ 
+-# Milne says Yekaterinburg time was 4:02:32.9; round to nearest.
+-
+-Zone Asia/Yekaterinburg	 4:02:33 -	LMT	1919 Jul 15 4:00
+-			 4:00	-	SVET	1930 Jun 21 # Sverdlovsk Time
+-			 5:00	Russia	SVE%sT	1991 Mar 31 2:00s
+-			 4:00	Russia	SVE%sT	1992 Jan 19 2:00s
+-			 5:00	Russia	YEK%sT	2011 Mar 27 2:00s
+-			 6:00	-	YEKT	2014 Oct 26 2:00s
+-			 5:00	-	YEKT
++# Milne says Yekaterinburg was 4:02:32.9; round to nearest.
++# Byalokoz 1919 says its provincial time was based on Perm, at 3:45:05.
++# Assume it switched on 1916-07-03, the time of the new standard.
++# The 1919 and 1930 transitions are from Shanks.
++
++Zone Asia/Yekaterinburg	 4:02:33 -	LMT	1916 Jul  3
++			 3:45:05 -	PMT	1919 Jul 15  4:00
++			 4:00	-	+04	1930 Jun 21
++			 5:00	Russia	+05/+06	1991 Mar 31  2:00s
++			 4:00	Russia	+04/+05	1992 Jan 19  2:00s
++			 5:00	Russia	+05/+06	2011 Mar 27  2:00s
++			 6:00	-	+06	2014 Oct 26  2:00s
++			 5:00	-	+05
+ 
+ 
+ # From Tim Parenti (2014-07-03), per Oscar van Vlijmen (2001-08-25):
+ # Asia/Omsk covers...
+-# 04	RU-AL 	Altai Republic
+-# 22	RU-ALT 	Altai Krai
+-# 55	RU-OMS 	Omsk Oblast
+-
+-Zone Asia/Omsk		 4:53:36 -	LMT	1919 Nov 14
+-			 5:00	-	OMST	1930 Jun 21 # Omsk Time
+-			 6:00	Russia	OMS%sT	1991 Mar 31 2:00s
+-			 5:00	Russia	OMS%sT	1992 Jan 19 2:00s
+-			 6:00	Russia	OMS%sT	2011 Mar 27 2:00s
+-			 7:00	-	OMST	2014 Oct 26 2:00s
+-			 6:00	-	OMST
++# 55	RU-OMS	Omsk Oblast
+ 
++# Byalokoz 1919 says Omsk was 4:53:30.
+ 
+-# From Tim Parenti (2014-07-03):
+-# Asia/Novosibirsk covers...
+-# 54	RU-NVS 	Novosibirsk Oblast
+-# 70	RU-TOM 	Tomsk Oblast
+-
+-# From Paul Eggert (2006-08-19): I'm guessing about Tomsk here; it's
+-# not clear when it switched from +7 to +6.
+-
+-Zone Asia/Novosibirsk	 5:31:40 -	LMT	1919 Dec 14 6:00
+-			 6:00	-	NOVT	1930 Jun 21 # Novosibirsk Time
+-			 7:00	Russia	NOV%sT	1991 Mar 31 2:00s
+-			 6:00	Russia	NOV%sT	1992 Jan 19 2:00s
+-			 7:00	Russia	NOV%sT	1993 May 23 # say Shanks & P.
+-			 6:00	Russia	NOV%sT	2011 Mar 27 2:00s
+-			 7:00	-	NOVT	2014 Oct 26 2:00s
+-			 6:00	-	NOVT
++Zone Asia/Omsk		 4:53:30 -	LMT	1919 Nov 14
++			 5:00	-	+05	1930 Jun 21
++			 6:00	Russia	+06/+07	1991 Mar 31  2:00s
++			 5:00	Russia	+05/+06	1992 Jan 19  2:00s
++			 6:00	Russia	+06/+07	2011 Mar 27  2:00s
++			 7:00	-	+07	2014 Oct 26  2:00s
++			 6:00	-	+06
++
++# From Paul Eggert (2016-02-22):
++# Asia/Barnaul covers:
++# 04	RU-AL	Altai Republic
++# 22	RU-ALT	Altai Krai
++
++# Data before 1991 are from Shanks & Pottenger.
++
++# From Stepan Golosunov (2016-03-07):
++# Letter of Bank of Russia from 1995-05-25
++# http://www.bestpravo.ru/rossijskoje/lj-akty/y3a.htm
++# suggests that Altai Republic transitioned to Moscow+3 on
++# 1995-05-28.
++#
++# http://regnum.ru/news/society/1957270.html
++# has some historical data for Altai Krai:
++# before 1957: west part on UTC+6, east on UTC+7
++# after 1957: UTC+7
++# since 1995: UTC+6
++# http://barnaul.rusplt.ru/index/pochemu_altajskij_kraj_okazalsja_v_neprivychnom_chasovom_pojase-17648.html
++# confirms that and provides more details including 1995-05-28 transition date.
++
++# From Alexander Krivenyshev (2016-02-17):
++# Altai Krai and Altai Republic on their way to change time zones
++# by March 27, 2016 at 2am....
++# Altai Republic / Gorno-Altaysk MSK+3 to MSK+4 (UTC+6 to UTC+7) ...
++# Altai Krai / Barnaul MSK+3 to MSK+4 (UTC+6 to UTC+7)
++# From Matt Johnson (2016-03-09):
++# http://publication.pravo.gov.ru/Document/View/0001201603090043
++# http://publication.pravo.gov.ru/Document/View/0001201603090038
++
++Zone Asia/Barnaul	 5:35:00 -	LMT	1919 Dec 10
++			 6:00	-	+06	1930 Jun 21
++			 7:00	Russia	+07/+08	1991 Mar 31  2:00s
++			 6:00	Russia	+06/+07	1992 Jan 19  2:00s
++			 7:00	Russia	+07/+08	1995 May 28
++			 6:00	Russia	+06/+07	2011 Mar 27  2:00s
++			 7:00	-	+07	2014 Oct 26  2:00s
++			 6:00	-	+06	2016 Mar 27  2:00s
++			 7:00	-	+07
++
++# From Paul Eggert (2016-03-18):
++# Asia/Novosibirsk covers:
++# 54	RU-NVS	Novosibirsk Oblast
++
++# From Stepan Golosunov (2016-05-30):
++# http://asozd2.duma.gov.ru/main.nsf/(Spravka)?OpenAgent&RN=1085784-6
++# moves Novosibirsk oblast from UTC+6 to UTC+7.
++# From Stepan Golosunov (2016-07-04):
++# The law was signed yesterday and published today on
++# http://publication.pravo.gov.ru/Document/View/0001201607040064
++
++Zone Asia/Novosibirsk	 5:31:40 -	LMT	1919 Dec 14  6:00
++			 6:00	-	+06	1930 Jun 21
++			 7:00	Russia	+07/+08	1991 Mar 31  2:00s
++			 6:00	Russia	+06/+07	1992 Jan 19  2:00s
++			 7:00	Russia	+07/+08	1993 May 23 # say Shanks & P.
++			 6:00	Russia	+06/+07	2011 Mar 27  2:00s
++			 7:00	-	+07	2014 Oct 26  2:00s
++			 6:00	-	+06	2016 Jul 24  2:00s
++			 7:00	-	+07
++
++# From Paul Eggert (2016-03-18):
++# Asia/Tomsk covers:
++# 70	RU-TOM	Tomsk Oblast
++
++# From Stepan Golosunov (2016-03-24):
++# Byalokoz listed Tomsk at 5:39:51.
++
++# From Stanislaw A. Kuzikowski (1994-06-29):
++# Tomsk is still 4 hours ahead of Moscow.
++
++# From Stepan Golosunov (2016-03-19):
++# http://pravo.gov.ru/proxy/ips/?docbody=&nd=102075743
++# (fifth time belt being UTC+5+1(decree time)
++# / UTC+5+1(decree time)+1(summer time)) ...
++# Note that time belts (numbered from 2 (Moscow) to 12 according to their
++# GMT/UTC offset and having too many exceptions like regions formally
++# belonging to one belt but using time from another) were replaced
++# with time zones in 2011 with different numbering (there was a
++# 2-hour gap between second and third zones in 2011-2014).
++
++# From Stepan Golosunov (2016-04-12):
++# http://asozd2.duma.gov.ru/main.nsf/(SpravkaNew)?OpenAgent&RN=1006865-6
++# This bill was approved in the first reading today.  It moves Tomsk oblast
++# from UTC+6 to UTC+7 and is supposed to come into effect on 2016-05-29 at
++# 2:00.  The bill needs to be approved in the second and the third readings by
++# the State Duma, approved by the Federation Council, signed by the President
++# and published to become a law.  Minor changes in the text are to be expected
++# before the second reading (references need to be updated to account for the
++# recent changes).
++#
++# Judging by the ultra-short one-day amendments period, recent similar laws,
++# the State Duma schedule and the Federation Council schedule
++# http://www.duma.gov.ru/legislative/planning/day-shedule/por_vesna_2016/
++# http://council.gov.ru/activity/meetings/schedule/63303
++# I speculate that the final text of the bill will be proposed tomorrow, the
++# bill will be approved in the second and the third readings on Friday,
++# approved by the Federation Council on 2016-04-20, signed by the President and
++# published as a law around 2016-04-26.
++
++# From Matt Johnson (2016-04-26):
++# http://publication.pravo.gov.ru/Document/View/0001201604260048
++
++Zone	Asia/Tomsk	 5:39:51 -	LMT	1919 Dec 22
++			 6:00	-	+06	1930 Jun 21
++			 7:00	Russia	+07/+08	1991 Mar 31  2:00s
++			 6:00	Russia	+06/+07	1992 Jan 19  2:00s
++			 7:00	Russia	+07/+08	2002 May  1  3:00
++			 6:00	Russia	+06/+07	2011 Mar 27  2:00s
++			 7:00	-	+07	2014 Oct 26  2:00s
++			 6:00	-	+06	2016 May 29  2:00s
++			 7:00	-	+07
+ 
+ 
+ # From Tim Parenti (2014-07-03):
+ # Asia/Novokuznetsk covers...
+-# 42	RU-KEM 	Kemerovo Oblast
++# 42	RU-KEM	Kemerovo Oblast
+ 
+ # From Alexander Krivenyshev (2009-10-13):
+ # Kemerovo oblast' (Kemerovo region) in Russia will change current time zone on
+@@ -2452,7 +2842,7 @@
+ # from current Russia Zone 6 - Krasnoyarsk Time Zone (KRA) UTC +0700
+ # to Russia Zone 5 - Novosibirsk Time Zone (NOV) UTC +0600
+ #
+-# This is according to Government of Russia decree # 740, on September
++# This is according to Government of Russia decree No. 740, on September
+ # 14, 2009 "Application in the territory of the Kemerovo region the Fifth
+ # time zone." ("Russia Zone 5" or old "USSR Zone 5" is GMT +0600)
+ #
+@@ -2464,81 +2854,87 @@
+ #
+ # Thus, when Russia will switch to DST on the night of March 28, 2010
+ # Kemerovo region (Kemerovo oblast') will not change the clock.
+-#
+-# As a result, Kemerovo oblast' will be in the same time zone as
+-# Novosibirsk, Omsk, Tomsk, Barnaul and Altai Republic.
+ 
+ # From Tim Parenti (2014-07-02), per Alexander Krivenyshev (2014-07-02):
+ # The Kemerovo region will remain at UTC+7 through the 2014-10-26 change, thus
+ # realigning itself with KRAT.
+ 
+-Zone Asia/Novokuznetsk	 5:48:48 -	NMT	1920 Jan  6
+-			 6:00	-	KRAT	1930 Jun 21 # Krasnoyarsk Time
+-			 7:00	Russia	KRA%sT	1991 Mar 31 2:00s
+-			 6:00	Russia	KRA%sT	1992 Jan 19 2:00s
+-			 7:00	Russia	KRA%sT	2010 Mar 28 2:00s
+-			 6:00	Russia	NOV%sT	2011 Mar 27 2:00s # Novosibirsk T
+-			 7:00	-	NOVT	2014 Oct 26 2:00s
+-			 7:00	-	KRAT	# Krasnoyarsk Time
+-
++Zone Asia/Novokuznetsk	 5:48:48 -	LMT	1924 May  1
++			 6:00	-	+06	1930 Jun 21
++			 7:00	Russia	+07/+08	1991 Mar 31  2:00s
++			 6:00	Russia	+06/+07	1992 Jan 19  2:00s
++			 7:00	Russia	+07/+08	2010 Mar 28  2:00s
++			 6:00	Russia	+06/+07	2011 Mar 27  2:00s
++			 7:00	-	+07
+ 
+ # From Tim Parenti (2014-07-03), per Oscar van Vlijmen (2001-08-25):
+ # Asia/Krasnoyarsk covers...
+-# 17	RU-TY 	Tuva Republic
+-# 19	RU-KK 	Khakassia, Republic of
+-# 24	RU-KYA 	Krasnoyarsk Krai
++# 17	RU-TY	Tuva Republic
++# 19	RU-KK	Khakassia, Republic of
++# 24	RU-KYA	Krasnoyarsk Krai
+ #
+ # Note: Effective 2007-01-01, (88) Evenk Autonomous Okrug and (84) Taymyr
+ # Autonomous Okrug were merged into (24, RU-KYA) Krasnoyarsk Krai.
+ 
+-Zone Asia/Krasnoyarsk	 6:11:20 -	LMT	1920 Jan  6
+-			 6:00	-	KRAT	1930 Jun 21 # Krasnoyarsk Time
+-			 7:00	Russia	KRA%sT	1991 Mar 31 2:00s
+-			 6:00	Russia	KRA%sT	1992 Jan 19 2:00s
+-			 7:00	Russia	KRA%sT	2011 Mar 27 2:00s
+-			 8:00	-	KRAT	2014 Oct 26 2:00s
+-			 7:00	-	KRAT
++# Byalokoz 1919 says Krasnoyarsk was 6:11:26.
++
++Zone Asia/Krasnoyarsk	 6:11:26 -	LMT	1920 Jan  6
++			 6:00	-	+06	1930 Jun 21
++			 7:00	Russia	+07/+08	1991 Mar 31  2:00s
++			 6:00	Russia	+06/+07	1992 Jan 19  2:00s
++			 7:00	Russia	+07/+08	2011 Mar 27  2:00s
++			 8:00	-	+08	2014 Oct 26  2:00s
++			 7:00	-	+07
+ 
+ 
+ # From Tim Parenti (2014-07-03), per Oscar van Vlijmen (2001-08-25):
+ # Asia/Irkutsk covers...
+-# 03	RU-BU 	Buryatia, Republic of
+-# 38	RU-IRK 	Irkutsk Oblast
++# 03	RU-BU	Buryatia, Republic of
++# 38	RU-IRK	Irkutsk Oblast
+ #
+ # Note: Effective 2008-01-01, (85) Ust-Orda Buryat Autonomous Okrug was
+ # merged into (38, RU-IRK) Irkutsk Oblast.
+ 
+-# Milne says Irkutsk time was 6:57:15.
+-
+-Zone Asia/Irkutsk	 6:57:15 -	LMT	1880
+-			 6:57:15 -	IMT	1920 Jan 25 # Irkutsk Mean Time
+-			 7:00	-	IRKT	1930 Jun 21 # Irkutsk Time
+-			 8:00	Russia	IRK%sT	1991 Mar 31 2:00s
+-			 7:00	Russia	IRK%sT	1992 Jan 19 2:00s
+-			 8:00	Russia	IRK%sT	2011 Mar 27 2:00s
+-			 9:00	-	IRKT	2014 Oct 26 2:00s
+-			 8:00	-	IRKT
++# Milne 1899 says Irkutsk was 6:57:15.
++# Byalokoz 1919 says Irkutsk was 6:57:05.
++# Go with Byalokoz.
++
++Zone Asia/Irkutsk	 6:57:05 -	LMT	1880
++			 6:57:05 -	IMT	1920 Jan 25 # Irkutsk Mean Time
++			 7:00	-	+07	1930 Jun 21
++			 8:00	Russia	+08/+09	1991 Mar 31  2:00s
++			 7:00	Russia	+07/+08	1992 Jan 19  2:00s
++			 8:00	Russia	+08/+09	2011 Mar 27  2:00s
++			 9:00	-	+09	2014 Oct 26  2:00s
++			 8:00	-	+08
+ 
+ 
+ # From Tim Parenti (2014-07-06):
+ # Asia/Chita covers...
+-# 92	RU-ZAB 	Zabaykalsky Krai
++# 92	RU-ZAB	Zabaykalsky Krai
+ #
+ # Note: Effective 2008-03-01, (75) Chita Oblast and (80) Agin-Buryat
+ # Autonomous Okrug merged to form (92, RU-ZAB) Zabaykalsky Krai.
+ 
++# From Alexander Krivenyshev (2016-01-02):
++# [The] time zone in the Trans-Baikal Territory (Zabaykalsky Krai) -
++# Asia/Chita [is changing] from UTC+8 to UTC+9.  Effective date will
++# be March 27, 2016 at 2:00am....
++# http://publication.pravo.gov.ru/Document/View/0001201512300107
++
+ Zone Asia/Chita	 7:33:52 -	LMT	1919 Dec 15
+-			 8:00	-	YAKT	1930 Jun 21 # Yakutsk Time
+-			 9:00	Russia	YAK%sT	1991 Mar 31 2:00s
+-			 8:00	Russia	YAK%sT	1992 Jan 19 2:00s
+-			 9:00	Russia	YAK%sT	2011 Mar 27 2:00s
+-			10:00	-	YAKT	2014 Oct 26 2:00s
+-			 8:00	-	IRKT
++			 8:00	-	+08	1930 Jun 21
++			 9:00	Russia	+09/+10	1991 Mar 31  2:00s
++			 8:00	Russia	+08/+09	1992 Jan 19  2:00s
++			 9:00	Russia	+09/+10	2011 Mar 27  2:00s
++			10:00	-	+10	2014 Oct 26  2:00s
++			 8:00	-	+08	2016 Mar 27  2:00
++			 9:00	-	+09
+ 
+ 
+ # From Tim Parenti (2014-07-03), per Oscar van Vlijmen (2009-11-29):
+ # Asia/Yakutsk covers...
+-# 28	RU-AMU 	Amur Oblast
++# 28	RU-AMU	Amur Oblast
+ #
+ # ...and parts of (14, RU-SA) Sakha (Yakutia) Republic:
+ # 14-02	****	Aldansky District
+@@ -2570,34 +2966,38 @@
+ # Since the surrounding districts of Sakha are all YAKT, assume this is, too.
+ # Also assume its history has been the same as the rest of Asia/Yakutsk.
+ 
+-Zone Asia/Yakutsk	 8:38:40 -	LMT	1919 Dec 15
+-			 8:00	-	YAKT	1930 Jun 21 # Yakutsk Time
+-			 9:00	Russia	YAK%sT	1991 Mar 31 2:00s
+-			 8:00	Russia	YAK%sT	1992 Jan 19 2:00s
+-			 9:00	Russia	YAK%sT	2011 Mar 27 2:00s
+-			10:00	-	YAKT	2014 Oct 26 2:00s
+-			 9:00	-	YAKT
++# Byalokoz 1919 says Yakutsk was 8:38:58.
++
++Zone Asia/Yakutsk	 8:38:58 -	LMT	1919 Dec 15
++			 8:00	-	+08	1930 Jun 21
++			 9:00	Russia	+09/+10	1991 Mar 31  2:00s
++			 8:00	Russia	+08/+09	1992 Jan 19  2:00s
++			 9:00	Russia	+09/+10	2011 Mar 27  2:00s
++			10:00	-	+10	2014 Oct 26  2:00s
++			 9:00	-	+09
+ 
+ 
+ # From Tim Parenti (2014-07-03), per Oscar van Vlijmen (2009-11-29):
+ # Asia/Vladivostok covers...
+-# 25	RU-PRI 	Primorsky Krai
+-# 27	RU-KHA 	Khabarovsk Krai
+-# 79	RU-YEV 	Jewish Autonomous Oblast
++# 25	RU-PRI	Primorsky Krai
++# 27	RU-KHA	Khabarovsk Krai
++# 79	RU-YEV	Jewish Autonomous Oblast
+ #
+ # ...and parts of (14, RU-SA) Sakha (Yakutia) Republic:
+ # 14-09	****	Verkhoyansky District
+ # 14-31	****	Ust-Yansky District
+ 
+-# Milne says Vladivostok time was 8:47:33.5; round to nearest.
+-
+-Zone Asia/Vladivostok	 8:47:34 -	LMT	1922 Nov 15
+-			 9:00	-	VLAT	1930 Jun 21 # Vladivostok Time
+-			10:00	Russia	VLA%sT	1991 Mar 31 2:00s
+-			 9:00	Russia	VLA%sT	1992 Jan 19 2:00s
+-			10:00	Russia	VLA%sT	2011 Mar 27 2:00s
+-			11:00	-	VLAT	2014 Oct 26 2:00s
+-			10:00	-	VLAT
++# Milne 1899 says Vladivostok was 8:47:33.5.
++# Byalokoz 1919 says Vladivostok was 8:47:31.
++# Go with Byalokoz.
++
++Zone Asia/Vladivostok	 8:47:31 -	LMT	1922 Nov 15
++			 9:00	-	+09	1930 Jun 21
++			10:00	Russia	+10/+11	1991 Mar 31  2:00s
++			 9:00	Russia	+09/+10	1992 Jan 19  2:00s
++			10:00	Russia	+10/+11	2011 Mar 27  2:00s
++			11:00	-	+11	2014 Oct 26  2:00s
++			10:00	-	+10
+ 
+ 
+ # From Tim Parenti (2014-07-03):
+@@ -2615,37 +3015,42 @@
+ # This transition is no doubt wrong, but we have no better info.
+ 
+ Zone Asia/Khandyga	 9:02:13 -	LMT	1919 Dec 15
+-			 8:00	-	YAKT	1930 Jun 21 # Yakutsk Time
+-			 9:00	Russia	YAK%sT	1991 Mar 31 2:00s
+-			 8:00	Russia	YAK%sT	1992 Jan 19 2:00s
+-			 9:00	Russia	YAK%sT	2004
+-			10:00	Russia	VLA%sT	2011 Mar 27 2:00s
+-			11:00	-	VLAT	2011 Sep 13 0:00s # Decree 725?
+-			10:00	-	YAKT	2014 Oct 26 2:00s
+-			 9:00	-	YAKT
++			 8:00	-	+08	1930 Jun 21
++			 9:00	Russia	+09/+10	1991 Mar 31  2:00s
++			 8:00	Russia	+08/+09	1992 Jan 19  2:00s
++			 9:00	Russia	+09/+10	2004
++			10:00	Russia	+10/+11	2011 Mar 27  2:00s
++			11:00	-	+11	2011 Sep 13  0:00s # Decree 725?
++			10:00	-	+10	2014 Oct 26  2:00s
++			 9:00	-	+09
+ 
+ 
+ # From Tim Parenti (2014-07-03):
+ # Asia/Sakhalin covers...
+-# 65	RU-SAK 	Sakhalin Oblast
++# 65	RU-SAK	Sakhalin Oblast
+ # ...with the exception of:
+ # 65-11	****	Severo-Kurilsky District (North Kuril Islands)
+ 
++# From Matt Johnson (2016-02-22):
++# Asia/Sakhalin is moving (in entirety) from UTC+10 to UTC+11 ...
++# (2016-03-09):
++# http://publication.pravo.gov.ru/Document/View/0001201603090044
++
+ # The Zone name should be Asia/Yuzhno-Sakhalinsk, but that's too long.
+ Zone Asia/Sakhalin	 9:30:48 -	LMT	1905 Aug 23
+-			 9:00	-	JCST	1937 Oct  1
+-			 9:00	-	JST	1945 Aug 25
+-			11:00	Russia	SAK%sT	1991 Mar 31 2:00s # Sakhalin T.
+-			10:00	Russia	SAK%sT	1992 Jan 19 2:00s
+-			11:00	Russia	SAK%sT	1997 Mar lastSun 2:00s
+-			10:00	Russia	SAK%sT	2011 Mar 27 2:00s
+-			11:00	-	SAKT	2014 Oct 26 2:00s
+-			10:00	-	SAKT
++			 9:00	-	+09	1945 Aug 25
++			11:00	Russia	+11/+12	1991 Mar 31  2:00s # Sakhalin T
++			10:00	Russia	+10/+11	1992 Jan 19  2:00s
++			11:00	Russia	+11/+12	1997 Mar lastSun  2:00s
++			10:00	Russia	+10/+11	2011 Mar 27  2:00s
++			11:00	-	+11	2014 Oct 26  2:00s
++			10:00	-	+10	2016 Mar 27  2:00s
++			11:00	-	+11
+ 
+ 
+ # From Tim Parenti (2014-07-03), per Oscar van Vlijmen (2009-11-29):
+ # Asia/Magadan covers...
+-# 49	RU-MAG 	Magadan Oblast
++# 49	RU-MAG	Magadan Oblast
+ 
+ # From Tim Parenti (2014-07-06), per Alexander Krivenyshev (2014-07-02):
+ # Magadan Oblast is moving from UTC+12 to UTC+10 on 2014-10-26; however,
+@@ -2654,13 +3059,22 @@
+ # until now by Asia/Magadan, will instead move to UTC+11.  These regions will
+ # need their own zone.
+ 
++# From Alexander Krivenyshev (2016-03-27):
++# ... draft bill 948300-6 to change its time zone from UTC+10 to UTC+11 ...
++# will take ... effect ... on April 24, 2016 at 2 o'clock
++#
++# From Matt Johnson (2016-04-05):
++# ... signed by the President today ...
++# http://publication.pravo.gov.ru/Document/View/0001201604050038
++
+ Zone Asia/Magadan	10:03:12 -	LMT	1924 May  2
+-			10:00	-	MAGT	1930 Jun 21 # Magadan Time
+-			11:00	Russia	MAG%sT	1991 Mar 31 2:00s
+-			10:00	Russia	MAG%sT	1992 Jan 19 2:00s
+-			11:00	Russia	MAG%sT	2011 Mar 27 2:00s
+-			12:00	-	MAGT	2014 Oct 26 2:00s
+-			10:00	-	MAGT
++			10:00	-	+10	1930 Jun 21 # Magadan Time
++			11:00	Russia	+11/+12	1991 Mar 31  2:00s
++			10:00	Russia	+10/+11	1992 Jan 19  2:00s
++			11:00	Russia	+11/+12	2011 Mar 27  2:00s
++			12:00	-	+12	2014 Oct 26  2:00s
++			10:00	-	+10	2016 Apr 24  2:00s
++			11:00	-	+11
+ 
+ 
+ # From Tim Parenti (2014-07-06):
+@@ -2703,17 +3117,14 @@
+ # in Russian.)  In addition, Srednekolymsk appears to be a much older
+ # settlement and the population of Zyryanka seems to be declining.
+ # Go with Srednekolymsk.
+-#
+-# Since Magadan Oblast moves to UTC+10 on 2014-10-26, we cannot keep using MAGT
+-# as the abbreviation.  Use SRET instead.
+ 
+ Zone Asia/Srednekolymsk	10:14:52 -	LMT	1924 May  2
+-			10:00	-	MAGT	1930 Jun 21 # Magadan Time
+-			11:00	Russia	MAG%sT	1991 Mar 31 2:00s
+-			10:00	Russia	MAG%sT	1992 Jan 19 2:00s
+-			11:00	Russia	MAG%sT	2011 Mar 27 2:00s
+-			12:00	-	MAGT	2014 Oct 26 2:00s
+-			11:00	-	SRET # Srednekolymsk Time
++			10:00	-	+10	1930 Jun 21
++			11:00	Russia	+11/+12	1991 Mar 31  2:00s
++			10:00	Russia	+10/+11	1992 Jan 19  2:00s
++			11:00	Russia	+11/+12	2011 Mar 27  2:00s
++			12:00	-	+12	2014 Oct 26  2:00s
++			11:00	-	+11
+ 
+ 
+ # From Tim Parenti (2014-07-03):
+@@ -2731,19 +3142,19 @@
+ # UTC+12 since at least then, too.
+ 
+ Zone Asia/Ust-Nera	 9:32:54 -	LMT	1919 Dec 15
+-			 8:00	-	YAKT	1930 Jun 21 # Yakutsk Time
+-			 9:00	Russia	YAKT	1981 Apr  1
+-			11:00	Russia	MAG%sT	1991 Mar 31 2:00s
+-			10:00	Russia	MAG%sT	1992 Jan 19 2:00s
+-			11:00	Russia	MAG%sT	2011 Mar 27 2:00s
+-			12:00	-	MAGT	2011 Sep 13 0:00s # Decree 725?
+-			11:00	-	VLAT	2014 Oct 26 2:00s
+-			10:00	-	VLAT
++			 8:00	-	+08	1930 Jun 21
++			 9:00	Russia	+09/+10	1981 Apr  1
++			11:00	Russia	+11/+12	1991 Mar 31  2:00s
++			10:00	Russia	+10/+11	1992 Jan 19  2:00s
++			11:00	Russia	+11/+12	2011 Mar 27  2:00s
++			12:00	-	+12	2011 Sep 13  0:00s # Decree 725?
++			11:00	-	+11	2014 Oct 26  2:00s
++			10:00	-	+10
+ 
+ 
+ # From Tim Parenti (2014-07-03), per Oscar van Vlijmen (2001-08-25):
+ # Asia/Kamchatka covers...
+-# 91	RU-KAM 	Kamchatka Krai
++# 91	RU-KAM	Kamchatka Krai
+ #
+ # Note: Effective 2007-07-01, (41) Kamchatka Oblast and (82) Koryak
+ # Autonomous Okrug merged to form (91, RU-KAM) Kamchatka Krai.
+@@ -2751,26 +3162,26 @@
+ # The Zone name should be Asia/Petropavlovsk-Kamchatski or perhaps
+ # Asia/Petropavlovsk-Kamchatsky, but these are too long.
+ Zone Asia/Kamchatka	10:34:36 -	LMT	1922 Nov 10
+-			11:00	-	PETT	1930 Jun 21 # P-K Time
+-			12:00	Russia	PET%sT	1991 Mar 31 2:00s
+-			11:00	Russia	PET%sT	1992 Jan 19 2:00s
+-			12:00	Russia	PET%sT	2010 Mar 28 2:00s
+-			11:00	Russia	PET%sT	2011 Mar 27 2:00s
+-			12:00	-	PETT
++			11:00	-	+11	1930 Jun 21
++			12:00	Russia	+12/+13	1991 Mar 31  2:00s
++			11:00	Russia	+11/+12	1992 Jan 19  2:00s
++			12:00	Russia	+12/+13	2010 Mar 28  2:00s
++			11:00	Russia	+11/+12	2011 Mar 27  2:00s
++			12:00	-	+12
+ 
+ 
+ # From Tim Parenti (2014-07-03):
+ # Asia/Anadyr covers...
+-# 87	RU-CHU 	Chukotka Autonomous Okrug
++# 87	RU-CHU	Chukotka Autonomous Okrug
+ 
+ Zone Asia/Anadyr	11:49:56 -	LMT	1924 May  2
+-			12:00	-	ANAT	1930 Jun 21 # Anadyr Time
+-			13:00	Russia	ANA%sT	1982 Apr  1 0:00s
+-			12:00	Russia	ANA%sT	1991 Mar 31 2:00s
+-			11:00	Russia	ANA%sT	1992 Jan 19 2:00s
+-			12:00	Russia	ANA%sT	2010 Mar 28 2:00s
+-			11:00	Russia	ANA%sT	2011 Mar 27 2:00s
+-			12:00	-	ANAT
++			12:00	-	+12	1930 Jun 21
++			13:00	Russia	+13/+14	1982 Apr  1  0:00s
++			12:00	Russia	+12/+13	1991 Mar 31  2:00s
++			11:00	Russia	+11/+12	1992 Jan 19  2:00s
++			12:00	Russia	+12/+13	2010 Mar 28  2:00s
++			11:00	Russia	+11/+12	2011 Mar 27  2:00s
++			12:00	-	+12
+ 
+ 
+ # San Marino
+@@ -2781,7 +3192,7 @@
+ Zone	Europe/Belgrade	1:22:00	-	LMT	1884
+ 			1:00	-	CET	1941 Apr 18 23:00
+ 			1:00	C-Eur	CE%sT	1945
+-			1:00	-	CET	1945 May 8 2:00s
++			1:00	-	CET	1945 May  8  2:00s
+ 			1:00	1:00	CEST	1945 Sep 16  2:00s
+ # Metod Koželj reports that the legal date of
+ # transition to EU rules was 1982-11-27, for all of Yugoslavia at the time.
+@@ -2861,13 +3272,13 @@
+ 			 0:00	1:00	WEST	1918 Oct  7 23:00
+ 			 0:00	-	WET	1924
+ 			 0:00	Spain	WE%sT	1929
+-			 0:00 SpainAfrica WE%sT 1984 Mar 16
++			 0:00 SpainAfrica WE%sT	1984 Mar 16
+ 			 1:00	-	CET	1986
+ 			 1:00	EU	CE%sT
+ Zone	Atlantic/Canary	-1:01:36 -	LMT	1922 Mar # Las Palmas de Gran C.
+-			-1:00	-	CANT	1946 Sep 30 1:00 # Canaries Time
+-			 0:00	-	WET	1980 Apr  6 0:00s
+-			 0:00	1:00	WEST	1980 Sep 28 0:00s
++			-1:00	-	CANT	1946 Sep 30  1:00 # Canaries T
++			 0:00	-	WET	1980 Apr  6  0:00s
++			 0:00	1:00	WEST	1980 Sep 28  1:00u
+ 			 0:00	EU	WE%sT
+ # IATA SSIM (1996-09) says the Canaries switch at 2:00u, not 1:00u.
+ # Ignore this for now, as the Canaries are part of the EU.
+@@ -2920,9 +3331,9 @@
+ 
+ # Zone	NAME		GMTOFF	RULES	FORMAT	[UNTIL]
+ Zone Europe/Stockholm	1:12:12 -	LMT	1879 Jan  1
+-			1:00:14	-	SET	1900 Jan  1	# Swedish Time
++			1:00:14	-	SET	1900 Jan  1 # Swedish Time
+ 			1:00	-	CET	1916 May 14 23:00
+-			1:00	1:00	CEST	1916 Oct  1 01:00
++			1:00	1:00	CEST	1916 Oct  1  1:00
+ 			1:00	-	CET	1980
+ 			1:00	EU	CE%sT
+ 
+@@ -2991,7 +3402,7 @@
+ 
+ # From Pierre-Yves Berger (2013-09-11):
+ # the "Circulaire du conseil fédéral" (December 11 1893)
+-# <http://www.amtsdruckschriften.bar.admin.ch/viewOrigDoc.do?id=10071353> ...
++# http://www.amtsdruckschriften.bar.admin.ch/viewOrigDoc.do?id=10071353
+ # clearly states that the [1894-06-01] change should be done at midnight
+ # but if no one is present after 11 at night, could be postponed until one
+ # hour before the beginning of service.
+@@ -3023,28 +3434,30 @@
+ Rule	Swiss	1941	1942	-	Oct	Mon>=1	2:00	0	-
+ # Zone	NAME		GMTOFF	RULES	FORMAT	[UNTIL]
+ Zone	Europe/Zurich	0:34:08 -	LMT	1853 Jul 16 # See above comment.
+-			0:29:46	-	BMT	1894 Jun # Bern Mean Time
++			0:29:46	-	BMT	1894 Jun    # Bern Mean Time
+ 			1:00	Swiss	CE%sT	1981
+ 			1:00	EU	CE%sT
+ 
+ # Turkey
+ 
+-# From Amar Devegowda (2007-01-03):
+-# The time zone rules for Istanbul, Turkey have not been changed for years now.
+-# ... The latest rules are available at:
+-# http://www.timeanddate.com/worldclock/timezone.html?n=107
+-# From Steffen Thorsen (2007-01-03):
+-# I have been able to find press records back to 1996 which all say that
+-# DST started 01:00 local time and end at 02:00 local time.  I am not sure
+-# what happened before that.  One example for each year from 1996 to 2001:
+-# http://newspot.byegm.gov.tr/arsiv/1996/21/N4.htm
+-# http://www.byegm.gov.tr/YAYINLARIMIZ/CHR/ING97/03/97X03X25.TXT
+-# http://www.byegm.gov.tr/YAYINLARIMIZ/CHR/ING98/03/98X03X02.HTM
+-# http://www.byegm.gov.tr/YAYINLARIMIZ/CHR/ING99/10/99X10X26.HTM#%2016
+-# http://www.byegm.gov.tr/YAYINLARIMIZ/CHR/ING2000/03/00X03X06.HTM#%2021
+-# http://www.byegm.gov.tr/YAYINLARIMIZ/CHR/ING2001/03/23x03x01.HTM#%2027
+-# From Paul Eggert (2007-01-03):
+-# Prefer the above source to Shanks & Pottenger for time stamps after 1990.
++# From Kıvanç Yazan (2016-09-25):
++# 1) For 1986-2006, DST started at 01:00 local and ended at 02:00 local, with
++#    no exceptions.
++# 2) 1994's lastSun was overridden with Mar 20 ...
++# Here are official papers:
++# http://www.resmigazete.gov.tr/arsiv/19032.pdf  - page 2 for 1986
++# http://www.resmigazete.gov.tr/arsiv/19400.pdf  - page 4 for 1987
++# http://www.resmigazete.gov.tr/arsiv/19752.pdf  - page 15 for 1988
++# http://www.resmigazete.gov.tr/arsiv/20102.pdf  - page 6 for 1989
++# http://www.resmigazete.gov.tr/arsiv/20464.pdf  - page 1 for 1990 - 1992
++# http://www.resmigazete.gov.tr/arsiv/21531.pdf  - page 15 for 1993 - 1995
++# http://www.resmigazete.gov.tr/arsiv/21879.pdf  - page 1 for overriding 1994
++# http://www.resmigazete.gov.tr/arsiv/22588.pdf  - page 1 for 1996, 1997
++# http://www.resmigazete.gov.tr/arsiv/23286.pdf  - page 10 for 1998 - 2000
++# http://www.resmigazete.gov.tr/eskiler/2001/03/20010324.htm#2  - for 2001
++# http://www.resmigazete.gov.tr/eskiler/2002/03/20020316.htm#2  - for 2002-2006
++# From Paul Eggert (2016-09-25):
++# Prefer the above sources to Shanks & Pottenger for time stamps after 1985.
+ 
+ # From Steffen Thorsen (2007-03-09):
+ # Starting 2007 though, it seems that they are adopting EU's 1:00 UTC
+@@ -3080,6 +3493,25 @@
+ # http://www.balkaneu.com/eventful-elections-turkey/ 2014-03-30.
+ # I guess the best we can do is document the official time.
+ 
++# From Fatih (2015-09-29):
++# It's officially announced now by the Ministry of Energy.
++# Turkey delays winter time to 8th of November 04:00
++# http://www.aa.com.tr/tr/turkiye/yaz-saati-uygulamasi-8-kasimda-sona-erecek/362217
++#
++# From BBC News (2015-10-25):
++# Confused Turks are asking "what's the time?" after automatic clocks defied a
++# government decision ... "For the next two weeks #Turkey is on EEST... Erdogan
++# Engineered Standard Time," said Twitter user @aysekarahasan.
++# http://www.bbc.com/news/world-europe-34631326
++
++# From Burak AYDIN (2016-09-08):
++# Turkey will stay in Daylight Saving Time even in winter....
++# http://www.resmigazete.gov.tr/eskiler/2016/09/20160908-2.pdf
++#
++# From Paul Eggert (2016-09-07):
++# The change is permanent, so this is the new standard time in Turkey.
++# It takes effect today, which is not much notice.
++
+ # Rule	NAME	FROM	TO	TYPE	IN	ON	AT	SAVE	LETTER/S
+ Rule	Turkey	1916	only	-	May	 1	0:00	1:00	S
+ Rule	Turkey	1916	only	-	Oct	 1	0:00	0	-
+@@ -3134,22 +3566,25 @@
+ Rule	Turkey	1983	only	-	Oct	 2	0:00	0	-
+ Rule	Turkey	1985	only	-	Apr	20	0:00	1:00	S
+ Rule	Turkey	1985	only	-	Sep	28	0:00	0	-
+-Rule	Turkey	1986	1990	-	Mar	lastSun	2:00s	1:00	S
+-Rule	Turkey	1986	1990	-	Sep	lastSun	2:00s	0	-
+-Rule	Turkey	1991	2006	-	Mar	lastSun	1:00s	1:00	S
+-Rule	Turkey	1991	1995	-	Sep	lastSun	1:00s	0	-
++Rule	Turkey	1986	1993	-	Mar	lastSun	1:00s	1:00	S
++Rule	Turkey	1986	1995	-	Sep	lastSun	1:00s	0	-
++Rule	Turkey	1994	only	-	Mar	20	1:00s	1:00	S
++Rule	Turkey	1995	2006	-	Mar	lastSun	1:00s	1:00	S
+ Rule	Turkey	1996	2006	-	Oct	lastSun	1:00s	0	-
+ # Zone	NAME		GMTOFF	RULES	FORMAT	[UNTIL]
+ Zone	Europe/Istanbul	1:55:52 -	LMT	1880
+ 			1:56:56	-	IMT	1910 Oct # Istanbul Mean Time?
+ 			2:00	Turkey	EE%sT	1978 Oct 15
+-			3:00	Turkey	TR%sT	1985 Apr 20 # Turkey Time
++			3:00	Turkey	+03/+04	1985 Apr 20
+ 			2:00	Turkey	EE%sT	2007
+-			2:00	EU	EE%sT	2011 Mar 27 1:00u
+-			2:00	-	EET	2011 Mar 28 1:00u
+-			2:00	EU	EE%sT	2014 Mar 30 1:00u
+-			2:00	-	EET	2014 Mar 31 1:00u
+-			2:00	EU	EE%sT
++			2:00	EU	EE%sT	2011 Mar 27  1:00u
++			2:00	-	EET	2011 Mar 28  1:00u
++			2:00	EU	EE%sT	2014 Mar 30  1:00u
++			2:00	-	EET	2014 Mar 31  1:00u
++			2:00	EU	EE%sT	2015 Oct 25  1:00u
++			2:00	1:00	EEST	2015 Nov  8  1:00u
++			2:00	EU	EE%sT	2016 Sep  7
++			3:00	-	+03
+ Link	Europe/Istanbul	Asia/Istanbul	# Istanbul is in both continents.
+ 
+ # Ukraine
+@@ -3157,7 +3592,7 @@
+ # From Igor Karpov, who works for the Ukrainian Ministry of Justice,
+ # via Garrett Wollman (2003-01-27):
+ # BTW, I've found the official document on this matter. It's government
+-# regulations number 509, May 13, 1996. In my poor translation it says:
++# regulations No. 509, May 13, 1996. In my poor translation it says:
+ # "Time in Ukraine is set to second timezone (Kiev time). Each last Sunday
+ # of March at 3am the time is changing to 4am and each last Sunday of
+ # October the time at 4am is changing to 3am"
+@@ -3166,7 +3601,7 @@
+ # On September 20, 2011 the deputies of the Verkhovna Rada agreed to
+ # abolish the transfer clock to winter time.
+ #
+-# Bill number 8330 of MP from the Party of Regions Oleg Nadoshi got
++# Bill No. 8330 of MP from the Party of Regions Oleg Nadoshi got
+ # approval from 266 deputies.
+ #
+ # Ukraine abolishes transfer back to the winter time (in Russian)
+@@ -3230,8 +3665,8 @@
+ 			2:00	-	EET	1930 Jun 21
+ 			3:00	-	MSK	1941 Sep 20
+ 			1:00	C-Eur	CE%sT	1943 Nov  6
+-			3:00	Russia	MSK/MSD	1990 Jul  1 2:00
+-			2:00	1:00	EEST	1991 Sep 29 3:00
++			3:00	Russia	MSK/MSD	1990 Jul  1  2:00
++			2:00	1:00	EEST	1991 Sep 29  3:00
+ 			2:00	E-Eur	EE%sT	1995
+ 			2:00	EU	EE%sT
+ # Ruthenia used CET 1990/1991.
+@@ -3243,8 +3678,8 @@
+ 			1:00	1:00	CEST	1944 Oct 26
+ 			1:00	-	CET	1945 Jun 29
+ 			3:00	Russia	MSK/MSD	1990
+-			3:00	-	MSK	1990 Jul  1 2:00
+-			1:00	-	CET	1991 Mar 31 3:00
++			3:00	-	MSK	1990 Jul  1  2:00
++			1:00	-	CET	1991 Mar 31  3:00
+ 			2:00	-	EET	1992
+ 			2:00	E-Eur	EE%sT	1995
+ 			2:00	EU	EE%sT
+@@ -3258,7 +3693,7 @@
+ 			2:00	-	EET	1930 Jun 21
+ 			3:00	-	MSK	1941 Aug 25
+ 			1:00	C-Eur	CE%sT	1943 Oct 25
+-			3:00	Russia	MSK/MSD	1991 Mar 31 2:00
++			3:00	Russia	MSK/MSD	1991 Mar 31  2:00
+ 			2:00	E-Eur	EE%sT	1995
+ 			2:00	EU	EE%sT
+ 
+@@ -3284,7 +3719,7 @@
+ # ...
+ #
+ # ...the European time rules are...standardized since 1981, when
+-# most European coun[tr]ies started DST.  Before that year, only
++# most European countries started DST.  Before that year, only
+ # a few countries (UK, France, Italy) had DST, each according
+ # to own national rules.  In 1981, however, DST started on
+ # 'Apr firstSun', and not on 'Mar lastSun' as in the following
+--- contrib/tzdata/factory.orig
++++ contrib/tzdata/factory
+@@ -1,9 +1,10 @@
+ # This file is in the public domain, so clarified as of
+ # 2009-05-17 by Arthur David Olson.
+ 
+-# For companies who don't want to put time zone specification in
+-# their installation procedures.  When users run date, they'll get the message.
+-# Also useful for the "comp.sources" version.
++# For distributors who don't want to put time zone specification in
++# their installation procedures.  Users that run 'date' will get the
++# time zone abbreviation "-00", indicating that the actual time zone
++# is unknown.
+ 
+ # Zone	NAME	GMTOFF	RULES	FORMAT
+ Zone	Factory	0	- "Local time zone must be set--use tzsetup"
+--- contrib/tzdata/leap-seconds.list.orig
++++ contrib/tzdata/leap-seconds.list
+@@ -47,7 +47,7 @@
+ #	and can be ignored for many purposes. These differences
+ #	are tabulated in Circular T, which is published monthly
+ #	by the International Bureau of Weights and Measures
+-#	(BIPM). See www.bipm.fr for more information.
++#	(BIPM). See www.bipm.org for more information.
+ #
+ #	3. The current definition of the relationship between UTC
+ #	and TAI dates from 1 January 1972. A number of different
+@@ -127,6 +127,15 @@
+ #	with, since the difficulty of unambiguously representing the epoch
+ #	during the leap second does not arise.
+ #
++#	Some systems implement leap seconds by amortizing the leap second
++#	over the last few minutes of the day. The frequency of the local
++#	clock is decreased (or increased) to realize the positive (or
++#	negative) leap second. This method removes the time step described
++#	above. Although the long-term behavior of the time scale is correct
++#	in this case, this method introduces an error during the adjustment
++#	period both in time and in frequency with respect to the official
++#	definition of UTC.
++#
+ #	Questions or comments to:
+ #		Judah Levine
+ #		Time and Frequency Division
+@@ -134,7 +143,7 @@
+ #		Boulder, Colorado
+ #		Judah.Levine@nist.gov
+ #
+-#	Last Update of leap second values:   11 January 2012
++#	Last Update of leap second values:   8 July 2016
+ #
+ #	The following line shows this last update date in NTP timestamp
+ #	format. This is the date on which the most recent change to
+@@ -142,7 +151,7 @@
+ #	be identified by the unique pair of characters in the first two
+ #	columns as shown below.
+ #
+-#$	 3535228800
++#$	 3676924800
+ #
+ #	The NTP timestamps are in units of seconds since the NTP epoch,
+ #	which is 1 January 1900, 00:00:00. The Modified Julian Day number
+@@ -190,10 +199,10 @@
+ #	current -- the update time stamp, the data and the name of the file
+ #	will not change.
+ #
+-#	Updated through IERS Bulletin C48
+-#	File expires on:  28 June 2015
++#	Updated through IERS Bulletin C52
++#	File expires on:  28 June 2017
+ #
+-#@	3644438400
++#@	3707596800
+ #
+ 2272060800	10	# 1 Jan 1972
+ 2287785600	11	# 1 Jul 1972
+@@ -221,6 +230,8 @@
+ 3345062400	33	# 1 Jan 2006
+ 3439756800	34	# 1 Jan 2009
+ 3550089600	35	# 1 Jul 2012
++3644697600	36	# 1 Jul 2015
++3692217600	37	# 1 Jan 2017
+ #
+ #	the following special comment contains the
+ #	hash value of the data in this file computed
+@@ -236,4 +247,4 @@
+ #	the hash line is also ignored in the
+ #	computation.
+ #
+-#h	a4862ccd c6f43c6 964f3604 85944a26 b5cfad4e
++#h	dacf2c42 2c4765d6 3c797af8 2cf630eb 699c8c67
+--- contrib/tzdata/leapseconds.orig
++++ contrib/tzdata/leapseconds
+@@ -1,14 +1,21 @@
+-# <pre>
+-# This file is in the public domain, so clarified as of
+-# 2009-05-17 by Arthur David Olson.
++# Allowance for leap seconds added to each time zone file.
+ 
+-# Allowance for leapseconds added to each timezone file.
++# This file is in the public domain.
+ 
+-# The International Earth Rotation Service periodically uses leap seconds
+-# to keep UTC to within 0.9 s of UT1
++# This file is generated automatically from the data in the public-domain
++# leap-seconds.list file available from most NIST time servers.
++# If the URL <ftp://time.nist.gov/pub/leap-seconds.list> does not work,
++# you should be able to pick up leap-seconds.list from a secondary NIST server.
++# See <http://tf.nist.gov/tf-cgi/servers.cgi> for a list of secondary servers.
++# For more about leap-seconds.list, please see
++# The NTP Timescale and Leap Seconds
++# http://www.eecis.udel.edu/~mills/leap.html
++
++# The International Earth Rotation and Reference Systems Service
++# periodically uses leap seconds to keep UTC to within 0.9 s of UT1
+ # (which measures the true angular orientation of the earth in space); see
+ # Terry J Quinn, The BIPM and the accurate measure of time,
+-# Proc IEEE 79, 7 (July 1991), 894-905.
++# Proc IEEE 79, 7 (July 1991), 894-905 <http://dx.doi.org/10.1109/5.84965>.
+ # There were no leap seconds before 1972, because the official mechanism
+ # accounting for the discrepancy between atomic time and the earth's rotation
+ # did not exist until the early 1970s.
+@@ -19,8 +26,8 @@
+ # or
+ #	Leap	YEAR	MON	DAY	23:59:59	-	R/S
+ 
+-# If the leapsecond is Rolling (R) the given time is local time
+-# If the leapsecond is Stationary (S) the given time is UTC
++# If the leapsecond is Rolling (R) the given time is local time.
++# If the leapsecond is Stationary (S) the given time is UTC.
+ 
+ # Leap	YEAR	MONTH	DAY	HH:MM:SS	CORR	R/S
+ Leap	1972	Jun	30	23:59:60	+	S
+@@ -48,53 +55,8 @@
+ Leap	2005	Dec	31	23:59:60	+	S
+ Leap	2008	Dec	31	23:59:60	+	S
+ Leap	2012	Jun	30	23:59:60	+	S
++Leap	2015	Jun	30	23:59:60	+	S
++Leap	2016	Dec	31	23:59:60	+	S
+ 
+-# INTERNATIONAL EARTH ROTATION AND REFERENCE SYSTEMS SERVICE (IERS)
+-#
+-# SERVICE INTERNATIONAL DE LA ROTATION TERRESTRE ET DES SYSTEMES DE REFERENCE
+-#
+-#
+-# SERVICE DE LA ROTATION TERRESTRE
+-# OBSERVATOIRE DE PARIS
+-# 61, Av. de l'Observatoire 75014 PARIS (France)
+-# Tel.      : 33 (0) 1 40 51 22 26
+-# FAX       : 33 (0) 1 40 51 22 91
+-# e-mail    : (E-Mail Removed)
+-# http://hpiers.obspm.fr/eop-pc
+-#
+-# Paris, 5 January 2012
+-#
+-#
+-# Bulletin C 43
+-#
+-# To authorities responsible
+-# for the measurement and
+-# distribution of time
+-#
+-#
+-# UTC TIME STEP
+-# on the 1st of July 2012
+-#
+-#
+-# A positive leap second will be introduced at the end of June 2012.
+-# The sequence of dates of the UTC second markers will be:
+-#
+-#                          2012 June 30,     23h 59m 59s
+-#                          2012 June 30,     23h 59m 60s
+-#                          2012 July  1,      0h  0m  0s
+-#
+-# The difference between UTC and the International Atomic Time TAI is:
+-#
+-# from 2009 January 1, 0h UTC, to 2012 July 1  0h UTC  : UTC-TAI = - 34s
+-# from 2012 July 1,    0h UTC, until further notice    : UTC-TAI = - 35s
+-#
+-# Leap seconds can be introduced in UTC at the end of the months of December
+-# or June, depending on the evolution of UT1-TAI. Bulletin C is mailed every
+-# six months, either to announce a time step in UTC or to confirm that there
+-# will be no time step at the next possible date.
+-#
+-#
+-# Daniel GAMBIS
+-# Head
+-# Earth Orientation Center of IERS
+-# Observatoire de Paris, France
++#	Updated through IERS Bulletin C52
++#	File expires on:  28 June 2017
+--- contrib/tzdata/leapseconds.awk.orig
++++ contrib/tzdata/leapseconds.awk
+@@ -0,0 +1,76 @@
++# Generate the 'leapseconds' file from 'leap-seconds.list'.
++
++# This file is in the public domain.
++
++BEGIN {
++  print "# Allowance for leap seconds added to each time zone file."
++  print ""
++  print "# This file is in the public domain."
++  print ""
++  print "# This file is generated automatically from the data in the public-domain"
++  print "# leap-seconds.list file available from most NIST time servers."
++  print "# If the URL <ftp://time.nist.gov/pub/leap-seconds.list> does not work,"
++  print "# you should be able to pick up leap-seconds.list from a secondary NIST server."
++  print "# See <http://tf.nist.gov/tf-cgi/servers.cgi> for a list of secondary servers."
++  print "# For more about leap-seconds.list, please see"
++  print "# The NTP Timescale and Leap Seconds"
++  print "# http://www.eecis.udel.edu/~mills/leap.html"
++  print ""
++  print "# The International Earth Rotation and Reference Systems Service"
++  print "# periodically uses leap seconds to keep UTC to within 0.9 s of UT1"
++  print "# (which measures the true angular orientation of the earth in space); see"
++  print "# Terry J Quinn, The BIPM and the accurate measure of time,"
++  print "# Proc IEEE 79, 7 (July 1991), 894-905 <http://dx.doi.org/10.1109/5.84965>."
++  print "# There were no leap seconds before 1972, because the official mechanism"
++  print "# accounting for the discrepancy between atomic time and the earth's rotation"
++  print "# did not exist until the early 1970s."
++  print ""
++  print "# The correction (+ or -) is made at the given time, so lines"
++  print "# will typically look like:"
++  print "#	Leap	YEAR	MON	DAY	23:59:60	+	R/S"
++  print "# or"
++  print "#	Leap	YEAR	MON	DAY	23:59:59	-	R/S"
++  print ""
++  print "# If the leapsecond is Rolling (R) the given time is local time."
++  print "# If the leapsecond is Stationary (S) the given time is UTC."
++  print ""
++  print "# Leap	YEAR	MONTH	DAY	HH:MM:SS	CORR	R/S"
++}
++
++/^ *$/ { next }
++
++/^#\tUpdated through/ || /^#\tFile expires on:/ {
++    last_lines = last_lines $0 "\n"
++}
++
++/^#/ { next }
++
++{
++    NTP_timestamp = $1
++    TAI_minus_UTC = $2
++    hash_mark = $3
++    one = $4
++    month = $5
++    year = $6
++    if (old_TAI_minus_UTC) {
++	if (old_TAI_minus_UTC < TAI_minus_UTC) {
++	    sign = "23:59:60\t+"
++	} else {
++	    sign = "23:59:59\t-"
++	}
++	if (month == "Jan") {
++	    year--;
++	    month = "Dec";
++	    day = 31
++	} else if (month == "Jul") {
++	    month = "Jun";
++	    day = 30
++	}
++	printf "Leap\t%s\t%s\t%s\t%s\tS\n", year, month, day, sign
++    }
++    old_TAI_minus_UTC = TAI_minus_UTC
++}
++
++END {
++    printf "\n%s", last_lines
++}
++native
+\ No newline at end of property
++FreeBSD=%H
+\ No newline at end of property
++text/plain
+\ No newline at end of property
+--- contrib/tzdata/northamerica.orig
++++ contrib/tzdata/northamerica
+@@ -3,9 +3,10 @@
+ 
+ # also includes Central America and the Caribbean
+ 
+-# This data is by no means authoritative; if you think you know better,
++# This file is by no means authoritative; if you think you know better,
+ # go ahead and edit the file (and please send any changes to
+-# tz@iana.org for general use in the future).
++# tz@iana.org for general use in the future).  For more, please see
++# the file CONTRIBUTING in the tz distribution.
+ 
+ # From Paul Eggert (1999-03-22):
+ # A reliable and entertaining source about time zones is
+@@ -23,8 +24,32 @@
+ # was the result of his proposals at the Convention of Railroad Trunk Lines
+ # in New York City (1869-10).  His 1870 proposal was based on Washington, DC,
+ # but in 1872-05 he moved the proposed origin to Greenwich.
+-# His proposal was adopted by the railroads on 1883-11-18 at 12:00,
+-# and the most of the country soon followed suit.
++
++# From Paul Eggert (2016-09-21):
++# Dowd's proposal left many details unresolved, such as where to draw
++# lines between time zones.  The key individual who made time zones
++# work in the US was William Frederick Allen - railway engineer,
++# managing editor of the Travelers' Guide, and secretary of the
++# General Time Convention, a railway standardization group.  Allen
++# spent months in dialogs with scientific and railway leaders,
++# developed a workable plan to institute time zones, and presented it
++# to the General Time Convention on 1883-04-11, saying that his plan
++# meant "local time would be practically abolished" - a plus for
++# railway scheduling.  By the next convention on 1883-10-11 nearly all
++# railroads had agreed and it took effect on 1883-11-18 at 12:00.
++# That Sunday was called the "day of two noons", as the eastern parts
++# of the new zones observed noon twice.  Allen witnessed the
++# transition in New York City, writing:
++#
++#   I heard the bells of St. Paul's strike on the old time.  Four
++#   minutes later, obedient to the electrical signal from the Naval
++#   Observatory ... the time-ball made its rapid descent, the chimes
++#   of old Trinity rang twelve measured strokes, and local time was
++#   abandoned, probably forever.
++#
++# Most of the US soon followed suit.  See:
++# Bartky IR. The adoption of standard time. Technol Cult 1989 Jan;30(1):25-56.
++# http://dx.doi.org/10.2307/3105430
+ 
+ # From Paul Eggert (2005-04-16):
+ # That 1883 transition occurred at 12:00 new time, not at 12:00 old time.
+@@ -59,8 +84,8 @@
+ #
+ # For more about the first ten years of DST in the United States, see
+ # Robert Garland, Ten years of daylight saving from the Pittsburgh standpoint
+-# (Carnegie Library of Pittsburgh, 1927)
+-# <http://www.clpgh.org/exhibit/dst.html>.
++# (Carnegie Library of Pittsburgh, 1927).
++# http://www.clpgh.org/exhibit/dst.html
+ #
+ # Shanks says that DST was called "War Time" in the US in 1918 and 1919.
+ # However, DST was imposed by the Standard Time Act of 1918, which
+@@ -79,8 +104,8 @@
+ # From Arthur David Olson (2000-09-25):
+ # Last night I heard part of a rebroadcast of a 1945 Arch Oboler radio drama.
+ # In the introduction, Oboler spoke of "Eastern Peace Time."
+-# An AltaVista search turned up
+-# <http://rowayton.org/rhs/hstaug45.html>:
++# An AltaVista search turned up:
++# http://rowayton.org/rhs/hstaug45.html
+ # "When the time is announced over the radio now, it is 'Eastern Peace
+ # Time' instead of the old familiar 'Eastern War Time.'  Peace is wonderful."
+ # (August 1945) by way of confirmation.
+@@ -123,7 +148,7 @@
+ Rule	US	1918	1919	-	Oct	lastSun	2:00	0	S
+ Rule	US	1942	only	-	Feb	9	2:00	1:00	W # War
+ Rule	US	1945	only	-	Aug	14	23:00u	1:00	P # Peace
+-Rule	US	1945	only	-	Sep	30	2:00	0	S
++Rule	US	1945	only	-	Sep	lastSun	2:00	0	S
+ Rule	US	1967	2006	-	Oct	lastSun	2:00	0	S
+ Rule	US	1967	1973	-	Apr	lastSun	2:00	1:00	D
+ Rule	US	1974	only	-	Jan	6	2:00	1:00	D
+@@ -226,9 +251,14 @@
+ # The law doesn't give abbreviations.
+ #
+ # From Paul Eggert (2000-01-08), following a heads-up from Rives McDow:
+-# Public law 106-564 (2000-12-23) introduced the abbreviation
+-# "Chamorro Standard Time" for time in Guam and the Northern Marianas.
+-# See the file "australasia".
++# Public law 106-564 (2000-12-23) introduced ... "Chamorro Standard Time"
++# for time in Guam and the Northern Marianas.  See the file "australasia".
++#
++# From Paul Eggert (2015-04-17):
++# HST and HDT are standardized abbreviations for Hawaii-Aleutian
++# standard and daylight times.  See section 9.47 (p 234) of the
++# U.S. Government Printing Office Style Manual (2008)
++# http://www.gpo.gov/fdsys/pkg/GPO-STYLEMANUAL-2008/pdf/GPO-STYLEMANUAL-2008.pdf
+ 
+ # From Arthur David Olson, 2005-08-09
+ # The following was signed into law on 2005-08-08.
+@@ -268,7 +298,7 @@
+ 
+ # From Paul Eggert (2005-08-26):
+ # According to today's Huntsville Times
+-# <http://www.al.com/news/huntsvilletimes/index.ssf?/base/news/1125047783228320.xml&coll=1>
++# http://www.al.com/news/huntsvilletimes/index.ssf?/base/news/1125047783228320.xml&coll=1
+ # a few towns on Alabama's "eastern border with Georgia, such as Phenix City
+ # in Russell County, Lanett in Chambers County and some towns in Lee County,
+ # set their watches and clocks on Eastern time."  It quotes H.H. "Bubba"
+@@ -276,6 +306,12 @@
+ # time zone, but we do go by the Eastern time zone because so many people work
+ # in Columbus."
+ 
++# From Paul Eggert (2014-09-06):
++# Monthly Notices of the Royal Astronomical Society 44, 4 (1884-02-08), 208
++# says that New York City Hall time was 3 minutes 58.4 seconds fast of
++# Eastern time (i.e., -4:56:01.6) just before the 1883 switch.  Round to the
++# nearest second.
++
+ # Rule	NAME	FROM	TO	TYPE	IN	ON	AT	SAVE	LETTER
+ Rule	NYC	1920	only	-	Mar	lastSun	2:00	1:00	D
+ Rule	NYC	1920	only	-	Oct	lastSun	2:00	0	S
+@@ -313,6 +349,16 @@
+ # Statue 175 closer in synch with the US Congress' intent....
+ # http://www.legis.state.wi.us/2007/data/acts/07Act3.pdf
+ 
++# From an email administrator of the City of Fort Pierre, SD (2015-12-21):
++# Fort Pierre is technically located in the Mountain time zone as is
++# the rest of Stanley County.  Most of Stanley County and Fort Pierre
++# uses the Central time zone due to doing most of their business in
++# Pierre so it simplifies schedules.  I have lived in Stanley County
++# all my life and it has been that way since I can remember.  (43 years!)
++#
++# From Paul Eggert (2015-12-25):
++# Assume this practice predates 1970, so Fort Pierre can use America/Chicago.
++
+ # Rule	NAME	FROM	TO	TYPE	IN	ON	AT	SAVE	LETTER
+ Rule	Chicago	1920	only	-	Jun	13	2:00	1:00	D
+ Rule	Chicago	1920	1921	-	Oct	lastSun	2:00	0	S
+@@ -323,15 +369,15 @@
+ # Zone	NAME		GMTOFF	RULES	FORMAT	[UNTIL]
+ Zone America/Chicago	-5:50:36 -	LMT	1883 Nov 18 12:09:24
+ 			-6:00	US	C%sT	1920
+-			-6:00	Chicago	C%sT	1936 Mar  1 2:00
+-			-5:00	-	EST	1936 Nov 15 2:00
++			-6:00	Chicago	C%sT	1936 Mar  1  2:00
++			-5:00	-	EST	1936 Nov 15  2:00
+ 			-6:00	Chicago	C%sT	1942
+ 			-6:00	US	C%sT	1946
+ 			-6:00	Chicago	C%sT	1967
+ 			-6:00	US	C%sT
+ # Oliver County, ND switched from mountain to central time on 1992-10-25.
+ Zone America/North_Dakota/Center -6:45:12 - LMT	1883 Nov 18 12:14:48
+-			-7:00	US	M%sT	1992 Oct 25 02:00
++			-7:00	US	M%sT	1992 Oct 25  2:00
+ 			-6:00	US	C%sT
+ # Morton County, ND, switched from mountain to central time on
+ # 2003-10-26, except for the area around Mandan which was already central time.
+@@ -340,8 +386,8 @@
+ # Jones, Mellette, and Todd Counties in South Dakota;
+ # but in practice these other counties were already observing central time.
+ # See <http://www.epa.gov/fedrgstr/EPA-IMPACT/2003/October/Day-28/i27056.htm>.
+-Zone America/North_Dakota/New_Salem -6:45:39 - LMT 1883 Nov 18 12:14:21
+-			-7:00	US	M%sT	2003 Oct 26 02:00
++Zone America/North_Dakota/New_Salem -6:45:39 - LMT	1883 Nov 18 12:14:21
++			-7:00	US	M%sT	2003 Oct 26  2:00
+ 			-6:00	US	C%sT
+ 
+ # From Josh Findley (2011-01-21):
+@@ -358,8 +404,8 @@
+ # at 47 degrees 15' 51" N, 101 degrees 46' 40" W, which yields an offset
+ # of 6h47'07".
+ 
+-Zone America/North_Dakota/Beulah -6:47:07 - LMT 1883 Nov 18 12:12:53
+-			-7:00	US	M%sT	2010 Nov  7 2:00
++Zone America/North_Dakota/Beulah -6:47:07 - LMT	1883 Nov 18 12:12:53
++			-7:00	US	M%sT	2010 Nov  7  2:00
+ 			-6:00	US	C%sT
+ 
+ # US mountain time, represented by Denver
+@@ -391,11 +437,42 @@
+ # north of the Salmon River, and the towns of Burgdorf and Warren),
+ # Nevada (except West Wendover), Oregon (except the northern 3/4 of
+ # Malheur county), and Washington
++
++# From Paul Eggert (2016-08-20):
++# In early February 1948, in response to California's electricity shortage,
++# PG&E changed power frequency from 60 to 59.5 Hz during daylight hours,
++# causing electric clocks to lose six minutes per day.  (This did not change
++# legal time, and is not part of the data here.)  See:
++# Ross SA. An energy crisis from the past: Northern California in 1948.
++# Working Paper No. 8, Institute of Governmental Studies, UC Berkeley,
++# 1973-11.  http://escholarship.org/uc/item/8x22k30c
++#
++# In another measure to save electricity, DST was instituted from 1948-03-14
++# at 02:01 to 1949-01-16 at 02:00, with the governor having the option to move
++# the fallback transition earlier.  See pages 3-4 of:
++# http://clerk.assembly.ca.gov/sites/clerk.assembly.ca.gov/files/archive/Statutes/1948/48Vol1_Chapters.pdf
++#
++# In response:
++#
++#   Governor Warren received a torrent of objecting mail, and it is not too much
++#   to speculate that the objections to Daylight Saving Time were one important
++#   factor in the defeat of the Dewey-Warren Presidential ticket in California.
++#     -- Ross, p 25
++#
++# On December 8 the governor exercised the option, setting the date to January 1
++# (LA Times 1948-12-09).  The transition time was 02:00 (LA Times 1949-01-01).
++#
++# Despite the controversy, in 1949 California voters approved Proposition 12,
++# which established DST from April's last Sunday at 01:00 until September's
++# last Sunday at 02:00. This was amended by 1962's Proposition 6, which changed
++# the fall-back date to October's last Sunday. See:
++# http://repository.uchastings.edu/cgi/viewcontent.cgi?article=1501&context=ca_ballot_props
++# http://repository.uchastings.edu/cgi/viewcontent.cgi?article=1636&context=ca_ballot_props
+ #
+ # Rule	NAME	FROM	TO	TYPE	IN	ON	AT	SAVE	LETTER
+-Rule	CA	1948	only	-	Mar	14	2:00	1:00	D
++Rule	CA	1948	only	-	Mar	14	2:01	1:00	D
+ Rule	CA	1949	only	-	Jan	 1	2:00	0	S
+-Rule	CA	1950	1966	-	Apr	lastSun	2:00	1:00	D
++Rule	CA	1950	1966	-	Apr	lastSun	1:00	1:00	D
+ Rule	CA	1950	1961	-	Sep	lastSun	2:00	0	S
+ Rule	CA	1962	1966	-	Oct	lastSun	2:00	0	S
+ # Zone	NAME		GMTOFF	RULES	FORMAT	[UNTIL]
+@@ -469,15 +546,21 @@
+ # For lack of better information, assume that Metlakatla's
+ # abandonment of use of daylight saving resulted from the 1983 vote.
+ 
++# From Steffen Thorsen (2015-11-09):
++# It seems Metlakatla did go off PST on Sunday, November 1, changing
++# their time to AKST and are going to follow Alaska's DST, switching
++# between AKST and AKDT from now on....
++# http://www.krbd.org/2015/10/30/annette-island-times-they-are-a-changing/
++
+ # Zone	NAME		GMTOFF	RULES	FORMAT	[UNTIL]
+ Zone America/Juneau	 15:02:19 -	LMT	1867 Oct 18
+ 			 -8:57:41 -	LMT	1900 Aug 20 12:00
+ 			 -8:00	-	PST	1942
+ 			 -8:00	US	P%sT	1946
+ 			 -8:00	-	PST	1969
+-			 -8:00	US	P%sT	1980 Apr 27 2:00
+-			 -9:00	US	Y%sT	1980 Oct 26 2:00
+-			 -8:00	US	P%sT	1983 Oct 30 2:00
++			 -8:00	US	P%sT	1980 Apr 27  2:00
++			 -9:00	US	Y%sT	1980 Oct 26  2:00
++			 -8:00	US	P%sT	1983 Oct 30  2:00
+ 			 -9:00	US	Y%sT	1983 Nov 30
+ 			 -9:00	US	AK%sT
+ Zone America/Sitka	 14:58:47 -	LMT	1867 Oct 18
+@@ -485,7 +568,7 @@
+ 			 -8:00	-	PST	1942
+ 			 -8:00	US	P%sT	1946
+ 			 -8:00	-	PST	1969
+-			 -8:00	US	P%sT	1983 Oct 30 2:00
++			 -8:00	US	P%sT	1983 Oct 30  2:00
+ 			 -9:00	US	Y%sT	1983 Nov 30
+ 			 -9:00	US	AK%sT
+ Zone America/Metlakatla	 15:13:42 -	LMT	1867 Oct 18
+@@ -493,8 +576,9 @@
+ 			 -8:00	-	PST	1942
+ 			 -8:00	US	P%sT	1946
+ 			 -8:00	-	PST	1969
+-			 -8:00	US	P%sT	1983 Oct 30 2:00
+-			 -8:00	-	PST
++			 -8:00	US	P%sT	1983 Oct 30  2:00
++			 -8:00	-	PST	2015 Nov  1  2:00
++			 -9:00	US	AK%sT
+ Zone America/Yakutat	 14:41:05 -	LMT	1867 Oct 18
+ 			 -9:18:55 -	LMT	1900 Aug 20 12:00
+ 			 -9:00	-	YST	1942
+@@ -509,7 +593,7 @@
+ 			-10:00	US	CAT/CAPT 1946 # Peace
+ 			-10:00	-	CAT	1967 Apr
+ 			-10:00	-	AHST	1969
+-			-10:00	US	AH%sT	1983 Oct 30 2:00
++			-10:00	US	AH%sT	1983 Oct 30  2:00
+ 			 -9:00	US	Y%sT	1983 Nov 30
+ 			 -9:00	US	AK%sT
+ Zone America/Nome	 12:58:21 -	LMT	1867 Oct 18
+@@ -518,7 +602,7 @@
+ 			-11:00	US	N%sT	1946
+ 			-11:00	-	NST	1967 Apr
+ 			-11:00	-	BST	1969
+-			-11:00	US	B%sT	1983 Oct 30 2:00
++			-11:00	US	B%sT	1983 Oct 30  2:00
+ 			 -9:00	US	Y%sT	1983 Nov 30
+ 			 -9:00	US	AK%sT
+ Zone America/Adak	 12:13:21 -	LMT	1867 Oct 18
+@@ -527,9 +611,9 @@
+ 			-11:00	US	N%sT	1946
+ 			-11:00	-	NST	1967 Apr
+ 			-11:00	-	BST	1969
+-			-11:00	US	B%sT	1983 Oct 30 2:00
++			-11:00	US	B%sT	1983 Oct 30  2:00
+ 			-10:00	US	AH%sT	1983 Nov 30
+-			-10:00	US	HA%sT
++			-10:00	US	H%sT
+ # The following switches don't quite make our 1970 cutoff.
+ #
+ # Shanks writes that part of southwest Alaska (e.g. Aniak)
+@@ -545,7 +629,7 @@
+ #  Minutes of the Unalaska City Council Meeting, January 10, 1967:
+ #  "Except for St. Paul and Akutan, Unalaska is the only important
+ #  location not on Alaska Standard Time.  The following resolution was
+-#  made by William Robinson and seconded by Henry Swanson:  Be it
++#  made by William Robinson and seconded by Henry Swanson: Be it
+ #  resolved that the City of Unalaska hereby goes to Alaska Standard
+ #  Time as of midnight Friday, January 13, 1967 (1 A.M. Saturday,
+ #  January 14, Alaska Standard Time.)  This resolution was passed with
+@@ -578,7 +662,7 @@
+ # year, the standard time of this Territory shall be advanced one
+ # hour...This Act shall take effect upon its approval. Approved this 26th
+ # day of April, A. D. 1933. LAWRENCE M JUDD, Governor of the Territory of
+-# Hawaii." Page 172:  "Act 163...Act 90 of the Session Laws of 1933 is
++# Hawaii." Page 172: "Act 163...Act 90 of the Session Laws of 1933 is
+ # hereby repealed...This Act shall take effect upon its approval, upon
+ # which date the standard time of this Territory shall be restored to
+ # that existing immediately prior to the taking effect of said Act 90.
+@@ -588,14 +672,14 @@
+ # Note that 1933-05-21 was a Sunday.
+ # We're left to guess the time of day when Act 163 was approved; guess noon.
+ 
+-Zone Pacific/Honolulu	-10:31:26 -	LMT	1896 Jan 13 12:00 #Schmitt&Cox
+-			-10:30	-	HST	1933 Apr 30 2:00 #Laws 1933
+-			-10:30	1:00	HDT	1933 May 21 12:00 #Laws 1933+12
+-			-10:30	-	HST	1942 Feb 09 2:00 #Schmitt&Cox+2
+-			-10:30	1:00	HDT	1945 Sep 30 2:00 #Schmitt&Cox+2
+-			-10:30	-	HST	1947 Jun  8 2:00 #Schmitt&Cox+2
++# Zone	NAME		GMTOFF	RULES	FORMAT	[UNTIL]
++Zone Pacific/Honolulu	-10:31:26 -	LMT	1896 Jan 13 12:00
++			-10:30	-	HST	1933 Apr 30  2:00
++			-10:30	1:00	HDT	1933 May 21 12:00
++			-10:30	-	HST	1942 Feb  9  2:00
++			-10:30	1:00	HDT	1945 Sep 30  2:00
++			-10:30	-	HST	1947 Jun  8  2:00
+ 			-10:00	-	HST
+-
+ Link Pacific/Honolulu Pacific/Johnston
+ 
+ # Now we turn to US areas that have diverged from the consensus since 1970.
+@@ -621,10 +705,11 @@
+ # Shanks says the 1944 experiment came to an end on 1944-03-17.
+ # Go with the Arizona State Library instead.
+ 
++# Zone	NAME		GMTOFF	RULES	FORMAT	[UNTIL]
+ Zone America/Phoenix	-7:28:18 -	LMT	1883 Nov 18 11:31:42
+-			-7:00	US	M%sT	1944 Jan  1 00:01
+-			-7:00	-	MST	1944 Apr  1 00:01
+-			-7:00	US	M%sT	1944 Oct  1 00:01
++			-7:00	US	M%sT	1944 Jan  1  0:01
++			-7:00	-	MST	1944 Apr  1  0:01
++			-7:00	US	M%sT	1944 Oct  1  0:01
+ 			-7:00	-	MST	1967
+ 			-7:00	US	M%sT	1968 Mar 21
+ 			-7:00	-	MST
+@@ -648,16 +733,15 @@
+ #
+ # Zone	NAME		GMTOFF	RULES	FORMAT	[UNTIL]
+ Zone America/Boise	-7:44:49 -	LMT	1883 Nov 18 12:15:11
+-			-8:00	US	P%sT	1923 May 13 2:00
++			-8:00	US	P%sT	1923 May 13  2:00
+ 			-7:00	US	M%sT	1974
+-			-7:00	-	MST	1974 Feb  3 2:00
++			-7:00	-	MST	1974 Feb  3  2:00
+ 			-7:00	US	M%sT
+ 
+ # Indiana
+ #
+ # For a map of Indiana's time zone regions, see:
+-# What time is it in Indiana? (2006-03-01)
+-# <http://www.mccsc.edu/time.html>
++# http://en.wikipedia.org/wiki/Time_in_Indiana
+ #
+ # From Paul Eggert (2007-08-17):
+ # Since 1970, most of Indiana has been like America/Indiana/Indianapolis,
+@@ -683,9 +767,6 @@
+ # that they would be ambiguous if we left them at the 'America' level.
+ # So we reluctantly put them all in a subdirectory 'America/Indiana'.
+ 
+-# From Paul Eggert (2005-08-16):
+-# http://www.mccsc.edu/time.html says that Indiana will use DST starting 2006.
+-
+ # From Paul Eggert (2014-06-26):
+ # https://www.federalregister.gov/articles/2006/01/20/06-563/standard-time-zone-boundary-in-the-state-of-indiana
+ # says "DOT is relocating the time zone boundary in Indiana to move Starke,
+@@ -707,13 +788,13 @@
+ Rule Indianapolis 1941	1954	-	Sep	lastSun	2:00	0	S
+ Rule Indianapolis 1946	1954	-	Apr	lastSun	2:00	1:00	D
+ # Zone	NAME		GMTOFF	RULES	FORMAT	[UNTIL]
+-Zone America/Indiana/Indianapolis -5:44:38 - LMT 1883 Nov 18 12:15:22
++Zone America/Indiana/Indianapolis -5:44:38 - LMT	1883 Nov 18 12:15:22
+ 			-6:00	US	C%sT	1920
+ 			-6:00 Indianapolis C%sT	1942
+ 			-6:00	US	C%sT	1946
+-			-6:00 Indianapolis C%sT	1955 Apr 24 2:00
+-			-5:00	-	EST	1957 Sep 29 2:00
+-			-6:00	-	CST	1958 Apr 27 2:00
++			-6:00 Indianapolis C%sT	1955 Apr 24  2:00
++			-5:00	-	EST	1957 Sep 29  2:00
++			-6:00	-	CST	1958 Apr 27  2:00
+ 			-5:00	-	EST	1969
+ 			-5:00	US	E%sT	1971
+ 			-5:00	-	EST	2006
+@@ -729,10 +810,10 @@
+ # Zone	NAME		GMTOFF	RULES	FORMAT	[UNTIL]
+ Zone America/Indiana/Marengo -5:45:23 -	LMT	1883 Nov 18 12:14:37
+ 			-6:00	US	C%sT	1951
+-			-6:00	Marengo	C%sT	1961 Apr 30 2:00
++			-6:00	Marengo	C%sT	1961 Apr 30  2:00
+ 			-5:00	-	EST	1969
+-			-5:00	US	E%sT	1974 Jan  6 2:00
+-			-6:00	1:00	CDT	1974 Oct 27 2:00
++			-5:00	US	E%sT	1974 Jan  6  2:00
++			-6:00	1:00	CDT	1974 Oct 27  2:00
+ 			-5:00	US	E%sT	1976
+ 			-5:00	-	EST	2006
+ 			-5:00	US	E%sT
+@@ -753,11 +834,11 @@
+ # Zone	NAME		GMTOFF	RULES	FORMAT	[UNTIL]
+ Zone America/Indiana/Vincennes -5:50:07 - LMT	1883 Nov 18 12:09:53
+ 			-6:00	US	C%sT	1946
+-			-6:00 Vincennes	C%sT	1964 Apr 26 2:00
++			-6:00 Vincennes	C%sT	1964 Apr 26  2:00
+ 			-5:00	-	EST	1969
+ 			-5:00	US	E%sT	1971
+-			-5:00	-	EST	2006 Apr  2 2:00
+-			-6:00	US	C%sT	2007 Nov  4 2:00
++			-5:00	-	EST	2006 Apr  2  2:00
++			-6:00	US	C%sT	2007 Nov  4  2:00
+ 			-5:00	US	E%sT
+ #
+ # Perry County, Indiana, switched from eastern to central time in April 2006.
+@@ -774,10 +855,10 @@
+ # Zone	NAME		GMTOFF	RULES	FORMAT	[UNTIL]
+ Zone America/Indiana/Tell_City -5:47:03 - LMT	1883 Nov 18 12:12:57
+ 			-6:00	US	C%sT	1946
+-			-6:00 Perry	C%sT	1964 Apr 26 2:00
++			-6:00 Perry	C%sT	1964 Apr 26  2:00
+ 			-5:00	-	EST	1969
+ 			-5:00	US	E%sT	1971
+-			-5:00	-	EST	2006 Apr  2 2:00
++			-5:00	-	EST	2006 Apr  2  2:00
+ 			-6:00	US	C%sT
+ #
+ # Pike County, Indiana moved from central to eastern time in 1977,
+@@ -790,11 +871,11 @@
+ # Zone	NAME		GMTOFF	RULES	FORMAT	[UNTIL]
+ Zone America/Indiana/Petersburg -5:49:07 - LMT	1883 Nov 18 12:10:53
+ 			-6:00	US	C%sT	1955
+-			-6:00	Pike	C%sT	1965 Apr 25 2:00
+-			-5:00	-	EST	1966 Oct 30 2:00
+-			-6:00	US	C%sT	1977 Oct 30 2:00
+-			-5:00	-	EST	2006 Apr  2 2:00
+-			-6:00	US	C%sT	2007 Nov  4 2:00
++			-6:00	Pike	C%sT	1965 Apr 25  2:00
++			-5:00	-	EST	1966 Oct 30  2:00
++			-6:00	US	C%sT	1977 Oct 30  2:00
++			-5:00	-	EST	2006 Apr  2  2:00
++			-6:00	US	C%sT	2007 Nov  4  2:00
+ 			-5:00	US	E%sT
+ #
+ # Starke County, Indiana moved from central to eastern time in 1991,
+@@ -812,10 +893,10 @@
+ # Zone	NAME		GMTOFF	RULES	FORMAT	[UNTIL]
+ Zone America/Indiana/Knox -5:46:30 -	LMT	1883 Nov 18 12:13:30
+ 			-6:00	US	C%sT	1947
+-			-6:00	Starke	C%sT	1962 Apr 29 2:00
+-			-5:00	-	EST	1963 Oct 27 2:00
+-			-6:00	US	C%sT	1991 Oct 27 2:00
+-			-5:00	-	EST	2006 Apr  2 2:00
++			-6:00	Starke	C%sT	1962 Apr 29  2:00
++			-5:00	-	EST	1963 Oct 27  2:00
++			-6:00	US	C%sT	1991 Oct 27  2:00
++			-5:00	-	EST	2006 Apr  2  2:00
+ 			-6:00	US	C%sT
+ #
+ # Pulaski County, Indiana, switched from eastern to central time in
+@@ -828,17 +909,17 @@
+ # Zone	NAME		GMTOFF	RULES	FORMAT	[UNTIL]
+ Zone America/Indiana/Winamac -5:46:25 - LMT	1883 Nov 18 12:13:35
+ 			-6:00	US	C%sT	1946
+-			-6:00	Pulaski	C%sT	1961 Apr 30 2:00
++			-6:00	Pulaski	C%sT	1961 Apr 30  2:00
+ 			-5:00	-	EST	1969
+ 			-5:00	US	E%sT	1971
+-			-5:00	-	EST	2006 Apr  2 2:00
+-			-6:00	US	C%sT	2007 Mar 11 2:00
++			-5:00	-	EST	2006 Apr  2  2:00
++			-6:00	US	C%sT	2007 Mar 11  2:00
+ 			-5:00	US	E%sT
+ #
+ # Switzerland County, Indiana, did not observe DST from 1973 through 2005.
+ # Zone	NAME		GMTOFF	RULES	FORMAT	[UNTIL]
+ Zone America/Indiana/Vevay -5:40:16 -	LMT	1883 Nov 18 12:19:44
+-			-6:00	US	C%sT	1954 Apr 25 2:00
++			-6:00	US	C%sT	1954 Apr 25  2:00
+ 			-5:00	-	EST	1969
+ 			-5:00	US	E%sT	1973
+ 			-5:00	-	EST	2006
+@@ -859,16 +940,16 @@
+ 			-6:00	US	C%sT	1921
+ 			-6:00 Louisville C%sT	1942
+ 			-6:00	US	C%sT	1946
+-			-6:00 Louisville C%sT	1961 Jul 23 2:00
++			-6:00 Louisville C%sT	1961 Jul 23  2:00
+ 			-5:00	-	EST	1968
+-			-5:00	US	E%sT	1974 Jan  6 2:00
+-			-6:00	1:00	CDT	1974 Oct 27 2:00
++			-5:00	US	E%sT	1974 Jan  6  2:00
++			-6:00	1:00	CDT	1974 Oct 27  2:00
+ 			-5:00	US	E%sT
+ #
+ # Wayne County, Kentucky
+ #
+ # From Lake Cumberland LIFE
+-# <http://www.lake-cumberland.com/life/archive/news990129time.shtml>
++# http://www.lake-cumberland.com/life/archive/news990129time.shtml
+ # (1999-01-29) via WKYM-101.7:
+ # Clinton County has joined Wayne County in asking the DoT to change from
+ # the Central to the Eastern time zone....  The Wayne County government made
+@@ -887,7 +968,7 @@
+ # From Paul Eggert (2001-07-16):
+ # The final rule was published in the
+ # Federal Register 65, 160 (2000-08-17), pp 50154-50158.
+-# <http://frwebgate.access.gpo.gov/cgi-bin/getdoc.cgi?dbname=2000_register&docid=fr17au00-22>
++# http://frwebgate.access.gpo.gov/cgi-bin/getdoc.cgi?dbname=2000_register&docid=fr17au00-22
+ #
+ Zone America/Kentucky/Monticello -5:39:24 - LMT	1883 Nov 18 12:20:36
+ 			-6:00	US	C%sT	1946
+@@ -913,7 +994,7 @@
+ # West Wendover, NV officially switched from Pacific to mountain time on
+ # 1999-10-31.  See the
+ # Federal Register 64, 203 (1999-10-21), pp 56705-56707.
+-# <http://frwebgate.access.gpo.gov/cgi-bin/getdoc.cgi?dbname=1999_register&docid=fr21oc99-15>
++# http://frwebgate.access.gpo.gov/cgi-bin/getdoc.cgi?dbname=1999_register&docid=fr21oc99-15
+ # However, the Federal Register says that West Wendover already operated
+ # on mountain time, and the rule merely made this official;
+ # hence a separate tz entry is not needed.
+@@ -951,12 +1032,12 @@
+ Rule	Detroit	1967	only	-	Oct	lastSun	2:00	0	S
+ # Zone	NAME		GMTOFF	RULES	FORMAT	[UNTIL]
+ Zone America/Detroit	-5:32:11 -	LMT	1905
+-			-6:00	-	CST	1915 May 15 2:00
++			-6:00	-	CST	1915 May 15  2:00
+ 			-5:00	-	EST	1942
+ 			-5:00	US	E%sT	1946
+ 			-5:00	Detroit	E%sT	1973
+ 			-5:00	US	E%sT	1975
+-			-5:00	-	EST	1975 Apr 27 2:00
++			-5:00	-	EST	1975 Apr 27  2:00
+ 			-5:00	US	E%sT
+ #
+ # Dickinson, Gogebic, Iron, and Menominee Counties, Michigan,
+@@ -969,8 +1050,8 @@
+ # Zone	NAME		GMTOFF	RULES	FORMAT	[UNTIL]
+ Zone America/Menominee	-5:50:27 -	LMT	1885 Sep 18 12:00
+ 			-6:00	US	C%sT	1946
+-			-6:00 Menominee	C%sT	1969 Apr 27 2:00
+-			-5:00	-	EST	1973 Apr 29 2:00
++			-6:00 Menominee	C%sT	1969 Apr 27  2:00
++			-5:00	-	EST	1973 Apr 29  2:00
+ 			-6:00	US	C%sT
+ 
+ # Navassa
+@@ -987,19 +1068,19 @@
+ ################################################################################
+ 
+ 
+-# From Paul Eggert (2006-03-22):
+-# A good source for time zone historical data outside the U.S. is
++# From Paul Eggert (2014-10-31):
++#
++# Unless otherwise specified, the source for data through 1990 is:
+ # Thomas G. Shanks and Rique Pottenger, The International Atlas (6th edition),
+ # San Diego: ACS Publications, Inc. (2003).
++# Unfortunately this book contains many errors and cites no sources.
+ #
+ # Gwillim Law writes that a good source
+ # for recent time zone data is the International Air Transport
+ # Association's Standard Schedules Information Manual (IATA SSIM),
+ # published semiannually.  Law sent in several helpful summaries
+-# of the IATA's data after 1990.
+-#
+-# Except where otherwise noted, Shanks & Pottenger is the source for
+-# entries through 1990, and IATA SSIM is the source for entries afterwards.
++# of the IATA's data after 1990.  Except where otherwise noted,
++# IATA SSIM is the source for entries after 1990.
+ #
+ # Other sources occasionally used include:
+ #
+@@ -1050,7 +1131,7 @@
+ # From Paul Eggert (1994-11-22):
+ # Alas, this sort of thing must be handled by localization software.
+ 
+-# Unless otherwise specified, the data for Canada are all from Shanks
++# Unless otherwise specified, the data entries for Canada are all from Shanks
+ # & Pottenger.
+ 
+ # From Chris Walton (2006-04-01, 2006-04-25, 2006-06-26, 2007-01-31,
+@@ -1097,17 +1178,16 @@
+ # An amendment to the Interpretation Act was registered on February 19/2007....
+ # http://action.attavik.ca/home/justice-gn/attach/2007/gaz02part2.pdf
+ 
+-# From Paul Eggert (2006-04-25):
++# From Paul Eggert (2014-10-18):
+ # H. David Matthews and Mary Vincent's map
+ # "It's about TIME", _Canadian Geographic_ (September-October 1998)
+-# <http://www.canadiangeographic.ca/Magazine/SO98/geomap.asp>
++# http://www.canadiangeographic.ca/Magazine/SO98/alacarte.asp
+ # contains detailed boundaries for regions observing nonstandard
+ # time and daylight saving time arrangements in Canada circa 1998.
+ #
+-# INMS, the Institute for National Measurement Standards in Ottawa, has
+-# information about standard and daylight saving time zones in Canada.
+-# <http://inms-ienm.nrc-cnrc.gc.ca/en/time_services/daylight_saving_e.php>
+-# (updated periodically).
++# National Research Council Canada maintains info about time zones and DST.
++# http://www.nrc-cnrc.gc.ca/eng/services/time/time_zones.html
++# http://www.nrc-cnrc.gc.ca/eng/services/time/faq/index.html#Q5
+ # Its unofficial information is often taken from Matthews and Vincent.
+ 
+ # From Paul Eggert (2006-06-27):
+@@ -1220,17 +1300,26 @@
+ 			-3:30	-	NST	1936
+ 			-3:30	StJohns	N%sT	1942 May 11
+ 			-3:30	Canada	N%sT	1946
+-			-3:30	StJohns	N%sT	1966 Mar 15 2:00
++			-3:30	StJohns	N%sT	1966 Mar 15  2:00
+ 			-4:00	StJohns	A%sT	2011 Nov
+ 			-4:00	Canada	A%sT
+ 
+ 
+ # west Labrador, Nova Scotia, Prince Edward I
+ 
+-# From Paul Eggert (2006-03-22):
++# From Brian Inglis (2015-07-20):
++# From the historical weather station records available at:
++# https://weatherspark.com/history/28351/1971/Sydney-Nova-Scotia-Canada
++# Sydney shares the same time history as Glace Bay, so was
++# likely to be the same across the island....
++# Sydney, as the capital and most populous location, or Cape Breton, would
++# have been better names for the zone had we known this in 1996.
++
++# From Paul Eggert (2015-07-20):
+ # Shanks & Pottenger write that since 1970 most of this region has been like
+ # Halifax.  Many locales did not observe peacetime DST until 1972;
+-# Glace Bay, NS is the largest that we know of.
++# the Cape Breton area, represented by Glace Bay, is the largest we know of
++# (Glace Bay was perhaps not the best name choice but no point changing now).
+ # Shanks & Pottenger also write that Liverpool, NS was the only town
+ # in Canada to observe DST in 1971 but not 1970; for now we'll assume
+ # this is a typo.
+@@ -1281,7 +1370,7 @@
+ Zone America/Halifax	-4:14:24 -	LMT	1902 Jun 15
+ 			-4:00	Halifax	A%sT	1918
+ 			-4:00	Canada	A%sT	1919
+-			-4:00	Halifax	A%sT	1942 Feb  9 2:00s
++			-4:00	Halifax	A%sT	1942 Feb  9  2:00s
+ 			-4:00	Canada	A%sT	1946
+ 			-4:00	Halifax	A%sT	1974
+ 			-4:00	Canada	A%sT
+@@ -1328,14 +1417,9 @@
+ 
+ # Quebec
+ 
+-# From Paul Eggert (2013-08-30):
+-# Since 1970 most of Quebec has been like Toronto.
+-# However, because earlier versions of the tz database mistakenly relied on data
+-# from Shanks & Pottenger saying that Quebec differed from Ontario after 1970,
+-# a separate entry was created for most of Quebec.  We're loath to lose
+-# its pre-1970 info, even though the tz database is normally limited to
+-# zones that differ after 1970, so keep this otherwise out-of-scope entry.
+-
++# From Paul Eggert (2015-03-24):
++# See America/Toronto for most of Quebec, including Montreal.
++#
+ # Matthews and Vincent (1998) also write that Quebec east of the -63
+ # meridian is supposed to observe AST, but residents as far east as
+ # Natashquan use EST/EDT, and residents east of Natashquan use AST.
+@@ -1349,47 +1433,10 @@
+ # For lack of better info, guess this practice began around 1970, contra to
+ # Shanks & Pottenger who have this region observing AST/ADT.
+ 
+-# Rule	NAME	FROM	TO	TYPE	IN	ON	AT	SAVE	LETTER/S
+-Rule	Mont	1917	only	-	Mar	25	2:00	1:00	D
+-Rule	Mont	1917	only	-	Apr	24	0:00	0	S
+-Rule	Mont	1919	only	-	Mar	31	2:30	1:00	D
+-Rule	Mont	1919	only	-	Oct	25	2:30	0	S
+-Rule	Mont	1920	only	-	May	 2	2:30	1:00	D
+-Rule	Mont	1920	1922	-	Oct	Sun>=1	2:30	0	S
+-Rule	Mont	1921	only	-	May	 1	2:00	1:00	D
+-Rule	Mont	1922	only	-	Apr	30	2:00	1:00	D
+-Rule	Mont	1924	only	-	May	17	2:00	1:00	D
+-Rule	Mont	1924	1926	-	Sep	lastSun	2:30	0	S
+-Rule	Mont	1925	1926	-	May	Sun>=1	2:00	1:00	D
+-# The 1927-to-1937 rules can be expressed more simply as
+-# Rule	Mont	1927	1937	-	Apr	lastSat	24:00	1:00	D
+-# Rule	Mont	1927	1937	-	Sep	lastSat	24:00	0	S
+-# The rules below avoid use of 24:00
+-# (which pre-1998 versions of zic cannot handle).
+-Rule	Mont	1927	only	-	May	1	0:00	1:00	D
+-Rule	Mont	1927	1932	-	Sep	lastSun	0:00	0	S
+-Rule	Mont	1928	1931	-	Apr	lastSun	0:00	1:00	D
+-Rule	Mont	1932	only	-	May	1	0:00	1:00	D
+-Rule	Mont	1933	1940	-	Apr	lastSun	0:00	1:00	D
+-Rule	Mont	1933	only	-	Oct	1	0:00	0	S
+-Rule	Mont	1934	1939	-	Sep	lastSun	0:00	0	S
+-Rule	Mont	1946	1973	-	Apr	lastSun	2:00	1:00	D
+-Rule	Mont	1945	1948	-	Sep	lastSun	2:00	0	S
+-Rule	Mont	1949	1950	-	Oct	lastSun	2:00	0	S
+-Rule	Mont	1951	1956	-	Sep	lastSun	2:00	0	S
+-Rule	Mont	1957	1973	-	Oct	lastSun	2:00	0	S
+-
+ # Zone	NAME		GMTOFF	RULES	FORMAT	[UNTIL]
+ Zone America/Blanc-Sablon -3:48:28 -	LMT	1884
+ 			-4:00	Canada	A%sT	1970
+ 			-4:00	-	AST
+-Zone America/Montreal	-4:54:16 -	LMT	1884
+-			-5:00	Mont	E%sT	1918
+-			-5:00	Canada	E%sT	1919
+-			-5:00	Mont	E%sT	1942 Feb  9 2:00s
+-			-5:00	Canada	E%sT	1946
+-			-5:00	Mont	E%sT	1974
+-			-5:00	Canada	E%sT
+ 
+ # Ontario
+ 
+@@ -1419,7 +1466,7 @@
+ # says that Atikokan, Ontario currently does not observe DST,
+ # but will vote on 11-10 whether to use EST/EDT.
+ # He also writes that the Ontario Time Act (1990, Chapter T.9)
+-# <http://www.gov.on.ca/MBS/english/publications/statregs/conttext.html>
++# http://www.gov.on.ca/MBS/english/publications/statregs/conttext.html
+ # says that Ontario east of 90W uses EST/EDT, and west of 90W uses CST/CDT.
+ # Officially Atikokan is therefore on CST/CDT, and most likely this report
+ # concerns a non-official time observed as a matter of local practice.
+@@ -1509,26 +1556,26 @@
+ # ing in 1930. The information for the province of Quebec is definite,
+ # for the other provinces only approximate:
+ #
+-# 	Province	Daylight saving time used
++#	Province	Daylight saving time used
+ # Prince Edward Island	Not used.
+ # Nova Scotia		In Halifax only.
+ # New Brunswick		In St. John only.
+ # Quebec		In the following places:
+-# 			Montreal	Lachine
+-# 			Quebec		Mont-Royal
+-# 			Lévis		Iberville
+-# 			St. Lambert	Cap de la Madelèine
+-# 			Verdun		Loretteville
+-# 			Westmount	Richmond
+-# 			Outremont	St. Jérôme
+-# 			Longueuil	Greenfield Park
+-# 			Arvida		Waterloo
+-# 			Chambly-Canton	Beaulieu
+-# 			Melbourne	La Tuque
+-# 			St. Théophile	Buckingham
++#			Montreal	Lachine
++#			Quebec		Mont-Royal
++#			Lévis		Iberville
++#			St. Lambert	Cap de la Madelèine
++#			Verdun		Loretteville
++#			Westmount	Richmond
++#			Outremont	St. Jérôme
++#			Longueuil	Greenfield Park
++#			Arvida		Waterloo
++#			Chambly-Canton	Beaulieu
++#			Melbourne	La Tuque
++#			St. Théophile	Buckingham
+ # Ontario		Used generally in the cities and towns along
+-# 			the southerly part of the province. Not
+-# 			used in the northwesterly part.
++#			the southerly part of the province. Not
++#			used in the northwesterly part.
+ # Manitoba		Not used.
+ # Saskatchewan		In Regina only.
+ # Alberta		Not used.
+@@ -1597,7 +1644,7 @@
+ # Zone	NAME		GMTOFF	RULES	FORMAT	[UNTIL]
+ Zone America/Toronto	-5:17:32 -	LMT	1895
+ 			-5:00	Canada	E%sT	1919
+-			-5:00	Toronto	E%sT	1942 Feb  9 2:00s
++			-5:00	Toronto	E%sT	1942 Feb  9  2:00s
+ 			-5:00	Canada	E%sT	1946
+ 			-5:00	Toronto	E%sT	1974
+ 			-5:00	Canada	E%sT
+@@ -1610,16 +1657,16 @@
+ 			-5:00	Canada	E%sT
+ Zone America/Nipigon	-5:53:04 -	LMT	1895
+ 			-5:00	Canada	E%sT	1940 Sep 29
+-			-5:00	1:00	EDT	1942 Feb  9 2:00s
++			-5:00	1:00	EDT	1942 Feb  9  2:00s
+ 			-5:00	Canada	E%sT
+ Zone America/Rainy_River -6:18:16 -	LMT	1895
+ 			-6:00	Canada	C%sT	1940 Sep 29
+-			-6:00	1:00	CDT	1942 Feb  9 2:00s
++			-6:00	1:00	CDT	1942 Feb  9  2:00s
+ 			-6:00	Canada	C%sT
+ Zone America/Atikokan	-6:06:28 -	LMT	1895
+ 			-6:00	Canada	C%sT	1940 Sep 29
+-			-6:00	1:00	CDT	1942 Feb  9 2:00s
+-			-6:00	Canada	C%sT	1945 Sep 30 2:00
++			-6:00	1:00	CDT	1942 Feb  9  2:00s
++			-6:00	Canada	C%sT	1945 Sep 30  2:00
+ 			-5:00	-	EST
+ 
+ 
+@@ -1755,12 +1802,12 @@
+ Rule	Swift	1960	1961	-	Sep	lastSun	2:00	0	S
+ # Zone	NAME		GMTOFF	RULES	FORMAT	[UNTIL]
+ Zone America/Regina	-6:58:36 -	LMT	1905 Sep
+-			-7:00	Regina	M%sT	1960 Apr lastSun 2:00
++			-7:00	Regina	M%sT	1960 Apr lastSun  2:00
+ 			-6:00	-	CST
+ Zone America/Swift_Current -7:11:20 -	LMT	1905 Sep
+-			-7:00	Canada	M%sT	1946 Apr lastSun 2:00
++			-7:00	Canada	M%sT	1946 Apr lastSun  2:00
+ 			-7:00	Regina	M%sT	1950
+-			-7:00	Swift	M%sT	1972 Apr lastSun 2:00
++			-7:00	Swift	M%sT	1972 Apr lastSun  2:00
+ 			-6:00	-	CST
+ 
+ 
+@@ -1818,25 +1865,25 @@
+ # Unfortunately the exact date for the time change in June 1918 remains
+ # unknown and will be difficult to ascertain.  I e-mailed Tammy a few months
+ # ago to ask if Sunday June 2 was a reasonable guess.  She said it was just
+-# as plausible as any other date (in June).  She also said that after writing the
+-# article she had discovered another time change in 1916; this is the subject
+-# of another article which she wrote in October 2010.
++# as plausible as any other date (in June).  She also said that after writing
++# the article she had discovered another time change in 1916; this is the
++# subject of another article which she wrote in October 2010.
+ # http://www.creston.museum.bc.ca/index.php?module=comments&uop=view_comment&cm+id=56
+ 
+ # Here is a summary of the three clock change events in Creston's history:
+ # 1. 1884 or 1885: adoption of Mountain Standard Time (GMT-7)
+ # Exact date unknown
+ # 2. Oct 1916: switch to Pacific Standard Time (GMT-8)
+-# Exact date in October unknown;  Sunday October 1 is a reasonable guess.
++# Exact date in October unknown; Sunday October 1 is a reasonable guess.
+ # 3. June 1918: switch to Pacific Daylight Time (GMT-7)
+ # Exact date in June unknown; Sunday June 2 is a reasonable guess.
+-# note#1:
++# note 1:
+ # On Oct 27/1918 when daylight saving ended in the rest of Canada,
+ # Creston did not change its clocks.
+-# note#2:
++# note 2:
+ # During WWII when the Federal Government legislated a mandatory clock change,
+ # Creston did not oblige.
+-# note#3:
++# note 3:
+ # There is no guarantee that Creston will remain on Mountain Standard Time
+ # (UTC-7) forever.
+ # The subject was debated at least once this year by the town Council.
+@@ -1851,6 +1898,22 @@
+ 
+ # The transition dates (and times) are guesses.
+ 
++# From Matt Johnson (2015-09-21):
++# Fort Nelson, BC, Canada will cancel DST this year.  So while previously they
++# were aligned with America/Vancouver, they're now aligned with
++# America/Dawson_Creek.
++# http://www.northernrockies.ca/EN/meta/news/archives/2015/northern-rockies-time-change.html
++#
++# From Tim Parenti (2015-09-23):
++# This requires a new zone for the Northern Rockies Regional Municipality,
++# America/Fort_Nelson.  The resolution of 2014-12-08 was reached following a
++# 2014-11-15 poll with nearly 75% support.  Effectively, the municipality has
++# been on MST (-0700) like Dawson Creek since it advanced its clocks on
++# 2015-03-08.
++#
++# From Paul Eggert (2015-09-23):
++# Shanks says Fort Nelson did not observe DST in 1946, unlike Vancouver.
++
+ # Rule	NAME	FROM	TO	TYPE	IN	ON	AT	SAVE	LETTER/S
+ Rule	Vanc	1918	only	-	Apr	14	2:00	1:00	D
+ Rule	Vanc	1918	only	-	Oct	27	2:00	0	S
+@@ -1867,7 +1930,13 @@
+ 			-8:00	Canada	P%sT
+ Zone America/Dawson_Creek -8:00:56 -	LMT	1884
+ 			-8:00	Canada	P%sT	1947
+-			-8:00	Vanc	P%sT	1972 Aug 30 2:00
++			-8:00	Vanc	P%sT	1972 Aug 30  2:00
++			-7:00	-	MST
++Zone America/Fort_Nelson	-8:10:47 -	LMT	1884
++			-8:00	Vanc	P%sT	1946
++			-8:00	-	PST	1947
++			-8:00	Vanc	P%sT	1987
++			-8:00	Canada	P%sT	2015 Mar  8  2:00
+ 			-7:00	-	MST
+ Zone America/Creston	-7:46:04 -	LMT	1884
+ 			-7:00	-	MST	1916 Oct 1
+@@ -1880,22 +1949,120 @@
+ # Dawson switched to PST in 1973.  Inuvik switched to MST in 1979.
+ # Mathew Englander (1996-10-07) gives the following refs:
+ #	* 1967. Paragraph 28(34)(g) of the Interpretation Act, S.C. 1967-68,
+-#	c. 7 defines Yukon standard time as UTC-9.  This is still valid;
++#	c. 7 defines Yukon standard time as UTC-9....
+ #	see Interpretation Act, R.S.C. 1985, c. I-21, s. 35(1).
++#	[http://canlii.ca/t/7vhg]
+ #	* C.O. 1973/214 switched Yukon to PST on 1973-10-28 00:00.
+ #	* O.I.C. 1980/02 established DST.
+ #	* O.I.C. 1987/056 changed DST to Apr firstSun 2:00 to Oct lastSun 2:00.
+-# Shanks & Pottenger say Yukon's 1973-10-28 switch was at 2:00; go
+-# with Englander.
+-# From Chris Walton (2006-06-26):
+-# Here is a link to the old daylight saving portion of the interpretation
+-# act which was last updated in 1987:
+-# http://www.gov.yk.ca/legislation/regs/oic1987_056.pdf
++
++# From Brian Inglis (2015-04-14):
++#
++# I tried to trace the history of Yukon time and found the following
++# regulations, giving the reference title and URL if found, regulation name,
++# and relevant quote if available.  Each regulation specifically revokes its
++# predecessor.  The final reference is to the current Interpretation Act
++# authorizing and resulting from these regulatory changes.
++#
++# Only recent regulations were retrievable via Yukon government site search or
++# index, and only some via Canadian legal sources.  Other sources used include
++# articles titled "Standard Time and Time Zones in Canada" from JRASC via ADS
++# Abstracts, cited by ADO for 1932 ..., and updated versions from 1958 and
++# 1970 quoted below; each article includes current extracts from provincial
++# and territorial ST and DST regulations at the end, summaries and details of
++# standard times and daylight saving time at many locations across Canada,
++# with time zone maps, tables and calculations for Canadian Sunrise, Sunset,
++# and LMST; they also cover many countries and global locations, with a chart
++# and table showing current Universal Time offsets, and may be useful as
++# another source of information for 1970 and earlier.
++#
++# * Standard Time and Time Zones in Canada; Smith, C.C.; JRASC, Vol. 26,
++#   pp.49-77; February 1932; SAO/NASA Astrophysics Data System (ADS)
++#   http://adsabs.harvard.edu/abs/1932JRASC..26...49S from p.75:
++#   Yukon Interpretation Ordinance
++#   Yukon standard time is the local mean time at the one hundred and
++#   thirty-fifth meridian.
++#
++# * Standard Time and Time Zones in Canada; Smith, C.C.; Thomson, Malcolm M.;
++#   JRASC, Vol. 52, pp.193-223; October 1958; SAO/NASA Astrophysics Data System
++#   (ADS) http://adsabs.harvard.edu/abs/1958JRASC..52..193S from pp.220-1:
++#   Yukon Interpretation Ordinance, 1955, Chap. 16.
++#
++#     (1) Subject to this section, standard time shall be reckoned as nine
++#     hours behind Greenwich Time and called Yukon Standard Time.
++#
++#     (2) Notwithstanding subsection (1), the Commissioner may make regulations
++#     varying the manner of reckoning standard time.
++#
++# * Yukon Territory Commissioner's Order 1966-20 Interpretation Ordinance
++#   http://? - no online source found
++#
++# * Standard Time and Time Zones in Canada; Thomson, Malcolm M.; JRASC,
++#   Vol. 64, pp.129-162; June 1970; SAO/NASA Astrophysics Data System (ADS)
++#   http://adsabs.harvard.edu/abs/1970JRASC..64..129T from p.156: Yukon
++#   Territory Commissioner's Order 1967-59 Interpretation Ordinance ...
++#
++#     1. Commissioner's Order 1966-20 dated at Whitehorse in the Yukon
++#     Territory on 27th January, 1966, is hereby revoked.
++#
++#     2. Yukon (East) Standard Time as defined by section 36 of the
++#     Interpretation Ordinance from and after mid-night on the 28th day of May,
++#     1967 shall be reckoned in the same manner as Pacific Standard Time, that
++#     is to say, eight hours behind Greenwich Time in the area of the Yukon
++#     Territory lying east of the 138th degree longitude west.
++#
++#     3. In the remainder of the Territory, lying west of the 138th degree
++#     longitude west, Yukon (West) Standard Time shall be reckoned as nine
++#     hours behind Greenwich Time.
++#
++# * Yukon Standard Time defined as Pacific Standard Time, YCO 1973/214
++#   http://www.canlii.org/en/yk/laws/regu/yco-1973-214/latest/yco-1973-214.html
++#   C.O. 1973/214 INTERPRETATION ACT ...
++#
++#     1. Effective October 28, 1973 Commissioner's Order 1967/59 is hereby
++#     revoked.
++#
++#     2. Yukon Standard Time as defined by section 36 of the Interpretation
++#     Act from and after midnight on the twenty-eighth day of October, 1973
++#     shall be reckoned in the same manner as Pacific Standard Time, that is
++#     to say eight hours behind Greenwich Time.
++#
++# * O.I.C. 1980/02 INTERPRETATION ACT
++#   http://? - no online source found
++#
++# * Yukon Daylight Saving Time, YOIC 1987/56
++#   http://www.canlii.org/en/yk/laws/regu/yoic-1987-56/latest/yoic-1987-56.html
++#   O.I.C. 1987/056 INTERPRETATION ACT ...
++#
++#   In every year between
++#     (a) two o'clock in the morning in the first Sunday in April, and
++#     (b) two o'clock in the morning in the last Sunday in October,
++#   Standard Time shall be reckoned as seven hours behind Greenwich Time and
++#   called Yukon Daylight Saving Time.
++#   ...
++#   Dated ... 9th day of March, A.D., 1987.
++#
++# * Yukon Daylight Saving Time 2006, YOIC 2006/127
++#   http://www.canlii.org/en/yk/laws/regu/yoic-2006-127/latest/yoic-2006-127.html
++#   O.I.C. 2006/127 INTERPRETATION ACT ...
++#
++#     1. In Yukon each year the time for general purposes shall be 7 hours
++#     behind Greenwich mean time during the period commencing at two o'clock
++#     in the forenoon on the second Sunday of March and ending at two o'clock
++#     in the forenoon on the first Sunday of November and shall be called
++#     Yukon Daylight Saving Time.
++#
++#     2. Order-in-Council 1987/56 is revoked.
++#
++#     3. This order comes into force January 1, 2007.
++#
++# * Interpretation Act, RSY 2002, c 125
++# http://www.canlii.org/en/yk/laws/stat/rsy-2002-c-125/latest/rsy-2002-c-125.html
+ 
+ # From Rives McDow (1999-09-04):
+ # Nunavut ... moved ... to incorporate the whole territory into one time zone.
+ # Nunavut moves to single time zone Oct. 31
+-# <http://www.nunatsiaq.com/nunavut/nvt90903_13.html>
++# http://www.nunatsiaq.com/nunavut/nvt90903_13.html
+ #
+ # From Antoine Leca (1999-09-06):
+ # We then need to create a new timezone for the Kitikmeot region of Nunavut
+@@ -1903,7 +2070,7 @@
+ 
+ # From Paul Eggert (1999-09-20):
+ # Basic Facts: The New Territory
+-# <http://www.nunavut.com/basicfacts/english/basicfacts_1territory.html>
++# http://www.nunavut.com/basicfacts/english/basicfacts_1territory.html
+ # (1999) reports that Pangnirtung operates on eastern time,
+ # and that Coral Harbour does not observe DST.  We don't know when
+ # Pangnirtung switched to eastern time; we'll guess 1995.
+@@ -1932,8 +2099,8 @@
+ # the current state of affairs.
+ 
+ # From Michaela Rodrigue, writing in the
+-# Nunatsiaq News (1999-11-19)
+-# <http://www.nunatsiaq.com/archives/nunavut991130/nvt91119_17.html>:
++# Nunatsiaq News (1999-11-19):
++# http://www.nunatsiaq.com/archives/nunavut991130/nvt91119_17.html
+ # Clyde River, Pangnirtung and Sanikiluaq now operate with two time zones,
+ # central - or Nunavut time - for government offices, and eastern time
+ # for municipal offices and schools....  Igloolik [was similar but then]
+@@ -1980,10 +2147,7 @@
+ # [Also see <http://www.nunatsiaq.com/nunavut/nvt10309_06.html> (2001-03-09).]
+ 
+ # From Gwillim Law (2005-05-21):
+-# According to maps at
+-# http://inms-ienm.nrc-cnrc.gc.ca/images/time_services/TZ01SWE.jpg
+-# http://inms-ienm.nrc-cnrc.gc.ca/images/time_services/TZ01SSE.jpg
+-# (both dated 2003), and
++# According to ...
+ # http://www.canadiangeographic.ca/Magazine/SO98/geomap.asp
+ # (from a 1998 Canadian Geographic article), the de facto and de jure time
+ # for Southampton Island (at the north end of Hudson Bay) is UTC-5 all year
+@@ -1992,9 +2156,11 @@
+ # predates the creation of Nunavut, it probably goes back many years....
+ # The Inuktitut name of Coral Harbour is Sallit, but it's rarely used.
+ #
+-# From Paul Eggert (2005-07-26):
++# From Paul Eggert (2014-10-17):
+ # For lack of better information, assume that Southampton Island observed
+-# daylight saving only during wartime.
++# daylight saving only during wartime.  Gwillim Law's email also
++# mentioned maps now maintained by National Research Council Canada;
++# see above for an up-to-date link.
+ 
+ # From Chris Walton (2007-03-01):
+ # ... the community of Resolute (located on Cornwallis Island in
+@@ -2080,48 +2246,48 @@
+ Rule	NT_YK	1987	2006	-	Apr	Sun>=1	2:00	1:00	D
+ # Zone	NAME		GMTOFF	RULES	FORMAT	[UNTIL]
+ # aka Panniqtuuq
+-Zone America/Pangnirtung 0	-	zzz	1921 # trading post est.
+-			-4:00	NT_YK	A%sT	1995 Apr Sun>=1 2:00
+-			-5:00	Canada	E%sT	1999 Oct 31 2:00
+-			-6:00	Canada	C%sT	2000 Oct 29 2:00
++Zone America/Pangnirtung 0	-	-00	1921 # trading post est.
++			-4:00	NT_YK	A%sT	1995 Apr Sun>=1  2:00
++			-5:00	Canada	E%sT	1999 Oct 31  2:00
++			-6:00	Canada	C%sT	2000 Oct 29  2:00
+ 			-5:00	Canada	E%sT
+ # formerly Frobisher Bay
+-Zone America/Iqaluit	0	-	zzz	1942 Aug # Frobisher Bay est.
+-			-5:00	NT_YK	E%sT	1999 Oct 31 2:00
+-			-6:00	Canada	C%sT	2000 Oct 29 2:00
++Zone America/Iqaluit	0	-	-00	1942 Aug # Frobisher Bay est.
++			-5:00	NT_YK	E%sT	1999 Oct 31  2:00
++			-6:00	Canada	C%sT	2000 Oct 29  2:00
+ 			-5:00	Canada	E%sT
+ # aka Qausuittuq
+-Zone America/Resolute	0	-	zzz	1947 Aug 31 # Resolute founded
+-			-6:00	NT_YK	C%sT	2000 Oct 29 2:00
+-			-5:00	-	EST	2001 Apr  1 3:00
+-			-6:00	Canada	C%sT	2006 Oct 29 2:00
+-			-5:00	-	EST	2007 Mar 11 3:00
++Zone America/Resolute	0	-	-00	1947 Aug 31 # Resolute founded
++			-6:00	NT_YK	C%sT	2000 Oct 29  2:00
++			-5:00	-	EST	2001 Apr  1  3:00
++			-6:00	Canada	C%sT	2006 Oct 29  2:00
++			-5:00	-	EST	2007 Mar 11  3:00
+ 			-6:00	Canada	C%sT
+ # aka Kangiqiniq
+-Zone America/Rankin_Inlet 0	-	zzz	1957 # Rankin Inlet founded
+-			-6:00	NT_YK	C%sT	2000 Oct 29 2:00
+-			-5:00	-	EST	2001 Apr  1 3:00
++Zone America/Rankin_Inlet 0	-	-00	1957 # Rankin Inlet founded
++			-6:00	NT_YK	C%sT	2000 Oct 29  2:00
++			-5:00	-	EST	2001 Apr  1  3:00
+ 			-6:00	Canada	C%sT
+ # aka Iqaluktuuttiaq
+-Zone America/Cambridge_Bay 0	-	zzz	1920 # trading post est.?
+-			-7:00	NT_YK	M%sT	1999 Oct 31 2:00
+-			-6:00	Canada	C%sT	2000 Oct 29 2:00
+-			-5:00	-	EST	2000 Nov  5 0:00
+-			-6:00	-	CST	2001 Apr  1 3:00
++Zone America/Cambridge_Bay 0	-	-00	1920 # trading post est.?
++			-7:00	NT_YK	M%sT	1999 Oct 31  2:00
++			-6:00	Canada	C%sT	2000 Oct 29  2:00
++			-5:00	-	EST	2000 Nov  5  0:00
++			-6:00	-	CST	2001 Apr  1  3:00
+ 			-7:00	Canada	M%sT
+-Zone America/Yellowknife 0	-	zzz	1935 # Yellowknife founded?
++Zone America/Yellowknife 0	-	-00	1935 # Yellowknife founded?
+ 			-7:00	NT_YK	M%sT	1980
+ 			-7:00	Canada	M%sT
+-Zone America/Inuvik	0	-	zzz	1953 # Inuvik founded
+-			-8:00	NT_YK	P%sT	1979 Apr lastSun 2:00
++Zone America/Inuvik	0	-	-00	1953 # Inuvik founded
++			-8:00	NT_YK	P%sT	1979 Apr lastSun  2:00
+ 			-7:00	NT_YK	M%sT	1980
+ 			-7:00	Canada	M%sT
+ Zone America/Whitehorse	-9:00:12 -	LMT	1900 Aug 20
+-			-9:00	NT_YK	Y%sT	1966 Jul 1 2:00
++			-9:00	NT_YK	Y%sT	1967 May 28  0:00
+ 			-8:00	NT_YK	P%sT	1980
+ 			-8:00	Canada	P%sT
+ Zone America/Dawson	-9:17:40 -	LMT	1900 Aug 20
+-			-9:00	NT_YK	Y%sT	1973 Oct 28 0:00
++			-9:00	NT_YK	Y%sT	1973 Oct 28  0:00
+ 			-8:00	NT_YK	P%sT	1980
+ 			-8:00	Canada	P%sT
+ 
+@@ -2130,11 +2296,11 @@
+ 
+ # Mexico
+ 
+-# From Paul Eggert (2001-03-05):
++# From Paul Eggert (2014-12-07):
+ # The Investigation and Analysis Service of the
+ # Mexican Library of Congress (MLoC) has published a
+ # history of Mexican local time (in Spanish)
+-# <http://www.cddhcu.gob.mx/bibliot/publica/inveyana/polisoc/horver/>.
++# http://www.diputados.gob.mx/bibliot/publica/inveyana/polisoc/horver/index.htm
+ #
+ # Here are the discrepancies between Shanks & Pottenger (S&P) and the MLoC.
+ # (In all cases we go with the MLoC.)
+@@ -2179,8 +2345,8 @@
+ # -------------- End Forwarded Message --------------
+ # From Paul Eggert (1996-06-12):
+ # For an English translation of the decree, see
+-# "Diario Oficial: Time Zone Changeover" (1996-01-04)
+-# <http://mexico-travel.com/extra/timezone_eng.html>.
++# "Diario Oficial: Time Zone Changeover" (1996-01-04).
++# http://mexico-travel.com/extra/timezone_eng.html
+ 
+ # From Rives McDow (1998-10-08):
+ # The State of Quintana Roo has reverted back to central STD and DST times
+@@ -2205,7 +2371,7 @@
+ # January 17, 2000 - The Energy Secretary, Ernesto Martens, announced
+ # that Summer Time will be reduced from seven to five months, starting
+ # this year....
+-# <http://www.publico.com.mx/scripts/texto3.asp?action=pagina&pag=21&pos=p&secc=naci&date=01/17/2001>
++# http://www.publico.com.mx/scripts/texto3.asp?action=pagina&pag=21&pos=p&secc=naci&date=01/17/2001
+ # [translated], says "summer time will ... take effect on the first Sunday
+ # in May, and end on the last Sunday of September.
+ 
+@@ -2219,13 +2385,13 @@
+ # observation of Daylight Saving Time.
+ 
+ # Official statute published by the Energy Department
+-# <http://www.conae.gob.mx/ahorro/decretohorver2001.html#decre>
++# http://www.conae.gob.mx/ahorro/decretohorver2001.html#decre
+ # (2001-02-01) shows Baja and Chihauhua as still using US DST rules,
+ # and Sonora with no DST.  This was reported by Jesper Nørgaard (2001-02-03).
+ 
+ # From Paul Eggert (2001-03-03):
+ #
+-# <http://www.latimes.com/news/nation/20010303/t000018766.html>
++# http://www.latimes.com/news/nation/20010303/t000018766.html
+ # James F. Smith writes in today's LA Times
+ # * Sonora will continue to observe standard time.
+ # * Last week Mexico City's mayor Andrés Manuel López Obrador decreed that
+@@ -2303,6 +2469,40 @@
+ # efecto desde las dos horas del segundo domingo de marzo y concluirá a
+ # las dos horas del primer domingo de noviembre.
+ 
++# From Steffen Thorsen (2014-12-08), translated by Gwillim Law:
++# The Mexican state of Quintana Roo will likely change to EST in 2015.
++#
++# http://www.unioncancun.mx/articulo/2014/12/04/medio-ambiente/congreso-aprueba-una-hora-mas-de-sol-en-qroo
++# "With this change, the time conflict that has existed between the municipios
++# of Quintana Roo and the municipio of Felipe Carrillo Puerto may come to an
++# end. The latter declared itself in rebellion 15 years ago when a time change
++# was initiated in Mexico, and since then it has refused to change its time
++# zone along with the rest of the country."
++#
++# From Steffen Thorsen (2015-01-14), translated by Gwillim Law:
++# http://sipse.com/novedades/confirman-aplicacion-de-nueva-zona-horaria-para-quintana-roo-132331.html
++# "...the new time zone will come into effect at two o'clock on the first Sunday
++# of February, when we will have to advance the clock one hour from its current
++# time..."
++# Also, the new zone will not use DST.
++#
++# From Carlos Raúl Perasso (2015-02-02):
++# The decree that modifies the Mexican Hour System Law has finally
++# been published at the Diario Oficial de la Federación
++# http://www.dof.gob.mx/nota_detalle.php?codigo=5380123&fecha=31/01/2015
++# It establishes 5 zones for Mexico:
++# 1- Zona Centro (Central Zone): Corresponds to longitude 90 W,
++#    includes most of Mexico, excluding what's mentioned below.
++# 2- Zona Pacífico (Pacific Zone): Longitude 105 W, includes the
++#    states of Baja California Sur; Chihuahua; Nayarit (excluding Bahía
++#    de Banderas which lies in Central Zone); Sinaloa and Sonora.
++# 3- Zona Noroeste (Northwest Zone): Longitude 120 W, includes the
++#    state of Baja California.
++# 4- Zona Sureste (Southeast Zone): Longitude 75 W, includes the state
++#    of Quintana Roo.
++# 5- The islands, reefs and keys shall take their timezone from the
++#    longitude they are located at.
++
+ # Rule	NAME	FROM	TO	TYPE	IN	ON	AT	SAVE	LETTER/S
+ Rule	Mexico	1939	only	-	Feb	5	0:00	1:00	D
+ Rule	Mexico	1939	only	-	Jun	25	0:00	0	S
+@@ -2323,35 +2523,48 @@
+ Zone America/Cancun	-5:47:04 -	LMT	1922 Jan  1  0:12:56
+ 			-6:00	-	CST	1981 Dec 23
+ 			-5:00	Mexico	E%sT	1998 Aug  2  2:00
+-			-6:00	Mexico	C%sT
++			-6:00	Mexico	C%sT	2015 Feb  1  2:00
++			-5:00	-	EST
+ # Campeche, Yucatán; represented by Mérida
+ Zone America/Merida	-5:58:28 -	LMT	1922 Jan  1  0:01:32
+ 			-6:00	-	CST	1981 Dec 23
+ 			-5:00	-	EST	1982 Dec  2
+ 			-6:00	Mexico	C%sT
+-# Coahuila, Durango, Nuevo León, Tamaulipas (near US border)
++# Coahuila, Nuevo León, Tamaulipas (near US border)
++# This includes the following municipalities:
++#   in Coahuila: Ocampo, Acuña, Zaragoza, Jiménez, Piedras Negras, Nava,
++#     Guerrero, Hidalgo.
++#   in Nuevo León: Anáhuac, Los Aldama.
++#   in Tamaulipas: Nuevo Laredo, Guerrero, Mier, Miguel Alemán, Camargo,
++#     Gustavo Díaz Ordaz, Reynosa, Río Bravo, Valle Hermoso, Matamoros.
++# See: Inicia mañana Horario de Verano en zona fronteriza, El Universal,
++# 2016-03-12
++# http://www.eluniversal.com.mx/articulo/estados/2016/03/12/inicia-manana-horario-de-verano-en-zona-fronteriza
+ Zone America/Matamoros	-6:40:00 -	LMT	1921 Dec 31 23:20:00
+ 			-6:00	-	CST	1988
+ 			-6:00	US	C%sT	1989
+ 			-6:00	Mexico	C%sT	2010
+ 			-6:00	US	C%sT
+-# Coahuila, Durango, Nuevo León, Tamaulipas (away from US border)
++# Durango; Coahuila, Nuevo León, Tamaulipas (away from US border)
+ Zone America/Monterrey	-6:41:16 -	LMT	1921 Dec 31 23:18:44
+ 			-6:00	-	CST	1988
+ 			-6:00	US	C%sT	1989
+ 			-6:00	Mexico	C%sT
+ # Central Mexico
+-Zone America/Mexico_City -6:36:36 -	LMT	1922 Jan  1 0:23:24
++Zone America/Mexico_City -6:36:36 -	LMT	1922 Jan  1  0:23:24
+ 			-7:00	-	MST	1927 Jun 10 23:00
+ 			-6:00	-	CST	1930 Nov 15
+ 			-7:00	-	MST	1931 May  1 23:00
+ 			-6:00	-	CST	1931 Oct
+ 			-7:00	-	MST	1932 Apr  1
+-			-6:00	Mexico	C%sT	2001 Sep 30 02:00
++			-6:00	Mexico	C%sT	2001 Sep 30  2:00
+ 			-6:00	-	CST	2002 Feb 20
+ 			-6:00	Mexico	C%sT
+ # Chihuahua (near US border)
+-Zone America/Ojinaga	-6:57:40 -	LMT	1922 Jan 1 0:02:20
++# This includes the municipalities of Janos, Ascensión, Juárez, Guadalupe,
++# Práxedis G Guerrero, Coyame del Sotol, Ojinaga, and Manuel Benavides.
++# (See the 2016-03-12 El Universal source mentioned above.)
++Zone America/Ojinaga	-6:57:40 -	LMT	1922 Jan  1  0:02:20
+ 			-7:00	-	MST	1927 Jun 10 23:00
+ 			-6:00	-	CST	1930 Nov 15
+ 			-7:00	-	MST	1931 May  1 23:00
+@@ -2359,7 +2572,7 @@
+ 			-7:00	-	MST	1932 Apr  1
+ 			-6:00	-	CST	1996
+ 			-6:00	Mexico	C%sT	1998
+-			-6:00	-	CST	1998 Apr Sun>=1 3:00
++			-6:00	-	CST	1998 Apr Sun>=1  3:00
+ 			-7:00	Mexico	M%sT	2010
+ 			-7:00	US	M%sT
+ # Chihuahua (away from US border)
+@@ -2371,7 +2584,7 @@
+ 			-7:00	-	MST	1932 Apr  1
+ 			-6:00	-	CST	1996
+ 			-6:00	Mexico	C%sT	1998
+-			-6:00	-	CST	1998 Apr Sun>=1 3:00
++			-6:00	-	CST	1998 Apr Sun>=1  3:00
+ 			-7:00	Mexico	M%sT
+ # Sonora
+ Zone America/Hermosillo	-7:23:52 -	LMT	1921 Dec 31 23:36:08
+@@ -2435,10 +2648,10 @@
+ 			-6:00	-	CST	1942 Apr 24
+ 			-7:00	-	MST	1949 Jan 14
+ 			-8:00	-	PST	1970
+-			-7:00	Mexico	M%sT	2010 Apr 4 2:00
++			-7:00	Mexico	M%sT	2010 Apr  4  2:00
+ 			-6:00	Mexico	C%sT
+ 
+-# Baja California (near US border)
++# Baja California
+ Zone America/Tijuana	-7:48:04 -	LMT	1922 Jan  1  0:11:56
+ 			-7:00	-	MST	1924
+ 			-8:00	-	PST	1927 Jun 10 23:00
+@@ -2458,25 +2671,6 @@
+ 			-8:00	US	P%sT	2002 Feb 20
+ 			-8:00	Mexico	P%sT	2010
+ 			-8:00	US	P%sT
+-# Baja California (away from US border)
+-Zone America/Santa_Isabel	-7:39:28 -	LMT	1922 Jan  1  0:20:32
+-			-7:00	-	MST	1924
+-			-8:00	-	PST	1927 Jun 10 23:00
+-			-7:00	-	MST	1930 Nov 15
+-			-8:00	-	PST	1931 Apr  1
+-			-8:00	1:00	PDT	1931 Sep 30
+-			-8:00	-	PST	1942 Apr 24
+-			-8:00	1:00	PWT	1945 Aug 14 23:00u
+-			-8:00	1:00	PPT	1945 Nov 12 # Peace
+-			-8:00	-	PST	1948 Apr  5
+-			-8:00	1:00	PDT	1949 Jan 14
+-			-8:00	-	PST	1954
+-			-8:00	CA	P%sT	1961
+-			-8:00	-	PST	1976
+-			-8:00	US	P%sT	1996
+-			-8:00	Mexico	P%sT	2001
+-			-8:00	US	P%sT	2002 Feb 20
+-			-8:00	Mexico	P%sT
+ # From Paul Eggert (2006-03-22):
+ # Formerly there was an America/Ensenada zone, which differed from
+ # America/Tijuana only in that it did not observe DST from 1976
+@@ -2489,19 +2683,21 @@
+ # other than America/Tijuana for Baja, but it's not clear yet what its
+ # name or contents should be.
+ #
++# From Paul Eggert (2015-10-08):
++# Formerly there was an America/Santa_Isabel zone, but this appears to
++# have come from a misreading of
++# http://dof.gob.mx/nota_detalle.php?codigo=5127480&fecha=06/01/2010
++# It has been moved to the 'backward' file.
++#
++#
+ # Revillagigedo Is
+ # no information
+ 
+ ###############################################################################
+ 
+ # Anguilla
+-# See America/Port_of_Spain.
+-
+ # Antigua and Barbuda
+-# Zone	NAME		GMTOFF	RULES	FORMAT	[UNTIL]
+-Zone	America/Antigua	-4:07:12 -	LMT	1912 Mar 2
+-			-5:00	-	EST	1951
+-			-4:00	-	AST
++# See America/Port_of_Spain.
+ 
+ # Bahamas
+ #
+@@ -2531,8 +2727,8 @@
+ Rule	Barb	1979	only	-	Sep	30	2:00	0	S
+ Rule	Barb	1980	only	-	Sep	25	2:00	0	S
+ # Zone	NAME		GMTOFF	RULES	FORMAT	[UNTIL]
+-Zone America/Barbados	-3:58:29 -	LMT	1924		# Bridgetown
+-			-3:58:29 -	BMT	1932	  # Bridgetown Mean Time
++Zone America/Barbados	-3:58:29 -	LMT	1924 # Bridgetown
++			-3:58:29 -	BMT	1932 # Bridgetown Mean Time
+ 			-4:00	Barb	A%sT
+ 
+ # Belize
+@@ -2562,16 +2758,13 @@
+ # http://www.theroyalgazette.com/apps/pbcs.dll/article?AID=/20060529/NEWS/105290135
+ 
+ # Zone	NAME		GMTOFF	RULES	FORMAT	[UNTIL]
+-Zone Atlantic/Bermuda	-4:19:18 -	LMT	1930 Jan  1 2:00    # Hamilton
+-			-4:00	-	AST	1974 Apr 28 2:00
++Zone Atlantic/Bermuda	-4:19:18 -	LMT	1930 Jan  1  2:00 # Hamilton
++			-4:00	-	AST	1974 Apr 28  2:00
+ 			-4:00	Canada	A%sT	1976
+ 			-4:00	US	A%sT
+ 
+ # Cayman Is
+-# Zone	NAME		GMTOFF	RULES	FORMAT	[UNTIL]
+-Zone	America/Cayman	-5:25:32 -	LMT	1890		# Georgetown
+-			-5:07:11 -	KMT	1912 Feb    # Kingston Mean Time
+-			-5:00	-	EST
++# See America/Panama.
+ 
+ # Costa Rica
+ 
+@@ -2587,7 +2780,7 @@
+ Rule	CR	1992	only	-	Mar	15	0:00	0	S
+ # There are too many San Josés elsewhere, so we'll use 'Costa Rica'.
+ # Zone	NAME		GMTOFF	RULES	FORMAT	[UNTIL]
+-Zone America/Costa_Rica	-5:36:13 -	LMT	1890		# San José
++Zone America/Costa_Rica	-5:36:13 -	LMT	1890        # San José
+ 			-5:36:13 -	SJMT	1921 Jan 15 # San José Mean Time
+ 			-6:00	CR	C%sT
+ # Coco
+@@ -2831,8 +3024,8 @@
+ Zone America/Santo_Domingo -4:39:36 -	LMT	1890
+ 			-4:40	-	SDMT	1933 Apr  1 12:00 # S. Dom. MT
+ 			-5:00	DR	E%sT	1974 Oct 27
+-			-4:00	-	AST	2000 Oct 29 02:00
+-			-5:00	US	E%sT	2000 Dec  3 01:00
++			-4:00	-	AST	2000 Oct 29  2:00
++			-5:00	US	E%sT	2000 Dec  3  1:00
+ 			-4:00	-	AST
+ 
+ # El Salvador
+@@ -2843,7 +3036,7 @@
+ # There are too many San Salvadors elsewhere, so use America/El_Salvador
+ # instead of America/San_Salvador.
+ # Zone	NAME		GMTOFF	RULES	FORMAT	[UNTIL]
+-Zone America/El_Salvador -5:56:48 -	LMT	1921		# San Salvador
++Zone America/El_Salvador -5:56:48 -	LMT	1921 # San Salvador
+ 			-6:00	Salv	C%sT
+ 
+ # Grenada
+@@ -2864,7 +3057,7 @@
+ # From Paul Eggert (2006-06-22):
+ # The Ministry of Energy and Mines, press release CP-15/2006
+ # (2006-04-19), says DST ends at 24:00.  See
+-# <http://www.sieca.org.gt/Sitio_publico/Energeticos/Doc/Medidas/Cambio_Horario_Nac_190406.pdf>.
++# http://www.sieca.org.gt/Sitio_publico/Energeticos/Doc/Medidas/Cambio_Horario_Nac_190406.pdf
+ 
+ # Rule	NAME	FROM	TO	TYPE	IN	ON	AT	SAVE	LETTER/S
+ Rule	Guat	1973	only	-	Nov	25	0:00	1:00	D
+@@ -2934,6 +3127,13 @@
+ # http://radiovision2000haiti.net/public/haiti-avis-changement-dheure-dimanche/
+ # http://www.canalplushaiti.net/?p=6714
+ 
++# From Steffen Thorsen (2016-03-12):
++# Jean Antoine, editor of www.haiti-reference.com informed us that Haiti
++# are not going on DST this year.  Several other resources confirm this: ...
++# http://www.radiotelevisioncaraibes.com/presse/heure_d_t_pas_de_changement_d_heure_pr_vu_pour_cet_ann_e.html
++# http://www.vantbefinfo.com/changement-dheure-pas-pour-haiti/
++# http://news.anmwe.com/haiti-lheure-nationale-ne-sera-ni-avancee-ni-reculee-cette-annee/
++
+ # Rule	NAME	FROM	TO	TYPE	IN	ON	AT	SAVE	LETTER/S
+ Rule	Haiti	1983	only	-	May	8	0:00	1:00	D
+ Rule	Haiti	1984	1987	-	Apr	lastSun	0:00	1:00	D
+@@ -2944,8 +3144,8 @@
+ Rule	Haiti	1988	1997	-	Oct	lastSun	1:00s	0	S
+ Rule	Haiti	2005	2006	-	Apr	Sun>=1	0:00	1:00	D
+ Rule	Haiti	2005	2006	-	Oct	lastSun	0:00	0	S
+-Rule	Haiti	2012	max	-	Mar	Sun>=8	2:00	1:00	D
+-Rule	Haiti	2012	max	-	Nov	Sun>=1	2:00	0	S
++Rule	Haiti	2012	2015	-	Mar	Sun>=8	2:00	1:00	D
++Rule	Haiti	2012	2015	-	Nov	Sun>=1	2:00	0	S
+ # Zone	NAME		GMTOFF	RULES	FORMAT	[UNTIL]
+ Zone America/Port-au-Prince -4:49:20 -	LMT	1890
+ 			-4:49	-	PPMT	1917 Jan 24 12:00 # P-a-P MT
+@@ -2967,8 +3167,8 @@
+ # http://www.worldtimezone.com/dst_news/dst_news_honduras04.html
+ 
+ # From Paul Eggert (2006-08-08):
+-# Also see Diario El Heraldo, The country returns to standard time (2006-08-08)
+-# <http://www.elheraldo.hn/nota.php?nid=54941&sec=12>.
++# Also see Diario El Heraldo, The country returns to standard time (2006-08-08).
++# http://www.elheraldo.hn/nota.php?nid=54941&sec=12
+ # It mentions executive decree 18-2006.
+ 
+ # From Steffen Thorsen (2006-08-17):
+@@ -2995,17 +3195,28 @@
+ # Shanks & Pottenger give -5:07:12, but Milne records -5:07:10.41 from an
+ # unspecified official document, and says "This time is used throughout the
+ # island".  Go with Milne.  Round to the nearest second as required by zic.
++#
++# Shanks & Pottenger give April 28 for the 1974 spring-forward transition, but
++# Lance Neita writes that Prime Minister Michael Manley decreed it January 5.
++# Assume Neita meant Jan 6 02:00, the same as the US.  Neita also writes that
++# Manley's supporters associated this act with Manley's nickname "Joshua"
++# (recall that in the Bible the sun stood still at Joshua's request),
++# and with the Rod of Correction which Manley said he had received from
++# Haile Selassie, Emperor of Ethiopia.  See:
++# Neita L. The politician in all of us. Jamaica Observer 2014-09-20
++# http://www.jamaicaobserver.com/columns/The-politician-in-all-of-us_17573647
++#
+ # Zone	NAME		GMTOFF	RULES	FORMAT	[UNTIL]
+-Zone	America/Jamaica	-5:07:11 -	LMT	1890		# Kingston
++Zone	America/Jamaica	-5:07:11 -	LMT	1890        # Kingston
+ 			-5:07:11 -	KMT	1912 Feb    # Kingston Mean Time
+-			-5:00	-	EST	1974 Apr 28 2:00
++			-5:00	-	EST	1974
+ 			-5:00	US	E%sT	1984
+ 			-5:00	-	EST
+ 
+ # Martinique
+ # Zone	NAME		GMTOFF	RULES	FORMAT	[UNTIL]
+-Zone America/Martinique	-4:04:20 -      LMT	1890		# Fort-de-France
+-			-4:04:20 -	FFMT	1911 May     # Fort-de-France MT
++Zone America/Martinique	-4:04:20 -      LMT	1890        # Fort-de-France
++			-4:04:20 -	FFMT	1911 May    # Fort-de-France MT
+ 			-4:00	-	AST	1980 Apr  6
+ 			-4:00	1:00	ADT	1980 Sep 28
+ 			-4:00	-	AST
+@@ -3034,7 +3245,7 @@
+ # From Gwillim Law (2005-04-21):
+ # The Associated Press story on the time change, which can be found at
+ # http://www.lapalmainteractivo.com/guias/content/gen/ap/America_Latina/AMC_GEN_NICARAGUA_HORA.html
+-# and elsewhere, says (fifth paragraph, translated from Spanish):  "The last
++# and elsewhere, says (fifth paragraph, translated from Spanish): "The last
+ # time that a change of clocks was applied to save energy was in the year 2000
+ # during the Arnoldo Alemán administration."...
+ # The northamerica file says that Nicaragua has been on UTC-6 continuously
+@@ -3072,7 +3283,7 @@
+ 			-5:45:12 -	MMT	1934 Jun 23 # Managua Mean Time?
+ 			-6:00	-	CST	1973 May
+ 			-5:00	-	EST	1975 Feb 16
+-			-6:00	Nic	C%sT	1992 Jan  1 4:00
++			-6:00	Nic	C%sT	1992 Jan  1  4:00
+ 			-5:00	-	EST	1992 Sep 24
+ 			-6:00	-	CST	1993
+ 			-5:00	-	EST	1997
+@@ -3081,13 +3292,14 @@
+ # Panama
+ # Zone	NAME		GMTOFF	RULES	FORMAT	[UNTIL]
+ Zone	America/Panama	-5:18:08 -	LMT	1890
+-			-5:19:36 -	CMT	1908 Apr 22   # Colón Mean Time
++			-5:19:36 -	CMT	1908 Apr 22 # Colón Mean Time
+ 			-5:00	-	EST
++Link America/Panama America/Cayman
+ 
+ # Puerto Rico
+ # There are too many San Juans elsewhere, so we'll use 'Puerto_Rico'.
+ # Zone	NAME		GMTOFF	RULES	FORMAT	[UNTIL]
+-Zone America/Puerto_Rico -4:24:25 -	LMT	1899 Mar 28 12:00    # San Juan
++Zone America/Puerto_Rico -4:24:25 -	LMT	1899 Mar 28 12:00 # San Juan
+ 			-4:00	-	AST	1942 May  3
+ 			-4:00	US	A%sT	1946
+ 			-4:00	-	AST
+@@ -3099,7 +3311,7 @@
+ # St Pierre and Miquelon
+ # There are too many St Pierres elsewhere, so we'll use 'Miquelon'.
+ # Zone	NAME		GMTOFF	RULES	FORMAT	[UNTIL]
+-Zone America/Miquelon	-3:44:40 -	LMT	1911 May 15	# St Pierre
++Zone America/Miquelon	-3:44:40 -	LMT	1911 May 15 # St Pierre
+ 			-4:00	-	AST	1980 May
+ 			-3:00	-	PMST	1987 # Pierre & Miquelon Time
+ 			-3:00	Canada	PM%sT
+@@ -3110,7 +3322,7 @@
+ # Turks and Caicos
+ #
+ # From Chris Dunn in
+-# <http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=415007>
++# http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=415007
+ # (2007-03-15): In the Turks & Caicos Islands (America/Grand_Turk) the
+ # daylight saving dates for time changes have been adjusted to match
+ # the recent U.S. change of dates.
+@@ -3123,20 +3335,21 @@
+ # Clocks are set back one hour at 2:00 a.m. local Daylight Saving Time"
+ # indicating that the normal ET rules are followed.
+ #
+-# From Paul Eggert (2006-05-01):
+-# Shanks & Pottenger say they use US DST rules, but IATA SSIM (1991/1998)
+-# says they switch at midnight.  Go with Shanks & Pottenger.
++# From Paul Eggert (2014-08-19):
++# The 2014-08-13 Cabinet meeting decided to stay on UT -04 year-round.  See:
++# http://tcweeklynews.com/daylight-savings-time-to-be-maintained-p5353-127.htm
++# Model this as a switch from EST/EDT to AST ...
++# From Chris Walton (2014-11-04):
++# ... the TCI government appears to have delayed the switch to
++# "permanent daylight saving time" by one year....
++# http://tcweeklynews.com/time-change-to-go-ahead-this-november-p5437-127.htm
+ #
+-# Rule	NAME	FROM	TO	TYPE	IN	ON	AT	SAVE	LETTER/S
+-Rule	TC	1979	1986	-	Apr	lastSun	2:00	1:00	D
+-Rule	TC	1979	2006	-	Oct	lastSun	2:00	0	S
+-Rule	TC	1987	2006	-	Apr	Sun>=1	2:00	1:00	D
+-Rule	TC	2007	max	-	Mar	Sun>=8	2:00	1:00	D
+-Rule	TC	2007	max	-	Nov	Sun>=1	2:00	0	S
+ # Zone	NAME		GMTOFF	RULES	FORMAT	[UNTIL]
+ Zone America/Grand_Turk	-4:44:32 -	LMT	1890
+-			-5:07:11 -	KMT	1912 Feb    # Kingston Mean Time
+-			-5:00	TC	E%sT
++			-5:07:11 -	KMT	1912 Feb # Kingston Mean Time
++			-5:00	-	EST	1979
++			-5:00	US	E%sT	2015 Nov Sun>=1 2:00
++			-4:00	-	AST
+ 
+ # British Virgin Is
+ # Virgin Is
+--- contrib/tzdata/southamerica.orig
++++ contrib/tzdata/southamerica
+@@ -1,27 +1,28 @@
+ # This file is in the public domain, so clarified as of
+ # 2009-05-17 by Arthur David Olson.
+ 
+-# This data is by no means authoritative; if you think you know better,
++# This file is by no means authoritative; if you think you know better,
+ # go ahead and edit the file (and please send any changes to
+-# tz@iana.org for general use in the future).
++# tz@iana.org for general use in the future).  For more, please see
++# the file CONTRIBUTING in the tz distribution.
+ 
+-# From Paul Eggert (2006-03-22):
+-# A good source for time zone historical data outside the U.S. is
++# From Paul Eggert (2014-10-31):
++#
++# Unless otherwise specified, the source for data through 1990 is:
+ # Thomas G. Shanks and Rique Pottenger, The International Atlas (6th edition),
+ # San Diego: ACS Publications, Inc. (2003).
+-#
+-# For data circa 1899, a common source is:
+-# Milne J. Civil time. Geogr J. 1899 Feb;13(2):173-94
+-# <http://www.jstor.org/stable/1774359>.
++# Unfortunately this book contains many errors and cites no sources.
+ #
+ # Gwillim Law writes that a good source
+ # for recent time zone data is the International Air Transport
+ # Association's Standard Schedules Information Manual (IATA SSIM),
+ # published semiannually.  Law sent in several helpful summaries
+-# of the IATA's data after 1990.
++# of the IATA's data after 1990.  Except where otherwise noted,
++# IATA SSIM is the source for entries after 1990.
+ #
+-# Except where otherwise noted, Shanks & Pottenger is the source for
+-# entries through 1990, and IATA SSIM is the source for entries afterwards.
++# For data circa 1899, a common source is:
++# Milne J. Civil time. Geogr J. 1899 Feb;13(2):173-94.
++# http://www.jstor.org/stable/1774359
+ #
+ # Earlier editions of these tables used the North American style (e.g. ARST and
+ # ARDT for Argentine Standard and Daylight Time), but the following quote
+@@ -29,7 +30,7 @@
+ #	I suggest the use of _Summer time_ instead of the more cumbersome
+ #	_daylight-saving time_.  _Summer time_ seems to be in general use
+ #	in Europe and South America.
+-#	-- E O Cutler, _New York Times_ (1937-02-14), quoted in
++#	-- E O Cutler, _New York Times_ (1937-02-14), quoted in
+ #	H L Mencken, _The American Language: Supplement I_ (1960), p 466
+ #
+ # Earlier editions of these tables also used the North American style
+@@ -130,7 +131,7 @@
+ # Timezone Law (which never was effectively applied) will (would?) be
+ # in effect.... The article is at
+ # http://ar.clarin.com/diario/2001-06-06/e-01701.htm
+-# ... The Law itself is "Ley No 25155", sanctioned on 1999-08-25, enacted
++# ... The Law itself is "Ley No. 25155", sanctioned on 1999-08-25, enacted
+ # 1999-09-17, and published 1999-09-21.  The official publication is at:
+ # http://www.boletin.jus.gov.ar/BON/Primera/1999/09-Septiembre/21/PDF/BO21-09-99LEG.PDF
+ # Regretfully, you have to subscribe (and pay) for the on-line version....
+@@ -174,21 +175,17 @@
+ # http://www.worldtimezone.com/dst_news/dst_news_argentina03.html
+ # http://www.impulsobaires.com.ar/nota.php?id=57832 (in spanish)
+ 
+-# From Rodrigo Severo (2008-10-06):
+-# Here is some info available at a Gentoo bug related to TZ on Argentina's DST:
+-# ...
+-# ------- Comment #1 from [jmdocile]  2008-10-06 16:28 0000 -------
+-# Hi, there is a problem with timezone-data-2008e and maybe with
+-# timezone-data-2008f
+-# Argentinian law [Number] 25.155 is no longer valid.
++# From Juan Manuel Docile in https://bugs.gentoo.org/240339 (2008-10-07)
++# via Rodrigo Severo:
++# Argentinian law No. 25.155 is no longer valid.
+ # http://www.infoleg.gov.ar/infolegInternet/anexos/60000-64999/60036/norma.htm
+-# The new one is law [Number] 26.350
++# The new one is law No. 26.350
+ # http://www.infoleg.gov.ar/infolegInternet/anexos/135000-139999/136191/norma.htm
+ # So there is no summer time in Argentina for now.
+ 
+ # From Mariano Absatz (2008-10-20):
+-# Decree 1693/2008 applies Law 26.350 for the summer 2008/2009 establishing DST in Argentina
+-# From 2008-10-19 until 2009-03-15
++# Decree 1693/2008 applies Law 26.350 for the summer 2008/2009 establishing DST
++# in Argentina from 2008-10-19 until 2009-03-15.
+ # http://www.boletinoficial.gov.ar/Bora.Portal/CustomControls/PdfContent.aspx?fp=16102008&pi=3&pf=4&s=0&sec=01
+ #
+ 
+@@ -197,14 +194,16 @@
+ # Pampa, Neuquén, Rio Negro, Chubut, Santa Cruz and Tierra del Fuego
+ # http://www.boletinoficial.gov.ar/Bora.Portal/CustomControls/PdfContent.aspx?fp=17102008&pi=1&pf=1&s=0&sec=01
+ #
+-# Press release 235 dated Saturday October 18th, from the Government of the Province of Jujuy saying
+-# it will not apply DST either (even when it was not included in Decree 1705/2008)
++# Press release 235 dated Saturday October 18th, from the Government of the
++# Province of Jujuy saying it will not apply DST either (even when it was not
++# included in Decree 1705/2008).
+ # http://www.jujuy.gov.ar/index2/partes_prensa/18_10_08/235-181008.doc
+ 
+ # From fullinet (2009-10-18):
+ # As announced in
+ # http://www.argentina.gob.ar/argentina/portal/paginas.dhtml?pagina=356
+-# (an official .gob.ar) under title: "Sin Cambio de Hora" (english: "No hour change")
++# (an official .gob.ar) under title: "Sin Cambio de Hora"
++# (English: "No hour change").
+ #
+ # "Por el momento, el Gobierno Nacional resolvió no modificar la hora
+ # oficial, decisión que estaba en estudio para su implementación el
+@@ -225,9 +224,9 @@
+ # It's Law No. 7,210.  This change is due to a public power emergency, so for
+ # now we'll assume it's for this year only.
+ #
+-# From Paul Eggert (2006-03-22):
+-# Hora de verano para la Republica Argentina (2003-06-08)
+-# <http://www.spicasc.net/horvera.html>
++# From Paul Eggert (2014-08-09):
++# Hora de verano para la República Argentina
++# http://buenasiembra.com.ar/esoterismo/astrologia/hora-de-verano-de-la-republica-argentina-27.html
+ # says that standard time in Argentina from 1894-10-31
+ # to 1920-05-01 was -4:16:48.25.  Go with this more-precise value
+ # over Shanks & Pottenger.
+@@ -300,7 +299,7 @@
+ # confirms that upon request the provinces San Juan and Mendoza
+ # refused to follow San Luis in this change.
+ #
+-# The change is supposed to take place Monday the 21.st at 0:00
++# The change is supposed to take place Monday the 21st at 0:00
+ # hours. As far as I understand it if this goes ahead, we need
+ # a new timezone for San Luis (although there are also documented
+ # independent changes in the southamerica file of San Luis in
+@@ -332,9 +331,9 @@
+ # back in 2004, when these provinces changed to UTC-4 for a few days, I
+ # mailed them personally and never got an answer).
+ 
+-# From Paul Eggert (2008-06-30):
+-# Unless otherwise specified, data are from Shanks & Pottenger through 1992,
+-# from the IATA otherwise.  As noted below, Shanks & Pottenger say that
++# From Paul Eggert (2014-08-12):
++# Unless otherwise specified, data entries are from Shanks & Pottenger through
++# 1992, from the IATA otherwise.  As noted below, Shanks & Pottenger say that
+ # America/Cordoba split into 6 subregions during 1991/1992, one of which
+ # was America/San_Luis, but we haven't verified this yet so for now we'll
+ # keep America/Cordoba a single region rather than splitting it into the
+@@ -394,7 +393,7 @@
+ # ...
+ 
+ # From Alexander Krivenyshev (2010-04-09):
+-# According to news reports from El Diario de la Republica Province San
++# According to news reports from El Diario de la República Province San
+ # Luis, Argentina (standard time UTC-04) will keep Daylight Saving Time
+ # after April 11, 2010 - will continue to have same time as rest of
+ # Argentina (UTC-3) (no DST).
+@@ -411,10 +410,10 @@
+ # stuck on Summer daylight savings time even though the summer is over.
+ 
+ # From Paul Eggert (2013-09-05):
+-# Perhaps San Luis operates on the legal fiction that it is at UTC-4
++# Perhaps San Luis operates on the legal fiction that it is at -04
+ # with perpetual summer time, but ordinary usage typically seems to
+-# just say it's at UTC-3; see, for example,
+-# <http://es.wikipedia.org/wiki/Hora_oficial_argentina>.
++# just say it's at -03; see, for example,
++# http://es.wikipedia.org/wiki/Hora_oficial_argentina
+ # We've documented similar situations as being plain changes to
+ # standard time, so let's do that here too.  This does not change UTC
+ # offsets, only tm_isdst and the time zone abbreviations.  One minor
+@@ -427,8 +426,8 @@
+ # Zone	NAME		GMTOFF	RULES	FORMAT	[UNTIL]
+ #
+ # Buenos Aires (BA), Capital Federal (CF),
+-Zone America/Argentina/Buenos_Aires -3:53:48 - LMT 1894 Oct 31
+-			-4:16:48 -	CMT	1920 May # Córdoba Mean Time
++Zone America/Argentina/Buenos_Aires -3:53:48 - LMT	1894 Oct 31
++			-4:16:48 -	CMT	1920 May    # Córdoba Mean Time
+ 			-4:00	-	ART	1930 Dec
+ 			-4:00	Arg	AR%sT	1969 Oct  5
+ 			-3:00	Arg	AR%sT	1999 Oct  3
+@@ -578,8 +577,8 @@
+ 			-3:00	-	ART
+ #
+ # Santa Cruz (SC)
+-Zone America/Argentina/Rio_Gallegos -4:36:52 - LMT 1894 Oct 31
+-			-4:16:48 -	CMT	1920 May # Córdoba Mean Time
++Zone America/Argentina/Rio_Gallegos -4:36:52 - LMT	1894 Oct 31
++			-4:16:48 -	CMT	1920 May    # Córdoba Mean Time
+ 			-4:00	-	ART	1930 Dec
+ 			-4:00	Arg	AR%sT	1969 Oct  5
+ 			-3:00	Arg	AR%sT	1999 Oct  3
+@@ -590,8 +589,8 @@
+ 			-3:00	-	ART
+ #
+ # Tierra del Fuego, Antártida e Islas del Atlántico Sur (TF)
+-Zone America/Argentina/Ushuaia -4:33:12 - LMT 1894 Oct 31
+-			-4:16:48 -	CMT	1920 May # Córdoba Mean Time
++Zone America/Argentina/Ushuaia -4:33:12 - LMT	1894 Oct 31
++			-4:16:48 -	CMT	1920 May    # Córdoba Mean Time
+ 			-4:00	-	ART	1930 Dec
+ 			-4:00	Arg	AR%sT	1969 Oct  5
+ 			-3:00	Arg	AR%sT	1999 Oct  3
+@@ -685,7 +684,7 @@
+ # Oficial da União"...) in Brazil there are changes in the timezones,
+ # effective today (00:00am at June 24, 2008) as follows:
+ #
+-# a) The timezone UTC+5 is e[x]tinguished, with all the Acre state and the
++# a) The timezone UTC+5 is extinguished, with all the Acre state and the
+ # part of the Amazonas state that had this timezone now being put to the
+ # timezone UTC+4
+ # b) The whole Pará state now is put at timezone UTC+3, instead of just
+@@ -722,8 +721,8 @@
+ 
+ # From Paul Eggert (2002-10-10):
+ # The official decrees referenced below are mostly taken from
+-# Decretos sobre o Horário de Verão no Brasil
+-# <http://pcdsh01.on.br/DecHV.html>.
++# Decretos sobre o Horário de Verão no Brasil.
++# http://pcdsh01.on.br/DecHV.html
+ 
+ # From Steffen Thorsen (2008-08-29):
+ # As announced by the government and many newspapers in Brazil late
+@@ -768,7 +767,7 @@
+ #	 [ and in a second message (same day): ]
+ # I found the decree.
+ #
+-# DECRETO No- 7.584, DE 13 DE OUTUBRO DE 2011
++# DECRETO No. 7.584, DE 13 DE OUTUBRO DE 2011
+ # Link :
+ # http://www.in.gov.br/visualiza/index.jsp?data=13/10/2011&jornal=1000&pagina=6&totalArquivos=6
+ 
+@@ -986,7 +985,7 @@
+ # West Pará includes Altamira, Óbidos, Prainha, Oriximiná, and Santarém.
+ Zone America/Santarem	-3:38:48 -	LMT	1914
+ 			-4:00	Brazil	AM%sT	1988 Sep 12
+-			-4:00	-	AMT	2008 Jun 24 00:00
++			-4:00	-	AMT	2008 Jun 24  0:00
+ 			-3:00	-	BRT
+ #
+ # Maranhão (MA), Piauí (PI), Ceará (CE), Rio Grande do Norte (RN),
+@@ -1041,7 +1040,7 @@
+ # Espírito Santo (ES), Rio de Janeiro (RJ), São Paulo (SP), Paraná (PR),
+ # Santa Catarina (SC), Rio Grande do Sul (RS)
+ Zone America/Sao_Paulo	-3:06:28 -	LMT	1914
+-			-3:00	Brazil	BR%sT	1963 Oct 23 00:00
++			-3:00	Brazil	BR%sT	1963 Oct 23  0:00
+ 			-3:00	1:00	BRST	1964
+ 			-3:00	Brazil	BR%sT
+ #
+@@ -1082,19 +1081,73 @@
+ 			-5:00	Brazil	AC%sT	1988 Sep 12
+ 			-5:00	-	ACT	1993 Sep 28
+ 			-5:00	Brazil	AC%sT	1994 Sep 22
+-			-5:00	-	ACT	2008 Jun 24 00:00
++			-5:00	-	ACT	2008 Jun 24  0:00
+ 			-4:00	-	AMT	2013 Nov 10
+ 			-5:00	-	ACT
+ #
+ # Acre (AC)
+ Zone America/Rio_Branco	-4:31:12 -	LMT	1914
+ 			-5:00	Brazil	AC%sT	1988 Sep 12
+-			-5:00	-	ACT	2008 Jun 24 00:00
++			-5:00	-	ACT	2008 Jun 24  0:00
+ 			-4:00	-	AMT	2013 Nov 10
+ 			-5:00	-	ACT
+ 
+ # Chile
+ 
++# From Paul Eggert (2015-04-03):
++# Shanks & Pottenger says America/Santiago introduced standard time in
++# 1890 and rounds its UTC offset to 70W40; guess that in practice this
++# was the same offset as in 1916-1919.  It also says Pacific/Easter
++# standardized on 109W22 in 1890; assume this didn't change the clocks.
++#
++# Dates for America/Santiago from 1910 to 2004 are primarily from
++# the following source, cited by Oscar van Vlijmen (2006-10-08):
++# [1] Chile Law
++# http://www.webexhibits.org/daylightsaving/chile.html
++# This contains a copy of a this official table:
++# Cambios en la hora oficial de Chile desde 1900 (retrieved 2008-03-30)
++# http://web.archive.org/web/20080330200901/http://www.horaoficial.cl/cambio.htm
++# [1] needs several corrections, though.
++#
++# The first set of corrections is from:
++# [2] History of the Official Time of Chile
++# http://www.horaoficial.cl/ing/horaof_ing.html (retrieved 2012-03-06).  See:
++# http://web.archive.org/web/20120306042032/http://www.horaoficial.cl/ing/horaof_ing.html
++# This is an English translation of:
++# Historia de la hora oficial de Chile (retrieved 2012-10-24).  See:
++# http://web.archive.org/web/20121024234627/http://www.horaoficial.cl/horaof.htm
++# A fancier Spanish version (requiring mouse-clicking) is at:
++# http://www.horaoficial.cl/historia_hora.html
++# Conflicts between [1] and [2] were resolved as follows:
++#
++#  - [1] says the 1910 transition was Jan 1, [2] says Jan 10 and cites
++#    Boletín No. 1, Aviso No. 1 (1910).  Go with [2].
++#
++#  - [1] says SMT was -4:42:45, [2] says Chile's official time from
++#    1916 to 1919 was -4:42:46.3, the meridian of Chile's National
++#    Astronomical Observatory (OAN), then located in what is now
++#    Quinta Normal in Santiago.  Go with [2], rounding it to -4:42:46.
++#
++#  - [1] says the 1918 transition was Sep 1, [2] says Sep 10 and cites
++#    Boletín No. 22, Aviso No. 129/1918 (1918-08-23).  Go with [2].
++#
++#  - [1] does not give times for transitions; assume they occur
++#    at midnight mainland time, the current common practice.  However,
++#    go with [2]'s specification of 23:00 for the 1947-05-21 transition.
++#
++# Another correction to [1] is from Jesper Nørgaard Welen, who
++# wrote (2006-10-08), "I think that there are some obvious mistakes in
++# the suggested link from Oscar van Vlijmen,... for instance entry 66
++# says that GMT-4 ended 1990-09-12 while entry 67 only begins GMT-3 at
++# 1990-09-15 (they should have been 1990-09-15 and 1990-09-16
++# respectively), but anyhow it clears up some doubts too."
++#
++# Data for Pacific/Easter from 1910 through 1967 come from Shanks &
++# Pottenger.  After that, for lack of better info assume
++# Pacific/Easter is always two hours behind America/Santiago;
++# this is known to work for DST transitions starting in 2008 and
++# may well be true for earlier transitions.
++
+ # From Eduardo Krell (1995-10-19):
+ # The law says to switch to DST at midnight [24:00] on the second SATURDAY
+ # of October....  The law is the same for March and October.
+@@ -1107,78 +1160,35 @@
+ # Because of the same drought, the government decided to end DST later,
+ # on April 3, (one-time change).
+ 
+-# From Oscar van Vlijmen (2006-10-08):
+-# http://www.horaoficial.cl/cambio.htm
+-
+-# From Jesper Nørgaard Welen (2006-10-08):
+-# I think that there are some obvious mistakes in the suggested link
+-# from Oscar van Vlijmen,... for instance entry 66 says that GMT-4
+-# ended 1990-09-12 while entry 67 only begins GMT-3 at 1990-09-15
+-# (they should have been 1990-09-15 and 1990-09-16 respectively), but
+-# anyhow it clears up some doubts too.
+-
+-# From Paul Eggert (2006-12-27):
+-# The following data for Chile and America/Santiago are from
+-# <http://www.horaoficial.cl/horaof.htm> (2006-09-20), transcribed by
+-# Jesper Nørgaard Welen.  The data for Pacific/Easter are from Shanks
+-# & Pottenger, except with DST transitions after 1932 cloned from
+-# America/Santiago.  The pre-1980 Pacific/Easter data are dubious,
+-# but we have no other source.
+-
+ # From Germán Poo-Caamaño (2008-03-03):
+ # Due to drought, Chile extends Daylight Time in three weeks.  This
+ # is one-time change (Saturday 3/29 at 24:00 for America/Santiago
+ # and Saturday 3/29 at 22:00 for Pacific/Easter)
+ # The Supreme Decree is located at
+ # http://www.shoa.cl/servicios/supremo316.pdf
+-# and the instructions for 2008 are located in:
+-# http://www.horaoficial.cl/cambio.htm
+-
++#
+ # From José Miguel Garrido (2008-03-05):
+-# ...
+-# You could see the announces of the change on
+ # http://www.shoa.cl/noticias/2008/04hora/hora.htm
+ 
+ # From Angel Chiang (2010-03-04):
+ # Subject: DST in Chile exceptionally extended to 3 April due to earthquake
+ # http://www.gobiernodechile.cl/viewNoticia.aspx?idArticulo=30098
+-# (in Spanish, last paragraph).
+ #
+-# This is breaking news. There should be more information available later.
+-
+-# From Arthur Daivd Olson (2010-03-06):
++# From Arthur David Olson (2010-03-06):
+ # Angel Chiang's message confirmed by Julio Pacheco; Julio provided a patch.
+ 
+-# From Glenn Eychaner (2011-03-02): [geychaner@mac.com]
+-# It appears that the Chilean government has decided to postpone the
+-# change from summer time to winter time again, by three weeks to April
+-# 2nd:
+-# http://www.emol.com/noticias/nacional/detalle/detallenoticias.asp?idnoticia=467651
+-#
+-# This is not yet reflected in the official "cambio de hora" site, but
+-# probably will be soon:
+-# http://www.horaoficial.cl/cambio.htm
+-
+-# From Arthur David Olson (2011-03-02):
+-# The emol.com article mentions a water shortage as the cause of the
+-# postponement, which may mean that it's not a permanent change.
+-
+ # From Glenn Eychaner (2011-03-28):
+-# The article:
+ # http://diario.elmercurio.com/2011/03/28/_portada/_portada/noticias/7565897A-CA86-49E6-9E03-660B21A4883E.htm?id=3D{7565897A-CA86-49E6-9E03-660B21A4883E}
+-#
+ # In English:
+ # Chile's clocks will go back an hour this year on the 7th of May instead
+ # of this Saturday. They will go forward again the 3rd Saturday in
+-# August, not in October as they have since 1968. This is a pilot plan
+-# which will be reevaluated in 2012.
++# August, not in October as they have since 1968.
+ 
+ # From Mauricio Parada (2012-02-22), translated by Glenn Eychaner (2012-02-23):
+ # As stated in the website of the Chilean Energy Ministry
+ # http://www.minenergia.cl/ministerio/noticias/generales/gobierno-anuncia-fechas-de-cambio-de.html
+ # The Chilean Government has decided to postpone the entrance into winter time
+-# (to leave DST) from March 11 2012 to April 28th 2012. The decision has not
+-# been yet formalized but it will within the next days.
++# (to leave DST) from March 11 2012 to April 28th 2012....
+ # Quote from the website communication:
+ #
+ # 6. For the year 2012, the dates of entry into winter time will be as follows:
+@@ -1203,17 +1213,31 @@
+ # DST Start: first Saturday of September 2014 (Sun 07 Sep 2014 04:00 UTC)
+ # http://www.diariooficial.interior.gob.cl//media/2014/02/19/do-20140219.pdf
+ 
+-# NOTE: ChileAQ rules for Antarctic bases are stored separately in the
+-# 'antarctica' file.
++# From Eduardo Romero Urra (2015-03-03):
++# Today has been published officially that Chile will use the DST time
++# permanently until March 25 of 2017
++# http://www.diariooficial.interior.gob.cl/media/2015/03/03/1-large.jpg
++#
++# From Paul Eggert (2015-03-03):
++# For now, assume that the extension will persist indefinitely.
++
++# From Juan Correa (2016-03-18):
++# The decree regarding DST has been published in today's Official Gazette:
++# http://www.diariooficial.interior.gob.cl/versiones-anteriores/do/20160318/
++# http://www.leychile.cl/Navegar?idNorma=1088502
++# It does consider the second Saturday of May and August as the dates
++# for the transition; and it lists DST dates until 2019, but I think
++# this scheme will stick.
++#
++# From Paul Eggert (2016-03-18):
++# For now, assume the pattern holds for the indefinite future.
++# The decree says transitions occur at 24:00; in practice this appears
++# to mean 24:00 mainland time, not 24:00 local time, so that Easter
++# Island is always two hours behind the mainland.
+ 
+ # Rule	NAME	FROM	TO	TYPE	IN	ON	AT	SAVE	LETTER/S
+-Rule	Chile	1927	1932	-	Sep	 1	0:00	1:00	S
++Rule	Chile	1927	1931	-	Sep	 1	0:00	1:00	S
+ Rule	Chile	1928	1932	-	Apr	 1	0:00	0	-
+-Rule	Chile	1942	only	-	Jun	 1	4:00u	0	-
+-Rule	Chile	1942	only	-	Aug	 1	5:00u	1:00	S
+-Rule	Chile	1946	only	-	Jul	15	4:00u	1:00	S
+-Rule	Chile	1946	only	-	Sep	 1	3:00u	0:00	-
+-Rule	Chile	1947	only	-	Apr	 1	4:00u	0	-
+ Rule	Chile	1968	only	-	Nov	 3	4:00u	1:00	S
+ Rule	Chile	1969	only	-	Mar	30	3:00u	0	-
+ Rule	Chile	1969	only	-	Nov	23	4:00u	1:00	S
+@@ -1224,10 +1248,8 @@
+ Rule	Chile	1973	only	-	Sep	30	4:00u	1:00	S
+ Rule	Chile	1974	1987	-	Oct	Sun>=9	4:00u	1:00	S
+ Rule	Chile	1987	only	-	Apr	12	3:00u	0	-
+-Rule	Chile	1988	1989	-	Mar	Sun>=9	3:00u	0	-
+-Rule	Chile	1988	only	-	Oct	Sun>=1	4:00u	1:00	S
+-Rule	Chile	1989	only	-	Oct	Sun>=9	4:00u	1:00	S
+-Rule	Chile	1990	only	-	Mar	18	3:00u	0	-
++Rule	Chile	1988	1990	-	Mar	Sun>=9	3:00u	0	-
++Rule	Chile	1988	1989	-	Oct	Sun>=9	4:00u	1:00	S
+ Rule	Chile	1990	only	-	Sep	16	4:00u	1:00	S
+ Rule	Chile	1991	1996	-	Mar	Sun>=9	3:00u	0	-
+ Rule	Chile	1991	1997	-	Oct	Sun>=9	4:00u	1:00	S
+@@ -1244,28 +1266,54 @@
+ Rule	Chile	2010	only	-	Apr	Sun>=1	3:00u	0	-
+ Rule	Chile	2011	only	-	May	Sun>=2	3:00u	0	-
+ Rule	Chile	2011	only	-	Aug	Sun>=16	4:00u	1:00	S
+-Rule	Chile	2012	max	-	Apr	Sun>=23	3:00u	0	-
+-Rule	Chile	2012	max	-	Sep	Sun>=2	4:00u	1:00	S
++Rule	Chile	2012	2014	-	Apr	Sun>=23	3:00u	0	-
++Rule	Chile	2012	2014	-	Sep	Sun>=2	4:00u	1:00	S
++Rule	Chile	2016	max	-	May	Sun>=9	3:00u	0	-
++Rule	Chile	2016	max	-	Aug	Sun>=9	4:00u	1:00	S
+ # IATA SSIM anomalies: (1992-02) says 1992-03-14;
+ # (1996-09) says 1998-03-08.  Ignore these.
+ # Zone	NAME		GMTOFF	RULES	FORMAT	[UNTIL]
+ Zone America/Santiago	-4:42:46 -	LMT	1890
+-			-4:42:46 -	SMT	1910 	    # Santiago Mean Time
++			-4:42:46 -	SMT	1910 Jan 10 # Santiago Mean Time
+ 			-5:00	-	CLT	1916 Jul  1 # Chile Time
+-			-4:42:46 -	SMT	1918 Sep  1 # Santiago Mean Time
+-			-4:00	-	CLT	1919 Jul  1 # Chile Time
+-			-4:42:46 -	SMT	1927 Sep  1 # Santiago Mean Time
+-			-5:00	Chile	CL%sT	1947 May 22 # Chile Time
++			-4:42:46 -	SMT	1918 Sep 10
++			-4:00	-	CLT	1919 Jul  1
++			-4:42:46 -	SMT	1927 Sep  1
++			-5:00	Chile	CL%sT	1932 Sep  1
++			-4:00	-	CLT	1942 Jun  1
++			-5:00	-	CLT	1942 Aug  1
++			-4:00	-	CLT	1946 Jul 15
++			-4:00	1:00	CLST	1946 Sep  1 # central Chile
++			-4:00	-	CLT	1947 Apr  1
++			-5:00	-	CLT	1947 May 21 23:00
+ 			-4:00	Chile	CL%sT
+-Zone Pacific/Easter	-7:17:44 -	LMT	1890
++Zone Pacific/Easter	-7:17:28 -	LMT	1890
+ 			-7:17:28 -	EMT	1932 Sep    # Easter Mean Time
+-			-7:00	Chile	EAS%sT	1982 Mar 13 21:00 # Easter I Time
++			-7:00	Chile	EAS%sT	1982 Mar 14 3:00u # Easter Time
+ 			-6:00	Chile	EAS%sT
+ #
+ # Salas y Gómez Island is uninhabited.
+ # Other Chilean locations, including Juan Fernández Is, Desventuradas Is,
+ # and Antarctic bases, are like America/Santiago.
+ 
++# Antarctic base using South American rules
++# (See the file 'antarctica' for more.)
++#
++# Palmer, Anvers Island, since 1965 (moved 2 miles in 1968)
++#
++# From Ethan Dicks (1996-10-06):
++# It keeps the same time as Punta Arenas, Chile, because, just like us
++# and the South Pole, that's the other end of their supply line....
++# I verified with someone who was there that since 1980,
++# Palmer has followed Chile.  Prior to that, before the Falklands War,
++# Palmer used to be supplied from Argentina.
++#
++# Zone	NAME		GMTOFF	RULES	FORMAT	[UNTIL]
++Zone Antarctica/Palmer	0	-	-00	1965
++			-4:00	Arg	AR%sT	1969 Oct  5
++			-3:00	Arg	AR%sT	1982 May
++			-4:00	Chile	CL%sT
++
+ # Colombia
+ 
+ # Milne gives 4:56:16.4 for Bogotá time in 1899; round to nearest.  He writes,
+@@ -1300,7 +1348,7 @@
+ # though, as far as we know.
+ #
+ # Zone	NAME		GMTOFF	RULES	FORMAT	[UNTIL]
+-Zone	America/Curacao	-4:35:47 -	LMT	1912 Feb 12	# Willemstad
++Zone	America/Curacao	-4:35:47 -	LMT	1912 Feb 12 # Willemstad
+ 			-4:30	-	ANT	1965 # Netherlands Antilles Time
+ 			-4:00	-	AST
+ 
+@@ -1325,10 +1373,10 @@
+ # Zone	NAME		GMTOFF	RULES	FORMAT	[UNTIL]
+ Zone America/Guayaquil	-5:19:20 -	LMT	1890
+ 			-5:14:00 -	QMT	1931 # Quito Mean Time
+-			-5:00	-	ECT	     # Ecuador Time
++			-5:00	-	ECT	# Ecuador Time
+ Zone Pacific/Galapagos	-5:58:24 -	LMT	1931 # Puerto Baquerizo Moreno
+ 			-5:00	-	ECT	1986
+-			-6:00	-	GALT	     # Galápagos Time
++			-6:00	-	GALT	# Galápagos Time
+ 
+ # Falklands
+ 
+@@ -1427,10 +1475,10 @@
+ Rule	Falk	2001	2010	-	Sep	Sun>=1	2:00	1:00	S
+ # Zone	NAME		GMTOFF	RULES	FORMAT	[UNTIL]
+ Zone Atlantic/Stanley	-3:51:24 -	LMT	1890
+-			-3:51:24 -	SMT	1912 Mar 12  # Stanley Mean Time
+-			-4:00	Falk	FK%sT	1983 May     # Falkland Is Time
++			-3:51:24 -	SMT	1912 Mar 12 # Stanley Mean Time
++			-4:00	Falk	FK%sT	1983 May    # Falkland Is Time
+ 			-3:00	Falk	FK%sT	1985 Sep 15
+-			-4:00	Falk	FK%sT	2010 Sep 5 02:00
++			-4:00	Falk	FK%sT	2010 Sep  5  2:00
+ 			-3:00	-	FKST
+ 
+ # French Guiana
+@@ -1441,7 +1489,7 @@
+ 
+ # Guyana
+ # Zone	NAME		GMTOFF	RULES	FORMAT	[UNTIL]
+-Zone	America/Guyana	-3:52:40 -	LMT	1915 Mar	# Georgetown
++Zone	America/Guyana	-3:52:40 -	LMT	1915 Mar    # Georgetown
+ 			-3:45	-	GBGT	1966 May 26 # Br Guiana Time
+ 			-3:45	-	GYT	1975 Jul 31 # Guyana Time
+ 			-3:00	-	GYT	1991
+@@ -1478,8 +1526,8 @@
+ # (10-01).
+ #
+ # Translated by Gwillim Law (2001-02-27) from
+-# Noticias, a daily paper in Asunción, Paraguay (2000-10-01)
+-# <http://www.diarionoticias.com.py/011000/nacional/naciona1.htm>:
++# Noticias, a daily paper in Asunción, Paraguay (2000-10-01):
++# http://www.diarionoticias.com.py/011000/nacional/naciona1.htm
+ # Starting at 0:00 today, the clock will be set forward 60 minutes, in
+ # fulfillment of Decree No. 7,273 of the Executive Power....  The time change
+ # system has been operating for several years.  Formerly there was a separate
+@@ -1494,7 +1542,7 @@
+ # (1999-09) reports no date; go with above sources and Gerd Knops (2001-02-27).
+ Rule	Para	1998	2001	-	Mar	Sun>=1	0:00	0	-
+ # From Rives McDow (2002-02-28):
+-# A decree was issued in Paraguay (no. 16350) on 2002-02-26 that changed the
++# A decree was issued in Paraguay (No. 16350) on 2002-02-26 that changed the
+ # dst method to be from the first Sunday in September to the first Sunday in
+ # April.
+ Rule	Para	2002	2004	-	Apr	Sun>=1	0:00	0	-
+@@ -1506,7 +1554,7 @@
+ # From Steffen Thorsen (2005-01-05):
+ # Decree 1,867 (2004-03-05)
+ # From Carlos Raúl Perasso via Jesper Nørgaard Welen (2006-10-13)
+-# <http://www.presidencia.gov.py/decretos/D1867.pdf>
++# http://www.presidencia.gov.py/decretos/D1867.pdf
+ Rule	Para	2004	2009	-	Oct	Sun>=15	0:00	1:00	S
+ Rule	Para	2005	2009	-	Mar	Sun>=8	0:00	0	-
+ # From Carlos Raúl Perasso (2010-02-18):
+@@ -1538,7 +1586,7 @@
+ # Zone	NAME		GMTOFF	RULES	FORMAT	[UNTIL]
+ Zone America/Asuncion	-3:50:40 -	LMT	1890
+ 			-3:50:40 -	AMT	1931 Oct 10 # Asunción Mean Time
+-			-4:00	-	PYT	1972 Oct # Paraguay Time
++			-4:00	-	PYT	1972 Oct    # Paraguay Time
+ 			-3:00	-	PYT	1974 Apr
+ 			-4:00	Para	PY%sT
+ 
+@@ -1571,7 +1619,7 @@
+ 
+ # South Georgia
+ # Zone	NAME		GMTOFF	RULES	FORMAT	[UNTIL]
+-Zone Atlantic/South_Georgia -2:26:08 -	LMT	1890		# Grytviken
++Zone Atlantic/South_Georgia -2:26:08 -	LMT	1890 # Grytviken
+ 			-2:00	-	GST	# South Georgia Time
+ 
+ # South Sandwich Is
+@@ -1581,9 +1629,9 @@
+ # Zone	NAME		GMTOFF	RULES	FORMAT	[UNTIL]
+ Zone America/Paramaribo	-3:40:40 -	LMT	1911
+ 			-3:40:52 -	PMT	1935     # Paramaribo Mean Time
+-			-3:40:36 -	PMT	1945 Oct # The capital moved?
++			-3:40:36 -	PMT	1945 Oct    # The capital moved?
+ 			-3:30	-	NEGT	1975 Nov 20 # Dutch Guiana Time
+-			-3:30	-	SRT	1984 Oct # Suriname Time
++			-3:30	-	SRT	1984 Oct    # Suriname Time
+ 			-3:00	-	SRT
+ 
+ # Trinidad and Tobago
+@@ -1593,6 +1641,7 @@
+ 
+ # These all agree with Trinidad and Tobago since 1970.
+ Link America/Port_of_Spain America/Anguilla
++Link America/Port_of_Spain America/Antigua
+ Link America/Port_of_Spain America/Dominica
+ Link America/Port_of_Spain America/Grenada
+ Link America/Port_of_Spain America/Guadeloupe
+@@ -1657,7 +1706,7 @@
+ Rule	Uruguay	1992	only	-	Oct	18	 0:00	1:00	S
+ Rule	Uruguay	1993	only	-	Feb	28	 0:00	0	-
+ # From Eduardo Cota (2004-09-20):
+-# The uruguayan government has decreed a change in the local time....
++# The Uruguayan government has decreed a change in the local time....
+ # http://www.presidencia.gub.uy/decretos/2004091502.htm
+ Rule	Uruguay	2004	only	-	Sep	19	 0:00	1:00	S
+ # From Steffen Thorsen (2005-03-11):
+@@ -1673,16 +1722,31 @@
+ Rule	Uruguay	2006	only	-	Mar	12	 2:00	0	-
+ # From Jesper Nørgaard Welen (2006-09-06):
+ # http://www.presidencia.gub.uy/_web/decretos/2006/09/CM%20210_08%2006%202006_00001.PDF
+-Rule	Uruguay	2006	max	-	Oct	Sun>=1	 2:00	1:00	S
+-Rule	Uruguay	2007	max	-	Mar	Sun>=8	 2:00	0	-
++#
++# From Steffen Thorsen (2015-06-30):
++# ... it looks like they will not be using DST the coming summer:
++# http://www.elobservador.com.uy/gobierno-resolvio-que-no-habra-cambio-horario-verano-n656787
++# http://www.republica.com.uy/este-ano-no-se-modificara-el-huso-horario-en-uruguay/523760/
++# From Paul Eggert (2015-06-30):
++# Apparently restaurateurs complained that DST caused people to go to the beach
++# instead of out to dinner.
++# From Pablo Camargo (2015-07-13):
++# http://archivo.presidencia.gub.uy/sci/decretos/2015/06/cons_min_201.pdf
++# [dated 2015-06-29; repeals Decree 311/006 dated 2006-09-04]
++Rule	Uruguay	2006	2014	-	Oct	Sun>=1	 2:00	1:00	S
++Rule	Uruguay	2007	2015	-	Mar	Sun>=8	 2:00	0	-
+ # Zone	NAME		GMTOFF	RULES	FORMAT	[UNTIL]
+ Zone America/Montevideo	-3:44:44 -	LMT	1898 Jun 28
+-			-3:44:44 -	MMT	1920 May  1	# Montevideo MT
+-			-3:30	Uruguay	UY%sT	1942 Dec 14	# Uruguay Time
++			-3:44:44 -	MMT	1920 May  1 # Montevideo MT
++			-3:30	Uruguay	UY%sT	1942 Dec 14 # Uruguay Time
+ 			-3:00	Uruguay	UY%sT
+ 
+ # Venezuela
+ #
++# From Paul Eggert (2015-07-28):
++# For the 1965 transition see Gaceta Oficial No. 27.619 (1964-12-15), p 205.533
++# http://www.pgr.gob.ve/dmdocuments/1964/27619.pdf
++#
+ # From John Stainforth (2007-11-28):
+ # ... the change for Venezuela originally expected for 2007-12-31 has
+ # been brought forward to 2007-12-09.  The official announcement was
+@@ -1691,9 +1755,25 @@
+ # resolution publication)
+ # http://www.globovision.com/news.php?nid=72208
+ 
++# From Alexander Krivenyshev (2016-04-15):
++# https://actualidad.rt.com/actualidad/204758-venezuela-modificar-huso-horario-sequia-elnino
++#
++# From Paul Eggert (2016-04-15):
++# Clocks advance 30 minutes on 2016-05-01 at 02:30....
++# "'Venezuela's new time-zone: hours without light, hours without water,
++# hours of presidential broadcasts, hours of lines,' quipped comedian
++# Jean Mary Curró ...". See: Cawthorne A, Kai D. Venezuela scraps
++# half-hour time difference set by Chavez. Reuters 2016-04-15 14:50 -0400
++# http://www.reuters.com/article/us-venezuela-timezone-idUSKCN0XC2BE
++#
++# From Matt Johnson (2016-04-20):
++# ... published in the official Gazette [2016-04-18], here:
++# http://historico.tsj.gob.ve/gaceta_ext/abril/1842016/E-1842016-4551.pdf
++
+ # Zone	NAME		GMTOFF	RULES	FORMAT	[UNTIL]
+ Zone	America/Caracas	-4:27:44 -	LMT	1890
+ 			-4:27:40 -	CMT	1912 Feb 12 # Caracas Mean Time?
+-			-4:30	-	VET	1965	     # Venezuela Time
+-			-4:00	-	VET	2007 Dec  9 03:00
+-			-4:30	-	VET
++			-4:30	-	VET	1965 Jan  1  0:00 # Venezuela T.
++			-4:00	-	VET	2007 Dec  9  3:00
++			-4:30	-	VET	2016 May  1  2:30
++			-4:00	-	VET
+--- contrib/tzdata/version.orig
++++ contrib/tzdata/version
+@@ -0,0 +1 @@
++2016i
+--- contrib/tzdata/zone.tab.orig
++++ contrib/tzdata/zone.tab
+@@ -17,8 +17,8 @@
+ # that of zone1970.tab.
+ #
+ # This table is intended as an aid for users, to help them select time
+-# zone data appropriate for their practical needs.  It is not intended
+-# to take or endorse any position on legal or territorial claims.
++# zone data entries appropriate for their practical needs.  It is not
++# intended to take or endorse any position on legal or territorial claims.
+ #
+ #country-
+ #code	coordinates	TZ			comments
+@@ -30,22 +30,22 @@
+ AL	+4120+01950	Europe/Tirane
+ AM	+4011+04430	Asia/Yerevan
+ AO	-0848+01314	Africa/Luanda
+-AQ	-7750+16636	Antarctica/McMurdo	McMurdo, South Pole, Scott (New Zealand time)
+-AQ	-6734-06808	Antarctica/Rothera	Rothera Station, Adelaide Island
+-AQ	-6448-06406	Antarctica/Palmer	Palmer Station, Anvers Island
+-AQ	-6736+06253	Antarctica/Mawson	Mawson Station, Holme Bay
+-AQ	-6835+07758	Antarctica/Davis	Davis Station, Vestfold Hills
+-AQ	-6617+11031	Antarctica/Casey	Casey Station, Bailey Peninsula
+-AQ	-7824+10654	Antarctica/Vostok	Vostok Station, Lake Vostok
+-AQ	-6640+14001	Antarctica/DumontDUrville	Dumont-d'Urville Station, Terre Adelie
+-AQ	-690022+0393524	Antarctica/Syowa	Syowa Station, E Ongul I
+-AQ	-720041+0023206	Antarctica/Troll	Troll Station, Queen Maud Land
++AQ	-7750+16636	Antarctica/McMurdo	New Zealand time - McMurdo, South Pole
++AQ	-6617+11031	Antarctica/Casey	Casey
++AQ	-6835+07758	Antarctica/Davis	Davis
++AQ	-6640+14001	Antarctica/DumontDUrville	Dumont-d'Urville
++AQ	-6736+06253	Antarctica/Mawson	Mawson
++AQ	-6448-06406	Antarctica/Palmer	Palmer
++AQ	-6734-06808	Antarctica/Rothera	Rothera
++AQ	-690022+0393524	Antarctica/Syowa	Syowa
++AQ	-720041+0023206	Antarctica/Troll	Troll
++AQ	-7824+10654	Antarctica/Vostok	Vostok
+ AR	-3436-05827	America/Argentina/Buenos_Aires	Buenos Aires (BA, CF)
+-AR	-3124-06411	America/Argentina/Cordoba	most locations (CB, CC, CN, ER, FM, MN, SE, SF)
+-AR	-2447-06525	America/Argentina/Salta	(SA, LP, NQ, RN)
++AR	-3124-06411	America/Argentina/Cordoba	Argentina (most areas: CB, CC, CN, ER, FM, MN, SE, SF)
++AR	-2447-06525	America/Argentina/Salta	Salta (SA, LP, NQ, RN)
+ AR	-2411-06518	America/Argentina/Jujuy	Jujuy (JY)
+ AR	-2649-06513	America/Argentina/Tucuman	Tucuman (TM)
+-AR	-2828-06547	America/Argentina/Catamarca	Catamarca (CT), Chubut (CH)
++AR	-2828-06547	America/Argentina/Catamarca	Catamarca (CT); Chubut (CH)
+ AR	-2926-06651	America/Argentina/La_Rioja	La Rioja (LR)
+ AR	-3132-06831	America/Argentina/San_Juan	San Juan (SJ)
+ AR	-3253-06849	America/Argentina/Mendoza	Mendoza (MZ)
+@@ -56,17 +56,17 @@
+ AT	+4813+01620	Europe/Vienna
+ AU	-3133+15905	Australia/Lord_Howe	Lord Howe Island
+ AU	-5430+15857	Antarctica/Macquarie	Macquarie Island
+-AU	-4253+14719	Australia/Hobart	Tasmania - most locations
+-AU	-3956+14352	Australia/Currie	Tasmania - King Island
++AU	-4253+14719	Australia/Hobart	Tasmania (most areas)
++AU	-3956+14352	Australia/Currie	Tasmania (King Island)
+ AU	-3749+14458	Australia/Melbourne	Victoria
+-AU	-3352+15113	Australia/Sydney	New South Wales - most locations
+-AU	-3157+14127	Australia/Broken_Hill	New South Wales - Yancowinna
+-AU	-2728+15302	Australia/Brisbane	Queensland - most locations
+-AU	-2016+14900	Australia/Lindeman	Queensland - Holiday Islands
++AU	-3352+15113	Australia/Sydney	New South Wales (most areas)
++AU	-3157+14127	Australia/Broken_Hill	New South Wales (Yancowinna)
++AU	-2728+15302	Australia/Brisbane	Queensland (most areas)
++AU	-2016+14900	Australia/Lindeman	Queensland (Whitsunday Islands)
+ AU	-3455+13835	Australia/Adelaide	South Australia
+ AU	-1228+13050	Australia/Darwin	Northern Territory
+-AU	-3157+11551	Australia/Perth	Western Australia - most locations
+-AU	-3143+12852	Australia/Eucla	Western Australia - Eucla area
++AU	-3157+11551	Australia/Perth	Western Australia (most areas)
++AU	-3143+12852	Australia/Eucla	Western Australia (Eucla)
+ AW	+1230-06958	America/Aruba
+ AX	+6006+01957	Europe/Mariehamn
+ AZ	+4023+04951	Asia/Baku
+@@ -85,62 +85,63 @@
+ BO	-1630-06809	America/La_Paz
+ BQ	+120903-0681636	America/Kralendijk
+ BR	-0351-03225	America/Noronha	Atlantic islands
+-BR	-0127-04829	America/Belem	Amapa, E Para
+-BR	-0343-03830	America/Fortaleza	NE Brazil (MA, PI, CE, RN, PB)
++BR	-0127-04829	America/Belem	Para (east); Amapa
++BR	-0343-03830	America/Fortaleza	Brazil (northeast: MA, PI, CE, RN, PB)
+ BR	-0803-03454	America/Recife	Pernambuco
+ BR	-0712-04812	America/Araguaina	Tocantins
+ BR	-0940-03543	America/Maceio	Alagoas, Sergipe
+ BR	-1259-03831	America/Bahia	Bahia
+-BR	-2332-04637	America/Sao_Paulo	S & SE Brazil (GO, DF, MG, ES, RJ, SP, PR, SC, RS)
++BR	-2332-04637	America/Sao_Paulo	Brazil (southeast: GO, DF, MG, ES, RJ, SP, PR, SC, RS)
+ BR	-2027-05437	America/Campo_Grande	Mato Grosso do Sul
+ BR	-1535-05605	America/Cuiaba	Mato Grosso
+-BR	-0226-05452	America/Santarem	W Para
++BR	-0226-05452	America/Santarem	Para (west)
+ BR	-0846-06354	America/Porto_Velho	Rondonia
+ BR	+0249-06040	America/Boa_Vista	Roraima
+-BR	-0308-06001	America/Manaus	E Amazonas
+-BR	-0640-06952	America/Eirunepe	W Amazonas
++BR	-0308-06001	America/Manaus	Amazonas (east)
++BR	-0640-06952	America/Eirunepe	Amazonas (west)
+ BR	-0958-06748	America/Rio_Branco	Acre
+ BS	+2505-07721	America/Nassau
+ BT	+2728+08939	Asia/Thimphu
+ BW	-2439+02555	Africa/Gaborone
+ BY	+5354+02734	Europe/Minsk
+ BZ	+1730-08812	America/Belize
+-CA	+4734-05243	America/St_Johns	Newfoundland Time, including SE Labrador
+-CA	+4439-06336	America/Halifax	Atlantic Time - Nova Scotia (most places), PEI
+-CA	+4612-05957	America/Glace_Bay	Atlantic Time - Nova Scotia - places that did not observe DST 1966-1971
+-CA	+4606-06447	America/Moncton	Atlantic Time - New Brunswick
+-CA	+5320-06025	America/Goose_Bay	Atlantic Time - Labrador - most locations
+-CA	+5125-05707	America/Blanc-Sablon	Atlantic Standard Time - Quebec - Lower North Shore
+-CA	+4339-07923	America/Toronto	Eastern Time - Ontario & Quebec - most locations
+-CA	+4901-08816	America/Nipigon	Eastern Time - Ontario & Quebec - places that did not observe DST 1967-1973
+-CA	+4823-08915	America/Thunder_Bay	Eastern Time - Thunder Bay, Ontario
+-CA	+6344-06828	America/Iqaluit	Eastern Time - east Nunavut - most locations
+-CA	+6608-06544	America/Pangnirtung	Eastern Time - Pangnirtung, Nunavut
+-CA	+744144-0944945	America/Resolute	Central Time - Resolute, Nunavut
+-CA	+484531-0913718	America/Atikokan	Eastern Standard Time - Atikokan, Ontario and Southampton I, Nunavut
+-CA	+624900-0920459	America/Rankin_Inlet	Central Time - central Nunavut
+-CA	+4953-09709	America/Winnipeg	Central Time - Manitoba & west Ontario
+-CA	+4843-09434	America/Rainy_River	Central Time - Rainy River & Fort Frances, Ontario
+-CA	+5024-10439	America/Regina	Central Standard Time - Saskatchewan - most locations
+-CA	+5017-10750	America/Swift_Current	Central Standard Time - Saskatchewan - midwest
+-CA	+5333-11328	America/Edmonton	Mountain Time - Alberta, east British Columbia & west Saskatchewan
+-CA	+690650-1050310	America/Cambridge_Bay	Mountain Time - west Nunavut
+-CA	+6227-11421	America/Yellowknife	Mountain Time - central Northwest Territories
+-CA	+682059-1334300	America/Inuvik	Mountain Time - west Northwest Territories
+-CA	+4906-11631	America/Creston	Mountain Standard Time - Creston, British Columbia
+-CA	+5946-12014	America/Dawson_Creek	Mountain Standard Time - Dawson Creek & Fort Saint John, British Columbia
+-CA	+4916-12307	America/Vancouver	Pacific Time - west British Columbia
+-CA	+6043-13503	America/Whitehorse	Pacific Time - south Yukon
+-CA	+6404-13925	America/Dawson	Pacific Time - north Yukon
++CA	+4734-05243	America/St_Johns	Newfoundland; Labrador (southeast)
++CA	+4439-06336	America/Halifax	Atlantic - NS (most areas); PE
++CA	+4612-05957	America/Glace_Bay	Atlantic - NS (Cape Breton)
++CA	+4606-06447	America/Moncton	Atlantic - New Brunswick
++CA	+5320-06025	America/Goose_Bay	Atlantic - Labrador (most areas)
++CA	+5125-05707	America/Blanc-Sablon	AST - QC (Lower North Shore)
++CA	+4339-07923	America/Toronto	Eastern - ON, QC (most areas)
++CA	+4901-08816	America/Nipigon	Eastern - ON, QC (no DST 1967-73)
++CA	+4823-08915	America/Thunder_Bay	Eastern - ON (Thunder Bay)
++CA	+6344-06828	America/Iqaluit	Eastern - NU (most east areas)
++CA	+6608-06544	America/Pangnirtung	Eastern - NU (Pangnirtung)
++CA	+484531-0913718	America/Atikokan	EST - ON (Atikokan); NU (Coral H)
++CA	+4953-09709	America/Winnipeg	Central - ON (west); Manitoba
++CA	+4843-09434	America/Rainy_River	Central - ON (Rainy R, Ft Frances)
++CA	+744144-0944945	America/Resolute	Central - NU (Resolute)
++CA	+624900-0920459	America/Rankin_Inlet	Central - NU (central)
++CA	+5024-10439	America/Regina	CST - SK (most areas)
++CA	+5017-10750	America/Swift_Current	CST - SK (midwest)
++CA	+5333-11328	America/Edmonton	Mountain - AB; BC (E); SK (W)
++CA	+690650-1050310	America/Cambridge_Bay	Mountain - NU (west)
++CA	+6227-11421	America/Yellowknife	Mountain - NT (central)
++CA	+682059-1334300	America/Inuvik	Mountain - NT (west)
++CA	+4906-11631	America/Creston	MST - BC (Creston)
++CA	+5946-12014	America/Dawson_Creek	MST - BC (Dawson Cr, Ft St John)
++CA	+5848-12242	America/Fort_Nelson	MST - BC (Ft Nelson)
++CA	+4916-12307	America/Vancouver	Pacific - BC (most areas)
++CA	+6043-13503	America/Whitehorse	Pacific - Yukon (south)
++CA	+6404-13925	America/Dawson	Pacific - Yukon (north)
+ CC	-1210+09655	Indian/Cocos
+-CD	-0418+01518	Africa/Kinshasa	west Dem. Rep. of Congo
+-CD	-1140+02728	Africa/Lubumbashi	east Dem. Rep. of Congo
++CD	-0418+01518	Africa/Kinshasa	Dem. Rep. of Congo (west)
++CD	-1140+02728	Africa/Lubumbashi	Dem. Rep. of Congo (east)
+ CF	+0422+01835	Africa/Bangui
+ CG	-0416+01517	Africa/Brazzaville
+ CH	+4723+00832	Europe/Zurich
+ CI	+0519-00402	Africa/Abidjan
+ CK	-2114-15946	Pacific/Rarotonga
+-CL	-3327-07040	America/Santiago	most locations
++CL	-3327-07040	America/Santiago	Chile (most areas)
+ CL	-2709-10926	Pacific/Easter	Easter Island
+ CM	+0403+00942	Africa/Douala
+ CN	+3114+12128	Asia/Shanghai	Beijing Time
+@@ -151,30 +152,31 @@
+ CV	+1455-02331	Atlantic/Cape_Verde
+ CW	+1211-06900	America/Curacao
+ CX	-1025+10543	Indian/Christmas
+-CY	+3510+03322	Asia/Nicosia
++CY	+3510+03322	Asia/Nicosia	Cyprus (most areas)
++CY	+3507+03357	Asia/Famagusta	Northern Cyprus
+ CZ	+5005+01426	Europe/Prague
+-DE	+5230+01322	Europe/Berlin	most locations
++DE	+5230+01322	Europe/Berlin	Germany (most areas)
+ DE	+4742+00841	Europe/Busingen	Busingen
+ DJ	+1136+04309	Africa/Djibouti
+ DK	+5540+01235	Europe/Copenhagen
+ DM	+1518-06124	America/Dominica
+ DO	+1828-06954	America/Santo_Domingo
+ DZ	+3647+00303	Africa/Algiers
+-EC	-0210-07950	America/Guayaquil	mainland
++EC	-0210-07950	America/Guayaquil	Ecuador (mainland)
+ EC	-0054-08936	Pacific/Galapagos	Galapagos Islands
+ EE	+5925+02445	Europe/Tallinn
+ EG	+3003+03115	Africa/Cairo
+ EH	+2709-01312	Africa/El_Aaiun
+ ER	+1520+03853	Africa/Asmara
+-ES	+4024-00341	Europe/Madrid	mainland
+-ES	+3553-00519	Africa/Ceuta	Ceuta & Melilla
++ES	+4024-00341	Europe/Madrid	Spain (mainland)
++ES	+3553-00519	Africa/Ceuta	Ceuta, Melilla
+ ES	+2806-01524	Atlantic/Canary	Canary Islands
+ ET	+0902+03842	Africa/Addis_Ababa
+ FI	+6010+02458	Europe/Helsinki
+ FJ	-1808+17825	Pacific/Fiji
+ FK	-5142-05751	Atlantic/Stanley
+-FM	+0725+15147	Pacific/Chuuk	Chuuk (Truk) and Yap
+-FM	+0658+15813	Pacific/Pohnpei	Pohnpei (Ponape)
++FM	+0725+15147	Pacific/Chuuk	Chuuk/Truk, Yap
++FM	+0658+15813	Pacific/Pohnpei	Pohnpei/Ponape
+ FM	+0519+16259	Pacific/Kosrae	Kosrae
+ FO	+6201-00646	Atlantic/Faroe
+ FR	+4852+00220	Europe/Paris
+@@ -186,10 +188,10 @@
+ GG	+4927-00232	Europe/Guernsey
+ GH	+0533-00013	Africa/Accra
+ GI	+3608-00521	Europe/Gibraltar
+-GL	+6411-05144	America/Godthab	most locations
+-GL	+7646-01840	America/Danmarkshavn	east coast, north of Scoresbysund
+-GL	+7029-02158	America/Scoresbysund	Scoresbysund / Ittoqqortoormiit
+-GL	+7634-06847	America/Thule	Thule / Pituffik
++GL	+6411-05144	America/Godthab	Greenland (most areas)
++GL	+7646-01840	America/Danmarkshavn	National Park (east coast)
++GL	+7029-02158	America/Scoresbysund	Scoresbysund/Ittoqqortoormiit
++GL	+7634-06847	America/Thule	Thule/Pituffik
+ GM	+1328-01639	Africa/Banjul
+ GN	+0931-01343	Africa/Conakry
+ GP	+1614-06132	America/Guadeloupe
+@@ -205,10 +207,10 @@
+ HR	+4548+01558	Europe/Zagreb
+ HT	+1832-07220	America/Port-au-Prince
+ HU	+4730+01905	Europe/Budapest
+-ID	-0610+10648	Asia/Jakarta	Java & Sumatra
+-ID	-0002+10920	Asia/Pontianak	west & central Borneo
+-ID	-0507+11924	Asia/Makassar	east & south Borneo, Sulawesi (Celebes), Bali, Nusa Tengarra, west Timor
+-ID	-0232+14042	Asia/Jayapura	west New Guinea (Irian Jaya) & Malukus (Moluccas)
++ID	-0610+10648	Asia/Jakarta	Java, Sumatra
++ID	-0002+10920	Asia/Pontianak	Borneo (west, central)
++ID	-0507+11924	Asia/Makassar	Borneo (east, south); Sulawesi/Celebes, Bali, Nusa Tengarra; Timor (west)
++ID	-0232+14042	Asia/Jayapura	New Guinea (West Papua / Irian Jaya); Malukus/Moluccas
+ IE	+5320-00615	Europe/Dublin
+ IL	+314650+0351326	Asia/Jerusalem
+ IM	+5409-00428	Europe/Isle_of_Man
+@@ -234,10 +236,10 @@
+ KR	+3733+12658	Asia/Seoul
+ KW	+2920+04759	Asia/Kuwait
+ KY	+1918-08123	America/Cayman
+-KZ	+4315+07657	Asia/Almaty	most locations
+-KZ	+4448+06528	Asia/Qyzylorda	Qyzylorda (Kyzylorda, Kzyl-Orda)
+-KZ	+5017+05710	Asia/Aqtobe	Aqtobe (Aktobe)
+-KZ	+4431+05016	Asia/Aqtau	Atyrau (Atirau, Gur'yev), Mangghystau (Mankistau)
++KZ	+4315+07657	Asia/Almaty	Kazakhstan (most areas)
++KZ	+4448+06528	Asia/Qyzylorda	Qyzylorda/Kyzylorda/Kzyl-Orda
++KZ	+5017+05710	Asia/Aqtobe	Aqtobe/Aktobe
++KZ	+4431+05016	Asia/Aqtau	Atyrau/Atirau/Gur'yev, Mangghystau/Mankistau
+ KZ	+5113+05121	Asia/Oral	West Kazakhstan
+ LA	+1758+10236	Asia/Vientiane
+ LB	+3353+03530	Asia/Beirut
+@@ -256,12 +258,12 @@
+ ME	+4226+01916	Europe/Podgorica
+ MF	+1804-06305	America/Marigot
+ MG	-1855+04731	Indian/Antananarivo
+-MH	+0709+17112	Pacific/Majuro	most locations
++MH	+0709+17112	Pacific/Majuro	Marshall Islands (most areas)
+ MH	+0905+16720	Pacific/Kwajalein	Kwajalein
+ MK	+4159+02126	Europe/Skopje
+ ML	+1239-00800	Africa/Bamako
+-MM	+1647+09610	Asia/Rangoon
+-MN	+4755+10653	Asia/Ulaanbaatar	most locations
++MM	+1647+09610	Asia/Yangon
++MN	+4755+10653	Asia/Ulaanbaatar	Mongolia (most areas)
+ MN	+4801+09139	Asia/Hovd	Bayan-Olgiy, Govi-Altai, Hovd, Uvs, Zavkhan
+ MN	+4804+11430	Asia/Choibalsan	Dornod, Sukhbaatar
+ MO	+2214+11335	Asia/Macau
+@@ -273,20 +275,19 @@
+ MU	-2010+05730	Indian/Mauritius
+ MV	+0410+07330	Indian/Maldives
+ MW	-1547+03500	Africa/Blantyre
+-MX	+1924-09909	America/Mexico_City	Central Time - most locations
+-MX	+2105-08646	America/Cancun	Central Time - Quintana Roo
++MX	+1924-09909	America/Mexico_City	Central Time
++MX	+2105-08646	America/Cancun	Eastern Standard Time - Quintana Roo
+ MX	+2058-08937	America/Merida	Central Time - Campeche, Yucatan
+-MX	+2540-10019	America/Monterrey	Mexican Central Time - Coahuila, Durango, Nuevo Leon, Tamaulipas away from US border
+-MX	+2550-09730	America/Matamoros	US Central Time - Coahuila, Durango, Nuevo Leon, Tamaulipas near US border
+-MX	+2313-10625	America/Mazatlan	Mountain Time - S Baja, Nayarit, Sinaloa
+-MX	+2838-10605	America/Chihuahua	Mexican Mountain Time - Chihuahua away from US border
+-MX	+2934-10425	America/Ojinaga	US Mountain Time - Chihuahua near US border
++MX	+2540-10019	America/Monterrey	Central Time - Durango; Coahuila, Nuevo Leon, Tamaulipas (most areas)
++MX	+2550-09730	America/Matamoros	Central Time US - Coahuila, Nuevo Leon, Tamaulipas (US border)
++MX	+2313-10625	America/Mazatlan	Mountain Time - Baja California Sur, Nayarit, Sinaloa
++MX	+2838-10605	America/Chihuahua	Mountain Time - Chihuahua (most areas)
++MX	+2934-10425	America/Ojinaga	Mountain Time US - Chihuahua (US border)
+ MX	+2904-11058	America/Hermosillo	Mountain Standard Time - Sonora
+-MX	+3232-11701	America/Tijuana	US Pacific Time - Baja California near US border
+-MX	+3018-11452	America/Santa_Isabel	Mexican Pacific Time - Baja California away from US border
+-MX	+2048-10515	America/Bahia_Banderas	Mexican Central Time - Bahia de Banderas
+-MY	+0310+10142	Asia/Kuala_Lumpur	peninsular Malaysia
+-MY	+0133+11020	Asia/Kuching	Sabah & Sarawak
++MX	+3232-11701	America/Tijuana	Pacific Time US - Baja California
++MX	+2048-10515	America/Bahia_Banderas	Central Time - Bahia de Banderas
++MY	+0310+10142	Asia/Kuala_Lumpur	Malaysia (peninsula)
++MY	+0133+11020	Asia/Kuching	Sabah, Sarawak
+ MZ	-2558+03235	Africa/Maputo
+ NA	-2234+01706	Africa/Windhoek
+ NC	-2216+16627	Pacific/Noumea
+@@ -299,7 +300,7 @@
+ NP	+2743+08519	Asia/Kathmandu
+ NR	-0031+16655	Pacific/Nauru
+ NU	-1901-16955	Pacific/Niue
+-NZ	-3652+17446	Pacific/Auckland	most locations
++NZ	-3652+17446	Pacific/Auckland	New Zealand (most areas)
+ NZ	-4357-17633	Pacific/Chatham	Chatham Islands
+ OM	+2336+05835	Asia/Muscat
+ PA	+0858-07932	America/Panama
+@@ -307,7 +308,8 @@
+ PF	-1732-14934	Pacific/Tahiti	Society Islands
+ PF	-0900-13930	Pacific/Marquesas	Marquesas Islands
+ PF	-2308-13457	Pacific/Gambier	Gambier Islands
+-PG	-0930+14710	Pacific/Port_Moresby
++PG	-0930+14710	Pacific/Port_Moresby	Papua New Guinea (most areas)
++PG	-0613+15534	Pacific/Bougainville	Bougainville
+ PH	+1435+12100	Asia/Manila
+ PK	+2452+06703	Asia/Karachi
+ PL	+5215+02100	Europe/Warsaw
+@@ -316,7 +318,7 @@
+ PR	+182806-0660622	America/Puerto_Rico
+ PS	+3130+03428	Asia/Gaza	Gaza Strip
+ PS	+313200+0350542	Asia/Hebron	West Bank
+-PT	+3843-00908	Europe/Lisbon	mainland
++PT	+3843-00908	Europe/Lisbon	Portugal (mainland)
+ PT	+3238-01654	Atlantic/Madeira	Madeira Islands
+ PT	+3744-02540	Atlantic/Azores	Azores
+ PW	+0720+13429	Pacific/Palau
+@@ -325,27 +327,32 @@
+ RE	-2052+05528	Indian/Reunion
+ RO	+4426+02606	Europe/Bucharest
+ RS	+4450+02030	Europe/Belgrade
+-RU	+5443+02030	Europe/Kaliningrad	Moscow-01 - Kaliningrad
+-RU	+554521+0373704	Europe/Moscow	Moscow+00 - west Russia
+-RU	+4457+03406	Europe/Simferopol	Moscow+00 - Crimea
+-RU	+4844+04425	Europe/Volgograd	Moscow+00 - Caspian Sea
+-RU	+5312+05009	Europe/Samara	Moscow+00 (Moscow+01 after 2014-10-26) - Samara, Udmurtia
+-RU	+5651+06036	Asia/Yekaterinburg	Moscow+02 - Urals
+-RU	+5500+07324	Asia/Omsk	Moscow+03 - west Siberia
+-RU	+5502+08255	Asia/Novosibirsk	Moscow+03 - Novosibirsk
+-RU	+5345+08707	Asia/Novokuznetsk	Moscow+03 (Moscow+04 after 2014-10-26) - Kemerovo
+-RU	+5601+09250	Asia/Krasnoyarsk	Moscow+04 - Yenisei River
+-RU	+5216+10420	Asia/Irkutsk	Moscow+05 - Lake Baikal
+-RU	+5203+11328	Asia/Chita	Moscow+06 (Moscow+05 after 2014-10-26) - Zabaykalsky
+-RU	+6200+12940	Asia/Yakutsk	Moscow+06 - Lena River
+-RU	+623923+1353314	Asia/Khandyga	Moscow+06 - Tomponsky, Ust-Maysky
+-RU	+4310+13156	Asia/Vladivostok	Moscow+07 - Amur River
+-RU	+4658+14242	Asia/Sakhalin	Moscow+07 - Sakhalin Island
+-RU	+643337+1431336	Asia/Ust-Nera	Moscow+07 - Oymyakonsky
+-RU	+5934+15048	Asia/Magadan	Moscow+08 (Moscow+07 after 2014-10-26) - Magadan
+-RU	+6728+15343	Asia/Srednekolymsk	Moscow+08 - E Sakha, N Kuril Is
+-RU	+5301+15839	Asia/Kamchatka	Moscow+08 (Moscow+09 after 2014-10-26) - Kamchatka
+-RU	+6445+17729	Asia/Anadyr	Moscow+08 (Moscow+09 after 2014-10-26) - Bering Sea
++RU	+5443+02030	Europe/Kaliningrad	MSK-01 - Kaliningrad
++RU	+554521+0373704	Europe/Moscow	MSK+00 - Moscow area
++RU	+4457+03406	Europe/Simferopol	MSK+00 - Crimea
++RU	+4844+04425	Europe/Volgograd	MSK+00 - Volgograd, Saratov
++RU	+5836+04939	Europe/Kirov	MSK+00 - Kirov
++RU	+4621+04803	Europe/Astrakhan	MSK+01 - Astrakhan
++RU	+5312+05009	Europe/Samara	MSK+01 - Samara, Udmurtia
++RU	+5420+04824	Europe/Ulyanovsk	MSK+01 - Ulyanovsk
++RU	+5651+06036	Asia/Yekaterinburg	MSK+02 - Urals
++RU	+5500+07324	Asia/Omsk	MSK+03 - Omsk
++RU	+5502+08255	Asia/Novosibirsk	MSK+03 - Novosibirsk
++RU	+5322+08345	Asia/Barnaul	MSK+04 - Altai
++RU	+5630+08458	Asia/Tomsk	MSK+04 - Tomsk
++RU	+5345+08707	Asia/Novokuznetsk	MSK+04 - Kemerovo
++RU	+5601+09250	Asia/Krasnoyarsk	MSK+04 - Krasnoyarsk area
++RU	+5216+10420	Asia/Irkutsk	MSK+05 - Irkutsk, Buryatia
++RU	+5203+11328	Asia/Chita	MSK+06 - Zabaykalsky
++RU	+6200+12940	Asia/Yakutsk	MSK+06 - Lena River
++RU	+623923+1353314	Asia/Khandyga	MSK+06 - Tomponsky, Ust-Maysky
++RU	+4310+13156	Asia/Vladivostok	MSK+07 - Amur River
++RU	+643337+1431336	Asia/Ust-Nera	MSK+07 - Oymyakonsky
++RU	+5934+15048	Asia/Magadan	MSK+08 - Magadan
++RU	+4658+14242	Asia/Sakhalin	MSK+08 - Sakhalin Island
++RU	+6728+15343	Asia/Srednekolymsk	MSK+08 - Sakha (E); North Kuril Is
++RU	+5301+15839	Asia/Kamchatka	MSK+09 - Kamchatka
++RU	+6445+17729	Asia/Anadyr	MSK+09 - Bering Sea
+ RW	-0157+03004	Africa/Kigali
+ SA	+2438+04643	Asia/Riyadh
+ SB	-0932+16012	Pacific/Guadalcanal
+@@ -384,45 +391,45 @@
+ TV	-0831+17913	Pacific/Funafuti
+ TW	+2503+12130	Asia/Taipei
+ TZ	-0648+03917	Africa/Dar_es_Salaam
+-UA	+5026+03031	Europe/Kiev	most locations
++UA	+5026+03031	Europe/Kiev	Ukraine (most areas)
+ UA	+4837+02218	Europe/Uzhgorod	Ruthenia
+-UA	+4750+03510	Europe/Zaporozhye	Zaporozh'ye, E Lugansk / Zaporizhia, E Luhansk
++UA	+4750+03510	Europe/Zaporozhye	Zaporozh'ye/Zaporizhia; Lugansk/Luhansk (east)
+ UG	+0019+03225	Africa/Kampala
+ UM	+1645-16931	Pacific/Johnston	Johnston Atoll
+ UM	+2813-17722	Pacific/Midway	Midway Islands
+ UM	+1917+16637	Pacific/Wake	Wake Island
+-US	+404251-0740023	America/New_York	Eastern Time
+-US	+421953-0830245	America/Detroit	Eastern Time - Michigan - most locations
+-US	+381515-0854534	America/Kentucky/Louisville	Eastern Time - Kentucky - Louisville area
+-US	+364947-0845057	America/Kentucky/Monticello	Eastern Time - Kentucky - Wayne County
+-US	+394606-0860929	America/Indiana/Indianapolis	Eastern Time - Indiana - most locations
+-US	+384038-0873143	America/Indiana/Vincennes	Eastern Time - Indiana - Daviess, Dubois, Knox & Martin Counties
+-US	+410305-0863611	America/Indiana/Winamac	Eastern Time - Indiana - Pulaski County
+-US	+382232-0862041	America/Indiana/Marengo	Eastern Time - Indiana - Crawford County
+-US	+382931-0871643	America/Indiana/Petersburg	Eastern Time - Indiana - Pike County
+-US	+384452-0850402	America/Indiana/Vevay	Eastern Time - Indiana - Switzerland County
+-US	+415100-0873900	America/Chicago	Central Time
+-US	+375711-0864541	America/Indiana/Tell_City	Central Time - Indiana - Perry County
+-US	+411745-0863730	America/Indiana/Knox	Central Time - Indiana - Starke County
+-US	+450628-0873651	America/Menominee	Central Time - Michigan - Dickinson, Gogebic, Iron & Menominee Counties
+-US	+470659-1011757	America/North_Dakota/Center	Central Time - North Dakota - Oliver County
+-US	+465042-1012439	America/North_Dakota/New_Salem	Central Time - North Dakota - Morton County (except Mandan area)
+-US	+471551-1014640	America/North_Dakota/Beulah	Central Time - North Dakota - Mercer County
+-US	+394421-1045903	America/Denver	Mountain Time
+-US	+433649-1161209	America/Boise	Mountain Time - south Idaho & east Oregon
+-US	+332654-1120424	America/Phoenix	Mountain Standard Time - Arizona (except Navajo)
+-US	+340308-1181434	America/Los_Angeles	Pacific Time
+-US	+550737-1313435	America/Metlakatla	Pacific Standard Time - Annette Island, Alaska
+-US	+611305-1495401	America/Anchorage	Alaska Time
+-US	+581807-1342511	America/Juneau	Alaska Time - Alaska panhandle
+-US	+571035-1351807	America/Sitka	Alaska Time - southeast Alaska panhandle
+-US	+593249-1394338	America/Yakutat	Alaska Time - Alaska panhandle neck
+-US	+643004-1652423	America/Nome	Alaska Time - west Alaska
++US	+404251-0740023	America/New_York	Eastern (most areas)
++US	+421953-0830245	America/Detroit	Eastern - MI (most areas)
++US	+381515-0854534	America/Kentucky/Louisville	Eastern - KY (Louisville area)
++US	+364947-0845057	America/Kentucky/Monticello	Eastern - KY (Wayne)
++US	+394606-0860929	America/Indiana/Indianapolis	Eastern - IN (most areas)
++US	+384038-0873143	America/Indiana/Vincennes	Eastern - IN (Da, Du, K, Mn)
++US	+410305-0863611	America/Indiana/Winamac	Eastern - IN (Pulaski)
++US	+382232-0862041	America/Indiana/Marengo	Eastern - IN (Crawford)
++US	+382931-0871643	America/Indiana/Petersburg	Eastern - IN (Pike)
++US	+384452-0850402	America/Indiana/Vevay	Eastern - IN (Switzerland)
++US	+415100-0873900	America/Chicago	Central (most areas)
++US	+375711-0864541	America/Indiana/Tell_City	Central - IN (Perry)
++US	+411745-0863730	America/Indiana/Knox	Central - IN (Starke)
++US	+450628-0873651	America/Menominee	Central - MI (Wisconsin border)
++US	+470659-1011757	America/North_Dakota/Center	Central - ND (Oliver)
++US	+465042-1012439	America/North_Dakota/New_Salem	Central - ND (Morton rural)
++US	+471551-1014640	America/North_Dakota/Beulah	Central - ND (Mercer)
++US	+394421-1045903	America/Denver	Mountain (most areas)
++US	+433649-1161209	America/Boise	Mountain - ID (south); OR (east)
++US	+332654-1120424	America/Phoenix	MST - Arizona (except Navajo)
++US	+340308-1181434	America/Los_Angeles	Pacific
++US	+611305-1495401	America/Anchorage	Alaska (most areas)
++US	+581807-1342511	America/Juneau	Alaska - Juneau area
++US	+571035-1351807	America/Sitka	Alaska - Sitka area
++US	+550737-1313435	America/Metlakatla	Alaska - Annette Island
++US	+593249-1394338	America/Yakutat	Alaska - Yakutat
++US	+643004-1652423	America/Nome	Alaska (west)
+ US	+515248-1763929	America/Adak	Aleutian Islands
+ US	+211825-1575130	Pacific/Honolulu	Hawaii
+ UY	-3453-05611	America/Montevideo
+-UZ	+3940+06648	Asia/Samarkand	west Uzbekistan
+-UZ	+4120+06918	Asia/Tashkent	east Uzbekistan
++UZ	+3940+06648	Asia/Samarkand	Uzbekistan (west)
++UZ	+4120+06918	Asia/Tashkent	Uzbekistan (east)
+ VA	+415408+0122711	Europe/Vatican
+ VC	+1309-06114	America/St_Vincent
+ VE	+1030-06656	America/Caracas
+--- contrib/tzdata/zone1970.tab.orig
++++ contrib/tzdata/zone1970.tab
+@@ -29,8 +29,8 @@
+ # most populous zones first, where that does not contradict (1).
+ #
+ # This table is intended as an aid for users, to help them select time
+-# zone data appropriate for their practical needs.  It is not intended
+-# to take or endorse any position on legal or territorial claims.
++# zone data entries appropriate for their practical needs.  It is not
++# intended to take or endorse any position on legal or territorial claims.
+ #
+ #country-
+ #codes	coordinates	TZ	comments
+@@ -39,21 +39,21 @@
+ AF	+3431+06912	Asia/Kabul
+ AL	+4120+01950	Europe/Tirane
+ AM	+4011+04430	Asia/Yerevan
+-AQ	-6734-06808	Antarctica/Rothera	Rothera Station, Adelaide Island
+-AQ	-6448-06406	Antarctica/Palmer	Palmer Station, Anvers Island
+-AQ	-6736+06253	Antarctica/Mawson	Mawson Station, Holme Bay
+-AQ	-6835+07758	Antarctica/Davis	Davis Station, Vestfold Hills
+-AQ	-6617+11031	Antarctica/Casey	Casey Station, Bailey Peninsula
+-AQ	-7824+10654	Antarctica/Vostok	Vostok Station, Lake Vostok
+-AQ	-6640+14001	Antarctica/DumontDUrville	Dumont-d'Urville Station, Terre Adelie
+-AQ	-690022+0393524	Antarctica/Syowa	Syowa Station, E Ongul I
+-AQ	-720041+0023206	Antarctica/Troll	Troll Station, Queen Maud Land
++AQ	-6617+11031	Antarctica/Casey	Casey
++AQ	-6835+07758	Antarctica/Davis	Davis
++AQ	-6640+14001	Antarctica/DumontDUrville	Dumont-d'Urville
++AQ	-6736+06253	Antarctica/Mawson	Mawson
++AQ	-6448-06406	Antarctica/Palmer	Palmer
++AQ	-6734-06808	Antarctica/Rothera	Rothera
++AQ	-690022+0393524	Antarctica/Syowa	Syowa
++AQ	-720041+0023206	Antarctica/Troll	Troll
++AQ	-7824+10654	Antarctica/Vostok	Vostok
+ AR	-3436-05827	America/Argentina/Buenos_Aires	Buenos Aires (BA, CF)
+-AR	-3124-06411	America/Argentina/Cordoba	most locations (CB, CC, CN, ER, FM, MN, SE, SF)
+-AR	-2447-06525	America/Argentina/Salta	(SA, LP, NQ, RN)
++AR	-3124-06411	America/Argentina/Cordoba	Argentina (most areas: CB, CC, CN, ER, FM, MN, SE, SF)
++AR	-2447-06525	America/Argentina/Salta	Salta (SA, LP, NQ, RN)
+ AR	-2411-06518	America/Argentina/Jujuy	Jujuy (JY)
+ AR	-2649-06513	America/Argentina/Tucuman	Tucumán (TM)
+-AR	-2828-06547	America/Argentina/Catamarca	Catamarca (CT), Chubut (CH)
++AR	-2828-06547	America/Argentina/Catamarca	Catamarca (CT); Chubut (CH)
+ AR	-2926-06651	America/Argentina/La_Rioja	La Rioja (LR)
+ AR	-3132-06831	America/Argentina/San_Juan	San Juan (SJ)
+ AR	-3253-06849	America/Argentina/Mendoza	Mendoza (MZ)
+@@ -64,17 +64,17 @@
+ AT	+4813+01620	Europe/Vienna
+ AU	-3133+15905	Australia/Lord_Howe	Lord Howe Island
+ AU	-5430+15857	Antarctica/Macquarie	Macquarie Island
+-AU	-4253+14719	Australia/Hobart	Tasmania - most locations
+-AU	-3956+14352	Australia/Currie	Tasmania - King Island
++AU	-4253+14719	Australia/Hobart	Tasmania (most areas)
++AU	-3956+14352	Australia/Currie	Tasmania (King Island)
+ AU	-3749+14458	Australia/Melbourne	Victoria
+-AU	-3352+15113	Australia/Sydney	New South Wales - most locations
+-AU	-3157+14127	Australia/Broken_Hill	New South Wales - Yancowinna
+-AU	-2728+15302	Australia/Brisbane	Queensland - most locations
+-AU	-2016+14900	Australia/Lindeman	Queensland - Holiday Islands
++AU	-3352+15113	Australia/Sydney	New South Wales (most areas)
++AU	-3157+14127	Australia/Broken_Hill	New South Wales (Yancowinna)
++AU	-2728+15302	Australia/Brisbane	Queensland (most areas)
++AU	-2016+14900	Australia/Lindeman	Queensland (Whitsunday Islands)
+ AU	-3455+13835	Australia/Adelaide	South Australia
+ AU	-1228+13050	Australia/Darwin	Northern Territory
+-AU	-3157+11551	Australia/Perth	Western Australia - most locations
+-AU	-3143+12852	Australia/Eucla	Western Australia - Eucla area
++AU	-3157+11551	Australia/Perth	Western Australia (most areas)
++AU	-3143+12852	Australia/Eucla	Western Australia (Eucla)
+ AZ	+4023+04951	Asia/Baku
+ BB	+1306-05937	America/Barbados
+ BD	+2343+09025	Asia/Dhaka
+@@ -84,57 +84,58 @@
+ BN	+0456+11455	Asia/Brunei
+ BO	-1630-06809	America/La_Paz
+ BR	-0351-03225	America/Noronha	Atlantic islands
+-BR	-0127-04829	America/Belem	Amapá, E Pará
+-BR	-0343-03830	America/Fortaleza	NE Brazil (MA, PI, CE, RN, PB)
++BR	-0127-04829	America/Belem	Pará (east); Amapá
++BR	-0343-03830	America/Fortaleza	Brazil (northeast: MA, PI, CE, RN, PB)
+ BR	-0803-03454	America/Recife	Pernambuco
+ BR	-0712-04812	America/Araguaina	Tocantins
+ BR	-0940-03543	America/Maceio	Alagoas, Sergipe
+ BR	-1259-03831	America/Bahia	Bahia
+-BR	-2332-04637	America/Sao_Paulo	S & SE Brazil (GO, DF, MG, ES, RJ, SP, PR, SC, RS)
++BR	-2332-04637	America/Sao_Paulo	Brazil (southeast: GO, DF, MG, ES, RJ, SP, PR, SC, RS)
+ BR	-2027-05437	America/Campo_Grande	Mato Grosso do Sul
+ BR	-1535-05605	America/Cuiaba	Mato Grosso
+-BR	-0226-05452	America/Santarem	W Pará
++BR	-0226-05452	America/Santarem	Pará (west)
+ BR	-0846-06354	America/Porto_Velho	Rondônia
+ BR	+0249-06040	America/Boa_Vista	Roraima
+-BR	-0308-06001	America/Manaus	E Amazonas
+-BR	-0640-06952	America/Eirunepe	W Amazonas
++BR	-0308-06001	America/Manaus	Amazonas (east)
++BR	-0640-06952	America/Eirunepe	Amazonas (west)
+ BR	-0958-06748	America/Rio_Branco	Acre
+ BS	+2505-07721	America/Nassau
+ BT	+2728+08939	Asia/Thimphu
+ BY	+5354+02734	Europe/Minsk
+ BZ	+1730-08812	America/Belize
+-CA	+4734-05243	America/St_Johns	Newfoundland Time, including SE Labrador
+-CA	+4439-06336	America/Halifax	Atlantic Time - Nova Scotia (most places), PEI
+-CA	+4612-05957	America/Glace_Bay	Atlantic Time - Nova Scotia - places that did not observe DST 1966-1971
+-CA	+4606-06447	America/Moncton	Atlantic Time - New Brunswick
+-CA	+5320-06025	America/Goose_Bay	Atlantic Time - Labrador - most locations
+-CA	+5125-05707	America/Blanc-Sablon	Atlantic Standard Time - Quebec - Lower North Shore
+-CA	+4339-07923	America/Toronto	Eastern Time - Ontario & Quebec - most locations
+-CA	+4901-08816	America/Nipigon	Eastern Time - Ontario & Quebec - places that did not observe DST 1967-1973
+-CA	+4823-08915	America/Thunder_Bay	Eastern Time - Thunder Bay, Ontario
+-CA	+6344-06828	America/Iqaluit	Eastern Time - east Nunavut - most locations
+-CA	+6608-06544	America/Pangnirtung	Eastern Time - Pangnirtung, Nunavut
+-CA	+744144-0944945	America/Resolute	Central Time - Resolute, Nunavut
+-CA	+484531-0913718	America/Atikokan	Eastern Standard Time - Atikokan, Ontario and Southampton I, Nunavut
+-CA	+624900-0920459	America/Rankin_Inlet	Central Time - central Nunavut
+-CA	+4953-09709	America/Winnipeg	Central Time - Manitoba & west Ontario
+-CA	+4843-09434	America/Rainy_River	Central Time - Rainy River & Fort Frances, Ontario
+-CA	+5024-10439	America/Regina	Central Standard Time - Saskatchewan - most locations
+-CA	+5017-10750	America/Swift_Current	Central Standard Time - Saskatchewan - midwest
+-CA	+5333-11328	America/Edmonton	Mountain Time - Alberta, east British Columbia & west Saskatchewan
+-CA	+690650-1050310	America/Cambridge_Bay	Mountain Time - west Nunavut
+-CA	+6227-11421	America/Yellowknife	Mountain Time - central Northwest Territories
+-CA	+682059-1334300	America/Inuvik	Mountain Time - west Northwest Territories
+-CA	+4906-11631	America/Creston	Mountain Standard Time - Creston, British Columbia
+-CA	+5946-12014	America/Dawson_Creek	Mountain Standard Time - Dawson Creek & Fort Saint John, British Columbia
+-CA	+4916-12307	America/Vancouver	Pacific Time - west British Columbia
+-CA	+6043-13503	America/Whitehorse	Pacific Time - south Yukon
+-CA	+6404-13925	America/Dawson	Pacific Time - north Yukon
++CA	+4734-05243	America/St_Johns	Newfoundland; Labrador (southeast)
++CA	+4439-06336	America/Halifax	Atlantic - NS (most areas); PE
++CA	+4612-05957	America/Glace_Bay	Atlantic - NS (Cape Breton)
++CA	+4606-06447	America/Moncton	Atlantic - New Brunswick
++CA	+5320-06025	America/Goose_Bay	Atlantic - Labrador (most areas)
++CA	+5125-05707	America/Blanc-Sablon	AST - QC (Lower North Shore)
++CA	+4339-07923	America/Toronto	Eastern - ON, QC (most areas)
++CA	+4901-08816	America/Nipigon	Eastern - ON, QC (no DST 1967-73)
++CA	+4823-08915	America/Thunder_Bay	Eastern - ON (Thunder Bay)
++CA	+6344-06828	America/Iqaluit	Eastern - NU (most east areas)
++CA	+6608-06544	America/Pangnirtung	Eastern - NU (Pangnirtung)
++CA	+484531-0913718	America/Atikokan	EST - ON (Atikokan); NU (Coral H)
++CA	+4953-09709	America/Winnipeg	Central - ON (west); Manitoba
++CA	+4843-09434	America/Rainy_River	Central - ON (Rainy R, Ft Frances)
++CA	+744144-0944945	America/Resolute	Central - NU (Resolute)
++CA	+624900-0920459	America/Rankin_Inlet	Central - NU (central)
++CA	+5024-10439	America/Regina	CST - SK (most areas)
++CA	+5017-10750	America/Swift_Current	CST - SK (midwest)
++CA	+5333-11328	America/Edmonton	Mountain - AB; BC (E); SK (W)
++CA	+690650-1050310	America/Cambridge_Bay	Mountain - NU (west)
++CA	+6227-11421	America/Yellowknife	Mountain - NT (central)
++CA	+682059-1334300	America/Inuvik	Mountain - NT (west)
++CA	+4906-11631	America/Creston	MST - BC (Creston)
++CA	+5946-12014	America/Dawson_Creek	MST - BC (Dawson Cr, Ft St John)
++CA	+5848-12242	America/Fort_Nelson	MST - BC (Ft Nelson)
++CA	+4916-12307	America/Vancouver	Pacific - BC (most areas)
++CA	+6043-13503	America/Whitehorse	Pacific - Yukon (south)
++CA	+6404-13925	America/Dawson	Pacific - Yukon (north)
+ CC	-1210+09655	Indian/Cocos
+ CH,DE,LI	+4723+00832	Europe/Zurich	Swiss time
+ CI,BF,GM,GN,ML,MR,SH,SL,SN,ST,TG	+0519-00402	Africa/Abidjan
+ CK	-2114-15946	Pacific/Rarotonga
+-CL	-3327-07040	America/Santiago	most locations
++CL	-3327-07040	America/Santiago	Chile (most areas)
+ CL	-2709-10926	Pacific/Easter	Easter Island
+ CN	+3114+12128	Asia/Shanghai	Beijing Time
+ CN	+4348+08735	Asia/Urumqi	Xinjiang Time
+@@ -144,25 +145,26 @@
+ CV	+1455-02331	Atlantic/Cape_Verde
+ CW,AW,BQ,SX	+1211-06900	America/Curacao
+ CX	-1025+10543	Indian/Christmas
+-CY	+3510+03322	Asia/Nicosia
++CY	+3510+03322	Asia/Nicosia	Cyprus (most areas)
++CY	+3507+03357	Asia/Famagusta	Northern Cyprus
+ CZ,SK	+5005+01426	Europe/Prague
+-DE	+5230+01322	Europe/Berlin	Berlin time
++DE	+5230+01322	Europe/Berlin	Germany (most areas)
+ DK	+5540+01235	Europe/Copenhagen
+ DO	+1828-06954	America/Santo_Domingo
+ DZ	+3647+00303	Africa/Algiers
+-EC	-0210-07950	America/Guayaquil	mainland
++EC	-0210-07950	America/Guayaquil	Ecuador (mainland)
+ EC	-0054-08936	Pacific/Galapagos	Galápagos Islands
+ EE	+5925+02445	Europe/Tallinn
+ EG	+3003+03115	Africa/Cairo
+ EH	+2709-01312	Africa/El_Aaiun
+-ES	+4024-00341	Europe/Madrid	mainland
+-ES	+3553-00519	Africa/Ceuta	Ceuta & Melilla
++ES	+4024-00341	Europe/Madrid	Spain (mainland)
++ES	+3553-00519	Africa/Ceuta	Ceuta, Melilla
+ ES	+2806-01524	Atlantic/Canary	Canary Islands
+ FI,AX	+6010+02458	Europe/Helsinki
+ FJ	-1808+17825	Pacific/Fiji
+ FK	-5142-05751	Atlantic/Stanley
+-FM	+0725+15147	Pacific/Chuuk	Chuuk (Truk) and Yap
+-FM	+0658+15813	Pacific/Pohnpei	Pohnpei (Ponape)
++FM	+0725+15147	Pacific/Chuuk	Chuuk/Truk, Yap
++FM	+0658+15813	Pacific/Pohnpei	Pohnpei/Ponape
+ FM	+0519+16259	Pacific/Kosrae	Kosrae
+ FO	+6201-00646	Atlantic/Faroe
+ FR	+4852+00220	Europe/Paris
+@@ -171,10 +173,10 @@
+ GF	+0456-05220	America/Cayenne
+ GH	+0533-00013	Africa/Accra
+ GI	+3608-00521	Europe/Gibraltar
+-GL	+6411-05144	America/Godthab	most locations
+-GL	+7646-01840	America/Danmarkshavn	east coast, north of Scoresbysund
+-GL	+7029-02158	America/Scoresbysund	Scoresbysund / Ittoqqortoormiit
+-GL	+7634-06847	America/Thule	Thule / Pituffik
++GL	+6411-05144	America/Godthab	Greenland (most areas)
++GL	+7646-01840	America/Danmarkshavn	National Park (east coast)
++GL	+7029-02158	America/Scoresbysund	Scoresbysund/Ittoqqortoormiit
++GL	+7634-06847	America/Thule	Thule/Pituffik
+ GR	+3758+02343	Europe/Athens
+ GS	-5416-03632	Atlantic/South_Georgia
+ GT	+1438-09031	America/Guatemala
+@@ -185,10 +187,10 @@
+ HN	+1406-08713	America/Tegucigalpa
+ HT	+1832-07220	America/Port-au-Prince
+ HU	+4730+01905	Europe/Budapest
+-ID	-0610+10648	Asia/Jakarta	Java & Sumatra
+-ID	-0002+10920	Asia/Pontianak	west & central Borneo
+-ID	-0507+11924	Asia/Makassar	east & south Borneo, Sulawesi (Celebes), Bali, Nusa Tengarra, west Timor
+-ID	-0232+14042	Asia/Jayapura	west New Guinea (Irian Jaya) & Malukus (Moluccas)
++ID	-0610+10648	Asia/Jakarta	Java, Sumatra
++ID	-0002+10920	Asia/Pontianak	Borneo (west, central)
++ID	-0507+11924	Asia/Makassar	Borneo (east, south); Sulawesi/Celebes, Bali, Nusa Tengarra; Timor (west)
++ID	-0232+14042	Asia/Jayapura	New Guinea (West Papua / Irian Jaya); Malukus/Moluccas
+ IE	+5320-00615	Europe/Dublin
+ IL	+314650+0351326	Asia/Jerusalem
+ IN	+2232+08822	Asia/Kolkata
+@@ -207,10 +209,10 @@
+ KI	+0152-15720	Pacific/Kiritimati	Line Islands
+ KP	+3901+12545	Asia/Pyongyang
+ KR	+3733+12658	Asia/Seoul
+-KZ	+4315+07657	Asia/Almaty	most locations
+-KZ	+4448+06528	Asia/Qyzylorda	Qyzylorda (Kyzylorda, Kzyl-Orda)
+-KZ	+5017+05710	Asia/Aqtobe	Aqtobe (Aktobe)
+-KZ	+4431+05016	Asia/Aqtau	Atyrau (Atirau, Gur'yev), Mangghystau (Mankistau)
++KZ	+4315+07657	Asia/Almaty	Kazakhstan (most areas)
++KZ	+4448+06528	Asia/Qyzylorda	Qyzylorda/Kyzylorda/Kzyl-Orda
++KZ	+5017+05710	Asia/Aqtobe	Aqtobe/Aktobe
++KZ	+4431+05016	Asia/Aqtau	Atyrau/Atirau/Gur'yev, Mangghystau/Mankistau
+ KZ	+5113+05121	Asia/Oral	West Kazakhstan
+ LB	+3353+03530	Asia/Beirut
+ LK	+0656+07951	Asia/Colombo
+@@ -222,10 +224,10 @@
+ MA	+3339-00735	Africa/Casablanca
+ MC	+4342+00723	Europe/Monaco
+ MD	+4700+02850	Europe/Chisinau
+-MH	+0709+17112	Pacific/Majuro	most locations
++MH	+0709+17112	Pacific/Majuro	Marshall Islands (most areas)
+ MH	+0905+16720	Pacific/Kwajalein	Kwajalein
+-MM	+1647+09610	Asia/Rangoon
+-MN	+4755+10653	Asia/Ulaanbaatar	most locations
++MM	+1647+09610	Asia/Yangon
++MN	+4755+10653	Asia/Ulaanbaatar	Mongolia (most areas)
+ MN	+4801+09139	Asia/Hovd	Bayan-Ölgii, Govi-Altai, Hovd, Uvs, Zavkhan
+ MN	+4804+11430	Asia/Choibalsan	Dornod, Sükhbaatar
+ MO	+2214+11335	Asia/Macau
+@@ -233,25 +235,24 @@
+ MT	+3554+01431	Europe/Malta
+ MU	-2010+05730	Indian/Mauritius
+ MV	+0410+07330	Indian/Maldives
+-MX	+1924-09909	America/Mexico_City	Central Time - most locations
+-MX	+2105-08646	America/Cancun	Central Time - Quintana Roo
++MX	+1924-09909	America/Mexico_City	Central Time
++MX	+2105-08646	America/Cancun	Eastern Standard Time - Quintana Roo
+ MX	+2058-08937	America/Merida	Central Time - Campeche, Yucatán
+-MX	+2540-10019	America/Monterrey	Mexican Central Time - Coahuila, Durango, Nuevo León, Tamaulipas away from US border
+-MX	+2550-09730	America/Matamoros	US Central Time - Coahuila, Durango, Nuevo León, Tamaulipas near US border
+-MX	+2313-10625	America/Mazatlan	Mountain Time - S Baja, Nayarit, Sinaloa
+-MX	+2838-10605	America/Chihuahua	Mexican Mountain Time - Chihuahua away from US border
+-MX	+2934-10425	America/Ojinaga	US Mountain Time - Chihuahua near US border
++MX	+2540-10019	America/Monterrey	Central Time - Durango; Coahuila, Nuevo León, Tamaulipas (most areas)
++MX	+2550-09730	America/Matamoros	Central Time US - Coahuila, Nuevo León, Tamaulipas (US border)
++MX	+2313-10625	America/Mazatlan	Mountain Time - Baja California Sur, Nayarit, Sinaloa
++MX	+2838-10605	America/Chihuahua	Mountain Time - Chihuahua (most areas)
++MX	+2934-10425	America/Ojinaga	Mountain Time US - Chihuahua (US border)
+ MX	+2904-11058	America/Hermosillo	Mountain Standard Time - Sonora
+-MX	+3232-11701	America/Tijuana	US Pacific Time - Baja California near US border
+-MX	+3018-11452	America/Santa_Isabel	Mexican Pacific Time - Baja California away from US border
+-MX	+2048-10515	America/Bahia_Banderas	Mexican Central Time - Bahía de Banderas
+-MY	+0310+10142	Asia/Kuala_Lumpur	peninsular Malaysia
+-MY	+0133+11020	Asia/Kuching	Sabah & Sarawak
+-MZ,BI,BW,CD,MW,RW,ZM,ZW	-2558+03235	Africa/Maputo	Central Africa Time (UTC+2)
++MX	+3232-11701	America/Tijuana	Pacific Time US - Baja California
++MX	+2048-10515	America/Bahia_Banderas	Central Time - Bahía de Banderas
++MY	+0310+10142	Asia/Kuala_Lumpur	Malaysia (peninsula)
++MY	+0133+11020	Asia/Kuching	Sabah, Sarawak
++MZ,BI,BW,CD,MW,RW,ZM,ZW	-2558+03235	Africa/Maputo	Central Africa Time
+ NA	-2234+01706	Africa/Windhoek
+ NC	-2216+16627	Pacific/Noumea
+ NF	-2903+16758	Pacific/Norfolk
+-NG,AO,BJ,CD,CF,CG,CM,GA,GQ,NE	+0627+00324	Africa/Lagos	West Africa Time (UTC+1)
++NG,AO,BJ,CD,CF,CG,CM,GA,GQ,NE	+0627+00324	Africa/Lagos	West Africa Time
+ NI	+1209-08617	America/Managua
+ NL	+5222+00454	Europe/Amsterdam
+ NO,SJ	+5955+01045	Europe/Oslo
+@@ -265,7 +266,8 @@
+ PF	-1732-14934	Pacific/Tahiti	Society Islands
+ PF	-0900-13930	Pacific/Marquesas	Marquesas Islands
+ PF	-2308-13457	Pacific/Gambier	Gambier Islands
+-PG	-0930+14710	Pacific/Port_Moresby
++PG	-0930+14710	Pacific/Port_Moresby	Papua New Guinea (most areas)
++PG	-0613+15534	Pacific/Bougainville	Bougainville
+ PH	+1435+12100	Asia/Manila
+ PK	+2452+06703	Asia/Karachi
+ PL	+5215+02100	Europe/Warsaw
+@@ -274,36 +276,41 @@
+ PR	+182806-0660622	America/Puerto_Rico
+ PS	+3130+03428	Asia/Gaza	Gaza Strip
+ PS	+313200+0350542	Asia/Hebron	West Bank
+-PT	+3843-00908	Europe/Lisbon	mainland
++PT	+3843-00908	Europe/Lisbon	Portugal (mainland)
+ PT	+3238-01654	Atlantic/Madeira	Madeira Islands
+ PT	+3744-02540	Atlantic/Azores	Azores
+ PW	+0720+13429	Pacific/Palau
+ PY	-2516-05740	America/Asuncion
+ QA,BH	+2517+05132	Asia/Qatar
+-RE,TF	-2052+05528	Indian/Reunion	Réunion, Crozet Is, Scattered Is
++RE,TF	-2052+05528	Indian/Reunion	Réunion, Crozet, Scattered Islands
+ RO	+4426+02606	Europe/Bucharest
+ RS,BA,HR,ME,MK,SI	+4450+02030	Europe/Belgrade
+-RU	+5443+02030	Europe/Kaliningrad	Moscow-01 - Kaliningrad
+-RU	+554521+0373704	Europe/Moscow	Moscow+00 - west Russia
+-RU	+4457+03406	Europe/Simferopol	Moscow+00 - Crimea
+-RU	+4844+04425	Europe/Volgograd	Moscow+00 - Caspian Sea
+-RU	+5312+05009	Europe/Samara	Moscow+00 (Moscow+01 after 2014-10-26) - Samara, Udmurtia
+-RU	+5651+06036	Asia/Yekaterinburg	Moscow+02 - Urals
+-RU	+5500+07324	Asia/Omsk	Moscow+03 - west Siberia
+-RU	+5502+08255	Asia/Novosibirsk	Moscow+03 - Novosibirsk
+-RU	+5345+08707	Asia/Novokuznetsk	Moscow+03 (Moscow+04 after 2014-10-26) - Kemerovo
+-RU	+5601+09250	Asia/Krasnoyarsk	Moscow+04 - Yenisei River
+-RU	+5216+10420	Asia/Irkutsk	Moscow+05 - Lake Baikal
+-RU	+5203+11328	Asia/Chita	Moscow+06 (Moscow+05 after 2014-10-26) - Zabaykalsky
+-RU	+6200+12940	Asia/Yakutsk	Moscow+06 - Lena River
+-RU	+623923+1353314	Asia/Khandyga	Moscow+06 - Tomponsky, Ust-Maysky
+-RU	+4310+13156	Asia/Vladivostok	Moscow+07 - Amur River
+-RU	+4658+14242	Asia/Sakhalin	Moscow+07 - Sakhalin Island
+-RU	+643337+1431336	Asia/Ust-Nera	Moscow+07 - Oymyakonsky
+-RU	+5934+15048	Asia/Magadan	Moscow+08 (Moscow+07 after 2014-10-26) - Magadan
+-RU	+6728+15343	Asia/Srednekolymsk	Moscow+08 - E Sakha, N Kuril Is
+-RU	+5301+15839	Asia/Kamchatka	Moscow+08 (Moscow+09 after 2014-10-26) - Kamchatka
+-RU	+6445+17729	Asia/Anadyr	Moscow+08 (Moscow+09 after 2014-10-26) - Bering Sea
++RU	+5443+02030	Europe/Kaliningrad	MSK-01 - Kaliningrad
++RU	+554521+0373704	Europe/Moscow	MSK+00 - Moscow area
++RU	+4457+03406	Europe/Simferopol	MSK+00 - Crimea
++RU	+4844+04425	Europe/Volgograd	MSK+00 - Volgograd, Saratov
++RU	+5836+04939	Europe/Kirov	MSK+00 - Kirov
++RU	+4621+04803	Europe/Astrakhan	MSK+01 - Astrakhan
++RU	+5312+05009	Europe/Samara	MSK+01 - Samara, Udmurtia
++RU	+5420+04824	Europe/Ulyanovsk	MSK+01 - Ulyanovsk
++RU	+5651+06036	Asia/Yekaterinburg	MSK+02 - Urals
++RU	+5500+07324	Asia/Omsk	MSK+03 - Omsk
++RU	+5502+08255	Asia/Novosibirsk	MSK+03 - Novosibirsk
++RU	+5322+08345	Asia/Barnaul	MSK+04 - Altai
++RU	+5630+08458	Asia/Tomsk	MSK+04 - Tomsk
++RU	+5345+08707	Asia/Novokuznetsk	MSK+04 - Kemerovo
++RU	+5601+09250	Asia/Krasnoyarsk	MSK+04 - Krasnoyarsk area
++RU	+5216+10420	Asia/Irkutsk	MSK+05 - Irkutsk, Buryatia
++RU	+5203+11328	Asia/Chita	MSK+06 - Zabaykalsky
++RU	+6200+12940	Asia/Yakutsk	MSK+06 - Lena River
++RU	+623923+1353314	Asia/Khandyga	MSK+06 - Tomponsky, Ust-Maysky
++RU	+4310+13156	Asia/Vladivostok	MSK+07 - Amur River
++RU	+643337+1431336	Asia/Ust-Nera	MSK+07 - Oymyakonsky
++RU	+5934+15048	Asia/Magadan	MSK+08 - Magadan
++RU	+4658+14242	Asia/Sakhalin	MSK+08 - Sakhalin Island
++RU	+6728+15343	Asia/Srednekolymsk	MSK+08 - Sakha (E); North Kuril Is
++RU	+5301+15839	Asia/Kamchatka	MSK+09 - Kamchatka
++RU	+6445+17729	Asia/Anadyr	MSK+09 - Bering Sea
+ SA,KW,YE	+2438+04643	Asia/Riyadh
+ SB	-0932+16012	Pacific/Guadalcanal
+ SC	-0440+05528	Indian/Mahe
+@@ -315,8 +322,8 @@
+ SY	+3330+03618	Asia/Damascus
+ TC	+2128-07108	America/Grand_Turk
+ TD	+1207+01503	Africa/Ndjamena
+-TF	-492110+0701303	Indian/Kerguelen	Kerguelen, St Paul I, Amsterdam I
+-TH,KH,LA,VN	+1345+10031	Asia/Bangkok
++TF	-492110+0701303	Indian/Kerguelen	Kerguelen, St Paul Island, Amsterdam Island
++TH,KH,LA,VN	+1345+10031	Asia/Bangkok	Indochina (most areas)
+ TJ	+3835+06848	Asia/Dushanbe
+ TK	-0922-17114	Pacific/Fakaofo
+ TL	-0833+12535	Asia/Dili
+@@ -324,46 +331,47 @@
+ TN	+3648+01011	Africa/Tunis
+ TO	-2110-17510	Pacific/Tongatapu
+ TR	+4101+02858	Europe/Istanbul
+-TT,AG,AI,BL,DM,GD,GP,MF,LC,KN,MS,VC,VG,VI	+1039-06131	America/Port_of_Spain
++TT,AG,AI,BL,DM,GD,GP,KN,LC,MF,MS,VC,VG,VI	+1039-06131	America/Port_of_Spain
+ TV	-0831+17913	Pacific/Funafuti
+ TW	+2503+12130	Asia/Taipei
+-UA	+5026+03031	Europe/Kiev	most locations
++UA	+5026+03031	Europe/Kiev	Ukraine (most areas)
+ UA	+4837+02218	Europe/Uzhgorod	Ruthenia
+-UA	+4750+03510	Europe/Zaporozhye	Zaporozh'ye, E Lugansk / Zaporizhia, E Luhansk
++UA	+4750+03510	Europe/Zaporozhye	Zaporozh'ye/Zaporizhia; Lugansk/Luhansk (east)
+ UM	+1917+16637	Pacific/Wake	Wake Island
+-US	+404251-0740023	America/New_York	Eastern Time
+-US	+421953-0830245	America/Detroit	Eastern Time - Michigan - most locations
+-US	+381515-0854534	America/Kentucky/Louisville	Eastern Time - Kentucky - Louisville area
+-US	+364947-0845057	America/Kentucky/Monticello	Eastern Time - Kentucky - Wayne County
+-US	+394606-0860929	America/Indiana/Indianapolis	Eastern Time - Indiana - most locations
+-US	+384038-0873143	America/Indiana/Vincennes	Eastern Time - Indiana - Daviess, Dubois, Knox & Martin Counties
+-US	+410305-0863611	America/Indiana/Winamac	Eastern Time - Indiana - Pulaski County
+-US	+382232-0862041	America/Indiana/Marengo	Eastern Time - Indiana - Crawford County
+-US	+382931-0871643	America/Indiana/Petersburg	Eastern Time - Indiana - Pike County
+-US	+384452-0850402	America/Indiana/Vevay	Eastern Time - Indiana - Switzerland County
+-US	+415100-0873900	America/Chicago	Central Time
+-US	+375711-0864541	America/Indiana/Tell_City	Central Time - Indiana - Perry County
+-US	+411745-0863730	America/Indiana/Knox	Central Time - Indiana - Starke County
+-US	+450628-0873651	America/Menominee	Central Time - Michigan - Dickinson, Gogebic, Iron & Menominee Counties
+-US	+470659-1011757	America/North_Dakota/Center	Central Time - North Dakota - Oliver County
+-US	+465042-1012439	America/North_Dakota/New_Salem	Central Time - North Dakota - Morton County (except Mandan area)
+-US	+471551-1014640	America/North_Dakota/Beulah	Central Time - North Dakota - Mercer County
+-US	+394421-1045903	America/Denver	Mountain Time
+-US	+433649-1161209	America/Boise	Mountain Time - south Idaho & east Oregon
+-US	+332654-1120424	America/Phoenix	Mountain Standard Time - Arizona (except Navajo)
+-US	+340308-1181434	America/Los_Angeles	Pacific Time
+-US	+550737-1313435	America/Metlakatla	Pacific Standard Time - Annette Island, Alaska
+-US	+611305-1495401	America/Anchorage	Alaska Time
+-US	+581807-1342511	America/Juneau	Alaska Time - Alaska panhandle
+-US	+571035-1351807	America/Sitka	Alaska Time - southeast Alaska panhandle
+-US	+593249-1394338	America/Yakutat	Alaska Time - Alaska panhandle neck
+-US	+643004-1652423	America/Nome	Alaska Time - west Alaska
++US	+404251-0740023	America/New_York	Eastern (most areas)
++US	+421953-0830245	America/Detroit	Eastern - MI (most areas)
++US	+381515-0854534	America/Kentucky/Louisville	Eastern - KY (Louisville area)
++US	+364947-0845057	America/Kentucky/Monticello	Eastern - KY (Wayne)
++US	+394606-0860929	America/Indiana/Indianapolis	Eastern - IN (most areas)
++US	+384038-0873143	America/Indiana/Vincennes	Eastern - IN (Da, Du, K, Mn)
++US	+410305-0863611	America/Indiana/Winamac	Eastern - IN (Pulaski)
++US	+382232-0862041	America/Indiana/Marengo	Eastern - IN (Crawford)
++US	+382931-0871643	America/Indiana/Petersburg	Eastern - IN (Pike)
++US	+384452-0850402	America/Indiana/Vevay	Eastern - IN (Switzerland)
++US	+415100-0873900	America/Chicago	Central (most areas)
++US	+375711-0864541	America/Indiana/Tell_City	Central - IN (Perry)
++US	+411745-0863730	America/Indiana/Knox	Central - IN (Starke)
++US	+450628-0873651	America/Menominee	Central - MI (Wisconsin border)
++US	+470659-1011757	America/North_Dakota/Center	Central - ND (Oliver)
++US	+465042-1012439	America/North_Dakota/New_Salem	Central - ND (Morton rural)
++US	+471551-1014640	America/North_Dakota/Beulah	Central - ND (Mercer)
++US	+394421-1045903	America/Denver	Mountain (most areas)
++US	+433649-1161209	America/Boise	Mountain - ID (south); OR (east)
++US	+332654-1120424	America/Phoenix	MST - Arizona (except Navajo)
++US	+340308-1181434	America/Los_Angeles	Pacific
++US	+611305-1495401	America/Anchorage	Alaska (most areas)
++US	+581807-1342511	America/Juneau	Alaska - Juneau area
++US	+571035-1351807	America/Sitka	Alaska - Sitka area
++US	+550737-1313435	America/Metlakatla	Alaska - Annette Island
++US	+593249-1394338	America/Yakutat	Alaska - Yakutat
++US	+643004-1652423	America/Nome	Alaska (west)
+ US	+515248-1763929	America/Adak	Aleutian Islands
+-US,UM	+211825-1575130	Pacific/Honolulu	Hawaii time
++US,UM	+211825-1575130	Pacific/Honolulu	Hawaii
+ UY	-3453-05611	America/Montevideo
+-UZ	+3940+06648	Asia/Samarkand	west Uzbekistan
+-UZ	+4120+06918	Asia/Tashkent	east Uzbekistan
++UZ	+3940+06648	Asia/Samarkand	Uzbekistan (west)
++UZ	+4120+06918	Asia/Tashkent	Uzbekistan (east)
+ VE	+1030-06656	America/Caracas
++VN	+1045+10640	Asia/Ho_Chi_Minh	Vietnam (south)
+ VU	-1740+16825	Pacific/Efate
+ WF	-1318-17610	Pacific/Wallis
+ WS	-1350-17144	Pacific/Apia
+--- contrib/tzdata/zoneinfo2tdf.pl.orig
++++ contrib/tzdata/zoneinfo2tdf.pl
+@@ -0,0 +1,52 @@
++#! /usr/bin/perl -w
++
++# Courtesy Ken Pizzini.
++
++use strict;
++
++#This file released to the public domain.
++
++# Note: error checking is poor; trust the output only if the input
++# has been checked by zic.
++
++my $contZone = '';
++while (<>) {
++  my $origline = $_;
++  my @fields = ();
++  while (s/^\s*((?:"[^"]*"|[^\s#])+)//) {
++    push @fields, $1;
++  }
++  next unless @fields;
++
++  my $type = lc($fields[0]);
++  if ($contZone) {
++    @fields >= 3 or warn "bad continuation line";
++    unshift @fields, '+', $contZone;
++    $type = 'zone';
++  }
++
++  $contZone = '';
++  if ($type eq 'zone') {
++    # Zone  NAME  GMTOFF  RULES/SAVE  FORMAT  [UNTIL]
++    my $nfields = @fields;
++    $nfields >= 5 or warn "bad zone line";
++    if ($nfields > 6) {
++      #this splice is optional, depending on one's preference
++      #(one big date-time field, or componentized date and time):
++      splice(@fields, 5, $nfields-5, "@fields[5..$nfields-1]");
++    }
++    $contZone = $fields[1] if @fields > 5;
++  } elsif ($type eq 'rule') {
++    # Rule  NAME  FROM  TO  TYPE  IN  ON  AT  SAVE  LETTER/S
++    @fields == 10 or warn "bad rule line";
++  } elsif ($type eq 'link') {
++    # Link  TARGET  LINK-NAME
++    @fields == 3 or warn "bad link line";
++  } elsif ($type eq 'leap') {
++    # Leap  YEAR  MONTH  DAY  HH:MM:SS  CORR  R/S
++    @fields == 7 or warn "bad leap line";
++  } else {
++    warn "Fubar at input line $.: $origline";
++  }
++  print join("\t", @fields), "\n";
++}
++native
+\ No newline at end of property
++*
+\ No newline at end of property
++FreeBSD=%H
+\ No newline at end of property
++text/plain
+\ No newline at end of property

Property changes on: user/gjb/releng-rewrite/share/security/patches/EN-16:20/tzdata-10.1.patch
___________________________________________________________________
Added: fbsd:nokeywords
## -0,0 +1 ##
+yes
\ No newline at end of property
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Added: svn:mime-type
## -0,0 +1 ##
+text/plain
\ No newline at end of property
Index: user/gjb/releng-rewrite/share/security/patches/EN-16:20/tzdata-10.1.patch.asc
===================================================================
--- user/gjb/releng-rewrite/share/security/patches/EN-16:20/tzdata-10.1.patch.asc	(nonexistent)
+++ user/gjb/releng-rewrite/share/security/patches/EN-16:20/tzdata-10.1.patch.asc	(revision 49725)
@@ -0,0 +1,16 @@
+-----BEGIN PGP SIGNATURE-----
+
+iQIcBAABCgAGBQJYRw1qAAoJEO1n7NZdz2rnhg4QAJQe6cfJHpcCUhAyhyAnYgU8
+Oqi67i8fw+kKfkP8mRxLrMdtUXSokR+pAWmHjl+vNLm3cUYyeu1DL1GrcOxGNfcb
+CbyNcABUM5B4q7i+ql/HAavjOYi1G9IzibRCS4Zk6En5aork/V2PovtUdVyz+gwk
+APzJ42Ff703hg/KsNnbrrgPx7Bqu5OHoK6rtHLPAgh5M/TnX1BmseSLCIjWQNnKO
+iPYKHsIBTfG3NlvaAohzWnd6j/n61IsAy748BrDMchOR9WZRB3QNTeAiuvEBczku
+qBKG0wwKac3z8BnsoBWGd0snkCa1367sNHBUL1+xiVjKEQF/mVToHcuROSi+ddcz
+Mxjt+hf/C0IWFppzStVHP9xl8toE5ZhmpQcHhvkdKRRvBUOuRZHsCuS7HmLxIl9V
+0g1qKOfQPqx3L6j/rQBmY4PbkLIkaXt9NuvJbyVGtug02/ZMqI92Tzpnj/Eht3QJ
+afGrnIkj4IBLZ/l438ua/ohkiZD9jfboys9z57XJPe+ktPkBiIX3OIbHSypehkDG
+1HE+KNtuaVqd1bvRYw5hPAK9oAVzaYtgJtP2wDmol92DuIsWu4ZgXWbSEAhasxYy
+ersY42kFnSTe22lw5QQyVy9bw99YwRccvxHAOjph/ox8XvNQkn4Lj7zqhujLhJbd
+J5V+rqKKn7f+rc6b5zhc
+=X0Hm
+-----END PGP SIGNATURE-----

Property changes on: user/gjb/releng-rewrite/share/security/patches/EN-16:20/tzdata-10.1.patch.asc
___________________________________________________________________
Added: fbsd:nokeywords
## -0,0 +1 ##
+yes
\ No newline at end of property
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Added: svn:mime-type
## -0,0 +1 ##
+text/plain
\ No newline at end of property
Index: user/gjb/releng-rewrite/share/security/patches/EN-16:20/tzdata-10.2.patch
===================================================================
--- user/gjb/releng-rewrite/share/security/patches/EN-16:20/tzdata-10.2.patch	(nonexistent)
+++ user/gjb/releng-rewrite/share/security/patches/EN-16:20/tzdata-10.2.patch	(revision 49725)
@@ -0,0 +1,11263 @@
+--- contrib/tzdata/CONTRIBUTING.orig
++++ contrib/tzdata/CONTRIBUTING
+@@ -0,0 +1,73 @@
++Contributing to the tz code and data
++
++The time zone database is by no means authoritative: governments
++change timekeeping rules erratically and sometimes with little
++warning, the data entries do not cover all of civil time before
++1970, and undoubtedly errors remain in the code and data.  Feel
++free to fill gaps or fix mistakes, and please email improvements
++to tz@iana.org for use in the future.
++
++To email small changes, please run a POSIX shell command like
++'diff -u old/europe new/europe >myfix.patch', and attach
++myfix.patch to the email.
++
++For more-elaborate changes, please read the Theory file and browse
++the mailing list archives <http://mm.icann.org/pipermail/tz/> for
++examples of patches that tend to work well.  Ideally, additions to
++data should contain commentary citing reliable sources as
++justification.
++
++Please submit changes against either the latest release in
++<ftp://ftp.iana.org/tz/> or the master branch of the experimental
++Git repository.  If you use Git the following workflow may be helpful:
++
++  * Copy the experimental repository.
++
++      git clone https://github.com/eggert/tz.git
++      cd tz
++
++  * Get current with the master branch.
++
++      git checkout master
++      git pull
++
++  * Switch to a new branch for the changes.  Choose a different
++    branch name for each change set.
++
++      git checkout -b mybranch
++
++  * Edit source files.  Include commentary that justifies the
++    changes by citing reliable sources.
++
++  * Debug the changes, e.g.:
++
++      make check
++      make install
++      ./zdump -v America/Los_Angeles
++
++  * For each separable change, commit it in the new branch, e.g.:
++
++      git add northamerica
++      git commit
++
++    See recent 'git log' output for the commit-message style.
++
++  * Create patch files 0001-*, 0002-*, ...
++
++      git format-patch master
++
++  * After reviewing the patch files, send the patches to tz@iana.org
++    for others to review.
++
++      git send-email master
++
++  * Start anew by getting current with the master branch again
++    (the second step above).
++
++Please do not create issues or pull requests on GitHub, as the
++proper procedure for proposing and distributing patches is via
++email as illustrated above.
++
++-----
++
++This file is in the public domain.
+--- contrib/tzdata/LICENSE.orig
++++ contrib/tzdata/LICENSE
+@@ -0,0 +1,4 @@
++With a few exceptions, all files in the tz code and data (including
++this one) are in the public domain.  The exceptions are date.c,
++newstrftime.3, and strftime.c, which contain material derived from BSD
++and which use the BSD 3-clause license.
+--- contrib/tzdata/Makefile.orig
++++ contrib/tzdata/Makefile
+@@ -0,0 +1,793 @@
++# This file is in the public domain, so clarified as of
++# 2009-05-17 by Arthur David Olson.
++
++# Package name for the code distribution.
++PACKAGE=	tzcode
++
++# Version number for the distribution, overridden in the 'tarballs' rule below.
++VERSION=	unknown
++
++# Email address for bug reports.
++BUGEMAIL=	tz@iana.org
++
++# Change the line below for your time zone (after finding the zone you want in
++# the time zone files, or adding it to a time zone file).
++# Alternately, if you discover you've got the wrong time zone, you can just
++#	zic -l rightzone
++# to correct things.
++# Use the command
++#	make zonenames
++# to get a list of the values you can use for LOCALTIME.
++
++LOCALTIME=	GMT
++
++# If you want something other than Eastern United States time as a template
++# for handling POSIX-style time zone environment variables,
++# change the line below (after finding the zone you want in the
++# time zone files, or adding it to a time zone file).
++# (When a POSIX-style environment variable is handled, the rules in the
++# template file are used to determine "spring forward" and "fall back" days and
++# times; the environment variable itself specifies UT offsets of standard and
++# summer time.)
++# Alternately, if you discover you've got the wrong time zone, you can just
++#	zic -p rightzone
++# to correct things.
++# Use the command
++#	make zonenames
++# to get a list of the values you can use for POSIXRULES.
++# If you want POSIX compatibility, use "America/New_York".
++
++POSIXRULES=	America/New_York
++
++# Also see TZDEFRULESTRING below, which takes effect only
++# if the time zone files cannot be accessed.
++
++# Everything gets put in subdirectories of. . .
++
++TOPDIR=		/usr/local
++
++# "Compiled" time zone information is placed in the "TZDIR" directory
++# (and subdirectories).
++# Use an absolute path name for TZDIR unless you're just testing the software.
++
++TZDIR_BASENAME=	zoneinfo
++TZDIR=		$(TOPDIR)/etc/$(TZDIR_BASENAME)
++
++# Types to try, as an alternative to time_t.  int64_t should be first.
++TIME_T_ALTERNATIVES= int64_t int32_t uint32_t uint64_t
++
++# The "tzselect", "zic", and "zdump" commands get installed in. . .
++
++ETCDIR=		$(TOPDIR)/etc
++
++# If you "make INSTALL", the "date" command gets installed in. . .
++
++BINDIR=		$(TOPDIR)/bin
++
++# Manual pages go in subdirectories of. . .
++
++MANDIR=		$(TOPDIR)/man
++
++# Library functions are put in an archive in LIBDIR.
++
++LIBDIR=		$(TOPDIR)/lib
++
++# If you always want time values interpreted as "seconds since the epoch
++# (not counting leap seconds)", use
++#	REDO=		posix_only
++# below.  If you always want right time values interpreted as "seconds since
++# the epoch" (counting leap seconds)", use
++#	REDO=		right_only
++# below.  If you want both sets of data available, with leap seconds not
++# counted normally, use
++#	REDO=		posix_right
++# below.  If you want both sets of data available, with leap seconds counted
++# normally, use
++#	REDO=		right_posix
++# below.  POSIX mandates that leap seconds not be counted; for compatibility
++# with it, use "posix_only" or "posix_right".
++
++REDO=		posix_right
++
++# If you want out-of-scope and often-wrong data from the file 'backzone', use
++#	PACKRATDATA=	backzone
++# To omit this data, use
++#	PACKRATDATA=
++
++PACKRATDATA=
++
++# Since "." may not be in PATH...
++
++YEARISTYPE=	./yearistype
++
++# Non-default libraries needed to link.
++LDLIBS=
++
++# Add the following to the end of the "CFLAGS=" line as needed.
++#  -DBIG_BANG=-9999999LL if the Big Bang occurred at time -9999999 (see zic.c)
++#  -DHAVE_DECL_ASCTIME_R=0 if <time.h> does not declare asctime_r
++#  -DHAVE_DIRECT_H if mkdir needs <direct.h> (MS-Windows)
++#  -DHAVE_DOS_FILE_NAMES if file names have drive specifiers etc. (MS-DOS)
++#  -DHAVE_GETTEXT=1 if 'gettext' works (e.g., GNU/Linux, FreeBSD, Solaris)
++#  -DHAVE_INCOMPATIBLE_CTIME_R=1 if your system's time.h declares
++#	ctime_r and asctime_r incompatibly with the POSIX standard
++#	(Solaris when _POSIX_PTHREAD_SEMANTICS is not defined).
++#  -DHAVE_INTTYPES_H=1 if you have a pre-C99 compiler with "inttypes.h"
++#  -DHAVE_LINK=0 if your system lacks a link function
++#  -DHAVE_LOCALTIME_R=0 if your system lacks a localtime_r function
++#  -DHAVE_LOCALTIME_RZ=0 if you do not want zdump to use localtime_rz
++#	This defaults to 1 if a working localtime_rz seems to be available.
++#	localtime_rz can make zdump significantly faster, but is nonstandard.
++#  -DHAVE_POSIX_DECLS=0 if your system's include files do not declare
++#	functions like 'link' or variables like 'tzname' required by POSIX
++#  -DHAVE_STDINT_H=1 if you have a pre-C99 compiler with "stdint.h"
++#  -DHAVE_STRFTIME_L=1 if <time.h> declares locale_t and strftime_l
++#	This defaults to 0 if _POSIX_VERSION < 200809, 1 otherwise.
++#  -DHAVE_STRDUP=0 if your system lacks the strdup function
++#  -DHAVE_SYMLINK=0 if your system lacks the symlink function
++#  -DHAVE_SYS_STAT_H=0 if your compiler lacks a "sys/stat.h"
++#  -DHAVE_SYS_WAIT_H=0 if your compiler lacks a "sys/wait.h"
++#  -DHAVE_TZSET=0 if your system lacks a tzset function
++#  -DHAVE_UNISTD_H=0 if your compiler lacks a "unistd.h" (Microsoft C++ 7?)
++#  -DEPOCH_LOCAL=1 if the 'time' function returns local time not UT
++#  -DEPOCH_OFFSET=N if the 'time' function returns a value N greater
++#	than what POSIX specifies, assuming local time is UT.
++#	For example, N is 252460800 on AmigaOS.
++#  -DNO_RUN_TIME_WARNINGS_ABOUT_YEAR_2000_PROBLEMS_THANK_YOU=1
++#	if you do not want run time warnings about formats that may cause
++#	year 2000 grief
++#  -Dssize_t=long on ancient hosts that lack ssize_t
++#  -DTHREAD_SAFE=1 to make localtime.c thread-safe, as POSIX requires;
++#	not needed by the main-program tz code, which is single-threaded.
++#	Append other compiler flags as needed, e.g., -pthread on GNU/Linux.
++#  -Dtime_tz=\"T\" to use T as the time_t type, rather than the system time_t
++#  -DTZ_DOMAIN=\"foo\" to use "foo" for gettext domain name; default is "tz"
++#  -DTZ_DOMAINDIR=\"/path\" to use "/path" for gettext directory;
++#	the default is system-supplied, typically "/usr/lib/locale"
++#  -DTZDEFRULESTRING=\",date/time,date/time\" to default to the specified
++#	DST transitions if the time zone files cannot be accessed
++#  -DUNINIT_TRAP=1 if reading uninitialized storage can cause problems
++#	other than simply getting garbage data
++#  -DUSE_LTZ=0 to build zdump with the system time zone library
++#	Also set TZDOBJS=zdump.o and CHECK_TIME_T_ALTERNATIVES= below.
++#  -DZIC_MAX_ABBR_LEN_WO_WARN=3
++#	(or some other number) to set the maximum time zone abbreviation length
++#	that zic will accept without a warning (the default is 6)
++#  $(GCC_DEBUG_FLAGS) if you are using recent GCC and want lots of checking
++GCC_DEBUG_FLAGS = -Dlint -g3 -O3 -fno-common -fstrict-aliasing \
++	-Wall -Wextra \
++	-Wbad-function-cast -Wcast-align -Wdate-time \
++	-Wdeclaration-after-statement \
++	-Wdouble-promotion \
++	-Wformat=2 -Winit-self -Wjump-misses-init \
++	-Wlogical-op -Wmissing-prototypes -Wnested-externs \
++	-Wold-style-definition -Woverlength-strings -Wpointer-arith \
++	-Wshadow -Wstrict-prototypes -Wsuggest-attribute=const \
++	-Wsuggest-attribute=format -Wsuggest-attribute=noreturn \
++	-Wsuggest-attribute=pure -Wtrampolines \
++	-Wunused -Wwrite-strings \
++	-Wno-address -Wno-format-nonliteral -Wno-sign-compare \
++	-Wno-type-limits -Wno-unused-parameter
++#
++# If you want to use System V compatibility code, add
++#	-DUSG_COMPAT
++# to the end of the "CFLAGS=" line.  This arrange for "timezone" and "daylight"
++# variables to be kept up-to-date by the time conversion functions.  Neither
++# "timezone" nor "daylight" is described in X3J11's work.
++#
++# If your system has a "GMT offset" field in its "struct tm"s
++# (or if you decide to add such a field in your system's "time.h" file),
++# add the name to a define such as
++#	-DTM_GMTOFF=tm_gmtoff
++# to the end of the "CFLAGS=" line.  If not defined, the code attempts to
++# guess TM_GMTOFF from other macros; define NO_TM_GMTOFF to suppress this.
++# Similarly, if your system has a "zone abbreviation" field, define
++#	-DTM_ZONE=tm_zone
++# and define NO_TM_ZONE to suppress any guessing.  These two fields are not
++# required by POSIX, but are widely available on GNU/Linux and BSD systems.
++#
++# If you want functions that were inspired by early versions of X3J11's work,
++# add
++#	-DSTD_INSPIRED
++# to the end of the "CFLAGS=" line.  This arranges for the functions
++# "tzsetwall", "offtime", "timelocal", "timegm", "timeoff",
++# "posix2time", and "time2posix" to be added to the time conversion library.
++# "tzsetwall" is like "tzset" except that it arranges for local wall clock
++# time (rather than the time specified in the TZ environment variable)
++# to be used.
++# "offtime" is like "gmtime" except that it accepts a second (long) argument
++# that gives an offset to add to the time_t when converting it.
++# "timelocal" is equivalent to "mktime".
++# "timegm" is like "timelocal" except that it turns a struct tm into
++# a time_t using UT (rather than local time as "timelocal" does).
++# "timeoff" is like "timegm" except that it accepts a second (long) argument
++# that gives an offset to use when converting to a time_t.
++# "posix2time" and "time2posix" are described in an included manual page.
++# X3J11's work does not describe any of these functions.
++# Sun has provided "tzsetwall", "timelocal", and "timegm" in SunOS 4.0.
++# These functions may well disappear in future releases of the time
++# conversion package.
++#
++# If you don't want functions that were inspired by NetBSD, add
++#	-DNETBSD_INSPIRED=0
++# to the end of the "CFLAGS=" line.  Otherwise, the functions
++# "localtime_rz", "mktime_z", "tzalloc", and "tzfree" are added to the
++# time library, and if STD_INSPIRED is also defined the functions
++# "posix2time_z" and "time2posix_z" are added as well.
++# The functions ending in "_z" (or "_rz") are like their unsuffixed
++# (or suffixed-by-"_r") counterparts, except with an extra first
++# argument of opaque type timezone_t that specifies the time zone.
++# "tzalloc" allocates a timezone_t value, and "tzfree" frees it.
++#
++# If you want to allocate state structures in localtime, add
++#	-DALL_STATE
++# to the end of the "CFLAGS=" line.  Storage is obtained by calling malloc.
++#
++# If you want an "altzone" variable (a la System V Release 3.1), add
++#	-DALTZONE
++# to the end of the "CFLAGS=" line.
++# This variable is not described in X3J11's work.
++#
++# NIST-PCTS:151-2, Version 1.4, (1993-12-03) is a test suite put
++# out by the National Institute of Standards and Technology
++# which claims to test C and Posix conformance.  If you want to pass PCTS, add
++#	-DPCTS
++# to the end of the "CFLAGS=" line.
++#
++# If you want strict compliance with XPG4 as of 1994-04-09, add
++#	-DXPG4_1994_04_09
++# to the end of the "CFLAGS=" line.  This causes "strftime" to always return
++# 53 as a week number (rather than 52 or 53) for those days in January that
++# before the first Monday in January when a "%V" format is used and January 1
++# falls on a Friday, Saturday, or Sunday.
++
++CFLAGS=
++
++# Linker flags.  Default to $(LFLAGS) for backwards compatibility
++# to release 2012h and earlier.
++
++LDFLAGS=	$(LFLAGS)
++
++# For leap seconds, this Makefile uses LEAPSECONDS='-L leapseconds' in
++# submake command lines.  The default is no leap seconds.
++
++LEAPSECONDS=
++
++# The zic command and its arguments.
++
++zic=		./zic
++ZIC=		$(zic) $(ZFLAGS)
++
++ZFLAGS=
++
++# How to use zic to install tz binary files.
++
++ZIC_INSTALL=	$(ZIC) -y $(YEARISTYPE) -d $(DESTDIR)$(TZDIR) $(LEAPSECONDS)
++
++# The name of a Posix-compliant 'awk' on your system.
++AWK=		awk
++
++# The full path name of a Posix-compliant shell, preferably one that supports
++# the Korn shell's 'select' statement as an extension.
++# These days, Bash is the most popular.
++# It should be OK to set this to /bin/sh, on platforms where /bin/sh
++# lacks 'select' or doesn't completely conform to Posix, but /bin/bash
++# is typically nicer if it works.
++KSHELL=		/bin/bash
++
++# The path where SGML DTDs are kept and the catalog file(s) to use when
++# validating.  The default should work on both Debian and Red Hat.
++SGML_TOPDIR= /usr
++SGML_DTDDIR= $(SGML_TOPDIR)/share/xml/w3c-sgml-lib/schema/dtd
++SGML_SEARCH_PATH= $(SGML_DTDDIR)/REC-html401-19991224
++SGML_CATALOG_FILES= \
++  $(SGML_TOPDIR)/share/doc/w3-recs/html/www.w3.org/TR/1999/REC-html401-19991224/HTML4.cat:$(SGML_TOPDIR)/share/sgml/html/4.01/HTML4.cat
++
++# The name, arguments and environment of a program to validate your web pages.
++# See <http://openjade.sourceforge.net/doc/> for a validator, and
++# <https://validator.w3.org/source/> for a validation library.
++VALIDATE = nsgmls
++VALIDATE_FLAGS = -s -B -wall -wno-unused-param
++VALIDATE_ENV = \
++  SGML_CATALOG_FILES=$(SGML_CATALOG_FILES) \
++  SGML_SEARCH_PATH=$(SGML_SEARCH_PATH) \
++  SP_CHARSET_FIXED=YES \
++  SP_ENCODING=UTF-8
++
++# This expensive test requires USE_LTZ.
++# To suppress it, define this macro to be empty.
++CHECK_TIME_T_ALTERNATIVES = check_time_t_alternatives
++
++# SAFE_CHAR is a regular expression that matches a safe character.
++# Some parts of this distribution are limited to safe characters;
++# others can use any UTF-8 character.
++# For now, the safe characters are a safe subset of ASCII.
++# The caller must set the shell variable 'sharp' to the character '#',
++# since Makefile macros cannot contain '#'.
++# TAB_CHAR is a single tab character, in single quotes.
++TAB_CHAR=	'	'
++SAFE_CHARSET1=	$(TAB_CHAR)' !\"'$$sharp'$$%&'\''()*+,./0123456789:;<=>?@'
++SAFE_CHARSET2=	'ABCDEFGHIJKLMNOPQRSTUVWXYZ[\\^_`'
++SAFE_CHARSET3=	'abcdefghijklmnopqrstuvwxyz{|}~'
++SAFE_CHARSET=	$(SAFE_CHARSET1)$(SAFE_CHARSET2)$(SAFE_CHARSET3)
++SAFE_CHAR=	'[]'$(SAFE_CHARSET)'-]'
++
++# OK_CHAR matches any character allowed in the distributed files.
++# This is the same as SAFE_CHAR, except that multibyte letters are
++# also allowed so that commentary can contain people's names and quote
++# non-English sources.  For non-letters the sources are limited to
++# ASCII renderings for the convenience of maintainers whose text editors
++# mishandle UTF-8 by default (e.g., XEmacs 21.4.22).
++OK_CHAR=	'[][:alpha:]'$(SAFE_CHARSET)'-]'
++
++# SAFE_LINE matches a line of safe characters.
++# SAFE_SHARP_LINE is similar, except any OK character can follow '#';
++# this is so that comments can contain non-ASCII characters.
++# OK_LINE matches a line of OK characters.
++SAFE_LINE=	'^'$(SAFE_CHAR)'*$$'
++SAFE_SHARP_LINE='^'$(SAFE_CHAR)'*('$$sharp$(OK_CHAR)'*)?$$'
++OK_LINE=	'^'$(OK_CHAR)'*$$'
++
++# Flags to give 'tar' when making a distribution.
++# Try to use flags appropriate for GNU tar.
++GNUTARFLAGS= --numeric-owner --owner=0 --group=0 --mode=go+u,go-w --sort=name
++TARFLAGS=	`if tar $(GNUTARFLAGS) --version >/dev/null 2>&1; \
++		 then echo $(GNUTARFLAGS); \
++		 else :; \
++		 fi`
++
++# Flags to give 'gzip' when making a distribution.
++GZIPFLAGS=	-9n
++
++###############################################################################
++
++#MAKE=		make
++
++cc=		cc
++CC=		$(cc) -DTZDIR=\"$(TZDIR)\"
++
++AR=		ar
++
++# ':' on typical hosts; 'ranlib' on the ancient hosts that still need ranlib.
++RANLIB=		:
++
++TZCOBJS=	zic.o
++TZDOBJS=	zdump.o localtime.o asctime.o
++DATEOBJS=	date.o localtime.o strftime.o asctime.o
++LIBSRCS=	localtime.c asctime.c difftime.c
++LIBOBJS=	localtime.o asctime.o difftime.o
++HEADERS=	tzfile.h private.h
++NONLIBSRCS=	zic.c zdump.c
++NEWUCBSRCS=	date.c strftime.c
++SOURCES=	$(HEADERS) $(LIBSRCS) $(NONLIBSRCS) $(NEWUCBSRCS) \
++			tzselect.ksh workman.sh
++MANS=		newctime.3 newstrftime.3 newtzset.3 time2posix.3 \
++			tzfile.5 tzselect.8 zic.8 zdump.8
++MANTXTS=	newctime.3.txt newstrftime.3.txt newtzset.3.txt \
++			time2posix.3.txt \
++			tzfile.5.txt tzselect.8.txt zic.8.txt zdump.8.txt \
++			date.1.txt
++COMMON=		CONTRIBUTING LICENSE Makefile NEWS README Theory version
++WEB_PAGES=	tz-art.htm tz-how-to.html tz-link.htm
++DOCS=		$(MANS) date.1 $(MANTXTS) $(WEB_PAGES)
++PRIMARY_YDATA=	africa antarctica asia australasia \
++		europe northamerica southamerica
++YDATA=		$(PRIMARY_YDATA) pacificnew etcetera backward
++NDATA=		systemv factory
++TDATA=		$(YDATA) $(NDATA)
++ZONETABLES=	zone1970.tab zone.tab
++TABDATA=	iso3166.tab leapseconds $(ZONETABLES)
++LEAP_DEPS=	leapseconds.awk leap-seconds.list
++DATA=		$(YDATA) $(NDATA) backzone $(TABDATA) \
++			leap-seconds.list yearistype.sh
++AWK_SCRIPTS=	checklinks.awk checktab.awk leapseconds.awk
++MISC=		$(AWK_SCRIPTS) zoneinfo2tdf.pl
++TZS_YEAR=	2050
++TZS=		to$(TZS_YEAR).tzs
++TZS_NEW=	to$(TZS_YEAR)new.tzs
++TZS_DEPS=	$(PRIMARY_YDATA) asctime.c localtime.c \
++			private.h tzfile.h zdump.c zic.c
++ENCHILADA=	$(COMMON) $(DOCS) $(SOURCES) $(DATA) $(MISC) $(TZS)
++
++# Consult these files when deciding whether to rebuild the 'version' file.
++# This list is not the same as the output of 'git ls-files', since
++# .gitignore is not distributed.
++VERSION_DEPS= \
++		CONTRIBUTING LICENSE Makefile NEWS README Theory \
++		africa antarctica asctime.c asia australasia \
++		backward backzone \
++		checklinks.awk checktab.awk \
++		date.1 date.c difftime.c \
++		etcetera europe factory iso3166.tab \
++		leap-seconds.list leapseconds.awk localtime.c \
++		newctime.3 newstrftime.3 newtzset.3 northamerica \
++		pacificnew private.h \
++		southamerica strftime.c systemv \
++		time2posix.3 tz-art.htm tz-how-to.html tz-link.htm \
++		tzfile.5 tzfile.h tzselect.8 tzselect.ksh \
++		workman.sh yearistype.sh \
++		zdump.8 zdump.c zic.8 zic.c \
++		zone.tab zone1970.tab zoneinfo2tdf.pl
++
++# And for the benefit of csh users on systems that assume the user
++# shell should be used to handle commands in Makefiles. . .
++
++SHELL=		/bin/sh
++
++all:		tzselect yearistype zic zdump libtz.a $(TABDATA)
++
++ALL:		all date $(ENCHILADA)
++
++install:	all $(DATA) $(REDO) $(MANS)
++		mkdir -p $(DESTDIR)$(ETCDIR) $(DESTDIR)$(TZDIR) \
++			$(DESTDIR)$(LIBDIR) \
++			$(DESTDIR)$(MANDIR)/man3 $(DESTDIR)$(MANDIR)/man5 \
++			$(DESTDIR)$(MANDIR)/man8
++		$(ZIC_INSTALL) -l $(LOCALTIME) -p $(POSIXRULES)
++		cp -f iso3166.tab $(ZONETABLES) $(DESTDIR)$(TZDIR)/.
++		cp tzselect zic zdump $(DESTDIR)$(ETCDIR)/.
++		cp libtz.a $(DESTDIR)$(LIBDIR)/.
++		$(RANLIB) $(DESTDIR)$(LIBDIR)/libtz.a
++		cp -f newctime.3 newtzset.3 $(DESTDIR)$(MANDIR)/man3/.
++		cp -f tzfile.5 $(DESTDIR)$(MANDIR)/man5/.
++		cp -f tzselect.8 zdump.8 zic.8 $(DESTDIR)$(MANDIR)/man8/.
++
++INSTALL:	ALL install date.1
++		mkdir -p $(DESTDIR)$(BINDIR) $(DESTDIR)$(MANDIR)/man1
++		cp date $(DESTDIR)$(BINDIR)/.
++		cp -f date.1 $(DESTDIR)$(MANDIR)/man1/.
++
++version:	$(VERSION_DEPS)
++		{ (type git) >/dev/null 2>&1 && \
++		  V=`git describe --match '[0-9][0-9][0-9][0-9][a-z]*' \
++				--abbrev=7 --dirty` || \
++		  V=$(VERSION); } && \
++		printf '%s\n' "$$V" >$@.out
++		mv $@.out $@
++
++version.h:	version
++		VERSION=`cat version` && printf '%s\n' \
++		  'static char const PKGVERSION[]="($(PACKAGE)) ";' \
++		  "static char const TZVERSION[]=\"$$VERSION\";" \
++		  'static char const REPORT_BUGS_TO[]="$(BUGEMAIL)";' \
++		  >$@.out
++		mv $@.out $@
++
++zdump:		$(TZDOBJS)
++		$(CC) -o $@ $(CFLAGS) $(LDFLAGS) $(TZDOBJS) $(LDLIBS)
++
++zic:		$(TZCOBJS)
++		$(CC) -o $@ $(CFLAGS) $(LDFLAGS) $(TZCOBJS) $(LDLIBS)
++
++yearistype:	yearistype.sh
++		cp yearistype.sh yearistype
++		chmod +x yearistype
++
++leapseconds:	$(LEAP_DEPS)
++		$(AWK) -f leapseconds.awk leap-seconds.list >$@.out
++		mv $@.out $@
++
++# Arguments to pass to submakes of install_data.
++# They can be overridden by later submake arguments.
++INSTALLARGS = \
++ DESTDIR=$(DESTDIR) \
++ LEAPSECONDS='$(LEAPSECONDS)' \
++ PACKRATDATA='$(PACKRATDATA)' \
++ TZDIR=$(TZDIR) \
++ YEARISTYPE=$(YEARISTYPE) \
++ ZIC='$(ZIC)'
++
++# 'make install_data' installs one set of tz binary files.
++# It can be tailored by setting LEAPSECONDS, PACKRATDATA, etc.
++install_data:	zic leapseconds yearistype $(PACKRATDATA) $(TDATA)
++		$(ZIC_INSTALL) $(TDATA)
++		$(AWK) '/^Rule/' $(TDATA) | $(ZIC_INSTALL) - $(PACKRATDATA)
++
++posix_only:
++		$(MAKE) $(INSTALLARGS) LEAPSECONDS= install_data
++
++right_only:
++		$(MAKE) $(INSTALLARGS) LEAPSECONDS='-L leapseconds' \
++			install_data
++
++# In earlier versions of this makefile, the other two directories were
++# subdirectories of $(TZDIR).  However, this led to configuration errors.
++# For example, with posix_right under the earlier scheme,
++# TZ='right/Australia/Adelaide' got you localtime with leap seconds,
++# but gmtime without leap seconds, which led to problems with applications
++# like sendmail that subtract gmtime from localtime.
++# Therefore, the other two directories are now siblings of $(TZDIR).
++# You must replace all of $(TZDIR) to switch from not using leap seconds
++# to using them, or vice versa.
++right_posix:	right_only
++		rm -fr $(DESTDIR)$(TZDIR)-leaps
++		ln -s $(TZDIR_BASENAME) $(DESTDIR)$(TZDIR)-leaps || \
++		  $(MAKE) $(INSTALLARGS) TZDIR=$(TZDIR)-leaps right_only
++		$(MAKE) $(INSTALLARGS) TZDIR=$(TZDIR)-posix posix_only
++
++posix_right:	posix_only
++		rm -fr $(DESTDIR)$(TZDIR)-posix
++		ln -s $(TZDIR_BASENAME) $(DESTDIR)$(TZDIR)-posix || \
++		  $(MAKE) $(INSTALLARGS) TZDIR=$(TZDIR)-posix posix_only
++		$(MAKE) $(INSTALLARGS) TZDIR=$(TZDIR)-leaps right_only
++
++# This obsolescent rule is present for backwards compatibility with
++# tz releases 2014g through 2015g.  It should go away eventually.
++posix_packrat:
++		$(MAKE) $(INSTALLARGS) PACKRATDATA=backzone posix_only
++
++zones:		$(REDO)
++
++$(TZS_NEW):	$(TDATA) zdump zic
++		mkdir -p tzs.dir
++		$(zic) -d tzs.dir $(TDATA)
++		$(AWK) '/^Link/{print $$1 "\t" $$2 "\t" $$3}' \
++		   $(TDATA) | LC_ALL=C sort >$@.out
++		wd=`pwd` && \
++		zones=`$(AWK) -v wd="$$wd" \
++				'/^Zone/{print wd "/tzs.dir/" $$2}' $(TDATA) \
++			 | LC_ALL=C sort` && \
++		./zdump -i -c $(TZS_YEAR) $$zones >>$@.out
++		sed 's,^TZ=".*tzs\.dir/,TZ=",' $@.out >$@.sed.out
++		rm -fr tzs.dir $@.out
++		mv $@.sed.out $@
++
++# If $(TZS) does not already exist (e.g., old-format tarballs), create it.
++# If it exists but 'make check_tzs' fails, a maintainer should inspect the
++# failed output and fix the inconsistency, perhaps by running 'make force_tzs'.
++$(TZS):
++		$(MAKE) force_tzs
++
++force_tzs:	$(TZS_NEW)
++		cp $(TZS_NEW) $(TZS)
++
++libtz.a:	$(LIBOBJS)
++		$(AR) ru $@ $(LIBOBJS)
++		$(RANLIB) $@
++
++date:		$(DATEOBJS)
++		$(CC) -o $@ $(CFLAGS) $(LDFLAGS) $(DATEOBJS) $(LDLIBS)
++
++tzselect:	tzselect.ksh version
++		VERSION=`cat version` && sed \
++			-e 's|#!/bin/bash|#!$(KSHELL)|g' \
++			-e 's|AWK=[^}]*|AWK=$(AWK)|g' \
++			-e 's|\(PKGVERSION\)=.*|\1='\''($(PACKAGE)) '\''|' \
++			-e 's|\(REPORT_BUGS_TO\)=.*|\1=$(BUGEMAIL)|' \
++			-e 's|TZDIR=[^}]*|TZDIR=$(TZDIR)|' \
++			-e 's|\(TZVERSION\)=.*|\1='"$$VERSION"'|' \
++			<$@.ksh >$@.out
++		chmod +x $@.out
++		mv $@.out $@
++
++check:		check_character_set check_white_space check_links check_sorted \
++		  check_tables check_tzs check_web
++
++check_character_set: $(ENCHILADA)
++		LC_ALL=en_US.utf8 && export LC_ALL && \
++		sharp='#' && \
++		! grep -Env $(SAFE_LINE) $(MANS) date.1 $(MANTXTS) \
++			$(MISC) $(SOURCES) $(WEB_PAGES) \
++			CONTRIBUTING LICENSE Makefile README version && \
++		! grep -Env $(SAFE_SHARP_LINE) $(TDATA) backzone \
++			leapseconds yearistype.sh zone.tab && \
++		! grep -Env $(OK_LINE) $(ENCHILADA)
++
++check_white_space: $(ENCHILADA)
++		patfmt=' \t|[\f\r\v]' && pat=`printf "$$patfmt\\n"` && \
++		! grep -En "$$pat" $(ENCHILADA)
++		! grep -n '[[:space:]]$$' $(ENCHILADA)
++
++CHECK_CC_LIST = { n = split($$1,a,/,/); for (i=2; i<=n; i++) print a[1], a[i]; }
++
++check_sorted: backward backzone iso3166.tab zone.tab zone1970.tab
++		$(AWK) '/^Link/ {print $$3}' backward | LC_ALL=C sort -cu
++		$(AWK) '/^Zone/ {print $$2}' backzone | LC_ALL=C sort -cu
++		$(AWK) '/^[^#]/ {print $$1}' iso3166.tab | LC_ALL=C sort -cu
++		$(AWK) '/^[^#]/ {print $$1}' zone.tab | LC_ALL=C sort -c
++		$(AWK) '/^[^#]/ {print substr($$0, 1, 2)}' zone1970.tab | \
++		  LC_ALL=C sort -c
++		$(AWK) '/^[^#]/ $(CHECK_CC_LIST)' zone1970.tab | \
++		  LC_ALL=C sort -cu
++
++check_links:	checklinks.awk $(TDATA)
++		$(AWK) -f checklinks.awk $(TDATA)
++
++check_tables:	checktab.awk $(PRIMARY_YDATA) $(ZONETABLES)
++		for tab in $(ZONETABLES); do \
++		  $(AWK) -f checktab.awk -v zone_table=$$tab $(PRIMARY_YDATA) \
++		    || exit; \
++		done
++
++check_tzs:	$(TZS) $(TZS_NEW)
++		diff -u $(TZS) $(TZS_NEW)
++
++check_web:	$(WEB_PAGES)
++		$(VALIDATE_ENV) $(VALIDATE) $(VALIDATE_FLAGS) $(WEB_PAGES)
++
++clean_misc:
++		rm -f core *.o *.out \
++		  date tzselect version.h zdump zic yearistype libtz.a
++clean:		clean_misc
++		rm -fr *.dir tzdb-*/ $(TZS_NEW)
++
++maintainer-clean: clean
++		@echo 'This command is intended for maintainers to use; it'
++		@echo 'deletes files that may need special tools to rebuild.'
++		rm -f leapseconds version $(MANTXTS) $(TZS) *.asc *.tar.*
++
++names:
++		@echo $(ENCHILADA)
++
++public:		check check_public $(CHECK_TIME_T_ALTERNATIVES) \
++		tarballs signatures
++
++date.1.txt:	date.1
++newctime.3.txt:	newctime.3
++newstrftime.3.txt: newstrftime.3
++newtzset.3.txt:	newtzset.3
++time2posix.3.txt: time2posix.3
++tzfile.5.txt:	tzfile.5
++tzselect.8.txt:	tzselect.8
++zdump.8.txt:	zdump.8
++zic.8.txt:	zic.8
++
++$(MANTXTS):	workman.sh
++		LC_ALL=C sh workman.sh `expr $@ : '\(.*\)\.txt$$'` >$@.out
++		mv $@.out $@
++
++# Set the time stamps to those of the git repository, if available,
++# and if the files have not changed since then.
++# This uses GNU 'touch' syntax 'touch -d@N FILE',
++# where N is the number of seconds since 1970.
++# If git or GNU 'touch' is absent, don't bother to sync with git timestamps.
++# Also, set the timestamp of each prebuilt file like 'leapseconds'
++# to be the maximum of the files it depends on.
++set-timestamps.out: $(ENCHILADA)
++		rm -f $@
++		if (type git) >/dev/null 2>&1 && \
++		   files=`git ls-files $(ENCHILADA)` && \
++		   touch -md @1 test.out; then \
++		  rm -f test.out && \
++		  for file in $$files; do \
++		    if git diff --quiet $$file; then \
++		      time=`git log -1 --format='tformat:%ct' $$file` && \
++		      touch -cmd @$$time $$file; \
++		    else \
++		      echo >&2 "$$file: warning: does not match repository"; \
++		    fi || exit; \
++		  done; \
++		fi
++		touch -cmr `ls -t $(LEAP_DEPS) | sed 1q` leapseconds
++		for file in `ls $(MANTXTS) | sed 's/\.txt$$//'`; do \
++		  touch -cmr `ls -t $$file workman.sh | sed 1q` $$file.txt || \
++		    exit; \
++		done
++		touch -cmr `ls -t $(TZS_DEPS) | sed 1q` $(TZS)
++		touch -cmr `ls -t $(VERSION_DEPS) | sed 1q` version
++		touch $@
++
++# The zics below ensure that each data file can stand on its own.
++# We also do an all-files run to catch links to links.
++
++check_public:
++		$(MAKE) maintainer-clean
++		$(MAKE) "CFLAGS=$(GCC_DEBUG_FLAGS)" ALL
++		mkdir -p public.dir
++		for i in $(TDATA) ; do \
++		  $(zic) -v -d public.dir $$i 2>&1 || exit; \
++		done
++		$(zic) -v -d public.dir $(TDATA)
++		rm -fr public.dir
++
++# Check that the code works under various alternative
++# implementations of time_t.
++check_time_t_alternatives:
++		if diff -q Makefile Makefile 2>/dev/null; then \
++		  quiet_option='-q'; \
++		else \
++		  quiet_option=''; \
++		fi && \
++		wd=`pwd` && \
++		zones=`$(AWK) '/^[^#]/ { print $$3 }' <zone1970.tab` && \
++		for type in $(TIME_T_ALTERNATIVES); do \
++		  mkdir -p time_t.dir/$$type && \
++		  $(MAKE) clean_misc && \
++		  $(MAKE) TOPDIR="$$wd/time_t.dir/$$type" \
++		    CFLAGS='$(CFLAGS) -Dtime_tz='"'$$type'" \
++		    REDO='$(REDO)' \
++		    install && \
++		  diff $$quiet_option -r \
++		    time_t.dir/int64_t/etc/zoneinfo \
++		    time_t.dir/$$type/etc/zoneinfo && \
++		  case $$type in \
++		  int32_t) range=-2147483648,2147483647;; \
++		  uint32_t) range=0,4294967296;; \
++		  int64_t) continue;; \
++		  *u*) range=0,10000000000;; \
++		  *) range=-10000000000,10000000000;; \
++		  esac && \
++		  echo checking $$type zones ... && \
++		  time_t.dir/int64_t/etc/zdump -V -t $$range $$zones \
++		      >time_t.dir/int64_t.out && \
++		  time_t.dir/$$type/etc/zdump -V -t $$range $$zones \
++		      >time_t.dir/$$type.out && \
++		  diff -u time_t.dir/int64_t.out time_t.dir/$$type.out \
++		    || exit; \
++		done
++		rm -fr time_t.dir
++
++tarballs traditional_tarballs signatures traditional_signatures: version
++		VERSION=`cat version` && \
++		$(MAKE) VERSION="$$VERSION" $@_version
++
++tarballs_version: traditional_tarballs_version tzdb-$(VERSION).tar.lz
++traditional_tarballs_version: \
++  tzcode$(VERSION).tar.gz tzdata$(VERSION).tar.gz
++signatures_version: traditional_signatures_version tzdb-$(VERSION).tar.lz.asc
++traditional_signatures_version: \
++  tzcode$(VERSION).tar.gz.asc tzdata$(VERSION).tar.gz.asc \
++
++tzcode$(VERSION).tar.gz: set-timestamps.out
++		LC_ALL=C && export LC_ALL && \
++		tar $(TARFLAGS) -cf - \
++		    $(COMMON) $(DOCS) $(SOURCES) | \
++		  gzip $(GZIPFLAGS) >$@.out
++		mv $@.out $@
++
++tzdata$(VERSION).tar.gz: set-timestamps.out
++		LC_ALL=C && export LC_ALL && \
++		tar $(TARFLAGS) -cf - $(COMMON) $(DATA) $(MISC) | \
++		  gzip $(GZIPFLAGS) >$@.out
++		mv $@.out $@
++
++tzdb-$(VERSION).tar.lz: set-timestamps.out
++		rm -fr tzdb-$(VERSION)
++		mkdir tzdb-$(VERSION)
++		ln $(ENCHILADA) tzdb-$(VERSION)
++		touch -cmr `ls -t tzdb-$(VERSION)/* | sed 1q` tzdb-$(VERSION)
++		LC_ALL=C && export LC_ALL && \
++		tar $(TARFLAGS) -cf - tzdb-$(VERSION) | lzip -9 >$@.out
++		mv $@.out $@
++
++tzcode$(VERSION).tar.gz.asc: tzcode$(VERSION).tar.gz
++		gpg --armor --detach-sign $?
++
++tzdata$(VERSION).tar.gz.asc: tzdata$(VERSION).tar.gz
++		gpg --armor --detach-sign $?
++
++tzdb-$(VERSION).tar.lz.asc: tzdb-$(VERSION).tar.lz
++		gpg --armor --detach-sign $?
++
++typecheck:
++		$(MAKE) clean
++		for i in "long long" unsigned; \
++		do \
++			$(MAKE) CFLAGS="-DTYPECHECK -D__time_t_defined -D_TIME_T \"-Dtime_t=$$i\"" ; \
++			./zdump -v Europe/Rome ; \
++			$(MAKE) clean ; \
++		done
++
++zonenames:	$(TDATA)
++		@$(AWK) '/^Zone/ { print $$2 } /^Link/ { print $$3 }' $(TDATA)
++
++asctime.o:	private.h tzfile.h
++date.o:		private.h
++difftime.o:	private.h
++localtime.o:	private.h tzfile.h
++strftime.o:	private.h tzfile.h
++zdump.o:	version.h
++zic.o:		private.h tzfile.h version.h
++
++.KEEP_STATE:
++
++.PHONY: ALL INSTALL all
++.PHONY: check check_character_set check_links
++.PHONY: check_public check_sorted check_tables
++.PHONY: check_time_t_alternatives check_tzs check_web check_white_space
++.PHONY: clean clean_misc force_tzs
++.PHONY: install install_data maintainer-clean names
++.PHONY: posix_only posix_packrat posix_right
++.PHONY: public right_only right_posix signatures signatures_version
++.PHONY: tarballs tarballs_version typecheck
++.PHONY: zonenames zones
++native
+\ No newline at end of property
++FreeBSD=%H
+\ No newline at end of property
++text/plain
+\ No newline at end of property
+--- contrib/tzdata/NEWS.orig
++++ contrib/tzdata/NEWS
+@@ -0,0 +1,3782 @@
++News for the tz database
++
++Release 2016i - 2016-11-01 23:19:52 -0700
++
++  Briefly: Cyprus split into two time zones on 2016-10-30, and Tonga
++  reintroduces DST on 2016-11-06.
++
++  Changes to future time stamps
++
++    Pacific/Tongatapu begins DST on 2016-11-06 at 02:00, ending on
++    2017-01-15 at 03:00.  Assume future observances in Tonga will be
++    from the first Sunday in November through the third Sunday in
++    January, like Fiji.  (Thanks to Pulu ʻAnau.)  Switch to numeric
++    time zone abbreviations for this zone.
++
++  Changes to past and future time stamps
++
++    Northern Cyprus is now +03 year round, causing a split in Cyprus
++    time zones starting 2016-10-30 at 04:00.  This creates a zone
++    Asia/Famagusta.  (Thanks to Even Scharning and Matt Johnson.)
++
++    Antarctica/Casey switched from +08 to +11 on 2016-10-22.
++    (Thanks to Steffen Thorsen.)
++
++  Changes to past time stamps
++
++    Several corrections were made for pre-1975 time stamps in Italy.
++    These affect Europe/Malta, Europe/Rome, Europe/San_Marino, and
++    Europe/Vatican.
++
++    First, the 1893-11-01 00:00 transition in Italy used the new UT
++    offset (+01), not the old (+00:49:56).  (Thanks to Michael
++    Deckers.)
++
++    Second, rules for daylight saving in Italy were changed to agree
++    with Italy's National Institute of Metrological Research (INRiM)
++    except for 1944, as follows (thanks to Pierpaolo Bernardi, Brian
++    Inglis, and Michael Deckers):
++
++      The 1916-06-03 transition was at 24:00, not 00:00.
++
++      The 1916-10-01, 1919-10-05, and 1920-09-19 transitions were at
++      00:00, not 01:00.
++
++      The 1917-09-30 and 1918-10-06 transitions were at 24:00, not
++      01:00.
++
++      The 1944-09-17 transition was at 03:00, not 01:00.  This
++      particular change is taken from Italian law as INRiM's table,
++      (which says 02:00) appears to have a typo here.  Also, keep the
++      1944-04-03 transition for Europe/Rome, as Rome was controlled by
++      Germany then.
++
++      The 1967-1970 and 1972-1974 fallback transitions were at 01:00,
++      not 00:00.
++
++  Changes to code
++
++    The code should now be buildable on AmigaOS merely by setting the
++    appropriate Makefile variables.  (From a patch by Carsten Larsen.)
++
++
++Release 2016h - 2016-10-19 23:17:57 -0700
++
++  Changes to future time stamps
++
++    Asia/Gaza and Asia/Hebron end DST on 2016-10-29 at 01:00, not
++    2016-10-21 at 00:00.  (Thanks to Sharef Mustafa.)  Predict that
++    future fall transitions will be on the last Saturday of October
++    at 01:00, which is consistent with predicted spring transitions
++    on the last Saturday of March.  (Thanks to Tim Parenti.)
++
++  Changes to past time stamps
++
++    In Turkey, transitions in 1986-1990 were at 01:00 standard time
++    not at 02:00, and the spring 1994 transition was on March 20, not
++    March 27.  (Thanks to Kıvanç Yazan.)
++
++  Changes to past and future time zone abbreviations
++
++    Asia/Colombo now uses numeric time zone abbreviations like "+0530"
++    instead of alphabetic ones like "IST" and "LKT".  Various
++    English-language sources use "IST", "LKT" and "SLST", with no
++    working consensus.  (Usage of "SLST" mentioned by Sadika
++    Sumanapala.)
++
++  Changes to code
++
++    zic no longer mishandles relativizing file names when creating
++    symbolic links like /etc/localtime, when these symbolic links
++    are outside the usual directory hierarchy.  This fixes a bug
++    introduced in 2016g.  (Problem reported by Andreas Stieger.)
++
++  Changes to build procedure
++
++    New rules 'traditional_tarballs' and 'traditional_signatures' for
++    building just the traditional-format distribution.  (Requested by
++    Deborah Goldsmith.)
++
++    The file 'version' is now put into the tzdata tarball too.
++    (Requested by Howard Hinnant.)
++
++  Changes to documentation and commentary
++
++    The 'Theory' file now has a section on interface stability.
++    (Requested by Paul Koning.)  It also mentions features like
++    tm_zone and localtime_rz that have long been supported by the
++    reference code.
++
++    tz-link.htm has improved coverage of time zone boundaries suitable
++    for geolocation.  (Thanks to heads-ups from Evan Siroky and Matt
++    Johnson.)
++
++    The US commentary now mentions Allen and the "day of two noons".
++
++    The Fiji commentary mentions the government's 2016-10-03 press
++    release.  (Thanks to Raymond Kumar.)
++
++
++Release 2016g - 2016-09-13 08:56:38 -0700
++
++  Changes to future time stamps
++
++    Turkey switched from EET/EEST (+02/+03) to permanent +03,
++    effective 2016-09-07.  (Thanks to Burak AYDIN.)  Use "+03" rather
++    than an invented abbreviation for the new time.
++
++    New leap second 2016-12-31 23:59:60 UTC as per IERS Bulletin C 52.
++    (Thanks to Tim Parenti.)
++
++  Changes to past time stamps
++
++    For America/Los_Angeles, spring-forward transition times have been
++    corrected from 02:00 to 02:01 in 1948, and from 02:00 to 01:00 in
++    1950-1966.
++
++    For zones using Soviet time on 1919-07-01, transitions to UT-based
++    time were at 00:00 UT, not at 02:00 local time.  The affected
++    zones are Europe/Kirov, Europe/Moscow, Europe/Samara, and
++    Europe/Ulyanovsk.  (Thanks to Alexander Belopolsky.)
++
++  Changes to past and future time zone abbreviations
++
++    The Factory zone now uses the time zone abbreviation -00 instead
++    of a long English-language string, as -00 is now the normal way to
++    represent an undefined time zone.
++
++    Several zones in Antarctica and the former Soviet Union, along
++    with zones intended for ships at sea that cannot use POSIX TZ
++    strings, now use numeric time zone abbreviations instead of
++    invented or obsolete alphanumeric abbreviations.  The affected
++    zones are Antarctica/Casey, Antarctica/Davis,
++    Antarctica/DumontDUrville, Antarctica/Mawson, Antarctica/Rothera,
++    Antarctica/Syowa, Antarctica/Troll, Antarctica/Vostok,
++    Asia/Anadyr, Asia/Ashgabat, Asia/Baku, Asia/Bishkek, Asia/Chita,
++    Asia/Dushanbe, Asia/Irkutsk, Asia/Kamchatka, Asia/Khandyga,
++    Asia/Krasnoyarsk, Asia/Magadan, Asia/Omsk, Asia/Sakhalin,
++    Asia/Samarkand, Asia/Srednekolymsk, Asia/Tashkent, Asia/Tbilisi,
++    Asia/Ust-Nera, Asia/Vladivostok, Asia/Yakutsk, Asia/Yekaterinburg,
++    Asia/Yerevan, Etc/GMT-14, Etc/GMT-13, Etc/GMT-12, Etc/GMT-11,
++    Etc/GMT-10, Etc/GMT-9, Etc/GMT-8, Etc/GMT-7, Etc/GMT-6, Etc/GMT-5,
++    Etc/GMT-4, Etc/GMT-3, Etc/GMT-2, Etc/GMT-1, Etc/GMT+1, Etc/GMT+2,
++    Etc/GMT+3, Etc/GMT+4, Etc/GMT+5, Etc/GMT+6, Etc/GMT+7, Etc/GMT+8,
++    Etc/GMT+9, Etc/GMT+10, Etc/GMT+11, Etc/GMT+12, Europe/Kaliningrad,
++    Europe/Minsk, Europe/Samara, Europe/Volgograd, and
++    Indian/Kerguelen.  For Europe/Moscow the invented abbreviation MSM
++    was replaced by +05, whereas MSK and MSD were kept as they are not
++    our invention and are widely used.
++
++  Changes to zone names
++
++    Rename Asia/Rangoon to Asia/Yangon, with a backward compatibility link.
++    (Thanks to David Massoud.)
++
++  Changes to code
++
++    zic no longer generates binary files containing POSIX TZ-like
++    strings that disagree with the local time type after the last
++    explicit transition in the data.  This fixes a bug with
++    Africa/Casablanca and Africa/El_Aaiun in some year-2037 time
++    stamps on the reference platform.  (Thanks to Alexander Belopolsky
++    for reporting the bug and suggesting a way forward.)
++
++    If the installed localtime and/or posixrules files are symbolic
++    links, zic now keeps them symbolic links when updating them, for
++    compatibility with platforms like OpenSUSE where other programs
++    configure these files as symlinks.
++
++    zic now avoids hard linking to symbolic links, avoids some
++    unnecessary mkdir and stat system calls, and uses shorter file
++    names internally.
++
++    zdump has a new -i option to generate transitions in a
++    more-compact but still human-readable format.  This option is
++    experimental, and the output format may change in future versions.
++    (Thanks to Jon Skeet for suggesting that an option was needed,
++    and thanks to Tim Parenti and Chris Rovick for further comments.)
++
++  Changes to build procedure
++
++    An experimental distribution format is available, in addition
++    to the traditional format which will continue to be distributed.
++    The new format is a tarball tzdb-VERSION.tar.lz with signature
++    file tzdb-VERSION.tar.lz.asc.  It unpacks to a top-level directory
++    tzdb-VERSION containing the code and data of the traditional
++    two-tarball format, along with extra data that may be useful.
++    (Thanks to Antonio Diaz Diaz, Oscar van Vlijmen, and many others
++    for comments about the experimental format.)
++
++    The release version number is now more accurate in the usual case
++    where releases are built from a Git repository.  For example, if
++    23 commits and some working-file changes have been made since
++    release 2016g, the version number is now something like
++    '2016g-23-g50556e3-dirty' instead of the misleading '2016g'.
++    Official releases uses the same version number format as before,
++    e.g., '2016g'.  To support the more-accurate version number, its
++    specification has moved from a line in the Makefile to a new
++    source file 'version'.
++
++    The experimental distribution contains a file to2050.tzs that
++    contains what should be the output of 'zdump -i -c 2050' on
++    primary zones.  If this file is available, 'make check' now checks
++    that zdump generates this output.
++
++    'make check_web' now works on Fedora-like distributions.
++
++  Changes to documentation and commentary
++
++    tzfile.5 now documents the new restriction on POSIX TZ-like
++    strings that is now implemented by zic.
++
++    Comments now cite URLs for some 1917-1921 Russian DST decrees.
++    (Thanks to Alexander Belopolsky.)
++
++    tz-link.htm mentions JuliaTime (thanks to Curtis Vogt) and Time4J
++    (thanks to Meno Hochschild) and ThreeTen-Extra, and its
++    description of Java 8 has been brought up to date (thanks to
++    Stephen Colebourne).  Its description of local time on Mars has
++    been updated to match current practice, and URLs have been updated
++    and some obsolete ones removed.
++
++
++Release 2016f - 2016-07-05 16:26:51 +0200
++
++  Changes affecting future time stamps
++
++    The Egyptian government changed its mind on short notice, and
++    Africa/Cairo will not introduce DST starting 2016-07-07 after all.
++    (Thanks to Mina Samuel.)
++
++    Asia/Novosibirsk switches from +06 to +07 on 2016-07-24 at 02:00.
++    (Thanks to Stepan Golosunov.)
++
++  Changes to past and future time stamps
++
++    Asia/Novokuznetsk and Asia/Novosibirsk now use numeric time zone
++    abbreviations instead of invented ones.
++
++  Changes affecting past time stamps
++
++    Europe/Minsk's 1992-03-29 spring-forward transition was at 02:00 not 00:00.
++    (Thanks to Stepan Golosunov.)
++
++
++Release 2016e - 2016-06-14 08:46:16 -0700
++
++  Changes affecting future time stamps
++
++    Africa/Cairo observes DST in 2016 from July 7 to the end of October.
++    Guess October 27 and 24:00 transitions.  (Thanks to Steffen Thorsen.)
++    For future years, guess April's last Thursday to October's last
++    Thursday except for Ramadan.
++
++  Changes affecting past time stamps
++
++    Locations while uninhabited now use '-00', not 'zzz', as a
++    placeholder time zone abbreviation.  This is inspired by Internet
++    RFC 3339 and is more consistent with numeric time zone
++    abbreviations already used elsewhere.  The change affects several
++    arctic and antarctic locations, e.g., America/Cambridge_Bay before
++    1920 and Antarctica/Troll before 2005.
++
++    Asia/Baku's 1992-09-27 transition from +04 (DST) to +04 (non-DST) was
++    at 03:00, not 23:00 the previous day.  (Thanks to Michael Deckers.)
++
++  Changes to code
++
++    zic now outputs a dummy transition at time 2**31 - 1 in zones
++    whose POSIX-style TZ strings contain a '<'.  This mostly works
++    around Qt bug 53071 <https://bugreports.qt.io/browse/QTBUG-53071>.
++    (Thanks to Zhanibek Adilbekov for reporting the Qt bug.)
++
++  Changes affecting documentation and commentary
++
++    tz-link.htm says why governments should give plenty of notice for
++    time zone or DST changes, and refers to Matt Johnson's blog post.
++
++    tz-link.htm mentions Tzdata for Elixir.  (Thanks to Matt Johnson.)
++
++
++Release 2016d - 2016-04-17 22:50:29 -0700
++
++  Changes affecting future time stamps
++
++    America/Caracas switches from -0430 to -04 on 2016-05-01 at 02:30.
++    (Thanks to Alexander Krivenyshev for the heads-up.)
++
++    Asia/Magadan switches from +10 to +11 on 2016-04-24 at 02:00.
++    (Thanks to Alexander Krivenyshev and Matt Johnson.)
++
++    New zone Asia/Tomsk, split off from Asia/Novosibirsk.  It covers
++    Tomsk Oblast, Russia, which switches from +06 to +07 on 2016-05-29
++    at 02:00.  (Thanks to Stepan Golosunov.)
++
++  Changes affecting past time stamps
++
++    New zone Europe/Kirov, split off from Europe/Volgograd.  It covers
++    Kirov Oblast, Russia, which switched from +04/+05 to +03/+04 on
++    1989-03-26 at 02:00, roughly a year after Europe/Volgograd made
++    the same change.  (Thanks to Stepan Golosunov.)
++
++    Russia and nearby locations had daylight-saving transitions on
++    1992-03-29 at 02:00 and 1992-09-27 at 03:00, instead of on
++    1992-03-28 at 23:00 and 1992-09-26 at 23:00.  (Thanks to Stepan
++    Golosunov.)
++
++    Many corrections to historical time in Kazakhstan from 1991
++    through 2005.  (Thanks to Stepan Golosunov.)  Replace Kazakhstan's
++    invented time zone abbreviations with numeric abbreviations.
++
++  Changes to commentary
++
++    Mention Internet RFCs 7808 (TZDIST) and 7809 (CalDAV time zone references).
++
++
++Release 2016c - 2016-03-23 00:51:27 -0700
++
++  Changes affecting future time stamps
++
++    Azerbaijan no longer observes DST.  (Thanks to Steffen Thorsen.)
++
++    Chile reverts from permanent to seasonal DST.  (Thanks to Juan
++    Correa for the heads-up, and to Tim Parenti for corrections.)
++    Guess that future transitions are August's and May's second
++    Saturdays at 24:00 mainland time.  Also, call the period from
++    2014-09-07 through 2016-05-14 daylight saving time instead of
++    standard time, as that seems more appropriate now.
++
++  Changes affecting past time stamps
++
++    Europe/Kaliningrad and Europe/Vilnius changed from +03/+04 to
++    +02/+03 on 1989-03-26, not 1991-03-31.  Europe/Volgograd changed
++    from +04/+05 to +03/+04 on 1988-03-27, not 1989-03-26.
++    (Thanks to Stepan Golosunov.)
++
++  Changes to commentary
++
++    Several updates and URLs for historical and proposed Russian changes.
++    (Thanks to Stepan Golosunov, Matt Johnson, and Alexander Krivenyshev.)
++
++
++Release 2016b - 2016-03-12 17:30:14 -0800
++
++  Compatibility note
++
++    Starting with release 2016b, some data entries cause zic implementations
++    derived from tz releases 2005j through 2015e to issue warnings like
++    "time zone abbreviation differs from POSIX standard (+03)".
++    These warnings should not otherwise affect zic's output and can safely be
++    ignored on today's platforms, as the warnings refer to a restriction in
++    POSIX.1-1988 that was removed in POSIX.1-2001.  One way to suppress the
++    warnings is to upgrade to zic derived from tz releases 2015f and later.
++
++  Changes affecting future time stamps
++
++    New zones Europe/Astrakhan and Europe/Ulyanovsk for Astrakhan and
++    Ulyanovsk Oblasts, Russia, both of which will switch from +03 to +04 on
++    2016-03-27 at 02:00 local time.  They need distinct zones since their
++    post-1970 histories disagree.  New zone Asia/Barnaul for Altai Krai and
++    Altai Republic, Russia, which will switch from +06 to +07 on the same date
++    and local time.  The Astrakhan change is already official; the others have
++    passed the first reading in the State Duma and are extremely likely.
++    Also, Asia/Sakhalin moves from +10 to +11 on 2016-03-27 at 02:00.
++    (Thanks to Alexander Krivenyshev for the heads-up, and to Matt Johnson
++    and Stepan Golosunov for followup.)
++
++    As a trial of a new system that needs less information to be made up,
++    the new zones use numeric time zone abbreviations like "+04"
++    instead of invented abbreviations like "ASTT".
++
++    Haiti will not observe DST in 2016.  (Thanks to Jean Antoine via
++    Steffen Thorsen.)
++
++    Palestine's spring-forward transition on 2016-03-26 is at 01:00, not 00:00.
++    (Thanks to Hannah Kreitem.) Guess future transitions will be March's last
++    Saturday at 01:00, not March's last Friday at 24:00.
++
++  Changes affecting past time stamps
++
++    Europe/Chisinau observed DST during 1990, and switched from +04 to
++    +03 at 1990-05-06 02:00, instead of switching from +03 to +02.
++    (Thanks to Stepan Golosunov.)
++
++    1991 abbreviations in Europe/Samara should be SAMT/SAMST, not
++    KUYT/KUYST.  (Thanks to Stepan Golosunov.)
++
++  Changes to code
++
++    tzselect's diagnostics and checking, and checktab.awk's checking,
++    have been improved.  (Thanks to J William Piggott.)
++
++    tzcode now builds under MinGW.  (Thanks to Ian Abbott and Esben Haabendal.)
++
++    tzselect now tests Julian-date TZ settings more accurately.
++    (Thanks to J William Piggott.)
++
++  Changes to commentary
++
++    Comments in zone tables have been improved.  (Thanks to J William Piggott.)
++
++    tzselect again limits its menu comments so that menus fit on a
++    24x80 alphanumeric display.
++
++    A new web page tz-how-to.html.  (Thanks to Bill Seymour.)
++
++    In the Theory file, the description of possible time zone abbreviations in
++    tzdata has been cleaned up, as the old description was unclear and
++    inconsistent.  (Thanks to Alain Mouette for reporting the problem.)
++
++
++Release 2016a - 2016-01-26 23:28:02 -0800
++
++  Changes affecting future time stamps
++
++    America/Cayman will not observe daylight saving this year after all.
++    Revert our guess that it would.  (Thanks to Matt Johnson.)
++
++    Asia/Chita switches from +0800 to +0900 on 2016-03-27 at 02:00.
++    (Thanks to Alexander Krivenyshev.)
++
++    Asia/Tehran now has DST predictions for the year 2038 and later,
++    to be March 21 00:00 to September 21 00:00.  This is likely better
++    than predicting no DST, albeit off by a day every now and then.
++
++  Changes affecting past and future time stamps
++
++    America/Metlakatla switched from PST all year to AKST/AKDT on
++    2015-11-01 at 02:00.  (Thanks to Steffen Thorsen.)
++
++    America/Santa_Isabel has been removed, and replaced with a
++    backward compatibility link to America/Tijuana.  Its contents were
++    apparently based on a misreading of Mexican legislation.
++
++  Changes affecting past time stamps
++
++    Asia/Karachi's two transition times in 2002 were off by a minute.
++    (Thanks to Matt Johnson.)
++
++  Changes affecting build procedure
++
++    An installer can now combine leap seconds with use of the backzone file,
++    e.g., with 'make PACKRATDATA=backzone REDO=posix_right zones'.
++    The old 'make posix_packrat' rule is now marked as obsolescent.
++    (Thanks to Ian Abbott for an initial implementation.)
++
++  Changes affecting documentation and commentary
++
++    A new file LICENSE makes it easier to see that the code and data
++    are mostly public-domain.  (Thanks to James Knight.)  The three
++    non-public-domain files now use the current (3-clause) BSD license
++    instead of older versions of that license.
++
++    tz-link.htm mentions the BDE library (thanks to Andrew Paprocki),
++    CCTZ (thanks to Tim Parenti), TimeJones.com, and has a new section
++    on editing tz source files (with a mention of Sublime zoneinfo,
++    thanks to Gilmore Davidson).
++
++    The Theory and asia files now mention the 2015 book "The Global
++    Transformation of Time, 1870-1950", and cite a couple of reviews.
++
++    The America/Chicago entry now documents the informal use of US
++    central time in Fort Pierre, South Dakota.  (Thanks to Rick
++    McDermid, Matt Johnson, and Steve Jones.)
++
++
++Release 2015g - 2015-10-01 00:39:51 -0700
++
++  Changes affecting future time stamps
++
++    Turkey's 2015 fall-back transition is scheduled for Nov. 8, not Oct. 25.
++    (Thanks to Fatih.)
++
++    Norfolk moves from +1130 to +1100 on 2015-10-04 at 02:00 local time.
++    (Thanks to Alexander Krivenyshev.)
++
++    Fiji's 2016 fall-back transition is scheduled for January 17, not 24.
++    (Thanks to Ken Rylander.)
++
++    Fort Nelson, British Columbia will not fall back on 2015-11-01.  It has
++    effectively been on MST (-0700) since it advanced its clocks on 2015-03-08.
++    New zone America/Fort_Nelson.  (Thanks to Matt Johnson.)
++
++  Changes affecting past time stamps
++
++    Norfolk observed DST from 1974-10-27 02:00 to 1975-03-02 02:00.
++
++  Changes affecting code
++
++    localtime no longer mishandles America/Anchorage after 2037.
++    (Thanks to Bradley White for reporting the bug.)
++
++    On hosts with signed 32-bit time_t, localtime no longer mishandles
++    Pacific/Fiji after 2038-01-16 14:00 UTC.
++
++    The localtime module allows the variables 'timezone', 'daylight',
++    and 'altzone' to be in common storage shared with other modules,
++    and declares them in case the system <time.h> does not.
++    (Problems reported by Kees Dekker.)
++
++    On platforms with tm_zone, strftime.c now assumes it is not NULL.
++    This simplifies the code and is consistent with zdump.c.
++    (Problem reported by Christos Zoulas.)
++
++  Changes affecting documentation
++
++   The tzfile man page now documents that transition times denote the
++   starts (not the ends) of the corresponding time periods.
++   (Ambiguity reported by Bill Seymour.)
++
++
++Release 2015f - 2015-08-10 18:06:56 -0700
++
++  Changes affecting future time stamps
++
++    North Korea switches to +0830 on 2015-08-15.  (Thanks to Steffen Thorsen.)
++    The abbreviation remains "KST".  (Thanks to Robert Elz.)
++
++    Uruguay no longer observes DST.  (Thanks to Steffen Thorsen
++    and Pablo Camargo.)
++
++  Changes affecting past and future time stamps
++
++    Moldova starts and ends DST at 00:00 UTC, not at 01:00 UTC.
++    (Thanks to Roman Tudos.)
++
++  Changes affecting data format and code
++
++    zic's '-y YEARISTYPE' option is no longer documented.  The TYPE
++    field of a Rule line should now be '-'; the old values 'even',
++    'odd', 'uspres', 'nonpres', 'nonuspres' were already undocumented.
++    Although the implementation has not changed, these features do not
++    work in the default installation, they are not used in the data,
++    and they are now considered obsolescent.
++
++    zic now checks that two rules don't take effect at the same time.
++    (Thanks to Jon Skeet and Arthur David Olson.)  Constraints on
++    simultaneity are now documented.
++
++    The two characters '%z' in a zone format now stand for the UTC
++    offset, e.g., '-07' for seven hours behind UTC and '+0530' for
++    five hours and thirty minutes ahead.  This better supports time
++    zone abbreviations conforming to POSIX.1-2001 and later.
++
++  Changes affecting installed data files
++
++    Comments for America/Halifax and America/Glace_Bay have been improved.
++    (Thanks to Brian Inglis.)
++
++    Data entries have been simplified for Atlantic/Canary, Europe/Simferopol,
++    Europe/Sofia, and Europe/Tallinn.  This yields slightly smaller
++    installed data files for Europe/Simferopol and Europe/Tallinn.
++    It does not affect timestamps.  (Thanks to Howard Hinnant.)
++
++  Changes affecting code
++
++    zdump and zic no longer warn about valid time zone abbreviations
++    like '-05'.
++
++    Some Visual Studio 2013 warnings have been suppressed.
++    (Thanks to Kees Dekker.)
++
++    'date' no longer sets the time of day and its -a, -d, -n and -t
++    options have been removed.  Long obsolescent, the implementation
++    of these features had porting problems.  Builders no longer need
++    to configure HAVE_ADJTIME, HAVE_SETTIMEOFDAY, or HAVE_UTMPX_H.
++    (Thanks to Kees Dekker for pointing out the problem.)
++
++  Changes affecting documentation
++
++    The Theory file mentions naming issues earlier, as these seem to be
++    poorly publicized (thanks to Gilmore Davidson for reporting the problem).
++
++    tz-link.htm mentions Time Zone Database Parser (thanks to Howard Hinnant).
++
++    Mention that Herbert Samuel introduced the term "Summer Time".
++
++
++Release 2015e - 2015-06-13 10:56:02 -0700
++
++  Changes affecting future time stamps
++
++    Morocco will suspend DST from 2015-06-14 03:00 through 2015-07-19 02:00,
++    not 06-13 and 07-18 as we had guessed.  (Thanks to Milamber.)
++
++    Assume Cayman Islands will observe DST starting next year, using US rules.
++    Although it isn't guaranteed, it is the most likely.
++
++  Changes affecting data format
++
++    The file 'iso3166.tab' now uses UTF-8, so that its entries can better
++    spell the names of Åland Islands, Côte d'Ivoire, and Réunion.
++
++  Changes affecting code
++
++    When displaying data, tzselect converts it to the current locale's
++    encoding if the iconv command works.  (Problem reported by random832.)
++
++    tzselect no longer mishandles Dominica, fixing a bug introduced
++    in Release 2014f.  (Problem reported by Owen Leibman.)
++
++    zic -l no longer fails when compiled with -DTZDEFAULT=\"/etc/localtime\".
++    This fixes a bug introduced in Release 2014f.
++    (Problem reported by Leonardo Chiquitto.)
++
++
++Release 2015d - 2015-04-24 08:09:46 -0700
++
++  Changes affecting future time stamps
++
++    Egypt will not observe DST in 2015 and will consider canceling it
++    permanently.  For now, assume no DST indefinitely.
++    (Thanks to Ahmed Nazmy and Tim Parenti.)
++
++  Changes affecting past time stamps
++
++    America/Whitehorse switched from UT -09 to -08 on 1967-05-28, not
++    1966-07-01.  Also, Yukon's time zone history is documented better.
++    (Thanks to Brian Inglis and Dennis Ferguson.)
++
++  Change affecting past and future time zone abbreviations
++
++    The abbreviations for Hawaii-Aleutian standard and daylight times
++    have been changed from HAST/HADT to HST/HDT, as per US Government
++    Printing Office style.  This affects only America/Adak since 1983,
++    as America/Honolulu was already using the new style.
++
++  Changes affecting code
++
++   zic has some minor performance improvements.
++
++
++Release 2015c - 2015-04-11 08:55:55 -0700
++
++  Changes affecting future time stamps
++
++    Egypt's spring-forward transition is at 24:00 on April's last Thursday,
++    not 00:00 on April's last Friday.  2015's transition will therefore be on
++    Thursday, April 30 at 24:00, not Friday, April 24 at 00:00.  Similar fixes
++    apply to 2026, 2037, 2043, etc.  (Thanks to Steffen Thorsen.)
++
++  Changes affecting past time stamps
++
++    The following changes affect some pre-1991 Chile-related time stamps
++    in America/Santiago, Antarctica/Palmer, and Pacific/Easter.
++
++      The 1910 transition was January 10, not January 1.
++
++      The 1918 transition was September 10, not September 1.
++
++      The UT -04 time observed from 1932 to 1942 is now considered to
++      be standard time, not year-round DST.
++
++      Santiago observed DST (UT -03) from 1946-07-15 through
++      1946-08-31, then reverted to standard time, then switched to -05
++      on 1947-04-01.
++
++      Assume transitions before 1968 were at 00:00, since we have no data
++      saying otherwise.
++
++      The spring 1988 transition was 1988-10-09, not 1988-10-02.
++      The fall 1990 transition was 1990-03-11, not 1990-03-18.
++
++      Assume no UTC offset change for Pacific/Easter on 1890-01-01,
++      and omit all transitions on Pacific/Easter from 1942 through 1946
++      since we have no data suggesting that they existed.
++
++    One more zone has been turned into a link, as it differed
++    from an existing zone only for older time stamps.  As usual,
++    this change affects UTC offsets in pre-1970 time stamps only.
++    The zone's old contents have been moved to the 'backzone' file.
++    The affected zone is America/Montreal.
++
++  Changes affecting commentary
++
++    Mention the TZUpdater tool.
++
++    Mention "The Time Now".  (Thanks to Brandon Ramsey.)
++
++
++Release 2015b - 2015-03-19 23:28:11 -0700
++
++  Changes affecting future time stamps
++
++    Mongolia will start observing DST again this year, from the last
++    Saturday in March at 02:00 to the last Saturday in September at 00:00.
++    (Thanks to Ganbold Tsagaankhuu.)
++
++    Palestine will start DST on March 28, not March 27.  Also,
++    correct the fall 2014 transition from September 26 to October 24.
++    Adjust future predictions accordingly.  (Thanks to Steffen Thorsen.)
++
++  Changes affecting past time stamps
++
++    The 1982 zone shift in Pacific/Easter has been corrected, fixing a 2015a
++    regression.  (Thanks to Stuart Bishop for reporting the problem.)
++
++    Some more zones have been turned into links, when they differed
++    from existing zones only for older time stamps.  As usual,
++    these changes affect UTC offsets in pre-1970 time stamps only.
++    Their old contents have been moved to the 'backzone' file.
++    The affected zones are: America/Antigua, America/Cayman,
++    Pacific/Midway, and Pacific/Saipan.
++
++  Changes affecting time zone abbreviations
++
++    Correct the 1992-2010 DST abbreviation in Volgograd from "MSK" to "MSD".
++    (Thanks to Hank W.)
++
++  Changes affecting code
++
++    Fix integer overflow bug in reference 'mktime' implementation.
++    (Problem reported by Jörg Richter.)
++
++    Allow -Dtime_tz=time_t compilations, and allow -Dtime_tz=... libraries
++    to be used in the same executable as standard-library time_t functions.
++    (Problems reported by Bradley White.)
++
++  Changes affecting commentary
++
++    Cite the recent Mexican decree changing Quintana Roo's time zone.
++    (Thanks to Carlos Raúl Perasso.)
++
++    Likewise for the recent Chilean decree.  (Thanks to Eduardo Romero Urra.)
++
++    Update info about Mars time.
++
++
++Release 2015a - 2015-01-29 22:35:20 -0800
++
++  Changes affecting future time stamps
++
++    The Mexican state of Quintana Roo, represented by America/Cancun,
++    will shift from Central Time with DST to Eastern Time without DST
++    on 2015-02-01 at 02:00.  (Thanks to Steffen Thorsen and Gwillim Law.)
++
++    Chile will not change clocks in April or thereafter; its new standard time
++    will be its old daylight saving time.  This affects America/Santiago,
++    Pacific/Easter, and Antarctica/Palmer.  (Thanks to Juan Correa.)
++
++    New leap second 2015-06-30 23:59:60 UTC as per IERS Bulletin C 49.
++    (Thanks to Tim Parenti.)
++
++  Changes affecting past time stamps
++
++    Iceland observed DST in 1919 and 1921, and its 1939 fallback
++    transition was Oct. 29, not Nov. 29.  Remove incorrect data from
++    Shanks about time in Iceland between 1837 and 1908.
++
++    Some more zones have been turned into links, when they differed
++    from existing zones only for older time stamps.  As usual,
++    these changes affect UTC offsets in pre-1970 time stamps only.
++    Their old contents have been moved to the 'backzone' file.
++    The affected zones are: Asia/Aden, Asia/Bahrain, Asia/Kuwait,
++    and Asia/Muscat.
++
++  Changes affecting code
++
++    tzalloc now scrubs time zone abbreviations compatibly with the way
++    that tzset always has, by replacing invalid bytes with '_' and by
++    shortening too-long abbreviations.
++
++    tzselect ports to POSIX awk implementations, no longer mishandles
++    POSIX TZ settings when GNU awk is used, and reports POSIX TZ
++    settings to the user.  (Thanks to Stefan Kuhn.)
++
++  Changes affecting build procedure
++
++    'make check' now checks for links to links in the data.
++    One such link (for Africa/Asmera) has been fixed.
++    (Thanks to Stephen Colebourne for pointing out the problem.)
++
++  Changes affecting commentary
++
++    The leapseconds file commentary now mentions the expiration date.
++    (Problem reported by Martin Burnicki.)
++
++    Update Mexican Library of Congress URL.
++
++
++Release 2014j - 2014-11-10 17:37:11 -0800
++
++  Changes affecting current and future time stamps
++
++    Turks & Caicos' switch from US eastern time to UT -04 year-round
++    did not occur on 2014-11-02 at 02:00.  It's currently scheduled
++    for 2015-11-01 at 02:00.  (Thanks to Chris Walton.)
++
++  Changes affecting past time stamps
++
++    Many pre-1989 time stamps have been corrected for Asia/Seoul and
++    Asia/Pyongyang, based on sources for the Korean-language Wikipedia
++    entry for time in Korea.  (Thanks to Sanghyuk Jung.)  Also, no
++    longer guess that Pyongyang mimicked Seoul time after World War II,
++    as this is politically implausible.
++
++    Some more zones have been turned into links, when they differed
++    from existing zones only for older time stamps.  As usual,
++    these changes affect UTC offsets in pre-1970 time stamps only.
++    Their old contents have been moved to the 'backzone' file.
++    The affected zones are: Africa/Addis_Ababa, Africa/Asmara,
++    Africa/Dar_es_Salaam, Africa/Djibouti, Africa/Kampala,
++    Africa/Mogadishu, Indian/Antananarivo, Indian/Comoro, and
++    Indian/Mayotte.
++
++  Changes affecting commentary
++
++    The commentary is less enthusiastic about Shanks as a source,
++    and is more careful to distinguish UT from UTC.
++
++
++Release 2014i - 2014-10-21 22:04:57 -0700
++
++  Changes affecting future time stamps
++
++    Pacific/Fiji will observe DST from 2014-11-02 02:00 to 2015-01-18 03:00.
++    (Thanks to Ken Rylander for the heads-up.)  Guess that future
++    years will use a similar pattern.
++
++    A new Zone Pacific/Bougainville, for the part of Papua New Guinea
++    that plans to switch from UT +10 to +11 on 2014-12-28 at 02:00.
++    (Thanks to Kiley Walbom for the heads-up.)
++
++  Changes affecting time zone abbreviations
++
++    Since Belarus is not changing its clocks even though Moscow is,
++    the time zone abbreviation in Europe/Minsk is changing from FET
++    to its more-traditional value MSK on 2014-10-26 at 01:00.
++    (Thanks to Alexander Bokovoy for the heads-up about Belarus.)
++
++    The new abbreviation IDT stands for the pre-1976 use of UT +08 in
++    Indochina, to distinguish it better from ICT (+07).
++
++  Changes affecting past time stamps
++
++    Many time stamps have been corrected for Asia/Ho_Chi_Minh before 1976
++    (thanks to Trần Ngọc Quân for an indirect pointer to Trần Tiến Bình's
++    authoritative book).  Asia/Ho_Chi_Minh has been added to
++    zone1970.tab, to give tzselect users in Vietnam two choices,
++    since north and south Vietnam disagreed after our 1970 cutoff.
++
++    Asia/Phnom_Penh and Asia/Vientiane have been turned into links, as
++    they differed from existing zones only for older time stamps.  As
++    usual, these changes affect pre-1970 time stamps only.  Their old
++    contents have been moved to the 'backzone' file.
++
++  Changes affecting code
++
++    The time-related library functions now set errno on failure, and
++    some crashes in the new tzalloc-related library functions have
++    been fixed.  (Thanks to Christos Zoulas for reporting most of
++    these problems and for suggesting fixes.)
++
++    If USG_COMPAT is defined and the requested time stamp is standard time,
++    the tz library's localtime and mktime functions now set the extern
++    variable timezone to a value appropriate for that time stamp; and
++    similarly for ALTZONE, daylight saving time, and the altzone variable.
++    This change is a companion to the tzname change in 2014h, and is
++    designed to make timezone and altzone more compatible with tzname.
++
++    The tz library's functions now set errno to EOVERFLOW if they fail
++    because the result cannot be represented.  ctime and ctime_r now
++    return NULL and set errno when a time stamp is out of range, rather
++    than having undefined behavior.
++
++    Some bugs associated with the new 2014g functions have been fixed.
++    This includes a bug that largely incapacitated the new functions
++    time2posix_z and posix2time_z.  (Thanks to Christos Zoulas.)
++    It also includes some uses of uninitialized variables after tzalloc.
++    The new code uses the standard type 'ssize_t', which the Makefile
++    now gives porting advice about.
++
++  Changes affecting commentary
++
++    Updated URLs for NRC Canada (thanks to Matt Johnson and Brian Inglis).
++
++
++Release 2014h - 2014-09-25 18:59:03 -0700
++
++  Changes affecting past time stamps
++
++    America/Jamaica's 1974 spring-forward transition was Jan. 6, not Apr. 28.
++
++    Shanks says Asia/Novokuznetsk switched from LMT (not "NMT") on 1924-05-01,
++    not 1920-01-06.  The old entry was based on a misinterpretation of Shanks.
++
++    Some more zones have been turned into links, when they differed
++    from existing zones only for older time stamps.  As usual,
++    these changes affect UTC offsets in pre-1970 time stamps only.
++    Their old contents have been moved to the 'backzone' file.
++    The affected zones are: Africa/Blantyre, Africa/Bujumbura,
++    Africa/Gaborone, Africa/Harare, Africa/Kigali, Africa/Lubumbashi,
++    Africa/Lusaka, Africa/Maseru, and Africa/Mbabane.
++
++  Changes affecting code
++
++    zdump -V and -v now output gmtoff= values on all platforms,
++    not merely on platforms defining TM_GMTOFF.
++
++    The tz library's localtime and mktime functions now set tzname to a value
++    appropriate for the requested time stamp, and zdump now uses this
++    on platforms not defining TM_ZONE, fixing a 2014g regression.
++    (Thanks to Tim Parenti for reporting the problem.)
++
++    The tz library no longer sets tzname if localtime or mktime fails.
++
++    zdump -c no longer mishandles transitions near year boundaries.
++    (Thanks to Tim Parenti for reporting the problem.)
++
++    An access to uninitialized data has been fixed.
++    (Thanks to Jörg Richter for reporting the problem.)
++
++    When THREAD_SAFE is defined, the code ports to the C11 memory model.
++    A memory leak has been fixed if ALL_STATE and THREAD_SAFE are defined
++    and two threads race to initialize data used by gmtime-like functions.
++    (Thanks to Andy Heninger for reporting the problems.)
++
++  Changes affecting build procedure
++
++    'make check' now checks better for properly-sorted data.
++
++  Changes affecting documentation and commentary
++
++    zdump's gmtoff=N output is now documented, and its isdst=D output
++    is now documented to possibly output D values other than 0 or 1.
++
++    zdump -c's treatment of years is now documented to use the
++    Gregorian calendar and Universal Time without leap seconds,
++    and its behavior at cutoff boundaries is now documented better.
++    (Thanks to Arthur David Olson and Tim Parenti for reporting the problems.)
++
++    Programs are now documented to use the proleptic Gregorian calendar.
++    (Thanks to Alan Barrett for the suggestion.)
++
++    Fractional-second GMT offsets have been documented for civil time
++    in 19th-century Chennai, Jakarta, and New York.
++
++
++Release 2014g - 2014-08-28 12:31:23 -0700
++
++  Changes affecting future time stamps
++
++    Turks & Caicos is switching from US eastern time to UT -04
++    year-round, modeled as a switch on 2014-11-02 at 02:00.
++    [As noted in 2014j, this switch was later delayed.]
++
++  Changes affecting past time stamps
++
++    Time in Russia or the USSR before 1926 or so has been corrected by
++    a few seconds in the following zones: Asia/Irkutsk,
++    Asia/Krasnoyarsk, Asia/Omsk, Asia/Samarkand, Asia/Tbilisi,
++    Asia/Vladivostok, Asia/Yakutsk, Europe/Riga, Europe/Samara.  For
++    Asia/Yekaterinburg the correction is a few minutes.  (Thanks to
++    Vladimir Karpinsky.)
++
++    The Portuguese decree of 1911-05-26 took effect on 1912-01-01.
++    This affects 1911 time stamps in Africa/Bissau, Africa/Luanda,
++    Atlantic/Azores, and Atlantic/Madeira.  Also, Lisbon's pre-1912
++    GMT offset was -0:36:45 (rounded from -0:36:44.68), not -0:36:32.
++    (Thanks to Stephen Colebourne for pointing to the decree.)
++
++    Asia/Dhaka ended DST on 2009-12-31 at 24:00, not 23:59.
++
++    A new file 'backzone' contains data which may appeal to
++    connoisseurs of old time stamps, although it is out of scope for
++    the tz database, is often poorly sourced, and contains some data
++    that is known to be incorrect.  The new file is not recommended
++    for ordinary use and its entries are not installed by default.
++    (Thanks to Lester Caine for the high-quality Jersey, Guernsey, and
++    Isle of Man entries.)
++
++    Some more zones have been turned into links, when they differed
++    from existing zones only for older time stamps.  As usual,
++    these changes affect UTC offsets in pre-1970 time stamps only.
++    Their old contents have been moved to the 'backzone' file.
++    The affected zones are: Africa/Bangui, Africa/Brazzaville,
++    Africa/Douala, Africa/Kinshasa, Africa/Libreville, Africa/Luanda,
++    Africa/Malabo, Africa/Niamey, and Africa/Porto-Novo.
++
++  Changes affecting code
++
++    Unless NETBSD_INSPIRED is defined to 0, the tz library now
++    supplies functions for creating and using objects that represent
++    time zones. The new functions are tzalloc, tzfree, localtime_rz,
++    mktime_z, and (if STD_INSPIRED is also defined) posix2time_z and
++    time2posix_z.  They are intended for performance: for example,
++    localtime_rz (unlike localtime_r) is trivially thread-safe without
++    locking.  (Thanks to Christos Zoulas for proposing NetBSD-inspired
++    functions, and to Alan Barrett and Jonathan Lennox for helping to
++    debug the change.)
++
++    zdump now builds with the tz library unless USE_LTZ is defined to 0,
++    This lets zdump use tz features even if the system library lacks them.
++    To build zdump with the system library, use 'make CFLAGS=-DUSE_LTZ=0
++    TZDOBJS=zdump.o CHECK_TIME_T_ALTERNATIVES='.
++
++    zdump now uses localtime_rz if available, as it's significantly faster,
++    and it can help zdump better diagnose invalid time zone names.
++    Define HAVE_LOCALTIME_RZ to 0 to suppress this.  HAVE_LOCALTIME_RZ
++    defaults to 1 if NETBSD_INSPIRED && USE_LTZ.  When localtime_rz is
++    not available, zdump now uses localtime_r and tzset if available,
++    as this is a bit cleaner and faster than plain localtime.  Compile
++    with -DHAVE_LOCALTIME_R=0 and/or -DHAVE_TZSET=0 if your system
++    lacks these two functions.
++
++    If THREAD_SAFE is defined to 1, the tz library is now thread-safe.
++    Although not needed for tz's own applications, which are single-threaded,
++    this supports POSIX better if the tz library is used in multithreaded apps.
++
++    Some crashes have been fixed when zdump or the tz library is given
++    invalid or outlandish input.
++
++    The tz library no longer mishandles leap seconds on platforms with
++    unsigned time_t in time zones that lack ordinary transitions after 1970.
++
++    The tz code now attempts to infer TM_GMTOFF and TM_ZONE if not
++    already defined, to make it easier to configure on common platforms.
++    Define NO_TM_GMTOFF and NO_TM_ZONE to suppress this.
++
++    Unless the new macro UNINIT_TRAP is defined to 1, the tz code now
++    assumes that reading uninitialized memory yields garbage values
++    but does not cause other problems such as traps.
++
++    If TM_GMTOFF is defined and UNINIT_TRAP is 0, mktime is now
++    more likely to guess right for ambiguous time stamps near
++    transitions where tm_isdst does not change.
++
++    If HAVE_STRFTIME_L is defined to 1, the tz library now defines
++    strftime_l for compatibility with recent versions of POSIX.
++    Only the C locale is supported, though.  HAVE_STRFTIME_L defaults
++    to 1 on recent POSIX versions, and to 0 otherwise.
++
++    tzselect -c now uses a hybrid distance measure that works better
++    in Africa.  (Thanks to Alan Barrett for noting the problem.)
++
++    The C source code now ports to NetBSD when GCC_DEBUG_FLAGS is used,
++    or when time_tz is defined.
++
++    When HAVE_UTMPX_H is set the 'date' command now builds on systems
++    whose <utmpx.h> file does not define WTMPX_FILE, and when setting
++    the date it updates the wtmpx file if _PATH_WTMPX is defined.
++    This affects GNU/Linux and similar systems.
++
++    For easier maintenance later, some C code has been simplified,
++    some lint has been removed, and the code has been tweaked so that
++    plain 'make' is more likely to work.
++
++    The C type 'bool' is now used for boolean values, instead of 'int'.
++
++    The long-obsolete LOCALE_HOME code has been removed.
++
++    The long-obsolete 'gtime' function has been removed.
++
++  Changes affecting build procedure
++
++    'zdump' no longer links in ialloc.o, as it's not needed.
++
++    'make check_time_t_alternatives' no longer assumes GNU diff.
++
++  Changes affecting distribution tarballs
++
++    The files checktab.awk and zoneinfo2tdf.pl are now distributed in
++    the tzdata tarball instead of the tzcode tarball, since they help
++    maintain the data.  The NEWS and Theory files are now also
++    distributed in the tzdata tarball, as they're relevant for data.
++    (Thanks to Alan Barrett for pointing this out.)  Also, the
++    leapseconds.awk file is no longer distributed in the tzcode
++    tarball, since it belongs in the tzdata tarball (where 2014f
++    inadvertently also distributed it).
++
++  Changes affecting documentation and commentary
++
++    A new file CONTRIBUTING is distributed.  (Thanks to Tim Parenti for
++    suggesting a CONTRIBUTING file, and to Tony Finch and Walter Harms
++    for debugging it.)
++
++    The man pages have been updated to use function prototypes,
++    to document thread-safe variants like localtime_r, and to document
++    the NetBSD-inspired functions tzalloc, tzfree, localtime_rz, and
++    mktime_z.
++
++    The fields in Link lines have been renamed to be more descriptive
++    and more like the parameters of 'ln'.  LINK-FROM has become TARGET,
++    and LINK-TO has become LINK-NAME.
++
++    tz-link.htm mentions the IETF's tzdist working group; Windows
++    Runtime etc. (thanks to Matt Johnson); and HP-UX's tztab.
++
++    Some broken URLs have been fixed in the commentary.  (Thanks to
++    Lester Caine.)
++
++    Commentary about Philippines DST has been updated, and commentary
++    on pre-1970 time in India has been added.
++
++
++Release 2014f - 2014-08-05 17:42:36 -0700
++
++  Changes affecting future time stamps
++
++    Russia will subtract an hour from most of its time zones on 2014-10-26
++    at 02:00 local time.  (Thanks to Alexander Krivenyshev.)
++    There are a few exceptions: Magadan Oblast (Asia/Magadan) and Zabaykalsky
++    Krai are subtracting two hours; conversely, Chukotka Autonomous Okrug
++    (Asia/Anadyr), Kamchatka Krai (Asia/Kamchatka), Kemerovo Oblast
++    (Asia/Novokuznetsk), and the Samara Oblast and the Udmurt Republic
++    (Europe/Samara) are not changing their clocks.  The changed zones are
++    Europe/Kaliningrad, Europe/Moscow, Europe/Simferopol, Europe/Volgograd,
++    Asia/Yekaterinburg, Asia/Omsk, Asia/Novosibirsk, Asia/Krasnoyarsk,
++    Asia/Irkutsk, Asia/Yakutsk, Asia/Vladivostok, Asia/Khandyga,
++    Asia/Sakhalin, and Asia/Ust-Nera; Asia/Magadan will have two hours
++    subtracted; and Asia/Novokuznetsk's time zone abbreviation is affected,
++    but not its UTC offset.  Two zones are added: Asia/Chita (split
++    from Asia/Yakutsk, and also with two hours subtracted) and
++    Asia/Srednekolymsk (split from Asia/Magadan, but with only one hour
++    subtracted).  (Thanks to Tim Parenti for much of the above.)
++
++  Changes affecting time zone abbreviations
++
++    Australian eastern time zone abbreviations are now AEST/AEDT not EST,
++    and similarly for the other Australian zones.  That is, for eastern
++    standard and daylight saving time the abbreviations are AEST and AEDT
++    instead of the former EST for both; similarly, ACST/ACDT, ACWST/ACWDT,
++    and AWST/AWDT are now used instead of the former CST, CWST, and WST.
++    This change does not affect UTC offsets, only time zone abbreviations.
++    (Thanks to Rich Tibbett and many others.)
++
++    Asia/Novokuznetsk shifts from NOVT to KRAT (remaining on UT +07)
++    effective 2014-10-26 at 02:00 local time.
++
++    The time zone abbreviation for Xinjiang Time (observed in Ürümqi)
++    has been changed from URUT to XJT.  (Thanks to Luther Ma.)
++
++    Prefer MSK/MSD for Moscow time in Russia, even in other cities.
++    Similarly, prefer EET/EEST for eastern European time in Russia.
++
++    Change time zone abbreviations in (western) Samoa to use "ST" and
++    "DT" suffixes, as this is more likely to match common practice.
++    Prefix "W" to (western) Samoa time when its standard-time offset
++    disagrees with that of American Samoa.
++
++    America/Metlakatla now uses PST, not MeST, to abbreviate its time zone.
++
++    Time zone abbreviations have been updated for Japan's two time
++    zones used 1896-1937.  JWST now stands for Western Standard
++    Time, and JCST for Central Standard Time (formerly this was CJT).
++    These abbreviations are now used for time in Korea, Taiwan,
++    and Sakhalin while controlled by Japan.
++
++  Changes affecting past time stamps
++
++    China's five zones have been simplified to two, since the post-1970
++    differences in the other three seem to have been imaginary.  The
++    zones Asia/Harbin, Asia/Chongqing, and Asia/Kashgar have been
++    removed; backwards-compatibility links still work, albeit with
++    different behaviors for time stamps before May 1980.  Asia/Urumqi's
++    1980 transition to UT +08 has been removed, so that it is now at
++    +06 and not +08.  (Thanks to Luther Ma and to Alois Treindl;
++    Treindl sent helpful translations of two papers by Guo Qingsheng.)
++
++    Some zones have been turned into links, when they differed from existing
++    zones only for older UTC offsets where data entries were likely invented.
++    These changes affect UTC offsets in pre-1970 time stamps only.  This is
++    similar to the change in release 2013e, except this time for western
++    Africa.  The affected zones are: Africa/Bamako, Africa/Banjul,
++    Africa/Conakry, Africa/Dakar, Africa/Freetown, Africa/Lome,
++    Africa/Nouakchott, Africa/Ouagadougou, Africa/Sao_Tome, and
++    Atlantic/St_Helena.  This also affects the backwards-compatibility
++    link Africa/Timbuktu.  (Thanks to Alan Barrett, Stephen Colebourne,
++    Tim Parenti, and David Patte for reporting problems in earlier
++    versions of this change.)
++
++    Asia/Shanghai's pre-standard-time UT offset has been changed from
++    8:05:57 to 8:05:43, the location of Xujiahui Observatory.  Its
++    transition to standard time has been changed from 1928 to 1901.
++
++    Asia/Taipei switched to JWST on 1896-01-01, then to JST on 1937-10-01,
++    then to CST on 1945-09-21 at 01:00, and did not observe DST in 1945.
++    In 1946 it observed DST from 05-15 through 09-30; in 1947
++    from 04-15 through 10-31; and in 1979 from 07-01 through 09-30.
++    (Thanks to Yu-Cheng Chuang.)
++
++    Asia/Riyadh's transition to standard time is now 1947-03-14, not 1950.
++
++    Europe/Helsinki's 1942 fall-back transition was 10-04 at 01:00, not
++    10-03 at 00:00.  (Thanks to Konstantin Hyppönen.)
++
++    Pacific/Pago_Pago has been changed from UT -11:30 to -11 for the
++    period from 1911 to 1950.
++
++    Pacific/Chatham has been changed to New Zealand standard time plus
++    45 minutes for the period before 1957, reflecting a 1956 remark in
++    the New Zealand parliament.
++
++    Europe/Budapest has several pre-1946 corrections: in 1918 the transition
++    out of DST was on 09-16, not 09-29; in 1919 it was on 11-24, not 09-15; in
++    1945 it was on 11-01, not 11-03; in 1941 the transition to DST was 04-08
++    not 04-06 at 02:00; and there was no DST in 1920.
++
++    Africa/Accra is now assumed to have observed DST from 1920 through 1935.
++
++    Time in Russia before 1927 or so has been corrected by a few seconds in
++    the following zones: Europe/Moscow, Asia/Irkutsk, Asia/Tbilisi,
++    Asia/Tashkent, Asia/Vladivostok, Asia/Yekaterinburg, Europe/Helsinki, and
++    Europe/Riga.  Also, Moscow's location has been changed to its Kilometer 0
++    point.  (Thanks to Vladimir Karpinsky for the Moscow changes.)
++
++  Changes affecting data format
++
++    A new file 'zone1970.tab' supersedes 'zone.tab' in the installed data.
++    The new file's extended format allows multiple country codes per zone.
++    The older file is still installed but is deprecated; its format is
++    not changing and it will still be distributed for a while, but new
++    applications should use the new file.
++
++    The new file format simplifies maintenance of obscure locations.
++    To test this, it adds coverage for the Crozet Islands and the
++    Scattered Islands.  (Thanks to Tobias Conradi and Antoine Leca.)
++
++    The file 'iso3166.tab' is planned to switch from ASCII to UTF-8.
++    It is still ASCII now, but commentary about the switch has been added.
++    The new file 'zone1970.tab' already uses UTF-8.
++
++  Changes affecting code
++
++    'localtime', 'mktime', etc. now use much less stack space if ALL_STATE
++    is defined.  (Thanks to Elliott Hughes for reporting the problem.)
++
++    'zic' no longer mishandles input when ignoring case in locales that
++    are not compatible with English, e.g., unibyte Turkish locales when
++    compiled with HAVE_GETTEXT.
++
++    Error diagnostics of 'zic' and 'yearistype' have been reworded so that
++    they no longer use ASCII '-' as if it were a dash.
++
++    'zic' now rejects output file names that contain '.' or '..' components.
++    (Thanks to Tim Parenti for reporting the problem.)
++
++    'zic -v' now warns about output file names that do not follow
++    POSIX rules, or that contain a digit or '.'.  (Thanks to Arthur
++    David Olson for starting the ball rolling on this.)
++
++    Some lint has been removed when using GCC_DEBUG_FLAGS with GCC 4.9.0.
++
++  Changes affecting build procedure
++
++    'zic' no longer links in localtime.o and asctime.o, as they're not needed.
++    (Thanks to John Cochran.)
++
++  Changes affecting documentation and commentary
++
++    The 'Theory' file documents legacy names, the longstanding
++    exceptions to the POSIX-inspired file name rules.
++
++    The 'zic' documentation clarifies the role of time types when
++    interpreting dates.  (Thanks to Arthur David Olson.)
++
++    Documentation and commentary now prefer UTF-8 to US-ASCII,
++    allowing the use of proper accents in foreign words and names.
++    Code and data have not changed because of this.  (Thanks to
++    Garrett Wollman, Ian Abbott, and Guy Harris for helping to debug
++    this.)
++
++    Non-HTML documentation and commentary now use plain-text URLs instead of
++    HTML insertions, and are more consistent about bracketing URLs when they
++    are not already surrounded by white space.  (Thanks to suggestions by
++    Steffen Nurpmeso.)
++
++    There is new commentary about Xujiahui Observatory, the five time-zone
++    project in China from 1918 to 1949, timekeeping in Japanese-occupied
++    Shanghai, and Tibet Time in the 1950s.  The sharp-eyed can spot the
++    warlord Jin Shuren in the data.
++
++    Commentary about the coverage of each Russian zone has been standardized.
++    (Thanks to Tim Parenti).
++
++    There is new commentary about contemporary timekeeping in Ethiopia.
++
++    Obsolete comments about a 2007 proposal for DST in Kuwait has been removed.
++
++    There is new commentary about time in Poland in 1919.
++
++    Proper credit has been given to DST inventor George Vernon Hudson.
++
++    Commentary about time in Metlakatla, AK and Resolute, NU has been
++    improved, with a new source for the former.
++
++    In zone.tab, Pacific/Easter no longer mentions Salas y Gómez, as it
++    is uninhabited.
++
++    Commentary about permanent Antarctic bases has been updated.
++
++    Several typos have been corrected.  (Thanks to Tim Parenti for
++    contributing some of these fixes.)
++
++    tz-link.htm now mentions the JavaScript libraries Moment Timezone,
++    TimezoneJS.Date, Walltime-js, and Timezone.  (Thanks to a heads-up
++    from Matt Johnson.)  Also, it mentions the Go 'latlong' package.
++    (Thanks to a heads-up from Dirkjan Ochtman.)
++
++    The files usno1988, usno1989, usno1989a, usno1995, usno1997, and usno1998
++    have been removed.  These obsolescent US Naval Observatory entries were no
++    longer helpful for maintenance.  (Thanks to Tim Parenti for the suggestion.)
++
++
++Release 2014e - 2014-06-12 21:53:52 -0700
++
++  Changes affecting near-future time stamps
++
++    Egypt's 2014 Ramadan-based transitions are June 26 and July 31 at 24:00.
++    (Thanks to Imed Chihi.)  Guess that from 2015 on Egypt will temporarily
++    switch to standard time at 24:00 the last Thursday before Ramadan, and
++    back to DST at 00:00 the first Friday after Ramadan.
++
++    Similarly, Morocco's are June 28 at 03:00 and August 2 at 02:00.  (Thanks
++    to Milamber Space Network.)  Guess that from 2015 on Morocco will
++    temporarily switch to standard time at 03:00 the last Saturday before
++    Ramadan, and back to DST at 02:00 the first Saturday after Ramadan.
++
++  Changes affecting past time stamps
++
++    The abbreviation "MSM" (Moscow Midsummer Time) is now used instead of
++    "MSD" for Moscow's double daylight time in summer 1921.  Also, a typo
++    "VLASST" has been repaired to be "VLAST" for Vladivostok summer time
++    in 1991.  (Thanks to Hank W. for reporting the problems.)
++
++  Changes affecting commentary
++
++    tz-link.htm now cites RFC 7265 for jCal, mentions PTP and the
++    draft CalDAV extension, updates URLs for TSP, TZInfo, IATA, and
++    removes stale pointers to World Time Explorer and WORLDTIME.
++
++
++Release 2014d - 2014-05-27 21:34:40 -0700
++
++  Changes affecting code
++
++    zic no longer generates files containing time stamps before the Big Bang.
++    This works around GNOME bug 730332
++    <https://bugzilla.gnome.org/show_bug.cgi?id=730332>.
++    (Thanks to Leonardo Chiquitto for reporting the bug, and to
++    Arthur David Olson and James Cloos for suggesting improvements to the fix.)
++
++  Changes affecting documentation
++
++    tz-link.htm now mentions GNOME.
++
++
++Release 2014c - 2014-05-13 07:44:13 -0700
++
++  Changes affecting near-future time stamps
++
++    Egypt observes DST starting 2014-05-15 at 24:00.
++    (Thanks to Ahmad El-Dardiry and Gunther Vermier.)
++    Details have not been announced, except that DST will not be observed
++    during Ramadan.  Guess that DST will stop during the same Ramadan dates as
++    Morocco, and that Egypt's future spring and fall transitions will be the
++    same as 2010 when it last observed DST, namely April's last Friday at
++    00:00 to September's last Thursday at 23:00 standard time.  Also, guess
++    that Ramadan transitions will be at 00:00 standard time.
++
++  Changes affecting code
++
++    zic now generates transitions for minimum time values, eliminating guesswork
++    when handling low-valued time stamps.  (Thanks to Arthur David Olson.)
++
++    Port to Cygwin sans glibc.  (Thanks to Arthur David Olson.)
++
++  Changes affecting commentary and documentation
++
++    Remove now-confusing comment about Jordan.  (Thanks to Oleksii Nochovnyi.)
++
++
++Release 2014b - 2014-03-24 21:28:50 -0700
++
++  Changes affecting near-future time stamps
++
++    Crimea switches to Moscow time on 2014-03-30 at 02:00 local time.
++    (Thanks to Alexander Krivenyshev.)  Move its zone.tab entry from UA to RU.
++
++    New entry for Troll station, Antarctica.  (Thanks to Paul-Inge Flakstad and
++    Bengt-Inge Larsson.)  This is currently an approximation; a better version
++    will require the zic and localtime fixes mentioned below, and the plan is
++    to wait for a while until at least the zic fixes propagate.
++
++  Changes affecting code
++
++    'zic' and 'localtime' no longer reject locations needing four transitions
++    per year for the foreseeable future.  (Thanks to Andrew Main (Zefram).)
++    Also, 'zic' avoids some unlikely failures due to integer overflow.
++
++  Changes affecting build procedure
++
++    'make check' now detects Rule lines defined but never used.
++    The NZAQ rules, an instance of this problem, have been removed.
++
++  Changes affecting commentary and documentation
++
++    Fix Tuesday/Thursday typo in description of time in Israel.
++    (Thanks to Bert Katz via Pavel Kharitonov and Mike Frysinger.)
++
++    Microsoft Windows 8.1 doesn't support tz database names.  (Thanks
++    to Donald MacQueen.)  Instead, the Microsoft Windows Store app
++    library supports them.
++
++    Add comments about Johnston Island time in the 1960s.
++    (Thanks to Lyle McElhaney.)
++
++    Morocco's 2014 DST start will be as predicted.
++    (Thanks to Sebastien Willemijns.)
++
++
++Release 2014a - 2014-03-07 23:30:29 -0800
++
++  Changes affecting near-future time stamps
++
++    Turkey begins DST on 2014-03-31, not 03-30.  (Thanks to Faruk Pasin for
++    the heads-up, and to Tim Parenti for simplifying the update.)
++
++  Changes affecting past time stamps
++
++    Fiji ended DST on 2014-01-19 at 02:00, not the previously-scheduled 03:00.
++    (Thanks to Steffen Thorsen.)
++
++    Ukraine switched from Moscow to Eastern European time on 1990-07-01
++    (not 1992-01-01), and observed DST during the entire next winter.
++    (Thanks to Vladimir in Moscow via Alois Treindl.)
++
++    In 1988 Israel observed DST from 04-10 to 09-04, not 04-09 to 09-03.
++    (Thanks to Avigdor Finkelstein.)
++
++  Changes affecting code
++
++    A uninitialized-storage bug in 'localtime' has been fixed.
++    (Thanks to Logan Chien.)
++
++  Changes affecting the build procedure
++
++    The settings for 'make check_web' now default to Ubuntu 13.10.
++
++  Changes affecting commentary and documentation
++
++    The boundary of the US Pacific time zone is given more accurately.
++    (Thanks to Alan Mintz.)
++
++    Chile's 2014 DST will be as predicted.  (Thanks to José Miguel Garrido.)
++
++    Paraguay's 2014 DST will be as predicted.  (Thanks to Carlos Raúl Perasso.)
++
++    Better descriptions of countries with same time zone history as
++    Trinidad and Tobago since 1970.  (Thanks to Alan Barrett for suggestion.)
++
++    Several changes affect tz-link.htm, the main web page.
++
++      Mention Time.is (thanks to Even Scharning) and WX-now (thanks to
++      David Braverman).
++
++      Mention xCal (Internet RFC 6321) and jCal.
++
++      Microsoft has some support for tz database names.
++
++      CLDR data formats include both XML and JSON.
++
++      Mention Maggiolo's map of solar vs standard time.
++      (Thanks to Arthur David Olson.)
++
++      Mention TZ4Net.  (Thanks to Matt Johnson.)
++
++      Mention the timezone-olson Haskell package.
++
++      Mention zeitverschiebung.net.  (Thanks to Martin Jäger.)
++
++      Remove moribund links to daylight-savings-time.info and to
++      Simple Timer + Clocks.
++
++      Update two links.  (Thanks to Oscar van Vlijmen.)
++
++      Fix some formatting glitches, e.g., remove random newlines from
++      abbr elements' title attributes.
++
++
++Release 2013i - 2013-12-17 07:25:23 -0800
++
++  Changes affecting near-future time stamps:
++
++    Jordan switches back to standard time at 00:00 on December 20, 2013.
++    The 2006-2011 transition schedule is planned to resume in 2014.
++    (Thanks to Steffen Thorsen.)
++
++  Changes affecting past time stamps:
++
++    In 2004, Cuba began DST on March 28, not April 4.
++    (Thanks to Steffen Thorsen.)
++
++  Changes affecting code
++
++    The compile-time flag NOSOLAR has been removed, as nowadays the
++    benefit of slightly shrinking runtime table size is outweighed by the
++    cost of disallowing potential future updates that exceed old limits.
++
++  Changes affecting documentation and commentary
++
++    The files solar87, solar88, and solar89 are no longer distributed.
++    They were a negative experiment - that is, a demonstration that
++    tz data can represent solar time only with some difficulty and error.
++    Their presence in the distribution caused confusion, as Riyadh
++    civil time was generally not solar time in those years.
++
++    tz-link.htm now mentions Noda Time.  (Thanks to Matt Johnson.)
++
++
++Release 2013h - 2013-10-25 15:32:32 -0700
++
++  Changes affecting current and future time stamps:
++
++    Libya has switched its UT offset back to +02 without DST, instead
++    of +01 with DST.  (Thanks to Even Scharning.)
++
++    Western Sahara (Africa/El_Aaiun) uses Morocco's DST rules.
++    (Thanks to Gwillim Law.)
++
++  Changes affecting future time stamps:
++
++    Acre and (we guess) western Amazonas will switch from UT -04 to -05
++    on 2013-11-10.  This affects America/Rio_Branco and America/Eirunepe.
++    (Thanks to Steffen Thorsen.)
++
++    Add entries for DST transitions in Morocco in the year 2038.
++    This avoids some year-2038 glitches introduced in 2013g.
++    (Thanks to Yoshito Umaoka for reporting the problem.)
++
++  Changes affecting API
++
++    The 'tzselect' command no longer requires the 'select' command,
++    and should now work with /bin/sh on more platforms.  It also works
++    around a bug in BusyBox awk before version 1.21.0.  (Thanks to
++    Patrick 'P. J.' McDermott and Alan Barrett.)
++
++  Changes affecting code
++
++    Fix localtime overflow bugs with 32-bit unsigned time_t.
++
++    zdump no longer assumes sscanf returns maximal values on overflow.
++
++  Changes affecting the build procedure
++
++    The builder can specify which programs to use, if any, instead of
++    'ar' and 'ranlib', and libtz.a is now built locally before being
++    installed.  (Thanks to Michael Forney.)
++
++    A dependency typo in the 'zdump' rule has been fixed.
++    (Thanks to Andrew Paprocki.)
++
++    The Makefile has been simplified by assuming that 'mkdir -p' and 'cp -f'
++    work as specified by POSIX.2-1992 or later; this is portable nowadays.
++
++    'make clean' no longer removes 'leapseconds', since it's
++    host-independent and is part of the distribution.
++
++    The unused makefile macros TZCSRCS, TZDSRCS, DATESRCS have been removed.
++
++  Changes affecting documentation and commentary
++
++    tz-link.htm now mentions TC TIMEZONE's draft time zone service protocol
++    (thanks to Mike Douglass) and TimezoneJS.Date (thanks to Jim Fehrle).
++
++    Update URLs in tz-link page.  Add URLs for Microsoft Windows, since
++    8.1 introduces tz support.  Remove URLs for Tru64 and UnixWare (no
++    longer maintained) and for old advisories.  SOFA now does C.
++
++Release 2013g - 2013-09-30 21:08:26 -0700
++
++  Changes affecting current and near-future time stamps
++
++    Morocco now observes DST from the last Sunday in March to the last
++    Sunday in October, not April to September respectively.  (Thanks
++    to Steffen Thorsen.)
++
++  Changes affecting 'zic'
++
++    'zic' now runs on platforms that lack both hard links and symlinks.
++    (Thanks to Theo Veenker for reporting the problem, for MinGW.)
++    Also, fix some bugs on platforms that lack hard links but have symlinks.
++
++    'zic -v' again warns that Asia/Tehran has no POSIX environment variable
++    to predict the far future, fixing a bug introduced in 2013e.
++
++  Changes affecting the build procedure
++
++    The 'leapseconds' file is again put into the tzdata tarball.
++    Also, 'leapseconds.awk', so tzdata is self-contained.  (Thanks to
++    Matt Burgess and Ian Abbott.)  The timestamps of these and other
++    dependent files in tarballs are adjusted more consistently.
++
++  Changes affecting documentation and commentary
++
++    The README file is now part of the data tarball as well as the code.
++    It now states that files are public domain unless otherwise specified.
++    (Thanks to Andrew Main (Zefram) for asking for clarifications.)
++    Its details about the 1989 release moved to a place of honor near
++    the end of NEWS.
++
++
++Release 2013f - 2013-09-24 23:37:36 -0700
++
++  Changes affecting near-future time stamps
++
++    Tocantins will very likely not observe DST starting this spring.
++    (Thanks to Steffen Thorsen.)
++
++    Jordan will likely stay at UT +03 indefinitely, and will not fall
++    back this fall.
++
++    Palestine will fall back at 00:00, not 01:00.  (Thanks to Steffen Thorsen.)
++
++  Changes affecting API
++
++    The types of the global variables 'timezone' and 'altzone' (if present)
++    have been changed back to 'long'.  This is required for 'timezone'
++    by POSIX, and for 'altzone' by common practice, e.g., Solaris 11.
++    These variables were originally 'long' in the tz code, but were
++    mistakenly changed to 'time_t' in 1987; nobody reported the
++    incompatibility until now.  The difference matters on x32, where
++    'long' is 32 bits and 'time_t' is 64.  (Thanks to Elliott Hughes.)
++
++  Changes affecting the build procedure
++
++    Avoid long strings in leapseconds.awk to work around a mawk bug.
++    (Thanks to Cyril Baurand.)
++
++  Changes affecting documentation and commentary
++
++    New file 'NEWS' that contains release notes like this one.
++
++    Paraguay's law does not specify DST transition time; 00:00 is customary.
++    (Thanks to Waldemar Villamayor-Venialbo.)
++
++    Minor capitalization fixes.
++
++  Changes affecting version-control only
++
++    The experimental GitHub repository now contains annotated and
++    signed tags for recent releases, e.g., '2013e' for Release 2013e.
++    Releases are tagged starting with 2012e; earlier releases were
++    done differently, and tags would either not have a simple name or
++    not exactly match what was released.
++
++    'make set-timestamps' is now simpler and a bit more portable.
++
++
++Release 2013e - 2013-09-19 23:50:04 -0700
++
++  Changes affecting near-future time stamps
++
++    This year Fiji will start DST on October 27, not October 20.
++    (Thanks to David Wheeler for the heads-up.)  For now, guess that
++    Fiji will continue to spring forward the Sunday before the fourth
++    Monday in October.
++
++  Changes affecting current and future time zone abbreviations
++
++    Use WIB/WITA/WIT rather than WIT/CIT/EIT for alphabetic Indonesian
++    time zone abbreviations since 1932.  (Thanks to George Ziegler,
++    Priyadi Iman Nurcahyo, Zakaria, Jason Grimes, Martin Pitt, and
++    Benny Lin.)  This affects Asia/Dili, Asia/Jakarta, Asia/Jayapura,
++    Asia/Makassar, and Asia/Pontianak.
++
++    Use ART (UT -03, standard time), rather than WARST (also -03, but
++    daylight saving time) for San Luis, Argentina since 2009.
++
++  Changes affecting Godthåb time stamps after 2037 if version mismatch
++
++    Allow POSIX-like TZ strings where the transition time's hour can
++    range from -167 through 167, instead of the POSIX-required 0
++    through 24.  E.g., TZ='FJT-12FJST,M10.3.1/146,M1.3.4/75' for the
++    new Fiji rules.  This is a more-compact way to represent
++    far-future time stamps for America/Godthab, America/Santiago,
++    Antarctica/Palmer, Asia/Gaza, Asia/Hebron, Asia/Jerusalem,
++    Pacific/Easter, and Pacific/Fiji.  Other zones are unaffected by
++    this change.  (Derived from a suggestion by Arthur David Olson.)
++
++    Allow POSIX-like TZ strings where daylight saving time is in
++    effect all year.  E.g., TZ='WART4WARST,J1/0,J365/25' for Western
++    Argentina Summer Time all year.  This supports a more-compact way
++    to represent the 2013d data for America/Argentina/San_Luis.
++    Because of the change for San Luis noted above this change does not
++    affect the current data.  (Thanks to Andrew Main (Zefram) for
++    suggestions that improved this change.)
++
++    Where these two TZ changes take effect, there is a minor extension
++    to the tz file format in that it allows new values for the
++    embedded TZ-format string, and the tz file format version number
++    has therefore been increased from 2 to 3 as a precaution.
++    Version-2-based client code should continue to work as before for
++    all time stamps before 2038.  Existing version-2-based client code
++    (tzcode, GNU/Linux, Solaris) has been tested on version-3-format
++    files, and typically works in practice even for time stamps after
++    2037; the only known exception is America/Godthab.
++
++  Changes affecting time stamps before 1970
++
++    Pacific/Johnston is now a link to Pacific/Honolulu.  This corrects
++    some errors before 1947.
++
++    Some zones have been turned into links, when they differ from existing
++    zones only in older data entries that were likely invented or that
++    differ only in LMT or transitions from LMT.  These changes affect
++    only time stamps before 1943.  The affected zones are:
++    Africa/Juba, America/Anguilla, America/Aruba, America/Dominica,
++    America/Grenada, America/Guadeloupe, America/Marigot,
++    America/Montserrat, America/St_Barthelemy, America/St_Kitts,
++    America/St_Lucia, America/St_Thomas, America/St_Vincent,
++    America/Tortola, and Europe/Vaduz.  (Thanks to Alois Treindl for
++    confirming that the old Europe/Vaduz zone was wrong and the new
++    link is better for WWII-era times.)
++
++    Change Kingston Mean Time from -5:07:12 to -5:07:11.  This affects
++    America/Cayman, America/Jamaica and America/Grand_Turk time stamps
++    from 1890 to 1912.
++
++    Change the UT offset of Bern Mean Time from 0:29:44 to 0:29:46.
++    This affects Europe/Zurich time stamps from 1853 to 1894.  (Thanks
++    to Alois Treindl).
++
++    Change the date of the circa-1850 Zurich transition from 1849-09-12
++    to 1853-07-16, overriding Shanks with data from Messerli about
++    postal and telegraph time in Switzerland.
++
++  Changes affecting time zone abbreviations before 1970
++
++    For Asia/Jakarta, use BMT (not JMT) for mean time from 1923 to 1932,
++    as Jakarta was called Batavia back then.
++
++  Changes affecting API
++
++    The 'zic' command now outputs a dummy transition when far-future
++    data can't be summarized using a TZ string, and uses a 402-year
++    window rather than a 400-year window.  For the current data, this
++    affects only the Asia/Tehran file.  It does not affect any of the
++    time stamps that this file represents, so zdump outputs the same
++    information as before.  (Thanks to Andrew Main (Zefram).)
++
++    The 'date' command has a new '-r' option, which lets you specify
++    the integer time to display, a la FreeBSD.
++
++    The 'tzselect' command has two new options '-c' and '-n', which lets you
++    select a zone based on latitude and longitude.
++
++    The 'zic' command's '-v' option now warns about constructs that
++    require the new version-3 binary file format.  (Thanks to Arthur
++    David Olson for the suggestion.)
++
++    Support for floating-point time_t has been removed.
++    It was always dicey, and POSIX no longer requires it.
++    (Thanks to Eric Blake for suggesting to the POSIX committee to
++    remove it, and thanks to Alan Barrett, Clive D.W. Feather, Andy
++    Heninger, Arthur David Olson, and Alois Treindl, for reporting
++    bugs and elucidating some of the corners of the old floating-point
++    implementation.)
++
++    The signatures of 'offtime', 'timeoff', and 'gtime' have been
++    changed back to the old practice of using 'long' to represent UT
++    offsets.  This had been inadvertently and mistakenly changed to
++    'int_fast32_t'.  (Thanks to Christos Zoulas.)
++
++    The code avoids undefined behavior on integer overflow in some
++    more places, including gmtime, localtime, mktime and zdump.
++
++  Changes affecting the zdump utility
++
++    zdump now outputs "UT" when referring to Universal Time, not "UTC".
++    "UTC" does not make sense for time stamps that predate the introduction
++    of UTC, whereas "UT", a more-generic term, does.  (Thanks to Steve Allen
++    for clarifying UT vs UTC.)
++
++  Data changes affecting behavior of tzselect and similar programs
++
++    Country code BQ is now called the more-common name "Caribbean Netherlands"
++    rather than the more-official "Bonaire, St Eustatius & Saba".
++
++    Remove from zone.tab the names America/Montreal, America/Shiprock,
++    and Antarctica/South_Pole, as they are equivalent to existing
++    same-country-code zones for post-1970 time stamps.  The data entries for
++    these names are unchanged, so the names continue to work as before.
++
++  Changes affecting code internals
++
++    zic -c now runs way faster on 64-bit hosts when given large numbers.
++
++    zic now uses vfprintf to avoid allocating and freeing some memory.
++
++    tzselect now computes the list of continents from the data,
++    rather than have it hard-coded.
++
++    Minor changes pacify GCC 4.7.3 and GCC 4.8.1.
++
++  Changes affecting the build procedure
++
++    The 'leapseconds' file is now generated automatically from a
++    new file 'leap-seconds.list', which is a copy of
++    <ftp://time.nist.gov/pub/leap-seconds.list>.
++    A new source file 'leapseconds.awk' implements this.
++    The goal is simplification of the future maintenance of 'leapseconds'.
++
++    When building the 'posix' or 'right' subdirectories, if the
++    subdirectory would be a copy of the default subdirectory, it is
++    now made a symbolic link if that is supported.  This saves about
++    2 MB of file system space.
++
++    The links America/Shiprock and Antarctica/South_Pole have been
++    moved to the 'backward' file.  This affects only nondefault builds
++    that omit 'backward'.
++
++  Changes affecting version-control only
++
++    .gitignore now ignores 'date'.
++
++  Changes affecting documentation and commentary
++
++    Changes to the 'tzfile' man page
++
++      It now mentions that the binary file format may be extended in
++      future versions by appending data.
++
++      It now refers to the 'zdump' and 'zic' man pages.
++
++    Changes to the 'zic' man page
++
++      It lists conditions that elicit a warning with '-v'.
++
++      It says that the behavior is unspecified when duplicate names
++      are given, or if the source of one link is the target of another.
++
++      Its examples are updated to match the latest data.
++
++      The definition of white space has been clarified slightly.
++      (Thanks to Michael Deckers.)
++
++    Changes to the 'Theory' file
++
++      There is a new section about the accuracy of the tz database,
++      describing the many ways that errors can creep in, and
++      explaining why so many of the pre-1970 time stamps are wrong or
++      misleading (thanks to Steve Allen, Lester Caine, and Garrett
++      Wollman for discussions that contributed to this).
++
++      The 'Theory' file describes LMT better (this follows a
++      suggestion by Guy Harris).
++
++      It refers to the 2013 edition of POSIX rather than the 2004 edition.
++
++      It's mentioned that excluding 'backward' should not affect the
++      other data, and it suggests at least one zone.tab name per
++      inhabited country (thanks to Stephen Colebourne).
++
++      Some longstanding restrictions on names are documented, e.g.,
++      'America/New_York' precludes 'America/New_York/Bronx'.
++
++      It gives more reasons for the 1970 cutoff.
++
++      It now mentions which time_t variants are supported, such as
++      signed integer time_t.  (Thanks to Paul Goyette for reporting
++      typos in an experimental version of this change.)
++
++      (Thanks to Philip Newton for correcting typos in these changes.)
++
++    Documentation and commentary is more careful to distinguish UT in
++    general from UTC in particular.  (Thanks to Steve Allen.)
++
++    Add a better source for the Zurich 1894 transition.
++    (Thanks to Pierre-Yves Berger.)
++
++    Update shapefile citations in tz-link.htm.  (Thanks to Guy Harris.)
++
++
++Release 2013d - 2013-07-05 07:38:01 -0700
++
++  Changes affecting future time stamps:
++
++    Morocco's midsummer transitions this year are July 7 and August 10,
++    not July 9 and August 8.  (Thanks to Andrew Paprocki.)
++
++    Israel now falls back on the last Sunday of October.
++    (Thanks to Ephraim Silverberg.)
++
++  Changes affecting past time stamps:
++
++    Specify Jerusalem's location more precisely; this changes the pre-1880
++    times by 2 s.
++
++  Changing affecting metadata only:
++
++    Fix typos in the entries for country codes BQ and SX.
++
++  Changes affecting code:
++
++    Rework the code to fix a bug with handling Australia/Macquarie on
++    32-bit hosts (thanks to Arthur David Olson).
++
++    Port to platforms like NetBSD, where time_t can be wider than long.
++
++    Add support for testing time_t types other than the system's.
++    Run 'make check_time_t_alternatives' to try this out.
++    Currently, the tests fail for unsigned time_t;
++    this should get fixed at some point.
++
++  Changes affecting documentation and commentary:
++
++    Deemphasize the significance of national borders.
++
++    Update the zdump man page.
++
++    Remove obsolete NOID comment (thanks to Denis Excoffier).
++
++    Update several URLs and comments in the web pages.
++
++    Spelling fixes (thanks to Kevin Lyda and Jonathan Leffler).
++
++    Update URL for CLDR Zone->Tzid table (thanks to Yoshito Umaoka).
++
++
++Release 2013c - 2013-04-19 16:17:40 -0700
++
++  Changes affecting current and future time stamps:
++
++    Palestine observed DST starting March 29, 2013.  (Thanks to
++    Steffen Thorsen.)  From 2013 on, Gaza and Hebron both observe DST,
++    with the predicted rules being the last Thursday in March at 24:00
++    to the first Friday on or after September 21 at 01:00.
++
++    Assume that the recent change to Paraguay's DST rules is permanent,
++    by moving the end of DST to the 4th Sunday in March every year.
++    (Thanks to Carlos Raúl Perasso.)
++
++  Changes affecting past time stamps:
++
++    Fix some historical data for Palestine to agree with that of
++    timeanddate.com, as follows:
++
++	  The spring 2008 change in Gaza and Hebron was on 00:00 Mar 28, not
++	  00:00 Apr 1.
++
++	  The fall 2009 change in Gaza and Hebron on Sep 4 was at 01:00, not
++	  02:00.
++
++	  The spring 2010 change in Hebron was 00:00 Mar 26, not 00:01 Mar 27.
++
++	  The spring 2011 change in Gaza was 00:01 Apr 1, not 12:01 Apr 2.
++
++	  The spring 2011 change in Hebron on Apr 1 was at 00:01, not 12:01.
++
++	  The fall 2011 change in Hebron on Sep 30 was at 00:00, not 03:00.
++
++    Fix times of habitation for Macquarie to agree with the Tasmania
++    Parks & Wildlife Service history, which indicates that permanent
++    habitation was 1899-1919 and 1948 on.
++
++  Changing affecting metadata only:
++
++    Macquarie Island is politically part of Australia, not Antarctica.
++    (Thanks to Tobias Conradi.)
++
++    Sort Macquarie more-consistently with other parts of Australia.
++    (Thanks to Tim Parenti.)
++
++
++Release 2013b - 2013-03-10 22:33:40 -0700
++
++  Changes affecting current and future time stamps:
++
++    Haiti uses US daylight-saving rules this year, and presumably future years.
++    This changes time stamps starting today.  (Thanks to Steffen Thorsen.)
++
++    Paraguay will end DST on March 24 this year.
++    (Thanks to Steffen Thorsen.)  For now, assume it's just this year.
++
++    Morocco does not observe DST during Ramadan;
++    try to predict Ramadan in Morocco as best we can.
++    (Thanks to Erik Homoet for the heads-up.)
++
++  Changes affecting commentary:
++
++    Update URLs in tz-link page.  Add URLs for webOS, BB10, iOS.
++    Update URL for Solaris.  Mention Internet RFC 6557.
++    Update Internet RFCs 2445->5545, 2822->5322.
++    Switch from FTP to HTTP for Internet RFCs.
++
++
++Release 2013a - 2013-02-27 09:20:35 -0800
++
++  Change affecting binary data format:
++
++    The zone offset at the end of version-2-format zone files is now
++    allowed to be 24:00, as per POSIX.1-2008.  (Thanks to Arthur David Olson.)
++
++  Changes affecting current and future time stamps:
++
++    Chile's 2013 rules, and we guess rules for 2014 and later, will be
++    the same as 2012, namely Apr Sun>=23 03:00 UTC to Sep Sun>=2 04:00 UTC.
++    (Thanks to Steffen Thorsen and Robert Elz.)
++
++    New Zones Asia/Khandyga, Asia/Ust-Nera, Europe/Busingen.
++    (Thanks to Tobias Conradi and Arthur David Olson.)
++
++  Many changes affect historical time stamps before 1940.
++  These were deduced from: Milne J. Civil time. Geogr J. 1899
++  Feb;13(2):173-94 <http://www.jstor.org/stable/1774359>.
++
++  Changes affecting the code:
++
++    Fix zic bug that mishandled Egypt's 2010 changes (this also affected
++    the data).  (Thanks to Arthur David Olson.)
++
++    Fix localtime bug when time_t is unsigned and data files were generated
++    by a signed time_t system.  (Thanks to Doug Bailey for reporting and
++    to Arthur David Olson for fixing.)
++
++    Allow the email address for bug reports to be set by the packager.
++    The default is tz@iana.org, as before.  (Thanks to Joseph S. Myers.)
++
++    Update HTML checking to be compatible with Ubuntu 12.10.
++
++    Check that files are a safe subset of ASCII.  At some point we may
++    relax this requirement to a safe subset of UTF-8.  Without the
++    check, some non-UTF-8 encodings were leaking into the distribution.
++
++  Commentary changes:
++
++    Restore a comment about copyright notices that was inadvertently deleted.
++    (Thanks to Arthur David Olson.)
++
++    Improve the commentary about which districts observe what times
++    in Russia.  (Thanks to Oscar van Vlijmen and Arthur David Olson).
++
++    Add web page links to tz.js.
++
++    Add "Run by the Monkeys" to tz-art.  (Thanks to Arthur David Olson.)
++
++
++Release 2012j - 2012-11-12 18:34:49 -0800
++
++  Libya moved to CET this weekend, but with DST planned next year.
++  (Thanks to Even Scharning, Steffen Thorsen, and Tim Parenti.)
++
++  Signatures now have the extension .asc, not .sign, as that's more
++  standard.  (Thanks to Phil Pennock.)
++
++  The output of 'zdump --version', and of 'zic --version', now
++  uses a format that is more typical for --version.
++  (Thanks to Joseph S. Myers.)
++
++  The output of 'tzselect --help', 'zdump --help', and 'zic --help'
++  now uses tz@iana.org rather than the old elsie address.
++
++  zic -v now complains about abbreviations that are less than 3
++  or more than 6 characters, as per Posix.  Formerly, it checked
++  for abbreviations that were more than 3.
++
++  'make public' no longer puts its temporary directory under /tmp,
++  and uses the just-built zic rather than the system zic.
++
++  Various fixes to documentation and commentary.
++
++
++Release 2012i - 2012-11-03 12:57:09 -0700
++
++  Cuba switches from DST tomorrow at 01:00.  (Thanks to Steffen Thorsen.)
++
++  Linker flags can now be specified via LDFLAGS.
++  AWK now defaults to 'awk', not 'nawk'.
++  The shell in tzselect now defaults to /bin/bash, but this can
++  be overridden by specifying KSHELL.
++  The main web page now mentions the unofficial GitHub repository.
++  (Thanks to Mike Frysinger.)
++
++  Tarball signatures can now be built by running 'make signatures'.
++  There are also new makefile rules 'tarballs', 'check_public', and
++  separate makefile rules for each tarball and signature file.
++  A few makefile rules are now more portable to strict POSIX.
++
++  The main web page now lists the canonical IANA URL.
++
++
++Release 2012h - 2012-10-26 22:49:10 -0700
++
++  Bahia no longer has DST.  (Thanks to Kelley Cook.)
++
++  Tocantins has DST.  (Thanks to Rodrigo Severo.)
++
++  Israel has new DST rules next year.  (Thanks to Ephraim Silverberg.)
++
++  Jordan stays on DST this winter.  (Thanks to Steffen Thorsen.)
++
++  Web page updates.
++
++  More C modernization, except that at Arthur David Olson's suggestion
++  the instances of 'register' were kept.
++
++
++Release 2012g - 2012-10-17 20:59:45 -0700
++
++  Samoa fall 2012 and later.  (Thanks to Nicholas Pereira and Robert Elz.)
++
++  Palestine fall 2012.  (Thanks to Steffen Thorsen.)
++
++  Assume C89.
++
++  To attack the version-number problem, this release ships the file
++  'Makefile' (which contains the release number) in both the tzcode and
++  the tzdata tarballs.  The two Makefiles are identical, and should be
++  identical in any matching pair of tarballs, so it shouldn't matter
++  which order you extract the tarballs.  Perhaps we can come up with a
++  better version-number scheme at some point; this scheme does have the
++  virtue of not adding more files.
++
++
++Release 2012f - 2012-09-12 23:17:03 -0700
++
++  * australasia (Pacific/Fiji): Fiji DST is October 21 through January
++    20 this year.  (Thanks to Steffen Thorsen.)
++
++
++Release 2012e - 2012-08-02 20:44:55 -0700
++
++  * australasia (Pacific/Fakaofo): Tokelau is UT +13, not +14.
++    (Thanks to Steffen Thorsen.)
++
++  * Use a single version number for both code and data.
++
++  * .gitignore: New file.
++
++  * Remove trailing white space.
++
++
++Release code2012c-data2012d - 2012-07-19 16:35:33 -0700
++
++  Changes for Morocco's time stamps, which take effect in a couple of
++  hours, along with infrastructure changes to accommodate how the tz
++  code and data are released on IANA.
++
++
++Release data2012c - 2012-03-27 12:17:25 -0400
++
++  africa
++	Summer time changes for Morocco (to start late April 2012)
++
++  asia
++	Changes for 2012 for Gaza & the West Bank (Hebron) and Syria
++
++  northamerica
++	Haiti following US/Canada rules for 2012 (and we're assuming,
++	for now anyway, for the future).
++
++
++Release 2012b - 2012-03-02 12:29:15 +0700
++
++  There is just one change to tzcode2012b (compared with 2012a):
++  the Makefile that was accidentally included with 2012a has been
++  replaced with the version that should have been there, which is
++  identical with the previous version (from tzcode2011i).
++
++  There are just two changes in tzdata2012b compared with 2012a.
++
++  Most significantly, summer time in Cuba has been delayed 3 weeks
++  (now starts April 1 rather than March 11).   Since Mar 11 (the old start
++  date, as listed in 2012a) is just a little over a week away, this
++  change is urgent.
++
++  Less importantly, an excess tab in one of the changes in zone.tab
++  in 2012a has been removed.
++
++
++Release 2012a - 2012-03-01 18:28:10 +0700
++
++  The changes in tzcode2012a (compared to the previous version, 2011i)
++  are entirely to the README and tz-art.htm and tz-link.htm files, if
++  none of those concern you, you can ignore the code update.  The changes
++  reflect the changed addresses for the mailing list and the code and
++  data distribution points & methods (and a link to DateTime::TimeZone::Tzfile
++  has been added to tz-link.htm).
++
++  In tzdata2012a (compared to the previous release, which was 2011n)
++  the major changes are:
++	Chile 2011/2012 and 2012/2013 summer time date adjustments.
++	Falkland Islands onto permanent summer time (we're assuming for the
++		foreseeable future, though 2012 is all we're fairly certain of.)
++	Armenia has abolished Summer Time.
++	Tokelau jumped the International Date Line back last December
++		(just the same as their near neighbour, Samoa).
++	America/Creston is a new zone for a small area of British Columbia
++	There will be a leapsecond 2012-06-30 23:59:60 UTC.
++
++  Other minor changes are:
++	Corrections to 1918 Canadian summer time end dates.
++	Updated URL for UK time zone history (in comments)
++	A few typos in Le Corre's list of free French place names (comments)
++
++
++Release data2011n - 2011-10-30 14:57:54 +0700
++
++  There are three changes of note - most urgently, Cuba (America/Havana)
++  has extended summer time by two weeks, now to end on Nov 13, rather than
++  the (already past) Oct 30.   Second, the Pridnestrovian Moldavian Republic
++  (Europe/Tiraspol) decided not to split from the rest of Moldova after
++  all, and consequently that zone has been removed (again) and reinstated
++  in the "backward" file as a link to Europe/Chisinau.   And third, the
++  end date for Fiji's summer time this summer was moved forward from the
++  earlier planned Feb 26, to Jan 22.
++
++  Apart from that, Moldova (MD) returns to a single entry in zone.tab
++  (and the incorrect syntax that was in the 2011m version of that file
++  is so fixed - it would have been fixed in a different way had this
++  change not happened - that's the "missing" sccs version id).
++
++
++Release data2011m - 2011-10-24 21:42:16 +0700
++
++  In particular, the typos in comments in the data (2011-11-17 should have
++  been 2011-10-17 as Alan Barrett noted, and spelling of Tiraspol that
++  Tim Parenti noted) have been fixed, and the change for Ukraine has been
++  made in all 4 Ukrainian zones, rather than just Kiev (again, thanks to
++  Tim Parenti, and also Denys Gavrysh)
++
++  In addition, I added Europe/Tiraspol to zone.tab.
++
++  This time, all the files have new version numbers...  (including the files
++  otherwise unchanged in 2011m that were changed in 2011l but didn't get new
++  version numbers there...)
++
++
++Release data2011l - 2011-10-10 11:15:43 +0700
++
++  There are just 2 changes that cause different generated tzdata files from
++  zic, to Asia/Hebron and Pacific/Fiji - the possible change for Bahia, Brazil
++  is included, but commented out.  Compared with the diff I sent out last week,
++  this version also includes attributions for the sources for the changes
++  (in much the same format as ado used, but the html tags have not been
++  checked, verified, or used in any way at all, so if there are errors there,
++  please let me know.)
++
++
++Release data2011k - 2011-09-20 17:54:03 -0400
++
++  [not summarized]
++
++
++Release data2011j - 2011-09-12 09:22:49 -0400
++
++  (contemporary changes for Samoa; past changes for Kenya, Uganda, and
++  Tanzania); there are also two spelling corrections to comments in
++  the australasia file (with thanks to Christos Zoulas).
++
++
++Release 2011i - 2011-08-29 05:56:32 -0400
++
++  [not summarized]
++
++
++Release data2011h - 2011-06-15 18:41:48 -0400
++
++  Russia and Curaçao changes
++
++
++Release 2011g - 2011-04-25 09:07:22 -0400
++
++  update the rules for Egypt to reflect its abandonment of DST this year
++
++
++Release 2011f - 2011-04-06 17:14:53 -0400
++
++  [not summarized]
++
++
++Release 2011e - 2011-03-31 16:04:38 -0400
++
++  Morocco, Chile, and tz-link changes
++
++
++Release 2011d - 2011-03-14 09:18:01 -0400
++
++  changes that impact present-day time stamps in Cuba, Samoa, and Turkey
++
++
++Release 2011c - 2011-03-07 09:30:09 -0500
++
++  These do affect current time stamps in Chile and Annette Island, Canada.
++
++
++Release 2011b - 2011-02-07 08:44:50 -0500
++
++  [not summarized]
++
++
++Release 2011a - 2011-01-24 10:30:16 -0500
++
++  [not summarized]
++
++
++Release data2010o - 2010-11-01 09:18:23 -0400
++
++  change to the end of DST in Fiji in 2011
++
++
++Release 2010n - 2010-10-25 08:19:17 -0400
++
++  [not summarized]
++
++
++Release 2010m - 2010-09-27 09:24:48 -0400
++
++  Hong Kong, Vostok, and zic.c changes
++
++
++Release 2010l - 2010-08-16 06:57:25 -0400
++
++  [not summarized]
++
++
++Release 2010k - 2010-07-26 10:42:27 -0400
++
++  [not summarized]
++
++
++Release 2010j - 2010-05-10 09:07:48 -0400
++
++  changes for Bahía de Banderas and for version naming
++
++
++Release data2010i - 2010-04-16 18:50:45 -0400
++
++  the end of DST in Morocco on 2010-08-08
++
++
++Release data2010h - 2010-04-05 09:58:56 -0400
++
++  [not summarized]
++
++
++Release data2010g - 2010-03-24 11:14:53 -0400
++
++  [not summarized]
++
++
++Release 2010f - 2010-03-22 09:45:46 -0400
++
++  [not summarized]
++
++
++Release data2010e - 2010-03-08 14:24:27 -0500
++
++  corrects the Dhaka bug found by Danvin Ruangchan
++
++
++Release data2010d - 2010-03-06 07:26:01 -0500
++
++  [not summarized]
++
++
++Release 2010c - 2010-03-01 09:20:58 -0500
++
++  changes including KRE's suggestion for earlier initialization of
++  "goahead" and "goback" structure elements
++
++
++Release code2010a - 2010-02-16 10:40:04 -0500
++
++  [not summarized]
++
++
++Release data2010b - 2010-01-20 12:37:01 -0500
++
++  Mexico changes
++
++
++Release data2010a - 2010-01-18 08:30:04 -0500
++
++  changes to Dhaka
++
++
++Release data2009u - 2009-12-26 08:32:28 -0500
++
++  changes to DST in Bangladesh
++
++
++Release 2009t - 2009-12-21 13:24:27 -0500
++
++  [not summarized]
++
++
++Release data2009s - 2009-11-14 10:26:32 -0500
++
++  (cosmetic) Antarctica change and the DST-in-Fiji-in-2009-and-2010 change
++
++
++Release 2009r - 2009-11-09 10:10:31 -0500
++
++  "antarctica" and "tz-link.htm" changes
++
++
++Release 2009q - 2009-11-02 09:12:40 -0500
++
++  with two corrections as reported by Eric Muller and Philip Newton
++
++
++Release data2009p - 2009-10-23 15:05:27 -0400
++
++  Argentina (including San Luis) changes (with the correction from
++  Mariano Absatz)
++
++
++Release data2009o - 2009-10-14 16:49:38 -0400
++
++  Samoa (commentary only), Pakistan, and Bangladesh changes
++
++
++Release data2009n - 2009-09-22 15:13:38 -0400
++
++  added commentary for Argentina and a change to the end of DST in
++  2009 in Pakistan
++
++
++Release data2009m - 2009-09-03 10:23:43 -0400
++
++  Samoa and Palestine changes
++
++
++Release data2009l - 2009-08-14 09:13:07 -0400
++
++  Samoa (comments only) and Egypt
++
++
++Release 2009k - 2009-07-20 09:46:08 -0400
++
++  [not summarized]
++
++
++Release data2009j - 2009-06-15 06:43:59 -0400
++
++  Bangladesh change (with a short turnaround since the DST change is
++  impending)
++
++
++Release 2009i - 2009-06-08 09:21:22 -0400
++
++  updating for DST in Bangladesh this year
++
++
++Release 2009h - 2009-05-26 09:19:14 -0400
++
++  [not summarized]
++
++
++Release data2009g - 2009-04-20 16:34:07 -0400
++
++  Cairo
++
++
++Release data2009f - 2009-04-10 11:00:52 -0400
++
++  correct DST in Pakistan
++
++
++Release 2009e - 2009-04-06 09:08:11 -0400
++
++  [not summarized]
++
++
++Release 2009d - 2009-03-23 09:38:12 -0400
++
++  Morocco, Tunisia, Argentina, and American Astronomical Society changes
++
++
++Release data2009c - 2009-03-16 09:47:51 -0400
++
++  change to the start of Cuban DST
++
++
++Release 2009b - 2009-02-09 11:15:22 -0500
++
++  [not summarized]
++
++
++Release 2009a - 2009-01-21 10:09:39 -0500
++
++  [not summarized]
++
++
++Release data2008i - 2008-10-21 12:10:25 -0400
++
++  southamerica and zone.tab files, with Argentina DST rule changes and
++  United States zone reordering and recommenting
++
++
++Release 2008h - 2008-10-13 07:33:56 -0400
++
++  [not summarized]
++
++
++Release 2008g - 2008-10-06 09:03:18 -0400
++
++  Fix a broken HTML anchor and update Brazil's DST transitions;
++  there's also a slight reordering of information in tz-art.htm.
++
++
++Release data2008f - 2008-09-09 22:33:26 -0400
++
++  [not summarized]
++
++
++Release 2008e - 2008-07-28 14:11:17 -0400
++
++  changes by Arthur David Olson and Jesper Nørgaard Welen
++
++
++Release data2008d - 2008-07-07 09:51:38 -0400
++
++  changes by Arthur David Olson, Paul Eggert, and Rodrigo Severo
++
++
++Release data2008c - 2008-05-19 17:48:03 -0400
++
++  Pakistan, Morocco, and Mongolia
++
++
++Release data2008b - 2008-03-24 08:30:59 -0400
++
++  including renaming Asia/Calcutta to Asia/Kolkata, with a backward
++  link provided
++
++
++Release 2008a - 2008-03-08 05:42:16 -0500
++
++  [not summarized]
++
++
++Release 2007k - 2007-12-31 10:25:22 -0500
++
++  most importantly, changes to the "southamerica" file based on
++  Argentina's readoption of daylight saving time
++
++
++Release 2007j - 2007-12-03 09:51:01 -0500
++
++  1. eliminate the "P" (parameter) macro;
++
++  2. the "noncontroversial" changes circulated on the time zone
++  mailing list (less the changes to "logwtmp.c");
++
++  3. eliminate "too many transition" errors when "min" is used in time
++  zone rules;
++
++  4. changes by Paul Eggert (including updated information for Venezuela).
++
++
++Release data2007i - 2007-10-30 10:28:11 -0400
++
++  changes for Cuba and Syria
++
++
++Release 2007h - 2007-10-01 10:05:51 -0400
++
++  changes by Paul Eggert, as well as an updated link to the ICU
++  project in tz-link.htm
++
++
++Release 2007g - 2007-08-20 10:47:59 -0400
++
++  changes by Paul Eggert
++
++  The "leapseconds" file has been updated to incorporate the most
++  recent International Earth Rotation and Reference Systems Service
++  (IERS) bulletin.
++
++  There's an addition to tz-art.htm regarding the television show "Medium".
++
++
++Release 2007f - 2007-05-07 10:46:46 -0400
++
++  changes by Paul Eggert (including Haiti, Turks and Caicos, and New
++  Zealand)
++
++  changes to zic.c to allow hour values greater than 24 (along with
++  Paul's improved time value overflow checking)
++
++
++Release 2007e - 2007-04-02 10:11:52 -0400
++
++  Syria and Honduras changes by Paul Eggert
++
++  zic.c variable renaming changes by Arthur David Olson
++
++
++Release 2007d - 2007-03-20 08:48:30 -0400
++
++  changes by Paul Eggert
++
++  the elimination of white space at the ends of lines
++
++
++Release 2007c - 2007-02-26 09:09:37 -0500
++
++  changes by Paul Eggert
++
++
++Release 2007b - 2007-02-12 09:34:20 -0500
++
++  Paul Eggert's proposed change to the quotation handling logic in zic.c.
++
++  changes to the commentary in "leapseconds" reflecting the IERS
++  announcement that there is to be no positive leap second at the end
++  of June 2007.
++
++
++Release 2007a - 2007-01-08 12:28:29 -0500
++
++  changes by Paul Eggert
++
++  Derick Rethan's Asmara change
++
++  Oscar van Vlijmen's Easter Island local mean time change
++
++  symbolic link changes
++
++
++Release 2006p - 2006-11-27 08:54:27 -0500
++
++  changes by Paul Eggert
++
++
++Release 2006o - 2006-11-06 09:18:07 -0500
++
++  changes by Paul Eggert
++
++
++Release 2006n - 2006-10-10 11:32:06 -0400
++
++  changes by Paul Eggert
++
++
++Release 2006m - 2006-10-02 15:32:35 -0400
++
++  changes for Uruguay, Palestine, and Egypt by Paul Eggert
++
++  (minimalist) changes to zic.8 to clarify "until" information
++
++
++Release data2006l - 2006-09-18 12:58:11 -0400
++
++  Paul's best-effort work on this coming weekend's Egypt time change
++
++
++Release 2006k - 2006-08-28 12:19:09 -0400
++
++  changes by Paul Eggert
++
++
++Release 2006j - 2006-08-21 09:56:32 -0400
++
++  changes by Paul Eggert
++
++
++Release code2006i - 2006-08-07 12:30:55 -0400
++
++  localtime.c fixes
++
++  Ken Pizzini's conversion script
++
++
++Release code2006h - 2006-07-24 09:19:37 -0400
++
++  adds public domain notices to four files
++
++  includes a fix for transition times being off by a second
++
++  adds a new recording to the "arts" file (information courtesy Colin Bowern)
++
++
++Release 2006g - 2006-05-08 17:18:09 -0400
++
++  northamerica changes by Paul Eggert
++
++
++Release 2006f - 2006-05-01 11:46:00 -0400
++
++  a missing version number problem is fixed (with thanks to Bradley
++  White for catching the problem)
++
++
++Release 2006d - 2006-04-17 14:33:43 -0400
++
++  changes by Paul Eggert
++
++  added new items to tz-arts.htm that were found by Paul
++
++
++Release 2006c - 2006-04-03 10:09:32 -0400
++
++  two sets of data changes by Paul Eggert
++
++  a fencepost error fix in zic.c
++
++  changes to zic.c and the "europe" file to minimize differences
++  between output produced by the old 32-bit zic and the new 64-bit
++  version
++
++
++Release 2006b - 2006-02-20 10:08:18 -0500
++  [tz32code2006b + tz64code2006b + tzdata2006b]
++
++  64-bit code
++
++  All SCCS IDs were bumped to "8.1" for this release.
++
++
++Release 2006a - 2006-01-30 08:59:31 -0500
++
++  changes by Paul Eggert (in particular, Indiana time zone moves)
++
++  an addition to the zic manual page to describe how special-case
++  transitions are handled
++
++
++Release 2005r - 2005-12-27 09:27:13 -0500
++
++  Canadian changes by Paul Eggert
++
++  They also add "<pre>" directives to time zone data files and reflect
++  changes to warning message logic in "zdump.c" (but with calls to
++  "gettext" kept unbundled at the suggestion of Ken Pizzini).
++
++
++Release 2005q - 2005-12-13 09:17:09 -0500
++
++  Nothing earth-shaking here:
++	1.  Electronic mail addresses have been removed.
++	2.  Casts of the return value of exit have been removed.
++	3.  Casts of the argument of is.* macros have been added.
++	4.  Indentation in one section of zic.c has been fixed.
++	5.  References to dead URLs in the data files have been dealt with.
++
++
++Release 2005p - 2005-12-05 10:30:53 -0500
++
++  "systemv", "tz-link.htm", and "zdump.c" changes
++  (less the casts of arguments to the is* macros)
++
++
++Release 2005o - 2005-11-28 10:55:26 -0500
++
++  Georgia, Cuba, Nicaragua, and Jordan changes by Paul Eggert
++
++  zdump.c lint fixes by Arthur David Olson
++
++
++Release 2005n - 2005-10-03 09:44:09 -0400
++
++  changes by Paul Eggert (both the Uruguay changes and the Kyrgyzstan
++  et al. changes)
++
++
++Release 2005m - 2005-08-29 12:15:40 -0400
++
++  changes by Paul Eggert (with a small tweak to the tz-art change)
++
++  a declaration of an unused variable has been removed from zdump.c
++
++
++Release 2005l - 2005-08-22 12:06:39 -0400
++
++  changes by Paul Eggert
++
++  overflow/underflow checks by Arthur David Olson, minus changes to
++  the "Theory" file about the pending addition of 64-bit data (I grow
++  less confident of the changes being accepted with each passing day,
++  and the changes no longer increase the data files nine-fold--there's
++  less than a doubling in size by my local Sun's reckoning)
++
++
++Release 2005k - 2005-07-14 14:14:24 -0400
++
++  The "leapseconds" file has been edited to reflect the recently
++  announced leap second at the end of 2005.
++
++  I've also deleted electronic mail addresses from the files as an
++  anti-spam measure.
++
++
++Release 2005j - 2005-06-13 14:34:13 -0400
++
++  These reflect changes to limit the length of time zone abbreviations
++  and the characters used in those abbreviations.
++
++  There are also changes to handle POSIX-style "quoted" time zone
++  environment variables.
++
++  The changes were circulated on the time zone mailing list; the only
++  change since then was the removal of a couple of minimum-length of
++  abbreviation checks.
++
++
++Release data2005i - 2005-04-21 15:04:16 -0400
++
++  changes (most importantly to Nicaragua and Haiti) by Paul Eggert
++
++
++Release 2005h - 2005-04-04 11:24:47 -0400
++
++  changes by Paul Eggert
++
++  minor changes to Makefile and zdump.c to produce more useful output
++  when doing a "make typecheck"
++
++
++Release 2005g - 2005-03-14 10:11:21 -0500
++
++  changes by Paul Eggert (a change to current DST rules in Uruguay and
++  an update to a link to time zone software)
++
++
++Release 2005f - 2005-03-01 08:45:32 -0500
++
++  data and documentation changes by Paul Eggert
++
++
++Release 2005e - 2005-02-10 15:59:44 -0500
++
++  [not summarized]
++
++
++Release code2005d - 2005-01-31 09:21:47 -0500
++
++  make zic complain about links to links if the -v flag is used
++
++  have "make public" do more code checking
++
++  add an include to "localtime.c" for the benefit of gcc systems
++
++
++Release 2005c - 2005-01-17 18:36:29 -0500
++
++  get better results when mktime runs on a system where time_t is double
++
++  changes to the data files (most importantly to Paraguay)
++
++
++Release 2005b - 2005-01-10 09:19:54 -0500
++
++  Get localtime and gmtime working on systems with exotic time_t types.
++
++  Update the leap second commentary in the "leapseconds" file.
++
++
++Release 2005a - 2005-01-01 13:13:44 -0500
++
++  [not summarized]
++
++
++Release code2004i - 2004-12-14 13:42:58 -0500
++
++  Deal with systems where time_t is unsigned.
++
++
++Release code2004h - 2004-12-07 11:40:18 -0500
++
++  64-bit-time_t changes
++
++
++Release 2004g - 2004-11-02 09:06:01 -0500
++
++  update to Cuba (taking effect this weekend)
++
++  other changes by Paul Eggert
++
++  correction of the spelling of Oslo
++
++  changed versions of difftime.c and private.h
++
++
++Release code2004f - 2004-10-21 10:25:22 -0400
++
++  Cope with wide-ranging tm_year values.
++
++
++Release 2004e - 2004-10-11 14:47:21 -0400
++
++  Brazil/Argentina/Israel changes by Paul Eggert
++
++  changes to tz-link.htm by Paul
++
++  one small fix to Makefile
++
++
++Release 2004d - 2004-09-22 08:27:29 -0400
++
++  Avoid overflow problems when TM_YEAR_BASE is added to an integer.
++
++
++Release 2004c - 2004-08-11 12:06:26 -0400
++
++  asctime-related changes
++
++  (variants of) some of the documentation changes suggested by Paul Eggert
++
++
++Release 2004b - 2004-07-19 14:33:35 -0400
++
++  data changes by Paul Eggert - most importantly, updates for Argentina
++
++
++Release 2004a - 2004-05-27 12:00:47 -0400
++
++  changes by Paul Eggert
++
++  Handle DST transitions that occur at the end of a month in some
++  years but at the start of the following month in other years.
++
++  Add a copy of the correspondence that's the basis for claims about
++  DST in the Navajo Nation.
++
++
++Release 2003e - 2003-12-15 09:36:47 -0500
++
++  changes by Arthur David Olson (primarily code changes)
++
++  changes by Paul Eggert (primarily data changes)
++
++  minor changes to "Makefile" and "northamerica" (in the latter case,
++  optimization of the "Toronto" rules)
++
++
++Release 2003d - 2003-10-06 09:34:44 -0400
++
++  changes by Paul Eggert
++
++
++Release 2003c - 2003-09-16 10:47:05 -0400
++
++  Fix bad returns in zic.c's inleap function.
++  Thanks to Bradley White for catching the problem!
++
++
++Release 2003b - 2003-09-16 07:13:44 -0400
++
++  Add a "--version" option (and documentation) to the zic and zdump commands.
++
++  changes to overflow/underflow checking in zic
++
++  a localtime typo fix.
++
++  Update the leapseconds and tz-art.htm files.
++
++
++Release 2003a - 2003-03-24 09:30:54 -0500
++
++  changes by Paul Eggert
++
++  a few additions and modifications to the tz-art.htm file
++
++
++Release 2002d - 2002-10-15 13:12:42 -0400
++
++  changes by Paul Eggert, less the "Britain (UK)" change in iso3166.tab
++
++  There's also a new time zone quote in "tz-art.htm".
++
++
++Release 2002c - 2002-04-04 11:55:20 -0500
++
++  changes by Paul Eggert
++
++  Change zic.c to avoid creating symlinks to files that don't exist.
++
++
++Release 2002b - 2002-01-28 12:56:03 -0500
++
++  [These change notes are for Release 2002a, which was corrupted.
++  2002b was a corrected version of 2002a.]
++
++  changes by Paul Eggert
++
++  Update the "leapseconds" file to note that there'll be no leap
++  second at the end of June, 2002.
++
++  Change "zic.c" to deal with a problem in handling the "Asia/Bishkek" zone.
++
++  Change to "difftime.c" to avoid sizeof problems.
++
++
++Release 2001d - 2001-10-09 13:31:32 -0400
++
++  changes by Paul Eggert
++
++
++Release 2001c - 2001-06-05 13:59:55 -0400
++
++  changes by Paul Eggert and Andrew Brown
++
++
++Release 2001b - 2001-04-05 16:44:38 -0400
++
++  changes by Paul Eggert (modulo jnorgard's typo fix)
++
++  tz-art.htm has been HTMLified.
++
++
++Release 2001a - 2001-03-13 12:57:44 -0500
++
++  changes by Paul Eggert
++
++  An addition to the "leapseconds" file: comments with the text of the
++  latest IERS leap second notice.
++
++  Trailing white space has been removed from data file lines, and
++  repeated spaces in "Rule Jordan" lines in the "asia" file have been
++  converted to tabs.
++
++
++Release 2000h - 2000-12-14 15:33:38 -0500
++
++  changes by Paul Eggert
++
++  one typo fix in the "art" file
++
++  With providence, this is the last update of the millennium.
++
++
++Release 2000g - 2000-10-10 11:35:22 -0400
++
++  changes by Paul Eggert
++
++  correction of John Mackin's name submitted by Robert Elz
++
++  Garry Shandling's Daylight Saving Time joke (!?!) from the recent
++  Emmy Awards broadcast.
++
++
++Release 2000f - 2000-08-10 09:31:58 -0400
++
++  changes by Paul Eggert
++
++  Added information in "tz-art.htm" on a Seinfeld reference to DST.
++
++  Error checking and messages in the "yearistype" script have been
++  improved.
++
++
++Release 2000e - 2000-07-31 09:27:54 -0400
++
++  data changes by Paul Eggert
++
++  a change to the default value of the defined constant HAVE_STRERROR
++
++  the addition of a Dave Barry quote on DST to the tz-arts file
++
++
++Release 2000d - 2000-04-20 15:43:04 -0400
++
++  changes to the documentation and code of strftime for C99 conformance
++
++  a bug fix for date.c
++
++  These are based on (though modified from) changes by Paul Eggert.
++
++
++Release 2000c - 2000-03-04 10:31:43 -0500
++
++  changes by Paul Eggert
++
++
++Release 2000b - 2000-02-21 12:16:29 -0500
++
++  changes by Paul Eggert and Joseph Myers
++
++  modest tweaks to the tz-art.htm and tz-link.htm files
++
++
++Release 2000a - 2000-01-18 09:21:26 -0500
++
++  changes by Paul Eggert
++
++  The two hypertext documents have also been renamed.
++
++
++Release code1999i-data1999j - 1999-11-15 18:43:22 -0500
++
++  Paul Eggert's changes
++
++  additions to the "zic" manual page and the "Arts.htm" file
++
++
++Release code1999h-data1999i - 1999-11-08 14:55:21 -0500
++
++  [not summarized]
++
++
++Release data1999h - 1999-10-07 03:50:29 -0400
++
++  changes by Paul Eggert to "europe" (most importantly, fixing
++  Lithuania and Estonia)
++
++
++Release 1999g - 1999-09-28 11:06:18 -0400
++
++  data changes by Paul Eggert (most importantly, the change for
++  Lebanon that buys correctness for this coming Sunday)
++
++  The "code" file contains changes to "Makefile" and "checktab.awk" to
++  allow better checking of time zone files before they are published.
++
++
++Release 1999f - 1999-09-23 09:48:14 -0400
++
++  changes by Arthur David Olson and Paul Eggert
++
++
++Release 1999e - 1999-08-17 15:20:54 -0400
++
++  changes circulated by Paul Eggert, although the change to handling
++  of DST-specifying time zone names has been commented out for now
++  (search for "XXX" in "localtime.c" for details).  These files also
++  do not make any changes to the start of DST in Brazil.
++
++  In addition to Paul's changes, there are updates to "Arts.htm" and
++  cleanups of URLs.
++
++
++Release 1999d - 1999-03-30 11:31:07 -0500
++
++  changes by Paul Eggert
++
++  The Makefile's "make public" rule has also been changed to do a test
++  compile of each individual time zone data file (which should help
++  avoid problems such as the one we had with Nicosia).
++
++
++Release 1999c - 1999-03-25 09:47:47 -0500
++
++  changes by Paul Eggert, most importantly the change for Chile.
++
++
++Release 1999b - 1999-02-01 17:51:44 -0500
++
++  changes by Paul Eggert
++
++  code changes (suggested by Mani Varadarajan, mani at be.com) for
++  correct handling of symbolic links when building using a relative directory
++
++  code changes to generate correct messages for failed links
++
++  updates to the URLs in Arts.htm
++
++
++Release 1999a - 1999-01-19 16:20:29 -0500
++
++  error message internationalizations and corrections in zic.c and
++  zdump.c (as suggested by Vladimir Michl, vladimir.michl at upol.cz,
++  to whom thanks!)
++
++
++Release code1998h-data1998i - 1998-10-01 09:56:10 -0400
++
++  changes for Brazil, Chile, and Germany
++
++  support for use of "24:00" in the input files for the time zone compiler
++
++
++Release code1998g-data1998h - 1998-09-24 10:50:28 -0400
++
++  changes by Paul Eggert
++
++  correction to a define in the "private.h" file
++
++
++Release data1998g - 1998-08-11 03:28:35 -0000
++  [tzdata1998g.tar.gz is missing!]
++
++  Lithuanian change provided by mgedmin at pub.osf.it
++
++  Move creation of the GMT link with Etc/GMT to "etcetera" (from
++  "backward") to ensure that the GMT file is created even where folks
++  don't want the "backward" links (as suggested by Paul Eggert).
++
++
++Release data1998f - 1998-07-20 13:50:00 -0000
++  [tzdata1998f.tar.gz is missing!]
++
++  Update the "leapseconds" file to include the newly-announced
++  insertion at the end of 1998.
++
++
++Release code1998f - 1998-06-01 10:18:31 -0400
++
++  addition to localtime.c by Guy Harris
++
++
++Release 1998e - 1998-05-28 09:56:26 -0400
++
++  The Makefile is changed to produce zoneinfo-posix rather than
++  zoneinfo/posix, and to produce zoneinfo-leaps rather than
++  zoneinfo/right.
++
++  data changes by Paul Eggert
++
++  changes from Guy Harris to provide asctime_r and ctime_r
++
++  A usno1998 file (substantially identical to usno1997) has been added.
++
++
++Release 1998d - 1998-05-14 11:58:34 -0400
++
++  changes to comments (in particular, elimination of references to CIA maps).
++  "Arts.htm", "WWW.htm", "asia", and "australasia" are the only places
++  where changes occur.
++
++
++Release 1998c - 1998-02-28 12:32:26 -0500
++
++  changes by Paul Eggert (save the "French correction," on which I'll
++  wait for the dust to settle)
++
++  symlink changes
++
++  changes and additions to Arts.htm
++
++
++Release 1998b - 1998-01-17 14:31:51 -0500
++
++  URL cleanups and additions
++
++
++Release 1998a - 1998-01-13 12:37:35 -0500
++
++  changes by Paul Eggert
++
++
++Release code1997i-data1997k - 1997-12-29 09:53:41 -0500
++
++  changes by Paul Eggert, with minor modifications from Arthur David
++  Olson to make the files more browser friendly
++
++
++Release code1997h-data1997j - 1997-12-18 17:47:35 -0500
++
++  minor changes to put "TZif" at the start of each time zone information file
++
++  a rule has also been added to the Makefile so you can
++	make zones
++  to just recompile the zone information files (rather than doing a
++  full "make install" with its other effects).
++
++
++Release data1997i - 1997-10-07 08:45:38 -0400
++
++  changes to Africa by Paul Eggert
++
++
++Release code1997g-data1997h - 1997-09-04 16:56:54 -0400
++
++  corrections for Uruguay (and other locations)
++
++  Arthur David Olson's simple-minded fix allowing mktime to both
++  correctly handle leap seconds and correctly handle tm_sec values
++  upon which arithmetic has been performed.
++
++
++Release code1997f-data1997g - 1997-07-19 13:15:02 -0400
++
++  Paul Eggert's updates
++
++  a small change to a function prototype;
++
++  "Music" has been renamed "Arts.htm", HTMLified, and augmented to
++  include information on Around the World in Eighty Days.
++
++
++Release code1997e-data1997f - 1997-05-03 18:52:34 -0400
++
++  fixes to zic's error handling
++
++  changes inspired by the item circulated on Slovenia
++
++  The description of Web resources has been HTMLified for browsing
++  convenience.
++
++  A new piece of tz-related music has been added to the "Music" file.
++
++
++Release code1997d-data1997e - 1997-03-29 12:48:52 -0500
++
++  Paul Eggert's latest suggestions
++
++
++Release code1997c-data1997d - 1997-03-07 20:37:54 -0500
++
++  changes to "zic.c" to correct performance of the "-s" option
++
++  a new file "usno1997"
++
++
++Release data1997c - 1997-03-04 09:58:18 -0500
++
++  changes in Israel
++
++
++Release 1997b - 1997-02-27 18:34:19 -0500
++
++  The data file incorporates the 1997 leap second.
++
++  The code file incorporates Arthur David Olson's take on the
++  zic/multiprocessor/directory-creation situation.
++
++
++Release 1997a - 1997-01-21 09:11:10 -0500
++
++  Paul Eggert's Antarctica (and other changes)
++
++  Arthur David Olson finessed the "getopt" issue by checking against
++  both -1 and EOF (regardless of POSIX, SunOS 4.1.1's manual says -1
++  is returned while SunOS 5.5's manual says EOF is returned).
++
++
++Release code1996o-data1996n - 1996-12-27 21:42:05 -0500
++
++  Paul Eggert's latest changes
++
++
++Release code1996n - 1996-12-16 09:42:02 -0500
++
++  link snapping fix from Bruce Evans (via Garrett Wollman)
++
++
++Release data1996m - 1996-11-24 02:37:34 -0000
++  [tzdata1996m.tar.gz is missing!]
++
++  Paul Eggert's batch of changes
++
++
++Release code1996m-data1996l - 1996-11-05 14:00:12 -0500
++
++  No functional changes here; the files have simply been changed to
++  make more use of ISO style dates in comments. The names of the above
++  files now include the year in full.
++
++
++Release code96l - 1996-09-08 17:12:20 -0400
++
++  tzcode96k was missing a couple of pieces.
++
++
++Release 96k - 1996-09-08 16:06:22 -0400
++
++  the latest round of changes from Paul Eggert
++
++  the recent Year 2000 material
++
++
++Release code96j - 1996-07-30 13:18:53 -0400
++
++  Set sp->typecnt as suggested by Timothy Patrick Murphy.
++
++
++Release code96i - 1996-07-27 20:11:35 -0400
++
++  Paul's suggested patch for strftime %V week numbers
++
++
++Release data96i - 1996-07-01 18:13:04 -0400
++
++  "northamerica" and "europe" changes by Paul Eggert
++
++
++Release code96h - 1996-06-05 08:02:21 -0400
++
++  fix for handling transitions specified in Universal Time
++
++  Some "public domain" notices have also been added.
++
++
++Release code96g - 1996-05-16 14:00:26 -0400
++
++  fix for the simultaneous-DST-and-zone-change challenge
++
++
++Release data96h - 1996-05-09 17:40:51 -0400
++
++  changes by Paul Eggert
++
++
++Release code96f-data96g - 1996-05-03 03:09:59 -0000
++  [tzcode96f.tar.gz + tzdata96g.tar.gz are both missing!]
++
++  The changes get us some of the way to fixing the problems noted in Paul
++  Eggert's letter yesterday (in addition to a few others).  The approach
++  has been to make zic a bit smarter about figuring out what time zone
++  abbreviations apply just after the time specified in the "UNTIL" part
++  of a zone line.  Putting the smarts in zic means avoiding having
++  transition times show up in both "Zone" lines and "Rule" lines, which
++  in turn avoids multiple transition time entries in time zone files.
++  (This also makes the zic input files such as "europe" a bit shorter and
++  should ease maintenance.)
++
++
++Release data96f - 1996-04-19 19:20:03 -0000
++  [tzdata96f.tar.gz is missing!]
++
++  The only changes are to the "northamerica" file; the time zone
++  abbreviation for Denver is corrected to MST (and MDT), and the
++  comments for Mexico have been updated.
++
++
++Release data96e - 1996-03-19 17:37:26 -0500
++
++  Proposals by Paul Eggert, in particular the Portugal change that
++  comes into play at the end of this month.
++
++
++Release data96d - 1996-03-18 20:49:39 -0500
++
++  [not summarized]
++
++
++Release code96e - 1996-02-29 15:43:27 -0000
++  [tzcode96e.tar.gz is missing!]
++
++  internationalization changes and the fix to the documentation for strftime
++
++
++Release code96d-data96c - 1996-02-12 11:05:27 -0500
++
++  The "code" file simply updates Bob Kridle's electronic address.
++
++  The "data" file updates rules for Mexico.
++
++
++Release data96b - 1996-01-27 15:44:42 -0500
++
++  Kiribati change
++
++
++Release code96c - 1996-01-16 16:58:15 -0500
++
++  leap-year streamlining and binary-search changes
++
++  fix to newctime.3
++
++
++Release code96b - 1996-01-10 20:42:39 -0500
++
++  fixes and enhancements from Paul Eggert, including code that
++  emulates the behavior of recent versions of the SunOS "date"
++  command.
++
++
++Release 96a - 1996-01-06 09:08:24 -0500
++
++  Israel updates
++
++  fixes to strftime.c for correct ISO 8601 week number generation,
++  plus support for two new formats ('G' and 'g') to give ISO 8601 year
++  numbers (which are not necessarily the same as calendar year numbers)
++
++
++Release code95i-data95m - 1995-12-21 12:46:47 -0500
++
++  The latest revisions from Paul Eggert are included, the usno1995
++  file has been updated, and a new file ("WWW") covering useful URLs
++  has been added.
++
++
++Release code95h-data95l - 1995-12-19 18:10:12 -0500
++
++  A simplification of a macro definition, a change to data for Sudan,
++  and (for last minute shoppers) notes in the "Music" file on the CD
++  "Old Man Time".
++
++
++Release code95g-data95k - 1995-10-30 10:32:47 -0500
++
++  (slightly reformatted) 8-bit-clean proposed patch
++
++  minor patch: US/Eastern -> America/New_York
++
++  snapshot of the USNO's latest data ("usno1995")
++
++  some other minor cleanups
++
++
++Release code95f-data95j - 1995-10-28 21:01:34 -0000
++  [tzcode95f.tar.gz + tzdata95j.tar.gz are both missing!]
++
++  European cleanups
++
++  support for 64-bit time_t's
++
++  optimization in localtime.c
++
++
++Release code95e - 1995-10-13 13:23:57 -0400
++
++  the mktime change to scan from future to past when trying to find time zone
++  offsets
++
++
++Release data95i - 1995-09-26 10:43:26 -0400
++
++  For Canada/Central, guess that the Sun customer's "one week too
++  early" was just a approximation, and the true error is one month
++  too early.  This is consistent with the rest of Canada.
++
++
++Release data95h - 1995-09-21 11:26:48 -0400
++
++  latest changes from Paul Eggert
++
++
++Release code95d - 1995-09-14 11:14:45 -0400
++
++  the addition of a "Music" file, which documents four recorded
++  versions of the tune "Save That Time".
++
++
++Release data95g - 1995-09-01 17:21:36 -0400
++
++  "yearistype" correction
++
++
++Release data95f - 1995-08-28 20:46:56 -0400
++
++  Paul Eggert's change to the australasia file
++
++
++Release data95e - 1995-07-08 18:02:34 -0400
++
++  The only change is a leap second at the end of this year.
++  Thanks to Bradley White for forwarding news on the leap second.
++
++
++Release data95d - 1995-07-03 13:26:22 -0400
++
++  Paul Eggert's changes
++
++
++Release data95c - 1995-07-02 19:19:28 -0400
++
++  changes to "asia", "backward", "europe", and "southamerica"
++  (read: northamericacentrics need not apply)
++
++
++Release code95c - 1995-03-13 14:00:46 -0500
++
++  one-line fix for sign extension problems in detzcode
++
++
++Release 95b - 1995-03-04 11:22:38 -0500
++
++  Minor changes in both:
++
++  The "code" file contains a workaround for the lack of "unistd.h" in
++  Microsoft C++ version 7.
++
++  The "data" file contains a fixed "Link" for America/Shiprock.
++
++
++Release 94h - 1994-12-10 12:51:14 -0500
++
++  The files:
++
++  *	incorporate the changes to "zdump" and "date" to make changes to
++	the "TZ" environment variable permanent;
++
++  *	incorporate the table changes by Paul Eggert;
++
++  *	include (and document) support for universal time specifications in
++	data files - but do not (yet) include use of this feature in the
++	data files.
++
++  Think of this as "TZ Classic" - the software has been set up not to break if
++  universal time shows up in its input, and data entries have been
++  left as is so as not to break existing implementations.
++
++
++Release data94f - 1994-08-20 12:56:09 -0400
++
++  (with thanks!) the latest data updates from Paul Eggert
++
++
++Release data94e - 1994-06-04 13:13:53 -0400
++
++  [not summarized]
++
++
++Release code94g - 1994-05-05 12:14:07 -0400
++
++  fix missing "optind.c" and a reference to it in the Makefile
++
++
++Release code94f - 1994-05-05 13:00:33 -0000
++  [tzcode94f.tar.gz is missing!]
++
++  changes to avoid overflow in difftime, as well as changes to cope
++  with the 52/53 challenge in strftime
++
++
++Release code94e - 1994-03-30 23:32:59 -0500
++
++  change for the benefit of PCTS
++
++
++Release 94d - 1994-02-24 15:42:25 -0500
++
++  Avoid clashes with POSIX semantics for zones such as GMT+4.
++
++  Some other very minor housekeeping is also present.
++
++
++Release code94c - 1994-02-10 08:52:40 -0500
++
++  Fix bug where mkdirs was broken unless you compile with
++  -fwritable-strings (which is generally losing to do).
++
++
++Release 94b - 1994-02-07 10:04:33 -0500
++
++  work by Paul Eggert who notes:
++
++  I found another book of time zone histories by E W Whitman; it's not
++  as extensive as Shanks but has a few goodies of its own.  I used it
++  to update the tables.  I also fixed some more as a result of
++  correspondence with Adam David and Peter Ilieve, and move some stray
++  links from 'europe' to 'backward'.  I corrected some scanning errors
++  in usno1989.
++
++  As far as the code goes, I fixed zic to allow years in the range
++  INT_MIN to INT_MAX; this fixed a few boundary conditions around 1900.
++  And I cleaned up the zic documentation a little bit.
++
++
++Release data94a - 1994-02-03 08:58:54 -0500
++
++  It simply incorporates the recently announced leap second into the
++  "leapseconds" file.
++
++
++Release 93g - 1993-11-22 17:28:27 -0500
++
++  Paul Eggert has provided a good deal of historic information (based
++  on Shanks), and there are some code changes to deal with the buglets
++  that crawled out in dealing with the new information.
++
++
++Release 93f - 1993-10-15 12:27:46 -0400
++
++  Paul Eggert's changes
++
++
++Release 93e - 1993-09-05 21:21:44 -0400
++
++  This has updated data for Israel, England, and Kwajalein.  There's
++  also an update to "zdump" to cope with Kwajalein's 24-hour jump.
++  Thanks to Paul Eggert and Peter Ilieve for the changes.
++
++
++Release 93d - 1993-06-17 23:34:17 -0400
++
++  new fix and new data on Israel
++
++
++Release 93c - 1993-06-06 19:31:55 -0400
++
++  [not summarized]
++
++
++Release 93b - 1993-02-02 14:53:58 -0500
++
++  updated "leapseconds" file
++
++
++Release 93 - 1993-01-08 07:01:06 -0500
++
++  At kre's suggestion, the package has been split in two - a code piece
++  (which also includes documentation) that's only of use to folks who
++  want to recompile things and a data piece useful to anyone who can
++  run "zic".
++
++  The new version has a few changes to the data files, a few
++  portability changes, and an off-by-one fix (with thanks to
++  Tom Karzes at deshaw.com for providing a description and a
++  solution).
++
++
++Release 92c - 1992-11-21 17:35:36 -0000
++  [tz92c.tar.Z is missing!]
++
++  The fallout from the latest round of DST transitions.
++
++  There are changes for Portugal, Saskatchewan, and "Pacific-New";
++  there's also a change to "zic.c" that makes it portable to more systems.
++
++
++Release 92 - 1992-04-25 18:17:03 -0000
++  [tz92.tar.Z is missing!]
++
++  By popular demand (well, at any rate, following a request by kre at munnari)
++
++
++The 1989 update of the time zone package featured:
++
++  *	POSIXization (including interpretation of POSIX-style TZ environment
++	variables, provided by Guy Harris),
++  *	ANSIfication (including versions of "mktime" and "difftime"),
++  *	SVIDulation (an "altzone" variable)
++  *	MACHination (the "gtime" function)
++  *	corrections to some time zone data (including corrections to the rules
++	for Great Britain and New Zealand)
++  *	reference data from the United States Naval Observatory for folks who
++	want to do additional time zones
++  *	and the 1989 data for Saudi Arabia.
++
++  (Since this code will be treated as "part of the implementation" in some
++  places and as "part of the application" in others, there's no good way to
++  name functions, such as timegm, that are not part of the proposed ANSI C
++  standard; such functions have kept their old, underscore-free names in this
++  update.)
++
++  And the "dysize" function has disappeared; it was present to allow
++  compilation of the "date" command on old BSD systems, and a version of "date"
++  is now provided in the package.  The "date" command is not created when you
++  "make all" since it may lack options provided by the version distributed with
++  your operating system, or may not interact with the system in the same way
++  the native version does.
++
++  Since POSIX frowns on correct leap second handling, the default behavior of
++  the "zic" command (in the absence of a "-L" option) has been changed to omit
++  leap second information from its output files.
++
++
++-----
++Notes
++
++This file contains copies of the part of each release announcement
++that talks about the changes in that release.  The text has been
++adapted and reformatted for the purposes of this file.
++
++Traditionally a release R consists of a pair of tarball files,
++tzcodeR.tar.gz and tzdataR.tar.gz.  However, some releases (e.g.,
++code2010a, data2012c) consist of just one or the other tarball, and a
++few (e.g., code2012c-data2012d) have tarballs with mixed version
++numbers.  Recent releases also come in an experimental format
++consisting of a single tarball tzdb-R.tar.lz with extra data.
++
++Release time stamps are taken from the release's commit (for newer,
++Git-based releases), from the newest file in the tarball (for older
++releases, where this info is available) or from the email announcing
++the release (if all else fails; these are marked with a time zone of
++-0000 and an "is missing!" comment).
++
++Earlier versions of the code and data were not announced on the tz
++list and are not summarized here.
++
++This file is in the public domain.
++
++Local Variables:
++coding: utf-8
++End:
+--- contrib/tzdata/README.orig
++++ contrib/tzdata/README
+@@ -0,0 +1,71 @@
++README for the tz distribution
++
++"What time is it?" -- Richard Deacon as The King
++"Any time you want it to be." -- Frank Baxter as The Scientist
++					(from the Bell System film "About Time")
++
++The Time Zone Database (often called tz or zoneinfo) contains code and
++data that represent the history of local time for many representative
++locations around the globe.  It is updated periodically to reflect
++changes made by political bodies to time zone boundaries, UTC offsets,
++and daylight-saving rules.
++
++Here is a recipe for acquiring, building, installing, and testing the
++tz distribution on a GNU/Linux or similar host.
++
++To acquire the distribution, run the following shell commands:
++
++	mkdir tz
++	cd tz
++	wget --retr-symlinks 'ftp://ftp.iana.org/tz/tz*-latest.tar.gz'
++	gzip -dc tzcode-latest.tar.gz | tar -xf -
++	gzip -dc tzdata-latest.tar.gz | tar -xf -
++
++Alternatively, the following shell commands acquire the same
++distribution, with extra data useful for regression testing:
++
++	wget --retr-symlinks 'ftp://ftp.iana.org/tz/tzdb-latest.tar.lz'
++	lzip -dc tzdb-latest.tar.lz | tar -xf -
++
++Be sure to read the comments in "Makefile" and make any changes needed
++to make things right for your system, especially if you are using some
++platform other than GNU/Linux.  Then run the following commands,
++substituting your desired installation directory for "$HOME/tzdir":
++
++	make TOPDIR=$HOME/tzdir install
++	$HOME/tzdir/etc/zdump -v America/Los_Angeles
++
++Historical local time information has been included here to:
++
++*	provide a compendium of data about the history of civil time
++	that is useful even if not 100% accurate;
++
++*	give an idea of the variety of local time rules that have
++	existed in the past and thus an idea of the variety that may be
++	expected in the future;
++
++*	provide a test of the generality of the local time rule description
++	system.
++
++The information in the time zone data files is by no means authoritative;
++fixes and enhancements are welcome.  Please see the file CONTRIBUTING
++for details.
++
++Thanks to these Time Zone Caballeros who've made major contributions to the
++time conversion package: Keith Bostic; Bob Devine; Paul Eggert; Robert Elz;
++Guy Harris; Mark Horton; John Mackin; and Bradley White.  Thanks also to
++Michael Bloom, Art Neilson, Stephen Prince, John Sovereign, and Frank Wales
++for testing work, and to Gwillim Law for checking local mean time data.
++Thanks in particular to Arthur David Olson, the project's founder and first
++maintainer, to whom the time zone community owes the greatest debt of all.
++None of them are responsible for remaining errors.
++
++Look in <ftp://ftp.iana.org/tz/releases/> for updated versions of these files.
++
++Please send comments or information to tz@iana.org.
++
++-----
++
++This file is in the public domain, so clarified as of 2009-05-17 by
++Arthur David Olson.  The other files in this distribution are either
++public domain or BSD licensed; see the file LICENSE for details.
+--- contrib/tzdata/Theory.orig
++++ contrib/tzdata/Theory
+@@ -0,0 +1,840 @@
++Theory and pragmatics of the tz code and data
++
++
++----- Outline -----
++
++	Scope of the tz database
++	Names of time zone rules
++	Time zone abbreviations
++	Accuracy of the tz database
++	Time and date functions
++	Calendrical issues
++	Time and time zones on Mars
++
++
++----- Scope of the tz database -----
++
++The tz database attempts to record the history and predicted future of
++all computer-based clocks that track civil time.  To represent this
++data, the world is partitioned into regions whose clocks all agree
++about time stamps that occur after the somewhat-arbitrary cutoff point
++of the POSIX Epoch (1970-01-01 00:00:00 UTC).  For each such region,
++the database records all known clock transitions, and labels the region
++with a notable location.  Although 1970 is a somewhat-arbitrary
++cutoff, there are significant challenges to moving the cutoff earlier
++even by a decade or two, due to the wide variety of local practices
++before computer timekeeping became prevalent.
++
++Clock transitions before 1970 are recorded for each such location,
++because most systems support time stamps before 1970 and could
++misbehave if data entries were omitted for pre-1970 transitions.
++However, the database is not designed for and does not suffice for
++applications requiring accurate handling of all past times everywhere,
++as it would take far too much effort and guesswork to record all
++details of pre-1970 civil timekeeping.
++
++As described below, reference source code for using the tz database is
++also available.  The tz code is upwards compatible with POSIX, an
++international standard for UNIX-like systems.  As of this writing, the
++current edition of POSIX is:
++
++  The Open Group Base Specifications Issue 7
++  IEEE Std 1003.1, 2013 Edition
++  <http://pubs.opengroup.org/onlinepubs/9699919799/>
++
++
++
++----- Names of time zone rules -----
++
++Each of the database's time zone rules has a unique name.
++Inexperienced users are not expected to select these names unaided.
++Distributors should provide documentation and/or a simple selection
++interface that explains the names; for one example, see the 'tzselect'
++program in the tz code.  The Unicode Common Locale Data Repository
++<http://cldr.unicode.org/> contains data that may be useful for other
++selection interfaces.
++
++The time zone rule naming conventions attempt to strike a balance
++among the following goals:
++
++ * Uniquely identify every region where clocks have agreed since 1970.
++   This is essential for the intended use: static clocks keeping local
++   civil time.
++
++ * Indicate to experts where that region is.
++
++ * Be robust in the presence of political changes.  For example, names
++   of countries are ordinarily not used, to avoid incompatibilities
++   when countries change their name (e.g. Zaire->Congo) or when
++   locations change countries (e.g. Hong Kong from UK colony to
++   China).
++
++ * Be portable to a wide variety of implementations.
++
++ * Use a consistent naming conventions over the entire world.
++
++Names normally have the form AREA/LOCATION, where AREA is the name
++of a continent or ocean, and LOCATION is the name of a specific
++location within that region.  North and South America share the same
++area, 'America'.  Typical names are 'Africa/Cairo', 'America/New_York',
++and 'Pacific/Honolulu'.
++
++Here are the general rules used for choosing location names,
++in decreasing order of importance:
++
++	Use only valid POSIX file name components (i.e., the parts of
++		names other than '/').  Do not use the file name
++		components '.' and '..'.  Within a file name component,
++		use only ASCII letters, '.', '-' and '_'.  Do not use
++		digits, as that might create an ambiguity with POSIX
++		TZ strings.  A file name component must not exceed 14
++		characters or start with '-'.  E.g., prefer 'Brunei'
++		to 'Bandar_Seri_Begawan'.  Exceptions: see the discussion
++		of legacy names below.
++	A name must not be empty, or contain '//', or start or end with '/'.
++	Do not use names that differ only in case.  Although the reference
++		implementation is case-sensitive, some other implementations
++		are not, and they would mishandle names differing only in case.
++	If one name A is an initial prefix of another name AB (ignoring case),
++		then B must not start with '/', as a regular file cannot have
++		the same name as a directory in POSIX.  For example,
++		'America/New_York' precludes 'America/New_York/Bronx'.
++	Uninhabited regions like the North Pole and Bouvet Island
++		do not need locations, since local time is not defined there.
++	There should typically be at least one name for each ISO 3166-1
++		officially assigned two-letter code for an inhabited country
++		or territory.
++	If all the clocks in a region have agreed since 1970,
++		don't bother to include more than one location
++		even if subregions' clocks disagreed before 1970.
++		Otherwise these tables would become annoyingly large.
++	If a name is ambiguous, use a less ambiguous alternative;
++		e.g. many cities are named San José and Georgetown, so
++		prefer 'Costa_Rica' to 'San_Jose' and 'Guyana' to 'Georgetown'.
++	Keep locations compact.  Use cities or small islands, not countries
++		or regions, so that any future time zone changes do not split
++		locations into different time zones.  E.g. prefer 'Paris'
++		to 'France', since France has had multiple time zones.
++	Use mainstream English spelling, e.g. prefer 'Rome' to 'Roma', and
++		prefer 'Athens' to the Greek 'Αθήνα' or the Romanized 'Athína'.
++		The POSIX file name restrictions encourage this rule.
++	Use the most populous among locations in a zone,
++		e.g. prefer 'Shanghai' to 'Beijing'.  Among locations with
++		similar populations, pick the best-known location,
++		e.g. prefer 'Rome' to 'Milan'.
++	Use the singular form, e.g. prefer 'Canary' to 'Canaries'.
++	Omit common suffixes like '_Islands' and '_City', unless that
++		would lead to ambiguity.  E.g. prefer 'Cayman' to
++		'Cayman_Islands' and 'Guatemala' to 'Guatemala_City',
++		but prefer 'Mexico_City' to 'Mexico' because the country
++		of Mexico has several time zones.
++	Use '_' to represent a space.
++	Omit '.' from abbreviations in names, e.g. prefer 'St_Helena'
++		to 'St._Helena'.
++	Do not change established names if they only marginally
++		violate the above rules.  For example, don't change
++		the existing name 'Rome' to 'Milan' merely because
++		Milan's population has grown to be somewhat greater
++		than Rome's.
++	If a name is changed, put its old spelling in the 'backward' file.
++		This means old spellings will continue to work.
++
++The file 'zone1970.tab' lists geographical locations used to name time
++zone rules.  It is intended to be an exhaustive list of names for
++geographic regions as described above; this is a subset of the names
++in the data.  Although a 'zone1970.tab' location's longitude
++corresponds to its LMT offset with one hour for every 15 degrees east
++longitude, this relationship is not exact.
++
++Older versions of this package used a different naming scheme,
++and these older names are still supported.
++See the file 'backward' for most of these older names
++(e.g., 'US/Eastern' instead of 'America/New_York').
++The other old-fashioned names still supported are
++'WET', 'CET', 'MET', and 'EET' (see the file 'europe').
++
++Older versions of this package defined legacy names that are
++incompatible with the first rule of location names, but which are
++still supported.  These legacy names are mostly defined in the file
++'etcetera'.  Also, the file 'backward' defines the legacy names
++'GMT0', 'GMT-0', 'GMT+0' and 'Canada/East-Saskatchewan', and the file
++'northamerica' defines the legacy names 'EST5EDT', 'CST6CDT',
++'MST7MDT', and 'PST8PDT'.
++
++Excluding 'backward' should not affect the other data.  If
++'backward' is excluded, excluding 'etcetera' should not affect the
++remaining data.
++
++
++----- Time zone abbreviations -----
++
++When this package is installed, it generates time zone abbreviations
++like 'EST' to be compatible with human tradition and POSIX.
++Here are the general rules used for choosing time zone abbreviations,
++in decreasing order of importance:
++
++	Use three or more characters that are ASCII alphanumerics or '+' or '-'.
++		Previous editions of this database also used characters like
++		' ' and '?', but these characters have a special meaning to
++		the shell and cause commands like
++			set `date`
++		to have unexpected effects.
++		Previous editions of this rule required upper-case letters,
++		but the Congressman who introduced Chamorro Standard Time
++		preferred "ChST", so lower-case letters are now allowed.
++		Also, POSIX from 2001 on relaxed the rule to allow '-', '+',
++		and alphanumeric characters from the portable character set
++		in the current locale.  In practice ASCII alphanumerics and
++		'+' and '-' are safe in all locales.
++
++		In other words, in the C locale the POSIX extended regular
++		expression [-+[:alnum:]]{3,} should match the abbreviation.
++		This guarantees that all abbreviations could have been
++		specified by a POSIX TZ string.
++
++	Use abbreviations that are in common use among English-speakers,
++		e.g. 'EST' for Eastern Standard Time in North America.
++		We assume that applications translate them to other languages
++		as part of the normal localization process; for example,
++		a French application might translate 'EST' to 'HNE'.
++
++	For zones whose times are taken from a city's longitude, use the
++		traditional xMT notation, e.g. 'PMT' for Paris Mean Time.
++		The only name like this in current use is 'GMT'.
++
++	Use 'LMT' for local mean time of locations before the introduction
++		of standard time; see "Scope of the tz database".
++
++	If there is no common English abbreviation, use numeric offsets like
++		-05 and +0830 that are generated by zic's %z notation.
++
++    [The remaining guidelines predate the introduction of %z.
++    They are problematic as they mean tz data entries invent
++    notation rather than record it.  These guidelines are now
++    deprecated and the plan is to gradually move to %z for
++    inhabited locations and to "-00" for uninhabited locations.]
++
++	If there is no common English abbreviation, abbreviate the English
++		translation of the usual phrase used by native speakers.
++		If this is not available or is a phrase mentioning the country
++		(e.g. "Cape Verde Time"), then:
++
++		When a country is identified with a single or principal zone,
++			append 'T' to the country's ISO	code, e.g. 'CVT' for
++			Cape Verde Time.  For summer time append 'ST';
++			for double summer time append 'DST'; etc.
++		Otherwise, take the first three letters of an English place
++			name identifying each zone and append 'T', 'ST', etc.
++			as before; e.g. 'VLAST' for VLAdivostok Summer Time.
++
++	Use UT (with time zone abbreviation '-00') for locations while
++		uninhabited.  The leading '-' is a flag that the time
++		zone is in some sense undefined; this notation is
++		derived from Internet RFC 3339.
++
++Application writers should note that these abbreviations are ambiguous
++in practice: e.g. 'CST' has a different meaning in China than
++it does in the United States.  In new applications, it's often better
++to use numeric UT offsets like '-0600' instead of time zone
++abbreviations like 'CST'; this avoids the ambiguity.
++
++
++----- Accuracy of the tz database -----
++
++The tz database is not authoritative, and it surely has errors.
++Corrections are welcome and encouraged; see the file CONTRIBUTING.
++Users requiring authoritative data should consult national standards
++bodies and the references cited in the database's comments.
++
++Errors in the tz database arise from many sources:
++
++ * The tz database predicts future time stamps, and current predictions
++   will be incorrect after future governments change the rules.
++   For example, if today someone schedules a meeting for 13:00 next
++   October 1, Casablanca time, and tomorrow Morocco changes its
++   daylight saving rules, software can mess up after the rule change
++   if it blithely relies on conversions made before the change.
++
++ * The pre-1970 entries in this database cover only a tiny sliver of how
++   clocks actually behaved; the vast majority of the necessary
++   information was lost or never recorded.  Thousands more zones would
++   be needed if the tz database's scope were extended to cover even
++   just the known or guessed history of standard time; for example,
++   the current single entry for France would need to split into dozens
++   of entries, perhaps hundreds.  And in most of the world even this
++   approach would be misleading due to widespread disagreement or
++   indifference about what times should be observed.  In her 2015 book
++   "The Global Transformation of Time, 1870-1950", Vanessa Ogle writes
++   "Outside of Europe and North America there was no system of time
++   zones at all, often not even a stable landscape of mean times,
++   prior to the middle decades of the twentieth century".  See:
++   Timothy Shenk, Booked: A Global History of Time. Dissent 2015-12-17
++   https://www.dissentmagazine.org/blog/booked-a-global-history-of-time-vanessa-ogle
++
++ * Most of the pre-1970 data entries come from unreliable sources, often
++   astrology books that lack citations and whose compilers evidently
++   invented entries when the true facts were unknown, without
++   reporting which entries were known and which were invented.
++   These books often contradict each other or give implausible entries,
++   and on the rare occasions when they are checked they are
++   typically found to be incorrect.
++
++ * For the UK the tz database relies on years of first-class work done by
++   Joseph Myers and others; see <http://www.polyomino.org.uk/british-time/>.
++   Other countries are not done nearly as well.
++
++ * Sometimes, different people in the same city would maintain clocks
++   that differed significantly.  Railway time was used by railroad
++   companies (which did not always agree with each other),
++   church-clock time was used for birth certificates, etc.
++   Often this was merely common practice, but sometimes it was set by law.
++   For example, from 1891 to 1911 the UT offset in France was legally
++   0:09:21 outside train stations and 0:04:21 inside.
++
++ * Although a named location in the tz database stands for the
++   containing region, its pre-1970 data entries are often accurate for
++   only a small subset of that region.  For example, Europe/London
++   stands for the United Kingdom, but its pre-1847 times are valid
++   only for locations that have London's exact meridian, and its 1847
++   transition to GMT is known to be valid only for the L&NW and the
++   Caledonian railways.
++
++ * The tz database does not record the earliest time for which a zone's
++   data entries are thereafter valid for every location in the region.
++   For example, Europe/London is valid for all locations in its
++   region after GMT was made the standard time, but the date of
++   standardization (1880-08-02) is not in the tz database, other than
++   in commentary.  For many zones the earliest time of validity is
++   unknown.
++
++ * The tz database does not record a region's boundaries, and in many
++   cases the boundaries are not known.  For example, the zone
++   America/Kentucky/Louisville represents a region around the city of
++   Louisville, the boundaries of which are unclear.
++
++ * Changes that are modeled as instantaneous transitions in the tz
++   database were often spread out over hours, days, or even decades.
++
++ * Even if the time is specified by law, locations sometimes
++   deliberately flout the law.
++
++ * Early timekeeping practices, even assuming perfect clocks, were
++   often not specified to the accuracy that the tz database requires.
++
++ * Sometimes historical timekeeping was specified more precisely
++   than what the tz database can handle.  For example, from 1909 to
++   1937 Netherlands clocks were legally UT +00:19:32.13, but the tz
++   database cannot represent the fractional second.
++
++ * Even when all the timestamp transitions recorded by the tz database
++   are correct, the tz rules that generate them may not faithfully
++   reflect the historical rules.  For example, from 1922 until World
++   War II the UK moved clocks forward the day following the third
++   Saturday in April unless that was Easter, in which case it moved
++   clocks forward the previous Sunday.  Because the tz database has no
++   way to specify Easter, these exceptional years are entered as
++   separate tz Rule lines, even though the legal rules did not change.
++
++ * The tz database models pre-standard time using the proleptic Gregorian
++   calendar and local mean time (LMT), but many people used other
++   calendars and other timescales.  For example, the Roman Empire used
++   the Julian calendar, and had 12 varying-length daytime hours with a
++   non-hour-based system at night.
++
++ * Early clocks were less reliable, and data entries do not represent
++   this unreliability.
++
++ * As for leap seconds, civil time was not based on atomic time before
++   1972, and we don't know the history of earth's rotation accurately
++   enough to map SI seconds to historical solar time to more than
++   about one-hour accuracy.  See: Morrison LV, Stephenson FR.
++   Historical values of the Earth's clock error Delta T and the
++   calculation of eclipses. J Hist Astron. 2004;35:327-36
++   <http://adsabs.harvard.edu/full/2004JHA....35..327M>;
++   Historical values of the Earth's clock error. J Hist Astron. 2005;36:339
++   <http://adsabs.harvard.edu/full/2005JHA....36..339M>.
++
++ * The relationship between POSIX time (that is, UTC but ignoring leap
++   seconds) and UTC is not agreed upon after 1972.  Although the POSIX
++   clock officially stops during an inserted leap second, at least one
++   proposed standard has it jumping back a second instead; and in
++   practice POSIX clocks more typically either progress glacially during
++   a leap second, or are slightly slowed while near a leap second.
++
++ * The tz database does not represent how uncertain its information is.
++   Ideally it would contain information about when data entries are
++   incomplete or dicey.  Partial temporal knowledge is a field of
++   active research, though, and it's not clear how to apply it here.
++
++In short, many, perhaps most, of the tz database's pre-1970 and future
++time stamps are either wrong or misleading.  Any attempt to pass the
++tz database off as the definition of time should be unacceptable to
++anybody who cares about the facts.  In particular, the tz database's
++LMT offsets should not be considered meaningful, and should not prompt
++creation of zones merely because two locations differ in LMT or
++transitioned to standard time at different dates.
++
++
++----- Time and date functions -----
++
++The tz code contains time and date functions that are upwards
++compatible with those of POSIX.
++
++POSIX has the following properties and limitations.
++
++*	In POSIX, time display in a process is controlled by the
++	environment variable TZ.  Unfortunately, the POSIX TZ string takes
++	a form that is hard to describe and is error-prone in practice.
++	Also, POSIX TZ strings can't deal with other (for example, Israeli)
++	daylight saving time rules, or situations where more than two
++	time zone abbreviations are used in an area.
++
++	The POSIX TZ string takes the following form:
++
++		stdoffset[dst[offset][,date[/time],date[/time]]]
++
++	where:
++
++	std and dst
++		are 3 or more characters specifying the standard
++		and daylight saving time (DST) zone names.
++		Starting with POSIX.1-2001, std and dst may also be
++		in a quoted form like "<UTC+10>"; this allows
++		"+" and "-" in the names.
++	offset
++		is of the form '[+-]hh:[mm[:ss]]' and specifies the
++		offset west of UT.  'hh' may be a single digit; 0<=hh<=24.
++		The default DST offset is one hour ahead of standard time.
++	date[/time],date[/time]
++		specifies the beginning and end of DST.  If this is absent,
++		the system supplies its own rules for DST, and these can
++		differ from year to year; typically US DST rules are used.
++	time
++		takes the form 'hh:[mm[:ss]]' and defaults to 02:00.
++		This is the same format as the offset, except that a
++		leading '+' or '-' is not allowed.
++	date
++		takes one of the following forms:
++		Jn (1<=n<=365)
++			origin-1 day number not counting February 29
++		n (0<=n<=365)
++			origin-0 day number counting February 29 if present
++		Mm.n.d (0[Sunday]<=d<=6[Saturday], 1<=n<=5, 1<=m<=12)
++			for the dth day of week n of month m of the year,
++			where week 1 is the first week in which day d appears,
++			and '5' stands for the last week in which day d appears
++			(which may be either the 4th or 5th week).
++			Typically, this is the only useful form;
++			the n and Jn forms are rarely used.
++
++	Here is an example POSIX TZ string, for US Pacific time using rules
++	appropriate from 1987 through 2006:
++
++		TZ='PST8PDT,M4.1.0/02:00,M10.5.0/02:00'
++
++	This POSIX TZ string is hard to remember, and mishandles time stamps
++	before 1987 and after 2006.  With this package you can use this
++	instead:
++
++		TZ='America/Los_Angeles'
++
++*	POSIX does not define the exact meaning of TZ values like "EST5EDT".
++	Typically the current US DST rules are used to interpret such values,
++	but this means that the US DST rules are compiled into each program
++	that does time conversion.  This means that when US time conversion
++	rules change (as in the United States in 1987), all programs that
++	do time conversion must be recompiled to ensure proper results.
++
++*	The TZ environment variable is process-global, which makes it hard
++	to write efficient, thread-safe applications that need access
++	to multiple time zones.
++
++*	In POSIX, there's no tamper-proof way for a process to learn the
++	system's best idea of local wall clock.  (This is important for
++	applications that an administrator wants used only at certain times -
++	without regard to whether the user has fiddled the "TZ" environment
++	variable.  While an administrator can "do everything in UTC" to get
++	around the problem, doing so is inconvenient and precludes handling
++	daylight saving time shifts - as might be required to limit phone
++	calls to off-peak hours.)
++
++*	POSIX provides no convenient and efficient way to determine the UT
++	offset and time zone abbreviation of arbitrary time stamps,
++	particularly for time zone settings that do not fit into the
++	POSIX model.
++
++*	POSIX requires that systems ignore leap seconds.
++
++*	The tz code attempts to support all the time_t implementations
++	allowed by POSIX.  The time_t type represents a nonnegative count of
++	seconds since 1970-01-01 00:00:00 UTC, ignoring leap seconds.
++	In practice, time_t is usually a signed 64- or 32-bit integer; 32-bit
++	signed time_t values stop working after 2038-01-19 03:14:07 UTC, so
++	new implementations these days typically use a signed 64-bit integer.
++	Unsigned 32-bit integers are used on one or two platforms,
++	and 36-bit and 40-bit integers are also used occasionally.
++	Although earlier POSIX versions allowed time_t to be a
++	floating-point type, this was not supported by any practical
++	systems, and POSIX.1-2013 and the tz code both require time_t
++	to be an integer type.
++
++These are the extensions that have been made to the POSIX functions:
++
++*	The "TZ" environment variable is used in generating the name of a file
++	from which time zone information is read (or is interpreted a la
++	POSIX); "TZ" is no longer constrained to be a three-letter time zone
++	name followed by a number of hours and an optional three-letter
++	daylight time zone name.  The daylight saving time rules to be used
++	for a particular time zone are encoded in the time zone file;
++	the format of the file allows U.S., Australian, and other rules to be
++	encoded, and allows for situations where more than two time zone
++	abbreviations are used.
++
++	It was recognized that allowing the "TZ" environment variable to
++	take on values such as "America/New_York" might cause "old" programs
++	(that expect "TZ" to have a certain form) to operate incorrectly;
++	consideration was given to using some other environment variable
++	(for example, "TIMEZONE") to hold the string used to generate the
++	time zone information file name.  In the end, however, it was decided
++	to continue using "TZ": it is widely used for time zone purposes;
++	separately maintaining both "TZ" and "TIMEZONE" seemed a nuisance;
++	and systems where "new" forms of "TZ" might cause problems can simply
++	use TZ values such as "EST5EDT" which can be used both by
++	"new" programs (a la POSIX) and "old" programs (as zone names and
++	offsets).
++
++*	The code supports platforms with a UT offset member in struct tm,
++	e.g., tm_gmtoff.
++
++*	The code supports platforms with a time zone abbreviation member in
++	struct tm, e.g., tm_zone.
++
++*	Since the "TZ" environment variable can now be used to control time
++	conversion, the "daylight" and "timezone" variables are no longer
++	needed.  (These variables are defined and set by "tzset"; however, their
++	values will not be used by "localtime.")
++
++*	Functions tzalloc, tzfree, localtime_rz, and mktime_z for
++	more-efficient thread-safe applications that need to use
++	multiple time zones.  The tzalloc and tzfree functions
++	allocate and free objects of type timezone_t, and localtime_rz
++	and mktime_z are like localtime_r and mktime with an extra
++	timezone_t argument.  The functions were inspired by NetBSD.
++
++*	A function "tzsetwall" has been added to arrange for the system's
++	best approximation to local wall clock time to be delivered by
++	subsequent calls to "localtime."  Source code for portable
++	applications that "must" run on local wall clock time should call
++	"tzsetwall();" if such code is moved to "old" systems that don't
++	provide tzsetwall, you won't be able to generate an executable program.
++	(These time zone functions also arrange for local wall clock time to be
++	used if tzset is called - directly or indirectly - and there's no "TZ"
++	environment variable; portable applications should not, however, rely
++	on this behavior since it's not the way SVR2 systems behave.)
++
++*	Negative time_t values are supported, on systems where time_t is signed.
++
++*	These functions can account for leap seconds, thanks to Bradley White.
++
++Points of interest to folks with other systems:
++
++*	Code compatible with this package is already part of many platforms,
++	including GNU/Linux, Android, the BSDs, Chromium OS, Cygwin, AIX, iOS,
++	BlackBery 10, macOS, Microsoft Windows, OpenVMS, and Solaris.
++	On such hosts, the primary use of this package
++	is to update obsolete time zone rule tables.
++	To do this, you may need to compile the time zone compiler
++	'zic' supplied with this package instead of using the system 'zic',
++	since the format of zic's input is occasionally extended,
++	and a platform may still be shipping an older zic.
++
++*	The UNIX Version 7 "timezone" function is not present in this package;
++	it's impossible to reliably map timezone's arguments (a "minutes west
++	of GMT" value and a "daylight saving time in effect" flag) to a
++	time zone abbreviation, and we refuse to guess.
++	Programs that in the past used the timezone function may now examine
++	tzname[localtime(&clock)->tm_isdst] to learn the correct time
++	zone abbreviation to use.  Alternatively, use
++	localtime(&clock)->tm_zone if this has been enabled.
++
++*	The 4.2BSD gettimeofday function is not used in this package.
++	This formerly let users obtain the current UTC offset and DST flag,
++	but this functionality was removed in later versions of BSD.
++
++*	In SVR2, time conversion fails for near-minimum or near-maximum
++	time_t values when doing conversions for places that don't use UT.
++	This package takes care to do these conversions correctly.
++	A comment in the source code tells how to get compatibly wrong
++	results.
++
++The functions that are conditionally compiled if STD_INSPIRED is defined
++should, at this point, be looked on primarily as food for thought.  They are
++not in any sense "standard compatible" - some are not, in fact, specified in
++*any* standard.  They do, however, represent responses of various authors to
++standardization proposals.
++
++Other time conversion proposals, in particular the one developed by folks at
++Hewlett Packard, offer a wider selection of functions that provide capabilities
++beyond those provided here.  The absence of such functions from this package
++is not meant to discourage the development, standardization, or use of such
++functions.  Rather, their absence reflects the decision to make this package
++contain valid extensions to POSIX, to ensure its broad acceptability.  If
++more powerful time conversion functions can be standardized, so much the
++better.
++
++
++----- Interface stability -----
++
++The tz code and data supply the following interfaces:
++
++ * A set of zone names as per "Names of time zone rules" above.
++
++ * Library functions described in "Time and date functions" above.
++
++ * The programs tzselect, zdump, and zic, documented in their man pages.
++
++ * The format of zic input files, documented in the zic man page.
++
++ * The format of zic output files, documented in the tzfile man page.
++
++ * The format of zone table files, documented in zone1970.tab.
++
++ * The format of the country code file, documented in iso3166.tab.
++
++When these interfaces are changed, an effort is made to preserve
++backward compatibility.  For example, tz data files typically do not
++rely on recently-added zic features, so that users can run older zic
++versions to process newer data files.
++
++Interfaces not listed above are less stable.  For example, users
++should not rely on particular UT offsets or abbreviations for time
++stamps, as data entries are often based on guesswork and these guesses
++may be corrected or improved.
++
++
++----- Calendrical issues -----
++
++Calendrical issues are a bit out of scope for a time zone database,
++but they indicate the sort of problems that we would run into if we
++extended the time zone database further into the past.  An excellent
++resource in this area is Nachum Dershowitz and Edward M. Reingold,
++Calendrical Calculations: Third Edition, Cambridge University Press (2008)
++<http://emr.cs.iit.edu/home/reingold/calendar-book/third-edition/>.
++Other information and sources are given below.  They sometimes disagree.
++
++
++France
++
++Gregorian calendar adopted 1582-12-20.
++French Revolutionary calendar used 1793-11-24 through 1805-12-31,
++and (in Paris only) 1871-05-06 through 1871-05-23.
++
++
++Russia
++
++From Chris Carrier (1996-12-02):
++On 1929-10-01 the Soviet Union instituted an "Eternal Calendar"
++with 30-day months plus 5 holidays, with a 5-day week.
++On 1931-12-01 it changed to a 6-day week; in 1934 it reverted to the
++Gregorian calendar while retaining the 6-day week; on 1940-06-27 it
++reverted to the 7-day week.  With the 6-day week the usual days
++off were the 6th, 12th, 18th, 24th and 30th of the month.
++(Source: Evitiar Zerubavel, _The Seven Day Circle_)
++
++
++Mark Brader reported a similar story in "The Book of Calendars", edited
++by Frank Parise (1982, Facts on File, ISBN 0-8719-6467-8), page 377.  But:
++
++From: Petteri Sulonen (via Usenet)
++Date: 14 Jan 1999 00:00:00 GMT
++...
++
++If your source is correct, how come documents between 1929 and 1940 were
++still dated using the conventional, Gregorian calendar?
++
++I can post a scan of a document dated December 1, 1934, signed by
++Yenukidze, the secretary, on behalf of Kalinin, the President of the
++Executive Committee of the Supreme Soviet, if you like.
++
++
++
++Sweden (and Finland)
++
++From: Mark Brader
++Subject: Re: Gregorian reform - a part of locale?
++<news:1996Jul6.012937.29190@sq.com>
++Date: 1996-07-06
++
++In 1700, Denmark made the transition from Julian to Gregorian.  Sweden
++decided to *start* a transition in 1700 as well, but rather than have one of
++those unsightly calendar gaps :-), they simply decreed that the next leap
++year after 1696 would be in 1744 - putting the whole country on a calendar
++different from both Julian and Gregorian for a period of 40 years.
++
++However, in 1704 something went wrong and the plan was not carried through;
++they did, after all, have a leap year that year.  And one in 1708.  In 1712
++they gave it up and went back to Julian, putting 30 days in February that
++year!...
++
++Then in 1753, Sweden made the transition to Gregorian in the usual manner,
++getting there only 13 years behind the original schedule.
++
++(A previous posting of this story was challenged, and Swedish readers
++produced the following references to support it: "Tideräkning och historia"
++by Natanael Beckman (1924) and "Tid, en bok om tideräkning och
++kalenderväsen" by Lars-Olof Lodén (1968).
++
++
++Grotefend's data
++
++From: "Michael Palmer" [with one obvious typo fixed]
++Subject: Re: Gregorian Calendar (was Re: Another FHC related question
++Newsgroups: soc.genealogy.german
++Date: Tue, 9 Feb 1999 02:32:48 -800
++...
++
++The following is a(n incomplete) listing, arranged chronologically, of
++European states, with the date they converted from the Julian to the
++Gregorian calendar:
++
++04/15 Oct 1582 - Italy (with exceptions), Spain, Portugal, Poland (Roman
++                 Catholics and Danzig only)
++09/20 Dec 1582 - France, Lorraine
++
++21 Dec 1582/
++   01 Jan 1583 - Holland, Brabant, Flanders, Hennegau
++10/21 Feb 1583 - bishopric of Liege (Lüttich)
++13/24 Feb 1583 - bishopric of Augsburg
++04/15 Oct 1583 - electorate of Trier
++05/16 Oct 1583 - Bavaria, bishoprics of Freising, Eichstedt, Regensburg,
++                 Salzburg, Brixen
++13/24 Oct 1583 - Austrian Oberelsaß and Breisgau
++20/31 Oct 1583 - bishopric of Basel
++02/13 Nov 1583 - duchy of Jülich-Berg
++02/13 Nov 1583 - electorate and city of Köln
++04/15 Nov 1583 - bishopric of Würzburg
++11/22 Nov 1583 - electorate of Mainz
++16/27 Nov 1583 - bishopric of Strassburg and the margraviate of Baden
++17/28 Nov 1583 - bishopric of Münster and duchy of Cleve
++14/25 Dec 1583 - Steiermark
++
++06/17 Jan 1584 - Austria and Bohemia
++11/22 Jan 1584 - Lucerne, Uri, Schwyz, Zug, Freiburg, Solothurn
++12/23 Jan 1584 - Silesia and the Lausitz
++22 Jan/
++   02 Feb 1584 - Hungary (legally on 21 Oct 1587)
++      Jun 1584 - Unterwalden
++01/12 Jul 1584 - duchy of Westfalen
++
++16/27 Jun 1585 - bishopric of Paderborn
++
++14/25 Dec 1590 - Transylvania
++
++22 Aug/
++   02 Sep 1612 - duchy of Prussia
++
++13/24 Dec 1614 - Pfalz-Neuburg
++
++          1617 - duchy of Kurland (reverted to the Julian calendar in
++                 1796)
++
++          1624 - bishopric of Osnabrück
++
++          1630 - bishopric of Minden
++
++15/26 Mar 1631 - bishopric of Hildesheim
++
++          1655 - Kanton Wallis
++
++05/16 Feb 1682 - city of Strassburg
++
++18 Feb/
++   01 Mar 1700 - Protestant Germany (including Swedish possessions in
++                 Germany), Denmark, Norway
++30 Jun/
++   12 Jul 1700 - Gelderland, Zutphen
++10 Nov/
++   12 Dec 1700 - Utrecht, Overijssel
++
++31 Dec 1700/
++   12 Jan 1701 - Friesland, Groningen, Zürich, Bern, Basel, Geneva,
++                 Turgau, and Schaffhausen
++
++          1724 - Glarus, Appenzell, and the city of St. Gallen
++
++01 Jan 1750    - Pisa and Florence
++
++02/14 Sep 1752 - Great Britain
++
++17 Feb/
++   01 Mar 1753 - Sweden
++
++1760-1812      - Graubünden
++
++The Russian empire (including Finland and the Baltic states) did not
++convert to the Gregorian calendar until the Soviet revolution of 1917.
++
++Source: H. Grotefend, _Taschenbuch der Zeitrechnung des deutschen
++Mittelalters und der Neuzeit_, herausgegeben von Dr. O. Grotefend
++(Hannover: Hahnsche Buchhandlung, 1941), pp. 26-28.
++
++
++----- Time and time zones on Mars -----
++
++Some people's work schedules use Mars time.  Jet Propulsion Laboratory
++(JPL) coordinators have kept Mars time on and off at least since 1997
++for the Mars Pathfinder mission.  Some of their family members have
++also adapted to Mars time.  Dozens of special Mars watches were built
++for JPL workers who kept Mars time during the Mars Exploration
++Rovers mission (2004).  These timepieces look like normal Seikos and
++Citizens but use Mars seconds rather than terrestrial seconds.
++
++A Mars solar day is called a "sol" and has a mean period equal to
++about 24 hours 39 minutes 35.244 seconds in terrestrial time.  It is
++divided into a conventional 24-hour clock, so each Mars second equals
++about 1.02749125 terrestrial seconds.
++
++The prime meridian of Mars goes through the center of the crater
++Airy-0, named in honor of the British astronomer who built the
++Greenwich telescope that defines Earth's prime meridian.  Mean solar
++time on the Mars prime meridian is called Mars Coordinated Time (MTC).
++
++Each landed mission on Mars has adopted a different reference for
++solar time keeping, so there is no real standard for Mars time zones.
++For example, the Mars Exploration Rover project (2004) defined two
++time zones "Local Solar Time A" and "Local Solar Time B" for its two
++missions, each zone designed so that its time equals local true solar
++time at approximately the middle of the nominal mission.  Such a "time
++zone" is not particularly suited for any application other than the
++mission itself.
++
++Many calendars have been proposed for Mars, but none have achieved
++wide acceptance.  Astronomers often use Mars Sol Date (MSD) which is a
++sequential count of Mars solar days elapsed since about 1873-12-29
++12:00 GMT.
++
++The tz database does not currently support Mars time, but it is
++documented here in the hopes that support will be added eventually.
++
++Sources:
++
++Michael Allison and Robert Schmunk,
++"Technical Notes on Mars Solar Time as Adopted by the Mars24 Sunclock"
++<http://www.giss.nasa.gov/tools/mars24/help/notes.html> (2012-08-08).
++
++Jia-Rui Chong, "Workdays Fit for a Martian", Los Angeles Times
++<http://articles.latimes.com/2004/jan/14/science/sci-marstime14>
++(2004-01-14), pp A1, A20-A21.
++
++Tom Chmielewski, "Jet Lag Is Worse on Mars", The Atlantic (2015-02-26)
++<http://www.theatlantic.com/technology/archive/2015/02/jet-lag-is-worse-on-mars/386033/>
++
++-----
++
++This file is in the public domain, so clarified as of 2009-05-17 by
++Arthur David Olson.
++
++-----
++Local Variables:
++coding: utf-8
++End:
+--- contrib/tzdata/africa.orig
++++ contrib/tzdata/africa
+@@ -343,6 +343,12 @@
+ # decision to abandon DST permanently.  See Ahram Online 2015-04-24.
+ # http://english.ahram.org.eg/NewsContent/1/64/128509/Egypt/Politics-/Sisi-cancels-daylight-saving-time-in-Egypt.aspx
+ 
++# From Steffen Thorsen (2016-04-29):
++# Egypt will have DST from July 7 until the end of October....
++# http://english.ahram.org.eg/NewsContentP/1/204655/Egypt/Daylight-savings-time-returning-to-Egypt-on--July.aspx
++# From Mina Samuel (2016-07-04):
++# Egyptian government took the decision to cancel the DST,
++
+ Rule	Egypt	2008	only	-	Aug	lastThu	24:00	0	-
+ Rule	Egypt	2009	only	-	Aug	20	24:00	0	-
+ Rule	Egypt	2010	only	-	Aug	10	24:00	0	-
+@@ -458,7 +464,7 @@
+ # http://www.libyaherald.com/2013/10/24/correction-no-time-change-tomorrow/
+ #
+ # From Paul Eggert (2013-10-25):
+-# For now, assume they're reverting to the pre-2012 rules of permanent UTC+2.
++# For now, assume they're reverting to the pre-2012 rules of permanent UT +02.
+ 
+ # Rule	NAME	FROM	TO	TYPE	IN	ON	AT	SAVE	LETTER/S
+ Rule	Libya	1951	only	-	Oct	14	2:00	1:00	S
+@@ -538,7 +544,7 @@
+ 
+ # From Alex Krivenyshev (2008-07-11):
+ # Seems that English language article "The revival of daylight saving
+-# time: Energy conservation?"-# No. 16578 (07/11/2008) was originally
++# time: Energy conservation?"- No. 16578 (07/11/2008) was originally
+ # published on Monday, June 30, 2008...
+ #
+ # I guess that article in French "Le gouvernement avance l'introduction
+@@ -670,7 +676,7 @@
+ # Here is a link to official document from Royaume du Maroc Premier Ministre,
+ # Ministère de la Modernisation des Secteurs Publics
+ #
+-# Under Article 1 of Royal Decree No. 455-67 of Act 23 safar 1387 (2 june 1967)
++# Under Article 1 of Royal Decree No. 455-67 of Act 23 safar 1387 (2 June 1967)
+ # concerning the amendment of the legal time, the Ministry of Modernization of
+ # Public Sectors announced that the official time in the Kingdom will be
+ # advanced 60 minutes from Sunday 31 May 2009 at midnight.
+@@ -858,11 +864,11 @@
+ Rule	Morocco	2010	only	-	May	 2	 0:00	1:00	S
+ Rule	Morocco	2010	only	-	Aug	 8	 0:00	0	-
+ Rule	Morocco	2011	only	-	Apr	 3	 0:00	1:00	S
+-Rule	Morocco	2011	only	-	Jul	31	 0	0	-
++Rule	Morocco	2011	only	-	Jul	31	 0:00	0	-
+ Rule	Morocco	2012	2013	-	Apr	lastSun	 2:00	1:00	S
+-Rule	Morocco	2012	only	-	Sep	30	 3:00	0	-
+ Rule	Morocco	2012	only	-	Jul	20	 3:00	0	-
+ Rule	Morocco	2012	only	-	Aug	20	 2:00	1:00	S
++Rule	Morocco	2012	only	-	Sep	30	 3:00	0	-
+ Rule	Morocco	2013	only	-	Jul	 7	 3:00	0	-
+ Rule	Morocco	2013	only	-	Aug	10	 2:00	1:00	S
+ Rule	Morocco	2013	max	-	Oct	lastSun	 3:00	0	-
+--- contrib/tzdata/antarctica.orig
++++ contrib/tzdata/antarctica
+@@ -10,10 +10,8 @@
+ # http://www.spri.cam.ac.uk/bob/periant.htm
+ # for information.
+ # Unless otherwise specified, we have no time zone information.
+-#
+-# Except for the French entries,
+-# I made up all time zone abbreviations mentioned here; corrections welcome!
+-# FORMAT is 'zzz' and GMTOFF is 0 for locations while uninhabited.
++
++# FORMAT is '-00' and GMTOFF is 0 for locations while uninhabited.
+ 
+ # Argentina - year-round bases
+ # Belgrano II, Confin Coast, -770227-0343737, since 1972-02-05
+@@ -29,7 +27,7 @@
+ #	previously sealers and scientific personnel wintered
+ #	Margaret Turner reports
+ #	http://web.archive.org/web/20021204222245/http://www.dstc.qut.edu.au/DST/marg/daylight.html
+-#	(1999-09-30) that they're UTC+5, with no DST;
++#	(1999-09-30) that they're UT +05, with no DST;
+ #	presumably this is when they have visitors.
+ #
+ # year-round bases
+@@ -66,25 +64,29 @@
+ # Background:
+ # http://www.timeanddate.com/news/time/antartica-time-changes-2010.html
+ 
++# From Steffen Thorsen (2016-10-28):
++# Australian Antarctica Division informed us that Casey changed time
++# zone to UTC+11 in "the morning of 22nd October 2016".
++
+ # Zone	NAME		GMTOFF	RULES	FORMAT	[UNTIL]
+-Zone Antarctica/Casey	0	-	zzz	1969
+-			8:00	-	AWST	2009 Oct 18  2:00
+-						# Australian Western Std Time
+-			11:00	-	CAST	2010 Mar  5  2:00  # Casey Time
+-			8:00	-	AWST	2011 Oct 28  2:00
+-			11:00	-	CAST	2012 Feb 21 17:00u
+-			8:00	-	AWST
+-Zone Antarctica/Davis	0	-	zzz	1957 Jan 13
+-			7:00	-	DAVT	1964 Nov    # Davis Time
+-			0	-	zzz	1969 Feb
+-			7:00	-	DAVT	2009 Oct 18  2:00
+-			5:00	-	DAVT	2010 Mar 10 20:00u
+-			7:00	-	DAVT	2011 Oct 28  2:00
+-			5:00	-	DAVT	2012 Feb 21 20:00u
+-			7:00	-	DAVT
+-Zone Antarctica/Mawson	0	-	zzz	1954 Feb 13
+-			6:00	-	MAWT	2009 Oct 18  2:00 # Mawson Time
+-			5:00	-	MAWT
++Zone Antarctica/Casey	0	-	-00	1969
++			8:00	-	+08	2009 Oct 18  2:00
++			11:00	-	+11	2010 Mar  5  2:00
++			8:00	-	+08	2011 Oct 28  2:00
++			11:00	-	+11	2012 Feb 21 17:00u
++			8:00	-	+08	2016 Oct 22
++			11:00	-	+11
++Zone Antarctica/Davis	0	-	-00	1957 Jan 13
++			7:00	-	+07	1964 Nov
++			0	-	-00	1969 Feb
++			7:00	-	+07	2009 Oct 18  2:00
++			5:00	-	+05	2010 Mar 10 20:00u
++			7:00	-	+07	2011 Oct 28  2:00
++			5:00	-	+05	2012 Feb 21 20:00u
++			7:00	-	+07
++Zone Antarctica/Mawson	0	-	-00	1954 Feb 13
++			6:00	-	+06	2009 Oct 18  2:00
++			5:00	-	+05
+ # References:
+ # Casey Weather (1998-02-26)
+ # http://www.antdiv.gov.au/aad/exop/sfo/casey/casey_aws.html
+@@ -137,8 +139,8 @@
+ #	fishing stations operated variously 1819/1931
+ #
+ # Zone	NAME		GMTOFF	RULES	FORMAT	[UNTIL]
+-Zone Indian/Kerguelen	0	-	zzz	1950 # Port-aux-Français
+-			5:00	-	TFT	# ISO code TF Time
++Zone Indian/Kerguelen	0	-	-00	1950 # Port-aux-Français
++			5:00	-	+05
+ #
+ # year-round base in the main continent
+ # Dumont d'Urville, Île des Pétrels, -6640+14001, since 1956-11
+@@ -148,10 +150,10 @@
+ # It was destroyed by fire on 1952-01-14.
+ #
+ # Zone	NAME		GMTOFF	RULES	FORMAT	[UNTIL]
+-Zone Antarctica/DumontDUrville 0 -	zzz	1947
+-			10:00	-	PMT	1952 Jan 14 # Port-Martin Time
+-			0	-	zzz	1956 Nov
+-			10:00	-	DDUT	# Dumont-d'Urville Time
++Zone Antarctica/DumontDUrville 0 -	-00	1947
++			10:00	-	+10	1952 Jan 14
++			0	-	-00	1956 Nov
++			10:00	-	+10
+ 
+ # France & Italy - year-round base
+ # Concordia, -750600+1232000, since 2005
+@@ -176,8 +178,8 @@
+ # was established on 1957-01-29.  Since Syowa station is still the main
+ # station of Japan, it's appropriate for the principal location.
+ # Zone	NAME		GMTOFF	RULES	FORMAT	[UNTIL]
+-Zone Antarctica/Syowa	0	-	zzz	1957 Jan 29
+-			3:00	-	SYOT	# Syowa Time
++Zone Antarctica/Syowa	0	-	-00	1957 Jan 29
++			3:00	-	+03
+ # See:
+ # NIPR Antarctic Research Activities (1999-08-17)
+ # http://www.nipr.ac.jp/english/ara01.html
+@@ -214,19 +216,19 @@
+ # correct, but they should be quite close to the actual dates.
+ #
+ # From Paul Eggert (2014-03-21):
+-# The CET-switching Troll rules require zic from tzcode 2014b or later, so as
++# The CET-switching Troll rules require zic from tz 2014b or later, so as
+ # suggested by Bengt-Inge Larsson comment them out for now, and approximate
+ # with only UTC and CEST.  Uncomment them when 2014b is more prevalent.
+ #
+ # Rule	NAME	FROM	TO	TYPE	IN	ON	AT	SAVE	LETTER/S
+-#Rule	Troll	2005	max	-	Mar	 1	1:00u	1:00	CET
+-Rule	Troll	2005	max	-	Mar	lastSun	1:00u	2:00	CEST
+-#Rule	Troll	2005	max	-	Oct	lastSun	1:00u	1:00	CET
+-#Rule	Troll	2004	max	-	Nov	 7	1:00u	0:00	UTC
++#Rule	Troll	2005	max	-	Mar	 1	1:00u	1:00	+01
++Rule	Troll	2005	max	-	Mar	lastSun	1:00u	2:00	+02
++#Rule	Troll	2005	max	-	Oct	lastSun	1:00u	1:00	+01
++#Rule	Troll	2004	max	-	Nov	 7	1:00u	0:00	+00
+ # Remove the following line when uncommenting the above '#Rule' lines.
+-Rule	Troll	2004	max	-	Oct	lastSun	1:00u	0:00	UTC
++Rule	Troll	2004	max	-	Oct	lastSun	1:00u	0:00	+00
+ # Zone	NAME		GMTOFF	RULES	FORMAT	[UNTIL]
+-Zone Antarctica/Troll	0	-	zzz	2005 Feb 12
++Zone Antarctica/Troll	0	-	-00	2005 Feb 12
+ 			0:00	Troll	%s
+ 
+ # Poland - year-round base
+@@ -265,10 +267,10 @@
+ # changes during the year and does not necessarily correspond to mean
+ # solar noon.  So the Vostok time might have been whatever the clocks
+ # happened to be during their visit.  So we still don't really know what time
+-# it is at Vostok.  But we'll guess UTC+6.
++# it is at Vostok.  But we'll guess +06.
+ #
+-Zone Antarctica/Vostok	0	-	zzz	1957 Dec 16
+-			6:00	-	VOST	# Vostok time
++Zone Antarctica/Vostok	0	-	-00	1957 Dec 16
++			6:00	-	+06
+ 
+ # S Africa - year-round bases
+ # Marion Island, -4653+03752
+@@ -300,8 +302,8 @@
+ # <http://webexhibits.org/daylightsaving/g.html> says Rothera is -03 all year.
+ #
+ # Zone	NAME		GMTOFF	RULES	FORMAT	[UNTIL]
+-Zone Antarctica/Rothera	0	-	zzz	1976 Dec  1
+-			-3:00	-	ROTT	# Rothera time
++Zone Antarctica/Rothera	0	-	-00	1976 Dec  1
++			-3:00	-	-03
+ 
+ # Uruguay - year round base
+ # Artigas, King George Island, -621104-0585107
+--- contrib/tzdata/asia.orig
++++ contrib/tzdata/asia
+@@ -6,7 +6,7 @@
+ # tz@iana.org for general use in the future).  For more, please see
+ # the file CONTRIBUTING in the tz distribution.
+ 
+-# From Paul Eggert (2014-10-31):
++# From Paul Eggert (2015-08-08):
+ #
+ # Unless otherwise specified, the source for data through 1990 is:
+ # Thomas G. Shanks and Rique Pottenger, The International Atlas (6th edition),
+@@ -43,7 +43,7 @@
+ #	2:00 EET  EEST	Eastern European Time
+ #	2:00 IST  IDT	Israel
+ #	3:00 AST  ADT	Arabia*
+-#	3:30 IRST IRDT	Iran
++#	3:30 IRST IRDT	Iran*
+ #	4:00 GST	Gulf*
+ #	5:30 IST	India
+ #	7:00 ICT	Indochina, most times and locations*
+@@ -52,10 +52,11 @@
+ #	8:00 CST	China
+ #	8:00 IDT	Indochina, 1943-45, 1947-55, 1960-75 (some locations)*
+ #	8:00 JWST	Western Standard Time (Japan, 1896/1937)*
++#	8:30 KST  KDT	Korea when at +0830*
+ #	9:00 JCST	Central Standard Time (Japan, 1896/1937)
+ #	9:00 WIT	east Indonesia (Waktu Indonesia Timur)
+ #	9:00 JST  JDT	Japan
+-#	9:00 KST  KDT	Korea
++#	9:00 KST  KDT	Korea when at +09
+ #	9:30 ACST	Australian Central Standard Time
+ #
+ # See the 'europe' file for Russia and Turkey in Asia.
+@@ -78,13 +79,9 @@
+ Rule E-EurAsia	1996	max	-	Oct	lastSun	 0:00	0	-
+ Rule RussiaAsia	1981	1984	-	Apr	1	 0:00	1:00	S
+ Rule RussiaAsia	1981	1983	-	Oct	1	 0:00	0	-
+-Rule RussiaAsia	1984	1991	-	Sep	lastSun	 2:00s	0	-
+-Rule RussiaAsia	1985	1991	-	Mar	lastSun	 2:00s	1:00	S
+-Rule RussiaAsia	1992	only	-	Mar	lastSat	23:00	1:00	S
+-Rule RussiaAsia	1992	only	-	Sep	lastSat	23:00	0	-
+-Rule RussiaAsia	1993	max	-	Mar	lastSun	 2:00s	1:00	S
+-Rule RussiaAsia	1993	1995	-	Sep	lastSun	 2:00s	0	-
+-Rule RussiaAsia	1996	max	-	Oct	lastSun	 2:00s	0	-
++Rule RussiaAsia	1984	1995	-	Sep	lastSun	 2:00s	0	-
++Rule RussiaAsia	1985	2011	-	Mar	lastSun	 2:00s	1:00	S
++Rule RussiaAsia	1996	2011	-	Oct	lastSun	 2:00s	0	-
+ 
+ # Afghanistan
+ # Zone	NAME		GMTOFF	RULES	FORMAT	[UNTIL]
+@@ -119,30 +116,37 @@
+ # http://www.worldtimezone.com/dst_news/dst_news_armenia03.html
+ # Zone	NAME		GMTOFF	RULES	FORMAT	[UNTIL]
+ Zone	Asia/Yerevan	2:58:00 -	LMT	1924 May  2
+-			3:00	-	YERT	1957 Mar    # Yerevan Time
+-			4:00 RussiaAsia YER%sT	1991 Mar 31  2:00s
+-			3:00	1:00	YERST	1991 Sep 23 # independence
+-			3:00 RussiaAsia	AM%sT	1995 Sep 24  2:00s
+-			4:00	-	AMT	1997
+-			4:00 RussiaAsia	AM%sT	2012 Mar 25  2:00s
+-			4:00	-	AMT
++			3:00	-	+03	1957 Mar
++			4:00 RussiaAsia +04/+05	1991 Mar 31  2:00s
++			3:00 RussiaAsia	+03/+04	1995 Sep 24  2:00s
++			4:00	-	+04	1997
++			4:00 RussiaAsia	+04/+05
+ 
+ # Azerbaijan
++
+ # From Rustam Aliyev of the Azerbaijan Internet Forum (2005-10-23):
+ # According to the resolution of Cabinet of Ministers, 1997
+-# Resolution available at: http://aif.az/docs/daylight_res.pdf
++# From Paul Eggert (2015-09-17): It was Resolution No. 21 (1997-03-17).
++# http://code.az/files/daylight_res.pdf
++
++# From Steffen Thorsen (2016-03-17):
++# ... the Azerbaijani Cabinet of Ministers has cancelled switching to
++# daylight saving time....
++# http://www.azernews.az/azerbaijan/94137.html
++# http://vestnikkavkaza.net/news/Azerbaijani-Cabinet-of-Ministers-cancels-daylight-saving-time.html
++# http://en.apa.az/xeber_azerbaijan_abolishes_daylight_savings_ti_240862.html
++
+ # Rule	NAME	FROM	TO	TYPE	IN	ON	AT	SAVE	LETTER/S
+-Rule	Azer	1997	max	-	Mar	lastSun	 4:00	1:00	S
+-Rule	Azer	1997	max	-	Oct	lastSun	 5:00	0	-
++Rule	Azer	1997	2015	-	Mar	lastSun	 4:00	1:00	S
++Rule	Azer	1997	2015	-	Oct	lastSun	 5:00	0	-
+ # Zone	NAME		GMTOFF	RULES	FORMAT	[UNTIL]
+ Zone	Asia/Baku	3:19:24 -	LMT	1924 May  2
+-			3:00	-	BAKT	1957 Mar    # Baku Time
+-			4:00 RussiaAsia BAK%sT	1991 Mar 31  2:00s
+-			3:00	1:00	BAKST	1991 Aug 30 # independence
+-			3:00 RussiaAsia	AZ%sT	1992 Sep lastSat 23:00
+-			4:00	-	AZT	1996     # Azerbaijan Time
+-			4:00	EUAsia	AZ%sT	1997
+-			4:00	Azer	AZ%sT
++			3:00	-	+03	1957 Mar
++			4:00 RussiaAsia +04/+05	1991 Mar 31  2:00s
++			3:00 RussiaAsia	+03/+04	1992 Sep lastSun  2:00s
++			4:00	-	+04	1996
++			4:00	EUAsia	+04/+05	1997
++			4:00	Azer	+04/+05
+ 
+ # Bahrain
+ # See Asia/Qatar.
+@@ -261,7 +265,7 @@
+ # Milne says 6:24:40 was the meridian of the time ball observatory at Rangoon.
+ 
+ # Zone	NAME		GMTOFF	RULES	FORMAT	[UNTIL]
+-Zone	Asia/Rangoon	6:24:40 -	LMT	1880        # or Yangon
++Zone	Asia/Yangon	6:24:40 -	LMT	1880        # or Rangoon
+ 			6:24:40	-	RMT	1920        # Rangoon Mean Time?
+ 			6:30	-	BURT	1942 May    # Burma Time
+ 			9:00	-	JST	1945 May  3
+@@ -376,7 +380,7 @@
+ # Lewiston (ME) Daily Sun (1939-05-29), p 17, said "Even the time is
+ # different - the occupied districts going by Tokyo time, an hour
+ # ahead of that prevailing in the rest of Shanghai."  Guess that the
+-# Xujiahui Observatory was under French control and stuck with UT+8.
++# Xujiahui Observatory was under French control and stuck with UT +08.
+ #
+ # In earlier versions of this file, China had many separate Zone entries, but
+ # this was based on what were apparently incorrect data in Shanks & Pottenger.
+@@ -385,26 +389,26 @@
+ # Proposed in 1918 and theoretically in effect until 1949 (although in practice
+ # mainly observed in coastal areas), the five zones were:
+ #
+-# Changbai Time ("Long-white Time", Long-white = Heilongjiang area) UT+8.5
++# Changbai Time ("Long-white Time", Long-white = Heilongjiang area) UT +08:30
+ # Asia/Harbin (currently a link to Asia/Shanghai)
+ # Heilongjiang (except Mohe county), Jilin
+ #
+-# Zhongyuan Time ("Central plain Time") UT+8
++# Zhongyuan Time ("Central plain Time") UT +08
+ # Asia/Shanghai
+ # most of China
+ # This currently represents most other zones as well,
+ # as apparently these regions have been the same since 1970.
+ # Milne gives 8:05:43.2 for Xujiahui Observatory time; round to nearest.
+-# Guo says Shanghai switched to UT+8 "from the end of the 19th century".
++# Guo says Shanghai switched to UT +08 "from the end of the 19th century".
+ #
+-# Long-shu Time (probably due to Long and Shu being two names of that area) UT+7
++# Long-shu Time (probably due to Long and Shu being two names of the area) UT +07
+ # Asia/Chongqing (currently a link to Asia/Shanghai)
+ # Guangxi, Guizhou, Hainan, Ningxia, Sichuan, Shaanxi, and Yunnan;
+ # most of Gansu; west Inner Mongolia; west Qinghai; and the Guangdong
+ # counties Deqing, Enping, Kaiping, Luoding, Taishan, Xinxing,
+ # Yangchun, Yangjiang, Yu'nan, and Yunfu.
+ #
+-# Xin-zang Time ("Xinjiang-Tibet Time") UT+6
++# Xin-zang Time ("Xinjiang-Tibet Time") UT +06
+ # Asia/Urumqi
+ # This currently represents Kunlun Time as well,
+ # as apparently the two regions have been the same since 1970.
+@@ -417,7 +421,7 @@
+ # Shihezi, Changji, Yanqi, Heshuo, Tuokexun, Tulufan, Shanshan, Hami,
+ # Fukang, Kuitun, Kumukuli, Miquan, Qitai, and Turfan.
+ #
+-# Kunlun Time UT+5.5
++# Kunlun Time UT +05:30
+ # Asia/Kashgar (currently a link to Asia/Urumqi)
+ # West Tibet, including Pulan, Aheqi, Shufu, Shule;
+ # West Xinjiang, including Aksu, Atushi, Yining, Hetian, Cele, Luopu, Nileke,
+@@ -433,7 +437,7 @@
+ #
+ # On the other hand, ethnic Uyghurs, who make up about half the
+ # population of Xinjiang, typically use "Xinjiang time" which is two
+-# hours behind Beijing time, or UTC +0600. The government of the Xinjiang
++# hours behind Beijing time, or UT +06. The government of the Xinjiang
+ # Uyghur Autonomous Region, (XAUR, or just Xinjiang for short) as well as
+ # local governments such as the Ürümqi city government use both times in
+ # publications, referring to what is popularly called Xinjiang time as
+@@ -489,8 +493,8 @@
+ # having the same time as Beijing.
+ 
+ # From Paul Eggert (2014-06-30):
+-# In the early days of the PRC, Tibet was given its own time zone (UT+6) but
+-# this was withdrawn in 1959 and never reinstated; see Tubten Khétsun,
++# In the early days of the PRC, Tibet was given its own time zone (UT +06)
++# but this was withdrawn in 1959 and never reinstated; see Tubten Khétsun,
+ # Memories of life in Lhasa under Chinese Rule, Columbia U Press, ISBN
+ # 978-0231142861 (2008), translator's introduction by Matthew Akester, p x.
+ # As this is before our 1970 cutoff, Tibet doesn't need a separate zone.
+@@ -504,12 +508,12 @@
+ # Republics, the Soviet Union, the Kuomintang, and the People's Republic of
+ # China, and tracking down all these organizations' timekeeping rules would be
+ # quite a trick.  Approximate this lost history by a transition from LMT to
+-# XJT at the start of 1928, the year of accession of the warlord Jin Shuren,
++# UT +06 at the start of 1928, the year of accession of the warlord Jin Shuren,
+ # which happens to be the date given by Shanks & Pottenger (no doubt as a
+-# guess) as the transition from LMT.  Ignore the usage of UT+8 before
+-# 1986-02-01 under the theory that the transition date to UT+8 is unknown and
++# guess) as the transition from LMT.  Ignore the usage of +08 before
++# 1986-02-01 under the theory that the transition date to +08 is unknown and
+ # that the sort of users who prefer Asia/Urumqi now typically ignored the
+-# UT+8 mandate back then.
++# +08 mandate back then.
+ 
+ # Zone	NAME		GMTOFF	RULES	FORMAT	[UNTIL]
+ # Beijing time, used throughout China; represented by Shanghai.
+@@ -714,7 +718,7 @@
+ # be found from historical government announcement database.
+ 
+ # From Paul Eggert (2014-07-03):
+-# As per Yu-Cheng Chuang, say that Taiwan was at UT+9 from 1937-10-01
++# As per Yu-Cheng Chuang, say that Taiwan was at UT +09 from 1937-10-01
+ # until 1945-09-21 at 01:00, overriding Shanks & Pottenger.
+ # Likewise, use Yu-Cheng Chuang's data for DST in Taiwan.
+ 
+@@ -767,9 +771,19 @@
+ ###############################################################################
+ 
+ # Cyprus
+-#
++
+ # Milne says the Eastern Telegraph Company used 2:14:00.  Stick with LMT.
+-#
++# IATA SSIM (1998-09) has Cyprus using EU rules for the first time.
++
++# From Paul Eggert (2016-09-09):
++# Yesterday's Cyprus Mail reports that Northern Cyprus followed Turkey's
++# lead and switched from +02/+03 to +03 year-round.
++# http://cyprus-mail.com/2016/09/08/two-time-zones-cyprus-turkey-will-not-turn-clocks-back-next-month/
++#
++# From Even Scharning (2016-10-31):
++# Looks like the time zone split in Cyprus went through last night.
++# http://cyprus-mail.com/2016/10/30/cyprus-new-division-two-time-zones-now-reality/
++
+ # Rule	NAME	FROM	TO	TYPE	IN	ON	AT	SAVE	LETTER/S
+ Rule	Cyprus	1975	only	-	Apr	13	0:00	1:00	S
+ Rule	Cyprus	1975	only	-	Oct	12	0:00	0	-
+@@ -784,7 +798,10 @@
+ Zone	Asia/Nicosia	2:13:28 -	LMT	1921 Nov 14
+ 			2:00	Cyprus	EE%sT	1998 Sep
+ 			2:00	EUAsia	EE%sT
+-# IATA SSIM (1998-09) has Cyprus using EU rules for the first time.
++Zone	Asia/Famagusta	2:15:48	-	LMT	1921 Nov 14
++			2:00	Cyprus	EE%sT	1998 Sep
++			2:00	EUAsia	EE%sT	2016 Sep  8
++			3:00	-	+03
+ 
+ # Classically, Cyprus belongs to Asia; e.g. see Herodotus, Histories, I.72.
+ # However, for various reasons many users expect to find it under Europe.
+@@ -828,16 +845,15 @@
+ # Zone	NAME		GMTOFF	RULES	FORMAT	[UNTIL]
+ Zone	Asia/Tbilisi	2:59:11 -	LMT	1880
+ 			2:59:11	-	TBMT	1924 May  2 # Tbilisi Mean Time
+-			3:00	-	TBIT	1957 Mar    # Tbilisi Time
+-			4:00 RussiaAsia TBI%sT	1991 Mar 31  2:00s
+-			3:00	1:00	TBIST	1991 Apr  9 # independence
+-			3:00 RussiaAsia GE%sT	1992        # Georgia Time
+-			3:00 E-EurAsia	GE%sT	1994 Sep lastSun
+-			4:00 E-EurAsia	GE%sT	1996 Oct lastSun
+-			4:00	1:00	GEST	1997 Mar lastSun
+-			4:00 E-EurAsia	GE%sT	2004 Jun 27
+-			3:00 RussiaAsia	GE%sT	2005 Mar lastSun  2:00
+-			4:00	-	GET
++			3:00	-	+03	1957 Mar
++			4:00 RussiaAsia +04/+05	1991 Mar 31  2:00s
++			3:00 RussiaAsia +03/+04	1992
++			3:00 E-EurAsia	+03/+04	1994 Sep lastSun
++			4:00 E-EurAsia	+04/+05	1996 Oct lastSun
++			4:00	1:00	+05	1997 Mar lastSun
++			4:00 E-EurAsia	+04/+05	2004 Jun 27
++			3:00 RussiaAsia	+03/+04	2005 Mar lastSun  2:00
++			4:00	-	+04
+ 
+ # East Timor
+ 
+@@ -872,6 +888,15 @@
+ 			9:00	-	TLT
+ 
+ # India
++
++# From Ian P. Beacock, in "A brief history of (modern) time", The Atlantic
++# http://www.theatlantic.com/technology/archive/2015/12/the-creation-of-modern-time/421419/
++# (2015-12-22):
++# In January 1906, several thousand cotton-mill workers rioted on the
++# outskirts of Bombay....  They were protesting the proposed abolition of
++# local time in favor of Indian Standard Time....  Journalists called this
++# dispute the "Battle of the Clocks."  It lasted nearly half a century.
++
+ # Zone	NAME		GMTOFF	RULES	FORMAT	[UNTIL]
+ Zone	Asia/Kolkata	5:53:28 -	LMT	1880        # Kolkata
+ 			5:53:20	-	HMT	1941 Oct    # Howrah Mean Time?
+@@ -905,7 +930,7 @@
+ # These would be the earliest possible times for a change.
+ # Régimes horaires pour le monde entier, by Henri Le Corre, (Éditions
+ # Traditionnelles, 1987, Paris) says that Java and Madura switched
+-# from JST to UTC+07:30 on 1945-09-23, and gives 1944-09-01 for Jayapura
++# from UT +09 to +07:30 on 1945-09-23, and gives 1944-09-01 for Jayapura
+ # (Hollandia).  For now, assume all Indonesian locations other than Jayapura
+ # switched on 1945-09-23.
+ #
+@@ -916,11 +941,11 @@
+ # summary published by the Time and Frequency Laboratory of the
+ # Research Center for Calibration, Instrumentation and Metrology,
+ # Indonesia, <http://time.kim.lipi.go.id/time-eng.php> (2006-09-29).
+-# The abbreviations are:
++# The time zone abbreviations and UT offsets are:
+ #
+-# WIB  - UTC+7 - Waktu Indonesia Barat (Indonesia western time)
+-# WITA - UTC+8 - Waktu Indonesia Tengah (Indonesia central time)
+-# WIT  - UTC+9 - Waktu Indonesia Timur (Indonesia eastern time)
++# WIB  - +07 - Waktu Indonesia Barat (Indonesia western time)
++# WITA - +08 - Waktu Indonesia Tengah (Indonesia central time)
++# WIT  - +09 - Waktu Indonesia Timur (Indonesia eastern time)
+ #
+ # Zone	NAME		GMTOFF	RULES	FORMAT	[UNTIL]
+ # Java, Sumatra
+@@ -1027,7 +1052,7 @@
+ #
+ # From Roozbeh Pournader (2007-11-05):
+ # This is quoted from Official Gazette of the Islamic Republic of
+-# Iran, Volume 63, Number 18242, dated Tuesday 1386/6/24
++# Iran, Volume 63, No. 18242, dated Tuesday 1386/6/24
+ # [2007-10-16]. I am doing the best translation I can:...
+ # The official time of the country will be moved forward for one hour
+ # on the 24 hours of the first day of the month of Farvardin and will
+@@ -1082,8 +1107,15 @@
+ Rule	Iran	2032	2033	-	Sep	21	0:00	0	S
+ Rule	Iran	2034	2035	-	Mar	22	0:00	1:00	D
+ Rule	Iran	2034	2035	-	Sep	22	0:00	0	S
+-Rule	Iran	2036	2037	-	Mar	21	0:00	1:00	D
+-Rule	Iran	2036	2037	-	Sep	21	0:00	0	S
++#
++# The following rules are approximations starting in the year 2038.
++# These are the best post-2037 approximations available, given the
++# restrictions of a single rule using a Gregorian-based data format.
++# At some point this table will need to be extended, though quite
++# possibly Iran will change the rules first.
++Rule	Iran	2036	max	-	Mar	21	0:00	1:00	D
++Rule	Iran	2036	max	-	Sep	21	0:00	0	S
++
+ # Zone	NAME		GMTOFF	RULES	FORMAT	[UNTIL]
+ Zone	Asia/Tehran	3:25:44	-	LMT	1916
+ 			3:25:44	-	TMT	1946     # Tehran Mean Time
+@@ -1540,24 +1572,7 @@
+ 
+ # Kazakhstan
+ 
+-# From Paul Eggert (1996-11-22):
+-# Andrew Evtichov (1996-04-13) writes that Kazakhstan
+-# stayed in sync with Moscow after 1990, and that Aqtobe (formerly Aktyubinsk)
+-# and Aqtau (formerly Shevchenko) are the largest cities in their zones.
+-# Guess that Aqtau and Aqtobe diverged in 1995, since that's the first time
+-# IATA SSIM mentions a third time zone in Kazakhstan.
+-
+-# From Paul Eggert (2006-03-22):
+-# German Iofis, ELSI, Almaty (2001-10-09) reports that Kazakhstan uses
+-# RussiaAsia rules, instead of switching at 00:00 as the IATA has it.
+-# Go with Shanks & Pottenger, who have them always using RussiaAsia rules.
+-# Also go with the following claims of Shanks & Pottenger:
+-#
+-# - Kazakhstan did not observe DST in 1991.
+-# - Qyzylorda switched from +5:00 to +6:00 on 1992-01-19 02:00.
+-# - Oral switched from +5:00 to +4:00 in spring 1989.
+-
+-# From Kazakhstan Embassy's News Bulletin #11
++# From Kazakhstan Embassy's News Bulletin No. 11
+ # <http://www.kazsociety.org.uk/news/2005/03/30.htm> (2005-03-21):
+ # The Government of Kazakhstan passed a resolution March 15 abolishing
+ # daylight saving time citing lack of economic benefits and health
+@@ -1573,61 +1588,232 @@
+ # everything else....  I guess that would make Kazakhstan time zones
+ # de jure UTC+5 and UTC+6 respectively.
+ 
++# From Stepan Golosunov (2016-03-27) ([*] means see later comments below):
++# Review of the linked documents from http://adilet.zan.kz/
++# produced the following data for post-1991 Kazakhstan:
++#
++# 0. Act of the Cabinet of Ministers of the USSR
++# from 1991-02-04 No. 20
++# http://pravo.gov.ru/proxy/ips/?docbody=&nd=102010545
++# removed the extra hour ("decree time") on the territory of the USSR
++# starting with the last Sunday of March 1991.
++# It also allowed (but not mandated) Kazakh SSR, Kirghiz SSR, Tajik SSR,
++# Turkmen SSR and Uzbek SSR to not have "summer" time.
++#
++# The 1992-01-13 act also refers to the act of the Cabinet of Ministers
++# of the Kazakh SSR from 1991-03-20 No. 170 "About the act of the Cabinet
++# of Ministers of the USSR from 1991-02-04 No. 20" but I didn't found its
++# text.
++#
++# According to Izvestia newspaper No. 68 (23334) from 1991-03-20
++# (page 6; available at http://libinfo.org/newsr/newsr2574.djvu via
++# http://libinfo.org/index.php?id=58564) on 1991-03-31 at 2:00 during
++# transition to "summer" time:
++# Republic of Georgia, Latvian SSR, Lithuanian SSR, SSR Moldova,
++# Estonian SSR; Komi ASSR; Kaliningrad oblast; Nenets autonomous okrug
++# were to move clocks 1 hour forward.
++# Kazakh SSR (excluding Uralsk oblast); Republic of Kyrgyzstan, Tajik
++# SSR; Andijan, Jizzakh, Namangan, Sirdarya, Tashkent, Fergana oblasts
++# of the Uzbek SSR were to move clocks 1 hour backwards.
++# Other territories were to not move clocks.
++# When the "summer" time would end on 1991-09-29, clocks were to be
++# moved 1 hour backwards on the territory of the USSR excluding
++# Kazakhstan, Kirghizia, Uzbekistan, Turkmenia, Tajikistan.
++#
++# Apparently there were last minute changes. Apparently Kazakh act No. 170
++# was one of such changes.
++#
++# https://ru.wikipedia.org/wiki/Декретное время
++# claims that Sovetskaya Rossiya newspaper on 1991-03-29 published that
++# Nenets autonomous okrug, Komi and Kazakhstan (excluding Uralsk oblast)
++# were to not move clocks and Uralsk oblast was to move clocks
++# forward; on 1991-09-29 Kazakhstan was to move clocks backwards.
++# (Probably there were changes even after that publication. There is an
++# article claiming that Kaliningrad oblast decided on 1991-03-29 to not
++# move clocks.)
++#
++# This implies that on 1991-03-31 Asia/Oral remained on +04/+05 while
++# the rest of Kazakhstan switched from +06/+07 to +05/06 or from +05/06
++# to +04/+05. It's unclear how Kzyl-Orda oblast moved into the fifth
++# time belt. (By switching from +04/+05 to +05/+06 on 1991-09-29?) ...
++#
++# 1. Act of the Cabinet of Ministers of the Republic of Kazakhstan
++# from 1992-01-13 No. 28
++# http://adilet.zan.kz/rus/docs/P920000028_
++# (text includes modification from the 1996 act)
++# introduced new rules for calculation of time, mirroring Russian
++# 1992-01-08 act.  It specified that time would be calculated
++# according to time belts plus extra hour ("decree time"), moved clocks
++# on the whole territory of Kazakhstan 1 hour forward on 1992-01-19 at
++# 2:00, specified DST rules.  It acknowledged that Kazakhstan was
++# located in the fourth and the fifth time belts and specified the
++# border between them to be located east of Kustanay and Aktyubinsk
++# oblasts (notably including Turgai and Kzyl-Orda oblasts into the fifth
++# time belt).
++#
++# This means switch on 1992-01-19 at 2:00 from +04/+05 to +05/+06 for
++# Asia/Aqtau, Asia/Aqtobe, Asia/Oral, Atyrau and Kustanay oblasts; from
++# +05/+06 to +06/+07 for Asia/Almaty and Asia/Qyzylorda (and Arkalyk) [*]....
++#
++# 2. Act of the Cabinet of Ministers of the Republic of Kazakhstan
++# from 1992-03-27 No. 284
++# http://adilet.zan.kz/rus/docs/P920000284_
++# cancels extra hour ("decree time") for Uralsk and Kzyl-Orda oblasts
++# since the last Sunday of March 1992, while keeping them in the fourth
++# and the fifth time belts respectively.
++#
++# 3. Order of the Prime Minister of the Republic of Kazakhstan
++# from 1994-09-23 No. 384
++# http://adilet.zan.kz/rus/docs/R940000384_
++# cancels the extra hour ("decree time") on the territory of Mangystau
++# oblast since the last Sunday of September 1994 (saying that time on
++# the territory would correspond to the third time belt as a
++# result)....
++#
++# 4. Act of the Government of the Republic of Kazakhstan
++# from 1996-05-08 No. 575
++# http://adilet.zan.kz/rus/docs/P960000575_
++# amends the 1992-01-13 act to end summer time in October instead
++# of September, mirroring identical Russian change from 1996-04-23 act.
++#
++# 5. Act of the Government of the Republic of Kazakhstan
++# from 1999-03-26 No. 305
++# http://adilet.zan.kz/rus/docs/P990000305_
++# cancels the extra hour ("decree time") for Atyrau oblast since the
++# last Sunday of March 1999 while retaining the oblast in the fourth
++# time belt.
++#
++# This means change from +05/+06 to +04/+05.
++#
++# There is no zone for Atyrau currently (listed under Asia/Aqtau in
++# zone1970.tab).[*]
++#
++# 6. Act of the Government of the Republic of Kazakhstan
++# from 2000-11-23 No. 1749
++# http://adilet.zan.kz/rus/archive/docs/P000001749_/23.11.2000
++# replaces the previous five documents.
++#
++# The only changes I noticed are in definition of the border between the
++# fourth and the fifth time belts.  They account for changes in spelling
++# and administrative division (splitting of Turgai oblast in 1997
++# probably changed time in territories incorporated into Kostanay oblast
++# (including Arkalyk) from +06/+07 to +05/+06) and move Kyzylorda oblast
++# from being in the fifth time belt and not using decree time into the
++# fourth time belt (no change in practice).[*]
++#
++# 7. Act of the Government of the Republic of Kazakhstan
++# from 2003-12-29 No. 1342
++# http://adilet.zan.kz/rus/docs/P030001342_
++# modified the 2000-11-23 act.  No relevant changes, apparently.
++#
++# 8. Act of the Government of the Republic of Kazakhstan
++# from 2004-07-20 No. 775
++# http://adilet.zan.kz/rus/archive/docs/P040000775_/20.07.2004
++# modified the 2000-11-23 act to move Kostanay and Kyzylorda oblasts into
++# the fifth time belt and add Aktobe oblast to the list of regions not
++# using extra hour ("decree time"), leaving Kazakhstan with only 2 time
++# zones (+04/+05 and +06/+07).  The changes were to be implemented
++# during DST transitions in 2004 and 2005 but the acts got radically
++# amended before implementation happened.
++#
++# 9. Act of the Government of the Republic of Kazakhstan
++# from 2004-09-15 No. 1059
++# http://adilet.zan.kz/rus/docs/P040001059_
++# modified the 2000-11-23 act to remove exceptions from the "decree time"
++# (leaving Kazakhstan in +05/+06 and +06/+07 zones), amended the
++# 2004-07-20 act to implement changes for Atyrau, West Kazakhstan,
++# Kostanay, Kyzylorda and Mangystau oblasts by not moving clocks
++# during the 2014 transition to "winter" time.
++#
++# This means transition from +04/+05 to +05/+06 for Atyrau oblast (no
++# zone currently), Asia/Oral, Asia/Aqtau and transition from +05/+06 to
++# +06/+07 for Kostanay oblast (Kostanay and Arkalyk, no zones currently)
++# and Asia/Qyzylorda on 2004-10-31 at 3:00....[*]
++#
++# 10. Act of the Government of the Republic of Kazakhstan
++# from 2005-03-15 No. 231
++# http://adilet.zan.kz/rus/docs/P050000231_
++# removes DST provisions from the 2000-11-23 act, removes most of the
++# (already implemented) provisions from the 2004-07-20 and 2004-09-15
++# acts, comes into effect 10 days after official publication.
++# The only practical effect seems to be the abolition of the summer
++# time.
++#
++# Unamended version of the act of the Government of the Russian Federation
++# No. 23 from 1992-01-08 [See 'europe' file for details].
++# Kazakh 1992-01-13 act appears to provide the same rules and 1992-03-27
++# act was to be enacted on the last Sunday of March 1992.
++
++# From Paul Eggert (2016-04-15):
++# The tables below should reflect Stepan Golosunov's remarks above,
++# except for the items marked "[*]" which I haven't gotten to yet.
++# It looks like we will need new zones Asia/Atyrau and Asia/Qostanay
++# to handle changes from 1992 through 2004 that we did not previously
++# know about.
++
+ #
+ # Zone	NAME		GMTOFF	RULES	FORMAT	[UNTIL]
+ #
+ # Almaty (formerly Alma-Ata), representing most locations in Kazakhstan
++# This includes KZ-AKM, KZ-ALA, KZ-ALM, KZ-AST, KZ-BAY, KZ-VOS, KZ-ZHA,
++# KZ-KAR, KZ-SEV, KZ-PAV, and KZ-YUZ.
+ Zone	Asia/Almaty	5:07:48 -	LMT	1924 May  2 # or Alma-Ata
+-			5:00	-	ALMT	1930 Jun 21 # Alma-Ata Time
+-			6:00 RussiaAsia ALM%sT	1991
+-			6:00	-	ALMT	1992
+-			6:00 RussiaAsia	ALM%sT	2005 Mar 15
+-			6:00	-	ALMT
+-# Qyzylorda (aka Kyzylorda, Kizilorda, Kzyl-Orda, etc.)
++			5:00	-	+05	1930 Jun 21
++			6:00 RussiaAsia +06/+07	1991 Mar 31  2:00s
++			5:00 RussiaAsia	+05/+06	1992 Jan 19  2:00s
++			6:00 RussiaAsia	+06/+07	2004 Oct 31  2:00s
++			6:00	-	+06
++# Qyzylorda (aka Kyzylorda, Kizilorda, Kzyl-Orda, etc.) (KZ-KZY)
+ Zone	Asia/Qyzylorda	4:21:52 -	LMT	1924 May  2
+-			4:00	-	KIZT	1930 Jun 21 # Kizilorda Time
+-			5:00	-	KIZT	1981 Apr  1
+-			5:00	1:00	KIZST	1981 Oct  1
+-			6:00	-	KIZT	1982 Apr  1
+-			5:00 RussiaAsia	KIZ%sT	1991
+-			5:00	-	KIZT	1991 Dec 16 # independence
+-			5:00	-	QYZT	1992 Jan 19  2:00
+-			6:00 RussiaAsia	QYZ%sT	2005 Mar 15
+-			6:00	-	QYZT
+-# Aqtobe (aka Aktobe, formerly Aktyubinsk)
++			4:00	-	+04	1930 Jun 21
++			5:00	-	+05	1981 Apr  1
++			5:00	1:00	+06	1981 Oct  1
++			6:00	-	+06	1982 Apr  1
++			5:00 RussiaAsia	+05/+06	1991 Mar 31  2:00s
++			4:00 RussiaAsia	+04/+05	1991 Sep 29  2:00s
++			5:00 RussiaAsia	+05/+06	1992 Jan 19  2:00s
++			6:00 RussiaAsia	+06/+07	1992 Mar 29  2:00s
++			5:00 RussiaAsia	+05/+06	2004 Oct 31  2:00s
++			6:00	-	+06
++# Aqtobe (aka Aktobe, formerly Aktyubinsk) (KZ-AKT)
+ Zone	Asia/Aqtobe	3:48:40	-	LMT	1924 May  2
+-			4:00	-	AKTT	1930 Jun 21 # Aktyubinsk Time
+-			5:00	-	AKTT	1981 Apr  1
+-			5:00	1:00	AKTST	1981 Oct  1
+-			6:00	-	AKTT	1982 Apr  1
+-			5:00 RussiaAsia	AKT%sT	1991
+-			5:00	-	AKTT	1991 Dec 16 # independence
+-			5:00 RussiaAsia	AQT%sT	2005 Mar 15 # Aqtobe Time
+-			5:00	-	AQTT
+-# Mangghystau
++			4:00	-	+04	1930 Jun 21
++			5:00	-	+05	1981 Apr  1
++			5:00	1:00	+06	1981 Oct  1
++			6:00	-	+06	1982 Apr  1
++			5:00 RussiaAsia	+05/+06	1991 Mar 31  2:00s
++			4:00 RussiaAsia	+04/+05	1992 Jan 19  2:00s
++			5:00 RussiaAsia	+05/+06	2004 Oct 31  2:00s
++			5:00	-	+05
++# Qostanay (KZ-KUS)
++
++# Mangghystau (KZ-MAN)
+ # Aqtau was not founded until 1963, but it represents an inhabited region,
+ # so include time stamps before 1963.
+ Zone	Asia/Aqtau	3:21:04	-	LMT	1924 May  2
+-			4:00	-	FORT	1930 Jun 21 # Fort Shevchenko T
+-			5:00	-	FORT	1963
+-			5:00	-	SHET	1981 Oct  1 # Shevchenko Time
+-			6:00	-	SHET	1982 Apr  1
+-			5:00 RussiaAsia	SHE%sT	1991
+-			5:00	-	SHET	1991 Dec 16 # independence
+-			5:00 RussiaAsia	AQT%sT	1995 Mar lastSun  2:00 # Aqtau Time
+-			4:00 RussiaAsia	AQT%sT	2005 Mar 15
+-			5:00	-	AQTT
+-# West Kazakhstan
++			4:00	-	+04	1930 Jun 21
++			5:00	-	+05	1963
++			5:00	-	+05	1981 Oct  1
++			6:00	-	+06	1982 Apr  1
++			5:00 RussiaAsia	+05/+06	1991 Mar 31  2:00s
++			4:00 RussiaAsia	+04/+05	1992 Jan 19  2:00s
++			5:00 RussiaAsia	+05/+06	1994 Sep 25  2:00s
++			4:00 RussiaAsia	+04/+05	2004 Oct 31  2:00s
++			5:00	-	+05
++
++# West Kazakhstan (KZ-ZAP)
++# From Paul Eggert (2016-03-18):
++# The 1989 transition is from USSR act No. 227 (1989-03-14).
+ Zone	Asia/Oral	3:25:24	-	LMT	1924 May  2 # or Ural'sk
+-			4:00	-	URAT	1930 Jun 21 # Ural'sk time
+-			5:00	-	URAT	1981 Apr  1
+-			5:00	1:00	URAST	1981 Oct  1
+-			6:00	-	URAT	1982 Apr  1
+-			5:00 RussiaAsia	URA%sT	1989 Mar 26  2:00
+-			4:00 RussiaAsia	URA%sT	1991
+-			4:00	-	URAT	1991 Dec 16 # independence
+-			4:00 RussiaAsia	ORA%sT	2005 Mar 15 # Oral Time
+-			5:00	-	ORAT
++			4:00	-	+04	1930 Jun 21
++			5:00	-	+05	1981 Apr  1
++			5:00	1:00	+06	1981 Oct  1
++			6:00	-	+06	1982 Apr  1
++			5:00 RussiaAsia	+05/+06	1989 Mar 26  2:00s
++			4:00 RussiaAsia	+04/+05	1992 Jan 19  2:00s
++			5:00 RussiaAsia	+05/+06	1992 Mar 29  2:00s
++			4:00 RussiaAsia	+04/+05	2004 Oct 31  2:00s
++			5:00	-	+05
+ 
+ # Kyrgyzstan (Kirgizstan)
+ # Transitions through 1991 are from Shanks & Pottenger.
+@@ -1648,11 +1834,11 @@
+ Rule	Kyrgyz	1997	2004	-	Oct	lastSun	2:30	0	-
+ # Zone	NAME		GMTOFF	RULES	FORMAT	[UNTIL]
+ Zone	Asia/Bishkek	4:58:24 -	LMT	1924 May  2
+-			5:00	-	FRUT	1930 Jun 21 # Frunze Time
+-			6:00 RussiaAsia FRU%sT	1991 Mar 31  2:00s
+-			5:00	1:00	FRUST	1991 Aug 31  2:00 # independence
+-			5:00	Kyrgyz	KG%sT	2005 Aug 12 # Kyrgyzstan Time
+-			6:00	-	KGT
++			5:00	-	+05	1930 Jun 21
++			6:00 RussiaAsia +06/+07	1991 Mar 31  2:00s
++			5:00 RussiaAsia	+05/+06	1991 Aug 31  2:00
++			5:00	Kyrgyz	+05/+06	2005 Aug 12
++			6:00	-	+06
+ 
+ ###############################################################################
+ 
+@@ -1691,25 +1877,36 @@
+ Rule	ROK	1987	1988	-	May	Sun>=8	2:00	1:00	D
+ Rule	ROK	1987	1988	-	Oct	Sun>=8	3:00	0	S
+ 
+-# From Paul Eggert (2014-10-30):
++# From Paul Eggert (2016-08-23):
+ # The Korean Wikipedia entry gives the following sources for UT offsets:
+ #
+-# 1908: Official Journal Article No. 3994 (Edict No. 5)
++# 1908: Official Journal Article No. 3994 (decree No. 5)
+ # 1912: Governor-General of Korea Official Gazette Issue No. 367
+ #       (Announcement No. 338)
+ # 1954: Presidential Decree No. 876 (1954-03-17)
+ # 1961: Law No. 676 (1961-08-07)
+-# 1987: Law No. 3919 (1986-12-31)
+ #
+-# The Wikipedia entry also has confusing information about a change
+-# to UT+9 in April 1910, but then what would be the point of the later change
+-# to UT+9 on 1912-01-01?  Omit the 1910 change for now.
++# (Another source "1987: Law No. 3919 (1986-12-31)" was in the 2014-10-30
++# edition of the Korean Wikipedia entry.)
+ #
+ # I guessed that time zone abbreviations through 1945 followed the same
+ # rules as discussed under Taiwan, with nominal switches from JST to KST
+ # when the respective cities were taken over by the Allies after WWII.
+ #
+-# For Pyongyang we have no information; guess no changes since World War II.
++# For Pyongyang, guess no changes from World War II until 2015, as we
++# have no information otherwise.
++
++# From Steffen Thorsen (2015-08-07):
++# According to many news sources, North Korea is going to change to
++# the 8:30 time zone on August 15, one example:
++# http://www.bbc.com/news/world-asia-33815049
++#
++# From Paul Eggert (2015-08-15):
++# Bells rang out midnight (00:00) Friday as part of the celebrations.  See:
++# Talmadge E. North Korea celebrates new time zone, 'Pyongyang Time'
++# http://news.yahoo.com/north-korea-celebrates-time-zone-pyongyang-time-164038128.html
++# There is no common English-language abbreviation for this time zone.
++# Use KST, as that's what we already use for 1954-1961 in ROK.
+ 
+ # Zone	NAME		GMTOFF	RULES	FORMAT	[UNTIL]
+ Zone	Asia/Seoul	8:27:52	-	LMT	1908 Apr  1
+@@ -1723,7 +1920,8 @@
+ 			8:30	-	KST	1912 Jan  1
+ 			9:00	-	JCST	1937 Oct  1
+ 			9:00	-	JST	1945 Aug 24
+-			9:00	-	KST
++			9:00	-	KST	2015 Aug 15 00:00
++			8:30	-	KST
+ 
+ ###############################################################################
+ 
+@@ -1856,7 +2054,7 @@
+ # Bill Bonnet (2005-05-19) reports that the US Embassy in Ulaanbaatar says
+ # there is only one time zone and that DST is observed, citing Microsoft
+ # Windows XP as the source.  Risto Nykänen (2005-05-16) reports that
+-# travelmongolia.org says there are two time zones (UTC+7, UTC+8) with no DST.
++# travelmongolia.org says there are two time zones (UT +07, +08) with no DST.
+ # Oscar van Vlijmen (2005-05-20) reports that the Mongolian Embassy in
+ # Washington, DC says there are two time zones, with DST observed.
+ # He also found
+@@ -2096,8 +2294,8 @@
+ # http://www.app.com.pk/en_/index.php?option=com_content&task=view&id=99374&Itemid=2
+ 
+ # Rule	NAME	FROM	TO	TYPE	IN	ON	AT	SAVE	LETTER/S
+-Rule Pakistan	2002	only	-	Apr	Sun>=2	0:01	1:00	S
+-Rule Pakistan	2002	only	-	Oct	Sun>=2	0:01	0	-
++Rule Pakistan	2002	only	-	Apr	Sun>=2	0:00	1:00	S
++Rule Pakistan	2002	only	-	Oct	Sun>=2	0:00	0	-
+ Rule Pakistan	2008	only	-	Jun	1	0:00	1:00	S
+ Rule Pakistan	2008	2009	-	Nov	1	0:00	0	-
+ Rule Pakistan	2009	only	-	Apr	15	0:00	1:00	S
+@@ -2359,9 +2557,28 @@
+ # From Paul Eggert (2015-03-03):
+ # http://www.timeanddate.com/time/change/west-bank/ramallah?year=2014
+ # says that the fall 2014 transition was Oct 23 at 24:00.
+-# For future dates, guess the last Friday in March at 24:00 through
+-# the first Friday on or after October 21 at 00:00.  This is consistent with
+-# the predictions in today's editions of the following URLs:
++
++# From Hannah Kreitem (2016-03-09):
++# http://www.palestinecabinet.gov.ps/WebSite/ar/ViewDetails?ID=31728
++# [Google translation]: "The Council also decided to start daylight
++# saving in Palestine as of one o'clock on Saturday morning,
++# 2016-03-26, to provide the clock 60 minutes ahead."
++#
++# From Paul Eggert (2016-03-12):
++# Predict spring transitions on March's last Saturday at 01:00 from now on.
++
++# From Sharef Mustafa (2016-10-19):
++# [T]he Palestinian cabinet decision (Mar 8th 2016) published on
++# http://www.palestinecabinet.gov.ps/WebSite/Upload/Decree/GOV_17/16032016134830.pdf
++# states that summer time will end on Oct 29th at 01:00.
++#
++# From Tim Parenti (2016-10-19):
++# Predict fall transitions on October's last Saturday at 01:00 from now on.
++# This is consistent with the 2016 transition as well as our spring
++# predictions.
++#
++# From Paul Eggert (2016-10-19):
++# It's also consistent with predictions in the following URLs today:
+ # http://www.timeanddate.com/time/change/gaza-strip/gaza
+ # http://www.timeanddate.com/time/change/west-bank/hebron
+ 
+@@ -2392,8 +2609,10 @@
+ Rule Palestine	2012	2014	-	Mar	lastThu	24:00	1:00	S
+ Rule Palestine	2012	only	-	Sep	21	1:00	0	-
+ Rule Palestine	2013	only	-	Sep	Fri>=21	0:00	0	-
+-Rule Palestine	2014	max	-	Oct	Fri>=21	0:00	0	-
+-Rule Palestine	2015	max	-	Mar	lastFri	24:00	1:00	S
++Rule Palestine	2014	2015	-	Oct	Fri>=21	0:00	0	-
++Rule Palestine	2015	only	-	Mar	lastFri	24:00	1:00	S
++Rule Palestine	2016	max	-	Mar	lastSat	1:00	1:00	S
++Rule Palestine	2016	max	-	Oct	lastSat	1:00	0	-
+ 
+ # Zone	NAME		GMTOFF	RULES	FORMAT	[UNTIL]
+ Zone	Asia/Gaza	2:17:52	-	LMT	1900 Oct
+@@ -2481,7 +2700,7 @@
+ # earlier date.
+ #
+ # Shanks & Pottenger also state that until 1968-05-01 Saudi Arabia had two
+-# time zones; the other zone, at UTC+4, was in the far eastern part of
++# time zones; the other zone, at UT +04, was in the far eastern part of
+ # the country.  Ignore this, as it's before our 1970 cutoff.
+ #
+ # Zone	NAME		GMTOFF	RULES	FORMAT	[UNTIL]
+@@ -2543,45 +2762,31 @@
+ # People who live in regions under Tamil control can use [TZ='Asia/Kolkata'],
+ # as that zone has agreed with the Tamil areas since our cutoff date of 1970.
+ 
+-# From K Sethu (2006-04-25):
+-# I think the abbreviation LKT originated from the world of computers at
+-# the time of or subsequent to the time zone changes by SL Government
+-# twice in 1996 and probably SL Government or its standardization
+-# agencies never declared an abbreviation as a national standard.
+-#
+-# I recollect before the recent change the government announcements
+-# mentioning it as simply changing Sri Lanka Standard Time or Sri Lanka
+-# Time and no mention was made about the abbreviation.
+-#
+-# If we look at Sri Lanka Department of Government's "Official News
+-# Website of Sri Lanka" ... http://www.news.lk/ we can see that they
+-# use SLT as abbreviation in time stamp at the beginning of each news
+-# item....
+-#
+-# Within Sri Lanka I think LKT is well known among computer users and
+-# administrators.  In my opinion SLT may not be a good choice because the
+-# nation's largest telcom / internet operator Sri Lanka Telcom is well
+-# known by that abbreviation - simply as SLT (there IP domains are
+-# slt.lk and sltnet.lk).
+-#
+-# But if indeed our government has adopted SLT as standard abbreviation
+-# (that we have not known so far) then  it is better that it be used for
+-# all computers.
+-
+-# From Paul Eggert (2006-04-25):
+-# One possibility is that we wait for a bit for the dust to settle down
+-# and then see what people actually say in practice.
++# From Sadika Sumanapala (2016-10-19):
++# According to http://www.sltime.org (maintained by Measurement Units,
++# Standards & Services Department, Sri Lanka) abbreviation for Sri Lanka
++# standard time is SLST.
++#
++# From Paul Eggert (2016-10-18):
++# "SLST" seems to be reasonably recent and rarely-used outside time
++# zone nerd sources.  I searched Google News and found three uses of
++# it in the International Business Times of India in February and
++# March of this year when discussing cricket match times, but nothing
++# since then (though there has been a lot of cricket) and nothing in
++# other English-language news sources.  Our old abbreviation "LKT" is
++# even worse.  For now, let's use a numeric abbreviation; we can
++# switch to "SLST" if it catches on.
+ 
+ # Zone	NAME		GMTOFF	RULES	FORMAT	[UNTIL]
+ Zone	Asia/Colombo	5:19:24 -	LMT	1880
+ 			5:19:32	-	MMT	1906        # Moratuwa Mean Time
+-			5:30	-	IST	1942 Jan  5
+-			5:30	0:30	IHST	1942 Sep
+-			5:30	1:00	IST	1945 Oct 16  2:00
+-			5:30	-	IST	1996 May 25  0:00
+-			6:30	-	LKT	1996 Oct 26  0:30
+-			6:00	-	LKT	2006 Apr 15  0:30
+-			5:30	-	IST
++			5:30	-	+0530	1942 Jan  5
++			5:30	0:30	+0530/+06 1942 Sep
++			5:30	1:00	+0530/+0630 1945 Oct 16  2:00
++			5:30	-	+0530	1996 May 25  0:00
++			6:30	-	+0630	1996 Oct 26  0:30
++			6:00	-	+06	2006 Apr 15  0:30
++			5:30	-	+0530
+ 
+ # Syria
+ # Rule	NAME	FROM	TO	TYPE	IN	ON	AT	SAVE	LETTER/S
+@@ -2750,10 +2955,10 @@
+ # From Shanks & Pottenger.
+ # Zone	NAME		GMTOFF	RULES	FORMAT	[UNTIL]
+ Zone	Asia/Dushanbe	4:35:12 -	LMT	1924 May  2
+-			5:00	-	DUST	1930 Jun 21 # Dushanbe Time
+-			6:00 RussiaAsia DUS%sT	1991 Mar 31  2:00s
+-			5:00	1:00	DUSST	1991 Sep  9  2:00s
+-			5:00	-	TJT	# Tajikistan Time
++			5:00	-	+05	1930 Jun 21
++			6:00 RussiaAsia +06/+07	1991 Mar 31  2:00s
++			5:00	1:00	+05/+06	1991 Sep  9  2:00s
++			5:00	-	+05
+ 
+ # Thailand
+ # Zone	NAME		GMTOFF	RULES	FORMAT	[UNTIL]
+@@ -2767,11 +2972,10 @@
+ # From Shanks & Pottenger.
+ # Zone	NAME		GMTOFF	RULES	FORMAT	[UNTIL]
+ Zone	Asia/Ashgabat	3:53:32 -	LMT	1924 May  2 # or Ashkhabad
+-			4:00	-	ASHT	1930 Jun 21 # Ashkhabad Time
+-			5:00 RussiaAsia	ASH%sT	1991 Mar 31  2:00
+-			4:00 RussiaAsia	ASH%sT	1991 Oct 27 # independence
+-			4:00 RussiaAsia	TM%sT	1992 Jan 19  2:00
+-			5:00	-	TMT
++			4:00	-	+04	1930 Jun 21
++			5:00 RussiaAsia	+05/+06	1991 Mar 31  2:00
++			4:00 RussiaAsia	+04/+05	1992 Jan 19  2:00
++			5:00	-	+05
+ 
+ # United Arab Emirates
+ # Zone	NAME		GMTOFF	RULES	FORMAT	[UNTIL]
+@@ -2783,20 +2987,18 @@
+ # Byalokoz 1919 says Uzbekistan was 4:27:53.
+ # Zone	NAME		GMTOFF	RULES	FORMAT	[UNTIL]
+ Zone	Asia/Samarkand	4:27:53 -	LMT	1924 May  2
+-			4:00	-	SAMT	1930 Jun 21 # Samarkand Time
+-			5:00	-	SAMT	1981 Apr  1
+-			5:00	1:00	SAMST	1981 Oct  1
+-			6:00	-	TAST	1982 Apr  1 # Tashkent Time
+-			5:00 RussiaAsia	SAM%sT	1991 Sep  1 # independence
+-			5:00 RussiaAsia	UZ%sT	1992
+-			5:00	-	UZT
++			4:00	-	+04	1930 Jun 21
++			5:00	-	+05	1981 Apr  1
++			5:00	1:00	+06	1981 Oct  1
++			6:00	-	+06	1982 Apr  1
++			5:00 RussiaAsia	+05/+06	1992
++			5:00	-	+05
+ # Milne says Tashkent was 4:37:10.8; round to nearest.
+ Zone	Asia/Tashkent	4:37:11 -	LMT	1924 May  2
+-			5:00	-	TAST	1930 Jun 21 # Tashkent Time
+-			6:00 RussiaAsia	TAS%sT	1991 Mar 31  2:00
+-			5:00 RussiaAsia	TAS%sT	1991 Sep  1 # independence
+-			5:00 RussiaAsia	UZ%sT	1992
+-			5:00	-	UZT
++			5:00	-	+05	1930 Jun 21
++			6:00 RussiaAsia	+06/+07	1991 Mar 31  2:00
++			5:00 RussiaAsia	+05/+06	1992
++			5:00	-	+05
+ 
+ # Vietnam
+ 
+--- contrib/tzdata/australasia.orig
++++ contrib/tzdata/australasia
+@@ -60,6 +60,14 @@
+ # Hamilton is the largest, but there is also a Hamilton in Victoria,
+ # so use Lindeman.
+ #
++# From J William Piggott (2016-02-20):
++# There is no location named Holiday Islands in Queensland Australia; holiday
++# islands is a colloquial term used globally.  Hayman and Lindeman are at the
++# north and south extremes of the Whitsunday Islands archipelago, and
++# Hamilton is in between; it is reasonable to believe that this time zone
++# applies to all of the Whitsundays.
++# http://www.australia.gov.au/about-australia/australian-story/austn-islands
++#
+ # Rule	NAME	FROM	TO	TYPE	IN	ON	AT	SAVE	LETTER/S
+ Rule	AQ	1971	only	-	Oct	lastSun	2:00s	1:00	D
+ Rule	AQ	1972	only	-	Feb	lastSun	2:00s	0	S
+@@ -235,11 +243,11 @@
+ # will produce a binary file with an [A]EST-type as the first 32-bit type;
+ # this is required for correct handling of times before 1916 by
+ # pre-2013 versions of localtime.
+-Zone Antarctica/Macquarie 0	-	zzz	1899 Nov
++Zone Antarctica/Macquarie 0	-	-00	1899 Nov
+ 			10:00	-	AEST	1916 Oct  1  2:00
+ 			10:00	1:00	AEDT	1917 Feb
+ 			10:00	Aus	AE%sT	1919 Apr  1  0:00s
+-			0	-	zzz	1948 Mar 25
++			0	-	-00	1948 Mar 25
+ 			10:00	Aus	AE%sT	1967
+ 			10:00	AT	AE%sT	2010 Apr  4  3:00
+ 			11:00	-	MIST	# Macquarie I Standard Time
+@@ -335,10 +343,23 @@
+ # DST will start Nov. 2 this year.
+ # http://www.fiji.gov.fj/Media-Center/Press-Releases/DAYLIGHT-SAVING-STARTS-ON-SUNDAY,-NOVEMBER-2ND.aspx
+ 
+-# From Paul Eggert (2014-10-20):
++# From a government order dated 2015-08-26 and published as Legal Notice No. 77
++# in the Government of Fiji Gazette Supplement No. 24 (2015-08-28),
++# via Ken Rylander (2015-09-02):
++# the daylight saving period is 1 hour in advance of the standard time
++# commencing at 2.00 am on Sunday 1st November, 2015 and ending at
++# 3.00 am on Sunday 17th January, 2016.
++
++# From Raymond Kumar (2016-10-04):
++# http://www.fiji.gov.fj/Media-Center/Press-Releases/DAYLIGHT-SAVING-STARTS-ON-6th-NOVEMBER,-2016.aspx
++# "Fiji's daylight savings will begin on Sunday, 6 November 2016, when
++# clocks go forward an hour at 2am to 3am....  Daylight Saving will
++# end at 3.00am on Sunday 15th January 2017."
++
++# From Paul Eggert (2016-10-03):
+ # For now, guess DST from 02:00 the first Sunday in November to
+-# 03:00 the first Sunday on or after January 18.  Although ad hoc, it
+-# matches this year's plan and seems more likely to match future
++# 03:00 the third Sunday in January.  Although ad hoc, it matches
++# transitions since late 2014 and seems more likely to match future
+ # practice than guessing no DST.
+ 
+ # Rule	NAME	FROM	TO	TYPE	IN	ON	AT	SAVE	LETTER/S
+@@ -351,7 +372,7 @@
+ Rule	Fiji	2012	2013	-	Jan	Sun>=18	3:00	0	-
+ Rule	Fiji	2014	only	-	Jan	Sun>=18	2:00	0	-
+ Rule	Fiji	2014	max	-	Nov	Sun>=1	2:00	1:00	S
+-Rule	Fiji	2015	max	-	Jan	Sun>=18	3:00	0	-
++Rule	Fiji	2015	max	-	Jan	Sun>=15	3:00	0	-
+ # Zone	NAME		GMTOFF	RULES	FORMAT	[UNTIL]
+ Zone	Pacific/Fiji	11:55:44 -	LMT	1915 Oct 26 # Suva
+ 			12:00	Fiji	FJ%sT	# Fiji Time
+@@ -510,7 +531,10 @@
+ # Zone	NAME		GMTOFF	RULES	FORMAT	[UNTIL]
+ Zone	Pacific/Norfolk	11:11:52 -	LMT	1901 # Kingston
+ 			11:12	-	NMT	1951 # Norfolk Mean Time
+-			11:30	-	NFT	# Norfolk Time
++			11:30	-	NFT	1974 Oct 27 02:00 # Norfolk T.
++			11:30	1:00	NFST	1975 Mar  2 02:00
++			11:30	-	NFT	2015 Oct  4 02:00
++			11:00	-	NFT
+ 
+ # Palau (Belau)
+ # Zone	NAME		GMTOFF	RULES	FORMAT	[UNTIL]
+@@ -527,7 +551,7 @@
+ # Base the Bougainville entry on the Arawa-Kieta region, which appears to have
+ # the most people even though it was devastated in the Bougainville Civil War.
+ #
+-# Although Shanks gives 1942-03-15 / 1943-11-01 for JST, these dates
++# Although Shanks gives 1942-03-15 / 1943-11-01 for UT +09, these dates
+ # are apparently rough guesswork from the starts of military campaigns.
+ # The World War II entries below are instead based on Arawa-Kieta.
+ # The Japanese occupied Kieta in July 1942,
+@@ -535,8 +559,8 @@
+ # http://pwencycl.kgbudge.com/B/o/Bougainville.htm
+ # and seem to have controlled it until their 1945-08-21 surrender.
+ #
+-# The Autonomous Region of Bougainville plans to switch from UTC+10 to UTC+11
+-# on 2014-12-28 at 02:00.  They call UTC+11 "Bougainville Standard Time";
++# The Autonomous Region of Bougainville switched from UT +10 to +11
++# on 2014-12-28 at 02:00.  They call +11 "Bougainville Standard Time";
+ # abbreviate this as BST.  See:
+ # http://www.bougainville24.com/bougainville-issues/bougainville-gets-own-timezone/
+ #
+@@ -602,7 +626,7 @@
+ # From Paul Eggert (2014-06-27):
+ # The International Date Line Act 2011
+ # http://www.parliament.gov.ws/images/ACTS/International_Date_Line_Act__2011_-_Eng.pdf
+-# changed Samoa from UTC-11 to UTC+13, effective "12 o'clock midnight, on
++# changed Samoa from UT -11 to +13, effective "12 o'clock midnight, on
+ # Thursday 29th December 2011".  The International Date Line was adjusted
+ # accordingly.
+ 
+@@ -678,11 +702,13 @@
+ Rule	Tonga	2000	only	-	Mar	19	2:00s	0	-
+ Rule	Tonga	2000	2001	-	Nov	Sun>=1	2:00	1:00	S
+ Rule	Tonga	2001	2002	-	Jan	lastSun	2:00	0	-
++Rule	Tonga	2016	max	-	Nov	Sun>=1	2:00	1:00	S
++Rule	Tonga	2017	max	-	Jan	Sun>=15	3:00	0	-
+ # Zone	NAME		GMTOFF	RULES	FORMAT	[UNTIL]
+ Zone Pacific/Tongatapu	12:19:20 -	LMT	1901
+-			12:20	-	TOT	1941 # Tonga Time
+-			13:00	-	TOT	1999
+-			13:00	Tonga	TO%sT
++			12:20	-	+1220	1941
++			13:00	-	+13	1999
++			13:00	Tonga	+13/+14
+ 
+ # Tuvalu
+ # Zone	NAME		GMTOFF	RULES	FORMAT	[UNTIL]
+@@ -697,7 +723,7 @@
+ # 1886-1891; Baker was similar but exact dates are not known.
+ # Inhabited by civilians 1935-1942; U.S. military bases 1943-1944;
+ # uninhabited thereafter.
+-# Howland observed Hawaii Standard Time (UT-10:30) in 1937;
++# Howland observed Hawaii Standard Time (UT -10:30) in 1937;
+ # see page 206 of Elgen M. Long and Marie K. Long,
+ # Amelia Earhart: the Mystery Solved, Simon & Schuster (2000).
+ # So most likely Howland and Baker observed Hawaii Time from 1935
+@@ -1455,7 +1481,7 @@
+ # Zealand time.  I understand that is the time they keep locally, anyhow."
+ # For now, assume this practice goes back to the introduction of standard time
+ # in New Zealand, as this would make Chatham Islands time almost exactly match
+-# LMT back when New Zealand was at UTC+11:30; also, assume Chatham Islands did
++# LMT back when New Zealand was at UT +11:30; also, assume Chatham Islands did
+ # not observe New Zealand's prewar DST.
+ 
+ ###############################################################################
+@@ -1511,7 +1537,7 @@
+ # For now, we assume the Ladrones switched at the same time as the Philippines;
+ # see Asia/Manila.
+ 
+-# US Public Law 106-564 (2000-12-23) made UTC+10 the official standard time,
++# US Public Law 106-564 (2000-12-23) made UT +10 the official standard time,
+ # under the name "Chamorro Standard Time".  There is no official abbreviation,
+ # but Congressman Robert A. Underwood, author of the bill that became law,
+ # wrote in a press release (2000-12-27) that he will seek the use of "ChST".
+@@ -1523,15 +1549,15 @@
+ # "I am certain, having lived there for the past decade, that 'Truk'
+ # (now properly known as Chuuk) ... is in the time zone GMT+10."
+ #
+-# Shanks & Pottenger write that Truk switched from UTC+10 to UTC+11
++# Shanks & Pottenger write that Truk switched from UT +10 to +11
+ # on 1978-10-01; ignore this for now.
+ 
+ # From Paul Eggert (1999-10-29):
+ # The Federated States of Micronesia Visitors Board writes in
+ # The Federated States of Micronesia - Visitor Information (1999-01-26)
+ # http://www.fsmgov.org/info/clocks.html
+-# that Truk and Yap are UTC+10, and Ponape and Kosrae are UTC+11.
+-# We don't know when Kosrae switched from UTC+12; assume January 1 for now.
++# that Truk and Yap are UT +10, and Ponape and Kosrae are +11.
++# We don't know when Kosrae switched from +12; assume January 1 for now.
+ 
+ 
+ # Midway
+@@ -1550,6 +1576,20 @@
+ # started DST on June 3.  Possibly DST was observed other years
+ # in Midway, but we have no record of it.
+ 
++# Norfolk
++
++# From Alexander Krivenyshev (2015-09-23):
++# Norfolk Island will change ... from +1130 to +1100:
++# https://www.comlaw.gov.au/Details/F2015L01483/Explanatory%20Statement/Text
++# ... at 12.30 am (by legal time in New South Wales) on 4 October 2015.
++# http://www.norfolkisland.gov.nf/nia/MediaRelease/Media%20Release%20Norfolk%20Island%20Standard%20Time%20Change.pdf
++
++# From Paul Eggert (2015-09-23):
++# Transitions before 2015 are from timeanddate.com, which consulted
++# the Norfolk Island Museum and the Australian Bureau of Meteorology's
++# Norfolk Island station, and found no record of Norfolk observing DST
++# other than in 1974/5.  See:
++# http://www.timeanddate.com/time/australia/norfolk-island.html
+ 
+ # Pitcairn
+ 
+@@ -1583,11 +1623,11 @@
+ # ordaining - by a masterpiece of diplomatic flattery - that
+ # the Fourth of July should be celebrated twice in that year."
+ 
+-# Although Shanks & Pottenger says they both switched to UTC-11:30
+-# in 1911, and to UTC-11 in 1950. many earlier sources give UTC-11
++# Although Shanks & Pottenger says they both switched to UT -11:30
++# in 1911, and to -11 in 1950. many earlier sources give -11
+ # for American Samoa, e.g., the US National Bureau of Standards
+ # circular "Standard Time Throughout the World", 1932.
+-# Assume American Samoa switched to UTC-11 in 1911, not 1950,
++# Assume American Samoa switched to -11 in 1911, not 1950,
+ # and that after 1950 they agreed until (western) Samoa skipped a
+ # day in 2011.  Assume also that the Samoas follow the US and New
+ # Zealand's "ST"/"DT" style of daylight-saving abbreviations.
+@@ -1674,9 +1714,17 @@
+ # of January the standard time in the Kingdom shall be moved backward by one
+ # hour to 1:00am.
+ 
+-# From Pulu 'Anau (2002-11-05):
++# From Pulu ʻAnau (2002-11-05):
+ # The law was for 3 years, supposedly to get renewed.  It wasn't.
+ 
++# From Pulu ʻAnau (2016-10-27):
++# http://mic.gov.to/news-today/press-releases/6375-daylight-saving-set-to-run-from-6-november-2016-to-15-january-2017
++# Cannot find anyone who knows the rules, has seen the duration or has seen
++# the cabinet decision, but it appears we are following Fiji's rule set.
++#
++# From Tim Parenti (2016-10-26):
++# Assume Tonga will observe DST from the first Sunday in November at 02:00
++# through the third Sunday in January at 03:00, like Fiji, for now.
+ 
+ # Wake
+ 
+--- contrib/tzdata/backward.orig
++++ contrib/tzdata/backward
+@@ -23,6 +23,7 @@
+ Link	America/Toronto		America/Montreal
+ Link	America/Rio_Branco	America/Porto_Acre
+ Link	America/Argentina/Cordoba	America/Rosario
++Link	America/Tijuana		America/Santa_Isabel
+ Link	America/Denver		America/Shiprock
+ Link	America/Port_of_Spain	America/Virgin
+ Link	Pacific/Auckland	Antarctica/South_Pole
+@@ -35,6 +36,7 @@
+ Link	Asia/Urumqi		Asia/Kashgar
+ Link	Asia/Kathmandu		Asia/Katmandu
+ Link	Asia/Macau		Asia/Macao
++Link	Asia/Yangon		Asia/Rangoon
+ Link	Asia/Ho_Chi_Minh	Asia/Saigon
+ Link	Asia/Jerusalem		Asia/Tel_Aviv
+ Link	Asia/Thimphu		Asia/Thimbu
+--- contrib/tzdata/backzone.orig
++++ contrib/tzdata/backzone
+@@ -0,0 +1,677 @@
++# Zones that go back beyond the scope of the tz database
++
++# This file is in the public domain.
++
++# This file is by no means authoritative; if you think you know
++# better, go ahead and edit it (and please send any changes to
++# tz@iana.org for general use in the future).  For more, please see
++# the file CONTRIBUTING in the tz distribution.
++
++
++# From Paul Eggert (2014-10-31):
++
++# This file contains data outside the normal scope of the tz database,
++# in that its zones do not differ from normal tz zones after 1970.
++# Links in this file point to zones in this file, superseding links in
++# the file 'backward'.
++
++# Although zones in this file may be of some use for analyzing
++# pre-1970 time stamps, they are less reliable, cover only a tiny
++# sliver of the pre-1970 era, and cannot feasibly be improved to cover
++# most of the era.  Because the zones are out of normal scope for the
++# database, less effort is put into maintaining this file.  Many of
++# the zones were formerly in other source files, but were removed or
++# replaced by links as their data entries were questionable and/or they
++# differed from other zones only in pre-1970 time stamps.
++
++# Unless otherwise specified, the source for data through 1990 is:
++# Thomas G. Shanks and Rique Pottenger, The International Atlas (6th edition),
++# San Diego: ACS Publications, Inc. (2003).
++# Unfortunately this book contains many errors and cites no sources.
++
++# This file is not intended to be compiled standalone, as it
++# assumes rules from other files.  In the tz distribution, use
++# 'make PACKRATDATA=backzone zones' to compile and install this file.
++
++# Zones are sorted by zone name.  Each zone is preceded by the
++# name of the country that the zone is in, along with any other
++# commentary and rules associated with the entry.
++#
++# As explained in the zic man page, the zone columns are:
++# Zone	NAME		GMTOFF	RULES	FORMAT	[UNTIL]
++
++# Ethiopia
++# From Paul Eggert (2014-07-31):
++# Like the Swahili of Kenya and Tanzania, many Ethiopians keep a
++# 12-hour clock starting at our 06:00, so their "8 o'clock" is our
++# 02:00 or 14:00.  Keep this in mind when you ask the time in Amharic.
++#
++# Shanks & Pottenger write that Ethiopia had six narrowly-spaced time
++# zones between 1870 and 1890, that they merged to 38E50 (2:35:20) in
++# 1890, and that they switched to 3:00 on 1936-05-05.  Perhaps 38E50
++# was for Adis Dera.  Quite likely the Shanks data entries are wrong
++# anyway.
++Zone Africa/Addis_Ababa	2:34:48 -	LMT	1870
++			2:35:20	-	ADMT	1936 May  5 # Adis Dera MT
++			3:00	-	EAT
++
++# Eritrea
++Zone	Africa/Asmara	2:35:32 -	LMT	1870
++			2:35:32	-	AMT	1890        # Asmara Mean Time
++			2:35:20	-	ADMT	1936 May  5 # Adis Dera MT
++			3:00	-	EAT
++Link Africa/Asmara Africa/Asmera
++
++# Mali (southern)
++Zone	Africa/Bamako	-0:32:00 -	LMT	1912
++			 0:00	-	GMT	1934 Feb 26
++			-1:00	-	WAT	1960 Jun 20
++			 0:00	-	GMT
++
++# Central African Republic
++Zone	Africa/Bangui	1:14:20	-	LMT	1912
++			1:00	-	WAT
++
++# Gambia
++Zone	Africa/Banjul	-1:06:36 -	LMT	1912
++			-1:06:36 -	BMT	1935 # Banjul Mean Time
++			-1:00	-	WAT	1964
++			 0:00	-	GMT
++
++# Malawi
++Zone	Africa/Blantyre	2:20:00 -	LMT	1903 Mar
++			2:00	-	CAT
++
++# Republic of the Congo
++Zone Africa/Brazzaville	1:01:08 -	LMT	1912
++			1:00	-	WAT
++
++# Burundi
++Zone Africa/Bujumbura	1:57:28	-	LMT	1890
++			2:00	-	CAT
++
++# Guinea
++Zone	Africa/Conakry	-0:54:52 -	LMT	1912
++			 0:00	-	GMT	1934 Feb 26
++			-1:00	-	WAT	1960
++			 0:00	-	GMT
++
++# Senegal
++Zone	Africa/Dakar	-1:09:44 -	LMT	1912
++			-1:00	-	WAT	1941 Jun
++			 0:00	-	GMT
++
++# Tanzania
++Zone Africa/Dar_es_Salaam 2:37:08 -	LMT	1931
++			3:00	-	EAT	1948
++			2:45	-	BEAUT	1961
++			3:00	-	EAT
++
++# Djibouti
++Zone	Africa/Djibouti	2:52:36 -	LMT	1911 Jul
++			3:00	-	EAT
++
++# Cameroon
++# Whitman says they switched to 1:00 in 1920; go with Shanks & Pottenger.
++Zone	Africa/Douala	0:38:48	-	LMT	1912
++			1:00	-	WAT
++# Sierra Leone
++# From Paul Eggert (2014-08-12):
++# The following table is from Shanks & Pottenger, but it can't be right.
++# Whitman gives Mar 31 - Aug 31 for 1931 on.
++# The International Hydrographic Bulletin, 1932-33, p 63 says that
++# Sierra Leone would advance its clocks by 20 minutes on 1933-10-01.
++# Rule	NAME	FROM	TO	TYPE	IN	ON	AT	SAVE	LETTER/S
++Rule	SL	1935	1942	-	Jun	 1	0:00	0:40	SLST
++Rule	SL	1935	1942	-	Oct	 1	0:00	0	WAT
++Rule	SL	1957	1962	-	Jun	 1	0:00	1:00	SLST
++Rule	SL	1957	1962	-	Sep	 1	0:00	0	GMT
++Zone	Africa/Freetown	-0:53:00 -	LMT	1882
++			-0:53:00 -	FMT	1913 Jun # Freetown Mean Time
++			-1:00	SL	%s	1957
++			 0:00	SL	%s
++
++# Botswana
++# From Paul Eggert (2013-02-21):
++# Milne says they were regulated by the Cape Town Signal in 1899;
++# assume they switched to 2:00 when Cape Town did.
++Zone	Africa/Gaborone	1:43:40 -	LMT	1885
++			1:30	-	SAST	1903 Mar
++			2:00	-	CAT	1943 Sep 19  2:00
++			2:00	1:00	CAST	1944 Mar 19  2:00
++			2:00	-	CAT
++
++# Zimbabwe
++Zone	Africa/Harare	2:04:12 -	LMT	1903 Mar
++			2:00	-	CAT
++
++# South Sudan
++Zone	Africa/Juba	2:06:24 -	LMT	1931
++			2:00	Sudan	CA%sT	2000 Jan 15 12:00
++			3:00	-	EAT
++
++# Uganda
++Zone	Africa/Kampala	2:09:40 -	LMT	1928 Jul
++			3:00	-	EAT	1930
++			2:30	-	BEAT	1948
++			2:45	-	BEAUT	1957
++			3:00	-	EAT
++
++# Rwanda
++Zone	Africa/Kigali	2:00:16 -	LMT	1935 Jun
++			2:00	-	CAT
++
++# Democratic Republic of the Congo (west)
++Zone Africa/Kinshasa	1:01:12 -	LMT	1897 Nov  9
++			1:00	-	WAT
++
++# Gabon
++Zone Africa/Libreville	0:37:48 -	LMT	1912
++			1:00	-	WAT
++
++# Togo
++Zone	Africa/Lome	0:04:52 -	LMT	1893
++			0:00	-	GMT
++
++# Angola
++#
++# Shanks gives 1911-05-26 for the transition to WAT,
++# evidently confusing the date of the Portuguese decree
++# http://dre.pt/pdf1sdip/1911/05/12500/23132313.pdf
++# with the date that it took effect, namely 1912-01-01.
++#
++Zone	Africa/Luanda	0:52:56	-	LMT	1892
++			0:52:04	-	AOT	1912 Jan  1 # Angola Time
++			1:00	-	WAT
++
++# Democratic Republic of the Congo (east)
++Zone Africa/Lubumbashi	1:49:52 -	LMT	1897 Nov 9
++			2:00	-	CAT
++
++# Zambia
++Zone	Africa/Lusaka	1:53:08 -	LMT	1903 Mar
++			2:00	-	CAT
++
++# Equatorial Guinea
++#
++# Although Shanks says that Malabo switched from UT +00 to +01 on 1963-12-15,
++# a Google Books search says that London Calling, Issues 432-465 (1948), p 19,
++# says that Spanish Guinea was at +01 back then.  The Shanks data entries
++# are most likely wrong, but we have nothing better; use them here for now.
++#
++Zone	Africa/Malabo	0:35:08 -	LMT	1912
++			0:00	-	GMT	1963 Dec 15
++			1:00	-	WAT
++
++# Lesotho
++Zone	Africa/Maseru	1:50:00 -	LMT	1903 Mar
++			2:00	-	SAST	1943 Sep 19  2:00
++			2:00	1:00	SAST	1944 Mar 19  2:00
++			2:00	-	SAST
++
++# Swaziland
++Zone	Africa/Mbabane	2:04:24 -	LMT	1903 Mar
++			2:00	-	SAST
++
++# Somalia
++Zone Africa/Mogadishu	3:01:28 -	LMT	1893 Nov
++			3:00	-	EAT	1931
++			2:30	-	BEAT	1957
++			3:00	-	EAT
++
++# Niger
++Zone	Africa/Niamey	 0:08:28 -	LMT	1912
++			-1:00	-	WAT	1934 Feb 26
++			 0:00	-	GMT	1960
++			 1:00	-	WAT
++
++# Mauritania
++Zone Africa/Nouakchott	-1:03:48 -	LMT	1912
++			 0:00	-	GMT	1934 Feb 26
++			-1:00	-	WAT	1960 Nov 28
++			 0:00	-	GMT
++
++# Burkina Faso
++Zone Africa/Ouagadougou	-0:06:04 -	LMT	1912
++			 0:00	-	GMT
++
++# Benin
++# Whitman says they switched to 1:00 in 1946, not 1934;
++# go with Shanks & Pottenger.
++Zone Africa/Porto-Novo	0:10:28	-	LMT	1912 Jan  1
++			0:00	-	GMT	1934 Feb 26
++			1:00	-	WAT
++
++# São Tomé and Príncipe
++Zone	Africa/Sao_Tome	 0:26:56 -	LMT	1884
++			-0:36:32 -	LMT	1912 # Lisbon Mean Time
++			 0:00	-	GMT
++
++# Mali (northern)
++Zone	Africa/Timbuktu	-0:12:04 -	LMT	1912
++			 0:00	-	GMT
++
++# Anguilla
++Zone America/Anguilla	-4:12:16 -	LMT	1912 Mar  2
++			-4:00	-	AST
++
++# Antigua and Barbuda
++Zone	America/Antigua	-4:07:12 -	LMT	1912 Mar 2
++			-5:00	-	EST	1951
++			-4:00	-	AST
++
++# Chubut, Argentina
++# The name "Comodoro Rivadavia" exceeds the 14-byte POSIX limit.
++Zone America/Argentina/ComodRivadavia -4:30:00 - LMT	1894 Oct 31
++			-4:16:48 -	CMT	1920 May
++			-4:00	-	ART	1930 Dec
++			-4:00	Arg	AR%sT	1969 Oct  5
++			-3:00	Arg	AR%sT	1991 Mar  3
++			-4:00	-	WART	1991 Oct 20
++			-3:00	Arg	AR%sT	1999 Oct  3
++			-4:00	Arg	AR%sT	2000 Mar  3
++			-3:00	-	ART	2004 Jun  1
++			-4:00	-	WART	2004 Jun 20
++			-3:00	-	ART
++
++# Aruba
++Zone	America/Aruba	-4:40:24 -	LMT	1912 Feb 12 # Oranjestad
++			-4:30	-	ANT	1965 # Netherlands Antilles Time
++			-4:00	-	AST
++
++# Cayman Is
++Zone	America/Cayman	-5:25:32 -	LMT	1890     # Georgetown
++			-5:07:11 -	KMT	1912 Feb # Kingston Mean Time
++			-5:00	-	EST
++
++# Canada
++Zone America/Coral_Harbour -5:32:40 -	LMT	1884
++			-5:00	NT_YK	E%sT	1946
++			-5:00	-	EST
++
++# Dominica
++Zone America/Dominica	-4:05:36 -	LMT	1911 Jul  1  0:01 # Roseau
++			-4:00	-	AST
++
++# Baja California
++# See 'northamerica' for why this entry is here rather than there.
++Zone America/Ensenada	-7:46:28 -	LMT	1922 Jan  1  0:13:32
++			-8:00	-	PST	1927 Jun 10 23:00
++			-7:00	-	MST	1930 Nov 16
++			-8:00	-	PST	1942 Apr
++			-7:00	-	MST	1949 Jan 14
++			-8:00	-	PST	1996
++			-8:00	Mexico	P%sT
++
++# Grenada
++Zone	America/Grenada	-4:07:00 -	LMT	1911 Jul # St George's
++			-4:00	-	AST
++
++# Guadeloupe
++Zone America/Guadeloupe	-4:06:08 -	LMT	1911 Jun  8 # Pointe-à-Pitre
++			-4:00	 -	AST
++
++# Canada
++#
++# From Paul Eggert (2015-03-24):
++# Since 1970 most of Quebec has been like Toronto; see
++# America/Toronto.  However, earlier versions of the tz database
++# mistakenly relied on data from Shanks & Pottenger saying that Quebec
++# differed from Ontario after 1970, and the following rules and zone
++# were created for most of Quebec from the incorrect Shanks &
++# Pottenger data.  The post-1970 entries have been corrected, but the
++# pre-1970 entries are unchecked and probably have errors.
++#
++# Rule	NAME	FROM	TO	TYPE	IN	ON	AT	SAVE	LETTER/S
++Rule	Mont	1917	only	-	Mar	25	2:00	1:00	D
++Rule	Mont	1917	only	-	Apr	24	0:00	0	S
++Rule	Mont	1919	only	-	Mar	31	2:30	1:00	D
++Rule	Mont	1919	only	-	Oct	25	2:30	0	S
++Rule	Mont	1920	only	-	May	 2	2:30	1:00	D
++Rule	Mont	1920	1922	-	Oct	Sun>=1	2:30	0	S
++Rule	Mont	1921	only	-	May	 1	2:00	1:00	D
++Rule	Mont	1922	only	-	Apr	30	2:00	1:00	D
++Rule	Mont	1924	only	-	May	17	2:00	1:00	D
++Rule	Mont	1924	1926	-	Sep	lastSun	2:30	0	S
++Rule	Mont	1925	1926	-	May	Sun>=1	2:00	1:00	D
++Rule	Mont	1927	1937	-	Apr	lastSat	24:00	1:00	D
++Rule	Mont	1927	1937	-	Sep	lastSat	24:00	0	S
++Rule	Mont	1938	1940	-	Apr	lastSun	0:00	1:00	D
++Rule	Mont	1938	1939	-	Sep	lastSun	0:00	0	S
++Rule	Mont	1946	1973	-	Apr	lastSun	2:00	1:00	D
++Rule	Mont	1945	1948	-	Sep	lastSun	2:00	0	S
++Rule	Mont	1949	1950	-	Oct	lastSun	2:00	0	S
++Rule	Mont	1951	1956	-	Sep	lastSun	2:00	0	S
++Rule	Mont	1957	1973	-	Oct	lastSun	2:00	0	S
++Zone America/Montreal	-4:54:16 -	LMT	1884
++			-5:00	Mont	E%sT	1918
++			-5:00	Canada	E%sT	1919
++			-5:00	Mont	E%sT	1942 Feb  9  2:00s
++			-5:00	Canada	E%sT	1946
++			-5:00	Mont	E%sT	1974
++			-5:00	Canada	E%sT
++
++# Montserrat
++# From Paul Eggert (2006-03-22):
++# In 1995 volcanic eruptions forced evacuation of Plymouth, the capital.
++# world.gazetteer.com says Cork Hill is the most populous location now.
++Zone America/Montserrat	-4:08:52 -	LMT	1911 Jul  1  0:01 # Cork Hill
++			-4:00	-	AST
++
++# Argentina
++# This entry was intended for the following areas, but has been superseded by
++# more detailed zones.
++# Santa Fe (SF), Entre Ríos (ER), Corrientes (CN), Misiones (MN), Chaco (CC),
++# Formosa (FM), La Pampa (LP), Chubut (CH)
++Zone America/Rosario	-4:02:40 -	LMT	1894 Nov
++			-4:16:44 -	CMT	1920 May
++			-4:00	-	ART	1930 Dec
++			-4:00	Arg	AR%sT	1969 Oct  5
++			-3:00	Arg	AR%sT	1991 Jul
++			-3:00	-	ART	1999 Oct  3  0:00
++			-4:00	Arg	AR%sT	2000 Mar  3  0:00
++			-3:00	-	ART
++
++# St Kitts-Nevis
++Zone America/St_Kitts	-4:10:52 -	LMT	1912 Mar  2 # Basseterre
++			-4:00	-	AST
++
++# St Lucia
++Zone America/St_Lucia	-4:04:00 -	LMT	1890 # Castries
++			-4:04:00 -	CMT	1912 # Castries Mean Time
++			-4:00	-	AST
++
++# Virgin Is
++Zone America/St_Thomas	-4:19:44 -	LMT	1911 Jul # Charlotte Amalie
++			-4:00	-	AST
++
++# St Vincent and the Grenadines
++Zone America/St_Vincent	-4:04:56 -	LMT	1890 # Kingstown
++			-4:04:56 -	KMT	1912 # Kingstown Mean Time
++			-4:00	-	AST
++
++# British Virgin Is
++Zone America/Tortola	-4:18:28 -	LMT	1911 Jul # Road Town
++			-4:00	-	AST
++
++# McMurdo, Ross Island, since 1955-12
++Zone Antarctica/McMurdo	0	-	-00	1956
++			12:00	NZ	NZ%sT
++Link Antarctica/McMurdo Antarctica/South_Pole
++
++# Yemen
++# Milne says 2:59:54 was the meridian of the saluting battery at Aden,
++# and that Yemen was at 1:55:56, the meridian of the Hagia Sophia.
++Zone	Asia/Aden	2:59:54	-	LMT	1950
++			3:00	-	AST
++
++# Bahrain
++Zone	Asia/Bahrain	3:22:20 -	LMT	1920     # Manamah
++			4:00	-	GST	1972 Jun
++			3:00	-	AST
++
++# India
++#
++# From Paul Eggert (2014-09-06):
++# The 1876 Report of the Secretary of the [US] Navy, p 305 says that Madras
++# civil time was 5:20:57.3.
++#
++# From Paul Eggert (2014-08-21):
++# In tomorrow's The Hindu, Nitya Menon reports that India had two civil time
++# zones starting in 1884, one in Bombay and one in Calcutta, and that railways
++# used a third time zone based on Madras time (80 deg. 18'30" E).  Also,
++# in 1881 Bombay briefly switched to Madras time, but switched back.  See:
++# http://www.thehindu.com/news/cities/chennai/madras-375-when-madras-clocked-the-time/article6339393.ece
++#Zone	  Asia/Chennai  [not enough info to complete]
++
++# China
++# Long-shu Time (probably due to Long and Shu being two names of that area)
++# Guangxi, Guizhou, Hainan, Ningxia, Sichuan, Shaanxi, and Yunnan;
++# most of Gansu; west Inner Mongolia; west Qinghai; and the Guangdong
++# counties Deqing, Enping, Kaiping, Luoding, Taishan, Xinxing,
++# Yangchun, Yangjiang, Yu'nan, and Yunfu.
++Zone	Asia/Chongqing	7:06:20	-	LMT	1928     # or Chungking
++			7:00	-	LONT	1980 May # Long-shu Time
++			8:00	PRC	C%sT
++Link Asia/Chongqing Asia/Chungking
++
++# Vietnam
++# From Paul Eggert (2014-10-13):
++# See Asia/Ho_Chi_Minh for the source for this data.
++# Trần's book says the 1954-55 transition to 07:00 in Hanoi was in
++# October 1954, with exact date and time unspecified.
++Zone	Asia/Hanoi	7:03:24 -	LMT	1906 Jul  1
++			7:06:30	-	PLMT	1911 May  1
++			7:00	-	ICT	1942 Dec 31 23:00
++			8:00	-	IDT	1945 Mar 14 23:00
++			9:00	-	JST	1945 Sep  2
++			7:00	-	ICT	1947 Apr  1
++			8:00	-	IDT	1954 Oct
++			7:00	-	ICT
++
++# China
++# Changbai Time ("Long-white Time", Long-white = Heilongjiang area)
++# Heilongjiang (except Mohe county), Jilin
++Zone	Asia/Harbin	8:26:44	-	LMT	1928     # or Haerbin
++			8:30	-	CHAT	1932 Mar # Changbai Time
++			8:00	-	CST	1940
++			9:00	-	CHAT	1966 May
++			8:30	-	CHAT	1980 May
++			8:00	PRC	C%sT
++
++# far west China
++Zone	Asia/Kashgar	5:03:56	-	LMT	1928     # or Kashi or Kaxgar
++			5:30	-	KAST	1940     # Kashgar Time
++			5:00	-	KAST	1980 May
++			8:00	PRC	C%sT
++
++# Kuwait
++Zone	Asia/Kuwait	3:11:56 -	LMT	1950
++			3:00	-	AST
++
++
++# Oman
++# Milne says 3:54:24 was the meridian of the Muscat Tidal Observatory.
++Zone	Asia/Muscat	3:54:24 -	LMT	1920
++			4:00	-	GST
++
++# India
++# From Paul Eggert (2014-08-11), after a heads-up from Stephen Colebourne:
++# According to a Portuguese decree (1911-05-26)
++# http://dre.pt/pdf1sdip/1911/05/12500/23132313.pdf
++# Portuguese India switched to UT +05 on 1912-01-01.
++#Zone	Asia/Panaji	[not enough info to complete]
++
++# Cambodia
++# From Paul Eggert (2014-10-11):
++# See Asia/Ho_Chi_Minh for the source for most of this data.  Also, guess
++# (1) Cambodia reverted to UT +07 on 1945-09-02, when Vietnam did, and
++# (2) they also reverted to +07 on 1953-11-09, the date of independence.
++# These guesses are probably wrong but they're better than guessing no
++# transitions there.
++Zone	Asia/Phnom_Penh	6:59:40 -	LMT	1906 Jul  1
++			7:06:30	-	PLMT	1911 May  1
++			7:00	-	ICT	1942 Dec 31 23:00
++			8:00	-	IDT	1945 Mar 14 23:00
++			9:00	-	JST	1945 Sep  2
++			7:00	-	ICT	1947 Apr  1
++			8:00	-	IDT	1953 Nov  9
++			7:00	-	ICT
++
++# Israel
++Zone	Asia/Tel_Aviv	2:19:04 -	LMT	1880
++			2:21	-	JMT	1918
++			2:00	Zion	I%sT
++
++# Laos
++# From Paul Eggert (2014-10-11):
++# See Asia/Ho_Chi_Minh for the source for most of this data.
++# Trần's book says that Laos reverted to UT +07 on 1955-04-15.
++# Also, guess that Laos reverted to +07 on 1945-09-02, when Vietnam did;
++# this is probably wrong but it's better than guessing no transition.
++Zone	Asia/Vientiane	6:50:24 -	LMT	1906 Jul  1
++			7:06:30	-	PLMT	1911 May  1
++			7:00	-	ICT	1942 Dec 31 23:00
++			8:00	-	IDT	1945 Mar 14 23:00
++			9:00	-	JST	1945 Sep  2
++			7:00	-	ICT	1947 Apr  1
++			8:00	-	IDT	1955 Apr 15
++			7:00	-	ICT
++
++# Jan Mayen
++# From Whitman:
++Zone Atlantic/Jan_Mayen	-1:00	-	EGT
++
++# St Helena
++Zone Atlantic/St_Helena	-0:22:48 -	LMT	1890 # Jamestown
++			-0:22:48 -	JMT	1951 # Jamestown Mean Time
++			 0:00	-	GMT
++
++# Northern Ireland
++Zone	Europe/Belfast	-0:23:40 -	LMT	1880 Aug  2
++			-0:25:21 -	DMT	1916 May 21  2:00
++						# DMT = Dublin/Dunsink MT
++			-0:25:21 1:00	IST	1916 Oct  1  2:00s
++						# IST = Irish Summer Time
++			 0:00	GB-Eire	%s	1968 Oct 27
++			 1:00	-	BST	1971 Oct 31  2:00u
++			 0:00	GB-Eire	%s	1996
++			 0:00	EU	GMT/BST
++
++# Guernsey
++# Data from Joseph S. Myers
++# http://mm.icann.org/pipermail/tz/2013-September/019883.html
++# References to be added
++# LMT Location - 49.27N -2.33E - St.Peter Port
++Zone	Europe/Guernsey	-0:09:19 -	LMT	1913 Jun 18
++			 0:00	GB-Eire	%s	1940 Jul  2
++			 1:00	C-Eur	CE%sT	1945 May  8
++			 0:00	GB-Eire	%s	1968 Oct 27
++			 1:00	-	BST	1971 Oct 31  2:00u
++			 0:00	GB-Eire	%s	1996
++			 0:00	EU	GMT/BST
++
++# Isle of Man
++#
++# From Lester Caine (2013-09-04):
++# The Isle of Man legislation is now on-line at
++# <http://www.legislation.gov.im>, starting with the original Statutory
++# Time Act in 1883 and including additional confirmation of some of
++# the dates of the 'Summer Time' orders originating at
++# Westminster.  There is a little uncertainty as to the starting date
++# of the first summer time in 1916 which may have be announced a
++# couple of days late.  There is still a substantial number of
++# documents to work through, but it is thought that every GB change
++# was also implemented on the island.
++#
++# AT4 of 1883 - The Statutory Time et cetera Act 1883 -
++# LMT Location - 54.1508N -4.4814E - Tynwald Hill ( Manx parliament )
++Zone Europe/Isle_of_Man	-0:17:55 -	LMT	1883 Mar 30  0:00s
++			 0:00	GB-Eire	%s	1968 Oct 27
++			 1:00	-	BST	1971 Oct 31  2:00u
++			 0:00	GB-Eire	%s	1996
++			 0:00	EU	GMT/BST
++
++# Jersey
++# Data from Joseph S. Myers
++# http://mm.icann.org/pipermail/tz/2013-September/019883.html
++# References to be added
++# LMT Location - 49.187N -2.107E - St. Helier
++Zone	Europe/Jersey	-0:08:25 -	LMT	1898 Jun 11 16:00u
++			 0:00	GB-Eire	%s	1940 Jul  2
++			 1:00	C-Eur	CE%sT	1945 May  8
++			 0:00	GB-Eire	%s	1968 Oct 27
++			 1:00	-	BST	1971 Oct 31  2:00u
++			 0:00	GB-Eire	%s	1996
++			 0:00	EU	GMT/BST
++
++# Slovenia
++Zone Europe/Ljubljana	0:58:04	-	LMT	1884
++			1:00	-	CET	1941 Apr 18 23:00
++			1:00	C-Eur	CE%sT	1945 May  8  2:00s
++			1:00	1:00	CEST	1945 Sep 16  2:00s
++			1:00	-	CET	1982 Nov 27
++			1:00	EU	CE%sT
++
++# Bosnia and Herzegovina
++Zone	Europe/Sarajevo	1:13:40	-	LMT	1884
++			1:00	-	CET	1941 Apr 18 23:00
++			1:00	C-Eur	CE%sT	1945 May  8  2:00s
++			1:00	1:00	CEST	1945 Sep 16  2:00s
++			1:00	-	CET	1982 Nov 27
++			1:00	EU	CE%sT
++
++# Macedonia
++Zone	Europe/Skopje	1:25:44	-	LMT	1884
++			1:00	-	CET	1941 Apr 18 23:00
++			1:00	C-Eur	CE%sT	1945 May  8  2:00s
++			1:00	1:00	CEST	1945 Sep 16  2:00s
++			1:00	-	CET	1982 Nov 27
++			1:00	EU	CE%sT
++
++# Moldova / Transnistria
++Zone	Europe/Tiraspol	1:58:32	-	LMT	1880
++			1:55	-	CMT	1918 Feb 15 # Chisinau MT
++			1:44:24	-	BMT	1931 Jul 24 # Bucharest MT
++			2:00	Romania	EE%sT	1940 Aug 15
++			2:00	1:00	EEST	1941 Jul 17
++			1:00	C-Eur	CE%sT	1944 Aug 24
++			3:00	Russia	MSK/MSD	1991 Mar 31  2:00
++			2:00	Russia	EE%sT	1992 Jan 19  2:00
++			3:00	Russia	MSK/MSD
++
++# Liechtenstein
++Zone	Europe/Vaduz	0:38:04 -	LMT	1894 Jun
++			1:00	-	CET	1981
++			1:00	EU	CE%sT
++
++# Croatia
++Zone	Europe/Zagreb	1:03:52	-	LMT	1884
++			1:00	-	CET	1941 Apr 18 23:00
++			1:00	C-Eur	CE%sT	1945 May  8  2:00s
++			1:00	1:00	CEST	1945 Sep 16  2:00s
++			1:00	-	CET	1982 Nov 27
++			1:00	EU	CE%sT
++
++# Madagascar
++Zone Indian/Antananarivo 3:10:04 -	LMT	1911 Jul
++			3:00	-	EAT	1954 Feb 27 23:00s
++			3:00	1:00	EAST	1954 May 29 23:00s
++			3:00	-	EAT
++
++# Comoros
++Zone	Indian/Comoro	2:53:04 -	LMT	1911 Jul # Moroni, Gran Comoro
++			3:00	-	EAT
++
++# Mayotte
++Zone	Indian/Mayotte	3:00:56 -	LMT	1911 Jul # Mamoutzou
++			3:00	-	EAT
++
++# US minor outlying islands
++Zone Pacific/Johnston	-10:00	-	HST
++
++# US minor outlying islands
++#
++# From Mark Brader (2005-01-23):
++# [Fallacies and Fantasies of Air Transport History, by R.E.G. Davies,
++# published 1994 by Paladwr Press, McLean, VA, USA; ISBN 0-9626483-5-3]
++# reproduced a Pan American Airways timetable from 1936, for their weekly
++# "Orient Express" flights between San Francisco and Manila, and connecting
++# flights to Chicago and the US East Coast.  As it uses some time zone
++# designations that I've never seen before:....
++# Fri. 6:30A Lv. HONOLOLU (Pearl Harbor), H.I.   H.L.T. Ar. 5:30P Sun.
++#  "   3:00P Ar. MIDWAY ISLAND . . . . . . . . . M.L.T. Lv. 6:00A  "
++#
++Zone Pacific/Midway	-11:49:28 -	LMT	1901
++			-11:00	-	NST	1956 Jun  3
++			-11:00	1:00	NDT	1956 Sep  2
++			-11:00	-	NST	1967 Apr    # N=Nome
++			-11:00	-	BST	1983 Nov 30 # B=Bering
++			-11:00	-	SST	            # S=Samoa
++
++# N Mariana Is
++Zone Pacific/Saipan	-14:17:00 -	LMT	1844 Dec 31
++			 9:43:00 -	LMT	1901
++			 9:00	-	MPT	1969 Oct    # N Mariana Is Time
++			10:00	-	MPT	2000 Dec 23
++			10:00	-	ChST	# Chamorro Standard Time
+--- contrib/tzdata/checklinks.awk.orig
++++ contrib/tzdata/checklinks.awk
+@@ -0,0 +1,48 @@
++# Check links in tz tables.
++
++# Contributed by Paul Eggert.  This file is in the public domain.
++
++BEGIN {
++    # Special marker indicating that the name is defined as a Zone.
++    # It is a newline so that it cannot match a valid name.
++    # It is not null so that its slot does not appear unset.
++    Zone = "\n"
++}
++
++/^Zone/ {
++    if (defined[$2]) {
++	if (defined[$2] == Zone) {
++	    printf "%s: Zone has duplicate definition\n", $2
++	} else {
++	    printf "%s: Link with same name as Zone\n", $2
++	}
++	status = 1
++    }
++    defined[$2] = Zone
++}
++
++/^Link/ {
++    if (defined[$3]) {
++	if (defined[$3] == Zone) {
++	    printf "%s: Link with same name as Zone\n", $3
++	} else if (defined[$3] == $2) {
++	    printf "%s: Link has duplicate definition\n", $3
++	} else {
++	    printf "%s: Link to both %s and %s\n", $3, defined[$3], $2
++	}
++	status = 1
++    }
++    used[$2] = 1
++    defined[$3] = $2
++}
++
++END {
++    for (tz in used) {
++	if (defined[tz] != Zone) {
++	    printf "%s: Link to non-zone\n", tz
++	    status = 1
++	}
++    }
++
++    exit status
++}
++native
+\ No newline at end of property
++FreeBSD=%H
+\ No newline at end of property
++text/plain
+\ No newline at end of property
+--- contrib/tzdata/checktab.awk.orig
++++ contrib/tzdata/checktab.awk
+@@ -0,0 +1,177 @@
++# Check tz tables for consistency.
++
++# Contributed by Paul Eggert.  This file is in the public domain.
++
++BEGIN {
++	FS = "\t"
++
++	if (!iso_table) iso_table = "iso3166.tab"
++	if (!zone_table) zone_table = "zone1970.tab"
++	if (!want_warnings) want_warnings = -1
++
++	while (getline <iso_table) {
++		iso_NR++
++		if ($0 ~ /^#/) continue
++		if (NF != 2) {
++			printf "%s:%d: wrong number of columns\n", \
++				iso_table, iso_NR >>"/dev/stderr"
++			status = 1
++		}
++		cc = $1
++		name = $2
++		if (cc !~ /^[A-Z][A-Z]$/) {
++			printf "%s:%d: invalid country code '%s'\n", \
++				iso_table, iso_NR, cc >>"/dev/stderr"
++			status = 1
++		}
++		if (cc <= cc0) {
++			if (cc == cc0) {
++				s = "duplicate";
++			} else {
++				s = "out of order";
++			}
++
++			printf "%s:%d: country code '%s' is %s\n", \
++				iso_table, iso_NR, cc, s \
++				>>"/dev/stderr"
++			status = 1
++		}
++		cc0 = cc
++		if (name2cc[name]) {
++			printf "%s:%d: '%s' and '%s' have the same name\n", \
++				iso_table, iso_NR, name2cc[name], cc \
++				>>"/dev/stderr"
++			status = 1
++		}
++		name2cc[name] = cc
++		cc2name[cc] = name
++		cc2NR[cc] = iso_NR
++	}
++
++	cc0 = ""
++
++	while (getline <zone_table) {
++		zone_NR++
++		if ($0 ~ /^#/) continue
++		if (NF != 3 && NF != 4) {
++			printf "%s:%d: wrong number of columns\n", \
++				zone_table, zone_NR >>"/dev/stderr"
++			status = 1
++		}
++		split($1, cca, /,/)
++		cc = cca[1]
++		coordinates = $2
++		tz = $3
++		comments = $4
++		if (cc < cc0) {
++			printf "%s:%d: country code '%s' is out of order\n", \
++				zone_table, zone_NR, cc >>"/dev/stderr"
++			status = 1
++		}
++		cc0 = cc
++		tztab[tz] = 1
++		tz2comments[tz] = comments
++		tz2NR[tz] = zone_NR
++		for (i in cca) {
++		    cc = cca[i]
++		    cctz = cc tz
++		    cctztab[cctz] = 1
++		    if (cc2name[cc]) {
++			cc_used[cc]++
++		    } else {
++			printf "%s:%d: %s: unknown country code\n", \
++				zone_table, zone_NR, cc >>"/dev/stderr"
++			status = 1
++		    }
++		}
++		if (coordinates !~ /^[-+][0-9][0-9][0-5][0-9][-+][01][0-9][0-9][0-5][0-9]$/ \
++		    && coordinates !~ /^[-+][0-9][0-9][0-5][0-9][0-5][0-9][-+][01][0-9][0-9][0-5][0-9][0-5][0-9]$/) {
++			printf "%s:%d: %s: invalid coordinates\n", \
++				zone_table, zone_NR, coordinates >>"/dev/stderr"
++			status = 1
++		}
++	}
++
++	for (cctz in cctztab) {
++		cc = substr (cctz, 1, 2)
++		tz = substr (cctz, 3)
++		if (1 < cc_used[cc]) {
++			comments_needed[tz] = cc
++		}
++	}
++	for (cctz in cctztab) {
++	  cc = substr (cctz, 1, 2)
++	  tz = substr (cctz, 3)
++	  if (!comments_needed[tz] && tz2comments[tz]) {
++	    printf "%s:%d: unnecessary comment '%s'\n", \
++		zone_table, tz2NR[tz], tz2comments[tz] \
++		>>"/dev/stderr"
++	    tz2comments[tz] = 0
++	    status = 1
++	  } else if (comments_needed[tz] && !tz2comments[tz]) {
++	    printf "%s:%d: missing comment for %s\n", \
++	      zone_table, tz2NR[tz], comments_needed[tz] \
++	      >>"/dev/stderr"
++	    tz2comments[tz] = 1
++	    status = 1
++	  }
++	}
++	FS = " "
++}
++
++$1 ~ /^#/ { next }
++
++{
++	tz = rules = ""
++	if ($1 == "Zone") {
++		tz = $2
++		ruleUsed[$4] = 1
++	} else if ($1 == "Link" && zone_table == "zone.tab") {
++		# Ignore Link commands if source and destination basenames
++		# are identical, e.g. Europe/Istanbul versus Asia/Istanbul.
++		src = $2
++		dst = $3
++		while ((i = index(src, "/"))) src = substr(src, i+1)
++		while ((i = index(dst, "/"))) dst = substr(dst, i+1)
++		if (src != dst) tz = $3
++	} else if ($1 == "Rule") {
++		ruleDefined[$2] = 1
++	} else {
++		ruleUsed[$2] = 1
++	}
++	if (tz && tz ~ /\//) {
++		if (!tztab[tz]) {
++			printf "%s: no data for '%s'\n", zone_table, tz \
++				>>"/dev/stderr"
++			status = 1
++		}
++		zoneSeen[tz] = 1
++	}
++}
++
++END {
++	for (tz in ruleDefined) {
++		if (!ruleUsed[tz]) {
++			printf "%s: Rule never used\n", tz
++			status = 1
++		}
++	}
++	for (tz in tztab) {
++		if (!zoneSeen[tz]) {
++			printf "%s:%d: no Zone table for '%s'\n", \
++				zone_table, tz2NR[tz], tz >>"/dev/stderr"
++			status = 1
++		}
++	}
++	if (0 < want_warnings) {
++		for (cc in cc2name) {
++			if (!cc_used[cc]) {
++				printf "%s:%d: warning: " \
++					"no Zone entries for %s (%s)\n", \
++					iso_table, cc2NR[cc], cc, cc2name[cc]
++			}
++		}
++	}
++
++	exit status
++}
++native
+\ No newline at end of property
++FreeBSD=%H
+\ No newline at end of property
++text/plain
+\ No newline at end of property
+--- contrib/tzdata/etcetera.orig
++++ contrib/tzdata/etcetera
+@@ -8,6 +8,13 @@
+ # need now for the entries that are not on UTC are for ships at sea
+ # that cannot use POSIX TZ settings.
+ 
++# Starting with POSIX 1003.1-2001, the entries below are all
++# unnecessary as settings for the TZ environment variable.  E.g.,
++# instead of TZ='Etc/GMT+4' one can use the POSIX setting TZ='<-04>+4'.
++#
++# Do not use a POSIX TZ setting like TZ='GMT+4', which is four hours
++# behind GMT but uses the completely misleading abbreviation "GMT".
++
+ Zone	Etc/GMT		0	-	GMT
+ Zone	Etc/UTC		0	-	UTC
+ Zone	Etc/UCT		0	-	UCT
+@@ -26,23 +33,13 @@
+ Link	Etc/GMT				Etc/GMT+0
+ Link	Etc/GMT				Etc/GMT0
+ 
+-# We use POSIX-style signs in the Zone names and the output abbreviations,
++# Be consistent with POSIX TZ settings in the Zone names,
+ # even though this is the opposite of what many people expect.
+ # POSIX has positive signs west of Greenwich, but many people expect
+ # positive signs east of Greenwich.  For example, TZ='Etc/GMT+4' uses
+-# the abbreviation "GMT+4" and corresponds to 4 hours behind UT
++# the abbreviation "-04" and corresponds to 4 hours behind UT
+ # (i.e. west of Greenwich) even though many people would expect it to
+ # mean 4 hours ahead of UT (i.e. east of Greenwich).
+-#
+-# In the draft 5 of POSIX 1003.1-200x, the angle bracket notation allows for
+-# TZ='<GMT-4>+4'; if you want time zone abbreviations conforming to
+-# ISO 8601 you can use TZ='<-0400>+4'.  Thus the commonly-expected
+-# offset is kept within the angle bracket (and is used for display)
+-# while the POSIX sign is kept outside the angle bracket (and is used
+-# for calculation).
+-#
+-# Do not use a TZ setting like TZ='GMT+4', which is four hours behind
+-# GMT but uses the completely misleading abbreviation "GMT".
+ 
+ # Earlier incarnations of this package were not POSIX-compliant,
+ # and had lines such as
+@@ -51,30 +48,31 @@
+ # way does a
+ #		zic -l GMT-12
+ # so we moved the names into the Etc subdirectory.
++# Also, the time zone abbreviations are now compatible with %z.
+ 
+-Zone	Etc/GMT-14	14	-	GMT-14	# 14 hours ahead of GMT
+-Zone	Etc/GMT-13	13	-	GMT-13
+-Zone	Etc/GMT-12	12	-	GMT-12
+-Zone	Etc/GMT-11	11	-	GMT-11
+-Zone	Etc/GMT-10	10	-	GMT-10
+-Zone	Etc/GMT-9	9	-	GMT-9
+-Zone	Etc/GMT-8	8	-	GMT-8
+-Zone	Etc/GMT-7	7	-	GMT-7
+-Zone	Etc/GMT-6	6	-	GMT-6
+-Zone	Etc/GMT-5	5	-	GMT-5
+-Zone	Etc/GMT-4	4	-	GMT-4
+-Zone	Etc/GMT-3	3	-	GMT-3
+-Zone	Etc/GMT-2	2	-	GMT-2
+-Zone	Etc/GMT-1	1	-	GMT-1
+-Zone	Etc/GMT+1	-1	-	GMT+1
+-Zone	Etc/GMT+2	-2	-	GMT+2
+-Zone	Etc/GMT+3	-3	-	GMT+3
+-Zone	Etc/GMT+4	-4	-	GMT+4
+-Zone	Etc/GMT+5	-5	-	GMT+5
+-Zone	Etc/GMT+6	-6	-	GMT+6
+-Zone	Etc/GMT+7	-7	-	GMT+7
+-Zone	Etc/GMT+8	-8	-	GMT+8
+-Zone	Etc/GMT+9	-9	-	GMT+9
+-Zone	Etc/GMT+10	-10	-	GMT+10
+-Zone	Etc/GMT+11	-11	-	GMT+11
+-Zone	Etc/GMT+12	-12	-	GMT+12
++Zone	Etc/GMT-14	14	-	+14
++Zone	Etc/GMT-13	13	-	+13
++Zone	Etc/GMT-12	12	-	+12
++Zone	Etc/GMT-11	11	-	+11
++Zone	Etc/GMT-10	10	-	+10
++Zone	Etc/GMT-9	9	-	+09
++Zone	Etc/GMT-8	8	-	+08
++Zone	Etc/GMT-7	7	-	+07
++Zone	Etc/GMT-6	6	-	+06
++Zone	Etc/GMT-5	5	-	+05
++Zone	Etc/GMT-4	4	-	+04
++Zone	Etc/GMT-3	3	-	+03
++Zone	Etc/GMT-2	2	-	+02
++Zone	Etc/GMT-1	1	-	+01
++Zone	Etc/GMT+1	-1	-	-01
++Zone	Etc/GMT+2	-2	-	-02
++Zone	Etc/GMT+3	-3	-	-03
++Zone	Etc/GMT+4	-4	-	-04
++Zone	Etc/GMT+5	-5	-	-05
++Zone	Etc/GMT+6	-6	-	-06
++Zone	Etc/GMT+7	-7	-	-07
++Zone	Etc/GMT+8	-8	-	-08
++Zone	Etc/GMT+9	-9	-	-09
++Zone	Etc/GMT+10	-10	-	-10
++Zone	Etc/GMT+11	-11	-	-11
++Zone	Etc/GMT+12	-12	-	-12
+--- contrib/tzdata/europe.orig
++++ contrib/tzdata/europe
+@@ -75,8 +75,7 @@
+ #        1:00       CET CEST CEMT Central Europe
+ #        1:00:14    SET           Swedish (1879-1899)*
+ #        2:00       EET EEST      Eastern Europe
+-#        3:00       FET           Further-eastern Europe (2011-2014)*
+-#        3:00       MSK MSD  MSM* Minsk, Moscow
++#        3:00       MSK MSD       Moscow
+ 
+ # From Peter Ilieve (1994-12-04),
+ # The original six [EU members]: Belgium, France, (West) Germany, Italy,
+@@ -193,11 +192,14 @@
+ #	republished in Finest Hour (Spring 2002) 1(114):26
+ #	http://www.winstonchurchill.org/images/finesthour/Vol.01%20No.114.pdf
+ 
+-# From Paul Eggert (1996-09-03):
++# From Paul Eggert (2015-08-08):
+ # The OED Supplement says that the English originally said "Daylight Saving"
+ # when they were debating the adoption of DST in 1908; but by 1916 this
+ # term appears only in quotes taken from DST's opponents, whereas the
+ # proponents (who eventually won the argument) are quoted as using "Summer".
++# The term "Summer Time" was introduced by Herbert Samuel, Home Secretary; see:
++# Viscount Samuel. Leisure in a Democracy. Cambridge University Press
++# ISBN 978-1-107-49471-8 (1949, reissued 2015), p 8.
+ 
+ # From Arthur David Olson (1989-01-19):
+ # A source at the British Information Office in New York avers that it's
+@@ -343,7 +345,7 @@
+ 
+ # From an anonymous contributor (1996-06-02):
+ # The law governing time in Ireland is under Statutory Instrument SI 395/94,
+-# which gives force to European Union 7th Council Directive # 94/21/EC.
++# which gives force to European Union 7th Council Directive No. 94/21/EC.
+ # Under this directive, the Minister for Justice in Ireland makes appropriate
+ # regulations. I spoke this morning with the Secretary of the Department of
+ # Justice (tel +353 1 678 9711) who confirmed to me that the correct name is
+@@ -580,33 +582,74 @@
+ Rule	E-Eur	1981	max	-	Mar	lastSun	 0:00	1:00	S
+ Rule	E-Eur	1996	max	-	Oct	lastSun	 0:00	0	-
+ 
++
++# Daylight saving time for Russia and the Soviet Union
++#
++# The 1917-1921 decree URLs are from Alexander Belopolsky (2016-08-23).
++
+ # Rule	NAME	FROM	TO	TYPE	IN	ON	AT	SAVE	LETTER/S
+ Rule	Russia	1917	only	-	Jul	 1	23:00	1:00	MST  # Moscow Summer Time
++#
++# Decree No. 142 (1917-12-22) http://istmat.info/node/28137
+ Rule	Russia	1917	only	-	Dec	28	 0:00	0	MMT  # Moscow Mean Time
++#
++# Decree No. 497 (1918-05-30) http://istmat.info/node/30001
+ Rule	Russia	1918	only	-	May	31	22:00	2:00	MDST # Moscow Double Summer Time
+ Rule	Russia	1918	only	-	Sep	16	 1:00	1:00	MST
++#
++# Decree No. 258 (1919-05-29) http://istmat.info/node/37949
+ Rule	Russia	1919	only	-	May	31	23:00	2:00	MDST
+-Rule	Russia	1919	only	-	Jul	 1	 2:00	1:00	MSD
++#
++Rule	Russia	1919	only	-	Jul	 1	 0:00u	1:00	MSD
+ Rule	Russia	1919	only	-	Aug	16	 0:00	0	MSK
++#
++# Decree No. 63 (1921-02-03) http://istmat.info/node/45840
+ Rule	Russia	1921	only	-	Feb	14	23:00	1:00	MSD
+-Rule	Russia	1921	only	-	Mar	20	23:00	2:00	MSM  # Midsummer
++#
++# Decree No. 121 (1921-03-07) http://istmat.info/node/45949
++Rule	Russia	1921	only	-	Mar	20	23:00	2:00	+05
++#
+ Rule	Russia	1921	only	-	Sep	 1	 0:00	1:00	MSD
+ Rule	Russia	1921	only	-	Oct	 1	 0:00	0	-
+-# Act No.925 of the Council of Ministers of the USSR (1980-10-24):
++# Act No. 925 of the Council of Ministers of the USSR (1980-10-24):
+ Rule	Russia	1981	1984	-	Apr	 1	 0:00	1:00	S
+ Rule	Russia	1981	1983	-	Oct	 1	 0:00	0	-
+-# Act No.967 of the Council of Ministers of the USSR (1984-09-13), repeated in
+-# Act No.227 of the Council of Ministers of the USSR (1989-03-14):
+-Rule	Russia	1984	1991	-	Sep	lastSun	 2:00s	0	-
+-Rule	Russia	1985	1991	-	Mar	lastSun	 2:00s	1:00	S
+-#
+-Rule	Russia	1992	only	-	Mar	lastSat	 23:00	1:00	S
+-Rule	Russia	1992	only	-	Sep	lastSat	 23:00	0	-
+-Rule	Russia	1993	2010	-	Mar	lastSun	 2:00s	1:00	S
+-Rule	Russia	1993	1995	-	Sep	lastSun	 2:00s	0	-
++# Act No. 967 of the Council of Ministers of the USSR (1984-09-13), repeated in
++# Act No. 227 of the Council of Ministers of the USSR (1989-03-14):
++Rule	Russia	1984	1995	-	Sep	lastSun	 2:00s	0	-
++Rule	Russia	1985	2010	-	Mar	lastSun	 2:00s	1:00	S
++#
+ Rule	Russia	1996	2010	-	Oct	lastSun	 2:00s	0	-
+ # As described below, Russia's 2014 change affects Zone data, not Rule data.
+ 
++# From Stepan Golosunov (2016-03-07):
++# Wikipedia and other sources refer to the Act of the Council of
++# Ministers of the USSR from 1988-01-04 No. 5 and the Act of the
++# Council of Ministers of the USSR from 1989-03-14 No. 227.
++#
++# I did not find full texts of these acts.  For the 1989 one we have
++# title at http://base.garant.ru/70754136/ :
++# "About change in calculation of time on the territories of
++# Lithuanian SSR, Latvian SSR and Estonian SSR, Astrakhan,
++# Kaliningrad, Kirov, Kuybyshev, Ulyanovsk and Uralsk oblasts".
++# And http://astrozet.net/files/Zones/DOC/RU/1980-925.txt appears to
++# contain quotes from both acts: Since last Sunday of March 1988 rules
++# of the second time belt are installed in Volgograd and Saratov
++# oblasts.  Since last Sunday of March 1989:
++# a) Lithuanian SSR, Latvian SSR, Estonian SSR, Kaliningrad oblast:
++# second time belt rules without extra hour (Moscow-1);
++# b) Astrakhan, Kirov, Kuybyshev, Ulyanovsk oblasts: second time belt
++# rules (Moscow time)
++# c) Uralsk oblast: third time belt rules (Moscow+1).
++
++# From Stepan Golosunov (2016-03-27):
++# Unamended version of the act of the
++# Government of the Russian Federation No. 23 from 08.01.1992
++# http://pravo.gov.ru/proxy/ips/?docbody=&nd=102014034&rdk=0
++# says that every year clocks were to be moved forward on last Sunday
++# of March at 2 hours and moved backwards on last Sunday of September
++# at 3 hours.  It was amended in 1996 to replace September with October.
++
+ # From Alexander Krivenyshev (2011-06-14):
+ # According to Kremlin press service, Russian President Dmitry Medvedev
+ # signed a federal law "On calculation of time" on June 9, 2011.
+@@ -728,6 +771,14 @@
+ 			1:00	EU	CE%sT
+ 
+ # Belarus
++#
++# From Stepan Golosunov (2016-07-02):
++# http://www.lawbelarus.com/repub/sub30/texf9611.htm
++# (Act of the Cabinet of Ministers of the Republic of Belarus from
++# 1992-03-25 No. 157) ... says clocks were to be moved forward at 2:00
++# on last Sunday of March and backward at 3:00 on last Sunday of September
++# (the same as previous USSR and contemporary Russian regulations).
++#
+ # From Yauhen Kharuzhy (2011-09-16):
+ # By latest Belarus government act Europe/Minsk timezone was changed to
+ # GMT+3 without DST (was GMT+2 with DST).
+@@ -740,8 +791,6 @@
+ # From Alexander Bokovoy (2014-10-09):
+ # Belarussian government decided against changing to winter time....
+ # http://eng.belta.by/all_news/society/Belarus-decides-against-adjusting-time-in-Russias-wake_i_76335.html
+-# From Paul Eggert (2014-10-08):
+-# Hence Belarus can share time zone abbreviations with Moscow again.
+ #
+ # Zone	NAME		GMTOFF	RULES	FORMAT	[UNTIL]
+ Zone	Europe/Minsk	1:50:16 -	LMT	1880
+@@ -751,12 +800,8 @@
+ 			1:00	C-Eur	CE%sT	1944 Jul  3
+ 			3:00	Russia	MSK/MSD	1990
+ 			3:00	-	MSK	1991 Mar 31  2:00s
+-			2:00	1:00	EEST	1991 Sep 29  2:00s
+-			2:00	-	EET	1992 Mar 29  0:00s
+-			2:00	1:00	EEST	1992 Sep 27  0:00s
+ 			2:00	Russia	EE%sT	2011 Mar 27  2:00s
+-			3:00	-	FET	2014 Oct 26  1:00s
+-			3:00	-	MSK
++			3:00	-	+03
+ 
+ # Belgium
+ #
+@@ -828,7 +873,7 @@
+ # Bulgaria
+ #
+ # From Plamen Simenov via Steffen Thorsen (1999-09-09):
+-# A document of Government of Bulgaria (No.94/1997) says:
++# A document of Government of Bulgaria (No. 94/1997) says:
+ # EET -> EETDST is in 03:00 Local time in last Sunday of March ...
+ # EETDST -> EET is in 04:00 Local time in last Sunday of October
+ #
+@@ -845,7 +890,7 @@
+ 			1:00	C-Eur	CE%sT	1945
+ 			1:00	-	CET	1945 Apr  2  3:00
+ 			2:00	-	EET	1979 Mar 31 23:00
+-			2:00	Bulg	EE%sT	1982 Sep 26  2:00
++			2:00	Bulg	EE%sT	1982 Sep 26  3:00
+ 			2:00	C-Eur	EE%sT	1991
+ 			2:00	E-Eur	EE%sT	1997
+ 			2:00	EU	EE%sT
+@@ -1002,6 +1047,12 @@
+ # startkart.no says Thule does not observe DST, but this is clearly an error,
+ # so go with Shanks & Pottenger for Thule transitions until this year.
+ # For 2007 on assume Thule will stay in sync with US DST rules.
++
++# From J William Piggott (2016-02-20):
++# "Greenland north of the community of Scoresbysund" is officially named
++# "National Park" by Executive Order:
++# http://naalakkersuisut.gl/~/media/Nanoq/Files/Attached%20Files/Engelske-tekster/Legislation/Executive%20Order%20National%20Park.rtf
++# It is their only National Park.
+ #
+ # Rule	NAME	FROM	TO	TYPE	IN	ON	AT	SAVE	LETTER/S
+ Rule	Thule	1991	1992	-	Mar	lastSun	2:00	1:00	D
+@@ -1027,6 +1078,10 @@
+ 			-4:00	Thule	A%sT
+ 
+ # Estonia
++#
++# From Paul Eggert (2016-03-18):
++# The 1989 transition is from USSR act No. 227 (1989-03-14).
++#
+ # From Peter Ilieve (1994-10-15):
+ # A relative in Tallinn confirms the accuracy of the data for 1989 onwards
+ # [through 1994] and gives the legal authority for it,
+@@ -1062,8 +1117,8 @@
+ # after that.
+ 
+ # From Mart Oruaas (2000-01-29):
+-# Regulation no. 301 (1999-10-12) obsoletes previous regulation
+-# no. 206 (1998-09-22) and thus sticks Estonia to +02:00 GMT for all
++# Regulation No. 301 (1999-10-12) obsoletes previous regulation
++# No. 206 (1998-09-22) and thus sticks Estonia to +02:00 GMT for all
+ # the year round.  The regulation is effective 1999-11-01.
+ 
+ # From Toomas Soome (2002-02-21):
+@@ -1084,7 +1139,7 @@
+ 			3:00	Russia	MSK/MSD	1989 Mar 26  2:00s
+ 			2:00	1:00	EEST	1989 Sep 24  2:00s
+ 			2:00	C-Eur	EE%sT	1998 Sep 22
+-			2:00	EU	EE%sT	1999 Nov  1
++			2:00	EU	EE%sT	1999 Oct 31  4:00
+ 			2:00	-	EET	2002 Feb 21
+ 			2:00	EU	EE%sT
+ 
+@@ -1254,7 +1309,7 @@
+ # http://www.parlament-berlin.de/pds-fraktion.nsf/727459127c8b66ee8525662300459099/defc77cb784f180ac1256c2b0030274b/$FILE/bersarint.pdf
+ # says that Bersarin issued an order to use Moscow time on May 20.
+ # However, Moscow did not observe daylight saving in 1945, so
+-# this was equivalent to CEMT (GMT+3), not GMT+4.
++# this was equivalent to UT +03, not +04.
+ 
+ 
+ # Rule	NAME	FROM	TO	TYPE	IN	ON	AT	SAVE	LETTER/S
+@@ -1445,73 +1500,84 @@
+ # But these events all occurred before the 1970 cutoff,
+ # so record only the time in Rome.
+ #
+-# From Paul Eggert (2006-03-22):
+-# For Italian DST we have three sources: Shanks & Pottenger, Whitman, and
+-# F. Pollastri
+-# Day-light Saving Time in Italy (2006-02-03)
+-# http://toi.iriti.cnr.it/uk/ienitlt.html
+-# ('FP' below), taken from an Italian National Electrotechnical Institute
+-# publication. When the three sources disagree, guess who's right, as follows:
+-#
+-# year	FP	Shanks&P. (S)	Whitman (W)	Go with:
+-# 1916	06-03	06-03 24:00	06-03 00:00	FP & W
+-#	09-30	09-30 24:00	09-30 01:00	FP; guess 24:00s
+-# 1917	04-01	03-31 24:00	03-31 00:00	FP & S
+-#	09-30	09-29 24:00	09-30 01:00	FP & W
+-# 1918	03-09	03-09 24:00	03-09 00:00	FP & S
+-#	10-06	10-05 24:00	10-06 01:00	FP & W
+-# 1919	03-01	03-01 24:00	03-01 00:00	FP & S
+-#	10-04	10-04 24:00	10-04 01:00	FP; guess 24:00s
+-# 1920	03-20	03-20 24:00	03-20 00:00	FP & S
+-#	09-18	09-18 24:00	10-01 01:00	FP; guess 24:00s
+-# 1944	04-02	04-03 02:00			S (see C-Eur)
+-#	09-16	10-02 03:00			FP; guess 24:00s
+-# 1945	09-14	09-16 24:00			FP; guess 24:00s
+-# 1970	05-21	05-31 00:00			S
+-#	09-20	09-27 00:00			S
+-#
+-# Rule	NAME	FROM	TO	TYPE	IN	ON	AT	SAVE	LETTER/S
+-Rule	Italy	1916	only	-	Jun	 3	0:00s	1:00	S
+-Rule	Italy	1916	only	-	Oct	 1	0:00s	0	-
+-Rule	Italy	1917	only	-	Apr	 1	0:00s	1:00	S
+-Rule	Italy	1917	only	-	Sep	30	0:00s	0	-
+-Rule	Italy	1918	only	-	Mar	10	0:00s	1:00	S
+-Rule	Italy	1918	1919	-	Oct	Sun>=1	0:00s	0	-
+-Rule	Italy	1919	only	-	Mar	 2	0:00s	1:00	S
+-Rule	Italy	1920	only	-	Mar	21	0:00s	1:00	S
+-Rule	Italy	1920	only	-	Sep	19	0:00s	0	-
+-Rule	Italy	1940	only	-	Jun	15	0:00s	1:00	S
+-Rule	Italy	1944	only	-	Sep	17	0:00s	0	-
+-Rule	Italy	1945	only	-	Apr	 2	2:00	1:00	S
+-Rule	Italy	1945	only	-	Sep	15	0:00s	0	-
+-Rule	Italy	1946	only	-	Mar	17	2:00s	1:00	S
+-Rule	Italy	1946	only	-	Oct	 6	2:00s	0	-
+-Rule	Italy	1947	only	-	Mar	16	0:00s	1:00	S
+-Rule	Italy	1947	only	-	Oct	 5	0:00s	0	-
+-Rule	Italy	1948	only	-	Feb	29	2:00s	1:00	S
+-Rule	Italy	1948	only	-	Oct	 3	2:00s	0	-
+-Rule	Italy	1966	1968	-	May	Sun>=22	0:00	1:00	S
+-Rule	Italy	1966	1969	-	Sep	Sun>=22	0:00	0	-
+-Rule	Italy	1969	only	-	Jun	 1	0:00	1:00	S
+-Rule	Italy	1970	only	-	May	31	0:00	1:00	S
+-Rule	Italy	1970	only	-	Sep	lastSun	0:00	0	-
+-Rule	Italy	1971	1972	-	May	Sun>=22	0:00	1:00	S
+-Rule	Italy	1971	only	-	Sep	lastSun	1:00	0	-
+-Rule	Italy	1972	only	-	Oct	 1	0:00	0	-
+-Rule	Italy	1973	only	-	Jun	 3	0:00	1:00	S
+-Rule	Italy	1973	1974	-	Sep	lastSun	0:00	0	-
+-Rule	Italy	1974	only	-	May	26	0:00	1:00	S
+-Rule	Italy	1975	only	-	Jun	 1	0:00s	1:00	S
+-Rule	Italy	1975	1977	-	Sep	lastSun	0:00s	0	-
+-Rule	Italy	1976	only	-	May	30	0:00s	1:00	S
+-Rule	Italy	1977	1979	-	May	Sun>=22	0:00s	1:00	S
+-Rule	Italy	1978	only	-	Oct	 1	0:00s	0	-
+-Rule	Italy	1979	only	-	Sep	30	0:00s	0	-
++# From Michael Deckers (2016-10-24):
++# http://www.ac-ilsestante.it/MERIDIANE/ora_legale quotes a law of 1893-08-10
++# ... [translated as] "The preceding dispositions will enter into
++# force at the instant at which, according to the time specified in
++# the 1st article, the 1st of November 1893 will begin...."
++#
++# From Pierpaolo Bernardi (2016-10-20):
++# The authoritative source for time in Italy is the national metrological
++# institute, which has a summary page of historical DST data at
++# http://www.inrim.it/res/tf/ora_legale_i.shtml
++# (2016-10-24):
++# http://www.renzobaldini.it/le-ore-legali-in-italia/
++# has still different data for 1944.  It divides Italy in two, as
++# there were effectively two governments at the time, north of Gothic
++# Line German controlled territory, official government RSI, and south
++# of the Gothic Line, controlled by allied armies.
++#
++# From Brian Inglis (2016-10-23):
++# Viceregal LEGISLATIVE DECREE. 14 September 1944, no. 219.
++# Restoration of Standard Time. (044U0219) (OJ 62 of 30.9.1944) ...
++# Given the R. law decreed on 1944-03-29, no. 92, by which standard time is
++# advanced to sixty minutes later starting at hour two on 1944-04-02; ...
++# Starting at hour three on the date 1944-09-17 standard time will be resumed.
++#
++# From Paul Eggert (2016-10-27):
++# Go with INRiM for DST rules, except as corrected by Inglis for 1944
++# for the Kingdom of Italy.  This is consistent with Renzo Baldini.
++# Model Rome's occupation by using using C-Eur rules from 1943-09-10
++# to 1944-06-04; although Rome was an open city during this period, it
++# was effectively controlled by Germany.
++#
++# Rule	NAME	FROM	TO	TYPE	IN	ON	AT	SAVE	LETTER/S
++Rule	Italy	1916	only	-	Jun	 3	24:00	1:00	S
++Rule	Italy	1916	1917	-	Sep	30	24:00	0	-
++Rule	Italy	1917	only	-	Mar	31	24:00	1:00	S
++Rule	Italy	1918	only	-	Mar	 9	24:00	1:00	S
++Rule	Italy	1918	only	-	Oct	 6	24:00	0	-
++Rule	Italy	1919	only	-	Mar	 1	24:00	1:00	S
++Rule	Italy	1919	only	-	Oct	 4	24:00	0	-
++Rule	Italy	1920	only	-	Mar	20	24:00	1:00	S
++Rule	Italy	1920	only	-	Sep	18	24:00	0	-
++Rule	Italy	1940	only	-	Jun	14	24:00	1:00	S
++Rule	Italy	1942	only	-	Nov	 2	 2:00s	0	-
++Rule	Italy	1943	only	-	Mar	29	 2:00s	1:00	S
++Rule	Italy	1943	only	-	Oct	 4	 2:00s	0	-
++Rule	Italy	1944	only	-	Apr	 2	 2:00s	1:00	S
++Rule	Italy	1944	only	-	Sep	17	 2:00s	0	-
++Rule	Italy	1945	only	-	Apr	 2	 2:00	1:00	S
++Rule	Italy	1945	only	-	Sep	15	 1:00	0	-
++Rule	Italy	1946	only	-	Mar	17	 2:00s	1:00	S
++Rule	Italy	1946	only	-	Oct	 6	 2:00s	0	-
++Rule	Italy	1947	only	-	Mar	16	 0:00s	1:00	S
++Rule	Italy	1947	only	-	Oct	 5	 0:00s	0	-
++Rule	Italy	1948	only	-	Feb	29	 2:00s	1:00	S
++Rule	Italy	1948	only	-	Oct	 3	 2:00s	0	-
++Rule	Italy	1966	1968	-	May	Sun>=22	 0:00s	1:00	S
++Rule	Italy	1966	only	-	Sep	24	24:00	0	-
++Rule	Italy	1967	1969	-	Sep	Sun>=22	 0:00s	0	-
++Rule	Italy	1969	only	-	Jun	 1	 0:00s	1:00	S
++Rule	Italy	1970	only	-	May	31	 0:00s	1:00	S
++Rule	Italy	1970	only	-	Sep	lastSun	 0:00s	0	-
++Rule	Italy	1971	1972	-	May	Sun>=22	 0:00s	1:00	S
++Rule	Italy	1971	only	-	Sep	lastSun	 0:00s	0	-
++Rule	Italy	1972	only	-	Oct	 1	 0:00s	0	-
++Rule	Italy	1973	only	-	Jun	 3	 0:00s	1:00	S
++Rule	Italy	1973	1974	-	Sep	lastSun	 0:00s	0	-
++Rule	Italy	1974	only	-	May	26	 0:00s	1:00	S
++Rule	Italy	1975	only	-	Jun	 1	 0:00s	1:00	S
++Rule	Italy	1975	1977	-	Sep	lastSun	 0:00s	0	-
++Rule	Italy	1976	only	-	May	30	 0:00s	1:00	S
++Rule	Italy	1977	1979	-	May	Sun>=22	 0:00s	1:00	S
++Rule	Italy	1978	only	-	Oct	 1	 0:00s	0	-
++Rule	Italy	1979	only	-	Sep	30	 0:00s	0	-
+ # Zone	NAME		GMTOFF	RULES	FORMAT	[UNTIL]
+ Zone	Europe/Rome	0:49:56 -	LMT	1866 Sep 22
+-			0:49:56	-	RMT	1893 Nov  1  0:00s # Rome Mean
+-			1:00	Italy	CE%sT	1942 Nov  2  2:00s
+-			1:00	C-Eur	CE%sT	1944 Jul
++			0:49:56	-	RMT	1893 Oct 31 23:49:56 # Rome Mean
++			1:00	Italy	CE%sT	1943 Sep 10
++			1:00	C-Eur	CE%sT	1944 Jun  4
+ 			1:00	Italy	CE%sT	1980
+ 			1:00	EU	CE%sT
+ 
+@@ -1527,21 +1593,21 @@
+ # correct data in juridical acts and I found some juridical documents about
+ # changes in the counting of time in Latvia from 1981....
+ #
+-# Act No.35 of the Council of Ministers of Latvian SSR of 1981-01-22 ...
+-# according to the Act No.925 of the Council of Ministers of USSR of 1980-10-24
++# Act No. 35 of the Council of Ministers of Latvian SSR of 1981-01-22 ...
++# according to the Act No. 925 of the Council of Ministers of USSR of 1980-10-24
+ # ...: all year round the time of 2nd time zone + 1 hour, in addition turning
+ # the hands of the clock 1 hour forward on 1 April at 00:00 (GMT 31 March 21:00)
+ # and 1 hour backward on the 1 October at 00:00 (GMT 30 September 20:00).
+ #
+-# Act No.592 of the Council of Ministers of Latvian SSR of 1984-09-24 ...
+-# according to the Act No.967 of the Council of Ministers of USSR of 1984-09-13
++# Act No. 592 of the Council of Ministers of Latvian SSR of 1984-09-24 ...
++# according to the Act No. 967 of the Council of Ministers of USSR of 1984-09-13
+ # ...: all year round the time of 2nd time zone + 1 hour, in addition turning
+ # the hands of the clock 1 hour forward on the last Sunday of March at 02:00
+ # (GMT 23:00 on the previous day) and 1 hour backward on the last Sunday of
+ # September at 03:00 (GMT 23:00 on the previous day).
+ #
+-# Act No.81 of the Council of Ministers of Latvian SSR of 1989-03-22 ...
+-# according to the Act No.227 of the Council of Ministers of USSR of 1989-03-14
++# Act No. 81 of the Council of Ministers of Latvian SSR of 1989-03-22 ...
++# according to the Act No. 227 of the Council of Ministers of USSR of 1989-03-14
+ # ...: since the last Sunday of March 1989 in Lithuanian SSR, Latvian SSR,
+ # Estonian SSR and Kaliningrad region of Russian Federation all year round the
+ # time of 2nd time zone (Moscow time minus one hour). On the territory of Latvia
+@@ -1558,7 +1624,7 @@
+ # From Andrei Ivanov (2000-03-06):
+ # This year Latvia will not switch to Daylight Savings Time (as specified in
+ # The Regulations of the Cabinet of Ministers of the Rep. of Latvia of
+-# 29-Feb-2000 (#79) <http://www.lv-laiks.lv/wwwraksti/2000/071072/vd4.htm>,
++# 29-Feb-2000 (No. 79) <http://www.lv-laiks.lv/wwwraksti/2000/071072/vd4.htm>,
+ # in Latvian for subscribers only).
+ 
+ # From RFE/RL Newsline
+@@ -1620,6 +1686,9 @@
+ 
+ # Lithuania
+ 
++# From Paul Eggert (2016-03-18):
++# The 1989 transition is from USSR act No. 227 (1989-03-14).
++
+ # From Paul Eggert (1996-11-22):
+ # IATA SSIM (1992/1996) says Lithuania uses W-Eur rules, but since it is
+ # known to be wrong about Estonia and Latvia, assume it's wrong here too.
+@@ -1659,8 +1728,8 @@
+ 			1:00	-	CET	1940 Aug  3
+ 			3:00	-	MSK	1941 Jun 24
+ 			1:00	C-Eur	CE%sT	1944 Aug
+-			3:00	Russia	MSK/MSD	1991 Mar 31  2:00s
+-			2:00	1:00	EEST	1991 Sep 29  2:00s
++			3:00	Russia	MSK/MSD	1989 Mar 26  2:00s
++			2:00	Russia	EE%sT	1991 Sep 29  2:00s
+ 			2:00	C-Eur	EE%sT	1998
+ 			2:00	-	EET	1998 Mar 29  1:00u
+ 			1:00	EU	CE%sT	1999 Oct 31  1:00u
+@@ -1707,6 +1776,10 @@
+ # See Europe/Belgrade.
+ 
+ # Malta
++#
++# From Paul Eggert (2016-10-21):
++# Assume 1900-1972 was like Rome, overriding Shanks.
++#
+ # Rule	NAME	FROM	TO	TYPE	IN	ON	AT	SAVE	LETTER/S
+ Rule	Malta	1973	only	-	Mar	31	0:00s	1:00	S
+ Rule	Malta	1973	only	-	Sep	29	0:00s	0	-
+@@ -1717,14 +1790,22 @@
+ Rule	Malta	1980	only	-	Mar	31	2:00	1:00	S
+ # Zone	NAME		GMTOFF	RULES	FORMAT	[UNTIL]
+ Zone	Europe/Malta	0:58:04 -	LMT	1893 Nov  2  0:00s # Valletta
+-			1:00	Italy	CE%sT	1942 Nov  2  2:00s
+-			1:00	C-Eur	CE%sT	1945 Apr  2  2:00s
+ 			1:00	Italy	CE%sT	1973 Mar 31
+ 			1:00	Malta	CE%sT	1981
+ 			1:00	EU	CE%sT
+ 
+ # Moldova
+ 
++# From Stepan Golosunov (2016-03-07):
++# the act of the government of the Republic of Moldova Nr. 132 from 1990-05-04
++# http://lex.justice.md/viewdoc.php?action=view&view=doc&id=298782&lang=2
++# ... says that since 1990-05-06 on the territory of the Moldavian SSR
++# time would be calculated as the standard time of the second time belt
++# plus one hour of the "summer" time. To implement that clocks would be
++# adjusted one hour backwards at 1990-05-06 2:00. After that "summer"
++# time would be cancelled last Sunday of September at 3:00 and
++# reintroduced last Sunday of March at 2:00.
++
+ # From Paul Eggert (2006-03-22):
+ # A previous version of this database followed Shanks & Pottenger, who write
+ # that Tiraspol switched to Moscow time on 1992-01-19 at 02:00.
+@@ -1763,6 +1844,18 @@
+ # News from Moldova (in russian):
+ # http://ru.publika.md/link_317061.html
+ 
++# From Roman Tudos (2015-07-02):
++# http://lex.justice.md/index.php?action=view&view=doc&lang=1&id=355077
++# From Paul Eggert (2015-07-01):
++# The abovementioned official link to IGO1445-868/2014 states that
++# 2014-10-26's fallback transition occurred at 03:00 local time.  Also,
++# http://www.trm.md/en/social/la-30-martie-vom-trece-la-ora-de-vara
++# says the 2014-03-30 spring-forward transition was at 02:00 local time.
++# Guess that since 1997 Moldova has switched one hour before the EU.
++
++# Rule	NAME	FROM	TO	TYPE	IN	ON	AT	SAVE	LETTER/S
++Rule	Moldova	1997	max	-	Mar	lastSun	 2:00	1:00	S
++Rule	Moldova	1997	max	-	Oct	lastSun	 3:00	0	-
+ 
+ # Zone	NAME		GMTOFF	RULES	FORMAT	[UNTIL]
+ Zone	Europe/Chisinau	1:55:20 -	LMT	1880
+@@ -1771,13 +1864,11 @@
+ 			2:00	Romania	EE%sT	1940 Aug 15
+ 			2:00	1:00	EEST	1941 Jul 17
+ 			1:00	C-Eur	CE%sT	1944 Aug 24
+-			3:00	Russia	MSK/MSD	1990
+-			3:00	-	MSK	1990 May 6
+-			2:00	-	EET	1991
++			3:00	Russia	MSK/MSD	1990 May  6  2:00
+ 			2:00	Russia	EE%sT	1992
+ 			2:00	E-Eur	EE%sT	1997
+ # See Romania commentary for the guessed 1997 transition to EU rules.
+-			2:00	EU	EE%sT
++			2:00	Moldova	EE%sT
+ 
+ # Monaco
+ # Shanks & Pottenger give 0:09:20 for Paris Mean Time; go with Howse's
+@@ -1830,7 +1921,7 @@
+ # Amsterdam mean time.
+ 
+ # The data entries before 1945 are taken from
+-# http://www.phys.uu.nl/~vgent/wettijd/wettijd.htm
++# http://www.staff.science.uu.nl/~gent0113/wettijd/wettijd.htm
+ 
+ # Rule	NAME	FROM	TO	TYPE	IN	ON	AT	SAVE	LETTER/S
+ Rule	Neth	1916	only	-	May	 1	0:00	1:00	NST	# Netherlands Summer Time
+@@ -2123,7 +2214,7 @@
+ # Russia
+ 
+ # From Alexander Krivenyshev (2011-09-15):
+-# Based on last Russian Government Decree # 725 on August 31, 2011
++# Based on last Russian Government Decree No. 725 on August 31, 2011
+ # (Government document
+ # http://www.government.ru/gov/results/16355/print/
+ # in Russian)
+@@ -2133,7 +2224,7 @@
+ # http://www.worldtimezone.com/dst_news/dst_news_russia36.htm
+ 
+ # From Sanjeev Gupta (2011-09-27):
+-# Scans of [Decree #23 of January 8, 1992] are available at:
++# Scans of [Decree No. 23 of January 8, 1992] are available at:
+ # http://government.consultant.ru/page.aspx?1223966
+ # They are in Cyrillic letters (presumably Russian).
+ 
+@@ -2144,19 +2235,19 @@
+ # One source is
+ # http://government.ru/gov/results/16355/
+ # which, according to translate.google.com, begins "Decree of August 31,
+-# 2011 No 725" and contains no other dates or "effective date" information.
++# 2011 No. 725" and contains no other dates or "effective date" information.
+ #
+ # Another source is
+ # http://www.rg.ru/2011/09/06/chas-zona-dok.html
+ # which, according to translate.google.com, begins "Resolution of the
+ # Government of the Russian Federation on August 31, 2011 N 725" and also
+ # contains "Date first official publication: September 6, 2011 Posted on:
+-# in the 'RG' - Federal Issue number 5573 September 6, 2011" but which
++# in the 'RG' - Federal Issue No. 5573 September 6, 2011" but which
+ # does not contain any "effective date" information.
+ #
+ # Another source is
+ # http://en.wikipedia.org/wiki/Oymyakonsky_District#cite_note-RuTime-7
+-# which, in note 8, contains "Resolution #725 of August 31, 2011...
++# which, in note 8, contains "Resolution No. 725 of August 31, 2011...
+ # Effective as of after 7 days following the day of the official publication"
+ # but which does not contain any reference to September 6, 2011.
+ #
+@@ -2195,7 +2286,6 @@
+ # http://www.worldtimezone.com/dst_news/dst_news_russia-map-2014-07.html
+ 
+ # From Paul Eggert (2006-03-22):
+-# Except for Moscow after 1919-07-01, I invented the time zone abbreviations.
+ # Moscow time zone abbreviations after 1919-07-01, and Moscow rules after 1991,
+ # are from Andrey A. Chernov.  The rest is from Shanks & Pottenger,
+ # except we follow Chernov's report that 1992 DST transitions were Sat
+@@ -2251,16 +2341,32 @@
+ # Europe/Kaliningrad covers...
+ # 39	RU-KGD	Kaliningrad Oblast
+ 
++# From Paul Eggert (2016-03-18):
++# The 1989 transition is from USSR act No. 227 (1989-03-14).
++
++# From Stepan Golosunov (2016-03-07):
++# http://www.rgo.ru/ru/kaliningradskoe-oblastnoe-otdelenie/ob-otdelenii/publikacii/kak-nam-zhilos-bez-letnego-vremeni
++# confirms that the 1989 change to Moscow-1 was implemented.
++# (The article, though, is misattributed to 1990 while saying that
++# summer->winter transition would be done on the 24 of September. But
++# 1990-09-24 was Monday, while 1989-09-24 was Sunday as expected.)
++# ...
++# http://www.kaliningradka.ru/site_pc/cherez/index.php?ELEMENT_ID=40091
++# says that Kaliningrad switched to Moscow-1 on 1989-03-26, avoided
++# at the last moment switch to Moscow-1 on 1991-03-31, switched to
++# Moscow on 1991-11-03, switched to Moscow-1 on 1992-01-19.
++
+ Zone Europe/Kaliningrad	 1:22:00 -	LMT	1893 Apr
+ 			 1:00	C-Eur	CE%sT	1945
+ 			 2:00	Poland	CE%sT	1946
+-			 3:00	Russia	MSK/MSD	1991 Mar 31  2:00s
++			 3:00	Russia	MSK/MSD	1989 Mar 26  2:00s
+ 			 2:00	Russia	EE%sT	2011 Mar 27  2:00s
+-			 3:00	-	FET	2014 Oct 26  2:00s
++			 3:00	-	+03	2014 Oct 26  2:00s
+ 			 2:00	-	EET
+ 
+ 
+-# From Tim Parenti (2014-07-03), per Oscar van Vlijmen (2001-08-25):
++# From Paul Eggert (2016-02-21), per Tim Parenti (2014-07-03) and
++# Oscar van Vlijmen (2001-08-25):
+ # Europe/Moscow covers...
+ # 01	RU-AD	Adygea, Republic of
+ # 05	RU-DA	Dagestan, Republic of
+@@ -2303,12 +2409,102 @@
+ # 68	RU-TAM	Tambov Oblast
+ # 69	RU-TVE	Tver Oblast
+ # 71	RU-TUL	Tula Oblast
+-# 73	RU-ULY	Ulyanovsk Oblast
+ # 76	RU-YAR	Yaroslavl Oblast
+ # 77	RU-MOW	Moscow
+ # 78	RU-SPE	Saint Petersburg
+ # 83	RU-NEN	Nenets Autonomous Okrug
+ 
++# From Paul Eggert (2016-08-23):
++# The Soviets switched to UT-based time in 1919.  Decree No. 59
++# (1919-02-08) http://istmat.info/node/35567 established UT-based time
++# zones, and Decree No. 147 (1919-03-29) http://istmat.info/node/35854
++# specified a transition date of 1919-07-01, apparently at 00:00 UT.
++# No doubt only the Soviet-controlled regions switched on that date;
++# later transitions to UT-based time in other parts of Russia are
++# taken from what appear to be guesses by Shanks.
++# (Thanks to Alexander Belopolsky for pointers to the decrees.)
++
++# From Stepan Golosunov (2016-03-07):
++# 11. Regions-violators, 1981-1982.
++# Wikipedia refers to
++# http://maps.monetonos.ru/maps/raznoe/Old_Maps/Old_Maps/Articles/022/3_1981.html
++# http://besp.narod.ru/nauka_1981_3.htm
++#
++# The second link provides two articles scanned from the Nauka i Zhizn
++# magazine No. 3, 1981 and a scan of the short article attributed to
++# the Trud newspaper from February 1982.  The first link provides the
++# same Nauka i Zhizn articles converted to the text form (but misses
++# time belt changes map).
++#
++# The second Nauka i Zhizn article says that in addition to
++# introduction of summer time on 1981-04-01 there are some time belt
++# border changes on 1981-10-01, mostly affecting Nenets Autonomous
++# Okrug, Krasnoyarsk Krai, Yakutia, Magadan Oblast and Chukotka
++# according to the provided map (colored one).  In addition to that
++# "time violators" (regions which were not using rules of the time
++# belts in which they were located) would not be moving off the DST on
++# 1981-10-01 to restore the decree time usage.  (Komi ASSR was
++# supposed to repeat that move in October 1982 to account for the 2
++# hour difference.)  Map depicting "time violators" before 1981-10-01
++# is also provided.
++#
++# The article from Trud says that 1981-10-01 changes caused problems
++# and some territories would be moved to pre-1981-10-01 time by not
++# moving to summer time on 1982-04-01.  Namely: Dagestan,
++# Kabardino-Balkar, Kalmyk, Komi, Mari, Mordovian, North Ossetian,
++# Tatar, Chechen-Ingush and Chuvash ASSR, Krasnodar and Stavropol
++# krais, Arkhangelsk, Vladimir, Vologda, Voronezh, Gorky, Ivanovo,
++# Kostroma, Lipetsk, Penza, Rostov, Ryazan, Tambov, Tyumen and
++# Yaroslavl oblasts, Nenets and Evenk autonomous okrugs, Khatangsky
++# district of Taymyr Autonomous Okrug.  As a result Evenk Autonomous
++# Okrug and Khatangsky district of Taymyr Autonomous Okrug would end
++# up on Moscow+4, Tyumen Oblast on Moscow+2 and the rest on Moscow
++# time.
++#
++# http://astrozet.net/files/Zones/DOC/RU/1980-925.txt
++# attributes the 1982 changes to the Act of the Council of Ministers
++# of the USSR No. 126 from 18.02.1982.  1980-925.txt also adds
++# Udmurtia to the list of affected territories and lists Khatangsky
++# district separately from Taymyr Autonomous Okrug.  Probably erroneously.
++#
++# The affected territories are currently listed under Europe/Moscow,
++# Asia/Yekaterinburg and Asia/Krasnoyarsk.
++#
++# 12. Udmurtia
++# The fact that Udmurtia is depicted as a violator in the Nauka i
++# Zhizn article hints at Izhevsk being on different time from
++# Kuybyshev before 1981-10-01. Udmurtia is not mentioned in the 1989 act.
++# http://astrozet.net/files/Zones/DOC/RU/1980-925.txt
++# implies Udmurtia was on Moscow time after 1982-04-01.
++# Wikipedia implies Udmurtia being on Moscow+1 until 1991.
++#
++# ...
++#
++# All Russian zones are supposed to have by default a -1 change at
++# 1991-03-31 2:00 (cancellation of the decree time in the USSR) and a +1
++# change at 1992-01-19 2:00 (restoration of the decree time in Russia).
++#
++# There were some exceptions, though.
++# Wikipedia says newspapers listed Astrakhan, Saratov, Kirov, Volgograd,
++# Izhevsk, Grozny, Kazan and Samara as such exceptions for the 1992
++# change. (Different newspapers providing different lists. And some
++# lists found in the internet are quite wild.)
++#
++# And apparently some exceptions were reverted in the last moment.
++# http://www.kaliningradka.ru/site_pc/cherez/index.php?ELEMENT_ID=40091
++# says that Kaliningrad decided not to be an exception 2 days before the
++# 1991-03-31 switch and one person at
++# http://izhevsk.ru/forum_light_message/50/682597-m8369040.html
++# says he remembers that Samara opted out of the 1992-01-19 exception
++# 2 days before the switch.
++#
++#
++# From Paul Eggert (2016-03-18):
++# Given the above, we appear to be missing some Zone entries for the
++# chaotic early 1980s in Russia.  It's not clear what these entries
++# should be.  For now, sweep this under the rug and just document the
++# time in Moscow.
++
+ # From Vladimir Karpinsky (2014-07-08):
+ # LMT in Moscow (before Jul 3, 1916) is 2:30:17, that was defined by Moscow
+ # Observatory (coordinates: 55 deg. 45'29.70", 37 deg. 34'05.30")....
+@@ -2329,7 +2525,7 @@
+ 
+ Zone Europe/Moscow	 2:30:17 -	LMT	1880
+ 			 2:30:17 -	MMT	1916 Jul  3 # Moscow Mean Time
+-			 2:31:19 Russia	%s	1919 Jul  1  2:00
++			 2:31:19 Russia	%s	1919 Jul  1  0:00u
+ 			 3:00	Russia	%s	1921 Oct
+ 			 3:00	Russia	MSK/MSD	1922 Oct
+ 			 2:00	-	EET	1930 Jun 21
+@@ -2364,7 +2560,7 @@
+ # changed in May.
+ 			 2:00	E-Eur	EE%sT	1994 May
+ # From IATA SSIM (1994/1997), which also says that Kerch is still like Kiev.
+-			 3:00	E-Eur	MSK/MSD	1996 Mar 31  3:00s
++			 3:00	E-Eur	MSK/MSD	1996 Mar 31  0:00s
+ 			 3:00	1:00	MSD	1996 Oct 27  3:00s
+ # IATA SSIM (1997-09) says Crimea switched to EET/EEST.
+ # Assume it happened in March by not changing the clocks.
+@@ -2382,47 +2578,101 @@
+ 			 3:00	-	MSK
+ 
+ 
+-# From Tim Parenti (2014-07-03):
+-# Europe/Volgograd covers...
++# From Paul Eggert (2016-03-18):
++# Europe/Astrakhan covers:
+ # 30	RU-AST	Astrakhan Oblast
++#
++# The 1989 transition is from USSR act No. 227 (1989-03-14).
++
++# From Alexander Krivenyshev (2016-01-12):
++# On February 10, 2016 Astrakhan Oblast got approval by the Federation
++# Council to change its time zone to UTC+4 (from current UTC+3 Moscow time)....
++# This Federal Law shall enter into force on 27 March 2016 at 02:00.
++# From Matt Johnson (2016-03-09):
++# http://publication.pravo.gov.ru/Document/View/0001201602150056
++
++Zone Europe/Astrakhan	 3:12:12 -	LMT	1924 May
++			 3:00	-	+03	1930 Jun 21
++			 4:00	Russia	+04/+05	1989 Mar 26  2:00s
++			 3:00	Russia	+03/+04	1991 Mar 31  2:00s
++			 4:00	-	+04	1992 Mar 29  2:00s
++			 3:00	Russia	+03/+04	2011 Mar 27  2:00s
++			 4:00	-	+04	2014 Oct 26  2:00s
++			 3:00	-	+03	2016 Mar 27  2:00s
++			 4:00	-	+04
++
++# From Paul Eggert (2016-03-18):
++# Europe/Volgograd covers:
+ # 34	RU-VGG	Volgograd Oblast
+-# 43	RU-KIR	Kirov Oblast
+ # 64	RU-SAR	Saratov Oblast
+-
+-# From Paul Eggert (2006-05-09):
+-# Shanks & Pottenger say Kirov is still at +0400 but Wikipedia says +0300.
+-# Perhaps it switched after the others?  But we have no data.
++# The 1988 transition is from USSR act No. 5 (1988-01-04).
+ 
+ Zone Europe/Volgograd	 2:57:40 -	LMT	1920 Jan  3
+-			 3:00	-	TSAT	1925 Apr  6 # Tsaritsyn Time
+-			 3:00	-	STAT	1930 Jun 21 # Stalingrad Time
+-			 4:00	-	STAT	1961 Nov 11
+-			 4:00	Russia	VOL%sT	1989 Mar 26  2:00s # Volgograd T
+-			 3:00	Russia	VOL%sT	1991 Mar 31  2:00s
+-			 4:00	-	VOLT	1992 Mar 29  2:00s
+-			 3:00	Russia	MSK/MSD	2011 Mar 27  2:00s
+-			 4:00	-	MSK	2014 Oct 26  2:00s
+-			 3:00	-	MSK
++			 3:00	-	+03	1930 Jun 21
++			 4:00	-	+04	1961 Nov 11
++			 4:00	Russia	+04/+05	1988 Mar 27  2:00s
++			 3:00	Russia	+03/+04	1991 Mar 31  2:00s
++			 4:00	-	+04	1992 Mar 29  2:00s
++			 3:00	Russia	+03/+04	2011 Mar 27  2:00s
++			 4:00	-	+04	2014 Oct 26  2:00s
++			 3:00	-	+03
+ 
++# From Paul Eggert (2016-03-18):
++# Europe/Kirov covers:
++# 43	RU-KIR	Kirov Oblast
++# The 1989 transition is from USSR act No. 227 (1989-03-14).
++#
++Zone Europe/Kirov	 3:18:48 -	LMT	1919 Jul  1  0:00u
++			 3:00	-	+03	1930 Jun 21
++			 4:00	Russia	+04/+05	1989 Mar 26  2:00s
++			 3:00	Russia	+03/+04	1991 Mar 31  2:00s
++			 4:00	-	+04	1992 Mar 29  2:00s
++			 3:00	Russia	+03/+04	2011 Mar 27  2:00s
++			 4:00	-	+04	2014 Oct 26  2:00s
++			 3:00	-	+03
+ 
+ # From Tim Parenti (2014-07-03), per Oscar van Vlijmen (2001-08-25):
+ # Europe/Samara covers...
+ # 18	RU-UD	Udmurt Republic
+ # 63	RU-SAM	Samara Oblast
+ 
++# From Paul Eggert (2016-03-18):
+ # Byalokoz 1919 says Samara was 3:20:20.
++# The 1989 transition is from USSR act No. 227 (1989-03-14).
+ 
+-Zone Europe/Samara	 3:20:20 -	LMT	1919 Jul  1  2:00
+-			 3:00	-	SAMT	1930 Jun 21
+-			 4:00	-	SAMT	1935 Jan 27
+-			 4:00	Russia	KUY%sT	1989 Mar 26  2:00s # Kuybyshev
+-			 3:00	Russia	MSK/MSD	1991 Mar 31  2:00s
+-			 2:00	Russia	EE%sT	1991 Sep 29  2:00s
+-			 3:00	-	KUYT	1991 Oct 20  3:00
+-			 4:00	Russia	SAM%sT	2010 Mar 28  2:00s # Samara Time
+-			 3:00	Russia	SAM%sT	2011 Mar 27  2:00s
+-			 4:00	-	SAMT
++Zone Europe/Samara	 3:20:20 -	LMT	1919 Jul  1  0:00u
++			 3:00	-	+03	1930 Jun 21
++			 4:00	-	+04	1935 Jan 27
++			 4:00	Russia	+04/+05	1989 Mar 26  2:00s
++			 3:00	Russia	+03/+04	1991 Mar 31  2:00s
++			 2:00	Russia	+02/+03	1991 Sep 29  2:00s
++			 3:00	-	+03	1991 Oct 20  3:00
++			 4:00	Russia	+04/+05	2010 Mar 28  2:00s
++			 3:00	Russia	+03/+04	2011 Mar 27  2:00s
++			 4:00	-	+04
++
++# From Paul Eggert (2016-03-18):
++# Europe/Ulyanovsk covers:
++# 73	RU-ULY	Ulyanovsk Oblast
++
++# The 1989 transition is from USSR act No. 227 (1989-03-14).
+ 
++# From Alexander Krivenyshev (2016-02-17):
++# Ulyanovsk ... on their way to change time zones by March 27, 2016 at 2am.
++# Ulyanovsk Oblast ... from MSK to MSK+1 (UTC+3 to UTC+4) ...
++# 920582-6 ... 02/17/2016 The State Duma passed the bill in the first reading.
++# From Matt Johnson (2016-03-09):
++# http://publication.pravo.gov.ru/Document/View/0001201603090051
++
++Zone Europe/Ulyanovsk	 3:13:36 -	LMT	1919 Jul  1  0:00u
++			 3:00	-	+03	1930 Jun 21
++			 4:00	Russia	+04/+05	1989 Mar 26  2:00s
++			 3:00	Russia	+03/+04	1991 Mar 31  2:00s
++			 2:00	Russia	+02/+03	1992 Jan 19  2:00s
++			 3:00	Russia	+03/+04	2011 Mar 27  2:00s
++			 4:00	-	+04	2014 Oct 26  2:00s
++			 3:00	-	+03	2016 Mar 27  2:00s
++			 4:00	-	+04
+ 
+ # From Tim Parenti (2014-07-03), per Oscar van Vlijmen (2001-08-25):
+ # Asia/Yekaterinburg covers...
+@@ -2446,47 +2696,140 @@
+ 
+ Zone Asia/Yekaterinburg	 4:02:33 -	LMT	1916 Jul  3
+ 			 3:45:05 -	PMT	1919 Jul 15  4:00
+-			 4:00	-	SVET	1930 Jun 21 # Sverdlovsk Time
+-			 5:00	Russia	SVE%sT	1991 Mar 31  2:00s
+-			 4:00	Russia	SVE%sT	1992 Jan 19  2:00s
+-			 5:00	Russia	YEK%sT	2011 Mar 27  2:00s
+-			 6:00	-	YEKT	2014 Oct 26  2:00s
+-			 5:00	-	YEKT
++			 4:00	-	+04	1930 Jun 21
++			 5:00	Russia	+05/+06	1991 Mar 31  2:00s
++			 4:00	Russia	+04/+05	1992 Jan 19  2:00s
++			 5:00	Russia	+05/+06	2011 Mar 27  2:00s
++			 6:00	-	+06	2014 Oct 26  2:00s
++			 5:00	-	+05
+ 
+ 
+ # From Tim Parenti (2014-07-03), per Oscar van Vlijmen (2001-08-25):
+ # Asia/Omsk covers...
+-# 04	RU-AL	Altai Republic
+-# 22	RU-ALT	Altai Krai
+ # 55	RU-OMS	Omsk Oblast
+ 
+ # Byalokoz 1919 says Omsk was 4:53:30.
+ 
+ Zone Asia/Omsk		 4:53:30 -	LMT	1919 Nov 14
+-			 5:00	-	OMST	1930 Jun 21 # Omsk Time
+-			 6:00	Russia	OMS%sT	1991 Mar 31  2:00s
+-			 5:00	Russia	OMS%sT	1992 Jan 19  2:00s
+-			 6:00	Russia	OMS%sT	2011 Mar 27  2:00s
+-			 7:00	-	OMST	2014 Oct 26  2:00s
+-			 6:00	-	OMST
++			 5:00	-	+05	1930 Jun 21
++			 6:00	Russia	+06/+07	1991 Mar 31  2:00s
++			 5:00	Russia	+05/+06	1992 Jan 19  2:00s
++			 6:00	Russia	+06/+07	2011 Mar 27  2:00s
++			 7:00	-	+07	2014 Oct 26  2:00s
++			 6:00	-	+06
+ 
++# From Paul Eggert (2016-02-22):
++# Asia/Barnaul covers:
++# 04	RU-AL	Altai Republic
++# 22	RU-ALT	Altai Krai
+ 
+-# From Tim Parenti (2014-07-03):
+-# Asia/Novosibirsk covers...
++# Data before 1991 are from Shanks & Pottenger.
++
++# From Stepan Golosunov (2016-03-07):
++# Letter of Bank of Russia from 1995-05-25
++# http://www.bestpravo.ru/rossijskoje/lj-akty/y3a.htm
++# suggests that Altai Republic transitioned to Moscow+3 on
++# 1995-05-28.
++#
++# http://regnum.ru/news/society/1957270.html
++# has some historical data for Altai Krai:
++# before 1957: west part on UTC+6, east on UTC+7
++# after 1957: UTC+7
++# since 1995: UTC+6
++# http://barnaul.rusplt.ru/index/pochemu_altajskij_kraj_okazalsja_v_neprivychnom_chasovom_pojase-17648.html
++# confirms that and provides more details including 1995-05-28 transition date.
++
++# From Alexander Krivenyshev (2016-02-17):
++# Altai Krai and Altai Republic on their way to change time zones
++# by March 27, 2016 at 2am....
++# Altai Republic / Gorno-Altaysk MSK+3 to MSK+4 (UTC+6 to UTC+7) ...
++# Altai Krai / Barnaul MSK+3 to MSK+4 (UTC+6 to UTC+7)
++# From Matt Johnson (2016-03-09):
++# http://publication.pravo.gov.ru/Document/View/0001201603090043
++# http://publication.pravo.gov.ru/Document/View/0001201603090038
++
++Zone Asia/Barnaul	 5:35:00 -	LMT	1919 Dec 10
++			 6:00	-	+06	1930 Jun 21
++			 7:00	Russia	+07/+08	1991 Mar 31  2:00s
++			 6:00	Russia	+06/+07	1992 Jan 19  2:00s
++			 7:00	Russia	+07/+08	1995 May 28
++			 6:00	Russia	+06/+07	2011 Mar 27  2:00s
++			 7:00	-	+07	2014 Oct 26  2:00s
++			 6:00	-	+06	2016 Mar 27  2:00s
++			 7:00	-	+07
++
++# From Paul Eggert (2016-03-18):
++# Asia/Novosibirsk covers:
+ # 54	RU-NVS	Novosibirsk Oblast
+-# 70	RU-TOM	Tomsk Oblast
+ 
+-# From Paul Eggert (2006-08-19): I'm guessing about Tomsk here; it's
+-# not clear when it switched from +7 to +6.
++# From Stepan Golosunov (2016-05-30):
++# http://asozd2.duma.gov.ru/main.nsf/(Spravka)?OpenAgent&RN=1085784-6
++# moves Novosibirsk oblast from UTC+6 to UTC+7.
++# From Stepan Golosunov (2016-07-04):
++# The law was signed yesterday and published today on
++# http://publication.pravo.gov.ru/Document/View/0001201607040064
+ 
+ Zone Asia/Novosibirsk	 5:31:40 -	LMT	1919 Dec 14  6:00
+-			 6:00	-	NOVT	1930 Jun 21 # Novosibirsk Time
+-			 7:00	Russia	NOV%sT	1991 Mar 31  2:00s
+-			 6:00	Russia	NOV%sT	1992 Jan 19  2:00s
+-			 7:00	Russia	NOV%sT	1993 May 23 # say Shanks & P.
+-			 6:00	Russia	NOV%sT	2011 Mar 27  2:00s
+-			 7:00	-	NOVT	2014 Oct 26  2:00s
+-			 6:00	-	NOVT
++			 6:00	-	+06	1930 Jun 21
++			 7:00	Russia	+07/+08	1991 Mar 31  2:00s
++			 6:00	Russia	+06/+07	1992 Jan 19  2:00s
++			 7:00	Russia	+07/+08	1993 May 23 # say Shanks & P.
++			 6:00	Russia	+06/+07	2011 Mar 27  2:00s
++			 7:00	-	+07	2014 Oct 26  2:00s
++			 6:00	-	+06	2016 Jul 24  2:00s
++			 7:00	-	+07
++
++# From Paul Eggert (2016-03-18):
++# Asia/Tomsk covers:
++# 70	RU-TOM	Tomsk Oblast
++
++# From Stepan Golosunov (2016-03-24):
++# Byalokoz listed Tomsk at 5:39:51.
++
++# From Stanislaw A. Kuzikowski (1994-06-29):
++# Tomsk is still 4 hours ahead of Moscow.
++
++# From Stepan Golosunov (2016-03-19):
++# http://pravo.gov.ru/proxy/ips/?docbody=&nd=102075743
++# (fifth time belt being UTC+5+1(decree time)
++# / UTC+5+1(decree time)+1(summer time)) ...
++# Note that time belts (numbered from 2 (Moscow) to 12 according to their
++# GMT/UTC offset and having too many exceptions like regions formally
++# belonging to one belt but using time from another) were replaced
++# with time zones in 2011 with different numbering (there was a
++# 2-hour gap between second and third zones in 2011-2014).
++
++# From Stepan Golosunov (2016-04-12):
++# http://asozd2.duma.gov.ru/main.nsf/(SpravkaNew)?OpenAgent&RN=1006865-6
++# This bill was approved in the first reading today.  It moves Tomsk oblast
++# from UTC+6 to UTC+7 and is supposed to come into effect on 2016-05-29 at
++# 2:00.  The bill needs to be approved in the second and the third readings by
++# the State Duma, approved by the Federation Council, signed by the President
++# and published to become a law.  Minor changes in the text are to be expected
++# before the second reading (references need to be updated to account for the
++# recent changes).
++#
++# Judging by the ultra-short one-day amendments period, recent similar laws,
++# the State Duma schedule and the Federation Council schedule
++# http://www.duma.gov.ru/legislative/planning/day-shedule/por_vesna_2016/
++# http://council.gov.ru/activity/meetings/schedule/63303
++# I speculate that the final text of the bill will be proposed tomorrow, the
++# bill will be approved in the second and the third readings on Friday,
++# approved by the Federation Council on 2016-04-20, signed by the President and
++# published as a law around 2016-04-26.
++
++# From Matt Johnson (2016-04-26):
++# http://publication.pravo.gov.ru/Document/View/0001201604260048
++
++Zone	Asia/Tomsk	 5:39:51 -	LMT	1919 Dec 22
++			 6:00	-	+06	1930 Jun 21
++			 7:00	Russia	+07/+08	1991 Mar 31  2:00s
++			 6:00	Russia	+06/+07	1992 Jan 19  2:00s
++			 7:00	Russia	+07/+08	2002 May  1  3:00
++			 6:00	Russia	+06/+07	2011 Mar 27  2:00s
++			 7:00	-	+07	2014 Oct 26  2:00s
++			 6:00	-	+06	2016 May 29  2:00s
++			 7:00	-	+07
+ 
+ 
+ # From Tim Parenti (2014-07-03):
+@@ -2499,7 +2842,7 @@
+ # from current Russia Zone 6 - Krasnoyarsk Time Zone (KRA) UTC +0700
+ # to Russia Zone 5 - Novosibirsk Time Zone (NOV) UTC +0600
+ #
+-# This is according to Government of Russia decree # 740, on September
++# This is according to Government of Russia decree No. 740, on September
+ # 14, 2009 "Application in the territory of the Kemerovo region the Fifth
+ # time zone." ("Russia Zone 5" or old "USSR Zone 5" is GMT +0600)
+ #
+@@ -2511,23 +2854,18 @@
+ #
+ # Thus, when Russia will switch to DST on the night of March 28, 2010
+ # Kemerovo region (Kemerovo oblast') will not change the clock.
+-#
+-# As a result, Kemerovo oblast' will be in the same time zone as
+-# Novosibirsk, Omsk, Tomsk, Barnaul and Altai Republic.
+ 
+ # From Tim Parenti (2014-07-02), per Alexander Krivenyshev (2014-07-02):
+ # The Kemerovo region will remain at UTC+7 through the 2014-10-26 change, thus
+ # realigning itself with KRAT.
+ 
+ Zone Asia/Novokuznetsk	 5:48:48 -	LMT	1924 May  1
+-			 6:00	-	KRAT	1930 Jun 21 # Krasnoyarsk Time
+-			 7:00	Russia	KRA%sT	1991 Mar 31  2:00s
+-			 6:00	Russia	KRA%sT	1992 Jan 19  2:00s
+-			 7:00	Russia	KRA%sT	2010 Mar 28  2:00s
+-			 6:00	Russia	NOV%sT	2011 Mar 27  2:00s # Novosibirsk
+-			 7:00	-	NOVT	2014 Oct 26  2:00s
+-			 7:00	-	KRAT	# Krasnoyarsk Time
+-
++			 6:00	-	+06	1930 Jun 21
++			 7:00	Russia	+07/+08	1991 Mar 31  2:00s
++			 6:00	Russia	+06/+07	1992 Jan 19  2:00s
++			 7:00	Russia	+07/+08	2010 Mar 28  2:00s
++			 6:00	Russia	+06/+07	2011 Mar 27  2:00s
++			 7:00	-	+07
+ 
+ # From Tim Parenti (2014-07-03), per Oscar van Vlijmen (2001-08-25):
+ # Asia/Krasnoyarsk covers...
+@@ -2541,12 +2879,12 @@
+ # Byalokoz 1919 says Krasnoyarsk was 6:11:26.
+ 
+ Zone Asia/Krasnoyarsk	 6:11:26 -	LMT	1920 Jan  6
+-			 6:00	-	KRAT	1930 Jun 21 # Krasnoyarsk Time
+-			 7:00	Russia	KRA%sT	1991 Mar 31  2:00s
+-			 6:00	Russia	KRA%sT	1992 Jan 19  2:00s
+-			 7:00	Russia	KRA%sT	2011 Mar 27  2:00s
+-			 8:00	-	KRAT	2014 Oct 26  2:00s
+-			 7:00	-	KRAT
++			 6:00	-	+06	1930 Jun 21
++			 7:00	Russia	+07/+08	1991 Mar 31  2:00s
++			 6:00	Russia	+06/+07	1992 Jan 19  2:00s
++			 7:00	Russia	+07/+08	2011 Mar 27  2:00s
++			 8:00	-	+08	2014 Oct 26  2:00s
++			 7:00	-	+07
+ 
+ 
+ # From Tim Parenti (2014-07-03), per Oscar van Vlijmen (2001-08-25):
+@@ -2563,12 +2901,12 @@
+ 
+ Zone Asia/Irkutsk	 6:57:05 -	LMT	1880
+ 			 6:57:05 -	IMT	1920 Jan 25 # Irkutsk Mean Time
+-			 7:00	-	IRKT	1930 Jun 21 # Irkutsk Time
+-			 8:00	Russia	IRK%sT	1991 Mar 31  2:00s
+-			 7:00	Russia	IRK%sT	1992 Jan 19  2:00s
+-			 8:00	Russia	IRK%sT	2011 Mar 27  2:00s
+-			 9:00	-	IRKT	2014 Oct 26  2:00s
+-			 8:00	-	IRKT
++			 7:00	-	+07	1930 Jun 21
++			 8:00	Russia	+08/+09	1991 Mar 31  2:00s
++			 7:00	Russia	+07/+08	1992 Jan 19  2:00s
++			 8:00	Russia	+08/+09	2011 Mar 27  2:00s
++			 9:00	-	+09	2014 Oct 26  2:00s
++			 8:00	-	+08
+ 
+ 
+ # From Tim Parenti (2014-07-06):
+@@ -2578,13 +2916,20 @@
+ # Note: Effective 2008-03-01, (75) Chita Oblast and (80) Agin-Buryat
+ # Autonomous Okrug merged to form (92, RU-ZAB) Zabaykalsky Krai.
+ 
++# From Alexander Krivenyshev (2016-01-02):
++# [The] time zone in the Trans-Baikal Territory (Zabaykalsky Krai) -
++# Asia/Chita [is changing] from UTC+8 to UTC+9.  Effective date will
++# be March 27, 2016 at 2:00am....
++# http://publication.pravo.gov.ru/Document/View/0001201512300107
++
+ Zone Asia/Chita	 7:33:52 -	LMT	1919 Dec 15
+-			 8:00	-	YAKT	1930 Jun 21 # Yakutsk Time
+-			 9:00	Russia	YAK%sT	1991 Mar 31  2:00s
+-			 8:00	Russia	YAK%sT	1992 Jan 19  2:00s
+-			 9:00	Russia	YAK%sT	2011 Mar 27  2:00s
+-			10:00	-	YAKT	2014 Oct 26  2:00s
+-			 8:00	-	IRKT
++			 8:00	-	+08	1930 Jun 21
++			 9:00	Russia	+09/+10	1991 Mar 31  2:00s
++			 8:00	Russia	+08/+09	1992 Jan 19  2:00s
++			 9:00	Russia	+09/+10	2011 Mar 27  2:00s
++			10:00	-	+10	2014 Oct 26  2:00s
++			 8:00	-	+08	2016 Mar 27  2:00
++			 9:00	-	+09
+ 
+ 
+ # From Tim Parenti (2014-07-03), per Oscar van Vlijmen (2009-11-29):
+@@ -2624,12 +2969,12 @@
+ # Byalokoz 1919 says Yakutsk was 8:38:58.
+ 
+ Zone Asia/Yakutsk	 8:38:58 -	LMT	1919 Dec 15
+-			 8:00	-	YAKT	1930 Jun 21 # Yakutsk Time
+-			 9:00	Russia	YAK%sT	1991 Mar 31  2:00s
+-			 8:00	Russia	YAK%sT	1992 Jan 19  2:00s
+-			 9:00	Russia	YAK%sT	2011 Mar 27  2:00s
+-			10:00	-	YAKT	2014 Oct 26  2:00s
+-			 9:00	-	YAKT
++			 8:00	-	+08	1930 Jun 21
++			 9:00	Russia	+09/+10	1991 Mar 31  2:00s
++			 8:00	Russia	+08/+09	1992 Jan 19  2:00s
++			 9:00	Russia	+09/+10	2011 Mar 27  2:00s
++			10:00	-	+10	2014 Oct 26  2:00s
++			 9:00	-	+09
+ 
+ 
+ # From Tim Parenti (2014-07-03), per Oscar van Vlijmen (2009-11-29):
+@@ -2647,12 +2992,12 @@
+ # Go with Byalokoz.
+ 
+ Zone Asia/Vladivostok	 8:47:31 -	LMT	1922 Nov 15
+-			 9:00	-	VLAT	1930 Jun 21 # Vladivostok Time
+-			10:00	Russia	VLA%sT	1991 Mar 31  2:00s
+-			 9:00	Russia	VLA%sT	1992 Jan 19  2:00s
+-			10:00	Russia	VLA%sT	2011 Mar 27  2:00s
+-			11:00	-	VLAT	2014 Oct 26  2:00s
+-			10:00	-	VLAT
++			 9:00	-	+09	1930 Jun 21
++			10:00	Russia	+10/+11	1991 Mar 31  2:00s
++			 9:00	Russia	+09/+10	1992 Jan 19  2:00s
++			10:00	Russia	+10/+11	2011 Mar 27  2:00s
++			11:00	-	+11	2014 Oct 26  2:00s
++			10:00	-	+10
+ 
+ 
+ # From Tim Parenti (2014-07-03):
+@@ -2670,14 +3015,14 @@
+ # This transition is no doubt wrong, but we have no better info.
+ 
+ Zone Asia/Khandyga	 9:02:13 -	LMT	1919 Dec 15
+-			 8:00	-	YAKT	1930 Jun 21 # Yakutsk Time
+-			 9:00	Russia	YAK%sT	1991 Mar 31  2:00s
+-			 8:00	Russia	YAK%sT	1992 Jan 19  2:00s
+-			 9:00	Russia	YAK%sT	2004
+-			10:00	Russia	VLA%sT	2011 Mar 27  2:00s
+-			11:00	-	VLAT	2011 Sep 13  0:00s # Decree 725?
+-			10:00	-	YAKT	2014 Oct 26  2:00s
+-			 9:00	-	YAKT
++			 8:00	-	+08	1930 Jun 21
++			 9:00	Russia	+09/+10	1991 Mar 31  2:00s
++			 8:00	Russia	+08/+09	1992 Jan 19  2:00s
++			 9:00	Russia	+09/+10	2004
++			10:00	Russia	+10/+11	2011 Mar 27  2:00s
++			11:00	-	+11	2011 Sep 13  0:00s # Decree 725?
++			10:00	-	+10	2014 Oct 26  2:00s
++			 9:00	-	+09
+ 
+ 
+ # From Tim Parenti (2014-07-03):
+@@ -2686,16 +3031,21 @@
+ # ...with the exception of:
+ # 65-11	****	Severo-Kurilsky District (North Kuril Islands)
+ 
++# From Matt Johnson (2016-02-22):
++# Asia/Sakhalin is moving (in entirety) from UTC+10 to UTC+11 ...
++# (2016-03-09):
++# http://publication.pravo.gov.ru/Document/View/0001201603090044
++
+ # The Zone name should be Asia/Yuzhno-Sakhalinsk, but that's too long.
+ Zone Asia/Sakhalin	 9:30:48 -	LMT	1905 Aug 23
+-			 9:00	-	JCST	1937 Oct  1
+-			 9:00	-	JST	1945 Aug 25
+-			11:00	Russia	SAK%sT	1991 Mar 31  2:00s # Sakhalin T
+-			10:00	Russia	SAK%sT	1992 Jan 19  2:00s
+-			11:00	Russia	SAK%sT	1997 Mar lastSun  2:00s
+-			10:00	Russia	SAK%sT	2011 Mar 27  2:00s
+-			11:00	-	SAKT	2014 Oct 26  2:00s
+-			10:00	-	SAKT
++			 9:00	-	+09	1945 Aug 25
++			11:00	Russia	+11/+12	1991 Mar 31  2:00s # Sakhalin T
++			10:00	Russia	+10/+11	1992 Jan 19  2:00s
++			11:00	Russia	+11/+12	1997 Mar lastSun  2:00s
++			10:00	Russia	+10/+11	2011 Mar 27  2:00s
++			11:00	-	+11	2014 Oct 26  2:00s
++			10:00	-	+10	2016 Mar 27  2:00s
++			11:00	-	+11
+ 
+ 
+ # From Tim Parenti (2014-07-03), per Oscar van Vlijmen (2009-11-29):
+@@ -2709,13 +3059,22 @@
+ # until now by Asia/Magadan, will instead move to UTC+11.  These regions will
+ # need their own zone.
+ 
++# From Alexander Krivenyshev (2016-03-27):
++# ... draft bill 948300-6 to change its time zone from UTC+10 to UTC+11 ...
++# will take ... effect ... on April 24, 2016 at 2 o'clock
++#
++# From Matt Johnson (2016-04-05):
++# ... signed by the President today ...
++# http://publication.pravo.gov.ru/Document/View/0001201604050038
++
+ Zone Asia/Magadan	10:03:12 -	LMT	1924 May  2
+-			10:00	-	MAGT	1930 Jun 21 # Magadan Time
+-			11:00	Russia	MAG%sT	1991 Mar 31  2:00s
+-			10:00	Russia	MAG%sT	1992 Jan 19  2:00s
+-			11:00	Russia	MAG%sT	2011 Mar 27  2:00s
+-			12:00	-	MAGT	2014 Oct 26  2:00s
+-			10:00	-	MAGT
++			10:00	-	+10	1930 Jun 21 # Magadan Time
++			11:00	Russia	+11/+12	1991 Mar 31  2:00s
++			10:00	Russia	+10/+11	1992 Jan 19  2:00s
++			11:00	Russia	+11/+12	2011 Mar 27  2:00s
++			12:00	-	+12	2014 Oct 26  2:00s
++			10:00	-	+10	2016 Apr 24  2:00s
++			11:00	-	+11
+ 
+ 
+ # From Tim Parenti (2014-07-06):
+@@ -2758,17 +3117,14 @@
+ # in Russian.)  In addition, Srednekolymsk appears to be a much older
+ # settlement and the population of Zyryanka seems to be declining.
+ # Go with Srednekolymsk.
+-#
+-# Since Magadan Oblast moves to UTC+10 on 2014-10-26, we cannot keep using MAGT
+-# as the abbreviation.  Use SRET instead.
+ 
+ Zone Asia/Srednekolymsk	10:14:52 -	LMT	1924 May  2
+-			10:00	-	MAGT	1930 Jun 21 # Magadan Time
+-			11:00	Russia	MAG%sT	1991 Mar 31  2:00s
+-			10:00	Russia	MAG%sT	1992 Jan 19  2:00s
+-			11:00	Russia	MAG%sT	2011 Mar 27  2:00s
+-			12:00	-	MAGT	2014 Oct 26  2:00s
+-			11:00	-	SRET	# Srednekolymsk Time
++			10:00	-	+10	1930 Jun 21
++			11:00	Russia	+11/+12	1991 Mar 31  2:00s
++			10:00	Russia	+10/+11	1992 Jan 19  2:00s
++			11:00	Russia	+11/+12	2011 Mar 27  2:00s
++			12:00	-	+12	2014 Oct 26  2:00s
++			11:00	-	+11
+ 
+ 
+ # From Tim Parenti (2014-07-03):
+@@ -2786,14 +3142,14 @@
+ # UTC+12 since at least then, too.
+ 
+ Zone Asia/Ust-Nera	 9:32:54 -	LMT	1919 Dec 15
+-			 8:00	-	YAKT	1930 Jun 21 # Yakutsk Time
+-			 9:00	Russia	YAKT	1981 Apr  1
+-			11:00	Russia	MAG%sT	1991 Mar 31  2:00s
+-			10:00	Russia	MAG%sT	1992 Jan 19  2:00s
+-			11:00	Russia	MAG%sT	2011 Mar 27  2:00s
+-			12:00	-	MAGT	2011 Sep 13  0:00s # Decree 725?
+-			11:00	-	VLAT	2014 Oct 26  2:00s
+-			10:00	-	VLAT
++			 8:00	-	+08	1930 Jun 21
++			 9:00	Russia	+09/+10	1981 Apr  1
++			11:00	Russia	+11/+12	1991 Mar 31  2:00s
++			10:00	Russia	+10/+11	1992 Jan 19  2:00s
++			11:00	Russia	+11/+12	2011 Mar 27  2:00s
++			12:00	-	+12	2011 Sep 13  0:00s # Decree 725?
++			11:00	-	+11	2014 Oct 26  2:00s
++			10:00	-	+10
+ 
+ 
+ # From Tim Parenti (2014-07-03), per Oscar van Vlijmen (2001-08-25):
+@@ -2806,12 +3162,12 @@
+ # The Zone name should be Asia/Petropavlovsk-Kamchatski or perhaps
+ # Asia/Petropavlovsk-Kamchatsky, but these are too long.
+ Zone Asia/Kamchatka	10:34:36 -	LMT	1922 Nov 10
+-			11:00	-	PETT	1930 Jun 21 # P-K Time
+-			12:00	Russia	PET%sT	1991 Mar 31  2:00s
+-			11:00	Russia	PET%sT	1992 Jan 19  2:00s
+-			12:00	Russia	PET%sT	2010 Mar 28  2:00s
+-			11:00	Russia	PET%sT	2011 Mar 27  2:00s
+-			12:00	-	PETT
++			11:00	-	+11	1930 Jun 21
++			12:00	Russia	+12/+13	1991 Mar 31  2:00s
++			11:00	Russia	+11/+12	1992 Jan 19  2:00s
++			12:00	Russia	+12/+13	2010 Mar 28  2:00s
++			11:00	Russia	+11/+12	2011 Mar 27  2:00s
++			12:00	-	+12
+ 
+ 
+ # From Tim Parenti (2014-07-03):
+@@ -2819,13 +3175,13 @@
+ # 87	RU-CHU	Chukotka Autonomous Okrug
+ 
+ Zone Asia/Anadyr	11:49:56 -	LMT	1924 May  2
+-			12:00	-	ANAT	1930 Jun 21 # Anadyr Time
+-			13:00	Russia	ANA%sT	1982 Apr  1  0:00s
+-			12:00	Russia	ANA%sT	1991 Mar 31  2:00s
+-			11:00	Russia	ANA%sT	1992 Jan 19  2:00s
+-			12:00	Russia	ANA%sT	2010 Mar 28  2:00s
+-			11:00	Russia	ANA%sT	2011 Mar 27  2:00s
+-			12:00	-	ANAT
++			12:00	-	+12	1930 Jun 21
++			13:00	Russia	+13/+14	1982 Apr  1  0:00s
++			12:00	Russia	+12/+13	1991 Mar 31  2:00s
++			11:00	Russia	+11/+12	1992 Jan 19  2:00s
++			12:00	Russia	+12/+13	2010 Mar 28  2:00s
++			11:00	Russia	+11/+12	2011 Mar 27  2:00s
++			12:00	-	+12
+ 
+ 
+ # San Marino
+@@ -2922,7 +3278,7 @@
+ Zone	Atlantic/Canary	-1:01:36 -	LMT	1922 Mar # Las Palmas de Gran C.
+ 			-1:00	-	CANT	1946 Sep 30  1:00 # Canaries T
+ 			 0:00	-	WET	1980 Apr  6  0:00s
+-			 0:00	1:00	WEST	1980 Sep 28  0:00s
++			 0:00	1:00	WEST	1980 Sep 28  1:00u
+ 			 0:00	EU	WE%sT
+ # IATA SSIM (1996-09) says the Canaries switch at 2:00u, not 1:00u.
+ # Ignore this for now, as the Canaries are part of the EU.
+@@ -3084,22 +3440,24 @@
+ 
+ # Turkey
+ 
+-# From Amar Devegowda (2007-01-03):
+-# The time zone rules for Istanbul, Turkey have not been changed for years now.
+-# ... The latest rules are available at:
+-# http://www.timeanddate.com/worldclock/timezone.html?n=107
+-# From Steffen Thorsen (2007-01-03):
+-# I have been able to find press records back to 1996 which all say that
+-# DST started 01:00 local time and end at 02:00 local time.  I am not sure
+-# what happened before that.  One example for each year from 1996 to 2001:
+-# http://newspot.byegm.gov.tr/arsiv/1996/21/N4.htm
+-# http://www.byegm.gov.tr/YAYINLARIMIZ/CHR/ING97/03/97X03X25.TXT
+-# http://www.byegm.gov.tr/YAYINLARIMIZ/CHR/ING98/03/98X03X02.HTM
+-# http://www.byegm.gov.tr/YAYINLARIMIZ/CHR/ING99/10/99X10X26.HTM#%2016
+-# http://www.byegm.gov.tr/YAYINLARIMIZ/CHR/ING2000/03/00X03X06.HTM#%2021
+-# http://www.byegm.gov.tr/YAYINLARIMIZ/CHR/ING2001/03/23x03x01.HTM#%2027
+-# From Paul Eggert (2007-01-03):
+-# Prefer the above source to Shanks & Pottenger for time stamps after 1990.
++# From Kıvanç Yazan (2016-09-25):
++# 1) For 1986-2006, DST started at 01:00 local and ended at 02:00 local, with
++#    no exceptions.
++# 2) 1994's lastSun was overridden with Mar 20 ...
++# Here are official papers:
++# http://www.resmigazete.gov.tr/arsiv/19032.pdf  - page 2 for 1986
++# http://www.resmigazete.gov.tr/arsiv/19400.pdf  - page 4 for 1987
++# http://www.resmigazete.gov.tr/arsiv/19752.pdf  - page 15 for 1988
++# http://www.resmigazete.gov.tr/arsiv/20102.pdf  - page 6 for 1989
++# http://www.resmigazete.gov.tr/arsiv/20464.pdf  - page 1 for 1990 - 1992
++# http://www.resmigazete.gov.tr/arsiv/21531.pdf  - page 15 for 1993 - 1995
++# http://www.resmigazete.gov.tr/arsiv/21879.pdf  - page 1 for overriding 1994
++# http://www.resmigazete.gov.tr/arsiv/22588.pdf  - page 1 for 1996, 1997
++# http://www.resmigazete.gov.tr/arsiv/23286.pdf  - page 10 for 1998 - 2000
++# http://www.resmigazete.gov.tr/eskiler/2001/03/20010324.htm#2  - for 2001
++# http://www.resmigazete.gov.tr/eskiler/2002/03/20020316.htm#2  - for 2002-2006
++# From Paul Eggert (2016-09-25):
++# Prefer the above sources to Shanks & Pottenger for time stamps after 1985.
+ 
+ # From Steffen Thorsen (2007-03-09):
+ # Starting 2007 though, it seems that they are adopting EU's 1:00 UTC
+@@ -3135,6 +3493,25 @@
+ # http://www.balkaneu.com/eventful-elections-turkey/ 2014-03-30.
+ # I guess the best we can do is document the official time.
+ 
++# From Fatih (2015-09-29):
++# It's officially announced now by the Ministry of Energy.
++# Turkey delays winter time to 8th of November 04:00
++# http://www.aa.com.tr/tr/turkiye/yaz-saati-uygulamasi-8-kasimda-sona-erecek/362217
++#
++# From BBC News (2015-10-25):
++# Confused Turks are asking "what's the time?" after automatic clocks defied a
++# government decision ... "For the next two weeks #Turkey is on EEST... Erdogan
++# Engineered Standard Time," said Twitter user @aysekarahasan.
++# http://www.bbc.com/news/world-europe-34631326
++
++# From Burak AYDIN (2016-09-08):
++# Turkey will stay in Daylight Saving Time even in winter....
++# http://www.resmigazete.gov.tr/eskiler/2016/09/20160908-2.pdf
++#
++# From Paul Eggert (2016-09-07):
++# The change is permanent, so this is the new standard time in Turkey.
++# It takes effect today, which is not much notice.
++
+ # Rule	NAME	FROM	TO	TYPE	IN	ON	AT	SAVE	LETTER/S
+ Rule	Turkey	1916	only	-	May	 1	0:00	1:00	S
+ Rule	Turkey	1916	only	-	Oct	 1	0:00	0	-
+@@ -3189,22 +3566,25 @@
+ Rule	Turkey	1983	only	-	Oct	 2	0:00	0	-
+ Rule	Turkey	1985	only	-	Apr	20	0:00	1:00	S
+ Rule	Turkey	1985	only	-	Sep	28	0:00	0	-
+-Rule	Turkey	1986	1990	-	Mar	lastSun	2:00s	1:00	S
+-Rule	Turkey	1986	1990	-	Sep	lastSun	2:00s	0	-
+-Rule	Turkey	1991	2006	-	Mar	lastSun	1:00s	1:00	S
+-Rule	Turkey	1991	1995	-	Sep	lastSun	1:00s	0	-
++Rule	Turkey	1986	1993	-	Mar	lastSun	1:00s	1:00	S
++Rule	Turkey	1986	1995	-	Sep	lastSun	1:00s	0	-
++Rule	Turkey	1994	only	-	Mar	20	1:00s	1:00	S
++Rule	Turkey	1995	2006	-	Mar	lastSun	1:00s	1:00	S
+ Rule	Turkey	1996	2006	-	Oct	lastSun	1:00s	0	-
+ # Zone	NAME		GMTOFF	RULES	FORMAT	[UNTIL]
+ Zone	Europe/Istanbul	1:55:52 -	LMT	1880
+ 			1:56:56	-	IMT	1910 Oct # Istanbul Mean Time?
+ 			2:00	Turkey	EE%sT	1978 Oct 15
+-			3:00	Turkey	TR%sT	1985 Apr 20 # Turkey Time
++			3:00	Turkey	+03/+04	1985 Apr 20
+ 			2:00	Turkey	EE%sT	2007
+ 			2:00	EU	EE%sT	2011 Mar 27  1:00u
+ 			2:00	-	EET	2011 Mar 28  1:00u
+ 			2:00	EU	EE%sT	2014 Mar 30  1:00u
+ 			2:00	-	EET	2014 Mar 31  1:00u
+-			2:00	EU	EE%sT
++			2:00	EU	EE%sT	2015 Oct 25  1:00u
++			2:00	1:00	EEST	2015 Nov  8  1:00u
++			2:00	EU	EE%sT	2016 Sep  7
++			3:00	-	+03
+ Link	Europe/Istanbul	Asia/Istanbul	# Istanbul is in both continents.
+ 
+ # Ukraine
+@@ -3212,7 +3592,7 @@
+ # From Igor Karpov, who works for the Ukrainian Ministry of Justice,
+ # via Garrett Wollman (2003-01-27):
+ # BTW, I've found the official document on this matter. It's government
+-# regulations number 509, May 13, 1996. In my poor translation it says:
++# regulations No. 509, May 13, 1996. In my poor translation it says:
+ # "Time in Ukraine is set to second timezone (Kiev time). Each last Sunday
+ # of March at 3am the time is changing to 4am and each last Sunday of
+ # October the time at 4am is changing to 3am"
+@@ -3221,7 +3601,7 @@
+ # On September 20, 2011 the deputies of the Verkhovna Rada agreed to
+ # abolish the transfer clock to winter time.
+ #
+-# Bill number 8330 of MP from the Party of Regions Oleg Nadoshi got
++# Bill No. 8330 of MP from the Party of Regions Oleg Nadoshi got
+ # approval from 266 deputies.
+ #
+ # Ukraine abolishes transfer back to the winter time (in Russian)
+--- contrib/tzdata/factory.orig
++++ contrib/tzdata/factory
+@@ -1,9 +1,10 @@
+ # This file is in the public domain, so clarified as of
+ # 2009-05-17 by Arthur David Olson.
+ 
+-# For companies who don't want to put time zone specification in
+-# their installation procedures.  When users run date, they'll get the message.
+-# Also useful for the "comp.sources" version.
++# For distributors who don't want to put time zone specification in
++# their installation procedures.  Users that run 'date' will get the
++# time zone abbreviation "-00", indicating that the actual time zone
++# is unknown.
+ 
+ # Zone	NAME	GMTOFF	RULES	FORMAT
+ Zone	Factory	0	- "Local time zone must be set--use tzsetup"
+--- contrib/tzdata/leap-seconds.list.orig
++++ contrib/tzdata/leap-seconds.list
+@@ -143,7 +143,7 @@
+ #		Boulder, Colorado
+ #		Judah.Levine@nist.gov
+ #
+-#	Last Update of leap second values:   5 January 2015
++#	Last Update of leap second values:   8 July 2016
+ #
+ #	The following line shows this last update date in NTP timestamp
+ #	format. This is the date on which the most recent change to
+@@ -151,7 +151,7 @@
+ #	be identified by the unique pair of characters in the first two
+ #	columns as shown below.
+ #
+-#$	 3629404800
++#$	 3676924800
+ #
+ #	The NTP timestamps are in units of seconds since the NTP epoch,
+ #	which is 1 January 1900, 00:00:00. The Modified Julian Day number
+@@ -199,10 +199,10 @@
+ #	current -- the update time stamp, the data and the name of the file
+ #	will not change.
+ #
+-#	Updated through IERS Bulletin C49
+-#	File expires on:  28 December 2015
++#	Updated through IERS Bulletin C52
++#	File expires on:  28 June 2017
+ #
+-#@	3660249600
++#@	3707596800
+ #
+ 2272060800	10	# 1 Jan 1972
+ 2287785600	11	# 1 Jul 1972
+@@ -231,6 +231,7 @@
+ 3439756800	34	# 1 Jan 2009
+ 3550089600	35	# 1 Jul 2012
+ 3644697600	36	# 1 Jul 2015
++3692217600	37	# 1 Jan 2017
+ #
+ #	the following special comment contains the
+ #	hash value of the data in this file computed
+@@ -246,4 +247,4 @@
+ #	the hash line is also ignored in the
+ #	computation.
+ #
+-#h	45e70fa7 a9df2033 f4a49ab0 ec648273 7b6c22c
++#h	dacf2c42 2c4765d6 3c797af8 2cf630eb 699c8c67
+--- contrib/tzdata/leapseconds.orig
++++ contrib/tzdata/leapseconds
+@@ -1,14 +1,21 @@
+-# <pre>
+-# This file is in the public domain, so clarified as of
+-# 2009-05-17 by Arthur David Olson.
++# Allowance for leap seconds added to each time zone file.
+ 
+-# Allowance for leapseconds added to each timezone file.
++# This file is in the public domain.
+ 
+-# The International Earth Rotation Service periodically uses leap seconds
+-# to keep UTC to within 0.9 s of UT1
++# This file is generated automatically from the data in the public-domain
++# leap-seconds.list file available from most NIST time servers.
++# If the URL <ftp://time.nist.gov/pub/leap-seconds.list> does not work,
++# you should be able to pick up leap-seconds.list from a secondary NIST server.
++# See <http://tf.nist.gov/tf-cgi/servers.cgi> for a list of secondary servers.
++# For more about leap-seconds.list, please see
++# The NTP Timescale and Leap Seconds
++# http://www.eecis.udel.edu/~mills/leap.html
++
++# The International Earth Rotation and Reference Systems Service
++# periodically uses leap seconds to keep UTC to within 0.9 s of UT1
+ # (which measures the true angular orientation of the earth in space); see
+ # Terry J Quinn, The BIPM and the accurate measure of time,
+-# Proc IEEE 79, 7 (July 1991), 894-905.
++# Proc IEEE 79, 7 (July 1991), 894-905 <http://dx.doi.org/10.1109/5.84965>.
+ # There were no leap seconds before 1972, because the official mechanism
+ # accounting for the discrepancy between atomic time and the earth's rotation
+ # did not exist until the early 1970s.
+@@ -19,8 +26,8 @@
+ # or
+ #	Leap	YEAR	MON	DAY	23:59:59	-	R/S
+ 
+-# If the leapsecond is Rolling (R) the given time is local time
+-# If the leapsecond is Stationary (S) the given time is UTC
++# If the leapsecond is Rolling (R) the given time is local time.
++# If the leapsecond is Stationary (S) the given time is UTC.
+ 
+ # Leap	YEAR	MONTH	DAY	HH:MM:SS	CORR	R/S
+ Leap	1972	Jun	30	23:59:60	+	S
+@@ -48,53 +55,8 @@
+ Leap	2005	Dec	31	23:59:60	+	S
+ Leap	2008	Dec	31	23:59:60	+	S
+ Leap	2012	Jun	30	23:59:60	+	S
++Leap	2015	Jun	30	23:59:60	+	S
++Leap	2016	Dec	31	23:59:60	+	S
+ 
+-# INTERNATIONAL EARTH ROTATION AND REFERENCE SYSTEMS SERVICE (IERS)
+-#
+-# SERVICE INTERNATIONAL DE LA ROTATION TERRESTRE ET DES SYSTEMES DE REFERENCE
+-#
+-#
+-# SERVICE DE LA ROTATION TERRESTRE
+-# OBSERVATOIRE DE PARIS
+-# 61, Av. de l'Observatoire 75014 PARIS (France)
+-# Tel.      : 33 (0) 1 40 51 22 26
+-# FAX       : 33 (0) 1 40 51 22 91
+-# e-mail    : (E-Mail Removed)
+-# http://hpiers.obspm.fr/eop-pc
+-#
+-# Paris, 5 January 2012
+-#
+-#
+-# Bulletin C 43
+-#
+-# To authorities responsible
+-# for the measurement and
+-# distribution of time
+-#
+-#
+-# UTC TIME STEP
+-# on the 1st of July 2012
+-#
+-#
+-# A positive leap second will be introduced at the end of June 2012.
+-# The sequence of dates of the UTC second markers will be:
+-#
+-#                          2012 June 30,     23h 59m 59s
+-#                          2012 June 30,     23h 59m 60s
+-#                          2012 July  1,      0h  0m  0s
+-#
+-# The difference between UTC and the International Atomic Time TAI is:
+-#
+-# from 2009 January 1, 0h UTC, to 2012 July 1  0h UTC  : UTC-TAI = - 34s
+-# from 2012 July 1,    0h UTC, until further notice    : UTC-TAI = - 35s
+-#
+-# Leap seconds can be introduced in UTC at the end of the months of December
+-# or June, depending on the evolution of UT1-TAI. Bulletin C is mailed every
+-# six months, either to announce a time step in UTC or to confirm that there
+-# will be no time step at the next possible date.
+-#
+-#
+-# Daniel GAMBIS
+-# Head
+-# Earth Orientation Center of IERS
+-# Observatoire de Paris, France
++#	Updated through IERS Bulletin C52
++#	File expires on:  28 June 2017
+--- contrib/tzdata/leapseconds.awk.orig
++++ contrib/tzdata/leapseconds.awk
+@@ -0,0 +1,76 @@
++# Generate the 'leapseconds' file from 'leap-seconds.list'.
++
++# This file is in the public domain.
++
++BEGIN {
++  print "# Allowance for leap seconds added to each time zone file."
++  print ""
++  print "# This file is in the public domain."
++  print ""
++  print "# This file is generated automatically from the data in the public-domain"
++  print "# leap-seconds.list file available from most NIST time servers."
++  print "# If the URL <ftp://time.nist.gov/pub/leap-seconds.list> does not work,"
++  print "# you should be able to pick up leap-seconds.list from a secondary NIST server."
++  print "# See <http://tf.nist.gov/tf-cgi/servers.cgi> for a list of secondary servers."
++  print "# For more about leap-seconds.list, please see"
++  print "# The NTP Timescale and Leap Seconds"
++  print "# http://www.eecis.udel.edu/~mills/leap.html"
++  print ""
++  print "# The International Earth Rotation and Reference Systems Service"
++  print "# periodically uses leap seconds to keep UTC to within 0.9 s of UT1"
++  print "# (which measures the true angular orientation of the earth in space); see"
++  print "# Terry J Quinn, The BIPM and the accurate measure of time,"
++  print "# Proc IEEE 79, 7 (July 1991), 894-905 <http://dx.doi.org/10.1109/5.84965>."
++  print "# There were no leap seconds before 1972, because the official mechanism"
++  print "# accounting for the discrepancy between atomic time and the earth's rotation"
++  print "# did not exist until the early 1970s."
++  print ""
++  print "# The correction (+ or -) is made at the given time, so lines"
++  print "# will typically look like:"
++  print "#	Leap	YEAR	MON	DAY	23:59:60	+	R/S"
++  print "# or"
++  print "#	Leap	YEAR	MON	DAY	23:59:59	-	R/S"
++  print ""
++  print "# If the leapsecond is Rolling (R) the given time is local time."
++  print "# If the leapsecond is Stationary (S) the given time is UTC."
++  print ""
++  print "# Leap	YEAR	MONTH	DAY	HH:MM:SS	CORR	R/S"
++}
++
++/^ *$/ { next }
++
++/^#\tUpdated through/ || /^#\tFile expires on:/ {
++    last_lines = last_lines $0 "\n"
++}
++
++/^#/ { next }
++
++{
++    NTP_timestamp = $1
++    TAI_minus_UTC = $2
++    hash_mark = $3
++    one = $4
++    month = $5
++    year = $6
++    if (old_TAI_minus_UTC) {
++	if (old_TAI_minus_UTC < TAI_minus_UTC) {
++	    sign = "23:59:60\t+"
++	} else {
++	    sign = "23:59:59\t-"
++	}
++	if (month == "Jan") {
++	    year--;
++	    month = "Dec";
++	    day = 31
++	} else if (month == "Jul") {
++	    month = "Jun";
++	    day = 30
++	}
++	printf "Leap\t%s\t%s\t%s\t%s\tS\n", year, month, day, sign
++    }
++    old_TAI_minus_UTC = TAI_minus_UTC
++}
++
++END {
++    printf "\n%s", last_lines
++}
++native
+\ No newline at end of property
++FreeBSD=%H
+\ No newline at end of property
++text/plain
+\ No newline at end of property
+--- contrib/tzdata/northamerica.orig
++++ contrib/tzdata/northamerica
+@@ -24,8 +24,32 @@
+ # was the result of his proposals at the Convention of Railroad Trunk Lines
+ # in New York City (1869-10).  His 1870 proposal was based on Washington, DC,
+ # but in 1872-05 he moved the proposed origin to Greenwich.
+-# His proposal was adopted by the railroads on 1883-11-18 at 12:00,
+-# and the most of the country soon followed suit.
++
++# From Paul Eggert (2016-09-21):
++# Dowd's proposal left many details unresolved, such as where to draw
++# lines between time zones.  The key individual who made time zones
++# work in the US was William Frederick Allen - railway engineer,
++# managing editor of the Travelers' Guide, and secretary of the
++# General Time Convention, a railway standardization group.  Allen
++# spent months in dialogs with scientific and railway leaders,
++# developed a workable plan to institute time zones, and presented it
++# to the General Time Convention on 1883-04-11, saying that his plan
++# meant "local time would be practically abolished" - a plus for
++# railway scheduling.  By the next convention on 1883-10-11 nearly all
++# railroads had agreed and it took effect on 1883-11-18 at 12:00.
++# That Sunday was called the "day of two noons", as the eastern parts
++# of the new zones observed noon twice.  Allen witnessed the
++# transition in New York City, writing:
++#
++#   I heard the bells of St. Paul's strike on the old time.  Four
++#   minutes later, obedient to the electrical signal from the Naval
++#   Observatory ... the time-ball made its rapid descent, the chimes
++#   of old Trinity rang twelve measured strokes, and local time was
++#   abandoned, probably forever.
++#
++# Most of the US soon followed suit.  See:
++# Bartky IR. The adoption of standard time. Technol Cult 1989 Jan;30(1):25-56.
++# http://dx.doi.org/10.2307/3105430
+ 
+ # From Paul Eggert (2005-04-16):
+ # That 1883 transition occurred at 12:00 new time, not at 12:00 old time.
+@@ -325,6 +349,16 @@
+ # Statue 175 closer in synch with the US Congress' intent....
+ # http://www.legis.state.wi.us/2007/data/acts/07Act3.pdf
+ 
++# From an email administrator of the City of Fort Pierre, SD (2015-12-21):
++# Fort Pierre is technically located in the Mountain time zone as is
++# the rest of Stanley County.  Most of Stanley County and Fort Pierre
++# uses the Central time zone due to doing most of their business in
++# Pierre so it simplifies schedules.  I have lived in Stanley County
++# all my life and it has been that way since I can remember.  (43 years!)
++#
++# From Paul Eggert (2015-12-25):
++# Assume this practice predates 1970, so Fort Pierre can use America/Chicago.
++
+ # Rule	NAME	FROM	TO	TYPE	IN	ON	AT	SAVE	LETTER
+ Rule	Chicago	1920	only	-	Jun	13	2:00	1:00	D
+ Rule	Chicago	1920	1921	-	Oct	lastSun	2:00	0	S
+@@ -403,11 +437,42 @@
+ # north of the Salmon River, and the towns of Burgdorf and Warren),
+ # Nevada (except West Wendover), Oregon (except the northern 3/4 of
+ # Malheur county), and Washington
++
++# From Paul Eggert (2016-08-20):
++# In early February 1948, in response to California's electricity shortage,
++# PG&E changed power frequency from 60 to 59.5 Hz during daylight hours,
++# causing electric clocks to lose six minutes per day.  (This did not change
++# legal time, and is not part of the data here.)  See:
++# Ross SA. An energy crisis from the past: Northern California in 1948.
++# Working Paper No. 8, Institute of Governmental Studies, UC Berkeley,
++# 1973-11.  http://escholarship.org/uc/item/8x22k30c
++#
++# In another measure to save electricity, DST was instituted from 1948-03-14
++# at 02:01 to 1949-01-16 at 02:00, with the governor having the option to move
++# the fallback transition earlier.  See pages 3-4 of:
++# http://clerk.assembly.ca.gov/sites/clerk.assembly.ca.gov/files/archive/Statutes/1948/48Vol1_Chapters.pdf
++#
++# In response:
++#
++#   Governor Warren received a torrent of objecting mail, and it is not too much
++#   to speculate that the objections to Daylight Saving Time were one important
++#   factor in the defeat of the Dewey-Warren Presidential ticket in California.
++#     -- Ross, p 25
++#
++# On December 8 the governor exercised the option, setting the date to January 1
++# (LA Times 1948-12-09).  The transition time was 02:00 (LA Times 1949-01-01).
++#
++# Despite the controversy, in 1949 California voters approved Proposition 12,
++# which established DST from April's last Sunday at 01:00 until September's
++# last Sunday at 02:00. This was amended by 1962's Proposition 6, which changed
++# the fall-back date to October's last Sunday. See:
++# http://repository.uchastings.edu/cgi/viewcontent.cgi?article=1501&context=ca_ballot_props
++# http://repository.uchastings.edu/cgi/viewcontent.cgi?article=1636&context=ca_ballot_props
+ #
+ # Rule	NAME	FROM	TO	TYPE	IN	ON	AT	SAVE	LETTER
+-Rule	CA	1948	only	-	Mar	14	2:00	1:00	D
++Rule	CA	1948	only	-	Mar	14	2:01	1:00	D
+ Rule	CA	1949	only	-	Jan	 1	2:00	0	S
+-Rule	CA	1950	1966	-	Apr	lastSun	2:00	1:00	D
++Rule	CA	1950	1966	-	Apr	lastSun	1:00	1:00	D
+ Rule	CA	1950	1961	-	Sep	lastSun	2:00	0	S
+ Rule	CA	1962	1966	-	Oct	lastSun	2:00	0	S
+ # Zone	NAME		GMTOFF	RULES	FORMAT	[UNTIL]
+@@ -481,6 +546,12 @@
+ # For lack of better information, assume that Metlakatla's
+ # abandonment of use of daylight saving resulted from the 1983 vote.
+ 
++# From Steffen Thorsen (2015-11-09):
++# It seems Metlakatla did go off PST on Sunday, November 1, changing
++# their time to AKST and are going to follow Alaska's DST, switching
++# between AKST and AKDT from now on....
++# http://www.krbd.org/2015/10/30/annette-island-times-they-are-a-changing/
++
+ # Zone	NAME		GMTOFF	RULES	FORMAT	[UNTIL]
+ Zone America/Juneau	 15:02:19 -	LMT	1867 Oct 18
+ 			 -8:57:41 -	LMT	1900 Aug 20 12:00
+@@ -506,7 +577,8 @@
+ 			 -8:00	US	P%sT	1946
+ 			 -8:00	-	PST	1969
+ 			 -8:00	US	P%sT	1983 Oct 30  2:00
+-			 -8:00	-	PST
++			 -8:00	-	PST	2015 Nov  1  2:00
++			 -9:00	US	AK%sT
+ Zone America/Yakutat	 14:41:05 -	LMT	1867 Oct 18
+ 			 -9:18:55 -	LMT	1900 Aug 20 12:00
+ 			 -9:00	-	YST	1942
+@@ -1235,10 +1307,19 @@
+ 
+ # west Labrador, Nova Scotia, Prince Edward I
+ 
+-# From Paul Eggert (2006-03-22):
++# From Brian Inglis (2015-07-20):
++# From the historical weather station records available at:
++# https://weatherspark.com/history/28351/1971/Sydney-Nova-Scotia-Canada
++# Sydney shares the same time history as Glace Bay, so was
++# likely to be the same across the island....
++# Sydney, as the capital and most populous location, or Cape Breton, would
++# have been better names for the zone had we known this in 1996.
++
++# From Paul Eggert (2015-07-20):
+ # Shanks & Pottenger write that since 1970 most of this region has been like
+ # Halifax.  Many locales did not observe peacetime DST until 1972;
+-# Glace Bay, NS is the largest that we know of.
++# the Cape Breton area, represented by Glace Bay, is the largest we know of
++# (Glace Bay was perhaps not the best name choice but no point changing now).
+ # Shanks & Pottenger also write that Liverpool, NS was the only town
+ # in Canada to observe DST in 1971 but not 1970; for now we'll assume
+ # this is a typo.
+@@ -1796,13 +1877,13 @@
+ # Exact date in October unknown; Sunday October 1 is a reasonable guess.
+ # 3. June 1918: switch to Pacific Daylight Time (GMT-7)
+ # Exact date in June unknown; Sunday June 2 is a reasonable guess.
+-# note#1:
++# note 1:
+ # On Oct 27/1918 when daylight saving ended in the rest of Canada,
+ # Creston did not change its clocks.
+-# note#2:
++# note 2:
+ # During WWII when the Federal Government legislated a mandatory clock change,
+ # Creston did not oblige.
+-# note#3:
++# note 3:
+ # There is no guarantee that Creston will remain on Mountain Standard Time
+ # (UTC-7) forever.
+ # The subject was debated at least once this year by the town Council.
+@@ -1817,6 +1898,22 @@
+ 
+ # The transition dates (and times) are guesses.
+ 
++# From Matt Johnson (2015-09-21):
++# Fort Nelson, BC, Canada will cancel DST this year.  So while previously they
++# were aligned with America/Vancouver, they're now aligned with
++# America/Dawson_Creek.
++# http://www.northernrockies.ca/EN/meta/news/archives/2015/northern-rockies-time-change.html
++#
++# From Tim Parenti (2015-09-23):
++# This requires a new zone for the Northern Rockies Regional Municipality,
++# America/Fort_Nelson.  The resolution of 2014-12-08 was reached following a
++# 2014-11-15 poll with nearly 75% support.  Effectively, the municipality has
++# been on MST (-0700) like Dawson Creek since it advanced its clocks on
++# 2015-03-08.
++#
++# From Paul Eggert (2015-09-23):
++# Shanks says Fort Nelson did not observe DST in 1946, unlike Vancouver.
++
+ # Rule	NAME	FROM	TO	TYPE	IN	ON	AT	SAVE	LETTER/S
+ Rule	Vanc	1918	only	-	Apr	14	2:00	1:00	D
+ Rule	Vanc	1918	only	-	Oct	27	2:00	0	S
+@@ -1835,6 +1932,12 @@
+ 			-8:00	Canada	P%sT	1947
+ 			-8:00	Vanc	P%sT	1972 Aug 30  2:00
+ 			-7:00	-	MST
++Zone America/Fort_Nelson	-8:10:47 -	LMT	1884
++			-8:00	Vanc	P%sT	1946
++			-8:00	-	PST	1947
++			-8:00	Vanc	P%sT	1987
++			-8:00	Canada	P%sT	2015 Mar  8  2:00
++			-7:00	-	MST
+ Zone America/Creston	-7:46:04 -	LMT	1884
+ 			-7:00	-	MST	1916 Oct 1
+ 			-8:00	-	PST	1918 Jun 2
+@@ -2143,39 +2246,39 @@
+ Rule	NT_YK	1987	2006	-	Apr	Sun>=1	2:00	1:00	D
+ # Zone	NAME		GMTOFF	RULES	FORMAT	[UNTIL]
+ # aka Panniqtuuq
+-Zone America/Pangnirtung 0	-	zzz	1921 # trading post est.
++Zone America/Pangnirtung 0	-	-00	1921 # trading post est.
+ 			-4:00	NT_YK	A%sT	1995 Apr Sun>=1  2:00
+ 			-5:00	Canada	E%sT	1999 Oct 31  2:00
+ 			-6:00	Canada	C%sT	2000 Oct 29  2:00
+ 			-5:00	Canada	E%sT
+ # formerly Frobisher Bay
+-Zone America/Iqaluit	0	-	zzz	1942 Aug # Frobisher Bay est.
++Zone America/Iqaluit	0	-	-00	1942 Aug # Frobisher Bay est.
+ 			-5:00	NT_YK	E%sT	1999 Oct 31  2:00
+ 			-6:00	Canada	C%sT	2000 Oct 29  2:00
+ 			-5:00	Canada	E%sT
+ # aka Qausuittuq
+-Zone America/Resolute	0	-	zzz	1947 Aug 31 # Resolute founded
++Zone America/Resolute	0	-	-00	1947 Aug 31 # Resolute founded
+ 			-6:00	NT_YK	C%sT	2000 Oct 29  2:00
+ 			-5:00	-	EST	2001 Apr  1  3:00
+ 			-6:00	Canada	C%sT	2006 Oct 29  2:00
+ 			-5:00	-	EST	2007 Mar 11  3:00
+ 			-6:00	Canada	C%sT
+ # aka Kangiqiniq
+-Zone America/Rankin_Inlet 0	-	zzz	1957 # Rankin Inlet founded
++Zone America/Rankin_Inlet 0	-	-00	1957 # Rankin Inlet founded
+ 			-6:00	NT_YK	C%sT	2000 Oct 29  2:00
+ 			-5:00	-	EST	2001 Apr  1  3:00
+ 			-6:00	Canada	C%sT
+ # aka Iqaluktuuttiaq
+-Zone America/Cambridge_Bay 0	-	zzz	1920 # trading post est.?
++Zone America/Cambridge_Bay 0	-	-00	1920 # trading post est.?
+ 			-7:00	NT_YK	M%sT	1999 Oct 31  2:00
+ 			-6:00	Canada	C%sT	2000 Oct 29  2:00
+ 			-5:00	-	EST	2000 Nov  5  0:00
+ 			-6:00	-	CST	2001 Apr  1  3:00
+ 			-7:00	Canada	M%sT
+-Zone America/Yellowknife 0	-	zzz	1935 # Yellowknife founded?
++Zone America/Yellowknife 0	-	-00	1935 # Yellowknife founded?
+ 			-7:00	NT_YK	M%sT	1980
+ 			-7:00	Canada	M%sT
+-Zone America/Inuvik	0	-	zzz	1953 # Inuvik founded
++Zone America/Inuvik	0	-	-00	1953 # Inuvik founded
+ 			-8:00	NT_YK	P%sT	1979 Apr lastSun  2:00
+ 			-7:00	NT_YK	M%sT	1980
+ 			-7:00	Canada	M%sT
+@@ -2427,13 +2530,22 @@
+ 			-6:00	-	CST	1981 Dec 23
+ 			-5:00	-	EST	1982 Dec  2
+ 			-6:00	Mexico	C%sT
+-# Coahuila, Durango, Nuevo León, Tamaulipas (near US border)
++# Coahuila, Nuevo León, Tamaulipas (near US border)
++# This includes the following municipalities:
++#   in Coahuila: Ocampo, Acuña, Zaragoza, Jiménez, Piedras Negras, Nava,
++#     Guerrero, Hidalgo.
++#   in Nuevo León: Anáhuac, Los Aldama.
++#   in Tamaulipas: Nuevo Laredo, Guerrero, Mier, Miguel Alemán, Camargo,
++#     Gustavo Díaz Ordaz, Reynosa, Río Bravo, Valle Hermoso, Matamoros.
++# See: Inicia mañana Horario de Verano en zona fronteriza, El Universal,
++# 2016-03-12
++# http://www.eluniversal.com.mx/articulo/estados/2016/03/12/inicia-manana-horario-de-verano-en-zona-fronteriza
+ Zone America/Matamoros	-6:40:00 -	LMT	1921 Dec 31 23:20:00
+ 			-6:00	-	CST	1988
+ 			-6:00	US	C%sT	1989
+ 			-6:00	Mexico	C%sT	2010
+ 			-6:00	US	C%sT
+-# Coahuila, Durango, Nuevo León, Tamaulipas (away from US border)
++# Durango; Coahuila, Nuevo León, Tamaulipas (away from US border)
+ Zone America/Monterrey	-6:41:16 -	LMT	1921 Dec 31 23:18:44
+ 			-6:00	-	CST	1988
+ 			-6:00	US	C%sT	1989
+@@ -2449,6 +2561,9 @@
+ 			-6:00	-	CST	2002 Feb 20
+ 			-6:00	Mexico	C%sT
+ # Chihuahua (near US border)
++# This includes the municipalities of Janos, Ascensión, Juárez, Guadalupe,
++# Práxedis G Guerrero, Coyame del Sotol, Ojinaga, and Manuel Benavides.
++# (See the 2016-03-12 El Universal source mentioned above.)
+ Zone America/Ojinaga	-6:57:40 -	LMT	1922 Jan  1  0:02:20
+ 			-7:00	-	MST	1927 Jun 10 23:00
+ 			-6:00	-	CST	1930 Nov 15
+@@ -2536,7 +2651,7 @@
+ 			-7:00	Mexico	M%sT	2010 Apr  4  2:00
+ 			-6:00	Mexico	C%sT
+ 
+-# Baja California (near US border)
++# Baja California
+ Zone America/Tijuana	-7:48:04 -	LMT	1922 Jan  1  0:11:56
+ 			-7:00	-	MST	1924
+ 			-8:00	-	PST	1927 Jun 10 23:00
+@@ -2556,25 +2671,6 @@
+ 			-8:00	US	P%sT	2002 Feb 20
+ 			-8:00	Mexico	P%sT	2010
+ 			-8:00	US	P%sT
+-# Baja California (away from US border)
+-Zone America/Santa_Isabel	-7:39:28 -	LMT	1922 Jan  1  0:20:32
+-			-7:00	-	MST	1924
+-			-8:00	-	PST	1927 Jun 10 23:00
+-			-7:00	-	MST	1930 Nov 15
+-			-8:00	-	PST	1931 Apr  1
+-			-8:00	1:00	PDT	1931 Sep 30
+-			-8:00	-	PST	1942 Apr 24
+-			-8:00	1:00	PWT	1945 Aug 14 23:00u
+-			-8:00	1:00	PPT	1945 Nov 12 # Peace
+-			-8:00	-	PST	1948 Apr  5
+-			-8:00	1:00	PDT	1949 Jan 14
+-			-8:00	-	PST	1954
+-			-8:00	CA	P%sT	1961
+-			-8:00	-	PST	1976
+-			-8:00	US	P%sT	1996
+-			-8:00	Mexico	P%sT	2001
+-			-8:00	US	P%sT	2002 Feb 20
+-			-8:00	Mexico	P%sT
+ # From Paul Eggert (2006-03-22):
+ # Formerly there was an America/Ensenada zone, which differed from
+ # America/Tijuana only in that it did not observe DST from 1976
+@@ -2587,6 +2683,13 @@
+ # other than America/Tijuana for Baja, but it's not clear yet what its
+ # name or contents should be.
+ #
++# From Paul Eggert (2015-10-08):
++# Formerly there was an America/Santa_Isabel zone, but this appears to
++# have come from a misreading of
++# http://dof.gob.mx/nota_detalle.php?codigo=5127480&fecha=06/01/2010
++# It has been moved to the 'backward' file.
++#
++#
+ # Revillagigedo Is
+ # no information
+ 
+@@ -2661,17 +2764,7 @@
+ 			-4:00	US	A%sT
+ 
+ # Cayman Is
+-
+-# From Paul Eggert (2015-05-15):
+-# The Cayman government has decided to introduce DST in 2016, the idea being
+-# to keep in sync with New York.  The legislation hasn't passed but the change
+-# seems quite likely.  See: Meade B. Cayman 27.
+-# http://www.cayman27.com.ky/2015/05/15/clock-ticks-toward-daylight-saving-time-in-cayman
+-
+-Zone	America/Cayman	-5:25:32 -	LMT	1890     # Georgetown
+-			-5:07:11 -	KMT	1912 Feb # Kingston Mean Time
+-			-5:00	-	EST	2016
+-			-5:00	US	E%sT
++# See America/Panama.
+ 
+ # Costa Rica
+ 
+@@ -3034,6 +3127,13 @@
+ # http://radiovision2000haiti.net/public/haiti-avis-changement-dheure-dimanche/
+ # http://www.canalplushaiti.net/?p=6714
+ 
++# From Steffen Thorsen (2016-03-12):
++# Jean Antoine, editor of www.haiti-reference.com informed us that Haiti
++# are not going on DST this year.  Several other resources confirm this: ...
++# http://www.radiotelevisioncaraibes.com/presse/heure_d_t_pas_de_changement_d_heure_pr_vu_pour_cet_ann_e.html
++# http://www.vantbefinfo.com/changement-dheure-pas-pour-haiti/
++# http://news.anmwe.com/haiti-lheure-nationale-ne-sera-ni-avancee-ni-reculee-cette-annee/
++
+ # Rule	NAME	FROM	TO	TYPE	IN	ON	AT	SAVE	LETTER/S
+ Rule	Haiti	1983	only	-	May	8	0:00	1:00	D
+ Rule	Haiti	1984	1987	-	Apr	lastSun	0:00	1:00	D
+@@ -3044,8 +3144,8 @@
+ Rule	Haiti	1988	1997	-	Oct	lastSun	1:00s	0	S
+ Rule	Haiti	2005	2006	-	Apr	Sun>=1	0:00	1:00	D
+ Rule	Haiti	2005	2006	-	Oct	lastSun	0:00	0	S
+-Rule	Haiti	2012	max	-	Mar	Sun>=8	2:00	1:00	D
+-Rule	Haiti	2012	max	-	Nov	Sun>=1	2:00	0	S
++Rule	Haiti	2012	2015	-	Mar	Sun>=8	2:00	1:00	D
++Rule	Haiti	2012	2015	-	Nov	Sun>=1	2:00	0	S
+ # Zone	NAME		GMTOFF	RULES	FORMAT	[UNTIL]
+ Zone America/Port-au-Prince -4:49:20 -	LMT	1890
+ 			-4:49	-	PPMT	1917 Jan 24 12:00 # P-a-P MT
+@@ -3194,6 +3294,7 @@
+ Zone	America/Panama	-5:18:08 -	LMT	1890
+ 			-5:19:36 -	CMT	1908 Apr 22 # Colón Mean Time
+ 			-5:00	-	EST
++Link America/Panama America/Cayman
+ 
+ # Puerto Rico
+ # There are too many San Juans elsewhere, so we'll use 'Puerto_Rico'.
+@@ -3235,7 +3336,7 @@
+ # indicating that the normal ET rules are followed.
+ #
+ # From Paul Eggert (2014-08-19):
+-# The 2014-08-13 Cabinet meeting decided to stay on UTC-4 year-round.  See:
++# The 2014-08-13 Cabinet meeting decided to stay on UT -04 year-round.  See:
+ # http://tcweeklynews.com/daylight-savings-time-to-be-maintained-p5353-127.htm
+ # Model this as a switch from EST/EDT to AST ...
+ # From Chris Walton (2014-11-04):
+--- contrib/tzdata/southamerica.orig
++++ contrib/tzdata/southamerica
+@@ -131,7 +131,7 @@
+ # Timezone Law (which never was effectively applied) will (would?) be
+ # in effect.... The article is at
+ # http://ar.clarin.com/diario/2001-06-06/e-01701.htm
+-# ... The Law itself is "Ley No 25155", sanctioned on 1999-08-25, enacted
++# ... The Law itself is "Ley No. 25155", sanctioned on 1999-08-25, enacted
+ # 1999-09-17, and published 1999-09-21.  The official publication is at:
+ # http://www.boletin.jus.gov.ar/BON/Primera/1999/09-Septiembre/21/PDF/BO21-09-99LEG.PDF
+ # Regretfully, you have to subscribe (and pay) for the on-line version....
+@@ -175,15 +175,11 @@
+ # http://www.worldtimezone.com/dst_news/dst_news_argentina03.html
+ # http://www.impulsobaires.com.ar/nota.php?id=57832 (in spanish)
+ 
+-# From Rodrigo Severo (2008-10-06):
+-# Here is some info available at a Gentoo bug related to TZ on Argentina's DST:
+-# ...
+-# ------- Comment #1 from [jmdocile]  2008-10-06 16:28 0000 -------
+-# Hi, there is a problem with timezone-data-2008e and maybe with
+-# timezone-data-2008f
+-# Argentinian law [Number] 25.155 is no longer valid.
++# From Juan Manuel Docile in https://bugs.gentoo.org/240339 (2008-10-07)
++# via Rodrigo Severo:
++# Argentinian law No. 25.155 is no longer valid.
+ # http://www.infoleg.gov.ar/infolegInternet/anexos/60000-64999/60036/norma.htm
+-# The new one is law [Number] 26.350
++# The new one is law No. 26.350
+ # http://www.infoleg.gov.ar/infolegInternet/anexos/135000-139999/136191/norma.htm
+ # So there is no summer time in Argentina for now.
+ 
+@@ -414,9 +410,9 @@
+ # stuck on Summer daylight savings time even though the summer is over.
+ 
+ # From Paul Eggert (2013-09-05):
+-# Perhaps San Luis operates on the legal fiction that it is at UTC-4
++# Perhaps San Luis operates on the legal fiction that it is at -04
+ # with perpetual summer time, but ordinary usage typically seems to
+-# just say it's at UTC-3; see, for example,
++# just say it's at -03; see, for example,
+ # http://es.wikipedia.org/wiki/Hora_oficial_argentina
+ # We've documented similar situations as being plain changes to
+ # standard time, so let's do that here too.  This does not change UTC
+@@ -771,7 +767,7 @@
+ #	 [ and in a second message (same day): ]
+ # I found the decree.
+ #
+-# DECRETO No- 7.584, DE 13 DE OUTUBRO DE 2011
++# DECRETO No. 7.584, DE 13 DE OUTUBRO DE 2011
+ # Link :
+ # http://www.in.gov.br/visualiza/index.jsp?data=13/10/2011&jornal=1000&pagina=6&totalArquivos=6
+ 
+@@ -1125,7 +1121,7 @@
+ # Conflicts between [1] and [2] were resolved as follows:
+ #
+ #  - [1] says the 1910 transition was Jan 1, [2] says Jan 10 and cites
+-#    Boletín Nº 1, Aviso Nº 1 (1910).  Go with [2].
++#    Boletín No. 1, Aviso No. 1 (1910).  Go with [2].
+ #
+ #  - [1] says SMT was -4:42:45, [2] says Chile's official time from
+ #    1916 to 1919 was -4:42:46.3, the meridian of Chile's National
+@@ -1133,7 +1129,7 @@
+ #    Quinta Normal in Santiago.  Go with [2], rounding it to -4:42:46.
+ #
+ #  - [1] says the 1918 transition was Sep 1, [2] says Sep 10 and cites
+-#    Boletín Nº 22, Aviso Nº 129/1918 (1918-08-23).  Go with [2].
++#    Boletín No. 22, Aviso No. 129/1918 (1918-08-23).  Go with [2].
+ #
+ #  - [1] does not give times for transitions; assume they occur
+ #    at midnight mainland time, the current common practice.  However,
+@@ -1225,6 +1221,20 @@
+ # From Paul Eggert (2015-03-03):
+ # For now, assume that the extension will persist indefinitely.
+ 
++# From Juan Correa (2016-03-18):
++# The decree regarding DST has been published in today's Official Gazette:
++# http://www.diariooficial.interior.gob.cl/versiones-anteriores/do/20160318/
++# http://www.leychile.cl/Navegar?idNorma=1088502
++# It does consider the second Saturday of May and August as the dates
++# for the transition; and it lists DST dates until 2019, but I think
++# this scheme will stick.
++#
++# From Paul Eggert (2016-03-18):
++# For now, assume the pattern holds for the indefinite future.
++# The decree says transitions occur at 24:00; in practice this appears
++# to mean 24:00 mainland time, not 24:00 local time, so that Easter
++# Island is always two hours behind the mainland.
++
+ # Rule	NAME	FROM	TO	TYPE	IN	ON	AT	SAVE	LETTER/S
+ Rule	Chile	1927	1931	-	Sep	 1	0:00	1:00	S
+ Rule	Chile	1928	1932	-	Apr	 1	0:00	0	-
+@@ -1256,8 +1266,10 @@
+ Rule	Chile	2010	only	-	Apr	Sun>=1	3:00u	0	-
+ Rule	Chile	2011	only	-	May	Sun>=2	3:00u	0	-
+ Rule	Chile	2011	only	-	Aug	Sun>=16	4:00u	1:00	S
+-Rule	Chile	2012	2015	-	Apr	Sun>=23	3:00u	0	-
++Rule	Chile	2012	2014	-	Apr	Sun>=23	3:00u	0	-
+ Rule	Chile	2012	2014	-	Sep	Sun>=2	4:00u	1:00	S
++Rule	Chile	2016	max	-	May	Sun>=9	3:00u	0	-
++Rule	Chile	2016	max	-	Aug	Sun>=9	4:00u	1:00	S
+ # IATA SSIM anomalies: (1992-02) says 1992-03-14;
+ # (1996-09) says 1998-03-08.  Ignore these.
+ # Zone	NAME		GMTOFF	RULES	FORMAT	[UNTIL]
+@@ -1274,13 +1286,11 @@
+ 			-4:00	1:00	CLST	1946 Sep  1 # central Chile
+ 			-4:00	-	CLT	1947 Apr  1
+ 			-5:00	-	CLT	1947 May 21 23:00
+-			-4:00	Chile	CL%sT	2015 Apr 26  3:00u
+-			-3:00	-	CLT
++			-4:00	Chile	CL%sT
+ Zone Pacific/Easter	-7:17:28 -	LMT	1890
+ 			-7:17:28 -	EMT	1932 Sep    # Easter Mean Time
+ 			-7:00	Chile	EAS%sT	1982 Mar 14 3:00u # Easter Time
+-			-6:00	Chile	EAS%sT	2015 Apr 26 3:00u
+-			-5:00	-	EAST
++			-6:00	Chile	EAS%sT
+ #
+ # Salas y Gómez Island is uninhabited.
+ # Other Chilean locations, including Juan Fernández Is, Desventuradas Is,
+@@ -1299,11 +1309,10 @@
+ # Palmer used to be supplied from Argentina.
+ #
+ # Zone	NAME		GMTOFF	RULES	FORMAT	[UNTIL]
+-Zone Antarctica/Palmer	0	-	zzz	1965
++Zone Antarctica/Palmer	0	-	-00	1965
+ 			-4:00	Arg	AR%sT	1969 Oct  5
+ 			-3:00	Arg	AR%sT	1982 May
+-			-4:00	Chile	CL%sT	2015 Apr 26 3:00u
+-			-3:00	-	CLT
++			-4:00	Chile	CL%sT
+ 
+ # Colombia
+ 
+@@ -1533,7 +1542,7 @@
+ # (1999-09) reports no date; go with above sources and Gerd Knops (2001-02-27).
+ Rule	Para	1998	2001	-	Mar	Sun>=1	0:00	0	-
+ # From Rives McDow (2002-02-28):
+-# A decree was issued in Paraguay (no. 16350) on 2002-02-26 that changed the
++# A decree was issued in Paraguay (No. 16350) on 2002-02-26 that changed the
+ # dst method to be from the first Sunday in September to the first Sunday in
+ # April.
+ Rule	Para	2002	2004	-	Apr	Sun>=1	0:00	0	-
+@@ -1713,8 +1722,19 @@
+ Rule	Uruguay	2006	only	-	Mar	12	 2:00	0	-
+ # From Jesper Nørgaard Welen (2006-09-06):
+ # http://www.presidencia.gub.uy/_web/decretos/2006/09/CM%20210_08%2006%202006_00001.PDF
+-Rule	Uruguay	2006	max	-	Oct	Sun>=1	 2:00	1:00	S
+-Rule	Uruguay	2007	max	-	Mar	Sun>=8	 2:00	0	-
++#
++# From Steffen Thorsen (2015-06-30):
++# ... it looks like they will not be using DST the coming summer:
++# http://www.elobservador.com.uy/gobierno-resolvio-que-no-habra-cambio-horario-verano-n656787
++# http://www.republica.com.uy/este-ano-no-se-modificara-el-huso-horario-en-uruguay/523760/
++# From Paul Eggert (2015-06-30):
++# Apparently restaurateurs complained that DST caused people to go to the beach
++# instead of out to dinner.
++# From Pablo Camargo (2015-07-13):
++# http://archivo.presidencia.gub.uy/sci/decretos/2015/06/cons_min_201.pdf
++# [dated 2015-06-29; repeals Decree 311/006 dated 2006-09-04]
++Rule	Uruguay	2006	2014	-	Oct	Sun>=1	 2:00	1:00	S
++Rule	Uruguay	2007	2015	-	Mar	Sun>=8	 2:00	0	-
+ # Zone	NAME		GMTOFF	RULES	FORMAT	[UNTIL]
+ Zone America/Montevideo	-3:44:44 -	LMT	1898 Jun 28
+ 			-3:44:44 -	MMT	1920 May  1 # Montevideo MT
+@@ -1723,6 +1743,10 @@
+ 
+ # Venezuela
+ #
++# From Paul Eggert (2015-07-28):
++# For the 1965 transition see Gaceta Oficial No. 27.619 (1964-12-15), p 205.533
++# http://www.pgr.gob.ve/dmdocuments/1964/27619.pdf
++#
+ # From John Stainforth (2007-11-28):
+ # ... the change for Venezuela originally expected for 2007-12-31 has
+ # been brought forward to 2007-12-09.  The official announcement was
+@@ -1731,9 +1755,25 @@
+ # resolution publication)
+ # http://www.globovision.com/news.php?nid=72208
+ 
++# From Alexander Krivenyshev (2016-04-15):
++# https://actualidad.rt.com/actualidad/204758-venezuela-modificar-huso-horario-sequia-elnino
++#
++# From Paul Eggert (2016-04-15):
++# Clocks advance 30 minutes on 2016-05-01 at 02:30....
++# "'Venezuela's new time-zone: hours without light, hours without water,
++# hours of presidential broadcasts, hours of lines,' quipped comedian
++# Jean Mary Curró ...". See: Cawthorne A, Kai D. Venezuela scraps
++# half-hour time difference set by Chavez. Reuters 2016-04-15 14:50 -0400
++# http://www.reuters.com/article/us-venezuela-timezone-idUSKCN0XC2BE
++#
++# From Matt Johnson (2016-04-20):
++# ... published in the official Gazette [2016-04-18], here:
++# http://historico.tsj.gob.ve/gaceta_ext/abril/1842016/E-1842016-4551.pdf
++
+ # Zone	NAME		GMTOFF	RULES	FORMAT	[UNTIL]
+ Zone	America/Caracas	-4:27:44 -	LMT	1890
+ 			-4:27:40 -	CMT	1912 Feb 12 # Caracas Mean Time?
+-			-4:30	-	VET	1965        # Venezuela Time
++			-4:30	-	VET	1965 Jan  1  0:00 # Venezuela T.
+ 			-4:00	-	VET	2007 Dec  9  3:00
+-			-4:30	-	VET
++			-4:30	-	VET	2016 May  1  2:30
++			-4:00	-	VET
+--- contrib/tzdata/version.orig
++++ contrib/tzdata/version
+@@ -0,0 +1 @@
++2016i
+--- contrib/tzdata/zone.tab.orig
++++ contrib/tzdata/zone.tab
+@@ -30,22 +30,22 @@
+ AL	+4120+01950	Europe/Tirane
+ AM	+4011+04430	Asia/Yerevan
+ AO	-0848+01314	Africa/Luanda
+-AQ	-7750+16636	Antarctica/McMurdo	McMurdo, South Pole, Scott (New Zealand time)
+-AQ	-6734-06808	Antarctica/Rothera	Rothera Station, Adelaide Island
+-AQ	-6448-06406	Antarctica/Palmer	Palmer Station, Anvers Island
+-AQ	-6736+06253	Antarctica/Mawson	Mawson Station, Holme Bay
+-AQ	-6835+07758	Antarctica/Davis	Davis Station, Vestfold Hills
+-AQ	-6617+11031	Antarctica/Casey	Casey Station, Bailey Peninsula
+-AQ	-7824+10654	Antarctica/Vostok	Vostok Station, Lake Vostok
+-AQ	-6640+14001	Antarctica/DumontDUrville	Dumont-d'Urville Station, Adelie Land
+-AQ	-690022+0393524	Antarctica/Syowa	Syowa Station, E Ongul I
+-AQ	-720041+0023206	Antarctica/Troll	Troll Station, Queen Maud Land
++AQ	-7750+16636	Antarctica/McMurdo	New Zealand time - McMurdo, South Pole
++AQ	-6617+11031	Antarctica/Casey	Casey
++AQ	-6835+07758	Antarctica/Davis	Davis
++AQ	-6640+14001	Antarctica/DumontDUrville	Dumont-d'Urville
++AQ	-6736+06253	Antarctica/Mawson	Mawson
++AQ	-6448-06406	Antarctica/Palmer	Palmer
++AQ	-6734-06808	Antarctica/Rothera	Rothera
++AQ	-690022+0393524	Antarctica/Syowa	Syowa
++AQ	-720041+0023206	Antarctica/Troll	Troll
++AQ	-7824+10654	Antarctica/Vostok	Vostok
+ AR	-3436-05827	America/Argentina/Buenos_Aires	Buenos Aires (BA, CF)
+-AR	-3124-06411	America/Argentina/Cordoba	most locations (CB, CC, CN, ER, FM, MN, SE, SF)
+-AR	-2447-06525	America/Argentina/Salta	(SA, LP, NQ, RN)
++AR	-3124-06411	America/Argentina/Cordoba	Argentina (most areas: CB, CC, CN, ER, FM, MN, SE, SF)
++AR	-2447-06525	America/Argentina/Salta	Salta (SA, LP, NQ, RN)
+ AR	-2411-06518	America/Argentina/Jujuy	Jujuy (JY)
+ AR	-2649-06513	America/Argentina/Tucuman	Tucuman (TM)
+-AR	-2828-06547	America/Argentina/Catamarca	Catamarca (CT), Chubut (CH)
++AR	-2828-06547	America/Argentina/Catamarca	Catamarca (CT); Chubut (CH)
+ AR	-2926-06651	America/Argentina/La_Rioja	La Rioja (LR)
+ AR	-3132-06831	America/Argentina/San_Juan	San Juan (SJ)
+ AR	-3253-06849	America/Argentina/Mendoza	Mendoza (MZ)
+@@ -56,17 +56,17 @@
+ AT	+4813+01620	Europe/Vienna
+ AU	-3133+15905	Australia/Lord_Howe	Lord Howe Island
+ AU	-5430+15857	Antarctica/Macquarie	Macquarie Island
+-AU	-4253+14719	Australia/Hobart	Tasmania - most locations
+-AU	-3956+14352	Australia/Currie	Tasmania - King Island
++AU	-4253+14719	Australia/Hobart	Tasmania (most areas)
++AU	-3956+14352	Australia/Currie	Tasmania (King Island)
+ AU	-3749+14458	Australia/Melbourne	Victoria
+-AU	-3352+15113	Australia/Sydney	New South Wales - most locations
+-AU	-3157+14127	Australia/Broken_Hill	New South Wales - Yancowinna
+-AU	-2728+15302	Australia/Brisbane	Queensland - most locations
+-AU	-2016+14900	Australia/Lindeman	Queensland - Holiday Islands
++AU	-3352+15113	Australia/Sydney	New South Wales (most areas)
++AU	-3157+14127	Australia/Broken_Hill	New South Wales (Yancowinna)
++AU	-2728+15302	Australia/Brisbane	Queensland (most areas)
++AU	-2016+14900	Australia/Lindeman	Queensland (Whitsunday Islands)
+ AU	-3455+13835	Australia/Adelaide	South Australia
+ AU	-1228+13050	Australia/Darwin	Northern Territory
+-AU	-3157+11551	Australia/Perth	Western Australia - most locations
+-AU	-3143+12852	Australia/Eucla	Western Australia - Eucla area
++AU	-3157+11551	Australia/Perth	Western Australia (most areas)
++AU	-3143+12852	Australia/Eucla	Western Australia (Eucla)
+ AW	+1230-06958	America/Aruba
+ AX	+6006+01957	Europe/Mariehamn
+ AZ	+4023+04951	Asia/Baku
+@@ -85,62 +85,63 @@
+ BO	-1630-06809	America/La_Paz
+ BQ	+120903-0681636	America/Kralendijk
+ BR	-0351-03225	America/Noronha	Atlantic islands
+-BR	-0127-04829	America/Belem	Amapa, E Para
+-BR	-0343-03830	America/Fortaleza	NE Brazil (MA, PI, CE, RN, PB)
++BR	-0127-04829	America/Belem	Para (east); Amapa
++BR	-0343-03830	America/Fortaleza	Brazil (northeast: MA, PI, CE, RN, PB)
+ BR	-0803-03454	America/Recife	Pernambuco
+ BR	-0712-04812	America/Araguaina	Tocantins
+ BR	-0940-03543	America/Maceio	Alagoas, Sergipe
+ BR	-1259-03831	America/Bahia	Bahia
+-BR	-2332-04637	America/Sao_Paulo	S & SE Brazil (GO, DF, MG, ES, RJ, SP, PR, SC, RS)
++BR	-2332-04637	America/Sao_Paulo	Brazil (southeast: GO, DF, MG, ES, RJ, SP, PR, SC, RS)
+ BR	-2027-05437	America/Campo_Grande	Mato Grosso do Sul
+ BR	-1535-05605	America/Cuiaba	Mato Grosso
+-BR	-0226-05452	America/Santarem	W Para
++BR	-0226-05452	America/Santarem	Para (west)
+ BR	-0846-06354	America/Porto_Velho	Rondonia
+ BR	+0249-06040	America/Boa_Vista	Roraima
+-BR	-0308-06001	America/Manaus	E Amazonas
+-BR	-0640-06952	America/Eirunepe	W Amazonas
++BR	-0308-06001	America/Manaus	Amazonas (east)
++BR	-0640-06952	America/Eirunepe	Amazonas (west)
+ BR	-0958-06748	America/Rio_Branco	Acre
+ BS	+2505-07721	America/Nassau
+ BT	+2728+08939	Asia/Thimphu
+ BW	-2439+02555	Africa/Gaborone
+ BY	+5354+02734	Europe/Minsk
+ BZ	+1730-08812	America/Belize
+-CA	+4734-05243	America/St_Johns	Newfoundland Time, including SE Labrador
+-CA	+4439-06336	America/Halifax	Atlantic Time - Nova Scotia (most places), PEI
+-CA	+4612-05957	America/Glace_Bay	Atlantic Time - Nova Scotia - places that did not observe DST 1966-1971
+-CA	+4606-06447	America/Moncton	Atlantic Time - New Brunswick
+-CA	+5320-06025	America/Goose_Bay	Atlantic Time - Labrador - most locations
+-CA	+5125-05707	America/Blanc-Sablon	Atlantic Standard Time - Quebec - Lower North Shore
+-CA	+4339-07923	America/Toronto	Eastern Time - Ontario & Quebec - most locations
+-CA	+4901-08816	America/Nipigon	Eastern Time - Ontario & Quebec - places that did not observe DST 1967-1973
+-CA	+4823-08915	America/Thunder_Bay	Eastern Time - Thunder Bay, Ontario
+-CA	+6344-06828	America/Iqaluit	Eastern Time - east Nunavut - most locations
+-CA	+6608-06544	America/Pangnirtung	Eastern Time - Pangnirtung, Nunavut
+-CA	+744144-0944945	America/Resolute	Central Time - Resolute, Nunavut
+-CA	+484531-0913718	America/Atikokan	Eastern Standard Time - Atikokan, Ontario and Southampton I, Nunavut
+-CA	+624900-0920459	America/Rankin_Inlet	Central Time - central Nunavut
+-CA	+4953-09709	America/Winnipeg	Central Time - Manitoba & west Ontario
+-CA	+4843-09434	America/Rainy_River	Central Time - Rainy River & Fort Frances, Ontario
+-CA	+5024-10439	America/Regina	Central Standard Time - Saskatchewan - most locations
+-CA	+5017-10750	America/Swift_Current	Central Standard Time - Saskatchewan - midwest
+-CA	+5333-11328	America/Edmonton	Mountain Time - Alberta, east British Columbia & west Saskatchewan
+-CA	+690650-1050310	America/Cambridge_Bay	Mountain Time - west Nunavut
+-CA	+6227-11421	America/Yellowknife	Mountain Time - central Northwest Territories
+-CA	+682059-1334300	America/Inuvik	Mountain Time - west Northwest Territories
+-CA	+4906-11631	America/Creston	Mountain Standard Time - Creston, British Columbia
+-CA	+5946-12014	America/Dawson_Creek	Mountain Standard Time - Dawson Creek & Fort Saint John, British Columbia
+-CA	+4916-12307	America/Vancouver	Pacific Time - west British Columbia
+-CA	+6043-13503	America/Whitehorse	Pacific Time - south Yukon
+-CA	+6404-13925	America/Dawson	Pacific Time - north Yukon
++CA	+4734-05243	America/St_Johns	Newfoundland; Labrador (southeast)
++CA	+4439-06336	America/Halifax	Atlantic - NS (most areas); PE
++CA	+4612-05957	America/Glace_Bay	Atlantic - NS (Cape Breton)
++CA	+4606-06447	America/Moncton	Atlantic - New Brunswick
++CA	+5320-06025	America/Goose_Bay	Atlantic - Labrador (most areas)
++CA	+5125-05707	America/Blanc-Sablon	AST - QC (Lower North Shore)
++CA	+4339-07923	America/Toronto	Eastern - ON, QC (most areas)
++CA	+4901-08816	America/Nipigon	Eastern - ON, QC (no DST 1967-73)
++CA	+4823-08915	America/Thunder_Bay	Eastern - ON (Thunder Bay)
++CA	+6344-06828	America/Iqaluit	Eastern - NU (most east areas)
++CA	+6608-06544	America/Pangnirtung	Eastern - NU (Pangnirtung)
++CA	+484531-0913718	America/Atikokan	EST - ON (Atikokan); NU (Coral H)
++CA	+4953-09709	America/Winnipeg	Central - ON (west); Manitoba
++CA	+4843-09434	America/Rainy_River	Central - ON (Rainy R, Ft Frances)
++CA	+744144-0944945	America/Resolute	Central - NU (Resolute)
++CA	+624900-0920459	America/Rankin_Inlet	Central - NU (central)
++CA	+5024-10439	America/Regina	CST - SK (most areas)
++CA	+5017-10750	America/Swift_Current	CST - SK (midwest)
++CA	+5333-11328	America/Edmonton	Mountain - AB; BC (E); SK (W)
++CA	+690650-1050310	America/Cambridge_Bay	Mountain - NU (west)
++CA	+6227-11421	America/Yellowknife	Mountain - NT (central)
++CA	+682059-1334300	America/Inuvik	Mountain - NT (west)
++CA	+4906-11631	America/Creston	MST - BC (Creston)
++CA	+5946-12014	America/Dawson_Creek	MST - BC (Dawson Cr, Ft St John)
++CA	+5848-12242	America/Fort_Nelson	MST - BC (Ft Nelson)
++CA	+4916-12307	America/Vancouver	Pacific - BC (most areas)
++CA	+6043-13503	America/Whitehorse	Pacific - Yukon (south)
++CA	+6404-13925	America/Dawson	Pacific - Yukon (north)
+ CC	-1210+09655	Indian/Cocos
+-CD	-0418+01518	Africa/Kinshasa	west Dem. Rep. of Congo
+-CD	-1140+02728	Africa/Lubumbashi	east Dem. Rep. of Congo
++CD	-0418+01518	Africa/Kinshasa	Dem. Rep. of Congo (west)
++CD	-1140+02728	Africa/Lubumbashi	Dem. Rep. of Congo (east)
+ CF	+0422+01835	Africa/Bangui
+ CG	-0416+01517	Africa/Brazzaville
+ CH	+4723+00832	Europe/Zurich
+ CI	+0519-00402	Africa/Abidjan
+ CK	-2114-15946	Pacific/Rarotonga
+-CL	-3327-07040	America/Santiago	most locations
++CL	-3327-07040	America/Santiago	Chile (most areas)
+ CL	-2709-10926	Pacific/Easter	Easter Island
+ CM	+0403+00942	Africa/Douala
+ CN	+3114+12128	Asia/Shanghai	Beijing Time
+@@ -151,30 +152,31 @@
+ CV	+1455-02331	Atlantic/Cape_Verde
+ CW	+1211-06900	America/Curacao
+ CX	-1025+10543	Indian/Christmas
+-CY	+3510+03322	Asia/Nicosia
++CY	+3510+03322	Asia/Nicosia	Cyprus (most areas)
++CY	+3507+03357	Asia/Famagusta	Northern Cyprus
+ CZ	+5005+01426	Europe/Prague
+-DE	+5230+01322	Europe/Berlin	most locations
++DE	+5230+01322	Europe/Berlin	Germany (most areas)
+ DE	+4742+00841	Europe/Busingen	Busingen
+ DJ	+1136+04309	Africa/Djibouti
+ DK	+5540+01235	Europe/Copenhagen
+ DM	+1518-06124	America/Dominica
+ DO	+1828-06954	America/Santo_Domingo
+ DZ	+3647+00303	Africa/Algiers
+-EC	-0210-07950	America/Guayaquil	mainland
++EC	-0210-07950	America/Guayaquil	Ecuador (mainland)
+ EC	-0054-08936	Pacific/Galapagos	Galapagos Islands
+ EE	+5925+02445	Europe/Tallinn
+ EG	+3003+03115	Africa/Cairo
+ EH	+2709-01312	Africa/El_Aaiun
+ ER	+1520+03853	Africa/Asmara
+-ES	+4024-00341	Europe/Madrid	mainland
+-ES	+3553-00519	Africa/Ceuta	Ceuta & Melilla
++ES	+4024-00341	Europe/Madrid	Spain (mainland)
++ES	+3553-00519	Africa/Ceuta	Ceuta, Melilla
+ ES	+2806-01524	Atlantic/Canary	Canary Islands
+ ET	+0902+03842	Africa/Addis_Ababa
+ FI	+6010+02458	Europe/Helsinki
+ FJ	-1808+17825	Pacific/Fiji
+ FK	-5142-05751	Atlantic/Stanley
+-FM	+0725+15147	Pacific/Chuuk	Chuuk (Truk) and Yap
+-FM	+0658+15813	Pacific/Pohnpei	Pohnpei (Ponape)
++FM	+0725+15147	Pacific/Chuuk	Chuuk/Truk, Yap
++FM	+0658+15813	Pacific/Pohnpei	Pohnpei/Ponape
+ FM	+0519+16259	Pacific/Kosrae	Kosrae
+ FO	+6201-00646	Atlantic/Faroe
+ FR	+4852+00220	Europe/Paris
+@@ -186,10 +188,10 @@
+ GG	+4927-00232	Europe/Guernsey
+ GH	+0533-00013	Africa/Accra
+ GI	+3608-00521	Europe/Gibraltar
+-GL	+6411-05144	America/Godthab	most locations
+-GL	+7646-01840	America/Danmarkshavn	east coast, north of Scoresbysund
+-GL	+7029-02158	America/Scoresbysund	Scoresbysund / Ittoqqortoormiit
+-GL	+7634-06847	America/Thule	Thule / Pituffik
++GL	+6411-05144	America/Godthab	Greenland (most areas)
++GL	+7646-01840	America/Danmarkshavn	National Park (east coast)
++GL	+7029-02158	America/Scoresbysund	Scoresbysund/Ittoqqortoormiit
++GL	+7634-06847	America/Thule	Thule/Pituffik
+ GM	+1328-01639	Africa/Banjul
+ GN	+0931-01343	Africa/Conakry
+ GP	+1614-06132	America/Guadeloupe
+@@ -205,10 +207,10 @@
+ HR	+4548+01558	Europe/Zagreb
+ HT	+1832-07220	America/Port-au-Prince
+ HU	+4730+01905	Europe/Budapest
+-ID	-0610+10648	Asia/Jakarta	Java & Sumatra
+-ID	-0002+10920	Asia/Pontianak	west & central Borneo
+-ID	-0507+11924	Asia/Makassar	east & south Borneo, Sulawesi (Celebes), Bali, Nusa Tengarra, west Timor
+-ID	-0232+14042	Asia/Jayapura	west New Guinea (Irian Jaya) & Malukus (Moluccas)
++ID	-0610+10648	Asia/Jakarta	Java, Sumatra
++ID	-0002+10920	Asia/Pontianak	Borneo (west, central)
++ID	-0507+11924	Asia/Makassar	Borneo (east, south); Sulawesi/Celebes, Bali, Nusa Tengarra; Timor (west)
++ID	-0232+14042	Asia/Jayapura	New Guinea (West Papua / Irian Jaya); Malukus/Moluccas
+ IE	+5320-00615	Europe/Dublin
+ IL	+314650+0351326	Asia/Jerusalem
+ IM	+5409-00428	Europe/Isle_of_Man
+@@ -234,10 +236,10 @@
+ KR	+3733+12658	Asia/Seoul
+ KW	+2920+04759	Asia/Kuwait
+ KY	+1918-08123	America/Cayman
+-KZ	+4315+07657	Asia/Almaty	most locations
+-KZ	+4448+06528	Asia/Qyzylorda	Qyzylorda (Kyzylorda, Kzyl-Orda)
+-KZ	+5017+05710	Asia/Aqtobe	Aqtobe (Aktobe)
+-KZ	+4431+05016	Asia/Aqtau	Atyrau (Atirau, Gur'yev), Mangghystau (Mankistau)
++KZ	+4315+07657	Asia/Almaty	Kazakhstan (most areas)
++KZ	+4448+06528	Asia/Qyzylorda	Qyzylorda/Kyzylorda/Kzyl-Orda
++KZ	+5017+05710	Asia/Aqtobe	Aqtobe/Aktobe
++KZ	+4431+05016	Asia/Aqtau	Atyrau/Atirau/Gur'yev, Mangghystau/Mankistau
+ KZ	+5113+05121	Asia/Oral	West Kazakhstan
+ LA	+1758+10236	Asia/Vientiane
+ LB	+3353+03530	Asia/Beirut
+@@ -256,12 +258,12 @@
+ ME	+4226+01916	Europe/Podgorica
+ MF	+1804-06305	America/Marigot
+ MG	-1855+04731	Indian/Antananarivo
+-MH	+0709+17112	Pacific/Majuro	most locations
++MH	+0709+17112	Pacific/Majuro	Marshall Islands (most areas)
+ MH	+0905+16720	Pacific/Kwajalein	Kwajalein
+ MK	+4159+02126	Europe/Skopje
+ ML	+1239-00800	Africa/Bamako
+-MM	+1647+09610	Asia/Rangoon
+-MN	+4755+10653	Asia/Ulaanbaatar	most locations
++MM	+1647+09610	Asia/Yangon
++MN	+4755+10653	Asia/Ulaanbaatar	Mongolia (most areas)
+ MN	+4801+09139	Asia/Hovd	Bayan-Olgiy, Govi-Altai, Hovd, Uvs, Zavkhan
+ MN	+4804+11430	Asia/Choibalsan	Dornod, Sukhbaatar
+ MO	+2214+11335	Asia/Macau
+@@ -273,20 +275,19 @@
+ MU	-2010+05730	Indian/Mauritius
+ MV	+0410+07330	Indian/Maldives
+ MW	-1547+03500	Africa/Blantyre
+-MX	+1924-09909	America/Mexico_City	Central Time - most locations
++MX	+1924-09909	America/Mexico_City	Central Time
+ MX	+2105-08646	America/Cancun	Eastern Standard Time - Quintana Roo
+ MX	+2058-08937	America/Merida	Central Time - Campeche, Yucatan
+-MX	+2540-10019	America/Monterrey	Mexican Central Time - Coahuila, Durango, Nuevo Leon, Tamaulipas away from US border
+-MX	+2550-09730	America/Matamoros	US Central Time - Coahuila, Durango, Nuevo Leon, Tamaulipas near US border
+-MX	+2313-10625	America/Mazatlan	Mountain Time - S Baja, Nayarit, Sinaloa
+-MX	+2838-10605	America/Chihuahua	Mexican Mountain Time - Chihuahua away from US border
+-MX	+2934-10425	America/Ojinaga	US Mountain Time - Chihuahua near US border
++MX	+2540-10019	America/Monterrey	Central Time - Durango; Coahuila, Nuevo Leon, Tamaulipas (most areas)
++MX	+2550-09730	America/Matamoros	Central Time US - Coahuila, Nuevo Leon, Tamaulipas (US border)
++MX	+2313-10625	America/Mazatlan	Mountain Time - Baja California Sur, Nayarit, Sinaloa
++MX	+2838-10605	America/Chihuahua	Mountain Time - Chihuahua (most areas)
++MX	+2934-10425	America/Ojinaga	Mountain Time US - Chihuahua (US border)
+ MX	+2904-11058	America/Hermosillo	Mountain Standard Time - Sonora
+-MX	+3232-11701	America/Tijuana	US Pacific Time - Baja California near US border
+-MX	+3018-11452	America/Santa_Isabel	Mexican Pacific Time - Baja California away from US border
+-MX	+2048-10515	America/Bahia_Banderas	Mexican Central Time - Bahia de Banderas
+-MY	+0310+10142	Asia/Kuala_Lumpur	peninsular Malaysia
+-MY	+0133+11020	Asia/Kuching	Sabah & Sarawak
++MX	+3232-11701	America/Tijuana	Pacific Time US - Baja California
++MX	+2048-10515	America/Bahia_Banderas	Central Time - Bahia de Banderas
++MY	+0310+10142	Asia/Kuala_Lumpur	Malaysia (peninsula)
++MY	+0133+11020	Asia/Kuching	Sabah, Sarawak
+ MZ	-2558+03235	Africa/Maputo
+ NA	-2234+01706	Africa/Windhoek
+ NC	-2216+16627	Pacific/Noumea
+@@ -299,7 +300,7 @@
+ NP	+2743+08519	Asia/Kathmandu
+ NR	-0031+16655	Pacific/Nauru
+ NU	-1901-16955	Pacific/Niue
+-NZ	-3652+17446	Pacific/Auckland	most locations
++NZ	-3652+17446	Pacific/Auckland	New Zealand (most areas)
+ NZ	-4357-17633	Pacific/Chatham	Chatham Islands
+ OM	+2336+05835	Asia/Muscat
+ PA	+0858-07932	America/Panama
+@@ -307,7 +308,7 @@
+ PF	-1732-14934	Pacific/Tahiti	Society Islands
+ PF	-0900-13930	Pacific/Marquesas	Marquesas Islands
+ PF	-2308-13457	Pacific/Gambier	Gambier Islands
+-PG	-0930+14710	Pacific/Port_Moresby	most locations
++PG	-0930+14710	Pacific/Port_Moresby	Papua New Guinea (most areas)
+ PG	-0613+15534	Pacific/Bougainville	Bougainville
+ PH	+1435+12100	Asia/Manila
+ PK	+2452+06703	Asia/Karachi
+@@ -317,7 +318,7 @@
+ PR	+182806-0660622	America/Puerto_Rico
+ PS	+3130+03428	Asia/Gaza	Gaza Strip
+ PS	+313200+0350542	Asia/Hebron	West Bank
+-PT	+3843-00908	Europe/Lisbon	mainland
++PT	+3843-00908	Europe/Lisbon	Portugal (mainland)
+ PT	+3238-01654	Atlantic/Madeira	Madeira Islands
+ PT	+3744-02540	Atlantic/Azores	Azores
+ PW	+0720+13429	Pacific/Palau
+@@ -326,27 +327,32 @@
+ RE	-2052+05528	Indian/Reunion
+ RO	+4426+02606	Europe/Bucharest
+ RS	+4450+02030	Europe/Belgrade
+-RU	+5443+02030	Europe/Kaliningrad	Moscow-01 - Kaliningrad
+-RU	+554521+0373704	Europe/Moscow	Moscow+00 - west Russia
+-RU	+4457+03406	Europe/Simferopol	Moscow+00 - Crimea
+-RU	+4844+04425	Europe/Volgograd	Moscow+00 - Caspian Sea
+-RU	+5312+05009	Europe/Samara	Moscow+00 (Moscow+01 after 2014-10-26) - Samara, Udmurtia
+-RU	+5651+06036	Asia/Yekaterinburg	Moscow+02 - Urals
+-RU	+5500+07324	Asia/Omsk	Moscow+03 - west Siberia
+-RU	+5502+08255	Asia/Novosibirsk	Moscow+03 - Novosibirsk
+-RU	+5345+08707	Asia/Novokuznetsk	Moscow+03 (Moscow+04 after 2014-10-26) - Kemerovo
+-RU	+5601+09250	Asia/Krasnoyarsk	Moscow+04 - Yenisei River
+-RU	+5216+10420	Asia/Irkutsk	Moscow+05 - Lake Baikal
+-RU	+5203+11328	Asia/Chita	Moscow+06 (Moscow+05 after 2014-10-26) - Zabaykalsky
+-RU	+6200+12940	Asia/Yakutsk	Moscow+06 - Lena River
+-RU	+623923+1353314	Asia/Khandyga	Moscow+06 - Tomponsky, Ust-Maysky
+-RU	+4310+13156	Asia/Vladivostok	Moscow+07 - Amur River
+-RU	+4658+14242	Asia/Sakhalin	Moscow+07 - Sakhalin Island
+-RU	+643337+1431336	Asia/Ust-Nera	Moscow+07 - Oymyakonsky
+-RU	+5934+15048	Asia/Magadan	Moscow+08 (Moscow+07 after 2014-10-26) - Magadan
+-RU	+6728+15343	Asia/Srednekolymsk	Moscow+08 - E Sakha, N Kuril Is
+-RU	+5301+15839	Asia/Kamchatka	Moscow+08 (Moscow+09 after 2014-10-26) - Kamchatka
+-RU	+6445+17729	Asia/Anadyr	Moscow+08 (Moscow+09 after 2014-10-26) - Bering Sea
++RU	+5443+02030	Europe/Kaliningrad	MSK-01 - Kaliningrad
++RU	+554521+0373704	Europe/Moscow	MSK+00 - Moscow area
++RU	+4457+03406	Europe/Simferopol	MSK+00 - Crimea
++RU	+4844+04425	Europe/Volgograd	MSK+00 - Volgograd, Saratov
++RU	+5836+04939	Europe/Kirov	MSK+00 - Kirov
++RU	+4621+04803	Europe/Astrakhan	MSK+01 - Astrakhan
++RU	+5312+05009	Europe/Samara	MSK+01 - Samara, Udmurtia
++RU	+5420+04824	Europe/Ulyanovsk	MSK+01 - Ulyanovsk
++RU	+5651+06036	Asia/Yekaterinburg	MSK+02 - Urals
++RU	+5500+07324	Asia/Omsk	MSK+03 - Omsk
++RU	+5502+08255	Asia/Novosibirsk	MSK+03 - Novosibirsk
++RU	+5322+08345	Asia/Barnaul	MSK+04 - Altai
++RU	+5630+08458	Asia/Tomsk	MSK+04 - Tomsk
++RU	+5345+08707	Asia/Novokuznetsk	MSK+04 - Kemerovo
++RU	+5601+09250	Asia/Krasnoyarsk	MSK+04 - Krasnoyarsk area
++RU	+5216+10420	Asia/Irkutsk	MSK+05 - Irkutsk, Buryatia
++RU	+5203+11328	Asia/Chita	MSK+06 - Zabaykalsky
++RU	+6200+12940	Asia/Yakutsk	MSK+06 - Lena River
++RU	+623923+1353314	Asia/Khandyga	MSK+06 - Tomponsky, Ust-Maysky
++RU	+4310+13156	Asia/Vladivostok	MSK+07 - Amur River
++RU	+643337+1431336	Asia/Ust-Nera	MSK+07 - Oymyakonsky
++RU	+5934+15048	Asia/Magadan	MSK+08 - Magadan
++RU	+4658+14242	Asia/Sakhalin	MSK+08 - Sakhalin Island
++RU	+6728+15343	Asia/Srednekolymsk	MSK+08 - Sakha (E); North Kuril Is
++RU	+5301+15839	Asia/Kamchatka	MSK+09 - Kamchatka
++RU	+6445+17729	Asia/Anadyr	MSK+09 - Bering Sea
+ RW	-0157+03004	Africa/Kigali
+ SA	+2438+04643	Asia/Riyadh
+ SB	-0932+16012	Pacific/Guadalcanal
+@@ -385,45 +391,45 @@
+ TV	-0831+17913	Pacific/Funafuti
+ TW	+2503+12130	Asia/Taipei
+ TZ	-0648+03917	Africa/Dar_es_Salaam
+-UA	+5026+03031	Europe/Kiev	most locations
++UA	+5026+03031	Europe/Kiev	Ukraine (most areas)
+ UA	+4837+02218	Europe/Uzhgorod	Ruthenia
+-UA	+4750+03510	Europe/Zaporozhye	Zaporozh'ye, E Lugansk / Zaporizhia, E Luhansk
++UA	+4750+03510	Europe/Zaporozhye	Zaporozh'ye/Zaporizhia; Lugansk/Luhansk (east)
+ UG	+0019+03225	Africa/Kampala
+ UM	+1645-16931	Pacific/Johnston	Johnston Atoll
+ UM	+2813-17722	Pacific/Midway	Midway Islands
+ UM	+1917+16637	Pacific/Wake	Wake Island
+-US	+404251-0740023	America/New_York	Eastern Time
+-US	+421953-0830245	America/Detroit	Eastern Time - Michigan - most locations
+-US	+381515-0854534	America/Kentucky/Louisville	Eastern Time - Kentucky - Louisville area
+-US	+364947-0845057	America/Kentucky/Monticello	Eastern Time - Kentucky - Wayne County
+-US	+394606-0860929	America/Indiana/Indianapolis	Eastern Time - Indiana - most locations
+-US	+384038-0873143	America/Indiana/Vincennes	Eastern Time - Indiana - Daviess, Dubois, Knox & Martin Counties
+-US	+410305-0863611	America/Indiana/Winamac	Eastern Time - Indiana - Pulaski County
+-US	+382232-0862041	America/Indiana/Marengo	Eastern Time - Indiana - Crawford County
+-US	+382931-0871643	America/Indiana/Petersburg	Eastern Time - Indiana - Pike County
+-US	+384452-0850402	America/Indiana/Vevay	Eastern Time - Indiana - Switzerland County
+-US	+415100-0873900	America/Chicago	Central Time
+-US	+375711-0864541	America/Indiana/Tell_City	Central Time - Indiana - Perry County
+-US	+411745-0863730	America/Indiana/Knox	Central Time - Indiana - Starke County
+-US	+450628-0873651	America/Menominee	Central Time - Michigan - Dickinson, Gogebic, Iron & Menominee Counties
+-US	+470659-1011757	America/North_Dakota/Center	Central Time - North Dakota - Oliver County
+-US	+465042-1012439	America/North_Dakota/New_Salem	Central Time - North Dakota - Morton County (except Mandan area)
+-US	+471551-1014640	America/North_Dakota/Beulah	Central Time - North Dakota - Mercer County
+-US	+394421-1045903	America/Denver	Mountain Time
+-US	+433649-1161209	America/Boise	Mountain Time - south Idaho & east Oregon
+-US	+332654-1120424	America/Phoenix	Mountain Standard Time - Arizona (except Navajo)
+-US	+340308-1181434	America/Los_Angeles	Pacific Time
+-US	+550737-1313435	America/Metlakatla	Pacific Standard Time - Annette Island, Alaska
+-US	+611305-1495401	America/Anchorage	Alaska Time
+-US	+581807-1342511	America/Juneau	Alaska Time - Alaska panhandle
+-US	+571035-1351807	America/Sitka	Alaska Time - southeast Alaska panhandle
+-US	+593249-1394338	America/Yakutat	Alaska Time - Alaska panhandle neck
+-US	+643004-1652423	America/Nome	Alaska Time - west Alaska
++US	+404251-0740023	America/New_York	Eastern (most areas)
++US	+421953-0830245	America/Detroit	Eastern - MI (most areas)
++US	+381515-0854534	America/Kentucky/Louisville	Eastern - KY (Louisville area)
++US	+364947-0845057	America/Kentucky/Monticello	Eastern - KY (Wayne)
++US	+394606-0860929	America/Indiana/Indianapolis	Eastern - IN (most areas)
++US	+384038-0873143	America/Indiana/Vincennes	Eastern - IN (Da, Du, K, Mn)
++US	+410305-0863611	America/Indiana/Winamac	Eastern - IN (Pulaski)
++US	+382232-0862041	America/Indiana/Marengo	Eastern - IN (Crawford)
++US	+382931-0871643	America/Indiana/Petersburg	Eastern - IN (Pike)
++US	+384452-0850402	America/Indiana/Vevay	Eastern - IN (Switzerland)
++US	+415100-0873900	America/Chicago	Central (most areas)
++US	+375711-0864541	America/Indiana/Tell_City	Central - IN (Perry)
++US	+411745-0863730	America/Indiana/Knox	Central - IN (Starke)
++US	+450628-0873651	America/Menominee	Central - MI (Wisconsin border)
++US	+470659-1011757	America/North_Dakota/Center	Central - ND (Oliver)
++US	+465042-1012439	America/North_Dakota/New_Salem	Central - ND (Morton rural)
++US	+471551-1014640	America/North_Dakota/Beulah	Central - ND (Mercer)
++US	+394421-1045903	America/Denver	Mountain (most areas)
++US	+433649-1161209	America/Boise	Mountain - ID (south); OR (east)
++US	+332654-1120424	America/Phoenix	MST - Arizona (except Navajo)
++US	+340308-1181434	America/Los_Angeles	Pacific
++US	+611305-1495401	America/Anchorage	Alaska (most areas)
++US	+581807-1342511	America/Juneau	Alaska - Juneau area
++US	+571035-1351807	America/Sitka	Alaska - Sitka area
++US	+550737-1313435	America/Metlakatla	Alaska - Annette Island
++US	+593249-1394338	America/Yakutat	Alaska - Yakutat
++US	+643004-1652423	America/Nome	Alaska (west)
+ US	+515248-1763929	America/Adak	Aleutian Islands
+ US	+211825-1575130	Pacific/Honolulu	Hawaii
+ UY	-3453-05611	America/Montevideo
+-UZ	+3940+06648	Asia/Samarkand	west Uzbekistan
+-UZ	+4120+06918	Asia/Tashkent	east Uzbekistan
++UZ	+3940+06648	Asia/Samarkand	Uzbekistan (west)
++UZ	+4120+06918	Asia/Tashkent	Uzbekistan (east)
+ VA	+415408+0122711	Europe/Vatican
+ VC	+1309-06114	America/St_Vincent
+ VE	+1030-06656	America/Caracas
+--- contrib/tzdata/zone1970.tab.orig
++++ contrib/tzdata/zone1970.tab
+@@ -39,21 +39,21 @@
+ AF	+3431+06912	Asia/Kabul
+ AL	+4120+01950	Europe/Tirane
+ AM	+4011+04430	Asia/Yerevan
+-AQ	-6734-06808	Antarctica/Rothera	Rothera Station, Adelaide Island
+-AQ	-6448-06406	Antarctica/Palmer	Palmer Station, Anvers Island
+-AQ	-6736+06253	Antarctica/Mawson	Mawson Station, Holme Bay
+-AQ	-6835+07758	Antarctica/Davis	Davis Station, Vestfold Hills
+-AQ	-6617+11031	Antarctica/Casey	Casey Station, Bailey Peninsula
+-AQ	-7824+10654	Antarctica/Vostok	Vostok Station, Lake Vostok
+-AQ	-6640+14001	Antarctica/DumontDUrville	Dumont-d'Urville Station, Adélie Land
+-AQ	-690022+0393524	Antarctica/Syowa	Syowa Station, E Ongul I
+-AQ	-720041+0023206	Antarctica/Troll	Troll Station, Queen Maud Land
++AQ	-6617+11031	Antarctica/Casey	Casey
++AQ	-6835+07758	Antarctica/Davis	Davis
++AQ	-6640+14001	Antarctica/DumontDUrville	Dumont-d'Urville
++AQ	-6736+06253	Antarctica/Mawson	Mawson
++AQ	-6448-06406	Antarctica/Palmer	Palmer
++AQ	-6734-06808	Antarctica/Rothera	Rothera
++AQ	-690022+0393524	Antarctica/Syowa	Syowa
++AQ	-720041+0023206	Antarctica/Troll	Troll
++AQ	-7824+10654	Antarctica/Vostok	Vostok
+ AR	-3436-05827	America/Argentina/Buenos_Aires	Buenos Aires (BA, CF)
+-AR	-3124-06411	America/Argentina/Cordoba	most locations (CB, CC, CN, ER, FM, MN, SE, SF)
+-AR	-2447-06525	America/Argentina/Salta	(SA, LP, NQ, RN)
++AR	-3124-06411	America/Argentina/Cordoba	Argentina (most areas: CB, CC, CN, ER, FM, MN, SE, SF)
++AR	-2447-06525	America/Argentina/Salta	Salta (SA, LP, NQ, RN)
+ AR	-2411-06518	America/Argentina/Jujuy	Jujuy (JY)
+ AR	-2649-06513	America/Argentina/Tucuman	Tucumán (TM)
+-AR	-2828-06547	America/Argentina/Catamarca	Catamarca (CT), Chubut (CH)
++AR	-2828-06547	America/Argentina/Catamarca	Catamarca (CT); Chubut (CH)
+ AR	-2926-06651	America/Argentina/La_Rioja	La Rioja (LR)
+ AR	-3132-06831	America/Argentina/San_Juan	San Juan (SJ)
+ AR	-3253-06849	America/Argentina/Mendoza	Mendoza (MZ)
+@@ -64,17 +64,17 @@
+ AT	+4813+01620	Europe/Vienna
+ AU	-3133+15905	Australia/Lord_Howe	Lord Howe Island
+ AU	-5430+15857	Antarctica/Macquarie	Macquarie Island
+-AU	-4253+14719	Australia/Hobart	Tasmania - most locations
+-AU	-3956+14352	Australia/Currie	Tasmania - King Island
++AU	-4253+14719	Australia/Hobart	Tasmania (most areas)
++AU	-3956+14352	Australia/Currie	Tasmania (King Island)
+ AU	-3749+14458	Australia/Melbourne	Victoria
+-AU	-3352+15113	Australia/Sydney	New South Wales - most locations
+-AU	-3157+14127	Australia/Broken_Hill	New South Wales - Yancowinna
+-AU	-2728+15302	Australia/Brisbane	Queensland - most locations
+-AU	-2016+14900	Australia/Lindeman	Queensland - Holiday Islands
++AU	-3352+15113	Australia/Sydney	New South Wales (most areas)
++AU	-3157+14127	Australia/Broken_Hill	New South Wales (Yancowinna)
++AU	-2728+15302	Australia/Brisbane	Queensland (most areas)
++AU	-2016+14900	Australia/Lindeman	Queensland (Whitsunday Islands)
+ AU	-3455+13835	Australia/Adelaide	South Australia
+ AU	-1228+13050	Australia/Darwin	Northern Territory
+-AU	-3157+11551	Australia/Perth	Western Australia - most locations
+-AU	-3143+12852	Australia/Eucla	Western Australia - Eucla area
++AU	-3157+11551	Australia/Perth	Western Australia (most areas)
++AU	-3143+12852	Australia/Eucla	Western Australia (Eucla)
+ AZ	+4023+04951	Asia/Baku
+ BB	+1306-05937	America/Barbados
+ BD	+2343+09025	Asia/Dhaka
+@@ -84,57 +84,58 @@
+ BN	+0456+11455	Asia/Brunei
+ BO	-1630-06809	America/La_Paz
+ BR	-0351-03225	America/Noronha	Atlantic islands
+-BR	-0127-04829	America/Belem	Amapá, E Pará
+-BR	-0343-03830	America/Fortaleza	NE Brazil (MA, PI, CE, RN, PB)
++BR	-0127-04829	America/Belem	Pará (east); Amapá
++BR	-0343-03830	America/Fortaleza	Brazil (northeast: MA, PI, CE, RN, PB)
+ BR	-0803-03454	America/Recife	Pernambuco
+ BR	-0712-04812	America/Araguaina	Tocantins
+ BR	-0940-03543	America/Maceio	Alagoas, Sergipe
+ BR	-1259-03831	America/Bahia	Bahia
+-BR	-2332-04637	America/Sao_Paulo	S & SE Brazil (GO, DF, MG, ES, RJ, SP, PR, SC, RS)
++BR	-2332-04637	America/Sao_Paulo	Brazil (southeast: GO, DF, MG, ES, RJ, SP, PR, SC, RS)
+ BR	-2027-05437	America/Campo_Grande	Mato Grosso do Sul
+ BR	-1535-05605	America/Cuiaba	Mato Grosso
+-BR	-0226-05452	America/Santarem	W Pará
++BR	-0226-05452	America/Santarem	Pará (west)
+ BR	-0846-06354	America/Porto_Velho	Rondônia
+ BR	+0249-06040	America/Boa_Vista	Roraima
+-BR	-0308-06001	America/Manaus	E Amazonas
+-BR	-0640-06952	America/Eirunepe	W Amazonas
++BR	-0308-06001	America/Manaus	Amazonas (east)
++BR	-0640-06952	America/Eirunepe	Amazonas (west)
+ BR	-0958-06748	America/Rio_Branco	Acre
+ BS	+2505-07721	America/Nassau
+ BT	+2728+08939	Asia/Thimphu
+ BY	+5354+02734	Europe/Minsk
+ BZ	+1730-08812	America/Belize
+-CA	+4734-05243	America/St_Johns	Newfoundland Time, including SE Labrador
+-CA	+4439-06336	America/Halifax	Atlantic Time - Nova Scotia (most places), PEI
+-CA	+4612-05957	America/Glace_Bay	Atlantic Time - Nova Scotia - places that did not observe DST 1966-1971
+-CA	+4606-06447	America/Moncton	Atlantic Time - New Brunswick
+-CA	+5320-06025	America/Goose_Bay	Atlantic Time - Labrador - most locations
+-CA	+5125-05707	America/Blanc-Sablon	Atlantic Standard Time - Quebec - Lower North Shore
+-CA	+4339-07923	America/Toronto	Eastern Time - Ontario & Quebec - most locations
+-CA	+4901-08816	America/Nipigon	Eastern Time - Ontario & Quebec - places that did not observe DST 1967-1973
+-CA	+4823-08915	America/Thunder_Bay	Eastern Time - Thunder Bay, Ontario
+-CA	+6344-06828	America/Iqaluit	Eastern Time - east Nunavut - most locations
+-CA	+6608-06544	America/Pangnirtung	Eastern Time - Pangnirtung, Nunavut
+-CA	+744144-0944945	America/Resolute	Central Time - Resolute, Nunavut
+-CA	+484531-0913718	America/Atikokan	Eastern Standard Time - Atikokan, Ontario and Southampton I, Nunavut
+-CA	+624900-0920459	America/Rankin_Inlet	Central Time - central Nunavut
+-CA	+4953-09709	America/Winnipeg	Central Time - Manitoba & west Ontario
+-CA	+4843-09434	America/Rainy_River	Central Time - Rainy River & Fort Frances, Ontario
+-CA	+5024-10439	America/Regina	Central Standard Time - Saskatchewan - most locations
+-CA	+5017-10750	America/Swift_Current	Central Standard Time - Saskatchewan - midwest
+-CA	+5333-11328	America/Edmonton	Mountain Time - Alberta, east British Columbia & west Saskatchewan
+-CA	+690650-1050310	America/Cambridge_Bay	Mountain Time - west Nunavut
+-CA	+6227-11421	America/Yellowknife	Mountain Time - central Northwest Territories
+-CA	+682059-1334300	America/Inuvik	Mountain Time - west Northwest Territories
+-CA	+4906-11631	America/Creston	Mountain Standard Time - Creston, British Columbia
+-CA	+5946-12014	America/Dawson_Creek	Mountain Standard Time - Dawson Creek & Fort Saint John, British Columbia
+-CA	+4916-12307	America/Vancouver	Pacific Time - west British Columbia
+-CA	+6043-13503	America/Whitehorse	Pacific Time - south Yukon
+-CA	+6404-13925	America/Dawson	Pacific Time - north Yukon
++CA	+4734-05243	America/St_Johns	Newfoundland; Labrador (southeast)
++CA	+4439-06336	America/Halifax	Atlantic - NS (most areas); PE
++CA	+4612-05957	America/Glace_Bay	Atlantic - NS (Cape Breton)
++CA	+4606-06447	America/Moncton	Atlantic - New Brunswick
++CA	+5320-06025	America/Goose_Bay	Atlantic - Labrador (most areas)
++CA	+5125-05707	America/Blanc-Sablon	AST - QC (Lower North Shore)
++CA	+4339-07923	America/Toronto	Eastern - ON, QC (most areas)
++CA	+4901-08816	America/Nipigon	Eastern - ON, QC (no DST 1967-73)
++CA	+4823-08915	America/Thunder_Bay	Eastern - ON (Thunder Bay)
++CA	+6344-06828	America/Iqaluit	Eastern - NU (most east areas)
++CA	+6608-06544	America/Pangnirtung	Eastern - NU (Pangnirtung)
++CA	+484531-0913718	America/Atikokan	EST - ON (Atikokan); NU (Coral H)
++CA	+4953-09709	America/Winnipeg	Central - ON (west); Manitoba
++CA	+4843-09434	America/Rainy_River	Central - ON (Rainy R, Ft Frances)
++CA	+744144-0944945	America/Resolute	Central - NU (Resolute)
++CA	+624900-0920459	America/Rankin_Inlet	Central - NU (central)
++CA	+5024-10439	America/Regina	CST - SK (most areas)
++CA	+5017-10750	America/Swift_Current	CST - SK (midwest)
++CA	+5333-11328	America/Edmonton	Mountain - AB; BC (E); SK (W)
++CA	+690650-1050310	America/Cambridge_Bay	Mountain - NU (west)
++CA	+6227-11421	America/Yellowknife	Mountain - NT (central)
++CA	+682059-1334300	America/Inuvik	Mountain - NT (west)
++CA	+4906-11631	America/Creston	MST - BC (Creston)
++CA	+5946-12014	America/Dawson_Creek	MST - BC (Dawson Cr, Ft St John)
++CA	+5848-12242	America/Fort_Nelson	MST - BC (Ft Nelson)
++CA	+4916-12307	America/Vancouver	Pacific - BC (most areas)
++CA	+6043-13503	America/Whitehorse	Pacific - Yukon (south)
++CA	+6404-13925	America/Dawson	Pacific - Yukon (north)
+ CC	-1210+09655	Indian/Cocos
+ CH,DE,LI	+4723+00832	Europe/Zurich	Swiss time
+ CI,BF,GM,GN,ML,MR,SH,SL,SN,ST,TG	+0519-00402	Africa/Abidjan
+ CK	-2114-15946	Pacific/Rarotonga
+-CL	-3327-07040	America/Santiago	most locations
++CL	-3327-07040	America/Santiago	Chile (most areas)
+ CL	-2709-10926	Pacific/Easter	Easter Island
+ CN	+3114+12128	Asia/Shanghai	Beijing Time
+ CN	+4348+08735	Asia/Urumqi	Xinjiang Time
+@@ -144,25 +145,26 @@
+ CV	+1455-02331	Atlantic/Cape_Verde
+ CW,AW,BQ,SX	+1211-06900	America/Curacao
+ CX	-1025+10543	Indian/Christmas
+-CY	+3510+03322	Asia/Nicosia
++CY	+3510+03322	Asia/Nicosia	Cyprus (most areas)
++CY	+3507+03357	Asia/Famagusta	Northern Cyprus
+ CZ,SK	+5005+01426	Europe/Prague
+-DE	+5230+01322	Europe/Berlin	Berlin time
++DE	+5230+01322	Europe/Berlin	Germany (most areas)
+ DK	+5540+01235	Europe/Copenhagen
+ DO	+1828-06954	America/Santo_Domingo
+ DZ	+3647+00303	Africa/Algiers
+-EC	-0210-07950	America/Guayaquil	mainland
++EC	-0210-07950	America/Guayaquil	Ecuador (mainland)
+ EC	-0054-08936	Pacific/Galapagos	Galápagos Islands
+ EE	+5925+02445	Europe/Tallinn
+ EG	+3003+03115	Africa/Cairo
+ EH	+2709-01312	Africa/El_Aaiun
+-ES	+4024-00341	Europe/Madrid	mainland
+-ES	+3553-00519	Africa/Ceuta	Ceuta & Melilla
++ES	+4024-00341	Europe/Madrid	Spain (mainland)
++ES	+3553-00519	Africa/Ceuta	Ceuta, Melilla
+ ES	+2806-01524	Atlantic/Canary	Canary Islands
+ FI,AX	+6010+02458	Europe/Helsinki
+ FJ	-1808+17825	Pacific/Fiji
+ FK	-5142-05751	Atlantic/Stanley
+-FM	+0725+15147	Pacific/Chuuk	Chuuk (Truk) and Yap
+-FM	+0658+15813	Pacific/Pohnpei	Pohnpei (Ponape)
++FM	+0725+15147	Pacific/Chuuk	Chuuk/Truk, Yap
++FM	+0658+15813	Pacific/Pohnpei	Pohnpei/Ponape
+ FM	+0519+16259	Pacific/Kosrae	Kosrae
+ FO	+6201-00646	Atlantic/Faroe
+ FR	+4852+00220	Europe/Paris
+@@ -171,10 +173,10 @@
+ GF	+0456-05220	America/Cayenne
+ GH	+0533-00013	Africa/Accra
+ GI	+3608-00521	Europe/Gibraltar
+-GL	+6411-05144	America/Godthab	most locations
+-GL	+7646-01840	America/Danmarkshavn	east coast, north of Scoresbysund
+-GL	+7029-02158	America/Scoresbysund	Scoresbysund / Ittoqqortoormiit
+-GL	+7634-06847	America/Thule	Thule / Pituffik
++GL	+6411-05144	America/Godthab	Greenland (most areas)
++GL	+7646-01840	America/Danmarkshavn	National Park (east coast)
++GL	+7029-02158	America/Scoresbysund	Scoresbysund/Ittoqqortoormiit
++GL	+7634-06847	America/Thule	Thule/Pituffik
+ GR	+3758+02343	Europe/Athens
+ GS	-5416-03632	Atlantic/South_Georgia
+ GT	+1438-09031	America/Guatemala
+@@ -185,10 +187,10 @@
+ HN	+1406-08713	America/Tegucigalpa
+ HT	+1832-07220	America/Port-au-Prince
+ HU	+4730+01905	Europe/Budapest
+-ID	-0610+10648	Asia/Jakarta	Java & Sumatra
+-ID	-0002+10920	Asia/Pontianak	west & central Borneo
+-ID	-0507+11924	Asia/Makassar	east & south Borneo, Sulawesi (Celebes), Bali, Nusa Tengarra, west Timor
+-ID	-0232+14042	Asia/Jayapura	west New Guinea (Irian Jaya) & Malukus (Moluccas)
++ID	-0610+10648	Asia/Jakarta	Java, Sumatra
++ID	-0002+10920	Asia/Pontianak	Borneo (west, central)
++ID	-0507+11924	Asia/Makassar	Borneo (east, south); Sulawesi/Celebes, Bali, Nusa Tengarra; Timor (west)
++ID	-0232+14042	Asia/Jayapura	New Guinea (West Papua / Irian Jaya); Malukus/Moluccas
+ IE	+5320-00615	Europe/Dublin
+ IL	+314650+0351326	Asia/Jerusalem
+ IN	+2232+08822	Asia/Kolkata
+@@ -207,11 +209,10 @@
+ KI	+0152-15720	Pacific/Kiritimati	Line Islands
+ KP	+3901+12545	Asia/Pyongyang
+ KR	+3733+12658	Asia/Seoul
+-KY	+1918-08123	America/Cayman
+-KZ	+4315+07657	Asia/Almaty	most locations
+-KZ	+4448+06528	Asia/Qyzylorda	Qyzylorda (Kyzylorda, Kzyl-Orda)
+-KZ	+5017+05710	Asia/Aqtobe	Aqtobe (Aktobe)
+-KZ	+4431+05016	Asia/Aqtau	Atyrau (Atirau, Gur'yev), Mangghystau (Mankistau)
++KZ	+4315+07657	Asia/Almaty	Kazakhstan (most areas)
++KZ	+4448+06528	Asia/Qyzylorda	Qyzylorda/Kyzylorda/Kzyl-Orda
++KZ	+5017+05710	Asia/Aqtobe	Aqtobe/Aktobe
++KZ	+4431+05016	Asia/Aqtau	Atyrau/Atirau/Gur'yev, Mangghystau/Mankistau
+ KZ	+5113+05121	Asia/Oral	West Kazakhstan
+ LB	+3353+03530	Asia/Beirut
+ LK	+0656+07951	Asia/Colombo
+@@ -223,10 +224,10 @@
+ MA	+3339-00735	Africa/Casablanca
+ MC	+4342+00723	Europe/Monaco
+ MD	+4700+02850	Europe/Chisinau
+-MH	+0709+17112	Pacific/Majuro	most locations
++MH	+0709+17112	Pacific/Majuro	Marshall Islands (most areas)
+ MH	+0905+16720	Pacific/Kwajalein	Kwajalein
+-MM	+1647+09610	Asia/Rangoon
+-MN	+4755+10653	Asia/Ulaanbaatar	most locations
++MM	+1647+09610	Asia/Yangon
++MN	+4755+10653	Asia/Ulaanbaatar	Mongolia (most areas)
+ MN	+4801+09139	Asia/Hovd	Bayan-Ölgii, Govi-Altai, Hovd, Uvs, Zavkhan
+ MN	+4804+11430	Asia/Choibalsan	Dornod, Sükhbaatar
+ MO	+2214+11335	Asia/Macau
+@@ -234,25 +235,24 @@
+ MT	+3554+01431	Europe/Malta
+ MU	-2010+05730	Indian/Mauritius
+ MV	+0410+07330	Indian/Maldives
+-MX	+1924-09909	America/Mexico_City	Central Time - most locations
++MX	+1924-09909	America/Mexico_City	Central Time
+ MX	+2105-08646	America/Cancun	Eastern Standard Time - Quintana Roo
+ MX	+2058-08937	America/Merida	Central Time - Campeche, Yucatán
+-MX	+2540-10019	America/Monterrey	Mexican Central Time - Coahuila, Durango, Nuevo León, Tamaulipas away from US border
+-MX	+2550-09730	America/Matamoros	US Central Time - Coahuila, Durango, Nuevo León, Tamaulipas near US border
+-MX	+2313-10625	America/Mazatlan	Mountain Time - S Baja, Nayarit, Sinaloa
+-MX	+2838-10605	America/Chihuahua	Mexican Mountain Time - Chihuahua away from US border
+-MX	+2934-10425	America/Ojinaga	US Mountain Time - Chihuahua near US border
++MX	+2540-10019	America/Monterrey	Central Time - Durango; Coahuila, Nuevo León, Tamaulipas (most areas)
++MX	+2550-09730	America/Matamoros	Central Time US - Coahuila, Nuevo León, Tamaulipas (US border)
++MX	+2313-10625	America/Mazatlan	Mountain Time - Baja California Sur, Nayarit, Sinaloa
++MX	+2838-10605	America/Chihuahua	Mountain Time - Chihuahua (most areas)
++MX	+2934-10425	America/Ojinaga	Mountain Time US - Chihuahua (US border)
+ MX	+2904-11058	America/Hermosillo	Mountain Standard Time - Sonora
+-MX	+3232-11701	America/Tijuana	US Pacific Time - Baja California near US border
+-MX	+3018-11452	America/Santa_Isabel	Mexican Pacific Time - Baja California away from US border
+-MX	+2048-10515	America/Bahia_Banderas	Mexican Central Time - Bahía de Banderas
+-MY	+0310+10142	Asia/Kuala_Lumpur	peninsular Malaysia
+-MY	+0133+11020	Asia/Kuching	Sabah & Sarawak
+-MZ,BI,BW,CD,MW,RW,ZM,ZW	-2558+03235	Africa/Maputo	Central Africa Time (UTC+2)
++MX	+3232-11701	America/Tijuana	Pacific Time US - Baja California
++MX	+2048-10515	America/Bahia_Banderas	Central Time - Bahía de Banderas
++MY	+0310+10142	Asia/Kuala_Lumpur	Malaysia (peninsula)
++MY	+0133+11020	Asia/Kuching	Sabah, Sarawak
++MZ,BI,BW,CD,MW,RW,ZM,ZW	-2558+03235	Africa/Maputo	Central Africa Time
+ NA	-2234+01706	Africa/Windhoek
+ NC	-2216+16627	Pacific/Noumea
+ NF	-2903+16758	Pacific/Norfolk
+-NG,AO,BJ,CD,CF,CG,CM,GA,GQ,NE	+0627+00324	Africa/Lagos	West Africa Time (UTC+1)
++NG,AO,BJ,CD,CF,CG,CM,GA,GQ,NE	+0627+00324	Africa/Lagos	West Africa Time
+ NI	+1209-08617	America/Managua
+ NL	+5222+00454	Europe/Amsterdam
+ NO,SJ	+5955+01045	Europe/Oslo
+@@ -261,12 +261,12 @@
+ NU	-1901-16955	Pacific/Niue
+ NZ,AQ	-3652+17446	Pacific/Auckland	New Zealand time
+ NZ	-4357-17633	Pacific/Chatham	Chatham Islands
+-PA	+0858-07932	America/Panama
++PA,KY	+0858-07932	America/Panama
+ PE	-1203-07703	America/Lima
+ PF	-1732-14934	Pacific/Tahiti	Society Islands
+ PF	-0900-13930	Pacific/Marquesas	Marquesas Islands
+ PF	-2308-13457	Pacific/Gambier	Gambier Islands
+-PG	-0930+14710	Pacific/Port_Moresby	most locations
++PG	-0930+14710	Pacific/Port_Moresby	Papua New Guinea (most areas)
+ PG	-0613+15534	Pacific/Bougainville	Bougainville
+ PH	+1435+12100	Asia/Manila
+ PK	+2452+06703	Asia/Karachi
+@@ -276,36 +276,41 @@
+ PR	+182806-0660622	America/Puerto_Rico
+ PS	+3130+03428	Asia/Gaza	Gaza Strip
+ PS	+313200+0350542	Asia/Hebron	West Bank
+-PT	+3843-00908	Europe/Lisbon	mainland
++PT	+3843-00908	Europe/Lisbon	Portugal (mainland)
+ PT	+3238-01654	Atlantic/Madeira	Madeira Islands
+ PT	+3744-02540	Atlantic/Azores	Azores
+ PW	+0720+13429	Pacific/Palau
+ PY	-2516-05740	America/Asuncion
+ QA,BH	+2517+05132	Asia/Qatar
+-RE,TF	-2052+05528	Indian/Reunion	Réunion, Crozet Is, Scattered Is
++RE,TF	-2052+05528	Indian/Reunion	Réunion, Crozet, Scattered Islands
+ RO	+4426+02606	Europe/Bucharest
+ RS,BA,HR,ME,MK,SI	+4450+02030	Europe/Belgrade
+-RU	+5443+02030	Europe/Kaliningrad	Moscow-01 - Kaliningrad
+-RU	+554521+0373704	Europe/Moscow	Moscow+00 - west Russia
+-RU	+4457+03406	Europe/Simferopol	Moscow+00 - Crimea
+-RU	+4844+04425	Europe/Volgograd	Moscow+00 - Caspian Sea
+-RU	+5312+05009	Europe/Samara	Moscow+00 (Moscow+01 after 2014-10-26) - Samara, Udmurtia
+-RU	+5651+06036	Asia/Yekaterinburg	Moscow+02 - Urals
+-RU	+5500+07324	Asia/Omsk	Moscow+03 - west Siberia
+-RU	+5502+08255	Asia/Novosibirsk	Moscow+03 - Novosibirsk
+-RU	+5345+08707	Asia/Novokuznetsk	Moscow+03 (Moscow+04 after 2014-10-26) - Kemerovo
+-RU	+5601+09250	Asia/Krasnoyarsk	Moscow+04 - Yenisei River
+-RU	+5216+10420	Asia/Irkutsk	Moscow+05 - Lake Baikal
+-RU	+5203+11328	Asia/Chita	Moscow+06 (Moscow+05 after 2014-10-26) - Zabaykalsky
+-RU	+6200+12940	Asia/Yakutsk	Moscow+06 - Lena River
+-RU	+623923+1353314	Asia/Khandyga	Moscow+06 - Tomponsky, Ust-Maysky
+-RU	+4310+13156	Asia/Vladivostok	Moscow+07 - Amur River
+-RU	+4658+14242	Asia/Sakhalin	Moscow+07 - Sakhalin Island
+-RU	+643337+1431336	Asia/Ust-Nera	Moscow+07 - Oymyakonsky
+-RU	+5934+15048	Asia/Magadan	Moscow+08 (Moscow+07 after 2014-10-26) - Magadan
+-RU	+6728+15343	Asia/Srednekolymsk	Moscow+08 - E Sakha, N Kuril Is
+-RU	+5301+15839	Asia/Kamchatka	Moscow+08 (Moscow+09 after 2014-10-26) - Kamchatka
+-RU	+6445+17729	Asia/Anadyr	Moscow+08 (Moscow+09 after 2014-10-26) - Bering Sea
++RU	+5443+02030	Europe/Kaliningrad	MSK-01 - Kaliningrad
++RU	+554521+0373704	Europe/Moscow	MSK+00 - Moscow area
++RU	+4457+03406	Europe/Simferopol	MSK+00 - Crimea
++RU	+4844+04425	Europe/Volgograd	MSK+00 - Volgograd, Saratov
++RU	+5836+04939	Europe/Kirov	MSK+00 - Kirov
++RU	+4621+04803	Europe/Astrakhan	MSK+01 - Astrakhan
++RU	+5312+05009	Europe/Samara	MSK+01 - Samara, Udmurtia
++RU	+5420+04824	Europe/Ulyanovsk	MSK+01 - Ulyanovsk
++RU	+5651+06036	Asia/Yekaterinburg	MSK+02 - Urals
++RU	+5500+07324	Asia/Omsk	MSK+03 - Omsk
++RU	+5502+08255	Asia/Novosibirsk	MSK+03 - Novosibirsk
++RU	+5322+08345	Asia/Barnaul	MSK+04 - Altai
++RU	+5630+08458	Asia/Tomsk	MSK+04 - Tomsk
++RU	+5345+08707	Asia/Novokuznetsk	MSK+04 - Kemerovo
++RU	+5601+09250	Asia/Krasnoyarsk	MSK+04 - Krasnoyarsk area
++RU	+5216+10420	Asia/Irkutsk	MSK+05 - Irkutsk, Buryatia
++RU	+5203+11328	Asia/Chita	MSK+06 - Zabaykalsky
++RU	+6200+12940	Asia/Yakutsk	MSK+06 - Lena River
++RU	+623923+1353314	Asia/Khandyga	MSK+06 - Tomponsky, Ust-Maysky
++RU	+4310+13156	Asia/Vladivostok	MSK+07 - Amur River
++RU	+643337+1431336	Asia/Ust-Nera	MSK+07 - Oymyakonsky
++RU	+5934+15048	Asia/Magadan	MSK+08 - Magadan
++RU	+4658+14242	Asia/Sakhalin	MSK+08 - Sakhalin Island
++RU	+6728+15343	Asia/Srednekolymsk	MSK+08 - Sakha (E); North Kuril Is
++RU	+5301+15839	Asia/Kamchatka	MSK+09 - Kamchatka
++RU	+6445+17729	Asia/Anadyr	MSK+09 - Bering Sea
+ SA,KW,YE	+2438+04643	Asia/Riyadh
+ SB	-0932+16012	Pacific/Guadalcanal
+ SC	-0440+05528	Indian/Mahe
+@@ -317,8 +322,8 @@
+ SY	+3330+03618	Asia/Damascus
+ TC	+2128-07108	America/Grand_Turk
+ TD	+1207+01503	Africa/Ndjamena
+-TF	-492110+0701303	Indian/Kerguelen	Kerguelen, St Paul I, Amsterdam I
+-TH,KH,LA,VN	+1345+10031	Asia/Bangkok	most of Indochina
++TF	-492110+0701303	Indian/Kerguelen	Kerguelen, St Paul Island, Amsterdam Island
++TH,KH,LA,VN	+1345+10031	Asia/Bangkok	Indochina (most areas)
+ TJ	+3835+06848	Asia/Dushanbe
+ TK	-0922-17114	Pacific/Fakaofo
+ TL	-0833+12535	Asia/Dili
+@@ -329,44 +334,44 @@
+ TT,AG,AI,BL,DM,GD,GP,KN,LC,MF,MS,VC,VG,VI	+1039-06131	America/Port_of_Spain
+ TV	-0831+17913	Pacific/Funafuti
+ TW	+2503+12130	Asia/Taipei
+-UA	+5026+03031	Europe/Kiev	most locations
++UA	+5026+03031	Europe/Kiev	Ukraine (most areas)
+ UA	+4837+02218	Europe/Uzhgorod	Ruthenia
+-UA	+4750+03510	Europe/Zaporozhye	Zaporozh'ye, E Lugansk / Zaporizhia, E Luhansk
++UA	+4750+03510	Europe/Zaporozhye	Zaporozh'ye/Zaporizhia; Lugansk/Luhansk (east)
+ UM	+1917+16637	Pacific/Wake	Wake Island
+-US	+404251-0740023	America/New_York	Eastern Time
+-US	+421953-0830245	America/Detroit	Eastern Time - Michigan - most locations
+-US	+381515-0854534	America/Kentucky/Louisville	Eastern Time - Kentucky - Louisville area
+-US	+364947-0845057	America/Kentucky/Monticello	Eastern Time - Kentucky - Wayne County
+-US	+394606-0860929	America/Indiana/Indianapolis	Eastern Time - Indiana - most locations
+-US	+384038-0873143	America/Indiana/Vincennes	Eastern Time - Indiana - Daviess, Dubois, Knox & Martin Counties
+-US	+410305-0863611	America/Indiana/Winamac	Eastern Time - Indiana - Pulaski County
+-US	+382232-0862041	America/Indiana/Marengo	Eastern Time - Indiana - Crawford County
+-US	+382931-0871643	America/Indiana/Petersburg	Eastern Time - Indiana - Pike County
+-US	+384452-0850402	America/Indiana/Vevay	Eastern Time - Indiana - Switzerland County
+-US	+415100-0873900	America/Chicago	Central Time
+-US	+375711-0864541	America/Indiana/Tell_City	Central Time - Indiana - Perry County
+-US	+411745-0863730	America/Indiana/Knox	Central Time - Indiana - Starke County
+-US	+450628-0873651	America/Menominee	Central Time - Michigan - Dickinson, Gogebic, Iron & Menominee Counties
+-US	+470659-1011757	America/North_Dakota/Center	Central Time - North Dakota - Oliver County
+-US	+465042-1012439	America/North_Dakota/New_Salem	Central Time - North Dakota - Morton County (except Mandan area)
+-US	+471551-1014640	America/North_Dakota/Beulah	Central Time - North Dakota - Mercer County
+-US	+394421-1045903	America/Denver	Mountain Time
+-US	+433649-1161209	America/Boise	Mountain Time - south Idaho & east Oregon
+-US	+332654-1120424	America/Phoenix	Mountain Standard Time - Arizona (except Navajo)
+-US	+340308-1181434	America/Los_Angeles	Pacific Time
+-US	+550737-1313435	America/Metlakatla	Pacific Standard Time - Annette Island, Alaska
+-US	+611305-1495401	America/Anchorage	Alaska Time
+-US	+581807-1342511	America/Juneau	Alaska Time - Alaska panhandle
+-US	+571035-1351807	America/Sitka	Alaska Time - southeast Alaska panhandle
+-US	+593249-1394338	America/Yakutat	Alaska Time - Alaska panhandle neck
+-US	+643004-1652423	America/Nome	Alaska Time - west Alaska
++US	+404251-0740023	America/New_York	Eastern (most areas)
++US	+421953-0830245	America/Detroit	Eastern - MI (most areas)
++US	+381515-0854534	America/Kentucky/Louisville	Eastern - KY (Louisville area)
++US	+364947-0845057	America/Kentucky/Monticello	Eastern - KY (Wayne)
++US	+394606-0860929	America/Indiana/Indianapolis	Eastern - IN (most areas)
++US	+384038-0873143	America/Indiana/Vincennes	Eastern - IN (Da, Du, K, Mn)
++US	+410305-0863611	America/Indiana/Winamac	Eastern - IN (Pulaski)
++US	+382232-0862041	America/Indiana/Marengo	Eastern - IN (Crawford)
++US	+382931-0871643	America/Indiana/Petersburg	Eastern - IN (Pike)
++US	+384452-0850402	America/Indiana/Vevay	Eastern - IN (Switzerland)
++US	+415100-0873900	America/Chicago	Central (most areas)
++US	+375711-0864541	America/Indiana/Tell_City	Central - IN (Perry)
++US	+411745-0863730	America/Indiana/Knox	Central - IN (Starke)
++US	+450628-0873651	America/Menominee	Central - MI (Wisconsin border)
++US	+470659-1011757	America/North_Dakota/Center	Central - ND (Oliver)
++US	+465042-1012439	America/North_Dakota/New_Salem	Central - ND (Morton rural)
++US	+471551-1014640	America/North_Dakota/Beulah	Central - ND (Mercer)
++US	+394421-1045903	America/Denver	Mountain (most areas)
++US	+433649-1161209	America/Boise	Mountain - ID (south); OR (east)
++US	+332654-1120424	America/Phoenix	MST - Arizona (except Navajo)
++US	+340308-1181434	America/Los_Angeles	Pacific
++US	+611305-1495401	America/Anchorage	Alaska (most areas)
++US	+581807-1342511	America/Juneau	Alaska - Juneau area
++US	+571035-1351807	America/Sitka	Alaska - Sitka area
++US	+550737-1313435	America/Metlakatla	Alaska - Annette Island
++US	+593249-1394338	America/Yakutat	Alaska - Yakutat
++US	+643004-1652423	America/Nome	Alaska (west)
+ US	+515248-1763929	America/Adak	Aleutian Islands
+-US,UM	+211825-1575130	Pacific/Honolulu	Hawaii time
++US,UM	+211825-1575130	Pacific/Honolulu	Hawaii
+ UY	-3453-05611	America/Montevideo
+-UZ	+3940+06648	Asia/Samarkand	west Uzbekistan
+-UZ	+4120+06918	Asia/Tashkent	east Uzbekistan
++UZ	+3940+06648	Asia/Samarkand	Uzbekistan (west)
++UZ	+4120+06918	Asia/Tashkent	Uzbekistan (east)
+ VE	+1030-06656	America/Caracas
+-VN	+1045+10640	Asia/Ho_Chi_Minh	south Vietnam
++VN	+1045+10640	Asia/Ho_Chi_Minh	Vietnam (south)
+ VU	-1740+16825	Pacific/Efate
+ WF	-1318-17610	Pacific/Wallis
+ WS	-1350-17144	Pacific/Apia
+--- contrib/tzdata/zoneinfo2tdf.pl.orig
++++ contrib/tzdata/zoneinfo2tdf.pl
+@@ -0,0 +1,52 @@
++#! /usr/bin/perl -w
++
++# Courtesy Ken Pizzini.
++
++use strict;
++
++#This file released to the public domain.
++
++# Note: error checking is poor; trust the output only if the input
++# has been checked by zic.
++
++my $contZone = '';
++while (<>) {
++  my $origline = $_;
++  my @fields = ();
++  while (s/^\s*((?:"[^"]*"|[^\s#])+)//) {
++    push @fields, $1;
++  }
++  next unless @fields;
++
++  my $type = lc($fields[0]);
++  if ($contZone) {
++    @fields >= 3 or warn "bad continuation line";
++    unshift @fields, '+', $contZone;
++    $type = 'zone';
++  }
++
++  $contZone = '';
++  if ($type eq 'zone') {
++    # Zone  NAME  GMTOFF  RULES/SAVE  FORMAT  [UNTIL]
++    my $nfields = @fields;
++    $nfields >= 5 or warn "bad zone line";
++    if ($nfields > 6) {
++      #this splice is optional, depending on one's preference
++      #(one big date-time field, or componentized date and time):
++      splice(@fields, 5, $nfields-5, "@fields[5..$nfields-1]");
++    }
++    $contZone = $fields[1] if @fields > 5;
++  } elsif ($type eq 'rule') {
++    # Rule  NAME  FROM  TO  TYPE  IN  ON  AT  SAVE  LETTER/S
++    @fields == 10 or warn "bad rule line";
++  } elsif ($type eq 'link') {
++    # Link  TARGET  LINK-NAME
++    @fields == 3 or warn "bad link line";
++  } elsif ($type eq 'leap') {
++    # Leap  YEAR  MONTH  DAY  HH:MM:SS  CORR  R/S
++    @fields == 7 or warn "bad leap line";
++  } else {
++    warn "Fubar at input line $.: $origline";
++  }
++  print join("\t", @fields), "\n";
++}
++native
+\ No newline at end of property
++*
+\ No newline at end of property
++FreeBSD=%H
+\ No newline at end of property
++text/plain
+\ No newline at end of property

Property changes on: user/gjb/releng-rewrite/share/security/patches/EN-16:20/tzdata-10.2.patch
___________________________________________________________________
Added: fbsd:nokeywords
## -0,0 +1 ##
+yes
\ No newline at end of property
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Added: svn:mime-type
## -0,0 +1 ##
+text/plain
\ No newline at end of property
Index: user/gjb/releng-rewrite/share/security/patches/EN-16:20/tzdata-10.2.patch.asc
===================================================================
--- user/gjb/releng-rewrite/share/security/patches/EN-16:20/tzdata-10.2.patch.asc	(nonexistent)
+++ user/gjb/releng-rewrite/share/security/patches/EN-16:20/tzdata-10.2.patch.asc	(revision 49725)
@@ -0,0 +1,16 @@
+-----BEGIN PGP SIGNATURE-----
+
+iQIcBAABCgAGBQJYRw1rAAoJEO1n7NZdz2rngakQAOIT07earAHkhoiIEiU+x9Ai
+rAV41bYSIxfBZ8X5Sp3g1/TC7HrMWzM68ar9Uqm9iM5nDWWBTxwXZYwcFSvVUrF0
+T4SVztyiksyzQQmypreaSY1msPIk/aIr1YVtGsyvPv0KbvvldFGQEWAUrcLykCaG
+LUamzrzMXWrFpZwN/TLnykIPXhRrrV1O+l8xBH7qm4JWp8PkoeFe6xtCuj1E+ZZg
++h24AMxoaDD6/fDXHZ+ht8MuY3/zz39oVCc6vFxAg0iCbO/MOy0Rwq8Uh0raSPE6
+aSWQGEQB8jrml24WAc6nozL6j9dyv5uKUr0mKCc9x00ZW2Ml4WNw4BIZ4FSJXJGU
+nMnIK/5aS5SJ5+JuBeoqwh0Qim6Z6SRz+gLsrA45pa2tY3mMjKn21WFpKyFlug9S
+bDqgeapTv4Cau38NPATGScSn3qzxeW9tSQ//Njj4XTD5sYhH1a0+VEUooo8bGvt0
+ANtOmeJXqH7vJmA/JA7V5rfEZts75eKDPWBg4DgW4KX8N0spkgHkCphfwF8ZEgTM
+0UkEpxRhWAeZ/DECr5MNdJ1g+koxk5Ijj0mc4TiRftGYL3ttIo+Q1YfWaLTGUazD
+/8fE0SCu417DC/MwQeLMge7nfQC0sW4NOTDjYpxgi39O/UJkKwn4WX/qyT2/RmdW
+5iPHnGay+FX6w0vSuMwU
+=CtTo
+-----END PGP SIGNATURE-----

Property changes on: user/gjb/releng-rewrite/share/security/patches/EN-16:20/tzdata-10.2.patch.asc
___________________________________________________________________
Added: fbsd:nokeywords
## -0,0 +1 ##
+yes
\ No newline at end of property
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Added: svn:mime-type
## -0,0 +1 ##
+text/plain
\ No newline at end of property
Index: user/gjb/releng-rewrite/share/security/patches/EN-16:20/tzdata-10.3.patch
===================================================================
--- user/gjb/releng-rewrite/share/security/patches/EN-16:20/tzdata-10.3.patch	(nonexistent)
+++ user/gjb/releng-rewrite/share/security/patches/EN-16:20/tzdata-10.3.patch	(revision 49725)
@@ -0,0 +1,10686 @@
+Index: contrib/tzdata/CONTRIBUTING
+===================================================================
+--- contrib/tzdata/CONTRIBUTING	(nonexistent)
++++ contrib/tzdata/CONTRIBUTING	(working copy)
+@@ -0,0 +1,73 @@
++Contributing to the tz code and data
++
++The time zone database is by no means authoritative: governments
++change timekeeping rules erratically and sometimes with little
++warning, the data entries do not cover all of civil time before
++1970, and undoubtedly errors remain in the code and data.  Feel
++free to fill gaps or fix mistakes, and please email improvements
++to tz@iana.org for use in the future.
++
++To email small changes, please run a POSIX shell command like
++'diff -u old/europe new/europe >myfix.patch', and attach
++myfix.patch to the email.
++
++For more-elaborate changes, please read the Theory file and browse
++the mailing list archives <http://mm.icann.org/pipermail/tz/> for
++examples of patches that tend to work well.  Ideally, additions to
++data should contain commentary citing reliable sources as
++justification.
++
++Please submit changes against either the latest release in
++<ftp://ftp.iana.org/tz/> or the master branch of the experimental
++Git repository.  If you use Git the following workflow may be helpful:
++
++  * Copy the experimental repository.
++
++      git clone https://github.com/eggert/tz.git
++      cd tz
++
++  * Get current with the master branch.
++
++      git checkout master
++      git pull
++
++  * Switch to a new branch for the changes.  Choose a different
++    branch name for each change set.
++
++      git checkout -b mybranch
++
++  * Edit source files.  Include commentary that justifies the
++    changes by citing reliable sources.
++
++  * Debug the changes, e.g.:
++
++      make check
++      make install
++      ./zdump -v America/Los_Angeles
++
++  * For each separable change, commit it in the new branch, e.g.:
++
++      git add northamerica
++      git commit
++
++    See recent 'git log' output for the commit-message style.
++
++  * Create patch files 0001-*, 0002-*, ...
++
++      git format-patch master
++
++  * After reviewing the patch files, send the patches to tz@iana.org
++    for others to review.
++
++      git send-email master
++
++  * Start anew by getting current with the master branch again
++    (the second step above).
++
++Please do not create issues or pull requests on GitHub, as the
++proper procedure for proposing and distributing patches is via
++email as illustrated above.
++
++-----
++
++This file is in the public domain.
+Index: contrib/tzdata/LICENSE
+===================================================================
+--- contrib/tzdata/LICENSE	(nonexistent)
++++ contrib/tzdata/LICENSE	(working copy)
+@@ -0,0 +1,4 @@
++With a few exceptions, all files in the tz code and data (including
++this one) are in the public domain.  The exceptions are date.c,
++newstrftime.3, and strftime.c, which contain material derived from BSD
++and which use the BSD 3-clause license.
+Index: contrib/tzdata/Makefile
+===================================================================
+--- contrib/tzdata/Makefile	(nonexistent)
++++ contrib/tzdata/Makefile	(working copy)
+@@ -0,0 +1,793 @@
++# This file is in the public domain, so clarified as of
++# 2009-05-17 by Arthur David Olson.
++
++# Package name for the code distribution.
++PACKAGE=	tzcode
++
++# Version number for the distribution, overridden in the 'tarballs' rule below.
++VERSION=	unknown
++
++# Email address for bug reports.
++BUGEMAIL=	tz@iana.org
++
++# Change the line below for your time zone (after finding the zone you want in
++# the time zone files, or adding it to a time zone file).
++# Alternately, if you discover you've got the wrong time zone, you can just
++#	zic -l rightzone
++# to correct things.
++# Use the command
++#	make zonenames
++# to get a list of the values you can use for LOCALTIME.
++
++LOCALTIME=	GMT
++
++# If you want something other than Eastern United States time as a template
++# for handling POSIX-style time zone environment variables,
++# change the line below (after finding the zone you want in the
++# time zone files, or adding it to a time zone file).
++# (When a POSIX-style environment variable is handled, the rules in the
++# template file are used to determine "spring forward" and "fall back" days and
++# times; the environment variable itself specifies UT offsets of standard and
++# summer time.)
++# Alternately, if you discover you've got the wrong time zone, you can just
++#	zic -p rightzone
++# to correct things.
++# Use the command
++#	make zonenames
++# to get a list of the values you can use for POSIXRULES.
++# If you want POSIX compatibility, use "America/New_York".
++
++POSIXRULES=	America/New_York
++
++# Also see TZDEFRULESTRING below, which takes effect only
++# if the time zone files cannot be accessed.
++
++# Everything gets put in subdirectories of. . .
++
++TOPDIR=		/usr/local
++
++# "Compiled" time zone information is placed in the "TZDIR" directory
++# (and subdirectories).
++# Use an absolute path name for TZDIR unless you're just testing the software.
++
++TZDIR_BASENAME=	zoneinfo
++TZDIR=		$(TOPDIR)/etc/$(TZDIR_BASENAME)
++
++# Types to try, as an alternative to time_t.  int64_t should be first.
++TIME_T_ALTERNATIVES= int64_t int32_t uint32_t uint64_t
++
++# The "tzselect", "zic", and "zdump" commands get installed in. . .
++
++ETCDIR=		$(TOPDIR)/etc
++
++# If you "make INSTALL", the "date" command gets installed in. . .
++
++BINDIR=		$(TOPDIR)/bin
++
++# Manual pages go in subdirectories of. . .
++
++MANDIR=		$(TOPDIR)/man
++
++# Library functions are put in an archive in LIBDIR.
++
++LIBDIR=		$(TOPDIR)/lib
++
++# If you always want time values interpreted as "seconds since the epoch
++# (not counting leap seconds)", use
++#	REDO=		posix_only
++# below.  If you always want right time values interpreted as "seconds since
++# the epoch" (counting leap seconds)", use
++#	REDO=		right_only
++# below.  If you want both sets of data available, with leap seconds not
++# counted normally, use
++#	REDO=		posix_right
++# below.  If you want both sets of data available, with leap seconds counted
++# normally, use
++#	REDO=		right_posix
++# below.  POSIX mandates that leap seconds not be counted; for compatibility
++# with it, use "posix_only" or "posix_right".
++
++REDO=		posix_right
++
++# If you want out-of-scope and often-wrong data from the file 'backzone', use
++#	PACKRATDATA=	backzone
++# To omit this data, use
++#	PACKRATDATA=
++
++PACKRATDATA=
++
++# Since "." may not be in PATH...
++
++YEARISTYPE=	./yearistype
++
++# Non-default libraries needed to link.
++LDLIBS=
++
++# Add the following to the end of the "CFLAGS=" line as needed.
++#  -DBIG_BANG=-9999999LL if the Big Bang occurred at time -9999999 (see zic.c)
++#  -DHAVE_DECL_ASCTIME_R=0 if <time.h> does not declare asctime_r
++#  -DHAVE_DIRECT_H if mkdir needs <direct.h> (MS-Windows)
++#  -DHAVE_DOS_FILE_NAMES if file names have drive specifiers etc. (MS-DOS)
++#  -DHAVE_GETTEXT=1 if 'gettext' works (e.g., GNU/Linux, FreeBSD, Solaris)
++#  -DHAVE_INCOMPATIBLE_CTIME_R=1 if your system's time.h declares
++#	ctime_r and asctime_r incompatibly with the POSIX standard
++#	(Solaris when _POSIX_PTHREAD_SEMANTICS is not defined).
++#  -DHAVE_INTTYPES_H=1 if you have a pre-C99 compiler with "inttypes.h"
++#  -DHAVE_LINK=0 if your system lacks a link function
++#  -DHAVE_LOCALTIME_R=0 if your system lacks a localtime_r function
++#  -DHAVE_LOCALTIME_RZ=0 if you do not want zdump to use localtime_rz
++#	This defaults to 1 if a working localtime_rz seems to be available.
++#	localtime_rz can make zdump significantly faster, but is nonstandard.
++#  -DHAVE_POSIX_DECLS=0 if your system's include files do not declare
++#	functions like 'link' or variables like 'tzname' required by POSIX
++#  -DHAVE_STDINT_H=1 if you have a pre-C99 compiler with "stdint.h"
++#  -DHAVE_STRFTIME_L=1 if <time.h> declares locale_t and strftime_l
++#	This defaults to 0 if _POSIX_VERSION < 200809, 1 otherwise.
++#  -DHAVE_STRDUP=0 if your system lacks the strdup function
++#  -DHAVE_SYMLINK=0 if your system lacks the symlink function
++#  -DHAVE_SYS_STAT_H=0 if your compiler lacks a "sys/stat.h"
++#  -DHAVE_SYS_WAIT_H=0 if your compiler lacks a "sys/wait.h"
++#  -DHAVE_TZSET=0 if your system lacks a tzset function
++#  -DHAVE_UNISTD_H=0 if your compiler lacks a "unistd.h" (Microsoft C++ 7?)
++#  -DEPOCH_LOCAL=1 if the 'time' function returns local time not UT
++#  -DEPOCH_OFFSET=N if the 'time' function returns a value N greater
++#	than what POSIX specifies, assuming local time is UT.
++#	For example, N is 252460800 on AmigaOS.
++#  -DNO_RUN_TIME_WARNINGS_ABOUT_YEAR_2000_PROBLEMS_THANK_YOU=1
++#	if you do not want run time warnings about formats that may cause
++#	year 2000 grief
++#  -Dssize_t=long on ancient hosts that lack ssize_t
++#  -DTHREAD_SAFE=1 to make localtime.c thread-safe, as POSIX requires;
++#	not needed by the main-program tz code, which is single-threaded.
++#	Append other compiler flags as needed, e.g., -pthread on GNU/Linux.
++#  -Dtime_tz=\"T\" to use T as the time_t type, rather than the system time_t
++#  -DTZ_DOMAIN=\"foo\" to use "foo" for gettext domain name; default is "tz"
++#  -DTZ_DOMAINDIR=\"/path\" to use "/path" for gettext directory;
++#	the default is system-supplied, typically "/usr/lib/locale"
++#  -DTZDEFRULESTRING=\",date/time,date/time\" to default to the specified
++#	DST transitions if the time zone files cannot be accessed
++#  -DUNINIT_TRAP=1 if reading uninitialized storage can cause problems
++#	other than simply getting garbage data
++#  -DUSE_LTZ=0 to build zdump with the system time zone library
++#	Also set TZDOBJS=zdump.o and CHECK_TIME_T_ALTERNATIVES= below.
++#  -DZIC_MAX_ABBR_LEN_WO_WARN=3
++#	(or some other number) to set the maximum time zone abbreviation length
++#	that zic will accept without a warning (the default is 6)
++#  $(GCC_DEBUG_FLAGS) if you are using recent GCC and want lots of checking
++GCC_DEBUG_FLAGS = -Dlint -g3 -O3 -fno-common -fstrict-aliasing \
++	-Wall -Wextra \
++	-Wbad-function-cast -Wcast-align -Wdate-time \
++	-Wdeclaration-after-statement \
++	-Wdouble-promotion \
++	-Wformat=2 -Winit-self -Wjump-misses-init \
++	-Wlogical-op -Wmissing-prototypes -Wnested-externs \
++	-Wold-style-definition -Woverlength-strings -Wpointer-arith \
++	-Wshadow -Wstrict-prototypes -Wsuggest-attribute=const \
++	-Wsuggest-attribute=format -Wsuggest-attribute=noreturn \
++	-Wsuggest-attribute=pure -Wtrampolines \
++	-Wunused -Wwrite-strings \
++	-Wno-address -Wno-format-nonliteral -Wno-sign-compare \
++	-Wno-type-limits -Wno-unused-parameter
++#
++# If you want to use System V compatibility code, add
++#	-DUSG_COMPAT
++# to the end of the "CFLAGS=" line.  This arrange for "timezone" and "daylight"
++# variables to be kept up-to-date by the time conversion functions.  Neither
++# "timezone" nor "daylight" is described in X3J11's work.
++#
++# If your system has a "GMT offset" field in its "struct tm"s
++# (or if you decide to add such a field in your system's "time.h" file),
++# add the name to a define such as
++#	-DTM_GMTOFF=tm_gmtoff
++# to the end of the "CFLAGS=" line.  If not defined, the code attempts to
++# guess TM_GMTOFF from other macros; define NO_TM_GMTOFF to suppress this.
++# Similarly, if your system has a "zone abbreviation" field, define
++#	-DTM_ZONE=tm_zone
++# and define NO_TM_ZONE to suppress any guessing.  These two fields are not
++# required by POSIX, but are widely available on GNU/Linux and BSD systems.
++#
++# If you want functions that were inspired by early versions of X3J11's work,
++# add
++#	-DSTD_INSPIRED
++# to the end of the "CFLAGS=" line.  This arranges for the functions
++# "tzsetwall", "offtime", "timelocal", "timegm", "timeoff",
++# "posix2time", and "time2posix" to be added to the time conversion library.
++# "tzsetwall" is like "tzset" except that it arranges for local wall clock
++# time (rather than the time specified in the TZ environment variable)
++# to be used.
++# "offtime" is like "gmtime" except that it accepts a second (long) argument
++# that gives an offset to add to the time_t when converting it.
++# "timelocal" is equivalent to "mktime".
++# "timegm" is like "timelocal" except that it turns a struct tm into
++# a time_t using UT (rather than local time as "timelocal" does).
++# "timeoff" is like "timegm" except that it accepts a second (long) argument
++# that gives an offset to use when converting to a time_t.
++# "posix2time" and "time2posix" are described in an included manual page.
++# X3J11's work does not describe any of these functions.
++# Sun has provided "tzsetwall", "timelocal", and "timegm" in SunOS 4.0.
++# These functions may well disappear in future releases of the time
++# conversion package.
++#
++# If you don't want functions that were inspired by NetBSD, add
++#	-DNETBSD_INSPIRED=0
++# to the end of the "CFLAGS=" line.  Otherwise, the functions
++# "localtime_rz", "mktime_z", "tzalloc", and "tzfree" are added to the
++# time library, and if STD_INSPIRED is also defined the functions
++# "posix2time_z" and "time2posix_z" are added as well.
++# The functions ending in "_z" (or "_rz") are like their unsuffixed
++# (or suffixed-by-"_r") counterparts, except with an extra first
++# argument of opaque type timezone_t that specifies the time zone.
++# "tzalloc" allocates a timezone_t value, and "tzfree" frees it.
++#
++# If you want to allocate state structures in localtime, add
++#	-DALL_STATE
++# to the end of the "CFLAGS=" line.  Storage is obtained by calling malloc.
++#
++# If you want an "altzone" variable (a la System V Release 3.1), add
++#	-DALTZONE
++# to the end of the "CFLAGS=" line.
++# This variable is not described in X3J11's work.
++#
++# NIST-PCTS:151-2, Version 1.4, (1993-12-03) is a test suite put
++# out by the National Institute of Standards and Technology
++# which claims to test C and Posix conformance.  If you want to pass PCTS, add
++#	-DPCTS
++# to the end of the "CFLAGS=" line.
++#
++# If you want strict compliance with XPG4 as of 1994-04-09, add
++#	-DXPG4_1994_04_09
++# to the end of the "CFLAGS=" line.  This causes "strftime" to always return
++# 53 as a week number (rather than 52 or 53) for those days in January that
++# before the first Monday in January when a "%V" format is used and January 1
++# falls on a Friday, Saturday, or Sunday.
++
++CFLAGS=
++
++# Linker flags.  Default to $(LFLAGS) for backwards compatibility
++# to release 2012h and earlier.
++
++LDFLAGS=	$(LFLAGS)
++
++# For leap seconds, this Makefile uses LEAPSECONDS='-L leapseconds' in
++# submake command lines.  The default is no leap seconds.
++
++LEAPSECONDS=
++
++# The zic command and its arguments.
++
++zic=		./zic
++ZIC=		$(zic) $(ZFLAGS)
++
++ZFLAGS=
++
++# How to use zic to install tz binary files.
++
++ZIC_INSTALL=	$(ZIC) -y $(YEARISTYPE) -d $(DESTDIR)$(TZDIR) $(LEAPSECONDS)
++
++# The name of a Posix-compliant 'awk' on your system.
++AWK=		awk
++
++# The full path name of a Posix-compliant shell, preferably one that supports
++# the Korn shell's 'select' statement as an extension.
++# These days, Bash is the most popular.
++# It should be OK to set this to /bin/sh, on platforms where /bin/sh
++# lacks 'select' or doesn't completely conform to Posix, but /bin/bash
++# is typically nicer if it works.
++KSHELL=		/bin/bash
++
++# The path where SGML DTDs are kept and the catalog file(s) to use when
++# validating.  The default should work on both Debian and Red Hat.
++SGML_TOPDIR= /usr
++SGML_DTDDIR= $(SGML_TOPDIR)/share/xml/w3c-sgml-lib/schema/dtd
++SGML_SEARCH_PATH= $(SGML_DTDDIR)/REC-html401-19991224
++SGML_CATALOG_FILES= \
++  $(SGML_TOPDIR)/share/doc/w3-recs/html/www.w3.org/TR/1999/REC-html401-19991224/HTML4.cat:$(SGML_TOPDIR)/share/sgml/html/4.01/HTML4.cat
++
++# The name, arguments and environment of a program to validate your web pages.
++# See <http://openjade.sourceforge.net/doc/> for a validator, and
++# <https://validator.w3.org/source/> for a validation library.
++VALIDATE = nsgmls
++VALIDATE_FLAGS = -s -B -wall -wno-unused-param
++VALIDATE_ENV = \
++  SGML_CATALOG_FILES=$(SGML_CATALOG_FILES) \
++  SGML_SEARCH_PATH=$(SGML_SEARCH_PATH) \
++  SP_CHARSET_FIXED=YES \
++  SP_ENCODING=UTF-8
++
++# This expensive test requires USE_LTZ.
++# To suppress it, define this macro to be empty.
++CHECK_TIME_T_ALTERNATIVES = check_time_t_alternatives
++
++# SAFE_CHAR is a regular expression that matches a safe character.
++# Some parts of this distribution are limited to safe characters;
++# others can use any UTF-8 character.
++# For now, the safe characters are a safe subset of ASCII.
++# The caller must set the shell variable 'sharp' to the character '#',
++# since Makefile macros cannot contain '#'.
++# TAB_CHAR is a single tab character, in single quotes.
++TAB_CHAR=	'	'
++SAFE_CHARSET1=	$(TAB_CHAR)' !\"'$$sharp'$$%&'\''()*+,./0123456789:;<=>?@'
++SAFE_CHARSET2=	'ABCDEFGHIJKLMNOPQRSTUVWXYZ[\\^_`'
++SAFE_CHARSET3=	'abcdefghijklmnopqrstuvwxyz{|}~'
++SAFE_CHARSET=	$(SAFE_CHARSET1)$(SAFE_CHARSET2)$(SAFE_CHARSET3)
++SAFE_CHAR=	'[]'$(SAFE_CHARSET)'-]'
++
++# OK_CHAR matches any character allowed in the distributed files.
++# This is the same as SAFE_CHAR, except that multibyte letters are
++# also allowed so that commentary can contain people's names and quote
++# non-English sources.  For non-letters the sources are limited to
++# ASCII renderings for the convenience of maintainers whose text editors
++# mishandle UTF-8 by default (e.g., XEmacs 21.4.22).
++OK_CHAR=	'[][:alpha:]'$(SAFE_CHARSET)'-]'
++
++# SAFE_LINE matches a line of safe characters.
++# SAFE_SHARP_LINE is similar, except any OK character can follow '#';
++# this is so that comments can contain non-ASCII characters.
++# OK_LINE matches a line of OK characters.
++SAFE_LINE=	'^'$(SAFE_CHAR)'*$$'
++SAFE_SHARP_LINE='^'$(SAFE_CHAR)'*('$$sharp$(OK_CHAR)'*)?$$'
++OK_LINE=	'^'$(OK_CHAR)'*$$'
++
++# Flags to give 'tar' when making a distribution.
++# Try to use flags appropriate for GNU tar.
++GNUTARFLAGS= --numeric-owner --owner=0 --group=0 --mode=go+u,go-w --sort=name
++TARFLAGS=	`if tar $(GNUTARFLAGS) --version >/dev/null 2>&1; \
++		 then echo $(GNUTARFLAGS); \
++		 else :; \
++		 fi`
++
++# Flags to give 'gzip' when making a distribution.
++GZIPFLAGS=	-9n
++
++###############################################################################
++
++#MAKE=		make
++
++cc=		cc
++CC=		$(cc) -DTZDIR=\"$(TZDIR)\"
++
++AR=		ar
++
++# ':' on typical hosts; 'ranlib' on the ancient hosts that still need ranlib.
++RANLIB=		:
++
++TZCOBJS=	zic.o
++TZDOBJS=	zdump.o localtime.o asctime.o
++DATEOBJS=	date.o localtime.o strftime.o asctime.o
++LIBSRCS=	localtime.c asctime.c difftime.c
++LIBOBJS=	localtime.o asctime.o difftime.o
++HEADERS=	tzfile.h private.h
++NONLIBSRCS=	zic.c zdump.c
++NEWUCBSRCS=	date.c strftime.c
++SOURCES=	$(HEADERS) $(LIBSRCS) $(NONLIBSRCS) $(NEWUCBSRCS) \
++			tzselect.ksh workman.sh
++MANS=		newctime.3 newstrftime.3 newtzset.3 time2posix.3 \
++			tzfile.5 tzselect.8 zic.8 zdump.8
++MANTXTS=	newctime.3.txt newstrftime.3.txt newtzset.3.txt \
++			time2posix.3.txt \
++			tzfile.5.txt tzselect.8.txt zic.8.txt zdump.8.txt \
++			date.1.txt
++COMMON=		CONTRIBUTING LICENSE Makefile NEWS README Theory version
++WEB_PAGES=	tz-art.htm tz-how-to.html tz-link.htm
++DOCS=		$(MANS) date.1 $(MANTXTS) $(WEB_PAGES)
++PRIMARY_YDATA=	africa antarctica asia australasia \
++		europe northamerica southamerica
++YDATA=		$(PRIMARY_YDATA) pacificnew etcetera backward
++NDATA=		systemv factory
++TDATA=		$(YDATA) $(NDATA)
++ZONETABLES=	zone1970.tab zone.tab
++TABDATA=	iso3166.tab leapseconds $(ZONETABLES)
++LEAP_DEPS=	leapseconds.awk leap-seconds.list
++DATA=		$(YDATA) $(NDATA) backzone $(TABDATA) \
++			leap-seconds.list yearistype.sh
++AWK_SCRIPTS=	checklinks.awk checktab.awk leapseconds.awk
++MISC=		$(AWK_SCRIPTS) zoneinfo2tdf.pl
++TZS_YEAR=	2050
++TZS=		to$(TZS_YEAR).tzs
++TZS_NEW=	to$(TZS_YEAR)new.tzs
++TZS_DEPS=	$(PRIMARY_YDATA) asctime.c localtime.c \
++			private.h tzfile.h zdump.c zic.c
++ENCHILADA=	$(COMMON) $(DOCS) $(SOURCES) $(DATA) $(MISC) $(TZS)
++
++# Consult these files when deciding whether to rebuild the 'version' file.
++# This list is not the same as the output of 'git ls-files', since
++# .gitignore is not distributed.
++VERSION_DEPS= \
++		CONTRIBUTING LICENSE Makefile NEWS README Theory \
++		africa antarctica asctime.c asia australasia \
++		backward backzone \
++		checklinks.awk checktab.awk \
++		date.1 date.c difftime.c \
++		etcetera europe factory iso3166.tab \
++		leap-seconds.list leapseconds.awk localtime.c \
++		newctime.3 newstrftime.3 newtzset.3 northamerica \
++		pacificnew private.h \
++		southamerica strftime.c systemv \
++		time2posix.3 tz-art.htm tz-how-to.html tz-link.htm \
++		tzfile.5 tzfile.h tzselect.8 tzselect.ksh \
++		workman.sh yearistype.sh \
++		zdump.8 zdump.c zic.8 zic.c \
++		zone.tab zone1970.tab zoneinfo2tdf.pl
++
++# And for the benefit of csh users on systems that assume the user
++# shell should be used to handle commands in Makefiles. . .
++
++SHELL=		/bin/sh
++
++all:		tzselect yearistype zic zdump libtz.a $(TABDATA)
++
++ALL:		all date $(ENCHILADA)
++
++install:	all $(DATA) $(REDO) $(MANS)
++		mkdir -p $(DESTDIR)$(ETCDIR) $(DESTDIR)$(TZDIR) \
++			$(DESTDIR)$(LIBDIR) \
++			$(DESTDIR)$(MANDIR)/man3 $(DESTDIR)$(MANDIR)/man5 \
++			$(DESTDIR)$(MANDIR)/man8
++		$(ZIC_INSTALL) -l $(LOCALTIME) -p $(POSIXRULES)
++		cp -f iso3166.tab $(ZONETABLES) $(DESTDIR)$(TZDIR)/.
++		cp tzselect zic zdump $(DESTDIR)$(ETCDIR)/.
++		cp libtz.a $(DESTDIR)$(LIBDIR)/.
++		$(RANLIB) $(DESTDIR)$(LIBDIR)/libtz.a
++		cp -f newctime.3 newtzset.3 $(DESTDIR)$(MANDIR)/man3/.
++		cp -f tzfile.5 $(DESTDIR)$(MANDIR)/man5/.
++		cp -f tzselect.8 zdump.8 zic.8 $(DESTDIR)$(MANDIR)/man8/.
++
++INSTALL:	ALL install date.1
++		mkdir -p $(DESTDIR)$(BINDIR) $(DESTDIR)$(MANDIR)/man1
++		cp date $(DESTDIR)$(BINDIR)/.
++		cp -f date.1 $(DESTDIR)$(MANDIR)/man1/.
++
++version:	$(VERSION_DEPS)
++		{ (type git) >/dev/null 2>&1 && \
++		  V=`git describe --match '[0-9][0-9][0-9][0-9][a-z]*' \
++				--abbrev=7 --dirty` || \
++		  V=$(VERSION); } && \
++		printf '%s\n' "$$V" >$@.out
++		mv $@.out $@
++
++version.h:	version
++		VERSION=`cat version` && printf '%s\n' \
++		  'static char const PKGVERSION[]="($(PACKAGE)) ";' \
++		  "static char const TZVERSION[]=\"$$VERSION\";" \
++		  'static char const REPORT_BUGS_TO[]="$(BUGEMAIL)";' \
++		  >$@.out
++		mv $@.out $@
++
++zdump:		$(TZDOBJS)
++		$(CC) -o $@ $(CFLAGS) $(LDFLAGS) $(TZDOBJS) $(LDLIBS)
++
++zic:		$(TZCOBJS)
++		$(CC) -o $@ $(CFLAGS) $(LDFLAGS) $(TZCOBJS) $(LDLIBS)
++
++yearistype:	yearistype.sh
++		cp yearistype.sh yearistype
++		chmod +x yearistype
++
++leapseconds:	$(LEAP_DEPS)
++		$(AWK) -f leapseconds.awk leap-seconds.list >$@.out
++		mv $@.out $@
++
++# Arguments to pass to submakes of install_data.
++# They can be overridden by later submake arguments.
++INSTALLARGS = \
++ DESTDIR=$(DESTDIR) \
++ LEAPSECONDS='$(LEAPSECONDS)' \
++ PACKRATDATA='$(PACKRATDATA)' \
++ TZDIR=$(TZDIR) \
++ YEARISTYPE=$(YEARISTYPE) \
++ ZIC='$(ZIC)'
++
++# 'make install_data' installs one set of tz binary files.
++# It can be tailored by setting LEAPSECONDS, PACKRATDATA, etc.
++install_data:	zic leapseconds yearistype $(PACKRATDATA) $(TDATA)
++		$(ZIC_INSTALL) $(TDATA)
++		$(AWK) '/^Rule/' $(TDATA) | $(ZIC_INSTALL) - $(PACKRATDATA)
++
++posix_only:
++		$(MAKE) $(INSTALLARGS) LEAPSECONDS= install_data
++
++right_only:
++		$(MAKE) $(INSTALLARGS) LEAPSECONDS='-L leapseconds' \
++			install_data
++
++# In earlier versions of this makefile, the other two directories were
++# subdirectories of $(TZDIR).  However, this led to configuration errors.
++# For example, with posix_right under the earlier scheme,
++# TZ='right/Australia/Adelaide' got you localtime with leap seconds,
++# but gmtime without leap seconds, which led to problems with applications
++# like sendmail that subtract gmtime from localtime.
++# Therefore, the other two directories are now siblings of $(TZDIR).
++# You must replace all of $(TZDIR) to switch from not using leap seconds
++# to using them, or vice versa.
++right_posix:	right_only
++		rm -fr $(DESTDIR)$(TZDIR)-leaps
++		ln -s $(TZDIR_BASENAME) $(DESTDIR)$(TZDIR)-leaps || \
++		  $(MAKE) $(INSTALLARGS) TZDIR=$(TZDIR)-leaps right_only
++		$(MAKE) $(INSTALLARGS) TZDIR=$(TZDIR)-posix posix_only
++
++posix_right:	posix_only
++		rm -fr $(DESTDIR)$(TZDIR)-posix
++		ln -s $(TZDIR_BASENAME) $(DESTDIR)$(TZDIR)-posix || \
++		  $(MAKE) $(INSTALLARGS) TZDIR=$(TZDIR)-posix posix_only
++		$(MAKE) $(INSTALLARGS) TZDIR=$(TZDIR)-leaps right_only
++
++# This obsolescent rule is present for backwards compatibility with
++# tz releases 2014g through 2015g.  It should go away eventually.
++posix_packrat:
++		$(MAKE) $(INSTALLARGS) PACKRATDATA=backzone posix_only
++
++zones:		$(REDO)
++
++$(TZS_NEW):	$(TDATA) zdump zic
++		mkdir -p tzs.dir
++		$(zic) -d tzs.dir $(TDATA)
++		$(AWK) '/^Link/{print $$1 "\t" $$2 "\t" $$3}' \
++		   $(TDATA) | LC_ALL=C sort >$@.out
++		wd=`pwd` && \
++		zones=`$(AWK) -v wd="$$wd" \
++				'/^Zone/{print wd "/tzs.dir/" $$2}' $(TDATA) \
++			 | LC_ALL=C sort` && \
++		./zdump -i -c $(TZS_YEAR) $$zones >>$@.out
++		sed 's,^TZ=".*tzs\.dir/,TZ=",' $@.out >$@.sed.out
++		rm -fr tzs.dir $@.out
++		mv $@.sed.out $@
++
++# If $(TZS) does not already exist (e.g., old-format tarballs), create it.
++# If it exists but 'make check_tzs' fails, a maintainer should inspect the
++# failed output and fix the inconsistency, perhaps by running 'make force_tzs'.
++$(TZS):
++		$(MAKE) force_tzs
++
++force_tzs:	$(TZS_NEW)
++		cp $(TZS_NEW) $(TZS)
++
++libtz.a:	$(LIBOBJS)
++		$(AR) ru $@ $(LIBOBJS)
++		$(RANLIB) $@
++
++date:		$(DATEOBJS)
++		$(CC) -o $@ $(CFLAGS) $(LDFLAGS) $(DATEOBJS) $(LDLIBS)
++
++tzselect:	tzselect.ksh version
++		VERSION=`cat version` && sed \
++			-e 's|#!/bin/bash|#!$(KSHELL)|g' \
++			-e 's|AWK=[^}]*|AWK=$(AWK)|g' \
++			-e 's|\(PKGVERSION\)=.*|\1='\''($(PACKAGE)) '\''|' \
++			-e 's|\(REPORT_BUGS_TO\)=.*|\1=$(BUGEMAIL)|' \
++			-e 's|TZDIR=[^}]*|TZDIR=$(TZDIR)|' \
++			-e 's|\(TZVERSION\)=.*|\1='"$$VERSION"'|' \
++			<$@.ksh >$@.out
++		chmod +x $@.out
++		mv $@.out $@
++
++check:		check_character_set check_white_space check_links check_sorted \
++		  check_tables check_tzs check_web
++
++check_character_set: $(ENCHILADA)
++		LC_ALL=en_US.utf8 && export LC_ALL && \
++		sharp='#' && \
++		! grep -Env $(SAFE_LINE) $(MANS) date.1 $(MANTXTS) \
++			$(MISC) $(SOURCES) $(WEB_PAGES) \
++			CONTRIBUTING LICENSE Makefile README version && \
++		! grep -Env $(SAFE_SHARP_LINE) $(TDATA) backzone \
++			leapseconds yearistype.sh zone.tab && \
++		! grep -Env $(OK_LINE) $(ENCHILADA)
++
++check_white_space: $(ENCHILADA)
++		patfmt=' \t|[\f\r\v]' && pat=`printf "$$patfmt\\n"` && \
++		! grep -En "$$pat" $(ENCHILADA)
++		! grep -n '[[:space:]]$$' $(ENCHILADA)
++
++CHECK_CC_LIST = { n = split($$1,a,/,/); for (i=2; i<=n; i++) print a[1], a[i]; }
++
++check_sorted: backward backzone iso3166.tab zone.tab zone1970.tab
++		$(AWK) '/^Link/ {print $$3}' backward | LC_ALL=C sort -cu
++		$(AWK) '/^Zone/ {print $$2}' backzone | LC_ALL=C sort -cu
++		$(AWK) '/^[^#]/ {print $$1}' iso3166.tab | LC_ALL=C sort -cu
++		$(AWK) '/^[^#]/ {print $$1}' zone.tab | LC_ALL=C sort -c
++		$(AWK) '/^[^#]/ {print substr($$0, 1, 2)}' zone1970.tab | \
++		  LC_ALL=C sort -c
++		$(AWK) '/^[^#]/ $(CHECK_CC_LIST)' zone1970.tab | \
++		  LC_ALL=C sort -cu
++
++check_links:	checklinks.awk $(TDATA)
++		$(AWK) -f checklinks.awk $(TDATA)
++
++check_tables:	checktab.awk $(PRIMARY_YDATA) $(ZONETABLES)
++		for tab in $(ZONETABLES); do \
++		  $(AWK) -f checktab.awk -v zone_table=$$tab $(PRIMARY_YDATA) \
++		    || exit; \
++		done
++
++check_tzs:	$(TZS) $(TZS_NEW)
++		diff -u $(TZS) $(TZS_NEW)
++
++check_web:	$(WEB_PAGES)
++		$(VALIDATE_ENV) $(VALIDATE) $(VALIDATE_FLAGS) $(WEB_PAGES)
++
++clean_misc:
++		rm -f core *.o *.out \
++		  date tzselect version.h zdump zic yearistype libtz.a
++clean:		clean_misc
++		rm -fr *.dir tzdb-*/ $(TZS_NEW)
++
++maintainer-clean: clean
++		@echo 'This command is intended for maintainers to use; it'
++		@echo 'deletes files that may need special tools to rebuild.'
++		rm -f leapseconds version $(MANTXTS) $(TZS) *.asc *.tar.*
++
++names:
++		@echo $(ENCHILADA)
++
++public:		check check_public $(CHECK_TIME_T_ALTERNATIVES) \
++		tarballs signatures
++
++date.1.txt:	date.1
++newctime.3.txt:	newctime.3
++newstrftime.3.txt: newstrftime.3
++newtzset.3.txt:	newtzset.3
++time2posix.3.txt: time2posix.3
++tzfile.5.txt:	tzfile.5
++tzselect.8.txt:	tzselect.8
++zdump.8.txt:	zdump.8
++zic.8.txt:	zic.8
++
++$(MANTXTS):	workman.sh
++		LC_ALL=C sh workman.sh `expr $@ : '\(.*\)\.txt$$'` >$@.out
++		mv $@.out $@
++
++# Set the time stamps to those of the git repository, if available,
++# and if the files have not changed since then.
++# This uses GNU 'touch' syntax 'touch -d@N FILE',
++# where N is the number of seconds since 1970.
++# If git or GNU 'touch' is absent, don't bother to sync with git timestamps.
++# Also, set the timestamp of each prebuilt file like 'leapseconds'
++# to be the maximum of the files it depends on.
++set-timestamps.out: $(ENCHILADA)
++		rm -f $@
++		if (type git) >/dev/null 2>&1 && \
++		   files=`git ls-files $(ENCHILADA)` && \
++		   touch -md @1 test.out; then \
++		  rm -f test.out && \
++		  for file in $$files; do \
++		    if git diff --quiet $$file; then \
++		      time=`git log -1 --format='tformat:%ct' $$file` && \
++		      touch -cmd @$$time $$file; \
++		    else \
++		      echo >&2 "$$file: warning: does not match repository"; \
++		    fi || exit; \
++		  done; \
++		fi
++		touch -cmr `ls -t $(LEAP_DEPS) | sed 1q` leapseconds
++		for file in `ls $(MANTXTS) | sed 's/\.txt$$//'`; do \
++		  touch -cmr `ls -t $$file workman.sh | sed 1q` $$file.txt || \
++		    exit; \
++		done
++		touch -cmr `ls -t $(TZS_DEPS) | sed 1q` $(TZS)
++		touch -cmr `ls -t $(VERSION_DEPS) | sed 1q` version
++		touch $@
++
++# The zics below ensure that each data file can stand on its own.
++# We also do an all-files run to catch links to links.
++
++check_public:
++		$(MAKE) maintainer-clean
++		$(MAKE) "CFLAGS=$(GCC_DEBUG_FLAGS)" ALL
++		mkdir -p public.dir
++		for i in $(TDATA) ; do \
++		  $(zic) -v -d public.dir $$i 2>&1 || exit; \
++		done
++		$(zic) -v -d public.dir $(TDATA)
++		rm -fr public.dir
++
++# Check that the code works under various alternative
++# implementations of time_t.
++check_time_t_alternatives:
++		if diff -q Makefile Makefile 2>/dev/null; then \
++		  quiet_option='-q'; \
++		else \
++		  quiet_option=''; \
++		fi && \
++		wd=`pwd` && \
++		zones=`$(AWK) '/^[^#]/ { print $$3 }' <zone1970.tab` && \
++		for type in $(TIME_T_ALTERNATIVES); do \
++		  mkdir -p time_t.dir/$$type && \
++		  $(MAKE) clean_misc && \
++		  $(MAKE) TOPDIR="$$wd/time_t.dir/$$type" \
++		    CFLAGS='$(CFLAGS) -Dtime_tz='"'$$type'" \
++		    REDO='$(REDO)' \
++		    install && \
++		  diff $$quiet_option -r \
++		    time_t.dir/int64_t/etc/zoneinfo \
++		    time_t.dir/$$type/etc/zoneinfo && \
++		  case $$type in \
++		  int32_t) range=-2147483648,2147483647;; \
++		  uint32_t) range=0,4294967296;; \
++		  int64_t) continue;; \
++		  *u*) range=0,10000000000;; \
++		  *) range=-10000000000,10000000000;; \
++		  esac && \
++		  echo checking $$type zones ... && \
++		  time_t.dir/int64_t/etc/zdump -V -t $$range $$zones \
++		      >time_t.dir/int64_t.out && \
++		  time_t.dir/$$type/etc/zdump -V -t $$range $$zones \
++		      >time_t.dir/$$type.out && \
++		  diff -u time_t.dir/int64_t.out time_t.dir/$$type.out \
++		    || exit; \
++		done
++		rm -fr time_t.dir
++
++tarballs traditional_tarballs signatures traditional_signatures: version
++		VERSION=`cat version` && \
++		$(MAKE) VERSION="$$VERSION" $@_version
++
++tarballs_version: traditional_tarballs_version tzdb-$(VERSION).tar.lz
++traditional_tarballs_version: \
++  tzcode$(VERSION).tar.gz tzdata$(VERSION).tar.gz
++signatures_version: traditional_signatures_version tzdb-$(VERSION).tar.lz.asc
++traditional_signatures_version: \
++  tzcode$(VERSION).tar.gz.asc tzdata$(VERSION).tar.gz.asc \
++
++tzcode$(VERSION).tar.gz: set-timestamps.out
++		LC_ALL=C && export LC_ALL && \
++		tar $(TARFLAGS) -cf - \
++		    $(COMMON) $(DOCS) $(SOURCES) | \
++		  gzip $(GZIPFLAGS) >$@.out
++		mv $@.out $@
++
++tzdata$(VERSION).tar.gz: set-timestamps.out
++		LC_ALL=C && export LC_ALL && \
++		tar $(TARFLAGS) -cf - $(COMMON) $(DATA) $(MISC) | \
++		  gzip $(GZIPFLAGS) >$@.out
++		mv $@.out $@
++
++tzdb-$(VERSION).tar.lz: set-timestamps.out
++		rm -fr tzdb-$(VERSION)
++		mkdir tzdb-$(VERSION)
++		ln $(ENCHILADA) tzdb-$(VERSION)
++		touch -cmr `ls -t tzdb-$(VERSION)/* | sed 1q` tzdb-$(VERSION)
++		LC_ALL=C && export LC_ALL && \
++		tar $(TARFLAGS) -cf - tzdb-$(VERSION) | lzip -9 >$@.out
++		mv $@.out $@
++
++tzcode$(VERSION).tar.gz.asc: tzcode$(VERSION).tar.gz
++		gpg --armor --detach-sign $?
++
++tzdata$(VERSION).tar.gz.asc: tzdata$(VERSION).tar.gz
++		gpg --armor --detach-sign $?
++
++tzdb-$(VERSION).tar.lz.asc: tzdb-$(VERSION).tar.lz
++		gpg --armor --detach-sign $?
++
++typecheck:
++		$(MAKE) clean
++		for i in "long long" unsigned; \
++		do \
++			$(MAKE) CFLAGS="-DTYPECHECK -D__time_t_defined -D_TIME_T \"-Dtime_t=$$i\"" ; \
++			./zdump -v Europe/Rome ; \
++			$(MAKE) clean ; \
++		done
++
++zonenames:	$(TDATA)
++		@$(AWK) '/^Zone/ { print $$2 } /^Link/ { print $$3 }' $(TDATA)
++
++asctime.o:	private.h tzfile.h
++date.o:		private.h
++difftime.o:	private.h
++localtime.o:	private.h tzfile.h
++strftime.o:	private.h tzfile.h
++zdump.o:	version.h
++zic.o:		private.h tzfile.h version.h
++
++.KEEP_STATE:
++
++.PHONY: ALL INSTALL all
++.PHONY: check check_character_set check_links
++.PHONY: check_public check_sorted check_tables
++.PHONY: check_time_t_alternatives check_tzs check_web check_white_space
++.PHONY: clean clean_misc force_tzs
++.PHONY: install install_data maintainer-clean names
++.PHONY: posix_only posix_packrat posix_right
++.PHONY: public right_only right_posix signatures signatures_version
++.PHONY: tarballs tarballs_version typecheck
++.PHONY: zonenames zones
+Index: contrib/tzdata/NEWS
+===================================================================
+--- contrib/tzdata/NEWS	(nonexistent)
++++ contrib/tzdata/NEWS	(working copy)
+@@ -0,0 +1,3782 @@
++News for the tz database
++
++Release 2016i - 2016-11-01 23:19:52 -0700
++
++  Briefly: Cyprus split into two time zones on 2016-10-30, and Tonga
++  reintroduces DST on 2016-11-06.
++
++  Changes to future time stamps
++
++    Pacific/Tongatapu begins DST on 2016-11-06 at 02:00, ending on
++    2017-01-15 at 03:00.  Assume future observances in Tonga will be
++    from the first Sunday in November through the third Sunday in
++    January, like Fiji.  (Thanks to Pulu ʻAnau.)  Switch to numeric
++    time zone abbreviations for this zone.
++
++  Changes to past and future time stamps
++
++    Northern Cyprus is now +03 year round, causing a split in Cyprus
++    time zones starting 2016-10-30 at 04:00.  This creates a zone
++    Asia/Famagusta.  (Thanks to Even Scharning and Matt Johnson.)
++
++    Antarctica/Casey switched from +08 to +11 on 2016-10-22.
++    (Thanks to Steffen Thorsen.)
++
++  Changes to past time stamps
++
++    Several corrections were made for pre-1975 time stamps in Italy.
++    These affect Europe/Malta, Europe/Rome, Europe/San_Marino, and
++    Europe/Vatican.
++
++    First, the 1893-11-01 00:00 transition in Italy used the new UT
++    offset (+01), not the old (+00:49:56).  (Thanks to Michael
++    Deckers.)
++
++    Second, rules for daylight saving in Italy were changed to agree
++    with Italy's National Institute of Metrological Research (INRiM)
++    except for 1944, as follows (thanks to Pierpaolo Bernardi, Brian
++    Inglis, and Michael Deckers):
++
++      The 1916-06-03 transition was at 24:00, not 00:00.
++
++      The 1916-10-01, 1919-10-05, and 1920-09-19 transitions were at
++      00:00, not 01:00.
++
++      The 1917-09-30 and 1918-10-06 transitions were at 24:00, not
++      01:00.
++
++      The 1944-09-17 transition was at 03:00, not 01:00.  This
++      particular change is taken from Italian law as INRiM's table,
++      (which says 02:00) appears to have a typo here.  Also, keep the
++      1944-04-03 transition for Europe/Rome, as Rome was controlled by
++      Germany then.
++
++      The 1967-1970 and 1972-1974 fallback transitions were at 01:00,
++      not 00:00.
++
++  Changes to code
++
++    The code should now be buildable on AmigaOS merely by setting the
++    appropriate Makefile variables.  (From a patch by Carsten Larsen.)
++
++
++Release 2016h - 2016-10-19 23:17:57 -0700
++
++  Changes to future time stamps
++
++    Asia/Gaza and Asia/Hebron end DST on 2016-10-29 at 01:00, not
++    2016-10-21 at 00:00.  (Thanks to Sharef Mustafa.)  Predict that
++    future fall transitions will be on the last Saturday of October
++    at 01:00, which is consistent with predicted spring transitions
++    on the last Saturday of March.  (Thanks to Tim Parenti.)
++
++  Changes to past time stamps
++
++    In Turkey, transitions in 1986-1990 were at 01:00 standard time
++    not at 02:00, and the spring 1994 transition was on March 20, not
++    March 27.  (Thanks to Kıvanç Yazan.)
++
++  Changes to past and future time zone abbreviations
++
++    Asia/Colombo now uses numeric time zone abbreviations like "+0530"
++    instead of alphabetic ones like "IST" and "LKT".  Various
++    English-language sources use "IST", "LKT" and "SLST", with no
++    working consensus.  (Usage of "SLST" mentioned by Sadika
++    Sumanapala.)
++
++  Changes to code
++
++    zic no longer mishandles relativizing file names when creating
++    symbolic links like /etc/localtime, when these symbolic links
++    are outside the usual directory hierarchy.  This fixes a bug
++    introduced in 2016g.  (Problem reported by Andreas Stieger.)
++
++  Changes to build procedure
++
++    New rules 'traditional_tarballs' and 'traditional_signatures' for
++    building just the traditional-format distribution.  (Requested by
++    Deborah Goldsmith.)
++
++    The file 'version' is now put into the tzdata tarball too.
++    (Requested by Howard Hinnant.)
++
++  Changes to documentation and commentary
++
++    The 'Theory' file now has a section on interface stability.
++    (Requested by Paul Koning.)  It also mentions features like
++    tm_zone and localtime_rz that have long been supported by the
++    reference code.
++
++    tz-link.htm has improved coverage of time zone boundaries suitable
++    for geolocation.  (Thanks to heads-ups from Evan Siroky and Matt
++    Johnson.)
++
++    The US commentary now mentions Allen and the "day of two noons".
++
++    The Fiji commentary mentions the government's 2016-10-03 press
++    release.  (Thanks to Raymond Kumar.)
++
++
++Release 2016g - 2016-09-13 08:56:38 -0700
++
++  Changes to future time stamps
++
++    Turkey switched from EET/EEST (+02/+03) to permanent +03,
++    effective 2016-09-07.  (Thanks to Burak AYDIN.)  Use "+03" rather
++    than an invented abbreviation for the new time.
++
++    New leap second 2016-12-31 23:59:60 UTC as per IERS Bulletin C 52.
++    (Thanks to Tim Parenti.)
++
++  Changes to past time stamps
++
++    For America/Los_Angeles, spring-forward transition times have been
++    corrected from 02:00 to 02:01 in 1948, and from 02:00 to 01:00 in
++    1950-1966.
++
++    For zones using Soviet time on 1919-07-01, transitions to UT-based
++    time were at 00:00 UT, not at 02:00 local time.  The affected
++    zones are Europe/Kirov, Europe/Moscow, Europe/Samara, and
++    Europe/Ulyanovsk.  (Thanks to Alexander Belopolsky.)
++
++  Changes to past and future time zone abbreviations
++
++    The Factory zone now uses the time zone abbreviation -00 instead
++    of a long English-language string, as -00 is now the normal way to
++    represent an undefined time zone.
++
++    Several zones in Antarctica and the former Soviet Union, along
++    with zones intended for ships at sea that cannot use POSIX TZ
++    strings, now use numeric time zone abbreviations instead of
++    invented or obsolete alphanumeric abbreviations.  The affected
++    zones are Antarctica/Casey, Antarctica/Davis,
++    Antarctica/DumontDUrville, Antarctica/Mawson, Antarctica/Rothera,
++    Antarctica/Syowa, Antarctica/Troll, Antarctica/Vostok,
++    Asia/Anadyr, Asia/Ashgabat, Asia/Baku, Asia/Bishkek, Asia/Chita,
++    Asia/Dushanbe, Asia/Irkutsk, Asia/Kamchatka, Asia/Khandyga,
++    Asia/Krasnoyarsk, Asia/Magadan, Asia/Omsk, Asia/Sakhalin,
++    Asia/Samarkand, Asia/Srednekolymsk, Asia/Tashkent, Asia/Tbilisi,
++    Asia/Ust-Nera, Asia/Vladivostok, Asia/Yakutsk, Asia/Yekaterinburg,
++    Asia/Yerevan, Etc/GMT-14, Etc/GMT-13, Etc/GMT-12, Etc/GMT-11,
++    Etc/GMT-10, Etc/GMT-9, Etc/GMT-8, Etc/GMT-7, Etc/GMT-6, Etc/GMT-5,
++    Etc/GMT-4, Etc/GMT-3, Etc/GMT-2, Etc/GMT-1, Etc/GMT+1, Etc/GMT+2,
++    Etc/GMT+3, Etc/GMT+4, Etc/GMT+5, Etc/GMT+6, Etc/GMT+7, Etc/GMT+8,
++    Etc/GMT+9, Etc/GMT+10, Etc/GMT+11, Etc/GMT+12, Europe/Kaliningrad,
++    Europe/Minsk, Europe/Samara, Europe/Volgograd, and
++    Indian/Kerguelen.  For Europe/Moscow the invented abbreviation MSM
++    was replaced by +05, whereas MSK and MSD were kept as they are not
++    our invention and are widely used.
++
++  Changes to zone names
++
++    Rename Asia/Rangoon to Asia/Yangon, with a backward compatibility link.
++    (Thanks to David Massoud.)
++
++  Changes to code
++
++    zic no longer generates binary files containing POSIX TZ-like
++    strings that disagree with the local time type after the last
++    explicit transition in the data.  This fixes a bug with
++    Africa/Casablanca and Africa/El_Aaiun in some year-2037 time
++    stamps on the reference platform.  (Thanks to Alexander Belopolsky
++    for reporting the bug and suggesting a way forward.)
++
++    If the installed localtime and/or posixrules files are symbolic
++    links, zic now keeps them symbolic links when updating them, for
++    compatibility with platforms like OpenSUSE where other programs
++    configure these files as symlinks.
++
++    zic now avoids hard linking to symbolic links, avoids some
++    unnecessary mkdir and stat system calls, and uses shorter file
++    names internally.
++
++    zdump has a new -i option to generate transitions in a
++    more-compact but still human-readable format.  This option is
++    experimental, and the output format may change in future versions.
++    (Thanks to Jon Skeet for suggesting that an option was needed,
++    and thanks to Tim Parenti and Chris Rovick for further comments.)
++
++  Changes to build procedure
++
++    An experimental distribution format is available, in addition
++    to the traditional format which will continue to be distributed.
++    The new format is a tarball tzdb-VERSION.tar.lz with signature
++    file tzdb-VERSION.tar.lz.asc.  It unpacks to a top-level directory
++    tzdb-VERSION containing the code and data of the traditional
++    two-tarball format, along with extra data that may be useful.
++    (Thanks to Antonio Diaz Diaz, Oscar van Vlijmen, and many others
++    for comments about the experimental format.)
++
++    The release version number is now more accurate in the usual case
++    where releases are built from a Git repository.  For example, if
++    23 commits and some working-file changes have been made since
++    release 2016g, the version number is now something like
++    '2016g-23-g50556e3-dirty' instead of the misleading '2016g'.
++    Official releases uses the same version number format as before,
++    e.g., '2016g'.  To support the more-accurate version number, its
++    specification has moved from a line in the Makefile to a new
++    source file 'version'.
++
++    The experimental distribution contains a file to2050.tzs that
++    contains what should be the output of 'zdump -i -c 2050' on
++    primary zones.  If this file is available, 'make check' now checks
++    that zdump generates this output.
++
++    'make check_web' now works on Fedora-like distributions.
++
++  Changes to documentation and commentary
++
++    tzfile.5 now documents the new restriction on POSIX TZ-like
++    strings that is now implemented by zic.
++
++    Comments now cite URLs for some 1917-1921 Russian DST decrees.
++    (Thanks to Alexander Belopolsky.)
++
++    tz-link.htm mentions JuliaTime (thanks to Curtis Vogt) and Time4J
++    (thanks to Meno Hochschild) and ThreeTen-Extra, and its
++    description of Java 8 has been brought up to date (thanks to
++    Stephen Colebourne).  Its description of local time on Mars has
++    been updated to match current practice, and URLs have been updated
++    and some obsolete ones removed.
++
++
++Release 2016f - 2016-07-05 16:26:51 +0200
++
++  Changes affecting future time stamps
++
++    The Egyptian government changed its mind on short notice, and
++    Africa/Cairo will not introduce DST starting 2016-07-07 after all.
++    (Thanks to Mina Samuel.)
++
++    Asia/Novosibirsk switches from +06 to +07 on 2016-07-24 at 02:00.
++    (Thanks to Stepan Golosunov.)
++
++  Changes to past and future time stamps
++
++    Asia/Novokuznetsk and Asia/Novosibirsk now use numeric time zone
++    abbreviations instead of invented ones.
++
++  Changes affecting past time stamps
++
++    Europe/Minsk's 1992-03-29 spring-forward transition was at 02:00 not 00:00.
++    (Thanks to Stepan Golosunov.)
++
++
++Release 2016e - 2016-06-14 08:46:16 -0700
++
++  Changes affecting future time stamps
++
++    Africa/Cairo observes DST in 2016 from July 7 to the end of October.
++    Guess October 27 and 24:00 transitions.  (Thanks to Steffen Thorsen.)
++    For future years, guess April's last Thursday to October's last
++    Thursday except for Ramadan.
++
++  Changes affecting past time stamps
++
++    Locations while uninhabited now use '-00', not 'zzz', as a
++    placeholder time zone abbreviation.  This is inspired by Internet
++    RFC 3339 and is more consistent with numeric time zone
++    abbreviations already used elsewhere.  The change affects several
++    arctic and antarctic locations, e.g., America/Cambridge_Bay before
++    1920 and Antarctica/Troll before 2005.
++
++    Asia/Baku's 1992-09-27 transition from +04 (DST) to +04 (non-DST) was
++    at 03:00, not 23:00 the previous day.  (Thanks to Michael Deckers.)
++
++  Changes to code
++
++    zic now outputs a dummy transition at time 2**31 - 1 in zones
++    whose POSIX-style TZ strings contain a '<'.  This mostly works
++    around Qt bug 53071 <https://bugreports.qt.io/browse/QTBUG-53071>.
++    (Thanks to Zhanibek Adilbekov for reporting the Qt bug.)
++
++  Changes affecting documentation and commentary
++
++    tz-link.htm says why governments should give plenty of notice for
++    time zone or DST changes, and refers to Matt Johnson's blog post.
++
++    tz-link.htm mentions Tzdata for Elixir.  (Thanks to Matt Johnson.)
++
++
++Release 2016d - 2016-04-17 22:50:29 -0700
++
++  Changes affecting future time stamps
++
++    America/Caracas switches from -0430 to -04 on 2016-05-01 at 02:30.
++    (Thanks to Alexander Krivenyshev for the heads-up.)
++
++    Asia/Magadan switches from +10 to +11 on 2016-04-24 at 02:00.
++    (Thanks to Alexander Krivenyshev and Matt Johnson.)
++
++    New zone Asia/Tomsk, split off from Asia/Novosibirsk.  It covers
++    Tomsk Oblast, Russia, which switches from +06 to +07 on 2016-05-29
++    at 02:00.  (Thanks to Stepan Golosunov.)
++
++  Changes affecting past time stamps
++
++    New zone Europe/Kirov, split off from Europe/Volgograd.  It covers
++    Kirov Oblast, Russia, which switched from +04/+05 to +03/+04 on
++    1989-03-26 at 02:00, roughly a year after Europe/Volgograd made
++    the same change.  (Thanks to Stepan Golosunov.)
++
++    Russia and nearby locations had daylight-saving transitions on
++    1992-03-29 at 02:00 and 1992-09-27 at 03:00, instead of on
++    1992-03-28 at 23:00 and 1992-09-26 at 23:00.  (Thanks to Stepan
++    Golosunov.)
++
++    Many corrections to historical time in Kazakhstan from 1991
++    through 2005.  (Thanks to Stepan Golosunov.)  Replace Kazakhstan's
++    invented time zone abbreviations with numeric abbreviations.
++
++  Changes to commentary
++
++    Mention Internet RFCs 7808 (TZDIST) and 7809 (CalDAV time zone references).
++
++
++Release 2016c - 2016-03-23 00:51:27 -0700
++
++  Changes affecting future time stamps
++
++    Azerbaijan no longer observes DST.  (Thanks to Steffen Thorsen.)
++
++    Chile reverts from permanent to seasonal DST.  (Thanks to Juan
++    Correa for the heads-up, and to Tim Parenti for corrections.)
++    Guess that future transitions are August's and May's second
++    Saturdays at 24:00 mainland time.  Also, call the period from
++    2014-09-07 through 2016-05-14 daylight saving time instead of
++    standard time, as that seems more appropriate now.
++
++  Changes affecting past time stamps
++
++    Europe/Kaliningrad and Europe/Vilnius changed from +03/+04 to
++    +02/+03 on 1989-03-26, not 1991-03-31.  Europe/Volgograd changed
++    from +04/+05 to +03/+04 on 1988-03-27, not 1989-03-26.
++    (Thanks to Stepan Golosunov.)
++
++  Changes to commentary
++
++    Several updates and URLs for historical and proposed Russian changes.
++    (Thanks to Stepan Golosunov, Matt Johnson, and Alexander Krivenyshev.)
++
++
++Release 2016b - 2016-03-12 17:30:14 -0800
++
++  Compatibility note
++
++    Starting with release 2016b, some data entries cause zic implementations
++    derived from tz releases 2005j through 2015e to issue warnings like
++    "time zone abbreviation differs from POSIX standard (+03)".
++    These warnings should not otherwise affect zic's output and can safely be
++    ignored on today's platforms, as the warnings refer to a restriction in
++    POSIX.1-1988 that was removed in POSIX.1-2001.  One way to suppress the
++    warnings is to upgrade to zic derived from tz releases 2015f and later.
++
++  Changes affecting future time stamps
++
++    New zones Europe/Astrakhan and Europe/Ulyanovsk for Astrakhan and
++    Ulyanovsk Oblasts, Russia, both of which will switch from +03 to +04 on
++    2016-03-27 at 02:00 local time.  They need distinct zones since their
++    post-1970 histories disagree.  New zone Asia/Barnaul for Altai Krai and
++    Altai Republic, Russia, which will switch from +06 to +07 on the same date
++    and local time.  The Astrakhan change is already official; the others have
++    passed the first reading in the State Duma and are extremely likely.
++    Also, Asia/Sakhalin moves from +10 to +11 on 2016-03-27 at 02:00.
++    (Thanks to Alexander Krivenyshev for the heads-up, and to Matt Johnson
++    and Stepan Golosunov for followup.)
++
++    As a trial of a new system that needs less information to be made up,
++    the new zones use numeric time zone abbreviations like "+04"
++    instead of invented abbreviations like "ASTT".
++
++    Haiti will not observe DST in 2016.  (Thanks to Jean Antoine via
++    Steffen Thorsen.)
++
++    Palestine's spring-forward transition on 2016-03-26 is at 01:00, not 00:00.
++    (Thanks to Hannah Kreitem.) Guess future transitions will be March's last
++    Saturday at 01:00, not March's last Friday at 24:00.
++
++  Changes affecting past time stamps
++
++    Europe/Chisinau observed DST during 1990, and switched from +04 to
++    +03 at 1990-05-06 02:00, instead of switching from +03 to +02.
++    (Thanks to Stepan Golosunov.)
++
++    1991 abbreviations in Europe/Samara should be SAMT/SAMST, not
++    KUYT/KUYST.  (Thanks to Stepan Golosunov.)
++
++  Changes to code
++
++    tzselect's diagnostics and checking, and checktab.awk's checking,
++    have been improved.  (Thanks to J William Piggott.)
++
++    tzcode now builds under MinGW.  (Thanks to Ian Abbott and Esben Haabendal.)
++
++    tzselect now tests Julian-date TZ settings more accurately.
++    (Thanks to J William Piggott.)
++
++  Changes to commentary
++
++    Comments in zone tables have been improved.  (Thanks to J William Piggott.)
++
++    tzselect again limits its menu comments so that menus fit on a
++    24x80 alphanumeric display.
++
++    A new web page tz-how-to.html.  (Thanks to Bill Seymour.)
++
++    In the Theory file, the description of possible time zone abbreviations in
++    tzdata has been cleaned up, as the old description was unclear and
++    inconsistent.  (Thanks to Alain Mouette for reporting the problem.)
++
++
++Release 2016a - 2016-01-26 23:28:02 -0800
++
++  Changes affecting future time stamps
++
++    America/Cayman will not observe daylight saving this year after all.
++    Revert our guess that it would.  (Thanks to Matt Johnson.)
++
++    Asia/Chita switches from +0800 to +0900 on 2016-03-27 at 02:00.
++    (Thanks to Alexander Krivenyshev.)
++
++    Asia/Tehran now has DST predictions for the year 2038 and later,
++    to be March 21 00:00 to September 21 00:00.  This is likely better
++    than predicting no DST, albeit off by a day every now and then.
++
++  Changes affecting past and future time stamps
++
++    America/Metlakatla switched from PST all year to AKST/AKDT on
++    2015-11-01 at 02:00.  (Thanks to Steffen Thorsen.)
++
++    America/Santa_Isabel has been removed, and replaced with a
++    backward compatibility link to America/Tijuana.  Its contents were
++    apparently based on a misreading of Mexican legislation.
++
++  Changes affecting past time stamps
++
++    Asia/Karachi's two transition times in 2002 were off by a minute.
++    (Thanks to Matt Johnson.)
++
++  Changes affecting build procedure
++
++    An installer can now combine leap seconds with use of the backzone file,
++    e.g., with 'make PACKRATDATA=backzone REDO=posix_right zones'.
++    The old 'make posix_packrat' rule is now marked as obsolescent.
++    (Thanks to Ian Abbott for an initial implementation.)
++
++  Changes affecting documentation and commentary
++
++    A new file LICENSE makes it easier to see that the code and data
++    are mostly public-domain.  (Thanks to James Knight.)  The three
++    non-public-domain files now use the current (3-clause) BSD license
++    instead of older versions of that license.
++
++    tz-link.htm mentions the BDE library (thanks to Andrew Paprocki),
++    CCTZ (thanks to Tim Parenti), TimeJones.com, and has a new section
++    on editing tz source files (with a mention of Sublime zoneinfo,
++    thanks to Gilmore Davidson).
++
++    The Theory and asia files now mention the 2015 book "The Global
++    Transformation of Time, 1870-1950", and cite a couple of reviews.
++
++    The America/Chicago entry now documents the informal use of US
++    central time in Fort Pierre, South Dakota.  (Thanks to Rick
++    McDermid, Matt Johnson, and Steve Jones.)
++
++
++Release 2015g - 2015-10-01 00:39:51 -0700
++
++  Changes affecting future time stamps
++
++    Turkey's 2015 fall-back transition is scheduled for Nov. 8, not Oct. 25.
++    (Thanks to Fatih.)
++
++    Norfolk moves from +1130 to +1100 on 2015-10-04 at 02:00 local time.
++    (Thanks to Alexander Krivenyshev.)
++
++    Fiji's 2016 fall-back transition is scheduled for January 17, not 24.
++    (Thanks to Ken Rylander.)
++
++    Fort Nelson, British Columbia will not fall back on 2015-11-01.  It has
++    effectively been on MST (-0700) since it advanced its clocks on 2015-03-08.
++    New zone America/Fort_Nelson.  (Thanks to Matt Johnson.)
++
++  Changes affecting past time stamps
++
++    Norfolk observed DST from 1974-10-27 02:00 to 1975-03-02 02:00.
++
++  Changes affecting code
++
++    localtime no longer mishandles America/Anchorage after 2037.
++    (Thanks to Bradley White for reporting the bug.)
++
++    On hosts with signed 32-bit time_t, localtime no longer mishandles
++    Pacific/Fiji after 2038-01-16 14:00 UTC.
++
++    The localtime module allows the variables 'timezone', 'daylight',
++    and 'altzone' to be in common storage shared with other modules,
++    and declares them in case the system <time.h> does not.
++    (Problems reported by Kees Dekker.)
++
++    On platforms with tm_zone, strftime.c now assumes it is not NULL.
++    This simplifies the code and is consistent with zdump.c.
++    (Problem reported by Christos Zoulas.)
++
++  Changes affecting documentation
++
++   The tzfile man page now documents that transition times denote the
++   starts (not the ends) of the corresponding time periods.
++   (Ambiguity reported by Bill Seymour.)
++
++
++Release 2015f - 2015-08-10 18:06:56 -0700
++
++  Changes affecting future time stamps
++
++    North Korea switches to +0830 on 2015-08-15.  (Thanks to Steffen Thorsen.)
++    The abbreviation remains "KST".  (Thanks to Robert Elz.)
++
++    Uruguay no longer observes DST.  (Thanks to Steffen Thorsen
++    and Pablo Camargo.)
++
++  Changes affecting past and future time stamps
++
++    Moldova starts and ends DST at 00:00 UTC, not at 01:00 UTC.
++    (Thanks to Roman Tudos.)
++
++  Changes affecting data format and code
++
++    zic's '-y YEARISTYPE' option is no longer documented.  The TYPE
++    field of a Rule line should now be '-'; the old values 'even',
++    'odd', 'uspres', 'nonpres', 'nonuspres' were already undocumented.
++    Although the implementation has not changed, these features do not
++    work in the default installation, they are not used in the data,
++    and they are now considered obsolescent.
++
++    zic now checks that two rules don't take effect at the same time.
++    (Thanks to Jon Skeet and Arthur David Olson.)  Constraints on
++    simultaneity are now documented.
++
++    The two characters '%z' in a zone format now stand for the UTC
++    offset, e.g., '-07' for seven hours behind UTC and '+0530' for
++    five hours and thirty minutes ahead.  This better supports time
++    zone abbreviations conforming to POSIX.1-2001 and later.
++
++  Changes affecting installed data files
++
++    Comments for America/Halifax and America/Glace_Bay have been improved.
++    (Thanks to Brian Inglis.)
++
++    Data entries have been simplified for Atlantic/Canary, Europe/Simferopol,
++    Europe/Sofia, and Europe/Tallinn.  This yields slightly smaller
++    installed data files for Europe/Simferopol and Europe/Tallinn.
++    It does not affect timestamps.  (Thanks to Howard Hinnant.)
++
++  Changes affecting code
++
++    zdump and zic no longer warn about valid time zone abbreviations
++    like '-05'.
++
++    Some Visual Studio 2013 warnings have been suppressed.
++    (Thanks to Kees Dekker.)
++
++    'date' no longer sets the time of day and its -a, -d, -n and -t
++    options have been removed.  Long obsolescent, the implementation
++    of these features had porting problems.  Builders no longer need
++    to configure HAVE_ADJTIME, HAVE_SETTIMEOFDAY, or HAVE_UTMPX_H.
++    (Thanks to Kees Dekker for pointing out the problem.)
++
++  Changes affecting documentation
++
++    The Theory file mentions naming issues earlier, as these seem to be
++    poorly publicized (thanks to Gilmore Davidson for reporting the problem).
++
++    tz-link.htm mentions Time Zone Database Parser (thanks to Howard Hinnant).
++
++    Mention that Herbert Samuel introduced the term "Summer Time".
++
++
++Release 2015e - 2015-06-13 10:56:02 -0700
++
++  Changes affecting future time stamps
++
++    Morocco will suspend DST from 2015-06-14 03:00 through 2015-07-19 02:00,
++    not 06-13 and 07-18 as we had guessed.  (Thanks to Milamber.)
++
++    Assume Cayman Islands will observe DST starting next year, using US rules.
++    Although it isn't guaranteed, it is the most likely.
++
++  Changes affecting data format
++
++    The file 'iso3166.tab' now uses UTF-8, so that its entries can better
++    spell the names of Åland Islands, Côte d'Ivoire, and Réunion.
++
++  Changes affecting code
++
++    When displaying data, tzselect converts it to the current locale's
++    encoding if the iconv command works.  (Problem reported by random832.)
++
++    tzselect no longer mishandles Dominica, fixing a bug introduced
++    in Release 2014f.  (Problem reported by Owen Leibman.)
++
++    zic -l no longer fails when compiled with -DTZDEFAULT=\"/etc/localtime\".
++    This fixes a bug introduced in Release 2014f.
++    (Problem reported by Leonardo Chiquitto.)
++
++
++Release 2015d - 2015-04-24 08:09:46 -0700
++
++  Changes affecting future time stamps
++
++    Egypt will not observe DST in 2015 and will consider canceling it
++    permanently.  For now, assume no DST indefinitely.
++    (Thanks to Ahmed Nazmy and Tim Parenti.)
++
++  Changes affecting past time stamps
++
++    America/Whitehorse switched from UT -09 to -08 on 1967-05-28, not
++    1966-07-01.  Also, Yukon's time zone history is documented better.
++    (Thanks to Brian Inglis and Dennis Ferguson.)
++
++  Change affecting past and future time zone abbreviations
++
++    The abbreviations for Hawaii-Aleutian standard and daylight times
++    have been changed from HAST/HADT to HST/HDT, as per US Government
++    Printing Office style.  This affects only America/Adak since 1983,
++    as America/Honolulu was already using the new style.
++
++  Changes affecting code
++
++   zic has some minor performance improvements.
++
++
++Release 2015c - 2015-04-11 08:55:55 -0700
++
++  Changes affecting future time stamps
++
++    Egypt's spring-forward transition is at 24:00 on April's last Thursday,
++    not 00:00 on April's last Friday.  2015's transition will therefore be on
++    Thursday, April 30 at 24:00, not Friday, April 24 at 00:00.  Similar fixes
++    apply to 2026, 2037, 2043, etc.  (Thanks to Steffen Thorsen.)
++
++  Changes affecting past time stamps
++
++    The following changes affect some pre-1991 Chile-related time stamps
++    in America/Santiago, Antarctica/Palmer, and Pacific/Easter.
++
++      The 1910 transition was January 10, not January 1.
++
++      The 1918 transition was September 10, not September 1.
++
++      The UT -04 time observed from 1932 to 1942 is now considered to
++      be standard time, not year-round DST.
++
++      Santiago observed DST (UT -03) from 1946-07-15 through
++      1946-08-31, then reverted to standard time, then switched to -05
++      on 1947-04-01.
++
++      Assume transitions before 1968 were at 00:00, since we have no data
++      saying otherwise.
++
++      The spring 1988 transition was 1988-10-09, not 1988-10-02.
++      The fall 1990 transition was 1990-03-11, not 1990-03-18.
++
++      Assume no UTC offset change for Pacific/Easter on 1890-01-01,
++      and omit all transitions on Pacific/Easter from 1942 through 1946
++      since we have no data suggesting that they existed.
++
++    One more zone has been turned into a link, as it differed
++    from an existing zone only for older time stamps.  As usual,
++    this change affects UTC offsets in pre-1970 time stamps only.
++    The zone's old contents have been moved to the 'backzone' file.
++    The affected zone is America/Montreal.
++
++  Changes affecting commentary
++
++    Mention the TZUpdater tool.
++
++    Mention "The Time Now".  (Thanks to Brandon Ramsey.)
++
++
++Release 2015b - 2015-03-19 23:28:11 -0700
++
++  Changes affecting future time stamps
++
++    Mongolia will start observing DST again this year, from the last
++    Saturday in March at 02:00 to the last Saturday in September at 00:00.
++    (Thanks to Ganbold Tsagaankhuu.)
++
++    Palestine will start DST on March 28, not March 27.  Also,
++    correct the fall 2014 transition from September 26 to October 24.
++    Adjust future predictions accordingly.  (Thanks to Steffen Thorsen.)
++
++  Changes affecting past time stamps
++
++    The 1982 zone shift in Pacific/Easter has been corrected, fixing a 2015a
++    regression.  (Thanks to Stuart Bishop for reporting the problem.)
++
++    Some more zones have been turned into links, when they differed
++    from existing zones only for older time stamps.  As usual,
++    these changes affect UTC offsets in pre-1970 time stamps only.
++    Their old contents have been moved to the 'backzone' file.
++    The affected zones are: America/Antigua, America/Cayman,
++    Pacific/Midway, and Pacific/Saipan.
++
++  Changes affecting time zone abbreviations
++
++    Correct the 1992-2010 DST abbreviation in Volgograd from "MSK" to "MSD".
++    (Thanks to Hank W.)
++
++  Changes affecting code
++
++    Fix integer overflow bug in reference 'mktime' implementation.
++    (Problem reported by Jörg Richter.)
++
++    Allow -Dtime_tz=time_t compilations, and allow -Dtime_tz=... libraries
++    to be used in the same executable as standard-library time_t functions.
++    (Problems reported by Bradley White.)
++
++  Changes affecting commentary
++
++    Cite the recent Mexican decree changing Quintana Roo's time zone.
++    (Thanks to Carlos Raúl Perasso.)
++
++    Likewise for the recent Chilean decree.  (Thanks to Eduardo Romero Urra.)
++
++    Update info about Mars time.
++
++
++Release 2015a - 2015-01-29 22:35:20 -0800
++
++  Changes affecting future time stamps
++
++    The Mexican state of Quintana Roo, represented by America/Cancun,
++    will shift from Central Time with DST to Eastern Time without DST
++    on 2015-02-01 at 02:00.  (Thanks to Steffen Thorsen and Gwillim Law.)
++
++    Chile will not change clocks in April or thereafter; its new standard time
++    will be its old daylight saving time.  This affects America/Santiago,
++    Pacific/Easter, and Antarctica/Palmer.  (Thanks to Juan Correa.)
++
++    New leap second 2015-06-30 23:59:60 UTC as per IERS Bulletin C 49.
++    (Thanks to Tim Parenti.)
++
++  Changes affecting past time stamps
++
++    Iceland observed DST in 1919 and 1921, and its 1939 fallback
++    transition was Oct. 29, not Nov. 29.  Remove incorrect data from
++    Shanks about time in Iceland between 1837 and 1908.
++
++    Some more zones have been turned into links, when they differed
++    from existing zones only for older time stamps.  As usual,
++    these changes affect UTC offsets in pre-1970 time stamps only.
++    Their old contents have been moved to the 'backzone' file.
++    The affected zones are: Asia/Aden, Asia/Bahrain, Asia/Kuwait,
++    and Asia/Muscat.
++
++  Changes affecting code
++
++    tzalloc now scrubs time zone abbreviations compatibly with the way
++    that tzset always has, by replacing invalid bytes with '_' and by
++    shortening too-long abbreviations.
++
++    tzselect ports to POSIX awk implementations, no longer mishandles
++    POSIX TZ settings when GNU awk is used, and reports POSIX TZ
++    settings to the user.  (Thanks to Stefan Kuhn.)
++
++  Changes affecting build procedure
++
++    'make check' now checks for links to links in the data.
++    One such link (for Africa/Asmera) has been fixed.
++    (Thanks to Stephen Colebourne for pointing out the problem.)
++
++  Changes affecting commentary
++
++    The leapseconds file commentary now mentions the expiration date.
++    (Problem reported by Martin Burnicki.)
++
++    Update Mexican Library of Congress URL.
++
++
++Release 2014j - 2014-11-10 17:37:11 -0800
++
++  Changes affecting current and future time stamps
++
++    Turks & Caicos' switch from US eastern time to UT -04 year-round
++    did not occur on 2014-11-02 at 02:00.  It's currently scheduled
++    for 2015-11-01 at 02:00.  (Thanks to Chris Walton.)
++
++  Changes affecting past time stamps
++
++    Many pre-1989 time stamps have been corrected for Asia/Seoul and
++    Asia/Pyongyang, based on sources for the Korean-language Wikipedia
++    entry for time in Korea.  (Thanks to Sanghyuk Jung.)  Also, no
++    longer guess that Pyongyang mimicked Seoul time after World War II,
++    as this is politically implausible.
++
++    Some more zones have been turned into links, when they differed
++    from existing zones only for older time stamps.  As usual,
++    these changes affect UTC offsets in pre-1970 time stamps only.
++    Their old contents have been moved to the 'backzone' file.
++    The affected zones are: Africa/Addis_Ababa, Africa/Asmara,
++    Africa/Dar_es_Salaam, Africa/Djibouti, Africa/Kampala,
++    Africa/Mogadishu, Indian/Antananarivo, Indian/Comoro, and
++    Indian/Mayotte.
++
++  Changes affecting commentary
++
++    The commentary is less enthusiastic about Shanks as a source,
++    and is more careful to distinguish UT from UTC.
++
++
++Release 2014i - 2014-10-21 22:04:57 -0700
++
++  Changes affecting future time stamps
++
++    Pacific/Fiji will observe DST from 2014-11-02 02:00 to 2015-01-18 03:00.
++    (Thanks to Ken Rylander for the heads-up.)  Guess that future
++    years will use a similar pattern.
++
++    A new Zone Pacific/Bougainville, for the part of Papua New Guinea
++    that plans to switch from UT +10 to +11 on 2014-12-28 at 02:00.
++    (Thanks to Kiley Walbom for the heads-up.)
++
++  Changes affecting time zone abbreviations
++
++    Since Belarus is not changing its clocks even though Moscow is,
++    the time zone abbreviation in Europe/Minsk is changing from FET
++    to its more-traditional value MSK on 2014-10-26 at 01:00.
++    (Thanks to Alexander Bokovoy for the heads-up about Belarus.)
++
++    The new abbreviation IDT stands for the pre-1976 use of UT +08 in
++    Indochina, to distinguish it better from ICT (+07).
++
++  Changes affecting past time stamps
++
++    Many time stamps have been corrected for Asia/Ho_Chi_Minh before 1976
++    (thanks to Trần Ngọc Quân for an indirect pointer to Trần Tiến Bình's
++    authoritative book).  Asia/Ho_Chi_Minh has been added to
++    zone1970.tab, to give tzselect users in Vietnam two choices,
++    since north and south Vietnam disagreed after our 1970 cutoff.
++
++    Asia/Phnom_Penh and Asia/Vientiane have been turned into links, as
++    they differed from existing zones only for older time stamps.  As
++    usual, these changes affect pre-1970 time stamps only.  Their old
++    contents have been moved to the 'backzone' file.
++
++  Changes affecting code
++
++    The time-related library functions now set errno on failure, and
++    some crashes in the new tzalloc-related library functions have
++    been fixed.  (Thanks to Christos Zoulas for reporting most of
++    these problems and for suggesting fixes.)
++
++    If USG_COMPAT is defined and the requested time stamp is standard time,
++    the tz library's localtime and mktime functions now set the extern
++    variable timezone to a value appropriate for that time stamp; and
++    similarly for ALTZONE, daylight saving time, and the altzone variable.
++    This change is a companion to the tzname change in 2014h, and is
++    designed to make timezone and altzone more compatible with tzname.
++
++    The tz library's functions now set errno to EOVERFLOW if they fail
++    because the result cannot be represented.  ctime and ctime_r now
++    return NULL and set errno when a time stamp is out of range, rather
++    than having undefined behavior.
++
++    Some bugs associated with the new 2014g functions have been fixed.
++    This includes a bug that largely incapacitated the new functions
++    time2posix_z and posix2time_z.  (Thanks to Christos Zoulas.)
++    It also includes some uses of uninitialized variables after tzalloc.
++    The new code uses the standard type 'ssize_t', which the Makefile
++    now gives porting advice about.
++
++  Changes affecting commentary
++
++    Updated URLs for NRC Canada (thanks to Matt Johnson and Brian Inglis).
++
++
++Release 2014h - 2014-09-25 18:59:03 -0700
++
++  Changes affecting past time stamps
++
++    America/Jamaica's 1974 spring-forward transition was Jan. 6, not Apr. 28.
++
++    Shanks says Asia/Novokuznetsk switched from LMT (not "NMT") on 1924-05-01,
++    not 1920-01-06.  The old entry was based on a misinterpretation of Shanks.
++
++    Some more zones have been turned into links, when they differed
++    from existing zones only for older time stamps.  As usual,
++    these changes affect UTC offsets in pre-1970 time stamps only.
++    Their old contents have been moved to the 'backzone' file.
++    The affected zones are: Africa/Blantyre, Africa/Bujumbura,
++    Africa/Gaborone, Africa/Harare, Africa/Kigali, Africa/Lubumbashi,
++    Africa/Lusaka, Africa/Maseru, and Africa/Mbabane.
++
++  Changes affecting code
++
++    zdump -V and -v now output gmtoff= values on all platforms,
++    not merely on platforms defining TM_GMTOFF.
++
++    The tz library's localtime and mktime functions now set tzname to a value
++    appropriate for the requested time stamp, and zdump now uses this
++    on platforms not defining TM_ZONE, fixing a 2014g regression.
++    (Thanks to Tim Parenti for reporting the problem.)
++
++    The tz library no longer sets tzname if localtime or mktime fails.
++
++    zdump -c no longer mishandles transitions near year boundaries.
++    (Thanks to Tim Parenti for reporting the problem.)
++
++    An access to uninitialized data has been fixed.
++    (Thanks to Jörg Richter for reporting the problem.)
++
++    When THREAD_SAFE is defined, the code ports to the C11 memory model.
++    A memory leak has been fixed if ALL_STATE and THREAD_SAFE are defined
++    and two threads race to initialize data used by gmtime-like functions.
++    (Thanks to Andy Heninger for reporting the problems.)
++
++  Changes affecting build procedure
++
++    'make check' now checks better for properly-sorted data.
++
++  Changes affecting documentation and commentary
++
++    zdump's gmtoff=N output is now documented, and its isdst=D output
++    is now documented to possibly output D values other than 0 or 1.
++
++    zdump -c's treatment of years is now documented to use the
++    Gregorian calendar and Universal Time without leap seconds,
++    and its behavior at cutoff boundaries is now documented better.
++    (Thanks to Arthur David Olson and Tim Parenti for reporting the problems.)
++
++    Programs are now documented to use the proleptic Gregorian calendar.
++    (Thanks to Alan Barrett for the suggestion.)
++
++    Fractional-second GMT offsets have been documented for civil time
++    in 19th-century Chennai, Jakarta, and New York.
++
++
++Release 2014g - 2014-08-28 12:31:23 -0700
++
++  Changes affecting future time stamps
++
++    Turks & Caicos is switching from US eastern time to UT -04
++    year-round, modeled as a switch on 2014-11-02 at 02:00.
++    [As noted in 2014j, this switch was later delayed.]
++
++  Changes affecting past time stamps
++
++    Time in Russia or the USSR before 1926 or so has been corrected by
++    a few seconds in the following zones: Asia/Irkutsk,
++    Asia/Krasnoyarsk, Asia/Omsk, Asia/Samarkand, Asia/Tbilisi,
++    Asia/Vladivostok, Asia/Yakutsk, Europe/Riga, Europe/Samara.  For
++    Asia/Yekaterinburg the correction is a few minutes.  (Thanks to
++    Vladimir Karpinsky.)
++
++    The Portuguese decree of 1911-05-26 took effect on 1912-01-01.
++    This affects 1911 time stamps in Africa/Bissau, Africa/Luanda,
++    Atlantic/Azores, and Atlantic/Madeira.  Also, Lisbon's pre-1912
++    GMT offset was -0:36:45 (rounded from -0:36:44.68), not -0:36:32.
++    (Thanks to Stephen Colebourne for pointing to the decree.)
++
++    Asia/Dhaka ended DST on 2009-12-31 at 24:00, not 23:59.
++
++    A new file 'backzone' contains data which may appeal to
++    connoisseurs of old time stamps, although it is out of scope for
++    the tz database, is often poorly sourced, and contains some data
++    that is known to be incorrect.  The new file is not recommended
++    for ordinary use and its entries are not installed by default.
++    (Thanks to Lester Caine for the high-quality Jersey, Guernsey, and
++    Isle of Man entries.)
++
++    Some more zones have been turned into links, when they differed
++    from existing zones only for older time stamps.  As usual,
++    these changes affect UTC offsets in pre-1970 time stamps only.
++    Their old contents have been moved to the 'backzone' file.
++    The affected zones are: Africa/Bangui, Africa/Brazzaville,
++    Africa/Douala, Africa/Kinshasa, Africa/Libreville, Africa/Luanda,
++    Africa/Malabo, Africa/Niamey, and Africa/Porto-Novo.
++
++  Changes affecting code
++
++    Unless NETBSD_INSPIRED is defined to 0, the tz library now
++    supplies functions for creating and using objects that represent
++    time zones. The new functions are tzalloc, tzfree, localtime_rz,
++    mktime_z, and (if STD_INSPIRED is also defined) posix2time_z and
++    time2posix_z.  They are intended for performance: for example,
++    localtime_rz (unlike localtime_r) is trivially thread-safe without
++    locking.  (Thanks to Christos Zoulas for proposing NetBSD-inspired
++    functions, and to Alan Barrett and Jonathan Lennox for helping to
++    debug the change.)
++
++    zdump now builds with the tz library unless USE_LTZ is defined to 0,
++    This lets zdump use tz features even if the system library lacks them.
++    To build zdump with the system library, use 'make CFLAGS=-DUSE_LTZ=0
++    TZDOBJS=zdump.o CHECK_TIME_T_ALTERNATIVES='.
++
++    zdump now uses localtime_rz if available, as it's significantly faster,
++    and it can help zdump better diagnose invalid time zone names.
++    Define HAVE_LOCALTIME_RZ to 0 to suppress this.  HAVE_LOCALTIME_RZ
++    defaults to 1 if NETBSD_INSPIRED && USE_LTZ.  When localtime_rz is
++    not available, zdump now uses localtime_r and tzset if available,
++    as this is a bit cleaner and faster than plain localtime.  Compile
++    with -DHAVE_LOCALTIME_R=0 and/or -DHAVE_TZSET=0 if your system
++    lacks these two functions.
++
++    If THREAD_SAFE is defined to 1, the tz library is now thread-safe.
++    Although not needed for tz's own applications, which are single-threaded,
++    this supports POSIX better if the tz library is used in multithreaded apps.
++
++    Some crashes have been fixed when zdump or the tz library is given
++    invalid or outlandish input.
++
++    The tz library no longer mishandles leap seconds on platforms with
++    unsigned time_t in time zones that lack ordinary transitions after 1970.
++
++    The tz code now attempts to infer TM_GMTOFF and TM_ZONE if not
++    already defined, to make it easier to configure on common platforms.
++    Define NO_TM_GMTOFF and NO_TM_ZONE to suppress this.
++
++    Unless the new macro UNINIT_TRAP is defined to 1, the tz code now
++    assumes that reading uninitialized memory yields garbage values
++    but does not cause other problems such as traps.
++
++    If TM_GMTOFF is defined and UNINIT_TRAP is 0, mktime is now
++    more likely to guess right for ambiguous time stamps near
++    transitions where tm_isdst does not change.
++
++    If HAVE_STRFTIME_L is defined to 1, the tz library now defines
++    strftime_l for compatibility with recent versions of POSIX.
++    Only the C locale is supported, though.  HAVE_STRFTIME_L defaults
++    to 1 on recent POSIX versions, and to 0 otherwise.
++
++    tzselect -c now uses a hybrid distance measure that works better
++    in Africa.  (Thanks to Alan Barrett for noting the problem.)
++
++    The C source code now ports to NetBSD when GCC_DEBUG_FLAGS is used,
++    or when time_tz is defined.
++
++    When HAVE_UTMPX_H is set the 'date' command now builds on systems
++    whose <utmpx.h> file does not define WTMPX_FILE, and when setting
++    the date it updates the wtmpx file if _PATH_WTMPX is defined.
++    This affects GNU/Linux and similar systems.
++
++    For easier maintenance later, some C code has been simplified,
++    some lint has been removed, and the code has been tweaked so that
++    plain 'make' is more likely to work.
++
++    The C type 'bool' is now used for boolean values, instead of 'int'.
++
++    The long-obsolete LOCALE_HOME code has been removed.
++
++    The long-obsolete 'gtime' function has been removed.
++
++  Changes affecting build procedure
++
++    'zdump' no longer links in ialloc.o, as it's not needed.
++
++    'make check_time_t_alternatives' no longer assumes GNU diff.
++
++  Changes affecting distribution tarballs
++
++    The files checktab.awk and zoneinfo2tdf.pl are now distributed in
++    the tzdata tarball instead of the tzcode tarball, since they help
++    maintain the data.  The NEWS and Theory files are now also
++    distributed in the tzdata tarball, as they're relevant for data.
++    (Thanks to Alan Barrett for pointing this out.)  Also, the
++    leapseconds.awk file is no longer distributed in the tzcode
++    tarball, since it belongs in the tzdata tarball (where 2014f
++    inadvertently also distributed it).
++
++  Changes affecting documentation and commentary
++
++    A new file CONTRIBUTING is distributed.  (Thanks to Tim Parenti for
++    suggesting a CONTRIBUTING file, and to Tony Finch and Walter Harms
++    for debugging it.)
++
++    The man pages have been updated to use function prototypes,
++    to document thread-safe variants like localtime_r, and to document
++    the NetBSD-inspired functions tzalloc, tzfree, localtime_rz, and
++    mktime_z.
++
++    The fields in Link lines have been renamed to be more descriptive
++    and more like the parameters of 'ln'.  LINK-FROM has become TARGET,
++    and LINK-TO has become LINK-NAME.
++
++    tz-link.htm mentions the IETF's tzdist working group; Windows
++    Runtime etc. (thanks to Matt Johnson); and HP-UX's tztab.
++
++    Some broken URLs have been fixed in the commentary.  (Thanks to
++    Lester Caine.)
++
++    Commentary about Philippines DST has been updated, and commentary
++    on pre-1970 time in India has been added.
++
++
++Release 2014f - 2014-08-05 17:42:36 -0700
++
++  Changes affecting future time stamps
++
++    Russia will subtract an hour from most of its time zones on 2014-10-26
++    at 02:00 local time.  (Thanks to Alexander Krivenyshev.)
++    There are a few exceptions: Magadan Oblast (Asia/Magadan) and Zabaykalsky
++    Krai are subtracting two hours; conversely, Chukotka Autonomous Okrug
++    (Asia/Anadyr), Kamchatka Krai (Asia/Kamchatka), Kemerovo Oblast
++    (Asia/Novokuznetsk), and the Samara Oblast and the Udmurt Republic
++    (Europe/Samara) are not changing their clocks.  The changed zones are
++    Europe/Kaliningrad, Europe/Moscow, Europe/Simferopol, Europe/Volgograd,
++    Asia/Yekaterinburg, Asia/Omsk, Asia/Novosibirsk, Asia/Krasnoyarsk,
++    Asia/Irkutsk, Asia/Yakutsk, Asia/Vladivostok, Asia/Khandyga,
++    Asia/Sakhalin, and Asia/Ust-Nera; Asia/Magadan will have two hours
++    subtracted; and Asia/Novokuznetsk's time zone abbreviation is affected,
++    but not its UTC offset.  Two zones are added: Asia/Chita (split
++    from Asia/Yakutsk, and also with two hours subtracted) and
++    Asia/Srednekolymsk (split from Asia/Magadan, but with only one hour
++    subtracted).  (Thanks to Tim Parenti for much of the above.)
++
++  Changes affecting time zone abbreviations
++
++    Australian eastern time zone abbreviations are now AEST/AEDT not EST,
++    and similarly for the other Australian zones.  That is, for eastern
++    standard and daylight saving time the abbreviations are AEST and AEDT
++    instead of the former EST for both; similarly, ACST/ACDT, ACWST/ACWDT,
++    and AWST/AWDT are now used instead of the former CST, CWST, and WST.
++    This change does not affect UTC offsets, only time zone abbreviations.
++    (Thanks to Rich Tibbett and many others.)
++
++    Asia/Novokuznetsk shifts from NOVT to KRAT (remaining on UT +07)
++    effective 2014-10-26 at 02:00 local time.
++
++    The time zone abbreviation for Xinjiang Time (observed in Ürümqi)
++    has been changed from URUT to XJT.  (Thanks to Luther Ma.)
++
++    Prefer MSK/MSD for Moscow time in Russia, even in other cities.
++    Similarly, prefer EET/EEST for eastern European time in Russia.
++
++    Change time zone abbreviations in (western) Samoa to use "ST" and
++    "DT" suffixes, as this is more likely to match common practice.
++    Prefix "W" to (western) Samoa time when its standard-time offset
++    disagrees with that of American Samoa.
++
++    America/Metlakatla now uses PST, not MeST, to abbreviate its time zone.
++
++    Time zone abbreviations have been updated for Japan's two time
++    zones used 1896-1937.  JWST now stands for Western Standard
++    Time, and JCST for Central Standard Time (formerly this was CJT).
++    These abbreviations are now used for time in Korea, Taiwan,
++    and Sakhalin while controlled by Japan.
++
++  Changes affecting past time stamps
++
++    China's five zones have been simplified to two, since the post-1970
++    differences in the other three seem to have been imaginary.  The
++    zones Asia/Harbin, Asia/Chongqing, and Asia/Kashgar have been
++    removed; backwards-compatibility links still work, albeit with
++    different behaviors for time stamps before May 1980.  Asia/Urumqi's
++    1980 transition to UT +08 has been removed, so that it is now at
++    +06 and not +08.  (Thanks to Luther Ma and to Alois Treindl;
++    Treindl sent helpful translations of two papers by Guo Qingsheng.)
++
++    Some zones have been turned into links, when they differed from existing
++    zones only for older UTC offsets where data entries were likely invented.
++    These changes affect UTC offsets in pre-1970 time stamps only.  This is
++    similar to the change in release 2013e, except this time for western
++    Africa.  The affected zones are: Africa/Bamako, Africa/Banjul,
++    Africa/Conakry, Africa/Dakar, Africa/Freetown, Africa/Lome,
++    Africa/Nouakchott, Africa/Ouagadougou, Africa/Sao_Tome, and
++    Atlantic/St_Helena.  This also affects the backwards-compatibility
++    link Africa/Timbuktu.  (Thanks to Alan Barrett, Stephen Colebourne,
++    Tim Parenti, and David Patte for reporting problems in earlier
++    versions of this change.)
++
++    Asia/Shanghai's pre-standard-time UT offset has been changed from
++    8:05:57 to 8:05:43, the location of Xujiahui Observatory.  Its
++    transition to standard time has been changed from 1928 to 1901.
++
++    Asia/Taipei switched to JWST on 1896-01-01, then to JST on 1937-10-01,
++    then to CST on 1945-09-21 at 01:00, and did not observe DST in 1945.
++    In 1946 it observed DST from 05-15 through 09-30; in 1947
++    from 04-15 through 10-31; and in 1979 from 07-01 through 09-30.
++    (Thanks to Yu-Cheng Chuang.)
++
++    Asia/Riyadh's transition to standard time is now 1947-03-14, not 1950.
++
++    Europe/Helsinki's 1942 fall-back transition was 10-04 at 01:00, not
++    10-03 at 00:00.  (Thanks to Konstantin Hyppönen.)
++
++    Pacific/Pago_Pago has been changed from UT -11:30 to -11 for the
++    period from 1911 to 1950.
++
++    Pacific/Chatham has been changed to New Zealand standard time plus
++    45 minutes for the period before 1957, reflecting a 1956 remark in
++    the New Zealand parliament.
++
++    Europe/Budapest has several pre-1946 corrections: in 1918 the transition
++    out of DST was on 09-16, not 09-29; in 1919 it was on 11-24, not 09-15; in
++    1945 it was on 11-01, not 11-03; in 1941 the transition to DST was 04-08
++    not 04-06 at 02:00; and there was no DST in 1920.
++
++    Africa/Accra is now assumed to have observed DST from 1920 through 1935.
++
++    Time in Russia before 1927 or so has been corrected by a few seconds in
++    the following zones: Europe/Moscow, Asia/Irkutsk, Asia/Tbilisi,
++    Asia/Tashkent, Asia/Vladivostok, Asia/Yekaterinburg, Europe/Helsinki, and
++    Europe/Riga.  Also, Moscow's location has been changed to its Kilometer 0
++    point.  (Thanks to Vladimir Karpinsky for the Moscow changes.)
++
++  Changes affecting data format
++
++    A new file 'zone1970.tab' supersedes 'zone.tab' in the installed data.
++    The new file's extended format allows multiple country codes per zone.
++    The older file is still installed but is deprecated; its format is
++    not changing and it will still be distributed for a while, but new
++    applications should use the new file.
++
++    The new file format simplifies maintenance of obscure locations.
++    To test this, it adds coverage for the Crozet Islands and the
++    Scattered Islands.  (Thanks to Tobias Conradi and Antoine Leca.)
++
++    The file 'iso3166.tab' is planned to switch from ASCII to UTF-8.
++    It is still ASCII now, but commentary about the switch has been added.
++    The new file 'zone1970.tab' already uses UTF-8.
++
++  Changes affecting code
++
++    'localtime', 'mktime', etc. now use much less stack space if ALL_STATE
++    is defined.  (Thanks to Elliott Hughes for reporting the problem.)
++
++    'zic' no longer mishandles input when ignoring case in locales that
++    are not compatible with English, e.g., unibyte Turkish locales when
++    compiled with HAVE_GETTEXT.
++
++    Error diagnostics of 'zic' and 'yearistype' have been reworded so that
++    they no longer use ASCII '-' as if it were a dash.
++
++    'zic' now rejects output file names that contain '.' or '..' components.
++    (Thanks to Tim Parenti for reporting the problem.)
++
++    'zic -v' now warns about output file names that do not follow
++    POSIX rules, or that contain a digit or '.'.  (Thanks to Arthur
++    David Olson for starting the ball rolling on this.)
++
++    Some lint has been removed when using GCC_DEBUG_FLAGS with GCC 4.9.0.
++
++  Changes affecting build procedure
++
++    'zic' no longer links in localtime.o and asctime.o, as they're not needed.
++    (Thanks to John Cochran.)
++
++  Changes affecting documentation and commentary
++
++    The 'Theory' file documents legacy names, the longstanding
++    exceptions to the POSIX-inspired file name rules.
++
++    The 'zic' documentation clarifies the role of time types when
++    interpreting dates.  (Thanks to Arthur David Olson.)
++
++    Documentation and commentary now prefer UTF-8 to US-ASCII,
++    allowing the use of proper accents in foreign words and names.
++    Code and data have not changed because of this.  (Thanks to
++    Garrett Wollman, Ian Abbott, and Guy Harris for helping to debug
++    this.)
++
++    Non-HTML documentation and commentary now use plain-text URLs instead of
++    HTML insertions, and are more consistent about bracketing URLs when they
++    are not already surrounded by white space.  (Thanks to suggestions by
++    Steffen Nurpmeso.)
++
++    There is new commentary about Xujiahui Observatory, the five time-zone
++    project in China from 1918 to 1949, timekeeping in Japanese-occupied
++    Shanghai, and Tibet Time in the 1950s.  The sharp-eyed can spot the
++    warlord Jin Shuren in the data.
++
++    Commentary about the coverage of each Russian zone has been standardized.
++    (Thanks to Tim Parenti).
++
++    There is new commentary about contemporary timekeeping in Ethiopia.
++
++    Obsolete comments about a 2007 proposal for DST in Kuwait has been removed.
++
++    There is new commentary about time in Poland in 1919.
++
++    Proper credit has been given to DST inventor George Vernon Hudson.
++
++    Commentary about time in Metlakatla, AK and Resolute, NU has been
++    improved, with a new source for the former.
++
++    In zone.tab, Pacific/Easter no longer mentions Salas y Gómez, as it
++    is uninhabited.
++
++    Commentary about permanent Antarctic bases has been updated.
++
++    Several typos have been corrected.  (Thanks to Tim Parenti for
++    contributing some of these fixes.)
++
++    tz-link.htm now mentions the JavaScript libraries Moment Timezone,
++    TimezoneJS.Date, Walltime-js, and Timezone.  (Thanks to a heads-up
++    from Matt Johnson.)  Also, it mentions the Go 'latlong' package.
++    (Thanks to a heads-up from Dirkjan Ochtman.)
++
++    The files usno1988, usno1989, usno1989a, usno1995, usno1997, and usno1998
++    have been removed.  These obsolescent US Naval Observatory entries were no
++    longer helpful for maintenance.  (Thanks to Tim Parenti for the suggestion.)
++
++
++Release 2014e - 2014-06-12 21:53:52 -0700
++
++  Changes affecting near-future time stamps
++
++    Egypt's 2014 Ramadan-based transitions are June 26 and July 31 at 24:00.
++    (Thanks to Imed Chihi.)  Guess that from 2015 on Egypt will temporarily
++    switch to standard time at 24:00 the last Thursday before Ramadan, and
++    back to DST at 00:00 the first Friday after Ramadan.
++
++    Similarly, Morocco's are June 28 at 03:00 and August 2 at 02:00.  (Thanks
++    to Milamber Space Network.)  Guess that from 2015 on Morocco will
++    temporarily switch to standard time at 03:00 the last Saturday before
++    Ramadan, and back to DST at 02:00 the first Saturday after Ramadan.
++
++  Changes affecting past time stamps
++
++    The abbreviation "MSM" (Moscow Midsummer Time) is now used instead of
++    "MSD" for Moscow's double daylight time in summer 1921.  Also, a typo
++    "VLASST" has been repaired to be "VLAST" for Vladivostok summer time
++    in 1991.  (Thanks to Hank W. for reporting the problems.)
++
++  Changes affecting commentary
++
++    tz-link.htm now cites RFC 7265 for jCal, mentions PTP and the
++    draft CalDAV extension, updates URLs for TSP, TZInfo, IATA, and
++    removes stale pointers to World Time Explorer and WORLDTIME.
++
++
++Release 2014d - 2014-05-27 21:34:40 -0700
++
++  Changes affecting code
++
++    zic no longer generates files containing time stamps before the Big Bang.
++    This works around GNOME bug 730332
++    <https://bugzilla.gnome.org/show_bug.cgi?id=730332>.
++    (Thanks to Leonardo Chiquitto for reporting the bug, and to
++    Arthur David Olson and James Cloos for suggesting improvements to the fix.)
++
++  Changes affecting documentation
++
++    tz-link.htm now mentions GNOME.
++
++
++Release 2014c - 2014-05-13 07:44:13 -0700
++
++  Changes affecting near-future time stamps
++
++    Egypt observes DST starting 2014-05-15 at 24:00.
++    (Thanks to Ahmad El-Dardiry and Gunther Vermier.)
++    Details have not been announced, except that DST will not be observed
++    during Ramadan.  Guess that DST will stop during the same Ramadan dates as
++    Morocco, and that Egypt's future spring and fall transitions will be the
++    same as 2010 when it last observed DST, namely April's last Friday at
++    00:00 to September's last Thursday at 23:00 standard time.  Also, guess
++    that Ramadan transitions will be at 00:00 standard time.
++
++  Changes affecting code
++
++    zic now generates transitions for minimum time values, eliminating guesswork
++    when handling low-valued time stamps.  (Thanks to Arthur David Olson.)
++
++    Port to Cygwin sans glibc.  (Thanks to Arthur David Olson.)
++
++  Changes affecting commentary and documentation
++
++    Remove now-confusing comment about Jordan.  (Thanks to Oleksii Nochovnyi.)
++
++
++Release 2014b - 2014-03-24 21:28:50 -0700
++
++  Changes affecting near-future time stamps
++
++    Crimea switches to Moscow time on 2014-03-30 at 02:00 local time.
++    (Thanks to Alexander Krivenyshev.)  Move its zone.tab entry from UA to RU.
++
++    New entry for Troll station, Antarctica.  (Thanks to Paul-Inge Flakstad and
++    Bengt-Inge Larsson.)  This is currently an approximation; a better version
++    will require the zic and localtime fixes mentioned below, and the plan is
++    to wait for a while until at least the zic fixes propagate.
++
++  Changes affecting code
++
++    'zic' and 'localtime' no longer reject locations needing four transitions
++    per year for the foreseeable future.  (Thanks to Andrew Main (Zefram).)
++    Also, 'zic' avoids some unlikely failures due to integer overflow.
++
++  Changes affecting build procedure
++
++    'make check' now detects Rule lines defined but never used.
++    The NZAQ rules, an instance of this problem, have been removed.
++
++  Changes affecting commentary and documentation
++
++    Fix Tuesday/Thursday typo in description of time in Israel.
++    (Thanks to Bert Katz via Pavel Kharitonov and Mike Frysinger.)
++
++    Microsoft Windows 8.1 doesn't support tz database names.  (Thanks
++    to Donald MacQueen.)  Instead, the Microsoft Windows Store app
++    library supports them.
++
++    Add comments about Johnston Island time in the 1960s.
++    (Thanks to Lyle McElhaney.)
++
++    Morocco's 2014 DST start will be as predicted.
++    (Thanks to Sebastien Willemijns.)
++
++
++Release 2014a - 2014-03-07 23:30:29 -0800
++
++  Changes affecting near-future time stamps
++
++    Turkey begins DST on 2014-03-31, not 03-30.  (Thanks to Faruk Pasin for
++    the heads-up, and to Tim Parenti for simplifying the update.)
++
++  Changes affecting past time stamps
++
++    Fiji ended DST on 2014-01-19 at 02:00, not the previously-scheduled 03:00.
++    (Thanks to Steffen Thorsen.)
++
++    Ukraine switched from Moscow to Eastern European time on 1990-07-01
++    (not 1992-01-01), and observed DST during the entire next winter.
++    (Thanks to Vladimir in Moscow via Alois Treindl.)
++
++    In 1988 Israel observed DST from 04-10 to 09-04, not 04-09 to 09-03.
++    (Thanks to Avigdor Finkelstein.)
++
++  Changes affecting code
++
++    A uninitialized-storage bug in 'localtime' has been fixed.
++    (Thanks to Logan Chien.)
++
++  Changes affecting the build procedure
++
++    The settings for 'make check_web' now default to Ubuntu 13.10.
++
++  Changes affecting commentary and documentation
++
++    The boundary of the US Pacific time zone is given more accurately.
++    (Thanks to Alan Mintz.)
++
++    Chile's 2014 DST will be as predicted.  (Thanks to José Miguel Garrido.)
++
++    Paraguay's 2014 DST will be as predicted.  (Thanks to Carlos Raúl Perasso.)
++
++    Better descriptions of countries with same time zone history as
++    Trinidad and Tobago since 1970.  (Thanks to Alan Barrett for suggestion.)
++
++    Several changes affect tz-link.htm, the main web page.
++
++      Mention Time.is (thanks to Even Scharning) and WX-now (thanks to
++      David Braverman).
++
++      Mention xCal (Internet RFC 6321) and jCal.
++
++      Microsoft has some support for tz database names.
++
++      CLDR data formats include both XML and JSON.
++
++      Mention Maggiolo's map of solar vs standard time.
++      (Thanks to Arthur David Olson.)
++
++      Mention TZ4Net.  (Thanks to Matt Johnson.)
++
++      Mention the timezone-olson Haskell package.
++
++      Mention zeitverschiebung.net.  (Thanks to Martin Jäger.)
++
++      Remove moribund links to daylight-savings-time.info and to
++      Simple Timer + Clocks.
++
++      Update two links.  (Thanks to Oscar van Vlijmen.)
++
++      Fix some formatting glitches, e.g., remove random newlines from
++      abbr elements' title attributes.
++
++
++Release 2013i - 2013-12-17 07:25:23 -0800
++
++  Changes affecting near-future time stamps:
++
++    Jordan switches back to standard time at 00:00 on December 20, 2013.
++    The 2006-2011 transition schedule is planned to resume in 2014.
++    (Thanks to Steffen Thorsen.)
++
++  Changes affecting past time stamps:
++
++    In 2004, Cuba began DST on March 28, not April 4.
++    (Thanks to Steffen Thorsen.)
++
++  Changes affecting code
++
++    The compile-time flag NOSOLAR has been removed, as nowadays the
++    benefit of slightly shrinking runtime table size is outweighed by the
++    cost of disallowing potential future updates that exceed old limits.
++
++  Changes affecting documentation and commentary
++
++    The files solar87, solar88, and solar89 are no longer distributed.
++    They were a negative experiment - that is, a demonstration that
++    tz data can represent solar time only with some difficulty and error.
++    Their presence in the distribution caused confusion, as Riyadh
++    civil time was generally not solar time in those years.
++
++    tz-link.htm now mentions Noda Time.  (Thanks to Matt Johnson.)
++
++
++Release 2013h - 2013-10-25 15:32:32 -0700
++
++  Changes affecting current and future time stamps:
++
++    Libya has switched its UT offset back to +02 without DST, instead
++    of +01 with DST.  (Thanks to Even Scharning.)
++
++    Western Sahara (Africa/El_Aaiun) uses Morocco's DST rules.
++    (Thanks to Gwillim Law.)
++
++  Changes affecting future time stamps:
++
++    Acre and (we guess) western Amazonas will switch from UT -04 to -05
++    on 2013-11-10.  This affects America/Rio_Branco and America/Eirunepe.
++    (Thanks to Steffen Thorsen.)
++
++    Add entries for DST transitions in Morocco in the year 2038.
++    This avoids some year-2038 glitches introduced in 2013g.
++    (Thanks to Yoshito Umaoka for reporting the problem.)
++
++  Changes affecting API
++
++    The 'tzselect' command no longer requires the 'select' command,
++    and should now work with /bin/sh on more platforms.  It also works
++    around a bug in BusyBox awk before version 1.21.0.  (Thanks to
++    Patrick 'P. J.' McDermott and Alan Barrett.)
++
++  Changes affecting code
++
++    Fix localtime overflow bugs with 32-bit unsigned time_t.
++
++    zdump no longer assumes sscanf returns maximal values on overflow.
++
++  Changes affecting the build procedure
++
++    The builder can specify which programs to use, if any, instead of
++    'ar' and 'ranlib', and libtz.a is now built locally before being
++    installed.  (Thanks to Michael Forney.)
++
++    A dependency typo in the 'zdump' rule has been fixed.
++    (Thanks to Andrew Paprocki.)
++
++    The Makefile has been simplified by assuming that 'mkdir -p' and 'cp -f'
++    work as specified by POSIX.2-1992 or later; this is portable nowadays.
++
++    'make clean' no longer removes 'leapseconds', since it's
++    host-independent and is part of the distribution.
++
++    The unused makefile macros TZCSRCS, TZDSRCS, DATESRCS have been removed.
++
++  Changes affecting documentation and commentary
++
++    tz-link.htm now mentions TC TIMEZONE's draft time zone service protocol
++    (thanks to Mike Douglass) and TimezoneJS.Date (thanks to Jim Fehrle).
++
++    Update URLs in tz-link page.  Add URLs for Microsoft Windows, since
++    8.1 introduces tz support.  Remove URLs for Tru64 and UnixWare (no
++    longer maintained) and for old advisories.  SOFA now does C.
++
++Release 2013g - 2013-09-30 21:08:26 -0700
++
++  Changes affecting current and near-future time stamps
++
++    Morocco now observes DST from the last Sunday in March to the last
++    Sunday in October, not April to September respectively.  (Thanks
++    to Steffen Thorsen.)
++
++  Changes affecting 'zic'
++
++    'zic' now runs on platforms that lack both hard links and symlinks.
++    (Thanks to Theo Veenker for reporting the problem, for MinGW.)
++    Also, fix some bugs on platforms that lack hard links but have symlinks.
++
++    'zic -v' again warns that Asia/Tehran has no POSIX environment variable
++    to predict the far future, fixing a bug introduced in 2013e.
++
++  Changes affecting the build procedure
++
++    The 'leapseconds' file is again put into the tzdata tarball.
++    Also, 'leapseconds.awk', so tzdata is self-contained.  (Thanks to
++    Matt Burgess and Ian Abbott.)  The timestamps of these and other
++    dependent files in tarballs are adjusted more consistently.
++
++  Changes affecting documentation and commentary
++
++    The README file is now part of the data tarball as well as the code.
++    It now states that files are public domain unless otherwise specified.
++    (Thanks to Andrew Main (Zefram) for asking for clarifications.)
++    Its details about the 1989 release moved to a place of honor near
++    the end of NEWS.
++
++
++Release 2013f - 2013-09-24 23:37:36 -0700
++
++  Changes affecting near-future time stamps
++
++    Tocantins will very likely not observe DST starting this spring.
++    (Thanks to Steffen Thorsen.)
++
++    Jordan will likely stay at UT +03 indefinitely, and will not fall
++    back this fall.
++
++    Palestine will fall back at 00:00, not 01:00.  (Thanks to Steffen Thorsen.)
++
++  Changes affecting API
++
++    The types of the global variables 'timezone' and 'altzone' (if present)
++    have been changed back to 'long'.  This is required for 'timezone'
++    by POSIX, and for 'altzone' by common practice, e.g., Solaris 11.
++    These variables were originally 'long' in the tz code, but were
++    mistakenly changed to 'time_t' in 1987; nobody reported the
++    incompatibility until now.  The difference matters on x32, where
++    'long' is 32 bits and 'time_t' is 64.  (Thanks to Elliott Hughes.)
++
++  Changes affecting the build procedure
++
++    Avoid long strings in leapseconds.awk to work around a mawk bug.
++    (Thanks to Cyril Baurand.)
++
++  Changes affecting documentation and commentary
++
++    New file 'NEWS' that contains release notes like this one.
++
++    Paraguay's law does not specify DST transition time; 00:00 is customary.
++    (Thanks to Waldemar Villamayor-Venialbo.)
++
++    Minor capitalization fixes.
++
++  Changes affecting version-control only
++
++    The experimental GitHub repository now contains annotated and
++    signed tags for recent releases, e.g., '2013e' for Release 2013e.
++    Releases are tagged starting with 2012e; earlier releases were
++    done differently, and tags would either not have a simple name or
++    not exactly match what was released.
++
++    'make set-timestamps' is now simpler and a bit more portable.
++
++
++Release 2013e - 2013-09-19 23:50:04 -0700
++
++  Changes affecting near-future time stamps
++
++    This year Fiji will start DST on October 27, not October 20.
++    (Thanks to David Wheeler for the heads-up.)  For now, guess that
++    Fiji will continue to spring forward the Sunday before the fourth
++    Monday in October.
++
++  Changes affecting current and future time zone abbreviations
++
++    Use WIB/WITA/WIT rather than WIT/CIT/EIT for alphabetic Indonesian
++    time zone abbreviations since 1932.  (Thanks to George Ziegler,
++    Priyadi Iman Nurcahyo, Zakaria, Jason Grimes, Martin Pitt, and
++    Benny Lin.)  This affects Asia/Dili, Asia/Jakarta, Asia/Jayapura,
++    Asia/Makassar, and Asia/Pontianak.
++
++    Use ART (UT -03, standard time), rather than WARST (also -03, but
++    daylight saving time) for San Luis, Argentina since 2009.
++
++  Changes affecting Godthåb time stamps after 2037 if version mismatch
++
++    Allow POSIX-like TZ strings where the transition time's hour can
++    range from -167 through 167, instead of the POSIX-required 0
++    through 24.  E.g., TZ='FJT-12FJST,M10.3.1/146,M1.3.4/75' for the
++    new Fiji rules.  This is a more-compact way to represent
++    far-future time stamps for America/Godthab, America/Santiago,
++    Antarctica/Palmer, Asia/Gaza, Asia/Hebron, Asia/Jerusalem,
++    Pacific/Easter, and Pacific/Fiji.  Other zones are unaffected by
++    this change.  (Derived from a suggestion by Arthur David Olson.)
++
++    Allow POSIX-like TZ strings where daylight saving time is in
++    effect all year.  E.g., TZ='WART4WARST,J1/0,J365/25' for Western
++    Argentina Summer Time all year.  This supports a more-compact way
++    to represent the 2013d data for America/Argentina/San_Luis.
++    Because of the change for San Luis noted above this change does not
++    affect the current data.  (Thanks to Andrew Main (Zefram) for
++    suggestions that improved this change.)
++
++    Where these two TZ changes take effect, there is a minor extension
++    to the tz file format in that it allows new values for the
++    embedded TZ-format string, and the tz file format version number
++    has therefore been increased from 2 to 3 as a precaution.
++    Version-2-based client code should continue to work as before for
++    all time stamps before 2038.  Existing version-2-based client code
++    (tzcode, GNU/Linux, Solaris) has been tested on version-3-format
++    files, and typically works in practice even for time stamps after
++    2037; the only known exception is America/Godthab.
++
++  Changes affecting time stamps before 1970
++
++    Pacific/Johnston is now a link to Pacific/Honolulu.  This corrects
++    some errors before 1947.
++
++    Some zones have been turned into links, when they differ from existing
++    zones only in older data entries that were likely invented or that
++    differ only in LMT or transitions from LMT.  These changes affect
++    only time stamps before 1943.  The affected zones are:
++    Africa/Juba, America/Anguilla, America/Aruba, America/Dominica,
++    America/Grenada, America/Guadeloupe, America/Marigot,
++    America/Montserrat, America/St_Barthelemy, America/St_Kitts,
++    America/St_Lucia, America/St_Thomas, America/St_Vincent,
++    America/Tortola, and Europe/Vaduz.  (Thanks to Alois Treindl for
++    confirming that the old Europe/Vaduz zone was wrong and the new
++    link is better for WWII-era times.)
++
++    Change Kingston Mean Time from -5:07:12 to -5:07:11.  This affects
++    America/Cayman, America/Jamaica and America/Grand_Turk time stamps
++    from 1890 to 1912.
++
++    Change the UT offset of Bern Mean Time from 0:29:44 to 0:29:46.
++    This affects Europe/Zurich time stamps from 1853 to 1894.  (Thanks
++    to Alois Treindl).
++
++    Change the date of the circa-1850 Zurich transition from 1849-09-12
++    to 1853-07-16, overriding Shanks with data from Messerli about
++    postal and telegraph time in Switzerland.
++
++  Changes affecting time zone abbreviations before 1970
++
++    For Asia/Jakarta, use BMT (not JMT) for mean time from 1923 to 1932,
++    as Jakarta was called Batavia back then.
++
++  Changes affecting API
++
++    The 'zic' command now outputs a dummy transition when far-future
++    data can't be summarized using a TZ string, and uses a 402-year
++    window rather than a 400-year window.  For the current data, this
++    affects only the Asia/Tehran file.  It does not affect any of the
++    time stamps that this file represents, so zdump outputs the same
++    information as before.  (Thanks to Andrew Main (Zefram).)
++
++    The 'date' command has a new '-r' option, which lets you specify
++    the integer time to display, a la FreeBSD.
++
++    The 'tzselect' command has two new options '-c' and '-n', which lets you
++    select a zone based on latitude and longitude.
++
++    The 'zic' command's '-v' option now warns about constructs that
++    require the new version-3 binary file format.  (Thanks to Arthur
++    David Olson for the suggestion.)
++
++    Support for floating-point time_t has been removed.
++    It was always dicey, and POSIX no longer requires it.
++    (Thanks to Eric Blake for suggesting to the POSIX committee to
++    remove it, and thanks to Alan Barrett, Clive D.W. Feather, Andy
++    Heninger, Arthur David Olson, and Alois Treindl, for reporting
++    bugs and elucidating some of the corners of the old floating-point
++    implementation.)
++
++    The signatures of 'offtime', 'timeoff', and 'gtime' have been
++    changed back to the old practice of using 'long' to represent UT
++    offsets.  This had been inadvertently and mistakenly changed to
++    'int_fast32_t'.  (Thanks to Christos Zoulas.)
++
++    The code avoids undefined behavior on integer overflow in some
++    more places, including gmtime, localtime, mktime and zdump.
++
++  Changes affecting the zdump utility
++
++    zdump now outputs "UT" when referring to Universal Time, not "UTC".
++    "UTC" does not make sense for time stamps that predate the introduction
++    of UTC, whereas "UT", a more-generic term, does.  (Thanks to Steve Allen
++    for clarifying UT vs UTC.)
++
++  Data changes affecting behavior of tzselect and similar programs
++
++    Country code BQ is now called the more-common name "Caribbean Netherlands"
++    rather than the more-official "Bonaire, St Eustatius & Saba".
++
++    Remove from zone.tab the names America/Montreal, America/Shiprock,
++    and Antarctica/South_Pole, as they are equivalent to existing
++    same-country-code zones for post-1970 time stamps.  The data entries for
++    these names are unchanged, so the names continue to work as before.
++
++  Changes affecting code internals
++
++    zic -c now runs way faster on 64-bit hosts when given large numbers.
++
++    zic now uses vfprintf to avoid allocating and freeing some memory.
++
++    tzselect now computes the list of continents from the data,
++    rather than have it hard-coded.
++
++    Minor changes pacify GCC 4.7.3 and GCC 4.8.1.
++
++  Changes affecting the build procedure
++
++    The 'leapseconds' file is now generated automatically from a
++    new file 'leap-seconds.list', which is a copy of
++    <ftp://time.nist.gov/pub/leap-seconds.list>.
++    A new source file 'leapseconds.awk' implements this.
++    The goal is simplification of the future maintenance of 'leapseconds'.
++
++    When building the 'posix' or 'right' subdirectories, if the
++    subdirectory would be a copy of the default subdirectory, it is
++    now made a symbolic link if that is supported.  This saves about
++    2 MB of file system space.
++
++    The links America/Shiprock and Antarctica/South_Pole have been
++    moved to the 'backward' file.  This affects only nondefault builds
++    that omit 'backward'.
++
++  Changes affecting version-control only
++
++    .gitignore now ignores 'date'.
++
++  Changes affecting documentation and commentary
++
++    Changes to the 'tzfile' man page
++
++      It now mentions that the binary file format may be extended in
++      future versions by appending data.
++
++      It now refers to the 'zdump' and 'zic' man pages.
++
++    Changes to the 'zic' man page
++
++      It lists conditions that elicit a warning with '-v'.
++
++      It says that the behavior is unspecified when duplicate names
++      are given, or if the source of one link is the target of another.
++
++      Its examples are updated to match the latest data.
++
++      The definition of white space has been clarified slightly.
++      (Thanks to Michael Deckers.)
++
++    Changes to the 'Theory' file
++
++      There is a new section about the accuracy of the tz database,
++      describing the many ways that errors can creep in, and
++      explaining why so many of the pre-1970 time stamps are wrong or
++      misleading (thanks to Steve Allen, Lester Caine, and Garrett
++      Wollman for discussions that contributed to this).
++
++      The 'Theory' file describes LMT better (this follows a
++      suggestion by Guy Harris).
++
++      It refers to the 2013 edition of POSIX rather than the 2004 edition.
++
++      It's mentioned that excluding 'backward' should not affect the
++      other data, and it suggests at least one zone.tab name per
++      inhabited country (thanks to Stephen Colebourne).
++
++      Some longstanding restrictions on names are documented, e.g.,
++      'America/New_York' precludes 'America/New_York/Bronx'.
++
++      It gives more reasons for the 1970 cutoff.
++
++      It now mentions which time_t variants are supported, such as
++      signed integer time_t.  (Thanks to Paul Goyette for reporting
++      typos in an experimental version of this change.)
++
++      (Thanks to Philip Newton for correcting typos in these changes.)
++
++    Documentation and commentary is more careful to distinguish UT in
++    general from UTC in particular.  (Thanks to Steve Allen.)
++
++    Add a better source for the Zurich 1894 transition.
++    (Thanks to Pierre-Yves Berger.)
++
++    Update shapefile citations in tz-link.htm.  (Thanks to Guy Harris.)
++
++
++Release 2013d - 2013-07-05 07:38:01 -0700
++
++  Changes affecting future time stamps:
++
++    Morocco's midsummer transitions this year are July 7 and August 10,
++    not July 9 and August 8.  (Thanks to Andrew Paprocki.)
++
++    Israel now falls back on the last Sunday of October.
++    (Thanks to Ephraim Silverberg.)
++
++  Changes affecting past time stamps:
++
++    Specify Jerusalem's location more precisely; this changes the pre-1880
++    times by 2 s.
++
++  Changing affecting metadata only:
++
++    Fix typos in the entries for country codes BQ and SX.
++
++  Changes affecting code:
++
++    Rework the code to fix a bug with handling Australia/Macquarie on
++    32-bit hosts (thanks to Arthur David Olson).
++
++    Port to platforms like NetBSD, where time_t can be wider than long.
++
++    Add support for testing time_t types other than the system's.
++    Run 'make check_time_t_alternatives' to try this out.
++    Currently, the tests fail for unsigned time_t;
++    this should get fixed at some point.
++
++  Changes affecting documentation and commentary:
++
++    Deemphasize the significance of national borders.
++
++    Update the zdump man page.
++
++    Remove obsolete NOID comment (thanks to Denis Excoffier).
++
++    Update several URLs and comments in the web pages.
++
++    Spelling fixes (thanks to Kevin Lyda and Jonathan Leffler).
++
++    Update URL for CLDR Zone->Tzid table (thanks to Yoshito Umaoka).
++
++
++Release 2013c - 2013-04-19 16:17:40 -0700
++
++  Changes affecting current and future time stamps:
++
++    Palestine observed DST starting March 29, 2013.  (Thanks to
++    Steffen Thorsen.)  From 2013 on, Gaza and Hebron both observe DST,
++    with the predicted rules being the last Thursday in March at 24:00
++    to the first Friday on or after September 21 at 01:00.
++
++    Assume that the recent change to Paraguay's DST rules is permanent,
++    by moving the end of DST to the 4th Sunday in March every year.
++    (Thanks to Carlos Raúl Perasso.)
++
++  Changes affecting past time stamps:
++
++    Fix some historical data for Palestine to agree with that of
++    timeanddate.com, as follows:
++
++	  The spring 2008 change in Gaza and Hebron was on 00:00 Mar 28, not
++	  00:00 Apr 1.
++
++	  The fall 2009 change in Gaza and Hebron on Sep 4 was at 01:00, not
++	  02:00.
++
++	  The spring 2010 change in Hebron was 00:00 Mar 26, not 00:01 Mar 27.
++
++	  The spring 2011 change in Gaza was 00:01 Apr 1, not 12:01 Apr 2.
++
++	  The spring 2011 change in Hebron on Apr 1 was at 00:01, not 12:01.
++
++	  The fall 2011 change in Hebron on Sep 30 was at 00:00, not 03:00.
++
++    Fix times of habitation for Macquarie to agree with the Tasmania
++    Parks & Wildlife Service history, which indicates that permanent
++    habitation was 1899-1919 and 1948 on.
++
++  Changing affecting metadata only:
++
++    Macquarie Island is politically part of Australia, not Antarctica.
++    (Thanks to Tobias Conradi.)
++
++    Sort Macquarie more-consistently with other parts of Australia.
++    (Thanks to Tim Parenti.)
++
++
++Release 2013b - 2013-03-10 22:33:40 -0700
++
++  Changes affecting current and future time stamps:
++
++    Haiti uses US daylight-saving rules this year, and presumably future years.
++    This changes time stamps starting today.  (Thanks to Steffen Thorsen.)
++
++    Paraguay will end DST on March 24 this year.
++    (Thanks to Steffen Thorsen.)  For now, assume it's just this year.
++
++    Morocco does not observe DST during Ramadan;
++    try to predict Ramadan in Morocco as best we can.
++    (Thanks to Erik Homoet for the heads-up.)
++
++  Changes affecting commentary:
++
++    Update URLs in tz-link page.  Add URLs for webOS, BB10, iOS.
++    Update URL for Solaris.  Mention Internet RFC 6557.
++    Update Internet RFCs 2445->5545, 2822->5322.
++    Switch from FTP to HTTP for Internet RFCs.
++
++
++Release 2013a - 2013-02-27 09:20:35 -0800
++
++  Change affecting binary data format:
++
++    The zone offset at the end of version-2-format zone files is now
++    allowed to be 24:00, as per POSIX.1-2008.  (Thanks to Arthur David Olson.)
++
++  Changes affecting current and future time stamps:
++
++    Chile's 2013 rules, and we guess rules for 2014 and later, will be
++    the same as 2012, namely Apr Sun>=23 03:00 UTC to Sep Sun>=2 04:00 UTC.
++    (Thanks to Steffen Thorsen and Robert Elz.)
++
++    New Zones Asia/Khandyga, Asia/Ust-Nera, Europe/Busingen.
++    (Thanks to Tobias Conradi and Arthur David Olson.)
++
++  Many changes affect historical time stamps before 1940.
++  These were deduced from: Milne J. Civil time. Geogr J. 1899
++  Feb;13(2):173-94 <http://www.jstor.org/stable/1774359>.
++
++  Changes affecting the code:
++
++    Fix zic bug that mishandled Egypt's 2010 changes (this also affected
++    the data).  (Thanks to Arthur David Olson.)
++
++    Fix localtime bug when time_t is unsigned and data files were generated
++    by a signed time_t system.  (Thanks to Doug Bailey for reporting and
++    to Arthur David Olson for fixing.)
++
++    Allow the email address for bug reports to be set by the packager.
++    The default is tz@iana.org, as before.  (Thanks to Joseph S. Myers.)
++
++    Update HTML checking to be compatible with Ubuntu 12.10.
++
++    Check that files are a safe subset of ASCII.  At some point we may
++    relax this requirement to a safe subset of UTF-8.  Without the
++    check, some non-UTF-8 encodings were leaking into the distribution.
++
++  Commentary changes:
++
++    Restore a comment about copyright notices that was inadvertently deleted.
++    (Thanks to Arthur David Olson.)
++
++    Improve the commentary about which districts observe what times
++    in Russia.  (Thanks to Oscar van Vlijmen and Arthur David Olson).
++
++    Add web page links to tz.js.
++
++    Add "Run by the Monkeys" to tz-art.  (Thanks to Arthur David Olson.)
++
++
++Release 2012j - 2012-11-12 18:34:49 -0800
++
++  Libya moved to CET this weekend, but with DST planned next year.
++  (Thanks to Even Scharning, Steffen Thorsen, and Tim Parenti.)
++
++  Signatures now have the extension .asc, not .sign, as that's more
++  standard.  (Thanks to Phil Pennock.)
++
++  The output of 'zdump --version', and of 'zic --version', now
++  uses a format that is more typical for --version.
++  (Thanks to Joseph S. Myers.)
++
++  The output of 'tzselect --help', 'zdump --help', and 'zic --help'
++  now uses tz@iana.org rather than the old elsie address.
++
++  zic -v now complains about abbreviations that are less than 3
++  or more than 6 characters, as per Posix.  Formerly, it checked
++  for abbreviations that were more than 3.
++
++  'make public' no longer puts its temporary directory under /tmp,
++  and uses the just-built zic rather than the system zic.
++
++  Various fixes to documentation and commentary.
++
++
++Release 2012i - 2012-11-03 12:57:09 -0700
++
++  Cuba switches from DST tomorrow at 01:00.  (Thanks to Steffen Thorsen.)
++
++  Linker flags can now be specified via LDFLAGS.
++  AWK now defaults to 'awk', not 'nawk'.
++  The shell in tzselect now defaults to /bin/bash, but this can
++  be overridden by specifying KSHELL.
++  The main web page now mentions the unofficial GitHub repository.
++  (Thanks to Mike Frysinger.)
++
++  Tarball signatures can now be built by running 'make signatures'.
++  There are also new makefile rules 'tarballs', 'check_public', and
++  separate makefile rules for each tarball and signature file.
++  A few makefile rules are now more portable to strict POSIX.
++
++  The main web page now lists the canonical IANA URL.
++
++
++Release 2012h - 2012-10-26 22:49:10 -0700
++
++  Bahia no longer has DST.  (Thanks to Kelley Cook.)
++
++  Tocantins has DST.  (Thanks to Rodrigo Severo.)
++
++  Israel has new DST rules next year.  (Thanks to Ephraim Silverberg.)
++
++  Jordan stays on DST this winter.  (Thanks to Steffen Thorsen.)
++
++  Web page updates.
++
++  More C modernization, except that at Arthur David Olson's suggestion
++  the instances of 'register' were kept.
++
++
++Release 2012g - 2012-10-17 20:59:45 -0700
++
++  Samoa fall 2012 and later.  (Thanks to Nicholas Pereira and Robert Elz.)
++
++  Palestine fall 2012.  (Thanks to Steffen Thorsen.)
++
++  Assume C89.
++
++  To attack the version-number problem, this release ships the file
++  'Makefile' (which contains the release number) in both the tzcode and
++  the tzdata tarballs.  The two Makefiles are identical, and should be
++  identical in any matching pair of tarballs, so it shouldn't matter
++  which order you extract the tarballs.  Perhaps we can come up with a
++  better version-number scheme at some point; this scheme does have the
++  virtue of not adding more files.
++
++
++Release 2012f - 2012-09-12 23:17:03 -0700
++
++  * australasia (Pacific/Fiji): Fiji DST is October 21 through January
++    20 this year.  (Thanks to Steffen Thorsen.)
++
++
++Release 2012e - 2012-08-02 20:44:55 -0700
++
++  * australasia (Pacific/Fakaofo): Tokelau is UT +13, not +14.
++    (Thanks to Steffen Thorsen.)
++
++  * Use a single version number for both code and data.
++
++  * .gitignore: New file.
++
++  * Remove trailing white space.
++
++
++Release code2012c-data2012d - 2012-07-19 16:35:33 -0700
++
++  Changes for Morocco's time stamps, which take effect in a couple of
++  hours, along with infrastructure changes to accommodate how the tz
++  code and data are released on IANA.
++
++
++Release data2012c - 2012-03-27 12:17:25 -0400
++
++  africa
++	Summer time changes for Morocco (to start late April 2012)
++
++  asia
++	Changes for 2012 for Gaza & the West Bank (Hebron) and Syria
++
++  northamerica
++	Haiti following US/Canada rules for 2012 (and we're assuming,
++	for now anyway, for the future).
++
++
++Release 2012b - 2012-03-02 12:29:15 +0700
++
++  There is just one change to tzcode2012b (compared with 2012a):
++  the Makefile that was accidentally included with 2012a has been
++  replaced with the version that should have been there, which is
++  identical with the previous version (from tzcode2011i).
++
++  There are just two changes in tzdata2012b compared with 2012a.
++
++  Most significantly, summer time in Cuba has been delayed 3 weeks
++  (now starts April 1 rather than March 11).   Since Mar 11 (the old start
++  date, as listed in 2012a) is just a little over a week away, this
++  change is urgent.
++
++  Less importantly, an excess tab in one of the changes in zone.tab
++  in 2012a has been removed.
++
++
++Release 2012a - 2012-03-01 18:28:10 +0700
++
++  The changes in tzcode2012a (compared to the previous version, 2011i)
++  are entirely to the README and tz-art.htm and tz-link.htm files, if
++  none of those concern you, you can ignore the code update.  The changes
++  reflect the changed addresses for the mailing list and the code and
++  data distribution points & methods (and a link to DateTime::TimeZone::Tzfile
++  has been added to tz-link.htm).
++
++  In tzdata2012a (compared to the previous release, which was 2011n)
++  the major changes are:
++	Chile 2011/2012 and 2012/2013 summer time date adjustments.
++	Falkland Islands onto permanent summer time (we're assuming for the
++		foreseeable future, though 2012 is all we're fairly certain of.)
++	Armenia has abolished Summer Time.
++	Tokelau jumped the International Date Line back last December
++		(just the same as their near neighbour, Samoa).
++	America/Creston is a new zone for a small area of British Columbia
++	There will be a leapsecond 2012-06-30 23:59:60 UTC.
++
++  Other minor changes are:
++	Corrections to 1918 Canadian summer time end dates.
++	Updated URL for UK time zone history (in comments)
++	A few typos in Le Corre's list of free French place names (comments)
++
++
++Release data2011n - 2011-10-30 14:57:54 +0700
++
++  There are three changes of note - most urgently, Cuba (America/Havana)
++  has extended summer time by two weeks, now to end on Nov 13, rather than
++  the (already past) Oct 30.   Second, the Pridnestrovian Moldavian Republic
++  (Europe/Tiraspol) decided not to split from the rest of Moldova after
++  all, and consequently that zone has been removed (again) and reinstated
++  in the "backward" file as a link to Europe/Chisinau.   And third, the
++  end date for Fiji's summer time this summer was moved forward from the
++  earlier planned Feb 26, to Jan 22.
++
++  Apart from that, Moldova (MD) returns to a single entry in zone.tab
++  (and the incorrect syntax that was in the 2011m version of that file
++  is so fixed - it would have been fixed in a different way had this
++  change not happened - that's the "missing" sccs version id).
++
++
++Release data2011m - 2011-10-24 21:42:16 +0700
++
++  In particular, the typos in comments in the data (2011-11-17 should have
++  been 2011-10-17 as Alan Barrett noted, and spelling of Tiraspol that
++  Tim Parenti noted) have been fixed, and the change for Ukraine has been
++  made in all 4 Ukrainian zones, rather than just Kiev (again, thanks to
++  Tim Parenti, and also Denys Gavrysh)
++
++  In addition, I added Europe/Tiraspol to zone.tab.
++
++  This time, all the files have new version numbers...  (including the files
++  otherwise unchanged in 2011m that were changed in 2011l but didn't get new
++  version numbers there...)
++
++
++Release data2011l - 2011-10-10 11:15:43 +0700
++
++  There are just 2 changes that cause different generated tzdata files from
++  zic, to Asia/Hebron and Pacific/Fiji - the possible change for Bahia, Brazil
++  is included, but commented out.  Compared with the diff I sent out last week,
++  this version also includes attributions for the sources for the changes
++  (in much the same format as ado used, but the html tags have not been
++  checked, verified, or used in any way at all, so if there are errors there,
++  please let me know.)
++
++
++Release data2011k - 2011-09-20 17:54:03 -0400
++
++  [not summarized]
++
++
++Release data2011j - 2011-09-12 09:22:49 -0400
++
++  (contemporary changes for Samoa; past changes for Kenya, Uganda, and
++  Tanzania); there are also two spelling corrections to comments in
++  the australasia file (with thanks to Christos Zoulas).
++
++
++Release 2011i - 2011-08-29 05:56:32 -0400
++
++  [not summarized]
++
++
++Release data2011h - 2011-06-15 18:41:48 -0400
++
++  Russia and Curaçao changes
++
++
++Release 2011g - 2011-04-25 09:07:22 -0400
++
++  update the rules for Egypt to reflect its abandonment of DST this year
++
++
++Release 2011f - 2011-04-06 17:14:53 -0400
++
++  [not summarized]
++
++
++Release 2011e - 2011-03-31 16:04:38 -0400
++
++  Morocco, Chile, and tz-link changes
++
++
++Release 2011d - 2011-03-14 09:18:01 -0400
++
++  changes that impact present-day time stamps in Cuba, Samoa, and Turkey
++
++
++Release 2011c - 2011-03-07 09:30:09 -0500
++
++  These do affect current time stamps in Chile and Annette Island, Canada.
++
++
++Release 2011b - 2011-02-07 08:44:50 -0500
++
++  [not summarized]
++
++
++Release 2011a - 2011-01-24 10:30:16 -0500
++
++  [not summarized]
++
++
++Release data2010o - 2010-11-01 09:18:23 -0400
++
++  change to the end of DST in Fiji in 2011
++
++
++Release 2010n - 2010-10-25 08:19:17 -0400
++
++  [not summarized]
++
++
++Release 2010m - 2010-09-27 09:24:48 -0400
++
++  Hong Kong, Vostok, and zic.c changes
++
++
++Release 2010l - 2010-08-16 06:57:25 -0400
++
++  [not summarized]
++
++
++Release 2010k - 2010-07-26 10:42:27 -0400
++
++  [not summarized]
++
++
++Release 2010j - 2010-05-10 09:07:48 -0400
++
++  changes for Bahía de Banderas and for version naming
++
++
++Release data2010i - 2010-04-16 18:50:45 -0400
++
++  the end of DST in Morocco on 2010-08-08
++
++
++Release data2010h - 2010-04-05 09:58:56 -0400
++
++  [not summarized]
++
++
++Release data2010g - 2010-03-24 11:14:53 -0400
++
++  [not summarized]
++
++
++Release 2010f - 2010-03-22 09:45:46 -0400
++
++  [not summarized]
++
++
++Release data2010e - 2010-03-08 14:24:27 -0500
++
++  corrects the Dhaka bug found by Danvin Ruangchan
++
++
++Release data2010d - 2010-03-06 07:26:01 -0500
++
++  [not summarized]
++
++
++Release 2010c - 2010-03-01 09:20:58 -0500
++
++  changes including KRE's suggestion for earlier initialization of
++  "goahead" and "goback" structure elements
++
++
++Release code2010a - 2010-02-16 10:40:04 -0500
++
++  [not summarized]
++
++
++Release data2010b - 2010-01-20 12:37:01 -0500
++
++  Mexico changes
++
++
++Release data2010a - 2010-01-18 08:30:04 -0500
++
++  changes to Dhaka
++
++
++Release data2009u - 2009-12-26 08:32:28 -0500
++
++  changes to DST in Bangladesh
++
++
++Release 2009t - 2009-12-21 13:24:27 -0500
++
++  [not summarized]
++
++
++Release data2009s - 2009-11-14 10:26:32 -0500
++
++  (cosmetic) Antarctica change and the DST-in-Fiji-in-2009-and-2010 change
++
++
++Release 2009r - 2009-11-09 10:10:31 -0500
++
++  "antarctica" and "tz-link.htm" changes
++
++
++Release 2009q - 2009-11-02 09:12:40 -0500
++
++  with two corrections as reported by Eric Muller and Philip Newton
++
++
++Release data2009p - 2009-10-23 15:05:27 -0400
++
++  Argentina (including San Luis) changes (with the correction from
++  Mariano Absatz)
++
++
++Release data2009o - 2009-10-14 16:49:38 -0400
++
++  Samoa (commentary only), Pakistan, and Bangladesh changes
++
++
++Release data2009n - 2009-09-22 15:13:38 -0400
++
++  added commentary for Argentina and a change to the end of DST in
++  2009 in Pakistan
++
++
++Release data2009m - 2009-09-03 10:23:43 -0400
++
++  Samoa and Palestine changes
++
++
++Release data2009l - 2009-08-14 09:13:07 -0400
++
++  Samoa (comments only) and Egypt
++
++
++Release 2009k - 2009-07-20 09:46:08 -0400
++
++  [not summarized]
++
++
++Release data2009j - 2009-06-15 06:43:59 -0400
++
++  Bangladesh change (with a short turnaround since the DST change is
++  impending)
++
++
++Release 2009i - 2009-06-08 09:21:22 -0400
++
++  updating for DST in Bangladesh this year
++
++
++Release 2009h - 2009-05-26 09:19:14 -0400
++
++  [not summarized]
++
++
++Release data2009g - 2009-04-20 16:34:07 -0400
++
++  Cairo
++
++
++Release data2009f - 2009-04-10 11:00:52 -0400
++
++  correct DST in Pakistan
++
++
++Release 2009e - 2009-04-06 09:08:11 -0400
++
++  [not summarized]
++
++
++Release 2009d - 2009-03-23 09:38:12 -0400
++
++  Morocco, Tunisia, Argentina, and American Astronomical Society changes
++
++
++Release data2009c - 2009-03-16 09:47:51 -0400
++
++  change to the start of Cuban DST
++
++
++Release 2009b - 2009-02-09 11:15:22 -0500
++
++  [not summarized]
++
++
++Release 2009a - 2009-01-21 10:09:39 -0500
++
++  [not summarized]
++
++
++Release data2008i - 2008-10-21 12:10:25 -0400
++
++  southamerica and zone.tab files, with Argentina DST rule changes and
++  United States zone reordering and recommenting
++
++
++Release 2008h - 2008-10-13 07:33:56 -0400
++
++  [not summarized]
++
++
++Release 2008g - 2008-10-06 09:03:18 -0400
++
++  Fix a broken HTML anchor and update Brazil's DST transitions;
++  there's also a slight reordering of information in tz-art.htm.
++
++
++Release data2008f - 2008-09-09 22:33:26 -0400
++
++  [not summarized]
++
++
++Release 2008e - 2008-07-28 14:11:17 -0400
++
++  changes by Arthur David Olson and Jesper Nørgaard Welen
++
++
++Release data2008d - 2008-07-07 09:51:38 -0400
++
++  changes by Arthur David Olson, Paul Eggert, and Rodrigo Severo
++
++
++Release data2008c - 2008-05-19 17:48:03 -0400
++
++  Pakistan, Morocco, and Mongolia
++
++
++Release data2008b - 2008-03-24 08:30:59 -0400
++
++  including renaming Asia/Calcutta to Asia/Kolkata, with a backward
++  link provided
++
++
++Release 2008a - 2008-03-08 05:42:16 -0500
++
++  [not summarized]
++
++
++Release 2007k - 2007-12-31 10:25:22 -0500
++
++  most importantly, changes to the "southamerica" file based on
++  Argentina's readoption of daylight saving time
++
++
++Release 2007j - 2007-12-03 09:51:01 -0500
++
++  1. eliminate the "P" (parameter) macro;
++
++  2. the "noncontroversial" changes circulated on the time zone
++  mailing list (less the changes to "logwtmp.c");
++
++  3. eliminate "too many transition" errors when "min" is used in time
++  zone rules;
++
++  4. changes by Paul Eggert (including updated information for Venezuela).
++
++
++Release data2007i - 2007-10-30 10:28:11 -0400
++
++  changes for Cuba and Syria
++
++
++Release 2007h - 2007-10-01 10:05:51 -0400
++
++  changes by Paul Eggert, as well as an updated link to the ICU
++  project in tz-link.htm
++
++
++Release 2007g - 2007-08-20 10:47:59 -0400
++
++  changes by Paul Eggert
++
++  The "leapseconds" file has been updated to incorporate the most
++  recent International Earth Rotation and Reference Systems Service
++  (IERS) bulletin.
++
++  There's an addition to tz-art.htm regarding the television show "Medium".
++
++
++Release 2007f - 2007-05-07 10:46:46 -0400
++
++  changes by Paul Eggert (including Haiti, Turks and Caicos, and New
++  Zealand)
++
++  changes to zic.c to allow hour values greater than 24 (along with
++  Paul's improved time value overflow checking)
++
++
++Release 2007e - 2007-04-02 10:11:52 -0400
++
++  Syria and Honduras changes by Paul Eggert
++
++  zic.c variable renaming changes by Arthur David Olson
++
++
++Release 2007d - 2007-03-20 08:48:30 -0400
++
++  changes by Paul Eggert
++
++  the elimination of white space at the ends of lines
++
++
++Release 2007c - 2007-02-26 09:09:37 -0500
++
++  changes by Paul Eggert
++
++
++Release 2007b - 2007-02-12 09:34:20 -0500
++
++  Paul Eggert's proposed change to the quotation handling logic in zic.c.
++
++  changes to the commentary in "leapseconds" reflecting the IERS
++  announcement that there is to be no positive leap second at the end
++  of June 2007.
++
++
++Release 2007a - 2007-01-08 12:28:29 -0500
++
++  changes by Paul Eggert
++
++  Derick Rethan's Asmara change
++
++  Oscar van Vlijmen's Easter Island local mean time change
++
++  symbolic link changes
++
++
++Release 2006p - 2006-11-27 08:54:27 -0500
++
++  changes by Paul Eggert
++
++
++Release 2006o - 2006-11-06 09:18:07 -0500
++
++  changes by Paul Eggert
++
++
++Release 2006n - 2006-10-10 11:32:06 -0400
++
++  changes by Paul Eggert
++
++
++Release 2006m - 2006-10-02 15:32:35 -0400
++
++  changes for Uruguay, Palestine, and Egypt by Paul Eggert
++
++  (minimalist) changes to zic.8 to clarify "until" information
++
++
++Release data2006l - 2006-09-18 12:58:11 -0400
++
++  Paul's best-effort work on this coming weekend's Egypt time change
++
++
++Release 2006k - 2006-08-28 12:19:09 -0400
++
++  changes by Paul Eggert
++
++
++Release 2006j - 2006-08-21 09:56:32 -0400
++
++  changes by Paul Eggert
++
++
++Release code2006i - 2006-08-07 12:30:55 -0400
++
++  localtime.c fixes
++
++  Ken Pizzini's conversion script
++
++
++Release code2006h - 2006-07-24 09:19:37 -0400
++
++  adds public domain notices to four files
++
++  includes a fix for transition times being off by a second
++
++  adds a new recording to the "arts" file (information courtesy Colin Bowern)
++
++
++Release 2006g - 2006-05-08 17:18:09 -0400
++
++  northamerica changes by Paul Eggert
++
++
++Release 2006f - 2006-05-01 11:46:00 -0400
++
++  a missing version number problem is fixed (with thanks to Bradley
++  White for catching the problem)
++
++
++Release 2006d - 2006-04-17 14:33:43 -0400
++
++  changes by Paul Eggert
++
++  added new items to tz-arts.htm that were found by Paul
++
++
++Release 2006c - 2006-04-03 10:09:32 -0400
++
++  two sets of data changes by Paul Eggert
++
++  a fencepost error fix in zic.c
++
++  changes to zic.c and the "europe" file to minimize differences
++  between output produced by the old 32-bit zic and the new 64-bit
++  version
++
++
++Release 2006b - 2006-02-20 10:08:18 -0500
++  [tz32code2006b + tz64code2006b + tzdata2006b]
++
++  64-bit code
++
++  All SCCS IDs were bumped to "8.1" for this release.
++
++
++Release 2006a - 2006-01-30 08:59:31 -0500
++
++  changes by Paul Eggert (in particular, Indiana time zone moves)
++
++  an addition to the zic manual page to describe how special-case
++  transitions are handled
++
++
++Release 2005r - 2005-12-27 09:27:13 -0500
++
++  Canadian changes by Paul Eggert
++
++  They also add "<pre>" directives to time zone data files and reflect
++  changes to warning message logic in "zdump.c" (but with calls to
++  "gettext" kept unbundled at the suggestion of Ken Pizzini).
++
++
++Release 2005q - 2005-12-13 09:17:09 -0500
++
++  Nothing earth-shaking here:
++	1.  Electronic mail addresses have been removed.
++	2.  Casts of the return value of exit have been removed.
++	3.  Casts of the argument of is.* macros have been added.
++	4.  Indentation in one section of zic.c has been fixed.
++	5.  References to dead URLs in the data files have been dealt with.
++
++
++Release 2005p - 2005-12-05 10:30:53 -0500
++
++  "systemv", "tz-link.htm", and "zdump.c" changes
++  (less the casts of arguments to the is* macros)
++
++
++Release 2005o - 2005-11-28 10:55:26 -0500
++
++  Georgia, Cuba, Nicaragua, and Jordan changes by Paul Eggert
++
++  zdump.c lint fixes by Arthur David Olson
++
++
++Release 2005n - 2005-10-03 09:44:09 -0400
++
++  changes by Paul Eggert (both the Uruguay changes and the Kyrgyzstan
++  et al. changes)
++
++
++Release 2005m - 2005-08-29 12:15:40 -0400
++
++  changes by Paul Eggert (with a small tweak to the tz-art change)
++
++  a declaration of an unused variable has been removed from zdump.c
++
++
++Release 2005l - 2005-08-22 12:06:39 -0400
++
++  changes by Paul Eggert
++
++  overflow/underflow checks by Arthur David Olson, minus changes to
++  the "Theory" file about the pending addition of 64-bit data (I grow
++  less confident of the changes being accepted with each passing day,
++  and the changes no longer increase the data files nine-fold--there's
++  less than a doubling in size by my local Sun's reckoning)
++
++
++Release 2005k - 2005-07-14 14:14:24 -0400
++
++  The "leapseconds" file has been edited to reflect the recently
++  announced leap second at the end of 2005.
++
++  I've also deleted electronic mail addresses from the files as an
++  anti-spam measure.
++
++
++Release 2005j - 2005-06-13 14:34:13 -0400
++
++  These reflect changes to limit the length of time zone abbreviations
++  and the characters used in those abbreviations.
++
++  There are also changes to handle POSIX-style "quoted" time zone
++  environment variables.
++
++  The changes were circulated on the time zone mailing list; the only
++  change since then was the removal of a couple of minimum-length of
++  abbreviation checks.
++
++
++Release data2005i - 2005-04-21 15:04:16 -0400
++
++  changes (most importantly to Nicaragua and Haiti) by Paul Eggert
++
++
++Release 2005h - 2005-04-04 11:24:47 -0400
++
++  changes by Paul Eggert
++
++  minor changes to Makefile and zdump.c to produce more useful output
++  when doing a "make typecheck"
++
++
++Release 2005g - 2005-03-14 10:11:21 -0500
++
++  changes by Paul Eggert (a change to current DST rules in Uruguay and
++  an update to a link to time zone software)
++
++
++Release 2005f - 2005-03-01 08:45:32 -0500
++
++  data and documentation changes by Paul Eggert
++
++
++Release 2005e - 2005-02-10 15:59:44 -0500
++
++  [not summarized]
++
++
++Release code2005d - 2005-01-31 09:21:47 -0500
++
++  make zic complain about links to links if the -v flag is used
++
++  have "make public" do more code checking
++
++  add an include to "localtime.c" for the benefit of gcc systems
++
++
++Release 2005c - 2005-01-17 18:36:29 -0500
++
++  get better results when mktime runs on a system where time_t is double
++
++  changes to the data files (most importantly to Paraguay)
++
++
++Release 2005b - 2005-01-10 09:19:54 -0500
++
++  Get localtime and gmtime working on systems with exotic time_t types.
++
++  Update the leap second commentary in the "leapseconds" file.
++
++
++Release 2005a - 2005-01-01 13:13:44 -0500
++
++  [not summarized]
++
++
++Release code2004i - 2004-12-14 13:42:58 -0500
++
++  Deal with systems where time_t is unsigned.
++
++
++Release code2004h - 2004-12-07 11:40:18 -0500
++
++  64-bit-time_t changes
++
++
++Release 2004g - 2004-11-02 09:06:01 -0500
++
++  update to Cuba (taking effect this weekend)
++
++  other changes by Paul Eggert
++
++  correction of the spelling of Oslo
++
++  changed versions of difftime.c and private.h
++
++
++Release code2004f - 2004-10-21 10:25:22 -0400
++
++  Cope with wide-ranging tm_year values.
++
++
++Release 2004e - 2004-10-11 14:47:21 -0400
++
++  Brazil/Argentina/Israel changes by Paul Eggert
++
++  changes to tz-link.htm by Paul
++
++  one small fix to Makefile
++
++
++Release 2004d - 2004-09-22 08:27:29 -0400
++
++  Avoid overflow problems when TM_YEAR_BASE is added to an integer.
++
++
++Release 2004c - 2004-08-11 12:06:26 -0400
++
++  asctime-related changes
++
++  (variants of) some of the documentation changes suggested by Paul Eggert
++
++
++Release 2004b - 2004-07-19 14:33:35 -0400
++
++  data changes by Paul Eggert - most importantly, updates for Argentina
++
++
++Release 2004a - 2004-05-27 12:00:47 -0400
++
++  changes by Paul Eggert
++
++  Handle DST transitions that occur at the end of a month in some
++  years but at the start of the following month in other years.
++
++  Add a copy of the correspondence that's the basis for claims about
++  DST in the Navajo Nation.
++
++
++Release 2003e - 2003-12-15 09:36:47 -0500
++
++  changes by Arthur David Olson (primarily code changes)
++
++  changes by Paul Eggert (primarily data changes)
++
++  minor changes to "Makefile" and "northamerica" (in the latter case,
++  optimization of the "Toronto" rules)
++
++
++Release 2003d - 2003-10-06 09:34:44 -0400
++
++  changes by Paul Eggert
++
++
++Release 2003c - 2003-09-16 10:47:05 -0400
++
++  Fix bad returns in zic.c's inleap function.
++  Thanks to Bradley White for catching the problem!
++
++
++Release 2003b - 2003-09-16 07:13:44 -0400
++
++  Add a "--version" option (and documentation) to the zic and zdump commands.
++
++  changes to overflow/underflow checking in zic
++
++  a localtime typo fix.
++
++  Update the leapseconds and tz-art.htm files.
++
++
++Release 2003a - 2003-03-24 09:30:54 -0500
++
++  changes by Paul Eggert
++
++  a few additions and modifications to the tz-art.htm file
++
++
++Release 2002d - 2002-10-15 13:12:42 -0400
++
++  changes by Paul Eggert, less the "Britain (UK)" change in iso3166.tab
++
++  There's also a new time zone quote in "tz-art.htm".
++
++
++Release 2002c - 2002-04-04 11:55:20 -0500
++
++  changes by Paul Eggert
++
++  Change zic.c to avoid creating symlinks to files that don't exist.
++
++
++Release 2002b - 2002-01-28 12:56:03 -0500
++
++  [These change notes are for Release 2002a, which was corrupted.
++  2002b was a corrected version of 2002a.]
++
++  changes by Paul Eggert
++
++  Update the "leapseconds" file to note that there'll be no leap
++  second at the end of June, 2002.
++
++  Change "zic.c" to deal with a problem in handling the "Asia/Bishkek" zone.
++
++  Change to "difftime.c" to avoid sizeof problems.
++
++
++Release 2001d - 2001-10-09 13:31:32 -0400
++
++  changes by Paul Eggert
++
++
++Release 2001c - 2001-06-05 13:59:55 -0400
++
++  changes by Paul Eggert and Andrew Brown
++
++
++Release 2001b - 2001-04-05 16:44:38 -0400
++
++  changes by Paul Eggert (modulo jnorgard's typo fix)
++
++  tz-art.htm has been HTMLified.
++
++
++Release 2001a - 2001-03-13 12:57:44 -0500
++
++  changes by Paul Eggert
++
++  An addition to the "leapseconds" file: comments with the text of the
++  latest IERS leap second notice.
++
++  Trailing white space has been removed from data file lines, and
++  repeated spaces in "Rule Jordan" lines in the "asia" file have been
++  converted to tabs.
++
++
++Release 2000h - 2000-12-14 15:33:38 -0500
++
++  changes by Paul Eggert
++
++  one typo fix in the "art" file
++
++  With providence, this is the last update of the millennium.
++
++
++Release 2000g - 2000-10-10 11:35:22 -0400
++
++  changes by Paul Eggert
++
++  correction of John Mackin's name submitted by Robert Elz
++
++  Garry Shandling's Daylight Saving Time joke (!?!) from the recent
++  Emmy Awards broadcast.
++
++
++Release 2000f - 2000-08-10 09:31:58 -0400
++
++  changes by Paul Eggert
++
++  Added information in "tz-art.htm" on a Seinfeld reference to DST.
++
++  Error checking and messages in the "yearistype" script have been
++  improved.
++
++
++Release 2000e - 2000-07-31 09:27:54 -0400
++
++  data changes by Paul Eggert
++
++  a change to the default value of the defined constant HAVE_STRERROR
++
++  the addition of a Dave Barry quote on DST to the tz-arts file
++
++
++Release 2000d - 2000-04-20 15:43:04 -0400
++
++  changes to the documentation and code of strftime for C99 conformance
++
++  a bug fix for date.c
++
++  These are based on (though modified from) changes by Paul Eggert.
++
++
++Release 2000c - 2000-03-04 10:31:43 -0500
++
++  changes by Paul Eggert
++
++
++Release 2000b - 2000-02-21 12:16:29 -0500
++
++  changes by Paul Eggert and Joseph Myers
++
++  modest tweaks to the tz-art.htm and tz-link.htm files
++
++
++Release 2000a - 2000-01-18 09:21:26 -0500
++
++  changes by Paul Eggert
++
++  The two hypertext documents have also been renamed.
++
++
++Release code1999i-data1999j - 1999-11-15 18:43:22 -0500
++
++  Paul Eggert's changes
++
++  additions to the "zic" manual page and the "Arts.htm" file
++
++
++Release code1999h-data1999i - 1999-11-08 14:55:21 -0500
++
++  [not summarized]
++
++
++Release data1999h - 1999-10-07 03:50:29 -0400
++
++  changes by Paul Eggert to "europe" (most importantly, fixing
++  Lithuania and Estonia)
++
++
++Release 1999g - 1999-09-28 11:06:18 -0400
++
++  data changes by Paul Eggert (most importantly, the change for
++  Lebanon that buys correctness for this coming Sunday)
++
++  The "code" file contains changes to "Makefile" and "checktab.awk" to
++  allow better checking of time zone files before they are published.
++
++
++Release 1999f - 1999-09-23 09:48:14 -0400
++
++  changes by Arthur David Olson and Paul Eggert
++
++
++Release 1999e - 1999-08-17 15:20:54 -0400
++
++  changes circulated by Paul Eggert, although the change to handling
++  of DST-specifying time zone names has been commented out for now
++  (search for "XXX" in "localtime.c" for details).  These files also
++  do not make any changes to the start of DST in Brazil.
++
++  In addition to Paul's changes, there are updates to "Arts.htm" and
++  cleanups of URLs.
++
++
++Release 1999d - 1999-03-30 11:31:07 -0500
++
++  changes by Paul Eggert
++
++  The Makefile's "make public" rule has also been changed to do a test
++  compile of each individual time zone data file (which should help
++  avoid problems such as the one we had with Nicosia).
++
++
++Release 1999c - 1999-03-25 09:47:47 -0500
++
++  changes by Paul Eggert, most importantly the change for Chile.
++
++
++Release 1999b - 1999-02-01 17:51:44 -0500
++
++  changes by Paul Eggert
++
++  code changes (suggested by Mani Varadarajan, mani at be.com) for
++  correct handling of symbolic links when building using a relative directory
++
++  code changes to generate correct messages for failed links
++
++  updates to the URLs in Arts.htm
++
++
++Release 1999a - 1999-01-19 16:20:29 -0500
++
++  error message internationalizations and corrections in zic.c and
++  zdump.c (as suggested by Vladimir Michl, vladimir.michl at upol.cz,
++  to whom thanks!)
++
++
++Release code1998h-data1998i - 1998-10-01 09:56:10 -0400
++
++  changes for Brazil, Chile, and Germany
++
++  support for use of "24:00" in the input files for the time zone compiler
++
++
++Release code1998g-data1998h - 1998-09-24 10:50:28 -0400
++
++  changes by Paul Eggert
++
++  correction to a define in the "private.h" file
++
++
++Release data1998g - 1998-08-11 03:28:35 -0000
++  [tzdata1998g.tar.gz is missing!]
++
++  Lithuanian change provided by mgedmin at pub.osf.it
++
++  Move creation of the GMT link with Etc/GMT to "etcetera" (from
++  "backward") to ensure that the GMT file is created even where folks
++  don't want the "backward" links (as suggested by Paul Eggert).
++
++
++Release data1998f - 1998-07-20 13:50:00 -0000
++  [tzdata1998f.tar.gz is missing!]
++
++  Update the "leapseconds" file to include the newly-announced
++  insertion at the end of 1998.
++
++
++Release code1998f - 1998-06-01 10:18:31 -0400
++
++  addition to localtime.c by Guy Harris
++
++
++Release 1998e - 1998-05-28 09:56:26 -0400
++
++  The Makefile is changed to produce zoneinfo-posix rather than
++  zoneinfo/posix, and to produce zoneinfo-leaps rather than
++  zoneinfo/right.
++
++  data changes by Paul Eggert
++
++  changes from Guy Harris to provide asctime_r and ctime_r
++
++  A usno1998 file (substantially identical to usno1997) has been added.
++
++
++Release 1998d - 1998-05-14 11:58:34 -0400
++
++  changes to comments (in particular, elimination of references to CIA maps).
++  "Arts.htm", "WWW.htm", "asia", and "australasia" are the only places
++  where changes occur.
++
++
++Release 1998c - 1998-02-28 12:32:26 -0500
++
++  changes by Paul Eggert (save the "French correction," on which I'll
++  wait for the dust to settle)
++
++  symlink changes
++
++  changes and additions to Arts.htm
++
++
++Release 1998b - 1998-01-17 14:31:51 -0500
++
++  URL cleanups and additions
++
++
++Release 1998a - 1998-01-13 12:37:35 -0500
++
++  changes by Paul Eggert
++
++
++Release code1997i-data1997k - 1997-12-29 09:53:41 -0500
++
++  changes by Paul Eggert, with minor modifications from Arthur David
++  Olson to make the files more browser friendly
++
++
++Release code1997h-data1997j - 1997-12-18 17:47:35 -0500
++
++  minor changes to put "TZif" at the start of each time zone information file
++
++  a rule has also been added to the Makefile so you can
++	make zones
++  to just recompile the zone information files (rather than doing a
++  full "make install" with its other effects).
++
++
++Release data1997i - 1997-10-07 08:45:38 -0400
++
++  changes to Africa by Paul Eggert
++
++
++Release code1997g-data1997h - 1997-09-04 16:56:54 -0400
++
++  corrections for Uruguay (and other locations)
++
++  Arthur David Olson's simple-minded fix allowing mktime to both
++  correctly handle leap seconds and correctly handle tm_sec values
++  upon which arithmetic has been performed.
++
++
++Release code1997f-data1997g - 1997-07-19 13:15:02 -0400
++
++  Paul Eggert's updates
++
++  a small change to a function prototype;
++
++  "Music" has been renamed "Arts.htm", HTMLified, and augmented to
++  include information on Around the World in Eighty Days.
++
++
++Release code1997e-data1997f - 1997-05-03 18:52:34 -0400
++
++  fixes to zic's error handling
++
++  changes inspired by the item circulated on Slovenia
++
++  The description of Web resources has been HTMLified for browsing
++  convenience.
++
++  A new piece of tz-related music has been added to the "Music" file.
++
++
++Release code1997d-data1997e - 1997-03-29 12:48:52 -0500
++
++  Paul Eggert's latest suggestions
++
++
++Release code1997c-data1997d - 1997-03-07 20:37:54 -0500
++
++  changes to "zic.c" to correct performance of the "-s" option
++
++  a new file "usno1997"
++
++
++Release data1997c - 1997-03-04 09:58:18 -0500
++
++  changes in Israel
++
++
++Release 1997b - 1997-02-27 18:34:19 -0500
++
++  The data file incorporates the 1997 leap second.
++
++  The code file incorporates Arthur David Olson's take on the
++  zic/multiprocessor/directory-creation situation.
++
++
++Release 1997a - 1997-01-21 09:11:10 -0500
++
++  Paul Eggert's Antarctica (and other changes)
++
++  Arthur David Olson finessed the "getopt" issue by checking against
++  both -1 and EOF (regardless of POSIX, SunOS 4.1.1's manual says -1
++  is returned while SunOS 5.5's manual says EOF is returned).
++
++
++Release code1996o-data1996n - 1996-12-27 21:42:05 -0500
++
++  Paul Eggert's latest changes
++
++
++Release code1996n - 1996-12-16 09:42:02 -0500
++
++  link snapping fix from Bruce Evans (via Garrett Wollman)
++
++
++Release data1996m - 1996-11-24 02:37:34 -0000
++  [tzdata1996m.tar.gz is missing!]
++
++  Paul Eggert's batch of changes
++
++
++Release code1996m-data1996l - 1996-11-05 14:00:12 -0500
++
++  No functional changes here; the files have simply been changed to
++  make more use of ISO style dates in comments. The names of the above
++  files now include the year in full.
++
++
++Release code96l - 1996-09-08 17:12:20 -0400
++
++  tzcode96k was missing a couple of pieces.
++
++
++Release 96k - 1996-09-08 16:06:22 -0400
++
++  the latest round of changes from Paul Eggert
++
++  the recent Year 2000 material
++
++
++Release code96j - 1996-07-30 13:18:53 -0400
++
++  Set sp->typecnt as suggested by Timothy Patrick Murphy.
++
++
++Release code96i - 1996-07-27 20:11:35 -0400
++
++  Paul's suggested patch for strftime %V week numbers
++
++
++Release data96i - 1996-07-01 18:13:04 -0400
++
++  "northamerica" and "europe" changes by Paul Eggert
++
++
++Release code96h - 1996-06-05 08:02:21 -0400
++
++  fix for handling transitions specified in Universal Time
++
++  Some "public domain" notices have also been added.
++
++
++Release code96g - 1996-05-16 14:00:26 -0400
++
++  fix for the simultaneous-DST-and-zone-change challenge
++
++
++Release data96h - 1996-05-09 17:40:51 -0400
++
++  changes by Paul Eggert
++
++
++Release code96f-data96g - 1996-05-03 03:09:59 -0000
++  [tzcode96f.tar.gz + tzdata96g.tar.gz are both missing!]
++
++  The changes get us some of the way to fixing the problems noted in Paul
++  Eggert's letter yesterday (in addition to a few others).  The approach
++  has been to make zic a bit smarter about figuring out what time zone
++  abbreviations apply just after the time specified in the "UNTIL" part
++  of a zone line.  Putting the smarts in zic means avoiding having
++  transition times show up in both "Zone" lines and "Rule" lines, which
++  in turn avoids multiple transition time entries in time zone files.
++  (This also makes the zic input files such as "europe" a bit shorter and
++  should ease maintenance.)
++
++
++Release data96f - 1996-04-19 19:20:03 -0000
++  [tzdata96f.tar.gz is missing!]
++
++  The only changes are to the "northamerica" file; the time zone
++  abbreviation for Denver is corrected to MST (and MDT), and the
++  comments for Mexico have been updated.
++
++
++Release data96e - 1996-03-19 17:37:26 -0500
++
++  Proposals by Paul Eggert, in particular the Portugal change that
++  comes into play at the end of this month.
++
++
++Release data96d - 1996-03-18 20:49:39 -0500
++
++  [not summarized]
++
++
++Release code96e - 1996-02-29 15:43:27 -0000
++  [tzcode96e.tar.gz is missing!]
++
++  internationalization changes and the fix to the documentation for strftime
++
++
++Release code96d-data96c - 1996-02-12 11:05:27 -0500
++
++  The "code" file simply updates Bob Kridle's electronic address.
++
++  The "data" file updates rules for Mexico.
++
++
++Release data96b - 1996-01-27 15:44:42 -0500
++
++  Kiribati change
++
++
++Release code96c - 1996-01-16 16:58:15 -0500
++
++  leap-year streamlining and binary-search changes
++
++  fix to newctime.3
++
++
++Release code96b - 1996-01-10 20:42:39 -0500
++
++  fixes and enhancements from Paul Eggert, including code that
++  emulates the behavior of recent versions of the SunOS "date"
++  command.
++
++
++Release 96a - 1996-01-06 09:08:24 -0500
++
++  Israel updates
++
++  fixes to strftime.c for correct ISO 8601 week number generation,
++  plus support for two new formats ('G' and 'g') to give ISO 8601 year
++  numbers (which are not necessarily the same as calendar year numbers)
++
++
++Release code95i-data95m - 1995-12-21 12:46:47 -0500
++
++  The latest revisions from Paul Eggert are included, the usno1995
++  file has been updated, and a new file ("WWW") covering useful URLs
++  has been added.
++
++
++Release code95h-data95l - 1995-12-19 18:10:12 -0500
++
++  A simplification of a macro definition, a change to data for Sudan,
++  and (for last minute shoppers) notes in the "Music" file on the CD
++  "Old Man Time".
++
++
++Release code95g-data95k - 1995-10-30 10:32:47 -0500
++
++  (slightly reformatted) 8-bit-clean proposed patch
++
++  minor patch: US/Eastern -> America/New_York
++
++  snapshot of the USNO's latest data ("usno1995")
++
++  some other minor cleanups
++
++
++Release code95f-data95j - 1995-10-28 21:01:34 -0000
++  [tzcode95f.tar.gz + tzdata95j.tar.gz are both missing!]
++
++  European cleanups
++
++  support for 64-bit time_t's
++
++  optimization in localtime.c
++
++
++Release code95e - 1995-10-13 13:23:57 -0400
++
++  the mktime change to scan from future to past when trying to find time zone
++  offsets
++
++
++Release data95i - 1995-09-26 10:43:26 -0400
++
++  For Canada/Central, guess that the Sun customer's "one week too
++  early" was just a approximation, and the true error is one month
++  too early.  This is consistent with the rest of Canada.
++
++
++Release data95h - 1995-09-21 11:26:48 -0400
++
++  latest changes from Paul Eggert
++
++
++Release code95d - 1995-09-14 11:14:45 -0400
++
++  the addition of a "Music" file, which documents four recorded
++  versions of the tune "Save That Time".
++
++
++Release data95g - 1995-09-01 17:21:36 -0400
++
++  "yearistype" correction
++
++
++Release data95f - 1995-08-28 20:46:56 -0400
++
++  Paul Eggert's change to the australasia file
++
++
++Release data95e - 1995-07-08 18:02:34 -0400
++
++  The only change is a leap second at the end of this year.
++  Thanks to Bradley White for forwarding news on the leap second.
++
++
++Release data95d - 1995-07-03 13:26:22 -0400
++
++  Paul Eggert's changes
++
++
++Release data95c - 1995-07-02 19:19:28 -0400
++
++  changes to "asia", "backward", "europe", and "southamerica"
++  (read: northamericacentrics need not apply)
++
++
++Release code95c - 1995-03-13 14:00:46 -0500
++
++  one-line fix for sign extension problems in detzcode
++
++
++Release 95b - 1995-03-04 11:22:38 -0500
++
++  Minor changes in both:
++
++  The "code" file contains a workaround for the lack of "unistd.h" in
++  Microsoft C++ version 7.
++
++  The "data" file contains a fixed "Link" for America/Shiprock.
++
++
++Release 94h - 1994-12-10 12:51:14 -0500
++
++  The files:
++
++  *	incorporate the changes to "zdump" and "date" to make changes to
++	the "TZ" environment variable permanent;
++
++  *	incorporate the table changes by Paul Eggert;
++
++  *	include (and document) support for universal time specifications in
++	data files - but do not (yet) include use of this feature in the
++	data files.
++
++  Think of this as "TZ Classic" - the software has been set up not to break if
++  universal time shows up in its input, and data entries have been
++  left as is so as not to break existing implementations.
++
++
++Release data94f - 1994-08-20 12:56:09 -0400
++
++  (with thanks!) the latest data updates from Paul Eggert
++
++
++Release data94e - 1994-06-04 13:13:53 -0400
++
++  [not summarized]
++
++
++Release code94g - 1994-05-05 12:14:07 -0400
++
++  fix missing "optind.c" and a reference to it in the Makefile
++
++
++Release code94f - 1994-05-05 13:00:33 -0000
++  [tzcode94f.tar.gz is missing!]
++
++  changes to avoid overflow in difftime, as well as changes to cope
++  with the 52/53 challenge in strftime
++
++
++Release code94e - 1994-03-30 23:32:59 -0500
++
++  change for the benefit of PCTS
++
++
++Release 94d - 1994-02-24 15:42:25 -0500
++
++  Avoid clashes with POSIX semantics for zones such as GMT+4.
++
++  Some other very minor housekeeping is also present.
++
++
++Release code94c - 1994-02-10 08:52:40 -0500
++
++  Fix bug where mkdirs was broken unless you compile with
++  -fwritable-strings (which is generally losing to do).
++
++
++Release 94b - 1994-02-07 10:04:33 -0500
++
++  work by Paul Eggert who notes:
++
++  I found another book of time zone histories by E W Whitman; it's not
++  as extensive as Shanks but has a few goodies of its own.  I used it
++  to update the tables.  I also fixed some more as a result of
++  correspondence with Adam David and Peter Ilieve, and move some stray
++  links from 'europe' to 'backward'.  I corrected some scanning errors
++  in usno1989.
++
++  As far as the code goes, I fixed zic to allow years in the range
++  INT_MIN to INT_MAX; this fixed a few boundary conditions around 1900.
++  And I cleaned up the zic documentation a little bit.
++
++
++Release data94a - 1994-02-03 08:58:54 -0500
++
++  It simply incorporates the recently announced leap second into the
++  "leapseconds" file.
++
++
++Release 93g - 1993-11-22 17:28:27 -0500
++
++  Paul Eggert has provided a good deal of historic information (based
++  on Shanks), and there are some code changes to deal with the buglets
++  that crawled out in dealing with the new information.
++
++
++Release 93f - 1993-10-15 12:27:46 -0400
++
++  Paul Eggert's changes
++
++
++Release 93e - 1993-09-05 21:21:44 -0400
++
++  This has updated data for Israel, England, and Kwajalein.  There's
++  also an update to "zdump" to cope with Kwajalein's 24-hour jump.
++  Thanks to Paul Eggert and Peter Ilieve for the changes.
++
++
++Release 93d - 1993-06-17 23:34:17 -0400
++
++  new fix and new data on Israel
++
++
++Release 93c - 1993-06-06 19:31:55 -0400
++
++  [not summarized]
++
++
++Release 93b - 1993-02-02 14:53:58 -0500
++
++  updated "leapseconds" file
++
++
++Release 93 - 1993-01-08 07:01:06 -0500
++
++  At kre's suggestion, the package has been split in two - a code piece
++  (which also includes documentation) that's only of use to folks who
++  want to recompile things and a data piece useful to anyone who can
++  run "zic".
++
++  The new version has a few changes to the data files, a few
++  portability changes, and an off-by-one fix (with thanks to
++  Tom Karzes at deshaw.com for providing a description and a
++  solution).
++
++
++Release 92c - 1992-11-21 17:35:36 -0000
++  [tz92c.tar.Z is missing!]
++
++  The fallout from the latest round of DST transitions.
++
++  There are changes for Portugal, Saskatchewan, and "Pacific-New";
++  there's also a change to "zic.c" that makes it portable to more systems.
++
++
++Release 92 - 1992-04-25 18:17:03 -0000
++  [tz92.tar.Z is missing!]
++
++  By popular demand (well, at any rate, following a request by kre at munnari)
++
++
++The 1989 update of the time zone package featured:
++
++  *	POSIXization (including interpretation of POSIX-style TZ environment
++	variables, provided by Guy Harris),
++  *	ANSIfication (including versions of "mktime" and "difftime"),
++  *	SVIDulation (an "altzone" variable)
++  *	MACHination (the "gtime" function)
++  *	corrections to some time zone data (including corrections to the rules
++	for Great Britain and New Zealand)
++  *	reference data from the United States Naval Observatory for folks who
++	want to do additional time zones
++  *	and the 1989 data for Saudi Arabia.
++
++  (Since this code will be treated as "part of the implementation" in some
++  places and as "part of the application" in others, there's no good way to
++  name functions, such as timegm, that are not part of the proposed ANSI C
++  standard; such functions have kept their old, underscore-free names in this
++  update.)
++
++  And the "dysize" function has disappeared; it was present to allow
++  compilation of the "date" command on old BSD systems, and a version of "date"
++  is now provided in the package.  The "date" command is not created when you
++  "make all" since it may lack options provided by the version distributed with
++  your operating system, or may not interact with the system in the same way
++  the native version does.
++
++  Since POSIX frowns on correct leap second handling, the default behavior of
++  the "zic" command (in the absence of a "-L" option) has been changed to omit
++  leap second information from its output files.
++
++
++-----
++Notes
++
++This file contains copies of the part of each release announcement
++that talks about the changes in that release.  The text has been
++adapted and reformatted for the purposes of this file.
++
++Traditionally a release R consists of a pair of tarball files,
++tzcodeR.tar.gz and tzdataR.tar.gz.  However, some releases (e.g.,
++code2010a, data2012c) consist of just one or the other tarball, and a
++few (e.g., code2012c-data2012d) have tarballs with mixed version
++numbers.  Recent releases also come in an experimental format
++consisting of a single tarball tzdb-R.tar.lz with extra data.
++
++Release time stamps are taken from the release's commit (for newer,
++Git-based releases), from the newest file in the tarball (for older
++releases, where this info is available) or from the email announcing
++the release (if all else fails; these are marked with a time zone of
++-0000 and an "is missing!" comment).
++
++Earlier versions of the code and data were not announced on the tz
++list and are not summarized here.
++
++This file is in the public domain.
++
++Local Variables:
++coding: utf-8
++End:
+Index: contrib/tzdata/README
+===================================================================
+--- contrib/tzdata/README	(nonexistent)
++++ contrib/tzdata/README	(working copy)
+@@ -0,0 +1,71 @@
++README for the tz distribution
++
++"What time is it?" -- Richard Deacon as The King
++"Any time you want it to be." -- Frank Baxter as The Scientist
++					(from the Bell System film "About Time")
++
++The Time Zone Database (often called tz or zoneinfo) contains code and
++data that represent the history of local time for many representative
++locations around the globe.  It is updated periodically to reflect
++changes made by political bodies to time zone boundaries, UTC offsets,
++and daylight-saving rules.
++
++Here is a recipe for acquiring, building, installing, and testing the
++tz distribution on a GNU/Linux or similar host.
++
++To acquire the distribution, run the following shell commands:
++
++	mkdir tz
++	cd tz
++	wget --retr-symlinks 'ftp://ftp.iana.org/tz/tz*-latest.tar.gz'
++	gzip -dc tzcode-latest.tar.gz | tar -xf -
++	gzip -dc tzdata-latest.tar.gz | tar -xf -
++
++Alternatively, the following shell commands acquire the same
++distribution, with extra data useful for regression testing:
++
++	wget --retr-symlinks 'ftp://ftp.iana.org/tz/tzdb-latest.tar.lz'
++	lzip -dc tzdb-latest.tar.lz | tar -xf -
++
++Be sure to read the comments in "Makefile" and make any changes needed
++to make things right for your system, especially if you are using some
++platform other than GNU/Linux.  Then run the following commands,
++substituting your desired installation directory for "$HOME/tzdir":
++
++	make TOPDIR=$HOME/tzdir install
++	$HOME/tzdir/etc/zdump -v America/Los_Angeles
++
++Historical local time information has been included here to:
++
++*	provide a compendium of data about the history of civil time
++	that is useful even if not 100% accurate;
++
++*	give an idea of the variety of local time rules that have
++	existed in the past and thus an idea of the variety that may be
++	expected in the future;
++
++*	provide a test of the generality of the local time rule description
++	system.
++
++The information in the time zone data files is by no means authoritative;
++fixes and enhancements are welcome.  Please see the file CONTRIBUTING
++for details.
++
++Thanks to these Time Zone Caballeros who've made major contributions to the
++time conversion package: Keith Bostic; Bob Devine; Paul Eggert; Robert Elz;
++Guy Harris; Mark Horton; John Mackin; and Bradley White.  Thanks also to
++Michael Bloom, Art Neilson, Stephen Prince, John Sovereign, and Frank Wales
++for testing work, and to Gwillim Law for checking local mean time data.
++Thanks in particular to Arthur David Olson, the project's founder and first
++maintainer, to whom the time zone community owes the greatest debt of all.
++None of them are responsible for remaining errors.
++
++Look in <ftp://ftp.iana.org/tz/releases/> for updated versions of these files.
++
++Please send comments or information to tz@iana.org.
++
++-----
++
++This file is in the public domain, so clarified as of 2009-05-17 by
++Arthur David Olson.  The other files in this distribution are either
++public domain or BSD licensed; see the file LICENSE for details.
+Index: contrib/tzdata/Theory
+===================================================================
+--- contrib/tzdata/Theory	(nonexistent)
++++ contrib/tzdata/Theory	(working copy)
+@@ -0,0 +1,840 @@
++Theory and pragmatics of the tz code and data
++
++
++----- Outline -----
++
++	Scope of the tz database
++	Names of time zone rules
++	Time zone abbreviations
++	Accuracy of the tz database
++	Time and date functions
++	Calendrical issues
++	Time and time zones on Mars
++
++
++----- Scope of the tz database -----
++
++The tz database attempts to record the history and predicted future of
++all computer-based clocks that track civil time.  To represent this
++data, the world is partitioned into regions whose clocks all agree
++about time stamps that occur after the somewhat-arbitrary cutoff point
++of the POSIX Epoch (1970-01-01 00:00:00 UTC).  For each such region,
++the database records all known clock transitions, and labels the region
++with a notable location.  Although 1970 is a somewhat-arbitrary
++cutoff, there are significant challenges to moving the cutoff earlier
++even by a decade or two, due to the wide variety of local practices
++before computer timekeeping became prevalent.
++
++Clock transitions before 1970 are recorded for each such location,
++because most systems support time stamps before 1970 and could
++misbehave if data entries were omitted for pre-1970 transitions.
++However, the database is not designed for and does not suffice for
++applications requiring accurate handling of all past times everywhere,
++as it would take far too much effort and guesswork to record all
++details of pre-1970 civil timekeeping.
++
++As described below, reference source code for using the tz database is
++also available.  The tz code is upwards compatible with POSIX, an
++international standard for UNIX-like systems.  As of this writing, the
++current edition of POSIX is:
++
++  The Open Group Base Specifications Issue 7
++  IEEE Std 1003.1, 2013 Edition
++  <http://pubs.opengroup.org/onlinepubs/9699919799/>
++
++
++
++----- Names of time zone rules -----
++
++Each of the database's time zone rules has a unique name.
++Inexperienced users are not expected to select these names unaided.
++Distributors should provide documentation and/or a simple selection
++interface that explains the names; for one example, see the 'tzselect'
++program in the tz code.  The Unicode Common Locale Data Repository
++<http://cldr.unicode.org/> contains data that may be useful for other
++selection interfaces.
++
++The time zone rule naming conventions attempt to strike a balance
++among the following goals:
++
++ * Uniquely identify every region where clocks have agreed since 1970.
++   This is essential for the intended use: static clocks keeping local
++   civil time.
++
++ * Indicate to experts where that region is.
++
++ * Be robust in the presence of political changes.  For example, names
++   of countries are ordinarily not used, to avoid incompatibilities
++   when countries change their name (e.g. Zaire->Congo) or when
++   locations change countries (e.g. Hong Kong from UK colony to
++   China).
++
++ * Be portable to a wide variety of implementations.
++
++ * Use a consistent naming conventions over the entire world.
++
++Names normally have the form AREA/LOCATION, where AREA is the name
++of a continent or ocean, and LOCATION is the name of a specific
++location within that region.  North and South America share the same
++area, 'America'.  Typical names are 'Africa/Cairo', 'America/New_York',
++and 'Pacific/Honolulu'.
++
++Here are the general rules used for choosing location names,
++in decreasing order of importance:
++
++	Use only valid POSIX file name components (i.e., the parts of
++		names other than '/').  Do not use the file name
++		components '.' and '..'.  Within a file name component,
++		use only ASCII letters, '.', '-' and '_'.  Do not use
++		digits, as that might create an ambiguity with POSIX
++		TZ strings.  A file name component must not exceed 14
++		characters or start with '-'.  E.g., prefer 'Brunei'
++		to 'Bandar_Seri_Begawan'.  Exceptions: see the discussion
++		of legacy names below.
++	A name must not be empty, or contain '//', or start or end with '/'.
++	Do not use names that differ only in case.  Although the reference
++		implementation is case-sensitive, some other implementations
++		are not, and they would mishandle names differing only in case.
++	If one name A is an initial prefix of another name AB (ignoring case),
++		then B must not start with '/', as a regular file cannot have
++		the same name as a directory in POSIX.  For example,
++		'America/New_York' precludes 'America/New_York/Bronx'.
++	Uninhabited regions like the North Pole and Bouvet Island
++		do not need locations, since local time is not defined there.
++	There should typically be at least one name for each ISO 3166-1
++		officially assigned two-letter code for an inhabited country
++		or territory.
++	If all the clocks in a region have agreed since 1970,
++		don't bother to include more than one location
++		even if subregions' clocks disagreed before 1970.
++		Otherwise these tables would become annoyingly large.
++	If a name is ambiguous, use a less ambiguous alternative;
++		e.g. many cities are named San José and Georgetown, so
++		prefer 'Costa_Rica' to 'San_Jose' and 'Guyana' to 'Georgetown'.
++	Keep locations compact.  Use cities or small islands, not countries
++		or regions, so that any future time zone changes do not split
++		locations into different time zones.  E.g. prefer 'Paris'
++		to 'France', since France has had multiple time zones.
++	Use mainstream English spelling, e.g. prefer 'Rome' to 'Roma', and
++		prefer 'Athens' to the Greek 'Αθήνα' or the Romanized 'Athína'.
++		The POSIX file name restrictions encourage this rule.
++	Use the most populous among locations in a zone,
++		e.g. prefer 'Shanghai' to 'Beijing'.  Among locations with
++		similar populations, pick the best-known location,
++		e.g. prefer 'Rome' to 'Milan'.
++	Use the singular form, e.g. prefer 'Canary' to 'Canaries'.
++	Omit common suffixes like '_Islands' and '_City', unless that
++		would lead to ambiguity.  E.g. prefer 'Cayman' to
++		'Cayman_Islands' and 'Guatemala' to 'Guatemala_City',
++		but prefer 'Mexico_City' to 'Mexico' because the country
++		of Mexico has several time zones.
++	Use '_' to represent a space.
++	Omit '.' from abbreviations in names, e.g. prefer 'St_Helena'
++		to 'St._Helena'.
++	Do not change established names if they only marginally
++		violate the above rules.  For example, don't change
++		the existing name 'Rome' to 'Milan' merely because
++		Milan's population has grown to be somewhat greater
++		than Rome's.
++	If a name is changed, put its old spelling in the 'backward' file.
++		This means old spellings will continue to work.
++
++The file 'zone1970.tab' lists geographical locations used to name time
++zone rules.  It is intended to be an exhaustive list of names for
++geographic regions as described above; this is a subset of the names
++in the data.  Although a 'zone1970.tab' location's longitude
++corresponds to its LMT offset with one hour for every 15 degrees east
++longitude, this relationship is not exact.
++
++Older versions of this package used a different naming scheme,
++and these older names are still supported.
++See the file 'backward' for most of these older names
++(e.g., 'US/Eastern' instead of 'America/New_York').
++The other old-fashioned names still supported are
++'WET', 'CET', 'MET', and 'EET' (see the file 'europe').
++
++Older versions of this package defined legacy names that are
++incompatible with the first rule of location names, but which are
++still supported.  These legacy names are mostly defined in the file
++'etcetera'.  Also, the file 'backward' defines the legacy names
++'GMT0', 'GMT-0', 'GMT+0' and 'Canada/East-Saskatchewan', and the file
++'northamerica' defines the legacy names 'EST5EDT', 'CST6CDT',
++'MST7MDT', and 'PST8PDT'.
++
++Excluding 'backward' should not affect the other data.  If
++'backward' is excluded, excluding 'etcetera' should not affect the
++remaining data.
++
++
++----- Time zone abbreviations -----
++
++When this package is installed, it generates time zone abbreviations
++like 'EST' to be compatible with human tradition and POSIX.
++Here are the general rules used for choosing time zone abbreviations,
++in decreasing order of importance:
++
++	Use three or more characters that are ASCII alphanumerics or '+' or '-'.
++		Previous editions of this database also used characters like
++		' ' and '?', but these characters have a special meaning to
++		the shell and cause commands like
++			set `date`
++		to have unexpected effects.
++		Previous editions of this rule required upper-case letters,
++		but the Congressman who introduced Chamorro Standard Time
++		preferred "ChST", so lower-case letters are now allowed.
++		Also, POSIX from 2001 on relaxed the rule to allow '-', '+',
++		and alphanumeric characters from the portable character set
++		in the current locale.  In practice ASCII alphanumerics and
++		'+' and '-' are safe in all locales.
++
++		In other words, in the C locale the POSIX extended regular
++		expression [-+[:alnum:]]{3,} should match the abbreviation.
++		This guarantees that all abbreviations could have been
++		specified by a POSIX TZ string.
++
++	Use abbreviations that are in common use among English-speakers,
++		e.g. 'EST' for Eastern Standard Time in North America.
++		We assume that applications translate them to other languages
++		as part of the normal localization process; for example,
++		a French application might translate 'EST' to 'HNE'.
++
++	For zones whose times are taken from a city's longitude, use the
++		traditional xMT notation, e.g. 'PMT' for Paris Mean Time.
++		The only name like this in current use is 'GMT'.
++
++	Use 'LMT' for local mean time of locations before the introduction
++		of standard time; see "Scope of the tz database".
++
++	If there is no common English abbreviation, use numeric offsets like
++		-05 and +0830 that are generated by zic's %z notation.
++
++    [The remaining guidelines predate the introduction of %z.
++    They are problematic as they mean tz data entries invent
++    notation rather than record it.  These guidelines are now
++    deprecated and the plan is to gradually move to %z for
++    inhabited locations and to "-00" for uninhabited locations.]
++
++	If there is no common English abbreviation, abbreviate the English
++		translation of the usual phrase used by native speakers.
++		If this is not available or is a phrase mentioning the country
++		(e.g. "Cape Verde Time"), then:
++
++		When a country is identified with a single or principal zone,
++			append 'T' to the country's ISO	code, e.g. 'CVT' for
++			Cape Verde Time.  For summer time append 'ST';
++			for double summer time append 'DST'; etc.
++		Otherwise, take the first three letters of an English place
++			name identifying each zone and append 'T', 'ST', etc.
++			as before; e.g. 'VLAST' for VLAdivostok Summer Time.
++
++	Use UT (with time zone abbreviation '-00') for locations while
++		uninhabited.  The leading '-' is a flag that the time
++		zone is in some sense undefined; this notation is
++		derived from Internet RFC 3339.
++
++Application writers should note that these abbreviations are ambiguous
++in practice: e.g. 'CST' has a different meaning in China than
++it does in the United States.  In new applications, it's often better
++to use numeric UT offsets like '-0600' instead of time zone
++abbreviations like 'CST'; this avoids the ambiguity.
++
++
++----- Accuracy of the tz database -----
++
++The tz database is not authoritative, and it surely has errors.
++Corrections are welcome and encouraged; see the file CONTRIBUTING.
++Users requiring authoritative data should consult national standards
++bodies and the references cited in the database's comments.
++
++Errors in the tz database arise from many sources:
++
++ * The tz database predicts future time stamps, and current predictions
++   will be incorrect after future governments change the rules.
++   For example, if today someone schedules a meeting for 13:00 next
++   October 1, Casablanca time, and tomorrow Morocco changes its
++   daylight saving rules, software can mess up after the rule change
++   if it blithely relies on conversions made before the change.
++
++ * The pre-1970 entries in this database cover only a tiny sliver of how
++   clocks actually behaved; the vast majority of the necessary
++   information was lost or never recorded.  Thousands more zones would
++   be needed if the tz database's scope were extended to cover even
++   just the known or guessed history of standard time; for example,
++   the current single entry for France would need to split into dozens
++   of entries, perhaps hundreds.  And in most of the world even this
++   approach would be misleading due to widespread disagreement or
++   indifference about what times should be observed.  In her 2015 book
++   "The Global Transformation of Time, 1870-1950", Vanessa Ogle writes
++   "Outside of Europe and North America there was no system of time
++   zones at all, often not even a stable landscape of mean times,
++   prior to the middle decades of the twentieth century".  See:
++   Timothy Shenk, Booked: A Global History of Time. Dissent 2015-12-17
++   https://www.dissentmagazine.org/blog/booked-a-global-history-of-time-vanessa-ogle
++
++ * Most of the pre-1970 data entries come from unreliable sources, often
++   astrology books that lack citations and whose compilers evidently
++   invented entries when the true facts were unknown, without
++   reporting which entries were known and which were invented.
++   These books often contradict each other or give implausible entries,
++   and on the rare occasions when they are checked they are
++   typically found to be incorrect.
++
++ * For the UK the tz database relies on years of first-class work done by
++   Joseph Myers and others; see <http://www.polyomino.org.uk/british-time/>.
++   Other countries are not done nearly as well.
++
++ * Sometimes, different people in the same city would maintain clocks
++   that differed significantly.  Railway time was used by railroad
++   companies (which did not always agree with each other),
++   church-clock time was used for birth certificates, etc.
++   Often this was merely common practice, but sometimes it was set by law.
++   For example, from 1891 to 1911 the UT offset in France was legally
++   0:09:21 outside train stations and 0:04:21 inside.
++
++ * Although a named location in the tz database stands for the
++   containing region, its pre-1970 data entries are often accurate for
++   only a small subset of that region.  For example, Europe/London
++   stands for the United Kingdom, but its pre-1847 times are valid
++   only for locations that have London's exact meridian, and its 1847
++   transition to GMT is known to be valid only for the L&NW and the
++   Caledonian railways.
++
++ * The tz database does not record the earliest time for which a zone's
++   data entries are thereafter valid for every location in the region.
++   For example, Europe/London is valid for all locations in its
++   region after GMT was made the standard time, but the date of
++   standardization (1880-08-02) is not in the tz database, other than
++   in commentary.  For many zones the earliest time of validity is
++   unknown.
++
++ * The tz database does not record a region's boundaries, and in many
++   cases the boundaries are not known.  For example, the zone
++   America/Kentucky/Louisville represents a region around the city of
++   Louisville, the boundaries of which are unclear.
++
++ * Changes that are modeled as instantaneous transitions in the tz
++   database were often spread out over hours, days, or even decades.
++
++ * Even if the time is specified by law, locations sometimes
++   deliberately flout the law.
++
++ * Early timekeeping practices, even assuming perfect clocks, were
++   often not specified to the accuracy that the tz database requires.
++
++ * Sometimes historical timekeeping was specified more precisely
++   than what the tz database can handle.  For example, from 1909 to
++   1937 Netherlands clocks were legally UT +00:19:32.13, but the tz
++   database cannot represent the fractional second.
++
++ * Even when all the timestamp transitions recorded by the tz database
++   are correct, the tz rules that generate them may not faithfully
++   reflect the historical rules.  For example, from 1922 until World
++   War II the UK moved clocks forward the day following the third
++   Saturday in April unless that was Easter, in which case it moved
++   clocks forward the previous Sunday.  Because the tz database has no
++   way to specify Easter, these exceptional years are entered as
++   separate tz Rule lines, even though the legal rules did not change.
++
++ * The tz database models pre-standard time using the proleptic Gregorian
++   calendar and local mean time (LMT), but many people used other
++   calendars and other timescales.  For example, the Roman Empire used
++   the Julian calendar, and had 12 varying-length daytime hours with a
++   non-hour-based system at night.
++
++ * Early clocks were less reliable, and data entries do not represent
++   this unreliability.
++
++ * As for leap seconds, civil time was not based on atomic time before
++   1972, and we don't know the history of earth's rotation accurately
++   enough to map SI seconds to historical solar time to more than
++   about one-hour accuracy.  See: Morrison LV, Stephenson FR.
++   Historical values of the Earth's clock error Delta T and the
++   calculation of eclipses. J Hist Astron. 2004;35:327-36
++   <http://adsabs.harvard.edu/full/2004JHA....35..327M>;
++   Historical values of the Earth's clock error. J Hist Astron. 2005;36:339
++   <http://adsabs.harvard.edu/full/2005JHA....36..339M>.
++
++ * The relationship between POSIX time (that is, UTC but ignoring leap
++   seconds) and UTC is not agreed upon after 1972.  Although the POSIX
++   clock officially stops during an inserted leap second, at least one
++   proposed standard has it jumping back a second instead; and in
++   practice POSIX clocks more typically either progress glacially during
++   a leap second, or are slightly slowed while near a leap second.
++
++ * The tz database does not represent how uncertain its information is.
++   Ideally it would contain information about when data entries are
++   incomplete or dicey.  Partial temporal knowledge is a field of
++   active research, though, and it's not clear how to apply it here.
++
++In short, many, perhaps most, of the tz database's pre-1970 and future
++time stamps are either wrong or misleading.  Any attempt to pass the
++tz database off as the definition of time should be unacceptable to
++anybody who cares about the facts.  In particular, the tz database's
++LMT offsets should not be considered meaningful, and should not prompt
++creation of zones merely because two locations differ in LMT or
++transitioned to standard time at different dates.
++
++
++----- Time and date functions -----
++
++The tz code contains time and date functions that are upwards
++compatible with those of POSIX.
++
++POSIX has the following properties and limitations.
++
++*	In POSIX, time display in a process is controlled by the
++	environment variable TZ.  Unfortunately, the POSIX TZ string takes
++	a form that is hard to describe and is error-prone in practice.
++	Also, POSIX TZ strings can't deal with other (for example, Israeli)
++	daylight saving time rules, or situations where more than two
++	time zone abbreviations are used in an area.
++
++	The POSIX TZ string takes the following form:
++
++		stdoffset[dst[offset][,date[/time],date[/time]]]
++
++	where:
++
++	std and dst
++		are 3 or more characters specifying the standard
++		and daylight saving time (DST) zone names.
++		Starting with POSIX.1-2001, std and dst may also be
++		in a quoted form like "<UTC+10>"; this allows
++		"+" and "-" in the names.
++	offset
++		is of the form '[+-]hh:[mm[:ss]]' and specifies the
++		offset west of UT.  'hh' may be a single digit; 0<=hh<=24.
++		The default DST offset is one hour ahead of standard time.
++	date[/time],date[/time]
++		specifies the beginning and end of DST.  If this is absent,
++		the system supplies its own rules for DST, and these can
++		differ from year to year; typically US DST rules are used.
++	time
++		takes the form 'hh:[mm[:ss]]' and defaults to 02:00.
++		This is the same format as the offset, except that a
++		leading '+' or '-' is not allowed.
++	date
++		takes one of the following forms:
++		Jn (1<=n<=365)
++			origin-1 day number not counting February 29
++		n (0<=n<=365)
++			origin-0 day number counting February 29 if present
++		Mm.n.d (0[Sunday]<=d<=6[Saturday], 1<=n<=5, 1<=m<=12)
++			for the dth day of week n of month m of the year,
++			where week 1 is the first week in which day d appears,
++			and '5' stands for the last week in which day d appears
++			(which may be either the 4th or 5th week).
++			Typically, this is the only useful form;
++			the n and Jn forms are rarely used.
++
++	Here is an example POSIX TZ string, for US Pacific time using rules
++	appropriate from 1987 through 2006:
++
++		TZ='PST8PDT,M4.1.0/02:00,M10.5.0/02:00'
++
++	This POSIX TZ string is hard to remember, and mishandles time stamps
++	before 1987 and after 2006.  With this package you can use this
++	instead:
++
++		TZ='America/Los_Angeles'
++
++*	POSIX does not define the exact meaning of TZ values like "EST5EDT".
++	Typically the current US DST rules are used to interpret such values,
++	but this means that the US DST rules are compiled into each program
++	that does time conversion.  This means that when US time conversion
++	rules change (as in the United States in 1987), all programs that
++	do time conversion must be recompiled to ensure proper results.
++
++*	The TZ environment variable is process-global, which makes it hard
++	to write efficient, thread-safe applications that need access
++	to multiple time zones.
++
++*	In POSIX, there's no tamper-proof way for a process to learn the
++	system's best idea of local wall clock.  (This is important for
++	applications that an administrator wants used only at certain times -
++	without regard to whether the user has fiddled the "TZ" environment
++	variable.  While an administrator can "do everything in UTC" to get
++	around the problem, doing so is inconvenient and precludes handling
++	daylight saving time shifts - as might be required to limit phone
++	calls to off-peak hours.)
++
++*	POSIX provides no convenient and efficient way to determine the UT
++	offset and time zone abbreviation of arbitrary time stamps,
++	particularly for time zone settings that do not fit into the
++	POSIX model.
++
++*	POSIX requires that systems ignore leap seconds.
++
++*	The tz code attempts to support all the time_t implementations
++	allowed by POSIX.  The time_t type represents a nonnegative count of
++	seconds since 1970-01-01 00:00:00 UTC, ignoring leap seconds.
++	In practice, time_t is usually a signed 64- or 32-bit integer; 32-bit
++	signed time_t values stop working after 2038-01-19 03:14:07 UTC, so
++	new implementations these days typically use a signed 64-bit integer.
++	Unsigned 32-bit integers are used on one or two platforms,
++	and 36-bit and 40-bit integers are also used occasionally.
++	Although earlier POSIX versions allowed time_t to be a
++	floating-point type, this was not supported by any practical
++	systems, and POSIX.1-2013 and the tz code both require time_t
++	to be an integer type.
++
++These are the extensions that have been made to the POSIX functions:
++
++*	The "TZ" environment variable is used in generating the name of a file
++	from which time zone information is read (or is interpreted a la
++	POSIX); "TZ" is no longer constrained to be a three-letter time zone
++	name followed by a number of hours and an optional three-letter
++	daylight time zone name.  The daylight saving time rules to be used
++	for a particular time zone are encoded in the time zone file;
++	the format of the file allows U.S., Australian, and other rules to be
++	encoded, and allows for situations where more than two time zone
++	abbreviations are used.
++
++	It was recognized that allowing the "TZ" environment variable to
++	take on values such as "America/New_York" might cause "old" programs
++	(that expect "TZ" to have a certain form) to operate incorrectly;
++	consideration was given to using some other environment variable
++	(for example, "TIMEZONE") to hold the string used to generate the
++	time zone information file name.  In the end, however, it was decided
++	to continue using "TZ": it is widely used for time zone purposes;
++	separately maintaining both "TZ" and "TIMEZONE" seemed a nuisance;
++	and systems where "new" forms of "TZ" might cause problems can simply
++	use TZ values such as "EST5EDT" which can be used both by
++	"new" programs (a la POSIX) and "old" programs (as zone names and
++	offsets).
++
++*	The code supports platforms with a UT offset member in struct tm,
++	e.g., tm_gmtoff.
++
++*	The code supports platforms with a time zone abbreviation member in
++	struct tm, e.g., tm_zone.
++
++*	Since the "TZ" environment variable can now be used to control time
++	conversion, the "daylight" and "timezone" variables are no longer
++	needed.  (These variables are defined and set by "tzset"; however, their
++	values will not be used by "localtime.")
++
++*	Functions tzalloc, tzfree, localtime_rz, and mktime_z for
++	more-efficient thread-safe applications that need to use
++	multiple time zones.  The tzalloc and tzfree functions
++	allocate and free objects of type timezone_t, and localtime_rz
++	and mktime_z are like localtime_r and mktime with an extra
++	timezone_t argument.  The functions were inspired by NetBSD.
++
++*	A function "tzsetwall" has been added to arrange for the system's
++	best approximation to local wall clock time to be delivered by
++	subsequent calls to "localtime."  Source code for portable
++	applications that "must" run on local wall clock time should call
++	"tzsetwall();" if such code is moved to "old" systems that don't
++	provide tzsetwall, you won't be able to generate an executable program.
++	(These time zone functions also arrange for local wall clock time to be
++	used if tzset is called - directly or indirectly - and there's no "TZ"
++	environment variable; portable applications should not, however, rely
++	on this behavior since it's not the way SVR2 systems behave.)
++
++*	Negative time_t values are supported, on systems where time_t is signed.
++
++*	These functions can account for leap seconds, thanks to Bradley White.
++
++Points of interest to folks with other systems:
++
++*	Code compatible with this package is already part of many platforms,
++	including GNU/Linux, Android, the BSDs, Chromium OS, Cygwin, AIX, iOS,
++	BlackBery 10, macOS, Microsoft Windows, OpenVMS, and Solaris.
++	On such hosts, the primary use of this package
++	is to update obsolete time zone rule tables.
++	To do this, you may need to compile the time zone compiler
++	'zic' supplied with this package instead of using the system 'zic',
++	since the format of zic's input is occasionally extended,
++	and a platform may still be shipping an older zic.
++
++*	The UNIX Version 7 "timezone" function is not present in this package;
++	it's impossible to reliably map timezone's arguments (a "minutes west
++	of GMT" value and a "daylight saving time in effect" flag) to a
++	time zone abbreviation, and we refuse to guess.
++	Programs that in the past used the timezone function may now examine
++	tzname[localtime(&clock)->tm_isdst] to learn the correct time
++	zone abbreviation to use.  Alternatively, use
++	localtime(&clock)->tm_zone if this has been enabled.
++
++*	The 4.2BSD gettimeofday function is not used in this package.
++	This formerly let users obtain the current UTC offset and DST flag,
++	but this functionality was removed in later versions of BSD.
++
++*	In SVR2, time conversion fails for near-minimum or near-maximum
++	time_t values when doing conversions for places that don't use UT.
++	This package takes care to do these conversions correctly.
++	A comment in the source code tells how to get compatibly wrong
++	results.
++
++The functions that are conditionally compiled if STD_INSPIRED is defined
++should, at this point, be looked on primarily as food for thought.  They are
++not in any sense "standard compatible" - some are not, in fact, specified in
++*any* standard.  They do, however, represent responses of various authors to
++standardization proposals.
++
++Other time conversion proposals, in particular the one developed by folks at
++Hewlett Packard, offer a wider selection of functions that provide capabilities
++beyond those provided here.  The absence of such functions from this package
++is not meant to discourage the development, standardization, or use of such
++functions.  Rather, their absence reflects the decision to make this package
++contain valid extensions to POSIX, to ensure its broad acceptability.  If
++more powerful time conversion functions can be standardized, so much the
++better.
++
++
++----- Interface stability -----
++
++The tz code and data supply the following interfaces:
++
++ * A set of zone names as per "Names of time zone rules" above.
++
++ * Library functions described in "Time and date functions" above.
++
++ * The programs tzselect, zdump, and zic, documented in their man pages.
++
++ * The format of zic input files, documented in the zic man page.
++
++ * The format of zic output files, documented in the tzfile man page.
++
++ * The format of zone table files, documented in zone1970.tab.
++
++ * The format of the country code file, documented in iso3166.tab.
++
++When these interfaces are changed, an effort is made to preserve
++backward compatibility.  For example, tz data files typically do not
++rely on recently-added zic features, so that users can run older zic
++versions to process newer data files.
++
++Interfaces not listed above are less stable.  For example, users
++should not rely on particular UT offsets or abbreviations for time
++stamps, as data entries are often based on guesswork and these guesses
++may be corrected or improved.
++
++
++----- Calendrical issues -----
++
++Calendrical issues are a bit out of scope for a time zone database,
++but they indicate the sort of problems that we would run into if we
++extended the time zone database further into the past.  An excellent
++resource in this area is Nachum Dershowitz and Edward M. Reingold,
++Calendrical Calculations: Third Edition, Cambridge University Press (2008)
++<http://emr.cs.iit.edu/home/reingold/calendar-book/third-edition/>.
++Other information and sources are given below.  They sometimes disagree.
++
++
++France
++
++Gregorian calendar adopted 1582-12-20.
++French Revolutionary calendar used 1793-11-24 through 1805-12-31,
++and (in Paris only) 1871-05-06 through 1871-05-23.
++
++
++Russia
++
++From Chris Carrier (1996-12-02):
++On 1929-10-01 the Soviet Union instituted an "Eternal Calendar"
++with 30-day months plus 5 holidays, with a 5-day week.
++On 1931-12-01 it changed to a 6-day week; in 1934 it reverted to the
++Gregorian calendar while retaining the 6-day week; on 1940-06-27 it
++reverted to the 7-day week.  With the 6-day week the usual days
++off were the 6th, 12th, 18th, 24th and 30th of the month.
++(Source: Evitiar Zerubavel, _The Seven Day Circle_)
++
++
++Mark Brader reported a similar story in "The Book of Calendars", edited
++by Frank Parise (1982, Facts on File, ISBN 0-8719-6467-8), page 377.  But:
++
++From: Petteri Sulonen (via Usenet)
++Date: 14 Jan 1999 00:00:00 GMT
++...
++
++If your source is correct, how come documents between 1929 and 1940 were
++still dated using the conventional, Gregorian calendar?
++
++I can post a scan of a document dated December 1, 1934, signed by
++Yenukidze, the secretary, on behalf of Kalinin, the President of the
++Executive Committee of the Supreme Soviet, if you like.
++
++
++
++Sweden (and Finland)
++
++From: Mark Brader
++Subject: Re: Gregorian reform - a part of locale?
++<news:1996Jul6.012937.29190@sq.com>
++Date: 1996-07-06
++
++In 1700, Denmark made the transition from Julian to Gregorian.  Sweden
++decided to *start* a transition in 1700 as well, but rather than have one of
++those unsightly calendar gaps :-), they simply decreed that the next leap
++year after 1696 would be in 1744 - putting the whole country on a calendar
++different from both Julian and Gregorian for a period of 40 years.
++
++However, in 1704 something went wrong and the plan was not carried through;
++they did, after all, have a leap year that year.  And one in 1708.  In 1712
++they gave it up and went back to Julian, putting 30 days in February that
++year!...
++
++Then in 1753, Sweden made the transition to Gregorian in the usual manner,
++getting there only 13 years behind the original schedule.
++
++(A previous posting of this story was challenged, and Swedish readers
++produced the following references to support it: "Tideräkning och historia"
++by Natanael Beckman (1924) and "Tid, en bok om tideräkning och
++kalenderväsen" by Lars-Olof Lodén (1968).
++
++
++Grotefend's data
++
++From: "Michael Palmer" [with one obvious typo fixed]
++Subject: Re: Gregorian Calendar (was Re: Another FHC related question
++Newsgroups: soc.genealogy.german
++Date: Tue, 9 Feb 1999 02:32:48 -800
++...
++
++The following is a(n incomplete) listing, arranged chronologically, of
++European states, with the date they converted from the Julian to the
++Gregorian calendar:
++
++04/15 Oct 1582 - Italy (with exceptions), Spain, Portugal, Poland (Roman
++                 Catholics and Danzig only)
++09/20 Dec 1582 - France, Lorraine
++
++21 Dec 1582/
++   01 Jan 1583 - Holland, Brabant, Flanders, Hennegau
++10/21 Feb 1583 - bishopric of Liege (Lüttich)
++13/24 Feb 1583 - bishopric of Augsburg
++04/15 Oct 1583 - electorate of Trier
++05/16 Oct 1583 - Bavaria, bishoprics of Freising, Eichstedt, Regensburg,
++                 Salzburg, Brixen
++13/24 Oct 1583 - Austrian Oberelsaß and Breisgau
++20/31 Oct 1583 - bishopric of Basel
++02/13 Nov 1583 - duchy of Jülich-Berg
++02/13 Nov 1583 - electorate and city of Köln
++04/15 Nov 1583 - bishopric of Würzburg
++11/22 Nov 1583 - electorate of Mainz
++16/27 Nov 1583 - bishopric of Strassburg and the margraviate of Baden
++17/28 Nov 1583 - bishopric of Münster and duchy of Cleve
++14/25 Dec 1583 - Steiermark
++
++06/17 Jan 1584 - Austria and Bohemia
++11/22 Jan 1584 - Lucerne, Uri, Schwyz, Zug, Freiburg, Solothurn
++12/23 Jan 1584 - Silesia and the Lausitz
++22 Jan/
++   02 Feb 1584 - Hungary (legally on 21 Oct 1587)
++      Jun 1584 - Unterwalden
++01/12 Jul 1584 - duchy of Westfalen
++
++16/27 Jun 1585 - bishopric of Paderborn
++
++14/25 Dec 1590 - Transylvania
++
++22 Aug/
++   02 Sep 1612 - duchy of Prussia
++
++13/24 Dec 1614 - Pfalz-Neuburg
++
++          1617 - duchy of Kurland (reverted to the Julian calendar in
++                 1796)
++
++          1624 - bishopric of Osnabrück
++
++          1630 - bishopric of Minden
++
++15/26 Mar 1631 - bishopric of Hildesheim
++
++          1655 - Kanton Wallis
++
++05/16 Feb 1682 - city of Strassburg
++
++18 Feb/
++   01 Mar 1700 - Protestant Germany (including Swedish possessions in
++                 Germany), Denmark, Norway
++30 Jun/
++   12 Jul 1700 - Gelderland, Zutphen
++10 Nov/
++   12 Dec 1700 - Utrecht, Overijssel
++
++31 Dec 1700/
++   12 Jan 1701 - Friesland, Groningen, Zürich, Bern, Basel, Geneva,
++                 Turgau, and Schaffhausen
++
++          1724 - Glarus, Appenzell, and the city of St. Gallen
++
++01 Jan 1750    - Pisa and Florence
++
++02/14 Sep 1752 - Great Britain
++
++17 Feb/
++   01 Mar 1753 - Sweden
++
++1760-1812      - Graubünden
++
++The Russian empire (including Finland and the Baltic states) did not
++convert to the Gregorian calendar until the Soviet revolution of 1917.
++
++Source: H. Grotefend, _Taschenbuch der Zeitrechnung des deutschen
++Mittelalters und der Neuzeit_, herausgegeben von Dr. O. Grotefend
++(Hannover: Hahnsche Buchhandlung, 1941), pp. 26-28.
++
++
++----- Time and time zones on Mars -----
++
++Some people's work schedules use Mars time.  Jet Propulsion Laboratory
++(JPL) coordinators have kept Mars time on and off at least since 1997
++for the Mars Pathfinder mission.  Some of their family members have
++also adapted to Mars time.  Dozens of special Mars watches were built
++for JPL workers who kept Mars time during the Mars Exploration
++Rovers mission (2004).  These timepieces look like normal Seikos and
++Citizens but use Mars seconds rather than terrestrial seconds.
++
++A Mars solar day is called a "sol" and has a mean period equal to
++about 24 hours 39 minutes 35.244 seconds in terrestrial time.  It is
++divided into a conventional 24-hour clock, so each Mars second equals
++about 1.02749125 terrestrial seconds.
++
++The prime meridian of Mars goes through the center of the crater
++Airy-0, named in honor of the British astronomer who built the
++Greenwich telescope that defines Earth's prime meridian.  Mean solar
++time on the Mars prime meridian is called Mars Coordinated Time (MTC).
++
++Each landed mission on Mars has adopted a different reference for
++solar time keeping, so there is no real standard for Mars time zones.
++For example, the Mars Exploration Rover project (2004) defined two
++time zones "Local Solar Time A" and "Local Solar Time B" for its two
++missions, each zone designed so that its time equals local true solar
++time at approximately the middle of the nominal mission.  Such a "time
++zone" is not particularly suited for any application other than the
++mission itself.
++
++Many calendars have been proposed for Mars, but none have achieved
++wide acceptance.  Astronomers often use Mars Sol Date (MSD) which is a
++sequential count of Mars solar days elapsed since about 1873-12-29
++12:00 GMT.
++
++The tz database does not currently support Mars time, but it is
++documented here in the hopes that support will be added eventually.
++
++Sources:
++
++Michael Allison and Robert Schmunk,
++"Technical Notes on Mars Solar Time as Adopted by the Mars24 Sunclock"
++<http://www.giss.nasa.gov/tools/mars24/help/notes.html> (2012-08-08).
++
++Jia-Rui Chong, "Workdays Fit for a Martian", Los Angeles Times
++<http://articles.latimes.com/2004/jan/14/science/sci-marstime14>
++(2004-01-14), pp A1, A20-A21.
++
++Tom Chmielewski, "Jet Lag Is Worse on Mars", The Atlantic (2015-02-26)
++<http://www.theatlantic.com/technology/archive/2015/02/jet-lag-is-worse-on-mars/386033/>
++
++-----
++
++This file is in the public domain, so clarified as of 2009-05-17 by
++Arthur David Olson.
++
++-----
++Local Variables:
++coding: utf-8
++End:
+Index: contrib/tzdata/africa
+===================================================================
+--- contrib/tzdata/africa	(revision 309576)
++++ contrib/tzdata/africa	(working copy)
+@@ -343,6 +343,12 @@ Rule	Egypt	2007	only	-	Sep	Thu>=1	24:00	0	-
+ # decision to abandon DST permanently.  See Ahram Online 2015-04-24.
+ # http://english.ahram.org.eg/NewsContent/1/64/128509/Egypt/Politics-/Sisi-cancels-daylight-saving-time-in-Egypt.aspx
+ 
++# From Steffen Thorsen (2016-04-29):
++# Egypt will have DST from July 7 until the end of October....
++# http://english.ahram.org.eg/NewsContentP/1/204655/Egypt/Daylight-savings-time-returning-to-Egypt-on--July.aspx
++# From Mina Samuel (2016-07-04):
++# Egyptian government took the decision to cancel the DST,
++
+ Rule	Egypt	2008	only	-	Aug	lastThu	24:00	0	-
+ Rule	Egypt	2009	only	-	Aug	20	24:00	0	-
+ Rule	Egypt	2010	only	-	Aug	10	24:00	0	-
+@@ -458,7 +464,7 @@ Zone	Africa/Monrovia	-0:43:08 -	LMT	1882
+ # http://www.libyaherald.com/2013/10/24/correction-no-time-change-tomorrow/
+ #
+ # From Paul Eggert (2013-10-25):
+-# For now, assume they're reverting to the pre-2012 rules of permanent UTC+2.
++# For now, assume they're reverting to the pre-2012 rules of permanent UT +02.
+ 
+ # Rule	NAME	FROM	TO	TYPE	IN	ON	AT	SAVE	LETTER/S
+ Rule	Libya	1951	only	-	Oct	14	2:00	1:00	S
+@@ -858,11 +864,11 @@ Rule	Morocco	2009	only	-	Aug	21	 0:00	0	-
+ Rule	Morocco	2010	only	-	May	 2	 0:00	1:00	S
+ Rule	Morocco	2010	only	-	Aug	 8	 0:00	0	-
+ Rule	Morocco	2011	only	-	Apr	 3	 0:00	1:00	S
+-Rule	Morocco	2011	only	-	Jul	31	 0	0	-
++Rule	Morocco	2011	only	-	Jul	31	 0:00	0	-
+ Rule	Morocco	2012	2013	-	Apr	lastSun	 2:00	1:00	S
+-Rule	Morocco	2012	only	-	Sep	30	 3:00	0	-
+ Rule	Morocco	2012	only	-	Jul	20	 3:00	0	-
+ Rule	Morocco	2012	only	-	Aug	20	 2:00	1:00	S
++Rule	Morocco	2012	only	-	Sep	30	 3:00	0	-
+ Rule	Morocco	2013	only	-	Jul	 7	 3:00	0	-
+ Rule	Morocco	2013	only	-	Aug	10	 2:00	1:00	S
+ Rule	Morocco	2013	max	-	Oct	lastSun	 3:00	0	-
+Index: contrib/tzdata/antarctica
+===================================================================
+--- contrib/tzdata/antarctica	(revision 309576)
++++ contrib/tzdata/antarctica	(working copy)
+@@ -10,11 +10,9 @@
+ # http://www.spri.cam.ac.uk/bob/periant.htm
+ # for information.
+ # Unless otherwise specified, we have no time zone information.
+-#
+-# Except for the French entries,
+-# I made up all time zone abbreviations mentioned here; corrections welcome!
+-# FORMAT is 'zzz' and GMTOFF is 0 for locations while uninhabited.
+ 
++# FORMAT is '-00' and GMTOFF is 0 for locations while uninhabited.
++
+ # Argentina - year-round bases
+ # Belgrano II, Confin Coast, -770227-0343737, since 1972-02-05
+ # Carlini, Potter Cove, King George Island, -6414-0602320, since 1982-01
+@@ -29,7 +27,7 @@
+ #	previously sealers and scientific personnel wintered
+ #	Margaret Turner reports
+ #	http://web.archive.org/web/20021204222245/http://www.dstc.qut.edu.au/DST/marg/daylight.html
+-#	(1999-09-30) that they're UTC+5, with no DST;
++#	(1999-09-30) that they're UT +05, with no DST;
+ #	presumably this is when they have visitors.
+ #
+ # year-round bases
+@@ -66,25 +64,29 @@
+ # Background:
+ # http://www.timeanddate.com/news/time/antartica-time-changes-2010.html
+ 
++# From Steffen Thorsen (2016-10-28):
++# Australian Antarctica Division informed us that Casey changed time
++# zone to UTC+11 in "the morning of 22nd October 2016".
++
+ # Zone	NAME		GMTOFF	RULES	FORMAT	[UNTIL]
+-Zone Antarctica/Casey	0	-	zzz	1969
+-			8:00	-	AWST	2009 Oct 18  2:00
+-						# Australian Western Std Time
+-			11:00	-	CAST	2010 Mar  5  2:00  # Casey Time
+-			8:00	-	AWST	2011 Oct 28  2:00
+-			11:00	-	CAST	2012 Feb 21 17:00u
+-			8:00	-	AWST
+-Zone Antarctica/Davis	0	-	zzz	1957 Jan 13
+-			7:00	-	DAVT	1964 Nov    # Davis Time
+-			0	-	zzz	1969 Feb
+-			7:00	-	DAVT	2009 Oct 18  2:00
+-			5:00	-	DAVT	2010 Mar 10 20:00u
+-			7:00	-	DAVT	2011 Oct 28  2:00
+-			5:00	-	DAVT	2012 Feb 21 20:00u
+-			7:00	-	DAVT
+-Zone Antarctica/Mawson	0	-	zzz	1954 Feb 13
+-			6:00	-	MAWT	2009 Oct 18  2:00 # Mawson Time
+-			5:00	-	MAWT
++Zone Antarctica/Casey	0	-	-00	1969
++			8:00	-	+08	2009 Oct 18  2:00
++			11:00	-	+11	2010 Mar  5  2:00
++			8:00	-	+08	2011 Oct 28  2:00
++			11:00	-	+11	2012 Feb 21 17:00u
++			8:00	-	+08	2016 Oct 22
++			11:00	-	+11
++Zone Antarctica/Davis	0	-	-00	1957 Jan 13
++			7:00	-	+07	1964 Nov
++			0	-	-00	1969 Feb
++			7:00	-	+07	2009 Oct 18  2:00
++			5:00	-	+05	2010 Mar 10 20:00u
++			7:00	-	+07	2011 Oct 28  2:00
++			5:00	-	+05	2012 Feb 21 20:00u
++			7:00	-	+07
++Zone Antarctica/Mawson	0	-	-00	1954 Feb 13
++			6:00	-	+06	2009 Oct 18  2:00
++			5:00	-	+05
+ # References:
+ # Casey Weather (1998-02-26)
+ # http://www.antdiv.gov.au/aad/exop/sfo/casey/casey_aws.html
+@@ -137,8 +139,8 @@
+ #	fishing stations operated variously 1819/1931
+ #
+ # Zone	NAME		GMTOFF	RULES	FORMAT	[UNTIL]
+-Zone Indian/Kerguelen	0	-	zzz	1950 # Port-aux-Français
+-			5:00	-	TFT	# ISO code TF Time
++Zone Indian/Kerguelen	0	-	-00	1950 # Port-aux-Français
++			5:00	-	+05
+ #
+ # year-round base in the main continent
+ # Dumont d'Urville, Île des Pétrels, -6640+14001, since 1956-11
+@@ -148,10 +150,10 @@
+ # It was destroyed by fire on 1952-01-14.
+ #
+ # Zone	NAME		GMTOFF	RULES	FORMAT	[UNTIL]
+-Zone Antarctica/DumontDUrville 0 -	zzz	1947
+-			10:00	-	PMT	1952 Jan 14 # Port-Martin Time
+-			0	-	zzz	1956 Nov
+-			10:00	-	DDUT	# Dumont-d'Urville Time
++Zone Antarctica/DumontDUrville 0 -	-00	1947
++			10:00	-	+10	1952 Jan 14
++			0	-	-00	1956 Nov
++			10:00	-	+10
+ 
+ # France & Italy - year-round base
+ # Concordia, -750600+1232000, since 2005
+@@ -176,8 +178,8 @@
+ # was established on 1957-01-29.  Since Syowa station is still the main
+ # station of Japan, it's appropriate for the principal location.
+ # Zone	NAME		GMTOFF	RULES	FORMAT	[UNTIL]
+-Zone Antarctica/Syowa	0	-	zzz	1957 Jan 29
+-			3:00	-	SYOT	# Syowa Time
++Zone Antarctica/Syowa	0	-	-00	1957 Jan 29
++			3:00	-	+03
+ # See:
+ # NIPR Antarctic Research Activities (1999-08-17)
+ # http://www.nipr.ac.jp/english/ara01.html
+@@ -214,19 +216,19 @@
+ # correct, but they should be quite close to the actual dates.
+ #
+ # From Paul Eggert (2014-03-21):
+-# The CET-switching Troll rules require zic from tzcode 2014b or later, so as
++# The CET-switching Troll rules require zic from tz 2014b or later, so as
+ # suggested by Bengt-Inge Larsson comment them out for now, and approximate
+ # with only UTC and CEST.  Uncomment them when 2014b is more prevalent.
+ #
+ # Rule	NAME	FROM	TO	TYPE	IN	ON	AT	SAVE	LETTER/S
+-#Rule	Troll	2005	max	-	Mar	 1	1:00u	1:00	CET
+-Rule	Troll	2005	max	-	Mar	lastSun	1:00u	2:00	CEST
+-#Rule	Troll	2005	max	-	Oct	lastSun	1:00u	1:00	CET
+-#Rule	Troll	2004	max	-	Nov	 7	1:00u	0:00	UTC
++#Rule	Troll	2005	max	-	Mar	 1	1:00u	1:00	+01
++Rule	Troll	2005	max	-	Mar	lastSun	1:00u	2:00	+02
++#Rule	Troll	2005	max	-	Oct	lastSun	1:00u	1:00	+01
++#Rule	Troll	2004	max	-	Nov	 7	1:00u	0:00	+00
+ # Remove the following line when uncommenting the above '#Rule' lines.
+-Rule	Troll	2004	max	-	Oct	lastSun	1:00u	0:00	UTC
++Rule	Troll	2004	max	-	Oct	lastSun	1:00u	0:00	+00
+ # Zone	NAME		GMTOFF	RULES	FORMAT	[UNTIL]
+-Zone Antarctica/Troll	0	-	zzz	2005 Feb 12
++Zone Antarctica/Troll	0	-	-00	2005 Feb 12
+ 			0:00	Troll	%s
+ 
+ # Poland - year-round base
+@@ -265,10 +267,10 @@
+ # changes during the year and does not necessarily correspond to mean
+ # solar noon.  So the Vostok time might have been whatever the clocks
+ # happened to be during their visit.  So we still don't really know what time
+-# it is at Vostok.  But we'll guess UTC+6.
++# it is at Vostok.  But we'll guess +06.
+ #
+-Zone Antarctica/Vostok	0	-	zzz	1957 Dec 16
+-			6:00	-	VOST	# Vostok time
++Zone Antarctica/Vostok	0	-	-00	1957 Dec 16
++			6:00	-	+06
+ 
+ # S Africa - year-round bases
+ # Marion Island, -4653+03752
+@@ -300,8 +302,8 @@
+ # <http://webexhibits.org/daylightsaving/g.html> says Rothera is -03 all year.
+ #
+ # Zone	NAME		GMTOFF	RULES	FORMAT	[UNTIL]
+-Zone Antarctica/Rothera	0	-	zzz	1976 Dec  1
+-			-3:00	-	ROTT	# Rothera time
++Zone Antarctica/Rothera	0	-	-00	1976 Dec  1
++			-3:00	-	-03
+ 
+ # Uruguay - year round base
+ # Artigas, King George Island, -621104-0585107
+Index: contrib/tzdata/asia
+===================================================================
+--- contrib/tzdata/asia	(revision 309576)
++++ contrib/tzdata/asia	(working copy)
+@@ -79,13 +79,9 @@ Rule E-EurAsia	1979	1995	-	Sep	lastSun	 0:00	0	-
+ Rule E-EurAsia	1996	max	-	Oct	lastSun	 0:00	0	-
+ Rule RussiaAsia	1981	1984	-	Apr	1	 0:00	1:00	S
+ Rule RussiaAsia	1981	1983	-	Oct	1	 0:00	0	-
+-Rule RussiaAsia	1984	1991	-	Sep	lastSun	 2:00s	0	-
+-Rule RussiaAsia	1985	1991	-	Mar	lastSun	 2:00s	1:00	S
+-Rule RussiaAsia	1992	only	-	Mar	lastSat	23:00	1:00	S
+-Rule RussiaAsia	1992	only	-	Sep	lastSat	23:00	0	-
+-Rule RussiaAsia	1993	max	-	Mar	lastSun	 2:00s	1:00	S
+-Rule RussiaAsia	1993	1995	-	Sep	lastSun	 2:00s	0	-
+-Rule RussiaAsia	1996	max	-	Oct	lastSun	 2:00s	0	-
++Rule RussiaAsia	1984	1995	-	Sep	lastSun	 2:00s	0	-
++Rule RussiaAsia	1985	2011	-	Mar	lastSun	 2:00s	1:00	S
++Rule RussiaAsia	1996	2011	-	Oct	lastSun	 2:00s	0	-
+ 
+ # Afghanistan
+ # Zone	NAME		GMTOFF	RULES	FORMAT	[UNTIL]
+@@ -120,31 +116,37 @@ Zone	Asia/Kabul	4:36:48 -	LMT	1890
+ # http://www.worldtimezone.com/dst_news/dst_news_armenia03.html
+ # Zone	NAME		GMTOFF	RULES	FORMAT	[UNTIL]
+ Zone	Asia/Yerevan	2:58:00 -	LMT	1924 May  2
+-			3:00	-	YERT	1957 Mar    # Yerevan Time
+-			4:00 RussiaAsia YER%sT	1991 Mar 31  2:00s
+-			3:00	1:00	YERST	1991 Sep 23 # independence
+-			3:00 RussiaAsia	AM%sT	1995 Sep 24  2:00s
+-			4:00	-	AMT	1997
+-			4:00 RussiaAsia	AM%sT	2012 Mar 25  2:00s
+-			4:00	-	AMT
++			3:00	-	+03	1957 Mar
++			4:00 RussiaAsia +04/+05	1991 Mar 31  2:00s
++			3:00 RussiaAsia	+03/+04	1995 Sep 24  2:00s
++			4:00	-	+04	1997
++			4:00 RussiaAsia	+04/+05
+ 
+ # Azerbaijan
++
+ # From Rustam Aliyev of the Azerbaijan Internet Forum (2005-10-23):
+ # According to the resolution of Cabinet of Ministers, 1997
+ # From Paul Eggert (2015-09-17): It was Resolution No. 21 (1997-03-17).
+ # http://code.az/files/daylight_res.pdf
++
++# From Steffen Thorsen (2016-03-17):
++# ... the Azerbaijani Cabinet of Ministers has cancelled switching to
++# daylight saving time....
++# http://www.azernews.az/azerbaijan/94137.html
++# http://vestnikkavkaza.net/news/Azerbaijani-Cabinet-of-Ministers-cancels-daylight-saving-time.html
++# http://en.apa.az/xeber_azerbaijan_abolishes_daylight_savings_ti_240862.html
++
+ # Rule	NAME	FROM	TO	TYPE	IN	ON	AT	SAVE	LETTER/S
+-Rule	Azer	1997	max	-	Mar	lastSun	 4:00	1:00	S
+-Rule	Azer	1997	max	-	Oct	lastSun	 5:00	0	-
++Rule	Azer	1997	2015	-	Mar	lastSun	 4:00	1:00	S
++Rule	Azer	1997	2015	-	Oct	lastSun	 5:00	0	-
+ # Zone	NAME		GMTOFF	RULES	FORMAT	[UNTIL]
+ Zone	Asia/Baku	3:19:24 -	LMT	1924 May  2
+-			3:00	-	BAKT	1957 Mar    # Baku Time
+-			4:00 RussiaAsia BAK%sT	1991 Mar 31  2:00s
+-			3:00	1:00	BAKST	1991 Aug 30 # independence
+-			3:00 RussiaAsia	AZ%sT	1992 Sep lastSat 23:00
+-			4:00	-	AZT	1996     # Azerbaijan Time
+-			4:00	EUAsia	AZ%sT	1997
+-			4:00	Azer	AZ%sT
++			3:00	-	+03	1957 Mar
++			4:00 RussiaAsia +04/+05	1991 Mar 31  2:00s
++			3:00 RussiaAsia	+03/+04	1992 Sep lastSun  2:00s
++			4:00	-	+04	1996
++			4:00	EUAsia	+04/+05	1997
++			4:00	Azer	+04/+05
+ 
+ # Bahrain
+ # See Asia/Qatar.
+@@ -263,7 +265,7 @@ Zone	Asia/Brunei	7:39:40 -	LMT	1926 Mar # Bandar S
+ # Milne says 6:24:40 was the meridian of the time ball observatory at Rangoon.
+ 
+ # Zone	NAME		GMTOFF	RULES	FORMAT	[UNTIL]
+-Zone	Asia/Rangoon	6:24:40 -	LMT	1880        # or Yangon
++Zone	Asia/Yangon	6:24:40 -	LMT	1880        # or Rangoon
+ 			6:24:40	-	RMT	1920        # Rangoon Mean Time?
+ 			6:30	-	BURT	1942 May    # Burma Time
+ 			9:00	-	JST	1945 May  3
+@@ -378,7 +380,7 @@ Rule	PRC	1987	1991	-	Apr	Sun>=10	0:00	1:00	D
+ # Lewiston (ME) Daily Sun (1939-05-29), p 17, said "Even the time is
+ # different - the occupied districts going by Tokyo time, an hour
+ # ahead of that prevailing in the rest of Shanghai."  Guess that the
+-# Xujiahui Observatory was under French control and stuck with UT+8.
++# Xujiahui Observatory was under French control and stuck with UT +08.
+ #
+ # In earlier versions of this file, China had many separate Zone entries, but
+ # this was based on what were apparently incorrect data in Shanks & Pottenger.
+@@ -387,19 +389,19 @@ Rule	PRC	1987	1991	-	Apr	Sun>=10	0:00	1:00	D
+ # Proposed in 1918 and theoretically in effect until 1949 (although in practice
+ # mainly observed in coastal areas), the five zones were:
+ #
+-# Changbai Time ("Long-white Time", Long-white = Heilongjiang area) UT+8.5
++# Changbai Time ("Long-white Time", Long-white = Heilongjiang area) UT +08:30
+ # Asia/Harbin (currently a link to Asia/Shanghai)
+ # Heilongjiang (except Mohe county), Jilin
+ #
+-# Zhongyuan Time ("Central plain Time") UT+8
++# Zhongyuan Time ("Central plain Time") UT +08
+ # Asia/Shanghai
+ # most of China
+ # This currently represents most other zones as well,
+ # as apparently these regions have been the same since 1970.
+ # Milne gives 8:05:43.2 for Xujiahui Observatory time; round to nearest.
+-# Guo says Shanghai switched to UT+8 "from the end of the 19th century".
++# Guo says Shanghai switched to UT +08 "from the end of the 19th century".
+ #
+-# Long-shu Time (probably due to Long and Shu being two names of that area) UT+7
++# Long-shu Time (probably due to Long and Shu being two names of the area) UT +07
+ # Asia/Chongqing (currently a link to Asia/Shanghai)
+ # Guangxi, Guizhou, Hainan, Ningxia, Sichuan, Shaanxi, and Yunnan;
+ # most of Gansu; west Inner Mongolia; west Qinghai; and the Guangdong
+@@ -406,7 +408,7 @@ Rule	PRC	1987	1991	-	Apr	Sun>=10	0:00	1:00	D
+ # counties Deqing, Enping, Kaiping, Luoding, Taishan, Xinxing,
+ # Yangchun, Yangjiang, Yu'nan, and Yunfu.
+ #
+-# Xin-zang Time ("Xinjiang-Tibet Time") UT+6
++# Xin-zang Time ("Xinjiang-Tibet Time") UT +06
+ # Asia/Urumqi
+ # This currently represents Kunlun Time as well,
+ # as apparently the two regions have been the same since 1970.
+@@ -419,7 +421,7 @@ Rule	PRC	1987	1991	-	Apr	Sun>=10	0:00	1:00	D
+ # Shihezi, Changji, Yanqi, Heshuo, Tuokexun, Tulufan, Shanshan, Hami,
+ # Fukang, Kuitun, Kumukuli, Miquan, Qitai, and Turfan.
+ #
+-# Kunlun Time UT+5.5
++# Kunlun Time UT +05:30
+ # Asia/Kashgar (currently a link to Asia/Urumqi)
+ # West Tibet, including Pulan, Aheqi, Shufu, Shule;
+ # West Xinjiang, including Aksu, Atushi, Yining, Hetian, Cele, Luopu, Nileke,
+@@ -435,7 +437,7 @@ Rule	PRC	1987	1991	-	Apr	Sun>=10	0:00	1:00	D
+ #
+ # On the other hand, ethnic Uyghurs, who make up about half the
+ # population of Xinjiang, typically use "Xinjiang time" which is two
+-# hours behind Beijing time, or UTC +0600. The government of the Xinjiang
++# hours behind Beijing time, or UT +06. The government of the Xinjiang
+ # Uyghur Autonomous Region, (XAUR, or just Xinjiang for short) as well as
+ # local governments such as the Ürümqi city government use both times in
+ # publications, referring to what is popularly called Xinjiang time as
+@@ -491,8 +493,8 @@ Rule	PRC	1987	1991	-	Apr	Sun>=10	0:00	1:00	D
+ # having the same time as Beijing.
+ 
+ # From Paul Eggert (2014-06-30):
+-# In the early days of the PRC, Tibet was given its own time zone (UT+6) but
+-# this was withdrawn in 1959 and never reinstated; see Tubten Khétsun,
++# In the early days of the PRC, Tibet was given its own time zone (UT +06)
++# but this was withdrawn in 1959 and never reinstated; see Tubten Khétsun,
+ # Memories of life in Lhasa under Chinese Rule, Columbia U Press, ISBN
+ # 978-0231142861 (2008), translator's introduction by Matthew Akester, p x.
+ # As this is before our 1970 cutoff, Tibet doesn't need a separate zone.
+@@ -506,12 +508,12 @@ Rule	PRC	1987	1991	-	Apr	Sun>=10	0:00	1:00	D
+ # Republics, the Soviet Union, the Kuomintang, and the People's Republic of
+ # China, and tracking down all these organizations' timekeeping rules would be
+ # quite a trick.  Approximate this lost history by a transition from LMT to
+-# XJT at the start of 1928, the year of accession of the warlord Jin Shuren,
++# UT +06 at the start of 1928, the year of accession of the warlord Jin Shuren,
+ # which happens to be the date given by Shanks & Pottenger (no doubt as a
+-# guess) as the transition from LMT.  Ignore the usage of UT+8 before
+-# 1986-02-01 under the theory that the transition date to UT+8 is unknown and
++# guess) as the transition from LMT.  Ignore the usage of +08 before
++# 1986-02-01 under the theory that the transition date to +08 is unknown and
+ # that the sort of users who prefer Asia/Urumqi now typically ignored the
+-# UT+8 mandate back then.
++# +08 mandate back then.
+ 
+ # Zone	NAME		GMTOFF	RULES	FORMAT	[UNTIL]
+ # Beijing time, used throughout China; represented by Shanghai.
+@@ -716,7 +718,7 @@ Zone	Asia/Hong_Kong	7:36:42 -	LMT	1904 Oct 30
+ # be found from historical government announcement database.
+ 
+ # From Paul Eggert (2014-07-03):
+-# As per Yu-Cheng Chuang, say that Taiwan was at UT+9 from 1937-10-01
++# As per Yu-Cheng Chuang, say that Taiwan was at UT +09 from 1937-10-01
+ # until 1945-09-21 at 01:00, overriding Shanks & Pottenger.
+ # Likewise, use Yu-Cheng Chuang's data for DST in Taiwan.
+ 
+@@ -769,9 +771,19 @@ Zone	Asia/Macau	7:34:20 -	LMT	1912 Jan  1
+ ###############################################################################
+ 
+ # Cyprus
+-#
++
+ # Milne says the Eastern Telegraph Company used 2:14:00.  Stick with LMT.
++# IATA SSIM (1998-09) has Cyprus using EU rules for the first time.
++
++# From Paul Eggert (2016-09-09):
++# Yesterday's Cyprus Mail reports that Northern Cyprus followed Turkey's
++# lead and switched from +02/+03 to +03 year-round.
++# http://cyprus-mail.com/2016/09/08/two-time-zones-cyprus-turkey-will-not-turn-clocks-back-next-month/
+ #
++# From Even Scharning (2016-10-31):
++# Looks like the time zone split in Cyprus went through last night.
++# http://cyprus-mail.com/2016/10/30/cyprus-new-division-two-time-zones-now-reality/
++
+ # Rule	NAME	FROM	TO	TYPE	IN	ON	AT	SAVE	LETTER/S
+ Rule	Cyprus	1975	only	-	Apr	13	0:00	1:00	S
+ Rule	Cyprus	1975	only	-	Oct	12	0:00	0	-
+@@ -786,7 +798,10 @@ Rule	Cyprus	1981	1998	-	Mar	lastSun	0:00	1:00	S
+ Zone	Asia/Nicosia	2:13:28 -	LMT	1921 Nov 14
+ 			2:00	Cyprus	EE%sT	1998 Sep
+ 			2:00	EUAsia	EE%sT
+-# IATA SSIM (1998-09) has Cyprus using EU rules for the first time.
++Zone	Asia/Famagusta	2:15:48	-	LMT	1921 Nov 14
++			2:00	Cyprus	EE%sT	1998 Sep
++			2:00	EUAsia	EE%sT	2016 Sep  8
++			3:00	-	+03
+ 
+ # Classically, Cyprus belongs to Asia; e.g. see Herodotus, Histories, I.72.
+ # However, for various reasons many users expect to find it under Europe.
+@@ -830,16 +845,15 @@ Link	Asia/Nicosia	Europe/Nicosia
+ # Zone	NAME		GMTOFF	RULES	FORMAT	[UNTIL]
+ Zone	Asia/Tbilisi	2:59:11 -	LMT	1880
+ 			2:59:11	-	TBMT	1924 May  2 # Tbilisi Mean Time
+-			3:00	-	TBIT	1957 Mar    # Tbilisi Time
+-			4:00 RussiaAsia TBI%sT	1991 Mar 31  2:00s
+-			3:00	1:00	TBIST	1991 Apr  9 # independence
+-			3:00 RussiaAsia GE%sT	1992        # Georgia Time
+-			3:00 E-EurAsia	GE%sT	1994 Sep lastSun
+-			4:00 E-EurAsia	GE%sT	1996 Oct lastSun
+-			4:00	1:00	GEST	1997 Mar lastSun
+-			4:00 E-EurAsia	GE%sT	2004 Jun 27
+-			3:00 RussiaAsia	GE%sT	2005 Mar lastSun  2:00
+-			4:00	-	GET
++			3:00	-	+03	1957 Mar
++			4:00 RussiaAsia +04/+05	1991 Mar 31  2:00s
++			3:00 RussiaAsia +03/+04	1992
++			3:00 E-EurAsia	+03/+04	1994 Sep lastSun
++			4:00 E-EurAsia	+04/+05	1996 Oct lastSun
++			4:00	1:00	+05	1997 Mar lastSun
++			4:00 E-EurAsia	+04/+05	2004 Jun 27
++			3:00 RussiaAsia	+03/+04	2005 Mar lastSun  2:00
++			4:00	-	+04
+ 
+ # East Timor
+ 
+@@ -874,6 +888,15 @@ Zone	Asia/Dili	8:22:20 -	LMT	1912 Jan  1
+ 			9:00	-	TLT
+ 
+ # India
++
++# From Ian P. Beacock, in "A brief history of (modern) time", The Atlantic
++# http://www.theatlantic.com/technology/archive/2015/12/the-creation-of-modern-time/421419/
++# (2015-12-22):
++# In January 1906, several thousand cotton-mill workers rioted on the
++# outskirts of Bombay....  They were protesting the proposed abolition of
++# local time in favor of Indian Standard Time....  Journalists called this
++# dispute the "Battle of the Clocks."  It lasted nearly half a century.
++
+ # Zone	NAME		GMTOFF	RULES	FORMAT	[UNTIL]
+ Zone	Asia/Kolkata	5:53:28 -	LMT	1880        # Kolkata
+ 			5:53:20	-	HMT	1941 Oct    # Howrah Mean Time?
+@@ -907,7 +930,7 @@ Zone	Asia/Kolkata	5:53:28 -	LMT	1880        # Kolk
+ # These would be the earliest possible times for a change.
+ # Régimes horaires pour le monde entier, by Henri Le Corre, (Éditions
+ # Traditionnelles, 1987, Paris) says that Java and Madura switched
+-# from JST to UTC+07:30 on 1945-09-23, and gives 1944-09-01 for Jayapura
++# from UT +09 to +07:30 on 1945-09-23, and gives 1944-09-01 for Jayapura
+ # (Hollandia).  For now, assume all Indonesian locations other than Jayapura
+ # switched on 1945-09-23.
+ #
+@@ -918,11 +941,11 @@ Zone	Asia/Kolkata	5:53:28 -	LMT	1880        # Kolk
+ # summary published by the Time and Frequency Laboratory of the
+ # Research Center for Calibration, Instrumentation and Metrology,
+ # Indonesia, <http://time.kim.lipi.go.id/time-eng.php> (2006-09-29).
+-# The abbreviations are:
++# The time zone abbreviations and UT offsets are:
+ #
+-# WIB  - UTC+7 - Waktu Indonesia Barat (Indonesia western time)
+-# WITA - UTC+8 - Waktu Indonesia Tengah (Indonesia central time)
+-# WIT  - UTC+9 - Waktu Indonesia Timur (Indonesia eastern time)
++# WIB  - +07 - Waktu Indonesia Barat (Indonesia western time)
++# WITA - +08 - Waktu Indonesia Tengah (Indonesia central time)
++# WIT  - +09 - Waktu Indonesia Timur (Indonesia eastern time)
+ #
+ # Zone	NAME		GMTOFF	RULES	FORMAT	[UNTIL]
+ # Java, Sumatra
+@@ -1084,8 +1107,15 @@ Rule	Iran	2032	2033	-	Mar	21	0:00	1:00	D
+ Rule	Iran	2032	2033	-	Sep	21	0:00	0	S
+ Rule	Iran	2034	2035	-	Mar	22	0:00	1:00	D
+ Rule	Iran	2034	2035	-	Sep	22	0:00	0	S
+-Rule	Iran	2036	2037	-	Mar	21	0:00	1:00	D
+-Rule	Iran	2036	2037	-	Sep	21	0:00	0	S
++#
++# The following rules are approximations starting in the year 2038.
++# These are the best post-2037 approximations available, given the
++# restrictions of a single rule using a Gregorian-based data format.
++# At some point this table will need to be extended, though quite
++# possibly Iran will change the rules first.
++Rule	Iran	2036	max	-	Mar	21	0:00	1:00	D
++Rule	Iran	2036	max	-	Sep	21	0:00	0	S
++
+ # Zone	NAME		GMTOFF	RULES	FORMAT	[UNTIL]
+ Zone	Asia/Tehran	3:25:44	-	LMT	1916
+ 			3:25:44	-	TMT	1946     # Tehran Mean Time
+@@ -1542,23 +1572,6 @@ Zone	Asia/Amman	2:23:44 -	LMT	1931
+ 
+ # Kazakhstan
+ 
+-# From Paul Eggert (1996-11-22):
+-# Andrew Evtichov (1996-04-13) writes that Kazakhstan
+-# stayed in sync with Moscow after 1990, and that Aqtobe (formerly Aktyubinsk)
+-# and Aqtau (formerly Shevchenko) are the largest cities in their zones.
+-# Guess that Aqtau and Aqtobe diverged in 1995, since that's the first time
+-# IATA SSIM mentions a third time zone in Kazakhstan.
+-
+-# From Paul Eggert (2006-03-22):
+-# German Iofis, ELSI, Almaty (2001-10-09) reports that Kazakhstan uses
+-# RussiaAsia rules, instead of switching at 00:00 as the IATA has it.
+-# Go with Shanks & Pottenger, who have them always using RussiaAsia rules.
+-# Also go with the following claims of Shanks & Pottenger:
+-#
+-# - Kazakhstan did not observe DST in 1991.
+-# - Qyzylorda switched from +5:00 to +6:00 on 1992-01-19 02:00.
+-# - Oral switched from +5:00 to +4:00 in spring 1989.
+-
+ # From Kazakhstan Embassy's News Bulletin No. 11
+ # <http://www.kazsociety.org.uk/news/2005/03/30.htm> (2005-03-21):
+ # The Government of Kazakhstan passed a resolution March 15 abolishing
+@@ -1575,61 +1588,232 @@ Zone	Asia/Amman	2:23:44 -	LMT	1931
+ # everything else....  I guess that would make Kazakhstan time zones
+ # de jure UTC+5 and UTC+6 respectively.
+ 
++# From Stepan Golosunov (2016-03-27) ([*] means see later comments below):
++# Review of the linked documents from http://adilet.zan.kz/
++# produced the following data for post-1991 Kazakhstan:
+ #
++# 0. Act of the Cabinet of Ministers of the USSR
++# from 1991-02-04 No. 20
++# http://pravo.gov.ru/proxy/ips/?docbody=&nd=102010545
++# removed the extra hour ("decree time") on the territory of the USSR
++# starting with the last Sunday of March 1991.
++# It also allowed (but not mandated) Kazakh SSR, Kirghiz SSR, Tajik SSR,
++# Turkmen SSR and Uzbek SSR to not have "summer" time.
++#
++# The 1992-01-13 act also refers to the act of the Cabinet of Ministers
++# of the Kazakh SSR from 1991-03-20 No. 170 "About the act of the Cabinet
++# of Ministers of the USSR from 1991-02-04 No. 20" but I didn't found its
++# text.
++#
++# According to Izvestia newspaper No. 68 (23334) from 1991-03-20
++# (page 6; available at http://libinfo.org/newsr/newsr2574.djvu via
++# http://libinfo.org/index.php?id=58564) on 1991-03-31 at 2:00 during
++# transition to "summer" time:
++# Republic of Georgia, Latvian SSR, Lithuanian SSR, SSR Moldova,
++# Estonian SSR; Komi ASSR; Kaliningrad oblast; Nenets autonomous okrug
++# were to move clocks 1 hour forward.
++# Kazakh SSR (excluding Uralsk oblast); Republic of Kyrgyzstan, Tajik
++# SSR; Andijan, Jizzakh, Namangan, Sirdarya, Tashkent, Fergana oblasts
++# of the Uzbek SSR were to move clocks 1 hour backwards.
++# Other territories were to not move clocks.
++# When the "summer" time would end on 1991-09-29, clocks were to be
++# moved 1 hour backwards on the territory of the USSR excluding
++# Kazakhstan, Kirghizia, Uzbekistan, Turkmenia, Tajikistan.
++#
++# Apparently there were last minute changes. Apparently Kazakh act No. 170
++# was one of such changes.
++#
++# https://ru.wikipedia.org/wiki/Декретное время
++# claims that Sovetskaya Rossiya newspaper on 1991-03-29 published that
++# Nenets autonomous okrug, Komi and Kazakhstan (excluding Uralsk oblast)
++# were to not move clocks and Uralsk oblast was to move clocks
++# forward; on 1991-09-29 Kazakhstan was to move clocks backwards.
++# (Probably there were changes even after that publication. There is an
++# article claiming that Kaliningrad oblast decided on 1991-03-29 to not
++# move clocks.)
++#
++# This implies that on 1991-03-31 Asia/Oral remained on +04/+05 while
++# the rest of Kazakhstan switched from +06/+07 to +05/06 or from +05/06
++# to +04/+05. It's unclear how Kzyl-Orda oblast moved into the fifth
++# time belt. (By switching from +04/+05 to +05/+06 on 1991-09-29?) ...
++#
++# 1. Act of the Cabinet of Ministers of the Republic of Kazakhstan
++# from 1992-01-13 No. 28
++# http://adilet.zan.kz/rus/docs/P920000028_
++# (text includes modification from the 1996 act)
++# introduced new rules for calculation of time, mirroring Russian
++# 1992-01-08 act.  It specified that time would be calculated
++# according to time belts plus extra hour ("decree time"), moved clocks
++# on the whole territory of Kazakhstan 1 hour forward on 1992-01-19 at
++# 2:00, specified DST rules.  It acknowledged that Kazakhstan was
++# located in the fourth and the fifth time belts and specified the
++# border between them to be located east of Kustanay and Aktyubinsk
++# oblasts (notably including Turgai and Kzyl-Orda oblasts into the fifth
++# time belt).
++#
++# This means switch on 1992-01-19 at 2:00 from +04/+05 to +05/+06 for
++# Asia/Aqtau, Asia/Aqtobe, Asia/Oral, Atyrau and Kustanay oblasts; from
++# +05/+06 to +06/+07 for Asia/Almaty and Asia/Qyzylorda (and Arkalyk) [*]....
++#
++# 2. Act of the Cabinet of Ministers of the Republic of Kazakhstan
++# from 1992-03-27 No. 284
++# http://adilet.zan.kz/rus/docs/P920000284_
++# cancels extra hour ("decree time") for Uralsk and Kzyl-Orda oblasts
++# since the last Sunday of March 1992, while keeping them in the fourth
++# and the fifth time belts respectively.
++#
++# 3. Order of the Prime Minister of the Republic of Kazakhstan
++# from 1994-09-23 No. 384
++# http://adilet.zan.kz/rus/docs/R940000384_
++# cancels the extra hour ("decree time") on the territory of Mangystau
++# oblast since the last Sunday of September 1994 (saying that time on
++# the territory would correspond to the third time belt as a
++# result)....
++#
++# 4. Act of the Government of the Republic of Kazakhstan
++# from 1996-05-08 No. 575
++# http://adilet.zan.kz/rus/docs/P960000575_
++# amends the 1992-01-13 act to end summer time in October instead
++# of September, mirroring identical Russian change from 1996-04-23 act.
++#
++# 5. Act of the Government of the Republic of Kazakhstan
++# from 1999-03-26 No. 305
++# http://adilet.zan.kz/rus/docs/P990000305_
++# cancels the extra hour ("decree time") for Atyrau oblast since the
++# last Sunday of March 1999 while retaining the oblast in the fourth
++# time belt.
++#
++# This means change from +05/+06 to +04/+05.
++#
++# There is no zone for Atyrau currently (listed under Asia/Aqtau in
++# zone1970.tab).[*]
++#
++# 6. Act of the Government of the Republic of Kazakhstan
++# from 2000-11-23 No. 1749
++# http://adilet.zan.kz/rus/archive/docs/P000001749_/23.11.2000
++# replaces the previous five documents.
++#
++# The only changes I noticed are in definition of the border between the
++# fourth and the fifth time belts.  They account for changes in spelling
++# and administrative division (splitting of Turgai oblast in 1997
++# probably changed time in territories incorporated into Kostanay oblast
++# (including Arkalyk) from +06/+07 to +05/+06) and move Kyzylorda oblast
++# from being in the fifth time belt and not using decree time into the
++# fourth time belt (no change in practice).[*]
++#
++# 7. Act of the Government of the Republic of Kazakhstan
++# from 2003-12-29 No. 1342
++# http://adilet.zan.kz/rus/docs/P030001342_
++# modified the 2000-11-23 act.  No relevant changes, apparently.
++#
++# 8. Act of the Government of the Republic of Kazakhstan
++# from 2004-07-20 No. 775
++# http://adilet.zan.kz/rus/archive/docs/P040000775_/20.07.2004
++# modified the 2000-11-23 act to move Kostanay and Kyzylorda oblasts into
++# the fifth time belt and add Aktobe oblast to the list of regions not
++# using extra hour ("decree time"), leaving Kazakhstan with only 2 time
++# zones (+04/+05 and +06/+07).  The changes were to be implemented
++# during DST transitions in 2004 and 2005 but the acts got radically
++# amended before implementation happened.
++#
++# 9. Act of the Government of the Republic of Kazakhstan
++# from 2004-09-15 No. 1059
++# http://adilet.zan.kz/rus/docs/P040001059_
++# modified the 2000-11-23 act to remove exceptions from the "decree time"
++# (leaving Kazakhstan in +05/+06 and +06/+07 zones), amended the
++# 2004-07-20 act to implement changes for Atyrau, West Kazakhstan,
++# Kostanay, Kyzylorda and Mangystau oblasts by not moving clocks
++# during the 2014 transition to "winter" time.
++#
++# This means transition from +04/+05 to +05/+06 for Atyrau oblast (no
++# zone currently), Asia/Oral, Asia/Aqtau and transition from +05/+06 to
++# +06/+07 for Kostanay oblast (Kostanay and Arkalyk, no zones currently)
++# and Asia/Qyzylorda on 2004-10-31 at 3:00....[*]
++#
++# 10. Act of the Government of the Republic of Kazakhstan
++# from 2005-03-15 No. 231
++# http://adilet.zan.kz/rus/docs/P050000231_
++# removes DST provisions from the 2000-11-23 act, removes most of the
++# (already implemented) provisions from the 2004-07-20 and 2004-09-15
++# acts, comes into effect 10 days after official publication.
++# The only practical effect seems to be the abolition of the summer
++# time.
++#
++# Unamended version of the act of the Government of the Russian Federation
++# No. 23 from 1992-01-08 [See 'europe' file for details].
++# Kazakh 1992-01-13 act appears to provide the same rules and 1992-03-27
++# act was to be enacted on the last Sunday of March 1992.
++
++# From Paul Eggert (2016-04-15):
++# The tables below should reflect Stepan Golosunov's remarks above,
++# except for the items marked "[*]" which I haven't gotten to yet.
++# It looks like we will need new zones Asia/Atyrau and Asia/Qostanay
++# to handle changes from 1992 through 2004 that we did not previously
++# know about.
++
++#
+ # Zone	NAME		GMTOFF	RULES	FORMAT	[UNTIL]
+ #
+ # Almaty (formerly Alma-Ata), representing most locations in Kazakhstan
++# This includes KZ-AKM, KZ-ALA, KZ-ALM, KZ-AST, KZ-BAY, KZ-VOS, KZ-ZHA,
++# KZ-KAR, KZ-SEV, KZ-PAV, and KZ-YUZ.
+ Zone	Asia/Almaty	5:07:48 -	LMT	1924 May  2 # or Alma-Ata
+-			5:00	-	ALMT	1930 Jun 21 # Alma-Ata Time
+-			6:00 RussiaAsia ALM%sT	1991
+-			6:00	-	ALMT	1992
+-			6:00 RussiaAsia	ALM%sT	2005 Mar 15
+-			6:00	-	ALMT
+-# Qyzylorda (aka Kyzylorda, Kizilorda, Kzyl-Orda, etc.)
++			5:00	-	+05	1930 Jun 21
++			6:00 RussiaAsia +06/+07	1991 Mar 31  2:00s
++			5:00 RussiaAsia	+05/+06	1992 Jan 19  2:00s
++			6:00 RussiaAsia	+06/+07	2004 Oct 31  2:00s
++			6:00	-	+06
++# Qyzylorda (aka Kyzylorda, Kizilorda, Kzyl-Orda, etc.) (KZ-KZY)
+ Zone	Asia/Qyzylorda	4:21:52 -	LMT	1924 May  2
+-			4:00	-	KIZT	1930 Jun 21 # Kizilorda Time
+-			5:00	-	KIZT	1981 Apr  1
+-			5:00	1:00	KIZST	1981 Oct  1
+-			6:00	-	KIZT	1982 Apr  1
+-			5:00 RussiaAsia	KIZ%sT	1991
+-			5:00	-	KIZT	1991 Dec 16 # independence
+-			5:00	-	QYZT	1992 Jan 19  2:00
+-			6:00 RussiaAsia	QYZ%sT	2005 Mar 15
+-			6:00	-	QYZT
+-# Aqtobe (aka Aktobe, formerly Aktyubinsk)
++			4:00	-	+04	1930 Jun 21
++			5:00	-	+05	1981 Apr  1
++			5:00	1:00	+06	1981 Oct  1
++			6:00	-	+06	1982 Apr  1
++			5:00 RussiaAsia	+05/+06	1991 Mar 31  2:00s
++			4:00 RussiaAsia	+04/+05	1991 Sep 29  2:00s
++			5:00 RussiaAsia	+05/+06	1992 Jan 19  2:00s
++			6:00 RussiaAsia	+06/+07	1992 Mar 29  2:00s
++			5:00 RussiaAsia	+05/+06	2004 Oct 31  2:00s
++			6:00	-	+06
++# Aqtobe (aka Aktobe, formerly Aktyubinsk) (KZ-AKT)
+ Zone	Asia/Aqtobe	3:48:40	-	LMT	1924 May  2
+-			4:00	-	AKTT	1930 Jun 21 # Aktyubinsk Time
+-			5:00	-	AKTT	1981 Apr  1
+-			5:00	1:00	AKTST	1981 Oct  1
+-			6:00	-	AKTT	1982 Apr  1
+-			5:00 RussiaAsia	AKT%sT	1991
+-			5:00	-	AKTT	1991 Dec 16 # independence
+-			5:00 RussiaAsia	AQT%sT	2005 Mar 15 # Aqtobe Time
+-			5:00	-	AQTT
+-# Mangghystau
++			4:00	-	+04	1930 Jun 21
++			5:00	-	+05	1981 Apr  1
++			5:00	1:00	+06	1981 Oct  1
++			6:00	-	+06	1982 Apr  1
++			5:00 RussiaAsia	+05/+06	1991 Mar 31  2:00s
++			4:00 RussiaAsia	+04/+05	1992 Jan 19  2:00s
++			5:00 RussiaAsia	+05/+06	2004 Oct 31  2:00s
++			5:00	-	+05
++# Qostanay (KZ-KUS)
++
++# Mangghystau (KZ-MAN)
+ # Aqtau was not founded until 1963, but it represents an inhabited region,
+ # so include time stamps before 1963.
+ Zone	Asia/Aqtau	3:21:04	-	LMT	1924 May  2
+-			4:00	-	FORT	1930 Jun 21 # Fort Shevchenko T
+-			5:00	-	FORT	1963
+-			5:00	-	SHET	1981 Oct  1 # Shevchenko Time
+-			6:00	-	SHET	1982 Apr  1
+-			5:00 RussiaAsia	SHE%sT	1991
+-			5:00	-	SHET	1991 Dec 16 # independence
+-			5:00 RussiaAsia	AQT%sT	1995 Mar lastSun  2:00 # Aqtau Time
+-			4:00 RussiaAsia	AQT%sT	2005 Mar 15
+-			5:00	-	AQTT
+-# West Kazakhstan
++			4:00	-	+04	1930 Jun 21
++			5:00	-	+05	1963
++			5:00	-	+05	1981 Oct  1
++			6:00	-	+06	1982 Apr  1
++			5:00 RussiaAsia	+05/+06	1991 Mar 31  2:00s
++			4:00 RussiaAsia	+04/+05	1992 Jan 19  2:00s
++			5:00 RussiaAsia	+05/+06	1994 Sep 25  2:00s
++			4:00 RussiaAsia	+04/+05	2004 Oct 31  2:00s
++			5:00	-	+05
++
++# West Kazakhstan (KZ-ZAP)
++# From Paul Eggert (2016-03-18):
++# The 1989 transition is from USSR act No. 227 (1989-03-14).
+ Zone	Asia/Oral	3:25:24	-	LMT	1924 May  2 # or Ural'sk
+-			4:00	-	URAT	1930 Jun 21 # Ural'sk time
+-			5:00	-	URAT	1981 Apr  1
+-			5:00	1:00	URAST	1981 Oct  1
+-			6:00	-	URAT	1982 Apr  1
+-			5:00 RussiaAsia	URA%sT	1989 Mar 26  2:00
+-			4:00 RussiaAsia	URA%sT	1991
+-			4:00	-	URAT	1991 Dec 16 # independence
+-			4:00 RussiaAsia	ORA%sT	2005 Mar 15 # Oral Time
+-			5:00	-	ORAT
++			4:00	-	+04	1930 Jun 21
++			5:00	-	+05	1981 Apr  1
++			5:00	1:00	+06	1981 Oct  1
++			6:00	-	+06	1982 Apr  1
++			5:00 RussiaAsia	+05/+06	1989 Mar 26  2:00s
++			4:00 RussiaAsia	+04/+05	1992 Jan 19  2:00s
++			5:00 RussiaAsia	+05/+06	1992 Mar 29  2:00s
++			4:00 RussiaAsia	+04/+05	2004 Oct 31  2:00s
++			5:00	-	+05
+ 
+ # Kyrgyzstan (Kirgizstan)
+ # Transitions through 1991 are from Shanks & Pottenger.
+@@ -1650,11 +1834,11 @@ Rule	Kyrgyz	1997	2005	-	Mar	lastSun	2:30	1:00	S
+ Rule	Kyrgyz	1997	2004	-	Oct	lastSun	2:30	0	-
+ # Zone	NAME		GMTOFF	RULES	FORMAT	[UNTIL]
+ Zone	Asia/Bishkek	4:58:24 -	LMT	1924 May  2
+-			5:00	-	FRUT	1930 Jun 21 # Frunze Time
+-			6:00 RussiaAsia FRU%sT	1991 Mar 31  2:00s
+-			5:00	1:00	FRUST	1991 Aug 31  2:00 # independence
+-			5:00	Kyrgyz	KG%sT	2005 Aug 12 # Kyrgyzstan Time
+-			6:00	-	KGT
++			5:00	-	+05	1930 Jun 21
++			6:00 RussiaAsia +06/+07	1991 Mar 31  2:00s
++			5:00 RussiaAsia	+05/+06	1991 Aug 31  2:00
++			5:00	Kyrgyz	+05/+06	2005 Aug 12
++			6:00	-	+06
+ 
+ ###############################################################################
+ 
+@@ -1693,25 +1877,24 @@ Rule	ROK	1957	1960	-	Sep	Sun>=18	0:00	0	S
+ Rule	ROK	1987	1988	-	May	Sun>=8	2:00	1:00	D
+ Rule	ROK	1987	1988	-	Oct	Sun>=8	3:00	0	S
+ 
+-# From Paul Eggert (2014-10-30):
++# From Paul Eggert (2016-08-23):
+ # The Korean Wikipedia entry gives the following sources for UT offsets:
+ #
+-# 1908: Official Journal Article No. 3994 (Edict No. 5)
++# 1908: Official Journal Article No. 3994 (decree No. 5)
+ # 1912: Governor-General of Korea Official Gazette Issue No. 367
+ #       (Announcement No. 338)
+ # 1954: Presidential Decree No. 876 (1954-03-17)
+ # 1961: Law No. 676 (1961-08-07)
+-# 1987: Law No. 3919 (1986-12-31)
+ #
+-# The Wikipedia entry also has confusing information about a change
+-# to UT+9 in April 1910, but then what would be the point of the later change
+-# to UT+9 on 1912-01-01?  Omit the 1910 change for now.
++# (Another source "1987: Law No. 3919 (1986-12-31)" was in the 2014-10-30
++# edition of the Korean Wikipedia entry.)
+ #
+ # I guessed that time zone abbreviations through 1945 followed the same
+ # rules as discussed under Taiwan, with nominal switches from JST to KST
+ # when the respective cities were taken over by the Allies after WWII.
+ #
+-# For Pyongyang we have no information; guess no changes since World War II.
++# For Pyongyang, guess no changes from World War II until 2015, as we
++# have no information otherwise.
+ 
+ # From Steffen Thorsen (2015-08-07):
+ # According to many news sources, North Korea is going to change to
+@@ -1871,7 +2054,7 @@ Zone	Indian/Maldives	4:54:00 -	LMT	1880 # Male
+ # Bill Bonnet (2005-05-19) reports that the US Embassy in Ulaanbaatar says
+ # there is only one time zone and that DST is observed, citing Microsoft
+ # Windows XP as the source.  Risto Nykänen (2005-05-16) reports that
+-# travelmongolia.org says there are two time zones (UTC+7, UTC+8) with no DST.
++# travelmongolia.org says there are two time zones (UT +07, +08) with no DST.
+ # Oscar van Vlijmen (2005-05-20) reports that the Mongolian Embassy in
+ # Washington, DC says there are two time zones, with DST observed.
+ # He also found
+@@ -2111,8 +2294,8 @@ Zone	Asia/Kathmandu	5:41:16 -	LMT	1920
+ # http://www.app.com.pk/en_/index.php?option=com_content&task=view&id=99374&Itemid=2
+ 
+ # Rule	NAME	FROM	TO	TYPE	IN	ON	AT	SAVE	LETTER/S
+-Rule Pakistan	2002	only	-	Apr	Sun>=2	0:01	1:00	S
+-Rule Pakistan	2002	only	-	Oct	Sun>=2	0:01	0	-
++Rule Pakistan	2002	only	-	Apr	Sun>=2	0:00	1:00	S
++Rule Pakistan	2002	only	-	Oct	Sun>=2	0:00	0	-
+ Rule Pakistan	2008	only	-	Jun	1	0:00	1:00	S
+ Rule Pakistan	2008	2009	-	Nov	1	0:00	0	-
+ Rule Pakistan	2009	only	-	Apr	15	0:00	1:00	S
+@@ -2374,9 +2557,28 @@ Zone	Asia/Karachi	4:28:12 -	LMT	1907
+ # From Paul Eggert (2015-03-03):
+ # http://www.timeanddate.com/time/change/west-bank/ramallah?year=2014
+ # says that the fall 2014 transition was Oct 23 at 24:00.
+-# For future dates, guess the last Friday in March at 24:00 through
+-# the first Friday on or after October 21 at 00:00.  This is consistent with
+-# the predictions in today's editions of the following URLs:
++
++# From Hannah Kreitem (2016-03-09):
++# http://www.palestinecabinet.gov.ps/WebSite/ar/ViewDetails?ID=31728
++# [Google translation]: "The Council also decided to start daylight
++# saving in Palestine as of one o'clock on Saturday morning,
++# 2016-03-26, to provide the clock 60 minutes ahead."
++#
++# From Paul Eggert (2016-03-12):
++# Predict spring transitions on March's last Saturday at 01:00 from now on.
++
++# From Sharef Mustafa (2016-10-19):
++# [T]he Palestinian cabinet decision (Mar 8th 2016) published on
++# http://www.palestinecabinet.gov.ps/WebSite/Upload/Decree/GOV_17/16032016134830.pdf
++# states that summer time will end on Oct 29th at 01:00.
++#
++# From Tim Parenti (2016-10-19):
++# Predict fall transitions on October's last Saturday at 01:00 from now on.
++# This is consistent with the 2016 transition as well as our spring
++# predictions.
++#
++# From Paul Eggert (2016-10-19):
++# It's also consistent with predictions in the following URLs today:
+ # http://www.timeanddate.com/time/change/gaza-strip/gaza
+ # http://www.timeanddate.com/time/change/west-bank/hebron
+ 
+@@ -2407,8 +2609,10 @@ Rule Palestine	2011	only	-	Sep	30	0:00	0	-
+ Rule Palestine	2012	2014	-	Mar	lastThu	24:00	1:00	S
+ Rule Palestine	2012	only	-	Sep	21	1:00	0	-
+ Rule Palestine	2013	only	-	Sep	Fri>=21	0:00	0	-
+-Rule Palestine	2014	max	-	Oct	Fri>=21	0:00	0	-
+-Rule Palestine	2015	max	-	Mar	lastFri	24:00	1:00	S
++Rule Palestine	2014	2015	-	Oct	Fri>=21	0:00	0	-
++Rule Palestine	2015	only	-	Mar	lastFri	24:00	1:00	S
++Rule Palestine	2016	max	-	Mar	lastSat	1:00	1:00	S
++Rule Palestine	2016	max	-	Oct	lastSat	1:00	0	-
+ 
+ # Zone	NAME		GMTOFF	RULES	FORMAT	[UNTIL]
+ Zone	Asia/Gaza	2:17:52	-	LMT	1900 Oct
+@@ -2496,7 +2700,7 @@ Link Asia/Qatar Asia/Bahrain
+ # earlier date.
+ #
+ # Shanks & Pottenger also state that until 1968-05-01 Saudi Arabia had two
+-# time zones; the other zone, at UTC+4, was in the far eastern part of
++# time zones; the other zone, at UT +04, was in the far eastern part of
+ # the country.  Ignore this, as it's before our 1970 cutoff.
+ #
+ # Zone	NAME		GMTOFF	RULES	FORMAT	[UNTIL]
+@@ -2558,45 +2762,31 @@ Zone	Asia/Singapore	6:55:25 -	LMT	1901 Jan  1
+ # People who live in regions under Tamil control can use [TZ='Asia/Kolkata'],
+ # as that zone has agreed with the Tamil areas since our cutoff date of 1970.
+ 
+-# From K Sethu (2006-04-25):
+-# I think the abbreviation LKT originated from the world of computers at
+-# the time of or subsequent to the time zone changes by SL Government
+-# twice in 1996 and probably SL Government or its standardization
+-# agencies never declared an abbreviation as a national standard.
++# From Sadika Sumanapala (2016-10-19):
++# According to http://www.sltime.org (maintained by Measurement Units,
++# Standards & Services Department, Sri Lanka) abbreviation for Sri Lanka
++# standard time is SLST.
+ #
+-# I recollect before the recent change the government announcements
+-# mentioning it as simply changing Sri Lanka Standard Time or Sri Lanka
+-# Time and no mention was made about the abbreviation.
+-#
+-# If we look at Sri Lanka Department of Government's "Official News
+-# Website of Sri Lanka" ... http://www.news.lk/ we can see that they
+-# use SLT as abbreviation in time stamp at the beginning of each news
+-# item....
+-#
+-# Within Sri Lanka I think LKT is well known among computer users and
+-# administrators.  In my opinion SLT may not be a good choice because the
+-# nation's largest telcom / internet operator Sri Lanka Telcom is well
+-# known by that abbreviation - simply as SLT (there IP domains are
+-# slt.lk and sltnet.lk).
+-#
+-# But if indeed our government has adopted SLT as standard abbreviation
+-# (that we have not known so far) then  it is better that it be used for
+-# all computers.
++# From Paul Eggert (2016-10-18):
++# "SLST" seems to be reasonably recent and rarely-used outside time
++# zone nerd sources.  I searched Google News and found three uses of
++# it in the International Business Times of India in February and
++# March of this year when discussing cricket match times, but nothing
++# since then (though there has been a lot of cricket) and nothing in
++# other English-language news sources.  Our old abbreviation "LKT" is
++# even worse.  For now, let's use a numeric abbreviation; we can
++# switch to "SLST" if it catches on.
+ 
+-# From Paul Eggert (2006-04-25):
+-# One possibility is that we wait for a bit for the dust to settle down
+-# and then see what people actually say in practice.
+-
+ # Zone	NAME		GMTOFF	RULES	FORMAT	[UNTIL]
+ Zone	Asia/Colombo	5:19:24 -	LMT	1880
+ 			5:19:32	-	MMT	1906        # Moratuwa Mean Time
+-			5:30	-	IST	1942 Jan  5
+-			5:30	0:30	IHST	1942 Sep
+-			5:30	1:00	IST	1945 Oct 16  2:00
+-			5:30	-	IST	1996 May 25  0:00
+-			6:30	-	LKT	1996 Oct 26  0:30
+-			6:00	-	LKT	2006 Apr 15  0:30
+-			5:30	-	IST
++			5:30	-	+0530	1942 Jan  5
++			5:30	0:30	+0530/+06 1942 Sep
++			5:30	1:00	+0530/+0630 1945 Oct 16  2:00
++			5:30	-	+0530	1996 May 25  0:00
++			6:30	-	+0630	1996 Oct 26  0:30
++			6:00	-	+06	2006 Apr 15  0:30
++			5:30	-	+0530
+ 
+ # Syria
+ # Rule	NAME	FROM	TO	TYPE	IN	ON	AT	SAVE	LETTER/S
+@@ -2765,10 +2955,10 @@ Zone	Asia/Damascus	2:25:12 -	LMT	1920 # Dimashq
+ # From Shanks & Pottenger.
+ # Zone	NAME		GMTOFF	RULES	FORMAT	[UNTIL]
+ Zone	Asia/Dushanbe	4:35:12 -	LMT	1924 May  2
+-			5:00	-	DUST	1930 Jun 21 # Dushanbe Time
+-			6:00 RussiaAsia DUS%sT	1991 Mar 31  2:00s
+-			5:00	1:00	DUSST	1991 Sep  9  2:00s
+-			5:00	-	TJT	# Tajikistan Time
++			5:00	-	+05	1930 Jun 21
++			6:00 RussiaAsia +06/+07	1991 Mar 31  2:00s
++			5:00	1:00	+05/+06	1991 Sep  9  2:00s
++			5:00	-	+05
+ 
+ # Thailand
+ # Zone	NAME		GMTOFF	RULES	FORMAT	[UNTIL]
+@@ -2782,11 +2972,10 @@ Link Asia/Bangkok Asia/Vientiane	# Laos
+ # From Shanks & Pottenger.
+ # Zone	NAME		GMTOFF	RULES	FORMAT	[UNTIL]
+ Zone	Asia/Ashgabat	3:53:32 -	LMT	1924 May  2 # or Ashkhabad
+-			4:00	-	ASHT	1930 Jun 21 # Ashkhabad Time
+-			5:00 RussiaAsia	ASH%sT	1991 Mar 31  2:00
+-			4:00 RussiaAsia	ASH%sT	1991 Oct 27 # independence
+-			4:00 RussiaAsia	TM%sT	1992 Jan 19  2:00
+-			5:00	-	TMT
++			4:00	-	+04	1930 Jun 21
++			5:00 RussiaAsia	+05/+06	1991 Mar 31  2:00
++			4:00 RussiaAsia	+04/+05	1992 Jan 19  2:00
++			5:00	-	+05
+ 
+ # United Arab Emirates
+ # Zone	NAME		GMTOFF	RULES	FORMAT	[UNTIL]
+@@ -2798,20 +2987,18 @@ Link Asia/Dubai Asia/Muscat	# Oman
+ # Byalokoz 1919 says Uzbekistan was 4:27:53.
+ # Zone	NAME		GMTOFF	RULES	FORMAT	[UNTIL]
+ Zone	Asia/Samarkand	4:27:53 -	LMT	1924 May  2
+-			4:00	-	SAMT	1930 Jun 21 # Samarkand Time
+-			5:00	-	SAMT	1981 Apr  1
+-			5:00	1:00	SAMST	1981 Oct  1
+-			6:00	-	TAST	1982 Apr  1 # Tashkent Time
+-			5:00 RussiaAsia	SAM%sT	1991 Sep  1 # independence
+-			5:00 RussiaAsia	UZ%sT	1992
+-			5:00	-	UZT
++			4:00	-	+04	1930 Jun 21
++			5:00	-	+05	1981 Apr  1
++			5:00	1:00	+06	1981 Oct  1
++			6:00	-	+06	1982 Apr  1
++			5:00 RussiaAsia	+05/+06	1992
++			5:00	-	+05
+ # Milne says Tashkent was 4:37:10.8; round to nearest.
+ Zone	Asia/Tashkent	4:37:11 -	LMT	1924 May  2
+-			5:00	-	TAST	1930 Jun 21 # Tashkent Time
+-			6:00 RussiaAsia	TAS%sT	1991 Mar 31  2:00
+-			5:00 RussiaAsia	TAS%sT	1991 Sep  1 # independence
+-			5:00 RussiaAsia	UZ%sT	1992
+-			5:00	-	UZT
++			5:00	-	+05	1930 Jun 21
++			6:00 RussiaAsia	+06/+07	1991 Mar 31  2:00
++			5:00 RussiaAsia	+05/+06	1992
++			5:00	-	+05
+ 
+ # Vietnam
+ 
+Index: contrib/tzdata/australasia
+===================================================================
+--- contrib/tzdata/australasia	(revision 309576)
++++ contrib/tzdata/australasia	(working copy)
+@@ -60,6 +60,14 @@ Zone Australia/Eucla	 8:35:28 -	LMT	1895 Dec
+ # Hamilton is the largest, but there is also a Hamilton in Victoria,
+ # so use Lindeman.
+ #
++# From J William Piggott (2016-02-20):
++# There is no location named Holiday Islands in Queensland Australia; holiday
++# islands is a colloquial term used globally.  Hayman and Lindeman are at the
++# north and south extremes of the Whitsunday Islands archipelago, and
++# Hamilton is in between; it is reasonable to believe that this time zone
++# applies to all of the Whitsundays.
++# http://www.australia.gov.au/about-australia/australian-story/austn-islands
++#
+ # Rule	NAME	FROM	TO	TYPE	IN	ON	AT	SAVE	LETTER/S
+ Rule	AQ	1971	only	-	Oct	lastSun	2:00s	1:00	D
+ Rule	AQ	1972	only	-	Feb	lastSun	2:00s	0	S
+@@ -235,11 +243,11 @@ Zone Australia/Lord_Howe 10:36:20 -	LMT	1895 Feb
+ # will produce a binary file with an [A]EST-type as the first 32-bit type;
+ # this is required for correct handling of times before 1916 by
+ # pre-2013 versions of localtime.
+-Zone Antarctica/Macquarie 0	-	zzz	1899 Nov
++Zone Antarctica/Macquarie 0	-	-00	1899 Nov
+ 			10:00	-	AEST	1916 Oct  1  2:00
+ 			10:00	1:00	AEDT	1917 Feb
+ 			10:00	Aus	AE%sT	1919 Apr  1  0:00s
+-			0	-	zzz	1948 Mar 25
++			0	-	-00	1948 Mar 25
+ 			10:00	Aus	AE%sT	1967
+ 			10:00	AT	AE%sT	2010 Apr  4  3:00
+ 			11:00	-	MIST	# Macquarie I Standard Time
+@@ -342,7 +350,13 @@ Zone	Indian/Cocos	6:27:40	-	LMT	1900
+ # commencing at 2.00 am on Sunday 1st November, 2015 and ending at
+ # 3.00 am on Sunday 17th January, 2016.
+ 
+-# From Paul Eggert (2015-09-01):
++# From Raymond Kumar (2016-10-04):
++# http://www.fiji.gov.fj/Media-Center/Press-Releases/DAYLIGHT-SAVING-STARTS-ON-6th-NOVEMBER,-2016.aspx
++# "Fiji's daylight savings will begin on Sunday, 6 November 2016, when
++# clocks go forward an hour at 2am to 3am....  Daylight Saving will
++# end at 3.00am on Sunday 15th January 2017."
++
++# From Paul Eggert (2016-10-03):
+ # For now, guess DST from 02:00 the first Sunday in November to
+ # 03:00 the third Sunday in January.  Although ad hoc, it matches
+ # transitions since late 2014 and seems more likely to match future
+@@ -537,7 +551,7 @@ Zone Pacific/Port_Moresby 9:48:40 -	LMT	1880
+ # Base the Bougainville entry on the Arawa-Kieta region, which appears to have
+ # the most people even though it was devastated in the Bougainville Civil War.
+ #
+-# Although Shanks gives 1942-03-15 / 1943-11-01 for JST, these dates
++# Although Shanks gives 1942-03-15 / 1943-11-01 for UT +09, these dates
+ # are apparently rough guesswork from the starts of military campaigns.
+ # The World War II entries below are instead based on Arawa-Kieta.
+ # The Japanese occupied Kieta in July 1942,
+@@ -545,8 +559,8 @@ Zone Pacific/Port_Moresby 9:48:40 -	LMT	1880
+ # http://pwencycl.kgbudge.com/B/o/Bougainville.htm
+ # and seem to have controlled it until their 1945-08-21 surrender.
+ #
+-# The Autonomous Region of Bougainville plans to switch from UTC+10 to UTC+11
+-# on 2014-12-28 at 02:00.  They call UTC+11 "Bougainville Standard Time";
++# The Autonomous Region of Bougainville switched from UT +10 to +11
++# on 2014-12-28 at 02:00.  They call +11 "Bougainville Standard Time";
+ # abbreviate this as BST.  See:
+ # http://www.bougainville24.com/bougainville-issues/bougainville-gets-own-timezone/
+ #
+@@ -612,7 +626,7 @@ Link Pacific/Pago_Pago Pacific/Midway # in US mino
+ # From Paul Eggert (2014-06-27):
+ # The International Date Line Act 2011
+ # http://www.parliament.gov.ws/images/ACTS/International_Date_Line_Act__2011_-_Eng.pdf
+-# changed Samoa from UTC-11 to UTC+13, effective "12 o'clock midnight, on
++# changed Samoa from UT -11 to +13, effective "12 o'clock midnight, on
+ # Thursday 29th December 2011".  The International Date Line was adjusted
+ # accordingly.
+ 
+@@ -688,11 +702,13 @@ Rule	Tonga	1999	only	-	Oct	 7	2:00s	1:00	S
+ Rule	Tonga	2000	only	-	Mar	19	2:00s	0	-
+ Rule	Tonga	2000	2001	-	Nov	Sun>=1	2:00	1:00	S
+ Rule	Tonga	2001	2002	-	Jan	lastSun	2:00	0	-
++Rule	Tonga	2016	max	-	Nov	Sun>=1	2:00	1:00	S
++Rule	Tonga	2017	max	-	Jan	Sun>=15	3:00	0	-
+ # Zone	NAME		GMTOFF	RULES	FORMAT	[UNTIL]
+ Zone Pacific/Tongatapu	12:19:20 -	LMT	1901
+-			12:20	-	TOT	1941 # Tonga Time
+-			13:00	-	TOT	1999
+-			13:00	Tonga	TO%sT
++			12:20	-	+1220	1941
++			13:00	-	+13	1999
++			13:00	Tonga	+13/+14
+ 
+ # Tuvalu
+ # Zone	NAME		GMTOFF	RULES	FORMAT	[UNTIL]
+@@ -707,7 +723,7 @@ Zone Pacific/Funafuti	11:56:52 -	LMT	1901
+ # 1886-1891; Baker was similar but exact dates are not known.
+ # Inhabited by civilians 1935-1942; U.S. military bases 1943-1944;
+ # uninhabited thereafter.
+-# Howland observed Hawaii Standard Time (UT-10:30) in 1937;
++# Howland observed Hawaii Standard Time (UT -10:30) in 1937;
+ # see page 206 of Elgen M. Long and Marie K. Long,
+ # Amelia Earhart: the Mystery Solved, Simon & Schuster (2000).
+ # So most likely Howland and Baker observed Hawaii Time from 1935
+@@ -1465,7 +1481,7 @@ Zone	Pacific/Wallis	12:15:20 -	LMT	1901
+ # Zealand time.  I understand that is the time they keep locally, anyhow."
+ # For now, assume this practice goes back to the introduction of standard time
+ # in New Zealand, as this would make Chatham Islands time almost exactly match
+-# LMT back when New Zealand was at UTC+11:30; also, assume Chatham Islands did
++# LMT back when New Zealand was at UT +11:30; also, assume Chatham Islands did
+ # not observe New Zealand's prewar DST.
+ 
+ ###############################################################################
+@@ -1521,7 +1537,7 @@ Zone	Pacific/Wallis	12:15:20 -	LMT	1901
+ # For now, we assume the Ladrones switched at the same time as the Philippines;
+ # see Asia/Manila.
+ 
+-# US Public Law 106-564 (2000-12-23) made UTC+10 the official standard time,
++# US Public Law 106-564 (2000-12-23) made UT +10 the official standard time,
+ # under the name "Chamorro Standard Time".  There is no official abbreviation,
+ # but Congressman Robert A. Underwood, author of the bill that became law,
+ # wrote in a press release (2000-12-27) that he will seek the use of "ChST".
+@@ -1533,7 +1549,7 @@ Zone	Pacific/Wallis	12:15:20 -	LMT	1901
+ # "I am certain, having lived there for the past decade, that 'Truk'
+ # (now properly known as Chuuk) ... is in the time zone GMT+10."
+ #
+-# Shanks & Pottenger write that Truk switched from UTC+10 to UTC+11
++# Shanks & Pottenger write that Truk switched from UT +10 to +11
+ # on 1978-10-01; ignore this for now.
+ 
+ # From Paul Eggert (1999-10-29):
+@@ -1540,8 +1556,8 @@ Zone	Pacific/Wallis	12:15:20 -	LMT	1901
+ # The Federated States of Micronesia Visitors Board writes in
+ # The Federated States of Micronesia - Visitor Information (1999-01-26)
+ # http://www.fsmgov.org/info/clocks.html
+-# that Truk and Yap are UTC+10, and Ponape and Kosrae are UTC+11.
+-# We don't know when Kosrae switched from UTC+12; assume January 1 for now.
++# that Truk and Yap are UT +10, and Ponape and Kosrae are +11.
++# We don't know when Kosrae switched from +12; assume January 1 for now.
+ 
+ 
+ # Midway
+@@ -1607,11 +1623,11 @@ Zone	Pacific/Wallis	12:15:20 -	LMT	1901
+ # ordaining - by a masterpiece of diplomatic flattery - that
+ # the Fourth of July should be celebrated twice in that year."
+ 
+-# Although Shanks & Pottenger says they both switched to UTC-11:30
+-# in 1911, and to UTC-11 in 1950. many earlier sources give UTC-11
++# Although Shanks & Pottenger says they both switched to UT -11:30
++# in 1911, and to -11 in 1950. many earlier sources give -11
+ # for American Samoa, e.g., the US National Bureau of Standards
+ # circular "Standard Time Throughout the World", 1932.
+-# Assume American Samoa switched to UTC-11 in 1911, not 1950,
++# Assume American Samoa switched to -11 in 1911, not 1950,
+ # and that after 1950 they agreed until (western) Samoa skipped a
+ # day in 2011.  Assume also that the Samoas follow the US and New
+ # Zealand's "ST"/"DT" style of daylight-saving abbreviations.
+@@ -1698,9 +1714,17 @@ Zone	Pacific/Wallis	12:15:20 -	LMT	1901
+ # of January the standard time in the Kingdom shall be moved backward by one
+ # hour to 1:00am.
+ 
+-# From Pulu 'Anau (2002-11-05):
++# From Pulu ʻAnau (2002-11-05):
+ # The law was for 3 years, supposedly to get renewed.  It wasn't.
+ 
++# From Pulu ʻAnau (2016-10-27):
++# http://mic.gov.to/news-today/press-releases/6375-daylight-saving-set-to-run-from-6-november-2016-to-15-january-2017
++# Cannot find anyone who knows the rules, has seen the duration or has seen
++# the cabinet decision, but it appears we are following Fiji's rule set.
++#
++# From Tim Parenti (2016-10-26):
++# Assume Tonga will observe DST from the first Sunday in November at 02:00
++# through the third Sunday in January at 03:00, like Fiji, for now.
+ 
+ # Wake
+ 
+Index: contrib/tzdata/backward
+===================================================================
+--- contrib/tzdata/backward	(revision 309576)
++++ contrib/tzdata/backward	(working copy)
+@@ -23,6 +23,7 @@ Link	America/Argentina/Mendoza	America/Mendoza
+ Link	America/Toronto		America/Montreal
+ Link	America/Rio_Branco	America/Porto_Acre
+ Link	America/Argentina/Cordoba	America/Rosario
++Link	America/Tijuana		America/Santa_Isabel
+ Link	America/Denver		America/Shiprock
+ Link	America/Port_of_Spain	America/Virgin
+ Link	Pacific/Auckland	Antarctica/South_Pole
+@@ -35,6 +36,7 @@ Link	Asia/Shanghai		Asia/Harbin
+ Link	Asia/Urumqi		Asia/Kashgar
+ Link	Asia/Kathmandu		Asia/Katmandu
+ Link	Asia/Macau		Asia/Macao
++Link	Asia/Yangon		Asia/Rangoon
+ Link	Asia/Ho_Chi_Minh	Asia/Saigon
+ Link	Asia/Jerusalem		Asia/Tel_Aviv
+ Link	Asia/Thimphu		Asia/Thimbu
+Index: contrib/tzdata/backzone
+===================================================================
+--- contrib/tzdata/backzone	(nonexistent)
++++ contrib/tzdata/backzone	(working copy)
+@@ -0,0 +1,677 @@
++# Zones that go back beyond the scope of the tz database
++
++# This file is in the public domain.
++
++# This file is by no means authoritative; if you think you know
++# better, go ahead and edit it (and please send any changes to
++# tz@iana.org for general use in the future).  For more, please see
++# the file CONTRIBUTING in the tz distribution.
++
++
++# From Paul Eggert (2014-10-31):
++
++# This file contains data outside the normal scope of the tz database,
++# in that its zones do not differ from normal tz zones after 1970.
++# Links in this file point to zones in this file, superseding links in
++# the file 'backward'.
++
++# Although zones in this file may be of some use for analyzing
++# pre-1970 time stamps, they are less reliable, cover only a tiny
++# sliver of the pre-1970 era, and cannot feasibly be improved to cover
++# most of the era.  Because the zones are out of normal scope for the
++# database, less effort is put into maintaining this file.  Many of
++# the zones were formerly in other source files, but were removed or
++# replaced by links as their data entries were questionable and/or they
++# differed from other zones only in pre-1970 time stamps.
++
++# Unless otherwise specified, the source for data through 1990 is:
++# Thomas G. Shanks and Rique Pottenger, The International Atlas (6th edition),
++# San Diego: ACS Publications, Inc. (2003).
++# Unfortunately this book contains many errors and cites no sources.
++
++# This file is not intended to be compiled standalone, as it
++# assumes rules from other files.  In the tz distribution, use
++# 'make PACKRATDATA=backzone zones' to compile and install this file.
++
++# Zones are sorted by zone name.  Each zone is preceded by the
++# name of the country that the zone is in, along with any other
++# commentary and rules associated with the entry.
++#
++# As explained in the zic man page, the zone columns are:
++# Zone	NAME		GMTOFF	RULES	FORMAT	[UNTIL]
++
++# Ethiopia
++# From Paul Eggert (2014-07-31):
++# Like the Swahili of Kenya and Tanzania, many Ethiopians keep a
++# 12-hour clock starting at our 06:00, so their "8 o'clock" is our
++# 02:00 or 14:00.  Keep this in mind when you ask the time in Amharic.
++#
++# Shanks & Pottenger write that Ethiopia had six narrowly-spaced time
++# zones between 1870 and 1890, that they merged to 38E50 (2:35:20) in
++# 1890, and that they switched to 3:00 on 1936-05-05.  Perhaps 38E50
++# was for Adis Dera.  Quite likely the Shanks data entries are wrong
++# anyway.
++Zone Africa/Addis_Ababa	2:34:48 -	LMT	1870
++			2:35:20	-	ADMT	1936 May  5 # Adis Dera MT
++			3:00	-	EAT
++
++# Eritrea
++Zone	Africa/Asmara	2:35:32 -	LMT	1870
++			2:35:32	-	AMT	1890        # Asmara Mean Time
++			2:35:20	-	ADMT	1936 May  5 # Adis Dera MT
++			3:00	-	EAT
++Link Africa/Asmara Africa/Asmera
++
++# Mali (southern)
++Zone	Africa/Bamako	-0:32:00 -	LMT	1912
++			 0:00	-	GMT	1934 Feb 26
++			-1:00	-	WAT	1960 Jun 20
++			 0:00	-	GMT
++
++# Central African Republic
++Zone	Africa/Bangui	1:14:20	-	LMT	1912
++			1:00	-	WAT
++
++# Gambia
++Zone	Africa/Banjul	-1:06:36 -	LMT	1912
++			-1:06:36 -	BMT	1935 # Banjul Mean Time
++			-1:00	-	WAT	1964
++			 0:00	-	GMT
++
++# Malawi
++Zone	Africa/Blantyre	2:20:00 -	LMT	1903 Mar
++			2:00	-	CAT
++
++# Republic of the Congo
++Zone Africa/Brazzaville	1:01:08 -	LMT	1912
++			1:00	-	WAT
++
++# Burundi
++Zone Africa/Bujumbura	1:57:28	-	LMT	1890
++			2:00	-	CAT
++
++# Guinea
++Zone	Africa/Conakry	-0:54:52 -	LMT	1912
++			 0:00	-	GMT	1934 Feb 26
++			-1:00	-	WAT	1960
++			 0:00	-	GMT
++
++# Senegal
++Zone	Africa/Dakar	-1:09:44 -	LMT	1912
++			-1:00	-	WAT	1941 Jun
++			 0:00	-	GMT
++
++# Tanzania
++Zone Africa/Dar_es_Salaam 2:37:08 -	LMT	1931
++			3:00	-	EAT	1948
++			2:45	-	BEAUT	1961
++			3:00	-	EAT
++
++# Djibouti
++Zone	Africa/Djibouti	2:52:36 -	LMT	1911 Jul
++			3:00	-	EAT
++
++# Cameroon
++# Whitman says they switched to 1:00 in 1920; go with Shanks & Pottenger.
++Zone	Africa/Douala	0:38:48	-	LMT	1912
++			1:00	-	WAT
++# Sierra Leone
++# From Paul Eggert (2014-08-12):
++# The following table is from Shanks & Pottenger, but it can't be right.
++# Whitman gives Mar 31 - Aug 31 for 1931 on.
++# The International Hydrographic Bulletin, 1932-33, p 63 says that
++# Sierra Leone would advance its clocks by 20 minutes on 1933-10-01.
++# Rule	NAME	FROM	TO	TYPE	IN	ON	AT	SAVE	LETTER/S
++Rule	SL	1935	1942	-	Jun	 1	0:00	0:40	SLST
++Rule	SL	1935	1942	-	Oct	 1	0:00	0	WAT
++Rule	SL	1957	1962	-	Jun	 1	0:00	1:00	SLST
++Rule	SL	1957	1962	-	Sep	 1	0:00	0	GMT
++Zone	Africa/Freetown	-0:53:00 -	LMT	1882
++			-0:53:00 -	FMT	1913 Jun # Freetown Mean Time
++			-1:00	SL	%s	1957
++			 0:00	SL	%s
++
++# Botswana
++# From Paul Eggert (2013-02-21):
++# Milne says they were regulated by the Cape Town Signal in 1899;
++# assume they switched to 2:00 when Cape Town did.
++Zone	Africa/Gaborone	1:43:40 -	LMT	1885
++			1:30	-	SAST	1903 Mar
++			2:00	-	CAT	1943 Sep 19  2:00
++			2:00	1:00	CAST	1944 Mar 19  2:00
++			2:00	-	CAT
++
++# Zimbabwe
++Zone	Africa/Harare	2:04:12 -	LMT	1903 Mar
++			2:00	-	CAT
++
++# South Sudan
++Zone	Africa/Juba	2:06:24 -	LMT	1931
++			2:00	Sudan	CA%sT	2000 Jan 15 12:00
++			3:00	-	EAT
++
++# Uganda
++Zone	Africa/Kampala	2:09:40 -	LMT	1928 Jul
++			3:00	-	EAT	1930
++			2:30	-	BEAT	1948
++			2:45	-	BEAUT	1957
++			3:00	-	EAT
++
++# Rwanda
++Zone	Africa/Kigali	2:00:16 -	LMT	1935 Jun
++			2:00	-	CAT
++
++# Democratic Republic of the Congo (west)
++Zone Africa/Kinshasa	1:01:12 -	LMT	1897 Nov  9
++			1:00	-	WAT
++
++# Gabon
++Zone Africa/Libreville	0:37:48 -	LMT	1912
++			1:00	-	WAT
++
++# Togo
++Zone	Africa/Lome	0:04:52 -	LMT	1893
++			0:00	-	GMT
++
++# Angola
++#
++# Shanks gives 1911-05-26 for the transition to WAT,
++# evidently confusing the date of the Portuguese decree
++# http://dre.pt/pdf1sdip/1911/05/12500/23132313.pdf
++# with the date that it took effect, namely 1912-01-01.
++#
++Zone	Africa/Luanda	0:52:56	-	LMT	1892
++			0:52:04	-	AOT	1912 Jan  1 # Angola Time
++			1:00	-	WAT
++
++# Democratic Republic of the Congo (east)
++Zone Africa/Lubumbashi	1:49:52 -	LMT	1897 Nov 9
++			2:00	-	CAT
++
++# Zambia
++Zone	Africa/Lusaka	1:53:08 -	LMT	1903 Mar
++			2:00	-	CAT
++
++# Equatorial Guinea
++#
++# Although Shanks says that Malabo switched from UT +00 to +01 on 1963-12-15,
++# a Google Books search says that London Calling, Issues 432-465 (1948), p 19,
++# says that Spanish Guinea was at +01 back then.  The Shanks data entries
++# are most likely wrong, but we have nothing better; use them here for now.
++#
++Zone	Africa/Malabo	0:35:08 -	LMT	1912
++			0:00	-	GMT	1963 Dec 15
++			1:00	-	WAT
++
++# Lesotho
++Zone	Africa/Maseru	1:50:00 -	LMT	1903 Mar
++			2:00	-	SAST	1943 Sep 19  2:00
++			2:00	1:00	SAST	1944 Mar 19  2:00
++			2:00	-	SAST
++
++# Swaziland
++Zone	Africa/Mbabane	2:04:24 -	LMT	1903 Mar
++			2:00	-	SAST
++
++# Somalia
++Zone Africa/Mogadishu	3:01:28 -	LMT	1893 Nov
++			3:00	-	EAT	1931
++			2:30	-	BEAT	1957
++			3:00	-	EAT
++
++# Niger
++Zone	Africa/Niamey	 0:08:28 -	LMT	1912
++			-1:00	-	WAT	1934 Feb 26
++			 0:00	-	GMT	1960
++			 1:00	-	WAT
++
++# Mauritania
++Zone Africa/Nouakchott	-1:03:48 -	LMT	1912
++			 0:00	-	GMT	1934 Feb 26
++			-1:00	-	WAT	1960 Nov 28
++			 0:00	-	GMT
++
++# Burkina Faso
++Zone Africa/Ouagadougou	-0:06:04 -	LMT	1912
++			 0:00	-	GMT
++
++# Benin
++# Whitman says they switched to 1:00 in 1946, not 1934;
++# go with Shanks & Pottenger.
++Zone Africa/Porto-Novo	0:10:28	-	LMT	1912 Jan  1
++			0:00	-	GMT	1934 Feb 26
++			1:00	-	WAT
++
++# São Tomé and Príncipe
++Zone	Africa/Sao_Tome	 0:26:56 -	LMT	1884
++			-0:36:32 -	LMT	1912 # Lisbon Mean Time
++			 0:00	-	GMT
++
++# Mali (northern)
++Zone	Africa/Timbuktu	-0:12:04 -	LMT	1912
++			 0:00	-	GMT
++
++# Anguilla
++Zone America/Anguilla	-4:12:16 -	LMT	1912 Mar  2
++			-4:00	-	AST
++
++# Antigua and Barbuda
++Zone	America/Antigua	-4:07:12 -	LMT	1912 Mar 2
++			-5:00	-	EST	1951
++			-4:00	-	AST
++
++# Chubut, Argentina
++# The name "Comodoro Rivadavia" exceeds the 14-byte POSIX limit.
++Zone America/Argentina/ComodRivadavia -4:30:00 - LMT	1894 Oct 31
++			-4:16:48 -	CMT	1920 May
++			-4:00	-	ART	1930 Dec
++			-4:00	Arg	AR%sT	1969 Oct  5
++			-3:00	Arg	AR%sT	1991 Mar  3
++			-4:00	-	WART	1991 Oct 20
++			-3:00	Arg	AR%sT	1999 Oct  3
++			-4:00	Arg	AR%sT	2000 Mar  3
++			-3:00	-	ART	2004 Jun  1
++			-4:00	-	WART	2004 Jun 20
++			-3:00	-	ART
++
++# Aruba
++Zone	America/Aruba	-4:40:24 -	LMT	1912 Feb 12 # Oranjestad
++			-4:30	-	ANT	1965 # Netherlands Antilles Time
++			-4:00	-	AST
++
++# Cayman Is
++Zone	America/Cayman	-5:25:32 -	LMT	1890     # Georgetown
++			-5:07:11 -	KMT	1912 Feb # Kingston Mean Time
++			-5:00	-	EST
++
++# Canada
++Zone America/Coral_Harbour -5:32:40 -	LMT	1884
++			-5:00	NT_YK	E%sT	1946
++			-5:00	-	EST
++
++# Dominica
++Zone America/Dominica	-4:05:36 -	LMT	1911 Jul  1  0:01 # Roseau
++			-4:00	-	AST
++
++# Baja California
++# See 'northamerica' for why this entry is here rather than there.
++Zone America/Ensenada	-7:46:28 -	LMT	1922 Jan  1  0:13:32
++			-8:00	-	PST	1927 Jun 10 23:00
++			-7:00	-	MST	1930 Nov 16
++			-8:00	-	PST	1942 Apr
++			-7:00	-	MST	1949 Jan 14
++			-8:00	-	PST	1996
++			-8:00	Mexico	P%sT
++
++# Grenada
++Zone	America/Grenada	-4:07:00 -	LMT	1911 Jul # St George's
++			-4:00	-	AST
++
++# Guadeloupe
++Zone America/Guadeloupe	-4:06:08 -	LMT	1911 Jun  8 # Pointe-à-Pitre
++			-4:00	 -	AST
++
++# Canada
++#
++# From Paul Eggert (2015-03-24):
++# Since 1970 most of Quebec has been like Toronto; see
++# America/Toronto.  However, earlier versions of the tz database
++# mistakenly relied on data from Shanks & Pottenger saying that Quebec
++# differed from Ontario after 1970, and the following rules and zone
++# were created for most of Quebec from the incorrect Shanks &
++# Pottenger data.  The post-1970 entries have been corrected, but the
++# pre-1970 entries are unchecked and probably have errors.
++#
++# Rule	NAME	FROM	TO	TYPE	IN	ON	AT	SAVE	LETTER/S
++Rule	Mont	1917	only	-	Mar	25	2:00	1:00	D
++Rule	Mont	1917	only	-	Apr	24	0:00	0	S
++Rule	Mont	1919	only	-	Mar	31	2:30	1:00	D
++Rule	Mont	1919	only	-	Oct	25	2:30	0	S
++Rule	Mont	1920	only	-	May	 2	2:30	1:00	D
++Rule	Mont	1920	1922	-	Oct	Sun>=1	2:30	0	S
++Rule	Mont	1921	only	-	May	 1	2:00	1:00	D
++Rule	Mont	1922	only	-	Apr	30	2:00	1:00	D
++Rule	Mont	1924	only	-	May	17	2:00	1:00	D
++Rule	Mont	1924	1926	-	Sep	lastSun	2:30	0	S
++Rule	Mont	1925	1926	-	May	Sun>=1	2:00	1:00	D
++Rule	Mont	1927	1937	-	Apr	lastSat	24:00	1:00	D
++Rule	Mont	1927	1937	-	Sep	lastSat	24:00	0	S
++Rule	Mont	1938	1940	-	Apr	lastSun	0:00	1:00	D
++Rule	Mont	1938	1939	-	Sep	lastSun	0:00	0	S
++Rule	Mont	1946	1973	-	Apr	lastSun	2:00	1:00	D
++Rule	Mont	1945	1948	-	Sep	lastSun	2:00	0	S
++Rule	Mont	1949	1950	-	Oct	lastSun	2:00	0	S
++Rule	Mont	1951	1956	-	Sep	lastSun	2:00	0	S
++Rule	Mont	1957	1973	-	Oct	lastSun	2:00	0	S
++Zone America/Montreal	-4:54:16 -	LMT	1884
++			-5:00	Mont	E%sT	1918
++			-5:00	Canada	E%sT	1919
++			-5:00	Mont	E%sT	1942 Feb  9  2:00s
++			-5:00	Canada	E%sT	1946
++			-5:00	Mont	E%sT	1974
++			-5:00	Canada	E%sT
++
++# Montserrat
++# From Paul Eggert (2006-03-22):
++# In 1995 volcanic eruptions forced evacuation of Plymouth, the capital.
++# world.gazetteer.com says Cork Hill is the most populous location now.
++Zone America/Montserrat	-4:08:52 -	LMT	1911 Jul  1  0:01 # Cork Hill
++			-4:00	-	AST
++
++# Argentina
++# This entry was intended for the following areas, but has been superseded by
++# more detailed zones.
++# Santa Fe (SF), Entre Ríos (ER), Corrientes (CN), Misiones (MN), Chaco (CC),
++# Formosa (FM), La Pampa (LP), Chubut (CH)
++Zone America/Rosario	-4:02:40 -	LMT	1894 Nov
++			-4:16:44 -	CMT	1920 May
++			-4:00	-	ART	1930 Dec
++			-4:00	Arg	AR%sT	1969 Oct  5
++			-3:00	Arg	AR%sT	1991 Jul
++			-3:00	-	ART	1999 Oct  3  0:00
++			-4:00	Arg	AR%sT	2000 Mar  3  0:00
++			-3:00	-	ART
++
++# St Kitts-Nevis
++Zone America/St_Kitts	-4:10:52 -	LMT	1912 Mar  2 # Basseterre
++			-4:00	-	AST
++
++# St Lucia
++Zone America/St_Lucia	-4:04:00 -	LMT	1890 # Castries
++			-4:04:00 -	CMT	1912 # Castries Mean Time
++			-4:00	-	AST
++
++# Virgin Is
++Zone America/St_Thomas	-4:19:44 -	LMT	1911 Jul # Charlotte Amalie
++			-4:00	-	AST
++
++# St Vincent and the Grenadines
++Zone America/St_Vincent	-4:04:56 -	LMT	1890 # Kingstown
++			-4:04:56 -	KMT	1912 # Kingstown Mean Time
++			-4:00	-	AST
++
++# British Virgin Is
++Zone America/Tortola	-4:18:28 -	LMT	1911 Jul # Road Town
++			-4:00	-	AST
++
++# McMurdo, Ross Island, since 1955-12
++Zone Antarctica/McMurdo	0	-	-00	1956
++			12:00	NZ	NZ%sT
++Link Antarctica/McMurdo Antarctica/South_Pole
++
++# Yemen
++# Milne says 2:59:54 was the meridian of the saluting battery at Aden,
++# and that Yemen was at 1:55:56, the meridian of the Hagia Sophia.
++Zone	Asia/Aden	2:59:54	-	LMT	1950
++			3:00	-	AST
++
++# Bahrain
++Zone	Asia/Bahrain	3:22:20 -	LMT	1920     # Manamah
++			4:00	-	GST	1972 Jun
++			3:00	-	AST
++
++# India
++#
++# From Paul Eggert (2014-09-06):
++# The 1876 Report of the Secretary of the [US] Navy, p 305 says that Madras
++# civil time was 5:20:57.3.
++#
++# From Paul Eggert (2014-08-21):
++# In tomorrow's The Hindu, Nitya Menon reports that India had two civil time
++# zones starting in 1884, one in Bombay and one in Calcutta, and that railways
++# used a third time zone based on Madras time (80 deg. 18'30" E).  Also,
++# in 1881 Bombay briefly switched to Madras time, but switched back.  See:
++# http://www.thehindu.com/news/cities/chennai/madras-375-when-madras-clocked-the-time/article6339393.ece
++#Zone	  Asia/Chennai  [not enough info to complete]
++
++# China
++# Long-shu Time (probably due to Long and Shu being two names of that area)
++# Guangxi, Guizhou, Hainan, Ningxia, Sichuan, Shaanxi, and Yunnan;
++# most of Gansu; west Inner Mongolia; west Qinghai; and the Guangdong
++# counties Deqing, Enping, Kaiping, Luoding, Taishan, Xinxing,
++# Yangchun, Yangjiang, Yu'nan, and Yunfu.
++Zone	Asia/Chongqing	7:06:20	-	LMT	1928     # or Chungking
++			7:00	-	LONT	1980 May # Long-shu Time
++			8:00	PRC	C%sT
++Link Asia/Chongqing Asia/Chungking
++
++# Vietnam
++# From Paul Eggert (2014-10-13):
++# See Asia/Ho_Chi_Minh for the source for this data.
++# Trần's book says the 1954-55 transition to 07:00 in Hanoi was in
++# October 1954, with exact date and time unspecified.
++Zone	Asia/Hanoi	7:03:24 -	LMT	1906 Jul  1
++			7:06:30	-	PLMT	1911 May  1
++			7:00	-	ICT	1942 Dec 31 23:00
++			8:00	-	IDT	1945 Mar 14 23:00
++			9:00	-	JST	1945 Sep  2
++			7:00	-	ICT	1947 Apr  1
++			8:00	-	IDT	1954 Oct
++			7:00	-	ICT
++
++# China
++# Changbai Time ("Long-white Time", Long-white = Heilongjiang area)
++# Heilongjiang (except Mohe county), Jilin
++Zone	Asia/Harbin	8:26:44	-	LMT	1928     # or Haerbin
++			8:30	-	CHAT	1932 Mar # Changbai Time
++			8:00	-	CST	1940
++			9:00	-	CHAT	1966 May
++			8:30	-	CHAT	1980 May
++			8:00	PRC	C%sT
++
++# far west China
++Zone	Asia/Kashgar	5:03:56	-	LMT	1928     # or Kashi or Kaxgar
++			5:30	-	KAST	1940     # Kashgar Time
++			5:00	-	KAST	1980 May
++			8:00	PRC	C%sT
++
++# Kuwait
++Zone	Asia/Kuwait	3:11:56 -	LMT	1950
++			3:00	-	AST
++
++
++# Oman
++# Milne says 3:54:24 was the meridian of the Muscat Tidal Observatory.
++Zone	Asia/Muscat	3:54:24 -	LMT	1920
++			4:00	-	GST
++
++# India
++# From Paul Eggert (2014-08-11), after a heads-up from Stephen Colebourne:
++# According to a Portuguese decree (1911-05-26)
++# http://dre.pt/pdf1sdip/1911/05/12500/23132313.pdf
++# Portuguese India switched to UT +05 on 1912-01-01.
++#Zone	Asia/Panaji	[not enough info to complete]
++
++# Cambodia
++# From Paul Eggert (2014-10-11):
++# See Asia/Ho_Chi_Minh for the source for most of this data.  Also, guess
++# (1) Cambodia reverted to UT +07 on 1945-09-02, when Vietnam did, and
++# (2) they also reverted to +07 on 1953-11-09, the date of independence.
++# These guesses are probably wrong but they're better than guessing no
++# transitions there.
++Zone	Asia/Phnom_Penh	6:59:40 -	LMT	1906 Jul  1
++			7:06:30	-	PLMT	1911 May  1
++			7:00	-	ICT	1942 Dec 31 23:00
++			8:00	-	IDT	1945 Mar 14 23:00
++			9:00	-	JST	1945 Sep  2
++			7:00	-	ICT	1947 Apr  1
++			8:00	-	IDT	1953 Nov  9
++			7:00	-	ICT
++
++# Israel
++Zone	Asia/Tel_Aviv	2:19:04 -	LMT	1880
++			2:21	-	JMT	1918
++			2:00	Zion	I%sT
++
++# Laos
++# From Paul Eggert (2014-10-11):
++# See Asia/Ho_Chi_Minh for the source for most of this data.
++# Trần's book says that Laos reverted to UT +07 on 1955-04-15.
++# Also, guess that Laos reverted to +07 on 1945-09-02, when Vietnam did;
++# this is probably wrong but it's better than guessing no transition.
++Zone	Asia/Vientiane	6:50:24 -	LMT	1906 Jul  1
++			7:06:30	-	PLMT	1911 May  1
++			7:00	-	ICT	1942 Dec 31 23:00
++			8:00	-	IDT	1945 Mar 14 23:00
++			9:00	-	JST	1945 Sep  2
++			7:00	-	ICT	1947 Apr  1
++			8:00	-	IDT	1955 Apr 15
++			7:00	-	ICT
++
++# Jan Mayen
++# From Whitman:
++Zone Atlantic/Jan_Mayen	-1:00	-	EGT
++
++# St Helena
++Zone Atlantic/St_Helena	-0:22:48 -	LMT	1890 # Jamestown
++			-0:22:48 -	JMT	1951 # Jamestown Mean Time
++			 0:00	-	GMT
++
++# Northern Ireland
++Zone	Europe/Belfast	-0:23:40 -	LMT	1880 Aug  2
++			-0:25:21 -	DMT	1916 May 21  2:00
++						# DMT = Dublin/Dunsink MT
++			-0:25:21 1:00	IST	1916 Oct  1  2:00s
++						# IST = Irish Summer Time
++			 0:00	GB-Eire	%s	1968 Oct 27
++			 1:00	-	BST	1971 Oct 31  2:00u
++			 0:00	GB-Eire	%s	1996
++			 0:00	EU	GMT/BST
++
++# Guernsey
++# Data from Joseph S. Myers
++# http://mm.icann.org/pipermail/tz/2013-September/019883.html
++# References to be added
++# LMT Location - 49.27N -2.33E - St.Peter Port
++Zone	Europe/Guernsey	-0:09:19 -	LMT	1913 Jun 18
++			 0:00	GB-Eire	%s	1940 Jul  2
++			 1:00	C-Eur	CE%sT	1945 May  8
++			 0:00	GB-Eire	%s	1968 Oct 27
++			 1:00	-	BST	1971 Oct 31  2:00u
++			 0:00	GB-Eire	%s	1996
++			 0:00	EU	GMT/BST
++
++# Isle of Man
++#
++# From Lester Caine (2013-09-04):
++# The Isle of Man legislation is now on-line at
++# <http://www.legislation.gov.im>, starting with the original Statutory
++# Time Act in 1883 and including additional confirmation of some of
++# the dates of the 'Summer Time' orders originating at
++# Westminster.  There is a little uncertainty as to the starting date
++# of the first summer time in 1916 which may have be announced a
++# couple of days late.  There is still a substantial number of
++# documents to work through, but it is thought that every GB change
++# was also implemented on the island.
++#
++# AT4 of 1883 - The Statutory Time et cetera Act 1883 -
++# LMT Location - 54.1508N -4.4814E - Tynwald Hill ( Manx parliament )
++Zone Europe/Isle_of_Man	-0:17:55 -	LMT	1883 Mar 30  0:00s
++			 0:00	GB-Eire	%s	1968 Oct 27
++			 1:00	-	BST	1971 Oct 31  2:00u
++			 0:00	GB-Eire	%s	1996
++			 0:00	EU	GMT/BST
++
++# Jersey
++# Data from Joseph S. Myers
++# http://mm.icann.org/pipermail/tz/2013-September/019883.html
++# References to be added
++# LMT Location - 49.187N -2.107E - St. Helier
++Zone	Europe/Jersey	-0:08:25 -	LMT	1898 Jun 11 16:00u
++			 0:00	GB-Eire	%s	1940 Jul  2
++			 1:00	C-Eur	CE%sT	1945 May  8
++			 0:00	GB-Eire	%s	1968 Oct 27
++			 1:00	-	BST	1971 Oct 31  2:00u
++			 0:00	GB-Eire	%s	1996
++			 0:00	EU	GMT/BST
++
++# Slovenia
++Zone Europe/Ljubljana	0:58:04	-	LMT	1884
++			1:00	-	CET	1941 Apr 18 23:00
++			1:00	C-Eur	CE%sT	1945 May  8  2:00s
++			1:00	1:00	CEST	1945 Sep 16  2:00s
++			1:00	-	CET	1982 Nov 27
++			1:00	EU	CE%sT
++
++# Bosnia and Herzegovina
++Zone	Europe/Sarajevo	1:13:40	-	LMT	1884
++			1:00	-	CET	1941 Apr 18 23:00
++			1:00	C-Eur	CE%sT	1945 May  8  2:00s
++			1:00	1:00	CEST	1945 Sep 16  2:00s
++			1:00	-	CET	1982 Nov 27
++			1:00	EU	CE%sT
++
++# Macedonia
++Zone	Europe/Skopje	1:25:44	-	LMT	1884
++			1:00	-	CET	1941 Apr 18 23:00
++			1:00	C-Eur	CE%sT	1945 May  8  2:00s
++			1:00	1:00	CEST	1945 Sep 16  2:00s
++			1:00	-	CET	1982 Nov 27
++			1:00	EU	CE%sT
++
++# Moldova / Transnistria
++Zone	Europe/Tiraspol	1:58:32	-	LMT	1880
++			1:55	-	CMT	1918 Feb 15 # Chisinau MT
++			1:44:24	-	BMT	1931 Jul 24 # Bucharest MT
++			2:00	Romania	EE%sT	1940 Aug 15
++			2:00	1:00	EEST	1941 Jul 17
++			1:00	C-Eur	CE%sT	1944 Aug 24
++			3:00	Russia	MSK/MSD	1991 Mar 31  2:00
++			2:00	Russia	EE%sT	1992 Jan 19  2:00
++			3:00	Russia	MSK/MSD
++
++# Liechtenstein
++Zone	Europe/Vaduz	0:38:04 -	LMT	1894 Jun
++			1:00	-	CET	1981
++			1:00	EU	CE%sT
++
++# Croatia
++Zone	Europe/Zagreb	1:03:52	-	LMT	1884
++			1:00	-	CET	1941 Apr 18 23:00
++			1:00	C-Eur	CE%sT	1945 May  8  2:00s
++			1:00	1:00	CEST	1945 Sep 16  2:00s
++			1:00	-	CET	1982 Nov 27
++			1:00	EU	CE%sT
++
++# Madagascar
++Zone Indian/Antananarivo 3:10:04 -	LMT	1911 Jul
++			3:00	-	EAT	1954 Feb 27 23:00s
++			3:00	1:00	EAST	1954 May 29 23:00s
++			3:00	-	EAT
++
++# Comoros
++Zone	Indian/Comoro	2:53:04 -	LMT	1911 Jul # Moroni, Gran Comoro
++			3:00	-	EAT
++
++# Mayotte
++Zone	Indian/Mayotte	3:00:56 -	LMT	1911 Jul # Mamoutzou
++			3:00	-	EAT
++
++# US minor outlying islands
++Zone Pacific/Johnston	-10:00	-	HST
++
++# US minor outlying islands
++#
++# From Mark Brader (2005-01-23):
++# [Fallacies and Fantasies of Air Transport History, by R.E.G. Davies,
++# published 1994 by Paladwr Press, McLean, VA, USA; ISBN 0-9626483-5-3]
++# reproduced a Pan American Airways timetable from 1936, for their weekly
++# "Orient Express" flights between San Francisco and Manila, and connecting
++# flights to Chicago and the US East Coast.  As it uses some time zone
++# designations that I've never seen before:....
++# Fri. 6:30A Lv. HONOLOLU (Pearl Harbor), H.I.   H.L.T. Ar. 5:30P Sun.
++#  "   3:00P Ar. MIDWAY ISLAND . . . . . . . . . M.L.T. Lv. 6:00A  "
++#
++Zone Pacific/Midway	-11:49:28 -	LMT	1901
++			-11:00	-	NST	1956 Jun  3
++			-11:00	1:00	NDT	1956 Sep  2
++			-11:00	-	NST	1967 Apr    # N=Nome
++			-11:00	-	BST	1983 Nov 30 # B=Bering
++			-11:00	-	SST	            # S=Samoa
++
++# N Mariana Is
++Zone Pacific/Saipan	-14:17:00 -	LMT	1844 Dec 31
++			 9:43:00 -	LMT	1901
++			 9:00	-	MPT	1969 Oct    # N Mariana Is Time
++			10:00	-	MPT	2000 Dec 23
++			10:00	-	ChST	# Chamorro Standard Time
+Index: contrib/tzdata/checklinks.awk
+===================================================================
+--- contrib/tzdata/checklinks.awk	(nonexistent)
++++ contrib/tzdata/checklinks.awk	(working copy)
+@@ -0,0 +1,48 @@
++# Check links in tz tables.
++
++# Contributed by Paul Eggert.  This file is in the public domain.
++
++BEGIN {
++    # Special marker indicating that the name is defined as a Zone.
++    # It is a newline so that it cannot match a valid name.
++    # It is not null so that its slot does not appear unset.
++    Zone = "\n"
++}
++
++/^Zone/ {
++    if (defined[$2]) {
++	if (defined[$2] == Zone) {
++	    printf "%s: Zone has duplicate definition\n", $2
++	} else {
++	    printf "%s: Link with same name as Zone\n", $2
++	}
++	status = 1
++    }
++    defined[$2] = Zone
++}
++
++/^Link/ {
++    if (defined[$3]) {
++	if (defined[$3] == Zone) {
++	    printf "%s: Link with same name as Zone\n", $3
++	} else if (defined[$3] == $2) {
++	    printf "%s: Link has duplicate definition\n", $3
++	} else {
++	    printf "%s: Link to both %s and %s\n", $3, defined[$3], $2
++	}
++	status = 1
++    }
++    used[$2] = 1
++    defined[$3] = $2
++}
++
++END {
++    for (tz in used) {
++	if (defined[tz] != Zone) {
++	    printf "%s: Link to non-zone\n", tz
++	    status = 1
++	}
++    }
++
++    exit status
++}
+Index: contrib/tzdata/checktab.awk
+===================================================================
+--- contrib/tzdata/checktab.awk	(nonexistent)
++++ contrib/tzdata/checktab.awk	(working copy)
+@@ -0,0 +1,177 @@
++# Check tz tables for consistency.
++
++# Contributed by Paul Eggert.  This file is in the public domain.
++
++BEGIN {
++	FS = "\t"
++
++	if (!iso_table) iso_table = "iso3166.tab"
++	if (!zone_table) zone_table = "zone1970.tab"
++	if (!want_warnings) want_warnings = -1
++
++	while (getline <iso_table) {
++		iso_NR++
++		if ($0 ~ /^#/) continue
++		if (NF != 2) {
++			printf "%s:%d: wrong number of columns\n", \
++				iso_table, iso_NR >>"/dev/stderr"
++			status = 1
++		}
++		cc = $1
++		name = $2
++		if (cc !~ /^[A-Z][A-Z]$/) {
++			printf "%s:%d: invalid country code '%s'\n", \
++				iso_table, iso_NR, cc >>"/dev/stderr"
++			status = 1
++		}
++		if (cc <= cc0) {
++			if (cc == cc0) {
++				s = "duplicate";
++			} else {
++				s = "out of order";
++			}
++
++			printf "%s:%d: country code '%s' is %s\n", \
++				iso_table, iso_NR, cc, s \
++				>>"/dev/stderr"
++			status = 1
++		}
++		cc0 = cc
++		if (name2cc[name]) {
++			printf "%s:%d: '%s' and '%s' have the same name\n", \
++				iso_table, iso_NR, name2cc[name], cc \
++				>>"/dev/stderr"
++			status = 1
++		}
++		name2cc[name] = cc
++		cc2name[cc] = name
++		cc2NR[cc] = iso_NR
++	}
++
++	cc0 = ""
++
++	while (getline <zone_table) {
++		zone_NR++
++		if ($0 ~ /^#/) continue
++		if (NF != 3 && NF != 4) {
++			printf "%s:%d: wrong number of columns\n", \
++				zone_table, zone_NR >>"/dev/stderr"
++			status = 1
++		}
++		split($1, cca, /,/)
++		cc = cca[1]
++		coordinates = $2
++		tz = $3
++		comments = $4
++		if (cc < cc0) {
++			printf "%s:%d: country code '%s' is out of order\n", \
++				zone_table, zone_NR, cc >>"/dev/stderr"
++			status = 1
++		}
++		cc0 = cc
++		tztab[tz] = 1
++		tz2comments[tz] = comments
++		tz2NR[tz] = zone_NR
++		for (i in cca) {
++		    cc = cca[i]
++		    cctz = cc tz
++		    cctztab[cctz] = 1
++		    if (cc2name[cc]) {
++			cc_used[cc]++
++		    } else {
++			printf "%s:%d: %s: unknown country code\n", \
++				zone_table, zone_NR, cc >>"/dev/stderr"
++			status = 1
++		    }
++		}
++		if (coordinates !~ /^[-+][0-9][0-9][0-5][0-9][-+][01][0-9][0-9][0-5][0-9]$/ \
++		    && coordinates !~ /^[-+][0-9][0-9][0-5][0-9][0-5][0-9][-+][01][0-9][0-9][0-5][0-9][0-5][0-9]$/) {
++			printf "%s:%d: %s: invalid coordinates\n", \
++				zone_table, zone_NR, coordinates >>"/dev/stderr"
++			status = 1
++		}
++	}
++
++	for (cctz in cctztab) {
++		cc = substr (cctz, 1, 2)
++		tz = substr (cctz, 3)
++		if (1 < cc_used[cc]) {
++			comments_needed[tz] = cc
++		}
++	}
++	for (cctz in cctztab) {
++	  cc = substr (cctz, 1, 2)
++	  tz = substr (cctz, 3)
++	  if (!comments_needed[tz] && tz2comments[tz]) {
++	    printf "%s:%d: unnecessary comment '%s'\n", \
++		zone_table, tz2NR[tz], tz2comments[tz] \
++		>>"/dev/stderr"
++	    tz2comments[tz] = 0
++	    status = 1
++	  } else if (comments_needed[tz] && !tz2comments[tz]) {
++	    printf "%s:%d: missing comment for %s\n", \
++	      zone_table, tz2NR[tz], comments_needed[tz] \
++	      >>"/dev/stderr"
++	    tz2comments[tz] = 1
++	    status = 1
++	  }
++	}
++	FS = " "
++}
++
++$1 ~ /^#/ { next }
++
++{
++	tz = rules = ""
++	if ($1 == "Zone") {
++		tz = $2
++		ruleUsed[$4] = 1
++	} else if ($1 == "Link" && zone_table == "zone.tab") {
++		# Ignore Link commands if source and destination basenames
++		# are identical, e.g. Europe/Istanbul versus Asia/Istanbul.
++		src = $2
++		dst = $3
++		while ((i = index(src, "/"))) src = substr(src, i+1)
++		while ((i = index(dst, "/"))) dst = substr(dst, i+1)
++		if (src != dst) tz = $3
++	} else if ($1 == "Rule") {
++		ruleDefined[$2] = 1
++	} else {
++		ruleUsed[$2] = 1
++	}
++	if (tz && tz ~ /\//) {
++		if (!tztab[tz]) {
++			printf "%s: no data for '%s'\n", zone_table, tz \
++				>>"/dev/stderr"
++			status = 1
++		}
++		zoneSeen[tz] = 1
++	}
++}
++
++END {
++	for (tz in ruleDefined) {
++		if (!ruleUsed[tz]) {
++			printf "%s: Rule never used\n", tz
++			status = 1
++		}
++	}
++	for (tz in tztab) {
++		if (!zoneSeen[tz]) {
++			printf "%s:%d: no Zone table for '%s'\n", \
++				zone_table, tz2NR[tz], tz >>"/dev/stderr"
++			status = 1
++		}
++	}
++	if (0 < want_warnings) {
++		for (cc in cc2name) {
++			if (!cc_used[cc]) {
++				printf "%s:%d: warning: " \
++					"no Zone entries for %s (%s)\n", \
++					iso_table, cc2NR[cc], cc, cc2name[cc]
++			}
++		}
++	}
++
++	exit status
++}
+Index: contrib/tzdata/etcetera
+===================================================================
+--- contrib/tzdata/etcetera	(revision 309576)
++++ contrib/tzdata/etcetera	(working copy)
+@@ -8,6 +8,13 @@
+ # need now for the entries that are not on UTC are for ships at sea
+ # that cannot use POSIX TZ settings.
+ 
++# Starting with POSIX 1003.1-2001, the entries below are all
++# unnecessary as settings for the TZ environment variable.  E.g.,
++# instead of TZ='Etc/GMT+4' one can use the POSIX setting TZ='<-04>+4'.
++#
++# Do not use a POSIX TZ setting like TZ='GMT+4', which is four hours
++# behind GMT but uses the completely misleading abbreviation "GMT".
++
+ Zone	Etc/GMT		0	-	GMT
+ Zone	Etc/UTC		0	-	UTC
+ Zone	Etc/UCT		0	-	UCT
+@@ -26,23 +33,13 @@ Link	Etc/GMT				Etc/GMT-0
+ Link	Etc/GMT				Etc/GMT+0
+ Link	Etc/GMT				Etc/GMT0
+ 
+-# We use POSIX-style signs in the Zone names and the output abbreviations,
++# Be consistent with POSIX TZ settings in the Zone names,
+ # even though this is the opposite of what many people expect.
+ # POSIX has positive signs west of Greenwich, but many people expect
+ # positive signs east of Greenwich.  For example, TZ='Etc/GMT+4' uses
+-# the abbreviation "GMT+4" and corresponds to 4 hours behind UT
++# the abbreviation "-04" and corresponds to 4 hours behind UT
+ # (i.e. west of Greenwich) even though many people would expect it to
+ # mean 4 hours ahead of UT (i.e. east of Greenwich).
+-#
+-# In the draft 5 of POSIX 1003.1-200x, the angle bracket notation allows for
+-# TZ='<GMT-4>+4'; if you want time zone abbreviations conforming to
+-# ISO 8601 you can use TZ='<-0400>+4'.  Thus the commonly-expected
+-# offset is kept within the angle bracket (and is used for display)
+-# while the POSIX sign is kept outside the angle bracket (and is used
+-# for calculation).
+-#
+-# Do not use a TZ setting like TZ='GMT+4', which is four hours behind
+-# GMT but uses the completely misleading abbreviation "GMT".
+ 
+ # Earlier incarnations of this package were not POSIX-compliant,
+ # and had lines such as
+@@ -51,30 +48,31 @@ Link	Etc/GMT				Etc/GMT0
+ # way does a
+ #		zic -l GMT-12
+ # so we moved the names into the Etc subdirectory.
++# Also, the time zone abbreviations are now compatible with %z.
+ 
+-Zone	Etc/GMT-14	14	-	GMT-14	# 14 hours ahead of GMT
+-Zone	Etc/GMT-13	13	-	GMT-13
+-Zone	Etc/GMT-12	12	-	GMT-12
+-Zone	Etc/GMT-11	11	-	GMT-11
+-Zone	Etc/GMT-10	10	-	GMT-10
+-Zone	Etc/GMT-9	9	-	GMT-9
+-Zone	Etc/GMT-8	8	-	GMT-8
+-Zone	Etc/GMT-7	7	-	GMT-7
+-Zone	Etc/GMT-6	6	-	GMT-6
+-Zone	Etc/GMT-5	5	-	GMT-5
+-Zone	Etc/GMT-4	4	-	GMT-4
+-Zone	Etc/GMT-3	3	-	GMT-3
+-Zone	Etc/GMT-2	2	-	GMT-2
+-Zone	Etc/GMT-1	1	-	GMT-1
+-Zone	Etc/GMT+1	-1	-	GMT+1
+-Zone	Etc/GMT+2	-2	-	GMT+2
+-Zone	Etc/GMT+3	-3	-	GMT+3
+-Zone	Etc/GMT+4	-4	-	GMT+4
+-Zone	Etc/GMT+5	-5	-	GMT+5
+-Zone	Etc/GMT+6	-6	-	GMT+6
+-Zone	Etc/GMT+7	-7	-	GMT+7
+-Zone	Etc/GMT+8	-8	-	GMT+8
+-Zone	Etc/GMT+9	-9	-	GMT+9
+-Zone	Etc/GMT+10	-10	-	GMT+10
+-Zone	Etc/GMT+11	-11	-	GMT+11
+-Zone	Etc/GMT+12	-12	-	GMT+12
++Zone	Etc/GMT-14	14	-	+14
++Zone	Etc/GMT-13	13	-	+13
++Zone	Etc/GMT-12	12	-	+12
++Zone	Etc/GMT-11	11	-	+11
++Zone	Etc/GMT-10	10	-	+10
++Zone	Etc/GMT-9	9	-	+09
++Zone	Etc/GMT-8	8	-	+08
++Zone	Etc/GMT-7	7	-	+07
++Zone	Etc/GMT-6	6	-	+06
++Zone	Etc/GMT-5	5	-	+05
++Zone	Etc/GMT-4	4	-	+04
++Zone	Etc/GMT-3	3	-	+03
++Zone	Etc/GMT-2	2	-	+02
++Zone	Etc/GMT-1	1	-	+01
++Zone	Etc/GMT+1	-1	-	-01
++Zone	Etc/GMT+2	-2	-	-02
++Zone	Etc/GMT+3	-3	-	-03
++Zone	Etc/GMT+4	-4	-	-04
++Zone	Etc/GMT+5	-5	-	-05
++Zone	Etc/GMT+6	-6	-	-06
++Zone	Etc/GMT+7	-7	-	-07
++Zone	Etc/GMT+8	-8	-	-08
++Zone	Etc/GMT+9	-9	-	-09
++Zone	Etc/GMT+10	-10	-	-10
++Zone	Etc/GMT+11	-11	-	-11
++Zone	Etc/GMT+12	-12	-	-12
+Index: contrib/tzdata/europe
+===================================================================
+--- contrib/tzdata/europe	(revision 309576)
++++ contrib/tzdata/europe	(working copy)
+@@ -75,8 +75,7 @@
+ #        1:00       CET CEST CEMT Central Europe
+ #        1:00:14    SET           Swedish (1879-1899)*
+ #        2:00       EET EEST      Eastern Europe
+-#        3:00       FET           Further-eastern Europe (2011-2014)*
+-#        3:00       MSK MSD  MSM* Minsk, Moscow
++#        3:00       MSK MSD       Moscow
+ 
+ # From Peter Ilieve (1994-12-04),
+ # The original six [EU members]: Belgium, France, (West) Germany, Italy,
+@@ -583,16 +582,33 @@ Rule	E-Eur	1979	1995	-	Sep	lastSun	 0:00	0	-
+ Rule	E-Eur	1981	max	-	Mar	lastSun	 0:00	1:00	S
+ Rule	E-Eur	1996	max	-	Oct	lastSun	 0:00	0	-
+ 
++
++# Daylight saving time for Russia and the Soviet Union
++#
++# The 1917-1921 decree URLs are from Alexander Belopolsky (2016-08-23).
++
+ # Rule	NAME	FROM	TO	TYPE	IN	ON	AT	SAVE	LETTER/S
+ Rule	Russia	1917	only	-	Jul	 1	23:00	1:00	MST  # Moscow Summer Time
++#
++# Decree No. 142 (1917-12-22) http://istmat.info/node/28137
+ Rule	Russia	1917	only	-	Dec	28	 0:00	0	MMT  # Moscow Mean Time
++#
++# Decree No. 497 (1918-05-30) http://istmat.info/node/30001
+ Rule	Russia	1918	only	-	May	31	22:00	2:00	MDST # Moscow Double Summer Time
+ Rule	Russia	1918	only	-	Sep	16	 1:00	1:00	MST
++#
++# Decree No. 258 (1919-05-29) http://istmat.info/node/37949
+ Rule	Russia	1919	only	-	May	31	23:00	2:00	MDST
+-Rule	Russia	1919	only	-	Jul	 1	 2:00	1:00	MSD
++#
++Rule	Russia	1919	only	-	Jul	 1	 0:00u	1:00	MSD
+ Rule	Russia	1919	only	-	Aug	16	 0:00	0	MSK
++#
++# Decree No. 63 (1921-02-03) http://istmat.info/node/45840
+ Rule	Russia	1921	only	-	Feb	14	23:00	1:00	MSD
+-Rule	Russia	1921	only	-	Mar	20	23:00	2:00	MSM  # Midsummer
++#
++# Decree No. 121 (1921-03-07) http://istmat.info/node/45949
++Rule	Russia	1921	only	-	Mar	20	23:00	2:00	+05
++#
+ Rule	Russia	1921	only	-	Sep	 1	 0:00	1:00	MSD
+ Rule	Russia	1921	only	-	Oct	 1	 0:00	0	-
+ # Act No. 925 of the Council of Ministers of the USSR (1980-10-24):
+@@ -600,16 +616,40 @@ Rule	Russia	1981	1984	-	Apr	 1	 0:00	1:00	S
+ Rule	Russia	1981	1983	-	Oct	 1	 0:00	0	-
+ # Act No. 967 of the Council of Ministers of the USSR (1984-09-13), repeated in
+ # Act No. 227 of the Council of Ministers of the USSR (1989-03-14):
+-Rule	Russia	1984	1991	-	Sep	lastSun	 2:00s	0	-
+-Rule	Russia	1985	1991	-	Mar	lastSun	 2:00s	1:00	S
++Rule	Russia	1984	1995	-	Sep	lastSun	 2:00s	0	-
++Rule	Russia	1985	2010	-	Mar	lastSun	 2:00s	1:00	S
+ #
+-Rule	Russia	1992	only	-	Mar	lastSat	 23:00	1:00	S
+-Rule	Russia	1992	only	-	Sep	lastSat	 23:00	0	-
+-Rule	Russia	1993	2010	-	Mar	lastSun	 2:00s	1:00	S
+-Rule	Russia	1993	1995	-	Sep	lastSun	 2:00s	0	-
+ Rule	Russia	1996	2010	-	Oct	lastSun	 2:00s	0	-
+ # As described below, Russia's 2014 change affects Zone data, not Rule data.
+ 
++# From Stepan Golosunov (2016-03-07):
++# Wikipedia and other sources refer to the Act of the Council of
++# Ministers of the USSR from 1988-01-04 No. 5 and the Act of the
++# Council of Ministers of the USSR from 1989-03-14 No. 227.
++#
++# I did not find full texts of these acts.  For the 1989 one we have
++# title at http://base.garant.ru/70754136/ :
++# "About change in calculation of time on the territories of
++# Lithuanian SSR, Latvian SSR and Estonian SSR, Astrakhan,
++# Kaliningrad, Kirov, Kuybyshev, Ulyanovsk and Uralsk oblasts".
++# And http://astrozet.net/files/Zones/DOC/RU/1980-925.txt appears to
++# contain quotes from both acts: Since last Sunday of March 1988 rules
++# of the second time belt are installed in Volgograd and Saratov
++# oblasts.  Since last Sunday of March 1989:
++# a) Lithuanian SSR, Latvian SSR, Estonian SSR, Kaliningrad oblast:
++# second time belt rules without extra hour (Moscow-1);
++# b) Astrakhan, Kirov, Kuybyshev, Ulyanovsk oblasts: second time belt
++# rules (Moscow time)
++# c) Uralsk oblast: third time belt rules (Moscow+1).
++
++# From Stepan Golosunov (2016-03-27):
++# Unamended version of the act of the
++# Government of the Russian Federation No. 23 from 08.01.1992
++# http://pravo.gov.ru/proxy/ips/?docbody=&nd=102014034&rdk=0
++# says that every year clocks were to be moved forward on last Sunday
++# of March at 2 hours and moved backwards on last Sunday of September
++# at 3 hours.  It was amended in 1996 to replace September with October.
++
+ # From Alexander Krivenyshev (2011-06-14):
+ # According to Kremlin press service, Russian President Dmitry Medvedev
+ # signed a federal law "On calculation of time" on June 9, 2011.
+@@ -731,6 +771,14 @@ Zone	Europe/Vienna	1:05:21 -	LMT	1893 Apr
+ 			1:00	EU	CE%sT
+ 
+ # Belarus
++#
++# From Stepan Golosunov (2016-07-02):
++# http://www.lawbelarus.com/repub/sub30/texf9611.htm
++# (Act of the Cabinet of Ministers of the Republic of Belarus from
++# 1992-03-25 No. 157) ... says clocks were to be moved forward at 2:00
++# on last Sunday of March and backward at 3:00 on last Sunday of September
++# (the same as previous USSR and contemporary Russian regulations).
++#
+ # From Yauhen Kharuzhy (2011-09-16):
+ # By latest Belarus government act Europe/Minsk timezone was changed to
+ # GMT+3 without DST (was GMT+2 with DST).
+@@ -743,8 +791,6 @@ Zone	Europe/Vienna	1:05:21 -	LMT	1893 Apr
+ # From Alexander Bokovoy (2014-10-09):
+ # Belarussian government decided against changing to winter time....
+ # http://eng.belta.by/all_news/society/Belarus-decides-against-adjusting-time-in-Russias-wake_i_76335.html
+-# From Paul Eggert (2014-10-08):
+-# Hence Belarus can share time zone abbreviations with Moscow again.
+ #
+ # Zone	NAME		GMTOFF	RULES	FORMAT	[UNTIL]
+ Zone	Europe/Minsk	1:50:16 -	LMT	1880
+@@ -754,12 +800,8 @@ Zone	Europe/Minsk	1:50:16 -	LMT	1880
+ 			1:00	C-Eur	CE%sT	1944 Jul  3
+ 			3:00	Russia	MSK/MSD	1990
+ 			3:00	-	MSK	1991 Mar 31  2:00s
+-			2:00	1:00	EEST	1991 Sep 29  2:00s
+-			2:00	-	EET	1992 Mar 29  0:00s
+-			2:00	1:00	EEST	1992 Sep 27  0:00s
+ 			2:00	Russia	EE%sT	2011 Mar 27  2:00s
+-			3:00	-	FET	2014 Oct 26  1:00s
+-			3:00	-	MSK
++			3:00	-	+03
+ 
+ # Belgium
+ #
+@@ -1005,6 +1047,12 @@ Zone Atlantic/Faroe	-0:27:04 -	LMT	1908 Jan 11 # T
+ # startkart.no says Thule does not observe DST, but this is clearly an error,
+ # so go with Shanks & Pottenger for Thule transitions until this year.
+ # For 2007 on assume Thule will stay in sync with US DST rules.
++
++# From J William Piggott (2016-02-20):
++# "Greenland north of the community of Scoresbysund" is officially named
++# "National Park" by Executive Order:
++# http://naalakkersuisut.gl/~/media/Nanoq/Files/Attached%20Files/Engelske-tekster/Legislation/Executive%20Order%20National%20Park.rtf
++# It is their only National Park.
+ #
+ # Rule	NAME	FROM	TO	TYPE	IN	ON	AT	SAVE	LETTER/S
+ Rule	Thule	1991	1992	-	Mar	lastSun	2:00	1:00	D
+@@ -1030,6 +1078,10 @@ Zone America/Thule	-4:35:08 -	LMT	1916 Jul 28 # Pi
+ 			-4:00	Thule	A%sT
+ 
+ # Estonia
++#
++# From Paul Eggert (2016-03-18):
++# The 1989 transition is from USSR act No. 227 (1989-03-14).
++#
+ # From Peter Ilieve (1994-10-15):
+ # A relative in Tallinn confirms the accuracy of the data for 1989 onwards
+ # [through 1994] and gives the legal authority for it,
+@@ -1257,7 +1309,7 @@ Zone	Europe/Paris	0:09:21 -	LMT	1891 Mar 15  0:01
+ # http://www.parlament-berlin.de/pds-fraktion.nsf/727459127c8b66ee8525662300459099/defc77cb784f180ac1256c2b0030274b/$FILE/bersarint.pdf
+ # says that Bersarin issued an order to use Moscow time on May 20.
+ # However, Moscow did not observe daylight saving in 1945, so
+-# this was equivalent to CEMT (GMT+3), not GMT+4.
++# this was equivalent to UT +03, not +04.
+ 
+ 
+ # Rule	NAME	FROM	TO	TYPE	IN	ON	AT	SAVE	LETTER/S
+@@ -1448,73 +1500,84 @@ Zone Atlantic/Reykjavik	-1:28	-	LMT	1908
+ # But these events all occurred before the 1970 cutoff,
+ # so record only the time in Rome.
+ #
+-# From Paul Eggert (2006-03-22):
+-# For Italian DST we have three sources: Shanks & Pottenger, Whitman, and
+-# F. Pollastri
+-# Day-light Saving Time in Italy (2006-02-03)
+-# http://toi.iriti.cnr.it/uk/ienitlt.html
+-# ('FP' below), taken from an Italian National Electrotechnical Institute
+-# publication. When the three sources disagree, guess who's right, as follows:
++# From Michael Deckers (2016-10-24):
++# http://www.ac-ilsestante.it/MERIDIANE/ora_legale quotes a law of 1893-08-10
++# ... [translated as] "The preceding dispositions will enter into
++# force at the instant at which, according to the time specified in
++# the 1st article, the 1st of November 1893 will begin...."
+ #
+-# year	FP	Shanks&P. (S)	Whitman (W)	Go with:
+-# 1916	06-03	06-03 24:00	06-03 00:00	FP & W
+-#	09-30	09-30 24:00	09-30 01:00	FP; guess 24:00s
+-# 1917	04-01	03-31 24:00	03-31 00:00	FP & S
+-#	09-30	09-29 24:00	09-30 01:00	FP & W
+-# 1918	03-09	03-09 24:00	03-09 00:00	FP & S
+-#	10-06	10-05 24:00	10-06 01:00	FP & W
+-# 1919	03-01	03-01 24:00	03-01 00:00	FP & S
+-#	10-04	10-04 24:00	10-04 01:00	FP; guess 24:00s
+-# 1920	03-20	03-20 24:00	03-20 00:00	FP & S
+-#	09-18	09-18 24:00	10-01 01:00	FP; guess 24:00s
+-# 1944	04-02	04-03 02:00			S (see C-Eur)
+-#	09-16	10-02 03:00			FP; guess 24:00s
+-# 1945	09-14	09-16 24:00			FP; guess 24:00s
+-# 1970	05-21	05-31 00:00			S
+-#	09-20	09-27 00:00			S
++# From Pierpaolo Bernardi (2016-10-20):
++# The authoritative source for time in Italy is the national metrological
++# institute, which has a summary page of historical DST data at
++# http://www.inrim.it/res/tf/ora_legale_i.shtml
++# (2016-10-24):
++# http://www.renzobaldini.it/le-ore-legali-in-italia/
++# has still different data for 1944.  It divides Italy in two, as
++# there were effectively two governments at the time, north of Gothic
++# Line German controlled territory, official government RSI, and south
++# of the Gothic Line, controlled by allied armies.
+ #
++# From Brian Inglis (2016-10-23):
++# Viceregal LEGISLATIVE DECREE. 14 September 1944, no. 219.
++# Restoration of Standard Time. (044U0219) (OJ 62 of 30.9.1944) ...
++# Given the R. law decreed on 1944-03-29, no. 92, by which standard time is
++# advanced to sixty minutes later starting at hour two on 1944-04-02; ...
++# Starting at hour three on the date 1944-09-17 standard time will be resumed.
++#
++# From Paul Eggert (2016-10-27):
++# Go with INRiM for DST rules, except as corrected by Inglis for 1944
++# for the Kingdom of Italy.  This is consistent with Renzo Baldini.
++# Model Rome's occupation by using using C-Eur rules from 1943-09-10
++# to 1944-06-04; although Rome was an open city during this period, it
++# was effectively controlled by Germany.
++#
+ # Rule	NAME	FROM	TO	TYPE	IN	ON	AT	SAVE	LETTER/S
+-Rule	Italy	1916	only	-	Jun	 3	0:00s	1:00	S
+-Rule	Italy	1916	only	-	Oct	 1	0:00s	0	-
+-Rule	Italy	1917	only	-	Apr	 1	0:00s	1:00	S
+-Rule	Italy	1917	only	-	Sep	30	0:00s	0	-
+-Rule	Italy	1918	only	-	Mar	10	0:00s	1:00	S
+-Rule	Italy	1918	1919	-	Oct	Sun>=1	0:00s	0	-
+-Rule	Italy	1919	only	-	Mar	 2	0:00s	1:00	S
+-Rule	Italy	1920	only	-	Mar	21	0:00s	1:00	S
+-Rule	Italy	1920	only	-	Sep	19	0:00s	0	-
+-Rule	Italy	1940	only	-	Jun	15	0:00s	1:00	S
+-Rule	Italy	1944	only	-	Sep	17	0:00s	0	-
+-Rule	Italy	1945	only	-	Apr	 2	2:00	1:00	S
+-Rule	Italy	1945	only	-	Sep	15	0:00s	0	-
+-Rule	Italy	1946	only	-	Mar	17	2:00s	1:00	S
+-Rule	Italy	1946	only	-	Oct	 6	2:00s	0	-
+-Rule	Italy	1947	only	-	Mar	16	0:00s	1:00	S
+-Rule	Italy	1947	only	-	Oct	 5	0:00s	0	-
+-Rule	Italy	1948	only	-	Feb	29	2:00s	1:00	S
+-Rule	Italy	1948	only	-	Oct	 3	2:00s	0	-
+-Rule	Italy	1966	1968	-	May	Sun>=22	0:00	1:00	S
+-Rule	Italy	1966	1969	-	Sep	Sun>=22	0:00	0	-
+-Rule	Italy	1969	only	-	Jun	 1	0:00	1:00	S
+-Rule	Italy	1970	only	-	May	31	0:00	1:00	S
+-Rule	Italy	1970	only	-	Sep	lastSun	0:00	0	-
+-Rule	Italy	1971	1972	-	May	Sun>=22	0:00	1:00	S
+-Rule	Italy	1971	only	-	Sep	lastSun	1:00	0	-
+-Rule	Italy	1972	only	-	Oct	 1	0:00	0	-
+-Rule	Italy	1973	only	-	Jun	 3	0:00	1:00	S
+-Rule	Italy	1973	1974	-	Sep	lastSun	0:00	0	-
+-Rule	Italy	1974	only	-	May	26	0:00	1:00	S
+-Rule	Italy	1975	only	-	Jun	 1	0:00s	1:00	S
+-Rule	Italy	1975	1977	-	Sep	lastSun	0:00s	0	-
+-Rule	Italy	1976	only	-	May	30	0:00s	1:00	S
+-Rule	Italy	1977	1979	-	May	Sun>=22	0:00s	1:00	S
+-Rule	Italy	1978	only	-	Oct	 1	0:00s	0	-
+-Rule	Italy	1979	only	-	Sep	30	0:00s	0	-
++Rule	Italy	1916	only	-	Jun	 3	24:00	1:00	S
++Rule	Italy	1916	1917	-	Sep	30	24:00	0	-
++Rule	Italy	1917	only	-	Mar	31	24:00	1:00	S
++Rule	Italy	1918	only	-	Mar	 9	24:00	1:00	S
++Rule	Italy	1918	only	-	Oct	 6	24:00	0	-
++Rule	Italy	1919	only	-	Mar	 1	24:00	1:00	S
++Rule	Italy	1919	only	-	Oct	 4	24:00	0	-
++Rule	Italy	1920	only	-	Mar	20	24:00	1:00	S
++Rule	Italy	1920	only	-	Sep	18	24:00	0	-
++Rule	Italy	1940	only	-	Jun	14	24:00	1:00	S
++Rule	Italy	1942	only	-	Nov	 2	 2:00s	0	-
++Rule	Italy	1943	only	-	Mar	29	 2:00s	1:00	S
++Rule	Italy	1943	only	-	Oct	 4	 2:00s	0	-
++Rule	Italy	1944	only	-	Apr	 2	 2:00s	1:00	S
++Rule	Italy	1944	only	-	Sep	17	 2:00s	0	-
++Rule	Italy	1945	only	-	Apr	 2	 2:00	1:00	S
++Rule	Italy	1945	only	-	Sep	15	 1:00	0	-
++Rule	Italy	1946	only	-	Mar	17	 2:00s	1:00	S
++Rule	Italy	1946	only	-	Oct	 6	 2:00s	0	-
++Rule	Italy	1947	only	-	Mar	16	 0:00s	1:00	S
++Rule	Italy	1947	only	-	Oct	 5	 0:00s	0	-
++Rule	Italy	1948	only	-	Feb	29	 2:00s	1:00	S
++Rule	Italy	1948	only	-	Oct	 3	 2:00s	0	-
++Rule	Italy	1966	1968	-	May	Sun>=22	 0:00s	1:00	S
++Rule	Italy	1966	only	-	Sep	24	24:00	0	-
++Rule	Italy	1967	1969	-	Sep	Sun>=22	 0:00s	0	-
++Rule	Italy	1969	only	-	Jun	 1	 0:00s	1:00	S
++Rule	Italy	1970	only	-	May	31	 0:00s	1:00	S
++Rule	Italy	1970	only	-	Sep	lastSun	 0:00s	0	-
++Rule	Italy	1971	1972	-	May	Sun>=22	 0:00s	1:00	S
++Rule	Italy	1971	only	-	Sep	lastSun	 0:00s	0	-
++Rule	Italy	1972	only	-	Oct	 1	 0:00s	0	-
++Rule	Italy	1973	only	-	Jun	 3	 0:00s	1:00	S
++Rule	Italy	1973	1974	-	Sep	lastSun	 0:00s	0	-
++Rule	Italy	1974	only	-	May	26	 0:00s	1:00	S
++Rule	Italy	1975	only	-	Jun	 1	 0:00s	1:00	S
++Rule	Italy	1975	1977	-	Sep	lastSun	 0:00s	0	-
++Rule	Italy	1976	only	-	May	30	 0:00s	1:00	S
++Rule	Italy	1977	1979	-	May	Sun>=22	 0:00s	1:00	S
++Rule	Italy	1978	only	-	Oct	 1	 0:00s	0	-
++Rule	Italy	1979	only	-	Sep	30	 0:00s	0	-
+ # Zone	NAME		GMTOFF	RULES	FORMAT	[UNTIL]
+ Zone	Europe/Rome	0:49:56 -	LMT	1866 Sep 22
+-			0:49:56	-	RMT	1893 Nov  1  0:00s # Rome Mean
+-			1:00	Italy	CE%sT	1942 Nov  2  2:00s
+-			1:00	C-Eur	CE%sT	1944 Jul
++			0:49:56	-	RMT	1893 Oct 31 23:49:56 # Rome Mean
++			1:00	Italy	CE%sT	1943 Sep 10
++			1:00	C-Eur	CE%sT	1944 Jun  4
+ 			1:00	Italy	CE%sT	1980
+ 			1:00	EU	CE%sT
+ 
+@@ -1623,6 +1686,9 @@ Link Europe/Zurich Europe/Vaduz
+ 
+ # Lithuania
+ 
++# From Paul Eggert (2016-03-18):
++# The 1989 transition is from USSR act No. 227 (1989-03-14).
++
+ # From Paul Eggert (1996-11-22):
+ # IATA SSIM (1992/1996) says Lithuania uses W-Eur rules, but since it is
+ # known to be wrong about Estonia and Latvia, assume it's wrong here too.
+@@ -1662,8 +1728,8 @@ Zone	Europe/Vilnius	1:41:16	-	LMT	1880
+ 			1:00	-	CET	1940 Aug  3
+ 			3:00	-	MSK	1941 Jun 24
+ 			1:00	C-Eur	CE%sT	1944 Aug
+-			3:00	Russia	MSK/MSD	1991 Mar 31  2:00s
+-			2:00	1:00	EEST	1991 Sep 29  2:00s
++			3:00	Russia	MSK/MSD	1989 Mar 26  2:00s
++			2:00	Russia	EE%sT	1991 Sep 29  2:00s
+ 			2:00	C-Eur	EE%sT	1998
+ 			2:00	-	EET	1998 Mar 29  1:00u
+ 			1:00	EU	CE%sT	1999 Oct 31  1:00u
+@@ -1710,6 +1776,10 @@ Zone Europe/Luxembourg	0:24:36 -	LMT	1904 Jun
+ # See Europe/Belgrade.
+ 
+ # Malta
++#
++# From Paul Eggert (2016-10-21):
++# Assume 1900-1972 was like Rome, overriding Shanks.
++#
+ # Rule	NAME	FROM	TO	TYPE	IN	ON	AT	SAVE	LETTER/S
+ Rule	Malta	1973	only	-	Mar	31	0:00s	1:00	S
+ Rule	Malta	1973	only	-	Sep	29	0:00s	0	-
+@@ -1720,8 +1790,6 @@ Rule	Malta	1975	1980	-	Sep	Sun>=15	2:00	0	-
+ Rule	Malta	1980	only	-	Mar	31	2:00	1:00	S
+ # Zone	NAME		GMTOFF	RULES	FORMAT	[UNTIL]
+ Zone	Europe/Malta	0:58:04 -	LMT	1893 Nov  2  0:00s # Valletta
+-			1:00	Italy	CE%sT	1942 Nov  2  2:00s
+-			1:00	C-Eur	CE%sT	1945 Apr  2  2:00s
+ 			1:00	Italy	CE%sT	1973 Mar 31
+ 			1:00	Malta	CE%sT	1981
+ 			1:00	EU	CE%sT
+@@ -1728,6 +1796,16 @@ Zone	Europe/Malta	0:58:04 -	LMT	1893 Nov  2  0:00s
+ 
+ # Moldova
+ 
++# From Stepan Golosunov (2016-03-07):
++# the act of the government of the Republic of Moldova Nr. 132 from 1990-05-04
++# http://lex.justice.md/viewdoc.php?action=view&view=doc&id=298782&lang=2
++# ... says that since 1990-05-06 on the territory of the Moldavian SSR
++# time would be calculated as the standard time of the second time belt
++# plus one hour of the "summer" time. To implement that clocks would be
++# adjusted one hour backwards at 1990-05-06 2:00. After that "summer"
++# time would be cancelled last Sunday of September at 3:00 and
++# reintroduced last Sunday of March at 2:00.
++
+ # From Paul Eggert (2006-03-22):
+ # A previous version of this database followed Shanks & Pottenger, who write
+ # that Tiraspol switched to Moscow time on 1992-01-19 at 02:00.
+@@ -1786,9 +1864,7 @@ Zone	Europe/Chisinau	1:55:20 -	LMT	1880
+ 			2:00	Romania	EE%sT	1940 Aug 15
+ 			2:00	1:00	EEST	1941 Jul 17
+ 			1:00	C-Eur	CE%sT	1944 Aug 24
+-			3:00	Russia	MSK/MSD	1990
+-			3:00	-	MSK	1990 May 6
+-			2:00	-	EET	1991
++			3:00	Russia	MSK/MSD	1990 May  6  2:00
+ 			2:00	Russia	EE%sT	1992
+ 			2:00	E-Eur	EE%sT	1997
+ # See Romania commentary for the guessed 1997 transition to EU rules.
+@@ -1845,7 +1921,7 @@ Zone	Europe/Monaco	0:29:32 -	LMT	1891 Mar 15
+ # Amsterdam mean time.
+ 
+ # The data entries before 1945 are taken from
+-# http://www.phys.uu.nl/~vgent/wettijd/wettijd.htm
++# http://www.staff.science.uu.nl/~gent0113/wettijd/wettijd.htm
+ 
+ # Rule	NAME	FROM	TO	TYPE	IN	ON	AT	SAVE	LETTER/S
+ Rule	Neth	1916	only	-	May	 1	0:00	1:00	NST	# Netherlands Summer Time
+@@ -2210,7 +2286,6 @@ Zone Europe/Bucharest	1:44:24 -	LMT	1891 Oct
+ # http://www.worldtimezone.com/dst_news/dst_news_russia-map-2014-07.html
+ 
+ # From Paul Eggert (2006-03-22):
+-# Except for Moscow after 1919-07-01, I invented the time zone abbreviations.
+ # Moscow time zone abbreviations after 1919-07-01, and Moscow rules after 1991,
+ # are from Andrey A. Chernov.  The rest is from Shanks & Pottenger,
+ # except we follow Chernov's report that 1992 DST transitions were Sat
+@@ -2266,16 +2341,32 @@ Zone Europe/Bucharest	1:44:24 -	LMT	1891 Oct
+ # Europe/Kaliningrad covers...
+ # 39	RU-KGD	Kaliningrad Oblast
+ 
++# From Paul Eggert (2016-03-18):
++# The 1989 transition is from USSR act No. 227 (1989-03-14).
++
++# From Stepan Golosunov (2016-03-07):
++# http://www.rgo.ru/ru/kaliningradskoe-oblastnoe-otdelenie/ob-otdelenii/publikacii/kak-nam-zhilos-bez-letnego-vremeni
++# confirms that the 1989 change to Moscow-1 was implemented.
++# (The article, though, is misattributed to 1990 while saying that
++# summer->winter transition would be done on the 24 of September. But
++# 1990-09-24 was Monday, while 1989-09-24 was Sunday as expected.)
++# ...
++# http://www.kaliningradka.ru/site_pc/cherez/index.php?ELEMENT_ID=40091
++# says that Kaliningrad switched to Moscow-1 on 1989-03-26, avoided
++# at the last moment switch to Moscow-1 on 1991-03-31, switched to
++# Moscow on 1991-11-03, switched to Moscow-1 on 1992-01-19.
++
+ Zone Europe/Kaliningrad	 1:22:00 -	LMT	1893 Apr
+ 			 1:00	C-Eur	CE%sT	1945
+ 			 2:00	Poland	CE%sT	1946
+-			 3:00	Russia	MSK/MSD	1991 Mar 31  2:00s
++			 3:00	Russia	MSK/MSD	1989 Mar 26  2:00s
+ 			 2:00	Russia	EE%sT	2011 Mar 27  2:00s
+-			 3:00	-	FET	2014 Oct 26  2:00s
++			 3:00	-	+03	2014 Oct 26  2:00s
+ 			 2:00	-	EET
+ 
+ 
+-# From Tim Parenti (2014-07-03), per Oscar van Vlijmen (2001-08-25):
++# From Paul Eggert (2016-02-21), per Tim Parenti (2014-07-03) and
++# Oscar van Vlijmen (2001-08-25):
+ # Europe/Moscow covers...
+ # 01	RU-AD	Adygea, Republic of
+ # 05	RU-DA	Dagestan, Republic of
+@@ -2318,12 +2409,102 @@ Zone Europe/Kaliningrad	 1:22:00 -	LMT	1893 Apr
+ # 68	RU-TAM	Tambov Oblast
+ # 69	RU-TVE	Tver Oblast
+ # 71	RU-TUL	Tula Oblast
+-# 73	RU-ULY	Ulyanovsk Oblast
+ # 76	RU-YAR	Yaroslavl Oblast
+ # 77	RU-MOW	Moscow
+ # 78	RU-SPE	Saint Petersburg
+ # 83	RU-NEN	Nenets Autonomous Okrug
+ 
++# From Paul Eggert (2016-08-23):
++# The Soviets switched to UT-based time in 1919.  Decree No. 59
++# (1919-02-08) http://istmat.info/node/35567 established UT-based time
++# zones, and Decree No. 147 (1919-03-29) http://istmat.info/node/35854
++# specified a transition date of 1919-07-01, apparently at 00:00 UT.
++# No doubt only the Soviet-controlled regions switched on that date;
++# later transitions to UT-based time in other parts of Russia are
++# taken from what appear to be guesses by Shanks.
++# (Thanks to Alexander Belopolsky for pointers to the decrees.)
++
++# From Stepan Golosunov (2016-03-07):
++# 11. Regions-violators, 1981-1982.
++# Wikipedia refers to
++# http://maps.monetonos.ru/maps/raznoe/Old_Maps/Old_Maps/Articles/022/3_1981.html
++# http://besp.narod.ru/nauka_1981_3.htm
++#
++# The second link provides two articles scanned from the Nauka i Zhizn
++# magazine No. 3, 1981 and a scan of the short article attributed to
++# the Trud newspaper from February 1982.  The first link provides the
++# same Nauka i Zhizn articles converted to the text form (but misses
++# time belt changes map).
++#
++# The second Nauka i Zhizn article says that in addition to
++# introduction of summer time on 1981-04-01 there are some time belt
++# border changes on 1981-10-01, mostly affecting Nenets Autonomous
++# Okrug, Krasnoyarsk Krai, Yakutia, Magadan Oblast and Chukotka
++# according to the provided map (colored one).  In addition to that
++# "time violators" (regions which were not using rules of the time
++# belts in which they were located) would not be moving off the DST on
++# 1981-10-01 to restore the decree time usage.  (Komi ASSR was
++# supposed to repeat that move in October 1982 to account for the 2
++# hour difference.)  Map depicting "time violators" before 1981-10-01
++# is also provided.
++#
++# The article from Trud says that 1981-10-01 changes caused problems
++# and some territories would be moved to pre-1981-10-01 time by not
++# moving to summer time on 1982-04-01.  Namely: Dagestan,
++# Kabardino-Balkar, Kalmyk, Komi, Mari, Mordovian, North Ossetian,
++# Tatar, Chechen-Ingush and Chuvash ASSR, Krasnodar and Stavropol
++# krais, Arkhangelsk, Vladimir, Vologda, Voronezh, Gorky, Ivanovo,
++# Kostroma, Lipetsk, Penza, Rostov, Ryazan, Tambov, Tyumen and
++# Yaroslavl oblasts, Nenets and Evenk autonomous okrugs, Khatangsky
++# district of Taymyr Autonomous Okrug.  As a result Evenk Autonomous
++# Okrug and Khatangsky district of Taymyr Autonomous Okrug would end
++# up on Moscow+4, Tyumen Oblast on Moscow+2 and the rest on Moscow
++# time.
++#
++# http://astrozet.net/files/Zones/DOC/RU/1980-925.txt
++# attributes the 1982 changes to the Act of the Council of Ministers
++# of the USSR No. 126 from 18.02.1982.  1980-925.txt also adds
++# Udmurtia to the list of affected territories and lists Khatangsky
++# district separately from Taymyr Autonomous Okrug.  Probably erroneously.
++#
++# The affected territories are currently listed under Europe/Moscow,
++# Asia/Yekaterinburg and Asia/Krasnoyarsk.
++#
++# 12. Udmurtia
++# The fact that Udmurtia is depicted as a violator in the Nauka i
++# Zhizn article hints at Izhevsk being on different time from
++# Kuybyshev before 1981-10-01. Udmurtia is not mentioned in the 1989 act.
++# http://astrozet.net/files/Zones/DOC/RU/1980-925.txt
++# implies Udmurtia was on Moscow time after 1982-04-01.
++# Wikipedia implies Udmurtia being on Moscow+1 until 1991.
++#
++# ...
++#
++# All Russian zones are supposed to have by default a -1 change at
++# 1991-03-31 2:00 (cancellation of the decree time in the USSR) and a +1
++# change at 1992-01-19 2:00 (restoration of the decree time in Russia).
++#
++# There were some exceptions, though.
++# Wikipedia says newspapers listed Astrakhan, Saratov, Kirov, Volgograd,
++# Izhevsk, Grozny, Kazan and Samara as such exceptions for the 1992
++# change. (Different newspapers providing different lists. And some
++# lists found in the internet are quite wild.)
++#
++# And apparently some exceptions were reverted in the last moment.
++# http://www.kaliningradka.ru/site_pc/cherez/index.php?ELEMENT_ID=40091
++# says that Kaliningrad decided not to be an exception 2 days before the
++# 1991-03-31 switch and one person at
++# http://izhevsk.ru/forum_light_message/50/682597-m8369040.html
++# says he remembers that Samara opted out of the 1992-01-19 exception
++# 2 days before the switch.
++#
++#
++# From Paul Eggert (2016-03-18):
++# Given the above, we appear to be missing some Zone entries for the
++# chaotic early 1980s in Russia.  It's not clear what these entries
++# should be.  For now, sweep this under the rug and just document the
++# time in Moscow.
++
+ # From Vladimir Karpinsky (2014-07-08):
+ # LMT in Moscow (before Jul 3, 1916) is 2:30:17, that was defined by Moscow
+ # Observatory (coordinates: 55 deg. 45'29.70", 37 deg. 34'05.30")....
+@@ -2344,7 +2525,7 @@ Zone Europe/Kaliningrad	 1:22:00 -	LMT	1893 Apr
+ 
+ Zone Europe/Moscow	 2:30:17 -	LMT	1880
+ 			 2:30:17 -	MMT	1916 Jul  3 # Moscow Mean Time
+-			 2:31:19 Russia	%s	1919 Jul  1  2:00
++			 2:31:19 Russia	%s	1919 Jul  1  0:00u
+ 			 3:00	Russia	%s	1921 Oct
+ 			 3:00	Russia	MSK/MSD	1922 Oct
+ 			 2:00	-	EET	1930 Jun 21
+@@ -2397,28 +2578,58 @@ Zone Europe/Simferopol	 2:16:24 -	LMT	1880
+ 			 3:00	-	MSK
+ 
+ 
+-# From Tim Parenti (2014-07-03):
+-# Europe/Volgograd covers...
++# From Paul Eggert (2016-03-18):
++# Europe/Astrakhan covers:
+ # 30	RU-AST	Astrakhan Oblast
++#
++# The 1989 transition is from USSR act No. 227 (1989-03-14).
++
++# From Alexander Krivenyshev (2016-01-12):
++# On February 10, 2016 Astrakhan Oblast got approval by the Federation
++# Council to change its time zone to UTC+4 (from current UTC+3 Moscow time)....
++# This Federal Law shall enter into force on 27 March 2016 at 02:00.
++# From Matt Johnson (2016-03-09):
++# http://publication.pravo.gov.ru/Document/View/0001201602150056
++
++Zone Europe/Astrakhan	 3:12:12 -	LMT	1924 May
++			 3:00	-	+03	1930 Jun 21
++			 4:00	Russia	+04/+05	1989 Mar 26  2:00s
++			 3:00	Russia	+03/+04	1991 Mar 31  2:00s
++			 4:00	-	+04	1992 Mar 29  2:00s
++			 3:00	Russia	+03/+04	2011 Mar 27  2:00s
++			 4:00	-	+04	2014 Oct 26  2:00s
++			 3:00	-	+03	2016 Mar 27  2:00s
++			 4:00	-	+04
++
++# From Paul Eggert (2016-03-18):
++# Europe/Volgograd covers:
+ # 34	RU-VGG	Volgograd Oblast
+-# 43	RU-KIR	Kirov Oblast
+ # 64	RU-SAR	Saratov Oblast
++# The 1988 transition is from USSR act No. 5 (1988-01-04).
+ 
+-# From Paul Eggert (2006-05-09):
+-# Shanks & Pottenger say Kirov is still at +0400 but Wikipedia says +0300.
+-# Perhaps it switched after the others?  But we have no data.
+-
+ Zone Europe/Volgograd	 2:57:40 -	LMT	1920 Jan  3
+-			 3:00	-	TSAT	1925 Apr  6 # Tsaritsyn Time
+-			 3:00	-	STAT	1930 Jun 21 # Stalingrad Time
+-			 4:00	-	STAT	1961 Nov 11
+-			 4:00	Russia	VOL%sT	1989 Mar 26  2:00s # Volgograd T
+-			 3:00	Russia	VOL%sT	1991 Mar 31  2:00s
+-			 4:00	-	VOLT	1992 Mar 29  2:00s
+-			 3:00	Russia	MSK/MSD	2011 Mar 27  2:00s
+-			 4:00	-	MSK	2014 Oct 26  2:00s
+-			 3:00	-	MSK
++			 3:00	-	+03	1930 Jun 21
++			 4:00	-	+04	1961 Nov 11
++			 4:00	Russia	+04/+05	1988 Mar 27  2:00s
++			 3:00	Russia	+03/+04	1991 Mar 31  2:00s
++			 4:00	-	+04	1992 Mar 29  2:00s
++			 3:00	Russia	+03/+04	2011 Mar 27  2:00s
++			 4:00	-	+04	2014 Oct 26  2:00s
++			 3:00	-	+03
+ 
++# From Paul Eggert (2016-03-18):
++# Europe/Kirov covers:
++# 43	RU-KIR	Kirov Oblast
++# The 1989 transition is from USSR act No. 227 (1989-03-14).
++#
++Zone Europe/Kirov	 3:18:48 -	LMT	1919 Jul  1  0:00u
++			 3:00	-	+03	1930 Jun 21
++			 4:00	Russia	+04/+05	1989 Mar 26  2:00s
++			 3:00	Russia	+03/+04	1991 Mar 31  2:00s
++			 4:00	-	+04	1992 Mar 29  2:00s
++			 3:00	Russia	+03/+04	2011 Mar 27  2:00s
++			 4:00	-	+04	2014 Oct 26  2:00s
++			 3:00	-	+03
+ 
+ # From Tim Parenti (2014-07-03), per Oscar van Vlijmen (2001-08-25):
+ # Europe/Samara covers...
+@@ -2425,20 +2636,44 @@ Zone Europe/Volgograd	 2:57:40 -	LMT	1920 Jan  3
+ # 18	RU-UD	Udmurt Republic
+ # 63	RU-SAM	Samara Oblast
+ 
++# From Paul Eggert (2016-03-18):
+ # Byalokoz 1919 says Samara was 3:20:20.
++# The 1989 transition is from USSR act No. 227 (1989-03-14).
+ 
+-Zone Europe/Samara	 3:20:20 -	LMT	1919 Jul  1  2:00
+-			 3:00	-	SAMT	1930 Jun 21
+-			 4:00	-	SAMT	1935 Jan 27
+-			 4:00	Russia	KUY%sT	1989 Mar 26  2:00s # Kuybyshev
+-			 3:00	Russia	MSK/MSD	1991 Mar 31  2:00s
+-			 2:00	Russia	EE%sT	1991 Sep 29  2:00s
+-			 3:00	-	KUYT	1991 Oct 20  3:00
+-			 4:00	Russia	SAM%sT	2010 Mar 28  2:00s # Samara Time
+-			 3:00	Russia	SAM%sT	2011 Mar 27  2:00s
+-			 4:00	-	SAMT
++Zone Europe/Samara	 3:20:20 -	LMT	1919 Jul  1  0:00u
++			 3:00	-	+03	1930 Jun 21
++			 4:00	-	+04	1935 Jan 27
++			 4:00	Russia	+04/+05	1989 Mar 26  2:00s
++			 3:00	Russia	+03/+04	1991 Mar 31  2:00s
++			 2:00	Russia	+02/+03	1991 Sep 29  2:00s
++			 3:00	-	+03	1991 Oct 20  3:00
++			 4:00	Russia	+04/+05	2010 Mar 28  2:00s
++			 3:00	Russia	+03/+04	2011 Mar 27  2:00s
++			 4:00	-	+04
+ 
++# From Paul Eggert (2016-03-18):
++# Europe/Ulyanovsk covers:
++# 73	RU-ULY	Ulyanovsk Oblast
+ 
++# The 1989 transition is from USSR act No. 227 (1989-03-14).
++
++# From Alexander Krivenyshev (2016-02-17):
++# Ulyanovsk ... on their way to change time zones by March 27, 2016 at 2am.
++# Ulyanovsk Oblast ... from MSK to MSK+1 (UTC+3 to UTC+4) ...
++# 920582-6 ... 02/17/2016 The State Duma passed the bill in the first reading.
++# From Matt Johnson (2016-03-09):
++# http://publication.pravo.gov.ru/Document/View/0001201603090051
++
++Zone Europe/Ulyanovsk	 3:13:36 -	LMT	1919 Jul  1  0:00u
++			 3:00	-	+03	1930 Jun 21
++			 4:00	Russia	+04/+05	1989 Mar 26  2:00s
++			 3:00	Russia	+03/+04	1991 Mar 31  2:00s
++			 2:00	Russia	+02/+03	1992 Jan 19  2:00s
++			 3:00	Russia	+03/+04	2011 Mar 27  2:00s
++			 4:00	-	+04	2014 Oct 26  2:00s
++			 3:00	-	+03	2016 Mar 27  2:00s
++			 4:00	-	+04
++
+ # From Tim Parenti (2014-07-03), per Oscar van Vlijmen (2001-08-25):
+ # Asia/Yekaterinburg covers...
+ # 02	RU-BA	Bashkortostan, Republic of
+@@ -2461,49 +2696,142 @@ Zone Europe/Volgograd	 2:57:40 -	LMT	1920 Jan  3
+ 
+ Zone Asia/Yekaterinburg	 4:02:33 -	LMT	1916 Jul  3
+ 			 3:45:05 -	PMT	1919 Jul 15  4:00
+-			 4:00	-	SVET	1930 Jun 21 # Sverdlovsk Time
+-			 5:00	Russia	SVE%sT	1991 Mar 31  2:00s
+-			 4:00	Russia	SVE%sT	1992 Jan 19  2:00s
+-			 5:00	Russia	YEK%sT	2011 Mar 27  2:00s
+-			 6:00	-	YEKT	2014 Oct 26  2:00s
+-			 5:00	-	YEKT
++			 4:00	-	+04	1930 Jun 21
++			 5:00	Russia	+05/+06	1991 Mar 31  2:00s
++			 4:00	Russia	+04/+05	1992 Jan 19  2:00s
++			 5:00	Russia	+05/+06	2011 Mar 27  2:00s
++			 6:00	-	+06	2014 Oct 26  2:00s
++			 5:00	-	+05
+ 
+ 
+ # From Tim Parenti (2014-07-03), per Oscar van Vlijmen (2001-08-25):
+ # Asia/Omsk covers...
+-# 04	RU-AL	Altai Republic
+-# 22	RU-ALT	Altai Krai
+ # 55	RU-OMS	Omsk Oblast
+ 
+ # Byalokoz 1919 says Omsk was 4:53:30.
+ 
+ Zone Asia/Omsk		 4:53:30 -	LMT	1919 Nov 14
+-			 5:00	-	OMST	1930 Jun 21 # Omsk Time
+-			 6:00	Russia	OMS%sT	1991 Mar 31  2:00s
+-			 5:00	Russia	OMS%sT	1992 Jan 19  2:00s
+-			 6:00	Russia	OMS%sT	2011 Mar 27  2:00s
+-			 7:00	-	OMST	2014 Oct 26  2:00s
+-			 6:00	-	OMST
++			 5:00	-	+05	1930 Jun 21
++			 6:00	Russia	+06/+07	1991 Mar 31  2:00s
++			 5:00	Russia	+05/+06	1992 Jan 19  2:00s
++			 6:00	Russia	+06/+07	2011 Mar 27  2:00s
++			 7:00	-	+07	2014 Oct 26  2:00s
++			 6:00	-	+06
+ 
++# From Paul Eggert (2016-02-22):
++# Asia/Barnaul covers:
++# 04	RU-AL	Altai Republic
++# 22	RU-ALT	Altai Krai
+ 
+-# From Tim Parenti (2014-07-03):
+-# Asia/Novosibirsk covers...
++# Data before 1991 are from Shanks & Pottenger.
++
++# From Stepan Golosunov (2016-03-07):
++# Letter of Bank of Russia from 1995-05-25
++# http://www.bestpravo.ru/rossijskoje/lj-akty/y3a.htm
++# suggests that Altai Republic transitioned to Moscow+3 on
++# 1995-05-28.
++#
++# http://regnum.ru/news/society/1957270.html
++# has some historical data for Altai Krai:
++# before 1957: west part on UTC+6, east on UTC+7
++# after 1957: UTC+7
++# since 1995: UTC+6
++# http://barnaul.rusplt.ru/index/pochemu_altajskij_kraj_okazalsja_v_neprivychnom_chasovom_pojase-17648.html
++# confirms that and provides more details including 1995-05-28 transition date.
++
++# From Alexander Krivenyshev (2016-02-17):
++# Altai Krai and Altai Republic on their way to change time zones
++# by March 27, 2016 at 2am....
++# Altai Republic / Gorno-Altaysk MSK+3 to MSK+4 (UTC+6 to UTC+7) ...
++# Altai Krai / Barnaul MSK+3 to MSK+4 (UTC+6 to UTC+7)
++# From Matt Johnson (2016-03-09):
++# http://publication.pravo.gov.ru/Document/View/0001201603090043
++# http://publication.pravo.gov.ru/Document/View/0001201603090038
++
++Zone Asia/Barnaul	 5:35:00 -	LMT	1919 Dec 10
++			 6:00	-	+06	1930 Jun 21
++			 7:00	Russia	+07/+08	1991 Mar 31  2:00s
++			 6:00	Russia	+06/+07	1992 Jan 19  2:00s
++			 7:00	Russia	+07/+08	1995 May 28
++			 6:00	Russia	+06/+07	2011 Mar 27  2:00s
++			 7:00	-	+07	2014 Oct 26  2:00s
++			 6:00	-	+06	2016 Mar 27  2:00s
++			 7:00	-	+07
++
++# From Paul Eggert (2016-03-18):
++# Asia/Novosibirsk covers:
+ # 54	RU-NVS	Novosibirsk Oblast
+-# 70	RU-TOM	Tomsk Oblast
+ 
+-# From Paul Eggert (2006-08-19): I'm guessing about Tomsk here; it's
+-# not clear when it switched from +7 to +6.
++# From Stepan Golosunov (2016-05-30):
++# http://asozd2.duma.gov.ru/main.nsf/(Spravka)?OpenAgent&RN=1085784-6
++# moves Novosibirsk oblast from UTC+6 to UTC+7.
++# From Stepan Golosunov (2016-07-04):
++# The law was signed yesterday and published today on
++# http://publication.pravo.gov.ru/Document/View/0001201607040064
+ 
+ Zone Asia/Novosibirsk	 5:31:40 -	LMT	1919 Dec 14  6:00
+-			 6:00	-	NOVT	1930 Jun 21 # Novosibirsk Time
+-			 7:00	Russia	NOV%sT	1991 Mar 31  2:00s
+-			 6:00	Russia	NOV%sT	1992 Jan 19  2:00s
+-			 7:00	Russia	NOV%sT	1993 May 23 # say Shanks & P.
+-			 6:00	Russia	NOV%sT	2011 Mar 27  2:00s
+-			 7:00	-	NOVT	2014 Oct 26  2:00s
+-			 6:00	-	NOVT
++			 6:00	-	+06	1930 Jun 21
++			 7:00	Russia	+07/+08	1991 Mar 31  2:00s
++			 6:00	Russia	+06/+07	1992 Jan 19  2:00s
++			 7:00	Russia	+07/+08	1993 May 23 # say Shanks & P.
++			 6:00	Russia	+06/+07	2011 Mar 27  2:00s
++			 7:00	-	+07	2014 Oct 26  2:00s
++			 6:00	-	+06	2016 Jul 24  2:00s
++			 7:00	-	+07
+ 
++# From Paul Eggert (2016-03-18):
++# Asia/Tomsk covers:
++# 70	RU-TOM	Tomsk Oblast
+ 
++# From Stepan Golosunov (2016-03-24):
++# Byalokoz listed Tomsk at 5:39:51.
++
++# From Stanislaw A. Kuzikowski (1994-06-29):
++# Tomsk is still 4 hours ahead of Moscow.
++
++# From Stepan Golosunov (2016-03-19):
++# http://pravo.gov.ru/proxy/ips/?docbody=&nd=102075743
++# (fifth time belt being UTC+5+1(decree time)
++# / UTC+5+1(decree time)+1(summer time)) ...
++# Note that time belts (numbered from 2 (Moscow) to 12 according to their
++# GMT/UTC offset and having too many exceptions like regions formally
++# belonging to one belt but using time from another) were replaced
++# with time zones in 2011 with different numbering (there was a
++# 2-hour gap between second and third zones in 2011-2014).
++
++# From Stepan Golosunov (2016-04-12):
++# http://asozd2.duma.gov.ru/main.nsf/(SpravkaNew)?OpenAgent&RN=1006865-6
++# This bill was approved in the first reading today.  It moves Tomsk oblast
++# from UTC+6 to UTC+7 and is supposed to come into effect on 2016-05-29 at
++# 2:00.  The bill needs to be approved in the second and the third readings by
++# the State Duma, approved by the Federation Council, signed by the President
++# and published to become a law.  Minor changes in the text are to be expected
++# before the second reading (references need to be updated to account for the
++# recent changes).
++#
++# Judging by the ultra-short one-day amendments period, recent similar laws,
++# the State Duma schedule and the Federation Council schedule
++# http://www.duma.gov.ru/legislative/planning/day-shedule/por_vesna_2016/
++# http://council.gov.ru/activity/meetings/schedule/63303
++# I speculate that the final text of the bill will be proposed tomorrow, the
++# bill will be approved in the second and the third readings on Friday,
++# approved by the Federation Council on 2016-04-20, signed by the President and
++# published as a law around 2016-04-26.
++
++# From Matt Johnson (2016-04-26):
++# http://publication.pravo.gov.ru/Document/View/0001201604260048
++
++Zone	Asia/Tomsk	 5:39:51 -	LMT	1919 Dec 22
++			 6:00	-	+06	1930 Jun 21
++			 7:00	Russia	+07/+08	1991 Mar 31  2:00s
++			 6:00	Russia	+06/+07	1992 Jan 19  2:00s
++			 7:00	Russia	+07/+08	2002 May  1  3:00
++			 6:00	Russia	+06/+07	2011 Mar 27  2:00s
++			 7:00	-	+07	2014 Oct 26  2:00s
++			 6:00	-	+06	2016 May 29  2:00s
++			 7:00	-	+07
++
++
+ # From Tim Parenti (2014-07-03):
+ # Asia/Novokuznetsk covers...
+ # 42	RU-KEM	Kemerovo Oblast
+@@ -2526,9 +2854,6 @@ Zone Asia/Novosibirsk	 5:31:40 -	LMT	1919 Dec 14
+ #
+ # Thus, when Russia will switch to DST on the night of March 28, 2010
+ # Kemerovo region (Kemerovo oblast') will not change the clock.
+-#
+-# As a result, Kemerovo oblast' will be in the same time zone as
+-# Novosibirsk, Omsk, Tomsk, Barnaul and Altai Republic.
+ 
+ # From Tim Parenti (2014-07-02), per Alexander Krivenyshev (2014-07-02):
+ # The Kemerovo region will remain at UTC+7 through the 2014-10-26 change, thus
+@@ -2535,15 +2860,13 @@ Zone Asia/Novosibirsk	 5:31:40 -	LMT	1919 Dec 14
+ # realigning itself with KRAT.
+ 
+ Zone Asia/Novokuznetsk	 5:48:48 -	LMT	1924 May  1
+-			 6:00	-	KRAT	1930 Jun 21 # Krasnoyarsk Time
+-			 7:00	Russia	KRA%sT	1991 Mar 31  2:00s
+-			 6:00	Russia	KRA%sT	1992 Jan 19  2:00s
+-			 7:00	Russia	KRA%sT	2010 Mar 28  2:00s
+-			 6:00	Russia	NOV%sT	2011 Mar 27  2:00s # Novosibirsk
+-			 7:00	-	NOVT	2014 Oct 26  2:00s
+-			 7:00	-	KRAT	# Krasnoyarsk Time
++			 6:00	-	+06	1930 Jun 21
++			 7:00	Russia	+07/+08	1991 Mar 31  2:00s
++			 6:00	Russia	+06/+07	1992 Jan 19  2:00s
++			 7:00	Russia	+07/+08	2010 Mar 28  2:00s
++			 6:00	Russia	+06/+07	2011 Mar 27  2:00s
++			 7:00	-	+07
+ 
+-
+ # From Tim Parenti (2014-07-03), per Oscar van Vlijmen (2001-08-25):
+ # Asia/Krasnoyarsk covers...
+ # 17	RU-TY	Tuva Republic
+@@ -2556,12 +2879,12 @@ Zone Asia/Novokuznetsk	 5:48:48 -	LMT	1924 May  1
+ # Byalokoz 1919 says Krasnoyarsk was 6:11:26.
+ 
+ Zone Asia/Krasnoyarsk	 6:11:26 -	LMT	1920 Jan  6
+-			 6:00	-	KRAT	1930 Jun 21 # Krasnoyarsk Time
+-			 7:00	Russia	KRA%sT	1991 Mar 31  2:00s
+-			 6:00	Russia	KRA%sT	1992 Jan 19  2:00s
+-			 7:00	Russia	KRA%sT	2011 Mar 27  2:00s
+-			 8:00	-	KRAT	2014 Oct 26  2:00s
+-			 7:00	-	KRAT
++			 6:00	-	+06	1930 Jun 21
++			 7:00	Russia	+07/+08	1991 Mar 31  2:00s
++			 6:00	Russia	+06/+07	1992 Jan 19  2:00s
++			 7:00	Russia	+07/+08	2011 Mar 27  2:00s
++			 8:00	-	+08	2014 Oct 26  2:00s
++			 7:00	-	+07
+ 
+ 
+ # From Tim Parenti (2014-07-03), per Oscar van Vlijmen (2001-08-25):
+@@ -2578,12 +2901,12 @@ Zone Asia/Krasnoyarsk	 6:11:26 -	LMT	1920 Jan  6
+ 
+ Zone Asia/Irkutsk	 6:57:05 -	LMT	1880
+ 			 6:57:05 -	IMT	1920 Jan 25 # Irkutsk Mean Time
+-			 7:00	-	IRKT	1930 Jun 21 # Irkutsk Time
+-			 8:00	Russia	IRK%sT	1991 Mar 31  2:00s
+-			 7:00	Russia	IRK%sT	1992 Jan 19  2:00s
+-			 8:00	Russia	IRK%sT	2011 Mar 27  2:00s
+-			 9:00	-	IRKT	2014 Oct 26  2:00s
+-			 8:00	-	IRKT
++			 7:00	-	+07	1930 Jun 21
++			 8:00	Russia	+08/+09	1991 Mar 31  2:00s
++			 7:00	Russia	+07/+08	1992 Jan 19  2:00s
++			 8:00	Russia	+08/+09	2011 Mar 27  2:00s
++			 9:00	-	+09	2014 Oct 26  2:00s
++			 8:00	-	+08
+ 
+ 
+ # From Tim Parenti (2014-07-06):
+@@ -2593,13 +2916,20 @@ Zone Asia/Irkutsk	 6:57:05 -	LMT	1880
+ # Note: Effective 2008-03-01, (75) Chita Oblast and (80) Agin-Buryat
+ # Autonomous Okrug merged to form (92, RU-ZAB) Zabaykalsky Krai.
+ 
++# From Alexander Krivenyshev (2016-01-02):
++# [The] time zone in the Trans-Baikal Territory (Zabaykalsky Krai) -
++# Asia/Chita [is changing] from UTC+8 to UTC+9.  Effective date will
++# be March 27, 2016 at 2:00am....
++# http://publication.pravo.gov.ru/Document/View/0001201512300107
++
+ Zone Asia/Chita	 7:33:52 -	LMT	1919 Dec 15
+-			 8:00	-	YAKT	1930 Jun 21 # Yakutsk Time
+-			 9:00	Russia	YAK%sT	1991 Mar 31  2:00s
+-			 8:00	Russia	YAK%sT	1992 Jan 19  2:00s
+-			 9:00	Russia	YAK%sT	2011 Mar 27  2:00s
+-			10:00	-	YAKT	2014 Oct 26  2:00s
+-			 8:00	-	IRKT
++			 8:00	-	+08	1930 Jun 21
++			 9:00	Russia	+09/+10	1991 Mar 31  2:00s
++			 8:00	Russia	+08/+09	1992 Jan 19  2:00s
++			 9:00	Russia	+09/+10	2011 Mar 27  2:00s
++			10:00	-	+10	2014 Oct 26  2:00s
++			 8:00	-	+08	2016 Mar 27  2:00
++			 9:00	-	+09
+ 
+ 
+ # From Tim Parenti (2014-07-03), per Oscar van Vlijmen (2009-11-29):
+@@ -2639,12 +2969,12 @@ Zone Asia/Chita	 7:33:52 -	LMT	1919 Dec 15
+ # Byalokoz 1919 says Yakutsk was 8:38:58.
+ 
+ Zone Asia/Yakutsk	 8:38:58 -	LMT	1919 Dec 15
+-			 8:00	-	YAKT	1930 Jun 21 # Yakutsk Time
+-			 9:00	Russia	YAK%sT	1991 Mar 31  2:00s
+-			 8:00	Russia	YAK%sT	1992 Jan 19  2:00s
+-			 9:00	Russia	YAK%sT	2011 Mar 27  2:00s
+-			10:00	-	YAKT	2014 Oct 26  2:00s
+-			 9:00	-	YAKT
++			 8:00	-	+08	1930 Jun 21
++			 9:00	Russia	+09/+10	1991 Mar 31  2:00s
++			 8:00	Russia	+08/+09	1992 Jan 19  2:00s
++			 9:00	Russia	+09/+10	2011 Mar 27  2:00s
++			10:00	-	+10	2014 Oct 26  2:00s
++			 9:00	-	+09
+ 
+ 
+ # From Tim Parenti (2014-07-03), per Oscar van Vlijmen (2009-11-29):
+@@ -2662,12 +2992,12 @@ Zone Asia/Yakutsk	 8:38:58 -	LMT	1919 Dec 15
+ # Go with Byalokoz.
+ 
+ Zone Asia/Vladivostok	 8:47:31 -	LMT	1922 Nov 15
+-			 9:00	-	VLAT	1930 Jun 21 # Vladivostok Time
+-			10:00	Russia	VLA%sT	1991 Mar 31  2:00s
+-			 9:00	Russia	VLA%sT	1992 Jan 19  2:00s
+-			10:00	Russia	VLA%sT	2011 Mar 27  2:00s
+-			11:00	-	VLAT	2014 Oct 26  2:00s
+-			10:00	-	VLAT
++			 9:00	-	+09	1930 Jun 21
++			10:00	Russia	+10/+11	1991 Mar 31  2:00s
++			 9:00	Russia	+09/+10	1992 Jan 19  2:00s
++			10:00	Russia	+10/+11	2011 Mar 27  2:00s
++			11:00	-	+11	2014 Oct 26  2:00s
++			10:00	-	+10
+ 
+ 
+ # From Tim Parenti (2014-07-03):
+@@ -2685,14 +3015,14 @@ Zone Asia/Vladivostok	 8:47:31 -	LMT	1922 Nov 15
+ # This transition is no doubt wrong, but we have no better info.
+ 
+ Zone Asia/Khandyga	 9:02:13 -	LMT	1919 Dec 15
+-			 8:00	-	YAKT	1930 Jun 21 # Yakutsk Time
+-			 9:00	Russia	YAK%sT	1991 Mar 31  2:00s
+-			 8:00	Russia	YAK%sT	1992 Jan 19  2:00s
+-			 9:00	Russia	YAK%sT	2004
+-			10:00	Russia	VLA%sT	2011 Mar 27  2:00s
+-			11:00	-	VLAT	2011 Sep 13  0:00s # Decree 725?
+-			10:00	-	YAKT	2014 Oct 26  2:00s
+-			 9:00	-	YAKT
++			 8:00	-	+08	1930 Jun 21
++			 9:00	Russia	+09/+10	1991 Mar 31  2:00s
++			 8:00	Russia	+08/+09	1992 Jan 19  2:00s
++			 9:00	Russia	+09/+10	2004
++			10:00	Russia	+10/+11	2011 Mar 27  2:00s
++			11:00	-	+11	2011 Sep 13  0:00s # Decree 725?
++			10:00	-	+10	2014 Oct 26  2:00s
++			 9:00	-	+09
+ 
+ 
+ # From Tim Parenti (2014-07-03):
+@@ -2701,16 +3031,21 @@ Zone Asia/Khandyga	 9:02:13 -	LMT	1919 Dec 15
+ # ...with the exception of:
+ # 65-11	****	Severo-Kurilsky District (North Kuril Islands)
+ 
++# From Matt Johnson (2016-02-22):
++# Asia/Sakhalin is moving (in entirety) from UTC+10 to UTC+11 ...
++# (2016-03-09):
++# http://publication.pravo.gov.ru/Document/View/0001201603090044
++
+ # The Zone name should be Asia/Yuzhno-Sakhalinsk, but that's too long.
+ Zone Asia/Sakhalin	 9:30:48 -	LMT	1905 Aug 23
+-			 9:00	-	JCST	1937 Oct  1
+-			 9:00	-	JST	1945 Aug 25
+-			11:00	Russia	SAK%sT	1991 Mar 31  2:00s # Sakhalin T
+-			10:00	Russia	SAK%sT	1992 Jan 19  2:00s
+-			11:00	Russia	SAK%sT	1997 Mar lastSun  2:00s
+-			10:00	Russia	SAK%sT	2011 Mar 27  2:00s
+-			11:00	-	SAKT	2014 Oct 26  2:00s
+-			10:00	-	SAKT
++			 9:00	-	+09	1945 Aug 25
++			11:00	Russia	+11/+12	1991 Mar 31  2:00s # Sakhalin T
++			10:00	Russia	+10/+11	1992 Jan 19  2:00s
++			11:00	Russia	+11/+12	1997 Mar lastSun  2:00s
++			10:00	Russia	+10/+11	2011 Mar 27  2:00s
++			11:00	-	+11	2014 Oct 26  2:00s
++			10:00	-	+10	2016 Mar 27  2:00s
++			11:00	-	+11
+ 
+ 
+ # From Tim Parenti (2014-07-03), per Oscar van Vlijmen (2009-11-29):
+@@ -2724,13 +3059,22 @@ Zone Asia/Sakhalin	 9:30:48 -	LMT	1905 Aug 23
+ # until now by Asia/Magadan, will instead move to UTC+11.  These regions will
+ # need their own zone.
+ 
++# From Alexander Krivenyshev (2016-03-27):
++# ... draft bill 948300-6 to change its time zone from UTC+10 to UTC+11 ...
++# will take ... effect ... on April 24, 2016 at 2 o'clock
++#
++# From Matt Johnson (2016-04-05):
++# ... signed by the President today ...
++# http://publication.pravo.gov.ru/Document/View/0001201604050038
++
+ Zone Asia/Magadan	10:03:12 -	LMT	1924 May  2
+-			10:00	-	MAGT	1930 Jun 21 # Magadan Time
+-			11:00	Russia	MAG%sT	1991 Mar 31  2:00s
+-			10:00	Russia	MAG%sT	1992 Jan 19  2:00s
+-			11:00	Russia	MAG%sT	2011 Mar 27  2:00s
+-			12:00	-	MAGT	2014 Oct 26  2:00s
+-			10:00	-	MAGT
++			10:00	-	+10	1930 Jun 21 # Magadan Time
++			11:00	Russia	+11/+12	1991 Mar 31  2:00s
++			10:00	Russia	+10/+11	1992 Jan 19  2:00s
++			11:00	Russia	+11/+12	2011 Mar 27  2:00s
++			12:00	-	+12	2014 Oct 26  2:00s
++			10:00	-	+10	2016 Apr 24  2:00s
++			11:00	-	+11
+ 
+ 
+ # From Tim Parenti (2014-07-06):
+@@ -2773,17 +3117,14 @@ Zone Asia/Magadan	10:03:12 -	LMT	1924 May  2
+ # in Russian.)  In addition, Srednekolymsk appears to be a much older
+ # settlement and the population of Zyryanka seems to be declining.
+ # Go with Srednekolymsk.
+-#
+-# Since Magadan Oblast moves to UTC+10 on 2014-10-26, we cannot keep using MAGT
+-# as the abbreviation.  Use SRET instead.
+ 
+ Zone Asia/Srednekolymsk	10:14:52 -	LMT	1924 May  2
+-			10:00	-	MAGT	1930 Jun 21 # Magadan Time
+-			11:00	Russia	MAG%sT	1991 Mar 31  2:00s
+-			10:00	Russia	MAG%sT	1992 Jan 19  2:00s
+-			11:00	Russia	MAG%sT	2011 Mar 27  2:00s
+-			12:00	-	MAGT	2014 Oct 26  2:00s
+-			11:00	-	SRET	# Srednekolymsk Time
++			10:00	-	+10	1930 Jun 21
++			11:00	Russia	+11/+12	1991 Mar 31  2:00s
++			10:00	Russia	+10/+11	1992 Jan 19  2:00s
++			11:00	Russia	+11/+12	2011 Mar 27  2:00s
++			12:00	-	+12	2014 Oct 26  2:00s
++			11:00	-	+11
+ 
+ 
+ # From Tim Parenti (2014-07-03):
+@@ -2801,14 +3142,14 @@ Zone Asia/Srednekolymsk	10:14:52 -	LMT	1924 May  2
+ # UTC+12 since at least then, too.
+ 
+ Zone Asia/Ust-Nera	 9:32:54 -	LMT	1919 Dec 15
+-			 8:00	-	YAKT	1930 Jun 21 # Yakutsk Time
+-			 9:00	Russia	YAKT	1981 Apr  1
+-			11:00	Russia	MAG%sT	1991 Mar 31  2:00s
+-			10:00	Russia	MAG%sT	1992 Jan 19  2:00s
+-			11:00	Russia	MAG%sT	2011 Mar 27  2:00s
+-			12:00	-	MAGT	2011 Sep 13  0:00s # Decree 725?
+-			11:00	-	VLAT	2014 Oct 26  2:00s
+-			10:00	-	VLAT
++			 8:00	-	+08	1930 Jun 21
++			 9:00	Russia	+09/+10	1981 Apr  1
++			11:00	Russia	+11/+12	1991 Mar 31  2:00s
++			10:00	Russia	+10/+11	1992 Jan 19  2:00s
++			11:00	Russia	+11/+12	2011 Mar 27  2:00s
++			12:00	-	+12	2011 Sep 13  0:00s # Decree 725?
++			11:00	-	+11	2014 Oct 26  2:00s
++			10:00	-	+10
+ 
+ 
+ # From Tim Parenti (2014-07-03), per Oscar van Vlijmen (2001-08-25):
+@@ -2821,12 +3162,12 @@ Zone Asia/Ust-Nera	 9:32:54 -	LMT	1919 Dec 15
+ # The Zone name should be Asia/Petropavlovsk-Kamchatski or perhaps
+ # Asia/Petropavlovsk-Kamchatsky, but these are too long.
+ Zone Asia/Kamchatka	10:34:36 -	LMT	1922 Nov 10
+-			11:00	-	PETT	1930 Jun 21 # P-K Time
+-			12:00	Russia	PET%sT	1991 Mar 31  2:00s
+-			11:00	Russia	PET%sT	1992 Jan 19  2:00s
+-			12:00	Russia	PET%sT	2010 Mar 28  2:00s
+-			11:00	Russia	PET%sT	2011 Mar 27  2:00s
+-			12:00	-	PETT
++			11:00	-	+11	1930 Jun 21
++			12:00	Russia	+12/+13	1991 Mar 31  2:00s
++			11:00	Russia	+11/+12	1992 Jan 19  2:00s
++			12:00	Russia	+12/+13	2010 Mar 28  2:00s
++			11:00	Russia	+11/+12	2011 Mar 27  2:00s
++			12:00	-	+12
+ 
+ 
+ # From Tim Parenti (2014-07-03):
+@@ -2834,13 +3175,13 @@ Zone Asia/Kamchatka	10:34:36 -	LMT	1922 Nov 10
+ # 87	RU-CHU	Chukotka Autonomous Okrug
+ 
+ Zone Asia/Anadyr	11:49:56 -	LMT	1924 May  2
+-			12:00	-	ANAT	1930 Jun 21 # Anadyr Time
+-			13:00	Russia	ANA%sT	1982 Apr  1  0:00s
+-			12:00	Russia	ANA%sT	1991 Mar 31  2:00s
+-			11:00	Russia	ANA%sT	1992 Jan 19  2:00s
+-			12:00	Russia	ANA%sT	2010 Mar 28  2:00s
+-			11:00	Russia	ANA%sT	2011 Mar 27  2:00s
+-			12:00	-	ANAT
++			12:00	-	+12	1930 Jun 21
++			13:00	Russia	+13/+14	1982 Apr  1  0:00s
++			12:00	Russia	+12/+13	1991 Mar 31  2:00s
++			11:00	Russia	+11/+12	1992 Jan 19  2:00s
++			12:00	Russia	+12/+13	2010 Mar 28  2:00s
++			11:00	Russia	+11/+12	2011 Mar 27  2:00s
++			12:00	-	+12
+ 
+ 
+ # San Marino
+@@ -3099,22 +3440,24 @@ Zone	Europe/Zurich	0:34:08 -	LMT	1853 Jul 16 # See
+ 
+ # Turkey
+ 
+-# From Amar Devegowda (2007-01-03):
+-# The time zone rules for Istanbul, Turkey have not been changed for years now.
+-# ... The latest rules are available at:
+-# http://www.timeanddate.com/worldclock/timezone.html?n=107
+-# From Steffen Thorsen (2007-01-03):
+-# I have been able to find press records back to 1996 which all say that
+-# DST started 01:00 local time and end at 02:00 local time.  I am not sure
+-# what happened before that.  One example for each year from 1996 to 2001:
+-# http://newspot.byegm.gov.tr/arsiv/1996/21/N4.htm
+-# http://www.byegm.gov.tr/YAYINLARIMIZ/CHR/ING97/03/97X03X25.TXT
+-# http://www.byegm.gov.tr/YAYINLARIMIZ/CHR/ING98/03/98X03X02.HTM
+-# http://www.byegm.gov.tr/YAYINLARIMIZ/CHR/ING99/10/99X10X26.HTM#%2016
+-# http://www.byegm.gov.tr/YAYINLARIMIZ/CHR/ING2000/03/00X03X06.HTM#%2021
+-# http://www.byegm.gov.tr/YAYINLARIMIZ/CHR/ING2001/03/23x03x01.HTM#%2027
+-# From Paul Eggert (2007-01-03):
+-# Prefer the above source to Shanks & Pottenger for time stamps after 1990.
++# From Kıvanç Yazan (2016-09-25):
++# 1) For 1986-2006, DST started at 01:00 local and ended at 02:00 local, with
++#    no exceptions.
++# 2) 1994's lastSun was overridden with Mar 20 ...
++# Here are official papers:
++# http://www.resmigazete.gov.tr/arsiv/19032.pdf  - page 2 for 1986
++# http://www.resmigazete.gov.tr/arsiv/19400.pdf  - page 4 for 1987
++# http://www.resmigazete.gov.tr/arsiv/19752.pdf  - page 15 for 1988
++# http://www.resmigazete.gov.tr/arsiv/20102.pdf  - page 6 for 1989
++# http://www.resmigazete.gov.tr/arsiv/20464.pdf  - page 1 for 1990 - 1992
++# http://www.resmigazete.gov.tr/arsiv/21531.pdf  - page 15 for 1993 - 1995
++# http://www.resmigazete.gov.tr/arsiv/21879.pdf  - page 1 for overriding 1994
++# http://www.resmigazete.gov.tr/arsiv/22588.pdf  - page 1 for 1996, 1997
++# http://www.resmigazete.gov.tr/arsiv/23286.pdf  - page 10 for 1998 - 2000
++# http://www.resmigazete.gov.tr/eskiler/2001/03/20010324.htm#2  - for 2001
++# http://www.resmigazete.gov.tr/eskiler/2002/03/20020316.htm#2  - for 2002-2006
++# From Paul Eggert (2016-09-25):
++# Prefer the above sources to Shanks & Pottenger for time stamps after 1985.
+ 
+ # From Steffen Thorsen (2007-03-09):
+ # Starting 2007 though, it seems that they are adopting EU's 1:00 UTC
+@@ -3154,7 +3497,21 @@ Zone	Europe/Zurich	0:34:08 -	LMT	1853 Jul 16 # See
+ # It's officially announced now by the Ministry of Energy.
+ # Turkey delays winter time to 8th of November 04:00
+ # http://www.aa.com.tr/tr/turkiye/yaz-saati-uygulamasi-8-kasimda-sona-erecek/362217
++#
++# From BBC News (2015-10-25):
++# Confused Turks are asking "what's the time?" after automatic clocks defied a
++# government decision ... "For the next two weeks #Turkey is on EEST... Erdogan
++# Engineered Standard Time," said Twitter user @aysekarahasan.
++# http://www.bbc.com/news/world-europe-34631326
+ 
++# From Burak AYDIN (2016-09-08):
++# Turkey will stay in Daylight Saving Time even in winter....
++# http://www.resmigazete.gov.tr/eskiler/2016/09/20160908-2.pdf
++#
++# From Paul Eggert (2016-09-07):
++# The change is permanent, so this is the new standard time in Turkey.
++# It takes effect today, which is not much notice.
++
+ # Rule	NAME	FROM	TO	TYPE	IN	ON	AT	SAVE	LETTER/S
+ Rule	Turkey	1916	only	-	May	 1	0:00	1:00	S
+ Rule	Turkey	1916	only	-	Oct	 1	0:00	0	-
+@@ -3209,16 +3566,16 @@ Rule	Turkey	1983	only	-	Jul	31	0:00	1:00	S
+ Rule	Turkey	1983	only	-	Oct	 2	0:00	0	-
+ Rule	Turkey	1985	only	-	Apr	20	0:00	1:00	S
+ Rule	Turkey	1985	only	-	Sep	28	0:00	0	-
+-Rule	Turkey	1986	1990	-	Mar	lastSun	2:00s	1:00	S
+-Rule	Turkey	1986	1990	-	Sep	lastSun	2:00s	0	-
+-Rule	Turkey	1991	2006	-	Mar	lastSun	1:00s	1:00	S
+-Rule	Turkey	1991	1995	-	Sep	lastSun	1:00s	0	-
++Rule	Turkey	1986	1993	-	Mar	lastSun	1:00s	1:00	S
++Rule	Turkey	1986	1995	-	Sep	lastSun	1:00s	0	-
++Rule	Turkey	1994	only	-	Mar	20	1:00s	1:00	S
++Rule	Turkey	1995	2006	-	Mar	lastSun	1:00s	1:00	S
+ Rule	Turkey	1996	2006	-	Oct	lastSun	1:00s	0	-
+ # Zone	NAME		GMTOFF	RULES	FORMAT	[UNTIL]
+ Zone	Europe/Istanbul	1:55:52 -	LMT	1880
+ 			1:56:56	-	IMT	1910 Oct # Istanbul Mean Time?
+ 			2:00	Turkey	EE%sT	1978 Oct 15
+-			3:00	Turkey	TR%sT	1985 Apr 20 # Turkey Time
++			3:00	Turkey	+03/+04	1985 Apr 20
+ 			2:00	Turkey	EE%sT	2007
+ 			2:00	EU	EE%sT	2011 Mar 27  1:00u
+ 			2:00	-	EET	2011 Mar 28  1:00u
+@@ -3226,7 +3583,8 @@ Zone	Europe/Istanbul	1:55:52 -	LMT	1880
+ 			2:00	-	EET	2014 Mar 31  1:00u
+ 			2:00	EU	EE%sT	2015 Oct 25  1:00u
+ 			2:00	1:00	EEST	2015 Nov  8  1:00u
+-			2:00	EU	EE%sT
++			2:00	EU	EE%sT	2016 Sep  7
++			3:00	-	+03
+ Link	Europe/Istanbul	Asia/Istanbul	# Istanbul is in both continents.
+ 
+ # Ukraine
+Index: contrib/tzdata/factory
+===================================================================
+--- contrib/tzdata/factory	(revision 309576)
++++ contrib/tzdata/factory	(working copy)
+@@ -1,9 +1,10 @@
+ # This file is in the public domain, so clarified as of
+ # 2009-05-17 by Arthur David Olson.
+ 
+-# For companies who don't want to put time zone specification in
+-# their installation procedures.  When users run date, they'll get the message.
+-# Also useful for the "comp.sources" version.
++# For distributors who don't want to put time zone specification in
++# their installation procedures.  Users that run 'date' will get the
++# time zone abbreviation "-00", indicating that the actual time zone
++# is unknown.
+ 
+ # Zone	NAME	GMTOFF	RULES	FORMAT
+ Zone	Factory	0	- "Local time zone must be set--use tzsetup"
+Index: contrib/tzdata/leap-seconds.list
+===================================================================
+--- contrib/tzdata/leap-seconds.list	(revision 309576)
++++ contrib/tzdata/leap-seconds.list	(working copy)
+@@ -143,7 +143,7 @@
+ #		Boulder, Colorado
+ #		Judah.Levine@nist.gov
+ #
+-#	Last Update of leap second values:   5 January 2015
++#	Last Update of leap second values:   8 July 2016
+ #
+ #	The following line shows this last update date in NTP timestamp
+ #	format. This is the date on which the most recent change to
+@@ -151,7 +151,7 @@
+ #	be identified by the unique pair of characters in the first two
+ #	columns as shown below.
+ #
+-#$	 3629404800
++#$	 3676924800
+ #
+ #	The NTP timestamps are in units of seconds since the NTP epoch,
+ #	which is 1 January 1900, 00:00:00. The Modified Julian Day number
+@@ -199,10 +199,10 @@
+ #	current -- the update time stamp, the data and the name of the file
+ #	will not change.
+ #
+-#	Updated through IERS Bulletin C50
+-#	File expires on:  28 June 2016
++#	Updated through IERS Bulletin C52
++#	File expires on:  28 June 2017
+ #
+-#@	3676060800
++#@	3707596800
+ #
+ 2272060800	10	# 1 Jan 1972
+ 2287785600	11	# 1 Jul 1972
+@@ -231,6 +231,7 @@
+ 3439756800	34	# 1 Jan 2009
+ 3550089600	35	# 1 Jul 2012
+ 3644697600	36	# 1 Jul 2015
++3692217600	37	# 1 Jan 2017
+ #
+ #	the following special comment contains the
+ #	hash value of the data in this file computed
+@@ -246,4 +247,4 @@
+ #	the hash line is also ignored in the
+ #	computation.
+ #
+-#h	3d037453 3acade76 570bd8f8 be2b8bc9 55ec6fe8
++#h	dacf2c42 2c4765d6 3c797af8 2cf630eb 699c8c67
+Index: contrib/tzdata/leapseconds
+===================================================================
+--- contrib/tzdata/leapseconds	(revision 309576)
++++ contrib/tzdata/leapseconds	(working copy)
+@@ -6,6 +6,7 @@
+ # leap-seconds.list file available from most NIST time servers.
+ # If the URL <ftp://time.nist.gov/pub/leap-seconds.list> does not work,
+ # you should be able to pick up leap-seconds.list from a secondary NIST server.
++# See <http://tf.nist.gov/tf-cgi/servers.cgi> for a list of secondary servers.
+ # For more about leap-seconds.list, please see
+ # The NTP Timescale and Leap Seconds
+ # http://www.eecis.udel.edu/~mills/leap.html
+@@ -55,6 +56,7 @@ Leap	2005	Dec	31	23:59:60	+	S
+ Leap	2008	Dec	31	23:59:60	+	S
+ Leap	2012	Jun	30	23:59:60	+	S
+ Leap	2015	Jun	30	23:59:60	+	S
++Leap	2016	Dec	31	23:59:60	+	S
+ 
+-#	Updated through IERS Bulletin C50
+-#	File expires on:  28 June 2016
++#	Updated through IERS Bulletin C52
++#	File expires on:  28 June 2017
+Index: contrib/tzdata/leapseconds.awk
+===================================================================
+--- contrib/tzdata/leapseconds.awk	(nonexistent)
++++ contrib/tzdata/leapseconds.awk	(working copy)
+@@ -0,0 +1,76 @@
++# Generate the 'leapseconds' file from 'leap-seconds.list'.
++
++# This file is in the public domain.
++
++BEGIN {
++  print "# Allowance for leap seconds added to each time zone file."
++  print ""
++  print "# This file is in the public domain."
++  print ""
++  print "# This file is generated automatically from the data in the public-domain"
++  print "# leap-seconds.list file available from most NIST time servers."
++  print "# If the URL <ftp://time.nist.gov/pub/leap-seconds.list> does not work,"
++  print "# you should be able to pick up leap-seconds.list from a secondary NIST server."
++  print "# See <http://tf.nist.gov/tf-cgi/servers.cgi> for a list of secondary servers."
++  print "# For more about leap-seconds.list, please see"
++  print "# The NTP Timescale and Leap Seconds"
++  print "# http://www.eecis.udel.edu/~mills/leap.html"
++  print ""
++  print "# The International Earth Rotation and Reference Systems Service"
++  print "# periodically uses leap seconds to keep UTC to within 0.9 s of UT1"
++  print "# (which measures the true angular orientation of the earth in space); see"
++  print "# Terry J Quinn, The BIPM and the accurate measure of time,"
++  print "# Proc IEEE 79, 7 (July 1991), 894-905 <http://dx.doi.org/10.1109/5.84965>."
++  print "# There were no leap seconds before 1972, because the official mechanism"
++  print "# accounting for the discrepancy between atomic time and the earth's rotation"
++  print "# did not exist until the early 1970s."
++  print ""
++  print "# The correction (+ or -) is made at the given time, so lines"
++  print "# will typically look like:"
++  print "#	Leap	YEAR	MON	DAY	23:59:60	+	R/S"
++  print "# or"
++  print "#	Leap	YEAR	MON	DAY	23:59:59	-	R/S"
++  print ""
++  print "# If the leapsecond is Rolling (R) the given time is local time."
++  print "# If the leapsecond is Stationary (S) the given time is UTC."
++  print ""
++  print "# Leap	YEAR	MONTH	DAY	HH:MM:SS	CORR	R/S"
++}
++
++/^ *$/ { next }
++
++/^#\tUpdated through/ || /^#\tFile expires on:/ {
++    last_lines = last_lines $0 "\n"
++}
++
++/^#/ { next }
++
++{
++    NTP_timestamp = $1
++    TAI_minus_UTC = $2
++    hash_mark = $3
++    one = $4
++    month = $5
++    year = $6
++    if (old_TAI_minus_UTC) {
++	if (old_TAI_minus_UTC < TAI_minus_UTC) {
++	    sign = "23:59:60\t+"
++	} else {
++	    sign = "23:59:59\t-"
++	}
++	if (month == "Jan") {
++	    year--;
++	    month = "Dec";
++	    day = 31
++	} else if (month == "Jul") {
++	    month = "Jun";
++	    day = 30
++	}
++	printf "Leap\t%s\t%s\t%s\t%s\tS\n", year, month, day, sign
++    }
++    old_TAI_minus_UTC = TAI_minus_UTC
++}
++
++END {
++    printf "\n%s", last_lines
++}
+Index: contrib/tzdata/northamerica
+===================================================================
+--- contrib/tzdata/northamerica	(revision 309576)
++++ contrib/tzdata/northamerica	(working copy)
+@@ -24,9 +24,33 @@
+ # was the result of his proposals at the Convention of Railroad Trunk Lines
+ # in New York City (1869-10).  His 1870 proposal was based on Washington, DC,
+ # but in 1872-05 he moved the proposed origin to Greenwich.
+-# His proposal was adopted by the railroads on 1883-11-18 at 12:00,
+-# and the most of the country soon followed suit.
+ 
++# From Paul Eggert (2016-09-21):
++# Dowd's proposal left many details unresolved, such as where to draw
++# lines between time zones.  The key individual who made time zones
++# work in the US was William Frederick Allen - railway engineer,
++# managing editor of the Travelers' Guide, and secretary of the
++# General Time Convention, a railway standardization group.  Allen
++# spent months in dialogs with scientific and railway leaders,
++# developed a workable plan to institute time zones, and presented it
++# to the General Time Convention on 1883-04-11, saying that his plan
++# meant "local time would be practically abolished" - a plus for
++# railway scheduling.  By the next convention on 1883-10-11 nearly all
++# railroads had agreed and it took effect on 1883-11-18 at 12:00.
++# That Sunday was called the "day of two noons", as the eastern parts
++# of the new zones observed noon twice.  Allen witnessed the
++# transition in New York City, writing:
++#
++#   I heard the bells of St. Paul's strike on the old time.  Four
++#   minutes later, obedient to the electrical signal from the Naval
++#   Observatory ... the time-ball made its rapid descent, the chimes
++#   of old Trinity rang twelve measured strokes, and local time was
++#   abandoned, probably forever.
++#
++# Most of the US soon followed suit.  See:
++# Bartky IR. The adoption of standard time. Technol Cult 1989 Jan;30(1):25-56.
++# http://dx.doi.org/10.2307/3105430
++
+ # From Paul Eggert (2005-04-16):
+ # That 1883 transition occurred at 12:00 new time, not at 12:00 old time.
+ # See p 46 of David Prerau, Seize the daylight, Thunder's Mouth Press (2005).
+@@ -325,6 +349,16 @@ Zone America/New_York	-4:56:02 -	LMT	1883 Nov 18 1
+ # Statue 175 closer in synch with the US Congress' intent....
+ # http://www.legis.state.wi.us/2007/data/acts/07Act3.pdf
+ 
++# From an email administrator of the City of Fort Pierre, SD (2015-12-21):
++# Fort Pierre is technically located in the Mountain time zone as is
++# the rest of Stanley County.  Most of Stanley County and Fort Pierre
++# uses the Central time zone due to doing most of their business in
++# Pierre so it simplifies schedules.  I have lived in Stanley County
++# all my life and it has been that way since I can remember.  (43 years!)
++#
++# From Paul Eggert (2015-12-25):
++# Assume this practice predates 1970, so Fort Pierre can use America/Chicago.
++
+ # Rule	NAME	FROM	TO	TYPE	IN	ON	AT	SAVE	LETTER
+ Rule	Chicago	1920	only	-	Jun	13	2:00	1:00	D
+ Rule	Chicago	1920	1921	-	Oct	lastSun	2:00	0	S
+@@ -403,11 +437,42 @@ Zone America/Denver	-6:59:56 -	LMT	1883 Nov 18 12:
+ # north of the Salmon River, and the towns of Burgdorf and Warren),
+ # Nevada (except West Wendover), Oregon (except the northern 3/4 of
+ # Malheur county), and Washington
++
++# From Paul Eggert (2016-08-20):
++# In early February 1948, in response to California's electricity shortage,
++# PG&E changed power frequency from 60 to 59.5 Hz during daylight hours,
++# causing electric clocks to lose six minutes per day.  (This did not change
++# legal time, and is not part of the data here.)  See:
++# Ross SA. An energy crisis from the past: Northern California in 1948.
++# Working Paper No. 8, Institute of Governmental Studies, UC Berkeley,
++# 1973-11.  http://escholarship.org/uc/item/8x22k30c
+ #
++# In another measure to save electricity, DST was instituted from 1948-03-14
++# at 02:01 to 1949-01-16 at 02:00, with the governor having the option to move
++# the fallback transition earlier.  See pages 3-4 of:
++# http://clerk.assembly.ca.gov/sites/clerk.assembly.ca.gov/files/archive/Statutes/1948/48Vol1_Chapters.pdf
++#
++# In response:
++#
++#   Governor Warren received a torrent of objecting mail, and it is not too much
++#   to speculate that the objections to Daylight Saving Time were one important
++#   factor in the defeat of the Dewey-Warren Presidential ticket in California.
++#     -- Ross, p 25
++#
++# On December 8 the governor exercised the option, setting the date to January 1
++# (LA Times 1948-12-09).  The transition time was 02:00 (LA Times 1949-01-01).
++#
++# Despite the controversy, in 1949 California voters approved Proposition 12,
++# which established DST from April's last Sunday at 01:00 until September's
++# last Sunday at 02:00. This was amended by 1962's Proposition 6, which changed
++# the fall-back date to October's last Sunday. See:
++# http://repository.uchastings.edu/cgi/viewcontent.cgi?article=1501&context=ca_ballot_props
++# http://repository.uchastings.edu/cgi/viewcontent.cgi?article=1636&context=ca_ballot_props
++#
+ # Rule	NAME	FROM	TO	TYPE	IN	ON	AT	SAVE	LETTER
+-Rule	CA	1948	only	-	Mar	14	2:00	1:00	D
++Rule	CA	1948	only	-	Mar	14	2:01	1:00	D
+ Rule	CA	1949	only	-	Jan	 1	2:00	0	S
+-Rule	CA	1950	1966	-	Apr	lastSun	2:00	1:00	D
++Rule	CA	1950	1966	-	Apr	lastSun	1:00	1:00	D
+ Rule	CA	1950	1961	-	Sep	lastSun	2:00	0	S
+ Rule	CA	1962	1966	-	Oct	lastSun	2:00	0	S
+ # Zone	NAME		GMTOFF	RULES	FORMAT	[UNTIL]
+@@ -481,6 +546,12 @@ Zone America/Los_Angeles -7:52:58 -	LMT	1883 Nov 1
+ # For lack of better information, assume that Metlakatla's
+ # abandonment of use of daylight saving resulted from the 1983 vote.
+ 
++# From Steffen Thorsen (2015-11-09):
++# It seems Metlakatla did go off PST on Sunday, November 1, changing
++# their time to AKST and are going to follow Alaska's DST, switching
++# between AKST and AKDT from now on....
++# http://www.krbd.org/2015/10/30/annette-island-times-they-are-a-changing/
++
+ # Zone	NAME		GMTOFF	RULES	FORMAT	[UNTIL]
+ Zone America/Juneau	 15:02:19 -	LMT	1867 Oct 18
+ 			 -8:57:41 -	LMT	1900 Aug 20 12:00
+@@ -506,7 +577,8 @@ Zone America/Metlakatla	 15:13:42 -	LMT	1867 Oct 1
+ 			 -8:00	US	P%sT	1946
+ 			 -8:00	-	PST	1969
+ 			 -8:00	US	P%sT	1983 Oct 30  2:00
+-			 -8:00	-	PST
++			 -8:00	-	PST	2015 Nov  1  2:00
++			 -9:00	US	AK%sT
+ Zone America/Yakutat	 14:41:05 -	LMT	1867 Oct 18
+ 			 -9:18:55 -	LMT	1900 Aug 20 12:00
+ 			 -9:00	-	YST	1942
+@@ -2174,18 +2246,18 @@ Rule	NT_YK	1980	2006	-	Oct	lastSun	2:00	0	S
+ Rule	NT_YK	1987	2006	-	Apr	Sun>=1	2:00	1:00	D
+ # Zone	NAME		GMTOFF	RULES	FORMAT	[UNTIL]
+ # aka Panniqtuuq
+-Zone America/Pangnirtung 0	-	zzz	1921 # trading post est.
++Zone America/Pangnirtung 0	-	-00	1921 # trading post est.
+ 			-4:00	NT_YK	A%sT	1995 Apr Sun>=1  2:00
+ 			-5:00	Canada	E%sT	1999 Oct 31  2:00
+ 			-6:00	Canada	C%sT	2000 Oct 29  2:00
+ 			-5:00	Canada	E%sT
+ # formerly Frobisher Bay
+-Zone America/Iqaluit	0	-	zzz	1942 Aug # Frobisher Bay est.
++Zone America/Iqaluit	0	-	-00	1942 Aug # Frobisher Bay est.
+ 			-5:00	NT_YK	E%sT	1999 Oct 31  2:00
+ 			-6:00	Canada	C%sT	2000 Oct 29  2:00
+ 			-5:00	Canada	E%sT
+ # aka Qausuittuq
+-Zone America/Resolute	0	-	zzz	1947 Aug 31 # Resolute founded
++Zone America/Resolute	0	-	-00	1947 Aug 31 # Resolute founded
+ 			-6:00	NT_YK	C%sT	2000 Oct 29  2:00
+ 			-5:00	-	EST	2001 Apr  1  3:00
+ 			-6:00	Canada	C%sT	2006 Oct 29  2:00
+@@ -2192,21 +2264,21 @@ Rule	NT_YK	1987	2006	-	Apr	Sun>=1	2:00	1:00	D
+ 			-5:00	-	EST	2007 Mar 11  3:00
+ 			-6:00	Canada	C%sT
+ # aka Kangiqiniq
+-Zone America/Rankin_Inlet 0	-	zzz	1957 # Rankin Inlet founded
++Zone America/Rankin_Inlet 0	-	-00	1957 # Rankin Inlet founded
+ 			-6:00	NT_YK	C%sT	2000 Oct 29  2:00
+ 			-5:00	-	EST	2001 Apr  1  3:00
+ 			-6:00	Canada	C%sT
+ # aka Iqaluktuuttiaq
+-Zone America/Cambridge_Bay 0	-	zzz	1920 # trading post est.?
++Zone America/Cambridge_Bay 0	-	-00	1920 # trading post est.?
+ 			-7:00	NT_YK	M%sT	1999 Oct 31  2:00
+ 			-6:00	Canada	C%sT	2000 Oct 29  2:00
+ 			-5:00	-	EST	2000 Nov  5  0:00
+ 			-6:00	-	CST	2001 Apr  1  3:00
+ 			-7:00	Canada	M%sT
+-Zone America/Yellowknife 0	-	zzz	1935 # Yellowknife founded?
++Zone America/Yellowknife 0	-	-00	1935 # Yellowknife founded?
+ 			-7:00	NT_YK	M%sT	1980
+ 			-7:00	Canada	M%sT
+-Zone America/Inuvik	0	-	zzz	1953 # Inuvik founded
++Zone America/Inuvik	0	-	-00	1953 # Inuvik founded
+ 			-8:00	NT_YK	P%sT	1979 Apr lastSun  2:00
+ 			-7:00	NT_YK	M%sT	1980
+ 			-7:00	Canada	M%sT
+@@ -2458,13 +2530,22 @@ Zone America/Merida	-5:58:28 -	LMT	1922 Jan  1  0:
+ 			-6:00	-	CST	1981 Dec 23
+ 			-5:00	-	EST	1982 Dec  2
+ 			-6:00	Mexico	C%sT
+-# Coahuila, Durango, Nuevo León, Tamaulipas (near US border)
++# Coahuila, Nuevo León, Tamaulipas (near US border)
++# This includes the following municipalities:
++#   in Coahuila: Ocampo, Acuña, Zaragoza, Jiménez, Piedras Negras, Nava,
++#     Guerrero, Hidalgo.
++#   in Nuevo León: Anáhuac, Los Aldama.
++#   in Tamaulipas: Nuevo Laredo, Guerrero, Mier, Miguel Alemán, Camargo,
++#     Gustavo Díaz Ordaz, Reynosa, Río Bravo, Valle Hermoso, Matamoros.
++# See: Inicia mañana Horario de Verano en zona fronteriza, El Universal,
++# 2016-03-12
++# http://www.eluniversal.com.mx/articulo/estados/2016/03/12/inicia-manana-horario-de-verano-en-zona-fronteriza
+ Zone America/Matamoros	-6:40:00 -	LMT	1921 Dec 31 23:20:00
+ 			-6:00	-	CST	1988
+ 			-6:00	US	C%sT	1989
+ 			-6:00	Mexico	C%sT	2010
+ 			-6:00	US	C%sT
+-# Coahuila, Durango, Nuevo León, Tamaulipas (away from US border)
++# Durango; Coahuila, Nuevo León, Tamaulipas (away from US border)
+ Zone America/Monterrey	-6:41:16 -	LMT	1921 Dec 31 23:18:44
+ 			-6:00	-	CST	1988
+ 			-6:00	US	C%sT	1989
+@@ -2480,6 +2561,9 @@ Zone America/Mexico_City -6:36:36 -	LMT	1922 Jan
+ 			-6:00	-	CST	2002 Feb 20
+ 			-6:00	Mexico	C%sT
+ # Chihuahua (near US border)
++# This includes the municipalities of Janos, Ascensión, Juárez, Guadalupe,
++# Práxedis G Guerrero, Coyame del Sotol, Ojinaga, and Manuel Benavides.
++# (See the 2016-03-12 El Universal source mentioned above.)
+ Zone America/Ojinaga	-6:57:40 -	LMT	1922 Jan  1  0:02:20
+ 			-7:00	-	MST	1927 Jun 10 23:00
+ 			-6:00	-	CST	1930 Nov 15
+@@ -2567,7 +2651,7 @@ Zone America/Bahia_Banderas	-7:01:00 -	LMT	1921 De
+ 			-7:00	Mexico	M%sT	2010 Apr  4  2:00
+ 			-6:00	Mexico	C%sT
+ 
+-# Baja California (near US border)
++# Baja California
+ Zone America/Tijuana	-7:48:04 -	LMT	1922 Jan  1  0:11:56
+ 			-7:00	-	MST	1924
+ 			-8:00	-	PST	1927 Jun 10 23:00
+@@ -2587,25 +2671,6 @@ Zone America/Tijuana	-7:48:04 -	LMT	1922 Jan  1  0
+ 			-8:00	US	P%sT	2002 Feb 20
+ 			-8:00	Mexico	P%sT	2010
+ 			-8:00	US	P%sT
+-# Baja California (away from US border)
+-Zone America/Santa_Isabel	-7:39:28 -	LMT	1922 Jan  1  0:20:32
+-			-7:00	-	MST	1924
+-			-8:00	-	PST	1927 Jun 10 23:00
+-			-7:00	-	MST	1930 Nov 15
+-			-8:00	-	PST	1931 Apr  1
+-			-8:00	1:00	PDT	1931 Sep 30
+-			-8:00	-	PST	1942 Apr 24
+-			-8:00	1:00	PWT	1945 Aug 14 23:00u
+-			-8:00	1:00	PPT	1945 Nov 12 # Peace
+-			-8:00	-	PST	1948 Apr  5
+-			-8:00	1:00	PDT	1949 Jan 14
+-			-8:00	-	PST	1954
+-			-8:00	CA	P%sT	1961
+-			-8:00	-	PST	1976
+-			-8:00	US	P%sT	1996
+-			-8:00	Mexico	P%sT	2001
+-			-8:00	US	P%sT	2002 Feb 20
+-			-8:00	Mexico	P%sT
+ # From Paul Eggert (2006-03-22):
+ # Formerly there was an America/Ensenada zone, which differed from
+ # America/Tijuana only in that it did not observe DST from 1976
+@@ -2618,6 +2683,13 @@ Zone America/Tijuana	-7:48:04 -	LMT	1922 Jan  1  0
+ # other than America/Tijuana for Baja, but it's not clear yet what its
+ # name or contents should be.
+ #
++# From Paul Eggert (2015-10-08):
++# Formerly there was an America/Santa_Isabel zone, but this appears to
++# have come from a misreading of
++# http://dof.gob.mx/nota_detalle.php?codigo=5127480&fecha=06/01/2010
++# It has been moved to the 'backward' file.
++#
++#
+ # Revillagigedo Is
+ # no information
+ 
+@@ -2692,18 +2764,8 @@ Zone Atlantic/Bermuda	-4:19:18 -	LMT	1930 Jan  1
+ 			-4:00	US	A%sT
+ 
+ # Cayman Is
++# See America/Panama.
+ 
+-# From Paul Eggert (2015-05-15):
+-# The Cayman government has decided to introduce DST in 2016, the idea being
+-# to keep in sync with New York.  The legislation hasn't passed but the change
+-# seems quite likely.  See: Meade B. Cayman 27.
+-# http://www.cayman27.com.ky/2015/05/15/clock-ticks-toward-daylight-saving-time-in-cayman
+-
+-Zone	America/Cayman	-5:25:32 -	LMT	1890     # Georgetown
+-			-5:07:11 -	KMT	1912 Feb # Kingston Mean Time
+-			-5:00	-	EST	2016
+-			-5:00	US	E%sT
+-
+ # Costa Rica
+ 
+ # Milne gives -5:36:13.3 as San José mean time; round to nearest.
+@@ -3065,6 +3127,13 @@ Zone America/Guatemala	-6:02:04 -	LMT	1918 Oct 5
+ # http://radiovision2000haiti.net/public/haiti-avis-changement-dheure-dimanche/
+ # http://www.canalplushaiti.net/?p=6714
+ 
++# From Steffen Thorsen (2016-03-12):
++# Jean Antoine, editor of www.haiti-reference.com informed us that Haiti
++# are not going on DST this year.  Several other resources confirm this: ...
++# http://www.radiotelevisioncaraibes.com/presse/heure_d_t_pas_de_changement_d_heure_pr_vu_pour_cet_ann_e.html
++# http://www.vantbefinfo.com/changement-dheure-pas-pour-haiti/
++# http://news.anmwe.com/haiti-lheure-nationale-ne-sera-ni-avancee-ni-reculee-cette-annee/
++
+ # Rule	NAME	FROM	TO	TYPE	IN	ON	AT	SAVE	LETTER/S
+ Rule	Haiti	1983	only	-	May	8	0:00	1:00	D
+ Rule	Haiti	1984	1987	-	Apr	lastSun	0:00	1:00	D
+@@ -3075,8 +3144,8 @@ Rule	Haiti	1988	1997	-	Apr	Sun>=1	1:00s	1:00	D
+ Rule	Haiti	1988	1997	-	Oct	lastSun	1:00s	0	S
+ Rule	Haiti	2005	2006	-	Apr	Sun>=1	0:00	1:00	D
+ Rule	Haiti	2005	2006	-	Oct	lastSun	0:00	0	S
+-Rule	Haiti	2012	max	-	Mar	Sun>=8	2:00	1:00	D
+-Rule	Haiti	2012	max	-	Nov	Sun>=1	2:00	0	S
++Rule	Haiti	2012	2015	-	Mar	Sun>=8	2:00	1:00	D
++Rule	Haiti	2012	2015	-	Nov	Sun>=1	2:00	0	S
+ # Zone	NAME		GMTOFF	RULES	FORMAT	[UNTIL]
+ Zone America/Port-au-Prince -4:49:20 -	LMT	1890
+ 			-4:49	-	PPMT	1917 Jan 24 12:00 # P-a-P MT
+@@ -3225,6 +3294,7 @@ Zone	America/Managua	-5:45:08 -	LMT	1890
+ Zone	America/Panama	-5:18:08 -	LMT	1890
+ 			-5:19:36 -	CMT	1908 Apr 22 # Colón Mean Time
+ 			-5:00	-	EST
++Link America/Panama America/Cayman
+ 
+ # Puerto Rico
+ # There are too many San Juans elsewhere, so we'll use 'Puerto_Rico'.
+@@ -3266,7 +3336,7 @@ Zone America/Miquelon	-3:44:40 -	LMT	1911 May 15 #
+ # indicating that the normal ET rules are followed.
+ #
+ # From Paul Eggert (2014-08-19):
+-# The 2014-08-13 Cabinet meeting decided to stay on UTC-4 year-round.  See:
++# The 2014-08-13 Cabinet meeting decided to stay on UT -04 year-round.  See:
+ # http://tcweeklynews.com/daylight-savings-time-to-be-maintained-p5353-127.htm
+ # Model this as a switch from EST/EDT to AST ...
+ # From Chris Walton (2014-11-04):
+Index: contrib/tzdata/southamerica
+===================================================================
+--- contrib/tzdata/southamerica	(revision 309576)
++++ contrib/tzdata/southamerica	(working copy)
+@@ -410,9 +410,9 @@ Rule	Arg	2008	only	-	Oct	Sun>=15	0:00	1:00	S
+ # stuck on Summer daylight savings time even though the summer is over.
+ 
+ # From Paul Eggert (2013-09-05):
+-# Perhaps San Luis operates on the legal fiction that it is at UTC-4
++# Perhaps San Luis operates on the legal fiction that it is at -04
+ # with perpetual summer time, but ordinary usage typically seems to
+-# just say it's at UTC-3; see, for example,
++# just say it's at -03; see, for example,
+ # http://es.wikipedia.org/wiki/Hora_oficial_argentina
+ # We've documented similar situations as being plain changes to
+ # standard time, so let's do that here too.  This does not change UTC
+@@ -1221,6 +1221,20 @@ Zone America/Rio_Branco	-4:31:12 -	LMT	1914
+ # From Paul Eggert (2015-03-03):
+ # For now, assume that the extension will persist indefinitely.
+ 
++# From Juan Correa (2016-03-18):
++# The decree regarding DST has been published in today's Official Gazette:
++# http://www.diariooficial.interior.gob.cl/versiones-anteriores/do/20160318/
++# http://www.leychile.cl/Navegar?idNorma=1088502
++# It does consider the second Saturday of May and August as the dates
++# for the transition; and it lists DST dates until 2019, but I think
++# this scheme will stick.
++#
++# From Paul Eggert (2016-03-18):
++# For now, assume the pattern holds for the indefinite future.
++# The decree says transitions occur at 24:00; in practice this appears
++# to mean 24:00 mainland time, not 24:00 local time, so that Easter
++# Island is always two hours behind the mainland.
++
+ # Rule	NAME	FROM	TO	TYPE	IN	ON	AT	SAVE	LETTER/S
+ Rule	Chile	1927	1931	-	Sep	 1	0:00	1:00	S
+ Rule	Chile	1928	1932	-	Apr	 1	0:00	0	-
+@@ -1252,8 +1266,10 @@ Rule	Chile	2009	only	-	Mar	Sun>=9	3:00u	0	-
+ Rule	Chile	2010	only	-	Apr	Sun>=1	3:00u	0	-
+ Rule	Chile	2011	only	-	May	Sun>=2	3:00u	0	-
+ Rule	Chile	2011	only	-	Aug	Sun>=16	4:00u	1:00	S
+-Rule	Chile	2012	2015	-	Apr	Sun>=23	3:00u	0	-
++Rule	Chile	2012	2014	-	Apr	Sun>=23	3:00u	0	-
+ Rule	Chile	2012	2014	-	Sep	Sun>=2	4:00u	1:00	S
++Rule	Chile	2016	max	-	May	Sun>=9	3:00u	0	-
++Rule	Chile	2016	max	-	Aug	Sun>=9	4:00u	1:00	S
+ # IATA SSIM anomalies: (1992-02) says 1992-03-14;
+ # (1996-09) says 1998-03-08.  Ignore these.
+ # Zone	NAME		GMTOFF	RULES	FORMAT	[UNTIL]
+@@ -1270,13 +1286,11 @@ Zone America/Santiago	-4:42:46 -	LMT	1890
+ 			-4:00	1:00	CLST	1946 Sep  1 # central Chile
+ 			-4:00	-	CLT	1947 Apr  1
+ 			-5:00	-	CLT	1947 May 21 23:00
+-			-4:00	Chile	CL%sT	2015 Apr 26  3:00u
+-			-3:00	-	CLT
++			-4:00	Chile	CL%sT
+ Zone Pacific/Easter	-7:17:28 -	LMT	1890
+ 			-7:17:28 -	EMT	1932 Sep    # Easter Mean Time
+ 			-7:00	Chile	EAS%sT	1982 Mar 14 3:00u # Easter Time
+-			-6:00	Chile	EAS%sT	2015 Apr 26 3:00u
+-			-5:00	-	EAST
++			-6:00	Chile	EAS%sT
+ #
+ # Salas y Gómez Island is uninhabited.
+ # Other Chilean locations, including Juan Fernández Is, Desventuradas Is,
+@@ -1295,11 +1309,10 @@ Zone Pacific/Easter	-7:17:28 -	LMT	1890
+ # Palmer used to be supplied from Argentina.
+ #
+ # Zone	NAME		GMTOFF	RULES	FORMAT	[UNTIL]
+-Zone Antarctica/Palmer	0	-	zzz	1965
++Zone Antarctica/Palmer	0	-	-00	1965
+ 			-4:00	Arg	AR%sT	1969 Oct  5
+ 			-3:00	Arg	AR%sT	1982 May
+-			-4:00	Chile	CL%sT	2015 Apr 26 3:00u
+-			-3:00	-	CLT
++			-4:00	Chile	CL%sT
+ 
+ # Colombia
+ 
+@@ -1742,9 +1755,25 @@ Zone America/Montevideo	-3:44:44 -	LMT	1898 Jun 28
+ # resolution publication)
+ # http://www.globovision.com/news.php?nid=72208
+ 
++# From Alexander Krivenyshev (2016-04-15):
++# https://actualidad.rt.com/actualidad/204758-venezuela-modificar-huso-horario-sequia-elnino
++#
++# From Paul Eggert (2016-04-15):
++# Clocks advance 30 minutes on 2016-05-01 at 02:30....
++# "'Venezuela's new time-zone: hours without light, hours without water,
++# hours of presidential broadcasts, hours of lines,' quipped comedian
++# Jean Mary Curró ...". See: Cawthorne A, Kai D. Venezuela scraps
++# half-hour time difference set by Chavez. Reuters 2016-04-15 14:50 -0400
++# http://www.reuters.com/article/us-venezuela-timezone-idUSKCN0XC2BE
++#
++# From Matt Johnson (2016-04-20):
++# ... published in the official Gazette [2016-04-18], here:
++# http://historico.tsj.gob.ve/gaceta_ext/abril/1842016/E-1842016-4551.pdf
++
+ # Zone	NAME		GMTOFF	RULES	FORMAT	[UNTIL]
+ Zone	America/Caracas	-4:27:44 -	LMT	1890
+ 			-4:27:40 -	CMT	1912 Feb 12 # Caracas Mean Time?
+ 			-4:30	-	VET	1965 Jan  1  0:00 # Venezuela T.
+ 			-4:00	-	VET	2007 Dec  9  3:00
+-			-4:30	-	VET
++			-4:30	-	VET	2016 May  1  2:30
++			-4:00	-	VET
+Index: contrib/tzdata/version
+===================================================================
+--- contrib/tzdata/version	(nonexistent)
++++ contrib/tzdata/version	(working copy)
+@@ -0,0 +1 @@
++2016i
+Index: contrib/tzdata/zone.tab
+===================================================================
+--- contrib/tzdata/zone.tab	(revision 309576)
++++ contrib/tzdata/zone.tab	(working copy)
+@@ -30,22 +30,22 @@ AI	+1812-06304	America/Anguilla
+ AL	+4120+01950	Europe/Tirane
+ AM	+4011+04430	Asia/Yerevan
+ AO	-0848+01314	Africa/Luanda
+-AQ	-7750+16636	Antarctica/McMurdo	McMurdo, South Pole, Scott (New Zealand time)
+-AQ	-6734-06808	Antarctica/Rothera	Rothera Station, Adelaide Island
+-AQ	-6448-06406	Antarctica/Palmer	Palmer Station, Anvers Island
+-AQ	-6736+06253	Antarctica/Mawson	Mawson Station, Holme Bay
+-AQ	-6835+07758	Antarctica/Davis	Davis Station, Vestfold Hills
+-AQ	-6617+11031	Antarctica/Casey	Casey Station, Bailey Peninsula
+-AQ	-7824+10654	Antarctica/Vostok	Vostok Station, Lake Vostok
+-AQ	-6640+14001	Antarctica/DumontDUrville	Dumont-d'Urville Station, Adelie Land
+-AQ	-690022+0393524	Antarctica/Syowa	Syowa Station, E Ongul I
+-AQ	-720041+0023206	Antarctica/Troll	Troll Station, Queen Maud Land
++AQ	-7750+16636	Antarctica/McMurdo	New Zealand time - McMurdo, South Pole
++AQ	-6617+11031	Antarctica/Casey	Casey
++AQ	-6835+07758	Antarctica/Davis	Davis
++AQ	-6640+14001	Antarctica/DumontDUrville	Dumont-d'Urville
++AQ	-6736+06253	Antarctica/Mawson	Mawson
++AQ	-6448-06406	Antarctica/Palmer	Palmer
++AQ	-6734-06808	Antarctica/Rothera	Rothera
++AQ	-690022+0393524	Antarctica/Syowa	Syowa
++AQ	-720041+0023206	Antarctica/Troll	Troll
++AQ	-7824+10654	Antarctica/Vostok	Vostok
+ AR	-3436-05827	America/Argentina/Buenos_Aires	Buenos Aires (BA, CF)
+-AR	-3124-06411	America/Argentina/Cordoba	most locations (CB, CC, CN, ER, FM, MN, SE, SF)
+-AR	-2447-06525	America/Argentina/Salta	(SA, LP, NQ, RN)
++AR	-3124-06411	America/Argentina/Cordoba	Argentina (most areas: CB, CC, CN, ER, FM, MN, SE, SF)
++AR	-2447-06525	America/Argentina/Salta	Salta (SA, LP, NQ, RN)
+ AR	-2411-06518	America/Argentina/Jujuy	Jujuy (JY)
+ AR	-2649-06513	America/Argentina/Tucuman	Tucuman (TM)
+-AR	-2828-06547	America/Argentina/Catamarca	Catamarca (CT), Chubut (CH)
++AR	-2828-06547	America/Argentina/Catamarca	Catamarca (CT); Chubut (CH)
+ AR	-2926-06651	America/Argentina/La_Rioja	La Rioja (LR)
+ AR	-3132-06831	America/Argentina/San_Juan	San Juan (SJ)
+ AR	-3253-06849	America/Argentina/Mendoza	Mendoza (MZ)
+@@ -56,17 +56,17 @@ AS	-1416-17042	Pacific/Pago_Pago
+ AT	+4813+01620	Europe/Vienna
+ AU	-3133+15905	Australia/Lord_Howe	Lord Howe Island
+ AU	-5430+15857	Antarctica/Macquarie	Macquarie Island
+-AU	-4253+14719	Australia/Hobart	Tasmania - most locations
+-AU	-3956+14352	Australia/Currie	Tasmania - King Island
++AU	-4253+14719	Australia/Hobart	Tasmania (most areas)
++AU	-3956+14352	Australia/Currie	Tasmania (King Island)
+ AU	-3749+14458	Australia/Melbourne	Victoria
+-AU	-3352+15113	Australia/Sydney	New South Wales - most locations
+-AU	-3157+14127	Australia/Broken_Hill	New South Wales - Yancowinna
+-AU	-2728+15302	Australia/Brisbane	Queensland - most locations
+-AU	-2016+14900	Australia/Lindeman	Queensland - Holiday Islands
++AU	-3352+15113	Australia/Sydney	New South Wales (most areas)
++AU	-3157+14127	Australia/Broken_Hill	New South Wales (Yancowinna)
++AU	-2728+15302	Australia/Brisbane	Queensland (most areas)
++AU	-2016+14900	Australia/Lindeman	Queensland (Whitsunday Islands)
+ AU	-3455+13835	Australia/Adelaide	South Australia
+ AU	-1228+13050	Australia/Darwin	Northern Territory
+-AU	-3157+11551	Australia/Perth	Western Australia - most locations
+-AU	-3143+12852	Australia/Eucla	Western Australia - Eucla area
++AU	-3157+11551	Australia/Perth	Western Australia (most areas)
++AU	-3143+12852	Australia/Eucla	Western Australia (Eucla)
+ AW	+1230-06958	America/Aruba
+ AX	+6006+01957	Europe/Mariehamn
+ AZ	+4023+04951	Asia/Baku
+@@ -85,20 +85,20 @@ BN	+0456+11455	Asia/Brunei
+ BO	-1630-06809	America/La_Paz
+ BQ	+120903-0681636	America/Kralendijk
+ BR	-0351-03225	America/Noronha	Atlantic islands
+-BR	-0127-04829	America/Belem	Amapa, E Para
+-BR	-0343-03830	America/Fortaleza	NE Brazil (MA, PI, CE, RN, PB)
++BR	-0127-04829	America/Belem	Para (east); Amapa
++BR	-0343-03830	America/Fortaleza	Brazil (northeast: MA, PI, CE, RN, PB)
+ BR	-0803-03454	America/Recife	Pernambuco
+ BR	-0712-04812	America/Araguaina	Tocantins
+ BR	-0940-03543	America/Maceio	Alagoas, Sergipe
+ BR	-1259-03831	America/Bahia	Bahia
+-BR	-2332-04637	America/Sao_Paulo	S & SE Brazil (GO, DF, MG, ES, RJ, SP, PR, SC, RS)
++BR	-2332-04637	America/Sao_Paulo	Brazil (southeast: GO, DF, MG, ES, RJ, SP, PR, SC, RS)
+ BR	-2027-05437	America/Campo_Grande	Mato Grosso do Sul
+ BR	-1535-05605	America/Cuiaba	Mato Grosso
+-BR	-0226-05452	America/Santarem	W Para
++BR	-0226-05452	America/Santarem	Para (west)
+ BR	-0846-06354	America/Porto_Velho	Rondonia
+ BR	+0249-06040	America/Boa_Vista	Roraima
+-BR	-0308-06001	America/Manaus	E Amazonas
+-BR	-0640-06952	America/Eirunepe	W Amazonas
++BR	-0308-06001	America/Manaus	Amazonas (east)
++BR	-0640-06952	America/Eirunepe	Amazonas (west)
+ BR	-0958-06748	America/Rio_Branco	Acre
+ BS	+2505-07721	America/Nassau
+ BT	+2728+08939	Asia/Thimphu
+@@ -105,43 +105,43 @@ BT	+2728+08939	Asia/Thimphu
+ BW	-2439+02555	Africa/Gaborone
+ BY	+5354+02734	Europe/Minsk
+ BZ	+1730-08812	America/Belize
+-CA	+4734-05243	America/St_Johns	Newfoundland Time, including SE Labrador
+-CA	+4439-06336	America/Halifax	Atlantic Time - Nova Scotia (peninsula), PEI
+-CA	+4612-05957	America/Glace_Bay	Atlantic Time - Nova Scotia (Cape Breton)
+-CA	+4606-06447	America/Moncton	Atlantic Time - New Brunswick
+-CA	+5320-06025	America/Goose_Bay	Atlantic Time - Labrador - most locations
+-CA	+5125-05707	America/Blanc-Sablon	Atlantic Standard Time - Quebec - Lower North Shore
+-CA	+4339-07923	America/Toronto	Eastern Time - Ontario & Quebec - most locations
+-CA	+4901-08816	America/Nipigon	Eastern Time - Ontario & Quebec - places that did not observe DST 1967-1973
+-CA	+4823-08915	America/Thunder_Bay	Eastern Time - Thunder Bay, Ontario
+-CA	+6344-06828	America/Iqaluit	Eastern Time - east Nunavut - most locations
+-CA	+6608-06544	America/Pangnirtung	Eastern Time - Pangnirtung, Nunavut
+-CA	+744144-0944945	America/Resolute	Central Time - Resolute, Nunavut
+-CA	+484531-0913718	America/Atikokan	Eastern Standard Time - Atikokan, Ontario and Southampton I, Nunavut
+-CA	+624900-0920459	America/Rankin_Inlet	Central Time - central Nunavut
+-CA	+4953-09709	America/Winnipeg	Central Time - Manitoba & west Ontario
+-CA	+4843-09434	America/Rainy_River	Central Time - Rainy River & Fort Frances, Ontario
+-CA	+5024-10439	America/Regina	Central Standard Time - Saskatchewan - most locations
+-CA	+5017-10750	America/Swift_Current	Central Standard Time - Saskatchewan - midwest
+-CA	+5333-11328	America/Edmonton	Mountain Time - Alberta, east British Columbia & west Saskatchewan
+-CA	+690650-1050310	America/Cambridge_Bay	Mountain Time - west Nunavut
+-CA	+6227-11421	America/Yellowknife	Mountain Time - central Northwest Territories
+-CA	+682059-1334300	America/Inuvik	Mountain Time - west Northwest Territories
+-CA	+4906-11631	America/Creston	Mountain Standard Time - Creston, British Columbia
+-CA	+5946-12014	America/Dawson_Creek	Mountain Standard Time - Dawson Creek & Fort Saint John, British Columbia
+-CA	+5848-12242	America/Fort_Nelson	Mountain Standard Time - Fort Nelson, British Columbia
+-CA	+4916-12307	America/Vancouver	Pacific Time - west British Columbia
+-CA	+6043-13503	America/Whitehorse	Pacific Time - south Yukon
+-CA	+6404-13925	America/Dawson	Pacific Time - north Yukon
++CA	+4734-05243	America/St_Johns	Newfoundland; Labrador (southeast)
++CA	+4439-06336	America/Halifax	Atlantic - NS (most areas); PE
++CA	+4612-05957	America/Glace_Bay	Atlantic - NS (Cape Breton)
++CA	+4606-06447	America/Moncton	Atlantic - New Brunswick
++CA	+5320-06025	America/Goose_Bay	Atlantic - Labrador (most areas)
++CA	+5125-05707	America/Blanc-Sablon	AST - QC (Lower North Shore)
++CA	+4339-07923	America/Toronto	Eastern - ON, QC (most areas)
++CA	+4901-08816	America/Nipigon	Eastern - ON, QC (no DST 1967-73)
++CA	+4823-08915	America/Thunder_Bay	Eastern - ON (Thunder Bay)
++CA	+6344-06828	America/Iqaluit	Eastern - NU (most east areas)
++CA	+6608-06544	America/Pangnirtung	Eastern - NU (Pangnirtung)
++CA	+484531-0913718	America/Atikokan	EST - ON (Atikokan); NU (Coral H)
++CA	+4953-09709	America/Winnipeg	Central - ON (west); Manitoba
++CA	+4843-09434	America/Rainy_River	Central - ON (Rainy R, Ft Frances)
++CA	+744144-0944945	America/Resolute	Central - NU (Resolute)
++CA	+624900-0920459	America/Rankin_Inlet	Central - NU (central)
++CA	+5024-10439	America/Regina	CST - SK (most areas)
++CA	+5017-10750	America/Swift_Current	CST - SK (midwest)
++CA	+5333-11328	America/Edmonton	Mountain - AB; BC (E); SK (W)
++CA	+690650-1050310	America/Cambridge_Bay	Mountain - NU (west)
++CA	+6227-11421	America/Yellowknife	Mountain - NT (central)
++CA	+682059-1334300	America/Inuvik	Mountain - NT (west)
++CA	+4906-11631	America/Creston	MST - BC (Creston)
++CA	+5946-12014	America/Dawson_Creek	MST - BC (Dawson Cr, Ft St John)
++CA	+5848-12242	America/Fort_Nelson	MST - BC (Ft Nelson)
++CA	+4916-12307	America/Vancouver	Pacific - BC (most areas)
++CA	+6043-13503	America/Whitehorse	Pacific - Yukon (south)
++CA	+6404-13925	America/Dawson	Pacific - Yukon (north)
+ CC	-1210+09655	Indian/Cocos
+-CD	-0418+01518	Africa/Kinshasa	west Dem. Rep. of Congo
+-CD	-1140+02728	Africa/Lubumbashi	east Dem. Rep. of Congo
++CD	-0418+01518	Africa/Kinshasa	Dem. Rep. of Congo (west)
++CD	-1140+02728	Africa/Lubumbashi	Dem. Rep. of Congo (east)
+ CF	+0422+01835	Africa/Bangui
+ CG	-0416+01517	Africa/Brazzaville
+ CH	+4723+00832	Europe/Zurich
+ CI	+0519-00402	Africa/Abidjan
+ CK	-2114-15946	Pacific/Rarotonga
+-CL	-3327-07040	America/Santiago	most locations
++CL	-3327-07040	America/Santiago	Chile (most areas)
+ CL	-2709-10926	Pacific/Easter	Easter Island
+ CM	+0403+00942	Africa/Douala
+ CN	+3114+12128	Asia/Shanghai	Beijing Time
+@@ -152,9 +152,10 @@ CU	+2308-08222	America/Havana
+ CV	+1455-02331	Atlantic/Cape_Verde
+ CW	+1211-06900	America/Curacao
+ CX	-1025+10543	Indian/Christmas
+-CY	+3510+03322	Asia/Nicosia
++CY	+3510+03322	Asia/Nicosia	Cyprus (most areas)
++CY	+3507+03357	Asia/Famagusta	Northern Cyprus
+ CZ	+5005+01426	Europe/Prague
+-DE	+5230+01322	Europe/Berlin	most locations
++DE	+5230+01322	Europe/Berlin	Germany (most areas)
+ DE	+4742+00841	Europe/Busingen	Busingen
+ DJ	+1136+04309	Africa/Djibouti
+ DK	+5540+01235	Europe/Copenhagen
+@@ -161,21 +162,21 @@ DK	+5540+01235	Europe/Copenhagen
+ DM	+1518-06124	America/Dominica
+ DO	+1828-06954	America/Santo_Domingo
+ DZ	+3647+00303	Africa/Algiers
+-EC	-0210-07950	America/Guayaquil	mainland
++EC	-0210-07950	America/Guayaquil	Ecuador (mainland)
+ EC	-0054-08936	Pacific/Galapagos	Galapagos Islands
+ EE	+5925+02445	Europe/Tallinn
+ EG	+3003+03115	Africa/Cairo
+ EH	+2709-01312	Africa/El_Aaiun
+ ER	+1520+03853	Africa/Asmara
+-ES	+4024-00341	Europe/Madrid	mainland
+-ES	+3553-00519	Africa/Ceuta	Ceuta & Melilla
++ES	+4024-00341	Europe/Madrid	Spain (mainland)
++ES	+3553-00519	Africa/Ceuta	Ceuta, Melilla
+ ES	+2806-01524	Atlantic/Canary	Canary Islands
+ ET	+0902+03842	Africa/Addis_Ababa
+ FI	+6010+02458	Europe/Helsinki
+ FJ	-1808+17825	Pacific/Fiji
+ FK	-5142-05751	Atlantic/Stanley
+-FM	+0725+15147	Pacific/Chuuk	Chuuk (Truk) and Yap
+-FM	+0658+15813	Pacific/Pohnpei	Pohnpei (Ponape)
++FM	+0725+15147	Pacific/Chuuk	Chuuk/Truk, Yap
++FM	+0658+15813	Pacific/Pohnpei	Pohnpei/Ponape
+ FM	+0519+16259	Pacific/Kosrae	Kosrae
+ FO	+6201-00646	Atlantic/Faroe
+ FR	+4852+00220	Europe/Paris
+@@ -187,10 +188,10 @@ GF	+0456-05220	America/Cayenne
+ GG	+4927-00232	Europe/Guernsey
+ GH	+0533-00013	Africa/Accra
+ GI	+3608-00521	Europe/Gibraltar
+-GL	+6411-05144	America/Godthab	most locations
+-GL	+7646-01840	America/Danmarkshavn	east coast, north of Scoresbysund
+-GL	+7029-02158	America/Scoresbysund	Scoresbysund / Ittoqqortoormiit
+-GL	+7634-06847	America/Thule	Thule / Pituffik
++GL	+6411-05144	America/Godthab	Greenland (most areas)
++GL	+7646-01840	America/Danmarkshavn	National Park (east coast)
++GL	+7029-02158	America/Scoresbysund	Scoresbysund/Ittoqqortoormiit
++GL	+7634-06847	America/Thule	Thule/Pituffik
+ GM	+1328-01639	Africa/Banjul
+ GN	+0931-01343	Africa/Conakry
+ GP	+1614-06132	America/Guadeloupe
+@@ -206,10 +207,10 @@ HN	+1406-08713	America/Tegucigalpa
+ HR	+4548+01558	Europe/Zagreb
+ HT	+1832-07220	America/Port-au-Prince
+ HU	+4730+01905	Europe/Budapest
+-ID	-0610+10648	Asia/Jakarta	Java & Sumatra
+-ID	-0002+10920	Asia/Pontianak	west & central Borneo
+-ID	-0507+11924	Asia/Makassar	east & south Borneo, Sulawesi (Celebes), Bali, Nusa Tengarra, west Timor
+-ID	-0232+14042	Asia/Jayapura	west New Guinea (Irian Jaya) & Malukus (Moluccas)
++ID	-0610+10648	Asia/Jakarta	Java, Sumatra
++ID	-0002+10920	Asia/Pontianak	Borneo (west, central)
++ID	-0507+11924	Asia/Makassar	Borneo (east, south); Sulawesi/Celebes, Bali, Nusa Tengarra; Timor (west)
++ID	-0232+14042	Asia/Jayapura	New Guinea (West Papua / Irian Jaya); Malukus/Moluccas
+ IE	+5320-00615	Europe/Dublin
+ IL	+314650+0351326	Asia/Jerusalem
+ IM	+5409-00428	Europe/Isle_of_Man
+@@ -235,10 +236,10 @@ KP	+3901+12545	Asia/Pyongyang
+ KR	+3733+12658	Asia/Seoul
+ KW	+2920+04759	Asia/Kuwait
+ KY	+1918-08123	America/Cayman
+-KZ	+4315+07657	Asia/Almaty	most locations
+-KZ	+4448+06528	Asia/Qyzylorda	Qyzylorda (Kyzylorda, Kzyl-Orda)
+-KZ	+5017+05710	Asia/Aqtobe	Aqtobe (Aktobe)
+-KZ	+4431+05016	Asia/Aqtau	Atyrau (Atirau, Gur'yev), Mangghystau (Mankistau)
++KZ	+4315+07657	Asia/Almaty	Kazakhstan (most areas)
++KZ	+4448+06528	Asia/Qyzylorda	Qyzylorda/Kyzylorda/Kzyl-Orda
++KZ	+5017+05710	Asia/Aqtobe	Aqtobe/Aktobe
++KZ	+4431+05016	Asia/Aqtau	Atyrau/Atirau/Gur'yev, Mangghystau/Mankistau
+ KZ	+5113+05121	Asia/Oral	West Kazakhstan
+ LA	+1758+10236	Asia/Vientiane
+ LB	+3353+03530	Asia/Beirut
+@@ -257,12 +258,12 @@ MD	+4700+02850	Europe/Chisinau
+ ME	+4226+01916	Europe/Podgorica
+ MF	+1804-06305	America/Marigot
+ MG	-1855+04731	Indian/Antananarivo
+-MH	+0709+17112	Pacific/Majuro	most locations
++MH	+0709+17112	Pacific/Majuro	Marshall Islands (most areas)
+ MH	+0905+16720	Pacific/Kwajalein	Kwajalein
+ MK	+4159+02126	Europe/Skopje
+ ML	+1239-00800	Africa/Bamako
+-MM	+1647+09610	Asia/Rangoon
+-MN	+4755+10653	Asia/Ulaanbaatar	most locations
++MM	+1647+09610	Asia/Yangon
++MN	+4755+10653	Asia/Ulaanbaatar	Mongolia (most areas)
+ MN	+4801+09139	Asia/Hovd	Bayan-Olgiy, Govi-Altai, Hovd, Uvs, Zavkhan
+ MN	+4804+11430	Asia/Choibalsan	Dornod, Sukhbaatar
+ MO	+2214+11335	Asia/Macau
+@@ -274,20 +275,19 @@ MT	+3554+01431	Europe/Malta
+ MU	-2010+05730	Indian/Mauritius
+ MV	+0410+07330	Indian/Maldives
+ MW	-1547+03500	Africa/Blantyre
+-MX	+1924-09909	America/Mexico_City	Central Time - most locations
++MX	+1924-09909	America/Mexico_City	Central Time
+ MX	+2105-08646	America/Cancun	Eastern Standard Time - Quintana Roo
+ MX	+2058-08937	America/Merida	Central Time - Campeche, Yucatan
+-MX	+2540-10019	America/Monterrey	Mexican Central Time - Coahuila, Durango, Nuevo Leon, Tamaulipas away from US border
+-MX	+2550-09730	America/Matamoros	US Central Time - Coahuila, Durango, Nuevo Leon, Tamaulipas near US border
+-MX	+2313-10625	America/Mazatlan	Mountain Time - S Baja, Nayarit, Sinaloa
+-MX	+2838-10605	America/Chihuahua	Mexican Mountain Time - Chihuahua away from US border
+-MX	+2934-10425	America/Ojinaga	US Mountain Time - Chihuahua near US border
++MX	+2540-10019	America/Monterrey	Central Time - Durango; Coahuila, Nuevo Leon, Tamaulipas (most areas)
++MX	+2550-09730	America/Matamoros	Central Time US - Coahuila, Nuevo Leon, Tamaulipas (US border)
++MX	+2313-10625	America/Mazatlan	Mountain Time - Baja California Sur, Nayarit, Sinaloa
++MX	+2838-10605	America/Chihuahua	Mountain Time - Chihuahua (most areas)
++MX	+2934-10425	America/Ojinaga	Mountain Time US - Chihuahua (US border)
+ MX	+2904-11058	America/Hermosillo	Mountain Standard Time - Sonora
+-MX	+3232-11701	America/Tijuana	US Pacific Time - Baja California near US border
+-MX	+3018-11452	America/Santa_Isabel	Mexican Pacific Time - Baja California away from US border
+-MX	+2048-10515	America/Bahia_Banderas	Mexican Central Time - Bahia de Banderas
+-MY	+0310+10142	Asia/Kuala_Lumpur	peninsular Malaysia
+-MY	+0133+11020	Asia/Kuching	Sabah & Sarawak
++MX	+3232-11701	America/Tijuana	Pacific Time US - Baja California
++MX	+2048-10515	America/Bahia_Banderas	Central Time - Bahia de Banderas
++MY	+0310+10142	Asia/Kuala_Lumpur	Malaysia (peninsula)
++MY	+0133+11020	Asia/Kuching	Sabah, Sarawak
+ MZ	-2558+03235	Africa/Maputo
+ NA	-2234+01706	Africa/Windhoek
+ NC	-2216+16627	Pacific/Noumea
+@@ -300,7 +300,7 @@ NO	+5955+01045	Europe/Oslo
+ NP	+2743+08519	Asia/Kathmandu
+ NR	-0031+16655	Pacific/Nauru
+ NU	-1901-16955	Pacific/Niue
+-NZ	-3652+17446	Pacific/Auckland	most locations
++NZ	-3652+17446	Pacific/Auckland	New Zealand (most areas)
+ NZ	-4357-17633	Pacific/Chatham	Chatham Islands
+ OM	+2336+05835	Asia/Muscat
+ PA	+0858-07932	America/Panama
+@@ -308,7 +308,7 @@ PE	-1203-07703	America/Lima
+ PF	-1732-14934	Pacific/Tahiti	Society Islands
+ PF	-0900-13930	Pacific/Marquesas	Marquesas Islands
+ PF	-2308-13457	Pacific/Gambier	Gambier Islands
+-PG	-0930+14710	Pacific/Port_Moresby	most locations
++PG	-0930+14710	Pacific/Port_Moresby	Papua New Guinea (most areas)
+ PG	-0613+15534	Pacific/Bougainville	Bougainville
+ PH	+1435+12100	Asia/Manila
+ PK	+2452+06703	Asia/Karachi
+@@ -318,7 +318,7 @@ PN	-2504-13005	Pacific/Pitcairn
+ PR	+182806-0660622	America/Puerto_Rico
+ PS	+3130+03428	Asia/Gaza	Gaza Strip
+ PS	+313200+0350542	Asia/Hebron	West Bank
+-PT	+3843-00908	Europe/Lisbon	mainland
++PT	+3843-00908	Europe/Lisbon	Portugal (mainland)
+ PT	+3238-01654	Atlantic/Madeira	Madeira Islands
+ PT	+3744-02540	Atlantic/Azores	Azores
+ PW	+0720+13429	Pacific/Palau
+@@ -327,27 +327,32 @@ QA	+2517+05132	Asia/Qatar
+ RE	-2052+05528	Indian/Reunion
+ RO	+4426+02606	Europe/Bucharest
+ RS	+4450+02030	Europe/Belgrade
+-RU	+5443+02030	Europe/Kaliningrad	Moscow-01 - Kaliningrad
+-RU	+554521+0373704	Europe/Moscow	Moscow+00 - west Russia
+-RU	+4457+03406	Europe/Simferopol	Moscow+00 - Crimea
+-RU	+4844+04425	Europe/Volgograd	Moscow+00 - Caspian Sea
+-RU	+5312+05009	Europe/Samara	Moscow+00 (Moscow+01 after 2014-10-26) - Samara, Udmurtia
+-RU	+5651+06036	Asia/Yekaterinburg	Moscow+02 - Urals
+-RU	+5500+07324	Asia/Omsk	Moscow+03 - west Siberia
+-RU	+5502+08255	Asia/Novosibirsk	Moscow+03 - Novosibirsk
+-RU	+5345+08707	Asia/Novokuznetsk	Moscow+03 (Moscow+04 after 2014-10-26) - Kemerovo
+-RU	+5601+09250	Asia/Krasnoyarsk	Moscow+04 - Yenisei River
+-RU	+5216+10420	Asia/Irkutsk	Moscow+05 - Lake Baikal
+-RU	+5203+11328	Asia/Chita	Moscow+06 (Moscow+05 after 2014-10-26) - Zabaykalsky
+-RU	+6200+12940	Asia/Yakutsk	Moscow+06 - Lena River
+-RU	+623923+1353314	Asia/Khandyga	Moscow+06 - Tomponsky, Ust-Maysky
+-RU	+4310+13156	Asia/Vladivostok	Moscow+07 - Amur River
+-RU	+4658+14242	Asia/Sakhalin	Moscow+07 - Sakhalin Island
+-RU	+643337+1431336	Asia/Ust-Nera	Moscow+07 - Oymyakonsky
+-RU	+5934+15048	Asia/Magadan	Moscow+08 (Moscow+07 after 2014-10-26) - Magadan
+-RU	+6728+15343	Asia/Srednekolymsk	Moscow+08 - E Sakha, N Kuril Is
+-RU	+5301+15839	Asia/Kamchatka	Moscow+08 (Moscow+09 after 2014-10-26) - Kamchatka
+-RU	+6445+17729	Asia/Anadyr	Moscow+08 (Moscow+09 after 2014-10-26) - Bering Sea
++RU	+5443+02030	Europe/Kaliningrad	MSK-01 - Kaliningrad
++RU	+554521+0373704	Europe/Moscow	MSK+00 - Moscow area
++RU	+4457+03406	Europe/Simferopol	MSK+00 - Crimea
++RU	+4844+04425	Europe/Volgograd	MSK+00 - Volgograd, Saratov
++RU	+5836+04939	Europe/Kirov	MSK+00 - Kirov
++RU	+4621+04803	Europe/Astrakhan	MSK+01 - Astrakhan
++RU	+5312+05009	Europe/Samara	MSK+01 - Samara, Udmurtia
++RU	+5420+04824	Europe/Ulyanovsk	MSK+01 - Ulyanovsk
++RU	+5651+06036	Asia/Yekaterinburg	MSK+02 - Urals
++RU	+5500+07324	Asia/Omsk	MSK+03 - Omsk
++RU	+5502+08255	Asia/Novosibirsk	MSK+03 - Novosibirsk
++RU	+5322+08345	Asia/Barnaul	MSK+04 - Altai
++RU	+5630+08458	Asia/Tomsk	MSK+04 - Tomsk
++RU	+5345+08707	Asia/Novokuznetsk	MSK+04 - Kemerovo
++RU	+5601+09250	Asia/Krasnoyarsk	MSK+04 - Krasnoyarsk area
++RU	+5216+10420	Asia/Irkutsk	MSK+05 - Irkutsk, Buryatia
++RU	+5203+11328	Asia/Chita	MSK+06 - Zabaykalsky
++RU	+6200+12940	Asia/Yakutsk	MSK+06 - Lena River
++RU	+623923+1353314	Asia/Khandyga	MSK+06 - Tomponsky, Ust-Maysky
++RU	+4310+13156	Asia/Vladivostok	MSK+07 - Amur River
++RU	+643337+1431336	Asia/Ust-Nera	MSK+07 - Oymyakonsky
++RU	+5934+15048	Asia/Magadan	MSK+08 - Magadan
++RU	+4658+14242	Asia/Sakhalin	MSK+08 - Sakhalin Island
++RU	+6728+15343	Asia/Srednekolymsk	MSK+08 - Sakha (E); North Kuril Is
++RU	+5301+15839	Asia/Kamchatka	MSK+09 - Kamchatka
++RU	+6445+17729	Asia/Anadyr	MSK+09 - Bering Sea
+ RW	-0157+03004	Africa/Kigali
+ SA	+2438+04643	Asia/Riyadh
+ SB	-0932+16012	Pacific/Guadalcanal
+@@ -386,45 +391,45 @@ TT	+1039-06131	America/Port_of_Spain
+ TV	-0831+17913	Pacific/Funafuti
+ TW	+2503+12130	Asia/Taipei
+ TZ	-0648+03917	Africa/Dar_es_Salaam
+-UA	+5026+03031	Europe/Kiev	most locations
++UA	+5026+03031	Europe/Kiev	Ukraine (most areas)
+ UA	+4837+02218	Europe/Uzhgorod	Ruthenia
+-UA	+4750+03510	Europe/Zaporozhye	Zaporozh'ye, E Lugansk / Zaporizhia, E Luhansk
++UA	+4750+03510	Europe/Zaporozhye	Zaporozh'ye/Zaporizhia; Lugansk/Luhansk (east)
+ UG	+0019+03225	Africa/Kampala
+ UM	+1645-16931	Pacific/Johnston	Johnston Atoll
+ UM	+2813-17722	Pacific/Midway	Midway Islands
+ UM	+1917+16637	Pacific/Wake	Wake Island
+-US	+404251-0740023	America/New_York	Eastern Time
+-US	+421953-0830245	America/Detroit	Eastern Time - Michigan - most locations
+-US	+381515-0854534	America/Kentucky/Louisville	Eastern Time - Kentucky - Louisville area
+-US	+364947-0845057	America/Kentucky/Monticello	Eastern Time - Kentucky - Wayne County
+-US	+394606-0860929	America/Indiana/Indianapolis	Eastern Time - Indiana - most locations
+-US	+384038-0873143	America/Indiana/Vincennes	Eastern Time - Indiana - Daviess, Dubois, Knox & Martin Counties
+-US	+410305-0863611	America/Indiana/Winamac	Eastern Time - Indiana - Pulaski County
+-US	+382232-0862041	America/Indiana/Marengo	Eastern Time - Indiana - Crawford County
+-US	+382931-0871643	America/Indiana/Petersburg	Eastern Time - Indiana - Pike County
+-US	+384452-0850402	America/Indiana/Vevay	Eastern Time - Indiana - Switzerland County
+-US	+415100-0873900	America/Chicago	Central Time
+-US	+375711-0864541	America/Indiana/Tell_City	Central Time - Indiana - Perry County
+-US	+411745-0863730	America/Indiana/Knox	Central Time - Indiana - Starke County
+-US	+450628-0873651	America/Menominee	Central Time - Michigan - Dickinson, Gogebic, Iron & Menominee Counties
+-US	+470659-1011757	America/North_Dakota/Center	Central Time - North Dakota - Oliver County
+-US	+465042-1012439	America/North_Dakota/New_Salem	Central Time - North Dakota - Morton County (except Mandan area)
+-US	+471551-1014640	America/North_Dakota/Beulah	Central Time - North Dakota - Mercer County
+-US	+394421-1045903	America/Denver	Mountain Time
+-US	+433649-1161209	America/Boise	Mountain Time - south Idaho & east Oregon
+-US	+332654-1120424	America/Phoenix	Mountain Standard Time - Arizona (except Navajo)
+-US	+340308-1181434	America/Los_Angeles	Pacific Time
+-US	+550737-1313435	America/Metlakatla	Pacific Standard Time - Annette Island, Alaska
+-US	+611305-1495401	America/Anchorage	Alaska Time
+-US	+581807-1342511	America/Juneau	Alaska Time - Alaska panhandle
+-US	+571035-1351807	America/Sitka	Alaska Time - southeast Alaska panhandle
+-US	+593249-1394338	America/Yakutat	Alaska Time - Alaska panhandle neck
+-US	+643004-1652423	America/Nome	Alaska Time - west Alaska
++US	+404251-0740023	America/New_York	Eastern (most areas)
++US	+421953-0830245	America/Detroit	Eastern - MI (most areas)
++US	+381515-0854534	America/Kentucky/Louisville	Eastern - KY (Louisville area)
++US	+364947-0845057	America/Kentucky/Monticello	Eastern - KY (Wayne)
++US	+394606-0860929	America/Indiana/Indianapolis	Eastern - IN (most areas)
++US	+384038-0873143	America/Indiana/Vincennes	Eastern - IN (Da, Du, K, Mn)
++US	+410305-0863611	America/Indiana/Winamac	Eastern - IN (Pulaski)
++US	+382232-0862041	America/Indiana/Marengo	Eastern - IN (Crawford)
++US	+382931-0871643	America/Indiana/Petersburg	Eastern - IN (Pike)
++US	+384452-0850402	America/Indiana/Vevay	Eastern - IN (Switzerland)
++US	+415100-0873900	America/Chicago	Central (most areas)
++US	+375711-0864541	America/Indiana/Tell_City	Central - IN (Perry)
++US	+411745-0863730	America/Indiana/Knox	Central - IN (Starke)
++US	+450628-0873651	America/Menominee	Central - MI (Wisconsin border)
++US	+470659-1011757	America/North_Dakota/Center	Central - ND (Oliver)
++US	+465042-1012439	America/North_Dakota/New_Salem	Central - ND (Morton rural)
++US	+471551-1014640	America/North_Dakota/Beulah	Central - ND (Mercer)
++US	+394421-1045903	America/Denver	Mountain (most areas)
++US	+433649-1161209	America/Boise	Mountain - ID (south); OR (east)
++US	+332654-1120424	America/Phoenix	MST - Arizona (except Navajo)
++US	+340308-1181434	America/Los_Angeles	Pacific
++US	+611305-1495401	America/Anchorage	Alaska (most areas)
++US	+581807-1342511	America/Juneau	Alaska - Juneau area
++US	+571035-1351807	America/Sitka	Alaska - Sitka area
++US	+550737-1313435	America/Metlakatla	Alaska - Annette Island
++US	+593249-1394338	America/Yakutat	Alaska - Yakutat
++US	+643004-1652423	America/Nome	Alaska (west)
+ US	+515248-1763929	America/Adak	Aleutian Islands
+ US	+211825-1575130	Pacific/Honolulu	Hawaii
+ UY	-3453-05611	America/Montevideo
+-UZ	+3940+06648	Asia/Samarkand	west Uzbekistan
+-UZ	+4120+06918	Asia/Tashkent	east Uzbekistan
++UZ	+3940+06648	Asia/Samarkand	Uzbekistan (west)
++UZ	+4120+06918	Asia/Tashkent	Uzbekistan (east)
+ VA	+415408+0122711	Europe/Vatican
+ VC	+1309-06114	America/St_Vincent
+ VE	+1030-06656	America/Caracas
+Index: contrib/tzdata/zone1970.tab
+===================================================================
+--- contrib/tzdata/zone1970.tab	(revision 309576)
++++ contrib/tzdata/zone1970.tab	(working copy)
+@@ -39,21 +39,21 @@ AE,OM	+2518+05518	Asia/Dubai
+ AF	+3431+06912	Asia/Kabul
+ AL	+4120+01950	Europe/Tirane
+ AM	+4011+04430	Asia/Yerevan
+-AQ	-6734-06808	Antarctica/Rothera	Rothera Station, Adelaide Island
+-AQ	-6448-06406	Antarctica/Palmer	Palmer Station, Anvers Island
+-AQ	-6736+06253	Antarctica/Mawson	Mawson Station, Holme Bay
+-AQ	-6835+07758	Antarctica/Davis	Davis Station, Vestfold Hills
+-AQ	-6617+11031	Antarctica/Casey	Casey Station, Bailey Peninsula
+-AQ	-7824+10654	Antarctica/Vostok	Vostok Station, Lake Vostok
+-AQ	-6640+14001	Antarctica/DumontDUrville	Dumont-d'Urville Station, Adélie Land
+-AQ	-690022+0393524	Antarctica/Syowa	Syowa Station, E Ongul I
+-AQ	-720041+0023206	Antarctica/Troll	Troll Station, Queen Maud Land
++AQ	-6617+11031	Antarctica/Casey	Casey
++AQ	-6835+07758	Antarctica/Davis	Davis
++AQ	-6640+14001	Antarctica/DumontDUrville	Dumont-d'Urville
++AQ	-6736+06253	Antarctica/Mawson	Mawson
++AQ	-6448-06406	Antarctica/Palmer	Palmer
++AQ	-6734-06808	Antarctica/Rothera	Rothera
++AQ	-690022+0393524	Antarctica/Syowa	Syowa
++AQ	-720041+0023206	Antarctica/Troll	Troll
++AQ	-7824+10654	Antarctica/Vostok	Vostok
+ AR	-3436-05827	America/Argentina/Buenos_Aires	Buenos Aires (BA, CF)
+-AR	-3124-06411	America/Argentina/Cordoba	most locations (CB, CC, CN, ER, FM, MN, SE, SF)
+-AR	-2447-06525	America/Argentina/Salta	(SA, LP, NQ, RN)
++AR	-3124-06411	America/Argentina/Cordoba	Argentina (most areas: CB, CC, CN, ER, FM, MN, SE, SF)
++AR	-2447-06525	America/Argentina/Salta	Salta (SA, LP, NQ, RN)
+ AR	-2411-06518	America/Argentina/Jujuy	Jujuy (JY)
+ AR	-2649-06513	America/Argentina/Tucuman	Tucumán (TM)
+-AR	-2828-06547	America/Argentina/Catamarca	Catamarca (CT), Chubut (CH)
++AR	-2828-06547	America/Argentina/Catamarca	Catamarca (CT); Chubut (CH)
+ AR	-2926-06651	America/Argentina/La_Rioja	La Rioja (LR)
+ AR	-3132-06831	America/Argentina/San_Juan	San Juan (SJ)
+ AR	-3253-06849	America/Argentina/Mendoza	Mendoza (MZ)
+@@ -64,17 +64,17 @@ AS,UM	-1416-17042	Pacific/Pago_Pago	Samoa, Midway
+ AT	+4813+01620	Europe/Vienna
+ AU	-3133+15905	Australia/Lord_Howe	Lord Howe Island
+ AU	-5430+15857	Antarctica/Macquarie	Macquarie Island
+-AU	-4253+14719	Australia/Hobart	Tasmania - most locations
+-AU	-3956+14352	Australia/Currie	Tasmania - King Island
++AU	-4253+14719	Australia/Hobart	Tasmania (most areas)
++AU	-3956+14352	Australia/Currie	Tasmania (King Island)
+ AU	-3749+14458	Australia/Melbourne	Victoria
+-AU	-3352+15113	Australia/Sydney	New South Wales - most locations
+-AU	-3157+14127	Australia/Broken_Hill	New South Wales - Yancowinna
+-AU	-2728+15302	Australia/Brisbane	Queensland - most locations
+-AU	-2016+14900	Australia/Lindeman	Queensland - Holiday Islands
++AU	-3352+15113	Australia/Sydney	New South Wales (most areas)
++AU	-3157+14127	Australia/Broken_Hill	New South Wales (Yancowinna)
++AU	-2728+15302	Australia/Brisbane	Queensland (most areas)
++AU	-2016+14900	Australia/Lindeman	Queensland (Whitsunday Islands)
+ AU	-3455+13835	Australia/Adelaide	South Australia
+ AU	-1228+13050	Australia/Darwin	Northern Territory
+-AU	-3157+11551	Australia/Perth	Western Australia - most locations
+-AU	-3143+12852	Australia/Eucla	Western Australia - Eucla area
++AU	-3157+11551	Australia/Perth	Western Australia (most areas)
++AU	-3143+12852	Australia/Eucla	Western Australia (Eucla)
+ AZ	+4023+04951	Asia/Baku
+ BB	+1306-05937	America/Barbados
+ BD	+2343+09025	Asia/Dhaka
+@@ -84,58 +84,58 @@ BM	+3217-06446	Atlantic/Bermuda
+ BN	+0456+11455	Asia/Brunei
+ BO	-1630-06809	America/La_Paz
+ BR	-0351-03225	America/Noronha	Atlantic islands
+-BR	-0127-04829	America/Belem	Amapá, E Pará
+-BR	-0343-03830	America/Fortaleza	NE Brazil (MA, PI, CE, RN, PB)
++BR	-0127-04829	America/Belem	Pará (east); Amapá
++BR	-0343-03830	America/Fortaleza	Brazil (northeast: MA, PI, CE, RN, PB)
+ BR	-0803-03454	America/Recife	Pernambuco
+ BR	-0712-04812	America/Araguaina	Tocantins
+ BR	-0940-03543	America/Maceio	Alagoas, Sergipe
+ BR	-1259-03831	America/Bahia	Bahia
+-BR	-2332-04637	America/Sao_Paulo	S & SE Brazil (GO, DF, MG, ES, RJ, SP, PR, SC, RS)
++BR	-2332-04637	America/Sao_Paulo	Brazil (southeast: GO, DF, MG, ES, RJ, SP, PR, SC, RS)
+ BR	-2027-05437	America/Campo_Grande	Mato Grosso do Sul
+ BR	-1535-05605	America/Cuiaba	Mato Grosso
+-BR	-0226-05452	America/Santarem	W Pará
++BR	-0226-05452	America/Santarem	Pará (west)
+ BR	-0846-06354	America/Porto_Velho	Rondônia
+ BR	+0249-06040	America/Boa_Vista	Roraima
+-BR	-0308-06001	America/Manaus	E Amazonas
+-BR	-0640-06952	America/Eirunepe	W Amazonas
++BR	-0308-06001	America/Manaus	Amazonas (east)
++BR	-0640-06952	America/Eirunepe	Amazonas (west)
+ BR	-0958-06748	America/Rio_Branco	Acre
+ BS	+2505-07721	America/Nassau
+ BT	+2728+08939	Asia/Thimphu
+ BY	+5354+02734	Europe/Minsk
+ BZ	+1730-08812	America/Belize
+-CA	+4734-05243	America/St_Johns	Newfoundland Time, including SE Labrador
+-CA	+4439-06336	America/Halifax	Atlantic Time - Nova Scotia (peninsula), PEI
+-CA	+4612-05957	America/Glace_Bay	Atlantic Time - Nova Scotia (Cape Breton)
+-CA	+4606-06447	America/Moncton	Atlantic Time - New Brunswick
+-CA	+5320-06025	America/Goose_Bay	Atlantic Time - Labrador - most locations
+-CA	+5125-05707	America/Blanc-Sablon	Atlantic Standard Time - Quebec - Lower North Shore
+-CA	+4339-07923	America/Toronto	Eastern Time - Ontario & Quebec - most locations
+-CA	+4901-08816	America/Nipigon	Eastern Time - Ontario & Quebec - places that did not observe DST 1967-1973
+-CA	+4823-08915	America/Thunder_Bay	Eastern Time - Thunder Bay, Ontario
+-CA	+6344-06828	America/Iqaluit	Eastern Time - east Nunavut - most locations
+-CA	+6608-06544	America/Pangnirtung	Eastern Time - Pangnirtung, Nunavut
+-CA	+744144-0944945	America/Resolute	Central Time - Resolute, Nunavut
+-CA	+484531-0913718	America/Atikokan	Eastern Standard Time - Atikokan, Ontario and Southampton I, Nunavut
+-CA	+624900-0920459	America/Rankin_Inlet	Central Time - central Nunavut
+-CA	+4953-09709	America/Winnipeg	Central Time - Manitoba & west Ontario
+-CA	+4843-09434	America/Rainy_River	Central Time - Rainy River & Fort Frances, Ontario
+-CA	+5024-10439	America/Regina	Central Standard Time - Saskatchewan - most locations
+-CA	+5017-10750	America/Swift_Current	Central Standard Time - Saskatchewan - midwest
+-CA	+5333-11328	America/Edmonton	Mountain Time - Alberta, east British Columbia & west Saskatchewan
+-CA	+690650-1050310	America/Cambridge_Bay	Mountain Time - west Nunavut
+-CA	+6227-11421	America/Yellowknife	Mountain Time - central Northwest Territories
+-CA	+682059-1334300	America/Inuvik	Mountain Time - west Northwest Territories
+-CA	+4906-11631	America/Creston	Mountain Standard Time - Creston, British Columbia
+-CA	+5946-12014	America/Dawson_Creek	Mountain Standard Time - Dawson Creek & Fort Saint John, British Columbia
+-CA	+5848-12242	America/Fort_Nelson	Mountain Standard Time - Fort Nelson, British Columbia
+-CA	+4916-12307	America/Vancouver	Pacific Time - west British Columbia
+-CA	+6043-13503	America/Whitehorse	Pacific Time - south Yukon
+-CA	+6404-13925	America/Dawson	Pacific Time - north Yukon
++CA	+4734-05243	America/St_Johns	Newfoundland; Labrador (southeast)
++CA	+4439-06336	America/Halifax	Atlantic - NS (most areas); PE
++CA	+4612-05957	America/Glace_Bay	Atlantic - NS (Cape Breton)
++CA	+4606-06447	America/Moncton	Atlantic - New Brunswick
++CA	+5320-06025	America/Goose_Bay	Atlantic - Labrador (most areas)
++CA	+5125-05707	America/Blanc-Sablon	AST - QC (Lower North Shore)
++CA	+4339-07923	America/Toronto	Eastern - ON, QC (most areas)
++CA	+4901-08816	America/Nipigon	Eastern - ON, QC (no DST 1967-73)
++CA	+4823-08915	America/Thunder_Bay	Eastern - ON (Thunder Bay)
++CA	+6344-06828	America/Iqaluit	Eastern - NU (most east areas)
++CA	+6608-06544	America/Pangnirtung	Eastern - NU (Pangnirtung)
++CA	+484531-0913718	America/Atikokan	EST - ON (Atikokan); NU (Coral H)
++CA	+4953-09709	America/Winnipeg	Central - ON (west); Manitoba
++CA	+4843-09434	America/Rainy_River	Central - ON (Rainy R, Ft Frances)
++CA	+744144-0944945	America/Resolute	Central - NU (Resolute)
++CA	+624900-0920459	America/Rankin_Inlet	Central - NU (central)
++CA	+5024-10439	America/Regina	CST - SK (most areas)
++CA	+5017-10750	America/Swift_Current	CST - SK (midwest)
++CA	+5333-11328	America/Edmonton	Mountain - AB; BC (E); SK (W)
++CA	+690650-1050310	America/Cambridge_Bay	Mountain - NU (west)
++CA	+6227-11421	America/Yellowknife	Mountain - NT (central)
++CA	+682059-1334300	America/Inuvik	Mountain - NT (west)
++CA	+4906-11631	America/Creston	MST - BC (Creston)
++CA	+5946-12014	America/Dawson_Creek	MST - BC (Dawson Cr, Ft St John)
++CA	+5848-12242	America/Fort_Nelson	MST - BC (Ft Nelson)
++CA	+4916-12307	America/Vancouver	Pacific - BC (most areas)
++CA	+6043-13503	America/Whitehorse	Pacific - Yukon (south)
++CA	+6404-13925	America/Dawson	Pacific - Yukon (north)
+ CC	-1210+09655	Indian/Cocos
+ CH,DE,LI	+4723+00832	Europe/Zurich	Swiss time
+ CI,BF,GM,GN,ML,MR,SH,SL,SN,ST,TG	+0519-00402	Africa/Abidjan
+ CK	-2114-15946	Pacific/Rarotonga
+-CL	-3327-07040	America/Santiago	most locations
++CL	-3327-07040	America/Santiago	Chile (most areas)
+ CL	-2709-10926	Pacific/Easter	Easter Island
+ CN	+3114+12128	Asia/Shanghai	Beijing Time
+ CN	+4348+08735	Asia/Urumqi	Xinjiang Time
+@@ -145,25 +145,26 @@ CU	+2308-08222	America/Havana
+ CV	+1455-02331	Atlantic/Cape_Verde
+ CW,AW,BQ,SX	+1211-06900	America/Curacao
+ CX	-1025+10543	Indian/Christmas
+-CY	+3510+03322	Asia/Nicosia
++CY	+3510+03322	Asia/Nicosia	Cyprus (most areas)
++CY	+3507+03357	Asia/Famagusta	Northern Cyprus
+ CZ,SK	+5005+01426	Europe/Prague
+-DE	+5230+01322	Europe/Berlin	Berlin time
++DE	+5230+01322	Europe/Berlin	Germany (most areas)
+ DK	+5540+01235	Europe/Copenhagen
+ DO	+1828-06954	America/Santo_Domingo
+ DZ	+3647+00303	Africa/Algiers
+-EC	-0210-07950	America/Guayaquil	mainland
++EC	-0210-07950	America/Guayaquil	Ecuador (mainland)
+ EC	-0054-08936	Pacific/Galapagos	Galápagos Islands
+ EE	+5925+02445	Europe/Tallinn
+ EG	+3003+03115	Africa/Cairo
+ EH	+2709-01312	Africa/El_Aaiun
+-ES	+4024-00341	Europe/Madrid	mainland
+-ES	+3553-00519	Africa/Ceuta	Ceuta & Melilla
++ES	+4024-00341	Europe/Madrid	Spain (mainland)
++ES	+3553-00519	Africa/Ceuta	Ceuta, Melilla
+ ES	+2806-01524	Atlantic/Canary	Canary Islands
+ FI,AX	+6010+02458	Europe/Helsinki
+ FJ	-1808+17825	Pacific/Fiji
+ FK	-5142-05751	Atlantic/Stanley
+-FM	+0725+15147	Pacific/Chuuk	Chuuk (Truk) and Yap
+-FM	+0658+15813	Pacific/Pohnpei	Pohnpei (Ponape)
++FM	+0725+15147	Pacific/Chuuk	Chuuk/Truk, Yap
++FM	+0658+15813	Pacific/Pohnpei	Pohnpei/Ponape
+ FM	+0519+16259	Pacific/Kosrae	Kosrae
+ FO	+6201-00646	Atlantic/Faroe
+ FR	+4852+00220	Europe/Paris
+@@ -172,10 +173,10 @@ GE	+4143+04449	Asia/Tbilisi
+ GF	+0456-05220	America/Cayenne
+ GH	+0533-00013	Africa/Accra
+ GI	+3608-00521	Europe/Gibraltar
+-GL	+6411-05144	America/Godthab	most locations
+-GL	+7646-01840	America/Danmarkshavn	east coast, north of Scoresbysund
+-GL	+7029-02158	America/Scoresbysund	Scoresbysund / Ittoqqortoormiit
+-GL	+7634-06847	America/Thule	Thule / Pituffik
++GL	+6411-05144	America/Godthab	Greenland (most areas)
++GL	+7646-01840	America/Danmarkshavn	National Park (east coast)
++GL	+7029-02158	America/Scoresbysund	Scoresbysund/Ittoqqortoormiit
++GL	+7634-06847	America/Thule	Thule/Pituffik
+ GR	+3758+02343	Europe/Athens
+ GS	-5416-03632	Atlantic/South_Georgia
+ GT	+1438-09031	America/Guatemala
+@@ -186,10 +187,10 @@ HK	+2217+11409	Asia/Hong_Kong
+ HN	+1406-08713	America/Tegucigalpa
+ HT	+1832-07220	America/Port-au-Prince
+ HU	+4730+01905	Europe/Budapest
+-ID	-0610+10648	Asia/Jakarta	Java & Sumatra
+-ID	-0002+10920	Asia/Pontianak	west & central Borneo
+-ID	-0507+11924	Asia/Makassar	east & south Borneo, Sulawesi (Celebes), Bali, Nusa Tengarra, west Timor
+-ID	-0232+14042	Asia/Jayapura	west New Guinea (Irian Jaya) & Malukus (Moluccas)
++ID	-0610+10648	Asia/Jakarta	Java, Sumatra
++ID	-0002+10920	Asia/Pontianak	Borneo (west, central)
++ID	-0507+11924	Asia/Makassar	Borneo (east, south); Sulawesi/Celebes, Bali, Nusa Tengarra; Timor (west)
++ID	-0232+14042	Asia/Jayapura	New Guinea (West Papua / Irian Jaya); Malukus/Moluccas
+ IE	+5320-00615	Europe/Dublin
+ IL	+314650+0351326	Asia/Jerusalem
+ IN	+2232+08822	Asia/Kolkata
+@@ -208,11 +209,10 @@ KI	-0308-17105	Pacific/Enderbury	Phoenix Islands
+ KI	+0152-15720	Pacific/Kiritimati	Line Islands
+ KP	+3901+12545	Asia/Pyongyang
+ KR	+3733+12658	Asia/Seoul
+-KY	+1918-08123	America/Cayman
+-KZ	+4315+07657	Asia/Almaty	most locations
+-KZ	+4448+06528	Asia/Qyzylorda	Qyzylorda (Kyzylorda, Kzyl-Orda)
+-KZ	+5017+05710	Asia/Aqtobe	Aqtobe (Aktobe)
+-KZ	+4431+05016	Asia/Aqtau	Atyrau (Atirau, Gur'yev), Mangghystau (Mankistau)
++KZ	+4315+07657	Asia/Almaty	Kazakhstan (most areas)
++KZ	+4448+06528	Asia/Qyzylorda	Qyzylorda/Kyzylorda/Kzyl-Orda
++KZ	+5017+05710	Asia/Aqtobe	Aqtobe/Aktobe
++KZ	+4431+05016	Asia/Aqtau	Atyrau/Atirau/Gur'yev, Mangghystau/Mankistau
+ KZ	+5113+05121	Asia/Oral	West Kazakhstan
+ LB	+3353+03530	Asia/Beirut
+ LK	+0656+07951	Asia/Colombo
+@@ -224,10 +224,10 @@ LY	+3254+01311	Africa/Tripoli
+ MA	+3339-00735	Africa/Casablanca
+ MC	+4342+00723	Europe/Monaco
+ MD	+4700+02850	Europe/Chisinau
+-MH	+0709+17112	Pacific/Majuro	most locations
++MH	+0709+17112	Pacific/Majuro	Marshall Islands (most areas)
+ MH	+0905+16720	Pacific/Kwajalein	Kwajalein
+-MM	+1647+09610	Asia/Rangoon
+-MN	+4755+10653	Asia/Ulaanbaatar	most locations
++MM	+1647+09610	Asia/Yangon
++MN	+4755+10653	Asia/Ulaanbaatar	Mongolia (most areas)
+ MN	+4801+09139	Asia/Hovd	Bayan-Ölgii, Govi-Altai, Hovd, Uvs, Zavkhan
+ MN	+4804+11430	Asia/Choibalsan	Dornod, Sükhbaatar
+ MO	+2214+11335	Asia/Macau
+@@ -235,25 +235,24 @@ MQ	+1436-06105	America/Martinique
+ MT	+3554+01431	Europe/Malta
+ MU	-2010+05730	Indian/Mauritius
+ MV	+0410+07330	Indian/Maldives
+-MX	+1924-09909	America/Mexico_City	Central Time - most locations
++MX	+1924-09909	America/Mexico_City	Central Time
+ MX	+2105-08646	America/Cancun	Eastern Standard Time - Quintana Roo
+ MX	+2058-08937	America/Merida	Central Time - Campeche, Yucatán
+-MX	+2540-10019	America/Monterrey	Mexican Central Time - Coahuila, Durango, Nuevo León, Tamaulipas away from US border
+-MX	+2550-09730	America/Matamoros	US Central Time - Coahuila, Durango, Nuevo León, Tamaulipas near US border
+-MX	+2313-10625	America/Mazatlan	Mountain Time - S Baja, Nayarit, Sinaloa
+-MX	+2838-10605	America/Chihuahua	Mexican Mountain Time - Chihuahua away from US border
+-MX	+2934-10425	America/Ojinaga	US Mountain Time - Chihuahua near US border
++MX	+2540-10019	America/Monterrey	Central Time - Durango; Coahuila, Nuevo León, Tamaulipas (most areas)
++MX	+2550-09730	America/Matamoros	Central Time US - Coahuila, Nuevo León, Tamaulipas (US border)
++MX	+2313-10625	America/Mazatlan	Mountain Time - Baja California Sur, Nayarit, Sinaloa
++MX	+2838-10605	America/Chihuahua	Mountain Time - Chihuahua (most areas)
++MX	+2934-10425	America/Ojinaga	Mountain Time US - Chihuahua (US border)
+ MX	+2904-11058	America/Hermosillo	Mountain Standard Time - Sonora
+-MX	+3232-11701	America/Tijuana	US Pacific Time - Baja California near US border
+-MX	+3018-11452	America/Santa_Isabel	Mexican Pacific Time - Baja California away from US border
+-MX	+2048-10515	America/Bahia_Banderas	Mexican Central Time - Bahía de Banderas
+-MY	+0310+10142	Asia/Kuala_Lumpur	peninsular Malaysia
+-MY	+0133+11020	Asia/Kuching	Sabah & Sarawak
+-MZ,BI,BW,CD,MW,RW,ZM,ZW	-2558+03235	Africa/Maputo	Central Africa Time (UTC+2)
++MX	+3232-11701	America/Tijuana	Pacific Time US - Baja California
++MX	+2048-10515	America/Bahia_Banderas	Central Time - Bahía de Banderas
++MY	+0310+10142	Asia/Kuala_Lumpur	Malaysia (peninsula)
++MY	+0133+11020	Asia/Kuching	Sabah, Sarawak
++MZ,BI,BW,CD,MW,RW,ZM,ZW	-2558+03235	Africa/Maputo	Central Africa Time
+ NA	-2234+01706	Africa/Windhoek
+ NC	-2216+16627	Pacific/Noumea
+ NF	-2903+16758	Pacific/Norfolk
+-NG,AO,BJ,CD,CF,CG,CM,GA,GQ,NE	+0627+00324	Africa/Lagos	West Africa Time (UTC+1)
++NG,AO,BJ,CD,CF,CG,CM,GA,GQ,NE	+0627+00324	Africa/Lagos	West Africa Time
+ NI	+1209-08617	America/Managua
+ NL	+5222+00454	Europe/Amsterdam
+ NO,SJ	+5955+01045	Europe/Oslo
+@@ -262,12 +261,12 @@ NR	-0031+16655	Pacific/Nauru
+ NU	-1901-16955	Pacific/Niue
+ NZ,AQ	-3652+17446	Pacific/Auckland	New Zealand time
+ NZ	-4357-17633	Pacific/Chatham	Chatham Islands
+-PA	+0858-07932	America/Panama
++PA,KY	+0858-07932	America/Panama
+ PE	-1203-07703	America/Lima
+ PF	-1732-14934	Pacific/Tahiti	Society Islands
+ PF	-0900-13930	Pacific/Marquesas	Marquesas Islands
+ PF	-2308-13457	Pacific/Gambier	Gambier Islands
+-PG	-0930+14710	Pacific/Port_Moresby	most locations
++PG	-0930+14710	Pacific/Port_Moresby	Papua New Guinea (most areas)
+ PG	-0613+15534	Pacific/Bougainville	Bougainville
+ PH	+1435+12100	Asia/Manila
+ PK	+2452+06703	Asia/Karachi
+@@ -277,36 +276,41 @@ PN	-2504-13005	Pacific/Pitcairn
+ PR	+182806-0660622	America/Puerto_Rico
+ PS	+3130+03428	Asia/Gaza	Gaza Strip
+ PS	+313200+0350542	Asia/Hebron	West Bank
+-PT	+3843-00908	Europe/Lisbon	mainland
++PT	+3843-00908	Europe/Lisbon	Portugal (mainland)
+ PT	+3238-01654	Atlantic/Madeira	Madeira Islands
+ PT	+3744-02540	Atlantic/Azores	Azores
+ PW	+0720+13429	Pacific/Palau
+ PY	-2516-05740	America/Asuncion
+ QA,BH	+2517+05132	Asia/Qatar
+-RE,TF	-2052+05528	Indian/Reunion	Réunion, Crozet Is, Scattered Is
++RE,TF	-2052+05528	Indian/Reunion	Réunion, Crozet, Scattered Islands
+ RO	+4426+02606	Europe/Bucharest
+ RS,BA,HR,ME,MK,SI	+4450+02030	Europe/Belgrade
+-RU	+5443+02030	Europe/Kaliningrad	Moscow-01 - Kaliningrad
+-RU	+554521+0373704	Europe/Moscow	Moscow+00 - west Russia
+-RU	+4457+03406	Europe/Simferopol	Moscow+00 - Crimea
+-RU	+4844+04425	Europe/Volgograd	Moscow+00 - Caspian Sea
+-RU	+5312+05009	Europe/Samara	Moscow+00 (Moscow+01 after 2014-10-26) - Samara, Udmurtia
+-RU	+5651+06036	Asia/Yekaterinburg	Moscow+02 - Urals
+-RU	+5500+07324	Asia/Omsk	Moscow+03 - west Siberia
+-RU	+5502+08255	Asia/Novosibirsk	Moscow+03 - Novosibirsk
+-RU	+5345+08707	Asia/Novokuznetsk	Moscow+03 (Moscow+04 after 2014-10-26) - Kemerovo
+-RU	+5601+09250	Asia/Krasnoyarsk	Moscow+04 - Yenisei River
+-RU	+5216+10420	Asia/Irkutsk	Moscow+05 - Lake Baikal
+-RU	+5203+11328	Asia/Chita	Moscow+06 (Moscow+05 after 2014-10-26) - Zabaykalsky
+-RU	+6200+12940	Asia/Yakutsk	Moscow+06 - Lena River
+-RU	+623923+1353314	Asia/Khandyga	Moscow+06 - Tomponsky, Ust-Maysky
+-RU	+4310+13156	Asia/Vladivostok	Moscow+07 - Amur River
+-RU	+4658+14242	Asia/Sakhalin	Moscow+07 - Sakhalin Island
+-RU	+643337+1431336	Asia/Ust-Nera	Moscow+07 - Oymyakonsky
+-RU	+5934+15048	Asia/Magadan	Moscow+08 (Moscow+07 after 2014-10-26) - Magadan
+-RU	+6728+15343	Asia/Srednekolymsk	Moscow+08 - E Sakha, N Kuril Is
+-RU	+5301+15839	Asia/Kamchatka	Moscow+08 (Moscow+09 after 2014-10-26) - Kamchatka
+-RU	+6445+17729	Asia/Anadyr	Moscow+08 (Moscow+09 after 2014-10-26) - Bering Sea
++RU	+5443+02030	Europe/Kaliningrad	MSK-01 - Kaliningrad
++RU	+554521+0373704	Europe/Moscow	MSK+00 - Moscow area
++RU	+4457+03406	Europe/Simferopol	MSK+00 - Crimea
++RU	+4844+04425	Europe/Volgograd	MSK+00 - Volgograd, Saratov
++RU	+5836+04939	Europe/Kirov	MSK+00 - Kirov
++RU	+4621+04803	Europe/Astrakhan	MSK+01 - Astrakhan
++RU	+5312+05009	Europe/Samara	MSK+01 - Samara, Udmurtia
++RU	+5420+04824	Europe/Ulyanovsk	MSK+01 - Ulyanovsk
++RU	+5651+06036	Asia/Yekaterinburg	MSK+02 - Urals
++RU	+5500+07324	Asia/Omsk	MSK+03 - Omsk
++RU	+5502+08255	Asia/Novosibirsk	MSK+03 - Novosibirsk
++RU	+5322+08345	Asia/Barnaul	MSK+04 - Altai
++RU	+5630+08458	Asia/Tomsk	MSK+04 - Tomsk
++RU	+5345+08707	Asia/Novokuznetsk	MSK+04 - Kemerovo
++RU	+5601+09250	Asia/Krasnoyarsk	MSK+04 - Krasnoyarsk area
++RU	+5216+10420	Asia/Irkutsk	MSK+05 - Irkutsk, Buryatia
++RU	+5203+11328	Asia/Chita	MSK+06 - Zabaykalsky
++RU	+6200+12940	Asia/Yakutsk	MSK+06 - Lena River
++RU	+623923+1353314	Asia/Khandyga	MSK+06 - Tomponsky, Ust-Maysky
++RU	+4310+13156	Asia/Vladivostok	MSK+07 - Amur River
++RU	+643337+1431336	Asia/Ust-Nera	MSK+07 - Oymyakonsky
++RU	+5934+15048	Asia/Magadan	MSK+08 - Magadan
++RU	+4658+14242	Asia/Sakhalin	MSK+08 - Sakhalin Island
++RU	+6728+15343	Asia/Srednekolymsk	MSK+08 - Sakha (E); North Kuril Is
++RU	+5301+15839	Asia/Kamchatka	MSK+09 - Kamchatka
++RU	+6445+17729	Asia/Anadyr	MSK+09 - Bering Sea
+ SA,KW,YE	+2438+04643	Asia/Riyadh
+ SB	-0932+16012	Pacific/Guadalcanal
+ SC	-0440+05528	Indian/Mahe
+@@ -318,8 +322,8 @@ SV	+1342-08912	America/El_Salvador
+ SY	+3330+03618	Asia/Damascus
+ TC	+2128-07108	America/Grand_Turk
+ TD	+1207+01503	Africa/Ndjamena
+-TF	-492110+0701303	Indian/Kerguelen	Kerguelen, St Paul I, Amsterdam I
+-TH,KH,LA,VN	+1345+10031	Asia/Bangkok	most of Indochina
++TF	-492110+0701303	Indian/Kerguelen	Kerguelen, St Paul Island, Amsterdam Island
++TH,KH,LA,VN	+1345+10031	Asia/Bangkok	Indochina (most areas)
+ TJ	+3835+06848	Asia/Dushanbe
+ TK	-0922-17114	Pacific/Fakaofo
+ TL	-0833+12535	Asia/Dili
+@@ -330,44 +334,44 @@ TR	+4101+02858	Europe/Istanbul
+ TT,AG,AI,BL,DM,GD,GP,KN,LC,MF,MS,VC,VG,VI	+1039-06131	America/Port_of_Spain
+ TV	-0831+17913	Pacific/Funafuti
+ TW	+2503+12130	Asia/Taipei
+-UA	+5026+03031	Europe/Kiev	most locations
++UA	+5026+03031	Europe/Kiev	Ukraine (most areas)
+ UA	+4837+02218	Europe/Uzhgorod	Ruthenia
+-UA	+4750+03510	Europe/Zaporozhye	Zaporozh'ye, E Lugansk / Zaporizhia, E Luhansk
++UA	+4750+03510	Europe/Zaporozhye	Zaporozh'ye/Zaporizhia; Lugansk/Luhansk (east)
+ UM	+1917+16637	Pacific/Wake	Wake Island
+-US	+404251-0740023	America/New_York	Eastern Time
+-US	+421953-0830245	America/Detroit	Eastern Time - Michigan - most locations
+-US	+381515-0854534	America/Kentucky/Louisville	Eastern Time - Kentucky - Louisville area
+-US	+364947-0845057	America/Kentucky/Monticello	Eastern Time - Kentucky - Wayne County
+-US	+394606-0860929	America/Indiana/Indianapolis	Eastern Time - Indiana - most locations
+-US	+384038-0873143	America/Indiana/Vincennes	Eastern Time - Indiana - Daviess, Dubois, Knox & Martin Counties
+-US	+410305-0863611	America/Indiana/Winamac	Eastern Time - Indiana - Pulaski County
+-US	+382232-0862041	America/Indiana/Marengo	Eastern Time - Indiana - Crawford County
+-US	+382931-0871643	America/Indiana/Petersburg	Eastern Time - Indiana - Pike County
+-US	+384452-0850402	America/Indiana/Vevay	Eastern Time - Indiana - Switzerland County
+-US	+415100-0873900	America/Chicago	Central Time
+-US	+375711-0864541	America/Indiana/Tell_City	Central Time - Indiana - Perry County
+-US	+411745-0863730	America/Indiana/Knox	Central Time - Indiana - Starke County
+-US	+450628-0873651	America/Menominee	Central Time - Michigan - Dickinson, Gogebic, Iron & Menominee Counties
+-US	+470659-1011757	America/North_Dakota/Center	Central Time - North Dakota - Oliver County
+-US	+465042-1012439	America/North_Dakota/New_Salem	Central Time - North Dakota - Morton County (except Mandan area)
+-US	+471551-1014640	America/North_Dakota/Beulah	Central Time - North Dakota - Mercer County
+-US	+394421-1045903	America/Denver	Mountain Time
+-US	+433649-1161209	America/Boise	Mountain Time - south Idaho & east Oregon
+-US	+332654-1120424	America/Phoenix	Mountain Standard Time - Arizona (except Navajo)
+-US	+340308-1181434	America/Los_Angeles	Pacific Time
+-US	+550737-1313435	America/Metlakatla	Pacific Standard Time - Annette Island, Alaska
+-US	+611305-1495401	America/Anchorage	Alaska Time
+-US	+581807-1342511	America/Juneau	Alaska Time - Alaska panhandle
+-US	+571035-1351807	America/Sitka	Alaska Time - southeast Alaska panhandle
+-US	+593249-1394338	America/Yakutat	Alaska Time - Alaska panhandle neck
+-US	+643004-1652423	America/Nome	Alaska Time - west Alaska
++US	+404251-0740023	America/New_York	Eastern (most areas)
++US	+421953-0830245	America/Detroit	Eastern - MI (most areas)
++US	+381515-0854534	America/Kentucky/Louisville	Eastern - KY (Louisville area)
++US	+364947-0845057	America/Kentucky/Monticello	Eastern - KY (Wayne)
++US	+394606-0860929	America/Indiana/Indianapolis	Eastern - IN (most areas)
++US	+384038-0873143	America/Indiana/Vincennes	Eastern - IN (Da, Du, K, Mn)
++US	+410305-0863611	America/Indiana/Winamac	Eastern - IN (Pulaski)
++US	+382232-0862041	America/Indiana/Marengo	Eastern - IN (Crawford)
++US	+382931-0871643	America/Indiana/Petersburg	Eastern - IN (Pike)
++US	+384452-0850402	America/Indiana/Vevay	Eastern - IN (Switzerland)
++US	+415100-0873900	America/Chicago	Central (most areas)
++US	+375711-0864541	America/Indiana/Tell_City	Central - IN (Perry)
++US	+411745-0863730	America/Indiana/Knox	Central - IN (Starke)
++US	+450628-0873651	America/Menominee	Central - MI (Wisconsin border)
++US	+470659-1011757	America/North_Dakota/Center	Central - ND (Oliver)
++US	+465042-1012439	America/North_Dakota/New_Salem	Central - ND (Morton rural)
++US	+471551-1014640	America/North_Dakota/Beulah	Central - ND (Mercer)
++US	+394421-1045903	America/Denver	Mountain (most areas)
++US	+433649-1161209	America/Boise	Mountain - ID (south); OR (east)
++US	+332654-1120424	America/Phoenix	MST - Arizona (except Navajo)
++US	+340308-1181434	America/Los_Angeles	Pacific
++US	+611305-1495401	America/Anchorage	Alaska (most areas)
++US	+581807-1342511	America/Juneau	Alaska - Juneau area
++US	+571035-1351807	America/Sitka	Alaska - Sitka area
++US	+550737-1313435	America/Metlakatla	Alaska - Annette Island
++US	+593249-1394338	America/Yakutat	Alaska - Yakutat
++US	+643004-1652423	America/Nome	Alaska (west)
+ US	+515248-1763929	America/Adak	Aleutian Islands
+-US,UM	+211825-1575130	Pacific/Honolulu	Hawaii time
++US,UM	+211825-1575130	Pacific/Honolulu	Hawaii
+ UY	-3453-05611	America/Montevideo
+-UZ	+3940+06648	Asia/Samarkand	west Uzbekistan
+-UZ	+4120+06918	Asia/Tashkent	east Uzbekistan
++UZ	+3940+06648	Asia/Samarkand	Uzbekistan (west)
++UZ	+4120+06918	Asia/Tashkent	Uzbekistan (east)
+ VE	+1030-06656	America/Caracas
+-VN	+1045+10640	Asia/Ho_Chi_Minh	south Vietnam
++VN	+1045+10640	Asia/Ho_Chi_Minh	Vietnam (south)
+ VU	-1740+16825	Pacific/Efate
+ WF	-1318-17610	Pacific/Wallis
+ WS	-1350-17144	Pacific/Apia
+Index: contrib/tzdata/zoneinfo2tdf.pl
+===================================================================
+--- contrib/tzdata/zoneinfo2tdf.pl	(nonexistent)
++++ contrib/tzdata/zoneinfo2tdf.pl	(working copy)
+@@ -0,0 +1,52 @@
++#! /usr/bin/perl -w
++
++# Courtesy Ken Pizzini.
++
++use strict;
++
++#This file released to the public domain.
++
++# Note: error checking is poor; trust the output only if the input
++# has been checked by zic.
++
++my $contZone = '';
++while (<>) {
++  my $origline = $_;
++  my @fields = ();
++  while (s/^\s*((?:"[^"]*"|[^\s#])+)//) {
++    push @fields, $1;
++  }
++  next unless @fields;
++
++  my $type = lc($fields[0]);
++  if ($contZone) {
++    @fields >= 3 or warn "bad continuation line";
++    unshift @fields, '+', $contZone;
++    $type = 'zone';
++  }
++
++  $contZone = '';
++  if ($type eq 'zone') {
++    # Zone  NAME  GMTOFF  RULES/SAVE  FORMAT  [UNTIL]
++    my $nfields = @fields;
++    $nfields >= 5 or warn "bad zone line";
++    if ($nfields > 6) {
++      #this splice is optional, depending on one's preference
++      #(one big date-time field, or componentized date and time):
++      splice(@fields, 5, $nfields-5, "@fields[5..$nfields-1]");
++    }
++    $contZone = $fields[1] if @fields > 5;
++  } elsif ($type eq 'rule') {
++    # Rule  NAME  FROM  TO  TYPE  IN  ON  AT  SAVE  LETTER/S
++    @fields == 10 or warn "bad rule line";
++  } elsif ($type eq 'link') {
++    # Link  TARGET  LINK-NAME
++    @fields == 3 or warn "bad link line";
++  } elsif ($type eq 'leap') {
++    # Leap  YEAR  MONTH  DAY  HH:MM:SS  CORR  R/S
++    @fields == 7 or warn "bad leap line";
++  } else {
++    warn "Fubar at input line $.: $origline";
++  }
++  print join("\t", @fields), "\n";
++}

Property changes on: user/gjb/releng-rewrite/share/security/patches/EN-16:20/tzdata-10.3.patch
___________________________________________________________________
Added: fbsd:nokeywords
## -0,0 +1 ##
+yes
\ No newline at end of property
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Added: svn:mime-type
## -0,0 +1 ##
+text/plain
\ No newline at end of property
Index: user/gjb/releng-rewrite/share/security/patches/EN-16:20/tzdata-10.3.patch.asc
===================================================================
--- user/gjb/releng-rewrite/share/security/patches/EN-16:20/tzdata-10.3.patch.asc	(nonexistent)
+++ user/gjb/releng-rewrite/share/security/patches/EN-16:20/tzdata-10.3.patch.asc	(revision 49725)
@@ -0,0 +1,16 @@
+-----BEGIN PGP SIGNATURE-----
+
+iQIcBAABCgAGBQJYRw1rAAoJEO1n7NZdz2rnaioQALum72PK209dPIUB9BkXDrjG
+SImE+wglkK9noM97NzFF4oQfHmXNaVI/ILOEM3aT7Kcqc7ls6h2n41lsVSu8aFZt
+ydtu0NC7Y55FKIss2JpbQyHAaSiXIVEr2bnBMFjYIvLe4ABnHYRvlUr653A3wYm2
+/dvsnxBF0mwcymBT7F2p4+koGpPDgeQ8CcABGinDS+QtquLmR2mnpq4CrDmtROvd
+52oBg5vLvgamsGEsIoAjygr5/MkWjPo4Xv/tiABxSSwHRHg81rf0Zf+7OdR24DYE
+qJnIEyMCjLPM/NPxL0yckyvArQAQLqyZTFxyzuLJXOIw7U9kY3vmu7phbXajifl1
+aJuYnH8jQFKcmaFbNKP7Pf1+vYNaa90ult3SI9HtuPRmR36T+bFs9kiYmbzd3UyM
+vtdOnaeQFt0DH2dE5EEfXOW6/jux6QG2CU4DXFbOjLyMoHW0b1lsnql0u/zjsvWX
+PAz2TmXWCYY3+4r2qIEi4r9AJyoNDIp1IPmG+LFz22gg8BZncaHV7f/DHQkRzDHb
+KlUMTCVV3+lhIWh2rfgpEEPNQjkn8F38rd924Nq8x1w0n+k+SbLc0TdYWhpkwf5+
+vYWDgPKXlTbBtdA3FvksHMcnHARhjDKDqYXfVc6hR2Pn6cdap+4UAWg6+Zc/g6hf
+MrxKZtJElQl2ITBT6Rzp
+=D16j
+-----END PGP SIGNATURE-----

Property changes on: user/gjb/releng-rewrite/share/security/patches/EN-16:20/tzdata-10.3.patch.asc
___________________________________________________________________
Added: fbsd:nokeywords
## -0,0 +1 ##
+yes
\ No newline at end of property
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Added: svn:mime-type
## -0,0 +1 ##
+text/plain
\ No newline at end of property
Index: user/gjb/releng-rewrite/share/security/patches/EN-16:20/tzdata-11.0.patch
===================================================================
--- user/gjb/releng-rewrite/share/security/patches/EN-16:20/tzdata-11.0.patch	(nonexistent)
+++ user/gjb/releng-rewrite/share/security/patches/EN-16:20/tzdata-11.0.patch	(revision 49725)
@@ -0,0 +1,10655 @@
+--- contrib/tzdata/CONTRIBUTING.orig
++++ contrib/tzdata/CONTRIBUTING
+@@ -0,0 +1,73 @@
++Contributing to the tz code and data
++
++The time zone database is by no means authoritative: governments
++change timekeeping rules erratically and sometimes with little
++warning, the data entries do not cover all of civil time before
++1970, and undoubtedly errors remain in the code and data.  Feel
++free to fill gaps or fix mistakes, and please email improvements
++to tz@iana.org for use in the future.
++
++To email small changes, please run a POSIX shell command like
++'diff -u old/europe new/europe >myfix.patch', and attach
++myfix.patch to the email.
++
++For more-elaborate changes, please read the Theory file and browse
++the mailing list archives <http://mm.icann.org/pipermail/tz/> for
++examples of patches that tend to work well.  Ideally, additions to
++data should contain commentary citing reliable sources as
++justification.
++
++Please submit changes against either the latest release in
++<ftp://ftp.iana.org/tz/> or the master branch of the experimental
++Git repository.  If you use Git the following workflow may be helpful:
++
++  * Copy the experimental repository.
++
++      git clone https://github.com/eggert/tz.git
++      cd tz
++
++  * Get current with the master branch.
++
++      git checkout master
++      git pull
++
++  * Switch to a new branch for the changes.  Choose a different
++    branch name for each change set.
++
++      git checkout -b mybranch
++
++  * Edit source files.  Include commentary that justifies the
++    changes by citing reliable sources.
++
++  * Debug the changes, e.g.:
++
++      make check
++      make install
++      ./zdump -v America/Los_Angeles
++
++  * For each separable change, commit it in the new branch, e.g.:
++
++      git add northamerica
++      git commit
++
++    See recent 'git log' output for the commit-message style.
++
++  * Create patch files 0001-*, 0002-*, ...
++
++      git format-patch master
++
++  * After reviewing the patch files, send the patches to tz@iana.org
++    for others to review.
++
++      git send-email master
++
++  * Start anew by getting current with the master branch again
++    (the second step above).
++
++Please do not create issues or pull requests on GitHub, as the
++proper procedure for proposing and distributing patches is via
++email as illustrated above.
++
++-----
++
++This file is in the public domain.
+--- contrib/tzdata/LICENSE.orig
++++ contrib/tzdata/LICENSE
+@@ -0,0 +1,4 @@
++With a few exceptions, all files in the tz code and data (including
++this one) are in the public domain.  The exceptions are date.c,
++newstrftime.3, and strftime.c, which contain material derived from BSD
++and which use the BSD 3-clause license.
+--- contrib/tzdata/Makefile.orig
++++ contrib/tzdata/Makefile
+@@ -0,0 +1,793 @@
++# This file is in the public domain, so clarified as of
++# 2009-05-17 by Arthur David Olson.
++
++# Package name for the code distribution.
++PACKAGE=	tzcode
++
++# Version number for the distribution, overridden in the 'tarballs' rule below.
++VERSION=	unknown
++
++# Email address for bug reports.
++BUGEMAIL=	tz@iana.org
++
++# Change the line below for your time zone (after finding the zone you want in
++# the time zone files, or adding it to a time zone file).
++# Alternately, if you discover you've got the wrong time zone, you can just
++#	zic -l rightzone
++# to correct things.
++# Use the command
++#	make zonenames
++# to get a list of the values you can use for LOCALTIME.
++
++LOCALTIME=	GMT
++
++# If you want something other than Eastern United States time as a template
++# for handling POSIX-style time zone environment variables,
++# change the line below (after finding the zone you want in the
++# time zone files, or adding it to a time zone file).
++# (When a POSIX-style environment variable is handled, the rules in the
++# template file are used to determine "spring forward" and "fall back" days and
++# times; the environment variable itself specifies UT offsets of standard and
++# summer time.)
++# Alternately, if you discover you've got the wrong time zone, you can just
++#	zic -p rightzone
++# to correct things.
++# Use the command
++#	make zonenames
++# to get a list of the values you can use for POSIXRULES.
++# If you want POSIX compatibility, use "America/New_York".
++
++POSIXRULES=	America/New_York
++
++# Also see TZDEFRULESTRING below, which takes effect only
++# if the time zone files cannot be accessed.
++
++# Everything gets put in subdirectories of. . .
++
++TOPDIR=		/usr/local
++
++# "Compiled" time zone information is placed in the "TZDIR" directory
++# (and subdirectories).
++# Use an absolute path name for TZDIR unless you're just testing the software.
++
++TZDIR_BASENAME=	zoneinfo
++TZDIR=		$(TOPDIR)/etc/$(TZDIR_BASENAME)
++
++# Types to try, as an alternative to time_t.  int64_t should be first.
++TIME_T_ALTERNATIVES= int64_t int32_t uint32_t uint64_t
++
++# The "tzselect", "zic", and "zdump" commands get installed in. . .
++
++ETCDIR=		$(TOPDIR)/etc
++
++# If you "make INSTALL", the "date" command gets installed in. . .
++
++BINDIR=		$(TOPDIR)/bin
++
++# Manual pages go in subdirectories of. . .
++
++MANDIR=		$(TOPDIR)/man
++
++# Library functions are put in an archive in LIBDIR.
++
++LIBDIR=		$(TOPDIR)/lib
++
++# If you always want time values interpreted as "seconds since the epoch
++# (not counting leap seconds)", use
++#	REDO=		posix_only
++# below.  If you always want right time values interpreted as "seconds since
++# the epoch" (counting leap seconds)", use
++#	REDO=		right_only
++# below.  If you want both sets of data available, with leap seconds not
++# counted normally, use
++#	REDO=		posix_right
++# below.  If you want both sets of data available, with leap seconds counted
++# normally, use
++#	REDO=		right_posix
++# below.  POSIX mandates that leap seconds not be counted; for compatibility
++# with it, use "posix_only" or "posix_right".
++
++REDO=		posix_right
++
++# If you want out-of-scope and often-wrong data from the file 'backzone', use
++#	PACKRATDATA=	backzone
++# To omit this data, use
++#	PACKRATDATA=
++
++PACKRATDATA=
++
++# Since "." may not be in PATH...
++
++YEARISTYPE=	./yearistype
++
++# Non-default libraries needed to link.
++LDLIBS=
++
++# Add the following to the end of the "CFLAGS=" line as needed.
++#  -DBIG_BANG=-9999999LL if the Big Bang occurred at time -9999999 (see zic.c)
++#  -DHAVE_DECL_ASCTIME_R=0 if <time.h> does not declare asctime_r
++#  -DHAVE_DIRECT_H if mkdir needs <direct.h> (MS-Windows)
++#  -DHAVE_DOS_FILE_NAMES if file names have drive specifiers etc. (MS-DOS)
++#  -DHAVE_GETTEXT=1 if 'gettext' works (e.g., GNU/Linux, FreeBSD, Solaris)
++#  -DHAVE_INCOMPATIBLE_CTIME_R=1 if your system's time.h declares
++#	ctime_r and asctime_r incompatibly with the POSIX standard
++#	(Solaris when _POSIX_PTHREAD_SEMANTICS is not defined).
++#  -DHAVE_INTTYPES_H=1 if you have a pre-C99 compiler with "inttypes.h"
++#  -DHAVE_LINK=0 if your system lacks a link function
++#  -DHAVE_LOCALTIME_R=0 if your system lacks a localtime_r function
++#  -DHAVE_LOCALTIME_RZ=0 if you do not want zdump to use localtime_rz
++#	This defaults to 1 if a working localtime_rz seems to be available.
++#	localtime_rz can make zdump significantly faster, but is nonstandard.
++#  -DHAVE_POSIX_DECLS=0 if your system's include files do not declare
++#	functions like 'link' or variables like 'tzname' required by POSIX
++#  -DHAVE_STDINT_H=1 if you have a pre-C99 compiler with "stdint.h"
++#  -DHAVE_STRFTIME_L=1 if <time.h> declares locale_t and strftime_l
++#	This defaults to 0 if _POSIX_VERSION < 200809, 1 otherwise.
++#  -DHAVE_STRDUP=0 if your system lacks the strdup function
++#  -DHAVE_SYMLINK=0 if your system lacks the symlink function
++#  -DHAVE_SYS_STAT_H=0 if your compiler lacks a "sys/stat.h"
++#  -DHAVE_SYS_WAIT_H=0 if your compiler lacks a "sys/wait.h"
++#  -DHAVE_TZSET=0 if your system lacks a tzset function
++#  -DHAVE_UNISTD_H=0 if your compiler lacks a "unistd.h" (Microsoft C++ 7?)
++#  -DEPOCH_LOCAL=1 if the 'time' function returns local time not UT
++#  -DEPOCH_OFFSET=N if the 'time' function returns a value N greater
++#	than what POSIX specifies, assuming local time is UT.
++#	For example, N is 252460800 on AmigaOS.
++#  -DNO_RUN_TIME_WARNINGS_ABOUT_YEAR_2000_PROBLEMS_THANK_YOU=1
++#	if you do not want run time warnings about formats that may cause
++#	year 2000 grief
++#  -Dssize_t=long on ancient hosts that lack ssize_t
++#  -DTHREAD_SAFE=1 to make localtime.c thread-safe, as POSIX requires;
++#	not needed by the main-program tz code, which is single-threaded.
++#	Append other compiler flags as needed, e.g., -pthread on GNU/Linux.
++#  -Dtime_tz=\"T\" to use T as the time_t type, rather than the system time_t
++#  -DTZ_DOMAIN=\"foo\" to use "foo" for gettext domain name; default is "tz"
++#  -DTZ_DOMAINDIR=\"/path\" to use "/path" for gettext directory;
++#	the default is system-supplied, typically "/usr/lib/locale"
++#  -DTZDEFRULESTRING=\",date/time,date/time\" to default to the specified
++#	DST transitions if the time zone files cannot be accessed
++#  -DUNINIT_TRAP=1 if reading uninitialized storage can cause problems
++#	other than simply getting garbage data
++#  -DUSE_LTZ=0 to build zdump with the system time zone library
++#	Also set TZDOBJS=zdump.o and CHECK_TIME_T_ALTERNATIVES= below.
++#  -DZIC_MAX_ABBR_LEN_WO_WARN=3
++#	(or some other number) to set the maximum time zone abbreviation length
++#	that zic will accept without a warning (the default is 6)
++#  $(GCC_DEBUG_FLAGS) if you are using recent GCC and want lots of checking
++GCC_DEBUG_FLAGS = -Dlint -g3 -O3 -fno-common -fstrict-aliasing \
++	-Wall -Wextra \
++	-Wbad-function-cast -Wcast-align -Wdate-time \
++	-Wdeclaration-after-statement \
++	-Wdouble-promotion \
++	-Wformat=2 -Winit-self -Wjump-misses-init \
++	-Wlogical-op -Wmissing-prototypes -Wnested-externs \
++	-Wold-style-definition -Woverlength-strings -Wpointer-arith \
++	-Wshadow -Wstrict-prototypes -Wsuggest-attribute=const \
++	-Wsuggest-attribute=format -Wsuggest-attribute=noreturn \
++	-Wsuggest-attribute=pure -Wtrampolines \
++	-Wunused -Wwrite-strings \
++	-Wno-address -Wno-format-nonliteral -Wno-sign-compare \
++	-Wno-type-limits -Wno-unused-parameter
++#
++# If you want to use System V compatibility code, add
++#	-DUSG_COMPAT
++# to the end of the "CFLAGS=" line.  This arrange for "timezone" and "daylight"
++# variables to be kept up-to-date by the time conversion functions.  Neither
++# "timezone" nor "daylight" is described in X3J11's work.
++#
++# If your system has a "GMT offset" field in its "struct tm"s
++# (or if you decide to add such a field in your system's "time.h" file),
++# add the name to a define such as
++#	-DTM_GMTOFF=tm_gmtoff
++# to the end of the "CFLAGS=" line.  If not defined, the code attempts to
++# guess TM_GMTOFF from other macros; define NO_TM_GMTOFF to suppress this.
++# Similarly, if your system has a "zone abbreviation" field, define
++#	-DTM_ZONE=tm_zone
++# and define NO_TM_ZONE to suppress any guessing.  These two fields are not
++# required by POSIX, but are widely available on GNU/Linux and BSD systems.
++#
++# If you want functions that were inspired by early versions of X3J11's work,
++# add
++#	-DSTD_INSPIRED
++# to the end of the "CFLAGS=" line.  This arranges for the functions
++# "tzsetwall", "offtime", "timelocal", "timegm", "timeoff",
++# "posix2time", and "time2posix" to be added to the time conversion library.
++# "tzsetwall" is like "tzset" except that it arranges for local wall clock
++# time (rather than the time specified in the TZ environment variable)
++# to be used.
++# "offtime" is like "gmtime" except that it accepts a second (long) argument
++# that gives an offset to add to the time_t when converting it.
++# "timelocal" is equivalent to "mktime".
++# "timegm" is like "timelocal" except that it turns a struct tm into
++# a time_t using UT (rather than local time as "timelocal" does).
++# "timeoff" is like "timegm" except that it accepts a second (long) argument
++# that gives an offset to use when converting to a time_t.
++# "posix2time" and "time2posix" are described in an included manual page.
++# X3J11's work does not describe any of these functions.
++# Sun has provided "tzsetwall", "timelocal", and "timegm" in SunOS 4.0.
++# These functions may well disappear in future releases of the time
++# conversion package.
++#
++# If you don't want functions that were inspired by NetBSD, add
++#	-DNETBSD_INSPIRED=0
++# to the end of the "CFLAGS=" line.  Otherwise, the functions
++# "localtime_rz", "mktime_z", "tzalloc", and "tzfree" are added to the
++# time library, and if STD_INSPIRED is also defined the functions
++# "posix2time_z" and "time2posix_z" are added as well.
++# The functions ending in "_z" (or "_rz") are like their unsuffixed
++# (or suffixed-by-"_r") counterparts, except with an extra first
++# argument of opaque type timezone_t that specifies the time zone.
++# "tzalloc" allocates a timezone_t value, and "tzfree" frees it.
++#
++# If you want to allocate state structures in localtime, add
++#	-DALL_STATE
++# to the end of the "CFLAGS=" line.  Storage is obtained by calling malloc.
++#
++# If you want an "altzone" variable (a la System V Release 3.1), add
++#	-DALTZONE
++# to the end of the "CFLAGS=" line.
++# This variable is not described in X3J11's work.
++#
++# NIST-PCTS:151-2, Version 1.4, (1993-12-03) is a test suite put
++# out by the National Institute of Standards and Technology
++# which claims to test C and Posix conformance.  If you want to pass PCTS, add
++#	-DPCTS
++# to the end of the "CFLAGS=" line.
++#
++# If you want strict compliance with XPG4 as of 1994-04-09, add
++#	-DXPG4_1994_04_09
++# to the end of the "CFLAGS=" line.  This causes "strftime" to always return
++# 53 as a week number (rather than 52 or 53) for those days in January that
++# before the first Monday in January when a "%V" format is used and January 1
++# falls on a Friday, Saturday, or Sunday.
++
++CFLAGS=
++
++# Linker flags.  Default to $(LFLAGS) for backwards compatibility
++# to release 2012h and earlier.
++
++LDFLAGS=	$(LFLAGS)
++
++# For leap seconds, this Makefile uses LEAPSECONDS='-L leapseconds' in
++# submake command lines.  The default is no leap seconds.
++
++LEAPSECONDS=
++
++# The zic command and its arguments.
++
++zic=		./zic
++ZIC=		$(zic) $(ZFLAGS)
++
++ZFLAGS=
++
++# How to use zic to install tz binary files.
++
++ZIC_INSTALL=	$(ZIC) -y $(YEARISTYPE) -d $(DESTDIR)$(TZDIR) $(LEAPSECONDS)
++
++# The name of a Posix-compliant 'awk' on your system.
++AWK=		awk
++
++# The full path name of a Posix-compliant shell, preferably one that supports
++# the Korn shell's 'select' statement as an extension.
++# These days, Bash is the most popular.
++# It should be OK to set this to /bin/sh, on platforms where /bin/sh
++# lacks 'select' or doesn't completely conform to Posix, but /bin/bash
++# is typically nicer if it works.
++KSHELL=		/bin/bash
++
++# The path where SGML DTDs are kept and the catalog file(s) to use when
++# validating.  The default should work on both Debian and Red Hat.
++SGML_TOPDIR= /usr
++SGML_DTDDIR= $(SGML_TOPDIR)/share/xml/w3c-sgml-lib/schema/dtd
++SGML_SEARCH_PATH= $(SGML_DTDDIR)/REC-html401-19991224
++SGML_CATALOG_FILES= \
++  $(SGML_TOPDIR)/share/doc/w3-recs/html/www.w3.org/TR/1999/REC-html401-19991224/HTML4.cat:$(SGML_TOPDIR)/share/sgml/html/4.01/HTML4.cat
++
++# The name, arguments and environment of a program to validate your web pages.
++# See <http://openjade.sourceforge.net/doc/> for a validator, and
++# <https://validator.w3.org/source/> for a validation library.
++VALIDATE = nsgmls
++VALIDATE_FLAGS = -s -B -wall -wno-unused-param
++VALIDATE_ENV = \
++  SGML_CATALOG_FILES=$(SGML_CATALOG_FILES) \
++  SGML_SEARCH_PATH=$(SGML_SEARCH_PATH) \
++  SP_CHARSET_FIXED=YES \
++  SP_ENCODING=UTF-8
++
++# This expensive test requires USE_LTZ.
++# To suppress it, define this macro to be empty.
++CHECK_TIME_T_ALTERNATIVES = check_time_t_alternatives
++
++# SAFE_CHAR is a regular expression that matches a safe character.
++# Some parts of this distribution are limited to safe characters;
++# others can use any UTF-8 character.
++# For now, the safe characters are a safe subset of ASCII.
++# The caller must set the shell variable 'sharp' to the character '#',
++# since Makefile macros cannot contain '#'.
++# TAB_CHAR is a single tab character, in single quotes.
++TAB_CHAR=	'	'
++SAFE_CHARSET1=	$(TAB_CHAR)' !\"'$$sharp'$$%&'\''()*+,./0123456789:;<=>?@'
++SAFE_CHARSET2=	'ABCDEFGHIJKLMNOPQRSTUVWXYZ[\\^_`'
++SAFE_CHARSET3=	'abcdefghijklmnopqrstuvwxyz{|}~'
++SAFE_CHARSET=	$(SAFE_CHARSET1)$(SAFE_CHARSET2)$(SAFE_CHARSET3)
++SAFE_CHAR=	'[]'$(SAFE_CHARSET)'-]'
++
++# OK_CHAR matches any character allowed in the distributed files.
++# This is the same as SAFE_CHAR, except that multibyte letters are
++# also allowed so that commentary can contain people's names and quote
++# non-English sources.  For non-letters the sources are limited to
++# ASCII renderings for the convenience of maintainers whose text editors
++# mishandle UTF-8 by default (e.g., XEmacs 21.4.22).
++OK_CHAR=	'[][:alpha:]'$(SAFE_CHARSET)'-]'
++
++# SAFE_LINE matches a line of safe characters.
++# SAFE_SHARP_LINE is similar, except any OK character can follow '#';
++# this is so that comments can contain non-ASCII characters.
++# OK_LINE matches a line of OK characters.
++SAFE_LINE=	'^'$(SAFE_CHAR)'*$$'
++SAFE_SHARP_LINE='^'$(SAFE_CHAR)'*('$$sharp$(OK_CHAR)'*)?$$'
++OK_LINE=	'^'$(OK_CHAR)'*$$'
++
++# Flags to give 'tar' when making a distribution.
++# Try to use flags appropriate for GNU tar.
++GNUTARFLAGS= --numeric-owner --owner=0 --group=0 --mode=go+u,go-w --sort=name
++TARFLAGS=	`if tar $(GNUTARFLAGS) --version >/dev/null 2>&1; \
++		 then echo $(GNUTARFLAGS); \
++		 else :; \
++		 fi`
++
++# Flags to give 'gzip' when making a distribution.
++GZIPFLAGS=	-9n
++
++###############################################################################
++
++#MAKE=		make
++
++cc=		cc
++CC=		$(cc) -DTZDIR=\"$(TZDIR)\"
++
++AR=		ar
++
++# ':' on typical hosts; 'ranlib' on the ancient hosts that still need ranlib.
++RANLIB=		:
++
++TZCOBJS=	zic.o
++TZDOBJS=	zdump.o localtime.o asctime.o
++DATEOBJS=	date.o localtime.o strftime.o asctime.o
++LIBSRCS=	localtime.c asctime.c difftime.c
++LIBOBJS=	localtime.o asctime.o difftime.o
++HEADERS=	tzfile.h private.h
++NONLIBSRCS=	zic.c zdump.c
++NEWUCBSRCS=	date.c strftime.c
++SOURCES=	$(HEADERS) $(LIBSRCS) $(NONLIBSRCS) $(NEWUCBSRCS) \
++			tzselect.ksh workman.sh
++MANS=		newctime.3 newstrftime.3 newtzset.3 time2posix.3 \
++			tzfile.5 tzselect.8 zic.8 zdump.8
++MANTXTS=	newctime.3.txt newstrftime.3.txt newtzset.3.txt \
++			time2posix.3.txt \
++			tzfile.5.txt tzselect.8.txt zic.8.txt zdump.8.txt \
++			date.1.txt
++COMMON=		CONTRIBUTING LICENSE Makefile NEWS README Theory version
++WEB_PAGES=	tz-art.htm tz-how-to.html tz-link.htm
++DOCS=		$(MANS) date.1 $(MANTXTS) $(WEB_PAGES)
++PRIMARY_YDATA=	africa antarctica asia australasia \
++		europe northamerica southamerica
++YDATA=		$(PRIMARY_YDATA) pacificnew etcetera backward
++NDATA=		systemv factory
++TDATA=		$(YDATA) $(NDATA)
++ZONETABLES=	zone1970.tab zone.tab
++TABDATA=	iso3166.tab leapseconds $(ZONETABLES)
++LEAP_DEPS=	leapseconds.awk leap-seconds.list
++DATA=		$(YDATA) $(NDATA) backzone $(TABDATA) \
++			leap-seconds.list yearistype.sh
++AWK_SCRIPTS=	checklinks.awk checktab.awk leapseconds.awk
++MISC=		$(AWK_SCRIPTS) zoneinfo2tdf.pl
++TZS_YEAR=	2050
++TZS=		to$(TZS_YEAR).tzs
++TZS_NEW=	to$(TZS_YEAR)new.tzs
++TZS_DEPS=	$(PRIMARY_YDATA) asctime.c localtime.c \
++			private.h tzfile.h zdump.c zic.c
++ENCHILADA=	$(COMMON) $(DOCS) $(SOURCES) $(DATA) $(MISC) $(TZS)
++
++# Consult these files when deciding whether to rebuild the 'version' file.
++# This list is not the same as the output of 'git ls-files', since
++# .gitignore is not distributed.
++VERSION_DEPS= \
++		CONTRIBUTING LICENSE Makefile NEWS README Theory \
++		africa antarctica asctime.c asia australasia \
++		backward backzone \
++		checklinks.awk checktab.awk \
++		date.1 date.c difftime.c \
++		etcetera europe factory iso3166.tab \
++		leap-seconds.list leapseconds.awk localtime.c \
++		newctime.3 newstrftime.3 newtzset.3 northamerica \
++		pacificnew private.h \
++		southamerica strftime.c systemv \
++		time2posix.3 tz-art.htm tz-how-to.html tz-link.htm \
++		tzfile.5 tzfile.h tzselect.8 tzselect.ksh \
++		workman.sh yearistype.sh \
++		zdump.8 zdump.c zic.8 zic.c \
++		zone.tab zone1970.tab zoneinfo2tdf.pl
++
++# And for the benefit of csh users on systems that assume the user
++# shell should be used to handle commands in Makefiles. . .
++
++SHELL=		/bin/sh
++
++all:		tzselect yearistype zic zdump libtz.a $(TABDATA)
++
++ALL:		all date $(ENCHILADA)
++
++install:	all $(DATA) $(REDO) $(MANS)
++		mkdir -p $(DESTDIR)$(ETCDIR) $(DESTDIR)$(TZDIR) \
++			$(DESTDIR)$(LIBDIR) \
++			$(DESTDIR)$(MANDIR)/man3 $(DESTDIR)$(MANDIR)/man5 \
++			$(DESTDIR)$(MANDIR)/man8
++		$(ZIC_INSTALL) -l $(LOCALTIME) -p $(POSIXRULES)
++		cp -f iso3166.tab $(ZONETABLES) $(DESTDIR)$(TZDIR)/.
++		cp tzselect zic zdump $(DESTDIR)$(ETCDIR)/.
++		cp libtz.a $(DESTDIR)$(LIBDIR)/.
++		$(RANLIB) $(DESTDIR)$(LIBDIR)/libtz.a
++		cp -f newctime.3 newtzset.3 $(DESTDIR)$(MANDIR)/man3/.
++		cp -f tzfile.5 $(DESTDIR)$(MANDIR)/man5/.
++		cp -f tzselect.8 zdump.8 zic.8 $(DESTDIR)$(MANDIR)/man8/.
++
++INSTALL:	ALL install date.1
++		mkdir -p $(DESTDIR)$(BINDIR) $(DESTDIR)$(MANDIR)/man1
++		cp date $(DESTDIR)$(BINDIR)/.
++		cp -f date.1 $(DESTDIR)$(MANDIR)/man1/.
++
++version:	$(VERSION_DEPS)
++		{ (type git) >/dev/null 2>&1 && \
++		  V=`git describe --match '[0-9][0-9][0-9][0-9][a-z]*' \
++				--abbrev=7 --dirty` || \
++		  V=$(VERSION); } && \
++		printf '%s\n' "$$V" >$@.out
++		mv $@.out $@
++
++version.h:	version
++		VERSION=`cat version` && printf '%s\n' \
++		  'static char const PKGVERSION[]="($(PACKAGE)) ";' \
++		  "static char const TZVERSION[]=\"$$VERSION\";" \
++		  'static char const REPORT_BUGS_TO[]="$(BUGEMAIL)";' \
++		  >$@.out
++		mv $@.out $@
++
++zdump:		$(TZDOBJS)
++		$(CC) -o $@ $(CFLAGS) $(LDFLAGS) $(TZDOBJS) $(LDLIBS)
++
++zic:		$(TZCOBJS)
++		$(CC) -o $@ $(CFLAGS) $(LDFLAGS) $(TZCOBJS) $(LDLIBS)
++
++yearistype:	yearistype.sh
++		cp yearistype.sh yearistype
++		chmod +x yearistype
++
++leapseconds:	$(LEAP_DEPS)
++		$(AWK) -f leapseconds.awk leap-seconds.list >$@.out
++		mv $@.out $@
++
++# Arguments to pass to submakes of install_data.
++# They can be overridden by later submake arguments.
++INSTALLARGS = \
++ DESTDIR=$(DESTDIR) \
++ LEAPSECONDS='$(LEAPSECONDS)' \
++ PACKRATDATA='$(PACKRATDATA)' \
++ TZDIR=$(TZDIR) \
++ YEARISTYPE=$(YEARISTYPE) \
++ ZIC='$(ZIC)'
++
++# 'make install_data' installs one set of tz binary files.
++# It can be tailored by setting LEAPSECONDS, PACKRATDATA, etc.
++install_data:	zic leapseconds yearistype $(PACKRATDATA) $(TDATA)
++		$(ZIC_INSTALL) $(TDATA)
++		$(AWK) '/^Rule/' $(TDATA) | $(ZIC_INSTALL) - $(PACKRATDATA)
++
++posix_only:
++		$(MAKE) $(INSTALLARGS) LEAPSECONDS= install_data
++
++right_only:
++		$(MAKE) $(INSTALLARGS) LEAPSECONDS='-L leapseconds' \
++			install_data
++
++# In earlier versions of this makefile, the other two directories were
++# subdirectories of $(TZDIR).  However, this led to configuration errors.
++# For example, with posix_right under the earlier scheme,
++# TZ='right/Australia/Adelaide' got you localtime with leap seconds,
++# but gmtime without leap seconds, which led to problems with applications
++# like sendmail that subtract gmtime from localtime.
++# Therefore, the other two directories are now siblings of $(TZDIR).
++# You must replace all of $(TZDIR) to switch from not using leap seconds
++# to using them, or vice versa.
++right_posix:	right_only
++		rm -fr $(DESTDIR)$(TZDIR)-leaps
++		ln -s $(TZDIR_BASENAME) $(DESTDIR)$(TZDIR)-leaps || \
++		  $(MAKE) $(INSTALLARGS) TZDIR=$(TZDIR)-leaps right_only
++		$(MAKE) $(INSTALLARGS) TZDIR=$(TZDIR)-posix posix_only
++
++posix_right:	posix_only
++		rm -fr $(DESTDIR)$(TZDIR)-posix
++		ln -s $(TZDIR_BASENAME) $(DESTDIR)$(TZDIR)-posix || \
++		  $(MAKE) $(INSTALLARGS) TZDIR=$(TZDIR)-posix posix_only
++		$(MAKE) $(INSTALLARGS) TZDIR=$(TZDIR)-leaps right_only
++
++# This obsolescent rule is present for backwards compatibility with
++# tz releases 2014g through 2015g.  It should go away eventually.
++posix_packrat:
++		$(MAKE) $(INSTALLARGS) PACKRATDATA=backzone posix_only
++
++zones:		$(REDO)
++
++$(TZS_NEW):	$(TDATA) zdump zic
++		mkdir -p tzs.dir
++		$(zic) -d tzs.dir $(TDATA)
++		$(AWK) '/^Link/{print $$1 "\t" $$2 "\t" $$3}' \
++		   $(TDATA) | LC_ALL=C sort >$@.out
++		wd=`pwd` && \
++		zones=`$(AWK) -v wd="$$wd" \
++				'/^Zone/{print wd "/tzs.dir/" $$2}' $(TDATA) \
++			 | LC_ALL=C sort` && \
++		./zdump -i -c $(TZS_YEAR) $$zones >>$@.out
++		sed 's,^TZ=".*tzs\.dir/,TZ=",' $@.out >$@.sed.out
++		rm -fr tzs.dir $@.out
++		mv $@.sed.out $@
++
++# If $(TZS) does not already exist (e.g., old-format tarballs), create it.
++# If it exists but 'make check_tzs' fails, a maintainer should inspect the
++# failed output and fix the inconsistency, perhaps by running 'make force_tzs'.
++$(TZS):
++		$(MAKE) force_tzs
++
++force_tzs:	$(TZS_NEW)
++		cp $(TZS_NEW) $(TZS)
++
++libtz.a:	$(LIBOBJS)
++		$(AR) ru $@ $(LIBOBJS)
++		$(RANLIB) $@
++
++date:		$(DATEOBJS)
++		$(CC) -o $@ $(CFLAGS) $(LDFLAGS) $(DATEOBJS) $(LDLIBS)
++
++tzselect:	tzselect.ksh version
++		VERSION=`cat version` && sed \
++			-e 's|#!/bin/bash|#!$(KSHELL)|g' \
++			-e 's|AWK=[^}]*|AWK=$(AWK)|g' \
++			-e 's|\(PKGVERSION\)=.*|\1='\''($(PACKAGE)) '\''|' \
++			-e 's|\(REPORT_BUGS_TO\)=.*|\1=$(BUGEMAIL)|' \
++			-e 's|TZDIR=[^}]*|TZDIR=$(TZDIR)|' \
++			-e 's|\(TZVERSION\)=.*|\1='"$$VERSION"'|' \
++			<$@.ksh >$@.out
++		chmod +x $@.out
++		mv $@.out $@
++
++check:		check_character_set check_white_space check_links check_sorted \
++		  check_tables check_tzs check_web
++
++check_character_set: $(ENCHILADA)
++		LC_ALL=en_US.utf8 && export LC_ALL && \
++		sharp='#' && \
++		! grep -Env $(SAFE_LINE) $(MANS) date.1 $(MANTXTS) \
++			$(MISC) $(SOURCES) $(WEB_PAGES) \
++			CONTRIBUTING LICENSE Makefile README version && \
++		! grep -Env $(SAFE_SHARP_LINE) $(TDATA) backzone \
++			leapseconds yearistype.sh zone.tab && \
++		! grep -Env $(OK_LINE) $(ENCHILADA)
++
++check_white_space: $(ENCHILADA)
++		patfmt=' \t|[\f\r\v]' && pat=`printf "$$patfmt\\n"` && \
++		! grep -En "$$pat" $(ENCHILADA)
++		! grep -n '[[:space:]]$$' $(ENCHILADA)
++
++CHECK_CC_LIST = { n = split($$1,a,/,/); for (i=2; i<=n; i++) print a[1], a[i]; }
++
++check_sorted: backward backzone iso3166.tab zone.tab zone1970.tab
++		$(AWK) '/^Link/ {print $$3}' backward | LC_ALL=C sort -cu
++		$(AWK) '/^Zone/ {print $$2}' backzone | LC_ALL=C sort -cu
++		$(AWK) '/^[^#]/ {print $$1}' iso3166.tab | LC_ALL=C sort -cu
++		$(AWK) '/^[^#]/ {print $$1}' zone.tab | LC_ALL=C sort -c
++		$(AWK) '/^[^#]/ {print substr($$0, 1, 2)}' zone1970.tab | \
++		  LC_ALL=C sort -c
++		$(AWK) '/^[^#]/ $(CHECK_CC_LIST)' zone1970.tab | \
++		  LC_ALL=C sort -cu
++
++check_links:	checklinks.awk $(TDATA)
++		$(AWK) -f checklinks.awk $(TDATA)
++
++check_tables:	checktab.awk $(PRIMARY_YDATA) $(ZONETABLES)
++		for tab in $(ZONETABLES); do \
++		  $(AWK) -f checktab.awk -v zone_table=$$tab $(PRIMARY_YDATA) \
++		    || exit; \
++		done
++
++check_tzs:	$(TZS) $(TZS_NEW)
++		diff -u $(TZS) $(TZS_NEW)
++
++check_web:	$(WEB_PAGES)
++		$(VALIDATE_ENV) $(VALIDATE) $(VALIDATE_FLAGS) $(WEB_PAGES)
++
++clean_misc:
++		rm -f core *.o *.out \
++		  date tzselect version.h zdump zic yearistype libtz.a
++clean:		clean_misc
++		rm -fr *.dir tzdb-*/ $(TZS_NEW)
++
++maintainer-clean: clean
++		@echo 'This command is intended for maintainers to use; it'
++		@echo 'deletes files that may need special tools to rebuild.'
++		rm -f leapseconds version $(MANTXTS) $(TZS) *.asc *.tar.*
++
++names:
++		@echo $(ENCHILADA)
++
++public:		check check_public $(CHECK_TIME_T_ALTERNATIVES) \
++		tarballs signatures
++
++date.1.txt:	date.1
++newctime.3.txt:	newctime.3
++newstrftime.3.txt: newstrftime.3
++newtzset.3.txt:	newtzset.3
++time2posix.3.txt: time2posix.3
++tzfile.5.txt:	tzfile.5
++tzselect.8.txt:	tzselect.8
++zdump.8.txt:	zdump.8
++zic.8.txt:	zic.8
++
++$(MANTXTS):	workman.sh
++		LC_ALL=C sh workman.sh `expr $@ : '\(.*\)\.txt$$'` >$@.out
++		mv $@.out $@
++
++# Set the time stamps to those of the git repository, if available,
++# and if the files have not changed since then.
++# This uses GNU 'touch' syntax 'touch -d@N FILE',
++# where N is the number of seconds since 1970.
++# If git or GNU 'touch' is absent, don't bother to sync with git timestamps.
++# Also, set the timestamp of each prebuilt file like 'leapseconds'
++# to be the maximum of the files it depends on.
++set-timestamps.out: $(ENCHILADA)
++		rm -f $@
++		if (type git) >/dev/null 2>&1 && \
++		   files=`git ls-files $(ENCHILADA)` && \
++		   touch -md @1 test.out; then \
++		  rm -f test.out && \
++		  for file in $$files; do \
++		    if git diff --quiet $$file; then \
++		      time=`git log -1 --format='tformat:%ct' $$file` && \
++		      touch -cmd @$$time $$file; \
++		    else \
++		      echo >&2 "$$file: warning: does not match repository"; \
++		    fi || exit; \
++		  done; \
++		fi
++		touch -cmr `ls -t $(LEAP_DEPS) | sed 1q` leapseconds
++		for file in `ls $(MANTXTS) | sed 's/\.txt$$//'`; do \
++		  touch -cmr `ls -t $$file workman.sh | sed 1q` $$file.txt || \
++		    exit; \
++		done
++		touch -cmr `ls -t $(TZS_DEPS) | sed 1q` $(TZS)
++		touch -cmr `ls -t $(VERSION_DEPS) | sed 1q` version
++		touch $@
++
++# The zics below ensure that each data file can stand on its own.
++# We also do an all-files run to catch links to links.
++
++check_public:
++		$(MAKE) maintainer-clean
++		$(MAKE) "CFLAGS=$(GCC_DEBUG_FLAGS)" ALL
++		mkdir -p public.dir
++		for i in $(TDATA) ; do \
++		  $(zic) -v -d public.dir $$i 2>&1 || exit; \
++		done
++		$(zic) -v -d public.dir $(TDATA)
++		rm -fr public.dir
++
++# Check that the code works under various alternative
++# implementations of time_t.
++check_time_t_alternatives:
++		if diff -q Makefile Makefile 2>/dev/null; then \
++		  quiet_option='-q'; \
++		else \
++		  quiet_option=''; \
++		fi && \
++		wd=`pwd` && \
++		zones=`$(AWK) '/^[^#]/ { print $$3 }' <zone1970.tab` && \
++		for type in $(TIME_T_ALTERNATIVES); do \
++		  mkdir -p time_t.dir/$$type && \
++		  $(MAKE) clean_misc && \
++		  $(MAKE) TOPDIR="$$wd/time_t.dir/$$type" \
++		    CFLAGS='$(CFLAGS) -Dtime_tz='"'$$type'" \
++		    REDO='$(REDO)' \
++		    install && \
++		  diff $$quiet_option -r \
++		    time_t.dir/int64_t/etc/zoneinfo \
++		    time_t.dir/$$type/etc/zoneinfo && \
++		  case $$type in \
++		  int32_t) range=-2147483648,2147483647;; \
++		  uint32_t) range=0,4294967296;; \
++		  int64_t) continue;; \
++		  *u*) range=0,10000000000;; \
++		  *) range=-10000000000,10000000000;; \
++		  esac && \
++		  echo checking $$type zones ... && \
++		  time_t.dir/int64_t/etc/zdump -V -t $$range $$zones \
++		      >time_t.dir/int64_t.out && \
++		  time_t.dir/$$type/etc/zdump -V -t $$range $$zones \
++		      >time_t.dir/$$type.out && \
++		  diff -u time_t.dir/int64_t.out time_t.dir/$$type.out \
++		    || exit; \
++		done
++		rm -fr time_t.dir
++
++tarballs traditional_tarballs signatures traditional_signatures: version
++		VERSION=`cat version` && \
++		$(MAKE) VERSION="$$VERSION" $@_version
++
++tarballs_version: traditional_tarballs_version tzdb-$(VERSION).tar.lz
++traditional_tarballs_version: \
++  tzcode$(VERSION).tar.gz tzdata$(VERSION).tar.gz
++signatures_version: traditional_signatures_version tzdb-$(VERSION).tar.lz.asc
++traditional_signatures_version: \
++  tzcode$(VERSION).tar.gz.asc tzdata$(VERSION).tar.gz.asc \
++
++tzcode$(VERSION).tar.gz: set-timestamps.out
++		LC_ALL=C && export LC_ALL && \
++		tar $(TARFLAGS) -cf - \
++		    $(COMMON) $(DOCS) $(SOURCES) | \
++		  gzip $(GZIPFLAGS) >$@.out
++		mv $@.out $@
++
++tzdata$(VERSION).tar.gz: set-timestamps.out
++		LC_ALL=C && export LC_ALL && \
++		tar $(TARFLAGS) -cf - $(COMMON) $(DATA) $(MISC) | \
++		  gzip $(GZIPFLAGS) >$@.out
++		mv $@.out $@
++
++tzdb-$(VERSION).tar.lz: set-timestamps.out
++		rm -fr tzdb-$(VERSION)
++		mkdir tzdb-$(VERSION)
++		ln $(ENCHILADA) tzdb-$(VERSION)
++		touch -cmr `ls -t tzdb-$(VERSION)/* | sed 1q` tzdb-$(VERSION)
++		LC_ALL=C && export LC_ALL && \
++		tar $(TARFLAGS) -cf - tzdb-$(VERSION) | lzip -9 >$@.out
++		mv $@.out $@
++
++tzcode$(VERSION).tar.gz.asc: tzcode$(VERSION).tar.gz
++		gpg --armor --detach-sign $?
++
++tzdata$(VERSION).tar.gz.asc: tzdata$(VERSION).tar.gz
++		gpg --armor --detach-sign $?
++
++tzdb-$(VERSION).tar.lz.asc: tzdb-$(VERSION).tar.lz
++		gpg --armor --detach-sign $?
++
++typecheck:
++		$(MAKE) clean
++		for i in "long long" unsigned; \
++		do \
++			$(MAKE) CFLAGS="-DTYPECHECK -D__time_t_defined -D_TIME_T \"-Dtime_t=$$i\"" ; \
++			./zdump -v Europe/Rome ; \
++			$(MAKE) clean ; \
++		done
++
++zonenames:	$(TDATA)
++		@$(AWK) '/^Zone/ { print $$2 } /^Link/ { print $$3 }' $(TDATA)
++
++asctime.o:	private.h tzfile.h
++date.o:		private.h
++difftime.o:	private.h
++localtime.o:	private.h tzfile.h
++strftime.o:	private.h tzfile.h
++zdump.o:	version.h
++zic.o:		private.h tzfile.h version.h
++
++.KEEP_STATE:
++
++.PHONY: ALL INSTALL all
++.PHONY: check check_character_set check_links
++.PHONY: check_public check_sorted check_tables
++.PHONY: check_time_t_alternatives check_tzs check_web check_white_space
++.PHONY: clean clean_misc force_tzs
++.PHONY: install install_data maintainer-clean names
++.PHONY: posix_only posix_packrat posix_right
++.PHONY: public right_only right_posix signatures signatures_version
++.PHONY: tarballs tarballs_version typecheck
++.PHONY: zonenames zones
++native
+\ No newline at end of property
++FreeBSD=%H
+\ No newline at end of property
++text/plain
+\ No newline at end of property
+--- contrib/tzdata/NEWS.orig
++++ contrib/tzdata/NEWS
+@@ -0,0 +1,3782 @@
++News for the tz database
++
++Release 2016i - 2016-11-01 23:19:52 -0700
++
++  Briefly: Cyprus split into two time zones on 2016-10-30, and Tonga
++  reintroduces DST on 2016-11-06.
++
++  Changes to future time stamps
++
++    Pacific/Tongatapu begins DST on 2016-11-06 at 02:00, ending on
++    2017-01-15 at 03:00.  Assume future observances in Tonga will be
++    from the first Sunday in November through the third Sunday in
++    January, like Fiji.  (Thanks to Pulu ʻAnau.)  Switch to numeric
++    time zone abbreviations for this zone.
++
++  Changes to past and future time stamps
++
++    Northern Cyprus is now +03 year round, causing a split in Cyprus
++    time zones starting 2016-10-30 at 04:00.  This creates a zone
++    Asia/Famagusta.  (Thanks to Even Scharning and Matt Johnson.)
++
++    Antarctica/Casey switched from +08 to +11 on 2016-10-22.
++    (Thanks to Steffen Thorsen.)
++
++  Changes to past time stamps
++
++    Several corrections were made for pre-1975 time stamps in Italy.
++    These affect Europe/Malta, Europe/Rome, Europe/San_Marino, and
++    Europe/Vatican.
++
++    First, the 1893-11-01 00:00 transition in Italy used the new UT
++    offset (+01), not the old (+00:49:56).  (Thanks to Michael
++    Deckers.)
++
++    Second, rules for daylight saving in Italy were changed to agree
++    with Italy's National Institute of Metrological Research (INRiM)
++    except for 1944, as follows (thanks to Pierpaolo Bernardi, Brian
++    Inglis, and Michael Deckers):
++
++      The 1916-06-03 transition was at 24:00, not 00:00.
++
++      The 1916-10-01, 1919-10-05, and 1920-09-19 transitions were at
++      00:00, not 01:00.
++
++      The 1917-09-30 and 1918-10-06 transitions were at 24:00, not
++      01:00.
++
++      The 1944-09-17 transition was at 03:00, not 01:00.  This
++      particular change is taken from Italian law as INRiM's table,
++      (which says 02:00) appears to have a typo here.  Also, keep the
++      1944-04-03 transition for Europe/Rome, as Rome was controlled by
++      Germany then.
++
++      The 1967-1970 and 1972-1974 fallback transitions were at 01:00,
++      not 00:00.
++
++  Changes to code
++
++    The code should now be buildable on AmigaOS merely by setting the
++    appropriate Makefile variables.  (From a patch by Carsten Larsen.)
++
++
++Release 2016h - 2016-10-19 23:17:57 -0700
++
++  Changes to future time stamps
++
++    Asia/Gaza and Asia/Hebron end DST on 2016-10-29 at 01:00, not
++    2016-10-21 at 00:00.  (Thanks to Sharef Mustafa.)  Predict that
++    future fall transitions will be on the last Saturday of October
++    at 01:00, which is consistent with predicted spring transitions
++    on the last Saturday of March.  (Thanks to Tim Parenti.)
++
++  Changes to past time stamps
++
++    In Turkey, transitions in 1986-1990 were at 01:00 standard time
++    not at 02:00, and the spring 1994 transition was on March 20, not
++    March 27.  (Thanks to Kıvanç Yazan.)
++
++  Changes to past and future time zone abbreviations
++
++    Asia/Colombo now uses numeric time zone abbreviations like "+0530"
++    instead of alphabetic ones like "IST" and "LKT".  Various
++    English-language sources use "IST", "LKT" and "SLST", with no
++    working consensus.  (Usage of "SLST" mentioned by Sadika
++    Sumanapala.)
++
++  Changes to code
++
++    zic no longer mishandles relativizing file names when creating
++    symbolic links like /etc/localtime, when these symbolic links
++    are outside the usual directory hierarchy.  This fixes a bug
++    introduced in 2016g.  (Problem reported by Andreas Stieger.)
++
++  Changes to build procedure
++
++    New rules 'traditional_tarballs' and 'traditional_signatures' for
++    building just the traditional-format distribution.  (Requested by
++    Deborah Goldsmith.)
++
++    The file 'version' is now put into the tzdata tarball too.
++    (Requested by Howard Hinnant.)
++
++  Changes to documentation and commentary
++
++    The 'Theory' file now has a section on interface stability.
++    (Requested by Paul Koning.)  It also mentions features like
++    tm_zone and localtime_rz that have long been supported by the
++    reference code.
++
++    tz-link.htm has improved coverage of time zone boundaries suitable
++    for geolocation.  (Thanks to heads-ups from Evan Siroky and Matt
++    Johnson.)
++
++    The US commentary now mentions Allen and the "day of two noons".
++
++    The Fiji commentary mentions the government's 2016-10-03 press
++    release.  (Thanks to Raymond Kumar.)
++
++
++Release 2016g - 2016-09-13 08:56:38 -0700
++
++  Changes to future time stamps
++
++    Turkey switched from EET/EEST (+02/+03) to permanent +03,
++    effective 2016-09-07.  (Thanks to Burak AYDIN.)  Use "+03" rather
++    than an invented abbreviation for the new time.
++
++    New leap second 2016-12-31 23:59:60 UTC as per IERS Bulletin C 52.
++    (Thanks to Tim Parenti.)
++
++  Changes to past time stamps
++
++    For America/Los_Angeles, spring-forward transition times have been
++    corrected from 02:00 to 02:01 in 1948, and from 02:00 to 01:00 in
++    1950-1966.
++
++    For zones using Soviet time on 1919-07-01, transitions to UT-based
++    time were at 00:00 UT, not at 02:00 local time.  The affected
++    zones are Europe/Kirov, Europe/Moscow, Europe/Samara, and
++    Europe/Ulyanovsk.  (Thanks to Alexander Belopolsky.)
++
++  Changes to past and future time zone abbreviations
++
++    The Factory zone now uses the time zone abbreviation -00 instead
++    of a long English-language string, as -00 is now the normal way to
++    represent an undefined time zone.
++
++    Several zones in Antarctica and the former Soviet Union, along
++    with zones intended for ships at sea that cannot use POSIX TZ
++    strings, now use numeric time zone abbreviations instead of
++    invented or obsolete alphanumeric abbreviations.  The affected
++    zones are Antarctica/Casey, Antarctica/Davis,
++    Antarctica/DumontDUrville, Antarctica/Mawson, Antarctica/Rothera,
++    Antarctica/Syowa, Antarctica/Troll, Antarctica/Vostok,
++    Asia/Anadyr, Asia/Ashgabat, Asia/Baku, Asia/Bishkek, Asia/Chita,
++    Asia/Dushanbe, Asia/Irkutsk, Asia/Kamchatka, Asia/Khandyga,
++    Asia/Krasnoyarsk, Asia/Magadan, Asia/Omsk, Asia/Sakhalin,
++    Asia/Samarkand, Asia/Srednekolymsk, Asia/Tashkent, Asia/Tbilisi,
++    Asia/Ust-Nera, Asia/Vladivostok, Asia/Yakutsk, Asia/Yekaterinburg,
++    Asia/Yerevan, Etc/GMT-14, Etc/GMT-13, Etc/GMT-12, Etc/GMT-11,
++    Etc/GMT-10, Etc/GMT-9, Etc/GMT-8, Etc/GMT-7, Etc/GMT-6, Etc/GMT-5,
++    Etc/GMT-4, Etc/GMT-3, Etc/GMT-2, Etc/GMT-1, Etc/GMT+1, Etc/GMT+2,
++    Etc/GMT+3, Etc/GMT+4, Etc/GMT+5, Etc/GMT+6, Etc/GMT+7, Etc/GMT+8,
++    Etc/GMT+9, Etc/GMT+10, Etc/GMT+11, Etc/GMT+12, Europe/Kaliningrad,
++    Europe/Minsk, Europe/Samara, Europe/Volgograd, and
++    Indian/Kerguelen.  For Europe/Moscow the invented abbreviation MSM
++    was replaced by +05, whereas MSK and MSD were kept as they are not
++    our invention and are widely used.
++
++  Changes to zone names
++
++    Rename Asia/Rangoon to Asia/Yangon, with a backward compatibility link.
++    (Thanks to David Massoud.)
++
++  Changes to code
++
++    zic no longer generates binary files containing POSIX TZ-like
++    strings that disagree with the local time type after the last
++    explicit transition in the data.  This fixes a bug with
++    Africa/Casablanca and Africa/El_Aaiun in some year-2037 time
++    stamps on the reference platform.  (Thanks to Alexander Belopolsky
++    for reporting the bug and suggesting a way forward.)
++
++    If the installed localtime and/or posixrules files are symbolic
++    links, zic now keeps them symbolic links when updating them, for
++    compatibility with platforms like OpenSUSE where other programs
++    configure these files as symlinks.
++
++    zic now avoids hard linking to symbolic links, avoids some
++    unnecessary mkdir and stat system calls, and uses shorter file
++    names internally.
++
++    zdump has a new -i option to generate transitions in a
++    more-compact but still human-readable format.  This option is
++    experimental, and the output format may change in future versions.
++    (Thanks to Jon Skeet for suggesting that an option was needed,
++    and thanks to Tim Parenti and Chris Rovick for further comments.)
++
++  Changes to build procedure
++
++    An experimental distribution format is available, in addition
++    to the traditional format which will continue to be distributed.
++    The new format is a tarball tzdb-VERSION.tar.lz with signature
++    file tzdb-VERSION.tar.lz.asc.  It unpacks to a top-level directory
++    tzdb-VERSION containing the code and data of the traditional
++    two-tarball format, along with extra data that may be useful.
++    (Thanks to Antonio Diaz Diaz, Oscar van Vlijmen, and many others
++    for comments about the experimental format.)
++
++    The release version number is now more accurate in the usual case
++    where releases are built from a Git repository.  For example, if
++    23 commits and some working-file changes have been made since
++    release 2016g, the version number is now something like
++    '2016g-23-g50556e3-dirty' instead of the misleading '2016g'.
++    Official releases uses the same version number format as before,
++    e.g., '2016g'.  To support the more-accurate version number, its
++    specification has moved from a line in the Makefile to a new
++    source file 'version'.
++
++    The experimental distribution contains a file to2050.tzs that
++    contains what should be the output of 'zdump -i -c 2050' on
++    primary zones.  If this file is available, 'make check' now checks
++    that zdump generates this output.
++
++    'make check_web' now works on Fedora-like distributions.
++
++  Changes to documentation and commentary
++
++    tzfile.5 now documents the new restriction on POSIX TZ-like
++    strings that is now implemented by zic.
++
++    Comments now cite URLs for some 1917-1921 Russian DST decrees.
++    (Thanks to Alexander Belopolsky.)
++
++    tz-link.htm mentions JuliaTime (thanks to Curtis Vogt) and Time4J
++    (thanks to Meno Hochschild) and ThreeTen-Extra, and its
++    description of Java 8 has been brought up to date (thanks to
++    Stephen Colebourne).  Its description of local time on Mars has
++    been updated to match current practice, and URLs have been updated
++    and some obsolete ones removed.
++
++
++Release 2016f - 2016-07-05 16:26:51 +0200
++
++  Changes affecting future time stamps
++
++    The Egyptian government changed its mind on short notice, and
++    Africa/Cairo will not introduce DST starting 2016-07-07 after all.
++    (Thanks to Mina Samuel.)
++
++    Asia/Novosibirsk switches from +06 to +07 on 2016-07-24 at 02:00.
++    (Thanks to Stepan Golosunov.)
++
++  Changes to past and future time stamps
++
++    Asia/Novokuznetsk and Asia/Novosibirsk now use numeric time zone
++    abbreviations instead of invented ones.
++
++  Changes affecting past time stamps
++
++    Europe/Minsk's 1992-03-29 spring-forward transition was at 02:00 not 00:00.
++    (Thanks to Stepan Golosunov.)
++
++
++Release 2016e - 2016-06-14 08:46:16 -0700
++
++  Changes affecting future time stamps
++
++    Africa/Cairo observes DST in 2016 from July 7 to the end of October.
++    Guess October 27 and 24:00 transitions.  (Thanks to Steffen Thorsen.)
++    For future years, guess April's last Thursday to October's last
++    Thursday except for Ramadan.
++
++  Changes affecting past time stamps
++
++    Locations while uninhabited now use '-00', not 'zzz', as a
++    placeholder time zone abbreviation.  This is inspired by Internet
++    RFC 3339 and is more consistent with numeric time zone
++    abbreviations already used elsewhere.  The change affects several
++    arctic and antarctic locations, e.g., America/Cambridge_Bay before
++    1920 and Antarctica/Troll before 2005.
++
++    Asia/Baku's 1992-09-27 transition from +04 (DST) to +04 (non-DST) was
++    at 03:00, not 23:00 the previous day.  (Thanks to Michael Deckers.)
++
++  Changes to code
++
++    zic now outputs a dummy transition at time 2**31 - 1 in zones
++    whose POSIX-style TZ strings contain a '<'.  This mostly works
++    around Qt bug 53071 <https://bugreports.qt.io/browse/QTBUG-53071>.
++    (Thanks to Zhanibek Adilbekov for reporting the Qt bug.)
++
++  Changes affecting documentation and commentary
++
++    tz-link.htm says why governments should give plenty of notice for
++    time zone or DST changes, and refers to Matt Johnson's blog post.
++
++    tz-link.htm mentions Tzdata for Elixir.  (Thanks to Matt Johnson.)
++
++
++Release 2016d - 2016-04-17 22:50:29 -0700
++
++  Changes affecting future time stamps
++
++    America/Caracas switches from -0430 to -04 on 2016-05-01 at 02:30.
++    (Thanks to Alexander Krivenyshev for the heads-up.)
++
++    Asia/Magadan switches from +10 to +11 on 2016-04-24 at 02:00.
++    (Thanks to Alexander Krivenyshev and Matt Johnson.)
++
++    New zone Asia/Tomsk, split off from Asia/Novosibirsk.  It covers
++    Tomsk Oblast, Russia, which switches from +06 to +07 on 2016-05-29
++    at 02:00.  (Thanks to Stepan Golosunov.)
++
++  Changes affecting past time stamps
++
++    New zone Europe/Kirov, split off from Europe/Volgograd.  It covers
++    Kirov Oblast, Russia, which switched from +04/+05 to +03/+04 on
++    1989-03-26 at 02:00, roughly a year after Europe/Volgograd made
++    the same change.  (Thanks to Stepan Golosunov.)
++
++    Russia and nearby locations had daylight-saving transitions on
++    1992-03-29 at 02:00 and 1992-09-27 at 03:00, instead of on
++    1992-03-28 at 23:00 and 1992-09-26 at 23:00.  (Thanks to Stepan
++    Golosunov.)
++
++    Many corrections to historical time in Kazakhstan from 1991
++    through 2005.  (Thanks to Stepan Golosunov.)  Replace Kazakhstan's
++    invented time zone abbreviations with numeric abbreviations.
++
++  Changes to commentary
++
++    Mention Internet RFCs 7808 (TZDIST) and 7809 (CalDAV time zone references).
++
++
++Release 2016c - 2016-03-23 00:51:27 -0700
++
++  Changes affecting future time stamps
++
++    Azerbaijan no longer observes DST.  (Thanks to Steffen Thorsen.)
++
++    Chile reverts from permanent to seasonal DST.  (Thanks to Juan
++    Correa for the heads-up, and to Tim Parenti for corrections.)
++    Guess that future transitions are August's and May's second
++    Saturdays at 24:00 mainland time.  Also, call the period from
++    2014-09-07 through 2016-05-14 daylight saving time instead of
++    standard time, as that seems more appropriate now.
++
++  Changes affecting past time stamps
++
++    Europe/Kaliningrad and Europe/Vilnius changed from +03/+04 to
++    +02/+03 on 1989-03-26, not 1991-03-31.  Europe/Volgograd changed
++    from +04/+05 to +03/+04 on 1988-03-27, not 1989-03-26.
++    (Thanks to Stepan Golosunov.)
++
++  Changes to commentary
++
++    Several updates and URLs for historical and proposed Russian changes.
++    (Thanks to Stepan Golosunov, Matt Johnson, and Alexander Krivenyshev.)
++
++
++Release 2016b - 2016-03-12 17:30:14 -0800
++
++  Compatibility note
++
++    Starting with release 2016b, some data entries cause zic implementations
++    derived from tz releases 2005j through 2015e to issue warnings like
++    "time zone abbreviation differs from POSIX standard (+03)".
++    These warnings should not otherwise affect zic's output and can safely be
++    ignored on today's platforms, as the warnings refer to a restriction in
++    POSIX.1-1988 that was removed in POSIX.1-2001.  One way to suppress the
++    warnings is to upgrade to zic derived from tz releases 2015f and later.
++
++  Changes affecting future time stamps
++
++    New zones Europe/Astrakhan and Europe/Ulyanovsk for Astrakhan and
++    Ulyanovsk Oblasts, Russia, both of which will switch from +03 to +04 on
++    2016-03-27 at 02:00 local time.  They need distinct zones since their
++    post-1970 histories disagree.  New zone Asia/Barnaul for Altai Krai and
++    Altai Republic, Russia, which will switch from +06 to +07 on the same date
++    and local time.  The Astrakhan change is already official; the others have
++    passed the first reading in the State Duma and are extremely likely.
++    Also, Asia/Sakhalin moves from +10 to +11 on 2016-03-27 at 02:00.
++    (Thanks to Alexander Krivenyshev for the heads-up, and to Matt Johnson
++    and Stepan Golosunov for followup.)
++
++    As a trial of a new system that needs less information to be made up,
++    the new zones use numeric time zone abbreviations like "+04"
++    instead of invented abbreviations like "ASTT".
++
++    Haiti will not observe DST in 2016.  (Thanks to Jean Antoine via
++    Steffen Thorsen.)
++
++    Palestine's spring-forward transition on 2016-03-26 is at 01:00, not 00:00.
++    (Thanks to Hannah Kreitem.) Guess future transitions will be March's last
++    Saturday at 01:00, not March's last Friday at 24:00.
++
++  Changes affecting past time stamps
++
++    Europe/Chisinau observed DST during 1990, and switched from +04 to
++    +03 at 1990-05-06 02:00, instead of switching from +03 to +02.
++    (Thanks to Stepan Golosunov.)
++
++    1991 abbreviations in Europe/Samara should be SAMT/SAMST, not
++    KUYT/KUYST.  (Thanks to Stepan Golosunov.)
++
++  Changes to code
++
++    tzselect's diagnostics and checking, and checktab.awk's checking,
++    have been improved.  (Thanks to J William Piggott.)
++
++    tzcode now builds under MinGW.  (Thanks to Ian Abbott and Esben Haabendal.)
++
++    tzselect now tests Julian-date TZ settings more accurately.
++    (Thanks to J William Piggott.)
++
++  Changes to commentary
++
++    Comments in zone tables have been improved.  (Thanks to J William Piggott.)
++
++    tzselect again limits its menu comments so that menus fit on a
++    24x80 alphanumeric display.
++
++    A new web page tz-how-to.html.  (Thanks to Bill Seymour.)
++
++    In the Theory file, the description of possible time zone abbreviations in
++    tzdata has been cleaned up, as the old description was unclear and
++    inconsistent.  (Thanks to Alain Mouette for reporting the problem.)
++
++
++Release 2016a - 2016-01-26 23:28:02 -0800
++
++  Changes affecting future time stamps
++
++    America/Cayman will not observe daylight saving this year after all.
++    Revert our guess that it would.  (Thanks to Matt Johnson.)
++
++    Asia/Chita switches from +0800 to +0900 on 2016-03-27 at 02:00.
++    (Thanks to Alexander Krivenyshev.)
++
++    Asia/Tehran now has DST predictions for the year 2038 and later,
++    to be March 21 00:00 to September 21 00:00.  This is likely better
++    than predicting no DST, albeit off by a day every now and then.
++
++  Changes affecting past and future time stamps
++
++    America/Metlakatla switched from PST all year to AKST/AKDT on
++    2015-11-01 at 02:00.  (Thanks to Steffen Thorsen.)
++
++    America/Santa_Isabel has been removed, and replaced with a
++    backward compatibility link to America/Tijuana.  Its contents were
++    apparently based on a misreading of Mexican legislation.
++
++  Changes affecting past time stamps
++
++    Asia/Karachi's two transition times in 2002 were off by a minute.
++    (Thanks to Matt Johnson.)
++
++  Changes affecting build procedure
++
++    An installer can now combine leap seconds with use of the backzone file,
++    e.g., with 'make PACKRATDATA=backzone REDO=posix_right zones'.
++    The old 'make posix_packrat' rule is now marked as obsolescent.
++    (Thanks to Ian Abbott for an initial implementation.)
++
++  Changes affecting documentation and commentary
++
++    A new file LICENSE makes it easier to see that the code and data
++    are mostly public-domain.  (Thanks to James Knight.)  The three
++    non-public-domain files now use the current (3-clause) BSD license
++    instead of older versions of that license.
++
++    tz-link.htm mentions the BDE library (thanks to Andrew Paprocki),
++    CCTZ (thanks to Tim Parenti), TimeJones.com, and has a new section
++    on editing tz source files (with a mention of Sublime zoneinfo,
++    thanks to Gilmore Davidson).
++
++    The Theory and asia files now mention the 2015 book "The Global
++    Transformation of Time, 1870-1950", and cite a couple of reviews.
++
++    The America/Chicago entry now documents the informal use of US
++    central time in Fort Pierre, South Dakota.  (Thanks to Rick
++    McDermid, Matt Johnson, and Steve Jones.)
++
++
++Release 2015g - 2015-10-01 00:39:51 -0700
++
++  Changes affecting future time stamps
++
++    Turkey's 2015 fall-back transition is scheduled for Nov. 8, not Oct. 25.
++    (Thanks to Fatih.)
++
++    Norfolk moves from +1130 to +1100 on 2015-10-04 at 02:00 local time.
++    (Thanks to Alexander Krivenyshev.)
++
++    Fiji's 2016 fall-back transition is scheduled for January 17, not 24.
++    (Thanks to Ken Rylander.)
++
++    Fort Nelson, British Columbia will not fall back on 2015-11-01.  It has
++    effectively been on MST (-0700) since it advanced its clocks on 2015-03-08.
++    New zone America/Fort_Nelson.  (Thanks to Matt Johnson.)
++
++  Changes affecting past time stamps
++
++    Norfolk observed DST from 1974-10-27 02:00 to 1975-03-02 02:00.
++
++  Changes affecting code
++
++    localtime no longer mishandles America/Anchorage after 2037.
++    (Thanks to Bradley White for reporting the bug.)
++
++    On hosts with signed 32-bit time_t, localtime no longer mishandles
++    Pacific/Fiji after 2038-01-16 14:00 UTC.
++
++    The localtime module allows the variables 'timezone', 'daylight',
++    and 'altzone' to be in common storage shared with other modules,
++    and declares them in case the system <time.h> does not.
++    (Problems reported by Kees Dekker.)
++
++    On platforms with tm_zone, strftime.c now assumes it is not NULL.
++    This simplifies the code and is consistent with zdump.c.
++    (Problem reported by Christos Zoulas.)
++
++  Changes affecting documentation
++
++   The tzfile man page now documents that transition times denote the
++   starts (not the ends) of the corresponding time periods.
++   (Ambiguity reported by Bill Seymour.)
++
++
++Release 2015f - 2015-08-10 18:06:56 -0700
++
++  Changes affecting future time stamps
++
++    North Korea switches to +0830 on 2015-08-15.  (Thanks to Steffen Thorsen.)
++    The abbreviation remains "KST".  (Thanks to Robert Elz.)
++
++    Uruguay no longer observes DST.  (Thanks to Steffen Thorsen
++    and Pablo Camargo.)
++
++  Changes affecting past and future time stamps
++
++    Moldova starts and ends DST at 00:00 UTC, not at 01:00 UTC.
++    (Thanks to Roman Tudos.)
++
++  Changes affecting data format and code
++
++    zic's '-y YEARISTYPE' option is no longer documented.  The TYPE
++    field of a Rule line should now be '-'; the old values 'even',
++    'odd', 'uspres', 'nonpres', 'nonuspres' were already undocumented.
++    Although the implementation has not changed, these features do not
++    work in the default installation, they are not used in the data,
++    and they are now considered obsolescent.
++
++    zic now checks that two rules don't take effect at the same time.
++    (Thanks to Jon Skeet and Arthur David Olson.)  Constraints on
++    simultaneity are now documented.
++
++    The two characters '%z' in a zone format now stand for the UTC
++    offset, e.g., '-07' for seven hours behind UTC and '+0530' for
++    five hours and thirty minutes ahead.  This better supports time
++    zone abbreviations conforming to POSIX.1-2001 and later.
++
++  Changes affecting installed data files
++
++    Comments for America/Halifax and America/Glace_Bay have been improved.
++    (Thanks to Brian Inglis.)
++
++    Data entries have been simplified for Atlantic/Canary, Europe/Simferopol,
++    Europe/Sofia, and Europe/Tallinn.  This yields slightly smaller
++    installed data files for Europe/Simferopol and Europe/Tallinn.
++    It does not affect timestamps.  (Thanks to Howard Hinnant.)
++
++  Changes affecting code
++
++    zdump and zic no longer warn about valid time zone abbreviations
++    like '-05'.
++
++    Some Visual Studio 2013 warnings have been suppressed.
++    (Thanks to Kees Dekker.)
++
++    'date' no longer sets the time of day and its -a, -d, -n and -t
++    options have been removed.  Long obsolescent, the implementation
++    of these features had porting problems.  Builders no longer need
++    to configure HAVE_ADJTIME, HAVE_SETTIMEOFDAY, or HAVE_UTMPX_H.
++    (Thanks to Kees Dekker for pointing out the problem.)
++
++  Changes affecting documentation
++
++    The Theory file mentions naming issues earlier, as these seem to be
++    poorly publicized (thanks to Gilmore Davidson for reporting the problem).
++
++    tz-link.htm mentions Time Zone Database Parser (thanks to Howard Hinnant).
++
++    Mention that Herbert Samuel introduced the term "Summer Time".
++
++
++Release 2015e - 2015-06-13 10:56:02 -0700
++
++  Changes affecting future time stamps
++
++    Morocco will suspend DST from 2015-06-14 03:00 through 2015-07-19 02:00,
++    not 06-13 and 07-18 as we had guessed.  (Thanks to Milamber.)
++
++    Assume Cayman Islands will observe DST starting next year, using US rules.
++    Although it isn't guaranteed, it is the most likely.
++
++  Changes affecting data format
++
++    The file 'iso3166.tab' now uses UTF-8, so that its entries can better
++    spell the names of Åland Islands, Côte d'Ivoire, and Réunion.
++
++  Changes affecting code
++
++    When displaying data, tzselect converts it to the current locale's
++    encoding if the iconv command works.  (Problem reported by random832.)
++
++    tzselect no longer mishandles Dominica, fixing a bug introduced
++    in Release 2014f.  (Problem reported by Owen Leibman.)
++
++    zic -l no longer fails when compiled with -DTZDEFAULT=\"/etc/localtime\".
++    This fixes a bug introduced in Release 2014f.
++    (Problem reported by Leonardo Chiquitto.)
++
++
++Release 2015d - 2015-04-24 08:09:46 -0700
++
++  Changes affecting future time stamps
++
++    Egypt will not observe DST in 2015 and will consider canceling it
++    permanently.  For now, assume no DST indefinitely.
++    (Thanks to Ahmed Nazmy and Tim Parenti.)
++
++  Changes affecting past time stamps
++
++    America/Whitehorse switched from UT -09 to -08 on 1967-05-28, not
++    1966-07-01.  Also, Yukon's time zone history is documented better.
++    (Thanks to Brian Inglis and Dennis Ferguson.)
++
++  Change affecting past and future time zone abbreviations
++
++    The abbreviations for Hawaii-Aleutian standard and daylight times
++    have been changed from HAST/HADT to HST/HDT, as per US Government
++    Printing Office style.  This affects only America/Adak since 1983,
++    as America/Honolulu was already using the new style.
++
++  Changes affecting code
++
++   zic has some minor performance improvements.
++
++
++Release 2015c - 2015-04-11 08:55:55 -0700
++
++  Changes affecting future time stamps
++
++    Egypt's spring-forward transition is at 24:00 on April's last Thursday,
++    not 00:00 on April's last Friday.  2015's transition will therefore be on
++    Thursday, April 30 at 24:00, not Friday, April 24 at 00:00.  Similar fixes
++    apply to 2026, 2037, 2043, etc.  (Thanks to Steffen Thorsen.)
++
++  Changes affecting past time stamps
++
++    The following changes affect some pre-1991 Chile-related time stamps
++    in America/Santiago, Antarctica/Palmer, and Pacific/Easter.
++
++      The 1910 transition was January 10, not January 1.
++
++      The 1918 transition was September 10, not September 1.
++
++      The UT -04 time observed from 1932 to 1942 is now considered to
++      be standard time, not year-round DST.
++
++      Santiago observed DST (UT -03) from 1946-07-15 through
++      1946-08-31, then reverted to standard time, then switched to -05
++      on 1947-04-01.
++
++      Assume transitions before 1968 were at 00:00, since we have no data
++      saying otherwise.
++
++      The spring 1988 transition was 1988-10-09, not 1988-10-02.
++      The fall 1990 transition was 1990-03-11, not 1990-03-18.
++
++      Assume no UTC offset change for Pacific/Easter on 1890-01-01,
++      and omit all transitions on Pacific/Easter from 1942 through 1946
++      since we have no data suggesting that they existed.
++
++    One more zone has been turned into a link, as it differed
++    from an existing zone only for older time stamps.  As usual,
++    this change affects UTC offsets in pre-1970 time stamps only.
++    The zone's old contents have been moved to the 'backzone' file.
++    The affected zone is America/Montreal.
++
++  Changes affecting commentary
++
++    Mention the TZUpdater tool.
++
++    Mention "The Time Now".  (Thanks to Brandon Ramsey.)
++
++
++Release 2015b - 2015-03-19 23:28:11 -0700
++
++  Changes affecting future time stamps
++
++    Mongolia will start observing DST again this year, from the last
++    Saturday in March at 02:00 to the last Saturday in September at 00:00.
++    (Thanks to Ganbold Tsagaankhuu.)
++
++    Palestine will start DST on March 28, not March 27.  Also,
++    correct the fall 2014 transition from September 26 to October 24.
++    Adjust future predictions accordingly.  (Thanks to Steffen Thorsen.)
++
++  Changes affecting past time stamps
++
++    The 1982 zone shift in Pacific/Easter has been corrected, fixing a 2015a
++    regression.  (Thanks to Stuart Bishop for reporting the problem.)
++
++    Some more zones have been turned into links, when they differed
++    from existing zones only for older time stamps.  As usual,
++    these changes affect UTC offsets in pre-1970 time stamps only.
++    Their old contents have been moved to the 'backzone' file.
++    The affected zones are: America/Antigua, America/Cayman,
++    Pacific/Midway, and Pacific/Saipan.
++
++  Changes affecting time zone abbreviations
++
++    Correct the 1992-2010 DST abbreviation in Volgograd from "MSK" to "MSD".
++    (Thanks to Hank W.)
++
++  Changes affecting code
++
++    Fix integer overflow bug in reference 'mktime' implementation.
++    (Problem reported by Jörg Richter.)
++
++    Allow -Dtime_tz=time_t compilations, and allow -Dtime_tz=... libraries
++    to be used in the same executable as standard-library time_t functions.
++    (Problems reported by Bradley White.)
++
++  Changes affecting commentary
++
++    Cite the recent Mexican decree changing Quintana Roo's time zone.
++    (Thanks to Carlos Raúl Perasso.)
++
++    Likewise for the recent Chilean decree.  (Thanks to Eduardo Romero Urra.)
++
++    Update info about Mars time.
++
++
++Release 2015a - 2015-01-29 22:35:20 -0800
++
++  Changes affecting future time stamps
++
++    The Mexican state of Quintana Roo, represented by America/Cancun,
++    will shift from Central Time with DST to Eastern Time without DST
++    on 2015-02-01 at 02:00.  (Thanks to Steffen Thorsen and Gwillim Law.)
++
++    Chile will not change clocks in April or thereafter; its new standard time
++    will be its old daylight saving time.  This affects America/Santiago,
++    Pacific/Easter, and Antarctica/Palmer.  (Thanks to Juan Correa.)
++
++    New leap second 2015-06-30 23:59:60 UTC as per IERS Bulletin C 49.
++    (Thanks to Tim Parenti.)
++
++  Changes affecting past time stamps
++
++    Iceland observed DST in 1919 and 1921, and its 1939 fallback
++    transition was Oct. 29, not Nov. 29.  Remove incorrect data from
++    Shanks about time in Iceland between 1837 and 1908.
++
++    Some more zones have been turned into links, when they differed
++    from existing zones only for older time stamps.  As usual,
++    these changes affect UTC offsets in pre-1970 time stamps only.
++    Their old contents have been moved to the 'backzone' file.
++    The affected zones are: Asia/Aden, Asia/Bahrain, Asia/Kuwait,
++    and Asia/Muscat.
++
++  Changes affecting code
++
++    tzalloc now scrubs time zone abbreviations compatibly with the way
++    that tzset always has, by replacing invalid bytes with '_' and by
++    shortening too-long abbreviations.
++
++    tzselect ports to POSIX awk implementations, no longer mishandles
++    POSIX TZ settings when GNU awk is used, and reports POSIX TZ
++    settings to the user.  (Thanks to Stefan Kuhn.)
++
++  Changes affecting build procedure
++
++    'make check' now checks for links to links in the data.
++    One such link (for Africa/Asmera) has been fixed.
++    (Thanks to Stephen Colebourne for pointing out the problem.)
++
++  Changes affecting commentary
++
++    The leapseconds file commentary now mentions the expiration date.
++    (Problem reported by Martin Burnicki.)
++
++    Update Mexican Library of Congress URL.
++
++
++Release 2014j - 2014-11-10 17:37:11 -0800
++
++  Changes affecting current and future time stamps
++
++    Turks & Caicos' switch from US eastern time to UT -04 year-round
++    did not occur on 2014-11-02 at 02:00.  It's currently scheduled
++    for 2015-11-01 at 02:00.  (Thanks to Chris Walton.)
++
++  Changes affecting past time stamps
++
++    Many pre-1989 time stamps have been corrected for Asia/Seoul and
++    Asia/Pyongyang, based on sources for the Korean-language Wikipedia
++    entry for time in Korea.  (Thanks to Sanghyuk Jung.)  Also, no
++    longer guess that Pyongyang mimicked Seoul time after World War II,
++    as this is politically implausible.
++
++    Some more zones have been turned into links, when they differed
++    from existing zones only for older time stamps.  As usual,
++    these changes affect UTC offsets in pre-1970 time stamps only.
++    Their old contents have been moved to the 'backzone' file.
++    The affected zones are: Africa/Addis_Ababa, Africa/Asmara,
++    Africa/Dar_es_Salaam, Africa/Djibouti, Africa/Kampala,
++    Africa/Mogadishu, Indian/Antananarivo, Indian/Comoro, and
++    Indian/Mayotte.
++
++  Changes affecting commentary
++
++    The commentary is less enthusiastic about Shanks as a source,
++    and is more careful to distinguish UT from UTC.
++
++
++Release 2014i - 2014-10-21 22:04:57 -0700
++
++  Changes affecting future time stamps
++
++    Pacific/Fiji will observe DST from 2014-11-02 02:00 to 2015-01-18 03:00.
++    (Thanks to Ken Rylander for the heads-up.)  Guess that future
++    years will use a similar pattern.
++
++    A new Zone Pacific/Bougainville, for the part of Papua New Guinea
++    that plans to switch from UT +10 to +11 on 2014-12-28 at 02:00.
++    (Thanks to Kiley Walbom for the heads-up.)
++
++  Changes affecting time zone abbreviations
++
++    Since Belarus is not changing its clocks even though Moscow is,
++    the time zone abbreviation in Europe/Minsk is changing from FET
++    to its more-traditional value MSK on 2014-10-26 at 01:00.
++    (Thanks to Alexander Bokovoy for the heads-up about Belarus.)
++
++    The new abbreviation IDT stands for the pre-1976 use of UT +08 in
++    Indochina, to distinguish it better from ICT (+07).
++
++  Changes affecting past time stamps
++
++    Many time stamps have been corrected for Asia/Ho_Chi_Minh before 1976
++    (thanks to Trần Ngọc Quân for an indirect pointer to Trần Tiến Bình's
++    authoritative book).  Asia/Ho_Chi_Minh has been added to
++    zone1970.tab, to give tzselect users in Vietnam two choices,
++    since north and south Vietnam disagreed after our 1970 cutoff.
++
++    Asia/Phnom_Penh and Asia/Vientiane have been turned into links, as
++    they differed from existing zones only for older time stamps.  As
++    usual, these changes affect pre-1970 time stamps only.  Their old
++    contents have been moved to the 'backzone' file.
++
++  Changes affecting code
++
++    The time-related library functions now set errno on failure, and
++    some crashes in the new tzalloc-related library functions have
++    been fixed.  (Thanks to Christos Zoulas for reporting most of
++    these problems and for suggesting fixes.)
++
++    If USG_COMPAT is defined and the requested time stamp is standard time,
++    the tz library's localtime and mktime functions now set the extern
++    variable timezone to a value appropriate for that time stamp; and
++    similarly for ALTZONE, daylight saving time, and the altzone variable.
++    This change is a companion to the tzname change in 2014h, and is
++    designed to make timezone and altzone more compatible with tzname.
++
++    The tz library's functions now set errno to EOVERFLOW if they fail
++    because the result cannot be represented.  ctime and ctime_r now
++    return NULL and set errno when a time stamp is out of range, rather
++    than having undefined behavior.
++
++    Some bugs associated with the new 2014g functions have been fixed.
++    This includes a bug that largely incapacitated the new functions
++    time2posix_z and posix2time_z.  (Thanks to Christos Zoulas.)
++    It also includes some uses of uninitialized variables after tzalloc.
++    The new code uses the standard type 'ssize_t', which the Makefile
++    now gives porting advice about.
++
++  Changes affecting commentary
++
++    Updated URLs for NRC Canada (thanks to Matt Johnson and Brian Inglis).
++
++
++Release 2014h - 2014-09-25 18:59:03 -0700
++
++  Changes affecting past time stamps
++
++    America/Jamaica's 1974 spring-forward transition was Jan. 6, not Apr. 28.
++
++    Shanks says Asia/Novokuznetsk switched from LMT (not "NMT") on 1924-05-01,
++    not 1920-01-06.  The old entry was based on a misinterpretation of Shanks.
++
++    Some more zones have been turned into links, when they differed
++    from existing zones only for older time stamps.  As usual,
++    these changes affect UTC offsets in pre-1970 time stamps only.
++    Their old contents have been moved to the 'backzone' file.
++    The affected zones are: Africa/Blantyre, Africa/Bujumbura,
++    Africa/Gaborone, Africa/Harare, Africa/Kigali, Africa/Lubumbashi,
++    Africa/Lusaka, Africa/Maseru, and Africa/Mbabane.
++
++  Changes affecting code
++
++    zdump -V and -v now output gmtoff= values on all platforms,
++    not merely on platforms defining TM_GMTOFF.
++
++    The tz library's localtime and mktime functions now set tzname to a value
++    appropriate for the requested time stamp, and zdump now uses this
++    on platforms not defining TM_ZONE, fixing a 2014g regression.
++    (Thanks to Tim Parenti for reporting the problem.)
++
++    The tz library no longer sets tzname if localtime or mktime fails.
++
++    zdump -c no longer mishandles transitions near year boundaries.
++    (Thanks to Tim Parenti for reporting the problem.)
++
++    An access to uninitialized data has been fixed.
++    (Thanks to Jörg Richter for reporting the problem.)
++
++    When THREAD_SAFE is defined, the code ports to the C11 memory model.
++    A memory leak has been fixed if ALL_STATE and THREAD_SAFE are defined
++    and two threads race to initialize data used by gmtime-like functions.
++    (Thanks to Andy Heninger for reporting the problems.)
++
++  Changes affecting build procedure
++
++    'make check' now checks better for properly-sorted data.
++
++  Changes affecting documentation and commentary
++
++    zdump's gmtoff=N output is now documented, and its isdst=D output
++    is now documented to possibly output D values other than 0 or 1.
++
++    zdump -c's treatment of years is now documented to use the
++    Gregorian calendar and Universal Time without leap seconds,
++    and its behavior at cutoff boundaries is now documented better.
++    (Thanks to Arthur David Olson and Tim Parenti for reporting the problems.)
++
++    Programs are now documented to use the proleptic Gregorian calendar.
++    (Thanks to Alan Barrett for the suggestion.)
++
++    Fractional-second GMT offsets have been documented for civil time
++    in 19th-century Chennai, Jakarta, and New York.
++
++
++Release 2014g - 2014-08-28 12:31:23 -0700
++
++  Changes affecting future time stamps
++
++    Turks & Caicos is switching from US eastern time to UT -04
++    year-round, modeled as a switch on 2014-11-02 at 02:00.
++    [As noted in 2014j, this switch was later delayed.]
++
++  Changes affecting past time stamps
++
++    Time in Russia or the USSR before 1926 or so has been corrected by
++    a few seconds in the following zones: Asia/Irkutsk,
++    Asia/Krasnoyarsk, Asia/Omsk, Asia/Samarkand, Asia/Tbilisi,
++    Asia/Vladivostok, Asia/Yakutsk, Europe/Riga, Europe/Samara.  For
++    Asia/Yekaterinburg the correction is a few minutes.  (Thanks to
++    Vladimir Karpinsky.)
++
++    The Portuguese decree of 1911-05-26 took effect on 1912-01-01.
++    This affects 1911 time stamps in Africa/Bissau, Africa/Luanda,
++    Atlantic/Azores, and Atlantic/Madeira.  Also, Lisbon's pre-1912
++    GMT offset was -0:36:45 (rounded from -0:36:44.68), not -0:36:32.
++    (Thanks to Stephen Colebourne for pointing to the decree.)
++
++    Asia/Dhaka ended DST on 2009-12-31 at 24:00, not 23:59.
++
++    A new file 'backzone' contains data which may appeal to
++    connoisseurs of old time stamps, although it is out of scope for
++    the tz database, is often poorly sourced, and contains some data
++    that is known to be incorrect.  The new file is not recommended
++    for ordinary use and its entries are not installed by default.
++    (Thanks to Lester Caine for the high-quality Jersey, Guernsey, and
++    Isle of Man entries.)
++
++    Some more zones have been turned into links, when they differed
++    from existing zones only for older time stamps.  As usual,
++    these changes affect UTC offsets in pre-1970 time stamps only.
++    Their old contents have been moved to the 'backzone' file.
++    The affected zones are: Africa/Bangui, Africa/Brazzaville,
++    Africa/Douala, Africa/Kinshasa, Africa/Libreville, Africa/Luanda,
++    Africa/Malabo, Africa/Niamey, and Africa/Porto-Novo.
++
++  Changes affecting code
++
++    Unless NETBSD_INSPIRED is defined to 0, the tz library now
++    supplies functions for creating and using objects that represent
++    time zones. The new functions are tzalloc, tzfree, localtime_rz,
++    mktime_z, and (if STD_INSPIRED is also defined) posix2time_z and
++    time2posix_z.  They are intended for performance: for example,
++    localtime_rz (unlike localtime_r) is trivially thread-safe without
++    locking.  (Thanks to Christos Zoulas for proposing NetBSD-inspired
++    functions, and to Alan Barrett and Jonathan Lennox for helping to
++    debug the change.)
++
++    zdump now builds with the tz library unless USE_LTZ is defined to 0,
++    This lets zdump use tz features even if the system library lacks them.
++    To build zdump with the system library, use 'make CFLAGS=-DUSE_LTZ=0
++    TZDOBJS=zdump.o CHECK_TIME_T_ALTERNATIVES='.
++
++    zdump now uses localtime_rz if available, as it's significantly faster,
++    and it can help zdump better diagnose invalid time zone names.
++    Define HAVE_LOCALTIME_RZ to 0 to suppress this.  HAVE_LOCALTIME_RZ
++    defaults to 1 if NETBSD_INSPIRED && USE_LTZ.  When localtime_rz is
++    not available, zdump now uses localtime_r and tzset if available,
++    as this is a bit cleaner and faster than plain localtime.  Compile
++    with -DHAVE_LOCALTIME_R=0 and/or -DHAVE_TZSET=0 if your system
++    lacks these two functions.
++
++    If THREAD_SAFE is defined to 1, the tz library is now thread-safe.
++    Although not needed for tz's own applications, which are single-threaded,
++    this supports POSIX better if the tz library is used in multithreaded apps.
++
++    Some crashes have been fixed when zdump or the tz library is given
++    invalid or outlandish input.
++
++    The tz library no longer mishandles leap seconds on platforms with
++    unsigned time_t in time zones that lack ordinary transitions after 1970.
++
++    The tz code now attempts to infer TM_GMTOFF and TM_ZONE if not
++    already defined, to make it easier to configure on common platforms.
++    Define NO_TM_GMTOFF and NO_TM_ZONE to suppress this.
++
++    Unless the new macro UNINIT_TRAP is defined to 1, the tz code now
++    assumes that reading uninitialized memory yields garbage values
++    but does not cause other problems such as traps.
++
++    If TM_GMTOFF is defined and UNINIT_TRAP is 0, mktime is now
++    more likely to guess right for ambiguous time stamps near
++    transitions where tm_isdst does not change.
++
++    If HAVE_STRFTIME_L is defined to 1, the tz library now defines
++    strftime_l for compatibility with recent versions of POSIX.
++    Only the C locale is supported, though.  HAVE_STRFTIME_L defaults
++    to 1 on recent POSIX versions, and to 0 otherwise.
++
++    tzselect -c now uses a hybrid distance measure that works better
++    in Africa.  (Thanks to Alan Barrett for noting the problem.)
++
++    The C source code now ports to NetBSD when GCC_DEBUG_FLAGS is used,
++    or when time_tz is defined.
++
++    When HAVE_UTMPX_H is set the 'date' command now builds on systems
++    whose <utmpx.h> file does not define WTMPX_FILE, and when setting
++    the date it updates the wtmpx file if _PATH_WTMPX is defined.
++    This affects GNU/Linux and similar systems.
++
++    For easier maintenance later, some C code has been simplified,
++    some lint has been removed, and the code has been tweaked so that
++    plain 'make' is more likely to work.
++
++    The C type 'bool' is now used for boolean values, instead of 'int'.
++
++    The long-obsolete LOCALE_HOME code has been removed.
++
++    The long-obsolete 'gtime' function has been removed.
++
++  Changes affecting build procedure
++
++    'zdump' no longer links in ialloc.o, as it's not needed.
++
++    'make check_time_t_alternatives' no longer assumes GNU diff.
++
++  Changes affecting distribution tarballs
++
++    The files checktab.awk and zoneinfo2tdf.pl are now distributed in
++    the tzdata tarball instead of the tzcode tarball, since they help
++    maintain the data.  The NEWS and Theory files are now also
++    distributed in the tzdata tarball, as they're relevant for data.
++    (Thanks to Alan Barrett for pointing this out.)  Also, the
++    leapseconds.awk file is no longer distributed in the tzcode
++    tarball, since it belongs in the tzdata tarball (where 2014f
++    inadvertently also distributed it).
++
++  Changes affecting documentation and commentary
++
++    A new file CONTRIBUTING is distributed.  (Thanks to Tim Parenti for
++    suggesting a CONTRIBUTING file, and to Tony Finch and Walter Harms
++    for debugging it.)
++
++    The man pages have been updated to use function prototypes,
++    to document thread-safe variants like localtime_r, and to document
++    the NetBSD-inspired functions tzalloc, tzfree, localtime_rz, and
++    mktime_z.
++
++    The fields in Link lines have been renamed to be more descriptive
++    and more like the parameters of 'ln'.  LINK-FROM has become TARGET,
++    and LINK-TO has become LINK-NAME.
++
++    tz-link.htm mentions the IETF's tzdist working group; Windows
++    Runtime etc. (thanks to Matt Johnson); and HP-UX's tztab.
++
++    Some broken URLs have been fixed in the commentary.  (Thanks to
++    Lester Caine.)
++
++    Commentary about Philippines DST has been updated, and commentary
++    on pre-1970 time in India has been added.
++
++
++Release 2014f - 2014-08-05 17:42:36 -0700
++
++  Changes affecting future time stamps
++
++    Russia will subtract an hour from most of its time zones on 2014-10-26
++    at 02:00 local time.  (Thanks to Alexander Krivenyshev.)
++    There are a few exceptions: Magadan Oblast (Asia/Magadan) and Zabaykalsky
++    Krai are subtracting two hours; conversely, Chukotka Autonomous Okrug
++    (Asia/Anadyr), Kamchatka Krai (Asia/Kamchatka), Kemerovo Oblast
++    (Asia/Novokuznetsk), and the Samara Oblast and the Udmurt Republic
++    (Europe/Samara) are not changing their clocks.  The changed zones are
++    Europe/Kaliningrad, Europe/Moscow, Europe/Simferopol, Europe/Volgograd,
++    Asia/Yekaterinburg, Asia/Omsk, Asia/Novosibirsk, Asia/Krasnoyarsk,
++    Asia/Irkutsk, Asia/Yakutsk, Asia/Vladivostok, Asia/Khandyga,
++    Asia/Sakhalin, and Asia/Ust-Nera; Asia/Magadan will have two hours
++    subtracted; and Asia/Novokuznetsk's time zone abbreviation is affected,
++    but not its UTC offset.  Two zones are added: Asia/Chita (split
++    from Asia/Yakutsk, and also with two hours subtracted) and
++    Asia/Srednekolymsk (split from Asia/Magadan, but with only one hour
++    subtracted).  (Thanks to Tim Parenti for much of the above.)
++
++  Changes affecting time zone abbreviations
++
++    Australian eastern time zone abbreviations are now AEST/AEDT not EST,
++    and similarly for the other Australian zones.  That is, for eastern
++    standard and daylight saving time the abbreviations are AEST and AEDT
++    instead of the former EST for both; similarly, ACST/ACDT, ACWST/ACWDT,
++    and AWST/AWDT are now used instead of the former CST, CWST, and WST.
++    This change does not affect UTC offsets, only time zone abbreviations.
++    (Thanks to Rich Tibbett and many others.)
++
++    Asia/Novokuznetsk shifts from NOVT to KRAT (remaining on UT +07)
++    effective 2014-10-26 at 02:00 local time.
++
++    The time zone abbreviation for Xinjiang Time (observed in Ürümqi)
++    has been changed from URUT to XJT.  (Thanks to Luther Ma.)
++
++    Prefer MSK/MSD for Moscow time in Russia, even in other cities.
++    Similarly, prefer EET/EEST for eastern European time in Russia.
++
++    Change time zone abbreviations in (western) Samoa to use "ST" and
++    "DT" suffixes, as this is more likely to match common practice.
++    Prefix "W" to (western) Samoa time when its standard-time offset
++    disagrees with that of American Samoa.
++
++    America/Metlakatla now uses PST, not MeST, to abbreviate its time zone.
++
++    Time zone abbreviations have been updated for Japan's two time
++    zones used 1896-1937.  JWST now stands for Western Standard
++    Time, and JCST for Central Standard Time (formerly this was CJT).
++    These abbreviations are now used for time in Korea, Taiwan,
++    and Sakhalin while controlled by Japan.
++
++  Changes affecting past time stamps
++
++    China's five zones have been simplified to two, since the post-1970
++    differences in the other three seem to have been imaginary.  The
++    zones Asia/Harbin, Asia/Chongqing, and Asia/Kashgar have been
++    removed; backwards-compatibility links still work, albeit with
++    different behaviors for time stamps before May 1980.  Asia/Urumqi's
++    1980 transition to UT +08 has been removed, so that it is now at
++    +06 and not +08.  (Thanks to Luther Ma and to Alois Treindl;
++    Treindl sent helpful translations of two papers by Guo Qingsheng.)
++
++    Some zones have been turned into links, when they differed from existing
++    zones only for older UTC offsets where data entries were likely invented.
++    These changes affect UTC offsets in pre-1970 time stamps only.  This is
++    similar to the change in release 2013e, except this time for western
++    Africa.  The affected zones are: Africa/Bamako, Africa/Banjul,
++    Africa/Conakry, Africa/Dakar, Africa/Freetown, Africa/Lome,
++    Africa/Nouakchott, Africa/Ouagadougou, Africa/Sao_Tome, and
++    Atlantic/St_Helena.  This also affects the backwards-compatibility
++    link Africa/Timbuktu.  (Thanks to Alan Barrett, Stephen Colebourne,
++    Tim Parenti, and David Patte for reporting problems in earlier
++    versions of this change.)
++
++    Asia/Shanghai's pre-standard-time UT offset has been changed from
++    8:05:57 to 8:05:43, the location of Xujiahui Observatory.  Its
++    transition to standard time has been changed from 1928 to 1901.
++
++    Asia/Taipei switched to JWST on 1896-01-01, then to JST on 1937-10-01,
++    then to CST on 1945-09-21 at 01:00, and did not observe DST in 1945.
++    In 1946 it observed DST from 05-15 through 09-30; in 1947
++    from 04-15 through 10-31; and in 1979 from 07-01 through 09-30.
++    (Thanks to Yu-Cheng Chuang.)
++
++    Asia/Riyadh's transition to standard time is now 1947-03-14, not 1950.
++
++    Europe/Helsinki's 1942 fall-back transition was 10-04 at 01:00, not
++    10-03 at 00:00.  (Thanks to Konstantin Hyppönen.)
++
++    Pacific/Pago_Pago has been changed from UT -11:30 to -11 for the
++    period from 1911 to 1950.
++
++    Pacific/Chatham has been changed to New Zealand standard time plus
++    45 minutes for the period before 1957, reflecting a 1956 remark in
++    the New Zealand parliament.
++
++    Europe/Budapest has several pre-1946 corrections: in 1918 the transition
++    out of DST was on 09-16, not 09-29; in 1919 it was on 11-24, not 09-15; in
++    1945 it was on 11-01, not 11-03; in 1941 the transition to DST was 04-08
++    not 04-06 at 02:00; and there was no DST in 1920.
++
++    Africa/Accra is now assumed to have observed DST from 1920 through 1935.
++
++    Time in Russia before 1927 or so has been corrected by a few seconds in
++    the following zones: Europe/Moscow, Asia/Irkutsk, Asia/Tbilisi,
++    Asia/Tashkent, Asia/Vladivostok, Asia/Yekaterinburg, Europe/Helsinki, and
++    Europe/Riga.  Also, Moscow's location has been changed to its Kilometer 0
++    point.  (Thanks to Vladimir Karpinsky for the Moscow changes.)
++
++  Changes affecting data format
++
++    A new file 'zone1970.tab' supersedes 'zone.tab' in the installed data.
++    The new file's extended format allows multiple country codes per zone.
++    The older file is still installed but is deprecated; its format is
++    not changing and it will still be distributed for a while, but new
++    applications should use the new file.
++
++    The new file format simplifies maintenance of obscure locations.
++    To test this, it adds coverage for the Crozet Islands and the
++    Scattered Islands.  (Thanks to Tobias Conradi and Antoine Leca.)
++
++    The file 'iso3166.tab' is planned to switch from ASCII to UTF-8.
++    It is still ASCII now, but commentary about the switch has been added.
++    The new file 'zone1970.tab' already uses UTF-8.
++
++  Changes affecting code
++
++    'localtime', 'mktime', etc. now use much less stack space if ALL_STATE
++    is defined.  (Thanks to Elliott Hughes for reporting the problem.)
++
++    'zic' no longer mishandles input when ignoring case in locales that
++    are not compatible with English, e.g., unibyte Turkish locales when
++    compiled with HAVE_GETTEXT.
++
++    Error diagnostics of 'zic' and 'yearistype' have been reworded so that
++    they no longer use ASCII '-' as if it were a dash.
++
++    'zic' now rejects output file names that contain '.' or '..' components.
++    (Thanks to Tim Parenti for reporting the problem.)
++
++    'zic -v' now warns about output file names that do not follow
++    POSIX rules, or that contain a digit or '.'.  (Thanks to Arthur
++    David Olson for starting the ball rolling on this.)
++
++    Some lint has been removed when using GCC_DEBUG_FLAGS with GCC 4.9.0.
++
++  Changes affecting build procedure
++
++    'zic' no longer links in localtime.o and asctime.o, as they're not needed.
++    (Thanks to John Cochran.)
++
++  Changes affecting documentation and commentary
++
++    The 'Theory' file documents legacy names, the longstanding
++    exceptions to the POSIX-inspired file name rules.
++
++    The 'zic' documentation clarifies the role of time types when
++    interpreting dates.  (Thanks to Arthur David Olson.)
++
++    Documentation and commentary now prefer UTF-8 to US-ASCII,
++    allowing the use of proper accents in foreign words and names.
++    Code and data have not changed because of this.  (Thanks to
++    Garrett Wollman, Ian Abbott, and Guy Harris for helping to debug
++    this.)
++
++    Non-HTML documentation and commentary now use plain-text URLs instead of
++    HTML insertions, and are more consistent about bracketing URLs when they
++    are not already surrounded by white space.  (Thanks to suggestions by
++    Steffen Nurpmeso.)
++
++    There is new commentary about Xujiahui Observatory, the five time-zone
++    project in China from 1918 to 1949, timekeeping in Japanese-occupied
++    Shanghai, and Tibet Time in the 1950s.  The sharp-eyed can spot the
++    warlord Jin Shuren in the data.
++
++    Commentary about the coverage of each Russian zone has been standardized.
++    (Thanks to Tim Parenti).
++
++    There is new commentary about contemporary timekeeping in Ethiopia.
++
++    Obsolete comments about a 2007 proposal for DST in Kuwait has been removed.
++
++    There is new commentary about time in Poland in 1919.
++
++    Proper credit has been given to DST inventor George Vernon Hudson.
++
++    Commentary about time in Metlakatla, AK and Resolute, NU has been
++    improved, with a new source for the former.
++
++    In zone.tab, Pacific/Easter no longer mentions Salas y Gómez, as it
++    is uninhabited.
++
++    Commentary about permanent Antarctic bases has been updated.
++
++    Several typos have been corrected.  (Thanks to Tim Parenti for
++    contributing some of these fixes.)
++
++    tz-link.htm now mentions the JavaScript libraries Moment Timezone,
++    TimezoneJS.Date, Walltime-js, and Timezone.  (Thanks to a heads-up
++    from Matt Johnson.)  Also, it mentions the Go 'latlong' package.
++    (Thanks to a heads-up from Dirkjan Ochtman.)
++
++    The files usno1988, usno1989, usno1989a, usno1995, usno1997, and usno1998
++    have been removed.  These obsolescent US Naval Observatory entries were no
++    longer helpful for maintenance.  (Thanks to Tim Parenti for the suggestion.)
++
++
++Release 2014e - 2014-06-12 21:53:52 -0700
++
++  Changes affecting near-future time stamps
++
++    Egypt's 2014 Ramadan-based transitions are June 26 and July 31 at 24:00.
++    (Thanks to Imed Chihi.)  Guess that from 2015 on Egypt will temporarily
++    switch to standard time at 24:00 the last Thursday before Ramadan, and
++    back to DST at 00:00 the first Friday after Ramadan.
++
++    Similarly, Morocco's are June 28 at 03:00 and August 2 at 02:00.  (Thanks
++    to Milamber Space Network.)  Guess that from 2015 on Morocco will
++    temporarily switch to standard time at 03:00 the last Saturday before
++    Ramadan, and back to DST at 02:00 the first Saturday after Ramadan.
++
++  Changes affecting past time stamps
++
++    The abbreviation "MSM" (Moscow Midsummer Time) is now used instead of
++    "MSD" for Moscow's double daylight time in summer 1921.  Also, a typo
++    "VLASST" has been repaired to be "VLAST" for Vladivostok summer time
++    in 1991.  (Thanks to Hank W. for reporting the problems.)
++
++  Changes affecting commentary
++
++    tz-link.htm now cites RFC 7265 for jCal, mentions PTP and the
++    draft CalDAV extension, updates URLs for TSP, TZInfo, IATA, and
++    removes stale pointers to World Time Explorer and WORLDTIME.
++
++
++Release 2014d - 2014-05-27 21:34:40 -0700
++
++  Changes affecting code
++
++    zic no longer generates files containing time stamps before the Big Bang.
++    This works around GNOME bug 730332
++    <https://bugzilla.gnome.org/show_bug.cgi?id=730332>.
++    (Thanks to Leonardo Chiquitto for reporting the bug, and to
++    Arthur David Olson and James Cloos for suggesting improvements to the fix.)
++
++  Changes affecting documentation
++
++    tz-link.htm now mentions GNOME.
++
++
++Release 2014c - 2014-05-13 07:44:13 -0700
++
++  Changes affecting near-future time stamps
++
++    Egypt observes DST starting 2014-05-15 at 24:00.
++    (Thanks to Ahmad El-Dardiry and Gunther Vermier.)
++    Details have not been announced, except that DST will not be observed
++    during Ramadan.  Guess that DST will stop during the same Ramadan dates as
++    Morocco, and that Egypt's future spring and fall transitions will be the
++    same as 2010 when it last observed DST, namely April's last Friday at
++    00:00 to September's last Thursday at 23:00 standard time.  Also, guess
++    that Ramadan transitions will be at 00:00 standard time.
++
++  Changes affecting code
++
++    zic now generates transitions for minimum time values, eliminating guesswork
++    when handling low-valued time stamps.  (Thanks to Arthur David Olson.)
++
++    Port to Cygwin sans glibc.  (Thanks to Arthur David Olson.)
++
++  Changes affecting commentary and documentation
++
++    Remove now-confusing comment about Jordan.  (Thanks to Oleksii Nochovnyi.)
++
++
++Release 2014b - 2014-03-24 21:28:50 -0700
++
++  Changes affecting near-future time stamps
++
++    Crimea switches to Moscow time on 2014-03-30 at 02:00 local time.
++    (Thanks to Alexander Krivenyshev.)  Move its zone.tab entry from UA to RU.
++
++    New entry for Troll station, Antarctica.  (Thanks to Paul-Inge Flakstad and
++    Bengt-Inge Larsson.)  This is currently an approximation; a better version
++    will require the zic and localtime fixes mentioned below, and the plan is
++    to wait for a while until at least the zic fixes propagate.
++
++  Changes affecting code
++
++    'zic' and 'localtime' no longer reject locations needing four transitions
++    per year for the foreseeable future.  (Thanks to Andrew Main (Zefram).)
++    Also, 'zic' avoids some unlikely failures due to integer overflow.
++
++  Changes affecting build procedure
++
++    'make check' now detects Rule lines defined but never used.
++    The NZAQ rules, an instance of this problem, have been removed.
++
++  Changes affecting commentary and documentation
++
++    Fix Tuesday/Thursday typo in description of time in Israel.
++    (Thanks to Bert Katz via Pavel Kharitonov and Mike Frysinger.)
++
++    Microsoft Windows 8.1 doesn't support tz database names.  (Thanks
++    to Donald MacQueen.)  Instead, the Microsoft Windows Store app
++    library supports them.
++
++    Add comments about Johnston Island time in the 1960s.
++    (Thanks to Lyle McElhaney.)
++
++    Morocco's 2014 DST start will be as predicted.
++    (Thanks to Sebastien Willemijns.)
++
++
++Release 2014a - 2014-03-07 23:30:29 -0800
++
++  Changes affecting near-future time stamps
++
++    Turkey begins DST on 2014-03-31, not 03-30.  (Thanks to Faruk Pasin for
++    the heads-up, and to Tim Parenti for simplifying the update.)
++
++  Changes affecting past time stamps
++
++    Fiji ended DST on 2014-01-19 at 02:00, not the previously-scheduled 03:00.
++    (Thanks to Steffen Thorsen.)
++
++    Ukraine switched from Moscow to Eastern European time on 1990-07-01
++    (not 1992-01-01), and observed DST during the entire next winter.
++    (Thanks to Vladimir in Moscow via Alois Treindl.)
++
++    In 1988 Israel observed DST from 04-10 to 09-04, not 04-09 to 09-03.
++    (Thanks to Avigdor Finkelstein.)
++
++  Changes affecting code
++
++    A uninitialized-storage bug in 'localtime' has been fixed.
++    (Thanks to Logan Chien.)
++
++  Changes affecting the build procedure
++
++    The settings for 'make check_web' now default to Ubuntu 13.10.
++
++  Changes affecting commentary and documentation
++
++    The boundary of the US Pacific time zone is given more accurately.
++    (Thanks to Alan Mintz.)
++
++    Chile's 2014 DST will be as predicted.  (Thanks to José Miguel Garrido.)
++
++    Paraguay's 2014 DST will be as predicted.  (Thanks to Carlos Raúl Perasso.)
++
++    Better descriptions of countries with same time zone history as
++    Trinidad and Tobago since 1970.  (Thanks to Alan Barrett for suggestion.)
++
++    Several changes affect tz-link.htm, the main web page.
++
++      Mention Time.is (thanks to Even Scharning) and WX-now (thanks to
++      David Braverman).
++
++      Mention xCal (Internet RFC 6321) and jCal.
++
++      Microsoft has some support for tz database names.
++
++      CLDR data formats include both XML and JSON.
++
++      Mention Maggiolo's map of solar vs standard time.
++      (Thanks to Arthur David Olson.)
++
++      Mention TZ4Net.  (Thanks to Matt Johnson.)
++
++      Mention the timezone-olson Haskell package.
++
++      Mention zeitverschiebung.net.  (Thanks to Martin Jäger.)
++
++      Remove moribund links to daylight-savings-time.info and to
++      Simple Timer + Clocks.
++
++      Update two links.  (Thanks to Oscar van Vlijmen.)
++
++      Fix some formatting glitches, e.g., remove random newlines from
++      abbr elements' title attributes.
++
++
++Release 2013i - 2013-12-17 07:25:23 -0800
++
++  Changes affecting near-future time stamps:
++
++    Jordan switches back to standard time at 00:00 on December 20, 2013.
++    The 2006-2011 transition schedule is planned to resume in 2014.
++    (Thanks to Steffen Thorsen.)
++
++  Changes affecting past time stamps:
++
++    In 2004, Cuba began DST on March 28, not April 4.
++    (Thanks to Steffen Thorsen.)
++
++  Changes affecting code
++
++    The compile-time flag NOSOLAR has been removed, as nowadays the
++    benefit of slightly shrinking runtime table size is outweighed by the
++    cost of disallowing potential future updates that exceed old limits.
++
++  Changes affecting documentation and commentary
++
++    The files solar87, solar88, and solar89 are no longer distributed.
++    They were a negative experiment - that is, a demonstration that
++    tz data can represent solar time only with some difficulty and error.
++    Their presence in the distribution caused confusion, as Riyadh
++    civil time was generally not solar time in those years.
++
++    tz-link.htm now mentions Noda Time.  (Thanks to Matt Johnson.)
++
++
++Release 2013h - 2013-10-25 15:32:32 -0700
++
++  Changes affecting current and future time stamps:
++
++    Libya has switched its UT offset back to +02 without DST, instead
++    of +01 with DST.  (Thanks to Even Scharning.)
++
++    Western Sahara (Africa/El_Aaiun) uses Morocco's DST rules.
++    (Thanks to Gwillim Law.)
++
++  Changes affecting future time stamps:
++
++    Acre and (we guess) western Amazonas will switch from UT -04 to -05
++    on 2013-11-10.  This affects America/Rio_Branco and America/Eirunepe.
++    (Thanks to Steffen Thorsen.)
++
++    Add entries for DST transitions in Morocco in the year 2038.
++    This avoids some year-2038 glitches introduced in 2013g.
++    (Thanks to Yoshito Umaoka for reporting the problem.)
++
++  Changes affecting API
++
++    The 'tzselect' command no longer requires the 'select' command,
++    and should now work with /bin/sh on more platforms.  It also works
++    around a bug in BusyBox awk before version 1.21.0.  (Thanks to
++    Patrick 'P. J.' McDermott and Alan Barrett.)
++
++  Changes affecting code
++
++    Fix localtime overflow bugs with 32-bit unsigned time_t.
++
++    zdump no longer assumes sscanf returns maximal values on overflow.
++
++  Changes affecting the build procedure
++
++    The builder can specify which programs to use, if any, instead of
++    'ar' and 'ranlib', and libtz.a is now built locally before being
++    installed.  (Thanks to Michael Forney.)
++
++    A dependency typo in the 'zdump' rule has been fixed.
++    (Thanks to Andrew Paprocki.)
++
++    The Makefile has been simplified by assuming that 'mkdir -p' and 'cp -f'
++    work as specified by POSIX.2-1992 or later; this is portable nowadays.
++
++    'make clean' no longer removes 'leapseconds', since it's
++    host-independent and is part of the distribution.
++
++    The unused makefile macros TZCSRCS, TZDSRCS, DATESRCS have been removed.
++
++  Changes affecting documentation and commentary
++
++    tz-link.htm now mentions TC TIMEZONE's draft time zone service protocol
++    (thanks to Mike Douglass) and TimezoneJS.Date (thanks to Jim Fehrle).
++
++    Update URLs in tz-link page.  Add URLs for Microsoft Windows, since
++    8.1 introduces tz support.  Remove URLs for Tru64 and UnixWare (no
++    longer maintained) and for old advisories.  SOFA now does C.
++
++Release 2013g - 2013-09-30 21:08:26 -0700
++
++  Changes affecting current and near-future time stamps
++
++    Morocco now observes DST from the last Sunday in March to the last
++    Sunday in October, not April to September respectively.  (Thanks
++    to Steffen Thorsen.)
++
++  Changes affecting 'zic'
++
++    'zic' now runs on platforms that lack both hard links and symlinks.
++    (Thanks to Theo Veenker for reporting the problem, for MinGW.)
++    Also, fix some bugs on platforms that lack hard links but have symlinks.
++
++    'zic -v' again warns that Asia/Tehran has no POSIX environment variable
++    to predict the far future, fixing a bug introduced in 2013e.
++
++  Changes affecting the build procedure
++
++    The 'leapseconds' file is again put into the tzdata tarball.
++    Also, 'leapseconds.awk', so tzdata is self-contained.  (Thanks to
++    Matt Burgess and Ian Abbott.)  The timestamps of these and other
++    dependent files in tarballs are adjusted more consistently.
++
++  Changes affecting documentation and commentary
++
++    The README file is now part of the data tarball as well as the code.
++    It now states that files are public domain unless otherwise specified.
++    (Thanks to Andrew Main (Zefram) for asking for clarifications.)
++    Its details about the 1989 release moved to a place of honor near
++    the end of NEWS.
++
++
++Release 2013f - 2013-09-24 23:37:36 -0700
++
++  Changes affecting near-future time stamps
++
++    Tocantins will very likely not observe DST starting this spring.
++    (Thanks to Steffen Thorsen.)
++
++    Jordan will likely stay at UT +03 indefinitely, and will not fall
++    back this fall.
++
++    Palestine will fall back at 00:00, not 01:00.  (Thanks to Steffen Thorsen.)
++
++  Changes affecting API
++
++    The types of the global variables 'timezone' and 'altzone' (if present)
++    have been changed back to 'long'.  This is required for 'timezone'
++    by POSIX, and for 'altzone' by common practice, e.g., Solaris 11.
++    These variables were originally 'long' in the tz code, but were
++    mistakenly changed to 'time_t' in 1987; nobody reported the
++    incompatibility until now.  The difference matters on x32, where
++    'long' is 32 bits and 'time_t' is 64.  (Thanks to Elliott Hughes.)
++
++  Changes affecting the build procedure
++
++    Avoid long strings in leapseconds.awk to work around a mawk bug.
++    (Thanks to Cyril Baurand.)
++
++  Changes affecting documentation and commentary
++
++    New file 'NEWS' that contains release notes like this one.
++
++    Paraguay's law does not specify DST transition time; 00:00 is customary.
++    (Thanks to Waldemar Villamayor-Venialbo.)
++
++    Minor capitalization fixes.
++
++  Changes affecting version-control only
++
++    The experimental GitHub repository now contains annotated and
++    signed tags for recent releases, e.g., '2013e' for Release 2013e.
++    Releases are tagged starting with 2012e; earlier releases were
++    done differently, and tags would either not have a simple name or
++    not exactly match what was released.
++
++    'make set-timestamps' is now simpler and a bit more portable.
++
++
++Release 2013e - 2013-09-19 23:50:04 -0700
++
++  Changes affecting near-future time stamps
++
++    This year Fiji will start DST on October 27, not October 20.
++    (Thanks to David Wheeler for the heads-up.)  For now, guess that
++    Fiji will continue to spring forward the Sunday before the fourth
++    Monday in October.
++
++  Changes affecting current and future time zone abbreviations
++
++    Use WIB/WITA/WIT rather than WIT/CIT/EIT for alphabetic Indonesian
++    time zone abbreviations since 1932.  (Thanks to George Ziegler,
++    Priyadi Iman Nurcahyo, Zakaria, Jason Grimes, Martin Pitt, and
++    Benny Lin.)  This affects Asia/Dili, Asia/Jakarta, Asia/Jayapura,
++    Asia/Makassar, and Asia/Pontianak.
++
++    Use ART (UT -03, standard time), rather than WARST (also -03, but
++    daylight saving time) for San Luis, Argentina since 2009.
++
++  Changes affecting Godthåb time stamps after 2037 if version mismatch
++
++    Allow POSIX-like TZ strings where the transition time's hour can
++    range from -167 through 167, instead of the POSIX-required 0
++    through 24.  E.g., TZ='FJT-12FJST,M10.3.1/146,M1.3.4/75' for the
++    new Fiji rules.  This is a more-compact way to represent
++    far-future time stamps for America/Godthab, America/Santiago,
++    Antarctica/Palmer, Asia/Gaza, Asia/Hebron, Asia/Jerusalem,
++    Pacific/Easter, and Pacific/Fiji.  Other zones are unaffected by
++    this change.  (Derived from a suggestion by Arthur David Olson.)
++
++    Allow POSIX-like TZ strings where daylight saving time is in
++    effect all year.  E.g., TZ='WART4WARST,J1/0,J365/25' for Western
++    Argentina Summer Time all year.  This supports a more-compact way
++    to represent the 2013d data for America/Argentina/San_Luis.
++    Because of the change for San Luis noted above this change does not
++    affect the current data.  (Thanks to Andrew Main (Zefram) for
++    suggestions that improved this change.)
++
++    Where these two TZ changes take effect, there is a minor extension
++    to the tz file format in that it allows new values for the
++    embedded TZ-format string, and the tz file format version number
++    has therefore been increased from 2 to 3 as a precaution.
++    Version-2-based client code should continue to work as before for
++    all time stamps before 2038.  Existing version-2-based client code
++    (tzcode, GNU/Linux, Solaris) has been tested on version-3-format
++    files, and typically works in practice even for time stamps after
++    2037; the only known exception is America/Godthab.
++
++  Changes affecting time stamps before 1970
++
++    Pacific/Johnston is now a link to Pacific/Honolulu.  This corrects
++    some errors before 1947.
++
++    Some zones have been turned into links, when they differ from existing
++    zones only in older data entries that were likely invented or that
++    differ only in LMT or transitions from LMT.  These changes affect
++    only time stamps before 1943.  The affected zones are:
++    Africa/Juba, America/Anguilla, America/Aruba, America/Dominica,
++    America/Grenada, America/Guadeloupe, America/Marigot,
++    America/Montserrat, America/St_Barthelemy, America/St_Kitts,
++    America/St_Lucia, America/St_Thomas, America/St_Vincent,
++    America/Tortola, and Europe/Vaduz.  (Thanks to Alois Treindl for
++    confirming that the old Europe/Vaduz zone was wrong and the new
++    link is better for WWII-era times.)
++
++    Change Kingston Mean Time from -5:07:12 to -5:07:11.  This affects
++    America/Cayman, America/Jamaica and America/Grand_Turk time stamps
++    from 1890 to 1912.
++
++    Change the UT offset of Bern Mean Time from 0:29:44 to 0:29:46.
++    This affects Europe/Zurich time stamps from 1853 to 1894.  (Thanks
++    to Alois Treindl).
++
++    Change the date of the circa-1850 Zurich transition from 1849-09-12
++    to 1853-07-16, overriding Shanks with data from Messerli about
++    postal and telegraph time in Switzerland.
++
++  Changes affecting time zone abbreviations before 1970
++
++    For Asia/Jakarta, use BMT (not JMT) for mean time from 1923 to 1932,
++    as Jakarta was called Batavia back then.
++
++  Changes affecting API
++
++    The 'zic' command now outputs a dummy transition when far-future
++    data can't be summarized using a TZ string, and uses a 402-year
++    window rather than a 400-year window.  For the current data, this
++    affects only the Asia/Tehran file.  It does not affect any of the
++    time stamps that this file represents, so zdump outputs the same
++    information as before.  (Thanks to Andrew Main (Zefram).)
++
++    The 'date' command has a new '-r' option, which lets you specify
++    the integer time to display, a la FreeBSD.
++
++    The 'tzselect' command has two new options '-c' and '-n', which lets you
++    select a zone based on latitude and longitude.
++
++    The 'zic' command's '-v' option now warns about constructs that
++    require the new version-3 binary file format.  (Thanks to Arthur
++    David Olson for the suggestion.)
++
++    Support for floating-point time_t has been removed.
++    It was always dicey, and POSIX no longer requires it.
++    (Thanks to Eric Blake for suggesting to the POSIX committee to
++    remove it, and thanks to Alan Barrett, Clive D.W. Feather, Andy
++    Heninger, Arthur David Olson, and Alois Treindl, for reporting
++    bugs and elucidating some of the corners of the old floating-point
++    implementation.)
++
++    The signatures of 'offtime', 'timeoff', and 'gtime' have been
++    changed back to the old practice of using 'long' to represent UT
++    offsets.  This had been inadvertently and mistakenly changed to
++    'int_fast32_t'.  (Thanks to Christos Zoulas.)
++
++    The code avoids undefined behavior on integer overflow in some
++    more places, including gmtime, localtime, mktime and zdump.
++
++  Changes affecting the zdump utility
++
++    zdump now outputs "UT" when referring to Universal Time, not "UTC".
++    "UTC" does not make sense for time stamps that predate the introduction
++    of UTC, whereas "UT", a more-generic term, does.  (Thanks to Steve Allen
++    for clarifying UT vs UTC.)
++
++  Data changes affecting behavior of tzselect and similar programs
++
++    Country code BQ is now called the more-common name "Caribbean Netherlands"
++    rather than the more-official "Bonaire, St Eustatius & Saba".
++
++    Remove from zone.tab the names America/Montreal, America/Shiprock,
++    and Antarctica/South_Pole, as they are equivalent to existing
++    same-country-code zones for post-1970 time stamps.  The data entries for
++    these names are unchanged, so the names continue to work as before.
++
++  Changes affecting code internals
++
++    zic -c now runs way faster on 64-bit hosts when given large numbers.
++
++    zic now uses vfprintf to avoid allocating and freeing some memory.
++
++    tzselect now computes the list of continents from the data,
++    rather than have it hard-coded.
++
++    Minor changes pacify GCC 4.7.3 and GCC 4.8.1.
++
++  Changes affecting the build procedure
++
++    The 'leapseconds' file is now generated automatically from a
++    new file 'leap-seconds.list', which is a copy of
++    <ftp://time.nist.gov/pub/leap-seconds.list>.
++    A new source file 'leapseconds.awk' implements this.
++    The goal is simplification of the future maintenance of 'leapseconds'.
++
++    When building the 'posix' or 'right' subdirectories, if the
++    subdirectory would be a copy of the default subdirectory, it is
++    now made a symbolic link if that is supported.  This saves about
++    2 MB of file system space.
++
++    The links America/Shiprock and Antarctica/South_Pole have been
++    moved to the 'backward' file.  This affects only nondefault builds
++    that omit 'backward'.
++
++  Changes affecting version-control only
++
++    .gitignore now ignores 'date'.
++
++  Changes affecting documentation and commentary
++
++    Changes to the 'tzfile' man page
++
++      It now mentions that the binary file format may be extended in
++      future versions by appending data.
++
++      It now refers to the 'zdump' and 'zic' man pages.
++
++    Changes to the 'zic' man page
++
++      It lists conditions that elicit a warning with '-v'.
++
++      It says that the behavior is unspecified when duplicate names
++      are given, or if the source of one link is the target of another.
++
++      Its examples are updated to match the latest data.
++
++      The definition of white space has been clarified slightly.
++      (Thanks to Michael Deckers.)
++
++    Changes to the 'Theory' file
++
++      There is a new section about the accuracy of the tz database,
++      describing the many ways that errors can creep in, and
++      explaining why so many of the pre-1970 time stamps are wrong or
++      misleading (thanks to Steve Allen, Lester Caine, and Garrett
++      Wollman for discussions that contributed to this).
++
++      The 'Theory' file describes LMT better (this follows a
++      suggestion by Guy Harris).
++
++      It refers to the 2013 edition of POSIX rather than the 2004 edition.
++
++      It's mentioned that excluding 'backward' should not affect the
++      other data, and it suggests at least one zone.tab name per
++      inhabited country (thanks to Stephen Colebourne).
++
++      Some longstanding restrictions on names are documented, e.g.,
++      'America/New_York' precludes 'America/New_York/Bronx'.
++
++      It gives more reasons for the 1970 cutoff.
++
++      It now mentions which time_t variants are supported, such as
++      signed integer time_t.  (Thanks to Paul Goyette for reporting
++      typos in an experimental version of this change.)
++
++      (Thanks to Philip Newton for correcting typos in these changes.)
++
++    Documentation and commentary is more careful to distinguish UT in
++    general from UTC in particular.  (Thanks to Steve Allen.)
++
++    Add a better source for the Zurich 1894 transition.
++    (Thanks to Pierre-Yves Berger.)
++
++    Update shapefile citations in tz-link.htm.  (Thanks to Guy Harris.)
++
++
++Release 2013d - 2013-07-05 07:38:01 -0700
++
++  Changes affecting future time stamps:
++
++    Morocco's midsummer transitions this year are July 7 and August 10,
++    not July 9 and August 8.  (Thanks to Andrew Paprocki.)
++
++    Israel now falls back on the last Sunday of October.
++    (Thanks to Ephraim Silverberg.)
++
++  Changes affecting past time stamps:
++
++    Specify Jerusalem's location more precisely; this changes the pre-1880
++    times by 2 s.
++
++  Changing affecting metadata only:
++
++    Fix typos in the entries for country codes BQ and SX.
++
++  Changes affecting code:
++
++    Rework the code to fix a bug with handling Australia/Macquarie on
++    32-bit hosts (thanks to Arthur David Olson).
++
++    Port to platforms like NetBSD, where time_t can be wider than long.
++
++    Add support for testing time_t types other than the system's.
++    Run 'make check_time_t_alternatives' to try this out.
++    Currently, the tests fail for unsigned time_t;
++    this should get fixed at some point.
++
++  Changes affecting documentation and commentary:
++
++    Deemphasize the significance of national borders.
++
++    Update the zdump man page.
++
++    Remove obsolete NOID comment (thanks to Denis Excoffier).
++
++    Update several URLs and comments in the web pages.
++
++    Spelling fixes (thanks to Kevin Lyda and Jonathan Leffler).
++
++    Update URL for CLDR Zone->Tzid table (thanks to Yoshito Umaoka).
++
++
++Release 2013c - 2013-04-19 16:17:40 -0700
++
++  Changes affecting current and future time stamps:
++
++    Palestine observed DST starting March 29, 2013.  (Thanks to
++    Steffen Thorsen.)  From 2013 on, Gaza and Hebron both observe DST,
++    with the predicted rules being the last Thursday in March at 24:00
++    to the first Friday on or after September 21 at 01:00.
++
++    Assume that the recent change to Paraguay's DST rules is permanent,
++    by moving the end of DST to the 4th Sunday in March every year.
++    (Thanks to Carlos Raúl Perasso.)
++
++  Changes affecting past time stamps:
++
++    Fix some historical data for Palestine to agree with that of
++    timeanddate.com, as follows:
++
++	  The spring 2008 change in Gaza and Hebron was on 00:00 Mar 28, not
++	  00:00 Apr 1.
++
++	  The fall 2009 change in Gaza and Hebron on Sep 4 was at 01:00, not
++	  02:00.
++
++	  The spring 2010 change in Hebron was 00:00 Mar 26, not 00:01 Mar 27.
++
++	  The spring 2011 change in Gaza was 00:01 Apr 1, not 12:01 Apr 2.
++
++	  The spring 2011 change in Hebron on Apr 1 was at 00:01, not 12:01.
++
++	  The fall 2011 change in Hebron on Sep 30 was at 00:00, not 03:00.
++
++    Fix times of habitation for Macquarie to agree with the Tasmania
++    Parks & Wildlife Service history, which indicates that permanent
++    habitation was 1899-1919 and 1948 on.
++
++  Changing affecting metadata only:
++
++    Macquarie Island is politically part of Australia, not Antarctica.
++    (Thanks to Tobias Conradi.)
++
++    Sort Macquarie more-consistently with other parts of Australia.
++    (Thanks to Tim Parenti.)
++
++
++Release 2013b - 2013-03-10 22:33:40 -0700
++
++  Changes affecting current and future time stamps:
++
++    Haiti uses US daylight-saving rules this year, and presumably future years.
++    This changes time stamps starting today.  (Thanks to Steffen Thorsen.)
++
++    Paraguay will end DST on March 24 this year.
++    (Thanks to Steffen Thorsen.)  For now, assume it's just this year.
++
++    Morocco does not observe DST during Ramadan;
++    try to predict Ramadan in Morocco as best we can.
++    (Thanks to Erik Homoet for the heads-up.)
++
++  Changes affecting commentary:
++
++    Update URLs in tz-link page.  Add URLs for webOS, BB10, iOS.
++    Update URL for Solaris.  Mention Internet RFC 6557.
++    Update Internet RFCs 2445->5545, 2822->5322.
++    Switch from FTP to HTTP for Internet RFCs.
++
++
++Release 2013a - 2013-02-27 09:20:35 -0800
++
++  Change affecting binary data format:
++
++    The zone offset at the end of version-2-format zone files is now
++    allowed to be 24:00, as per POSIX.1-2008.  (Thanks to Arthur David Olson.)
++
++  Changes affecting current and future time stamps:
++
++    Chile's 2013 rules, and we guess rules for 2014 and later, will be
++    the same as 2012, namely Apr Sun>=23 03:00 UTC to Sep Sun>=2 04:00 UTC.
++    (Thanks to Steffen Thorsen and Robert Elz.)
++
++    New Zones Asia/Khandyga, Asia/Ust-Nera, Europe/Busingen.
++    (Thanks to Tobias Conradi and Arthur David Olson.)
++
++  Many changes affect historical time stamps before 1940.
++  These were deduced from: Milne J. Civil time. Geogr J. 1899
++  Feb;13(2):173-94 <http://www.jstor.org/stable/1774359>.
++
++  Changes affecting the code:
++
++    Fix zic bug that mishandled Egypt's 2010 changes (this also affected
++    the data).  (Thanks to Arthur David Olson.)
++
++    Fix localtime bug when time_t is unsigned and data files were generated
++    by a signed time_t system.  (Thanks to Doug Bailey for reporting and
++    to Arthur David Olson for fixing.)
++
++    Allow the email address for bug reports to be set by the packager.
++    The default is tz@iana.org, as before.  (Thanks to Joseph S. Myers.)
++
++    Update HTML checking to be compatible with Ubuntu 12.10.
++
++    Check that files are a safe subset of ASCII.  At some point we may
++    relax this requirement to a safe subset of UTF-8.  Without the
++    check, some non-UTF-8 encodings were leaking into the distribution.
++
++  Commentary changes:
++
++    Restore a comment about copyright notices that was inadvertently deleted.
++    (Thanks to Arthur David Olson.)
++
++    Improve the commentary about which districts observe what times
++    in Russia.  (Thanks to Oscar van Vlijmen and Arthur David Olson).
++
++    Add web page links to tz.js.
++
++    Add "Run by the Monkeys" to tz-art.  (Thanks to Arthur David Olson.)
++
++
++Release 2012j - 2012-11-12 18:34:49 -0800
++
++  Libya moved to CET this weekend, but with DST planned next year.
++  (Thanks to Even Scharning, Steffen Thorsen, and Tim Parenti.)
++
++  Signatures now have the extension .asc, not .sign, as that's more
++  standard.  (Thanks to Phil Pennock.)
++
++  The output of 'zdump --version', and of 'zic --version', now
++  uses a format that is more typical for --version.
++  (Thanks to Joseph S. Myers.)
++
++  The output of 'tzselect --help', 'zdump --help', and 'zic --help'
++  now uses tz@iana.org rather than the old elsie address.
++
++  zic -v now complains about abbreviations that are less than 3
++  or more than 6 characters, as per Posix.  Formerly, it checked
++  for abbreviations that were more than 3.
++
++  'make public' no longer puts its temporary directory under /tmp,
++  and uses the just-built zic rather than the system zic.
++
++  Various fixes to documentation and commentary.
++
++
++Release 2012i - 2012-11-03 12:57:09 -0700
++
++  Cuba switches from DST tomorrow at 01:00.  (Thanks to Steffen Thorsen.)
++
++  Linker flags can now be specified via LDFLAGS.
++  AWK now defaults to 'awk', not 'nawk'.
++  The shell in tzselect now defaults to /bin/bash, but this can
++  be overridden by specifying KSHELL.
++  The main web page now mentions the unofficial GitHub repository.
++  (Thanks to Mike Frysinger.)
++
++  Tarball signatures can now be built by running 'make signatures'.
++  There are also new makefile rules 'tarballs', 'check_public', and
++  separate makefile rules for each tarball and signature file.
++  A few makefile rules are now more portable to strict POSIX.
++
++  The main web page now lists the canonical IANA URL.
++
++
++Release 2012h - 2012-10-26 22:49:10 -0700
++
++  Bahia no longer has DST.  (Thanks to Kelley Cook.)
++
++  Tocantins has DST.  (Thanks to Rodrigo Severo.)
++
++  Israel has new DST rules next year.  (Thanks to Ephraim Silverberg.)
++
++  Jordan stays on DST this winter.  (Thanks to Steffen Thorsen.)
++
++  Web page updates.
++
++  More C modernization, except that at Arthur David Olson's suggestion
++  the instances of 'register' were kept.
++
++
++Release 2012g - 2012-10-17 20:59:45 -0700
++
++  Samoa fall 2012 and later.  (Thanks to Nicholas Pereira and Robert Elz.)
++
++  Palestine fall 2012.  (Thanks to Steffen Thorsen.)
++
++  Assume C89.
++
++  To attack the version-number problem, this release ships the file
++  'Makefile' (which contains the release number) in both the tzcode and
++  the tzdata tarballs.  The two Makefiles are identical, and should be
++  identical in any matching pair of tarballs, so it shouldn't matter
++  which order you extract the tarballs.  Perhaps we can come up with a
++  better version-number scheme at some point; this scheme does have the
++  virtue of not adding more files.
++
++
++Release 2012f - 2012-09-12 23:17:03 -0700
++
++  * australasia (Pacific/Fiji): Fiji DST is October 21 through January
++    20 this year.  (Thanks to Steffen Thorsen.)
++
++
++Release 2012e - 2012-08-02 20:44:55 -0700
++
++  * australasia (Pacific/Fakaofo): Tokelau is UT +13, not +14.
++    (Thanks to Steffen Thorsen.)
++
++  * Use a single version number for both code and data.
++
++  * .gitignore: New file.
++
++  * Remove trailing white space.
++
++
++Release code2012c-data2012d - 2012-07-19 16:35:33 -0700
++
++  Changes for Morocco's time stamps, which take effect in a couple of
++  hours, along with infrastructure changes to accommodate how the tz
++  code and data are released on IANA.
++
++
++Release data2012c - 2012-03-27 12:17:25 -0400
++
++  africa
++	Summer time changes for Morocco (to start late April 2012)
++
++  asia
++	Changes for 2012 for Gaza & the West Bank (Hebron) and Syria
++
++  northamerica
++	Haiti following US/Canada rules for 2012 (and we're assuming,
++	for now anyway, for the future).
++
++
++Release 2012b - 2012-03-02 12:29:15 +0700
++
++  There is just one change to tzcode2012b (compared with 2012a):
++  the Makefile that was accidentally included with 2012a has been
++  replaced with the version that should have been there, which is
++  identical with the previous version (from tzcode2011i).
++
++  There are just two changes in tzdata2012b compared with 2012a.
++
++  Most significantly, summer time in Cuba has been delayed 3 weeks
++  (now starts April 1 rather than March 11).   Since Mar 11 (the old start
++  date, as listed in 2012a) is just a little over a week away, this
++  change is urgent.
++
++  Less importantly, an excess tab in one of the changes in zone.tab
++  in 2012a has been removed.
++
++
++Release 2012a - 2012-03-01 18:28:10 +0700
++
++  The changes in tzcode2012a (compared to the previous version, 2011i)
++  are entirely to the README and tz-art.htm and tz-link.htm files, if
++  none of those concern you, you can ignore the code update.  The changes
++  reflect the changed addresses for the mailing list and the code and
++  data distribution points & methods (and a link to DateTime::TimeZone::Tzfile
++  has been added to tz-link.htm).
++
++  In tzdata2012a (compared to the previous release, which was 2011n)
++  the major changes are:
++	Chile 2011/2012 and 2012/2013 summer time date adjustments.
++	Falkland Islands onto permanent summer time (we're assuming for the
++		foreseeable future, though 2012 is all we're fairly certain of.)
++	Armenia has abolished Summer Time.
++	Tokelau jumped the International Date Line back last December
++		(just the same as their near neighbour, Samoa).
++	America/Creston is a new zone for a small area of British Columbia
++	There will be a leapsecond 2012-06-30 23:59:60 UTC.
++
++  Other minor changes are:
++	Corrections to 1918 Canadian summer time end dates.
++	Updated URL for UK time zone history (in comments)
++	A few typos in Le Corre's list of free French place names (comments)
++
++
++Release data2011n - 2011-10-30 14:57:54 +0700
++
++  There are three changes of note - most urgently, Cuba (America/Havana)
++  has extended summer time by two weeks, now to end on Nov 13, rather than
++  the (already past) Oct 30.   Second, the Pridnestrovian Moldavian Republic
++  (Europe/Tiraspol) decided not to split from the rest of Moldova after
++  all, and consequently that zone has been removed (again) and reinstated
++  in the "backward" file as a link to Europe/Chisinau.   And third, the
++  end date for Fiji's summer time this summer was moved forward from the
++  earlier planned Feb 26, to Jan 22.
++
++  Apart from that, Moldova (MD) returns to a single entry in zone.tab
++  (and the incorrect syntax that was in the 2011m version of that file
++  is so fixed - it would have been fixed in a different way had this
++  change not happened - that's the "missing" sccs version id).
++
++
++Release data2011m - 2011-10-24 21:42:16 +0700
++
++  In particular, the typos in comments in the data (2011-11-17 should have
++  been 2011-10-17 as Alan Barrett noted, and spelling of Tiraspol that
++  Tim Parenti noted) have been fixed, and the change for Ukraine has been
++  made in all 4 Ukrainian zones, rather than just Kiev (again, thanks to
++  Tim Parenti, and also Denys Gavrysh)
++
++  In addition, I added Europe/Tiraspol to zone.tab.
++
++  This time, all the files have new version numbers...  (including the files
++  otherwise unchanged in 2011m that were changed in 2011l but didn't get new
++  version numbers there...)
++
++
++Release data2011l - 2011-10-10 11:15:43 +0700
++
++  There are just 2 changes that cause different generated tzdata files from
++  zic, to Asia/Hebron and Pacific/Fiji - the possible change for Bahia, Brazil
++  is included, but commented out.  Compared with the diff I sent out last week,
++  this version also includes attributions for the sources for the changes
++  (in much the same format as ado used, but the html tags have not been
++  checked, verified, or used in any way at all, so if there are errors there,
++  please let me know.)
++
++
++Release data2011k - 2011-09-20 17:54:03 -0400
++
++  [not summarized]
++
++
++Release data2011j - 2011-09-12 09:22:49 -0400
++
++  (contemporary changes for Samoa; past changes for Kenya, Uganda, and
++  Tanzania); there are also two spelling corrections to comments in
++  the australasia file (with thanks to Christos Zoulas).
++
++
++Release 2011i - 2011-08-29 05:56:32 -0400
++
++  [not summarized]
++
++
++Release data2011h - 2011-06-15 18:41:48 -0400
++
++  Russia and Curaçao changes
++
++
++Release 2011g - 2011-04-25 09:07:22 -0400
++
++  update the rules for Egypt to reflect its abandonment of DST this year
++
++
++Release 2011f - 2011-04-06 17:14:53 -0400
++
++  [not summarized]
++
++
++Release 2011e - 2011-03-31 16:04:38 -0400
++
++  Morocco, Chile, and tz-link changes
++
++
++Release 2011d - 2011-03-14 09:18:01 -0400
++
++  changes that impact present-day time stamps in Cuba, Samoa, and Turkey
++
++
++Release 2011c - 2011-03-07 09:30:09 -0500
++
++  These do affect current time stamps in Chile and Annette Island, Canada.
++
++
++Release 2011b - 2011-02-07 08:44:50 -0500
++
++  [not summarized]
++
++
++Release 2011a - 2011-01-24 10:30:16 -0500
++
++  [not summarized]
++
++
++Release data2010o - 2010-11-01 09:18:23 -0400
++
++  change to the end of DST in Fiji in 2011
++
++
++Release 2010n - 2010-10-25 08:19:17 -0400
++
++  [not summarized]
++
++
++Release 2010m - 2010-09-27 09:24:48 -0400
++
++  Hong Kong, Vostok, and zic.c changes
++
++
++Release 2010l - 2010-08-16 06:57:25 -0400
++
++  [not summarized]
++
++
++Release 2010k - 2010-07-26 10:42:27 -0400
++
++  [not summarized]
++
++
++Release 2010j - 2010-05-10 09:07:48 -0400
++
++  changes for Bahía de Banderas and for version naming
++
++
++Release data2010i - 2010-04-16 18:50:45 -0400
++
++  the end of DST in Morocco on 2010-08-08
++
++
++Release data2010h - 2010-04-05 09:58:56 -0400
++
++  [not summarized]
++
++
++Release data2010g - 2010-03-24 11:14:53 -0400
++
++  [not summarized]
++
++
++Release 2010f - 2010-03-22 09:45:46 -0400
++
++  [not summarized]
++
++
++Release data2010e - 2010-03-08 14:24:27 -0500
++
++  corrects the Dhaka bug found by Danvin Ruangchan
++
++
++Release data2010d - 2010-03-06 07:26:01 -0500
++
++  [not summarized]
++
++
++Release 2010c - 2010-03-01 09:20:58 -0500
++
++  changes including KRE's suggestion for earlier initialization of
++  "goahead" and "goback" structure elements
++
++
++Release code2010a - 2010-02-16 10:40:04 -0500
++
++  [not summarized]
++
++
++Release data2010b - 2010-01-20 12:37:01 -0500
++
++  Mexico changes
++
++
++Release data2010a - 2010-01-18 08:30:04 -0500
++
++  changes to Dhaka
++
++
++Release data2009u - 2009-12-26 08:32:28 -0500
++
++  changes to DST in Bangladesh
++
++
++Release 2009t - 2009-12-21 13:24:27 -0500
++
++  [not summarized]
++
++
++Release data2009s - 2009-11-14 10:26:32 -0500
++
++  (cosmetic) Antarctica change and the DST-in-Fiji-in-2009-and-2010 change
++
++
++Release 2009r - 2009-11-09 10:10:31 -0500
++
++  "antarctica" and "tz-link.htm" changes
++
++
++Release 2009q - 2009-11-02 09:12:40 -0500
++
++  with two corrections as reported by Eric Muller and Philip Newton
++
++
++Release data2009p - 2009-10-23 15:05:27 -0400
++
++  Argentina (including San Luis) changes (with the correction from
++  Mariano Absatz)
++
++
++Release data2009o - 2009-10-14 16:49:38 -0400
++
++  Samoa (commentary only), Pakistan, and Bangladesh changes
++
++
++Release data2009n - 2009-09-22 15:13:38 -0400
++
++  added commentary for Argentina and a change to the end of DST in
++  2009 in Pakistan
++
++
++Release data2009m - 2009-09-03 10:23:43 -0400
++
++  Samoa and Palestine changes
++
++
++Release data2009l - 2009-08-14 09:13:07 -0400
++
++  Samoa (comments only) and Egypt
++
++
++Release 2009k - 2009-07-20 09:46:08 -0400
++
++  [not summarized]
++
++
++Release data2009j - 2009-06-15 06:43:59 -0400
++
++  Bangladesh change (with a short turnaround since the DST change is
++  impending)
++
++
++Release 2009i - 2009-06-08 09:21:22 -0400
++
++  updating for DST in Bangladesh this year
++
++
++Release 2009h - 2009-05-26 09:19:14 -0400
++
++  [not summarized]
++
++
++Release data2009g - 2009-04-20 16:34:07 -0400
++
++  Cairo
++
++
++Release data2009f - 2009-04-10 11:00:52 -0400
++
++  correct DST in Pakistan
++
++
++Release 2009e - 2009-04-06 09:08:11 -0400
++
++  [not summarized]
++
++
++Release 2009d - 2009-03-23 09:38:12 -0400
++
++  Morocco, Tunisia, Argentina, and American Astronomical Society changes
++
++
++Release data2009c - 2009-03-16 09:47:51 -0400
++
++  change to the start of Cuban DST
++
++
++Release 2009b - 2009-02-09 11:15:22 -0500
++
++  [not summarized]
++
++
++Release 2009a - 2009-01-21 10:09:39 -0500
++
++  [not summarized]
++
++
++Release data2008i - 2008-10-21 12:10:25 -0400
++
++  southamerica and zone.tab files, with Argentina DST rule changes and
++  United States zone reordering and recommenting
++
++
++Release 2008h - 2008-10-13 07:33:56 -0400
++
++  [not summarized]
++
++
++Release 2008g - 2008-10-06 09:03:18 -0400
++
++  Fix a broken HTML anchor and update Brazil's DST transitions;
++  there's also a slight reordering of information in tz-art.htm.
++
++
++Release data2008f - 2008-09-09 22:33:26 -0400
++
++  [not summarized]
++
++
++Release 2008e - 2008-07-28 14:11:17 -0400
++
++  changes by Arthur David Olson and Jesper Nørgaard Welen
++
++
++Release data2008d - 2008-07-07 09:51:38 -0400
++
++  changes by Arthur David Olson, Paul Eggert, and Rodrigo Severo
++
++
++Release data2008c - 2008-05-19 17:48:03 -0400
++
++  Pakistan, Morocco, and Mongolia
++
++
++Release data2008b - 2008-03-24 08:30:59 -0400
++
++  including renaming Asia/Calcutta to Asia/Kolkata, with a backward
++  link provided
++
++
++Release 2008a - 2008-03-08 05:42:16 -0500
++
++  [not summarized]
++
++
++Release 2007k - 2007-12-31 10:25:22 -0500
++
++  most importantly, changes to the "southamerica" file based on
++  Argentina's readoption of daylight saving time
++
++
++Release 2007j - 2007-12-03 09:51:01 -0500
++
++  1. eliminate the "P" (parameter) macro;
++
++  2. the "noncontroversial" changes circulated on the time zone
++  mailing list (less the changes to "logwtmp.c");
++
++  3. eliminate "too many transition" errors when "min" is used in time
++  zone rules;
++
++  4. changes by Paul Eggert (including updated information for Venezuela).
++
++
++Release data2007i - 2007-10-30 10:28:11 -0400
++
++  changes for Cuba and Syria
++
++
++Release 2007h - 2007-10-01 10:05:51 -0400
++
++  changes by Paul Eggert, as well as an updated link to the ICU
++  project in tz-link.htm
++
++
++Release 2007g - 2007-08-20 10:47:59 -0400
++
++  changes by Paul Eggert
++
++  The "leapseconds" file has been updated to incorporate the most
++  recent International Earth Rotation and Reference Systems Service
++  (IERS) bulletin.
++
++  There's an addition to tz-art.htm regarding the television show "Medium".
++
++
++Release 2007f - 2007-05-07 10:46:46 -0400
++
++  changes by Paul Eggert (including Haiti, Turks and Caicos, and New
++  Zealand)
++
++  changes to zic.c to allow hour values greater than 24 (along with
++  Paul's improved time value overflow checking)
++
++
++Release 2007e - 2007-04-02 10:11:52 -0400
++
++  Syria and Honduras changes by Paul Eggert
++
++  zic.c variable renaming changes by Arthur David Olson
++
++
++Release 2007d - 2007-03-20 08:48:30 -0400
++
++  changes by Paul Eggert
++
++  the elimination of white space at the ends of lines
++
++
++Release 2007c - 2007-02-26 09:09:37 -0500
++
++  changes by Paul Eggert
++
++
++Release 2007b - 2007-02-12 09:34:20 -0500
++
++  Paul Eggert's proposed change to the quotation handling logic in zic.c.
++
++  changes to the commentary in "leapseconds" reflecting the IERS
++  announcement that there is to be no positive leap second at the end
++  of June 2007.
++
++
++Release 2007a - 2007-01-08 12:28:29 -0500
++
++  changes by Paul Eggert
++
++  Derick Rethan's Asmara change
++
++  Oscar van Vlijmen's Easter Island local mean time change
++
++  symbolic link changes
++
++
++Release 2006p - 2006-11-27 08:54:27 -0500
++
++  changes by Paul Eggert
++
++
++Release 2006o - 2006-11-06 09:18:07 -0500
++
++  changes by Paul Eggert
++
++
++Release 2006n - 2006-10-10 11:32:06 -0400
++
++  changes by Paul Eggert
++
++
++Release 2006m - 2006-10-02 15:32:35 -0400
++
++  changes for Uruguay, Palestine, and Egypt by Paul Eggert
++
++  (minimalist) changes to zic.8 to clarify "until" information
++
++
++Release data2006l - 2006-09-18 12:58:11 -0400
++
++  Paul's best-effort work on this coming weekend's Egypt time change
++
++
++Release 2006k - 2006-08-28 12:19:09 -0400
++
++  changes by Paul Eggert
++
++
++Release 2006j - 2006-08-21 09:56:32 -0400
++
++  changes by Paul Eggert
++
++
++Release code2006i - 2006-08-07 12:30:55 -0400
++
++  localtime.c fixes
++
++  Ken Pizzini's conversion script
++
++
++Release code2006h - 2006-07-24 09:19:37 -0400
++
++  adds public domain notices to four files
++
++  includes a fix for transition times being off by a second
++
++  adds a new recording to the "arts" file (information courtesy Colin Bowern)
++
++
++Release 2006g - 2006-05-08 17:18:09 -0400
++
++  northamerica changes by Paul Eggert
++
++
++Release 2006f - 2006-05-01 11:46:00 -0400
++
++  a missing version number problem is fixed (with thanks to Bradley
++  White for catching the problem)
++
++
++Release 2006d - 2006-04-17 14:33:43 -0400
++
++  changes by Paul Eggert
++
++  added new items to tz-arts.htm that were found by Paul
++
++
++Release 2006c - 2006-04-03 10:09:32 -0400
++
++  two sets of data changes by Paul Eggert
++
++  a fencepost error fix in zic.c
++
++  changes to zic.c and the "europe" file to minimize differences
++  between output produced by the old 32-bit zic and the new 64-bit
++  version
++
++
++Release 2006b - 2006-02-20 10:08:18 -0500
++  [tz32code2006b + tz64code2006b + tzdata2006b]
++
++  64-bit code
++
++  All SCCS IDs were bumped to "8.1" for this release.
++
++
++Release 2006a - 2006-01-30 08:59:31 -0500
++
++  changes by Paul Eggert (in particular, Indiana time zone moves)
++
++  an addition to the zic manual page to describe how special-case
++  transitions are handled
++
++
++Release 2005r - 2005-12-27 09:27:13 -0500
++
++  Canadian changes by Paul Eggert
++
++  They also add "<pre>" directives to time zone data files and reflect
++  changes to warning message logic in "zdump.c" (but with calls to
++  "gettext" kept unbundled at the suggestion of Ken Pizzini).
++
++
++Release 2005q - 2005-12-13 09:17:09 -0500
++
++  Nothing earth-shaking here:
++	1.  Electronic mail addresses have been removed.
++	2.  Casts of the return value of exit have been removed.
++	3.  Casts of the argument of is.* macros have been added.
++	4.  Indentation in one section of zic.c has been fixed.
++	5.  References to dead URLs in the data files have been dealt with.
++
++
++Release 2005p - 2005-12-05 10:30:53 -0500
++
++  "systemv", "tz-link.htm", and "zdump.c" changes
++  (less the casts of arguments to the is* macros)
++
++
++Release 2005o - 2005-11-28 10:55:26 -0500
++
++  Georgia, Cuba, Nicaragua, and Jordan changes by Paul Eggert
++
++  zdump.c lint fixes by Arthur David Olson
++
++
++Release 2005n - 2005-10-03 09:44:09 -0400
++
++  changes by Paul Eggert (both the Uruguay changes and the Kyrgyzstan
++  et al. changes)
++
++
++Release 2005m - 2005-08-29 12:15:40 -0400
++
++  changes by Paul Eggert (with a small tweak to the tz-art change)
++
++  a declaration of an unused variable has been removed from zdump.c
++
++
++Release 2005l - 2005-08-22 12:06:39 -0400
++
++  changes by Paul Eggert
++
++  overflow/underflow checks by Arthur David Olson, minus changes to
++  the "Theory" file about the pending addition of 64-bit data (I grow
++  less confident of the changes being accepted with each passing day,
++  and the changes no longer increase the data files nine-fold--there's
++  less than a doubling in size by my local Sun's reckoning)
++
++
++Release 2005k - 2005-07-14 14:14:24 -0400
++
++  The "leapseconds" file has been edited to reflect the recently
++  announced leap second at the end of 2005.
++
++  I've also deleted electronic mail addresses from the files as an
++  anti-spam measure.
++
++
++Release 2005j - 2005-06-13 14:34:13 -0400
++
++  These reflect changes to limit the length of time zone abbreviations
++  and the characters used in those abbreviations.
++
++  There are also changes to handle POSIX-style "quoted" time zone
++  environment variables.
++
++  The changes were circulated on the time zone mailing list; the only
++  change since then was the removal of a couple of minimum-length of
++  abbreviation checks.
++
++
++Release data2005i - 2005-04-21 15:04:16 -0400
++
++  changes (most importantly to Nicaragua and Haiti) by Paul Eggert
++
++
++Release 2005h - 2005-04-04 11:24:47 -0400
++
++  changes by Paul Eggert
++
++  minor changes to Makefile and zdump.c to produce more useful output
++  when doing a "make typecheck"
++
++
++Release 2005g - 2005-03-14 10:11:21 -0500
++
++  changes by Paul Eggert (a change to current DST rules in Uruguay and
++  an update to a link to time zone software)
++
++
++Release 2005f - 2005-03-01 08:45:32 -0500
++
++  data and documentation changes by Paul Eggert
++
++
++Release 2005e - 2005-02-10 15:59:44 -0500
++
++  [not summarized]
++
++
++Release code2005d - 2005-01-31 09:21:47 -0500
++
++  make zic complain about links to links if the -v flag is used
++
++  have "make public" do more code checking
++
++  add an include to "localtime.c" for the benefit of gcc systems
++
++
++Release 2005c - 2005-01-17 18:36:29 -0500
++
++  get better results when mktime runs on a system where time_t is double
++
++  changes to the data files (most importantly to Paraguay)
++
++
++Release 2005b - 2005-01-10 09:19:54 -0500
++
++  Get localtime and gmtime working on systems with exotic time_t types.
++
++  Update the leap second commentary in the "leapseconds" file.
++
++
++Release 2005a - 2005-01-01 13:13:44 -0500
++
++  [not summarized]
++
++
++Release code2004i - 2004-12-14 13:42:58 -0500
++
++  Deal with systems where time_t is unsigned.
++
++
++Release code2004h - 2004-12-07 11:40:18 -0500
++
++  64-bit-time_t changes
++
++
++Release 2004g - 2004-11-02 09:06:01 -0500
++
++  update to Cuba (taking effect this weekend)
++
++  other changes by Paul Eggert
++
++  correction of the spelling of Oslo
++
++  changed versions of difftime.c and private.h
++
++
++Release code2004f - 2004-10-21 10:25:22 -0400
++
++  Cope with wide-ranging tm_year values.
++
++
++Release 2004e - 2004-10-11 14:47:21 -0400
++
++  Brazil/Argentina/Israel changes by Paul Eggert
++
++  changes to tz-link.htm by Paul
++
++  one small fix to Makefile
++
++
++Release 2004d - 2004-09-22 08:27:29 -0400
++
++  Avoid overflow problems when TM_YEAR_BASE is added to an integer.
++
++
++Release 2004c - 2004-08-11 12:06:26 -0400
++
++  asctime-related changes
++
++  (variants of) some of the documentation changes suggested by Paul Eggert
++
++
++Release 2004b - 2004-07-19 14:33:35 -0400
++
++  data changes by Paul Eggert - most importantly, updates for Argentina
++
++
++Release 2004a - 2004-05-27 12:00:47 -0400
++
++  changes by Paul Eggert
++
++  Handle DST transitions that occur at the end of a month in some
++  years but at the start of the following month in other years.
++
++  Add a copy of the correspondence that's the basis for claims about
++  DST in the Navajo Nation.
++
++
++Release 2003e - 2003-12-15 09:36:47 -0500
++
++  changes by Arthur David Olson (primarily code changes)
++
++  changes by Paul Eggert (primarily data changes)
++
++  minor changes to "Makefile" and "northamerica" (in the latter case,
++  optimization of the "Toronto" rules)
++
++
++Release 2003d - 2003-10-06 09:34:44 -0400
++
++  changes by Paul Eggert
++
++
++Release 2003c - 2003-09-16 10:47:05 -0400
++
++  Fix bad returns in zic.c's inleap function.
++  Thanks to Bradley White for catching the problem!
++
++
++Release 2003b - 2003-09-16 07:13:44 -0400
++
++  Add a "--version" option (and documentation) to the zic and zdump commands.
++
++  changes to overflow/underflow checking in zic
++
++  a localtime typo fix.
++
++  Update the leapseconds and tz-art.htm files.
++
++
++Release 2003a - 2003-03-24 09:30:54 -0500
++
++  changes by Paul Eggert
++
++  a few additions and modifications to the tz-art.htm file
++
++
++Release 2002d - 2002-10-15 13:12:42 -0400
++
++  changes by Paul Eggert, less the "Britain (UK)" change in iso3166.tab
++
++  There's also a new time zone quote in "tz-art.htm".
++
++
++Release 2002c - 2002-04-04 11:55:20 -0500
++
++  changes by Paul Eggert
++
++  Change zic.c to avoid creating symlinks to files that don't exist.
++
++
++Release 2002b - 2002-01-28 12:56:03 -0500
++
++  [These change notes are for Release 2002a, which was corrupted.
++  2002b was a corrected version of 2002a.]
++
++  changes by Paul Eggert
++
++  Update the "leapseconds" file to note that there'll be no leap
++  second at the end of June, 2002.
++
++  Change "zic.c" to deal with a problem in handling the "Asia/Bishkek" zone.
++
++  Change to "difftime.c" to avoid sizeof problems.
++
++
++Release 2001d - 2001-10-09 13:31:32 -0400
++
++  changes by Paul Eggert
++
++
++Release 2001c - 2001-06-05 13:59:55 -0400
++
++  changes by Paul Eggert and Andrew Brown
++
++
++Release 2001b - 2001-04-05 16:44:38 -0400
++
++  changes by Paul Eggert (modulo jnorgard's typo fix)
++
++  tz-art.htm has been HTMLified.
++
++
++Release 2001a - 2001-03-13 12:57:44 -0500
++
++  changes by Paul Eggert
++
++  An addition to the "leapseconds" file: comments with the text of the
++  latest IERS leap second notice.
++
++  Trailing white space has been removed from data file lines, and
++  repeated spaces in "Rule Jordan" lines in the "asia" file have been
++  converted to tabs.
++
++
++Release 2000h - 2000-12-14 15:33:38 -0500
++
++  changes by Paul Eggert
++
++  one typo fix in the "art" file
++
++  With providence, this is the last update of the millennium.
++
++
++Release 2000g - 2000-10-10 11:35:22 -0400
++
++  changes by Paul Eggert
++
++  correction of John Mackin's name submitted by Robert Elz
++
++  Garry Shandling's Daylight Saving Time joke (!?!) from the recent
++  Emmy Awards broadcast.
++
++
++Release 2000f - 2000-08-10 09:31:58 -0400
++
++  changes by Paul Eggert
++
++  Added information in "tz-art.htm" on a Seinfeld reference to DST.
++
++  Error checking and messages in the "yearistype" script have been
++  improved.
++
++
++Release 2000e - 2000-07-31 09:27:54 -0400
++
++  data changes by Paul Eggert
++
++  a change to the default value of the defined constant HAVE_STRERROR
++
++  the addition of a Dave Barry quote on DST to the tz-arts file
++
++
++Release 2000d - 2000-04-20 15:43:04 -0400
++
++  changes to the documentation and code of strftime for C99 conformance
++
++  a bug fix for date.c
++
++  These are based on (though modified from) changes by Paul Eggert.
++
++
++Release 2000c - 2000-03-04 10:31:43 -0500
++
++  changes by Paul Eggert
++
++
++Release 2000b - 2000-02-21 12:16:29 -0500
++
++  changes by Paul Eggert and Joseph Myers
++
++  modest tweaks to the tz-art.htm and tz-link.htm files
++
++
++Release 2000a - 2000-01-18 09:21:26 -0500
++
++  changes by Paul Eggert
++
++  The two hypertext documents have also been renamed.
++
++
++Release code1999i-data1999j - 1999-11-15 18:43:22 -0500
++
++  Paul Eggert's changes
++
++  additions to the "zic" manual page and the "Arts.htm" file
++
++
++Release code1999h-data1999i - 1999-11-08 14:55:21 -0500
++
++  [not summarized]
++
++
++Release data1999h - 1999-10-07 03:50:29 -0400
++
++  changes by Paul Eggert to "europe" (most importantly, fixing
++  Lithuania and Estonia)
++
++
++Release 1999g - 1999-09-28 11:06:18 -0400
++
++  data changes by Paul Eggert (most importantly, the change for
++  Lebanon that buys correctness for this coming Sunday)
++
++  The "code" file contains changes to "Makefile" and "checktab.awk" to
++  allow better checking of time zone files before they are published.
++
++
++Release 1999f - 1999-09-23 09:48:14 -0400
++
++  changes by Arthur David Olson and Paul Eggert
++
++
++Release 1999e - 1999-08-17 15:20:54 -0400
++
++  changes circulated by Paul Eggert, although the change to handling
++  of DST-specifying time zone names has been commented out for now
++  (search for "XXX" in "localtime.c" for details).  These files also
++  do not make any changes to the start of DST in Brazil.
++
++  In addition to Paul's changes, there are updates to "Arts.htm" and
++  cleanups of URLs.
++
++
++Release 1999d - 1999-03-30 11:31:07 -0500
++
++  changes by Paul Eggert
++
++  The Makefile's "make public" rule has also been changed to do a test
++  compile of each individual time zone data file (which should help
++  avoid problems such as the one we had with Nicosia).
++
++
++Release 1999c - 1999-03-25 09:47:47 -0500
++
++  changes by Paul Eggert, most importantly the change for Chile.
++
++
++Release 1999b - 1999-02-01 17:51:44 -0500
++
++  changes by Paul Eggert
++
++  code changes (suggested by Mani Varadarajan, mani at be.com) for
++  correct handling of symbolic links when building using a relative directory
++
++  code changes to generate correct messages for failed links
++
++  updates to the URLs in Arts.htm
++
++
++Release 1999a - 1999-01-19 16:20:29 -0500
++
++  error message internationalizations and corrections in zic.c and
++  zdump.c (as suggested by Vladimir Michl, vladimir.michl at upol.cz,
++  to whom thanks!)
++
++
++Release code1998h-data1998i - 1998-10-01 09:56:10 -0400
++
++  changes for Brazil, Chile, and Germany
++
++  support for use of "24:00" in the input files for the time zone compiler
++
++
++Release code1998g-data1998h - 1998-09-24 10:50:28 -0400
++
++  changes by Paul Eggert
++
++  correction to a define in the "private.h" file
++
++
++Release data1998g - 1998-08-11 03:28:35 -0000
++  [tzdata1998g.tar.gz is missing!]
++
++  Lithuanian change provided by mgedmin at pub.osf.it
++
++  Move creation of the GMT link with Etc/GMT to "etcetera" (from
++  "backward") to ensure that the GMT file is created even where folks
++  don't want the "backward" links (as suggested by Paul Eggert).
++
++
++Release data1998f - 1998-07-20 13:50:00 -0000
++  [tzdata1998f.tar.gz is missing!]
++
++  Update the "leapseconds" file to include the newly-announced
++  insertion at the end of 1998.
++
++
++Release code1998f - 1998-06-01 10:18:31 -0400
++
++  addition to localtime.c by Guy Harris
++
++
++Release 1998e - 1998-05-28 09:56:26 -0400
++
++  The Makefile is changed to produce zoneinfo-posix rather than
++  zoneinfo/posix, and to produce zoneinfo-leaps rather than
++  zoneinfo/right.
++
++  data changes by Paul Eggert
++
++  changes from Guy Harris to provide asctime_r and ctime_r
++
++  A usno1998 file (substantially identical to usno1997) has been added.
++
++
++Release 1998d - 1998-05-14 11:58:34 -0400
++
++  changes to comments (in particular, elimination of references to CIA maps).
++  "Arts.htm", "WWW.htm", "asia", and "australasia" are the only places
++  where changes occur.
++
++
++Release 1998c - 1998-02-28 12:32:26 -0500
++
++  changes by Paul Eggert (save the "French correction," on which I'll
++  wait for the dust to settle)
++
++  symlink changes
++
++  changes and additions to Arts.htm
++
++
++Release 1998b - 1998-01-17 14:31:51 -0500
++
++  URL cleanups and additions
++
++
++Release 1998a - 1998-01-13 12:37:35 -0500
++
++  changes by Paul Eggert
++
++
++Release code1997i-data1997k - 1997-12-29 09:53:41 -0500
++
++  changes by Paul Eggert, with minor modifications from Arthur David
++  Olson to make the files more browser friendly
++
++
++Release code1997h-data1997j - 1997-12-18 17:47:35 -0500
++
++  minor changes to put "TZif" at the start of each time zone information file
++
++  a rule has also been added to the Makefile so you can
++	make zones
++  to just recompile the zone information files (rather than doing a
++  full "make install" with its other effects).
++
++
++Release data1997i - 1997-10-07 08:45:38 -0400
++
++  changes to Africa by Paul Eggert
++
++
++Release code1997g-data1997h - 1997-09-04 16:56:54 -0400
++
++  corrections for Uruguay (and other locations)
++
++  Arthur David Olson's simple-minded fix allowing mktime to both
++  correctly handle leap seconds and correctly handle tm_sec values
++  upon which arithmetic has been performed.
++
++
++Release code1997f-data1997g - 1997-07-19 13:15:02 -0400
++
++  Paul Eggert's updates
++
++  a small change to a function prototype;
++
++  "Music" has been renamed "Arts.htm", HTMLified, and augmented to
++  include information on Around the World in Eighty Days.
++
++
++Release code1997e-data1997f - 1997-05-03 18:52:34 -0400
++
++  fixes to zic's error handling
++
++  changes inspired by the item circulated on Slovenia
++
++  The description of Web resources has been HTMLified for browsing
++  convenience.
++
++  A new piece of tz-related music has been added to the "Music" file.
++
++
++Release code1997d-data1997e - 1997-03-29 12:48:52 -0500
++
++  Paul Eggert's latest suggestions
++
++
++Release code1997c-data1997d - 1997-03-07 20:37:54 -0500
++
++  changes to "zic.c" to correct performance of the "-s" option
++
++  a new file "usno1997"
++
++
++Release data1997c - 1997-03-04 09:58:18 -0500
++
++  changes in Israel
++
++
++Release 1997b - 1997-02-27 18:34:19 -0500
++
++  The data file incorporates the 1997 leap second.
++
++  The code file incorporates Arthur David Olson's take on the
++  zic/multiprocessor/directory-creation situation.
++
++
++Release 1997a - 1997-01-21 09:11:10 -0500
++
++  Paul Eggert's Antarctica (and other changes)
++
++  Arthur David Olson finessed the "getopt" issue by checking against
++  both -1 and EOF (regardless of POSIX, SunOS 4.1.1's manual says -1
++  is returned while SunOS 5.5's manual says EOF is returned).
++
++
++Release code1996o-data1996n - 1996-12-27 21:42:05 -0500
++
++  Paul Eggert's latest changes
++
++
++Release code1996n - 1996-12-16 09:42:02 -0500
++
++  link snapping fix from Bruce Evans (via Garrett Wollman)
++
++
++Release data1996m - 1996-11-24 02:37:34 -0000
++  [tzdata1996m.tar.gz is missing!]
++
++  Paul Eggert's batch of changes
++
++
++Release code1996m-data1996l - 1996-11-05 14:00:12 -0500
++
++  No functional changes here; the files have simply been changed to
++  make more use of ISO style dates in comments. The names of the above
++  files now include the year in full.
++
++
++Release code96l - 1996-09-08 17:12:20 -0400
++
++  tzcode96k was missing a couple of pieces.
++
++
++Release 96k - 1996-09-08 16:06:22 -0400
++
++  the latest round of changes from Paul Eggert
++
++  the recent Year 2000 material
++
++
++Release code96j - 1996-07-30 13:18:53 -0400
++
++  Set sp->typecnt as suggested by Timothy Patrick Murphy.
++
++
++Release code96i - 1996-07-27 20:11:35 -0400
++
++  Paul's suggested patch for strftime %V week numbers
++
++
++Release data96i - 1996-07-01 18:13:04 -0400
++
++  "northamerica" and "europe" changes by Paul Eggert
++
++
++Release code96h - 1996-06-05 08:02:21 -0400
++
++  fix for handling transitions specified in Universal Time
++
++  Some "public domain" notices have also been added.
++
++
++Release code96g - 1996-05-16 14:00:26 -0400
++
++  fix for the simultaneous-DST-and-zone-change challenge
++
++
++Release data96h - 1996-05-09 17:40:51 -0400
++
++  changes by Paul Eggert
++
++
++Release code96f-data96g - 1996-05-03 03:09:59 -0000
++  [tzcode96f.tar.gz + tzdata96g.tar.gz are both missing!]
++
++  The changes get us some of the way to fixing the problems noted in Paul
++  Eggert's letter yesterday (in addition to a few others).  The approach
++  has been to make zic a bit smarter about figuring out what time zone
++  abbreviations apply just after the time specified in the "UNTIL" part
++  of a zone line.  Putting the smarts in zic means avoiding having
++  transition times show up in both "Zone" lines and "Rule" lines, which
++  in turn avoids multiple transition time entries in time zone files.
++  (This also makes the zic input files such as "europe" a bit shorter and
++  should ease maintenance.)
++
++
++Release data96f - 1996-04-19 19:20:03 -0000
++  [tzdata96f.tar.gz is missing!]
++
++  The only changes are to the "northamerica" file; the time zone
++  abbreviation for Denver is corrected to MST (and MDT), and the
++  comments for Mexico have been updated.
++
++
++Release data96e - 1996-03-19 17:37:26 -0500
++
++  Proposals by Paul Eggert, in particular the Portugal change that
++  comes into play at the end of this month.
++
++
++Release data96d - 1996-03-18 20:49:39 -0500
++
++  [not summarized]
++
++
++Release code96e - 1996-02-29 15:43:27 -0000
++  [tzcode96e.tar.gz is missing!]
++
++  internationalization changes and the fix to the documentation for strftime
++
++
++Release code96d-data96c - 1996-02-12 11:05:27 -0500
++
++  The "code" file simply updates Bob Kridle's electronic address.
++
++  The "data" file updates rules for Mexico.
++
++
++Release data96b - 1996-01-27 15:44:42 -0500
++
++  Kiribati change
++
++
++Release code96c - 1996-01-16 16:58:15 -0500
++
++  leap-year streamlining and binary-search changes
++
++  fix to newctime.3
++
++
++Release code96b - 1996-01-10 20:42:39 -0500
++
++  fixes and enhancements from Paul Eggert, including code that
++  emulates the behavior of recent versions of the SunOS "date"
++  command.
++
++
++Release 96a - 1996-01-06 09:08:24 -0500
++
++  Israel updates
++
++  fixes to strftime.c for correct ISO 8601 week number generation,
++  plus support for two new formats ('G' and 'g') to give ISO 8601 year
++  numbers (which are not necessarily the same as calendar year numbers)
++
++
++Release code95i-data95m - 1995-12-21 12:46:47 -0500
++
++  The latest revisions from Paul Eggert are included, the usno1995
++  file has been updated, and a new file ("WWW") covering useful URLs
++  has been added.
++
++
++Release code95h-data95l - 1995-12-19 18:10:12 -0500
++
++  A simplification of a macro definition, a change to data for Sudan,
++  and (for last minute shoppers) notes in the "Music" file on the CD
++  "Old Man Time".
++
++
++Release code95g-data95k - 1995-10-30 10:32:47 -0500
++
++  (slightly reformatted) 8-bit-clean proposed patch
++
++  minor patch: US/Eastern -> America/New_York
++
++  snapshot of the USNO's latest data ("usno1995")
++
++  some other minor cleanups
++
++
++Release code95f-data95j - 1995-10-28 21:01:34 -0000
++  [tzcode95f.tar.gz + tzdata95j.tar.gz are both missing!]
++
++  European cleanups
++
++  support for 64-bit time_t's
++
++  optimization in localtime.c
++
++
++Release code95e - 1995-10-13 13:23:57 -0400
++
++  the mktime change to scan from future to past when trying to find time zone
++  offsets
++
++
++Release data95i - 1995-09-26 10:43:26 -0400
++
++  For Canada/Central, guess that the Sun customer's "one week too
++  early" was just a approximation, and the true error is one month
++  too early.  This is consistent with the rest of Canada.
++
++
++Release data95h - 1995-09-21 11:26:48 -0400
++
++  latest changes from Paul Eggert
++
++
++Release code95d - 1995-09-14 11:14:45 -0400
++
++  the addition of a "Music" file, which documents four recorded
++  versions of the tune "Save That Time".
++
++
++Release data95g - 1995-09-01 17:21:36 -0400
++
++  "yearistype" correction
++
++
++Release data95f - 1995-08-28 20:46:56 -0400
++
++  Paul Eggert's change to the australasia file
++
++
++Release data95e - 1995-07-08 18:02:34 -0400
++
++  The only change is a leap second at the end of this year.
++  Thanks to Bradley White for forwarding news on the leap second.
++
++
++Release data95d - 1995-07-03 13:26:22 -0400
++
++  Paul Eggert's changes
++
++
++Release data95c - 1995-07-02 19:19:28 -0400
++
++  changes to "asia", "backward", "europe", and "southamerica"
++  (read: northamericacentrics need not apply)
++
++
++Release code95c - 1995-03-13 14:00:46 -0500
++
++  one-line fix for sign extension problems in detzcode
++
++
++Release 95b - 1995-03-04 11:22:38 -0500
++
++  Minor changes in both:
++
++  The "code" file contains a workaround for the lack of "unistd.h" in
++  Microsoft C++ version 7.
++
++  The "data" file contains a fixed "Link" for America/Shiprock.
++
++
++Release 94h - 1994-12-10 12:51:14 -0500
++
++  The files:
++
++  *	incorporate the changes to "zdump" and "date" to make changes to
++	the "TZ" environment variable permanent;
++
++  *	incorporate the table changes by Paul Eggert;
++
++  *	include (and document) support for universal time specifications in
++	data files - but do not (yet) include use of this feature in the
++	data files.
++
++  Think of this as "TZ Classic" - the software has been set up not to break if
++  universal time shows up in its input, and data entries have been
++  left as is so as not to break existing implementations.
++
++
++Release data94f - 1994-08-20 12:56:09 -0400
++
++  (with thanks!) the latest data updates from Paul Eggert
++
++
++Release data94e - 1994-06-04 13:13:53 -0400
++
++  [not summarized]
++
++
++Release code94g - 1994-05-05 12:14:07 -0400
++
++  fix missing "optind.c" and a reference to it in the Makefile
++
++
++Release code94f - 1994-05-05 13:00:33 -0000
++  [tzcode94f.tar.gz is missing!]
++
++  changes to avoid overflow in difftime, as well as changes to cope
++  with the 52/53 challenge in strftime
++
++
++Release code94e - 1994-03-30 23:32:59 -0500
++
++  change for the benefit of PCTS
++
++
++Release 94d - 1994-02-24 15:42:25 -0500
++
++  Avoid clashes with POSIX semantics for zones such as GMT+4.
++
++  Some other very minor housekeeping is also present.
++
++
++Release code94c - 1994-02-10 08:52:40 -0500
++
++  Fix bug where mkdirs was broken unless you compile with
++  -fwritable-strings (which is generally losing to do).
++
++
++Release 94b - 1994-02-07 10:04:33 -0500
++
++  work by Paul Eggert who notes:
++
++  I found another book of time zone histories by E W Whitman; it's not
++  as extensive as Shanks but has a few goodies of its own.  I used it
++  to update the tables.  I also fixed some more as a result of
++  correspondence with Adam David and Peter Ilieve, and move some stray
++  links from 'europe' to 'backward'.  I corrected some scanning errors
++  in usno1989.
++
++  As far as the code goes, I fixed zic to allow years in the range
++  INT_MIN to INT_MAX; this fixed a few boundary conditions around 1900.
++  And I cleaned up the zic documentation a little bit.
++
++
++Release data94a - 1994-02-03 08:58:54 -0500
++
++  It simply incorporates the recently announced leap second into the
++  "leapseconds" file.
++
++
++Release 93g - 1993-11-22 17:28:27 -0500
++
++  Paul Eggert has provided a good deal of historic information (based
++  on Shanks), and there are some code changes to deal with the buglets
++  that crawled out in dealing with the new information.
++
++
++Release 93f - 1993-10-15 12:27:46 -0400
++
++  Paul Eggert's changes
++
++
++Release 93e - 1993-09-05 21:21:44 -0400
++
++  This has updated data for Israel, England, and Kwajalein.  There's
++  also an update to "zdump" to cope with Kwajalein's 24-hour jump.
++  Thanks to Paul Eggert and Peter Ilieve for the changes.
++
++
++Release 93d - 1993-06-17 23:34:17 -0400
++
++  new fix and new data on Israel
++
++
++Release 93c - 1993-06-06 19:31:55 -0400
++
++  [not summarized]
++
++
++Release 93b - 1993-02-02 14:53:58 -0500
++
++  updated "leapseconds" file
++
++
++Release 93 - 1993-01-08 07:01:06 -0500
++
++  At kre's suggestion, the package has been split in two - a code piece
++  (which also includes documentation) that's only of use to folks who
++  want to recompile things and a data piece useful to anyone who can
++  run "zic".
++
++  The new version has a few changes to the data files, a few
++  portability changes, and an off-by-one fix (with thanks to
++  Tom Karzes at deshaw.com for providing a description and a
++  solution).
++
++
++Release 92c - 1992-11-21 17:35:36 -0000
++  [tz92c.tar.Z is missing!]
++
++  The fallout from the latest round of DST transitions.
++
++  There are changes for Portugal, Saskatchewan, and "Pacific-New";
++  there's also a change to "zic.c" that makes it portable to more systems.
++
++
++Release 92 - 1992-04-25 18:17:03 -0000
++  [tz92.tar.Z is missing!]
++
++  By popular demand (well, at any rate, following a request by kre at munnari)
++
++
++The 1989 update of the time zone package featured:
++
++  *	POSIXization (including interpretation of POSIX-style TZ environment
++	variables, provided by Guy Harris),
++  *	ANSIfication (including versions of "mktime" and "difftime"),
++  *	SVIDulation (an "altzone" variable)
++  *	MACHination (the "gtime" function)
++  *	corrections to some time zone data (including corrections to the rules
++	for Great Britain and New Zealand)
++  *	reference data from the United States Naval Observatory for folks who
++	want to do additional time zones
++  *	and the 1989 data for Saudi Arabia.
++
++  (Since this code will be treated as "part of the implementation" in some
++  places and as "part of the application" in others, there's no good way to
++  name functions, such as timegm, that are not part of the proposed ANSI C
++  standard; such functions have kept their old, underscore-free names in this
++  update.)
++
++  And the "dysize" function has disappeared; it was present to allow
++  compilation of the "date" command on old BSD systems, and a version of "date"
++  is now provided in the package.  The "date" command is not created when you
++  "make all" since it may lack options provided by the version distributed with
++  your operating system, or may not interact with the system in the same way
++  the native version does.
++
++  Since POSIX frowns on correct leap second handling, the default behavior of
++  the "zic" command (in the absence of a "-L" option) has been changed to omit
++  leap second information from its output files.
++
++
++-----
++Notes
++
++This file contains copies of the part of each release announcement
++that talks about the changes in that release.  The text has been
++adapted and reformatted for the purposes of this file.
++
++Traditionally a release R consists of a pair of tarball files,
++tzcodeR.tar.gz and tzdataR.tar.gz.  However, some releases (e.g.,
++code2010a, data2012c) consist of just one or the other tarball, and a
++few (e.g., code2012c-data2012d) have tarballs with mixed version
++numbers.  Recent releases also come in an experimental format
++consisting of a single tarball tzdb-R.tar.lz with extra data.
++
++Release time stamps are taken from the release's commit (for newer,
++Git-based releases), from the newest file in the tarball (for older
++releases, where this info is available) or from the email announcing
++the release (if all else fails; these are marked with a time zone of
++-0000 and an "is missing!" comment).
++
++Earlier versions of the code and data were not announced on the tz
++list and are not summarized here.
++
++This file is in the public domain.
++
++Local Variables:
++coding: utf-8
++End:
+--- contrib/tzdata/README.orig
++++ contrib/tzdata/README
+@@ -0,0 +1,71 @@
++README for the tz distribution
++
++"What time is it?" -- Richard Deacon as The King
++"Any time you want it to be." -- Frank Baxter as The Scientist
++					(from the Bell System film "About Time")
++
++The Time Zone Database (often called tz or zoneinfo) contains code and
++data that represent the history of local time for many representative
++locations around the globe.  It is updated periodically to reflect
++changes made by political bodies to time zone boundaries, UTC offsets,
++and daylight-saving rules.
++
++Here is a recipe for acquiring, building, installing, and testing the
++tz distribution on a GNU/Linux or similar host.
++
++To acquire the distribution, run the following shell commands:
++
++	mkdir tz
++	cd tz
++	wget --retr-symlinks 'ftp://ftp.iana.org/tz/tz*-latest.tar.gz'
++	gzip -dc tzcode-latest.tar.gz | tar -xf -
++	gzip -dc tzdata-latest.tar.gz | tar -xf -
++
++Alternatively, the following shell commands acquire the same
++distribution, with extra data useful for regression testing:
++
++	wget --retr-symlinks 'ftp://ftp.iana.org/tz/tzdb-latest.tar.lz'
++	lzip -dc tzdb-latest.tar.lz | tar -xf -
++
++Be sure to read the comments in "Makefile" and make any changes needed
++to make things right for your system, especially if you are using some
++platform other than GNU/Linux.  Then run the following commands,
++substituting your desired installation directory for "$HOME/tzdir":
++
++	make TOPDIR=$HOME/tzdir install
++	$HOME/tzdir/etc/zdump -v America/Los_Angeles
++
++Historical local time information has been included here to:
++
++*	provide a compendium of data about the history of civil time
++	that is useful even if not 100% accurate;
++
++*	give an idea of the variety of local time rules that have
++	existed in the past and thus an idea of the variety that may be
++	expected in the future;
++
++*	provide a test of the generality of the local time rule description
++	system.
++
++The information in the time zone data files is by no means authoritative;
++fixes and enhancements are welcome.  Please see the file CONTRIBUTING
++for details.
++
++Thanks to these Time Zone Caballeros who've made major contributions to the
++time conversion package: Keith Bostic; Bob Devine; Paul Eggert; Robert Elz;
++Guy Harris; Mark Horton; John Mackin; and Bradley White.  Thanks also to
++Michael Bloom, Art Neilson, Stephen Prince, John Sovereign, and Frank Wales
++for testing work, and to Gwillim Law for checking local mean time data.
++Thanks in particular to Arthur David Olson, the project's founder and first
++maintainer, to whom the time zone community owes the greatest debt of all.
++None of them are responsible for remaining errors.
++
++Look in <ftp://ftp.iana.org/tz/releases/> for updated versions of these files.
++
++Please send comments or information to tz@iana.org.
++
++-----
++
++This file is in the public domain, so clarified as of 2009-05-17 by
++Arthur David Olson.  The other files in this distribution are either
++public domain or BSD licensed; see the file LICENSE for details.
+--- contrib/tzdata/Theory.orig
++++ contrib/tzdata/Theory
+@@ -0,0 +1,840 @@
++Theory and pragmatics of the tz code and data
++
++
++----- Outline -----
++
++	Scope of the tz database
++	Names of time zone rules
++	Time zone abbreviations
++	Accuracy of the tz database
++	Time and date functions
++	Calendrical issues
++	Time and time zones on Mars
++
++
++----- Scope of the tz database -----
++
++The tz database attempts to record the history and predicted future of
++all computer-based clocks that track civil time.  To represent this
++data, the world is partitioned into regions whose clocks all agree
++about time stamps that occur after the somewhat-arbitrary cutoff point
++of the POSIX Epoch (1970-01-01 00:00:00 UTC).  For each such region,
++the database records all known clock transitions, and labels the region
++with a notable location.  Although 1970 is a somewhat-arbitrary
++cutoff, there are significant challenges to moving the cutoff earlier
++even by a decade or two, due to the wide variety of local practices
++before computer timekeeping became prevalent.
++
++Clock transitions before 1970 are recorded for each such location,
++because most systems support time stamps before 1970 and could
++misbehave if data entries were omitted for pre-1970 transitions.
++However, the database is not designed for and does not suffice for
++applications requiring accurate handling of all past times everywhere,
++as it would take far too much effort and guesswork to record all
++details of pre-1970 civil timekeeping.
++
++As described below, reference source code for using the tz database is
++also available.  The tz code is upwards compatible with POSIX, an
++international standard for UNIX-like systems.  As of this writing, the
++current edition of POSIX is:
++
++  The Open Group Base Specifications Issue 7
++  IEEE Std 1003.1, 2013 Edition
++  <http://pubs.opengroup.org/onlinepubs/9699919799/>
++
++
++
++----- Names of time zone rules -----
++
++Each of the database's time zone rules has a unique name.
++Inexperienced users are not expected to select these names unaided.
++Distributors should provide documentation and/or a simple selection
++interface that explains the names; for one example, see the 'tzselect'
++program in the tz code.  The Unicode Common Locale Data Repository
++<http://cldr.unicode.org/> contains data that may be useful for other
++selection interfaces.
++
++The time zone rule naming conventions attempt to strike a balance
++among the following goals:
++
++ * Uniquely identify every region where clocks have agreed since 1970.
++   This is essential for the intended use: static clocks keeping local
++   civil time.
++
++ * Indicate to experts where that region is.
++
++ * Be robust in the presence of political changes.  For example, names
++   of countries are ordinarily not used, to avoid incompatibilities
++   when countries change their name (e.g. Zaire->Congo) or when
++   locations change countries (e.g. Hong Kong from UK colony to
++   China).
++
++ * Be portable to a wide variety of implementations.
++
++ * Use a consistent naming conventions over the entire world.
++
++Names normally have the form AREA/LOCATION, where AREA is the name
++of a continent or ocean, and LOCATION is the name of a specific
++location within that region.  North and South America share the same
++area, 'America'.  Typical names are 'Africa/Cairo', 'America/New_York',
++and 'Pacific/Honolulu'.
++
++Here are the general rules used for choosing location names,
++in decreasing order of importance:
++
++	Use only valid POSIX file name components (i.e., the parts of
++		names other than '/').  Do not use the file name
++		components '.' and '..'.  Within a file name component,
++		use only ASCII letters, '.', '-' and '_'.  Do not use
++		digits, as that might create an ambiguity with POSIX
++		TZ strings.  A file name component must not exceed 14
++		characters or start with '-'.  E.g., prefer 'Brunei'
++		to 'Bandar_Seri_Begawan'.  Exceptions: see the discussion
++		of legacy names below.
++	A name must not be empty, or contain '//', or start or end with '/'.
++	Do not use names that differ only in case.  Although the reference
++		implementation is case-sensitive, some other implementations
++		are not, and they would mishandle names differing only in case.
++	If one name A is an initial prefix of another name AB (ignoring case),
++		then B must not start with '/', as a regular file cannot have
++		the same name as a directory in POSIX.  For example,
++		'America/New_York' precludes 'America/New_York/Bronx'.
++	Uninhabited regions like the North Pole and Bouvet Island
++		do not need locations, since local time is not defined there.
++	There should typically be at least one name for each ISO 3166-1
++		officially assigned two-letter code for an inhabited country
++		or territory.
++	If all the clocks in a region have agreed since 1970,
++		don't bother to include more than one location
++		even if subregions' clocks disagreed before 1970.
++		Otherwise these tables would become annoyingly large.
++	If a name is ambiguous, use a less ambiguous alternative;
++		e.g. many cities are named San José and Georgetown, so
++		prefer 'Costa_Rica' to 'San_Jose' and 'Guyana' to 'Georgetown'.
++	Keep locations compact.  Use cities or small islands, not countries
++		or regions, so that any future time zone changes do not split
++		locations into different time zones.  E.g. prefer 'Paris'
++		to 'France', since France has had multiple time zones.
++	Use mainstream English spelling, e.g. prefer 'Rome' to 'Roma', and
++		prefer 'Athens' to the Greek 'Αθήνα' or the Romanized 'Athína'.
++		The POSIX file name restrictions encourage this rule.
++	Use the most populous among locations in a zone,
++		e.g. prefer 'Shanghai' to 'Beijing'.  Among locations with
++		similar populations, pick the best-known location,
++		e.g. prefer 'Rome' to 'Milan'.
++	Use the singular form, e.g. prefer 'Canary' to 'Canaries'.
++	Omit common suffixes like '_Islands' and '_City', unless that
++		would lead to ambiguity.  E.g. prefer 'Cayman' to
++		'Cayman_Islands' and 'Guatemala' to 'Guatemala_City',
++		but prefer 'Mexico_City' to 'Mexico' because the country
++		of Mexico has several time zones.
++	Use '_' to represent a space.
++	Omit '.' from abbreviations in names, e.g. prefer 'St_Helena'
++		to 'St._Helena'.
++	Do not change established names if they only marginally
++		violate the above rules.  For example, don't change
++		the existing name 'Rome' to 'Milan' merely because
++		Milan's population has grown to be somewhat greater
++		than Rome's.
++	If a name is changed, put its old spelling in the 'backward' file.
++		This means old spellings will continue to work.
++
++The file 'zone1970.tab' lists geographical locations used to name time
++zone rules.  It is intended to be an exhaustive list of names for
++geographic regions as described above; this is a subset of the names
++in the data.  Although a 'zone1970.tab' location's longitude
++corresponds to its LMT offset with one hour for every 15 degrees east
++longitude, this relationship is not exact.
++
++Older versions of this package used a different naming scheme,
++and these older names are still supported.
++See the file 'backward' for most of these older names
++(e.g., 'US/Eastern' instead of 'America/New_York').
++The other old-fashioned names still supported are
++'WET', 'CET', 'MET', and 'EET' (see the file 'europe').
++
++Older versions of this package defined legacy names that are
++incompatible with the first rule of location names, but which are
++still supported.  These legacy names are mostly defined in the file
++'etcetera'.  Also, the file 'backward' defines the legacy names
++'GMT0', 'GMT-0', 'GMT+0' and 'Canada/East-Saskatchewan', and the file
++'northamerica' defines the legacy names 'EST5EDT', 'CST6CDT',
++'MST7MDT', and 'PST8PDT'.
++
++Excluding 'backward' should not affect the other data.  If
++'backward' is excluded, excluding 'etcetera' should not affect the
++remaining data.
++
++
++----- Time zone abbreviations -----
++
++When this package is installed, it generates time zone abbreviations
++like 'EST' to be compatible with human tradition and POSIX.
++Here are the general rules used for choosing time zone abbreviations,
++in decreasing order of importance:
++
++	Use three or more characters that are ASCII alphanumerics or '+' or '-'.
++		Previous editions of this database also used characters like
++		' ' and '?', but these characters have a special meaning to
++		the shell and cause commands like
++			set `date`
++		to have unexpected effects.
++		Previous editions of this rule required upper-case letters,
++		but the Congressman who introduced Chamorro Standard Time
++		preferred "ChST", so lower-case letters are now allowed.
++		Also, POSIX from 2001 on relaxed the rule to allow '-', '+',
++		and alphanumeric characters from the portable character set
++		in the current locale.  In practice ASCII alphanumerics and
++		'+' and '-' are safe in all locales.
++
++		In other words, in the C locale the POSIX extended regular
++		expression [-+[:alnum:]]{3,} should match the abbreviation.
++		This guarantees that all abbreviations could have been
++		specified by a POSIX TZ string.
++
++	Use abbreviations that are in common use among English-speakers,
++		e.g. 'EST' for Eastern Standard Time in North America.
++		We assume that applications translate them to other languages
++		as part of the normal localization process; for example,
++		a French application might translate 'EST' to 'HNE'.
++
++	For zones whose times are taken from a city's longitude, use the
++		traditional xMT notation, e.g. 'PMT' for Paris Mean Time.
++		The only name like this in current use is 'GMT'.
++
++	Use 'LMT' for local mean time of locations before the introduction
++		of standard time; see "Scope of the tz database".
++
++	If there is no common English abbreviation, use numeric offsets like
++		-05 and +0830 that are generated by zic's %z notation.
++
++    [The remaining guidelines predate the introduction of %z.
++    They are problematic as they mean tz data entries invent
++    notation rather than record it.  These guidelines are now
++    deprecated and the plan is to gradually move to %z for
++    inhabited locations and to "-00" for uninhabited locations.]
++
++	If there is no common English abbreviation, abbreviate the English
++		translation of the usual phrase used by native speakers.
++		If this is not available or is a phrase mentioning the country
++		(e.g. "Cape Verde Time"), then:
++
++		When a country is identified with a single or principal zone,
++			append 'T' to the country's ISO	code, e.g. 'CVT' for
++			Cape Verde Time.  For summer time append 'ST';
++			for double summer time append 'DST'; etc.
++		Otherwise, take the first three letters of an English place
++			name identifying each zone and append 'T', 'ST', etc.
++			as before; e.g. 'VLAST' for VLAdivostok Summer Time.
++
++	Use UT (with time zone abbreviation '-00') for locations while
++		uninhabited.  The leading '-' is a flag that the time
++		zone is in some sense undefined; this notation is
++		derived from Internet RFC 3339.
++
++Application writers should note that these abbreviations are ambiguous
++in practice: e.g. 'CST' has a different meaning in China than
++it does in the United States.  In new applications, it's often better
++to use numeric UT offsets like '-0600' instead of time zone
++abbreviations like 'CST'; this avoids the ambiguity.
++
++
++----- Accuracy of the tz database -----
++
++The tz database is not authoritative, and it surely has errors.
++Corrections are welcome and encouraged; see the file CONTRIBUTING.
++Users requiring authoritative data should consult national standards
++bodies and the references cited in the database's comments.
++
++Errors in the tz database arise from many sources:
++
++ * The tz database predicts future time stamps, and current predictions
++   will be incorrect after future governments change the rules.
++   For example, if today someone schedules a meeting for 13:00 next
++   October 1, Casablanca time, and tomorrow Morocco changes its
++   daylight saving rules, software can mess up after the rule change
++   if it blithely relies on conversions made before the change.
++
++ * The pre-1970 entries in this database cover only a tiny sliver of how
++   clocks actually behaved; the vast majority of the necessary
++   information was lost or never recorded.  Thousands more zones would
++   be needed if the tz database's scope were extended to cover even
++   just the known or guessed history of standard time; for example,
++   the current single entry for France would need to split into dozens
++   of entries, perhaps hundreds.  And in most of the world even this
++   approach would be misleading due to widespread disagreement or
++   indifference about what times should be observed.  In her 2015 book
++   "The Global Transformation of Time, 1870-1950", Vanessa Ogle writes
++   "Outside of Europe and North America there was no system of time
++   zones at all, often not even a stable landscape of mean times,
++   prior to the middle decades of the twentieth century".  See:
++   Timothy Shenk, Booked: A Global History of Time. Dissent 2015-12-17
++   https://www.dissentmagazine.org/blog/booked-a-global-history-of-time-vanessa-ogle
++
++ * Most of the pre-1970 data entries come from unreliable sources, often
++   astrology books that lack citations and whose compilers evidently
++   invented entries when the true facts were unknown, without
++   reporting which entries were known and which were invented.
++   These books often contradict each other or give implausible entries,
++   and on the rare occasions when they are checked they are
++   typically found to be incorrect.
++
++ * For the UK the tz database relies on years of first-class work done by
++   Joseph Myers and others; see <http://www.polyomino.org.uk/british-time/>.
++   Other countries are not done nearly as well.
++
++ * Sometimes, different people in the same city would maintain clocks
++   that differed significantly.  Railway time was used by railroad
++   companies (which did not always agree with each other),
++   church-clock time was used for birth certificates, etc.
++   Often this was merely common practice, but sometimes it was set by law.
++   For example, from 1891 to 1911 the UT offset in France was legally
++   0:09:21 outside train stations and 0:04:21 inside.
++
++ * Although a named location in the tz database stands for the
++   containing region, its pre-1970 data entries are often accurate for
++   only a small subset of that region.  For example, Europe/London
++   stands for the United Kingdom, but its pre-1847 times are valid
++   only for locations that have London's exact meridian, and its 1847
++   transition to GMT is known to be valid only for the L&NW and the
++   Caledonian railways.
++
++ * The tz database does not record the earliest time for which a zone's
++   data entries are thereafter valid for every location in the region.
++   For example, Europe/London is valid for all locations in its
++   region after GMT was made the standard time, but the date of
++   standardization (1880-08-02) is not in the tz database, other than
++   in commentary.  For many zones the earliest time of validity is
++   unknown.
++
++ * The tz database does not record a region's boundaries, and in many
++   cases the boundaries are not known.  For example, the zone
++   America/Kentucky/Louisville represents a region around the city of
++   Louisville, the boundaries of which are unclear.
++
++ * Changes that are modeled as instantaneous transitions in the tz
++   database were often spread out over hours, days, or even decades.
++
++ * Even if the time is specified by law, locations sometimes
++   deliberately flout the law.
++
++ * Early timekeeping practices, even assuming perfect clocks, were
++   often not specified to the accuracy that the tz database requires.
++
++ * Sometimes historical timekeeping was specified more precisely
++   than what the tz database can handle.  For example, from 1909 to
++   1937 Netherlands clocks were legally UT +00:19:32.13, but the tz
++   database cannot represent the fractional second.
++
++ * Even when all the timestamp transitions recorded by the tz database
++   are correct, the tz rules that generate them may not faithfully
++   reflect the historical rules.  For example, from 1922 until World
++   War II the UK moved clocks forward the day following the third
++   Saturday in April unless that was Easter, in which case it moved
++   clocks forward the previous Sunday.  Because the tz database has no
++   way to specify Easter, these exceptional years are entered as
++   separate tz Rule lines, even though the legal rules did not change.
++
++ * The tz database models pre-standard time using the proleptic Gregorian
++   calendar and local mean time (LMT), but many people used other
++   calendars and other timescales.  For example, the Roman Empire used
++   the Julian calendar, and had 12 varying-length daytime hours with a
++   non-hour-based system at night.
++
++ * Early clocks were less reliable, and data entries do not represent
++   this unreliability.
++
++ * As for leap seconds, civil time was not based on atomic time before
++   1972, and we don't know the history of earth's rotation accurately
++   enough to map SI seconds to historical solar time to more than
++   about one-hour accuracy.  See: Morrison LV, Stephenson FR.
++   Historical values of the Earth's clock error Delta T and the
++   calculation of eclipses. J Hist Astron. 2004;35:327-36
++   <http://adsabs.harvard.edu/full/2004JHA....35..327M>;
++   Historical values of the Earth's clock error. J Hist Astron. 2005;36:339
++   <http://adsabs.harvard.edu/full/2005JHA....36..339M>.
++
++ * The relationship between POSIX time (that is, UTC but ignoring leap
++   seconds) and UTC is not agreed upon after 1972.  Although the POSIX
++   clock officially stops during an inserted leap second, at least one
++   proposed standard has it jumping back a second instead; and in
++   practice POSIX clocks more typically either progress glacially during
++   a leap second, or are slightly slowed while near a leap second.
++
++ * The tz database does not represent how uncertain its information is.
++   Ideally it would contain information about when data entries are
++   incomplete or dicey.  Partial temporal knowledge is a field of
++   active research, though, and it's not clear how to apply it here.
++
++In short, many, perhaps most, of the tz database's pre-1970 and future
++time stamps are either wrong or misleading.  Any attempt to pass the
++tz database off as the definition of time should be unacceptable to
++anybody who cares about the facts.  In particular, the tz database's
++LMT offsets should not be considered meaningful, and should not prompt
++creation of zones merely because two locations differ in LMT or
++transitioned to standard time at different dates.
++
++
++----- Time and date functions -----
++
++The tz code contains time and date functions that are upwards
++compatible with those of POSIX.
++
++POSIX has the following properties and limitations.
++
++*	In POSIX, time display in a process is controlled by the
++	environment variable TZ.  Unfortunately, the POSIX TZ string takes
++	a form that is hard to describe and is error-prone in practice.
++	Also, POSIX TZ strings can't deal with other (for example, Israeli)
++	daylight saving time rules, or situations where more than two
++	time zone abbreviations are used in an area.
++
++	The POSIX TZ string takes the following form:
++
++		stdoffset[dst[offset][,date[/time],date[/time]]]
++
++	where:
++
++	std and dst
++		are 3 or more characters specifying the standard
++		and daylight saving time (DST) zone names.
++		Starting with POSIX.1-2001, std and dst may also be
++		in a quoted form like "<UTC+10>"; this allows
++		"+" and "-" in the names.
++	offset
++		is of the form '[+-]hh:[mm[:ss]]' and specifies the
++		offset west of UT.  'hh' may be a single digit; 0<=hh<=24.
++		The default DST offset is one hour ahead of standard time.
++	date[/time],date[/time]
++		specifies the beginning and end of DST.  If this is absent,
++		the system supplies its own rules for DST, and these can
++		differ from year to year; typically US DST rules are used.
++	time
++		takes the form 'hh:[mm[:ss]]' and defaults to 02:00.
++		This is the same format as the offset, except that a
++		leading '+' or '-' is not allowed.
++	date
++		takes one of the following forms:
++		Jn (1<=n<=365)
++			origin-1 day number not counting February 29
++		n (0<=n<=365)
++			origin-0 day number counting February 29 if present
++		Mm.n.d (0[Sunday]<=d<=6[Saturday], 1<=n<=5, 1<=m<=12)
++			for the dth day of week n of month m of the year,
++			where week 1 is the first week in which day d appears,
++			and '5' stands for the last week in which day d appears
++			(which may be either the 4th or 5th week).
++			Typically, this is the only useful form;
++			the n and Jn forms are rarely used.
++
++	Here is an example POSIX TZ string, for US Pacific time using rules
++	appropriate from 1987 through 2006:
++
++		TZ='PST8PDT,M4.1.0/02:00,M10.5.0/02:00'
++
++	This POSIX TZ string is hard to remember, and mishandles time stamps
++	before 1987 and after 2006.  With this package you can use this
++	instead:
++
++		TZ='America/Los_Angeles'
++
++*	POSIX does not define the exact meaning of TZ values like "EST5EDT".
++	Typically the current US DST rules are used to interpret such values,
++	but this means that the US DST rules are compiled into each program
++	that does time conversion.  This means that when US time conversion
++	rules change (as in the United States in 1987), all programs that
++	do time conversion must be recompiled to ensure proper results.
++
++*	The TZ environment variable is process-global, which makes it hard
++	to write efficient, thread-safe applications that need access
++	to multiple time zones.
++
++*	In POSIX, there's no tamper-proof way for a process to learn the
++	system's best idea of local wall clock.  (This is important for
++	applications that an administrator wants used only at certain times -
++	without regard to whether the user has fiddled the "TZ" environment
++	variable.  While an administrator can "do everything in UTC" to get
++	around the problem, doing so is inconvenient and precludes handling
++	daylight saving time shifts - as might be required to limit phone
++	calls to off-peak hours.)
++
++*	POSIX provides no convenient and efficient way to determine the UT
++	offset and time zone abbreviation of arbitrary time stamps,
++	particularly for time zone settings that do not fit into the
++	POSIX model.
++
++*	POSIX requires that systems ignore leap seconds.
++
++*	The tz code attempts to support all the time_t implementations
++	allowed by POSIX.  The time_t type represents a nonnegative count of
++	seconds since 1970-01-01 00:00:00 UTC, ignoring leap seconds.
++	In practice, time_t is usually a signed 64- or 32-bit integer; 32-bit
++	signed time_t values stop working after 2038-01-19 03:14:07 UTC, so
++	new implementations these days typically use a signed 64-bit integer.
++	Unsigned 32-bit integers are used on one or two platforms,
++	and 36-bit and 40-bit integers are also used occasionally.
++	Although earlier POSIX versions allowed time_t to be a
++	floating-point type, this was not supported by any practical
++	systems, and POSIX.1-2013 and the tz code both require time_t
++	to be an integer type.
++
++These are the extensions that have been made to the POSIX functions:
++
++*	The "TZ" environment variable is used in generating the name of a file
++	from which time zone information is read (or is interpreted a la
++	POSIX); "TZ" is no longer constrained to be a three-letter time zone
++	name followed by a number of hours and an optional three-letter
++	daylight time zone name.  The daylight saving time rules to be used
++	for a particular time zone are encoded in the time zone file;
++	the format of the file allows U.S., Australian, and other rules to be
++	encoded, and allows for situations where more than two time zone
++	abbreviations are used.
++
++	It was recognized that allowing the "TZ" environment variable to
++	take on values such as "America/New_York" might cause "old" programs
++	(that expect "TZ" to have a certain form) to operate incorrectly;
++	consideration was given to using some other environment variable
++	(for example, "TIMEZONE") to hold the string used to generate the
++	time zone information file name.  In the end, however, it was decided
++	to continue using "TZ": it is widely used for time zone purposes;
++	separately maintaining both "TZ" and "TIMEZONE" seemed a nuisance;
++	and systems where "new" forms of "TZ" might cause problems can simply
++	use TZ values such as "EST5EDT" which can be used both by
++	"new" programs (a la POSIX) and "old" programs (as zone names and
++	offsets).
++
++*	The code supports platforms with a UT offset member in struct tm,
++	e.g., tm_gmtoff.
++
++*	The code supports platforms with a time zone abbreviation member in
++	struct tm, e.g., tm_zone.
++
++*	Since the "TZ" environment variable can now be used to control time
++	conversion, the "daylight" and "timezone" variables are no longer
++	needed.  (These variables are defined and set by "tzset"; however, their
++	values will not be used by "localtime.")
++
++*	Functions tzalloc, tzfree, localtime_rz, and mktime_z for
++	more-efficient thread-safe applications that need to use
++	multiple time zones.  The tzalloc and tzfree functions
++	allocate and free objects of type timezone_t, and localtime_rz
++	and mktime_z are like localtime_r and mktime with an extra
++	timezone_t argument.  The functions were inspired by NetBSD.
++
++*	A function "tzsetwall" has been added to arrange for the system's
++	best approximation to local wall clock time to be delivered by
++	subsequent calls to "localtime."  Source code for portable
++	applications that "must" run on local wall clock time should call
++	"tzsetwall();" if such code is moved to "old" systems that don't
++	provide tzsetwall, you won't be able to generate an executable program.
++	(These time zone functions also arrange for local wall clock time to be
++	used if tzset is called - directly or indirectly - and there's no "TZ"
++	environment variable; portable applications should not, however, rely
++	on this behavior since it's not the way SVR2 systems behave.)
++
++*	Negative time_t values are supported, on systems where time_t is signed.
++
++*	These functions can account for leap seconds, thanks to Bradley White.
++
++Points of interest to folks with other systems:
++
++*	Code compatible with this package is already part of many platforms,
++	including GNU/Linux, Android, the BSDs, Chromium OS, Cygwin, AIX, iOS,
++	BlackBery 10, macOS, Microsoft Windows, OpenVMS, and Solaris.
++	On such hosts, the primary use of this package
++	is to update obsolete time zone rule tables.
++	To do this, you may need to compile the time zone compiler
++	'zic' supplied with this package instead of using the system 'zic',
++	since the format of zic's input is occasionally extended,
++	and a platform may still be shipping an older zic.
++
++*	The UNIX Version 7 "timezone" function is not present in this package;
++	it's impossible to reliably map timezone's arguments (a "minutes west
++	of GMT" value and a "daylight saving time in effect" flag) to a
++	time zone abbreviation, and we refuse to guess.
++	Programs that in the past used the timezone function may now examine
++	tzname[localtime(&clock)->tm_isdst] to learn the correct time
++	zone abbreviation to use.  Alternatively, use
++	localtime(&clock)->tm_zone if this has been enabled.
++
++*	The 4.2BSD gettimeofday function is not used in this package.
++	This formerly let users obtain the current UTC offset and DST flag,
++	but this functionality was removed in later versions of BSD.
++
++*	In SVR2, time conversion fails for near-minimum or near-maximum
++	time_t values when doing conversions for places that don't use UT.
++	This package takes care to do these conversions correctly.
++	A comment in the source code tells how to get compatibly wrong
++	results.
++
++The functions that are conditionally compiled if STD_INSPIRED is defined
++should, at this point, be looked on primarily as food for thought.  They are
++not in any sense "standard compatible" - some are not, in fact, specified in
++*any* standard.  They do, however, represent responses of various authors to
++standardization proposals.
++
++Other time conversion proposals, in particular the one developed by folks at
++Hewlett Packard, offer a wider selection of functions that provide capabilities
++beyond those provided here.  The absence of such functions from this package
++is not meant to discourage the development, standardization, or use of such
++functions.  Rather, their absence reflects the decision to make this package
++contain valid extensions to POSIX, to ensure its broad acceptability.  If
++more powerful time conversion functions can be standardized, so much the
++better.
++
++
++----- Interface stability -----
++
++The tz code and data supply the following interfaces:
++
++ * A set of zone names as per "Names of time zone rules" above.
++
++ * Library functions described in "Time and date functions" above.
++
++ * The programs tzselect, zdump, and zic, documented in their man pages.
++
++ * The format of zic input files, documented in the zic man page.
++
++ * The format of zic output files, documented in the tzfile man page.
++
++ * The format of zone table files, documented in zone1970.tab.
++
++ * The format of the country code file, documented in iso3166.tab.
++
++When these interfaces are changed, an effort is made to preserve
++backward compatibility.  For example, tz data files typically do not
++rely on recently-added zic features, so that users can run older zic
++versions to process newer data files.
++
++Interfaces not listed above are less stable.  For example, users
++should not rely on particular UT offsets or abbreviations for time
++stamps, as data entries are often based on guesswork and these guesses
++may be corrected or improved.
++
++
++----- Calendrical issues -----
++
++Calendrical issues are a bit out of scope for a time zone database,
++but they indicate the sort of problems that we would run into if we
++extended the time zone database further into the past.  An excellent
++resource in this area is Nachum Dershowitz and Edward M. Reingold,
++Calendrical Calculations: Third Edition, Cambridge University Press (2008)
++<http://emr.cs.iit.edu/home/reingold/calendar-book/third-edition/>.
++Other information and sources are given below.  They sometimes disagree.
++
++
++France
++
++Gregorian calendar adopted 1582-12-20.
++French Revolutionary calendar used 1793-11-24 through 1805-12-31,
++and (in Paris only) 1871-05-06 through 1871-05-23.
++
++
++Russia
++
++From Chris Carrier (1996-12-02):
++On 1929-10-01 the Soviet Union instituted an "Eternal Calendar"
++with 30-day months plus 5 holidays, with a 5-day week.
++On 1931-12-01 it changed to a 6-day week; in 1934 it reverted to the
++Gregorian calendar while retaining the 6-day week; on 1940-06-27 it
++reverted to the 7-day week.  With the 6-day week the usual days
++off were the 6th, 12th, 18th, 24th and 30th of the month.
++(Source: Evitiar Zerubavel, _The Seven Day Circle_)
++
++
++Mark Brader reported a similar story in "The Book of Calendars", edited
++by Frank Parise (1982, Facts on File, ISBN 0-8719-6467-8), page 377.  But:
++
++From: Petteri Sulonen (via Usenet)
++Date: 14 Jan 1999 00:00:00 GMT
++...
++
++If your source is correct, how come documents between 1929 and 1940 were
++still dated using the conventional, Gregorian calendar?
++
++I can post a scan of a document dated December 1, 1934, signed by
++Yenukidze, the secretary, on behalf of Kalinin, the President of the
++Executive Committee of the Supreme Soviet, if you like.
++
++
++
++Sweden (and Finland)
++
++From: Mark Brader
++Subject: Re: Gregorian reform - a part of locale?
++<news:1996Jul6.012937.29190@sq.com>
++Date: 1996-07-06
++
++In 1700, Denmark made the transition from Julian to Gregorian.  Sweden
++decided to *start* a transition in 1700 as well, but rather than have one of
++those unsightly calendar gaps :-), they simply decreed that the next leap
++year after 1696 would be in 1744 - putting the whole country on a calendar
++different from both Julian and Gregorian for a period of 40 years.
++
++However, in 1704 something went wrong and the plan was not carried through;
++they did, after all, have a leap year that year.  And one in 1708.  In 1712
++they gave it up and went back to Julian, putting 30 days in February that
++year!...
++
++Then in 1753, Sweden made the transition to Gregorian in the usual manner,
++getting there only 13 years behind the original schedule.
++
++(A previous posting of this story was challenged, and Swedish readers
++produced the following references to support it: "Tideräkning och historia"
++by Natanael Beckman (1924) and "Tid, en bok om tideräkning och
++kalenderväsen" by Lars-Olof Lodén (1968).
++
++
++Grotefend's data
++
++From: "Michael Palmer" [with one obvious typo fixed]
++Subject: Re: Gregorian Calendar (was Re: Another FHC related question
++Newsgroups: soc.genealogy.german
++Date: Tue, 9 Feb 1999 02:32:48 -800
++...
++
++The following is a(n incomplete) listing, arranged chronologically, of
++European states, with the date they converted from the Julian to the
++Gregorian calendar:
++
++04/15 Oct 1582 - Italy (with exceptions), Spain, Portugal, Poland (Roman
++                 Catholics and Danzig only)
++09/20 Dec 1582 - France, Lorraine
++
++21 Dec 1582/
++   01 Jan 1583 - Holland, Brabant, Flanders, Hennegau
++10/21 Feb 1583 - bishopric of Liege (Lüttich)
++13/24 Feb 1583 - bishopric of Augsburg
++04/15 Oct 1583 - electorate of Trier
++05/16 Oct 1583 - Bavaria, bishoprics of Freising, Eichstedt, Regensburg,
++                 Salzburg, Brixen
++13/24 Oct 1583 - Austrian Oberelsaß and Breisgau
++20/31 Oct 1583 - bishopric of Basel
++02/13 Nov 1583 - duchy of Jülich-Berg
++02/13 Nov 1583 - electorate and city of Köln
++04/15 Nov 1583 - bishopric of Würzburg
++11/22 Nov 1583 - electorate of Mainz
++16/27 Nov 1583 - bishopric of Strassburg and the margraviate of Baden
++17/28 Nov 1583 - bishopric of Münster and duchy of Cleve
++14/25 Dec 1583 - Steiermark
++
++06/17 Jan 1584 - Austria and Bohemia
++11/22 Jan 1584 - Lucerne, Uri, Schwyz, Zug, Freiburg, Solothurn
++12/23 Jan 1584 - Silesia and the Lausitz
++22 Jan/
++   02 Feb 1584 - Hungary (legally on 21 Oct 1587)
++      Jun 1584 - Unterwalden
++01/12 Jul 1584 - duchy of Westfalen
++
++16/27 Jun 1585 - bishopric of Paderborn
++
++14/25 Dec 1590 - Transylvania
++
++22 Aug/
++   02 Sep 1612 - duchy of Prussia
++
++13/24 Dec 1614 - Pfalz-Neuburg
++
++          1617 - duchy of Kurland (reverted to the Julian calendar in
++                 1796)
++
++          1624 - bishopric of Osnabrück
++
++          1630 - bishopric of Minden
++
++15/26 Mar 1631 - bishopric of Hildesheim
++
++          1655 - Kanton Wallis
++
++05/16 Feb 1682 - city of Strassburg
++
++18 Feb/
++   01 Mar 1700 - Protestant Germany (including Swedish possessions in
++                 Germany), Denmark, Norway
++30 Jun/
++   12 Jul 1700 - Gelderland, Zutphen
++10 Nov/
++   12 Dec 1700 - Utrecht, Overijssel
++
++31 Dec 1700/
++   12 Jan 1701 - Friesland, Groningen, Zürich, Bern, Basel, Geneva,
++                 Turgau, and Schaffhausen
++
++          1724 - Glarus, Appenzell, and the city of St. Gallen
++
++01 Jan 1750    - Pisa and Florence
++
++02/14 Sep 1752 - Great Britain
++
++17 Feb/
++   01 Mar 1753 - Sweden
++
++1760-1812      - Graubünden
++
++The Russian empire (including Finland and the Baltic states) did not
++convert to the Gregorian calendar until the Soviet revolution of 1917.
++
++Source: H. Grotefend, _Taschenbuch der Zeitrechnung des deutschen
++Mittelalters und der Neuzeit_, herausgegeben von Dr. O. Grotefend
++(Hannover: Hahnsche Buchhandlung, 1941), pp. 26-28.
++
++
++----- Time and time zones on Mars -----
++
++Some people's work schedules use Mars time.  Jet Propulsion Laboratory
++(JPL) coordinators have kept Mars time on and off at least since 1997
++for the Mars Pathfinder mission.  Some of their family members have
++also adapted to Mars time.  Dozens of special Mars watches were built
++for JPL workers who kept Mars time during the Mars Exploration
++Rovers mission (2004).  These timepieces look like normal Seikos and
++Citizens but use Mars seconds rather than terrestrial seconds.
++
++A Mars solar day is called a "sol" and has a mean period equal to
++about 24 hours 39 minutes 35.244 seconds in terrestrial time.  It is
++divided into a conventional 24-hour clock, so each Mars second equals
++about 1.02749125 terrestrial seconds.
++
++The prime meridian of Mars goes through the center of the crater
++Airy-0, named in honor of the British astronomer who built the
++Greenwich telescope that defines Earth's prime meridian.  Mean solar
++time on the Mars prime meridian is called Mars Coordinated Time (MTC).
++
++Each landed mission on Mars has adopted a different reference for
++solar time keeping, so there is no real standard for Mars time zones.
++For example, the Mars Exploration Rover project (2004) defined two
++time zones "Local Solar Time A" and "Local Solar Time B" for its two
++missions, each zone designed so that its time equals local true solar
++time at approximately the middle of the nominal mission.  Such a "time
++zone" is not particularly suited for any application other than the
++mission itself.
++
++Many calendars have been proposed for Mars, but none have achieved
++wide acceptance.  Astronomers often use Mars Sol Date (MSD) which is a
++sequential count of Mars solar days elapsed since about 1873-12-29
++12:00 GMT.
++
++The tz database does not currently support Mars time, but it is
++documented here in the hopes that support will be added eventually.
++
++Sources:
++
++Michael Allison and Robert Schmunk,
++"Technical Notes on Mars Solar Time as Adopted by the Mars24 Sunclock"
++<http://www.giss.nasa.gov/tools/mars24/help/notes.html> (2012-08-08).
++
++Jia-Rui Chong, "Workdays Fit for a Martian", Los Angeles Times
++<http://articles.latimes.com/2004/jan/14/science/sci-marstime14>
++(2004-01-14), pp A1, A20-A21.
++
++Tom Chmielewski, "Jet Lag Is Worse on Mars", The Atlantic (2015-02-26)
++<http://www.theatlantic.com/technology/archive/2015/02/jet-lag-is-worse-on-mars/386033/>
++
++-----
++
++This file is in the public domain, so clarified as of 2009-05-17 by
++Arthur David Olson.
++
++-----
++Local Variables:
++coding: utf-8
++End:
+--- contrib/tzdata/africa.orig
++++ contrib/tzdata/africa
+@@ -343,6 +343,12 @@
+ # decision to abandon DST permanently.  See Ahram Online 2015-04-24.
+ # http://english.ahram.org.eg/NewsContent/1/64/128509/Egypt/Politics-/Sisi-cancels-daylight-saving-time-in-Egypt.aspx
+ 
++# From Steffen Thorsen (2016-04-29):
++# Egypt will have DST from July 7 until the end of October....
++# http://english.ahram.org.eg/NewsContentP/1/204655/Egypt/Daylight-savings-time-returning-to-Egypt-on--July.aspx
++# From Mina Samuel (2016-07-04):
++# Egyptian government took the decision to cancel the DST,
++
+ Rule	Egypt	2008	only	-	Aug	lastThu	24:00	0	-
+ Rule	Egypt	2009	only	-	Aug	20	24:00	0	-
+ Rule	Egypt	2010	only	-	Aug	10	24:00	0	-
+@@ -458,7 +464,7 @@
+ # http://www.libyaherald.com/2013/10/24/correction-no-time-change-tomorrow/
+ #
+ # From Paul Eggert (2013-10-25):
+-# For now, assume they're reverting to the pre-2012 rules of permanent UTC+2.
++# For now, assume they're reverting to the pre-2012 rules of permanent UT +02.
+ 
+ # Rule	NAME	FROM	TO	TYPE	IN	ON	AT	SAVE	LETTER/S
+ Rule	Libya	1951	only	-	Oct	14	2:00	1:00	S
+@@ -858,11 +864,11 @@
+ Rule	Morocco	2010	only	-	May	 2	 0:00	1:00	S
+ Rule	Morocco	2010	only	-	Aug	 8	 0:00	0	-
+ Rule	Morocco	2011	only	-	Apr	 3	 0:00	1:00	S
+-Rule	Morocco	2011	only	-	Jul	31	 0	0	-
++Rule	Morocco	2011	only	-	Jul	31	 0:00	0	-
+ Rule	Morocco	2012	2013	-	Apr	lastSun	 2:00	1:00	S
+-Rule	Morocco	2012	only	-	Sep	30	 3:00	0	-
+ Rule	Morocco	2012	only	-	Jul	20	 3:00	0	-
+ Rule	Morocco	2012	only	-	Aug	20	 2:00	1:00	S
++Rule	Morocco	2012	only	-	Sep	30	 3:00	0	-
+ Rule	Morocco	2013	only	-	Jul	 7	 3:00	0	-
+ Rule	Morocco	2013	only	-	Aug	10	 2:00	1:00	S
+ Rule	Morocco	2013	max	-	Oct	lastSun	 3:00	0	-
+--- contrib/tzdata/antarctica.orig
++++ contrib/tzdata/antarctica
+@@ -10,10 +10,8 @@
+ # http://www.spri.cam.ac.uk/bob/periant.htm
+ # for information.
+ # Unless otherwise specified, we have no time zone information.
+-#
+-# Except for the French entries,
+-# I made up all time zone abbreviations mentioned here; corrections welcome!
+-# FORMAT is 'zzz' and GMTOFF is 0 for locations while uninhabited.
++
++# FORMAT is '-00' and GMTOFF is 0 for locations while uninhabited.
+ 
+ # Argentina - year-round bases
+ # Belgrano II, Confin Coast, -770227-0343737, since 1972-02-05
+@@ -29,7 +27,7 @@
+ #	previously sealers and scientific personnel wintered
+ #	Margaret Turner reports
+ #	http://web.archive.org/web/20021204222245/http://www.dstc.qut.edu.au/DST/marg/daylight.html
+-#	(1999-09-30) that they're UTC+5, with no DST;
++#	(1999-09-30) that they're UT +05, with no DST;
+ #	presumably this is when they have visitors.
+ #
+ # year-round bases
+@@ -66,25 +64,29 @@
+ # Background:
+ # http://www.timeanddate.com/news/time/antartica-time-changes-2010.html
+ 
++# From Steffen Thorsen (2016-10-28):
++# Australian Antarctica Division informed us that Casey changed time
++# zone to UTC+11 in "the morning of 22nd October 2016".
++
+ # Zone	NAME		GMTOFF	RULES	FORMAT	[UNTIL]
+-Zone Antarctica/Casey	0	-	zzz	1969
+-			8:00	-	AWST	2009 Oct 18  2:00
+-						# Australian Western Std Time
+-			11:00	-	CAST	2010 Mar  5  2:00  # Casey Time
+-			8:00	-	AWST	2011 Oct 28  2:00
+-			11:00	-	CAST	2012 Feb 21 17:00u
+-			8:00	-	AWST
+-Zone Antarctica/Davis	0	-	zzz	1957 Jan 13
+-			7:00	-	DAVT	1964 Nov    # Davis Time
+-			0	-	zzz	1969 Feb
+-			7:00	-	DAVT	2009 Oct 18  2:00
+-			5:00	-	DAVT	2010 Mar 10 20:00u
+-			7:00	-	DAVT	2011 Oct 28  2:00
+-			5:00	-	DAVT	2012 Feb 21 20:00u
+-			7:00	-	DAVT
+-Zone Antarctica/Mawson	0	-	zzz	1954 Feb 13
+-			6:00	-	MAWT	2009 Oct 18  2:00 # Mawson Time
+-			5:00	-	MAWT
++Zone Antarctica/Casey	0	-	-00	1969
++			8:00	-	+08	2009 Oct 18  2:00
++			11:00	-	+11	2010 Mar  5  2:00
++			8:00	-	+08	2011 Oct 28  2:00
++			11:00	-	+11	2012 Feb 21 17:00u
++			8:00	-	+08	2016 Oct 22
++			11:00	-	+11
++Zone Antarctica/Davis	0	-	-00	1957 Jan 13
++			7:00	-	+07	1964 Nov
++			0	-	-00	1969 Feb
++			7:00	-	+07	2009 Oct 18  2:00
++			5:00	-	+05	2010 Mar 10 20:00u
++			7:00	-	+07	2011 Oct 28  2:00
++			5:00	-	+05	2012 Feb 21 20:00u
++			7:00	-	+07
++Zone Antarctica/Mawson	0	-	-00	1954 Feb 13
++			6:00	-	+06	2009 Oct 18  2:00
++			5:00	-	+05
+ # References:
+ # Casey Weather (1998-02-26)
+ # http://www.antdiv.gov.au/aad/exop/sfo/casey/casey_aws.html
+@@ -137,8 +139,8 @@
+ #	fishing stations operated variously 1819/1931
+ #
+ # Zone	NAME		GMTOFF	RULES	FORMAT	[UNTIL]
+-Zone Indian/Kerguelen	0	-	zzz	1950 # Port-aux-Français
+-			5:00	-	TFT	# ISO code TF Time
++Zone Indian/Kerguelen	0	-	-00	1950 # Port-aux-Français
++			5:00	-	+05
+ #
+ # year-round base in the main continent
+ # Dumont d'Urville, Île des Pétrels, -6640+14001, since 1956-11
+@@ -148,10 +150,10 @@
+ # It was destroyed by fire on 1952-01-14.
+ #
+ # Zone	NAME		GMTOFF	RULES	FORMAT	[UNTIL]
+-Zone Antarctica/DumontDUrville 0 -	zzz	1947
+-			10:00	-	PMT	1952 Jan 14 # Port-Martin Time
+-			0	-	zzz	1956 Nov
+-			10:00	-	DDUT	# Dumont-d'Urville Time
++Zone Antarctica/DumontDUrville 0 -	-00	1947
++			10:00	-	+10	1952 Jan 14
++			0	-	-00	1956 Nov
++			10:00	-	+10
+ 
+ # France & Italy - year-round base
+ # Concordia, -750600+1232000, since 2005
+@@ -176,8 +178,8 @@
+ # was established on 1957-01-29.  Since Syowa station is still the main
+ # station of Japan, it's appropriate for the principal location.
+ # Zone	NAME		GMTOFF	RULES	FORMAT	[UNTIL]
+-Zone Antarctica/Syowa	0	-	zzz	1957 Jan 29
+-			3:00	-	SYOT	# Syowa Time
++Zone Antarctica/Syowa	0	-	-00	1957 Jan 29
++			3:00	-	+03
+ # See:
+ # NIPR Antarctic Research Activities (1999-08-17)
+ # http://www.nipr.ac.jp/english/ara01.html
+@@ -214,19 +216,19 @@
+ # correct, but they should be quite close to the actual dates.
+ #
+ # From Paul Eggert (2014-03-21):
+-# The CET-switching Troll rules require zic from tzcode 2014b or later, so as
++# The CET-switching Troll rules require zic from tz 2014b or later, so as
+ # suggested by Bengt-Inge Larsson comment them out for now, and approximate
+ # with only UTC and CEST.  Uncomment them when 2014b is more prevalent.
+ #
+ # Rule	NAME	FROM	TO	TYPE	IN	ON	AT	SAVE	LETTER/S
+-#Rule	Troll	2005	max	-	Mar	 1	1:00u	1:00	CET
+-Rule	Troll	2005	max	-	Mar	lastSun	1:00u	2:00	CEST
+-#Rule	Troll	2005	max	-	Oct	lastSun	1:00u	1:00	CET
+-#Rule	Troll	2004	max	-	Nov	 7	1:00u	0:00	UTC
++#Rule	Troll	2005	max	-	Mar	 1	1:00u	1:00	+01
++Rule	Troll	2005	max	-	Mar	lastSun	1:00u	2:00	+02
++#Rule	Troll	2005	max	-	Oct	lastSun	1:00u	1:00	+01
++#Rule	Troll	2004	max	-	Nov	 7	1:00u	0:00	+00
+ # Remove the following line when uncommenting the above '#Rule' lines.
+-Rule	Troll	2004	max	-	Oct	lastSun	1:00u	0:00	UTC
++Rule	Troll	2004	max	-	Oct	lastSun	1:00u	0:00	+00
+ # Zone	NAME		GMTOFF	RULES	FORMAT	[UNTIL]
+-Zone Antarctica/Troll	0	-	zzz	2005 Feb 12
++Zone Antarctica/Troll	0	-	-00	2005 Feb 12
+ 			0:00	Troll	%s
+ 
+ # Poland - year-round base
+@@ -265,10 +267,10 @@
+ # changes during the year and does not necessarily correspond to mean
+ # solar noon.  So the Vostok time might have been whatever the clocks
+ # happened to be during their visit.  So we still don't really know what time
+-# it is at Vostok.  But we'll guess UTC+6.
++# it is at Vostok.  But we'll guess +06.
+ #
+-Zone Antarctica/Vostok	0	-	zzz	1957 Dec 16
+-			6:00	-	VOST	# Vostok time
++Zone Antarctica/Vostok	0	-	-00	1957 Dec 16
++			6:00	-	+06
+ 
+ # S Africa - year-round bases
+ # Marion Island, -4653+03752
+@@ -300,8 +302,8 @@
+ # <http://webexhibits.org/daylightsaving/g.html> says Rothera is -03 all year.
+ #
+ # Zone	NAME		GMTOFF	RULES	FORMAT	[UNTIL]
+-Zone Antarctica/Rothera	0	-	zzz	1976 Dec  1
+-			-3:00	-	ROTT	# Rothera time
++Zone Antarctica/Rothera	0	-	-00	1976 Dec  1
++			-3:00	-	-03
+ 
+ # Uruguay - year round base
+ # Artigas, King George Island, -621104-0585107
+--- contrib/tzdata/asia.orig
++++ contrib/tzdata/asia
+@@ -79,13 +79,9 @@
+ Rule E-EurAsia	1996	max	-	Oct	lastSun	 0:00	0	-
+ Rule RussiaAsia	1981	1984	-	Apr	1	 0:00	1:00	S
+ Rule RussiaAsia	1981	1983	-	Oct	1	 0:00	0	-
+-Rule RussiaAsia	1984	1991	-	Sep	lastSun	 2:00s	0	-
+-Rule RussiaAsia	1985	1991	-	Mar	lastSun	 2:00s	1:00	S
+-Rule RussiaAsia	1992	only	-	Mar	lastSat	23:00	1:00	S
+-Rule RussiaAsia	1992	only	-	Sep	lastSat	23:00	0	-
+-Rule RussiaAsia	1993	max	-	Mar	lastSun	 2:00s	1:00	S
+-Rule RussiaAsia	1993	1995	-	Sep	lastSun	 2:00s	0	-
+-Rule RussiaAsia	1996	max	-	Oct	lastSun	 2:00s	0	-
++Rule RussiaAsia	1984	1995	-	Sep	lastSun	 2:00s	0	-
++Rule RussiaAsia	1985	2011	-	Mar	lastSun	 2:00s	1:00	S
++Rule RussiaAsia	1996	2011	-	Oct	lastSun	 2:00s	0	-
+ 
+ # Afghanistan
+ # Zone	NAME		GMTOFF	RULES	FORMAT	[UNTIL]
+@@ -120,31 +116,37 @@
+ # http://www.worldtimezone.com/dst_news/dst_news_armenia03.html
+ # Zone	NAME		GMTOFF	RULES	FORMAT	[UNTIL]
+ Zone	Asia/Yerevan	2:58:00 -	LMT	1924 May  2
+-			3:00	-	YERT	1957 Mar    # Yerevan Time
+-			4:00 RussiaAsia YER%sT	1991 Mar 31  2:00s
+-			3:00	1:00	YERST	1991 Sep 23 # independence
+-			3:00 RussiaAsia	AM%sT	1995 Sep 24  2:00s
+-			4:00	-	AMT	1997
+-			4:00 RussiaAsia	AM%sT	2012 Mar 25  2:00s
+-			4:00	-	AMT
++			3:00	-	+03	1957 Mar
++			4:00 RussiaAsia +04/+05	1991 Mar 31  2:00s
++			3:00 RussiaAsia	+03/+04	1995 Sep 24  2:00s
++			4:00	-	+04	1997
++			4:00 RussiaAsia	+04/+05
+ 
+ # Azerbaijan
++
+ # From Rustam Aliyev of the Azerbaijan Internet Forum (2005-10-23):
+ # According to the resolution of Cabinet of Ministers, 1997
+ # From Paul Eggert (2015-09-17): It was Resolution No. 21 (1997-03-17).
+ # http://code.az/files/daylight_res.pdf
++
++# From Steffen Thorsen (2016-03-17):
++# ... the Azerbaijani Cabinet of Ministers has cancelled switching to
++# daylight saving time....
++# http://www.azernews.az/azerbaijan/94137.html
++# http://vestnikkavkaza.net/news/Azerbaijani-Cabinet-of-Ministers-cancels-daylight-saving-time.html
++# http://en.apa.az/xeber_azerbaijan_abolishes_daylight_savings_ti_240862.html
++
+ # Rule	NAME	FROM	TO	TYPE	IN	ON	AT	SAVE	LETTER/S
+-Rule	Azer	1997	max	-	Mar	lastSun	 4:00	1:00	S
+-Rule	Azer	1997	max	-	Oct	lastSun	 5:00	0	-
++Rule	Azer	1997	2015	-	Mar	lastSun	 4:00	1:00	S
++Rule	Azer	1997	2015	-	Oct	lastSun	 5:00	0	-
+ # Zone	NAME		GMTOFF	RULES	FORMAT	[UNTIL]
+ Zone	Asia/Baku	3:19:24 -	LMT	1924 May  2
+-			3:00	-	BAKT	1957 Mar    # Baku Time
+-			4:00 RussiaAsia BAK%sT	1991 Mar 31  2:00s
+-			3:00	1:00	BAKST	1991 Aug 30 # independence
+-			3:00 RussiaAsia	AZ%sT	1992 Sep lastSat 23:00
+-			4:00	-	AZT	1996     # Azerbaijan Time
+-			4:00	EUAsia	AZ%sT	1997
+-			4:00	Azer	AZ%sT
++			3:00	-	+03	1957 Mar
++			4:00 RussiaAsia +04/+05	1991 Mar 31  2:00s
++			3:00 RussiaAsia	+03/+04	1992 Sep lastSun  2:00s
++			4:00	-	+04	1996
++			4:00	EUAsia	+04/+05	1997
++			4:00	Azer	+04/+05
+ 
+ # Bahrain
+ # See Asia/Qatar.
+@@ -263,7 +265,7 @@
+ # Milne says 6:24:40 was the meridian of the time ball observatory at Rangoon.
+ 
+ # Zone	NAME		GMTOFF	RULES	FORMAT	[UNTIL]
+-Zone	Asia/Rangoon	6:24:40 -	LMT	1880        # or Yangon
++Zone	Asia/Yangon	6:24:40 -	LMT	1880        # or Rangoon
+ 			6:24:40	-	RMT	1920        # Rangoon Mean Time?
+ 			6:30	-	BURT	1942 May    # Burma Time
+ 			9:00	-	JST	1945 May  3
+@@ -378,7 +380,7 @@
+ # Lewiston (ME) Daily Sun (1939-05-29), p 17, said "Even the time is
+ # different - the occupied districts going by Tokyo time, an hour
+ # ahead of that prevailing in the rest of Shanghai."  Guess that the
+-# Xujiahui Observatory was under French control and stuck with UT+8.
++# Xujiahui Observatory was under French control and stuck with UT +08.
+ #
+ # In earlier versions of this file, China had many separate Zone entries, but
+ # this was based on what were apparently incorrect data in Shanks & Pottenger.
+@@ -387,26 +389,26 @@
+ # Proposed in 1918 and theoretically in effect until 1949 (although in practice
+ # mainly observed in coastal areas), the five zones were:
+ #
+-# Changbai Time ("Long-white Time", Long-white = Heilongjiang area) UT+8.5
++# Changbai Time ("Long-white Time", Long-white = Heilongjiang area) UT +08:30
+ # Asia/Harbin (currently a link to Asia/Shanghai)
+ # Heilongjiang (except Mohe county), Jilin
+ #
+-# Zhongyuan Time ("Central plain Time") UT+8
++# Zhongyuan Time ("Central plain Time") UT +08
+ # Asia/Shanghai
+ # most of China
+ # This currently represents most other zones as well,
+ # as apparently these regions have been the same since 1970.
+ # Milne gives 8:05:43.2 for Xujiahui Observatory time; round to nearest.
+-# Guo says Shanghai switched to UT+8 "from the end of the 19th century".
++# Guo says Shanghai switched to UT +08 "from the end of the 19th century".
+ #
+-# Long-shu Time (probably due to Long and Shu being two names of that area) UT+7
++# Long-shu Time (probably due to Long and Shu being two names of the area) UT +07
+ # Asia/Chongqing (currently a link to Asia/Shanghai)
+ # Guangxi, Guizhou, Hainan, Ningxia, Sichuan, Shaanxi, and Yunnan;
+ # most of Gansu; west Inner Mongolia; west Qinghai; and the Guangdong
+ # counties Deqing, Enping, Kaiping, Luoding, Taishan, Xinxing,
+ # Yangchun, Yangjiang, Yu'nan, and Yunfu.
+ #
+-# Xin-zang Time ("Xinjiang-Tibet Time") UT+6
++# Xin-zang Time ("Xinjiang-Tibet Time") UT +06
+ # Asia/Urumqi
+ # This currently represents Kunlun Time as well,
+ # as apparently the two regions have been the same since 1970.
+@@ -419,7 +421,7 @@
+ # Shihezi, Changji, Yanqi, Heshuo, Tuokexun, Tulufan, Shanshan, Hami,
+ # Fukang, Kuitun, Kumukuli, Miquan, Qitai, and Turfan.
+ #
+-# Kunlun Time UT+5.5
++# Kunlun Time UT +05:30
+ # Asia/Kashgar (currently a link to Asia/Urumqi)
+ # West Tibet, including Pulan, Aheqi, Shufu, Shule;
+ # West Xinjiang, including Aksu, Atushi, Yining, Hetian, Cele, Luopu, Nileke,
+@@ -435,7 +437,7 @@
+ #
+ # On the other hand, ethnic Uyghurs, who make up about half the
+ # population of Xinjiang, typically use "Xinjiang time" which is two
+-# hours behind Beijing time, or UTC +0600. The government of the Xinjiang
++# hours behind Beijing time, or UT +06. The government of the Xinjiang
+ # Uyghur Autonomous Region, (XAUR, or just Xinjiang for short) as well as
+ # local governments such as the Ürümqi city government use both times in
+ # publications, referring to what is popularly called Xinjiang time as
+@@ -491,8 +493,8 @@
+ # having the same time as Beijing.
+ 
+ # From Paul Eggert (2014-06-30):
+-# In the early days of the PRC, Tibet was given its own time zone (UT+6) but
+-# this was withdrawn in 1959 and never reinstated; see Tubten Khétsun,
++# In the early days of the PRC, Tibet was given its own time zone (UT +06)
++# but this was withdrawn in 1959 and never reinstated; see Tubten Khétsun,
+ # Memories of life in Lhasa under Chinese Rule, Columbia U Press, ISBN
+ # 978-0231142861 (2008), translator's introduction by Matthew Akester, p x.
+ # As this is before our 1970 cutoff, Tibet doesn't need a separate zone.
+@@ -506,12 +508,12 @@
+ # Republics, the Soviet Union, the Kuomintang, and the People's Republic of
+ # China, and tracking down all these organizations' timekeeping rules would be
+ # quite a trick.  Approximate this lost history by a transition from LMT to
+-# XJT at the start of 1928, the year of accession of the warlord Jin Shuren,
++# UT +06 at the start of 1928, the year of accession of the warlord Jin Shuren,
+ # which happens to be the date given by Shanks & Pottenger (no doubt as a
+-# guess) as the transition from LMT.  Ignore the usage of UT+8 before
+-# 1986-02-01 under the theory that the transition date to UT+8 is unknown and
++# guess) as the transition from LMT.  Ignore the usage of +08 before
++# 1986-02-01 under the theory that the transition date to +08 is unknown and
+ # that the sort of users who prefer Asia/Urumqi now typically ignored the
+-# UT+8 mandate back then.
++# +08 mandate back then.
+ 
+ # Zone	NAME		GMTOFF	RULES	FORMAT	[UNTIL]
+ # Beijing time, used throughout China; represented by Shanghai.
+@@ -716,7 +718,7 @@
+ # be found from historical government announcement database.
+ 
+ # From Paul Eggert (2014-07-03):
+-# As per Yu-Cheng Chuang, say that Taiwan was at UT+9 from 1937-10-01
++# As per Yu-Cheng Chuang, say that Taiwan was at UT +09 from 1937-10-01
+ # until 1945-09-21 at 01:00, overriding Shanks & Pottenger.
+ # Likewise, use Yu-Cheng Chuang's data for DST in Taiwan.
+ 
+@@ -769,9 +771,19 @@
+ ###############################################################################
+ 
+ # Cyprus
+-#
++
+ # Milne says the Eastern Telegraph Company used 2:14:00.  Stick with LMT.
+-#
++# IATA SSIM (1998-09) has Cyprus using EU rules for the first time.
++
++# From Paul Eggert (2016-09-09):
++# Yesterday's Cyprus Mail reports that Northern Cyprus followed Turkey's
++# lead and switched from +02/+03 to +03 year-round.
++# http://cyprus-mail.com/2016/09/08/two-time-zones-cyprus-turkey-will-not-turn-clocks-back-next-month/
++#
++# From Even Scharning (2016-10-31):
++# Looks like the time zone split in Cyprus went through last night.
++# http://cyprus-mail.com/2016/10/30/cyprus-new-division-two-time-zones-now-reality/
++
+ # Rule	NAME	FROM	TO	TYPE	IN	ON	AT	SAVE	LETTER/S
+ Rule	Cyprus	1975	only	-	Apr	13	0:00	1:00	S
+ Rule	Cyprus	1975	only	-	Oct	12	0:00	0	-
+@@ -786,7 +798,10 @@
+ Zone	Asia/Nicosia	2:13:28 -	LMT	1921 Nov 14
+ 			2:00	Cyprus	EE%sT	1998 Sep
+ 			2:00	EUAsia	EE%sT
+-# IATA SSIM (1998-09) has Cyprus using EU rules for the first time.
++Zone	Asia/Famagusta	2:15:48	-	LMT	1921 Nov 14
++			2:00	Cyprus	EE%sT	1998 Sep
++			2:00	EUAsia	EE%sT	2016 Sep  8
++			3:00	-	+03
+ 
+ # Classically, Cyprus belongs to Asia; e.g. see Herodotus, Histories, I.72.
+ # However, for various reasons many users expect to find it under Europe.
+@@ -830,16 +845,15 @@
+ # Zone	NAME		GMTOFF	RULES	FORMAT	[UNTIL]
+ Zone	Asia/Tbilisi	2:59:11 -	LMT	1880
+ 			2:59:11	-	TBMT	1924 May  2 # Tbilisi Mean Time
+-			3:00	-	TBIT	1957 Mar    # Tbilisi Time
+-			4:00 RussiaAsia TBI%sT	1991 Mar 31  2:00s
+-			3:00	1:00	TBIST	1991 Apr  9 # independence
+-			3:00 RussiaAsia GE%sT	1992        # Georgia Time
+-			3:00 E-EurAsia	GE%sT	1994 Sep lastSun
+-			4:00 E-EurAsia	GE%sT	1996 Oct lastSun
+-			4:00	1:00	GEST	1997 Mar lastSun
+-			4:00 E-EurAsia	GE%sT	2004 Jun 27
+-			3:00 RussiaAsia	GE%sT	2005 Mar lastSun  2:00
+-			4:00	-	GET
++			3:00	-	+03	1957 Mar
++			4:00 RussiaAsia +04/+05	1991 Mar 31  2:00s
++			3:00 RussiaAsia +03/+04	1992
++			3:00 E-EurAsia	+03/+04	1994 Sep lastSun
++			4:00 E-EurAsia	+04/+05	1996 Oct lastSun
++			4:00	1:00	+05	1997 Mar lastSun
++			4:00 E-EurAsia	+04/+05	2004 Jun 27
++			3:00 RussiaAsia	+03/+04	2005 Mar lastSun  2:00
++			4:00	-	+04
+ 
+ # East Timor
+ 
+@@ -874,6 +888,15 @@
+ 			9:00	-	TLT
+ 
+ # India
++
++# From Ian P. Beacock, in "A brief history of (modern) time", The Atlantic
++# http://www.theatlantic.com/technology/archive/2015/12/the-creation-of-modern-time/421419/
++# (2015-12-22):
++# In January 1906, several thousand cotton-mill workers rioted on the
++# outskirts of Bombay....  They were protesting the proposed abolition of
++# local time in favor of Indian Standard Time....  Journalists called this
++# dispute the "Battle of the Clocks."  It lasted nearly half a century.
++
+ # Zone	NAME		GMTOFF	RULES	FORMAT	[UNTIL]
+ Zone	Asia/Kolkata	5:53:28 -	LMT	1880        # Kolkata
+ 			5:53:20	-	HMT	1941 Oct    # Howrah Mean Time?
+@@ -907,7 +930,7 @@
+ # These would be the earliest possible times for a change.
+ # Régimes horaires pour le monde entier, by Henri Le Corre, (Éditions
+ # Traditionnelles, 1987, Paris) says that Java and Madura switched
+-# from JST to UTC+07:30 on 1945-09-23, and gives 1944-09-01 for Jayapura
++# from UT +09 to +07:30 on 1945-09-23, and gives 1944-09-01 for Jayapura
+ # (Hollandia).  For now, assume all Indonesian locations other than Jayapura
+ # switched on 1945-09-23.
+ #
+@@ -918,11 +941,11 @@
+ # summary published by the Time and Frequency Laboratory of the
+ # Research Center for Calibration, Instrumentation and Metrology,
+ # Indonesia, <http://time.kim.lipi.go.id/time-eng.php> (2006-09-29).
+-# The abbreviations are:
++# The time zone abbreviations and UT offsets are:
+ #
+-# WIB  - UTC+7 - Waktu Indonesia Barat (Indonesia western time)
+-# WITA - UTC+8 - Waktu Indonesia Tengah (Indonesia central time)
+-# WIT  - UTC+9 - Waktu Indonesia Timur (Indonesia eastern time)
++# WIB  - +07 - Waktu Indonesia Barat (Indonesia western time)
++# WITA - +08 - Waktu Indonesia Tengah (Indonesia central time)
++# WIT  - +09 - Waktu Indonesia Timur (Indonesia eastern time)
+ #
+ # Zone	NAME		GMTOFF	RULES	FORMAT	[UNTIL]
+ # Java, Sumatra
+@@ -1084,8 +1107,15 @@
+ Rule	Iran	2032	2033	-	Sep	21	0:00	0	S
+ Rule	Iran	2034	2035	-	Mar	22	0:00	1:00	D
+ Rule	Iran	2034	2035	-	Sep	22	0:00	0	S
+-Rule	Iran	2036	2037	-	Mar	21	0:00	1:00	D
+-Rule	Iran	2036	2037	-	Sep	21	0:00	0	S
++#
++# The following rules are approximations starting in the year 2038.
++# These are the best post-2037 approximations available, given the
++# restrictions of a single rule using a Gregorian-based data format.
++# At some point this table will need to be extended, though quite
++# possibly Iran will change the rules first.
++Rule	Iran	2036	max	-	Mar	21	0:00	1:00	D
++Rule	Iran	2036	max	-	Sep	21	0:00	0	S
++
+ # Zone	NAME		GMTOFF	RULES	FORMAT	[UNTIL]
+ Zone	Asia/Tehran	3:25:44	-	LMT	1916
+ 			3:25:44	-	TMT	1946     # Tehran Mean Time
+@@ -1542,23 +1572,6 @@
+ 
+ # Kazakhstan
+ 
+-# From Paul Eggert (1996-11-22):
+-# Andrew Evtichov (1996-04-13) writes that Kazakhstan
+-# stayed in sync with Moscow after 1990, and that Aqtobe (formerly Aktyubinsk)
+-# and Aqtau (formerly Shevchenko) are the largest cities in their zones.
+-# Guess that Aqtau and Aqtobe diverged in 1995, since that's the first time
+-# IATA SSIM mentions a third time zone in Kazakhstan.
+-
+-# From Paul Eggert (2006-03-22):
+-# German Iofis, ELSI, Almaty (2001-10-09) reports that Kazakhstan uses
+-# RussiaAsia rules, instead of switching at 00:00 as the IATA has it.
+-# Go with Shanks & Pottenger, who have them always using RussiaAsia rules.
+-# Also go with the following claims of Shanks & Pottenger:
+-#
+-# - Kazakhstan did not observe DST in 1991.
+-# - Qyzylorda switched from +5:00 to +6:00 on 1992-01-19 02:00.
+-# - Oral switched from +5:00 to +4:00 in spring 1989.
+-
+ # From Kazakhstan Embassy's News Bulletin No. 11
+ # <http://www.kazsociety.org.uk/news/2005/03/30.htm> (2005-03-21):
+ # The Government of Kazakhstan passed a resolution March 15 abolishing
+@@ -1575,61 +1588,232 @@
+ # everything else....  I guess that would make Kazakhstan time zones
+ # de jure UTC+5 and UTC+6 respectively.
+ 
++# From Stepan Golosunov (2016-03-27) ([*] means see later comments below):
++# Review of the linked documents from http://adilet.zan.kz/
++# produced the following data for post-1991 Kazakhstan:
++#
++# 0. Act of the Cabinet of Ministers of the USSR
++# from 1991-02-04 No. 20
++# http://pravo.gov.ru/proxy/ips/?docbody=&nd=102010545
++# removed the extra hour ("decree time") on the territory of the USSR
++# starting with the last Sunday of March 1991.
++# It also allowed (but not mandated) Kazakh SSR, Kirghiz SSR, Tajik SSR,
++# Turkmen SSR and Uzbek SSR to not have "summer" time.
++#
++# The 1992-01-13 act also refers to the act of the Cabinet of Ministers
++# of the Kazakh SSR from 1991-03-20 No. 170 "About the act of the Cabinet
++# of Ministers of the USSR from 1991-02-04 No. 20" but I didn't found its
++# text.
++#
++# According to Izvestia newspaper No. 68 (23334) from 1991-03-20
++# (page 6; available at http://libinfo.org/newsr/newsr2574.djvu via
++# http://libinfo.org/index.php?id=58564) on 1991-03-31 at 2:00 during
++# transition to "summer" time:
++# Republic of Georgia, Latvian SSR, Lithuanian SSR, SSR Moldova,
++# Estonian SSR; Komi ASSR; Kaliningrad oblast; Nenets autonomous okrug
++# were to move clocks 1 hour forward.
++# Kazakh SSR (excluding Uralsk oblast); Republic of Kyrgyzstan, Tajik
++# SSR; Andijan, Jizzakh, Namangan, Sirdarya, Tashkent, Fergana oblasts
++# of the Uzbek SSR were to move clocks 1 hour backwards.
++# Other territories were to not move clocks.
++# When the "summer" time would end on 1991-09-29, clocks were to be
++# moved 1 hour backwards on the territory of the USSR excluding
++# Kazakhstan, Kirghizia, Uzbekistan, Turkmenia, Tajikistan.
++#
++# Apparently there were last minute changes. Apparently Kazakh act No. 170
++# was one of such changes.
++#
++# https://ru.wikipedia.org/wiki/Декретное время
++# claims that Sovetskaya Rossiya newspaper on 1991-03-29 published that
++# Nenets autonomous okrug, Komi and Kazakhstan (excluding Uralsk oblast)
++# were to not move clocks and Uralsk oblast was to move clocks
++# forward; on 1991-09-29 Kazakhstan was to move clocks backwards.
++# (Probably there were changes even after that publication. There is an
++# article claiming that Kaliningrad oblast decided on 1991-03-29 to not
++# move clocks.)
++#
++# This implies that on 1991-03-31 Asia/Oral remained on +04/+05 while
++# the rest of Kazakhstan switched from +06/+07 to +05/06 or from +05/06
++# to +04/+05. It's unclear how Kzyl-Orda oblast moved into the fifth
++# time belt. (By switching from +04/+05 to +05/+06 on 1991-09-29?) ...
++#
++# 1. Act of the Cabinet of Ministers of the Republic of Kazakhstan
++# from 1992-01-13 No. 28
++# http://adilet.zan.kz/rus/docs/P920000028_
++# (text includes modification from the 1996 act)
++# introduced new rules for calculation of time, mirroring Russian
++# 1992-01-08 act.  It specified that time would be calculated
++# according to time belts plus extra hour ("decree time"), moved clocks
++# on the whole territory of Kazakhstan 1 hour forward on 1992-01-19 at
++# 2:00, specified DST rules.  It acknowledged that Kazakhstan was
++# located in the fourth and the fifth time belts and specified the
++# border between them to be located east of Kustanay and Aktyubinsk
++# oblasts (notably including Turgai and Kzyl-Orda oblasts into the fifth
++# time belt).
++#
++# This means switch on 1992-01-19 at 2:00 from +04/+05 to +05/+06 for
++# Asia/Aqtau, Asia/Aqtobe, Asia/Oral, Atyrau and Kustanay oblasts; from
++# +05/+06 to +06/+07 for Asia/Almaty and Asia/Qyzylorda (and Arkalyk) [*]....
++#
++# 2. Act of the Cabinet of Ministers of the Republic of Kazakhstan
++# from 1992-03-27 No. 284
++# http://adilet.zan.kz/rus/docs/P920000284_
++# cancels extra hour ("decree time") for Uralsk and Kzyl-Orda oblasts
++# since the last Sunday of March 1992, while keeping them in the fourth
++# and the fifth time belts respectively.
++#
++# 3. Order of the Prime Minister of the Republic of Kazakhstan
++# from 1994-09-23 No. 384
++# http://adilet.zan.kz/rus/docs/R940000384_
++# cancels the extra hour ("decree time") on the territory of Mangystau
++# oblast since the last Sunday of September 1994 (saying that time on
++# the territory would correspond to the third time belt as a
++# result)....
++#
++# 4. Act of the Government of the Republic of Kazakhstan
++# from 1996-05-08 No. 575
++# http://adilet.zan.kz/rus/docs/P960000575_
++# amends the 1992-01-13 act to end summer time in October instead
++# of September, mirroring identical Russian change from 1996-04-23 act.
++#
++# 5. Act of the Government of the Republic of Kazakhstan
++# from 1999-03-26 No. 305
++# http://adilet.zan.kz/rus/docs/P990000305_
++# cancels the extra hour ("decree time") for Atyrau oblast since the
++# last Sunday of March 1999 while retaining the oblast in the fourth
++# time belt.
++#
++# This means change from +05/+06 to +04/+05.
++#
++# There is no zone for Atyrau currently (listed under Asia/Aqtau in
++# zone1970.tab).[*]
++#
++# 6. Act of the Government of the Republic of Kazakhstan
++# from 2000-11-23 No. 1749
++# http://adilet.zan.kz/rus/archive/docs/P000001749_/23.11.2000
++# replaces the previous five documents.
++#
++# The only changes I noticed are in definition of the border between the
++# fourth and the fifth time belts.  They account for changes in spelling
++# and administrative division (splitting of Turgai oblast in 1997
++# probably changed time in territories incorporated into Kostanay oblast
++# (including Arkalyk) from +06/+07 to +05/+06) and move Kyzylorda oblast
++# from being in the fifth time belt and not using decree time into the
++# fourth time belt (no change in practice).[*]
++#
++# 7. Act of the Government of the Republic of Kazakhstan
++# from 2003-12-29 No. 1342
++# http://adilet.zan.kz/rus/docs/P030001342_
++# modified the 2000-11-23 act.  No relevant changes, apparently.
++#
++# 8. Act of the Government of the Republic of Kazakhstan
++# from 2004-07-20 No. 775
++# http://adilet.zan.kz/rus/archive/docs/P040000775_/20.07.2004
++# modified the 2000-11-23 act to move Kostanay and Kyzylorda oblasts into
++# the fifth time belt and add Aktobe oblast to the list of regions not
++# using extra hour ("decree time"), leaving Kazakhstan with only 2 time
++# zones (+04/+05 and +06/+07).  The changes were to be implemented
++# during DST transitions in 2004 and 2005 but the acts got radically
++# amended before implementation happened.
++#
++# 9. Act of the Government of the Republic of Kazakhstan
++# from 2004-09-15 No. 1059
++# http://adilet.zan.kz/rus/docs/P040001059_
++# modified the 2000-11-23 act to remove exceptions from the "decree time"
++# (leaving Kazakhstan in +05/+06 and +06/+07 zones), amended the
++# 2004-07-20 act to implement changes for Atyrau, West Kazakhstan,
++# Kostanay, Kyzylorda and Mangystau oblasts by not moving clocks
++# during the 2014 transition to "winter" time.
++#
++# This means transition from +04/+05 to +05/+06 for Atyrau oblast (no
++# zone currently), Asia/Oral, Asia/Aqtau and transition from +05/+06 to
++# +06/+07 for Kostanay oblast (Kostanay and Arkalyk, no zones currently)
++# and Asia/Qyzylorda on 2004-10-31 at 3:00....[*]
++#
++# 10. Act of the Government of the Republic of Kazakhstan
++# from 2005-03-15 No. 231
++# http://adilet.zan.kz/rus/docs/P050000231_
++# removes DST provisions from the 2000-11-23 act, removes most of the
++# (already implemented) provisions from the 2004-07-20 and 2004-09-15
++# acts, comes into effect 10 days after official publication.
++# The only practical effect seems to be the abolition of the summer
++# time.
++#
++# Unamended version of the act of the Government of the Russian Federation
++# No. 23 from 1992-01-08 [See 'europe' file for details].
++# Kazakh 1992-01-13 act appears to provide the same rules and 1992-03-27
++# act was to be enacted on the last Sunday of March 1992.
++
++# From Paul Eggert (2016-04-15):
++# The tables below should reflect Stepan Golosunov's remarks above,
++# except for the items marked "[*]" which I haven't gotten to yet.
++# It looks like we will need new zones Asia/Atyrau and Asia/Qostanay
++# to handle changes from 1992 through 2004 that we did not previously
++# know about.
++
+ #
+ # Zone	NAME		GMTOFF	RULES	FORMAT	[UNTIL]
+ #
+ # Almaty (formerly Alma-Ata), representing most locations in Kazakhstan
++# This includes KZ-AKM, KZ-ALA, KZ-ALM, KZ-AST, KZ-BAY, KZ-VOS, KZ-ZHA,
++# KZ-KAR, KZ-SEV, KZ-PAV, and KZ-YUZ.
+ Zone	Asia/Almaty	5:07:48 -	LMT	1924 May  2 # or Alma-Ata
+-			5:00	-	ALMT	1930 Jun 21 # Alma-Ata Time
+-			6:00 RussiaAsia ALM%sT	1991
+-			6:00	-	ALMT	1992
+-			6:00 RussiaAsia	ALM%sT	2005 Mar 15
+-			6:00	-	ALMT
+-# Qyzylorda (aka Kyzylorda, Kizilorda, Kzyl-Orda, etc.)
++			5:00	-	+05	1930 Jun 21
++			6:00 RussiaAsia +06/+07	1991 Mar 31  2:00s
++			5:00 RussiaAsia	+05/+06	1992 Jan 19  2:00s
++			6:00 RussiaAsia	+06/+07	2004 Oct 31  2:00s
++			6:00	-	+06
++# Qyzylorda (aka Kyzylorda, Kizilorda, Kzyl-Orda, etc.) (KZ-KZY)
+ Zone	Asia/Qyzylorda	4:21:52 -	LMT	1924 May  2
+-			4:00	-	KIZT	1930 Jun 21 # Kizilorda Time
+-			5:00	-	KIZT	1981 Apr  1
+-			5:00	1:00	KIZST	1981 Oct  1
+-			6:00	-	KIZT	1982 Apr  1
+-			5:00 RussiaAsia	KIZ%sT	1991
+-			5:00	-	KIZT	1991 Dec 16 # independence
+-			5:00	-	QYZT	1992 Jan 19  2:00
+-			6:00 RussiaAsia	QYZ%sT	2005 Mar 15
+-			6:00	-	QYZT
+-# Aqtobe (aka Aktobe, formerly Aktyubinsk)
++			4:00	-	+04	1930 Jun 21
++			5:00	-	+05	1981 Apr  1
++			5:00	1:00	+06	1981 Oct  1
++			6:00	-	+06	1982 Apr  1
++			5:00 RussiaAsia	+05/+06	1991 Mar 31  2:00s
++			4:00 RussiaAsia	+04/+05	1991 Sep 29  2:00s
++			5:00 RussiaAsia	+05/+06	1992 Jan 19  2:00s
++			6:00 RussiaAsia	+06/+07	1992 Mar 29  2:00s
++			5:00 RussiaAsia	+05/+06	2004 Oct 31  2:00s
++			6:00	-	+06
++# Aqtobe (aka Aktobe, formerly Aktyubinsk) (KZ-AKT)
+ Zone	Asia/Aqtobe	3:48:40	-	LMT	1924 May  2
+-			4:00	-	AKTT	1930 Jun 21 # Aktyubinsk Time
+-			5:00	-	AKTT	1981 Apr  1
+-			5:00	1:00	AKTST	1981 Oct  1
+-			6:00	-	AKTT	1982 Apr  1
+-			5:00 RussiaAsia	AKT%sT	1991
+-			5:00	-	AKTT	1991 Dec 16 # independence
+-			5:00 RussiaAsia	AQT%sT	2005 Mar 15 # Aqtobe Time
+-			5:00	-	AQTT
+-# Mangghystau
++			4:00	-	+04	1930 Jun 21
++			5:00	-	+05	1981 Apr  1
++			5:00	1:00	+06	1981 Oct  1
++			6:00	-	+06	1982 Apr  1
++			5:00 RussiaAsia	+05/+06	1991 Mar 31  2:00s
++			4:00 RussiaAsia	+04/+05	1992 Jan 19  2:00s
++			5:00 RussiaAsia	+05/+06	2004 Oct 31  2:00s
++			5:00	-	+05
++# Qostanay (KZ-KUS)
++
++# Mangghystau (KZ-MAN)
+ # Aqtau was not founded until 1963, but it represents an inhabited region,
+ # so include time stamps before 1963.
+ Zone	Asia/Aqtau	3:21:04	-	LMT	1924 May  2
+-			4:00	-	FORT	1930 Jun 21 # Fort Shevchenko T
+-			5:00	-	FORT	1963
+-			5:00	-	SHET	1981 Oct  1 # Shevchenko Time
+-			6:00	-	SHET	1982 Apr  1
+-			5:00 RussiaAsia	SHE%sT	1991
+-			5:00	-	SHET	1991 Dec 16 # independence
+-			5:00 RussiaAsia	AQT%sT	1995 Mar lastSun  2:00 # Aqtau Time
+-			4:00 RussiaAsia	AQT%sT	2005 Mar 15
+-			5:00	-	AQTT
+-# West Kazakhstan
++			4:00	-	+04	1930 Jun 21
++			5:00	-	+05	1963
++			5:00	-	+05	1981 Oct  1
++			6:00	-	+06	1982 Apr  1
++			5:00 RussiaAsia	+05/+06	1991 Mar 31  2:00s
++			4:00 RussiaAsia	+04/+05	1992 Jan 19  2:00s
++			5:00 RussiaAsia	+05/+06	1994 Sep 25  2:00s
++			4:00 RussiaAsia	+04/+05	2004 Oct 31  2:00s
++			5:00	-	+05
++
++# West Kazakhstan (KZ-ZAP)
++# From Paul Eggert (2016-03-18):
++# The 1989 transition is from USSR act No. 227 (1989-03-14).
+ Zone	Asia/Oral	3:25:24	-	LMT	1924 May  2 # or Ural'sk
+-			4:00	-	URAT	1930 Jun 21 # Ural'sk time
+-			5:00	-	URAT	1981 Apr  1
+-			5:00	1:00	URAST	1981 Oct  1
+-			6:00	-	URAT	1982 Apr  1
+-			5:00 RussiaAsia	URA%sT	1989 Mar 26  2:00
+-			4:00 RussiaAsia	URA%sT	1991
+-			4:00	-	URAT	1991 Dec 16 # independence
+-			4:00 RussiaAsia	ORA%sT	2005 Mar 15 # Oral Time
+-			5:00	-	ORAT
++			4:00	-	+04	1930 Jun 21
++			5:00	-	+05	1981 Apr  1
++			5:00	1:00	+06	1981 Oct  1
++			6:00	-	+06	1982 Apr  1
++			5:00 RussiaAsia	+05/+06	1989 Mar 26  2:00s
++			4:00 RussiaAsia	+04/+05	1992 Jan 19  2:00s
++			5:00 RussiaAsia	+05/+06	1992 Mar 29  2:00s
++			4:00 RussiaAsia	+04/+05	2004 Oct 31  2:00s
++			5:00	-	+05
+ 
+ # Kyrgyzstan (Kirgizstan)
+ # Transitions through 1991 are from Shanks & Pottenger.
+@@ -1650,11 +1834,11 @@
+ Rule	Kyrgyz	1997	2004	-	Oct	lastSun	2:30	0	-
+ # Zone	NAME		GMTOFF	RULES	FORMAT	[UNTIL]
+ Zone	Asia/Bishkek	4:58:24 -	LMT	1924 May  2
+-			5:00	-	FRUT	1930 Jun 21 # Frunze Time
+-			6:00 RussiaAsia FRU%sT	1991 Mar 31  2:00s
+-			5:00	1:00	FRUST	1991 Aug 31  2:00 # independence
+-			5:00	Kyrgyz	KG%sT	2005 Aug 12 # Kyrgyzstan Time
+-			6:00	-	KGT
++			5:00	-	+05	1930 Jun 21
++			6:00 RussiaAsia +06/+07	1991 Mar 31  2:00s
++			5:00 RussiaAsia	+05/+06	1991 Aug 31  2:00
++			5:00	Kyrgyz	+05/+06	2005 Aug 12
++			6:00	-	+06
+ 
+ ###############################################################################
+ 
+@@ -1693,25 +1877,24 @@
+ Rule	ROK	1987	1988	-	May	Sun>=8	2:00	1:00	D
+ Rule	ROK	1987	1988	-	Oct	Sun>=8	3:00	0	S
+ 
+-# From Paul Eggert (2014-10-30):
++# From Paul Eggert (2016-08-23):
+ # The Korean Wikipedia entry gives the following sources for UT offsets:
+ #
+-# 1908: Official Journal Article No. 3994 (Edict No. 5)
++# 1908: Official Journal Article No. 3994 (decree No. 5)
+ # 1912: Governor-General of Korea Official Gazette Issue No. 367
+ #       (Announcement No. 338)
+ # 1954: Presidential Decree No. 876 (1954-03-17)
+ # 1961: Law No. 676 (1961-08-07)
+-# 1987: Law No. 3919 (1986-12-31)
+ #
+-# The Wikipedia entry also has confusing information about a change
+-# to UT+9 in April 1910, but then what would be the point of the later change
+-# to UT+9 on 1912-01-01?  Omit the 1910 change for now.
++# (Another source "1987: Law No. 3919 (1986-12-31)" was in the 2014-10-30
++# edition of the Korean Wikipedia entry.)
+ #
+ # I guessed that time zone abbreviations through 1945 followed the same
+ # rules as discussed under Taiwan, with nominal switches from JST to KST
+ # when the respective cities were taken over by the Allies after WWII.
+ #
+-# For Pyongyang we have no information; guess no changes since World War II.
++# For Pyongyang, guess no changes from World War II until 2015, as we
++# have no information otherwise.
+ 
+ # From Steffen Thorsen (2015-08-07):
+ # According to many news sources, North Korea is going to change to
+@@ -1871,7 +2054,7 @@
+ # Bill Bonnet (2005-05-19) reports that the US Embassy in Ulaanbaatar says
+ # there is only one time zone and that DST is observed, citing Microsoft
+ # Windows XP as the source.  Risto Nykänen (2005-05-16) reports that
+-# travelmongolia.org says there are two time zones (UTC+7, UTC+8) with no DST.
++# travelmongolia.org says there are two time zones (UT +07, +08) with no DST.
+ # Oscar van Vlijmen (2005-05-20) reports that the Mongolian Embassy in
+ # Washington, DC says there are two time zones, with DST observed.
+ # He also found
+@@ -2111,8 +2294,8 @@
+ # http://www.app.com.pk/en_/index.php?option=com_content&task=view&id=99374&Itemid=2
+ 
+ # Rule	NAME	FROM	TO	TYPE	IN	ON	AT	SAVE	LETTER/S
+-Rule Pakistan	2002	only	-	Apr	Sun>=2	0:01	1:00	S
+-Rule Pakistan	2002	only	-	Oct	Sun>=2	0:01	0	-
++Rule Pakistan	2002	only	-	Apr	Sun>=2	0:00	1:00	S
++Rule Pakistan	2002	only	-	Oct	Sun>=2	0:00	0	-
+ Rule Pakistan	2008	only	-	Jun	1	0:00	1:00	S
+ Rule Pakistan	2008	2009	-	Nov	1	0:00	0	-
+ Rule Pakistan	2009	only	-	Apr	15	0:00	1:00	S
+@@ -2374,9 +2557,28 @@
+ # From Paul Eggert (2015-03-03):
+ # http://www.timeanddate.com/time/change/west-bank/ramallah?year=2014
+ # says that the fall 2014 transition was Oct 23 at 24:00.
+-# For future dates, guess the last Friday in March at 24:00 through
+-# the first Friday on or after October 21 at 00:00.  This is consistent with
+-# the predictions in today's editions of the following URLs:
++
++# From Hannah Kreitem (2016-03-09):
++# http://www.palestinecabinet.gov.ps/WebSite/ar/ViewDetails?ID=31728
++# [Google translation]: "The Council also decided to start daylight
++# saving in Palestine as of one o'clock on Saturday morning,
++# 2016-03-26, to provide the clock 60 minutes ahead."
++#
++# From Paul Eggert (2016-03-12):
++# Predict spring transitions on March's last Saturday at 01:00 from now on.
++
++# From Sharef Mustafa (2016-10-19):
++# [T]he Palestinian cabinet decision (Mar 8th 2016) published on
++# http://www.palestinecabinet.gov.ps/WebSite/Upload/Decree/GOV_17/16032016134830.pdf
++# states that summer time will end on Oct 29th at 01:00.
++#
++# From Tim Parenti (2016-10-19):
++# Predict fall transitions on October's last Saturday at 01:00 from now on.
++# This is consistent with the 2016 transition as well as our spring
++# predictions.
++#
++# From Paul Eggert (2016-10-19):
++# It's also consistent with predictions in the following URLs today:
+ # http://www.timeanddate.com/time/change/gaza-strip/gaza
+ # http://www.timeanddate.com/time/change/west-bank/hebron
+ 
+@@ -2407,8 +2609,10 @@
+ Rule Palestine	2012	2014	-	Mar	lastThu	24:00	1:00	S
+ Rule Palestine	2012	only	-	Sep	21	1:00	0	-
+ Rule Palestine	2013	only	-	Sep	Fri>=21	0:00	0	-
+-Rule Palestine	2014	max	-	Oct	Fri>=21	0:00	0	-
+-Rule Palestine	2015	max	-	Mar	lastFri	24:00	1:00	S
++Rule Palestine	2014	2015	-	Oct	Fri>=21	0:00	0	-
++Rule Palestine	2015	only	-	Mar	lastFri	24:00	1:00	S
++Rule Palestine	2016	max	-	Mar	lastSat	1:00	1:00	S
++Rule Palestine	2016	max	-	Oct	lastSat	1:00	0	-
+ 
+ # Zone	NAME		GMTOFF	RULES	FORMAT	[UNTIL]
+ Zone	Asia/Gaza	2:17:52	-	LMT	1900 Oct
+@@ -2496,7 +2700,7 @@
+ # earlier date.
+ #
+ # Shanks & Pottenger also state that until 1968-05-01 Saudi Arabia had two
+-# time zones; the other zone, at UTC+4, was in the far eastern part of
++# time zones; the other zone, at UT +04, was in the far eastern part of
+ # the country.  Ignore this, as it's before our 1970 cutoff.
+ #
+ # Zone	NAME		GMTOFF	RULES	FORMAT	[UNTIL]
+@@ -2558,45 +2762,31 @@
+ # People who live in regions under Tamil control can use [TZ='Asia/Kolkata'],
+ # as that zone has agreed with the Tamil areas since our cutoff date of 1970.
+ 
+-# From K Sethu (2006-04-25):
+-# I think the abbreviation LKT originated from the world of computers at
+-# the time of or subsequent to the time zone changes by SL Government
+-# twice in 1996 and probably SL Government or its standardization
+-# agencies never declared an abbreviation as a national standard.
+-#
+-# I recollect before the recent change the government announcements
+-# mentioning it as simply changing Sri Lanka Standard Time or Sri Lanka
+-# Time and no mention was made about the abbreviation.
+-#
+-# If we look at Sri Lanka Department of Government's "Official News
+-# Website of Sri Lanka" ... http://www.news.lk/ we can see that they
+-# use SLT as abbreviation in time stamp at the beginning of each news
+-# item....
+-#
+-# Within Sri Lanka I think LKT is well known among computer users and
+-# administrators.  In my opinion SLT may not be a good choice because the
+-# nation's largest telcom / internet operator Sri Lanka Telcom is well
+-# known by that abbreviation - simply as SLT (there IP domains are
+-# slt.lk and sltnet.lk).
+-#
+-# But if indeed our government has adopted SLT as standard abbreviation
+-# (that we have not known so far) then  it is better that it be used for
+-# all computers.
+-
+-# From Paul Eggert (2006-04-25):
+-# One possibility is that we wait for a bit for the dust to settle down
+-# and then see what people actually say in practice.
++# From Sadika Sumanapala (2016-10-19):
++# According to http://www.sltime.org (maintained by Measurement Units,
++# Standards & Services Department, Sri Lanka) abbreviation for Sri Lanka
++# standard time is SLST.
++#
++# From Paul Eggert (2016-10-18):
++# "SLST" seems to be reasonably recent and rarely-used outside time
++# zone nerd sources.  I searched Google News and found three uses of
++# it in the International Business Times of India in February and
++# March of this year when discussing cricket match times, but nothing
++# since then (though there has been a lot of cricket) and nothing in
++# other English-language news sources.  Our old abbreviation "LKT" is
++# even worse.  For now, let's use a numeric abbreviation; we can
++# switch to "SLST" if it catches on.
+ 
+ # Zone	NAME		GMTOFF	RULES	FORMAT	[UNTIL]
+ Zone	Asia/Colombo	5:19:24 -	LMT	1880
+ 			5:19:32	-	MMT	1906        # Moratuwa Mean Time
+-			5:30	-	IST	1942 Jan  5
+-			5:30	0:30	IHST	1942 Sep
+-			5:30	1:00	IST	1945 Oct 16  2:00
+-			5:30	-	IST	1996 May 25  0:00
+-			6:30	-	LKT	1996 Oct 26  0:30
+-			6:00	-	LKT	2006 Apr 15  0:30
+-			5:30	-	IST
++			5:30	-	+0530	1942 Jan  5
++			5:30	0:30	+0530/+06 1942 Sep
++			5:30	1:00	+0530/+0630 1945 Oct 16  2:00
++			5:30	-	+0530	1996 May 25  0:00
++			6:30	-	+0630	1996 Oct 26  0:30
++			6:00	-	+06	2006 Apr 15  0:30
++			5:30	-	+0530
+ 
+ # Syria
+ # Rule	NAME	FROM	TO	TYPE	IN	ON	AT	SAVE	LETTER/S
+@@ -2765,10 +2955,10 @@
+ # From Shanks & Pottenger.
+ # Zone	NAME		GMTOFF	RULES	FORMAT	[UNTIL]
+ Zone	Asia/Dushanbe	4:35:12 -	LMT	1924 May  2
+-			5:00	-	DUST	1930 Jun 21 # Dushanbe Time
+-			6:00 RussiaAsia DUS%sT	1991 Mar 31  2:00s
+-			5:00	1:00	DUSST	1991 Sep  9  2:00s
+-			5:00	-	TJT	# Tajikistan Time
++			5:00	-	+05	1930 Jun 21
++			6:00 RussiaAsia +06/+07	1991 Mar 31  2:00s
++			5:00	1:00	+05/+06	1991 Sep  9  2:00s
++			5:00	-	+05
+ 
+ # Thailand
+ # Zone	NAME		GMTOFF	RULES	FORMAT	[UNTIL]
+@@ -2782,11 +2972,10 @@
+ # From Shanks & Pottenger.
+ # Zone	NAME		GMTOFF	RULES	FORMAT	[UNTIL]
+ Zone	Asia/Ashgabat	3:53:32 -	LMT	1924 May  2 # or Ashkhabad
+-			4:00	-	ASHT	1930 Jun 21 # Ashkhabad Time
+-			5:00 RussiaAsia	ASH%sT	1991 Mar 31  2:00
+-			4:00 RussiaAsia	ASH%sT	1991 Oct 27 # independence
+-			4:00 RussiaAsia	TM%sT	1992 Jan 19  2:00
+-			5:00	-	TMT
++			4:00	-	+04	1930 Jun 21
++			5:00 RussiaAsia	+05/+06	1991 Mar 31  2:00
++			4:00 RussiaAsia	+04/+05	1992 Jan 19  2:00
++			5:00	-	+05
+ 
+ # United Arab Emirates
+ # Zone	NAME		GMTOFF	RULES	FORMAT	[UNTIL]
+@@ -2798,20 +2987,18 @@
+ # Byalokoz 1919 says Uzbekistan was 4:27:53.
+ # Zone	NAME		GMTOFF	RULES	FORMAT	[UNTIL]
+ Zone	Asia/Samarkand	4:27:53 -	LMT	1924 May  2
+-			4:00	-	SAMT	1930 Jun 21 # Samarkand Time
+-			5:00	-	SAMT	1981 Apr  1
+-			5:00	1:00	SAMST	1981 Oct  1
+-			6:00	-	TAST	1982 Apr  1 # Tashkent Time
+-			5:00 RussiaAsia	SAM%sT	1991 Sep  1 # independence
+-			5:00 RussiaAsia	UZ%sT	1992
+-			5:00	-	UZT
++			4:00	-	+04	1930 Jun 21
++			5:00	-	+05	1981 Apr  1
++			5:00	1:00	+06	1981 Oct  1
++			6:00	-	+06	1982 Apr  1
++			5:00 RussiaAsia	+05/+06	1992
++			5:00	-	+05
+ # Milne says Tashkent was 4:37:10.8; round to nearest.
+ Zone	Asia/Tashkent	4:37:11 -	LMT	1924 May  2
+-			5:00	-	TAST	1930 Jun 21 # Tashkent Time
+-			6:00 RussiaAsia	TAS%sT	1991 Mar 31  2:00
+-			5:00 RussiaAsia	TAS%sT	1991 Sep  1 # independence
+-			5:00 RussiaAsia	UZ%sT	1992
+-			5:00	-	UZT
++			5:00	-	+05	1930 Jun 21
++			6:00 RussiaAsia	+06/+07	1991 Mar 31  2:00
++			5:00 RussiaAsia	+05/+06	1992
++			5:00	-	+05
+ 
+ # Vietnam
+ 
+--- contrib/tzdata/australasia.orig
++++ contrib/tzdata/australasia
+@@ -60,6 +60,14 @@
+ # Hamilton is the largest, but there is also a Hamilton in Victoria,
+ # so use Lindeman.
+ #
++# From J William Piggott (2016-02-20):
++# There is no location named Holiday Islands in Queensland Australia; holiday
++# islands is a colloquial term used globally.  Hayman and Lindeman are at the
++# north and south extremes of the Whitsunday Islands archipelago, and
++# Hamilton is in between; it is reasonable to believe that this time zone
++# applies to all of the Whitsundays.
++# http://www.australia.gov.au/about-australia/australian-story/austn-islands
++#
+ # Rule	NAME	FROM	TO	TYPE	IN	ON	AT	SAVE	LETTER/S
+ Rule	AQ	1971	only	-	Oct	lastSun	2:00s	1:00	D
+ Rule	AQ	1972	only	-	Feb	lastSun	2:00s	0	S
+@@ -235,11 +243,11 @@
+ # will produce a binary file with an [A]EST-type as the first 32-bit type;
+ # this is required for correct handling of times before 1916 by
+ # pre-2013 versions of localtime.
+-Zone Antarctica/Macquarie 0	-	zzz	1899 Nov
++Zone Antarctica/Macquarie 0	-	-00	1899 Nov
+ 			10:00	-	AEST	1916 Oct  1  2:00
+ 			10:00	1:00	AEDT	1917 Feb
+ 			10:00	Aus	AE%sT	1919 Apr  1  0:00s
+-			0	-	zzz	1948 Mar 25
++			0	-	-00	1948 Mar 25
+ 			10:00	Aus	AE%sT	1967
+ 			10:00	AT	AE%sT	2010 Apr  4  3:00
+ 			11:00	-	MIST	# Macquarie I Standard Time
+@@ -342,7 +350,13 @@
+ # commencing at 2.00 am on Sunday 1st November, 2015 and ending at
+ # 3.00 am on Sunday 17th January, 2016.
+ 
+-# From Paul Eggert (2015-09-01):
++# From Raymond Kumar (2016-10-04):
++# http://www.fiji.gov.fj/Media-Center/Press-Releases/DAYLIGHT-SAVING-STARTS-ON-6th-NOVEMBER,-2016.aspx
++# "Fiji's daylight savings will begin on Sunday, 6 November 2016, when
++# clocks go forward an hour at 2am to 3am....  Daylight Saving will
++# end at 3.00am on Sunday 15th January 2017."
++
++# From Paul Eggert (2016-10-03):
+ # For now, guess DST from 02:00 the first Sunday in November to
+ # 03:00 the third Sunday in January.  Although ad hoc, it matches
+ # transitions since late 2014 and seems more likely to match future
+@@ -537,7 +551,7 @@
+ # Base the Bougainville entry on the Arawa-Kieta region, which appears to have
+ # the most people even though it was devastated in the Bougainville Civil War.
+ #
+-# Although Shanks gives 1942-03-15 / 1943-11-01 for JST, these dates
++# Although Shanks gives 1942-03-15 / 1943-11-01 for UT +09, these dates
+ # are apparently rough guesswork from the starts of military campaigns.
+ # The World War II entries below are instead based on Arawa-Kieta.
+ # The Japanese occupied Kieta in July 1942,
+@@ -545,8 +559,8 @@
+ # http://pwencycl.kgbudge.com/B/o/Bougainville.htm
+ # and seem to have controlled it until their 1945-08-21 surrender.
+ #
+-# The Autonomous Region of Bougainville plans to switch from UTC+10 to UTC+11
+-# on 2014-12-28 at 02:00.  They call UTC+11 "Bougainville Standard Time";
++# The Autonomous Region of Bougainville switched from UT +10 to +11
++# on 2014-12-28 at 02:00.  They call +11 "Bougainville Standard Time";
+ # abbreviate this as BST.  See:
+ # http://www.bougainville24.com/bougainville-issues/bougainville-gets-own-timezone/
+ #
+@@ -612,7 +626,7 @@
+ # From Paul Eggert (2014-06-27):
+ # The International Date Line Act 2011
+ # http://www.parliament.gov.ws/images/ACTS/International_Date_Line_Act__2011_-_Eng.pdf
+-# changed Samoa from UTC-11 to UTC+13, effective "12 o'clock midnight, on
++# changed Samoa from UT -11 to +13, effective "12 o'clock midnight, on
+ # Thursday 29th December 2011".  The International Date Line was adjusted
+ # accordingly.
+ 
+@@ -688,11 +702,13 @@
+ Rule	Tonga	2000	only	-	Mar	19	2:00s	0	-
+ Rule	Tonga	2000	2001	-	Nov	Sun>=1	2:00	1:00	S
+ Rule	Tonga	2001	2002	-	Jan	lastSun	2:00	0	-
++Rule	Tonga	2016	max	-	Nov	Sun>=1	2:00	1:00	S
++Rule	Tonga	2017	max	-	Jan	Sun>=15	3:00	0	-
+ # Zone	NAME		GMTOFF	RULES	FORMAT	[UNTIL]
+ Zone Pacific/Tongatapu	12:19:20 -	LMT	1901
+-			12:20	-	TOT	1941 # Tonga Time
+-			13:00	-	TOT	1999
+-			13:00	Tonga	TO%sT
++			12:20	-	+1220	1941
++			13:00	-	+13	1999
++			13:00	Tonga	+13/+14
+ 
+ # Tuvalu
+ # Zone	NAME		GMTOFF	RULES	FORMAT	[UNTIL]
+@@ -707,7 +723,7 @@
+ # 1886-1891; Baker was similar but exact dates are not known.
+ # Inhabited by civilians 1935-1942; U.S. military bases 1943-1944;
+ # uninhabited thereafter.
+-# Howland observed Hawaii Standard Time (UT-10:30) in 1937;
++# Howland observed Hawaii Standard Time (UT -10:30) in 1937;
+ # see page 206 of Elgen M. Long and Marie K. Long,
+ # Amelia Earhart: the Mystery Solved, Simon & Schuster (2000).
+ # So most likely Howland and Baker observed Hawaii Time from 1935
+@@ -1465,7 +1481,7 @@
+ # Zealand time.  I understand that is the time they keep locally, anyhow."
+ # For now, assume this practice goes back to the introduction of standard time
+ # in New Zealand, as this would make Chatham Islands time almost exactly match
+-# LMT back when New Zealand was at UTC+11:30; also, assume Chatham Islands did
++# LMT back when New Zealand was at UT +11:30; also, assume Chatham Islands did
+ # not observe New Zealand's prewar DST.
+ 
+ ###############################################################################
+@@ -1521,7 +1537,7 @@
+ # For now, we assume the Ladrones switched at the same time as the Philippines;
+ # see Asia/Manila.
+ 
+-# US Public Law 106-564 (2000-12-23) made UTC+10 the official standard time,
++# US Public Law 106-564 (2000-12-23) made UT +10 the official standard time,
+ # under the name "Chamorro Standard Time".  There is no official abbreviation,
+ # but Congressman Robert A. Underwood, author of the bill that became law,
+ # wrote in a press release (2000-12-27) that he will seek the use of "ChST".
+@@ -1533,15 +1549,15 @@
+ # "I am certain, having lived there for the past decade, that 'Truk'
+ # (now properly known as Chuuk) ... is in the time zone GMT+10."
+ #
+-# Shanks & Pottenger write that Truk switched from UTC+10 to UTC+11
++# Shanks & Pottenger write that Truk switched from UT +10 to +11
+ # on 1978-10-01; ignore this for now.
+ 
+ # From Paul Eggert (1999-10-29):
+ # The Federated States of Micronesia Visitors Board writes in
+ # The Federated States of Micronesia - Visitor Information (1999-01-26)
+ # http://www.fsmgov.org/info/clocks.html
+-# that Truk and Yap are UTC+10, and Ponape and Kosrae are UTC+11.
+-# We don't know when Kosrae switched from UTC+12; assume January 1 for now.
++# that Truk and Yap are UT +10, and Ponape and Kosrae are +11.
++# We don't know when Kosrae switched from +12; assume January 1 for now.
+ 
+ 
+ # Midway
+@@ -1607,11 +1623,11 @@
+ # ordaining - by a masterpiece of diplomatic flattery - that
+ # the Fourth of July should be celebrated twice in that year."
+ 
+-# Although Shanks & Pottenger says they both switched to UTC-11:30
+-# in 1911, and to UTC-11 in 1950. many earlier sources give UTC-11
++# Although Shanks & Pottenger says they both switched to UT -11:30
++# in 1911, and to -11 in 1950. many earlier sources give -11
+ # for American Samoa, e.g., the US National Bureau of Standards
+ # circular "Standard Time Throughout the World", 1932.
+-# Assume American Samoa switched to UTC-11 in 1911, not 1950,
++# Assume American Samoa switched to -11 in 1911, not 1950,
+ # and that after 1950 they agreed until (western) Samoa skipped a
+ # day in 2011.  Assume also that the Samoas follow the US and New
+ # Zealand's "ST"/"DT" style of daylight-saving abbreviations.
+@@ -1698,9 +1714,17 @@
+ # of January the standard time in the Kingdom shall be moved backward by one
+ # hour to 1:00am.
+ 
+-# From Pulu 'Anau (2002-11-05):
++# From Pulu ʻAnau (2002-11-05):
+ # The law was for 3 years, supposedly to get renewed.  It wasn't.
+ 
++# From Pulu ʻAnau (2016-10-27):
++# http://mic.gov.to/news-today/press-releases/6375-daylight-saving-set-to-run-from-6-november-2016-to-15-january-2017
++# Cannot find anyone who knows the rules, has seen the duration or has seen
++# the cabinet decision, but it appears we are following Fiji's rule set.
++#
++# From Tim Parenti (2016-10-26):
++# Assume Tonga will observe DST from the first Sunday in November at 02:00
++# through the third Sunday in January at 03:00, like Fiji, for now.
+ 
+ # Wake
+ 
+--- contrib/tzdata/backward.orig
++++ contrib/tzdata/backward
+@@ -23,6 +23,7 @@
+ Link	America/Toronto		America/Montreal
+ Link	America/Rio_Branco	America/Porto_Acre
+ Link	America/Argentina/Cordoba	America/Rosario
++Link	America/Tijuana		America/Santa_Isabel
+ Link	America/Denver		America/Shiprock
+ Link	America/Port_of_Spain	America/Virgin
+ Link	Pacific/Auckland	Antarctica/South_Pole
+@@ -35,6 +36,7 @@
+ Link	Asia/Urumqi		Asia/Kashgar
+ Link	Asia/Kathmandu		Asia/Katmandu
+ Link	Asia/Macau		Asia/Macao
++Link	Asia/Yangon		Asia/Rangoon
+ Link	Asia/Ho_Chi_Minh	Asia/Saigon
+ Link	Asia/Jerusalem		Asia/Tel_Aviv
+ Link	Asia/Thimphu		Asia/Thimbu
+--- contrib/tzdata/backzone.orig
++++ contrib/tzdata/backzone
+@@ -0,0 +1,677 @@
++# Zones that go back beyond the scope of the tz database
++
++# This file is in the public domain.
++
++# This file is by no means authoritative; if you think you know
++# better, go ahead and edit it (and please send any changes to
++# tz@iana.org for general use in the future).  For more, please see
++# the file CONTRIBUTING in the tz distribution.
++
++
++# From Paul Eggert (2014-10-31):
++
++# This file contains data outside the normal scope of the tz database,
++# in that its zones do not differ from normal tz zones after 1970.
++# Links in this file point to zones in this file, superseding links in
++# the file 'backward'.
++
++# Although zones in this file may be of some use for analyzing
++# pre-1970 time stamps, they are less reliable, cover only a tiny
++# sliver of the pre-1970 era, and cannot feasibly be improved to cover
++# most of the era.  Because the zones are out of normal scope for the
++# database, less effort is put into maintaining this file.  Many of
++# the zones were formerly in other source files, but were removed or
++# replaced by links as their data entries were questionable and/or they
++# differed from other zones only in pre-1970 time stamps.
++
++# Unless otherwise specified, the source for data through 1990 is:
++# Thomas G. Shanks and Rique Pottenger, The International Atlas (6th edition),
++# San Diego: ACS Publications, Inc. (2003).
++# Unfortunately this book contains many errors and cites no sources.
++
++# This file is not intended to be compiled standalone, as it
++# assumes rules from other files.  In the tz distribution, use
++# 'make PACKRATDATA=backzone zones' to compile and install this file.
++
++# Zones are sorted by zone name.  Each zone is preceded by the
++# name of the country that the zone is in, along with any other
++# commentary and rules associated with the entry.
++#
++# As explained in the zic man page, the zone columns are:
++# Zone	NAME		GMTOFF	RULES	FORMAT	[UNTIL]
++
++# Ethiopia
++# From Paul Eggert (2014-07-31):
++# Like the Swahili of Kenya and Tanzania, many Ethiopians keep a
++# 12-hour clock starting at our 06:00, so their "8 o'clock" is our
++# 02:00 or 14:00.  Keep this in mind when you ask the time in Amharic.
++#
++# Shanks & Pottenger write that Ethiopia had six narrowly-spaced time
++# zones between 1870 and 1890, that they merged to 38E50 (2:35:20) in
++# 1890, and that they switched to 3:00 on 1936-05-05.  Perhaps 38E50
++# was for Adis Dera.  Quite likely the Shanks data entries are wrong
++# anyway.
++Zone Africa/Addis_Ababa	2:34:48 -	LMT	1870
++			2:35:20	-	ADMT	1936 May  5 # Adis Dera MT
++			3:00	-	EAT
++
++# Eritrea
++Zone	Africa/Asmara	2:35:32 -	LMT	1870
++			2:35:32	-	AMT	1890        # Asmara Mean Time
++			2:35:20	-	ADMT	1936 May  5 # Adis Dera MT
++			3:00	-	EAT
++Link Africa/Asmara Africa/Asmera
++
++# Mali (southern)
++Zone	Africa/Bamako	-0:32:00 -	LMT	1912
++			 0:00	-	GMT	1934 Feb 26
++			-1:00	-	WAT	1960 Jun 20
++			 0:00	-	GMT
++
++# Central African Republic
++Zone	Africa/Bangui	1:14:20	-	LMT	1912
++			1:00	-	WAT
++
++# Gambia
++Zone	Africa/Banjul	-1:06:36 -	LMT	1912
++			-1:06:36 -	BMT	1935 # Banjul Mean Time
++			-1:00	-	WAT	1964
++			 0:00	-	GMT
++
++# Malawi
++Zone	Africa/Blantyre	2:20:00 -	LMT	1903 Mar
++			2:00	-	CAT
++
++# Republic of the Congo
++Zone Africa/Brazzaville	1:01:08 -	LMT	1912
++			1:00	-	WAT
++
++# Burundi
++Zone Africa/Bujumbura	1:57:28	-	LMT	1890
++			2:00	-	CAT
++
++# Guinea
++Zone	Africa/Conakry	-0:54:52 -	LMT	1912
++			 0:00	-	GMT	1934 Feb 26
++			-1:00	-	WAT	1960
++			 0:00	-	GMT
++
++# Senegal
++Zone	Africa/Dakar	-1:09:44 -	LMT	1912
++			-1:00	-	WAT	1941 Jun
++			 0:00	-	GMT
++
++# Tanzania
++Zone Africa/Dar_es_Salaam 2:37:08 -	LMT	1931
++			3:00	-	EAT	1948
++			2:45	-	BEAUT	1961
++			3:00	-	EAT
++
++# Djibouti
++Zone	Africa/Djibouti	2:52:36 -	LMT	1911 Jul
++			3:00	-	EAT
++
++# Cameroon
++# Whitman says they switched to 1:00 in 1920; go with Shanks & Pottenger.
++Zone	Africa/Douala	0:38:48	-	LMT	1912
++			1:00	-	WAT
++# Sierra Leone
++# From Paul Eggert (2014-08-12):
++# The following table is from Shanks & Pottenger, but it can't be right.
++# Whitman gives Mar 31 - Aug 31 for 1931 on.
++# The International Hydrographic Bulletin, 1932-33, p 63 says that
++# Sierra Leone would advance its clocks by 20 minutes on 1933-10-01.
++# Rule	NAME	FROM	TO	TYPE	IN	ON	AT	SAVE	LETTER/S
++Rule	SL	1935	1942	-	Jun	 1	0:00	0:40	SLST
++Rule	SL	1935	1942	-	Oct	 1	0:00	0	WAT
++Rule	SL	1957	1962	-	Jun	 1	0:00	1:00	SLST
++Rule	SL	1957	1962	-	Sep	 1	0:00	0	GMT
++Zone	Africa/Freetown	-0:53:00 -	LMT	1882
++			-0:53:00 -	FMT	1913 Jun # Freetown Mean Time
++			-1:00	SL	%s	1957
++			 0:00	SL	%s
++
++# Botswana
++# From Paul Eggert (2013-02-21):
++# Milne says they were regulated by the Cape Town Signal in 1899;
++# assume they switched to 2:00 when Cape Town did.
++Zone	Africa/Gaborone	1:43:40 -	LMT	1885
++			1:30	-	SAST	1903 Mar
++			2:00	-	CAT	1943 Sep 19  2:00
++			2:00	1:00	CAST	1944 Mar 19  2:00
++			2:00	-	CAT
++
++# Zimbabwe
++Zone	Africa/Harare	2:04:12 -	LMT	1903 Mar
++			2:00	-	CAT
++
++# South Sudan
++Zone	Africa/Juba	2:06:24 -	LMT	1931
++			2:00	Sudan	CA%sT	2000 Jan 15 12:00
++			3:00	-	EAT
++
++# Uganda
++Zone	Africa/Kampala	2:09:40 -	LMT	1928 Jul
++			3:00	-	EAT	1930
++			2:30	-	BEAT	1948
++			2:45	-	BEAUT	1957
++			3:00	-	EAT
++
++# Rwanda
++Zone	Africa/Kigali	2:00:16 -	LMT	1935 Jun
++			2:00	-	CAT
++
++# Democratic Republic of the Congo (west)
++Zone Africa/Kinshasa	1:01:12 -	LMT	1897 Nov  9
++			1:00	-	WAT
++
++# Gabon
++Zone Africa/Libreville	0:37:48 -	LMT	1912
++			1:00	-	WAT
++
++# Togo
++Zone	Africa/Lome	0:04:52 -	LMT	1893
++			0:00	-	GMT
++
++# Angola
++#
++# Shanks gives 1911-05-26 for the transition to WAT,
++# evidently confusing the date of the Portuguese decree
++# http://dre.pt/pdf1sdip/1911/05/12500/23132313.pdf
++# with the date that it took effect, namely 1912-01-01.
++#
++Zone	Africa/Luanda	0:52:56	-	LMT	1892
++			0:52:04	-	AOT	1912 Jan  1 # Angola Time
++			1:00	-	WAT
++
++# Democratic Republic of the Congo (east)
++Zone Africa/Lubumbashi	1:49:52 -	LMT	1897 Nov 9
++			2:00	-	CAT
++
++# Zambia
++Zone	Africa/Lusaka	1:53:08 -	LMT	1903 Mar
++			2:00	-	CAT
++
++# Equatorial Guinea
++#
++# Although Shanks says that Malabo switched from UT +00 to +01 on 1963-12-15,
++# a Google Books search says that London Calling, Issues 432-465 (1948), p 19,
++# says that Spanish Guinea was at +01 back then.  The Shanks data entries
++# are most likely wrong, but we have nothing better; use them here for now.
++#
++Zone	Africa/Malabo	0:35:08 -	LMT	1912
++			0:00	-	GMT	1963 Dec 15
++			1:00	-	WAT
++
++# Lesotho
++Zone	Africa/Maseru	1:50:00 -	LMT	1903 Mar
++			2:00	-	SAST	1943 Sep 19  2:00
++			2:00	1:00	SAST	1944 Mar 19  2:00
++			2:00	-	SAST
++
++# Swaziland
++Zone	Africa/Mbabane	2:04:24 -	LMT	1903 Mar
++			2:00	-	SAST
++
++# Somalia
++Zone Africa/Mogadishu	3:01:28 -	LMT	1893 Nov
++			3:00	-	EAT	1931
++			2:30	-	BEAT	1957
++			3:00	-	EAT
++
++# Niger
++Zone	Africa/Niamey	 0:08:28 -	LMT	1912
++			-1:00	-	WAT	1934 Feb 26
++			 0:00	-	GMT	1960
++			 1:00	-	WAT
++
++# Mauritania
++Zone Africa/Nouakchott	-1:03:48 -	LMT	1912
++			 0:00	-	GMT	1934 Feb 26
++			-1:00	-	WAT	1960 Nov 28
++			 0:00	-	GMT
++
++# Burkina Faso
++Zone Africa/Ouagadougou	-0:06:04 -	LMT	1912
++			 0:00	-	GMT
++
++# Benin
++# Whitman says they switched to 1:00 in 1946, not 1934;
++# go with Shanks & Pottenger.
++Zone Africa/Porto-Novo	0:10:28	-	LMT	1912 Jan  1
++			0:00	-	GMT	1934 Feb 26
++			1:00	-	WAT
++
++# São Tomé and Príncipe
++Zone	Africa/Sao_Tome	 0:26:56 -	LMT	1884
++			-0:36:32 -	LMT	1912 # Lisbon Mean Time
++			 0:00	-	GMT
++
++# Mali (northern)
++Zone	Africa/Timbuktu	-0:12:04 -	LMT	1912
++			 0:00	-	GMT
++
++# Anguilla
++Zone America/Anguilla	-4:12:16 -	LMT	1912 Mar  2
++			-4:00	-	AST
++
++# Antigua and Barbuda
++Zone	America/Antigua	-4:07:12 -	LMT	1912 Mar 2
++			-5:00	-	EST	1951
++			-4:00	-	AST
++
++# Chubut, Argentina
++# The name "Comodoro Rivadavia" exceeds the 14-byte POSIX limit.
++Zone America/Argentina/ComodRivadavia -4:30:00 - LMT	1894 Oct 31
++			-4:16:48 -	CMT	1920 May
++			-4:00	-	ART	1930 Dec
++			-4:00	Arg	AR%sT	1969 Oct  5
++			-3:00	Arg	AR%sT	1991 Mar  3
++			-4:00	-	WART	1991 Oct 20
++			-3:00	Arg	AR%sT	1999 Oct  3
++			-4:00	Arg	AR%sT	2000 Mar  3
++			-3:00	-	ART	2004 Jun  1
++			-4:00	-	WART	2004 Jun 20
++			-3:00	-	ART
++
++# Aruba
++Zone	America/Aruba	-4:40:24 -	LMT	1912 Feb 12 # Oranjestad
++			-4:30	-	ANT	1965 # Netherlands Antilles Time
++			-4:00	-	AST
++
++# Cayman Is
++Zone	America/Cayman	-5:25:32 -	LMT	1890     # Georgetown
++			-5:07:11 -	KMT	1912 Feb # Kingston Mean Time
++			-5:00	-	EST
++
++# Canada
++Zone America/Coral_Harbour -5:32:40 -	LMT	1884
++			-5:00	NT_YK	E%sT	1946
++			-5:00	-	EST
++
++# Dominica
++Zone America/Dominica	-4:05:36 -	LMT	1911 Jul  1  0:01 # Roseau
++			-4:00	-	AST
++
++# Baja California
++# See 'northamerica' for why this entry is here rather than there.
++Zone America/Ensenada	-7:46:28 -	LMT	1922 Jan  1  0:13:32
++			-8:00	-	PST	1927 Jun 10 23:00
++			-7:00	-	MST	1930 Nov 16
++			-8:00	-	PST	1942 Apr
++			-7:00	-	MST	1949 Jan 14
++			-8:00	-	PST	1996
++			-8:00	Mexico	P%sT
++
++# Grenada
++Zone	America/Grenada	-4:07:00 -	LMT	1911 Jul # St George's
++			-4:00	-	AST
++
++# Guadeloupe
++Zone America/Guadeloupe	-4:06:08 -	LMT	1911 Jun  8 # Pointe-à-Pitre
++			-4:00	 -	AST
++
++# Canada
++#
++# From Paul Eggert (2015-03-24):
++# Since 1970 most of Quebec has been like Toronto; see
++# America/Toronto.  However, earlier versions of the tz database
++# mistakenly relied on data from Shanks & Pottenger saying that Quebec
++# differed from Ontario after 1970, and the following rules and zone
++# were created for most of Quebec from the incorrect Shanks &
++# Pottenger data.  The post-1970 entries have been corrected, but the
++# pre-1970 entries are unchecked and probably have errors.
++#
++# Rule	NAME	FROM	TO	TYPE	IN	ON	AT	SAVE	LETTER/S
++Rule	Mont	1917	only	-	Mar	25	2:00	1:00	D
++Rule	Mont	1917	only	-	Apr	24	0:00	0	S
++Rule	Mont	1919	only	-	Mar	31	2:30	1:00	D
++Rule	Mont	1919	only	-	Oct	25	2:30	0	S
++Rule	Mont	1920	only	-	May	 2	2:30	1:00	D
++Rule	Mont	1920	1922	-	Oct	Sun>=1	2:30	0	S
++Rule	Mont	1921	only	-	May	 1	2:00	1:00	D
++Rule	Mont	1922	only	-	Apr	30	2:00	1:00	D
++Rule	Mont	1924	only	-	May	17	2:00	1:00	D
++Rule	Mont	1924	1926	-	Sep	lastSun	2:30	0	S
++Rule	Mont	1925	1926	-	May	Sun>=1	2:00	1:00	D
++Rule	Mont	1927	1937	-	Apr	lastSat	24:00	1:00	D
++Rule	Mont	1927	1937	-	Sep	lastSat	24:00	0	S
++Rule	Mont	1938	1940	-	Apr	lastSun	0:00	1:00	D
++Rule	Mont	1938	1939	-	Sep	lastSun	0:00	0	S
++Rule	Mont	1946	1973	-	Apr	lastSun	2:00	1:00	D
++Rule	Mont	1945	1948	-	Sep	lastSun	2:00	0	S
++Rule	Mont	1949	1950	-	Oct	lastSun	2:00	0	S
++Rule	Mont	1951	1956	-	Sep	lastSun	2:00	0	S
++Rule	Mont	1957	1973	-	Oct	lastSun	2:00	0	S
++Zone America/Montreal	-4:54:16 -	LMT	1884
++			-5:00	Mont	E%sT	1918
++			-5:00	Canada	E%sT	1919
++			-5:00	Mont	E%sT	1942 Feb  9  2:00s
++			-5:00	Canada	E%sT	1946
++			-5:00	Mont	E%sT	1974
++			-5:00	Canada	E%sT
++
++# Montserrat
++# From Paul Eggert (2006-03-22):
++# In 1995 volcanic eruptions forced evacuation of Plymouth, the capital.
++# world.gazetteer.com says Cork Hill is the most populous location now.
++Zone America/Montserrat	-4:08:52 -	LMT	1911 Jul  1  0:01 # Cork Hill
++			-4:00	-	AST
++
++# Argentina
++# This entry was intended for the following areas, but has been superseded by
++# more detailed zones.
++# Santa Fe (SF), Entre Ríos (ER), Corrientes (CN), Misiones (MN), Chaco (CC),
++# Formosa (FM), La Pampa (LP), Chubut (CH)
++Zone America/Rosario	-4:02:40 -	LMT	1894 Nov
++			-4:16:44 -	CMT	1920 May
++			-4:00	-	ART	1930 Dec
++			-4:00	Arg	AR%sT	1969 Oct  5
++			-3:00	Arg	AR%sT	1991 Jul
++			-3:00	-	ART	1999 Oct  3  0:00
++			-4:00	Arg	AR%sT	2000 Mar  3  0:00
++			-3:00	-	ART
++
++# St Kitts-Nevis
++Zone America/St_Kitts	-4:10:52 -	LMT	1912 Mar  2 # Basseterre
++			-4:00	-	AST
++
++# St Lucia
++Zone America/St_Lucia	-4:04:00 -	LMT	1890 # Castries
++			-4:04:00 -	CMT	1912 # Castries Mean Time
++			-4:00	-	AST
++
++# Virgin Is
++Zone America/St_Thomas	-4:19:44 -	LMT	1911 Jul # Charlotte Amalie
++			-4:00	-	AST
++
++# St Vincent and the Grenadines
++Zone America/St_Vincent	-4:04:56 -	LMT	1890 # Kingstown
++			-4:04:56 -	KMT	1912 # Kingstown Mean Time
++			-4:00	-	AST
++
++# British Virgin Is
++Zone America/Tortola	-4:18:28 -	LMT	1911 Jul # Road Town
++			-4:00	-	AST
++
++# McMurdo, Ross Island, since 1955-12
++Zone Antarctica/McMurdo	0	-	-00	1956
++			12:00	NZ	NZ%sT
++Link Antarctica/McMurdo Antarctica/South_Pole
++
++# Yemen
++# Milne says 2:59:54 was the meridian of the saluting battery at Aden,
++# and that Yemen was at 1:55:56, the meridian of the Hagia Sophia.
++Zone	Asia/Aden	2:59:54	-	LMT	1950
++			3:00	-	AST
++
++# Bahrain
++Zone	Asia/Bahrain	3:22:20 -	LMT	1920     # Manamah
++			4:00	-	GST	1972 Jun
++			3:00	-	AST
++
++# India
++#
++# From Paul Eggert (2014-09-06):
++# The 1876 Report of the Secretary of the [US] Navy, p 305 says that Madras
++# civil time was 5:20:57.3.
++#
++# From Paul Eggert (2014-08-21):
++# In tomorrow's The Hindu, Nitya Menon reports that India had two civil time
++# zones starting in 1884, one in Bombay and one in Calcutta, and that railways
++# used a third time zone based on Madras time (80 deg. 18'30" E).  Also,
++# in 1881 Bombay briefly switched to Madras time, but switched back.  See:
++# http://www.thehindu.com/news/cities/chennai/madras-375-when-madras-clocked-the-time/article6339393.ece
++#Zone	  Asia/Chennai  [not enough info to complete]
++
++# China
++# Long-shu Time (probably due to Long and Shu being two names of that area)
++# Guangxi, Guizhou, Hainan, Ningxia, Sichuan, Shaanxi, and Yunnan;
++# most of Gansu; west Inner Mongolia; west Qinghai; and the Guangdong
++# counties Deqing, Enping, Kaiping, Luoding, Taishan, Xinxing,
++# Yangchun, Yangjiang, Yu'nan, and Yunfu.
++Zone	Asia/Chongqing	7:06:20	-	LMT	1928     # or Chungking
++			7:00	-	LONT	1980 May # Long-shu Time
++			8:00	PRC	C%sT
++Link Asia/Chongqing Asia/Chungking
++
++# Vietnam
++# From Paul Eggert (2014-10-13):
++# See Asia/Ho_Chi_Minh for the source for this data.
++# Trần's book says the 1954-55 transition to 07:00 in Hanoi was in
++# October 1954, with exact date and time unspecified.
++Zone	Asia/Hanoi	7:03:24 -	LMT	1906 Jul  1
++			7:06:30	-	PLMT	1911 May  1
++			7:00	-	ICT	1942 Dec 31 23:00
++			8:00	-	IDT	1945 Mar 14 23:00
++			9:00	-	JST	1945 Sep  2
++			7:00	-	ICT	1947 Apr  1
++			8:00	-	IDT	1954 Oct
++			7:00	-	ICT
++
++# China
++# Changbai Time ("Long-white Time", Long-white = Heilongjiang area)
++# Heilongjiang (except Mohe county), Jilin
++Zone	Asia/Harbin	8:26:44	-	LMT	1928     # or Haerbin
++			8:30	-	CHAT	1932 Mar # Changbai Time
++			8:00	-	CST	1940
++			9:00	-	CHAT	1966 May
++			8:30	-	CHAT	1980 May
++			8:00	PRC	C%sT
++
++# far west China
++Zone	Asia/Kashgar	5:03:56	-	LMT	1928     # or Kashi or Kaxgar
++			5:30	-	KAST	1940     # Kashgar Time
++			5:00	-	KAST	1980 May
++			8:00	PRC	C%sT
++
++# Kuwait
++Zone	Asia/Kuwait	3:11:56 -	LMT	1950
++			3:00	-	AST
++
++
++# Oman
++# Milne says 3:54:24 was the meridian of the Muscat Tidal Observatory.
++Zone	Asia/Muscat	3:54:24 -	LMT	1920
++			4:00	-	GST
++
++# India
++# From Paul Eggert (2014-08-11), after a heads-up from Stephen Colebourne:
++# According to a Portuguese decree (1911-05-26)
++# http://dre.pt/pdf1sdip/1911/05/12500/23132313.pdf
++# Portuguese India switched to UT +05 on 1912-01-01.
++#Zone	Asia/Panaji	[not enough info to complete]
++
++# Cambodia
++# From Paul Eggert (2014-10-11):
++# See Asia/Ho_Chi_Minh for the source for most of this data.  Also, guess
++# (1) Cambodia reverted to UT +07 on 1945-09-02, when Vietnam did, and
++# (2) they also reverted to +07 on 1953-11-09, the date of independence.
++# These guesses are probably wrong but they're better than guessing no
++# transitions there.
++Zone	Asia/Phnom_Penh	6:59:40 -	LMT	1906 Jul  1
++			7:06:30	-	PLMT	1911 May  1
++			7:00	-	ICT	1942 Dec 31 23:00
++			8:00	-	IDT	1945 Mar 14 23:00
++			9:00	-	JST	1945 Sep  2
++			7:00	-	ICT	1947 Apr  1
++			8:00	-	IDT	1953 Nov  9
++			7:00	-	ICT
++
++# Israel
++Zone	Asia/Tel_Aviv	2:19:04 -	LMT	1880
++			2:21	-	JMT	1918
++			2:00	Zion	I%sT
++
++# Laos
++# From Paul Eggert (2014-10-11):
++# See Asia/Ho_Chi_Minh for the source for most of this data.
++# Trần's book says that Laos reverted to UT +07 on 1955-04-15.
++# Also, guess that Laos reverted to +07 on 1945-09-02, when Vietnam did;
++# this is probably wrong but it's better than guessing no transition.
++Zone	Asia/Vientiane	6:50:24 -	LMT	1906 Jul  1
++			7:06:30	-	PLMT	1911 May  1
++			7:00	-	ICT	1942 Dec 31 23:00
++			8:00	-	IDT	1945 Mar 14 23:00
++			9:00	-	JST	1945 Sep  2
++			7:00	-	ICT	1947 Apr  1
++			8:00	-	IDT	1955 Apr 15
++			7:00	-	ICT
++
++# Jan Mayen
++# From Whitman:
++Zone Atlantic/Jan_Mayen	-1:00	-	EGT
++
++# St Helena
++Zone Atlantic/St_Helena	-0:22:48 -	LMT	1890 # Jamestown
++			-0:22:48 -	JMT	1951 # Jamestown Mean Time
++			 0:00	-	GMT
++
++# Northern Ireland
++Zone	Europe/Belfast	-0:23:40 -	LMT	1880 Aug  2
++			-0:25:21 -	DMT	1916 May 21  2:00
++						# DMT = Dublin/Dunsink MT
++			-0:25:21 1:00	IST	1916 Oct  1  2:00s
++						# IST = Irish Summer Time
++			 0:00	GB-Eire	%s	1968 Oct 27
++			 1:00	-	BST	1971 Oct 31  2:00u
++			 0:00	GB-Eire	%s	1996
++			 0:00	EU	GMT/BST
++
++# Guernsey
++# Data from Joseph S. Myers
++# http://mm.icann.org/pipermail/tz/2013-September/019883.html
++# References to be added
++# LMT Location - 49.27N -2.33E - St.Peter Port
++Zone	Europe/Guernsey	-0:09:19 -	LMT	1913 Jun 18
++			 0:00	GB-Eire	%s	1940 Jul  2
++			 1:00	C-Eur	CE%sT	1945 May  8
++			 0:00	GB-Eire	%s	1968 Oct 27
++			 1:00	-	BST	1971 Oct 31  2:00u
++			 0:00	GB-Eire	%s	1996
++			 0:00	EU	GMT/BST
++
++# Isle of Man
++#
++# From Lester Caine (2013-09-04):
++# The Isle of Man legislation is now on-line at
++# <http://www.legislation.gov.im>, starting with the original Statutory
++# Time Act in 1883 and including additional confirmation of some of
++# the dates of the 'Summer Time' orders originating at
++# Westminster.  There is a little uncertainty as to the starting date
++# of the first summer time in 1916 which may have be announced a
++# couple of days late.  There is still a substantial number of
++# documents to work through, but it is thought that every GB change
++# was also implemented on the island.
++#
++# AT4 of 1883 - The Statutory Time et cetera Act 1883 -
++# LMT Location - 54.1508N -4.4814E - Tynwald Hill ( Manx parliament )
++Zone Europe/Isle_of_Man	-0:17:55 -	LMT	1883 Mar 30  0:00s
++			 0:00	GB-Eire	%s	1968 Oct 27
++			 1:00	-	BST	1971 Oct 31  2:00u
++			 0:00	GB-Eire	%s	1996
++			 0:00	EU	GMT/BST
++
++# Jersey
++# Data from Joseph S. Myers
++# http://mm.icann.org/pipermail/tz/2013-September/019883.html
++# References to be added
++# LMT Location - 49.187N -2.107E - St. Helier
++Zone	Europe/Jersey	-0:08:25 -	LMT	1898 Jun 11 16:00u
++			 0:00	GB-Eire	%s	1940 Jul  2
++			 1:00	C-Eur	CE%sT	1945 May  8
++			 0:00	GB-Eire	%s	1968 Oct 27
++			 1:00	-	BST	1971 Oct 31  2:00u
++			 0:00	GB-Eire	%s	1996
++			 0:00	EU	GMT/BST
++
++# Slovenia
++Zone Europe/Ljubljana	0:58:04	-	LMT	1884
++			1:00	-	CET	1941 Apr 18 23:00
++			1:00	C-Eur	CE%sT	1945 May  8  2:00s
++			1:00	1:00	CEST	1945 Sep 16  2:00s
++			1:00	-	CET	1982 Nov 27
++			1:00	EU	CE%sT
++
++# Bosnia and Herzegovina
++Zone	Europe/Sarajevo	1:13:40	-	LMT	1884
++			1:00	-	CET	1941 Apr 18 23:00
++			1:00	C-Eur	CE%sT	1945 May  8  2:00s
++			1:00	1:00	CEST	1945 Sep 16  2:00s
++			1:00	-	CET	1982 Nov 27
++			1:00	EU	CE%sT
++
++# Macedonia
++Zone	Europe/Skopje	1:25:44	-	LMT	1884
++			1:00	-	CET	1941 Apr 18 23:00
++			1:00	C-Eur	CE%sT	1945 May  8  2:00s
++			1:00	1:00	CEST	1945 Sep 16  2:00s
++			1:00	-	CET	1982 Nov 27
++			1:00	EU	CE%sT
++
++# Moldova / Transnistria
++Zone	Europe/Tiraspol	1:58:32	-	LMT	1880
++			1:55	-	CMT	1918 Feb 15 # Chisinau MT
++			1:44:24	-	BMT	1931 Jul 24 # Bucharest MT
++			2:00	Romania	EE%sT	1940 Aug 15
++			2:00	1:00	EEST	1941 Jul 17
++			1:00	C-Eur	CE%sT	1944 Aug 24
++			3:00	Russia	MSK/MSD	1991 Mar 31  2:00
++			2:00	Russia	EE%sT	1992 Jan 19  2:00
++			3:00	Russia	MSK/MSD
++
++# Liechtenstein
++Zone	Europe/Vaduz	0:38:04 -	LMT	1894 Jun
++			1:00	-	CET	1981
++			1:00	EU	CE%sT
++
++# Croatia
++Zone	Europe/Zagreb	1:03:52	-	LMT	1884
++			1:00	-	CET	1941 Apr 18 23:00
++			1:00	C-Eur	CE%sT	1945 May  8  2:00s
++			1:00	1:00	CEST	1945 Sep 16  2:00s
++			1:00	-	CET	1982 Nov 27
++			1:00	EU	CE%sT
++
++# Madagascar
++Zone Indian/Antananarivo 3:10:04 -	LMT	1911 Jul
++			3:00	-	EAT	1954 Feb 27 23:00s
++			3:00	1:00	EAST	1954 May 29 23:00s
++			3:00	-	EAT
++
++# Comoros
++Zone	Indian/Comoro	2:53:04 -	LMT	1911 Jul # Moroni, Gran Comoro
++			3:00	-	EAT
++
++# Mayotte
++Zone	Indian/Mayotte	3:00:56 -	LMT	1911 Jul # Mamoutzou
++			3:00	-	EAT
++
++# US minor outlying islands
++Zone Pacific/Johnston	-10:00	-	HST
++
++# US minor outlying islands
++#
++# From Mark Brader (2005-01-23):
++# [Fallacies and Fantasies of Air Transport History, by R.E.G. Davies,
++# published 1994 by Paladwr Press, McLean, VA, USA; ISBN 0-9626483-5-3]
++# reproduced a Pan American Airways timetable from 1936, for their weekly
++# "Orient Express" flights between San Francisco and Manila, and connecting
++# flights to Chicago and the US East Coast.  As it uses some time zone
++# designations that I've never seen before:....
++# Fri. 6:30A Lv. HONOLOLU (Pearl Harbor), H.I.   H.L.T. Ar. 5:30P Sun.
++#  "   3:00P Ar. MIDWAY ISLAND . . . . . . . . . M.L.T. Lv. 6:00A  "
++#
++Zone Pacific/Midway	-11:49:28 -	LMT	1901
++			-11:00	-	NST	1956 Jun  3
++			-11:00	1:00	NDT	1956 Sep  2
++			-11:00	-	NST	1967 Apr    # N=Nome
++			-11:00	-	BST	1983 Nov 30 # B=Bering
++			-11:00	-	SST	            # S=Samoa
++
++# N Mariana Is
++Zone Pacific/Saipan	-14:17:00 -	LMT	1844 Dec 31
++			 9:43:00 -	LMT	1901
++			 9:00	-	MPT	1969 Oct    # N Mariana Is Time
++			10:00	-	MPT	2000 Dec 23
++			10:00	-	ChST	# Chamorro Standard Time
+--- contrib/tzdata/checklinks.awk.orig
++++ contrib/tzdata/checklinks.awk
+@@ -0,0 +1,48 @@
++# Check links in tz tables.
++
++# Contributed by Paul Eggert.  This file is in the public domain.
++
++BEGIN {
++    # Special marker indicating that the name is defined as a Zone.
++    # It is a newline so that it cannot match a valid name.
++    # It is not null so that its slot does not appear unset.
++    Zone = "\n"
++}
++
++/^Zone/ {
++    if (defined[$2]) {
++	if (defined[$2] == Zone) {
++	    printf "%s: Zone has duplicate definition\n", $2
++	} else {
++	    printf "%s: Link with same name as Zone\n", $2
++	}
++	status = 1
++    }
++    defined[$2] = Zone
++}
++
++/^Link/ {
++    if (defined[$3]) {
++	if (defined[$3] == Zone) {
++	    printf "%s: Link with same name as Zone\n", $3
++	} else if (defined[$3] == $2) {
++	    printf "%s: Link has duplicate definition\n", $3
++	} else {
++	    printf "%s: Link to both %s and %s\n", $3, defined[$3], $2
++	}
++	status = 1
++    }
++    used[$2] = 1
++    defined[$3] = $2
++}
++
++END {
++    for (tz in used) {
++	if (defined[tz] != Zone) {
++	    printf "%s: Link to non-zone\n", tz
++	    status = 1
++	}
++    }
++
++    exit status
++}
++native
+\ No newline at end of property
++FreeBSD=%H
+\ No newline at end of property
++text/plain
+\ No newline at end of property
+--- contrib/tzdata/checktab.awk.orig
++++ contrib/tzdata/checktab.awk
+@@ -0,0 +1,177 @@
++# Check tz tables for consistency.
++
++# Contributed by Paul Eggert.  This file is in the public domain.
++
++BEGIN {
++	FS = "\t"
++
++	if (!iso_table) iso_table = "iso3166.tab"
++	if (!zone_table) zone_table = "zone1970.tab"
++	if (!want_warnings) want_warnings = -1
++
++	while (getline <iso_table) {
++		iso_NR++
++		if ($0 ~ /^#/) continue
++		if (NF != 2) {
++			printf "%s:%d: wrong number of columns\n", \
++				iso_table, iso_NR >>"/dev/stderr"
++			status = 1
++		}
++		cc = $1
++		name = $2
++		if (cc !~ /^[A-Z][A-Z]$/) {
++			printf "%s:%d: invalid country code '%s'\n", \
++				iso_table, iso_NR, cc >>"/dev/stderr"
++			status = 1
++		}
++		if (cc <= cc0) {
++			if (cc == cc0) {
++				s = "duplicate";
++			} else {
++				s = "out of order";
++			}
++
++			printf "%s:%d: country code '%s' is %s\n", \
++				iso_table, iso_NR, cc, s \
++				>>"/dev/stderr"
++			status = 1
++		}
++		cc0 = cc
++		if (name2cc[name]) {
++			printf "%s:%d: '%s' and '%s' have the same name\n", \
++				iso_table, iso_NR, name2cc[name], cc \
++				>>"/dev/stderr"
++			status = 1
++		}
++		name2cc[name] = cc
++		cc2name[cc] = name
++		cc2NR[cc] = iso_NR
++	}
++
++	cc0 = ""
++
++	while (getline <zone_table) {
++		zone_NR++
++		if ($0 ~ /^#/) continue
++		if (NF != 3 && NF != 4) {
++			printf "%s:%d: wrong number of columns\n", \
++				zone_table, zone_NR >>"/dev/stderr"
++			status = 1
++		}
++		split($1, cca, /,/)
++		cc = cca[1]
++		coordinates = $2
++		tz = $3
++		comments = $4
++		if (cc < cc0) {
++			printf "%s:%d: country code '%s' is out of order\n", \
++				zone_table, zone_NR, cc >>"/dev/stderr"
++			status = 1
++		}
++		cc0 = cc
++		tztab[tz] = 1
++		tz2comments[tz] = comments
++		tz2NR[tz] = zone_NR
++		for (i in cca) {
++		    cc = cca[i]
++		    cctz = cc tz
++		    cctztab[cctz] = 1
++		    if (cc2name[cc]) {
++			cc_used[cc]++
++		    } else {
++			printf "%s:%d: %s: unknown country code\n", \
++				zone_table, zone_NR, cc >>"/dev/stderr"
++			status = 1
++		    }
++		}
++		if (coordinates !~ /^[-+][0-9][0-9][0-5][0-9][-+][01][0-9][0-9][0-5][0-9]$/ \
++		    && coordinates !~ /^[-+][0-9][0-9][0-5][0-9][0-5][0-9][-+][01][0-9][0-9][0-5][0-9][0-5][0-9]$/) {
++			printf "%s:%d: %s: invalid coordinates\n", \
++				zone_table, zone_NR, coordinates >>"/dev/stderr"
++			status = 1
++		}
++	}
++
++	for (cctz in cctztab) {
++		cc = substr (cctz, 1, 2)
++		tz = substr (cctz, 3)
++		if (1 < cc_used[cc]) {
++			comments_needed[tz] = cc
++		}
++	}
++	for (cctz in cctztab) {
++	  cc = substr (cctz, 1, 2)
++	  tz = substr (cctz, 3)
++	  if (!comments_needed[tz] && tz2comments[tz]) {
++	    printf "%s:%d: unnecessary comment '%s'\n", \
++		zone_table, tz2NR[tz], tz2comments[tz] \
++		>>"/dev/stderr"
++	    tz2comments[tz] = 0
++	    status = 1
++	  } else if (comments_needed[tz] && !tz2comments[tz]) {
++	    printf "%s:%d: missing comment for %s\n", \
++	      zone_table, tz2NR[tz], comments_needed[tz] \
++	      >>"/dev/stderr"
++	    tz2comments[tz] = 1
++	    status = 1
++	  }
++	}
++	FS = " "
++}
++
++$1 ~ /^#/ { next }
++
++{
++	tz = rules = ""
++	if ($1 == "Zone") {
++		tz = $2
++		ruleUsed[$4] = 1
++	} else if ($1 == "Link" && zone_table == "zone.tab") {
++		# Ignore Link commands if source and destination basenames
++		# are identical, e.g. Europe/Istanbul versus Asia/Istanbul.
++		src = $2
++		dst = $3
++		while ((i = index(src, "/"))) src = substr(src, i+1)
++		while ((i = index(dst, "/"))) dst = substr(dst, i+1)
++		if (src != dst) tz = $3
++	} else if ($1 == "Rule") {
++		ruleDefined[$2] = 1
++	} else {
++		ruleUsed[$2] = 1
++	}
++	if (tz && tz ~ /\//) {
++		if (!tztab[tz]) {
++			printf "%s: no data for '%s'\n", zone_table, tz \
++				>>"/dev/stderr"
++			status = 1
++		}
++		zoneSeen[tz] = 1
++	}
++}
++
++END {
++	for (tz in ruleDefined) {
++		if (!ruleUsed[tz]) {
++			printf "%s: Rule never used\n", tz
++			status = 1
++		}
++	}
++	for (tz in tztab) {
++		if (!zoneSeen[tz]) {
++			printf "%s:%d: no Zone table for '%s'\n", \
++				zone_table, tz2NR[tz], tz >>"/dev/stderr"
++			status = 1
++		}
++	}
++	if (0 < want_warnings) {
++		for (cc in cc2name) {
++			if (!cc_used[cc]) {
++				printf "%s:%d: warning: " \
++					"no Zone entries for %s (%s)\n", \
++					iso_table, cc2NR[cc], cc, cc2name[cc]
++			}
++		}
++	}
++
++	exit status
++}
++native
+\ No newline at end of property
++FreeBSD=%H
+\ No newline at end of property
++text/plain
+\ No newline at end of property
+--- contrib/tzdata/etcetera.orig
++++ contrib/tzdata/etcetera
+@@ -8,6 +8,13 @@
+ # need now for the entries that are not on UTC are for ships at sea
+ # that cannot use POSIX TZ settings.
+ 
++# Starting with POSIX 1003.1-2001, the entries below are all
++# unnecessary as settings for the TZ environment variable.  E.g.,
++# instead of TZ='Etc/GMT+4' one can use the POSIX setting TZ='<-04>+4'.
++#
++# Do not use a POSIX TZ setting like TZ='GMT+4', which is four hours
++# behind GMT but uses the completely misleading abbreviation "GMT".
++
+ Zone	Etc/GMT		0	-	GMT
+ Zone	Etc/UTC		0	-	UTC
+ Zone	Etc/UCT		0	-	UCT
+@@ -26,23 +33,13 @@
+ Link	Etc/GMT				Etc/GMT+0
+ Link	Etc/GMT				Etc/GMT0
+ 
+-# We use POSIX-style signs in the Zone names and the output abbreviations,
++# Be consistent with POSIX TZ settings in the Zone names,
+ # even though this is the opposite of what many people expect.
+ # POSIX has positive signs west of Greenwich, but many people expect
+ # positive signs east of Greenwich.  For example, TZ='Etc/GMT+4' uses
+-# the abbreviation "GMT+4" and corresponds to 4 hours behind UT
++# the abbreviation "-04" and corresponds to 4 hours behind UT
+ # (i.e. west of Greenwich) even though many people would expect it to
+ # mean 4 hours ahead of UT (i.e. east of Greenwich).
+-#
+-# In the draft 5 of POSIX 1003.1-200x, the angle bracket notation allows for
+-# TZ='<GMT-4>+4'; if you want time zone abbreviations conforming to
+-# ISO 8601 you can use TZ='<-0400>+4'.  Thus the commonly-expected
+-# offset is kept within the angle bracket (and is used for display)
+-# while the POSIX sign is kept outside the angle bracket (and is used
+-# for calculation).
+-#
+-# Do not use a TZ setting like TZ='GMT+4', which is four hours behind
+-# GMT but uses the completely misleading abbreviation "GMT".
+ 
+ # Earlier incarnations of this package were not POSIX-compliant,
+ # and had lines such as
+@@ -51,30 +48,31 @@
+ # way does a
+ #		zic -l GMT-12
+ # so we moved the names into the Etc subdirectory.
++# Also, the time zone abbreviations are now compatible with %z.
+ 
+-Zone	Etc/GMT-14	14	-	GMT-14	# 14 hours ahead of GMT
+-Zone	Etc/GMT-13	13	-	GMT-13
+-Zone	Etc/GMT-12	12	-	GMT-12
+-Zone	Etc/GMT-11	11	-	GMT-11
+-Zone	Etc/GMT-10	10	-	GMT-10
+-Zone	Etc/GMT-9	9	-	GMT-9
+-Zone	Etc/GMT-8	8	-	GMT-8
+-Zone	Etc/GMT-7	7	-	GMT-7
+-Zone	Etc/GMT-6	6	-	GMT-6
+-Zone	Etc/GMT-5	5	-	GMT-5
+-Zone	Etc/GMT-4	4	-	GMT-4
+-Zone	Etc/GMT-3	3	-	GMT-3
+-Zone	Etc/GMT-2	2	-	GMT-2
+-Zone	Etc/GMT-1	1	-	GMT-1
+-Zone	Etc/GMT+1	-1	-	GMT+1
+-Zone	Etc/GMT+2	-2	-	GMT+2
+-Zone	Etc/GMT+3	-3	-	GMT+3
+-Zone	Etc/GMT+4	-4	-	GMT+4
+-Zone	Etc/GMT+5	-5	-	GMT+5
+-Zone	Etc/GMT+6	-6	-	GMT+6
+-Zone	Etc/GMT+7	-7	-	GMT+7
+-Zone	Etc/GMT+8	-8	-	GMT+8
+-Zone	Etc/GMT+9	-9	-	GMT+9
+-Zone	Etc/GMT+10	-10	-	GMT+10
+-Zone	Etc/GMT+11	-11	-	GMT+11
+-Zone	Etc/GMT+12	-12	-	GMT+12
++Zone	Etc/GMT-14	14	-	+14
++Zone	Etc/GMT-13	13	-	+13
++Zone	Etc/GMT-12	12	-	+12
++Zone	Etc/GMT-11	11	-	+11
++Zone	Etc/GMT-10	10	-	+10
++Zone	Etc/GMT-9	9	-	+09
++Zone	Etc/GMT-8	8	-	+08
++Zone	Etc/GMT-7	7	-	+07
++Zone	Etc/GMT-6	6	-	+06
++Zone	Etc/GMT-5	5	-	+05
++Zone	Etc/GMT-4	4	-	+04
++Zone	Etc/GMT-3	3	-	+03
++Zone	Etc/GMT-2	2	-	+02
++Zone	Etc/GMT-1	1	-	+01
++Zone	Etc/GMT+1	-1	-	-01
++Zone	Etc/GMT+2	-2	-	-02
++Zone	Etc/GMT+3	-3	-	-03
++Zone	Etc/GMT+4	-4	-	-04
++Zone	Etc/GMT+5	-5	-	-05
++Zone	Etc/GMT+6	-6	-	-06
++Zone	Etc/GMT+7	-7	-	-07
++Zone	Etc/GMT+8	-8	-	-08
++Zone	Etc/GMT+9	-9	-	-09
++Zone	Etc/GMT+10	-10	-	-10
++Zone	Etc/GMT+11	-11	-	-11
++Zone	Etc/GMT+12	-12	-	-12
+--- contrib/tzdata/europe.orig
++++ contrib/tzdata/europe
+@@ -75,8 +75,7 @@
+ #        1:00       CET CEST CEMT Central Europe
+ #        1:00:14    SET           Swedish (1879-1899)*
+ #        2:00       EET EEST      Eastern Europe
+-#        3:00       FET           Further-eastern Europe (2011-2014)*
+-#        3:00       MSK MSD  MSM* Minsk, Moscow
++#        3:00       MSK MSD       Moscow
+ 
+ # From Peter Ilieve (1994-12-04),
+ # The original six [EU members]: Belgium, France, (West) Germany, Italy,
+@@ -583,16 +582,33 @@
+ Rule	E-Eur	1981	max	-	Mar	lastSun	 0:00	1:00	S
+ Rule	E-Eur	1996	max	-	Oct	lastSun	 0:00	0	-
+ 
++
++# Daylight saving time for Russia and the Soviet Union
++#
++# The 1917-1921 decree URLs are from Alexander Belopolsky (2016-08-23).
++
+ # Rule	NAME	FROM	TO	TYPE	IN	ON	AT	SAVE	LETTER/S
+ Rule	Russia	1917	only	-	Jul	 1	23:00	1:00	MST  # Moscow Summer Time
++#
++# Decree No. 142 (1917-12-22) http://istmat.info/node/28137
+ Rule	Russia	1917	only	-	Dec	28	 0:00	0	MMT  # Moscow Mean Time
++#
++# Decree No. 497 (1918-05-30) http://istmat.info/node/30001
+ Rule	Russia	1918	only	-	May	31	22:00	2:00	MDST # Moscow Double Summer Time
+ Rule	Russia	1918	only	-	Sep	16	 1:00	1:00	MST
++#
++# Decree No. 258 (1919-05-29) http://istmat.info/node/37949
+ Rule	Russia	1919	only	-	May	31	23:00	2:00	MDST
+-Rule	Russia	1919	only	-	Jul	 1	 2:00	1:00	MSD
++#
++Rule	Russia	1919	only	-	Jul	 1	 0:00u	1:00	MSD
+ Rule	Russia	1919	only	-	Aug	16	 0:00	0	MSK
++#
++# Decree No. 63 (1921-02-03) http://istmat.info/node/45840
+ Rule	Russia	1921	only	-	Feb	14	23:00	1:00	MSD
+-Rule	Russia	1921	only	-	Mar	20	23:00	2:00	MSM  # Midsummer
++#
++# Decree No. 121 (1921-03-07) http://istmat.info/node/45949
++Rule	Russia	1921	only	-	Mar	20	23:00	2:00	+05
++#
+ Rule	Russia	1921	only	-	Sep	 1	 0:00	1:00	MSD
+ Rule	Russia	1921	only	-	Oct	 1	 0:00	0	-
+ # Act No. 925 of the Council of Ministers of the USSR (1980-10-24):
+@@ -600,16 +616,40 @@
+ Rule	Russia	1981	1983	-	Oct	 1	 0:00	0	-
+ # Act No. 967 of the Council of Ministers of the USSR (1984-09-13), repeated in
+ # Act No. 227 of the Council of Ministers of the USSR (1989-03-14):
+-Rule	Russia	1984	1991	-	Sep	lastSun	 2:00s	0	-
+-Rule	Russia	1985	1991	-	Mar	lastSun	 2:00s	1:00	S
++Rule	Russia	1984	1995	-	Sep	lastSun	 2:00s	0	-
++Rule	Russia	1985	2010	-	Mar	lastSun	 2:00s	1:00	S
+ #
+-Rule	Russia	1992	only	-	Mar	lastSat	 23:00	1:00	S
+-Rule	Russia	1992	only	-	Sep	lastSat	 23:00	0	-
+-Rule	Russia	1993	2010	-	Mar	lastSun	 2:00s	1:00	S
+-Rule	Russia	1993	1995	-	Sep	lastSun	 2:00s	0	-
+ Rule	Russia	1996	2010	-	Oct	lastSun	 2:00s	0	-
+ # As described below, Russia's 2014 change affects Zone data, not Rule data.
+ 
++# From Stepan Golosunov (2016-03-07):
++# Wikipedia and other sources refer to the Act of the Council of
++# Ministers of the USSR from 1988-01-04 No. 5 and the Act of the
++# Council of Ministers of the USSR from 1989-03-14 No. 227.
++#
++# I did not find full texts of these acts.  For the 1989 one we have
++# title at http://base.garant.ru/70754136/ :
++# "About change in calculation of time on the territories of
++# Lithuanian SSR, Latvian SSR and Estonian SSR, Astrakhan,
++# Kaliningrad, Kirov, Kuybyshev, Ulyanovsk and Uralsk oblasts".
++# And http://astrozet.net/files/Zones/DOC/RU/1980-925.txt appears to
++# contain quotes from both acts: Since last Sunday of March 1988 rules
++# of the second time belt are installed in Volgograd and Saratov
++# oblasts.  Since last Sunday of March 1989:
++# a) Lithuanian SSR, Latvian SSR, Estonian SSR, Kaliningrad oblast:
++# second time belt rules without extra hour (Moscow-1);
++# b) Astrakhan, Kirov, Kuybyshev, Ulyanovsk oblasts: second time belt
++# rules (Moscow time)
++# c) Uralsk oblast: third time belt rules (Moscow+1).
++
++# From Stepan Golosunov (2016-03-27):
++# Unamended version of the act of the
++# Government of the Russian Federation No. 23 from 08.01.1992
++# http://pravo.gov.ru/proxy/ips/?docbody=&nd=102014034&rdk=0
++# says that every year clocks were to be moved forward on last Sunday
++# of March at 2 hours and moved backwards on last Sunday of September
++# at 3 hours.  It was amended in 1996 to replace September with October.
++
+ # From Alexander Krivenyshev (2011-06-14):
+ # According to Kremlin press service, Russian President Dmitry Medvedev
+ # signed a federal law "On calculation of time" on June 9, 2011.
+@@ -731,6 +771,14 @@
+ 			1:00	EU	CE%sT
+ 
+ # Belarus
++#
++# From Stepan Golosunov (2016-07-02):
++# http://www.lawbelarus.com/repub/sub30/texf9611.htm
++# (Act of the Cabinet of Ministers of the Republic of Belarus from
++# 1992-03-25 No. 157) ... says clocks were to be moved forward at 2:00
++# on last Sunday of March and backward at 3:00 on last Sunday of September
++# (the same as previous USSR and contemporary Russian regulations).
++#
+ # From Yauhen Kharuzhy (2011-09-16):
+ # By latest Belarus government act Europe/Minsk timezone was changed to
+ # GMT+3 without DST (was GMT+2 with DST).
+@@ -743,8 +791,6 @@
+ # From Alexander Bokovoy (2014-10-09):
+ # Belarussian government decided against changing to winter time....
+ # http://eng.belta.by/all_news/society/Belarus-decides-against-adjusting-time-in-Russias-wake_i_76335.html
+-# From Paul Eggert (2014-10-08):
+-# Hence Belarus can share time zone abbreviations with Moscow again.
+ #
+ # Zone	NAME		GMTOFF	RULES	FORMAT	[UNTIL]
+ Zone	Europe/Minsk	1:50:16 -	LMT	1880
+@@ -754,12 +800,8 @@
+ 			1:00	C-Eur	CE%sT	1944 Jul  3
+ 			3:00	Russia	MSK/MSD	1990
+ 			3:00	-	MSK	1991 Mar 31  2:00s
+-			2:00	1:00	EEST	1991 Sep 29  2:00s
+-			2:00	-	EET	1992 Mar 29  0:00s
+-			2:00	1:00	EEST	1992 Sep 27  0:00s
+ 			2:00	Russia	EE%sT	2011 Mar 27  2:00s
+-			3:00	-	FET	2014 Oct 26  1:00s
+-			3:00	-	MSK
++			3:00	-	+03
+ 
+ # Belgium
+ #
+@@ -1005,6 +1047,12 @@
+ # startkart.no says Thule does not observe DST, but this is clearly an error,
+ # so go with Shanks & Pottenger for Thule transitions until this year.
+ # For 2007 on assume Thule will stay in sync with US DST rules.
++
++# From J William Piggott (2016-02-20):
++# "Greenland north of the community of Scoresbysund" is officially named
++# "National Park" by Executive Order:
++# http://naalakkersuisut.gl/~/media/Nanoq/Files/Attached%20Files/Engelske-tekster/Legislation/Executive%20Order%20National%20Park.rtf
++# It is their only National Park.
+ #
+ # Rule	NAME	FROM	TO	TYPE	IN	ON	AT	SAVE	LETTER/S
+ Rule	Thule	1991	1992	-	Mar	lastSun	2:00	1:00	D
+@@ -1030,6 +1078,10 @@
+ 			-4:00	Thule	A%sT
+ 
+ # Estonia
++#
++# From Paul Eggert (2016-03-18):
++# The 1989 transition is from USSR act No. 227 (1989-03-14).
++#
+ # From Peter Ilieve (1994-10-15):
+ # A relative in Tallinn confirms the accuracy of the data for 1989 onwards
+ # [through 1994] and gives the legal authority for it,
+@@ -1257,7 +1309,7 @@
+ # http://www.parlament-berlin.de/pds-fraktion.nsf/727459127c8b66ee8525662300459099/defc77cb784f180ac1256c2b0030274b/$FILE/bersarint.pdf
+ # says that Bersarin issued an order to use Moscow time on May 20.
+ # However, Moscow did not observe daylight saving in 1945, so
+-# this was equivalent to CEMT (GMT+3), not GMT+4.
++# this was equivalent to UT +03, not +04.
+ 
+ 
+ # Rule	NAME	FROM	TO	TYPE	IN	ON	AT	SAVE	LETTER/S
+@@ -1448,73 +1500,84 @@
+ # But these events all occurred before the 1970 cutoff,
+ # so record only the time in Rome.
+ #
+-# From Paul Eggert (2006-03-22):
+-# For Italian DST we have three sources: Shanks & Pottenger, Whitman, and
+-# F. Pollastri
+-# Day-light Saving Time in Italy (2006-02-03)
+-# http://toi.iriti.cnr.it/uk/ienitlt.html
+-# ('FP' below), taken from an Italian National Electrotechnical Institute
+-# publication. When the three sources disagree, guess who's right, as follows:
+-#
+-# year	FP	Shanks&P. (S)	Whitman (W)	Go with:
+-# 1916	06-03	06-03 24:00	06-03 00:00	FP & W
+-#	09-30	09-30 24:00	09-30 01:00	FP; guess 24:00s
+-# 1917	04-01	03-31 24:00	03-31 00:00	FP & S
+-#	09-30	09-29 24:00	09-30 01:00	FP & W
+-# 1918	03-09	03-09 24:00	03-09 00:00	FP & S
+-#	10-06	10-05 24:00	10-06 01:00	FP & W
+-# 1919	03-01	03-01 24:00	03-01 00:00	FP & S
+-#	10-04	10-04 24:00	10-04 01:00	FP; guess 24:00s
+-# 1920	03-20	03-20 24:00	03-20 00:00	FP & S
+-#	09-18	09-18 24:00	10-01 01:00	FP; guess 24:00s
+-# 1944	04-02	04-03 02:00			S (see C-Eur)
+-#	09-16	10-02 03:00			FP; guess 24:00s
+-# 1945	09-14	09-16 24:00			FP; guess 24:00s
+-# 1970	05-21	05-31 00:00			S
+-#	09-20	09-27 00:00			S
+-#
+-# Rule	NAME	FROM	TO	TYPE	IN	ON	AT	SAVE	LETTER/S
+-Rule	Italy	1916	only	-	Jun	 3	0:00s	1:00	S
+-Rule	Italy	1916	only	-	Oct	 1	0:00s	0	-
+-Rule	Italy	1917	only	-	Apr	 1	0:00s	1:00	S
+-Rule	Italy	1917	only	-	Sep	30	0:00s	0	-
+-Rule	Italy	1918	only	-	Mar	10	0:00s	1:00	S
+-Rule	Italy	1918	1919	-	Oct	Sun>=1	0:00s	0	-
+-Rule	Italy	1919	only	-	Mar	 2	0:00s	1:00	S
+-Rule	Italy	1920	only	-	Mar	21	0:00s	1:00	S
+-Rule	Italy	1920	only	-	Sep	19	0:00s	0	-
+-Rule	Italy	1940	only	-	Jun	15	0:00s	1:00	S
+-Rule	Italy	1944	only	-	Sep	17	0:00s	0	-
+-Rule	Italy	1945	only	-	Apr	 2	2:00	1:00	S
+-Rule	Italy	1945	only	-	Sep	15	0:00s	0	-
+-Rule	Italy	1946	only	-	Mar	17	2:00s	1:00	S
+-Rule	Italy	1946	only	-	Oct	 6	2:00s	0	-
+-Rule	Italy	1947	only	-	Mar	16	0:00s	1:00	S
+-Rule	Italy	1947	only	-	Oct	 5	0:00s	0	-
+-Rule	Italy	1948	only	-	Feb	29	2:00s	1:00	S
+-Rule	Italy	1948	only	-	Oct	 3	2:00s	0	-
+-Rule	Italy	1966	1968	-	May	Sun>=22	0:00	1:00	S
+-Rule	Italy	1966	1969	-	Sep	Sun>=22	0:00	0	-
+-Rule	Italy	1969	only	-	Jun	 1	0:00	1:00	S
+-Rule	Italy	1970	only	-	May	31	0:00	1:00	S
+-Rule	Italy	1970	only	-	Sep	lastSun	0:00	0	-
+-Rule	Italy	1971	1972	-	May	Sun>=22	0:00	1:00	S
+-Rule	Italy	1971	only	-	Sep	lastSun	1:00	0	-
+-Rule	Italy	1972	only	-	Oct	 1	0:00	0	-
+-Rule	Italy	1973	only	-	Jun	 3	0:00	1:00	S
+-Rule	Italy	1973	1974	-	Sep	lastSun	0:00	0	-
+-Rule	Italy	1974	only	-	May	26	0:00	1:00	S
+-Rule	Italy	1975	only	-	Jun	 1	0:00s	1:00	S
+-Rule	Italy	1975	1977	-	Sep	lastSun	0:00s	0	-
+-Rule	Italy	1976	only	-	May	30	0:00s	1:00	S
+-Rule	Italy	1977	1979	-	May	Sun>=22	0:00s	1:00	S
+-Rule	Italy	1978	only	-	Oct	 1	0:00s	0	-
+-Rule	Italy	1979	only	-	Sep	30	0:00s	0	-
++# From Michael Deckers (2016-10-24):
++# http://www.ac-ilsestante.it/MERIDIANE/ora_legale quotes a law of 1893-08-10
++# ... [translated as] "The preceding dispositions will enter into
++# force at the instant at which, according to the time specified in
++# the 1st article, the 1st of November 1893 will begin...."
++#
++# From Pierpaolo Bernardi (2016-10-20):
++# The authoritative source for time in Italy is the national metrological
++# institute, which has a summary page of historical DST data at
++# http://www.inrim.it/res/tf/ora_legale_i.shtml
++# (2016-10-24):
++# http://www.renzobaldini.it/le-ore-legali-in-italia/
++# has still different data for 1944.  It divides Italy in two, as
++# there were effectively two governments at the time, north of Gothic
++# Line German controlled territory, official government RSI, and south
++# of the Gothic Line, controlled by allied armies.
++#
++# From Brian Inglis (2016-10-23):
++# Viceregal LEGISLATIVE DECREE. 14 September 1944, no. 219.
++# Restoration of Standard Time. (044U0219) (OJ 62 of 30.9.1944) ...
++# Given the R. law decreed on 1944-03-29, no. 92, by which standard time is
++# advanced to sixty minutes later starting at hour two on 1944-04-02; ...
++# Starting at hour three on the date 1944-09-17 standard time will be resumed.
++#
++# From Paul Eggert (2016-10-27):
++# Go with INRiM for DST rules, except as corrected by Inglis for 1944
++# for the Kingdom of Italy.  This is consistent with Renzo Baldini.
++# Model Rome's occupation by using using C-Eur rules from 1943-09-10
++# to 1944-06-04; although Rome was an open city during this period, it
++# was effectively controlled by Germany.
++#
++# Rule	NAME	FROM	TO	TYPE	IN	ON	AT	SAVE	LETTER/S
++Rule	Italy	1916	only	-	Jun	 3	24:00	1:00	S
++Rule	Italy	1916	1917	-	Sep	30	24:00	0	-
++Rule	Italy	1917	only	-	Mar	31	24:00	1:00	S
++Rule	Italy	1918	only	-	Mar	 9	24:00	1:00	S
++Rule	Italy	1918	only	-	Oct	 6	24:00	0	-
++Rule	Italy	1919	only	-	Mar	 1	24:00	1:00	S
++Rule	Italy	1919	only	-	Oct	 4	24:00	0	-
++Rule	Italy	1920	only	-	Mar	20	24:00	1:00	S
++Rule	Italy	1920	only	-	Sep	18	24:00	0	-
++Rule	Italy	1940	only	-	Jun	14	24:00	1:00	S
++Rule	Italy	1942	only	-	Nov	 2	 2:00s	0	-
++Rule	Italy	1943	only	-	Mar	29	 2:00s	1:00	S
++Rule	Italy	1943	only	-	Oct	 4	 2:00s	0	-
++Rule	Italy	1944	only	-	Apr	 2	 2:00s	1:00	S
++Rule	Italy	1944	only	-	Sep	17	 2:00s	0	-
++Rule	Italy	1945	only	-	Apr	 2	 2:00	1:00	S
++Rule	Italy	1945	only	-	Sep	15	 1:00	0	-
++Rule	Italy	1946	only	-	Mar	17	 2:00s	1:00	S
++Rule	Italy	1946	only	-	Oct	 6	 2:00s	0	-
++Rule	Italy	1947	only	-	Mar	16	 0:00s	1:00	S
++Rule	Italy	1947	only	-	Oct	 5	 0:00s	0	-
++Rule	Italy	1948	only	-	Feb	29	 2:00s	1:00	S
++Rule	Italy	1948	only	-	Oct	 3	 2:00s	0	-
++Rule	Italy	1966	1968	-	May	Sun>=22	 0:00s	1:00	S
++Rule	Italy	1966	only	-	Sep	24	24:00	0	-
++Rule	Italy	1967	1969	-	Sep	Sun>=22	 0:00s	0	-
++Rule	Italy	1969	only	-	Jun	 1	 0:00s	1:00	S
++Rule	Italy	1970	only	-	May	31	 0:00s	1:00	S
++Rule	Italy	1970	only	-	Sep	lastSun	 0:00s	0	-
++Rule	Italy	1971	1972	-	May	Sun>=22	 0:00s	1:00	S
++Rule	Italy	1971	only	-	Sep	lastSun	 0:00s	0	-
++Rule	Italy	1972	only	-	Oct	 1	 0:00s	0	-
++Rule	Italy	1973	only	-	Jun	 3	 0:00s	1:00	S
++Rule	Italy	1973	1974	-	Sep	lastSun	 0:00s	0	-
++Rule	Italy	1974	only	-	May	26	 0:00s	1:00	S
++Rule	Italy	1975	only	-	Jun	 1	 0:00s	1:00	S
++Rule	Italy	1975	1977	-	Sep	lastSun	 0:00s	0	-
++Rule	Italy	1976	only	-	May	30	 0:00s	1:00	S
++Rule	Italy	1977	1979	-	May	Sun>=22	 0:00s	1:00	S
++Rule	Italy	1978	only	-	Oct	 1	 0:00s	0	-
++Rule	Italy	1979	only	-	Sep	30	 0:00s	0	-
+ # Zone	NAME		GMTOFF	RULES	FORMAT	[UNTIL]
+ Zone	Europe/Rome	0:49:56 -	LMT	1866 Sep 22
+-			0:49:56	-	RMT	1893 Nov  1  0:00s # Rome Mean
+-			1:00	Italy	CE%sT	1942 Nov  2  2:00s
+-			1:00	C-Eur	CE%sT	1944 Jul
++			0:49:56	-	RMT	1893 Oct 31 23:49:56 # Rome Mean
++			1:00	Italy	CE%sT	1943 Sep 10
++			1:00	C-Eur	CE%sT	1944 Jun  4
+ 			1:00	Italy	CE%sT	1980
+ 			1:00	EU	CE%sT
+ 
+@@ -1623,6 +1686,9 @@
+ 
+ # Lithuania
+ 
++# From Paul Eggert (2016-03-18):
++# The 1989 transition is from USSR act No. 227 (1989-03-14).
++
+ # From Paul Eggert (1996-11-22):
+ # IATA SSIM (1992/1996) says Lithuania uses W-Eur rules, but since it is
+ # known to be wrong about Estonia and Latvia, assume it's wrong here too.
+@@ -1662,8 +1728,8 @@
+ 			1:00	-	CET	1940 Aug  3
+ 			3:00	-	MSK	1941 Jun 24
+ 			1:00	C-Eur	CE%sT	1944 Aug
+-			3:00	Russia	MSK/MSD	1991 Mar 31  2:00s
+-			2:00	1:00	EEST	1991 Sep 29  2:00s
++			3:00	Russia	MSK/MSD	1989 Mar 26  2:00s
++			2:00	Russia	EE%sT	1991 Sep 29  2:00s
+ 			2:00	C-Eur	EE%sT	1998
+ 			2:00	-	EET	1998 Mar 29  1:00u
+ 			1:00	EU	CE%sT	1999 Oct 31  1:00u
+@@ -1710,6 +1776,10 @@
+ # See Europe/Belgrade.
+ 
+ # Malta
++#
++# From Paul Eggert (2016-10-21):
++# Assume 1900-1972 was like Rome, overriding Shanks.
++#
+ # Rule	NAME	FROM	TO	TYPE	IN	ON	AT	SAVE	LETTER/S
+ Rule	Malta	1973	only	-	Mar	31	0:00s	1:00	S
+ Rule	Malta	1973	only	-	Sep	29	0:00s	0	-
+@@ -1720,14 +1790,22 @@
+ Rule	Malta	1980	only	-	Mar	31	2:00	1:00	S
+ # Zone	NAME		GMTOFF	RULES	FORMAT	[UNTIL]
+ Zone	Europe/Malta	0:58:04 -	LMT	1893 Nov  2  0:00s # Valletta
+-			1:00	Italy	CE%sT	1942 Nov  2  2:00s
+-			1:00	C-Eur	CE%sT	1945 Apr  2  2:00s
+ 			1:00	Italy	CE%sT	1973 Mar 31
+ 			1:00	Malta	CE%sT	1981
+ 			1:00	EU	CE%sT
+ 
+ # Moldova
+ 
++# From Stepan Golosunov (2016-03-07):
++# the act of the government of the Republic of Moldova Nr. 132 from 1990-05-04
++# http://lex.justice.md/viewdoc.php?action=view&view=doc&id=298782&lang=2
++# ... says that since 1990-05-06 on the territory of the Moldavian SSR
++# time would be calculated as the standard time of the second time belt
++# plus one hour of the "summer" time. To implement that clocks would be
++# adjusted one hour backwards at 1990-05-06 2:00. After that "summer"
++# time would be cancelled last Sunday of September at 3:00 and
++# reintroduced last Sunday of March at 2:00.
++
+ # From Paul Eggert (2006-03-22):
+ # A previous version of this database followed Shanks & Pottenger, who write
+ # that Tiraspol switched to Moscow time on 1992-01-19 at 02:00.
+@@ -1786,9 +1864,7 @@
+ 			2:00	Romania	EE%sT	1940 Aug 15
+ 			2:00	1:00	EEST	1941 Jul 17
+ 			1:00	C-Eur	CE%sT	1944 Aug 24
+-			3:00	Russia	MSK/MSD	1990
+-			3:00	-	MSK	1990 May 6
+-			2:00	-	EET	1991
++			3:00	Russia	MSK/MSD	1990 May  6  2:00
+ 			2:00	Russia	EE%sT	1992
+ 			2:00	E-Eur	EE%sT	1997
+ # See Romania commentary for the guessed 1997 transition to EU rules.
+@@ -1845,7 +1921,7 @@
+ # Amsterdam mean time.
+ 
+ # The data entries before 1945 are taken from
+-# http://www.phys.uu.nl/~vgent/wettijd/wettijd.htm
++# http://www.staff.science.uu.nl/~gent0113/wettijd/wettijd.htm
+ 
+ # Rule	NAME	FROM	TO	TYPE	IN	ON	AT	SAVE	LETTER/S
+ Rule	Neth	1916	only	-	May	 1	0:00	1:00	NST	# Netherlands Summer Time
+@@ -2210,7 +2286,6 @@
+ # http://www.worldtimezone.com/dst_news/dst_news_russia-map-2014-07.html
+ 
+ # From Paul Eggert (2006-03-22):
+-# Except for Moscow after 1919-07-01, I invented the time zone abbreviations.
+ # Moscow time zone abbreviations after 1919-07-01, and Moscow rules after 1991,
+ # are from Andrey A. Chernov.  The rest is from Shanks & Pottenger,
+ # except we follow Chernov's report that 1992 DST transitions were Sat
+@@ -2266,16 +2341,32 @@
+ # Europe/Kaliningrad covers...
+ # 39	RU-KGD	Kaliningrad Oblast
+ 
++# From Paul Eggert (2016-03-18):
++# The 1989 transition is from USSR act No. 227 (1989-03-14).
++
++# From Stepan Golosunov (2016-03-07):
++# http://www.rgo.ru/ru/kaliningradskoe-oblastnoe-otdelenie/ob-otdelenii/publikacii/kak-nam-zhilos-bez-letnego-vremeni
++# confirms that the 1989 change to Moscow-1 was implemented.
++# (The article, though, is misattributed to 1990 while saying that
++# summer->winter transition would be done on the 24 of September. But
++# 1990-09-24 was Monday, while 1989-09-24 was Sunday as expected.)
++# ...
++# http://www.kaliningradka.ru/site_pc/cherez/index.php?ELEMENT_ID=40091
++# says that Kaliningrad switched to Moscow-1 on 1989-03-26, avoided
++# at the last moment switch to Moscow-1 on 1991-03-31, switched to
++# Moscow on 1991-11-03, switched to Moscow-1 on 1992-01-19.
++
+ Zone Europe/Kaliningrad	 1:22:00 -	LMT	1893 Apr
+ 			 1:00	C-Eur	CE%sT	1945
+ 			 2:00	Poland	CE%sT	1946
+-			 3:00	Russia	MSK/MSD	1991 Mar 31  2:00s
++			 3:00	Russia	MSK/MSD	1989 Mar 26  2:00s
+ 			 2:00	Russia	EE%sT	2011 Mar 27  2:00s
+-			 3:00	-	FET	2014 Oct 26  2:00s
++			 3:00	-	+03	2014 Oct 26  2:00s
+ 			 2:00	-	EET
+ 
+ 
+-# From Tim Parenti (2014-07-03), per Oscar van Vlijmen (2001-08-25):
++# From Paul Eggert (2016-02-21), per Tim Parenti (2014-07-03) and
++# Oscar van Vlijmen (2001-08-25):
+ # Europe/Moscow covers...
+ # 01	RU-AD	Adygea, Republic of
+ # 05	RU-DA	Dagestan, Republic of
+@@ -2318,12 +2409,102 @@
+ # 68	RU-TAM	Tambov Oblast
+ # 69	RU-TVE	Tver Oblast
+ # 71	RU-TUL	Tula Oblast
+-# 73	RU-ULY	Ulyanovsk Oblast
+ # 76	RU-YAR	Yaroslavl Oblast
+ # 77	RU-MOW	Moscow
+ # 78	RU-SPE	Saint Petersburg
+ # 83	RU-NEN	Nenets Autonomous Okrug
+ 
++# From Paul Eggert (2016-08-23):
++# The Soviets switched to UT-based time in 1919.  Decree No. 59
++# (1919-02-08) http://istmat.info/node/35567 established UT-based time
++# zones, and Decree No. 147 (1919-03-29) http://istmat.info/node/35854
++# specified a transition date of 1919-07-01, apparently at 00:00 UT.
++# No doubt only the Soviet-controlled regions switched on that date;
++# later transitions to UT-based time in other parts of Russia are
++# taken from what appear to be guesses by Shanks.
++# (Thanks to Alexander Belopolsky for pointers to the decrees.)
++
++# From Stepan Golosunov (2016-03-07):
++# 11. Regions-violators, 1981-1982.
++# Wikipedia refers to
++# http://maps.monetonos.ru/maps/raznoe/Old_Maps/Old_Maps/Articles/022/3_1981.html
++# http://besp.narod.ru/nauka_1981_3.htm
++#
++# The second link provides two articles scanned from the Nauka i Zhizn
++# magazine No. 3, 1981 and a scan of the short article attributed to
++# the Trud newspaper from February 1982.  The first link provides the
++# same Nauka i Zhizn articles converted to the text form (but misses
++# time belt changes map).
++#
++# The second Nauka i Zhizn article says that in addition to
++# introduction of summer time on 1981-04-01 there are some time belt
++# border changes on 1981-10-01, mostly affecting Nenets Autonomous
++# Okrug, Krasnoyarsk Krai, Yakutia, Magadan Oblast and Chukotka
++# according to the provided map (colored one).  In addition to that
++# "time violators" (regions which were not using rules of the time
++# belts in which they were located) would not be moving off the DST on
++# 1981-10-01 to restore the decree time usage.  (Komi ASSR was
++# supposed to repeat that move in October 1982 to account for the 2
++# hour difference.)  Map depicting "time violators" before 1981-10-01
++# is also provided.
++#
++# The article from Trud says that 1981-10-01 changes caused problems
++# and some territories would be moved to pre-1981-10-01 time by not
++# moving to summer time on 1982-04-01.  Namely: Dagestan,
++# Kabardino-Balkar, Kalmyk, Komi, Mari, Mordovian, North Ossetian,
++# Tatar, Chechen-Ingush and Chuvash ASSR, Krasnodar and Stavropol
++# krais, Arkhangelsk, Vladimir, Vologda, Voronezh, Gorky, Ivanovo,
++# Kostroma, Lipetsk, Penza, Rostov, Ryazan, Tambov, Tyumen and
++# Yaroslavl oblasts, Nenets and Evenk autonomous okrugs, Khatangsky
++# district of Taymyr Autonomous Okrug.  As a result Evenk Autonomous
++# Okrug and Khatangsky district of Taymyr Autonomous Okrug would end
++# up on Moscow+4, Tyumen Oblast on Moscow+2 and the rest on Moscow
++# time.
++#
++# http://astrozet.net/files/Zones/DOC/RU/1980-925.txt
++# attributes the 1982 changes to the Act of the Council of Ministers
++# of the USSR No. 126 from 18.02.1982.  1980-925.txt also adds
++# Udmurtia to the list of affected territories and lists Khatangsky
++# district separately from Taymyr Autonomous Okrug.  Probably erroneously.
++#
++# The affected territories are currently listed under Europe/Moscow,
++# Asia/Yekaterinburg and Asia/Krasnoyarsk.
++#
++# 12. Udmurtia
++# The fact that Udmurtia is depicted as a violator in the Nauka i
++# Zhizn article hints at Izhevsk being on different time from
++# Kuybyshev before 1981-10-01. Udmurtia is not mentioned in the 1989 act.
++# http://astrozet.net/files/Zones/DOC/RU/1980-925.txt
++# implies Udmurtia was on Moscow time after 1982-04-01.
++# Wikipedia implies Udmurtia being on Moscow+1 until 1991.
++#
++# ...
++#
++# All Russian zones are supposed to have by default a -1 change at
++# 1991-03-31 2:00 (cancellation of the decree time in the USSR) and a +1
++# change at 1992-01-19 2:00 (restoration of the decree time in Russia).
++#
++# There were some exceptions, though.
++# Wikipedia says newspapers listed Astrakhan, Saratov, Kirov, Volgograd,
++# Izhevsk, Grozny, Kazan and Samara as such exceptions for the 1992
++# change. (Different newspapers providing different lists. And some
++# lists found in the internet are quite wild.)
++#
++# And apparently some exceptions were reverted in the last moment.
++# http://www.kaliningradka.ru/site_pc/cherez/index.php?ELEMENT_ID=40091
++# says that Kaliningrad decided not to be an exception 2 days before the
++# 1991-03-31 switch and one person at
++# http://izhevsk.ru/forum_light_message/50/682597-m8369040.html
++# says he remembers that Samara opted out of the 1992-01-19 exception
++# 2 days before the switch.
++#
++#
++# From Paul Eggert (2016-03-18):
++# Given the above, we appear to be missing some Zone entries for the
++# chaotic early 1980s in Russia.  It's not clear what these entries
++# should be.  For now, sweep this under the rug and just document the
++# time in Moscow.
++
+ # From Vladimir Karpinsky (2014-07-08):
+ # LMT in Moscow (before Jul 3, 1916) is 2:30:17, that was defined by Moscow
+ # Observatory (coordinates: 55 deg. 45'29.70", 37 deg. 34'05.30")....
+@@ -2344,7 +2525,7 @@
+ 
+ Zone Europe/Moscow	 2:30:17 -	LMT	1880
+ 			 2:30:17 -	MMT	1916 Jul  3 # Moscow Mean Time
+-			 2:31:19 Russia	%s	1919 Jul  1  2:00
++			 2:31:19 Russia	%s	1919 Jul  1  0:00u
+ 			 3:00	Russia	%s	1921 Oct
+ 			 3:00	Russia	MSK/MSD	1922 Oct
+ 			 2:00	-	EET	1930 Jun 21
+@@ -2397,47 +2578,101 @@
+ 			 3:00	-	MSK
+ 
+ 
+-# From Tim Parenti (2014-07-03):
+-# Europe/Volgograd covers...
++# From Paul Eggert (2016-03-18):
++# Europe/Astrakhan covers:
+ # 30	RU-AST	Astrakhan Oblast
++#
++# The 1989 transition is from USSR act No. 227 (1989-03-14).
++
++# From Alexander Krivenyshev (2016-01-12):
++# On February 10, 2016 Astrakhan Oblast got approval by the Federation
++# Council to change its time zone to UTC+4 (from current UTC+3 Moscow time)....
++# This Federal Law shall enter into force on 27 March 2016 at 02:00.
++# From Matt Johnson (2016-03-09):
++# http://publication.pravo.gov.ru/Document/View/0001201602150056
++
++Zone Europe/Astrakhan	 3:12:12 -	LMT	1924 May
++			 3:00	-	+03	1930 Jun 21
++			 4:00	Russia	+04/+05	1989 Mar 26  2:00s
++			 3:00	Russia	+03/+04	1991 Mar 31  2:00s
++			 4:00	-	+04	1992 Mar 29  2:00s
++			 3:00	Russia	+03/+04	2011 Mar 27  2:00s
++			 4:00	-	+04	2014 Oct 26  2:00s
++			 3:00	-	+03	2016 Mar 27  2:00s
++			 4:00	-	+04
++
++# From Paul Eggert (2016-03-18):
++# Europe/Volgograd covers:
+ # 34	RU-VGG	Volgograd Oblast
+-# 43	RU-KIR	Kirov Oblast
+ # 64	RU-SAR	Saratov Oblast
+-
+-# From Paul Eggert (2006-05-09):
+-# Shanks & Pottenger say Kirov is still at +0400 but Wikipedia says +0300.
+-# Perhaps it switched after the others?  But we have no data.
++# The 1988 transition is from USSR act No. 5 (1988-01-04).
+ 
+ Zone Europe/Volgograd	 2:57:40 -	LMT	1920 Jan  3
+-			 3:00	-	TSAT	1925 Apr  6 # Tsaritsyn Time
+-			 3:00	-	STAT	1930 Jun 21 # Stalingrad Time
+-			 4:00	-	STAT	1961 Nov 11
+-			 4:00	Russia	VOL%sT	1989 Mar 26  2:00s # Volgograd T
+-			 3:00	Russia	VOL%sT	1991 Mar 31  2:00s
+-			 4:00	-	VOLT	1992 Mar 29  2:00s
+-			 3:00	Russia	MSK/MSD	2011 Mar 27  2:00s
+-			 4:00	-	MSK	2014 Oct 26  2:00s
+-			 3:00	-	MSK
++			 3:00	-	+03	1930 Jun 21
++			 4:00	-	+04	1961 Nov 11
++			 4:00	Russia	+04/+05	1988 Mar 27  2:00s
++			 3:00	Russia	+03/+04	1991 Mar 31  2:00s
++			 4:00	-	+04	1992 Mar 29  2:00s
++			 3:00	Russia	+03/+04	2011 Mar 27  2:00s
++			 4:00	-	+04	2014 Oct 26  2:00s
++			 3:00	-	+03
+ 
++# From Paul Eggert (2016-03-18):
++# Europe/Kirov covers:
++# 43	RU-KIR	Kirov Oblast
++# The 1989 transition is from USSR act No. 227 (1989-03-14).
++#
++Zone Europe/Kirov	 3:18:48 -	LMT	1919 Jul  1  0:00u
++			 3:00	-	+03	1930 Jun 21
++			 4:00	Russia	+04/+05	1989 Mar 26  2:00s
++			 3:00	Russia	+03/+04	1991 Mar 31  2:00s
++			 4:00	-	+04	1992 Mar 29  2:00s
++			 3:00	Russia	+03/+04	2011 Mar 27  2:00s
++			 4:00	-	+04	2014 Oct 26  2:00s
++			 3:00	-	+03
+ 
+ # From Tim Parenti (2014-07-03), per Oscar van Vlijmen (2001-08-25):
+ # Europe/Samara covers...
+ # 18	RU-UD	Udmurt Republic
+ # 63	RU-SAM	Samara Oblast
+ 
++# From Paul Eggert (2016-03-18):
+ # Byalokoz 1919 says Samara was 3:20:20.
++# The 1989 transition is from USSR act No. 227 (1989-03-14).
+ 
+-Zone Europe/Samara	 3:20:20 -	LMT	1919 Jul  1  2:00
+-			 3:00	-	SAMT	1930 Jun 21
+-			 4:00	-	SAMT	1935 Jan 27
+-			 4:00	Russia	KUY%sT	1989 Mar 26  2:00s # Kuybyshev
+-			 3:00	Russia	MSK/MSD	1991 Mar 31  2:00s
+-			 2:00	Russia	EE%sT	1991 Sep 29  2:00s
+-			 3:00	-	KUYT	1991 Oct 20  3:00
+-			 4:00	Russia	SAM%sT	2010 Mar 28  2:00s # Samara Time
+-			 3:00	Russia	SAM%sT	2011 Mar 27  2:00s
+-			 4:00	-	SAMT
++Zone Europe/Samara	 3:20:20 -	LMT	1919 Jul  1  0:00u
++			 3:00	-	+03	1930 Jun 21
++			 4:00	-	+04	1935 Jan 27
++			 4:00	Russia	+04/+05	1989 Mar 26  2:00s
++			 3:00	Russia	+03/+04	1991 Mar 31  2:00s
++			 2:00	Russia	+02/+03	1991 Sep 29  2:00s
++			 3:00	-	+03	1991 Oct 20  3:00
++			 4:00	Russia	+04/+05	2010 Mar 28  2:00s
++			 3:00	Russia	+03/+04	2011 Mar 27  2:00s
++			 4:00	-	+04
++
++# From Paul Eggert (2016-03-18):
++# Europe/Ulyanovsk covers:
++# 73	RU-ULY	Ulyanovsk Oblast
+ 
++# The 1989 transition is from USSR act No. 227 (1989-03-14).
++
++# From Alexander Krivenyshev (2016-02-17):
++# Ulyanovsk ... on their way to change time zones by March 27, 2016 at 2am.
++# Ulyanovsk Oblast ... from MSK to MSK+1 (UTC+3 to UTC+4) ...
++# 920582-6 ... 02/17/2016 The State Duma passed the bill in the first reading.
++# From Matt Johnson (2016-03-09):
++# http://publication.pravo.gov.ru/Document/View/0001201603090051
++
++Zone Europe/Ulyanovsk	 3:13:36 -	LMT	1919 Jul  1  0:00u
++			 3:00	-	+03	1930 Jun 21
++			 4:00	Russia	+04/+05	1989 Mar 26  2:00s
++			 3:00	Russia	+03/+04	1991 Mar 31  2:00s
++			 2:00	Russia	+02/+03	1992 Jan 19  2:00s
++			 3:00	Russia	+03/+04	2011 Mar 27  2:00s
++			 4:00	-	+04	2014 Oct 26  2:00s
++			 3:00	-	+03	2016 Mar 27  2:00s
++			 4:00	-	+04
+ 
+ # From Tim Parenti (2014-07-03), per Oscar van Vlijmen (2001-08-25):
+ # Asia/Yekaterinburg covers...
+@@ -2461,47 +2696,140 @@
+ 
+ Zone Asia/Yekaterinburg	 4:02:33 -	LMT	1916 Jul  3
+ 			 3:45:05 -	PMT	1919 Jul 15  4:00
+-			 4:00	-	SVET	1930 Jun 21 # Sverdlovsk Time
+-			 5:00	Russia	SVE%sT	1991 Mar 31  2:00s
+-			 4:00	Russia	SVE%sT	1992 Jan 19  2:00s
+-			 5:00	Russia	YEK%sT	2011 Mar 27  2:00s
+-			 6:00	-	YEKT	2014 Oct 26  2:00s
+-			 5:00	-	YEKT
++			 4:00	-	+04	1930 Jun 21
++			 5:00	Russia	+05/+06	1991 Mar 31  2:00s
++			 4:00	Russia	+04/+05	1992 Jan 19  2:00s
++			 5:00	Russia	+05/+06	2011 Mar 27  2:00s
++			 6:00	-	+06	2014 Oct 26  2:00s
++			 5:00	-	+05
+ 
+ 
+ # From Tim Parenti (2014-07-03), per Oscar van Vlijmen (2001-08-25):
+ # Asia/Omsk covers...
+-# 04	RU-AL	Altai Republic
+-# 22	RU-ALT	Altai Krai
+ # 55	RU-OMS	Omsk Oblast
+ 
+ # Byalokoz 1919 says Omsk was 4:53:30.
+ 
+ Zone Asia/Omsk		 4:53:30 -	LMT	1919 Nov 14
+-			 5:00	-	OMST	1930 Jun 21 # Omsk Time
+-			 6:00	Russia	OMS%sT	1991 Mar 31  2:00s
+-			 5:00	Russia	OMS%sT	1992 Jan 19  2:00s
+-			 6:00	Russia	OMS%sT	2011 Mar 27  2:00s
+-			 7:00	-	OMST	2014 Oct 26  2:00s
+-			 6:00	-	OMST
++			 5:00	-	+05	1930 Jun 21
++			 6:00	Russia	+06/+07	1991 Mar 31  2:00s
++			 5:00	Russia	+05/+06	1992 Jan 19  2:00s
++			 6:00	Russia	+06/+07	2011 Mar 27  2:00s
++			 7:00	-	+07	2014 Oct 26  2:00s
++			 6:00	-	+06
+ 
++# From Paul Eggert (2016-02-22):
++# Asia/Barnaul covers:
++# 04	RU-AL	Altai Republic
++# 22	RU-ALT	Altai Krai
+ 
+-# From Tim Parenti (2014-07-03):
+-# Asia/Novosibirsk covers...
++# Data before 1991 are from Shanks & Pottenger.
++
++# From Stepan Golosunov (2016-03-07):
++# Letter of Bank of Russia from 1995-05-25
++# http://www.bestpravo.ru/rossijskoje/lj-akty/y3a.htm
++# suggests that Altai Republic transitioned to Moscow+3 on
++# 1995-05-28.
++#
++# http://regnum.ru/news/society/1957270.html
++# has some historical data for Altai Krai:
++# before 1957: west part on UTC+6, east on UTC+7
++# after 1957: UTC+7
++# since 1995: UTC+6
++# http://barnaul.rusplt.ru/index/pochemu_altajskij_kraj_okazalsja_v_neprivychnom_chasovom_pojase-17648.html
++# confirms that and provides more details including 1995-05-28 transition date.
++
++# From Alexander Krivenyshev (2016-02-17):
++# Altai Krai and Altai Republic on their way to change time zones
++# by March 27, 2016 at 2am....
++# Altai Republic / Gorno-Altaysk MSK+3 to MSK+4 (UTC+6 to UTC+7) ...
++# Altai Krai / Barnaul MSK+3 to MSK+4 (UTC+6 to UTC+7)
++# From Matt Johnson (2016-03-09):
++# http://publication.pravo.gov.ru/Document/View/0001201603090043
++# http://publication.pravo.gov.ru/Document/View/0001201603090038
++
++Zone Asia/Barnaul	 5:35:00 -	LMT	1919 Dec 10
++			 6:00	-	+06	1930 Jun 21
++			 7:00	Russia	+07/+08	1991 Mar 31  2:00s
++			 6:00	Russia	+06/+07	1992 Jan 19  2:00s
++			 7:00	Russia	+07/+08	1995 May 28
++			 6:00	Russia	+06/+07	2011 Mar 27  2:00s
++			 7:00	-	+07	2014 Oct 26  2:00s
++			 6:00	-	+06	2016 Mar 27  2:00s
++			 7:00	-	+07
++
++# From Paul Eggert (2016-03-18):
++# Asia/Novosibirsk covers:
+ # 54	RU-NVS	Novosibirsk Oblast
+-# 70	RU-TOM	Tomsk Oblast
+ 
+-# From Paul Eggert (2006-08-19): I'm guessing about Tomsk here; it's
+-# not clear when it switched from +7 to +6.
++# From Stepan Golosunov (2016-05-30):
++# http://asozd2.duma.gov.ru/main.nsf/(Spravka)?OpenAgent&RN=1085784-6
++# moves Novosibirsk oblast from UTC+6 to UTC+7.
++# From Stepan Golosunov (2016-07-04):
++# The law was signed yesterday and published today on
++# http://publication.pravo.gov.ru/Document/View/0001201607040064
+ 
+ Zone Asia/Novosibirsk	 5:31:40 -	LMT	1919 Dec 14  6:00
+-			 6:00	-	NOVT	1930 Jun 21 # Novosibirsk Time
+-			 7:00	Russia	NOV%sT	1991 Mar 31  2:00s
+-			 6:00	Russia	NOV%sT	1992 Jan 19  2:00s
+-			 7:00	Russia	NOV%sT	1993 May 23 # say Shanks & P.
+-			 6:00	Russia	NOV%sT	2011 Mar 27  2:00s
+-			 7:00	-	NOVT	2014 Oct 26  2:00s
+-			 6:00	-	NOVT
++			 6:00	-	+06	1930 Jun 21
++			 7:00	Russia	+07/+08	1991 Mar 31  2:00s
++			 6:00	Russia	+06/+07	1992 Jan 19  2:00s
++			 7:00	Russia	+07/+08	1993 May 23 # say Shanks & P.
++			 6:00	Russia	+06/+07	2011 Mar 27  2:00s
++			 7:00	-	+07	2014 Oct 26  2:00s
++			 6:00	-	+06	2016 Jul 24  2:00s
++			 7:00	-	+07
++
++# From Paul Eggert (2016-03-18):
++# Asia/Tomsk covers:
++# 70	RU-TOM	Tomsk Oblast
++
++# From Stepan Golosunov (2016-03-24):
++# Byalokoz listed Tomsk at 5:39:51.
++
++# From Stanislaw A. Kuzikowski (1994-06-29):
++# Tomsk is still 4 hours ahead of Moscow.
++
++# From Stepan Golosunov (2016-03-19):
++# http://pravo.gov.ru/proxy/ips/?docbody=&nd=102075743
++# (fifth time belt being UTC+5+1(decree time)
++# / UTC+5+1(decree time)+1(summer time)) ...
++# Note that time belts (numbered from 2 (Moscow) to 12 according to their
++# GMT/UTC offset and having too many exceptions like regions formally
++# belonging to one belt but using time from another) were replaced
++# with time zones in 2011 with different numbering (there was a
++# 2-hour gap between second and third zones in 2011-2014).
++
++# From Stepan Golosunov (2016-04-12):
++# http://asozd2.duma.gov.ru/main.nsf/(SpravkaNew)?OpenAgent&RN=1006865-6
++# This bill was approved in the first reading today.  It moves Tomsk oblast
++# from UTC+6 to UTC+7 and is supposed to come into effect on 2016-05-29 at
++# 2:00.  The bill needs to be approved in the second and the third readings by
++# the State Duma, approved by the Federation Council, signed by the President
++# and published to become a law.  Minor changes in the text are to be expected
++# before the second reading (references need to be updated to account for the
++# recent changes).
++#
++# Judging by the ultra-short one-day amendments period, recent similar laws,
++# the State Duma schedule and the Federation Council schedule
++# http://www.duma.gov.ru/legislative/planning/day-shedule/por_vesna_2016/
++# http://council.gov.ru/activity/meetings/schedule/63303
++# I speculate that the final text of the bill will be proposed tomorrow, the
++# bill will be approved in the second and the third readings on Friday,
++# approved by the Federation Council on 2016-04-20, signed by the President and
++# published as a law around 2016-04-26.
++
++# From Matt Johnson (2016-04-26):
++# http://publication.pravo.gov.ru/Document/View/0001201604260048
++
++Zone	Asia/Tomsk	 5:39:51 -	LMT	1919 Dec 22
++			 6:00	-	+06	1930 Jun 21
++			 7:00	Russia	+07/+08	1991 Mar 31  2:00s
++			 6:00	Russia	+06/+07	1992 Jan 19  2:00s
++			 7:00	Russia	+07/+08	2002 May  1  3:00
++			 6:00	Russia	+06/+07	2011 Mar 27  2:00s
++			 7:00	-	+07	2014 Oct 26  2:00s
++			 6:00	-	+06	2016 May 29  2:00s
++			 7:00	-	+07
+ 
+ 
+ # From Tim Parenti (2014-07-03):
+@@ -2526,23 +2854,18 @@
+ #
+ # Thus, when Russia will switch to DST on the night of March 28, 2010
+ # Kemerovo region (Kemerovo oblast') will not change the clock.
+-#
+-# As a result, Kemerovo oblast' will be in the same time zone as
+-# Novosibirsk, Omsk, Tomsk, Barnaul and Altai Republic.
+ 
+ # From Tim Parenti (2014-07-02), per Alexander Krivenyshev (2014-07-02):
+ # The Kemerovo region will remain at UTC+7 through the 2014-10-26 change, thus
+ # realigning itself with KRAT.
+ 
+ Zone Asia/Novokuznetsk	 5:48:48 -	LMT	1924 May  1
+-			 6:00	-	KRAT	1930 Jun 21 # Krasnoyarsk Time
+-			 7:00	Russia	KRA%sT	1991 Mar 31  2:00s
+-			 6:00	Russia	KRA%sT	1992 Jan 19  2:00s
+-			 7:00	Russia	KRA%sT	2010 Mar 28  2:00s
+-			 6:00	Russia	NOV%sT	2011 Mar 27  2:00s # Novosibirsk
+-			 7:00	-	NOVT	2014 Oct 26  2:00s
+-			 7:00	-	KRAT	# Krasnoyarsk Time
+-
++			 6:00	-	+06	1930 Jun 21
++			 7:00	Russia	+07/+08	1991 Mar 31  2:00s
++			 6:00	Russia	+06/+07	1992 Jan 19  2:00s
++			 7:00	Russia	+07/+08	2010 Mar 28  2:00s
++			 6:00	Russia	+06/+07	2011 Mar 27  2:00s
++			 7:00	-	+07
+ 
+ # From Tim Parenti (2014-07-03), per Oscar van Vlijmen (2001-08-25):
+ # Asia/Krasnoyarsk covers...
+@@ -2556,12 +2879,12 @@
+ # Byalokoz 1919 says Krasnoyarsk was 6:11:26.
+ 
+ Zone Asia/Krasnoyarsk	 6:11:26 -	LMT	1920 Jan  6
+-			 6:00	-	KRAT	1930 Jun 21 # Krasnoyarsk Time
+-			 7:00	Russia	KRA%sT	1991 Mar 31  2:00s
+-			 6:00	Russia	KRA%sT	1992 Jan 19  2:00s
+-			 7:00	Russia	KRA%sT	2011 Mar 27  2:00s
+-			 8:00	-	KRAT	2014 Oct 26  2:00s
+-			 7:00	-	KRAT
++			 6:00	-	+06	1930 Jun 21
++			 7:00	Russia	+07/+08	1991 Mar 31  2:00s
++			 6:00	Russia	+06/+07	1992 Jan 19  2:00s
++			 7:00	Russia	+07/+08	2011 Mar 27  2:00s
++			 8:00	-	+08	2014 Oct 26  2:00s
++			 7:00	-	+07
+ 
+ 
+ # From Tim Parenti (2014-07-03), per Oscar van Vlijmen (2001-08-25):
+@@ -2578,12 +2901,12 @@
+ 
+ Zone Asia/Irkutsk	 6:57:05 -	LMT	1880
+ 			 6:57:05 -	IMT	1920 Jan 25 # Irkutsk Mean Time
+-			 7:00	-	IRKT	1930 Jun 21 # Irkutsk Time
+-			 8:00	Russia	IRK%sT	1991 Mar 31  2:00s
+-			 7:00	Russia	IRK%sT	1992 Jan 19  2:00s
+-			 8:00	Russia	IRK%sT	2011 Mar 27  2:00s
+-			 9:00	-	IRKT	2014 Oct 26  2:00s
+-			 8:00	-	IRKT
++			 7:00	-	+07	1930 Jun 21
++			 8:00	Russia	+08/+09	1991 Mar 31  2:00s
++			 7:00	Russia	+07/+08	1992 Jan 19  2:00s
++			 8:00	Russia	+08/+09	2011 Mar 27  2:00s
++			 9:00	-	+09	2014 Oct 26  2:00s
++			 8:00	-	+08
+ 
+ 
+ # From Tim Parenti (2014-07-06):
+@@ -2593,13 +2916,20 @@
+ # Note: Effective 2008-03-01, (75) Chita Oblast and (80) Agin-Buryat
+ # Autonomous Okrug merged to form (92, RU-ZAB) Zabaykalsky Krai.
+ 
++# From Alexander Krivenyshev (2016-01-02):
++# [The] time zone in the Trans-Baikal Territory (Zabaykalsky Krai) -
++# Asia/Chita [is changing] from UTC+8 to UTC+9.  Effective date will
++# be March 27, 2016 at 2:00am....
++# http://publication.pravo.gov.ru/Document/View/0001201512300107
++
+ Zone Asia/Chita	 7:33:52 -	LMT	1919 Dec 15
+-			 8:00	-	YAKT	1930 Jun 21 # Yakutsk Time
+-			 9:00	Russia	YAK%sT	1991 Mar 31  2:00s
+-			 8:00	Russia	YAK%sT	1992 Jan 19  2:00s
+-			 9:00	Russia	YAK%sT	2011 Mar 27  2:00s
+-			10:00	-	YAKT	2014 Oct 26  2:00s
+-			 8:00	-	IRKT
++			 8:00	-	+08	1930 Jun 21
++			 9:00	Russia	+09/+10	1991 Mar 31  2:00s
++			 8:00	Russia	+08/+09	1992 Jan 19  2:00s
++			 9:00	Russia	+09/+10	2011 Mar 27  2:00s
++			10:00	-	+10	2014 Oct 26  2:00s
++			 8:00	-	+08	2016 Mar 27  2:00
++			 9:00	-	+09
+ 
+ 
+ # From Tim Parenti (2014-07-03), per Oscar van Vlijmen (2009-11-29):
+@@ -2639,12 +2969,12 @@
+ # Byalokoz 1919 says Yakutsk was 8:38:58.
+ 
+ Zone Asia/Yakutsk	 8:38:58 -	LMT	1919 Dec 15
+-			 8:00	-	YAKT	1930 Jun 21 # Yakutsk Time
+-			 9:00	Russia	YAK%sT	1991 Mar 31  2:00s
+-			 8:00	Russia	YAK%sT	1992 Jan 19  2:00s
+-			 9:00	Russia	YAK%sT	2011 Mar 27  2:00s
+-			10:00	-	YAKT	2014 Oct 26  2:00s
+-			 9:00	-	YAKT
++			 8:00	-	+08	1930 Jun 21
++			 9:00	Russia	+09/+10	1991 Mar 31  2:00s
++			 8:00	Russia	+08/+09	1992 Jan 19  2:00s
++			 9:00	Russia	+09/+10	2011 Mar 27  2:00s
++			10:00	-	+10	2014 Oct 26  2:00s
++			 9:00	-	+09
+ 
+ 
+ # From Tim Parenti (2014-07-03), per Oscar van Vlijmen (2009-11-29):
+@@ -2662,12 +2992,12 @@
+ # Go with Byalokoz.
+ 
+ Zone Asia/Vladivostok	 8:47:31 -	LMT	1922 Nov 15
+-			 9:00	-	VLAT	1930 Jun 21 # Vladivostok Time
+-			10:00	Russia	VLA%sT	1991 Mar 31  2:00s
+-			 9:00	Russia	VLA%sT	1992 Jan 19  2:00s
+-			10:00	Russia	VLA%sT	2011 Mar 27  2:00s
+-			11:00	-	VLAT	2014 Oct 26  2:00s
+-			10:00	-	VLAT
++			 9:00	-	+09	1930 Jun 21
++			10:00	Russia	+10/+11	1991 Mar 31  2:00s
++			 9:00	Russia	+09/+10	1992 Jan 19  2:00s
++			10:00	Russia	+10/+11	2011 Mar 27  2:00s
++			11:00	-	+11	2014 Oct 26  2:00s
++			10:00	-	+10
+ 
+ 
+ # From Tim Parenti (2014-07-03):
+@@ -2685,14 +3015,14 @@
+ # This transition is no doubt wrong, but we have no better info.
+ 
+ Zone Asia/Khandyga	 9:02:13 -	LMT	1919 Dec 15
+-			 8:00	-	YAKT	1930 Jun 21 # Yakutsk Time
+-			 9:00	Russia	YAK%sT	1991 Mar 31  2:00s
+-			 8:00	Russia	YAK%sT	1992 Jan 19  2:00s
+-			 9:00	Russia	YAK%sT	2004
+-			10:00	Russia	VLA%sT	2011 Mar 27  2:00s
+-			11:00	-	VLAT	2011 Sep 13  0:00s # Decree 725?
+-			10:00	-	YAKT	2014 Oct 26  2:00s
+-			 9:00	-	YAKT
++			 8:00	-	+08	1930 Jun 21
++			 9:00	Russia	+09/+10	1991 Mar 31  2:00s
++			 8:00	Russia	+08/+09	1992 Jan 19  2:00s
++			 9:00	Russia	+09/+10	2004
++			10:00	Russia	+10/+11	2011 Mar 27  2:00s
++			11:00	-	+11	2011 Sep 13  0:00s # Decree 725?
++			10:00	-	+10	2014 Oct 26  2:00s
++			 9:00	-	+09
+ 
+ 
+ # From Tim Parenti (2014-07-03):
+@@ -2701,16 +3031,21 @@
+ # ...with the exception of:
+ # 65-11	****	Severo-Kurilsky District (North Kuril Islands)
+ 
++# From Matt Johnson (2016-02-22):
++# Asia/Sakhalin is moving (in entirety) from UTC+10 to UTC+11 ...
++# (2016-03-09):
++# http://publication.pravo.gov.ru/Document/View/0001201603090044
++
+ # The Zone name should be Asia/Yuzhno-Sakhalinsk, but that's too long.
+ Zone Asia/Sakhalin	 9:30:48 -	LMT	1905 Aug 23
+-			 9:00	-	JCST	1937 Oct  1
+-			 9:00	-	JST	1945 Aug 25
+-			11:00	Russia	SAK%sT	1991 Mar 31  2:00s # Sakhalin T
+-			10:00	Russia	SAK%sT	1992 Jan 19  2:00s
+-			11:00	Russia	SAK%sT	1997 Mar lastSun  2:00s
+-			10:00	Russia	SAK%sT	2011 Mar 27  2:00s
+-			11:00	-	SAKT	2014 Oct 26  2:00s
+-			10:00	-	SAKT
++			 9:00	-	+09	1945 Aug 25
++			11:00	Russia	+11/+12	1991 Mar 31  2:00s # Sakhalin T
++			10:00	Russia	+10/+11	1992 Jan 19  2:00s
++			11:00	Russia	+11/+12	1997 Mar lastSun  2:00s
++			10:00	Russia	+10/+11	2011 Mar 27  2:00s
++			11:00	-	+11	2014 Oct 26  2:00s
++			10:00	-	+10	2016 Mar 27  2:00s
++			11:00	-	+11
+ 
+ 
+ # From Tim Parenti (2014-07-03), per Oscar van Vlijmen (2009-11-29):
+@@ -2724,13 +3059,22 @@
+ # until now by Asia/Magadan, will instead move to UTC+11.  These regions will
+ # need their own zone.
+ 
++# From Alexander Krivenyshev (2016-03-27):
++# ... draft bill 948300-6 to change its time zone from UTC+10 to UTC+11 ...
++# will take ... effect ... on April 24, 2016 at 2 o'clock
++#
++# From Matt Johnson (2016-04-05):
++# ... signed by the President today ...
++# http://publication.pravo.gov.ru/Document/View/0001201604050038
++
+ Zone Asia/Magadan	10:03:12 -	LMT	1924 May  2
+-			10:00	-	MAGT	1930 Jun 21 # Magadan Time
+-			11:00	Russia	MAG%sT	1991 Mar 31  2:00s
+-			10:00	Russia	MAG%sT	1992 Jan 19  2:00s
+-			11:00	Russia	MAG%sT	2011 Mar 27  2:00s
+-			12:00	-	MAGT	2014 Oct 26  2:00s
+-			10:00	-	MAGT
++			10:00	-	+10	1930 Jun 21 # Magadan Time
++			11:00	Russia	+11/+12	1991 Mar 31  2:00s
++			10:00	Russia	+10/+11	1992 Jan 19  2:00s
++			11:00	Russia	+11/+12	2011 Mar 27  2:00s
++			12:00	-	+12	2014 Oct 26  2:00s
++			10:00	-	+10	2016 Apr 24  2:00s
++			11:00	-	+11
+ 
+ 
+ # From Tim Parenti (2014-07-06):
+@@ -2773,17 +3117,14 @@
+ # in Russian.)  In addition, Srednekolymsk appears to be a much older
+ # settlement and the population of Zyryanka seems to be declining.
+ # Go with Srednekolymsk.
+-#
+-# Since Magadan Oblast moves to UTC+10 on 2014-10-26, we cannot keep using MAGT
+-# as the abbreviation.  Use SRET instead.
+ 
+ Zone Asia/Srednekolymsk	10:14:52 -	LMT	1924 May  2
+-			10:00	-	MAGT	1930 Jun 21 # Magadan Time
+-			11:00	Russia	MAG%sT	1991 Mar 31  2:00s
+-			10:00	Russia	MAG%sT	1992 Jan 19  2:00s
+-			11:00	Russia	MAG%sT	2011 Mar 27  2:00s
+-			12:00	-	MAGT	2014 Oct 26  2:00s
+-			11:00	-	SRET	# Srednekolymsk Time
++			10:00	-	+10	1930 Jun 21
++			11:00	Russia	+11/+12	1991 Mar 31  2:00s
++			10:00	Russia	+10/+11	1992 Jan 19  2:00s
++			11:00	Russia	+11/+12	2011 Mar 27  2:00s
++			12:00	-	+12	2014 Oct 26  2:00s
++			11:00	-	+11
+ 
+ 
+ # From Tim Parenti (2014-07-03):
+@@ -2801,14 +3142,14 @@
+ # UTC+12 since at least then, too.
+ 
+ Zone Asia/Ust-Nera	 9:32:54 -	LMT	1919 Dec 15
+-			 8:00	-	YAKT	1930 Jun 21 # Yakutsk Time
+-			 9:00	Russia	YAKT	1981 Apr  1
+-			11:00	Russia	MAG%sT	1991 Mar 31  2:00s
+-			10:00	Russia	MAG%sT	1992 Jan 19  2:00s
+-			11:00	Russia	MAG%sT	2011 Mar 27  2:00s
+-			12:00	-	MAGT	2011 Sep 13  0:00s # Decree 725?
+-			11:00	-	VLAT	2014 Oct 26  2:00s
+-			10:00	-	VLAT
++			 8:00	-	+08	1930 Jun 21
++			 9:00	Russia	+09/+10	1981 Apr  1
++			11:00	Russia	+11/+12	1991 Mar 31  2:00s
++			10:00	Russia	+10/+11	1992 Jan 19  2:00s
++			11:00	Russia	+11/+12	2011 Mar 27  2:00s
++			12:00	-	+12	2011 Sep 13  0:00s # Decree 725?
++			11:00	-	+11	2014 Oct 26  2:00s
++			10:00	-	+10
+ 
+ 
+ # From Tim Parenti (2014-07-03), per Oscar van Vlijmen (2001-08-25):
+@@ -2821,12 +3162,12 @@
+ # The Zone name should be Asia/Petropavlovsk-Kamchatski or perhaps
+ # Asia/Petropavlovsk-Kamchatsky, but these are too long.
+ Zone Asia/Kamchatka	10:34:36 -	LMT	1922 Nov 10
+-			11:00	-	PETT	1930 Jun 21 # P-K Time
+-			12:00	Russia	PET%sT	1991 Mar 31  2:00s
+-			11:00	Russia	PET%sT	1992 Jan 19  2:00s
+-			12:00	Russia	PET%sT	2010 Mar 28  2:00s
+-			11:00	Russia	PET%sT	2011 Mar 27  2:00s
+-			12:00	-	PETT
++			11:00	-	+11	1930 Jun 21
++			12:00	Russia	+12/+13	1991 Mar 31  2:00s
++			11:00	Russia	+11/+12	1992 Jan 19  2:00s
++			12:00	Russia	+12/+13	2010 Mar 28  2:00s
++			11:00	Russia	+11/+12	2011 Mar 27  2:00s
++			12:00	-	+12
+ 
+ 
+ # From Tim Parenti (2014-07-03):
+@@ -2834,13 +3175,13 @@
+ # 87	RU-CHU	Chukotka Autonomous Okrug
+ 
+ Zone Asia/Anadyr	11:49:56 -	LMT	1924 May  2
+-			12:00	-	ANAT	1930 Jun 21 # Anadyr Time
+-			13:00	Russia	ANA%sT	1982 Apr  1  0:00s
+-			12:00	Russia	ANA%sT	1991 Mar 31  2:00s
+-			11:00	Russia	ANA%sT	1992 Jan 19  2:00s
+-			12:00	Russia	ANA%sT	2010 Mar 28  2:00s
+-			11:00	Russia	ANA%sT	2011 Mar 27  2:00s
+-			12:00	-	ANAT
++			12:00	-	+12	1930 Jun 21
++			13:00	Russia	+13/+14	1982 Apr  1  0:00s
++			12:00	Russia	+12/+13	1991 Mar 31  2:00s
++			11:00	Russia	+11/+12	1992 Jan 19  2:00s
++			12:00	Russia	+12/+13	2010 Mar 28  2:00s
++			11:00	Russia	+11/+12	2011 Mar 27  2:00s
++			12:00	-	+12
+ 
+ 
+ # San Marino
+@@ -3099,22 +3440,24 @@
+ 
+ # Turkey
+ 
+-# From Amar Devegowda (2007-01-03):
+-# The time zone rules for Istanbul, Turkey have not been changed for years now.
+-# ... The latest rules are available at:
+-# http://www.timeanddate.com/worldclock/timezone.html?n=107
+-# From Steffen Thorsen (2007-01-03):
+-# I have been able to find press records back to 1996 which all say that
+-# DST started 01:00 local time and end at 02:00 local time.  I am not sure
+-# what happened before that.  One example for each year from 1996 to 2001:
+-# http://newspot.byegm.gov.tr/arsiv/1996/21/N4.htm
+-# http://www.byegm.gov.tr/YAYINLARIMIZ/CHR/ING97/03/97X03X25.TXT
+-# http://www.byegm.gov.tr/YAYINLARIMIZ/CHR/ING98/03/98X03X02.HTM
+-# http://www.byegm.gov.tr/YAYINLARIMIZ/CHR/ING99/10/99X10X26.HTM#%2016
+-# http://www.byegm.gov.tr/YAYINLARIMIZ/CHR/ING2000/03/00X03X06.HTM#%2021
+-# http://www.byegm.gov.tr/YAYINLARIMIZ/CHR/ING2001/03/23x03x01.HTM#%2027
+-# From Paul Eggert (2007-01-03):
+-# Prefer the above source to Shanks & Pottenger for time stamps after 1990.
++# From Kıvanç Yazan (2016-09-25):
++# 1) For 1986-2006, DST started at 01:00 local and ended at 02:00 local, with
++#    no exceptions.
++# 2) 1994's lastSun was overridden with Mar 20 ...
++# Here are official papers:
++# http://www.resmigazete.gov.tr/arsiv/19032.pdf  - page 2 for 1986
++# http://www.resmigazete.gov.tr/arsiv/19400.pdf  - page 4 for 1987
++# http://www.resmigazete.gov.tr/arsiv/19752.pdf  - page 15 for 1988
++# http://www.resmigazete.gov.tr/arsiv/20102.pdf  - page 6 for 1989
++# http://www.resmigazete.gov.tr/arsiv/20464.pdf  - page 1 for 1990 - 1992
++# http://www.resmigazete.gov.tr/arsiv/21531.pdf  - page 15 for 1993 - 1995
++# http://www.resmigazete.gov.tr/arsiv/21879.pdf  - page 1 for overriding 1994
++# http://www.resmigazete.gov.tr/arsiv/22588.pdf  - page 1 for 1996, 1997
++# http://www.resmigazete.gov.tr/arsiv/23286.pdf  - page 10 for 1998 - 2000
++# http://www.resmigazete.gov.tr/eskiler/2001/03/20010324.htm#2  - for 2001
++# http://www.resmigazete.gov.tr/eskiler/2002/03/20020316.htm#2  - for 2002-2006
++# From Paul Eggert (2016-09-25):
++# Prefer the above sources to Shanks & Pottenger for time stamps after 1985.
+ 
+ # From Steffen Thorsen (2007-03-09):
+ # Starting 2007 though, it seems that they are adopting EU's 1:00 UTC
+@@ -3154,6 +3497,20 @@
+ # It's officially announced now by the Ministry of Energy.
+ # Turkey delays winter time to 8th of November 04:00
+ # http://www.aa.com.tr/tr/turkiye/yaz-saati-uygulamasi-8-kasimda-sona-erecek/362217
++#
++# From BBC News (2015-10-25):
++# Confused Turks are asking "what's the time?" after automatic clocks defied a
++# government decision ... "For the next two weeks #Turkey is on EEST... Erdogan
++# Engineered Standard Time," said Twitter user @aysekarahasan.
++# http://www.bbc.com/news/world-europe-34631326
++
++# From Burak AYDIN (2016-09-08):
++# Turkey will stay in Daylight Saving Time even in winter....
++# http://www.resmigazete.gov.tr/eskiler/2016/09/20160908-2.pdf
++#
++# From Paul Eggert (2016-09-07):
++# The change is permanent, so this is the new standard time in Turkey.
++# It takes effect today, which is not much notice.
+ 
+ # Rule	NAME	FROM	TO	TYPE	IN	ON	AT	SAVE	LETTER/S
+ Rule	Turkey	1916	only	-	May	 1	0:00	1:00	S
+@@ -3209,16 +3566,16 @@
+ Rule	Turkey	1983	only	-	Oct	 2	0:00	0	-
+ Rule	Turkey	1985	only	-	Apr	20	0:00	1:00	S
+ Rule	Turkey	1985	only	-	Sep	28	0:00	0	-
+-Rule	Turkey	1986	1990	-	Mar	lastSun	2:00s	1:00	S
+-Rule	Turkey	1986	1990	-	Sep	lastSun	2:00s	0	-
+-Rule	Turkey	1991	2006	-	Mar	lastSun	1:00s	1:00	S
+-Rule	Turkey	1991	1995	-	Sep	lastSun	1:00s	0	-
++Rule	Turkey	1986	1993	-	Mar	lastSun	1:00s	1:00	S
++Rule	Turkey	1986	1995	-	Sep	lastSun	1:00s	0	-
++Rule	Turkey	1994	only	-	Mar	20	1:00s	1:00	S
++Rule	Turkey	1995	2006	-	Mar	lastSun	1:00s	1:00	S
+ Rule	Turkey	1996	2006	-	Oct	lastSun	1:00s	0	-
+ # Zone	NAME		GMTOFF	RULES	FORMAT	[UNTIL]
+ Zone	Europe/Istanbul	1:55:52 -	LMT	1880
+ 			1:56:56	-	IMT	1910 Oct # Istanbul Mean Time?
+ 			2:00	Turkey	EE%sT	1978 Oct 15
+-			3:00	Turkey	TR%sT	1985 Apr 20 # Turkey Time
++			3:00	Turkey	+03/+04	1985 Apr 20
+ 			2:00	Turkey	EE%sT	2007
+ 			2:00	EU	EE%sT	2011 Mar 27  1:00u
+ 			2:00	-	EET	2011 Mar 28  1:00u
+@@ -3226,7 +3583,8 @@
+ 			2:00	-	EET	2014 Mar 31  1:00u
+ 			2:00	EU	EE%sT	2015 Oct 25  1:00u
+ 			2:00	1:00	EEST	2015 Nov  8  1:00u
+-			2:00	EU	EE%sT
++			2:00	EU	EE%sT	2016 Sep  7
++			3:00	-	+03
+ Link	Europe/Istanbul	Asia/Istanbul	# Istanbul is in both continents.
+ 
+ # Ukraine
+--- contrib/tzdata/factory.orig
++++ contrib/tzdata/factory
+@@ -1,9 +1,10 @@
+ # This file is in the public domain, so clarified as of
+ # 2009-05-17 by Arthur David Olson.
+ 
+-# For companies who don't want to put time zone specification in
+-# their installation procedures.  When users run date, they'll get the message.
+-# Also useful for the "comp.sources" version.
++# For distributors who don't want to put time zone specification in
++# their installation procedures.  Users that run 'date' will get the
++# time zone abbreviation "-00", indicating that the actual time zone
++# is unknown.
+ 
+ # Zone	NAME	GMTOFF	RULES	FORMAT
+ Zone	Factory	0	- "Local time zone must be set--use tzsetup"
+--- contrib/tzdata/leap-seconds.list.orig
++++ contrib/tzdata/leap-seconds.list
+@@ -143,7 +143,7 @@
+ #		Boulder, Colorado
+ #		Judah.Levine@nist.gov
+ #
+-#	Last Update of leap second values:   5 January 2015
++#	Last Update of leap second values:   8 July 2016
+ #
+ #	The following line shows this last update date in NTP timestamp
+ #	format. This is the date on which the most recent change to
+@@ -151,7 +151,7 @@
+ #	be identified by the unique pair of characters in the first two
+ #	columns as shown below.
+ #
+-#$	 3629404800
++#$	 3676924800
+ #
+ #	The NTP timestamps are in units of seconds since the NTP epoch,
+ #	which is 1 January 1900, 00:00:00. The Modified Julian Day number
+@@ -199,10 +199,10 @@
+ #	current -- the update time stamp, the data and the name of the file
+ #	will not change.
+ #
+-#	Updated through IERS Bulletin C50
+-#	File expires on:  28 June 2016
++#	Updated through IERS Bulletin C52
++#	File expires on:  28 June 2017
+ #
+-#@	3676060800
++#@	3707596800
+ #
+ 2272060800	10	# 1 Jan 1972
+ 2287785600	11	# 1 Jul 1972
+@@ -231,6 +231,7 @@
+ 3439756800	34	# 1 Jan 2009
+ 3550089600	35	# 1 Jul 2012
+ 3644697600	36	# 1 Jul 2015
++3692217600	37	# 1 Jan 2017
+ #
+ #	the following special comment contains the
+ #	hash value of the data in this file computed
+@@ -246,4 +247,4 @@
+ #	the hash line is also ignored in the
+ #	computation.
+ #
+-#h	3d037453 3acade76 570bd8f8 be2b8bc9 55ec6fe8
++#h	dacf2c42 2c4765d6 3c797af8 2cf630eb 699c8c67
+--- contrib/tzdata/leapseconds.orig
++++ contrib/tzdata/leapseconds
+@@ -6,6 +6,7 @@
+ # leap-seconds.list file available from most NIST time servers.
+ # If the URL <ftp://time.nist.gov/pub/leap-seconds.list> does not work,
+ # you should be able to pick up leap-seconds.list from a secondary NIST server.
++# See <http://tf.nist.gov/tf-cgi/servers.cgi> for a list of secondary servers.
+ # For more about leap-seconds.list, please see
+ # The NTP Timescale and Leap Seconds
+ # http://www.eecis.udel.edu/~mills/leap.html
+@@ -55,6 +56,7 @@
+ Leap	2008	Dec	31	23:59:60	+	S
+ Leap	2012	Jun	30	23:59:60	+	S
+ Leap	2015	Jun	30	23:59:60	+	S
++Leap	2016	Dec	31	23:59:60	+	S
+ 
+-#	Updated through IERS Bulletin C50
+-#	File expires on:  28 June 2016
++#	Updated through IERS Bulletin C52
++#	File expires on:  28 June 2017
+--- contrib/tzdata/leapseconds.awk.orig
++++ contrib/tzdata/leapseconds.awk
+@@ -0,0 +1,76 @@
++# Generate the 'leapseconds' file from 'leap-seconds.list'.
++
++# This file is in the public domain.
++
++BEGIN {
++  print "# Allowance for leap seconds added to each time zone file."
++  print ""
++  print "# This file is in the public domain."
++  print ""
++  print "# This file is generated automatically from the data in the public-domain"
++  print "# leap-seconds.list file available from most NIST time servers."
++  print "# If the URL <ftp://time.nist.gov/pub/leap-seconds.list> does not work,"
++  print "# you should be able to pick up leap-seconds.list from a secondary NIST server."
++  print "# See <http://tf.nist.gov/tf-cgi/servers.cgi> for a list of secondary servers."
++  print "# For more about leap-seconds.list, please see"
++  print "# The NTP Timescale and Leap Seconds"
++  print "# http://www.eecis.udel.edu/~mills/leap.html"
++  print ""
++  print "# The International Earth Rotation and Reference Systems Service"
++  print "# periodically uses leap seconds to keep UTC to within 0.9 s of UT1"
++  print "# (which measures the true angular orientation of the earth in space); see"
++  print "# Terry J Quinn, The BIPM and the accurate measure of time,"
++  print "# Proc IEEE 79, 7 (July 1991), 894-905 <http://dx.doi.org/10.1109/5.84965>."
++  print "# There were no leap seconds before 1972, because the official mechanism"
++  print "# accounting for the discrepancy between atomic time and the earth's rotation"
++  print "# did not exist until the early 1970s."
++  print ""
++  print "# The correction (+ or -) is made at the given time, so lines"
++  print "# will typically look like:"
++  print "#	Leap	YEAR	MON	DAY	23:59:60	+	R/S"
++  print "# or"
++  print "#	Leap	YEAR	MON	DAY	23:59:59	-	R/S"
++  print ""
++  print "# If the leapsecond is Rolling (R) the given time is local time."
++  print "# If the leapsecond is Stationary (S) the given time is UTC."
++  print ""
++  print "# Leap	YEAR	MONTH	DAY	HH:MM:SS	CORR	R/S"
++}
++
++/^ *$/ { next }
++
++/^#\tUpdated through/ || /^#\tFile expires on:/ {
++    last_lines = last_lines $0 "\n"
++}
++
++/^#/ { next }
++
++{
++    NTP_timestamp = $1
++    TAI_minus_UTC = $2
++    hash_mark = $3
++    one = $4
++    month = $5
++    year = $6
++    if (old_TAI_minus_UTC) {
++	if (old_TAI_minus_UTC < TAI_minus_UTC) {
++	    sign = "23:59:60\t+"
++	} else {
++	    sign = "23:59:59\t-"
++	}
++	if (month == "Jan") {
++	    year--;
++	    month = "Dec";
++	    day = 31
++	} else if (month == "Jul") {
++	    month = "Jun";
++	    day = 30
++	}
++	printf "Leap\t%s\t%s\t%s\t%s\tS\n", year, month, day, sign
++    }
++    old_TAI_minus_UTC = TAI_minus_UTC
++}
++
++END {
++    printf "\n%s", last_lines
++}
++native
+\ No newline at end of property
++FreeBSD=%H
+\ No newline at end of property
++text/plain
+\ No newline at end of property
+--- contrib/tzdata/northamerica.orig
++++ contrib/tzdata/northamerica
+@@ -24,8 +24,32 @@
+ # was the result of his proposals at the Convention of Railroad Trunk Lines
+ # in New York City (1869-10).  His 1870 proposal was based on Washington, DC,
+ # but in 1872-05 he moved the proposed origin to Greenwich.
+-# His proposal was adopted by the railroads on 1883-11-18 at 12:00,
+-# and the most of the country soon followed suit.
++
++# From Paul Eggert (2016-09-21):
++# Dowd's proposal left many details unresolved, such as where to draw
++# lines between time zones.  The key individual who made time zones
++# work in the US was William Frederick Allen - railway engineer,
++# managing editor of the Travelers' Guide, and secretary of the
++# General Time Convention, a railway standardization group.  Allen
++# spent months in dialogs with scientific and railway leaders,
++# developed a workable plan to institute time zones, and presented it
++# to the General Time Convention on 1883-04-11, saying that his plan
++# meant "local time would be practically abolished" - a plus for
++# railway scheduling.  By the next convention on 1883-10-11 nearly all
++# railroads had agreed and it took effect on 1883-11-18 at 12:00.
++# That Sunday was called the "day of two noons", as the eastern parts
++# of the new zones observed noon twice.  Allen witnessed the
++# transition in New York City, writing:
++#
++#   I heard the bells of St. Paul's strike on the old time.  Four
++#   minutes later, obedient to the electrical signal from the Naval
++#   Observatory ... the time-ball made its rapid descent, the chimes
++#   of old Trinity rang twelve measured strokes, and local time was
++#   abandoned, probably forever.
++#
++# Most of the US soon followed suit.  See:
++# Bartky IR. The adoption of standard time. Technol Cult 1989 Jan;30(1):25-56.
++# http://dx.doi.org/10.2307/3105430
+ 
+ # From Paul Eggert (2005-04-16):
+ # That 1883 transition occurred at 12:00 new time, not at 12:00 old time.
+@@ -325,6 +349,16 @@
+ # Statue 175 closer in synch with the US Congress' intent....
+ # http://www.legis.state.wi.us/2007/data/acts/07Act3.pdf
+ 
++# From an email administrator of the City of Fort Pierre, SD (2015-12-21):
++# Fort Pierre is technically located in the Mountain time zone as is
++# the rest of Stanley County.  Most of Stanley County and Fort Pierre
++# uses the Central time zone due to doing most of their business in
++# Pierre so it simplifies schedules.  I have lived in Stanley County
++# all my life and it has been that way since I can remember.  (43 years!)
++#
++# From Paul Eggert (2015-12-25):
++# Assume this practice predates 1970, so Fort Pierre can use America/Chicago.
++
+ # Rule	NAME	FROM	TO	TYPE	IN	ON	AT	SAVE	LETTER
+ Rule	Chicago	1920	only	-	Jun	13	2:00	1:00	D
+ Rule	Chicago	1920	1921	-	Oct	lastSun	2:00	0	S
+@@ -403,11 +437,42 @@
+ # north of the Salmon River, and the towns of Burgdorf and Warren),
+ # Nevada (except West Wendover), Oregon (except the northern 3/4 of
+ # Malheur county), and Washington
++
++# From Paul Eggert (2016-08-20):
++# In early February 1948, in response to California's electricity shortage,
++# PG&E changed power frequency from 60 to 59.5 Hz during daylight hours,
++# causing electric clocks to lose six minutes per day.  (This did not change
++# legal time, and is not part of the data here.)  See:
++# Ross SA. An energy crisis from the past: Northern California in 1948.
++# Working Paper No. 8, Institute of Governmental Studies, UC Berkeley,
++# 1973-11.  http://escholarship.org/uc/item/8x22k30c
++#
++# In another measure to save electricity, DST was instituted from 1948-03-14
++# at 02:01 to 1949-01-16 at 02:00, with the governor having the option to move
++# the fallback transition earlier.  See pages 3-4 of:
++# http://clerk.assembly.ca.gov/sites/clerk.assembly.ca.gov/files/archive/Statutes/1948/48Vol1_Chapters.pdf
++#
++# In response:
++#
++#   Governor Warren received a torrent of objecting mail, and it is not too much
++#   to speculate that the objections to Daylight Saving Time were one important
++#   factor in the defeat of the Dewey-Warren Presidential ticket in California.
++#     -- Ross, p 25
++#
++# On December 8 the governor exercised the option, setting the date to January 1
++# (LA Times 1948-12-09).  The transition time was 02:00 (LA Times 1949-01-01).
++#
++# Despite the controversy, in 1949 California voters approved Proposition 12,
++# which established DST from April's last Sunday at 01:00 until September's
++# last Sunday at 02:00. This was amended by 1962's Proposition 6, which changed
++# the fall-back date to October's last Sunday. See:
++# http://repository.uchastings.edu/cgi/viewcontent.cgi?article=1501&context=ca_ballot_props
++# http://repository.uchastings.edu/cgi/viewcontent.cgi?article=1636&context=ca_ballot_props
+ #
+ # Rule	NAME	FROM	TO	TYPE	IN	ON	AT	SAVE	LETTER
+-Rule	CA	1948	only	-	Mar	14	2:00	1:00	D
++Rule	CA	1948	only	-	Mar	14	2:01	1:00	D
+ Rule	CA	1949	only	-	Jan	 1	2:00	0	S
+-Rule	CA	1950	1966	-	Apr	lastSun	2:00	1:00	D
++Rule	CA	1950	1966	-	Apr	lastSun	1:00	1:00	D
+ Rule	CA	1950	1961	-	Sep	lastSun	2:00	0	S
+ Rule	CA	1962	1966	-	Oct	lastSun	2:00	0	S
+ # Zone	NAME		GMTOFF	RULES	FORMAT	[UNTIL]
+@@ -481,6 +546,12 @@
+ # For lack of better information, assume that Metlakatla's
+ # abandonment of use of daylight saving resulted from the 1983 vote.
+ 
++# From Steffen Thorsen (2015-11-09):
++# It seems Metlakatla did go off PST on Sunday, November 1, changing
++# their time to AKST and are going to follow Alaska's DST, switching
++# between AKST and AKDT from now on....
++# http://www.krbd.org/2015/10/30/annette-island-times-they-are-a-changing/
++
+ # Zone	NAME		GMTOFF	RULES	FORMAT	[UNTIL]
+ Zone America/Juneau	 15:02:19 -	LMT	1867 Oct 18
+ 			 -8:57:41 -	LMT	1900 Aug 20 12:00
+@@ -506,7 +577,8 @@
+ 			 -8:00	US	P%sT	1946
+ 			 -8:00	-	PST	1969
+ 			 -8:00	US	P%sT	1983 Oct 30  2:00
+-			 -8:00	-	PST
++			 -8:00	-	PST	2015 Nov  1  2:00
++			 -9:00	US	AK%sT
+ Zone America/Yakutat	 14:41:05 -	LMT	1867 Oct 18
+ 			 -9:18:55 -	LMT	1900 Aug 20 12:00
+ 			 -9:00	-	YST	1942
+@@ -2174,39 +2246,39 @@
+ Rule	NT_YK	1987	2006	-	Apr	Sun>=1	2:00	1:00	D
+ # Zone	NAME		GMTOFF	RULES	FORMAT	[UNTIL]
+ # aka Panniqtuuq
+-Zone America/Pangnirtung 0	-	zzz	1921 # trading post est.
++Zone America/Pangnirtung 0	-	-00	1921 # trading post est.
+ 			-4:00	NT_YK	A%sT	1995 Apr Sun>=1  2:00
+ 			-5:00	Canada	E%sT	1999 Oct 31  2:00
+ 			-6:00	Canada	C%sT	2000 Oct 29  2:00
+ 			-5:00	Canada	E%sT
+ # formerly Frobisher Bay
+-Zone America/Iqaluit	0	-	zzz	1942 Aug # Frobisher Bay est.
++Zone America/Iqaluit	0	-	-00	1942 Aug # Frobisher Bay est.
+ 			-5:00	NT_YK	E%sT	1999 Oct 31  2:00
+ 			-6:00	Canada	C%sT	2000 Oct 29  2:00
+ 			-5:00	Canada	E%sT
+ # aka Qausuittuq
+-Zone America/Resolute	0	-	zzz	1947 Aug 31 # Resolute founded
++Zone America/Resolute	0	-	-00	1947 Aug 31 # Resolute founded
+ 			-6:00	NT_YK	C%sT	2000 Oct 29  2:00
+ 			-5:00	-	EST	2001 Apr  1  3:00
+ 			-6:00	Canada	C%sT	2006 Oct 29  2:00
+ 			-5:00	-	EST	2007 Mar 11  3:00
+ 			-6:00	Canada	C%sT
+ # aka Kangiqiniq
+-Zone America/Rankin_Inlet 0	-	zzz	1957 # Rankin Inlet founded
++Zone America/Rankin_Inlet 0	-	-00	1957 # Rankin Inlet founded
+ 			-6:00	NT_YK	C%sT	2000 Oct 29  2:00
+ 			-5:00	-	EST	2001 Apr  1  3:00
+ 			-6:00	Canada	C%sT
+ # aka Iqaluktuuttiaq
+-Zone America/Cambridge_Bay 0	-	zzz	1920 # trading post est.?
++Zone America/Cambridge_Bay 0	-	-00	1920 # trading post est.?
+ 			-7:00	NT_YK	M%sT	1999 Oct 31  2:00
+ 			-6:00	Canada	C%sT	2000 Oct 29  2:00
+ 			-5:00	-	EST	2000 Nov  5  0:00
+ 			-6:00	-	CST	2001 Apr  1  3:00
+ 			-7:00	Canada	M%sT
+-Zone America/Yellowknife 0	-	zzz	1935 # Yellowknife founded?
++Zone America/Yellowknife 0	-	-00	1935 # Yellowknife founded?
+ 			-7:00	NT_YK	M%sT	1980
+ 			-7:00	Canada	M%sT
+-Zone America/Inuvik	0	-	zzz	1953 # Inuvik founded
++Zone America/Inuvik	0	-	-00	1953 # Inuvik founded
+ 			-8:00	NT_YK	P%sT	1979 Apr lastSun  2:00
+ 			-7:00	NT_YK	M%sT	1980
+ 			-7:00	Canada	M%sT
+@@ -2458,13 +2530,22 @@
+ 			-6:00	-	CST	1981 Dec 23
+ 			-5:00	-	EST	1982 Dec  2
+ 			-6:00	Mexico	C%sT
+-# Coahuila, Durango, Nuevo León, Tamaulipas (near US border)
++# Coahuila, Nuevo León, Tamaulipas (near US border)
++# This includes the following municipalities:
++#   in Coahuila: Ocampo, Acuña, Zaragoza, Jiménez, Piedras Negras, Nava,
++#     Guerrero, Hidalgo.
++#   in Nuevo León: Anáhuac, Los Aldama.
++#   in Tamaulipas: Nuevo Laredo, Guerrero, Mier, Miguel Alemán, Camargo,
++#     Gustavo Díaz Ordaz, Reynosa, Río Bravo, Valle Hermoso, Matamoros.
++# See: Inicia mañana Horario de Verano en zona fronteriza, El Universal,
++# 2016-03-12
++# http://www.eluniversal.com.mx/articulo/estados/2016/03/12/inicia-manana-horario-de-verano-en-zona-fronteriza
+ Zone America/Matamoros	-6:40:00 -	LMT	1921 Dec 31 23:20:00
+ 			-6:00	-	CST	1988
+ 			-6:00	US	C%sT	1989
+ 			-6:00	Mexico	C%sT	2010
+ 			-6:00	US	C%sT
+-# Coahuila, Durango, Nuevo León, Tamaulipas (away from US border)
++# Durango; Coahuila, Nuevo León, Tamaulipas (away from US border)
+ Zone America/Monterrey	-6:41:16 -	LMT	1921 Dec 31 23:18:44
+ 			-6:00	-	CST	1988
+ 			-6:00	US	C%sT	1989
+@@ -2480,6 +2561,9 @@
+ 			-6:00	-	CST	2002 Feb 20
+ 			-6:00	Mexico	C%sT
+ # Chihuahua (near US border)
++# This includes the municipalities of Janos, Ascensión, Juárez, Guadalupe,
++# Práxedis G Guerrero, Coyame del Sotol, Ojinaga, and Manuel Benavides.
++# (See the 2016-03-12 El Universal source mentioned above.)
+ Zone America/Ojinaga	-6:57:40 -	LMT	1922 Jan  1  0:02:20
+ 			-7:00	-	MST	1927 Jun 10 23:00
+ 			-6:00	-	CST	1930 Nov 15
+@@ -2567,7 +2651,7 @@
+ 			-7:00	Mexico	M%sT	2010 Apr  4  2:00
+ 			-6:00	Mexico	C%sT
+ 
+-# Baja California (near US border)
++# Baja California
+ Zone America/Tijuana	-7:48:04 -	LMT	1922 Jan  1  0:11:56
+ 			-7:00	-	MST	1924
+ 			-8:00	-	PST	1927 Jun 10 23:00
+@@ -2587,25 +2671,6 @@
+ 			-8:00	US	P%sT	2002 Feb 20
+ 			-8:00	Mexico	P%sT	2010
+ 			-8:00	US	P%sT
+-# Baja California (away from US border)
+-Zone America/Santa_Isabel	-7:39:28 -	LMT	1922 Jan  1  0:20:32
+-			-7:00	-	MST	1924
+-			-8:00	-	PST	1927 Jun 10 23:00
+-			-7:00	-	MST	1930 Nov 15
+-			-8:00	-	PST	1931 Apr  1
+-			-8:00	1:00	PDT	1931 Sep 30
+-			-8:00	-	PST	1942 Apr 24
+-			-8:00	1:00	PWT	1945 Aug 14 23:00u
+-			-8:00	1:00	PPT	1945 Nov 12 # Peace
+-			-8:00	-	PST	1948 Apr  5
+-			-8:00	1:00	PDT	1949 Jan 14
+-			-8:00	-	PST	1954
+-			-8:00	CA	P%sT	1961
+-			-8:00	-	PST	1976
+-			-8:00	US	P%sT	1996
+-			-8:00	Mexico	P%sT	2001
+-			-8:00	US	P%sT	2002 Feb 20
+-			-8:00	Mexico	P%sT
+ # From Paul Eggert (2006-03-22):
+ # Formerly there was an America/Ensenada zone, which differed from
+ # America/Tijuana only in that it did not observe DST from 1976
+@@ -2618,6 +2683,13 @@
+ # other than America/Tijuana for Baja, but it's not clear yet what its
+ # name or contents should be.
+ #
++# From Paul Eggert (2015-10-08):
++# Formerly there was an America/Santa_Isabel zone, but this appears to
++# have come from a misreading of
++# http://dof.gob.mx/nota_detalle.php?codigo=5127480&fecha=06/01/2010
++# It has been moved to the 'backward' file.
++#
++#
+ # Revillagigedo Is
+ # no information
+ 
+@@ -2692,17 +2764,7 @@
+ 			-4:00	US	A%sT
+ 
+ # Cayman Is
+-
+-# From Paul Eggert (2015-05-15):
+-# The Cayman government has decided to introduce DST in 2016, the idea being
+-# to keep in sync with New York.  The legislation hasn't passed but the change
+-# seems quite likely.  See: Meade B. Cayman 27.
+-# http://www.cayman27.com.ky/2015/05/15/clock-ticks-toward-daylight-saving-time-in-cayman
+-
+-Zone	America/Cayman	-5:25:32 -	LMT	1890     # Georgetown
+-			-5:07:11 -	KMT	1912 Feb # Kingston Mean Time
+-			-5:00	-	EST	2016
+-			-5:00	US	E%sT
++# See America/Panama.
+ 
+ # Costa Rica
+ 
+@@ -3065,6 +3127,13 @@
+ # http://radiovision2000haiti.net/public/haiti-avis-changement-dheure-dimanche/
+ # http://www.canalplushaiti.net/?p=6714
+ 
++# From Steffen Thorsen (2016-03-12):
++# Jean Antoine, editor of www.haiti-reference.com informed us that Haiti
++# are not going on DST this year.  Several other resources confirm this: ...
++# http://www.radiotelevisioncaraibes.com/presse/heure_d_t_pas_de_changement_d_heure_pr_vu_pour_cet_ann_e.html
++# http://www.vantbefinfo.com/changement-dheure-pas-pour-haiti/
++# http://news.anmwe.com/haiti-lheure-nationale-ne-sera-ni-avancee-ni-reculee-cette-annee/
++
+ # Rule	NAME	FROM	TO	TYPE	IN	ON	AT	SAVE	LETTER/S
+ Rule	Haiti	1983	only	-	May	8	0:00	1:00	D
+ Rule	Haiti	1984	1987	-	Apr	lastSun	0:00	1:00	D
+@@ -3075,8 +3144,8 @@
+ Rule	Haiti	1988	1997	-	Oct	lastSun	1:00s	0	S
+ Rule	Haiti	2005	2006	-	Apr	Sun>=1	0:00	1:00	D
+ Rule	Haiti	2005	2006	-	Oct	lastSun	0:00	0	S
+-Rule	Haiti	2012	max	-	Mar	Sun>=8	2:00	1:00	D
+-Rule	Haiti	2012	max	-	Nov	Sun>=1	2:00	0	S
++Rule	Haiti	2012	2015	-	Mar	Sun>=8	2:00	1:00	D
++Rule	Haiti	2012	2015	-	Nov	Sun>=1	2:00	0	S
+ # Zone	NAME		GMTOFF	RULES	FORMAT	[UNTIL]
+ Zone America/Port-au-Prince -4:49:20 -	LMT	1890
+ 			-4:49	-	PPMT	1917 Jan 24 12:00 # P-a-P MT
+@@ -3225,6 +3294,7 @@
+ Zone	America/Panama	-5:18:08 -	LMT	1890
+ 			-5:19:36 -	CMT	1908 Apr 22 # Colón Mean Time
+ 			-5:00	-	EST
++Link America/Panama America/Cayman
+ 
+ # Puerto Rico
+ # There are too many San Juans elsewhere, so we'll use 'Puerto_Rico'.
+@@ -3266,7 +3336,7 @@
+ # indicating that the normal ET rules are followed.
+ #
+ # From Paul Eggert (2014-08-19):
+-# The 2014-08-13 Cabinet meeting decided to stay on UTC-4 year-round.  See:
++# The 2014-08-13 Cabinet meeting decided to stay on UT -04 year-round.  See:
+ # http://tcweeklynews.com/daylight-savings-time-to-be-maintained-p5353-127.htm
+ # Model this as a switch from EST/EDT to AST ...
+ # From Chris Walton (2014-11-04):
+--- contrib/tzdata/southamerica.orig
++++ contrib/tzdata/southamerica
+@@ -410,9 +410,9 @@
+ # stuck on Summer daylight savings time even though the summer is over.
+ 
+ # From Paul Eggert (2013-09-05):
+-# Perhaps San Luis operates on the legal fiction that it is at UTC-4
++# Perhaps San Luis operates on the legal fiction that it is at -04
+ # with perpetual summer time, but ordinary usage typically seems to
+-# just say it's at UTC-3; see, for example,
++# just say it's at -03; see, for example,
+ # http://es.wikipedia.org/wiki/Hora_oficial_argentina
+ # We've documented similar situations as being plain changes to
+ # standard time, so let's do that here too.  This does not change UTC
+@@ -1221,6 +1221,20 @@
+ # From Paul Eggert (2015-03-03):
+ # For now, assume that the extension will persist indefinitely.
+ 
++# From Juan Correa (2016-03-18):
++# The decree regarding DST has been published in today's Official Gazette:
++# http://www.diariooficial.interior.gob.cl/versiones-anteriores/do/20160318/
++# http://www.leychile.cl/Navegar?idNorma=1088502
++# It does consider the second Saturday of May and August as the dates
++# for the transition; and it lists DST dates until 2019, but I think
++# this scheme will stick.
++#
++# From Paul Eggert (2016-03-18):
++# For now, assume the pattern holds for the indefinite future.
++# The decree says transitions occur at 24:00; in practice this appears
++# to mean 24:00 mainland time, not 24:00 local time, so that Easter
++# Island is always two hours behind the mainland.
++
+ # Rule	NAME	FROM	TO	TYPE	IN	ON	AT	SAVE	LETTER/S
+ Rule	Chile	1927	1931	-	Sep	 1	0:00	1:00	S
+ Rule	Chile	1928	1932	-	Apr	 1	0:00	0	-
+@@ -1252,8 +1266,10 @@
+ Rule	Chile	2010	only	-	Apr	Sun>=1	3:00u	0	-
+ Rule	Chile	2011	only	-	May	Sun>=2	3:00u	0	-
+ Rule	Chile	2011	only	-	Aug	Sun>=16	4:00u	1:00	S
+-Rule	Chile	2012	2015	-	Apr	Sun>=23	3:00u	0	-
++Rule	Chile	2012	2014	-	Apr	Sun>=23	3:00u	0	-
+ Rule	Chile	2012	2014	-	Sep	Sun>=2	4:00u	1:00	S
++Rule	Chile	2016	max	-	May	Sun>=9	3:00u	0	-
++Rule	Chile	2016	max	-	Aug	Sun>=9	4:00u	1:00	S
+ # IATA SSIM anomalies: (1992-02) says 1992-03-14;
+ # (1996-09) says 1998-03-08.  Ignore these.
+ # Zone	NAME		GMTOFF	RULES	FORMAT	[UNTIL]
+@@ -1270,13 +1286,11 @@
+ 			-4:00	1:00	CLST	1946 Sep  1 # central Chile
+ 			-4:00	-	CLT	1947 Apr  1
+ 			-5:00	-	CLT	1947 May 21 23:00
+-			-4:00	Chile	CL%sT	2015 Apr 26  3:00u
+-			-3:00	-	CLT
++			-4:00	Chile	CL%sT
+ Zone Pacific/Easter	-7:17:28 -	LMT	1890
+ 			-7:17:28 -	EMT	1932 Sep    # Easter Mean Time
+ 			-7:00	Chile	EAS%sT	1982 Mar 14 3:00u # Easter Time
+-			-6:00	Chile	EAS%sT	2015 Apr 26 3:00u
+-			-5:00	-	EAST
++			-6:00	Chile	EAS%sT
+ #
+ # Salas y Gómez Island is uninhabited.
+ # Other Chilean locations, including Juan Fernández Is, Desventuradas Is,
+@@ -1295,11 +1309,10 @@
+ # Palmer used to be supplied from Argentina.
+ #
+ # Zone	NAME		GMTOFF	RULES	FORMAT	[UNTIL]
+-Zone Antarctica/Palmer	0	-	zzz	1965
++Zone Antarctica/Palmer	0	-	-00	1965
+ 			-4:00	Arg	AR%sT	1969 Oct  5
+ 			-3:00	Arg	AR%sT	1982 May
+-			-4:00	Chile	CL%sT	2015 Apr 26 3:00u
+-			-3:00	-	CLT
++			-4:00	Chile	CL%sT
+ 
+ # Colombia
+ 
+@@ -1742,9 +1755,25 @@
+ # resolution publication)
+ # http://www.globovision.com/news.php?nid=72208
+ 
++# From Alexander Krivenyshev (2016-04-15):
++# https://actualidad.rt.com/actualidad/204758-venezuela-modificar-huso-horario-sequia-elnino
++#
++# From Paul Eggert (2016-04-15):
++# Clocks advance 30 minutes on 2016-05-01 at 02:30....
++# "'Venezuela's new time-zone: hours without light, hours without water,
++# hours of presidential broadcasts, hours of lines,' quipped comedian
++# Jean Mary Curró ...". See: Cawthorne A, Kai D. Venezuela scraps
++# half-hour time difference set by Chavez. Reuters 2016-04-15 14:50 -0400
++# http://www.reuters.com/article/us-venezuela-timezone-idUSKCN0XC2BE
++#
++# From Matt Johnson (2016-04-20):
++# ... published in the official Gazette [2016-04-18], here:
++# http://historico.tsj.gob.ve/gaceta_ext/abril/1842016/E-1842016-4551.pdf
++
+ # Zone	NAME		GMTOFF	RULES	FORMAT	[UNTIL]
+ Zone	America/Caracas	-4:27:44 -	LMT	1890
+ 			-4:27:40 -	CMT	1912 Feb 12 # Caracas Mean Time?
+ 			-4:30	-	VET	1965 Jan  1  0:00 # Venezuela T.
+ 			-4:00	-	VET	2007 Dec  9  3:00
+-			-4:30	-	VET
++			-4:30	-	VET	2016 May  1  2:30
++			-4:00	-	VET
+--- contrib/tzdata/version.orig
++++ contrib/tzdata/version
+@@ -0,0 +1 @@
++2016i
+--- contrib/tzdata/zone.tab.orig
++++ contrib/tzdata/zone.tab
+@@ -30,22 +30,22 @@
+ AL	+4120+01950	Europe/Tirane
+ AM	+4011+04430	Asia/Yerevan
+ AO	-0848+01314	Africa/Luanda
+-AQ	-7750+16636	Antarctica/McMurdo	McMurdo, South Pole, Scott (New Zealand time)
+-AQ	-6734-06808	Antarctica/Rothera	Rothera Station, Adelaide Island
+-AQ	-6448-06406	Antarctica/Palmer	Palmer Station, Anvers Island
+-AQ	-6736+06253	Antarctica/Mawson	Mawson Station, Holme Bay
+-AQ	-6835+07758	Antarctica/Davis	Davis Station, Vestfold Hills
+-AQ	-6617+11031	Antarctica/Casey	Casey Station, Bailey Peninsula
+-AQ	-7824+10654	Antarctica/Vostok	Vostok Station, Lake Vostok
+-AQ	-6640+14001	Antarctica/DumontDUrville	Dumont-d'Urville Station, Adelie Land
+-AQ	-690022+0393524	Antarctica/Syowa	Syowa Station, E Ongul I
+-AQ	-720041+0023206	Antarctica/Troll	Troll Station, Queen Maud Land
++AQ	-7750+16636	Antarctica/McMurdo	New Zealand time - McMurdo, South Pole
++AQ	-6617+11031	Antarctica/Casey	Casey
++AQ	-6835+07758	Antarctica/Davis	Davis
++AQ	-6640+14001	Antarctica/DumontDUrville	Dumont-d'Urville
++AQ	-6736+06253	Antarctica/Mawson	Mawson
++AQ	-6448-06406	Antarctica/Palmer	Palmer
++AQ	-6734-06808	Antarctica/Rothera	Rothera
++AQ	-690022+0393524	Antarctica/Syowa	Syowa
++AQ	-720041+0023206	Antarctica/Troll	Troll
++AQ	-7824+10654	Antarctica/Vostok	Vostok
+ AR	-3436-05827	America/Argentina/Buenos_Aires	Buenos Aires (BA, CF)
+-AR	-3124-06411	America/Argentina/Cordoba	most locations (CB, CC, CN, ER, FM, MN, SE, SF)
+-AR	-2447-06525	America/Argentina/Salta	(SA, LP, NQ, RN)
++AR	-3124-06411	America/Argentina/Cordoba	Argentina (most areas: CB, CC, CN, ER, FM, MN, SE, SF)
++AR	-2447-06525	America/Argentina/Salta	Salta (SA, LP, NQ, RN)
+ AR	-2411-06518	America/Argentina/Jujuy	Jujuy (JY)
+ AR	-2649-06513	America/Argentina/Tucuman	Tucuman (TM)
+-AR	-2828-06547	America/Argentina/Catamarca	Catamarca (CT), Chubut (CH)
++AR	-2828-06547	America/Argentina/Catamarca	Catamarca (CT); Chubut (CH)
+ AR	-2926-06651	America/Argentina/La_Rioja	La Rioja (LR)
+ AR	-3132-06831	America/Argentina/San_Juan	San Juan (SJ)
+ AR	-3253-06849	America/Argentina/Mendoza	Mendoza (MZ)
+@@ -56,17 +56,17 @@
+ AT	+4813+01620	Europe/Vienna
+ AU	-3133+15905	Australia/Lord_Howe	Lord Howe Island
+ AU	-5430+15857	Antarctica/Macquarie	Macquarie Island
+-AU	-4253+14719	Australia/Hobart	Tasmania - most locations
+-AU	-3956+14352	Australia/Currie	Tasmania - King Island
++AU	-4253+14719	Australia/Hobart	Tasmania (most areas)
++AU	-3956+14352	Australia/Currie	Tasmania (King Island)
+ AU	-3749+14458	Australia/Melbourne	Victoria
+-AU	-3352+15113	Australia/Sydney	New South Wales - most locations
+-AU	-3157+14127	Australia/Broken_Hill	New South Wales - Yancowinna
+-AU	-2728+15302	Australia/Brisbane	Queensland - most locations
+-AU	-2016+14900	Australia/Lindeman	Queensland - Holiday Islands
++AU	-3352+15113	Australia/Sydney	New South Wales (most areas)
++AU	-3157+14127	Australia/Broken_Hill	New South Wales (Yancowinna)
++AU	-2728+15302	Australia/Brisbane	Queensland (most areas)
++AU	-2016+14900	Australia/Lindeman	Queensland (Whitsunday Islands)
+ AU	-3455+13835	Australia/Adelaide	South Australia
+ AU	-1228+13050	Australia/Darwin	Northern Territory
+-AU	-3157+11551	Australia/Perth	Western Australia - most locations
+-AU	-3143+12852	Australia/Eucla	Western Australia - Eucla area
++AU	-3157+11551	Australia/Perth	Western Australia (most areas)
++AU	-3143+12852	Australia/Eucla	Western Australia (Eucla)
+ AW	+1230-06958	America/Aruba
+ AX	+6006+01957	Europe/Mariehamn
+ AZ	+4023+04951	Asia/Baku
+@@ -85,63 +85,63 @@
+ BO	-1630-06809	America/La_Paz
+ BQ	+120903-0681636	America/Kralendijk
+ BR	-0351-03225	America/Noronha	Atlantic islands
+-BR	-0127-04829	America/Belem	Amapa, E Para
+-BR	-0343-03830	America/Fortaleza	NE Brazil (MA, PI, CE, RN, PB)
++BR	-0127-04829	America/Belem	Para (east); Amapa
++BR	-0343-03830	America/Fortaleza	Brazil (northeast: MA, PI, CE, RN, PB)
+ BR	-0803-03454	America/Recife	Pernambuco
+ BR	-0712-04812	America/Araguaina	Tocantins
+ BR	-0940-03543	America/Maceio	Alagoas, Sergipe
+ BR	-1259-03831	America/Bahia	Bahia
+-BR	-2332-04637	America/Sao_Paulo	S & SE Brazil (GO, DF, MG, ES, RJ, SP, PR, SC, RS)
++BR	-2332-04637	America/Sao_Paulo	Brazil (southeast: GO, DF, MG, ES, RJ, SP, PR, SC, RS)
+ BR	-2027-05437	America/Campo_Grande	Mato Grosso do Sul
+ BR	-1535-05605	America/Cuiaba	Mato Grosso
+-BR	-0226-05452	America/Santarem	W Para
++BR	-0226-05452	America/Santarem	Para (west)
+ BR	-0846-06354	America/Porto_Velho	Rondonia
+ BR	+0249-06040	America/Boa_Vista	Roraima
+-BR	-0308-06001	America/Manaus	E Amazonas
+-BR	-0640-06952	America/Eirunepe	W Amazonas
++BR	-0308-06001	America/Manaus	Amazonas (east)
++BR	-0640-06952	America/Eirunepe	Amazonas (west)
+ BR	-0958-06748	America/Rio_Branco	Acre
+ BS	+2505-07721	America/Nassau
+ BT	+2728+08939	Asia/Thimphu
+ BW	-2439+02555	Africa/Gaborone
+ BY	+5354+02734	Europe/Minsk
+ BZ	+1730-08812	America/Belize
+-CA	+4734-05243	America/St_Johns	Newfoundland Time, including SE Labrador
+-CA	+4439-06336	America/Halifax	Atlantic Time - Nova Scotia (peninsula), PEI
+-CA	+4612-05957	America/Glace_Bay	Atlantic Time - Nova Scotia (Cape Breton)
+-CA	+4606-06447	America/Moncton	Atlantic Time - New Brunswick
+-CA	+5320-06025	America/Goose_Bay	Atlantic Time - Labrador - most locations
+-CA	+5125-05707	America/Blanc-Sablon	Atlantic Standard Time - Quebec - Lower North Shore
+-CA	+4339-07923	America/Toronto	Eastern Time - Ontario & Quebec - most locations
+-CA	+4901-08816	America/Nipigon	Eastern Time - Ontario & Quebec - places that did not observe DST 1967-1973
+-CA	+4823-08915	America/Thunder_Bay	Eastern Time - Thunder Bay, Ontario
+-CA	+6344-06828	America/Iqaluit	Eastern Time - east Nunavut - most locations
+-CA	+6608-06544	America/Pangnirtung	Eastern Time - Pangnirtung, Nunavut
+-CA	+744144-0944945	America/Resolute	Central Time - Resolute, Nunavut
+-CA	+484531-0913718	America/Atikokan	Eastern Standard Time - Atikokan, Ontario and Southampton I, Nunavut
+-CA	+624900-0920459	America/Rankin_Inlet	Central Time - central Nunavut
+-CA	+4953-09709	America/Winnipeg	Central Time - Manitoba & west Ontario
+-CA	+4843-09434	America/Rainy_River	Central Time - Rainy River & Fort Frances, Ontario
+-CA	+5024-10439	America/Regina	Central Standard Time - Saskatchewan - most locations
+-CA	+5017-10750	America/Swift_Current	Central Standard Time - Saskatchewan - midwest
+-CA	+5333-11328	America/Edmonton	Mountain Time - Alberta, east British Columbia & west Saskatchewan
+-CA	+690650-1050310	America/Cambridge_Bay	Mountain Time - west Nunavut
+-CA	+6227-11421	America/Yellowknife	Mountain Time - central Northwest Territories
+-CA	+682059-1334300	America/Inuvik	Mountain Time - west Northwest Territories
+-CA	+4906-11631	America/Creston	Mountain Standard Time - Creston, British Columbia
+-CA	+5946-12014	America/Dawson_Creek	Mountain Standard Time - Dawson Creek & Fort Saint John, British Columbia
+-CA	+5848-12242	America/Fort_Nelson	Mountain Standard Time - Fort Nelson, British Columbia
+-CA	+4916-12307	America/Vancouver	Pacific Time - west British Columbia
+-CA	+6043-13503	America/Whitehorse	Pacific Time - south Yukon
+-CA	+6404-13925	America/Dawson	Pacific Time - north Yukon
++CA	+4734-05243	America/St_Johns	Newfoundland; Labrador (southeast)
++CA	+4439-06336	America/Halifax	Atlantic - NS (most areas); PE
++CA	+4612-05957	America/Glace_Bay	Atlantic - NS (Cape Breton)
++CA	+4606-06447	America/Moncton	Atlantic - New Brunswick
++CA	+5320-06025	America/Goose_Bay	Atlantic - Labrador (most areas)
++CA	+5125-05707	America/Blanc-Sablon	AST - QC (Lower North Shore)
++CA	+4339-07923	America/Toronto	Eastern - ON, QC (most areas)
++CA	+4901-08816	America/Nipigon	Eastern - ON, QC (no DST 1967-73)
++CA	+4823-08915	America/Thunder_Bay	Eastern - ON (Thunder Bay)
++CA	+6344-06828	America/Iqaluit	Eastern - NU (most east areas)
++CA	+6608-06544	America/Pangnirtung	Eastern - NU (Pangnirtung)
++CA	+484531-0913718	America/Atikokan	EST - ON (Atikokan); NU (Coral H)
++CA	+4953-09709	America/Winnipeg	Central - ON (west); Manitoba
++CA	+4843-09434	America/Rainy_River	Central - ON (Rainy R, Ft Frances)
++CA	+744144-0944945	America/Resolute	Central - NU (Resolute)
++CA	+624900-0920459	America/Rankin_Inlet	Central - NU (central)
++CA	+5024-10439	America/Regina	CST - SK (most areas)
++CA	+5017-10750	America/Swift_Current	CST - SK (midwest)
++CA	+5333-11328	America/Edmonton	Mountain - AB; BC (E); SK (W)
++CA	+690650-1050310	America/Cambridge_Bay	Mountain - NU (west)
++CA	+6227-11421	America/Yellowknife	Mountain - NT (central)
++CA	+682059-1334300	America/Inuvik	Mountain - NT (west)
++CA	+4906-11631	America/Creston	MST - BC (Creston)
++CA	+5946-12014	America/Dawson_Creek	MST - BC (Dawson Cr, Ft St John)
++CA	+5848-12242	America/Fort_Nelson	MST - BC (Ft Nelson)
++CA	+4916-12307	America/Vancouver	Pacific - BC (most areas)
++CA	+6043-13503	America/Whitehorse	Pacific - Yukon (south)
++CA	+6404-13925	America/Dawson	Pacific - Yukon (north)
+ CC	-1210+09655	Indian/Cocos
+-CD	-0418+01518	Africa/Kinshasa	west Dem. Rep. of Congo
+-CD	-1140+02728	Africa/Lubumbashi	east Dem. Rep. of Congo
++CD	-0418+01518	Africa/Kinshasa	Dem. Rep. of Congo (west)
++CD	-1140+02728	Africa/Lubumbashi	Dem. Rep. of Congo (east)
+ CF	+0422+01835	Africa/Bangui
+ CG	-0416+01517	Africa/Brazzaville
+ CH	+4723+00832	Europe/Zurich
+ CI	+0519-00402	Africa/Abidjan
+ CK	-2114-15946	Pacific/Rarotonga
+-CL	-3327-07040	America/Santiago	most locations
++CL	-3327-07040	America/Santiago	Chile (most areas)
+ CL	-2709-10926	Pacific/Easter	Easter Island
+ CM	+0403+00942	Africa/Douala
+ CN	+3114+12128	Asia/Shanghai	Beijing Time
+@@ -152,30 +152,31 @@
+ CV	+1455-02331	Atlantic/Cape_Verde
+ CW	+1211-06900	America/Curacao
+ CX	-1025+10543	Indian/Christmas
+-CY	+3510+03322	Asia/Nicosia
++CY	+3510+03322	Asia/Nicosia	Cyprus (most areas)
++CY	+3507+03357	Asia/Famagusta	Northern Cyprus
+ CZ	+5005+01426	Europe/Prague
+-DE	+5230+01322	Europe/Berlin	most locations
++DE	+5230+01322	Europe/Berlin	Germany (most areas)
+ DE	+4742+00841	Europe/Busingen	Busingen
+ DJ	+1136+04309	Africa/Djibouti
+ DK	+5540+01235	Europe/Copenhagen
+ DM	+1518-06124	America/Dominica
+ DO	+1828-06954	America/Santo_Domingo
+ DZ	+3647+00303	Africa/Algiers
+-EC	-0210-07950	America/Guayaquil	mainland
++EC	-0210-07950	America/Guayaquil	Ecuador (mainland)
+ EC	-0054-08936	Pacific/Galapagos	Galapagos Islands
+ EE	+5925+02445	Europe/Tallinn
+ EG	+3003+03115	Africa/Cairo
+ EH	+2709-01312	Africa/El_Aaiun
+ ER	+1520+03853	Africa/Asmara
+-ES	+4024-00341	Europe/Madrid	mainland
+-ES	+3553-00519	Africa/Ceuta	Ceuta & Melilla
++ES	+4024-00341	Europe/Madrid	Spain (mainland)
++ES	+3553-00519	Africa/Ceuta	Ceuta, Melilla
+ ES	+2806-01524	Atlantic/Canary	Canary Islands
+ ET	+0902+03842	Africa/Addis_Ababa
+ FI	+6010+02458	Europe/Helsinki
+ FJ	-1808+17825	Pacific/Fiji
+ FK	-5142-05751	Atlantic/Stanley
+-FM	+0725+15147	Pacific/Chuuk	Chuuk (Truk) and Yap
+-FM	+0658+15813	Pacific/Pohnpei	Pohnpei (Ponape)
++FM	+0725+15147	Pacific/Chuuk	Chuuk/Truk, Yap
++FM	+0658+15813	Pacific/Pohnpei	Pohnpei/Ponape
+ FM	+0519+16259	Pacific/Kosrae	Kosrae
+ FO	+6201-00646	Atlantic/Faroe
+ FR	+4852+00220	Europe/Paris
+@@ -187,10 +188,10 @@
+ GG	+4927-00232	Europe/Guernsey
+ GH	+0533-00013	Africa/Accra
+ GI	+3608-00521	Europe/Gibraltar
+-GL	+6411-05144	America/Godthab	most locations
+-GL	+7646-01840	America/Danmarkshavn	east coast, north of Scoresbysund
+-GL	+7029-02158	America/Scoresbysund	Scoresbysund / Ittoqqortoormiit
+-GL	+7634-06847	America/Thule	Thule / Pituffik
++GL	+6411-05144	America/Godthab	Greenland (most areas)
++GL	+7646-01840	America/Danmarkshavn	National Park (east coast)
++GL	+7029-02158	America/Scoresbysund	Scoresbysund/Ittoqqortoormiit
++GL	+7634-06847	America/Thule	Thule/Pituffik
+ GM	+1328-01639	Africa/Banjul
+ GN	+0931-01343	Africa/Conakry
+ GP	+1614-06132	America/Guadeloupe
+@@ -206,10 +207,10 @@
+ HR	+4548+01558	Europe/Zagreb
+ HT	+1832-07220	America/Port-au-Prince
+ HU	+4730+01905	Europe/Budapest
+-ID	-0610+10648	Asia/Jakarta	Java & Sumatra
+-ID	-0002+10920	Asia/Pontianak	west & central Borneo
+-ID	-0507+11924	Asia/Makassar	east & south Borneo, Sulawesi (Celebes), Bali, Nusa Tengarra, west Timor
+-ID	-0232+14042	Asia/Jayapura	west New Guinea (Irian Jaya) & Malukus (Moluccas)
++ID	-0610+10648	Asia/Jakarta	Java, Sumatra
++ID	-0002+10920	Asia/Pontianak	Borneo (west, central)
++ID	-0507+11924	Asia/Makassar	Borneo (east, south); Sulawesi/Celebes, Bali, Nusa Tengarra; Timor (west)
++ID	-0232+14042	Asia/Jayapura	New Guinea (West Papua / Irian Jaya); Malukus/Moluccas
+ IE	+5320-00615	Europe/Dublin
+ IL	+314650+0351326	Asia/Jerusalem
+ IM	+5409-00428	Europe/Isle_of_Man
+@@ -235,10 +236,10 @@
+ KR	+3733+12658	Asia/Seoul
+ KW	+2920+04759	Asia/Kuwait
+ KY	+1918-08123	America/Cayman
+-KZ	+4315+07657	Asia/Almaty	most locations
+-KZ	+4448+06528	Asia/Qyzylorda	Qyzylorda (Kyzylorda, Kzyl-Orda)
+-KZ	+5017+05710	Asia/Aqtobe	Aqtobe (Aktobe)
+-KZ	+4431+05016	Asia/Aqtau	Atyrau (Atirau, Gur'yev), Mangghystau (Mankistau)
++KZ	+4315+07657	Asia/Almaty	Kazakhstan (most areas)
++KZ	+4448+06528	Asia/Qyzylorda	Qyzylorda/Kyzylorda/Kzyl-Orda
++KZ	+5017+05710	Asia/Aqtobe	Aqtobe/Aktobe
++KZ	+4431+05016	Asia/Aqtau	Atyrau/Atirau/Gur'yev, Mangghystau/Mankistau
+ KZ	+5113+05121	Asia/Oral	West Kazakhstan
+ LA	+1758+10236	Asia/Vientiane
+ LB	+3353+03530	Asia/Beirut
+@@ -257,12 +258,12 @@
+ ME	+4226+01916	Europe/Podgorica
+ MF	+1804-06305	America/Marigot
+ MG	-1855+04731	Indian/Antananarivo
+-MH	+0709+17112	Pacific/Majuro	most locations
++MH	+0709+17112	Pacific/Majuro	Marshall Islands (most areas)
+ MH	+0905+16720	Pacific/Kwajalein	Kwajalein
+ MK	+4159+02126	Europe/Skopje
+ ML	+1239-00800	Africa/Bamako
+-MM	+1647+09610	Asia/Rangoon
+-MN	+4755+10653	Asia/Ulaanbaatar	most locations
++MM	+1647+09610	Asia/Yangon
++MN	+4755+10653	Asia/Ulaanbaatar	Mongolia (most areas)
+ MN	+4801+09139	Asia/Hovd	Bayan-Olgiy, Govi-Altai, Hovd, Uvs, Zavkhan
+ MN	+4804+11430	Asia/Choibalsan	Dornod, Sukhbaatar
+ MO	+2214+11335	Asia/Macau
+@@ -274,20 +275,19 @@
+ MU	-2010+05730	Indian/Mauritius
+ MV	+0410+07330	Indian/Maldives
+ MW	-1547+03500	Africa/Blantyre
+-MX	+1924-09909	America/Mexico_City	Central Time - most locations
++MX	+1924-09909	America/Mexico_City	Central Time
+ MX	+2105-08646	America/Cancun	Eastern Standard Time - Quintana Roo
+ MX	+2058-08937	America/Merida	Central Time - Campeche, Yucatan
+-MX	+2540-10019	America/Monterrey	Mexican Central Time - Coahuila, Durango, Nuevo Leon, Tamaulipas away from US border
+-MX	+2550-09730	America/Matamoros	US Central Time - Coahuila, Durango, Nuevo Leon, Tamaulipas near US border
+-MX	+2313-10625	America/Mazatlan	Mountain Time - S Baja, Nayarit, Sinaloa
+-MX	+2838-10605	America/Chihuahua	Mexican Mountain Time - Chihuahua away from US border
+-MX	+2934-10425	America/Ojinaga	US Mountain Time - Chihuahua near US border
++MX	+2540-10019	America/Monterrey	Central Time - Durango; Coahuila, Nuevo Leon, Tamaulipas (most areas)
++MX	+2550-09730	America/Matamoros	Central Time US - Coahuila, Nuevo Leon, Tamaulipas (US border)
++MX	+2313-10625	America/Mazatlan	Mountain Time - Baja California Sur, Nayarit, Sinaloa
++MX	+2838-10605	America/Chihuahua	Mountain Time - Chihuahua (most areas)
++MX	+2934-10425	America/Ojinaga	Mountain Time US - Chihuahua (US border)
+ MX	+2904-11058	America/Hermosillo	Mountain Standard Time - Sonora
+-MX	+3232-11701	America/Tijuana	US Pacific Time - Baja California near US border
+-MX	+3018-11452	America/Santa_Isabel	Mexican Pacific Time - Baja California away from US border
+-MX	+2048-10515	America/Bahia_Banderas	Mexican Central Time - Bahia de Banderas
+-MY	+0310+10142	Asia/Kuala_Lumpur	peninsular Malaysia
+-MY	+0133+11020	Asia/Kuching	Sabah & Sarawak
++MX	+3232-11701	America/Tijuana	Pacific Time US - Baja California
++MX	+2048-10515	America/Bahia_Banderas	Central Time - Bahia de Banderas
++MY	+0310+10142	Asia/Kuala_Lumpur	Malaysia (peninsula)
++MY	+0133+11020	Asia/Kuching	Sabah, Sarawak
+ MZ	-2558+03235	Africa/Maputo
+ NA	-2234+01706	Africa/Windhoek
+ NC	-2216+16627	Pacific/Noumea
+@@ -300,7 +300,7 @@
+ NP	+2743+08519	Asia/Kathmandu
+ NR	-0031+16655	Pacific/Nauru
+ NU	-1901-16955	Pacific/Niue
+-NZ	-3652+17446	Pacific/Auckland	most locations
++NZ	-3652+17446	Pacific/Auckland	New Zealand (most areas)
+ NZ	-4357-17633	Pacific/Chatham	Chatham Islands
+ OM	+2336+05835	Asia/Muscat
+ PA	+0858-07932	America/Panama
+@@ -308,7 +308,7 @@
+ PF	-1732-14934	Pacific/Tahiti	Society Islands
+ PF	-0900-13930	Pacific/Marquesas	Marquesas Islands
+ PF	-2308-13457	Pacific/Gambier	Gambier Islands
+-PG	-0930+14710	Pacific/Port_Moresby	most locations
++PG	-0930+14710	Pacific/Port_Moresby	Papua New Guinea (most areas)
+ PG	-0613+15534	Pacific/Bougainville	Bougainville
+ PH	+1435+12100	Asia/Manila
+ PK	+2452+06703	Asia/Karachi
+@@ -318,7 +318,7 @@
+ PR	+182806-0660622	America/Puerto_Rico
+ PS	+3130+03428	Asia/Gaza	Gaza Strip
+ PS	+313200+0350542	Asia/Hebron	West Bank
+-PT	+3843-00908	Europe/Lisbon	mainland
++PT	+3843-00908	Europe/Lisbon	Portugal (mainland)
+ PT	+3238-01654	Atlantic/Madeira	Madeira Islands
+ PT	+3744-02540	Atlantic/Azores	Azores
+ PW	+0720+13429	Pacific/Palau
+@@ -327,27 +327,32 @@
+ RE	-2052+05528	Indian/Reunion
+ RO	+4426+02606	Europe/Bucharest
+ RS	+4450+02030	Europe/Belgrade
+-RU	+5443+02030	Europe/Kaliningrad	Moscow-01 - Kaliningrad
+-RU	+554521+0373704	Europe/Moscow	Moscow+00 - west Russia
+-RU	+4457+03406	Europe/Simferopol	Moscow+00 - Crimea
+-RU	+4844+04425	Europe/Volgograd	Moscow+00 - Caspian Sea
+-RU	+5312+05009	Europe/Samara	Moscow+00 (Moscow+01 after 2014-10-26) - Samara, Udmurtia
+-RU	+5651+06036	Asia/Yekaterinburg	Moscow+02 - Urals
+-RU	+5500+07324	Asia/Omsk	Moscow+03 - west Siberia
+-RU	+5502+08255	Asia/Novosibirsk	Moscow+03 - Novosibirsk
+-RU	+5345+08707	Asia/Novokuznetsk	Moscow+03 (Moscow+04 after 2014-10-26) - Kemerovo
+-RU	+5601+09250	Asia/Krasnoyarsk	Moscow+04 - Yenisei River
+-RU	+5216+10420	Asia/Irkutsk	Moscow+05 - Lake Baikal
+-RU	+5203+11328	Asia/Chita	Moscow+06 (Moscow+05 after 2014-10-26) - Zabaykalsky
+-RU	+6200+12940	Asia/Yakutsk	Moscow+06 - Lena River
+-RU	+623923+1353314	Asia/Khandyga	Moscow+06 - Tomponsky, Ust-Maysky
+-RU	+4310+13156	Asia/Vladivostok	Moscow+07 - Amur River
+-RU	+4658+14242	Asia/Sakhalin	Moscow+07 - Sakhalin Island
+-RU	+643337+1431336	Asia/Ust-Nera	Moscow+07 - Oymyakonsky
+-RU	+5934+15048	Asia/Magadan	Moscow+08 (Moscow+07 after 2014-10-26) - Magadan
+-RU	+6728+15343	Asia/Srednekolymsk	Moscow+08 - E Sakha, N Kuril Is
+-RU	+5301+15839	Asia/Kamchatka	Moscow+08 (Moscow+09 after 2014-10-26) - Kamchatka
+-RU	+6445+17729	Asia/Anadyr	Moscow+08 (Moscow+09 after 2014-10-26) - Bering Sea
++RU	+5443+02030	Europe/Kaliningrad	MSK-01 - Kaliningrad
++RU	+554521+0373704	Europe/Moscow	MSK+00 - Moscow area
++RU	+4457+03406	Europe/Simferopol	MSK+00 - Crimea
++RU	+4844+04425	Europe/Volgograd	MSK+00 - Volgograd, Saratov
++RU	+5836+04939	Europe/Kirov	MSK+00 - Kirov
++RU	+4621+04803	Europe/Astrakhan	MSK+01 - Astrakhan
++RU	+5312+05009	Europe/Samara	MSK+01 - Samara, Udmurtia
++RU	+5420+04824	Europe/Ulyanovsk	MSK+01 - Ulyanovsk
++RU	+5651+06036	Asia/Yekaterinburg	MSK+02 - Urals
++RU	+5500+07324	Asia/Omsk	MSK+03 - Omsk
++RU	+5502+08255	Asia/Novosibirsk	MSK+03 - Novosibirsk
++RU	+5322+08345	Asia/Barnaul	MSK+04 - Altai
++RU	+5630+08458	Asia/Tomsk	MSK+04 - Tomsk
++RU	+5345+08707	Asia/Novokuznetsk	MSK+04 - Kemerovo
++RU	+5601+09250	Asia/Krasnoyarsk	MSK+04 - Krasnoyarsk area
++RU	+5216+10420	Asia/Irkutsk	MSK+05 - Irkutsk, Buryatia
++RU	+5203+11328	Asia/Chita	MSK+06 - Zabaykalsky
++RU	+6200+12940	Asia/Yakutsk	MSK+06 - Lena River
++RU	+623923+1353314	Asia/Khandyga	MSK+06 - Tomponsky, Ust-Maysky
++RU	+4310+13156	Asia/Vladivostok	MSK+07 - Amur River
++RU	+643337+1431336	Asia/Ust-Nera	MSK+07 - Oymyakonsky
++RU	+5934+15048	Asia/Magadan	MSK+08 - Magadan
++RU	+4658+14242	Asia/Sakhalin	MSK+08 - Sakhalin Island
++RU	+6728+15343	Asia/Srednekolymsk	MSK+08 - Sakha (E); North Kuril Is
++RU	+5301+15839	Asia/Kamchatka	MSK+09 - Kamchatka
++RU	+6445+17729	Asia/Anadyr	MSK+09 - Bering Sea
+ RW	-0157+03004	Africa/Kigali
+ SA	+2438+04643	Asia/Riyadh
+ SB	-0932+16012	Pacific/Guadalcanal
+@@ -386,45 +391,45 @@
+ TV	-0831+17913	Pacific/Funafuti
+ TW	+2503+12130	Asia/Taipei
+ TZ	-0648+03917	Africa/Dar_es_Salaam
+-UA	+5026+03031	Europe/Kiev	most locations
++UA	+5026+03031	Europe/Kiev	Ukraine (most areas)
+ UA	+4837+02218	Europe/Uzhgorod	Ruthenia
+-UA	+4750+03510	Europe/Zaporozhye	Zaporozh'ye, E Lugansk / Zaporizhia, E Luhansk
++UA	+4750+03510	Europe/Zaporozhye	Zaporozh'ye/Zaporizhia; Lugansk/Luhansk (east)
+ UG	+0019+03225	Africa/Kampala
+ UM	+1645-16931	Pacific/Johnston	Johnston Atoll
+ UM	+2813-17722	Pacific/Midway	Midway Islands
+ UM	+1917+16637	Pacific/Wake	Wake Island
+-US	+404251-0740023	America/New_York	Eastern Time
+-US	+421953-0830245	America/Detroit	Eastern Time - Michigan - most locations
+-US	+381515-0854534	America/Kentucky/Louisville	Eastern Time - Kentucky - Louisville area
+-US	+364947-0845057	America/Kentucky/Monticello	Eastern Time - Kentucky - Wayne County
+-US	+394606-0860929	America/Indiana/Indianapolis	Eastern Time - Indiana - most locations
+-US	+384038-0873143	America/Indiana/Vincennes	Eastern Time - Indiana - Daviess, Dubois, Knox & Martin Counties
+-US	+410305-0863611	America/Indiana/Winamac	Eastern Time - Indiana - Pulaski County
+-US	+382232-0862041	America/Indiana/Marengo	Eastern Time - Indiana - Crawford County
+-US	+382931-0871643	America/Indiana/Petersburg	Eastern Time - Indiana - Pike County
+-US	+384452-0850402	America/Indiana/Vevay	Eastern Time - Indiana - Switzerland County
+-US	+415100-0873900	America/Chicago	Central Time
+-US	+375711-0864541	America/Indiana/Tell_City	Central Time - Indiana - Perry County
+-US	+411745-0863730	America/Indiana/Knox	Central Time - Indiana - Starke County
+-US	+450628-0873651	America/Menominee	Central Time - Michigan - Dickinson, Gogebic, Iron & Menominee Counties
+-US	+470659-1011757	America/North_Dakota/Center	Central Time - North Dakota - Oliver County
+-US	+465042-1012439	America/North_Dakota/New_Salem	Central Time - North Dakota - Morton County (except Mandan area)
+-US	+471551-1014640	America/North_Dakota/Beulah	Central Time - North Dakota - Mercer County
+-US	+394421-1045903	America/Denver	Mountain Time
+-US	+433649-1161209	America/Boise	Mountain Time - south Idaho & east Oregon
+-US	+332654-1120424	America/Phoenix	Mountain Standard Time - Arizona (except Navajo)
+-US	+340308-1181434	America/Los_Angeles	Pacific Time
+-US	+550737-1313435	America/Metlakatla	Pacific Standard Time - Annette Island, Alaska
+-US	+611305-1495401	America/Anchorage	Alaska Time
+-US	+581807-1342511	America/Juneau	Alaska Time - Alaska panhandle
+-US	+571035-1351807	America/Sitka	Alaska Time - southeast Alaska panhandle
+-US	+593249-1394338	America/Yakutat	Alaska Time - Alaska panhandle neck
+-US	+643004-1652423	America/Nome	Alaska Time - west Alaska
++US	+404251-0740023	America/New_York	Eastern (most areas)
++US	+421953-0830245	America/Detroit	Eastern - MI (most areas)
++US	+381515-0854534	America/Kentucky/Louisville	Eastern - KY (Louisville area)
++US	+364947-0845057	America/Kentucky/Monticello	Eastern - KY (Wayne)
++US	+394606-0860929	America/Indiana/Indianapolis	Eastern - IN (most areas)
++US	+384038-0873143	America/Indiana/Vincennes	Eastern - IN (Da, Du, K, Mn)
++US	+410305-0863611	America/Indiana/Winamac	Eastern - IN (Pulaski)
++US	+382232-0862041	America/Indiana/Marengo	Eastern - IN (Crawford)
++US	+382931-0871643	America/Indiana/Petersburg	Eastern - IN (Pike)
++US	+384452-0850402	America/Indiana/Vevay	Eastern - IN (Switzerland)
++US	+415100-0873900	America/Chicago	Central (most areas)
++US	+375711-0864541	America/Indiana/Tell_City	Central - IN (Perry)
++US	+411745-0863730	America/Indiana/Knox	Central - IN (Starke)
++US	+450628-0873651	America/Menominee	Central - MI (Wisconsin border)
++US	+470659-1011757	America/North_Dakota/Center	Central - ND (Oliver)
++US	+465042-1012439	America/North_Dakota/New_Salem	Central - ND (Morton rural)
++US	+471551-1014640	America/North_Dakota/Beulah	Central - ND (Mercer)
++US	+394421-1045903	America/Denver	Mountain (most areas)
++US	+433649-1161209	America/Boise	Mountain - ID (south); OR (east)
++US	+332654-1120424	America/Phoenix	MST - Arizona (except Navajo)
++US	+340308-1181434	America/Los_Angeles	Pacific
++US	+611305-1495401	America/Anchorage	Alaska (most areas)
++US	+581807-1342511	America/Juneau	Alaska - Juneau area
++US	+571035-1351807	America/Sitka	Alaska - Sitka area
++US	+550737-1313435	America/Metlakatla	Alaska - Annette Island
++US	+593249-1394338	America/Yakutat	Alaska - Yakutat
++US	+643004-1652423	America/Nome	Alaska (west)
+ US	+515248-1763929	America/Adak	Aleutian Islands
+ US	+211825-1575130	Pacific/Honolulu	Hawaii
+ UY	-3453-05611	America/Montevideo
+-UZ	+3940+06648	Asia/Samarkand	west Uzbekistan
+-UZ	+4120+06918	Asia/Tashkent	east Uzbekistan
++UZ	+3940+06648	Asia/Samarkand	Uzbekistan (west)
++UZ	+4120+06918	Asia/Tashkent	Uzbekistan (east)
+ VA	+415408+0122711	Europe/Vatican
+ VC	+1309-06114	America/St_Vincent
+ VE	+1030-06656	America/Caracas
+--- contrib/tzdata/zone1970.tab.orig
++++ contrib/tzdata/zone1970.tab
+@@ -39,21 +39,21 @@
+ AF	+3431+06912	Asia/Kabul
+ AL	+4120+01950	Europe/Tirane
+ AM	+4011+04430	Asia/Yerevan
+-AQ	-6734-06808	Antarctica/Rothera	Rothera Station, Adelaide Island
+-AQ	-6448-06406	Antarctica/Palmer	Palmer Station, Anvers Island
+-AQ	-6736+06253	Antarctica/Mawson	Mawson Station, Holme Bay
+-AQ	-6835+07758	Antarctica/Davis	Davis Station, Vestfold Hills
+-AQ	-6617+11031	Antarctica/Casey	Casey Station, Bailey Peninsula
+-AQ	-7824+10654	Antarctica/Vostok	Vostok Station, Lake Vostok
+-AQ	-6640+14001	Antarctica/DumontDUrville	Dumont-d'Urville Station, Adélie Land
+-AQ	-690022+0393524	Antarctica/Syowa	Syowa Station, E Ongul I
+-AQ	-720041+0023206	Antarctica/Troll	Troll Station, Queen Maud Land
++AQ	-6617+11031	Antarctica/Casey	Casey
++AQ	-6835+07758	Antarctica/Davis	Davis
++AQ	-6640+14001	Antarctica/DumontDUrville	Dumont-d'Urville
++AQ	-6736+06253	Antarctica/Mawson	Mawson
++AQ	-6448-06406	Antarctica/Palmer	Palmer
++AQ	-6734-06808	Antarctica/Rothera	Rothera
++AQ	-690022+0393524	Antarctica/Syowa	Syowa
++AQ	-720041+0023206	Antarctica/Troll	Troll
++AQ	-7824+10654	Antarctica/Vostok	Vostok
+ AR	-3436-05827	America/Argentina/Buenos_Aires	Buenos Aires (BA, CF)
+-AR	-3124-06411	America/Argentina/Cordoba	most locations (CB, CC, CN, ER, FM, MN, SE, SF)
+-AR	-2447-06525	America/Argentina/Salta	(SA, LP, NQ, RN)
++AR	-3124-06411	America/Argentina/Cordoba	Argentina (most areas: CB, CC, CN, ER, FM, MN, SE, SF)
++AR	-2447-06525	America/Argentina/Salta	Salta (SA, LP, NQ, RN)
+ AR	-2411-06518	America/Argentina/Jujuy	Jujuy (JY)
+ AR	-2649-06513	America/Argentina/Tucuman	Tucumán (TM)
+-AR	-2828-06547	America/Argentina/Catamarca	Catamarca (CT), Chubut (CH)
++AR	-2828-06547	America/Argentina/Catamarca	Catamarca (CT); Chubut (CH)
+ AR	-2926-06651	America/Argentina/La_Rioja	La Rioja (LR)
+ AR	-3132-06831	America/Argentina/San_Juan	San Juan (SJ)
+ AR	-3253-06849	America/Argentina/Mendoza	Mendoza (MZ)
+@@ -64,17 +64,17 @@
+ AT	+4813+01620	Europe/Vienna
+ AU	-3133+15905	Australia/Lord_Howe	Lord Howe Island
+ AU	-5430+15857	Antarctica/Macquarie	Macquarie Island
+-AU	-4253+14719	Australia/Hobart	Tasmania - most locations
+-AU	-3956+14352	Australia/Currie	Tasmania - King Island
++AU	-4253+14719	Australia/Hobart	Tasmania (most areas)
++AU	-3956+14352	Australia/Currie	Tasmania (King Island)
+ AU	-3749+14458	Australia/Melbourne	Victoria
+-AU	-3352+15113	Australia/Sydney	New South Wales - most locations
+-AU	-3157+14127	Australia/Broken_Hill	New South Wales - Yancowinna
+-AU	-2728+15302	Australia/Brisbane	Queensland - most locations
+-AU	-2016+14900	Australia/Lindeman	Queensland - Holiday Islands
++AU	-3352+15113	Australia/Sydney	New South Wales (most areas)
++AU	-3157+14127	Australia/Broken_Hill	New South Wales (Yancowinna)
++AU	-2728+15302	Australia/Brisbane	Queensland (most areas)
++AU	-2016+14900	Australia/Lindeman	Queensland (Whitsunday Islands)
+ AU	-3455+13835	Australia/Adelaide	South Australia
+ AU	-1228+13050	Australia/Darwin	Northern Territory
+-AU	-3157+11551	Australia/Perth	Western Australia - most locations
+-AU	-3143+12852	Australia/Eucla	Western Australia - Eucla area
++AU	-3157+11551	Australia/Perth	Western Australia (most areas)
++AU	-3143+12852	Australia/Eucla	Western Australia (Eucla)
+ AZ	+4023+04951	Asia/Baku
+ BB	+1306-05937	America/Barbados
+ BD	+2343+09025	Asia/Dhaka
+@@ -84,58 +84,58 @@
+ BN	+0456+11455	Asia/Brunei
+ BO	-1630-06809	America/La_Paz
+ BR	-0351-03225	America/Noronha	Atlantic islands
+-BR	-0127-04829	America/Belem	Amapá, E Pará
+-BR	-0343-03830	America/Fortaleza	NE Brazil (MA, PI, CE, RN, PB)
++BR	-0127-04829	America/Belem	Pará (east); Amapá
++BR	-0343-03830	America/Fortaleza	Brazil (northeast: MA, PI, CE, RN, PB)
+ BR	-0803-03454	America/Recife	Pernambuco
+ BR	-0712-04812	America/Araguaina	Tocantins
+ BR	-0940-03543	America/Maceio	Alagoas, Sergipe
+ BR	-1259-03831	America/Bahia	Bahia
+-BR	-2332-04637	America/Sao_Paulo	S & SE Brazil (GO, DF, MG, ES, RJ, SP, PR, SC, RS)
++BR	-2332-04637	America/Sao_Paulo	Brazil (southeast: GO, DF, MG, ES, RJ, SP, PR, SC, RS)
+ BR	-2027-05437	America/Campo_Grande	Mato Grosso do Sul
+ BR	-1535-05605	America/Cuiaba	Mato Grosso
+-BR	-0226-05452	America/Santarem	W Pará
++BR	-0226-05452	America/Santarem	Pará (west)
+ BR	-0846-06354	America/Porto_Velho	Rondônia
+ BR	+0249-06040	America/Boa_Vista	Roraima
+-BR	-0308-06001	America/Manaus	E Amazonas
+-BR	-0640-06952	America/Eirunepe	W Amazonas
++BR	-0308-06001	America/Manaus	Amazonas (east)
++BR	-0640-06952	America/Eirunepe	Amazonas (west)
+ BR	-0958-06748	America/Rio_Branco	Acre
+ BS	+2505-07721	America/Nassau
+ BT	+2728+08939	Asia/Thimphu
+ BY	+5354+02734	Europe/Minsk
+ BZ	+1730-08812	America/Belize
+-CA	+4734-05243	America/St_Johns	Newfoundland Time, including SE Labrador
+-CA	+4439-06336	America/Halifax	Atlantic Time - Nova Scotia (peninsula), PEI
+-CA	+4612-05957	America/Glace_Bay	Atlantic Time - Nova Scotia (Cape Breton)
+-CA	+4606-06447	America/Moncton	Atlantic Time - New Brunswick
+-CA	+5320-06025	America/Goose_Bay	Atlantic Time - Labrador - most locations
+-CA	+5125-05707	America/Blanc-Sablon	Atlantic Standard Time - Quebec - Lower North Shore
+-CA	+4339-07923	America/Toronto	Eastern Time - Ontario & Quebec - most locations
+-CA	+4901-08816	America/Nipigon	Eastern Time - Ontario & Quebec - places that did not observe DST 1967-1973
+-CA	+4823-08915	America/Thunder_Bay	Eastern Time - Thunder Bay, Ontario
+-CA	+6344-06828	America/Iqaluit	Eastern Time - east Nunavut - most locations
+-CA	+6608-06544	America/Pangnirtung	Eastern Time - Pangnirtung, Nunavut
+-CA	+744144-0944945	America/Resolute	Central Time - Resolute, Nunavut
+-CA	+484531-0913718	America/Atikokan	Eastern Standard Time - Atikokan, Ontario and Southampton I, Nunavut
+-CA	+624900-0920459	America/Rankin_Inlet	Central Time - central Nunavut
+-CA	+4953-09709	America/Winnipeg	Central Time - Manitoba & west Ontario
+-CA	+4843-09434	America/Rainy_River	Central Time - Rainy River & Fort Frances, Ontario
+-CA	+5024-10439	America/Regina	Central Standard Time - Saskatchewan - most locations
+-CA	+5017-10750	America/Swift_Current	Central Standard Time - Saskatchewan - midwest
+-CA	+5333-11328	America/Edmonton	Mountain Time - Alberta, east British Columbia & west Saskatchewan
+-CA	+690650-1050310	America/Cambridge_Bay	Mountain Time - west Nunavut
+-CA	+6227-11421	America/Yellowknife	Mountain Time - central Northwest Territories
+-CA	+682059-1334300	America/Inuvik	Mountain Time - west Northwest Territories
+-CA	+4906-11631	America/Creston	Mountain Standard Time - Creston, British Columbia
+-CA	+5946-12014	America/Dawson_Creek	Mountain Standard Time - Dawson Creek & Fort Saint John, British Columbia
+-CA	+5848-12242	America/Fort_Nelson	Mountain Standard Time - Fort Nelson, British Columbia
+-CA	+4916-12307	America/Vancouver	Pacific Time - west British Columbia
+-CA	+6043-13503	America/Whitehorse	Pacific Time - south Yukon
+-CA	+6404-13925	America/Dawson	Pacific Time - north Yukon
++CA	+4734-05243	America/St_Johns	Newfoundland; Labrador (southeast)
++CA	+4439-06336	America/Halifax	Atlantic - NS (most areas); PE
++CA	+4612-05957	America/Glace_Bay	Atlantic - NS (Cape Breton)
++CA	+4606-06447	America/Moncton	Atlantic - New Brunswick
++CA	+5320-06025	America/Goose_Bay	Atlantic - Labrador (most areas)
++CA	+5125-05707	America/Blanc-Sablon	AST - QC (Lower North Shore)
++CA	+4339-07923	America/Toronto	Eastern - ON, QC (most areas)
++CA	+4901-08816	America/Nipigon	Eastern - ON, QC (no DST 1967-73)
++CA	+4823-08915	America/Thunder_Bay	Eastern - ON (Thunder Bay)
++CA	+6344-06828	America/Iqaluit	Eastern - NU (most east areas)
++CA	+6608-06544	America/Pangnirtung	Eastern - NU (Pangnirtung)
++CA	+484531-0913718	America/Atikokan	EST - ON (Atikokan); NU (Coral H)
++CA	+4953-09709	America/Winnipeg	Central - ON (west); Manitoba
++CA	+4843-09434	America/Rainy_River	Central - ON (Rainy R, Ft Frances)
++CA	+744144-0944945	America/Resolute	Central - NU (Resolute)
++CA	+624900-0920459	America/Rankin_Inlet	Central - NU (central)
++CA	+5024-10439	America/Regina	CST - SK (most areas)
++CA	+5017-10750	America/Swift_Current	CST - SK (midwest)
++CA	+5333-11328	America/Edmonton	Mountain - AB; BC (E); SK (W)
++CA	+690650-1050310	America/Cambridge_Bay	Mountain - NU (west)
++CA	+6227-11421	America/Yellowknife	Mountain - NT (central)
++CA	+682059-1334300	America/Inuvik	Mountain - NT (west)
++CA	+4906-11631	America/Creston	MST - BC (Creston)
++CA	+5946-12014	America/Dawson_Creek	MST - BC (Dawson Cr, Ft St John)
++CA	+5848-12242	America/Fort_Nelson	MST - BC (Ft Nelson)
++CA	+4916-12307	America/Vancouver	Pacific - BC (most areas)
++CA	+6043-13503	America/Whitehorse	Pacific - Yukon (south)
++CA	+6404-13925	America/Dawson	Pacific - Yukon (north)
+ CC	-1210+09655	Indian/Cocos
+ CH,DE,LI	+4723+00832	Europe/Zurich	Swiss time
+ CI,BF,GM,GN,ML,MR,SH,SL,SN,ST,TG	+0519-00402	Africa/Abidjan
+ CK	-2114-15946	Pacific/Rarotonga
+-CL	-3327-07040	America/Santiago	most locations
++CL	-3327-07040	America/Santiago	Chile (most areas)
+ CL	-2709-10926	Pacific/Easter	Easter Island
+ CN	+3114+12128	Asia/Shanghai	Beijing Time
+ CN	+4348+08735	Asia/Urumqi	Xinjiang Time
+@@ -145,25 +145,26 @@
+ CV	+1455-02331	Atlantic/Cape_Verde
+ CW,AW,BQ,SX	+1211-06900	America/Curacao
+ CX	-1025+10543	Indian/Christmas
+-CY	+3510+03322	Asia/Nicosia
++CY	+3510+03322	Asia/Nicosia	Cyprus (most areas)
++CY	+3507+03357	Asia/Famagusta	Northern Cyprus
+ CZ,SK	+5005+01426	Europe/Prague
+-DE	+5230+01322	Europe/Berlin	Berlin time
++DE	+5230+01322	Europe/Berlin	Germany (most areas)
+ DK	+5540+01235	Europe/Copenhagen
+ DO	+1828-06954	America/Santo_Domingo
+ DZ	+3647+00303	Africa/Algiers
+-EC	-0210-07950	America/Guayaquil	mainland
++EC	-0210-07950	America/Guayaquil	Ecuador (mainland)
+ EC	-0054-08936	Pacific/Galapagos	Galápagos Islands
+ EE	+5925+02445	Europe/Tallinn
+ EG	+3003+03115	Africa/Cairo
+ EH	+2709-01312	Africa/El_Aaiun
+-ES	+4024-00341	Europe/Madrid	mainland
+-ES	+3553-00519	Africa/Ceuta	Ceuta & Melilla
++ES	+4024-00341	Europe/Madrid	Spain (mainland)
++ES	+3553-00519	Africa/Ceuta	Ceuta, Melilla
+ ES	+2806-01524	Atlantic/Canary	Canary Islands
+ FI,AX	+6010+02458	Europe/Helsinki
+ FJ	-1808+17825	Pacific/Fiji
+ FK	-5142-05751	Atlantic/Stanley
+-FM	+0725+15147	Pacific/Chuuk	Chuuk (Truk) and Yap
+-FM	+0658+15813	Pacific/Pohnpei	Pohnpei (Ponape)
++FM	+0725+15147	Pacific/Chuuk	Chuuk/Truk, Yap
++FM	+0658+15813	Pacific/Pohnpei	Pohnpei/Ponape
+ FM	+0519+16259	Pacific/Kosrae	Kosrae
+ FO	+6201-00646	Atlantic/Faroe
+ FR	+4852+00220	Europe/Paris
+@@ -172,10 +173,10 @@
+ GF	+0456-05220	America/Cayenne
+ GH	+0533-00013	Africa/Accra
+ GI	+3608-00521	Europe/Gibraltar
+-GL	+6411-05144	America/Godthab	most locations
+-GL	+7646-01840	America/Danmarkshavn	east coast, north of Scoresbysund
+-GL	+7029-02158	America/Scoresbysund	Scoresbysund / Ittoqqortoormiit
+-GL	+7634-06847	America/Thule	Thule / Pituffik
++GL	+6411-05144	America/Godthab	Greenland (most areas)
++GL	+7646-01840	America/Danmarkshavn	National Park (east coast)
++GL	+7029-02158	America/Scoresbysund	Scoresbysund/Ittoqqortoormiit
++GL	+7634-06847	America/Thule	Thule/Pituffik
+ GR	+3758+02343	Europe/Athens
+ GS	-5416-03632	Atlantic/South_Georgia
+ GT	+1438-09031	America/Guatemala
+@@ -186,10 +187,10 @@
+ HN	+1406-08713	America/Tegucigalpa
+ HT	+1832-07220	America/Port-au-Prince
+ HU	+4730+01905	Europe/Budapest
+-ID	-0610+10648	Asia/Jakarta	Java & Sumatra
+-ID	-0002+10920	Asia/Pontianak	west & central Borneo
+-ID	-0507+11924	Asia/Makassar	east & south Borneo, Sulawesi (Celebes), Bali, Nusa Tengarra, west Timor
+-ID	-0232+14042	Asia/Jayapura	west New Guinea (Irian Jaya) & Malukus (Moluccas)
++ID	-0610+10648	Asia/Jakarta	Java, Sumatra
++ID	-0002+10920	Asia/Pontianak	Borneo (west, central)
++ID	-0507+11924	Asia/Makassar	Borneo (east, south); Sulawesi/Celebes, Bali, Nusa Tengarra; Timor (west)
++ID	-0232+14042	Asia/Jayapura	New Guinea (West Papua / Irian Jaya); Malukus/Moluccas
+ IE	+5320-00615	Europe/Dublin
+ IL	+314650+0351326	Asia/Jerusalem
+ IN	+2232+08822	Asia/Kolkata
+@@ -208,11 +209,10 @@
+ KI	+0152-15720	Pacific/Kiritimati	Line Islands
+ KP	+3901+12545	Asia/Pyongyang
+ KR	+3733+12658	Asia/Seoul
+-KY	+1918-08123	America/Cayman
+-KZ	+4315+07657	Asia/Almaty	most locations
+-KZ	+4448+06528	Asia/Qyzylorda	Qyzylorda (Kyzylorda, Kzyl-Orda)
+-KZ	+5017+05710	Asia/Aqtobe	Aqtobe (Aktobe)
+-KZ	+4431+05016	Asia/Aqtau	Atyrau (Atirau, Gur'yev), Mangghystau (Mankistau)
++KZ	+4315+07657	Asia/Almaty	Kazakhstan (most areas)
++KZ	+4448+06528	Asia/Qyzylorda	Qyzylorda/Kyzylorda/Kzyl-Orda
++KZ	+5017+05710	Asia/Aqtobe	Aqtobe/Aktobe
++KZ	+4431+05016	Asia/Aqtau	Atyrau/Atirau/Gur'yev, Mangghystau/Mankistau
+ KZ	+5113+05121	Asia/Oral	West Kazakhstan
+ LB	+3353+03530	Asia/Beirut
+ LK	+0656+07951	Asia/Colombo
+@@ -224,10 +224,10 @@
+ MA	+3339-00735	Africa/Casablanca
+ MC	+4342+00723	Europe/Monaco
+ MD	+4700+02850	Europe/Chisinau
+-MH	+0709+17112	Pacific/Majuro	most locations
++MH	+0709+17112	Pacific/Majuro	Marshall Islands (most areas)
+ MH	+0905+16720	Pacific/Kwajalein	Kwajalein
+-MM	+1647+09610	Asia/Rangoon
+-MN	+4755+10653	Asia/Ulaanbaatar	most locations
++MM	+1647+09610	Asia/Yangon
++MN	+4755+10653	Asia/Ulaanbaatar	Mongolia (most areas)
+ MN	+4801+09139	Asia/Hovd	Bayan-Ölgii, Govi-Altai, Hovd, Uvs, Zavkhan
+ MN	+4804+11430	Asia/Choibalsan	Dornod, Sükhbaatar
+ MO	+2214+11335	Asia/Macau
+@@ -235,25 +235,24 @@
+ MT	+3554+01431	Europe/Malta
+ MU	-2010+05730	Indian/Mauritius
+ MV	+0410+07330	Indian/Maldives
+-MX	+1924-09909	America/Mexico_City	Central Time - most locations
++MX	+1924-09909	America/Mexico_City	Central Time
+ MX	+2105-08646	America/Cancun	Eastern Standard Time - Quintana Roo
+ MX	+2058-08937	America/Merida	Central Time - Campeche, Yucatán
+-MX	+2540-10019	America/Monterrey	Mexican Central Time - Coahuila, Durango, Nuevo León, Tamaulipas away from US border
+-MX	+2550-09730	America/Matamoros	US Central Time - Coahuila, Durango, Nuevo León, Tamaulipas near US border
+-MX	+2313-10625	America/Mazatlan	Mountain Time - S Baja, Nayarit, Sinaloa
+-MX	+2838-10605	America/Chihuahua	Mexican Mountain Time - Chihuahua away from US border
+-MX	+2934-10425	America/Ojinaga	US Mountain Time - Chihuahua near US border
++MX	+2540-10019	America/Monterrey	Central Time - Durango; Coahuila, Nuevo León, Tamaulipas (most areas)
++MX	+2550-09730	America/Matamoros	Central Time US - Coahuila, Nuevo León, Tamaulipas (US border)
++MX	+2313-10625	America/Mazatlan	Mountain Time - Baja California Sur, Nayarit, Sinaloa
++MX	+2838-10605	America/Chihuahua	Mountain Time - Chihuahua (most areas)
++MX	+2934-10425	America/Ojinaga	Mountain Time US - Chihuahua (US border)
+ MX	+2904-11058	America/Hermosillo	Mountain Standard Time - Sonora
+-MX	+3232-11701	America/Tijuana	US Pacific Time - Baja California near US border
+-MX	+3018-11452	America/Santa_Isabel	Mexican Pacific Time - Baja California away from US border
+-MX	+2048-10515	America/Bahia_Banderas	Mexican Central Time - Bahía de Banderas
+-MY	+0310+10142	Asia/Kuala_Lumpur	peninsular Malaysia
+-MY	+0133+11020	Asia/Kuching	Sabah & Sarawak
+-MZ,BI,BW,CD,MW,RW,ZM,ZW	-2558+03235	Africa/Maputo	Central Africa Time (UTC+2)
++MX	+3232-11701	America/Tijuana	Pacific Time US - Baja California
++MX	+2048-10515	America/Bahia_Banderas	Central Time - Bahía de Banderas
++MY	+0310+10142	Asia/Kuala_Lumpur	Malaysia (peninsula)
++MY	+0133+11020	Asia/Kuching	Sabah, Sarawak
++MZ,BI,BW,CD,MW,RW,ZM,ZW	-2558+03235	Africa/Maputo	Central Africa Time
+ NA	-2234+01706	Africa/Windhoek
+ NC	-2216+16627	Pacific/Noumea
+ NF	-2903+16758	Pacific/Norfolk
+-NG,AO,BJ,CD,CF,CG,CM,GA,GQ,NE	+0627+00324	Africa/Lagos	West Africa Time (UTC+1)
++NG,AO,BJ,CD,CF,CG,CM,GA,GQ,NE	+0627+00324	Africa/Lagos	West Africa Time
+ NI	+1209-08617	America/Managua
+ NL	+5222+00454	Europe/Amsterdam
+ NO,SJ	+5955+01045	Europe/Oslo
+@@ -262,12 +261,12 @@
+ NU	-1901-16955	Pacific/Niue
+ NZ,AQ	-3652+17446	Pacific/Auckland	New Zealand time
+ NZ	-4357-17633	Pacific/Chatham	Chatham Islands
+-PA	+0858-07932	America/Panama
++PA,KY	+0858-07932	America/Panama
+ PE	-1203-07703	America/Lima
+ PF	-1732-14934	Pacific/Tahiti	Society Islands
+ PF	-0900-13930	Pacific/Marquesas	Marquesas Islands
+ PF	-2308-13457	Pacific/Gambier	Gambier Islands
+-PG	-0930+14710	Pacific/Port_Moresby	most locations
++PG	-0930+14710	Pacific/Port_Moresby	Papua New Guinea (most areas)
+ PG	-0613+15534	Pacific/Bougainville	Bougainville
+ PH	+1435+12100	Asia/Manila
+ PK	+2452+06703	Asia/Karachi
+@@ -277,36 +276,41 @@
+ PR	+182806-0660622	America/Puerto_Rico
+ PS	+3130+03428	Asia/Gaza	Gaza Strip
+ PS	+313200+0350542	Asia/Hebron	West Bank
+-PT	+3843-00908	Europe/Lisbon	mainland
++PT	+3843-00908	Europe/Lisbon	Portugal (mainland)
+ PT	+3238-01654	Atlantic/Madeira	Madeira Islands
+ PT	+3744-02540	Atlantic/Azores	Azores
+ PW	+0720+13429	Pacific/Palau
+ PY	-2516-05740	America/Asuncion
+ QA,BH	+2517+05132	Asia/Qatar
+-RE,TF	-2052+05528	Indian/Reunion	Réunion, Crozet Is, Scattered Is
++RE,TF	-2052+05528	Indian/Reunion	Réunion, Crozet, Scattered Islands
+ RO	+4426+02606	Europe/Bucharest
+ RS,BA,HR,ME,MK,SI	+4450+02030	Europe/Belgrade
+-RU	+5443+02030	Europe/Kaliningrad	Moscow-01 - Kaliningrad
+-RU	+554521+0373704	Europe/Moscow	Moscow+00 - west Russia
+-RU	+4457+03406	Europe/Simferopol	Moscow+00 - Crimea
+-RU	+4844+04425	Europe/Volgograd	Moscow+00 - Caspian Sea
+-RU	+5312+05009	Europe/Samara	Moscow+00 (Moscow+01 after 2014-10-26) - Samara, Udmurtia
+-RU	+5651+06036	Asia/Yekaterinburg	Moscow+02 - Urals
+-RU	+5500+07324	Asia/Omsk	Moscow+03 - west Siberia
+-RU	+5502+08255	Asia/Novosibirsk	Moscow+03 - Novosibirsk
+-RU	+5345+08707	Asia/Novokuznetsk	Moscow+03 (Moscow+04 after 2014-10-26) - Kemerovo
+-RU	+5601+09250	Asia/Krasnoyarsk	Moscow+04 - Yenisei River
+-RU	+5216+10420	Asia/Irkutsk	Moscow+05 - Lake Baikal
+-RU	+5203+11328	Asia/Chita	Moscow+06 (Moscow+05 after 2014-10-26) - Zabaykalsky
+-RU	+6200+12940	Asia/Yakutsk	Moscow+06 - Lena River
+-RU	+623923+1353314	Asia/Khandyga	Moscow+06 - Tomponsky, Ust-Maysky
+-RU	+4310+13156	Asia/Vladivostok	Moscow+07 - Amur River
+-RU	+4658+14242	Asia/Sakhalin	Moscow+07 - Sakhalin Island
+-RU	+643337+1431336	Asia/Ust-Nera	Moscow+07 - Oymyakonsky
+-RU	+5934+15048	Asia/Magadan	Moscow+08 (Moscow+07 after 2014-10-26) - Magadan
+-RU	+6728+15343	Asia/Srednekolymsk	Moscow+08 - E Sakha, N Kuril Is
+-RU	+5301+15839	Asia/Kamchatka	Moscow+08 (Moscow+09 after 2014-10-26) - Kamchatka
+-RU	+6445+17729	Asia/Anadyr	Moscow+08 (Moscow+09 after 2014-10-26) - Bering Sea
++RU	+5443+02030	Europe/Kaliningrad	MSK-01 - Kaliningrad
++RU	+554521+0373704	Europe/Moscow	MSK+00 - Moscow area
++RU	+4457+03406	Europe/Simferopol	MSK+00 - Crimea
++RU	+4844+04425	Europe/Volgograd	MSK+00 - Volgograd, Saratov
++RU	+5836+04939	Europe/Kirov	MSK+00 - Kirov
++RU	+4621+04803	Europe/Astrakhan	MSK+01 - Astrakhan
++RU	+5312+05009	Europe/Samara	MSK+01 - Samara, Udmurtia
++RU	+5420+04824	Europe/Ulyanovsk	MSK+01 - Ulyanovsk
++RU	+5651+06036	Asia/Yekaterinburg	MSK+02 - Urals
++RU	+5500+07324	Asia/Omsk	MSK+03 - Omsk
++RU	+5502+08255	Asia/Novosibirsk	MSK+03 - Novosibirsk
++RU	+5322+08345	Asia/Barnaul	MSK+04 - Altai
++RU	+5630+08458	Asia/Tomsk	MSK+04 - Tomsk
++RU	+5345+08707	Asia/Novokuznetsk	MSK+04 - Kemerovo
++RU	+5601+09250	Asia/Krasnoyarsk	MSK+04 - Krasnoyarsk area
++RU	+5216+10420	Asia/Irkutsk	MSK+05 - Irkutsk, Buryatia
++RU	+5203+11328	Asia/Chita	MSK+06 - Zabaykalsky
++RU	+6200+12940	Asia/Yakutsk	MSK+06 - Lena River
++RU	+623923+1353314	Asia/Khandyga	MSK+06 - Tomponsky, Ust-Maysky
++RU	+4310+13156	Asia/Vladivostok	MSK+07 - Amur River
++RU	+643337+1431336	Asia/Ust-Nera	MSK+07 - Oymyakonsky
++RU	+5934+15048	Asia/Magadan	MSK+08 - Magadan
++RU	+4658+14242	Asia/Sakhalin	MSK+08 - Sakhalin Island
++RU	+6728+15343	Asia/Srednekolymsk	MSK+08 - Sakha (E); North Kuril Is
++RU	+5301+15839	Asia/Kamchatka	MSK+09 - Kamchatka
++RU	+6445+17729	Asia/Anadyr	MSK+09 - Bering Sea
+ SA,KW,YE	+2438+04643	Asia/Riyadh
+ SB	-0932+16012	Pacific/Guadalcanal
+ SC	-0440+05528	Indian/Mahe
+@@ -318,8 +322,8 @@
+ SY	+3330+03618	Asia/Damascus
+ TC	+2128-07108	America/Grand_Turk
+ TD	+1207+01503	Africa/Ndjamena
+-TF	-492110+0701303	Indian/Kerguelen	Kerguelen, St Paul I, Amsterdam I
+-TH,KH,LA,VN	+1345+10031	Asia/Bangkok	most of Indochina
++TF	-492110+0701303	Indian/Kerguelen	Kerguelen, St Paul Island, Amsterdam Island
++TH,KH,LA,VN	+1345+10031	Asia/Bangkok	Indochina (most areas)
+ TJ	+3835+06848	Asia/Dushanbe
+ TK	-0922-17114	Pacific/Fakaofo
+ TL	-0833+12535	Asia/Dili
+@@ -330,44 +334,44 @@
+ TT,AG,AI,BL,DM,GD,GP,KN,LC,MF,MS,VC,VG,VI	+1039-06131	America/Port_of_Spain
+ TV	-0831+17913	Pacific/Funafuti
+ TW	+2503+12130	Asia/Taipei
+-UA	+5026+03031	Europe/Kiev	most locations
++UA	+5026+03031	Europe/Kiev	Ukraine (most areas)
+ UA	+4837+02218	Europe/Uzhgorod	Ruthenia
+-UA	+4750+03510	Europe/Zaporozhye	Zaporozh'ye, E Lugansk / Zaporizhia, E Luhansk
++UA	+4750+03510	Europe/Zaporozhye	Zaporozh'ye/Zaporizhia; Lugansk/Luhansk (east)
+ UM	+1917+16637	Pacific/Wake	Wake Island
+-US	+404251-0740023	America/New_York	Eastern Time
+-US	+421953-0830245	America/Detroit	Eastern Time - Michigan - most locations
+-US	+381515-0854534	America/Kentucky/Louisville	Eastern Time - Kentucky - Louisville area
+-US	+364947-0845057	America/Kentucky/Monticello	Eastern Time - Kentucky - Wayne County
+-US	+394606-0860929	America/Indiana/Indianapolis	Eastern Time - Indiana - most locations
+-US	+384038-0873143	America/Indiana/Vincennes	Eastern Time - Indiana - Daviess, Dubois, Knox & Martin Counties
+-US	+410305-0863611	America/Indiana/Winamac	Eastern Time - Indiana - Pulaski County
+-US	+382232-0862041	America/Indiana/Marengo	Eastern Time - Indiana - Crawford County
+-US	+382931-0871643	America/Indiana/Petersburg	Eastern Time - Indiana - Pike County
+-US	+384452-0850402	America/Indiana/Vevay	Eastern Time - Indiana - Switzerland County
+-US	+415100-0873900	America/Chicago	Central Time
+-US	+375711-0864541	America/Indiana/Tell_City	Central Time - Indiana - Perry County
+-US	+411745-0863730	America/Indiana/Knox	Central Time - Indiana - Starke County
+-US	+450628-0873651	America/Menominee	Central Time - Michigan - Dickinson, Gogebic, Iron & Menominee Counties
+-US	+470659-1011757	America/North_Dakota/Center	Central Time - North Dakota - Oliver County
+-US	+465042-1012439	America/North_Dakota/New_Salem	Central Time - North Dakota - Morton County (except Mandan area)
+-US	+471551-1014640	America/North_Dakota/Beulah	Central Time - North Dakota - Mercer County
+-US	+394421-1045903	America/Denver	Mountain Time
+-US	+433649-1161209	America/Boise	Mountain Time - south Idaho & east Oregon
+-US	+332654-1120424	America/Phoenix	Mountain Standard Time - Arizona (except Navajo)
+-US	+340308-1181434	America/Los_Angeles	Pacific Time
+-US	+550737-1313435	America/Metlakatla	Pacific Standard Time - Annette Island, Alaska
+-US	+611305-1495401	America/Anchorage	Alaska Time
+-US	+581807-1342511	America/Juneau	Alaska Time - Alaska panhandle
+-US	+571035-1351807	America/Sitka	Alaska Time - southeast Alaska panhandle
+-US	+593249-1394338	America/Yakutat	Alaska Time - Alaska panhandle neck
+-US	+643004-1652423	America/Nome	Alaska Time - west Alaska
++US	+404251-0740023	America/New_York	Eastern (most areas)
++US	+421953-0830245	America/Detroit	Eastern - MI (most areas)
++US	+381515-0854534	America/Kentucky/Louisville	Eastern - KY (Louisville area)
++US	+364947-0845057	America/Kentucky/Monticello	Eastern - KY (Wayne)
++US	+394606-0860929	America/Indiana/Indianapolis	Eastern - IN (most areas)
++US	+384038-0873143	America/Indiana/Vincennes	Eastern - IN (Da, Du, K, Mn)
++US	+410305-0863611	America/Indiana/Winamac	Eastern - IN (Pulaski)
++US	+382232-0862041	America/Indiana/Marengo	Eastern - IN (Crawford)
++US	+382931-0871643	America/Indiana/Petersburg	Eastern - IN (Pike)
++US	+384452-0850402	America/Indiana/Vevay	Eastern - IN (Switzerland)
++US	+415100-0873900	America/Chicago	Central (most areas)
++US	+375711-0864541	America/Indiana/Tell_City	Central - IN (Perry)
++US	+411745-0863730	America/Indiana/Knox	Central - IN (Starke)
++US	+450628-0873651	America/Menominee	Central - MI (Wisconsin border)
++US	+470659-1011757	America/North_Dakota/Center	Central - ND (Oliver)
++US	+465042-1012439	America/North_Dakota/New_Salem	Central - ND (Morton rural)
++US	+471551-1014640	America/North_Dakota/Beulah	Central - ND (Mercer)
++US	+394421-1045903	America/Denver	Mountain (most areas)
++US	+433649-1161209	America/Boise	Mountain - ID (south); OR (east)
++US	+332654-1120424	America/Phoenix	MST - Arizona (except Navajo)
++US	+340308-1181434	America/Los_Angeles	Pacific
++US	+611305-1495401	America/Anchorage	Alaska (most areas)
++US	+581807-1342511	America/Juneau	Alaska - Juneau area
++US	+571035-1351807	America/Sitka	Alaska - Sitka area
++US	+550737-1313435	America/Metlakatla	Alaska - Annette Island
++US	+593249-1394338	America/Yakutat	Alaska - Yakutat
++US	+643004-1652423	America/Nome	Alaska (west)
+ US	+515248-1763929	America/Adak	Aleutian Islands
+-US,UM	+211825-1575130	Pacific/Honolulu	Hawaii time
++US,UM	+211825-1575130	Pacific/Honolulu	Hawaii
+ UY	-3453-05611	America/Montevideo
+-UZ	+3940+06648	Asia/Samarkand	west Uzbekistan
+-UZ	+4120+06918	Asia/Tashkent	east Uzbekistan
++UZ	+3940+06648	Asia/Samarkand	Uzbekistan (west)
++UZ	+4120+06918	Asia/Tashkent	Uzbekistan (east)
+ VE	+1030-06656	America/Caracas
+-VN	+1045+10640	Asia/Ho_Chi_Minh	south Vietnam
++VN	+1045+10640	Asia/Ho_Chi_Minh	Vietnam (south)
+ VU	-1740+16825	Pacific/Efate
+ WF	-1318-17610	Pacific/Wallis
+ WS	-1350-17144	Pacific/Apia
+--- contrib/tzdata/zoneinfo2tdf.pl.orig
++++ contrib/tzdata/zoneinfo2tdf.pl
+@@ -0,0 +1,52 @@
++#! /usr/bin/perl -w
++
++# Courtesy Ken Pizzini.
++
++use strict;
++
++#This file released to the public domain.
++
++# Note: error checking is poor; trust the output only if the input
++# has been checked by zic.
++
++my $contZone = '';
++while (<>) {
++  my $origline = $_;
++  my @fields = ();
++  while (s/^\s*((?:"[^"]*"|[^\s#])+)//) {
++    push @fields, $1;
++  }
++  next unless @fields;
++
++  my $type = lc($fields[0]);
++  if ($contZone) {
++    @fields >= 3 or warn "bad continuation line";
++    unshift @fields, '+', $contZone;
++    $type = 'zone';
++  }
++
++  $contZone = '';
++  if ($type eq 'zone') {
++    # Zone  NAME  GMTOFF  RULES/SAVE  FORMAT  [UNTIL]
++    my $nfields = @fields;
++    $nfields >= 5 or warn "bad zone line";
++    if ($nfields > 6) {
++      #this splice is optional, depending on one's preference
++      #(one big date-time field, or componentized date and time):
++      splice(@fields, 5, $nfields-5, "@fields[5..$nfields-1]");
++    }
++    $contZone = $fields[1] if @fields > 5;
++  } elsif ($type eq 'rule') {
++    # Rule  NAME  FROM  TO  TYPE  IN  ON  AT  SAVE  LETTER/S
++    @fields == 10 or warn "bad rule line";
++  } elsif ($type eq 'link') {
++    # Link  TARGET  LINK-NAME
++    @fields == 3 or warn "bad link line";
++  } elsif ($type eq 'leap') {
++    # Leap  YEAR  MONTH  DAY  HH:MM:SS  CORR  R/S
++    @fields == 7 or warn "bad leap line";
++  } else {
++    warn "Fubar at input line $.: $origline";
++  }
++  print join("\t", @fields), "\n";
++}
++native
+\ No newline at end of property
++*
+\ No newline at end of property
++FreeBSD=%H
+\ No newline at end of property
++text/plain
+\ No newline at end of property

Property changes on: user/gjb/releng-rewrite/share/security/patches/EN-16:20/tzdata-11.0.patch
___________________________________________________________________
Added: fbsd:nokeywords
## -0,0 +1 ##
+yes
\ No newline at end of property
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Added: svn:mime-type
## -0,0 +1 ##
+text/plain
\ No newline at end of property
Index: user/gjb/releng-rewrite/share/security/patches/EN-16:20/tzdata-11.0.patch.asc
===================================================================
--- user/gjb/releng-rewrite/share/security/patches/EN-16:20/tzdata-11.0.patch.asc	(nonexistent)
+++ user/gjb/releng-rewrite/share/security/patches/EN-16:20/tzdata-11.0.patch.asc	(revision 49725)
@@ -0,0 +1,16 @@
+-----BEGIN PGP SIGNATURE-----
+
+iQIcBAABCgAGBQJYRw1sAAoJEO1n7NZdz2rndsAQAL+3rzd73YkJJ0m/SzLGVDy5
+pt2f94JVigBt3808UVzDpwlUeqQCBl5SWfjz1zCFIRS84NCypTZIiRudEpsIQgQa
+OW39WVM4Iv4GQRAOAHuGP8xzgZJUewjVSrEQp56hQ0CbGbn4S/ckJf4ak+XcR+Mg
+IfIdL2EnlFOjDSZeh+217anBGX6ztTzApx0++FGux4Sgrgby0AffrDc9HUK7pzIo
+b8dXN/UuNbnRXFhjcmqY+vy4KiiQgCTDeIdngsKtV+DKLpmMM7PGwlW2mBUT/EfU
+6JyVaJiZPjj2fNqB1ezVXncmebupLCr25ZoelNxqTpWbzuEjxzpI3wD/wLT1U0n/
+xxWU4ySbJUgIWSYvcoZk6hNUheUEoutqHKi7QuOa1j6FF5+2Gi9jQgNCuK/jbjai
+hxS3e+yvXOFY9dt8NZRP8Rv+m4DIUV1Mcf13KINC3c5lofGuINfc06q51Ly2C9S2
+dmxB35sNXEDV4q6kWgUr/cALHaYoQgqBfB4Lta8mxWAR3ROCsIhDqVM6rlzU+cvP
+Jr8mXEg8gkz8C6C2THjYQkieZwJ2X5sYr5t1sNtB4I40neo9StqYnYGNu3RgJPK2
+d1ui0NH0gaIMIAsMcZTHbmxTZKeSjvbhk4g2elWwTZ6H7819Sm4yBJ8OPEbfvkqH
+LDN/7yH0l0YZrBEJBOUu
+=bpne
+-----END PGP SIGNATURE-----

Property changes on: user/gjb/releng-rewrite/share/security/patches/EN-16:20/tzdata-11.0.patch.asc
___________________________________________________________________
Added: fbsd:nokeywords
## -0,0 +1 ##
+yes
\ No newline at end of property
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Added: svn:mime-type
## -0,0 +1 ##
+text/plain
\ No newline at end of property
Index: user/gjb/releng-rewrite/share/security/patches/EN-16:20/tzdata-9.3.patch
===================================================================
--- user/gjb/releng-rewrite/share/security/patches/EN-16:20/tzdata-9.3.patch	(nonexistent)
+++ user/gjb/releng-rewrite/share/security/patches/EN-16:20/tzdata-9.3.patch	(revision 49725)
@@ -0,0 +1,15769 @@
+--- contrib/tzdata/CONTRIBUTING.orig
++++ contrib/tzdata/CONTRIBUTING
+@@ -0,0 +1,73 @@
++Contributing to the tz code and data
++
++The time zone database is by no means authoritative: governments
++change timekeeping rules erratically and sometimes with little
++warning, the data entries do not cover all of civil time before
++1970, and undoubtedly errors remain in the code and data.  Feel
++free to fill gaps or fix mistakes, and please email improvements
++to tz@iana.org for use in the future.
++
++To email small changes, please run a POSIX shell command like
++'diff -u old/europe new/europe >myfix.patch', and attach
++myfix.patch to the email.
++
++For more-elaborate changes, please read the Theory file and browse
++the mailing list archives <http://mm.icann.org/pipermail/tz/> for
++examples of patches that tend to work well.  Ideally, additions to
++data should contain commentary citing reliable sources as
++justification.
++
++Please submit changes against either the latest release in
++<ftp://ftp.iana.org/tz/> or the master branch of the experimental
++Git repository.  If you use Git the following workflow may be helpful:
++
++  * Copy the experimental repository.
++
++      git clone https://github.com/eggert/tz.git
++      cd tz
++
++  * Get current with the master branch.
++
++      git checkout master
++      git pull
++
++  * Switch to a new branch for the changes.  Choose a different
++    branch name for each change set.
++
++      git checkout -b mybranch
++
++  * Edit source files.  Include commentary that justifies the
++    changes by citing reliable sources.
++
++  * Debug the changes, e.g.:
++
++      make check
++      make install
++      ./zdump -v America/Los_Angeles
++
++  * For each separable change, commit it in the new branch, e.g.:
++
++      git add northamerica
++      git commit
++
++    See recent 'git log' output for the commit-message style.
++
++  * Create patch files 0001-*, 0002-*, ...
++
++      git format-patch master
++
++  * After reviewing the patch files, send the patches to tz@iana.org
++    for others to review.
++
++      git send-email master
++
++  * Start anew by getting current with the master branch again
++    (the second step above).
++
++Please do not create issues or pull requests on GitHub, as the
++proper procedure for proposing and distributing patches is via
++email as illustrated above.
++
++-----
++
++This file is in the public domain.
+--- contrib/tzdata/LICENSE.orig
++++ contrib/tzdata/LICENSE
+@@ -0,0 +1,4 @@
++With a few exceptions, all files in the tz code and data (including
++this one) are in the public domain.  The exceptions are date.c,
++newstrftime.3, and strftime.c, which contain material derived from BSD
++and which use the BSD 3-clause license.
+--- contrib/tzdata/Makefile.orig
++++ contrib/tzdata/Makefile
+@@ -0,0 +1,793 @@
++# This file is in the public domain, so clarified as of
++# 2009-05-17 by Arthur David Olson.
++
++# Package name for the code distribution.
++PACKAGE=	tzcode
++
++# Version number for the distribution, overridden in the 'tarballs' rule below.
++VERSION=	unknown
++
++# Email address for bug reports.
++BUGEMAIL=	tz@iana.org
++
++# Change the line below for your time zone (after finding the zone you want in
++# the time zone files, or adding it to a time zone file).
++# Alternately, if you discover you've got the wrong time zone, you can just
++#	zic -l rightzone
++# to correct things.
++# Use the command
++#	make zonenames
++# to get a list of the values you can use for LOCALTIME.
++
++LOCALTIME=	GMT
++
++# If you want something other than Eastern United States time as a template
++# for handling POSIX-style time zone environment variables,
++# change the line below (after finding the zone you want in the
++# time zone files, or adding it to a time zone file).
++# (When a POSIX-style environment variable is handled, the rules in the
++# template file are used to determine "spring forward" and "fall back" days and
++# times; the environment variable itself specifies UT offsets of standard and
++# summer time.)
++# Alternately, if you discover you've got the wrong time zone, you can just
++#	zic -p rightzone
++# to correct things.
++# Use the command
++#	make zonenames
++# to get a list of the values you can use for POSIXRULES.
++# If you want POSIX compatibility, use "America/New_York".
++
++POSIXRULES=	America/New_York
++
++# Also see TZDEFRULESTRING below, which takes effect only
++# if the time zone files cannot be accessed.
++
++# Everything gets put in subdirectories of. . .
++
++TOPDIR=		/usr/local
++
++# "Compiled" time zone information is placed in the "TZDIR" directory
++# (and subdirectories).
++# Use an absolute path name for TZDIR unless you're just testing the software.
++
++TZDIR_BASENAME=	zoneinfo
++TZDIR=		$(TOPDIR)/etc/$(TZDIR_BASENAME)
++
++# Types to try, as an alternative to time_t.  int64_t should be first.
++TIME_T_ALTERNATIVES= int64_t int32_t uint32_t uint64_t
++
++# The "tzselect", "zic", and "zdump" commands get installed in. . .
++
++ETCDIR=		$(TOPDIR)/etc
++
++# If you "make INSTALL", the "date" command gets installed in. . .
++
++BINDIR=		$(TOPDIR)/bin
++
++# Manual pages go in subdirectories of. . .
++
++MANDIR=		$(TOPDIR)/man
++
++# Library functions are put in an archive in LIBDIR.
++
++LIBDIR=		$(TOPDIR)/lib
++
++# If you always want time values interpreted as "seconds since the epoch
++# (not counting leap seconds)", use
++#	REDO=		posix_only
++# below.  If you always want right time values interpreted as "seconds since
++# the epoch" (counting leap seconds)", use
++#	REDO=		right_only
++# below.  If you want both sets of data available, with leap seconds not
++# counted normally, use
++#	REDO=		posix_right
++# below.  If you want both sets of data available, with leap seconds counted
++# normally, use
++#	REDO=		right_posix
++# below.  POSIX mandates that leap seconds not be counted; for compatibility
++# with it, use "posix_only" or "posix_right".
++
++REDO=		posix_right
++
++# If you want out-of-scope and often-wrong data from the file 'backzone', use
++#	PACKRATDATA=	backzone
++# To omit this data, use
++#	PACKRATDATA=
++
++PACKRATDATA=
++
++# Since "." may not be in PATH...
++
++YEARISTYPE=	./yearistype
++
++# Non-default libraries needed to link.
++LDLIBS=
++
++# Add the following to the end of the "CFLAGS=" line as needed.
++#  -DBIG_BANG=-9999999LL if the Big Bang occurred at time -9999999 (see zic.c)
++#  -DHAVE_DECL_ASCTIME_R=0 if <time.h> does not declare asctime_r
++#  -DHAVE_DIRECT_H if mkdir needs <direct.h> (MS-Windows)
++#  -DHAVE_DOS_FILE_NAMES if file names have drive specifiers etc. (MS-DOS)
++#  -DHAVE_GETTEXT=1 if 'gettext' works (e.g., GNU/Linux, FreeBSD, Solaris)
++#  -DHAVE_INCOMPATIBLE_CTIME_R=1 if your system's time.h declares
++#	ctime_r and asctime_r incompatibly with the POSIX standard
++#	(Solaris when _POSIX_PTHREAD_SEMANTICS is not defined).
++#  -DHAVE_INTTYPES_H=1 if you have a pre-C99 compiler with "inttypes.h"
++#  -DHAVE_LINK=0 if your system lacks a link function
++#  -DHAVE_LOCALTIME_R=0 if your system lacks a localtime_r function
++#  -DHAVE_LOCALTIME_RZ=0 if you do not want zdump to use localtime_rz
++#	This defaults to 1 if a working localtime_rz seems to be available.
++#	localtime_rz can make zdump significantly faster, but is nonstandard.
++#  -DHAVE_POSIX_DECLS=0 if your system's include files do not declare
++#	functions like 'link' or variables like 'tzname' required by POSIX
++#  -DHAVE_STDINT_H=1 if you have a pre-C99 compiler with "stdint.h"
++#  -DHAVE_STRFTIME_L=1 if <time.h> declares locale_t and strftime_l
++#	This defaults to 0 if _POSIX_VERSION < 200809, 1 otherwise.
++#  -DHAVE_STRDUP=0 if your system lacks the strdup function
++#  -DHAVE_SYMLINK=0 if your system lacks the symlink function
++#  -DHAVE_SYS_STAT_H=0 if your compiler lacks a "sys/stat.h"
++#  -DHAVE_SYS_WAIT_H=0 if your compiler lacks a "sys/wait.h"
++#  -DHAVE_TZSET=0 if your system lacks a tzset function
++#  -DHAVE_UNISTD_H=0 if your compiler lacks a "unistd.h" (Microsoft C++ 7?)
++#  -DEPOCH_LOCAL=1 if the 'time' function returns local time not UT
++#  -DEPOCH_OFFSET=N if the 'time' function returns a value N greater
++#	than what POSIX specifies, assuming local time is UT.
++#	For example, N is 252460800 on AmigaOS.
++#  -DNO_RUN_TIME_WARNINGS_ABOUT_YEAR_2000_PROBLEMS_THANK_YOU=1
++#	if you do not want run time warnings about formats that may cause
++#	year 2000 grief
++#  -Dssize_t=long on ancient hosts that lack ssize_t
++#  -DTHREAD_SAFE=1 to make localtime.c thread-safe, as POSIX requires;
++#	not needed by the main-program tz code, which is single-threaded.
++#	Append other compiler flags as needed, e.g., -pthread on GNU/Linux.
++#  -Dtime_tz=\"T\" to use T as the time_t type, rather than the system time_t
++#  -DTZ_DOMAIN=\"foo\" to use "foo" for gettext domain name; default is "tz"
++#  -DTZ_DOMAINDIR=\"/path\" to use "/path" for gettext directory;
++#	the default is system-supplied, typically "/usr/lib/locale"
++#  -DTZDEFRULESTRING=\",date/time,date/time\" to default to the specified
++#	DST transitions if the time zone files cannot be accessed
++#  -DUNINIT_TRAP=1 if reading uninitialized storage can cause problems
++#	other than simply getting garbage data
++#  -DUSE_LTZ=0 to build zdump with the system time zone library
++#	Also set TZDOBJS=zdump.o and CHECK_TIME_T_ALTERNATIVES= below.
++#  -DZIC_MAX_ABBR_LEN_WO_WARN=3
++#	(or some other number) to set the maximum time zone abbreviation length
++#	that zic will accept without a warning (the default is 6)
++#  $(GCC_DEBUG_FLAGS) if you are using recent GCC and want lots of checking
++GCC_DEBUG_FLAGS = -Dlint -g3 -O3 -fno-common -fstrict-aliasing \
++	-Wall -Wextra \
++	-Wbad-function-cast -Wcast-align -Wdate-time \
++	-Wdeclaration-after-statement \
++	-Wdouble-promotion \
++	-Wformat=2 -Winit-self -Wjump-misses-init \
++	-Wlogical-op -Wmissing-prototypes -Wnested-externs \
++	-Wold-style-definition -Woverlength-strings -Wpointer-arith \
++	-Wshadow -Wstrict-prototypes -Wsuggest-attribute=const \
++	-Wsuggest-attribute=format -Wsuggest-attribute=noreturn \
++	-Wsuggest-attribute=pure -Wtrampolines \
++	-Wunused -Wwrite-strings \
++	-Wno-address -Wno-format-nonliteral -Wno-sign-compare \
++	-Wno-type-limits -Wno-unused-parameter
++#
++# If you want to use System V compatibility code, add
++#	-DUSG_COMPAT
++# to the end of the "CFLAGS=" line.  This arrange for "timezone" and "daylight"
++# variables to be kept up-to-date by the time conversion functions.  Neither
++# "timezone" nor "daylight" is described in X3J11's work.
++#
++# If your system has a "GMT offset" field in its "struct tm"s
++# (or if you decide to add such a field in your system's "time.h" file),
++# add the name to a define such as
++#	-DTM_GMTOFF=tm_gmtoff
++# to the end of the "CFLAGS=" line.  If not defined, the code attempts to
++# guess TM_GMTOFF from other macros; define NO_TM_GMTOFF to suppress this.
++# Similarly, if your system has a "zone abbreviation" field, define
++#	-DTM_ZONE=tm_zone
++# and define NO_TM_ZONE to suppress any guessing.  These two fields are not
++# required by POSIX, but are widely available on GNU/Linux and BSD systems.
++#
++# If you want functions that were inspired by early versions of X3J11's work,
++# add
++#	-DSTD_INSPIRED
++# to the end of the "CFLAGS=" line.  This arranges for the functions
++# "tzsetwall", "offtime", "timelocal", "timegm", "timeoff",
++# "posix2time", and "time2posix" to be added to the time conversion library.
++# "tzsetwall" is like "tzset" except that it arranges for local wall clock
++# time (rather than the time specified in the TZ environment variable)
++# to be used.
++# "offtime" is like "gmtime" except that it accepts a second (long) argument
++# that gives an offset to add to the time_t when converting it.
++# "timelocal" is equivalent to "mktime".
++# "timegm" is like "timelocal" except that it turns a struct tm into
++# a time_t using UT (rather than local time as "timelocal" does).
++# "timeoff" is like "timegm" except that it accepts a second (long) argument
++# that gives an offset to use when converting to a time_t.
++# "posix2time" and "time2posix" are described in an included manual page.
++# X3J11's work does not describe any of these functions.
++# Sun has provided "tzsetwall", "timelocal", and "timegm" in SunOS 4.0.
++# These functions may well disappear in future releases of the time
++# conversion package.
++#
++# If you don't want functions that were inspired by NetBSD, add
++#	-DNETBSD_INSPIRED=0
++# to the end of the "CFLAGS=" line.  Otherwise, the functions
++# "localtime_rz", "mktime_z", "tzalloc", and "tzfree" are added to the
++# time library, and if STD_INSPIRED is also defined the functions
++# "posix2time_z" and "time2posix_z" are added as well.
++# The functions ending in "_z" (or "_rz") are like their unsuffixed
++# (or suffixed-by-"_r") counterparts, except with an extra first
++# argument of opaque type timezone_t that specifies the time zone.
++# "tzalloc" allocates a timezone_t value, and "tzfree" frees it.
++#
++# If you want to allocate state structures in localtime, add
++#	-DALL_STATE
++# to the end of the "CFLAGS=" line.  Storage is obtained by calling malloc.
++#
++# If you want an "altzone" variable (a la System V Release 3.1), add
++#	-DALTZONE
++# to the end of the "CFLAGS=" line.
++# This variable is not described in X3J11's work.
++#
++# NIST-PCTS:151-2, Version 1.4, (1993-12-03) is a test suite put
++# out by the National Institute of Standards and Technology
++# which claims to test C and Posix conformance.  If you want to pass PCTS, add
++#	-DPCTS
++# to the end of the "CFLAGS=" line.
++#
++# If you want strict compliance with XPG4 as of 1994-04-09, add
++#	-DXPG4_1994_04_09
++# to the end of the "CFLAGS=" line.  This causes "strftime" to always return
++# 53 as a week number (rather than 52 or 53) for those days in January that
++# before the first Monday in January when a "%V" format is used and January 1
++# falls on a Friday, Saturday, or Sunday.
++
++CFLAGS=
++
++# Linker flags.  Default to $(LFLAGS) for backwards compatibility
++# to release 2012h and earlier.
++
++LDFLAGS=	$(LFLAGS)
++
++# For leap seconds, this Makefile uses LEAPSECONDS='-L leapseconds' in
++# submake command lines.  The default is no leap seconds.
++
++LEAPSECONDS=
++
++# The zic command and its arguments.
++
++zic=		./zic
++ZIC=		$(zic) $(ZFLAGS)
++
++ZFLAGS=
++
++# How to use zic to install tz binary files.
++
++ZIC_INSTALL=	$(ZIC) -y $(YEARISTYPE) -d $(DESTDIR)$(TZDIR) $(LEAPSECONDS)
++
++# The name of a Posix-compliant 'awk' on your system.
++AWK=		awk
++
++# The full path name of a Posix-compliant shell, preferably one that supports
++# the Korn shell's 'select' statement as an extension.
++# These days, Bash is the most popular.
++# It should be OK to set this to /bin/sh, on platforms where /bin/sh
++# lacks 'select' or doesn't completely conform to Posix, but /bin/bash
++# is typically nicer if it works.
++KSHELL=		/bin/bash
++
++# The path where SGML DTDs are kept and the catalog file(s) to use when
++# validating.  The default should work on both Debian and Red Hat.
++SGML_TOPDIR= /usr
++SGML_DTDDIR= $(SGML_TOPDIR)/share/xml/w3c-sgml-lib/schema/dtd
++SGML_SEARCH_PATH= $(SGML_DTDDIR)/REC-html401-19991224
++SGML_CATALOG_FILES= \
++  $(SGML_TOPDIR)/share/doc/w3-recs/html/www.w3.org/TR/1999/REC-html401-19991224/HTML4.cat:$(SGML_TOPDIR)/share/sgml/html/4.01/HTML4.cat
++
++# The name, arguments and environment of a program to validate your web pages.
++# See <http://openjade.sourceforge.net/doc/> for a validator, and
++# <https://validator.w3.org/source/> for a validation library.
++VALIDATE = nsgmls
++VALIDATE_FLAGS = -s -B -wall -wno-unused-param
++VALIDATE_ENV = \
++  SGML_CATALOG_FILES=$(SGML_CATALOG_FILES) \
++  SGML_SEARCH_PATH=$(SGML_SEARCH_PATH) \
++  SP_CHARSET_FIXED=YES \
++  SP_ENCODING=UTF-8
++
++# This expensive test requires USE_LTZ.
++# To suppress it, define this macro to be empty.
++CHECK_TIME_T_ALTERNATIVES = check_time_t_alternatives
++
++# SAFE_CHAR is a regular expression that matches a safe character.
++# Some parts of this distribution are limited to safe characters;
++# others can use any UTF-8 character.
++# For now, the safe characters are a safe subset of ASCII.
++# The caller must set the shell variable 'sharp' to the character '#',
++# since Makefile macros cannot contain '#'.
++# TAB_CHAR is a single tab character, in single quotes.
++TAB_CHAR=	'	'
++SAFE_CHARSET1=	$(TAB_CHAR)' !\"'$$sharp'$$%&'\''()*+,./0123456789:;<=>?@'
++SAFE_CHARSET2=	'ABCDEFGHIJKLMNOPQRSTUVWXYZ[\\^_`'
++SAFE_CHARSET3=	'abcdefghijklmnopqrstuvwxyz{|}~'
++SAFE_CHARSET=	$(SAFE_CHARSET1)$(SAFE_CHARSET2)$(SAFE_CHARSET3)
++SAFE_CHAR=	'[]'$(SAFE_CHARSET)'-]'
++
++# OK_CHAR matches any character allowed in the distributed files.
++# This is the same as SAFE_CHAR, except that multibyte letters are
++# also allowed so that commentary can contain people's names and quote
++# non-English sources.  For non-letters the sources are limited to
++# ASCII renderings for the convenience of maintainers whose text editors
++# mishandle UTF-8 by default (e.g., XEmacs 21.4.22).
++OK_CHAR=	'[][:alpha:]'$(SAFE_CHARSET)'-]'
++
++# SAFE_LINE matches a line of safe characters.
++# SAFE_SHARP_LINE is similar, except any OK character can follow '#';
++# this is so that comments can contain non-ASCII characters.
++# OK_LINE matches a line of OK characters.
++SAFE_LINE=	'^'$(SAFE_CHAR)'*$$'
++SAFE_SHARP_LINE='^'$(SAFE_CHAR)'*('$$sharp$(OK_CHAR)'*)?$$'
++OK_LINE=	'^'$(OK_CHAR)'*$$'
++
++# Flags to give 'tar' when making a distribution.
++# Try to use flags appropriate for GNU tar.
++GNUTARFLAGS= --numeric-owner --owner=0 --group=0 --mode=go+u,go-w --sort=name
++TARFLAGS=	`if tar $(GNUTARFLAGS) --version >/dev/null 2>&1; \
++		 then echo $(GNUTARFLAGS); \
++		 else :; \
++		 fi`
++
++# Flags to give 'gzip' when making a distribution.
++GZIPFLAGS=	-9n
++
++###############################################################################
++
++#MAKE=		make
++
++cc=		cc
++CC=		$(cc) -DTZDIR=\"$(TZDIR)\"
++
++AR=		ar
++
++# ':' on typical hosts; 'ranlib' on the ancient hosts that still need ranlib.
++RANLIB=		:
++
++TZCOBJS=	zic.o
++TZDOBJS=	zdump.o localtime.o asctime.o
++DATEOBJS=	date.o localtime.o strftime.o asctime.o
++LIBSRCS=	localtime.c asctime.c difftime.c
++LIBOBJS=	localtime.o asctime.o difftime.o
++HEADERS=	tzfile.h private.h
++NONLIBSRCS=	zic.c zdump.c
++NEWUCBSRCS=	date.c strftime.c
++SOURCES=	$(HEADERS) $(LIBSRCS) $(NONLIBSRCS) $(NEWUCBSRCS) \
++			tzselect.ksh workman.sh
++MANS=		newctime.3 newstrftime.3 newtzset.3 time2posix.3 \
++			tzfile.5 tzselect.8 zic.8 zdump.8
++MANTXTS=	newctime.3.txt newstrftime.3.txt newtzset.3.txt \
++			time2posix.3.txt \
++			tzfile.5.txt tzselect.8.txt zic.8.txt zdump.8.txt \
++			date.1.txt
++COMMON=		CONTRIBUTING LICENSE Makefile NEWS README Theory version
++WEB_PAGES=	tz-art.htm tz-how-to.html tz-link.htm
++DOCS=		$(MANS) date.1 $(MANTXTS) $(WEB_PAGES)
++PRIMARY_YDATA=	africa antarctica asia australasia \
++		europe northamerica southamerica
++YDATA=		$(PRIMARY_YDATA) pacificnew etcetera backward
++NDATA=		systemv factory
++TDATA=		$(YDATA) $(NDATA)
++ZONETABLES=	zone1970.tab zone.tab
++TABDATA=	iso3166.tab leapseconds $(ZONETABLES)
++LEAP_DEPS=	leapseconds.awk leap-seconds.list
++DATA=		$(YDATA) $(NDATA) backzone $(TABDATA) \
++			leap-seconds.list yearistype.sh
++AWK_SCRIPTS=	checklinks.awk checktab.awk leapseconds.awk
++MISC=		$(AWK_SCRIPTS) zoneinfo2tdf.pl
++TZS_YEAR=	2050
++TZS=		to$(TZS_YEAR).tzs
++TZS_NEW=	to$(TZS_YEAR)new.tzs
++TZS_DEPS=	$(PRIMARY_YDATA) asctime.c localtime.c \
++			private.h tzfile.h zdump.c zic.c
++ENCHILADA=	$(COMMON) $(DOCS) $(SOURCES) $(DATA) $(MISC) $(TZS)
++
++# Consult these files when deciding whether to rebuild the 'version' file.
++# This list is not the same as the output of 'git ls-files', since
++# .gitignore is not distributed.
++VERSION_DEPS= \
++		CONTRIBUTING LICENSE Makefile NEWS README Theory \
++		africa antarctica asctime.c asia australasia \
++		backward backzone \
++		checklinks.awk checktab.awk \
++		date.1 date.c difftime.c \
++		etcetera europe factory iso3166.tab \
++		leap-seconds.list leapseconds.awk localtime.c \
++		newctime.3 newstrftime.3 newtzset.3 northamerica \
++		pacificnew private.h \
++		southamerica strftime.c systemv \
++		time2posix.3 tz-art.htm tz-how-to.html tz-link.htm \
++		tzfile.5 tzfile.h tzselect.8 tzselect.ksh \
++		workman.sh yearistype.sh \
++		zdump.8 zdump.c zic.8 zic.c \
++		zone.tab zone1970.tab zoneinfo2tdf.pl
++
++# And for the benefit of csh users on systems that assume the user
++# shell should be used to handle commands in Makefiles. . .
++
++SHELL=		/bin/sh
++
++all:		tzselect yearistype zic zdump libtz.a $(TABDATA)
++
++ALL:		all date $(ENCHILADA)
++
++install:	all $(DATA) $(REDO) $(MANS)
++		mkdir -p $(DESTDIR)$(ETCDIR) $(DESTDIR)$(TZDIR) \
++			$(DESTDIR)$(LIBDIR) \
++			$(DESTDIR)$(MANDIR)/man3 $(DESTDIR)$(MANDIR)/man5 \
++			$(DESTDIR)$(MANDIR)/man8
++		$(ZIC_INSTALL) -l $(LOCALTIME) -p $(POSIXRULES)
++		cp -f iso3166.tab $(ZONETABLES) $(DESTDIR)$(TZDIR)/.
++		cp tzselect zic zdump $(DESTDIR)$(ETCDIR)/.
++		cp libtz.a $(DESTDIR)$(LIBDIR)/.
++		$(RANLIB) $(DESTDIR)$(LIBDIR)/libtz.a
++		cp -f newctime.3 newtzset.3 $(DESTDIR)$(MANDIR)/man3/.
++		cp -f tzfile.5 $(DESTDIR)$(MANDIR)/man5/.
++		cp -f tzselect.8 zdump.8 zic.8 $(DESTDIR)$(MANDIR)/man8/.
++
++INSTALL:	ALL install date.1
++		mkdir -p $(DESTDIR)$(BINDIR) $(DESTDIR)$(MANDIR)/man1
++		cp date $(DESTDIR)$(BINDIR)/.
++		cp -f date.1 $(DESTDIR)$(MANDIR)/man1/.
++
++version:	$(VERSION_DEPS)
++		{ (type git) >/dev/null 2>&1 && \
++		  V=`git describe --match '[0-9][0-9][0-9][0-9][a-z]*' \
++				--abbrev=7 --dirty` || \
++		  V=$(VERSION); } && \
++		printf '%s\n' "$$V" >$@.out
++		mv $@.out $@
++
++version.h:	version
++		VERSION=`cat version` && printf '%s\n' \
++		  'static char const PKGVERSION[]="($(PACKAGE)) ";' \
++		  "static char const TZVERSION[]=\"$$VERSION\";" \
++		  'static char const REPORT_BUGS_TO[]="$(BUGEMAIL)";' \
++		  >$@.out
++		mv $@.out $@
++
++zdump:		$(TZDOBJS)
++		$(CC) -o $@ $(CFLAGS) $(LDFLAGS) $(TZDOBJS) $(LDLIBS)
++
++zic:		$(TZCOBJS)
++		$(CC) -o $@ $(CFLAGS) $(LDFLAGS) $(TZCOBJS) $(LDLIBS)
++
++yearistype:	yearistype.sh
++		cp yearistype.sh yearistype
++		chmod +x yearistype
++
++leapseconds:	$(LEAP_DEPS)
++		$(AWK) -f leapseconds.awk leap-seconds.list >$@.out
++		mv $@.out $@
++
++# Arguments to pass to submakes of install_data.
++# They can be overridden by later submake arguments.
++INSTALLARGS = \
++ DESTDIR=$(DESTDIR) \
++ LEAPSECONDS='$(LEAPSECONDS)' \
++ PACKRATDATA='$(PACKRATDATA)' \
++ TZDIR=$(TZDIR) \
++ YEARISTYPE=$(YEARISTYPE) \
++ ZIC='$(ZIC)'
++
++# 'make install_data' installs one set of tz binary files.
++# It can be tailored by setting LEAPSECONDS, PACKRATDATA, etc.
++install_data:	zic leapseconds yearistype $(PACKRATDATA) $(TDATA)
++		$(ZIC_INSTALL) $(TDATA)
++		$(AWK) '/^Rule/' $(TDATA) | $(ZIC_INSTALL) - $(PACKRATDATA)
++
++posix_only:
++		$(MAKE) $(INSTALLARGS) LEAPSECONDS= install_data
++
++right_only:
++		$(MAKE) $(INSTALLARGS) LEAPSECONDS='-L leapseconds' \
++			install_data
++
++# In earlier versions of this makefile, the other two directories were
++# subdirectories of $(TZDIR).  However, this led to configuration errors.
++# For example, with posix_right under the earlier scheme,
++# TZ='right/Australia/Adelaide' got you localtime with leap seconds,
++# but gmtime without leap seconds, which led to problems with applications
++# like sendmail that subtract gmtime from localtime.
++# Therefore, the other two directories are now siblings of $(TZDIR).
++# You must replace all of $(TZDIR) to switch from not using leap seconds
++# to using them, or vice versa.
++right_posix:	right_only
++		rm -fr $(DESTDIR)$(TZDIR)-leaps
++		ln -s $(TZDIR_BASENAME) $(DESTDIR)$(TZDIR)-leaps || \
++		  $(MAKE) $(INSTALLARGS) TZDIR=$(TZDIR)-leaps right_only
++		$(MAKE) $(INSTALLARGS) TZDIR=$(TZDIR)-posix posix_only
++
++posix_right:	posix_only
++		rm -fr $(DESTDIR)$(TZDIR)-posix
++		ln -s $(TZDIR_BASENAME) $(DESTDIR)$(TZDIR)-posix || \
++		  $(MAKE) $(INSTALLARGS) TZDIR=$(TZDIR)-posix posix_only
++		$(MAKE) $(INSTALLARGS) TZDIR=$(TZDIR)-leaps right_only
++
++# This obsolescent rule is present for backwards compatibility with
++# tz releases 2014g through 2015g.  It should go away eventually.
++posix_packrat:
++		$(MAKE) $(INSTALLARGS) PACKRATDATA=backzone posix_only
++
++zones:		$(REDO)
++
++$(TZS_NEW):	$(TDATA) zdump zic
++		mkdir -p tzs.dir
++		$(zic) -d tzs.dir $(TDATA)
++		$(AWK) '/^Link/{print $$1 "\t" $$2 "\t" $$3}' \
++		   $(TDATA) | LC_ALL=C sort >$@.out
++		wd=`pwd` && \
++		zones=`$(AWK) -v wd="$$wd" \
++				'/^Zone/{print wd "/tzs.dir/" $$2}' $(TDATA) \
++			 | LC_ALL=C sort` && \
++		./zdump -i -c $(TZS_YEAR) $$zones >>$@.out
++		sed 's,^TZ=".*tzs\.dir/,TZ=",' $@.out >$@.sed.out
++		rm -fr tzs.dir $@.out
++		mv $@.sed.out $@
++
++# If $(TZS) does not already exist (e.g., old-format tarballs), create it.
++# If it exists but 'make check_tzs' fails, a maintainer should inspect the
++# failed output and fix the inconsistency, perhaps by running 'make force_tzs'.
++$(TZS):
++		$(MAKE) force_tzs
++
++force_tzs:	$(TZS_NEW)
++		cp $(TZS_NEW) $(TZS)
++
++libtz.a:	$(LIBOBJS)
++		$(AR) ru $@ $(LIBOBJS)
++		$(RANLIB) $@
++
++date:		$(DATEOBJS)
++		$(CC) -o $@ $(CFLAGS) $(LDFLAGS) $(DATEOBJS) $(LDLIBS)
++
++tzselect:	tzselect.ksh version
++		VERSION=`cat version` && sed \
++			-e 's|#!/bin/bash|#!$(KSHELL)|g' \
++			-e 's|AWK=[^}]*|AWK=$(AWK)|g' \
++			-e 's|\(PKGVERSION\)=.*|\1='\''($(PACKAGE)) '\''|' \
++			-e 's|\(REPORT_BUGS_TO\)=.*|\1=$(BUGEMAIL)|' \
++			-e 's|TZDIR=[^}]*|TZDIR=$(TZDIR)|' \
++			-e 's|\(TZVERSION\)=.*|\1='"$$VERSION"'|' \
++			<$@.ksh >$@.out
++		chmod +x $@.out
++		mv $@.out $@
++
++check:		check_character_set check_white_space check_links check_sorted \
++		  check_tables check_tzs check_web
++
++check_character_set: $(ENCHILADA)
++		LC_ALL=en_US.utf8 && export LC_ALL && \
++		sharp='#' && \
++		! grep -Env $(SAFE_LINE) $(MANS) date.1 $(MANTXTS) \
++			$(MISC) $(SOURCES) $(WEB_PAGES) \
++			CONTRIBUTING LICENSE Makefile README version && \
++		! grep -Env $(SAFE_SHARP_LINE) $(TDATA) backzone \
++			leapseconds yearistype.sh zone.tab && \
++		! grep -Env $(OK_LINE) $(ENCHILADA)
++
++check_white_space: $(ENCHILADA)
++		patfmt=' \t|[\f\r\v]' && pat=`printf "$$patfmt\\n"` && \
++		! grep -En "$$pat" $(ENCHILADA)
++		! grep -n '[[:space:]]$$' $(ENCHILADA)
++
++CHECK_CC_LIST = { n = split($$1,a,/,/); for (i=2; i<=n; i++) print a[1], a[i]; }
++
++check_sorted: backward backzone iso3166.tab zone.tab zone1970.tab
++		$(AWK) '/^Link/ {print $$3}' backward | LC_ALL=C sort -cu
++		$(AWK) '/^Zone/ {print $$2}' backzone | LC_ALL=C sort -cu
++		$(AWK) '/^[^#]/ {print $$1}' iso3166.tab | LC_ALL=C sort -cu
++		$(AWK) '/^[^#]/ {print $$1}' zone.tab | LC_ALL=C sort -c
++		$(AWK) '/^[^#]/ {print substr($$0, 1, 2)}' zone1970.tab | \
++		  LC_ALL=C sort -c
++		$(AWK) '/^[^#]/ $(CHECK_CC_LIST)' zone1970.tab | \
++		  LC_ALL=C sort -cu
++
++check_links:	checklinks.awk $(TDATA)
++		$(AWK) -f checklinks.awk $(TDATA)
++
++check_tables:	checktab.awk $(PRIMARY_YDATA) $(ZONETABLES)
++		for tab in $(ZONETABLES); do \
++		  $(AWK) -f checktab.awk -v zone_table=$$tab $(PRIMARY_YDATA) \
++		    || exit; \
++		done
++
++check_tzs:	$(TZS) $(TZS_NEW)
++		diff -u $(TZS) $(TZS_NEW)
++
++check_web:	$(WEB_PAGES)
++		$(VALIDATE_ENV) $(VALIDATE) $(VALIDATE_FLAGS) $(WEB_PAGES)
++
++clean_misc:
++		rm -f core *.o *.out \
++		  date tzselect version.h zdump zic yearistype libtz.a
++clean:		clean_misc
++		rm -fr *.dir tzdb-*/ $(TZS_NEW)
++
++maintainer-clean: clean
++		@echo 'This command is intended for maintainers to use; it'
++		@echo 'deletes files that may need special tools to rebuild.'
++		rm -f leapseconds version $(MANTXTS) $(TZS) *.asc *.tar.*
++
++names:
++		@echo $(ENCHILADA)
++
++public:		check check_public $(CHECK_TIME_T_ALTERNATIVES) \
++		tarballs signatures
++
++date.1.txt:	date.1
++newctime.3.txt:	newctime.3
++newstrftime.3.txt: newstrftime.3
++newtzset.3.txt:	newtzset.3
++time2posix.3.txt: time2posix.3
++tzfile.5.txt:	tzfile.5
++tzselect.8.txt:	tzselect.8
++zdump.8.txt:	zdump.8
++zic.8.txt:	zic.8
++
++$(MANTXTS):	workman.sh
++		LC_ALL=C sh workman.sh `expr $@ : '\(.*\)\.txt$$'` >$@.out
++		mv $@.out $@
++
++# Set the time stamps to those of the git repository, if available,
++# and if the files have not changed since then.
++# This uses GNU 'touch' syntax 'touch -d@N FILE',
++# where N is the number of seconds since 1970.
++# If git or GNU 'touch' is absent, don't bother to sync with git timestamps.
++# Also, set the timestamp of each prebuilt file like 'leapseconds'
++# to be the maximum of the files it depends on.
++set-timestamps.out: $(ENCHILADA)
++		rm -f $@
++		if (type git) >/dev/null 2>&1 && \
++		   files=`git ls-files $(ENCHILADA)` && \
++		   touch -md @1 test.out; then \
++		  rm -f test.out && \
++		  for file in $$files; do \
++		    if git diff --quiet $$file; then \
++		      time=`git log -1 --format='tformat:%ct' $$file` && \
++		      touch -cmd @$$time $$file; \
++		    else \
++		      echo >&2 "$$file: warning: does not match repository"; \
++		    fi || exit; \
++		  done; \
++		fi
++		touch -cmr `ls -t $(LEAP_DEPS) | sed 1q` leapseconds
++		for file in `ls $(MANTXTS) | sed 's/\.txt$$//'`; do \
++		  touch -cmr `ls -t $$file workman.sh | sed 1q` $$file.txt || \
++		    exit; \
++		done
++		touch -cmr `ls -t $(TZS_DEPS) | sed 1q` $(TZS)
++		touch -cmr `ls -t $(VERSION_DEPS) | sed 1q` version
++		touch $@
++
++# The zics below ensure that each data file can stand on its own.
++# We also do an all-files run to catch links to links.
++
++check_public:
++		$(MAKE) maintainer-clean
++		$(MAKE) "CFLAGS=$(GCC_DEBUG_FLAGS)" ALL
++		mkdir -p public.dir
++		for i in $(TDATA) ; do \
++		  $(zic) -v -d public.dir $$i 2>&1 || exit; \
++		done
++		$(zic) -v -d public.dir $(TDATA)
++		rm -fr public.dir
++
++# Check that the code works under various alternative
++# implementations of time_t.
++check_time_t_alternatives:
++		if diff -q Makefile Makefile 2>/dev/null; then \
++		  quiet_option='-q'; \
++		else \
++		  quiet_option=''; \
++		fi && \
++		wd=`pwd` && \
++		zones=`$(AWK) '/^[^#]/ { print $$3 }' <zone1970.tab` && \
++		for type in $(TIME_T_ALTERNATIVES); do \
++		  mkdir -p time_t.dir/$$type && \
++		  $(MAKE) clean_misc && \
++		  $(MAKE) TOPDIR="$$wd/time_t.dir/$$type" \
++		    CFLAGS='$(CFLAGS) -Dtime_tz='"'$$type'" \
++		    REDO='$(REDO)' \
++		    install && \
++		  diff $$quiet_option -r \
++		    time_t.dir/int64_t/etc/zoneinfo \
++		    time_t.dir/$$type/etc/zoneinfo && \
++		  case $$type in \
++		  int32_t) range=-2147483648,2147483647;; \
++		  uint32_t) range=0,4294967296;; \
++		  int64_t) continue;; \
++		  *u*) range=0,10000000000;; \
++		  *) range=-10000000000,10000000000;; \
++		  esac && \
++		  echo checking $$type zones ... && \
++		  time_t.dir/int64_t/etc/zdump -V -t $$range $$zones \
++		      >time_t.dir/int64_t.out && \
++		  time_t.dir/$$type/etc/zdump -V -t $$range $$zones \
++		      >time_t.dir/$$type.out && \
++		  diff -u time_t.dir/int64_t.out time_t.dir/$$type.out \
++		    || exit; \
++		done
++		rm -fr time_t.dir
++
++tarballs traditional_tarballs signatures traditional_signatures: version
++		VERSION=`cat version` && \
++		$(MAKE) VERSION="$$VERSION" $@_version
++
++tarballs_version: traditional_tarballs_version tzdb-$(VERSION).tar.lz
++traditional_tarballs_version: \
++  tzcode$(VERSION).tar.gz tzdata$(VERSION).tar.gz
++signatures_version: traditional_signatures_version tzdb-$(VERSION).tar.lz.asc
++traditional_signatures_version: \
++  tzcode$(VERSION).tar.gz.asc tzdata$(VERSION).tar.gz.asc \
++
++tzcode$(VERSION).tar.gz: set-timestamps.out
++		LC_ALL=C && export LC_ALL && \
++		tar $(TARFLAGS) -cf - \
++		    $(COMMON) $(DOCS) $(SOURCES) | \
++		  gzip $(GZIPFLAGS) >$@.out
++		mv $@.out $@
++
++tzdata$(VERSION).tar.gz: set-timestamps.out
++		LC_ALL=C && export LC_ALL && \
++		tar $(TARFLAGS) -cf - $(COMMON) $(DATA) $(MISC) | \
++		  gzip $(GZIPFLAGS) >$@.out
++		mv $@.out $@
++
++tzdb-$(VERSION).tar.lz: set-timestamps.out
++		rm -fr tzdb-$(VERSION)
++		mkdir tzdb-$(VERSION)
++		ln $(ENCHILADA) tzdb-$(VERSION)
++		touch -cmr `ls -t tzdb-$(VERSION)/* | sed 1q` tzdb-$(VERSION)
++		LC_ALL=C && export LC_ALL && \
++		tar $(TARFLAGS) -cf - tzdb-$(VERSION) | lzip -9 >$@.out
++		mv $@.out $@
++
++tzcode$(VERSION).tar.gz.asc: tzcode$(VERSION).tar.gz
++		gpg --armor --detach-sign $?
++
++tzdata$(VERSION).tar.gz.asc: tzdata$(VERSION).tar.gz
++		gpg --armor --detach-sign $?
++
++tzdb-$(VERSION).tar.lz.asc: tzdb-$(VERSION).tar.lz
++		gpg --armor --detach-sign $?
++
++typecheck:
++		$(MAKE) clean
++		for i in "long long" unsigned; \
++		do \
++			$(MAKE) CFLAGS="-DTYPECHECK -D__time_t_defined -D_TIME_T \"-Dtime_t=$$i\"" ; \
++			./zdump -v Europe/Rome ; \
++			$(MAKE) clean ; \
++		done
++
++zonenames:	$(TDATA)
++		@$(AWK) '/^Zone/ { print $$2 } /^Link/ { print $$3 }' $(TDATA)
++
++asctime.o:	private.h tzfile.h
++date.o:		private.h
++difftime.o:	private.h
++localtime.o:	private.h tzfile.h
++strftime.o:	private.h tzfile.h
++zdump.o:	version.h
++zic.o:		private.h tzfile.h version.h
++
++.KEEP_STATE:
++
++.PHONY: ALL INSTALL all
++.PHONY: check check_character_set check_links
++.PHONY: check_public check_sorted check_tables
++.PHONY: check_time_t_alternatives check_tzs check_web check_white_space
++.PHONY: clean clean_misc force_tzs
++.PHONY: install install_data maintainer-clean names
++.PHONY: posix_only posix_packrat posix_right
++.PHONY: public right_only right_posix signatures signatures_version
++.PHONY: tarballs tarballs_version typecheck
++.PHONY: zonenames zones
++native
+\ No newline at end of property
++FreeBSD=%H
+\ No newline at end of property
++text/plain
+\ No newline at end of property
+--- contrib/tzdata/NEWS.orig
++++ contrib/tzdata/NEWS
+@@ -0,0 +1,3782 @@
++News for the tz database
++
++Release 2016i - 2016-11-01 23:19:52 -0700
++
++  Briefly: Cyprus split into two time zones on 2016-10-30, and Tonga
++  reintroduces DST on 2016-11-06.
++
++  Changes to future time stamps
++
++    Pacific/Tongatapu begins DST on 2016-11-06 at 02:00, ending on
++    2017-01-15 at 03:00.  Assume future observances in Tonga will be
++    from the first Sunday in November through the third Sunday in
++    January, like Fiji.  (Thanks to Pulu ʻAnau.)  Switch to numeric
++    time zone abbreviations for this zone.
++
++  Changes to past and future time stamps
++
++    Northern Cyprus is now +03 year round, causing a split in Cyprus
++    time zones starting 2016-10-30 at 04:00.  This creates a zone
++    Asia/Famagusta.  (Thanks to Even Scharning and Matt Johnson.)
++
++    Antarctica/Casey switched from +08 to +11 on 2016-10-22.
++    (Thanks to Steffen Thorsen.)
++
++  Changes to past time stamps
++
++    Several corrections were made for pre-1975 time stamps in Italy.
++    These affect Europe/Malta, Europe/Rome, Europe/San_Marino, and
++    Europe/Vatican.
++
++    First, the 1893-11-01 00:00 transition in Italy used the new UT
++    offset (+01), not the old (+00:49:56).  (Thanks to Michael
++    Deckers.)
++
++    Second, rules for daylight saving in Italy were changed to agree
++    with Italy's National Institute of Metrological Research (INRiM)
++    except for 1944, as follows (thanks to Pierpaolo Bernardi, Brian
++    Inglis, and Michael Deckers):
++
++      The 1916-06-03 transition was at 24:00, not 00:00.
++
++      The 1916-10-01, 1919-10-05, and 1920-09-19 transitions were at
++      00:00, not 01:00.
++
++      The 1917-09-30 and 1918-10-06 transitions were at 24:00, not
++      01:00.
++
++      The 1944-09-17 transition was at 03:00, not 01:00.  This
++      particular change is taken from Italian law as INRiM's table,
++      (which says 02:00) appears to have a typo here.  Also, keep the
++      1944-04-03 transition for Europe/Rome, as Rome was controlled by
++      Germany then.
++
++      The 1967-1970 and 1972-1974 fallback transitions were at 01:00,
++      not 00:00.
++
++  Changes to code
++
++    The code should now be buildable on AmigaOS merely by setting the
++    appropriate Makefile variables.  (From a patch by Carsten Larsen.)
++
++
++Release 2016h - 2016-10-19 23:17:57 -0700
++
++  Changes to future time stamps
++
++    Asia/Gaza and Asia/Hebron end DST on 2016-10-29 at 01:00, not
++    2016-10-21 at 00:00.  (Thanks to Sharef Mustafa.)  Predict that
++    future fall transitions will be on the last Saturday of October
++    at 01:00, which is consistent with predicted spring transitions
++    on the last Saturday of March.  (Thanks to Tim Parenti.)
++
++  Changes to past time stamps
++
++    In Turkey, transitions in 1986-1990 were at 01:00 standard time
++    not at 02:00, and the spring 1994 transition was on March 20, not
++    March 27.  (Thanks to Kıvanç Yazan.)
++
++  Changes to past and future time zone abbreviations
++
++    Asia/Colombo now uses numeric time zone abbreviations like "+0530"
++    instead of alphabetic ones like "IST" and "LKT".  Various
++    English-language sources use "IST", "LKT" and "SLST", with no
++    working consensus.  (Usage of "SLST" mentioned by Sadika
++    Sumanapala.)
++
++  Changes to code
++
++    zic no longer mishandles relativizing file names when creating
++    symbolic links like /etc/localtime, when these symbolic links
++    are outside the usual directory hierarchy.  This fixes a bug
++    introduced in 2016g.  (Problem reported by Andreas Stieger.)
++
++  Changes to build procedure
++
++    New rules 'traditional_tarballs' and 'traditional_signatures' for
++    building just the traditional-format distribution.  (Requested by
++    Deborah Goldsmith.)
++
++    The file 'version' is now put into the tzdata tarball too.
++    (Requested by Howard Hinnant.)
++
++  Changes to documentation and commentary
++
++    The 'Theory' file now has a section on interface stability.
++    (Requested by Paul Koning.)  It also mentions features like
++    tm_zone and localtime_rz that have long been supported by the
++    reference code.
++
++    tz-link.htm has improved coverage of time zone boundaries suitable
++    for geolocation.  (Thanks to heads-ups from Evan Siroky and Matt
++    Johnson.)
++
++    The US commentary now mentions Allen and the "day of two noons".
++
++    The Fiji commentary mentions the government's 2016-10-03 press
++    release.  (Thanks to Raymond Kumar.)
++
++
++Release 2016g - 2016-09-13 08:56:38 -0700
++
++  Changes to future time stamps
++
++    Turkey switched from EET/EEST (+02/+03) to permanent +03,
++    effective 2016-09-07.  (Thanks to Burak AYDIN.)  Use "+03" rather
++    than an invented abbreviation for the new time.
++
++    New leap second 2016-12-31 23:59:60 UTC as per IERS Bulletin C 52.
++    (Thanks to Tim Parenti.)
++
++  Changes to past time stamps
++
++    For America/Los_Angeles, spring-forward transition times have been
++    corrected from 02:00 to 02:01 in 1948, and from 02:00 to 01:00 in
++    1950-1966.
++
++    For zones using Soviet time on 1919-07-01, transitions to UT-based
++    time were at 00:00 UT, not at 02:00 local time.  The affected
++    zones are Europe/Kirov, Europe/Moscow, Europe/Samara, and
++    Europe/Ulyanovsk.  (Thanks to Alexander Belopolsky.)
++
++  Changes to past and future time zone abbreviations
++
++    The Factory zone now uses the time zone abbreviation -00 instead
++    of a long English-language string, as -00 is now the normal way to
++    represent an undefined time zone.
++
++    Several zones in Antarctica and the former Soviet Union, along
++    with zones intended for ships at sea that cannot use POSIX TZ
++    strings, now use numeric time zone abbreviations instead of
++    invented or obsolete alphanumeric abbreviations.  The affected
++    zones are Antarctica/Casey, Antarctica/Davis,
++    Antarctica/DumontDUrville, Antarctica/Mawson, Antarctica/Rothera,
++    Antarctica/Syowa, Antarctica/Troll, Antarctica/Vostok,
++    Asia/Anadyr, Asia/Ashgabat, Asia/Baku, Asia/Bishkek, Asia/Chita,
++    Asia/Dushanbe, Asia/Irkutsk, Asia/Kamchatka, Asia/Khandyga,
++    Asia/Krasnoyarsk, Asia/Magadan, Asia/Omsk, Asia/Sakhalin,
++    Asia/Samarkand, Asia/Srednekolymsk, Asia/Tashkent, Asia/Tbilisi,
++    Asia/Ust-Nera, Asia/Vladivostok, Asia/Yakutsk, Asia/Yekaterinburg,
++    Asia/Yerevan, Etc/GMT-14, Etc/GMT-13, Etc/GMT-12, Etc/GMT-11,
++    Etc/GMT-10, Etc/GMT-9, Etc/GMT-8, Etc/GMT-7, Etc/GMT-6, Etc/GMT-5,
++    Etc/GMT-4, Etc/GMT-3, Etc/GMT-2, Etc/GMT-1, Etc/GMT+1, Etc/GMT+2,
++    Etc/GMT+3, Etc/GMT+4, Etc/GMT+5, Etc/GMT+6, Etc/GMT+7, Etc/GMT+8,
++    Etc/GMT+9, Etc/GMT+10, Etc/GMT+11, Etc/GMT+12, Europe/Kaliningrad,
++    Europe/Minsk, Europe/Samara, Europe/Volgograd, and
++    Indian/Kerguelen.  For Europe/Moscow the invented abbreviation MSM
++    was replaced by +05, whereas MSK and MSD were kept as they are not
++    our invention and are widely used.
++
++  Changes to zone names
++
++    Rename Asia/Rangoon to Asia/Yangon, with a backward compatibility link.
++    (Thanks to David Massoud.)
++
++  Changes to code
++
++    zic no longer generates binary files containing POSIX TZ-like
++    strings that disagree with the local time type after the last
++    explicit transition in the data.  This fixes a bug with
++    Africa/Casablanca and Africa/El_Aaiun in some year-2037 time
++    stamps on the reference platform.  (Thanks to Alexander Belopolsky
++    for reporting the bug and suggesting a way forward.)
++
++    If the installed localtime and/or posixrules files are symbolic
++    links, zic now keeps them symbolic links when updating them, for
++    compatibility with platforms like OpenSUSE where other programs
++    configure these files as symlinks.
++
++    zic now avoids hard linking to symbolic links, avoids some
++    unnecessary mkdir and stat system calls, and uses shorter file
++    names internally.
++
++    zdump has a new -i option to generate transitions in a
++    more-compact but still human-readable format.  This option is
++    experimental, and the output format may change in future versions.
++    (Thanks to Jon Skeet for suggesting that an option was needed,
++    and thanks to Tim Parenti and Chris Rovick for further comments.)
++
++  Changes to build procedure
++
++    An experimental distribution format is available, in addition
++    to the traditional format which will continue to be distributed.
++    The new format is a tarball tzdb-VERSION.tar.lz with signature
++    file tzdb-VERSION.tar.lz.asc.  It unpacks to a top-level directory
++    tzdb-VERSION containing the code and data of the traditional
++    two-tarball format, along with extra data that may be useful.
++    (Thanks to Antonio Diaz Diaz, Oscar van Vlijmen, and many others
++    for comments about the experimental format.)
++
++    The release version number is now more accurate in the usual case
++    where releases are built from a Git repository.  For example, if
++    23 commits and some working-file changes have been made since
++    release 2016g, the version number is now something like
++    '2016g-23-g50556e3-dirty' instead of the misleading '2016g'.
++    Official releases uses the same version number format as before,
++    e.g., '2016g'.  To support the more-accurate version number, its
++    specification has moved from a line in the Makefile to a new
++    source file 'version'.
++
++    The experimental distribution contains a file to2050.tzs that
++    contains what should be the output of 'zdump -i -c 2050' on
++    primary zones.  If this file is available, 'make check' now checks
++    that zdump generates this output.
++
++    'make check_web' now works on Fedora-like distributions.
++
++  Changes to documentation and commentary
++
++    tzfile.5 now documents the new restriction on POSIX TZ-like
++    strings that is now implemented by zic.
++
++    Comments now cite URLs for some 1917-1921 Russian DST decrees.
++    (Thanks to Alexander Belopolsky.)
++
++    tz-link.htm mentions JuliaTime (thanks to Curtis Vogt) and Time4J
++    (thanks to Meno Hochschild) and ThreeTen-Extra, and its
++    description of Java 8 has been brought up to date (thanks to
++    Stephen Colebourne).  Its description of local time on Mars has
++    been updated to match current practice, and URLs have been updated
++    and some obsolete ones removed.
++
++
++Release 2016f - 2016-07-05 16:26:51 +0200
++
++  Changes affecting future time stamps
++
++    The Egyptian government changed its mind on short notice, and
++    Africa/Cairo will not introduce DST starting 2016-07-07 after all.
++    (Thanks to Mina Samuel.)
++
++    Asia/Novosibirsk switches from +06 to +07 on 2016-07-24 at 02:00.
++    (Thanks to Stepan Golosunov.)
++
++  Changes to past and future time stamps
++
++    Asia/Novokuznetsk and Asia/Novosibirsk now use numeric time zone
++    abbreviations instead of invented ones.
++
++  Changes affecting past time stamps
++
++    Europe/Minsk's 1992-03-29 spring-forward transition was at 02:00 not 00:00.
++    (Thanks to Stepan Golosunov.)
++
++
++Release 2016e - 2016-06-14 08:46:16 -0700
++
++  Changes affecting future time stamps
++
++    Africa/Cairo observes DST in 2016 from July 7 to the end of October.
++    Guess October 27 and 24:00 transitions.  (Thanks to Steffen Thorsen.)
++    For future years, guess April's last Thursday to October's last
++    Thursday except for Ramadan.
++
++  Changes affecting past time stamps
++
++    Locations while uninhabited now use '-00', not 'zzz', as a
++    placeholder time zone abbreviation.  This is inspired by Internet
++    RFC 3339 and is more consistent with numeric time zone
++    abbreviations already used elsewhere.  The change affects several
++    arctic and antarctic locations, e.g., America/Cambridge_Bay before
++    1920 and Antarctica/Troll before 2005.
++
++    Asia/Baku's 1992-09-27 transition from +04 (DST) to +04 (non-DST) was
++    at 03:00, not 23:00 the previous day.  (Thanks to Michael Deckers.)
++
++  Changes to code
++
++    zic now outputs a dummy transition at time 2**31 - 1 in zones
++    whose POSIX-style TZ strings contain a '<'.  This mostly works
++    around Qt bug 53071 <https://bugreports.qt.io/browse/QTBUG-53071>.
++    (Thanks to Zhanibek Adilbekov for reporting the Qt bug.)
++
++  Changes affecting documentation and commentary
++
++    tz-link.htm says why governments should give plenty of notice for
++    time zone or DST changes, and refers to Matt Johnson's blog post.
++
++    tz-link.htm mentions Tzdata for Elixir.  (Thanks to Matt Johnson.)
++
++
++Release 2016d - 2016-04-17 22:50:29 -0700
++
++  Changes affecting future time stamps
++
++    America/Caracas switches from -0430 to -04 on 2016-05-01 at 02:30.
++    (Thanks to Alexander Krivenyshev for the heads-up.)
++
++    Asia/Magadan switches from +10 to +11 on 2016-04-24 at 02:00.
++    (Thanks to Alexander Krivenyshev and Matt Johnson.)
++
++    New zone Asia/Tomsk, split off from Asia/Novosibirsk.  It covers
++    Tomsk Oblast, Russia, which switches from +06 to +07 on 2016-05-29
++    at 02:00.  (Thanks to Stepan Golosunov.)
++
++  Changes affecting past time stamps
++
++    New zone Europe/Kirov, split off from Europe/Volgograd.  It covers
++    Kirov Oblast, Russia, which switched from +04/+05 to +03/+04 on
++    1989-03-26 at 02:00, roughly a year after Europe/Volgograd made
++    the same change.  (Thanks to Stepan Golosunov.)
++
++    Russia and nearby locations had daylight-saving transitions on
++    1992-03-29 at 02:00 and 1992-09-27 at 03:00, instead of on
++    1992-03-28 at 23:00 and 1992-09-26 at 23:00.  (Thanks to Stepan
++    Golosunov.)
++
++    Many corrections to historical time in Kazakhstan from 1991
++    through 2005.  (Thanks to Stepan Golosunov.)  Replace Kazakhstan's
++    invented time zone abbreviations with numeric abbreviations.
++
++  Changes to commentary
++
++    Mention Internet RFCs 7808 (TZDIST) and 7809 (CalDAV time zone references).
++
++
++Release 2016c - 2016-03-23 00:51:27 -0700
++
++  Changes affecting future time stamps
++
++    Azerbaijan no longer observes DST.  (Thanks to Steffen Thorsen.)
++
++    Chile reverts from permanent to seasonal DST.  (Thanks to Juan
++    Correa for the heads-up, and to Tim Parenti for corrections.)
++    Guess that future transitions are August's and May's second
++    Saturdays at 24:00 mainland time.  Also, call the period from
++    2014-09-07 through 2016-05-14 daylight saving time instead of
++    standard time, as that seems more appropriate now.
++
++  Changes affecting past time stamps
++
++    Europe/Kaliningrad and Europe/Vilnius changed from +03/+04 to
++    +02/+03 on 1989-03-26, not 1991-03-31.  Europe/Volgograd changed
++    from +04/+05 to +03/+04 on 1988-03-27, not 1989-03-26.
++    (Thanks to Stepan Golosunov.)
++
++  Changes to commentary
++
++    Several updates and URLs for historical and proposed Russian changes.
++    (Thanks to Stepan Golosunov, Matt Johnson, and Alexander Krivenyshev.)
++
++
++Release 2016b - 2016-03-12 17:30:14 -0800
++
++  Compatibility note
++
++    Starting with release 2016b, some data entries cause zic implementations
++    derived from tz releases 2005j through 2015e to issue warnings like
++    "time zone abbreviation differs from POSIX standard (+03)".
++    These warnings should not otherwise affect zic's output and can safely be
++    ignored on today's platforms, as the warnings refer to a restriction in
++    POSIX.1-1988 that was removed in POSIX.1-2001.  One way to suppress the
++    warnings is to upgrade to zic derived from tz releases 2015f and later.
++
++  Changes affecting future time stamps
++
++    New zones Europe/Astrakhan and Europe/Ulyanovsk for Astrakhan and
++    Ulyanovsk Oblasts, Russia, both of which will switch from +03 to +04 on
++    2016-03-27 at 02:00 local time.  They need distinct zones since their
++    post-1970 histories disagree.  New zone Asia/Barnaul for Altai Krai and
++    Altai Republic, Russia, which will switch from +06 to +07 on the same date
++    and local time.  The Astrakhan change is already official; the others have
++    passed the first reading in the State Duma and are extremely likely.
++    Also, Asia/Sakhalin moves from +10 to +11 on 2016-03-27 at 02:00.
++    (Thanks to Alexander Krivenyshev for the heads-up, and to Matt Johnson
++    and Stepan Golosunov for followup.)
++
++    As a trial of a new system that needs less information to be made up,
++    the new zones use numeric time zone abbreviations like "+04"
++    instead of invented abbreviations like "ASTT".
++
++    Haiti will not observe DST in 2016.  (Thanks to Jean Antoine via
++    Steffen Thorsen.)
++
++    Palestine's spring-forward transition on 2016-03-26 is at 01:00, not 00:00.
++    (Thanks to Hannah Kreitem.) Guess future transitions will be March's last
++    Saturday at 01:00, not March's last Friday at 24:00.
++
++  Changes affecting past time stamps
++
++    Europe/Chisinau observed DST during 1990, and switched from +04 to
++    +03 at 1990-05-06 02:00, instead of switching from +03 to +02.
++    (Thanks to Stepan Golosunov.)
++
++    1991 abbreviations in Europe/Samara should be SAMT/SAMST, not
++    KUYT/KUYST.  (Thanks to Stepan Golosunov.)
++
++  Changes to code
++
++    tzselect's diagnostics and checking, and checktab.awk's checking,
++    have been improved.  (Thanks to J William Piggott.)
++
++    tzcode now builds under MinGW.  (Thanks to Ian Abbott and Esben Haabendal.)
++
++    tzselect now tests Julian-date TZ settings more accurately.
++    (Thanks to J William Piggott.)
++
++  Changes to commentary
++
++    Comments in zone tables have been improved.  (Thanks to J William Piggott.)
++
++    tzselect again limits its menu comments so that menus fit on a
++    24x80 alphanumeric display.
++
++    A new web page tz-how-to.html.  (Thanks to Bill Seymour.)
++
++    In the Theory file, the description of possible time zone abbreviations in
++    tzdata has been cleaned up, as the old description was unclear and
++    inconsistent.  (Thanks to Alain Mouette for reporting the problem.)
++
++
++Release 2016a - 2016-01-26 23:28:02 -0800
++
++  Changes affecting future time stamps
++
++    America/Cayman will not observe daylight saving this year after all.
++    Revert our guess that it would.  (Thanks to Matt Johnson.)
++
++    Asia/Chita switches from +0800 to +0900 on 2016-03-27 at 02:00.
++    (Thanks to Alexander Krivenyshev.)
++
++    Asia/Tehran now has DST predictions for the year 2038 and later,
++    to be March 21 00:00 to September 21 00:00.  This is likely better
++    than predicting no DST, albeit off by a day every now and then.
++
++  Changes affecting past and future time stamps
++
++    America/Metlakatla switched from PST all year to AKST/AKDT on
++    2015-11-01 at 02:00.  (Thanks to Steffen Thorsen.)
++
++    America/Santa_Isabel has been removed, and replaced with a
++    backward compatibility link to America/Tijuana.  Its contents were
++    apparently based on a misreading of Mexican legislation.
++
++  Changes affecting past time stamps
++
++    Asia/Karachi's two transition times in 2002 were off by a minute.
++    (Thanks to Matt Johnson.)
++
++  Changes affecting build procedure
++
++    An installer can now combine leap seconds with use of the backzone file,
++    e.g., with 'make PACKRATDATA=backzone REDO=posix_right zones'.
++    The old 'make posix_packrat' rule is now marked as obsolescent.
++    (Thanks to Ian Abbott for an initial implementation.)
++
++  Changes affecting documentation and commentary
++
++    A new file LICENSE makes it easier to see that the code and data
++    are mostly public-domain.  (Thanks to James Knight.)  The three
++    non-public-domain files now use the current (3-clause) BSD license
++    instead of older versions of that license.
++
++    tz-link.htm mentions the BDE library (thanks to Andrew Paprocki),
++    CCTZ (thanks to Tim Parenti), TimeJones.com, and has a new section
++    on editing tz source files (with a mention of Sublime zoneinfo,
++    thanks to Gilmore Davidson).
++
++    The Theory and asia files now mention the 2015 book "The Global
++    Transformation of Time, 1870-1950", and cite a couple of reviews.
++
++    The America/Chicago entry now documents the informal use of US
++    central time in Fort Pierre, South Dakota.  (Thanks to Rick
++    McDermid, Matt Johnson, and Steve Jones.)
++
++
++Release 2015g - 2015-10-01 00:39:51 -0700
++
++  Changes affecting future time stamps
++
++    Turkey's 2015 fall-back transition is scheduled for Nov. 8, not Oct. 25.
++    (Thanks to Fatih.)
++
++    Norfolk moves from +1130 to +1100 on 2015-10-04 at 02:00 local time.
++    (Thanks to Alexander Krivenyshev.)
++
++    Fiji's 2016 fall-back transition is scheduled for January 17, not 24.
++    (Thanks to Ken Rylander.)
++
++    Fort Nelson, British Columbia will not fall back on 2015-11-01.  It has
++    effectively been on MST (-0700) since it advanced its clocks on 2015-03-08.
++    New zone America/Fort_Nelson.  (Thanks to Matt Johnson.)
++
++  Changes affecting past time stamps
++
++    Norfolk observed DST from 1974-10-27 02:00 to 1975-03-02 02:00.
++
++  Changes affecting code
++
++    localtime no longer mishandles America/Anchorage after 2037.
++    (Thanks to Bradley White for reporting the bug.)
++
++    On hosts with signed 32-bit time_t, localtime no longer mishandles
++    Pacific/Fiji after 2038-01-16 14:00 UTC.
++
++    The localtime module allows the variables 'timezone', 'daylight',
++    and 'altzone' to be in common storage shared with other modules,
++    and declares them in case the system <time.h> does not.
++    (Problems reported by Kees Dekker.)
++
++    On platforms with tm_zone, strftime.c now assumes it is not NULL.
++    This simplifies the code and is consistent with zdump.c.
++    (Problem reported by Christos Zoulas.)
++
++  Changes affecting documentation
++
++   The tzfile man page now documents that transition times denote the
++   starts (not the ends) of the corresponding time periods.
++   (Ambiguity reported by Bill Seymour.)
++
++
++Release 2015f - 2015-08-10 18:06:56 -0700
++
++  Changes affecting future time stamps
++
++    North Korea switches to +0830 on 2015-08-15.  (Thanks to Steffen Thorsen.)
++    The abbreviation remains "KST".  (Thanks to Robert Elz.)
++
++    Uruguay no longer observes DST.  (Thanks to Steffen Thorsen
++    and Pablo Camargo.)
++
++  Changes affecting past and future time stamps
++
++    Moldova starts and ends DST at 00:00 UTC, not at 01:00 UTC.
++    (Thanks to Roman Tudos.)
++
++  Changes affecting data format and code
++
++    zic's '-y YEARISTYPE' option is no longer documented.  The TYPE
++    field of a Rule line should now be '-'; the old values 'even',
++    'odd', 'uspres', 'nonpres', 'nonuspres' were already undocumented.
++    Although the implementation has not changed, these features do not
++    work in the default installation, they are not used in the data,
++    and they are now considered obsolescent.
++
++    zic now checks that two rules don't take effect at the same time.
++    (Thanks to Jon Skeet and Arthur David Olson.)  Constraints on
++    simultaneity are now documented.
++
++    The two characters '%z' in a zone format now stand for the UTC
++    offset, e.g., '-07' for seven hours behind UTC and '+0530' for
++    five hours and thirty minutes ahead.  This better supports time
++    zone abbreviations conforming to POSIX.1-2001 and later.
++
++  Changes affecting installed data files
++
++    Comments for America/Halifax and America/Glace_Bay have been improved.
++    (Thanks to Brian Inglis.)
++
++    Data entries have been simplified for Atlantic/Canary, Europe/Simferopol,
++    Europe/Sofia, and Europe/Tallinn.  This yields slightly smaller
++    installed data files for Europe/Simferopol and Europe/Tallinn.
++    It does not affect timestamps.  (Thanks to Howard Hinnant.)
++
++  Changes affecting code
++
++    zdump and zic no longer warn about valid time zone abbreviations
++    like '-05'.
++
++    Some Visual Studio 2013 warnings have been suppressed.
++    (Thanks to Kees Dekker.)
++
++    'date' no longer sets the time of day and its -a, -d, -n and -t
++    options have been removed.  Long obsolescent, the implementation
++    of these features had porting problems.  Builders no longer need
++    to configure HAVE_ADJTIME, HAVE_SETTIMEOFDAY, or HAVE_UTMPX_H.
++    (Thanks to Kees Dekker for pointing out the problem.)
++
++  Changes affecting documentation
++
++    The Theory file mentions naming issues earlier, as these seem to be
++    poorly publicized (thanks to Gilmore Davidson for reporting the problem).
++
++    tz-link.htm mentions Time Zone Database Parser (thanks to Howard Hinnant).
++
++    Mention that Herbert Samuel introduced the term "Summer Time".
++
++
++Release 2015e - 2015-06-13 10:56:02 -0700
++
++  Changes affecting future time stamps
++
++    Morocco will suspend DST from 2015-06-14 03:00 through 2015-07-19 02:00,
++    not 06-13 and 07-18 as we had guessed.  (Thanks to Milamber.)
++
++    Assume Cayman Islands will observe DST starting next year, using US rules.
++    Although it isn't guaranteed, it is the most likely.
++
++  Changes affecting data format
++
++    The file 'iso3166.tab' now uses UTF-8, so that its entries can better
++    spell the names of Åland Islands, Côte d'Ivoire, and Réunion.
++
++  Changes affecting code
++
++    When displaying data, tzselect converts it to the current locale's
++    encoding if the iconv command works.  (Problem reported by random832.)
++
++    tzselect no longer mishandles Dominica, fixing a bug introduced
++    in Release 2014f.  (Problem reported by Owen Leibman.)
++
++    zic -l no longer fails when compiled with -DTZDEFAULT=\"/etc/localtime\".
++    This fixes a bug introduced in Release 2014f.
++    (Problem reported by Leonardo Chiquitto.)
++
++
++Release 2015d - 2015-04-24 08:09:46 -0700
++
++  Changes affecting future time stamps
++
++    Egypt will not observe DST in 2015 and will consider canceling it
++    permanently.  For now, assume no DST indefinitely.
++    (Thanks to Ahmed Nazmy and Tim Parenti.)
++
++  Changes affecting past time stamps
++
++    America/Whitehorse switched from UT -09 to -08 on 1967-05-28, not
++    1966-07-01.  Also, Yukon's time zone history is documented better.
++    (Thanks to Brian Inglis and Dennis Ferguson.)
++
++  Change affecting past and future time zone abbreviations
++
++    The abbreviations for Hawaii-Aleutian standard and daylight times
++    have been changed from HAST/HADT to HST/HDT, as per US Government
++    Printing Office style.  This affects only America/Adak since 1983,
++    as America/Honolulu was already using the new style.
++
++  Changes affecting code
++
++   zic has some minor performance improvements.
++
++
++Release 2015c - 2015-04-11 08:55:55 -0700
++
++  Changes affecting future time stamps
++
++    Egypt's spring-forward transition is at 24:00 on April's last Thursday,
++    not 00:00 on April's last Friday.  2015's transition will therefore be on
++    Thursday, April 30 at 24:00, not Friday, April 24 at 00:00.  Similar fixes
++    apply to 2026, 2037, 2043, etc.  (Thanks to Steffen Thorsen.)
++
++  Changes affecting past time stamps
++
++    The following changes affect some pre-1991 Chile-related time stamps
++    in America/Santiago, Antarctica/Palmer, and Pacific/Easter.
++
++      The 1910 transition was January 10, not January 1.
++
++      The 1918 transition was September 10, not September 1.
++
++      The UT -04 time observed from 1932 to 1942 is now considered to
++      be standard time, not year-round DST.
++
++      Santiago observed DST (UT -03) from 1946-07-15 through
++      1946-08-31, then reverted to standard time, then switched to -05
++      on 1947-04-01.
++
++      Assume transitions before 1968 were at 00:00, since we have no data
++      saying otherwise.
++
++      The spring 1988 transition was 1988-10-09, not 1988-10-02.
++      The fall 1990 transition was 1990-03-11, not 1990-03-18.
++
++      Assume no UTC offset change for Pacific/Easter on 1890-01-01,
++      and omit all transitions on Pacific/Easter from 1942 through 1946
++      since we have no data suggesting that they existed.
++
++    One more zone has been turned into a link, as it differed
++    from an existing zone only for older time stamps.  As usual,
++    this change affects UTC offsets in pre-1970 time stamps only.
++    The zone's old contents have been moved to the 'backzone' file.
++    The affected zone is America/Montreal.
++
++  Changes affecting commentary
++
++    Mention the TZUpdater tool.
++
++    Mention "The Time Now".  (Thanks to Brandon Ramsey.)
++
++
++Release 2015b - 2015-03-19 23:28:11 -0700
++
++  Changes affecting future time stamps
++
++    Mongolia will start observing DST again this year, from the last
++    Saturday in March at 02:00 to the last Saturday in September at 00:00.
++    (Thanks to Ganbold Tsagaankhuu.)
++
++    Palestine will start DST on March 28, not March 27.  Also,
++    correct the fall 2014 transition from September 26 to October 24.
++    Adjust future predictions accordingly.  (Thanks to Steffen Thorsen.)
++
++  Changes affecting past time stamps
++
++    The 1982 zone shift in Pacific/Easter has been corrected, fixing a 2015a
++    regression.  (Thanks to Stuart Bishop for reporting the problem.)
++
++    Some more zones have been turned into links, when they differed
++    from existing zones only for older time stamps.  As usual,
++    these changes affect UTC offsets in pre-1970 time stamps only.
++    Their old contents have been moved to the 'backzone' file.
++    The affected zones are: America/Antigua, America/Cayman,
++    Pacific/Midway, and Pacific/Saipan.
++
++  Changes affecting time zone abbreviations
++
++    Correct the 1992-2010 DST abbreviation in Volgograd from "MSK" to "MSD".
++    (Thanks to Hank W.)
++
++  Changes affecting code
++
++    Fix integer overflow bug in reference 'mktime' implementation.
++    (Problem reported by Jörg Richter.)
++
++    Allow -Dtime_tz=time_t compilations, and allow -Dtime_tz=... libraries
++    to be used in the same executable as standard-library time_t functions.
++    (Problems reported by Bradley White.)
++
++  Changes affecting commentary
++
++    Cite the recent Mexican decree changing Quintana Roo's time zone.
++    (Thanks to Carlos Raúl Perasso.)
++
++    Likewise for the recent Chilean decree.  (Thanks to Eduardo Romero Urra.)
++
++    Update info about Mars time.
++
++
++Release 2015a - 2015-01-29 22:35:20 -0800
++
++  Changes affecting future time stamps
++
++    The Mexican state of Quintana Roo, represented by America/Cancun,
++    will shift from Central Time with DST to Eastern Time without DST
++    on 2015-02-01 at 02:00.  (Thanks to Steffen Thorsen and Gwillim Law.)
++
++    Chile will not change clocks in April or thereafter; its new standard time
++    will be its old daylight saving time.  This affects America/Santiago,
++    Pacific/Easter, and Antarctica/Palmer.  (Thanks to Juan Correa.)
++
++    New leap second 2015-06-30 23:59:60 UTC as per IERS Bulletin C 49.
++    (Thanks to Tim Parenti.)
++
++  Changes affecting past time stamps
++
++    Iceland observed DST in 1919 and 1921, and its 1939 fallback
++    transition was Oct. 29, not Nov. 29.  Remove incorrect data from
++    Shanks about time in Iceland between 1837 and 1908.
++
++    Some more zones have been turned into links, when they differed
++    from existing zones only for older time stamps.  As usual,
++    these changes affect UTC offsets in pre-1970 time stamps only.
++    Their old contents have been moved to the 'backzone' file.
++    The affected zones are: Asia/Aden, Asia/Bahrain, Asia/Kuwait,
++    and Asia/Muscat.
++
++  Changes affecting code
++
++    tzalloc now scrubs time zone abbreviations compatibly with the way
++    that tzset always has, by replacing invalid bytes with '_' and by
++    shortening too-long abbreviations.
++
++    tzselect ports to POSIX awk implementations, no longer mishandles
++    POSIX TZ settings when GNU awk is used, and reports POSIX TZ
++    settings to the user.  (Thanks to Stefan Kuhn.)
++
++  Changes affecting build procedure
++
++    'make check' now checks for links to links in the data.
++    One such link (for Africa/Asmera) has been fixed.
++    (Thanks to Stephen Colebourne for pointing out the problem.)
++
++  Changes affecting commentary
++
++    The leapseconds file commentary now mentions the expiration date.
++    (Problem reported by Martin Burnicki.)
++
++    Update Mexican Library of Congress URL.
++
++
++Release 2014j - 2014-11-10 17:37:11 -0800
++
++  Changes affecting current and future time stamps
++
++    Turks & Caicos' switch from US eastern time to UT -04 year-round
++    did not occur on 2014-11-02 at 02:00.  It's currently scheduled
++    for 2015-11-01 at 02:00.  (Thanks to Chris Walton.)
++
++  Changes affecting past time stamps
++
++    Many pre-1989 time stamps have been corrected for Asia/Seoul and
++    Asia/Pyongyang, based on sources for the Korean-language Wikipedia
++    entry for time in Korea.  (Thanks to Sanghyuk Jung.)  Also, no
++    longer guess that Pyongyang mimicked Seoul time after World War II,
++    as this is politically implausible.
++
++    Some more zones have been turned into links, when they differed
++    from existing zones only for older time stamps.  As usual,
++    these changes affect UTC offsets in pre-1970 time stamps only.
++    Their old contents have been moved to the 'backzone' file.
++    The affected zones are: Africa/Addis_Ababa, Africa/Asmara,
++    Africa/Dar_es_Salaam, Africa/Djibouti, Africa/Kampala,
++    Africa/Mogadishu, Indian/Antananarivo, Indian/Comoro, and
++    Indian/Mayotte.
++
++  Changes affecting commentary
++
++    The commentary is less enthusiastic about Shanks as a source,
++    and is more careful to distinguish UT from UTC.
++
++
++Release 2014i - 2014-10-21 22:04:57 -0700
++
++  Changes affecting future time stamps
++
++    Pacific/Fiji will observe DST from 2014-11-02 02:00 to 2015-01-18 03:00.
++    (Thanks to Ken Rylander for the heads-up.)  Guess that future
++    years will use a similar pattern.
++
++    A new Zone Pacific/Bougainville, for the part of Papua New Guinea
++    that plans to switch from UT +10 to +11 on 2014-12-28 at 02:00.
++    (Thanks to Kiley Walbom for the heads-up.)
++
++  Changes affecting time zone abbreviations
++
++    Since Belarus is not changing its clocks even though Moscow is,
++    the time zone abbreviation in Europe/Minsk is changing from FET
++    to its more-traditional value MSK on 2014-10-26 at 01:00.
++    (Thanks to Alexander Bokovoy for the heads-up about Belarus.)
++
++    The new abbreviation IDT stands for the pre-1976 use of UT +08 in
++    Indochina, to distinguish it better from ICT (+07).
++
++  Changes affecting past time stamps
++
++    Many time stamps have been corrected for Asia/Ho_Chi_Minh before 1976
++    (thanks to Trần Ngọc Quân for an indirect pointer to Trần Tiến Bình's
++    authoritative book).  Asia/Ho_Chi_Minh has been added to
++    zone1970.tab, to give tzselect users in Vietnam two choices,
++    since north and south Vietnam disagreed after our 1970 cutoff.
++
++    Asia/Phnom_Penh and Asia/Vientiane have been turned into links, as
++    they differed from existing zones only for older time stamps.  As
++    usual, these changes affect pre-1970 time stamps only.  Their old
++    contents have been moved to the 'backzone' file.
++
++  Changes affecting code
++
++    The time-related library functions now set errno on failure, and
++    some crashes in the new tzalloc-related library functions have
++    been fixed.  (Thanks to Christos Zoulas for reporting most of
++    these problems and for suggesting fixes.)
++
++    If USG_COMPAT is defined and the requested time stamp is standard time,
++    the tz library's localtime and mktime functions now set the extern
++    variable timezone to a value appropriate for that time stamp; and
++    similarly for ALTZONE, daylight saving time, and the altzone variable.
++    This change is a companion to the tzname change in 2014h, and is
++    designed to make timezone and altzone more compatible with tzname.
++
++    The tz library's functions now set errno to EOVERFLOW if they fail
++    because the result cannot be represented.  ctime and ctime_r now
++    return NULL and set errno when a time stamp is out of range, rather
++    than having undefined behavior.
++
++    Some bugs associated with the new 2014g functions have been fixed.
++    This includes a bug that largely incapacitated the new functions
++    time2posix_z and posix2time_z.  (Thanks to Christos Zoulas.)
++    It also includes some uses of uninitialized variables after tzalloc.
++    The new code uses the standard type 'ssize_t', which the Makefile
++    now gives porting advice about.
++
++  Changes affecting commentary
++
++    Updated URLs for NRC Canada (thanks to Matt Johnson and Brian Inglis).
++
++
++Release 2014h - 2014-09-25 18:59:03 -0700
++
++  Changes affecting past time stamps
++
++    America/Jamaica's 1974 spring-forward transition was Jan. 6, not Apr. 28.
++
++    Shanks says Asia/Novokuznetsk switched from LMT (not "NMT") on 1924-05-01,
++    not 1920-01-06.  The old entry was based on a misinterpretation of Shanks.
++
++    Some more zones have been turned into links, when they differed
++    from existing zones only for older time stamps.  As usual,
++    these changes affect UTC offsets in pre-1970 time stamps only.
++    Their old contents have been moved to the 'backzone' file.
++    The affected zones are: Africa/Blantyre, Africa/Bujumbura,
++    Africa/Gaborone, Africa/Harare, Africa/Kigali, Africa/Lubumbashi,
++    Africa/Lusaka, Africa/Maseru, and Africa/Mbabane.
++
++  Changes affecting code
++
++    zdump -V and -v now output gmtoff= values on all platforms,
++    not merely on platforms defining TM_GMTOFF.
++
++    The tz library's localtime and mktime functions now set tzname to a value
++    appropriate for the requested time stamp, and zdump now uses this
++    on platforms not defining TM_ZONE, fixing a 2014g regression.
++    (Thanks to Tim Parenti for reporting the problem.)
++
++    The tz library no longer sets tzname if localtime or mktime fails.
++
++    zdump -c no longer mishandles transitions near year boundaries.
++    (Thanks to Tim Parenti for reporting the problem.)
++
++    An access to uninitialized data has been fixed.
++    (Thanks to Jörg Richter for reporting the problem.)
++
++    When THREAD_SAFE is defined, the code ports to the C11 memory model.
++    A memory leak has been fixed if ALL_STATE and THREAD_SAFE are defined
++    and two threads race to initialize data used by gmtime-like functions.
++    (Thanks to Andy Heninger for reporting the problems.)
++
++  Changes affecting build procedure
++
++    'make check' now checks better for properly-sorted data.
++
++  Changes affecting documentation and commentary
++
++    zdump's gmtoff=N output is now documented, and its isdst=D output
++    is now documented to possibly output D values other than 0 or 1.
++
++    zdump -c's treatment of years is now documented to use the
++    Gregorian calendar and Universal Time without leap seconds,
++    and its behavior at cutoff boundaries is now documented better.
++    (Thanks to Arthur David Olson and Tim Parenti for reporting the problems.)
++
++    Programs are now documented to use the proleptic Gregorian calendar.
++    (Thanks to Alan Barrett for the suggestion.)
++
++    Fractional-second GMT offsets have been documented for civil time
++    in 19th-century Chennai, Jakarta, and New York.
++
++
++Release 2014g - 2014-08-28 12:31:23 -0700
++
++  Changes affecting future time stamps
++
++    Turks & Caicos is switching from US eastern time to UT -04
++    year-round, modeled as a switch on 2014-11-02 at 02:00.
++    [As noted in 2014j, this switch was later delayed.]
++
++  Changes affecting past time stamps
++
++    Time in Russia or the USSR before 1926 or so has been corrected by
++    a few seconds in the following zones: Asia/Irkutsk,
++    Asia/Krasnoyarsk, Asia/Omsk, Asia/Samarkand, Asia/Tbilisi,
++    Asia/Vladivostok, Asia/Yakutsk, Europe/Riga, Europe/Samara.  For
++    Asia/Yekaterinburg the correction is a few minutes.  (Thanks to
++    Vladimir Karpinsky.)
++
++    The Portuguese decree of 1911-05-26 took effect on 1912-01-01.
++    This affects 1911 time stamps in Africa/Bissau, Africa/Luanda,
++    Atlantic/Azores, and Atlantic/Madeira.  Also, Lisbon's pre-1912
++    GMT offset was -0:36:45 (rounded from -0:36:44.68), not -0:36:32.
++    (Thanks to Stephen Colebourne for pointing to the decree.)
++
++    Asia/Dhaka ended DST on 2009-12-31 at 24:00, not 23:59.
++
++    A new file 'backzone' contains data which may appeal to
++    connoisseurs of old time stamps, although it is out of scope for
++    the tz database, is often poorly sourced, and contains some data
++    that is known to be incorrect.  The new file is not recommended
++    for ordinary use and its entries are not installed by default.
++    (Thanks to Lester Caine for the high-quality Jersey, Guernsey, and
++    Isle of Man entries.)
++
++    Some more zones have been turned into links, when they differed
++    from existing zones only for older time stamps.  As usual,
++    these changes affect UTC offsets in pre-1970 time stamps only.
++    Their old contents have been moved to the 'backzone' file.
++    The affected zones are: Africa/Bangui, Africa/Brazzaville,
++    Africa/Douala, Africa/Kinshasa, Africa/Libreville, Africa/Luanda,
++    Africa/Malabo, Africa/Niamey, and Africa/Porto-Novo.
++
++  Changes affecting code
++
++    Unless NETBSD_INSPIRED is defined to 0, the tz library now
++    supplies functions for creating and using objects that represent
++    time zones. The new functions are tzalloc, tzfree, localtime_rz,
++    mktime_z, and (if STD_INSPIRED is also defined) posix2time_z and
++    time2posix_z.  They are intended for performance: for example,
++    localtime_rz (unlike localtime_r) is trivially thread-safe without
++    locking.  (Thanks to Christos Zoulas for proposing NetBSD-inspired
++    functions, and to Alan Barrett and Jonathan Lennox for helping to
++    debug the change.)
++
++    zdump now builds with the tz library unless USE_LTZ is defined to 0,
++    This lets zdump use tz features even if the system library lacks them.
++    To build zdump with the system library, use 'make CFLAGS=-DUSE_LTZ=0
++    TZDOBJS=zdump.o CHECK_TIME_T_ALTERNATIVES='.
++
++    zdump now uses localtime_rz if available, as it's significantly faster,
++    and it can help zdump better diagnose invalid time zone names.
++    Define HAVE_LOCALTIME_RZ to 0 to suppress this.  HAVE_LOCALTIME_RZ
++    defaults to 1 if NETBSD_INSPIRED && USE_LTZ.  When localtime_rz is
++    not available, zdump now uses localtime_r and tzset if available,
++    as this is a bit cleaner and faster than plain localtime.  Compile
++    with -DHAVE_LOCALTIME_R=0 and/or -DHAVE_TZSET=0 if your system
++    lacks these two functions.
++
++    If THREAD_SAFE is defined to 1, the tz library is now thread-safe.
++    Although not needed for tz's own applications, which are single-threaded,
++    this supports POSIX better if the tz library is used in multithreaded apps.
++
++    Some crashes have been fixed when zdump or the tz library is given
++    invalid or outlandish input.
++
++    The tz library no longer mishandles leap seconds on platforms with
++    unsigned time_t in time zones that lack ordinary transitions after 1970.
++
++    The tz code now attempts to infer TM_GMTOFF and TM_ZONE if not
++    already defined, to make it easier to configure on common platforms.
++    Define NO_TM_GMTOFF and NO_TM_ZONE to suppress this.
++
++    Unless the new macro UNINIT_TRAP is defined to 1, the tz code now
++    assumes that reading uninitialized memory yields garbage values
++    but does not cause other problems such as traps.
++
++    If TM_GMTOFF is defined and UNINIT_TRAP is 0, mktime is now
++    more likely to guess right for ambiguous time stamps near
++    transitions where tm_isdst does not change.
++
++    If HAVE_STRFTIME_L is defined to 1, the tz library now defines
++    strftime_l for compatibility with recent versions of POSIX.
++    Only the C locale is supported, though.  HAVE_STRFTIME_L defaults
++    to 1 on recent POSIX versions, and to 0 otherwise.
++
++    tzselect -c now uses a hybrid distance measure that works better
++    in Africa.  (Thanks to Alan Barrett for noting the problem.)
++
++    The C source code now ports to NetBSD when GCC_DEBUG_FLAGS is used,
++    or when time_tz is defined.
++
++    When HAVE_UTMPX_H is set the 'date' command now builds on systems
++    whose <utmpx.h> file does not define WTMPX_FILE, and when setting
++    the date it updates the wtmpx file if _PATH_WTMPX is defined.
++    This affects GNU/Linux and similar systems.
++
++    For easier maintenance later, some C code has been simplified,
++    some lint has been removed, and the code has been tweaked so that
++    plain 'make' is more likely to work.
++
++    The C type 'bool' is now used for boolean values, instead of 'int'.
++
++    The long-obsolete LOCALE_HOME code has been removed.
++
++    The long-obsolete 'gtime' function has been removed.
++
++  Changes affecting build procedure
++
++    'zdump' no longer links in ialloc.o, as it's not needed.
++
++    'make check_time_t_alternatives' no longer assumes GNU diff.
++
++  Changes affecting distribution tarballs
++
++    The files checktab.awk and zoneinfo2tdf.pl are now distributed in
++    the tzdata tarball instead of the tzcode tarball, since they help
++    maintain the data.  The NEWS and Theory files are now also
++    distributed in the tzdata tarball, as they're relevant for data.
++    (Thanks to Alan Barrett for pointing this out.)  Also, the
++    leapseconds.awk file is no longer distributed in the tzcode
++    tarball, since it belongs in the tzdata tarball (where 2014f
++    inadvertently also distributed it).
++
++  Changes affecting documentation and commentary
++
++    A new file CONTRIBUTING is distributed.  (Thanks to Tim Parenti for
++    suggesting a CONTRIBUTING file, and to Tony Finch and Walter Harms
++    for debugging it.)
++
++    The man pages have been updated to use function prototypes,
++    to document thread-safe variants like localtime_r, and to document
++    the NetBSD-inspired functions tzalloc, tzfree, localtime_rz, and
++    mktime_z.
++
++    The fields in Link lines have been renamed to be more descriptive
++    and more like the parameters of 'ln'.  LINK-FROM has become TARGET,
++    and LINK-TO has become LINK-NAME.
++
++    tz-link.htm mentions the IETF's tzdist working group; Windows
++    Runtime etc. (thanks to Matt Johnson); and HP-UX's tztab.
++
++    Some broken URLs have been fixed in the commentary.  (Thanks to
++    Lester Caine.)
++
++    Commentary about Philippines DST has been updated, and commentary
++    on pre-1970 time in India has been added.
++
++
++Release 2014f - 2014-08-05 17:42:36 -0700
++
++  Changes affecting future time stamps
++
++    Russia will subtract an hour from most of its time zones on 2014-10-26
++    at 02:00 local time.  (Thanks to Alexander Krivenyshev.)
++    There are a few exceptions: Magadan Oblast (Asia/Magadan) and Zabaykalsky
++    Krai are subtracting two hours; conversely, Chukotka Autonomous Okrug
++    (Asia/Anadyr), Kamchatka Krai (Asia/Kamchatka), Kemerovo Oblast
++    (Asia/Novokuznetsk), and the Samara Oblast and the Udmurt Republic
++    (Europe/Samara) are not changing their clocks.  The changed zones are
++    Europe/Kaliningrad, Europe/Moscow, Europe/Simferopol, Europe/Volgograd,
++    Asia/Yekaterinburg, Asia/Omsk, Asia/Novosibirsk, Asia/Krasnoyarsk,
++    Asia/Irkutsk, Asia/Yakutsk, Asia/Vladivostok, Asia/Khandyga,
++    Asia/Sakhalin, and Asia/Ust-Nera; Asia/Magadan will have two hours
++    subtracted; and Asia/Novokuznetsk's time zone abbreviation is affected,
++    but not its UTC offset.  Two zones are added: Asia/Chita (split
++    from Asia/Yakutsk, and also with two hours subtracted) and
++    Asia/Srednekolymsk (split from Asia/Magadan, but with only one hour
++    subtracted).  (Thanks to Tim Parenti for much of the above.)
++
++  Changes affecting time zone abbreviations
++
++    Australian eastern time zone abbreviations are now AEST/AEDT not EST,
++    and similarly for the other Australian zones.  That is, for eastern
++    standard and daylight saving time the abbreviations are AEST and AEDT
++    instead of the former EST for both; similarly, ACST/ACDT, ACWST/ACWDT,
++    and AWST/AWDT are now used instead of the former CST, CWST, and WST.
++    This change does not affect UTC offsets, only time zone abbreviations.
++    (Thanks to Rich Tibbett and many others.)
++
++    Asia/Novokuznetsk shifts from NOVT to KRAT (remaining on UT +07)
++    effective 2014-10-26 at 02:00 local time.
++
++    The time zone abbreviation for Xinjiang Time (observed in Ürümqi)
++    has been changed from URUT to XJT.  (Thanks to Luther Ma.)
++
++    Prefer MSK/MSD for Moscow time in Russia, even in other cities.
++    Similarly, prefer EET/EEST for eastern European time in Russia.
++
++    Change time zone abbreviations in (western) Samoa to use "ST" and
++    "DT" suffixes, as this is more likely to match common practice.
++    Prefix "W" to (western) Samoa time when its standard-time offset
++    disagrees with that of American Samoa.
++
++    America/Metlakatla now uses PST, not MeST, to abbreviate its time zone.
++
++    Time zone abbreviations have been updated for Japan's two time
++    zones used 1896-1937.  JWST now stands for Western Standard
++    Time, and JCST for Central Standard Time (formerly this was CJT).
++    These abbreviations are now used for time in Korea, Taiwan,
++    and Sakhalin while controlled by Japan.
++
++  Changes affecting past time stamps
++
++    China's five zones have been simplified to two, since the post-1970
++    differences in the other three seem to have been imaginary.  The
++    zones Asia/Harbin, Asia/Chongqing, and Asia/Kashgar have been
++    removed; backwards-compatibility links still work, albeit with
++    different behaviors for time stamps before May 1980.  Asia/Urumqi's
++    1980 transition to UT +08 has been removed, so that it is now at
++    +06 and not +08.  (Thanks to Luther Ma and to Alois Treindl;
++    Treindl sent helpful translations of two papers by Guo Qingsheng.)
++
++    Some zones have been turned into links, when they differed from existing
++    zones only for older UTC offsets where data entries were likely invented.
++    These changes affect UTC offsets in pre-1970 time stamps only.  This is
++    similar to the change in release 2013e, except this time for western
++    Africa.  The affected zones are: Africa/Bamako, Africa/Banjul,
++    Africa/Conakry, Africa/Dakar, Africa/Freetown, Africa/Lome,
++    Africa/Nouakchott, Africa/Ouagadougou, Africa/Sao_Tome, and
++    Atlantic/St_Helena.  This also affects the backwards-compatibility
++    link Africa/Timbuktu.  (Thanks to Alan Barrett, Stephen Colebourne,
++    Tim Parenti, and David Patte for reporting problems in earlier
++    versions of this change.)
++
++    Asia/Shanghai's pre-standard-time UT offset has been changed from
++    8:05:57 to 8:05:43, the location of Xujiahui Observatory.  Its
++    transition to standard time has been changed from 1928 to 1901.
++
++    Asia/Taipei switched to JWST on 1896-01-01, then to JST on 1937-10-01,
++    then to CST on 1945-09-21 at 01:00, and did not observe DST in 1945.
++    In 1946 it observed DST from 05-15 through 09-30; in 1947
++    from 04-15 through 10-31; and in 1979 from 07-01 through 09-30.
++    (Thanks to Yu-Cheng Chuang.)
++
++    Asia/Riyadh's transition to standard time is now 1947-03-14, not 1950.
++
++    Europe/Helsinki's 1942 fall-back transition was 10-04 at 01:00, not
++    10-03 at 00:00.  (Thanks to Konstantin Hyppönen.)
++
++    Pacific/Pago_Pago has been changed from UT -11:30 to -11 for the
++    period from 1911 to 1950.
++
++    Pacific/Chatham has been changed to New Zealand standard time plus
++    45 minutes for the period before 1957, reflecting a 1956 remark in
++    the New Zealand parliament.
++
++    Europe/Budapest has several pre-1946 corrections: in 1918 the transition
++    out of DST was on 09-16, not 09-29; in 1919 it was on 11-24, not 09-15; in
++    1945 it was on 11-01, not 11-03; in 1941 the transition to DST was 04-08
++    not 04-06 at 02:00; and there was no DST in 1920.
++
++    Africa/Accra is now assumed to have observed DST from 1920 through 1935.
++
++    Time in Russia before 1927 or so has been corrected by a few seconds in
++    the following zones: Europe/Moscow, Asia/Irkutsk, Asia/Tbilisi,
++    Asia/Tashkent, Asia/Vladivostok, Asia/Yekaterinburg, Europe/Helsinki, and
++    Europe/Riga.  Also, Moscow's location has been changed to its Kilometer 0
++    point.  (Thanks to Vladimir Karpinsky for the Moscow changes.)
++
++  Changes affecting data format
++
++    A new file 'zone1970.tab' supersedes 'zone.tab' in the installed data.
++    The new file's extended format allows multiple country codes per zone.
++    The older file is still installed but is deprecated; its format is
++    not changing and it will still be distributed for a while, but new
++    applications should use the new file.
++
++    The new file format simplifies maintenance of obscure locations.
++    To test this, it adds coverage for the Crozet Islands and the
++    Scattered Islands.  (Thanks to Tobias Conradi and Antoine Leca.)
++
++    The file 'iso3166.tab' is planned to switch from ASCII to UTF-8.
++    It is still ASCII now, but commentary about the switch has been added.
++    The new file 'zone1970.tab' already uses UTF-8.
++
++  Changes affecting code
++
++    'localtime', 'mktime', etc. now use much less stack space if ALL_STATE
++    is defined.  (Thanks to Elliott Hughes for reporting the problem.)
++
++    'zic' no longer mishandles input when ignoring case in locales that
++    are not compatible with English, e.g., unibyte Turkish locales when
++    compiled with HAVE_GETTEXT.
++
++    Error diagnostics of 'zic' and 'yearistype' have been reworded so that
++    they no longer use ASCII '-' as if it were a dash.
++
++    'zic' now rejects output file names that contain '.' or '..' components.
++    (Thanks to Tim Parenti for reporting the problem.)
++
++    'zic -v' now warns about output file names that do not follow
++    POSIX rules, or that contain a digit or '.'.  (Thanks to Arthur
++    David Olson for starting the ball rolling on this.)
++
++    Some lint has been removed when using GCC_DEBUG_FLAGS with GCC 4.9.0.
++
++  Changes affecting build procedure
++
++    'zic' no longer links in localtime.o and asctime.o, as they're not needed.
++    (Thanks to John Cochran.)
++
++  Changes affecting documentation and commentary
++
++    The 'Theory' file documents legacy names, the longstanding
++    exceptions to the POSIX-inspired file name rules.
++
++    The 'zic' documentation clarifies the role of time types when
++    interpreting dates.  (Thanks to Arthur David Olson.)
++
++    Documentation and commentary now prefer UTF-8 to US-ASCII,
++    allowing the use of proper accents in foreign words and names.
++    Code and data have not changed because of this.  (Thanks to
++    Garrett Wollman, Ian Abbott, and Guy Harris for helping to debug
++    this.)
++
++    Non-HTML documentation and commentary now use plain-text URLs instead of
++    HTML insertions, and are more consistent about bracketing URLs when they
++    are not already surrounded by white space.  (Thanks to suggestions by
++    Steffen Nurpmeso.)
++
++    There is new commentary about Xujiahui Observatory, the five time-zone
++    project in China from 1918 to 1949, timekeeping in Japanese-occupied
++    Shanghai, and Tibet Time in the 1950s.  The sharp-eyed can spot the
++    warlord Jin Shuren in the data.
++
++    Commentary about the coverage of each Russian zone has been standardized.
++    (Thanks to Tim Parenti).
++
++    There is new commentary about contemporary timekeeping in Ethiopia.
++
++    Obsolete comments about a 2007 proposal for DST in Kuwait has been removed.
++
++    There is new commentary about time in Poland in 1919.
++
++    Proper credit has been given to DST inventor George Vernon Hudson.
++
++    Commentary about time in Metlakatla, AK and Resolute, NU has been
++    improved, with a new source for the former.
++
++    In zone.tab, Pacific/Easter no longer mentions Salas y Gómez, as it
++    is uninhabited.
++
++    Commentary about permanent Antarctic bases has been updated.
++
++    Several typos have been corrected.  (Thanks to Tim Parenti for
++    contributing some of these fixes.)
++
++    tz-link.htm now mentions the JavaScript libraries Moment Timezone,
++    TimezoneJS.Date, Walltime-js, and Timezone.  (Thanks to a heads-up
++    from Matt Johnson.)  Also, it mentions the Go 'latlong' package.
++    (Thanks to a heads-up from Dirkjan Ochtman.)
++
++    The files usno1988, usno1989, usno1989a, usno1995, usno1997, and usno1998
++    have been removed.  These obsolescent US Naval Observatory entries were no
++    longer helpful for maintenance.  (Thanks to Tim Parenti for the suggestion.)
++
++
++Release 2014e - 2014-06-12 21:53:52 -0700
++
++  Changes affecting near-future time stamps
++
++    Egypt's 2014 Ramadan-based transitions are June 26 and July 31 at 24:00.
++    (Thanks to Imed Chihi.)  Guess that from 2015 on Egypt will temporarily
++    switch to standard time at 24:00 the last Thursday before Ramadan, and
++    back to DST at 00:00 the first Friday after Ramadan.
++
++    Similarly, Morocco's are June 28 at 03:00 and August 2 at 02:00.  (Thanks
++    to Milamber Space Network.)  Guess that from 2015 on Morocco will
++    temporarily switch to standard time at 03:00 the last Saturday before
++    Ramadan, and back to DST at 02:00 the first Saturday after Ramadan.
++
++  Changes affecting past time stamps
++
++    The abbreviation "MSM" (Moscow Midsummer Time) is now used instead of
++    "MSD" for Moscow's double daylight time in summer 1921.  Also, a typo
++    "VLASST" has been repaired to be "VLAST" for Vladivostok summer time
++    in 1991.  (Thanks to Hank W. for reporting the problems.)
++
++  Changes affecting commentary
++
++    tz-link.htm now cites RFC 7265 for jCal, mentions PTP and the
++    draft CalDAV extension, updates URLs for TSP, TZInfo, IATA, and
++    removes stale pointers to World Time Explorer and WORLDTIME.
++
++
++Release 2014d - 2014-05-27 21:34:40 -0700
++
++  Changes affecting code
++
++    zic no longer generates files containing time stamps before the Big Bang.
++    This works around GNOME bug 730332
++    <https://bugzilla.gnome.org/show_bug.cgi?id=730332>.
++    (Thanks to Leonardo Chiquitto for reporting the bug, and to
++    Arthur David Olson and James Cloos for suggesting improvements to the fix.)
++
++  Changes affecting documentation
++
++    tz-link.htm now mentions GNOME.
++
++
++Release 2014c - 2014-05-13 07:44:13 -0700
++
++  Changes affecting near-future time stamps
++
++    Egypt observes DST starting 2014-05-15 at 24:00.
++    (Thanks to Ahmad El-Dardiry and Gunther Vermier.)
++    Details have not been announced, except that DST will not be observed
++    during Ramadan.  Guess that DST will stop during the same Ramadan dates as
++    Morocco, and that Egypt's future spring and fall transitions will be the
++    same as 2010 when it last observed DST, namely April's last Friday at
++    00:00 to September's last Thursday at 23:00 standard time.  Also, guess
++    that Ramadan transitions will be at 00:00 standard time.
++
++  Changes affecting code
++
++    zic now generates transitions for minimum time values, eliminating guesswork
++    when handling low-valued time stamps.  (Thanks to Arthur David Olson.)
++
++    Port to Cygwin sans glibc.  (Thanks to Arthur David Olson.)
++
++  Changes affecting commentary and documentation
++
++    Remove now-confusing comment about Jordan.  (Thanks to Oleksii Nochovnyi.)
++
++
++Release 2014b - 2014-03-24 21:28:50 -0700
++
++  Changes affecting near-future time stamps
++
++    Crimea switches to Moscow time on 2014-03-30 at 02:00 local time.
++    (Thanks to Alexander Krivenyshev.)  Move its zone.tab entry from UA to RU.
++
++    New entry for Troll station, Antarctica.  (Thanks to Paul-Inge Flakstad and
++    Bengt-Inge Larsson.)  This is currently an approximation; a better version
++    will require the zic and localtime fixes mentioned below, and the plan is
++    to wait for a while until at least the zic fixes propagate.
++
++  Changes affecting code
++
++    'zic' and 'localtime' no longer reject locations needing four transitions
++    per year for the foreseeable future.  (Thanks to Andrew Main (Zefram).)
++    Also, 'zic' avoids some unlikely failures due to integer overflow.
++
++  Changes affecting build procedure
++
++    'make check' now detects Rule lines defined but never used.
++    The NZAQ rules, an instance of this problem, have been removed.
++
++  Changes affecting commentary and documentation
++
++    Fix Tuesday/Thursday typo in description of time in Israel.
++    (Thanks to Bert Katz via Pavel Kharitonov and Mike Frysinger.)
++
++    Microsoft Windows 8.1 doesn't support tz database names.  (Thanks
++    to Donald MacQueen.)  Instead, the Microsoft Windows Store app
++    library supports them.
++
++    Add comments about Johnston Island time in the 1960s.
++    (Thanks to Lyle McElhaney.)
++
++    Morocco's 2014 DST start will be as predicted.
++    (Thanks to Sebastien Willemijns.)
++
++
++Release 2014a - 2014-03-07 23:30:29 -0800
++
++  Changes affecting near-future time stamps
++
++    Turkey begins DST on 2014-03-31, not 03-30.  (Thanks to Faruk Pasin for
++    the heads-up, and to Tim Parenti for simplifying the update.)
++
++  Changes affecting past time stamps
++
++    Fiji ended DST on 2014-01-19 at 02:00, not the previously-scheduled 03:00.
++    (Thanks to Steffen Thorsen.)
++
++    Ukraine switched from Moscow to Eastern European time on 1990-07-01
++    (not 1992-01-01), and observed DST during the entire next winter.
++    (Thanks to Vladimir in Moscow via Alois Treindl.)
++
++    In 1988 Israel observed DST from 04-10 to 09-04, not 04-09 to 09-03.
++    (Thanks to Avigdor Finkelstein.)
++
++  Changes affecting code
++
++    A uninitialized-storage bug in 'localtime' has been fixed.
++    (Thanks to Logan Chien.)
++
++  Changes affecting the build procedure
++
++    The settings for 'make check_web' now default to Ubuntu 13.10.
++
++  Changes affecting commentary and documentation
++
++    The boundary of the US Pacific time zone is given more accurately.
++    (Thanks to Alan Mintz.)
++
++    Chile's 2014 DST will be as predicted.  (Thanks to José Miguel Garrido.)
++
++    Paraguay's 2014 DST will be as predicted.  (Thanks to Carlos Raúl Perasso.)
++
++    Better descriptions of countries with same time zone history as
++    Trinidad and Tobago since 1970.  (Thanks to Alan Barrett for suggestion.)
++
++    Several changes affect tz-link.htm, the main web page.
++
++      Mention Time.is (thanks to Even Scharning) and WX-now (thanks to
++      David Braverman).
++
++      Mention xCal (Internet RFC 6321) and jCal.
++
++      Microsoft has some support for tz database names.
++
++      CLDR data formats include both XML and JSON.
++
++      Mention Maggiolo's map of solar vs standard time.
++      (Thanks to Arthur David Olson.)
++
++      Mention TZ4Net.  (Thanks to Matt Johnson.)
++
++      Mention the timezone-olson Haskell package.
++
++      Mention zeitverschiebung.net.  (Thanks to Martin Jäger.)
++
++      Remove moribund links to daylight-savings-time.info and to
++      Simple Timer + Clocks.
++
++      Update two links.  (Thanks to Oscar van Vlijmen.)
++
++      Fix some formatting glitches, e.g., remove random newlines from
++      abbr elements' title attributes.
++
++
++Release 2013i - 2013-12-17 07:25:23 -0800
++
++  Changes affecting near-future time stamps:
++
++    Jordan switches back to standard time at 00:00 on December 20, 2013.
++    The 2006-2011 transition schedule is planned to resume in 2014.
++    (Thanks to Steffen Thorsen.)
++
++  Changes affecting past time stamps:
++
++    In 2004, Cuba began DST on March 28, not April 4.
++    (Thanks to Steffen Thorsen.)
++
++  Changes affecting code
++
++    The compile-time flag NOSOLAR has been removed, as nowadays the
++    benefit of slightly shrinking runtime table size is outweighed by the
++    cost of disallowing potential future updates that exceed old limits.
++
++  Changes affecting documentation and commentary
++
++    The files solar87, solar88, and solar89 are no longer distributed.
++    They were a negative experiment - that is, a demonstration that
++    tz data can represent solar time only with some difficulty and error.
++    Their presence in the distribution caused confusion, as Riyadh
++    civil time was generally not solar time in those years.
++
++    tz-link.htm now mentions Noda Time.  (Thanks to Matt Johnson.)
++
++
++Release 2013h - 2013-10-25 15:32:32 -0700
++
++  Changes affecting current and future time stamps:
++
++    Libya has switched its UT offset back to +02 without DST, instead
++    of +01 with DST.  (Thanks to Even Scharning.)
++
++    Western Sahara (Africa/El_Aaiun) uses Morocco's DST rules.
++    (Thanks to Gwillim Law.)
++
++  Changes affecting future time stamps:
++
++    Acre and (we guess) western Amazonas will switch from UT -04 to -05
++    on 2013-11-10.  This affects America/Rio_Branco and America/Eirunepe.
++    (Thanks to Steffen Thorsen.)
++
++    Add entries for DST transitions in Morocco in the year 2038.
++    This avoids some year-2038 glitches introduced in 2013g.
++    (Thanks to Yoshito Umaoka for reporting the problem.)
++
++  Changes affecting API
++
++    The 'tzselect' command no longer requires the 'select' command,
++    and should now work with /bin/sh on more platforms.  It also works
++    around a bug in BusyBox awk before version 1.21.0.  (Thanks to
++    Patrick 'P. J.' McDermott and Alan Barrett.)
++
++  Changes affecting code
++
++    Fix localtime overflow bugs with 32-bit unsigned time_t.
++
++    zdump no longer assumes sscanf returns maximal values on overflow.
++
++  Changes affecting the build procedure
++
++    The builder can specify which programs to use, if any, instead of
++    'ar' and 'ranlib', and libtz.a is now built locally before being
++    installed.  (Thanks to Michael Forney.)
++
++    A dependency typo in the 'zdump' rule has been fixed.
++    (Thanks to Andrew Paprocki.)
++
++    The Makefile has been simplified by assuming that 'mkdir -p' and 'cp -f'
++    work as specified by POSIX.2-1992 or later; this is portable nowadays.
++
++    'make clean' no longer removes 'leapseconds', since it's
++    host-independent and is part of the distribution.
++
++    The unused makefile macros TZCSRCS, TZDSRCS, DATESRCS have been removed.
++
++  Changes affecting documentation and commentary
++
++    tz-link.htm now mentions TC TIMEZONE's draft time zone service protocol
++    (thanks to Mike Douglass) and TimezoneJS.Date (thanks to Jim Fehrle).
++
++    Update URLs in tz-link page.  Add URLs for Microsoft Windows, since
++    8.1 introduces tz support.  Remove URLs for Tru64 and UnixWare (no
++    longer maintained) and for old advisories.  SOFA now does C.
++
++Release 2013g - 2013-09-30 21:08:26 -0700
++
++  Changes affecting current and near-future time stamps
++
++    Morocco now observes DST from the last Sunday in March to the last
++    Sunday in October, not April to September respectively.  (Thanks
++    to Steffen Thorsen.)
++
++  Changes affecting 'zic'
++
++    'zic' now runs on platforms that lack both hard links and symlinks.
++    (Thanks to Theo Veenker for reporting the problem, for MinGW.)
++    Also, fix some bugs on platforms that lack hard links but have symlinks.
++
++    'zic -v' again warns that Asia/Tehran has no POSIX environment variable
++    to predict the far future, fixing a bug introduced in 2013e.
++
++  Changes affecting the build procedure
++
++    The 'leapseconds' file is again put into the tzdata tarball.
++    Also, 'leapseconds.awk', so tzdata is self-contained.  (Thanks to
++    Matt Burgess and Ian Abbott.)  The timestamps of these and other
++    dependent files in tarballs are adjusted more consistently.
++
++  Changes affecting documentation and commentary
++
++    The README file is now part of the data tarball as well as the code.
++    It now states that files are public domain unless otherwise specified.
++    (Thanks to Andrew Main (Zefram) for asking for clarifications.)
++    Its details about the 1989 release moved to a place of honor near
++    the end of NEWS.
++
++
++Release 2013f - 2013-09-24 23:37:36 -0700
++
++  Changes affecting near-future time stamps
++
++    Tocantins will very likely not observe DST starting this spring.
++    (Thanks to Steffen Thorsen.)
++
++    Jordan will likely stay at UT +03 indefinitely, and will not fall
++    back this fall.
++
++    Palestine will fall back at 00:00, not 01:00.  (Thanks to Steffen Thorsen.)
++
++  Changes affecting API
++
++    The types of the global variables 'timezone' and 'altzone' (if present)
++    have been changed back to 'long'.  This is required for 'timezone'
++    by POSIX, and for 'altzone' by common practice, e.g., Solaris 11.
++    These variables were originally 'long' in the tz code, but were
++    mistakenly changed to 'time_t' in 1987; nobody reported the
++    incompatibility until now.  The difference matters on x32, where
++    'long' is 32 bits and 'time_t' is 64.  (Thanks to Elliott Hughes.)
++
++  Changes affecting the build procedure
++
++    Avoid long strings in leapseconds.awk to work around a mawk bug.
++    (Thanks to Cyril Baurand.)
++
++  Changes affecting documentation and commentary
++
++    New file 'NEWS' that contains release notes like this one.
++
++    Paraguay's law does not specify DST transition time; 00:00 is customary.
++    (Thanks to Waldemar Villamayor-Venialbo.)
++
++    Minor capitalization fixes.
++
++  Changes affecting version-control only
++
++    The experimental GitHub repository now contains annotated and
++    signed tags for recent releases, e.g., '2013e' for Release 2013e.
++    Releases are tagged starting with 2012e; earlier releases were
++    done differently, and tags would either not have a simple name or
++    not exactly match what was released.
++
++    'make set-timestamps' is now simpler and a bit more portable.
++
++
++Release 2013e - 2013-09-19 23:50:04 -0700
++
++  Changes affecting near-future time stamps
++
++    This year Fiji will start DST on October 27, not October 20.
++    (Thanks to David Wheeler for the heads-up.)  For now, guess that
++    Fiji will continue to spring forward the Sunday before the fourth
++    Monday in October.
++
++  Changes affecting current and future time zone abbreviations
++
++    Use WIB/WITA/WIT rather than WIT/CIT/EIT for alphabetic Indonesian
++    time zone abbreviations since 1932.  (Thanks to George Ziegler,
++    Priyadi Iman Nurcahyo, Zakaria, Jason Grimes, Martin Pitt, and
++    Benny Lin.)  This affects Asia/Dili, Asia/Jakarta, Asia/Jayapura,
++    Asia/Makassar, and Asia/Pontianak.
++
++    Use ART (UT -03, standard time), rather than WARST (also -03, but
++    daylight saving time) for San Luis, Argentina since 2009.
++
++  Changes affecting Godthåb time stamps after 2037 if version mismatch
++
++    Allow POSIX-like TZ strings where the transition time's hour can
++    range from -167 through 167, instead of the POSIX-required 0
++    through 24.  E.g., TZ='FJT-12FJST,M10.3.1/146,M1.3.4/75' for the
++    new Fiji rules.  This is a more-compact way to represent
++    far-future time stamps for America/Godthab, America/Santiago,
++    Antarctica/Palmer, Asia/Gaza, Asia/Hebron, Asia/Jerusalem,
++    Pacific/Easter, and Pacific/Fiji.  Other zones are unaffected by
++    this change.  (Derived from a suggestion by Arthur David Olson.)
++
++    Allow POSIX-like TZ strings where daylight saving time is in
++    effect all year.  E.g., TZ='WART4WARST,J1/0,J365/25' for Western
++    Argentina Summer Time all year.  This supports a more-compact way
++    to represent the 2013d data for America/Argentina/San_Luis.
++    Because of the change for San Luis noted above this change does not
++    affect the current data.  (Thanks to Andrew Main (Zefram) for
++    suggestions that improved this change.)
++
++    Where these two TZ changes take effect, there is a minor extension
++    to the tz file format in that it allows new values for the
++    embedded TZ-format string, and the tz file format version number
++    has therefore been increased from 2 to 3 as a precaution.
++    Version-2-based client code should continue to work as before for
++    all time stamps before 2038.  Existing version-2-based client code
++    (tzcode, GNU/Linux, Solaris) has been tested on version-3-format
++    files, and typically works in practice even for time stamps after
++    2037; the only known exception is America/Godthab.
++
++  Changes affecting time stamps before 1970
++
++    Pacific/Johnston is now a link to Pacific/Honolulu.  This corrects
++    some errors before 1947.
++
++    Some zones have been turned into links, when they differ from existing
++    zones only in older data entries that were likely invented or that
++    differ only in LMT or transitions from LMT.  These changes affect
++    only time stamps before 1943.  The affected zones are:
++    Africa/Juba, America/Anguilla, America/Aruba, America/Dominica,
++    America/Grenada, America/Guadeloupe, America/Marigot,
++    America/Montserrat, America/St_Barthelemy, America/St_Kitts,
++    America/St_Lucia, America/St_Thomas, America/St_Vincent,
++    America/Tortola, and Europe/Vaduz.  (Thanks to Alois Treindl for
++    confirming that the old Europe/Vaduz zone was wrong and the new
++    link is better for WWII-era times.)
++
++    Change Kingston Mean Time from -5:07:12 to -5:07:11.  This affects
++    America/Cayman, America/Jamaica and America/Grand_Turk time stamps
++    from 1890 to 1912.
++
++    Change the UT offset of Bern Mean Time from 0:29:44 to 0:29:46.
++    This affects Europe/Zurich time stamps from 1853 to 1894.  (Thanks
++    to Alois Treindl).
++
++    Change the date of the circa-1850 Zurich transition from 1849-09-12
++    to 1853-07-16, overriding Shanks with data from Messerli about
++    postal and telegraph time in Switzerland.
++
++  Changes affecting time zone abbreviations before 1970
++
++    For Asia/Jakarta, use BMT (not JMT) for mean time from 1923 to 1932,
++    as Jakarta was called Batavia back then.
++
++  Changes affecting API
++
++    The 'zic' command now outputs a dummy transition when far-future
++    data can't be summarized using a TZ string, and uses a 402-year
++    window rather than a 400-year window.  For the current data, this
++    affects only the Asia/Tehran file.  It does not affect any of the
++    time stamps that this file represents, so zdump outputs the same
++    information as before.  (Thanks to Andrew Main (Zefram).)
++
++    The 'date' command has a new '-r' option, which lets you specify
++    the integer time to display, a la FreeBSD.
++
++    The 'tzselect' command has two new options '-c' and '-n', which lets you
++    select a zone based on latitude and longitude.
++
++    The 'zic' command's '-v' option now warns about constructs that
++    require the new version-3 binary file format.  (Thanks to Arthur
++    David Olson for the suggestion.)
++
++    Support for floating-point time_t has been removed.
++    It was always dicey, and POSIX no longer requires it.
++    (Thanks to Eric Blake for suggesting to the POSIX committee to
++    remove it, and thanks to Alan Barrett, Clive D.W. Feather, Andy
++    Heninger, Arthur David Olson, and Alois Treindl, for reporting
++    bugs and elucidating some of the corners of the old floating-point
++    implementation.)
++
++    The signatures of 'offtime', 'timeoff', and 'gtime' have been
++    changed back to the old practice of using 'long' to represent UT
++    offsets.  This had been inadvertently and mistakenly changed to
++    'int_fast32_t'.  (Thanks to Christos Zoulas.)
++
++    The code avoids undefined behavior on integer overflow in some
++    more places, including gmtime, localtime, mktime and zdump.
++
++  Changes affecting the zdump utility
++
++    zdump now outputs "UT" when referring to Universal Time, not "UTC".
++    "UTC" does not make sense for time stamps that predate the introduction
++    of UTC, whereas "UT", a more-generic term, does.  (Thanks to Steve Allen
++    for clarifying UT vs UTC.)
++
++  Data changes affecting behavior of tzselect and similar programs
++
++    Country code BQ is now called the more-common name "Caribbean Netherlands"
++    rather than the more-official "Bonaire, St Eustatius & Saba".
++
++    Remove from zone.tab the names America/Montreal, America/Shiprock,
++    and Antarctica/South_Pole, as they are equivalent to existing
++    same-country-code zones for post-1970 time stamps.  The data entries for
++    these names are unchanged, so the names continue to work as before.
++
++  Changes affecting code internals
++
++    zic -c now runs way faster on 64-bit hosts when given large numbers.
++
++    zic now uses vfprintf to avoid allocating and freeing some memory.
++
++    tzselect now computes the list of continents from the data,
++    rather than have it hard-coded.
++
++    Minor changes pacify GCC 4.7.3 and GCC 4.8.1.
++
++  Changes affecting the build procedure
++
++    The 'leapseconds' file is now generated automatically from a
++    new file 'leap-seconds.list', which is a copy of
++    <ftp://time.nist.gov/pub/leap-seconds.list>.
++    A new source file 'leapseconds.awk' implements this.
++    The goal is simplification of the future maintenance of 'leapseconds'.
++
++    When building the 'posix' or 'right' subdirectories, if the
++    subdirectory would be a copy of the default subdirectory, it is
++    now made a symbolic link if that is supported.  This saves about
++    2 MB of file system space.
++
++    The links America/Shiprock and Antarctica/South_Pole have been
++    moved to the 'backward' file.  This affects only nondefault builds
++    that omit 'backward'.
++
++  Changes affecting version-control only
++
++    .gitignore now ignores 'date'.
++
++  Changes affecting documentation and commentary
++
++    Changes to the 'tzfile' man page
++
++      It now mentions that the binary file format may be extended in
++      future versions by appending data.
++
++      It now refers to the 'zdump' and 'zic' man pages.
++
++    Changes to the 'zic' man page
++
++      It lists conditions that elicit a warning with '-v'.
++
++      It says that the behavior is unspecified when duplicate names
++      are given, or if the source of one link is the target of another.
++
++      Its examples are updated to match the latest data.
++
++      The definition of white space has been clarified slightly.
++      (Thanks to Michael Deckers.)
++
++    Changes to the 'Theory' file
++
++      There is a new section about the accuracy of the tz database,
++      describing the many ways that errors can creep in, and
++      explaining why so many of the pre-1970 time stamps are wrong or
++      misleading (thanks to Steve Allen, Lester Caine, and Garrett
++      Wollman for discussions that contributed to this).
++
++      The 'Theory' file describes LMT better (this follows a
++      suggestion by Guy Harris).
++
++      It refers to the 2013 edition of POSIX rather than the 2004 edition.
++
++      It's mentioned that excluding 'backward' should not affect the
++      other data, and it suggests at least one zone.tab name per
++      inhabited country (thanks to Stephen Colebourne).
++
++      Some longstanding restrictions on names are documented, e.g.,
++      'America/New_York' precludes 'America/New_York/Bronx'.
++
++      It gives more reasons for the 1970 cutoff.
++
++      It now mentions which time_t variants are supported, such as
++      signed integer time_t.  (Thanks to Paul Goyette for reporting
++      typos in an experimental version of this change.)
++
++      (Thanks to Philip Newton for correcting typos in these changes.)
++
++    Documentation and commentary is more careful to distinguish UT in
++    general from UTC in particular.  (Thanks to Steve Allen.)
++
++    Add a better source for the Zurich 1894 transition.
++    (Thanks to Pierre-Yves Berger.)
++
++    Update shapefile citations in tz-link.htm.  (Thanks to Guy Harris.)
++
++
++Release 2013d - 2013-07-05 07:38:01 -0700
++
++  Changes affecting future time stamps:
++
++    Morocco's midsummer transitions this year are July 7 and August 10,
++    not July 9 and August 8.  (Thanks to Andrew Paprocki.)
++
++    Israel now falls back on the last Sunday of October.
++    (Thanks to Ephraim Silverberg.)
++
++  Changes affecting past time stamps:
++
++    Specify Jerusalem's location more precisely; this changes the pre-1880
++    times by 2 s.
++
++  Changing affecting metadata only:
++
++    Fix typos in the entries for country codes BQ and SX.
++
++  Changes affecting code:
++
++    Rework the code to fix a bug with handling Australia/Macquarie on
++    32-bit hosts (thanks to Arthur David Olson).
++
++    Port to platforms like NetBSD, where time_t can be wider than long.
++
++    Add support for testing time_t types other than the system's.
++    Run 'make check_time_t_alternatives' to try this out.
++    Currently, the tests fail for unsigned time_t;
++    this should get fixed at some point.
++
++  Changes affecting documentation and commentary:
++
++    Deemphasize the significance of national borders.
++
++    Update the zdump man page.
++
++    Remove obsolete NOID comment (thanks to Denis Excoffier).
++
++    Update several URLs and comments in the web pages.
++
++    Spelling fixes (thanks to Kevin Lyda and Jonathan Leffler).
++
++    Update URL for CLDR Zone->Tzid table (thanks to Yoshito Umaoka).
++
++
++Release 2013c - 2013-04-19 16:17:40 -0700
++
++  Changes affecting current and future time stamps:
++
++    Palestine observed DST starting March 29, 2013.  (Thanks to
++    Steffen Thorsen.)  From 2013 on, Gaza and Hebron both observe DST,
++    with the predicted rules being the last Thursday in March at 24:00
++    to the first Friday on or after September 21 at 01:00.
++
++    Assume that the recent change to Paraguay's DST rules is permanent,
++    by moving the end of DST to the 4th Sunday in March every year.
++    (Thanks to Carlos Raúl Perasso.)
++
++  Changes affecting past time stamps:
++
++    Fix some historical data for Palestine to agree with that of
++    timeanddate.com, as follows:
++
++	  The spring 2008 change in Gaza and Hebron was on 00:00 Mar 28, not
++	  00:00 Apr 1.
++
++	  The fall 2009 change in Gaza and Hebron on Sep 4 was at 01:00, not
++	  02:00.
++
++	  The spring 2010 change in Hebron was 00:00 Mar 26, not 00:01 Mar 27.
++
++	  The spring 2011 change in Gaza was 00:01 Apr 1, not 12:01 Apr 2.
++
++	  The spring 2011 change in Hebron on Apr 1 was at 00:01, not 12:01.
++
++	  The fall 2011 change in Hebron on Sep 30 was at 00:00, not 03:00.
++
++    Fix times of habitation for Macquarie to agree with the Tasmania
++    Parks & Wildlife Service history, which indicates that permanent
++    habitation was 1899-1919 and 1948 on.
++
++  Changing affecting metadata only:
++
++    Macquarie Island is politically part of Australia, not Antarctica.
++    (Thanks to Tobias Conradi.)
++
++    Sort Macquarie more-consistently with other parts of Australia.
++    (Thanks to Tim Parenti.)
++
++
++Release 2013b - 2013-03-10 22:33:40 -0700
++
++  Changes affecting current and future time stamps:
++
++    Haiti uses US daylight-saving rules this year, and presumably future years.
++    This changes time stamps starting today.  (Thanks to Steffen Thorsen.)
++
++    Paraguay will end DST on March 24 this year.
++    (Thanks to Steffen Thorsen.)  For now, assume it's just this year.
++
++    Morocco does not observe DST during Ramadan;
++    try to predict Ramadan in Morocco as best we can.
++    (Thanks to Erik Homoet for the heads-up.)
++
++  Changes affecting commentary:
++
++    Update URLs in tz-link page.  Add URLs for webOS, BB10, iOS.
++    Update URL for Solaris.  Mention Internet RFC 6557.
++    Update Internet RFCs 2445->5545, 2822->5322.
++    Switch from FTP to HTTP for Internet RFCs.
++
++
++Release 2013a - 2013-02-27 09:20:35 -0800
++
++  Change affecting binary data format:
++
++    The zone offset at the end of version-2-format zone files is now
++    allowed to be 24:00, as per POSIX.1-2008.  (Thanks to Arthur David Olson.)
++
++  Changes affecting current and future time stamps:
++
++    Chile's 2013 rules, and we guess rules for 2014 and later, will be
++    the same as 2012, namely Apr Sun>=23 03:00 UTC to Sep Sun>=2 04:00 UTC.
++    (Thanks to Steffen Thorsen and Robert Elz.)
++
++    New Zones Asia/Khandyga, Asia/Ust-Nera, Europe/Busingen.
++    (Thanks to Tobias Conradi and Arthur David Olson.)
++
++  Many changes affect historical time stamps before 1940.
++  These were deduced from: Milne J. Civil time. Geogr J. 1899
++  Feb;13(2):173-94 <http://www.jstor.org/stable/1774359>.
++
++  Changes affecting the code:
++
++    Fix zic bug that mishandled Egypt's 2010 changes (this also affected
++    the data).  (Thanks to Arthur David Olson.)
++
++    Fix localtime bug when time_t is unsigned and data files were generated
++    by a signed time_t system.  (Thanks to Doug Bailey for reporting and
++    to Arthur David Olson for fixing.)
++
++    Allow the email address for bug reports to be set by the packager.
++    The default is tz@iana.org, as before.  (Thanks to Joseph S. Myers.)
++
++    Update HTML checking to be compatible with Ubuntu 12.10.
++
++    Check that files are a safe subset of ASCII.  At some point we may
++    relax this requirement to a safe subset of UTF-8.  Without the
++    check, some non-UTF-8 encodings were leaking into the distribution.
++
++  Commentary changes:
++
++    Restore a comment about copyright notices that was inadvertently deleted.
++    (Thanks to Arthur David Olson.)
++
++    Improve the commentary about which districts observe what times
++    in Russia.  (Thanks to Oscar van Vlijmen and Arthur David Olson).
++
++    Add web page links to tz.js.
++
++    Add "Run by the Monkeys" to tz-art.  (Thanks to Arthur David Olson.)
++
++
++Release 2012j - 2012-11-12 18:34:49 -0800
++
++  Libya moved to CET this weekend, but with DST planned next year.
++  (Thanks to Even Scharning, Steffen Thorsen, and Tim Parenti.)
++
++  Signatures now have the extension .asc, not .sign, as that's more
++  standard.  (Thanks to Phil Pennock.)
++
++  The output of 'zdump --version', and of 'zic --version', now
++  uses a format that is more typical for --version.
++  (Thanks to Joseph S. Myers.)
++
++  The output of 'tzselect --help', 'zdump --help', and 'zic --help'
++  now uses tz@iana.org rather than the old elsie address.
++
++  zic -v now complains about abbreviations that are less than 3
++  or more than 6 characters, as per Posix.  Formerly, it checked
++  for abbreviations that were more than 3.
++
++  'make public' no longer puts its temporary directory under /tmp,
++  and uses the just-built zic rather than the system zic.
++
++  Various fixes to documentation and commentary.
++
++
++Release 2012i - 2012-11-03 12:57:09 -0700
++
++  Cuba switches from DST tomorrow at 01:00.  (Thanks to Steffen Thorsen.)
++
++  Linker flags can now be specified via LDFLAGS.
++  AWK now defaults to 'awk', not 'nawk'.
++  The shell in tzselect now defaults to /bin/bash, but this can
++  be overridden by specifying KSHELL.
++  The main web page now mentions the unofficial GitHub repository.
++  (Thanks to Mike Frysinger.)
++
++  Tarball signatures can now be built by running 'make signatures'.
++  There are also new makefile rules 'tarballs', 'check_public', and
++  separate makefile rules for each tarball and signature file.
++  A few makefile rules are now more portable to strict POSIX.
++
++  The main web page now lists the canonical IANA URL.
++
++
++Release 2012h - 2012-10-26 22:49:10 -0700
++
++  Bahia no longer has DST.  (Thanks to Kelley Cook.)
++
++  Tocantins has DST.  (Thanks to Rodrigo Severo.)
++
++  Israel has new DST rules next year.  (Thanks to Ephraim Silverberg.)
++
++  Jordan stays on DST this winter.  (Thanks to Steffen Thorsen.)
++
++  Web page updates.
++
++  More C modernization, except that at Arthur David Olson's suggestion
++  the instances of 'register' were kept.
++
++
++Release 2012g - 2012-10-17 20:59:45 -0700
++
++  Samoa fall 2012 and later.  (Thanks to Nicholas Pereira and Robert Elz.)
++
++  Palestine fall 2012.  (Thanks to Steffen Thorsen.)
++
++  Assume C89.
++
++  To attack the version-number problem, this release ships the file
++  'Makefile' (which contains the release number) in both the tzcode and
++  the tzdata tarballs.  The two Makefiles are identical, and should be
++  identical in any matching pair of tarballs, so it shouldn't matter
++  which order you extract the tarballs.  Perhaps we can come up with a
++  better version-number scheme at some point; this scheme does have the
++  virtue of not adding more files.
++
++
++Release 2012f - 2012-09-12 23:17:03 -0700
++
++  * australasia (Pacific/Fiji): Fiji DST is October 21 through January
++    20 this year.  (Thanks to Steffen Thorsen.)
++
++
++Release 2012e - 2012-08-02 20:44:55 -0700
++
++  * australasia (Pacific/Fakaofo): Tokelau is UT +13, not +14.
++    (Thanks to Steffen Thorsen.)
++
++  * Use a single version number for both code and data.
++
++  * .gitignore: New file.
++
++  * Remove trailing white space.
++
++
++Release code2012c-data2012d - 2012-07-19 16:35:33 -0700
++
++  Changes for Morocco's time stamps, which take effect in a couple of
++  hours, along with infrastructure changes to accommodate how the tz
++  code and data are released on IANA.
++
++
++Release data2012c - 2012-03-27 12:17:25 -0400
++
++  africa
++	Summer time changes for Morocco (to start late April 2012)
++
++  asia
++	Changes for 2012 for Gaza & the West Bank (Hebron) and Syria
++
++  northamerica
++	Haiti following US/Canada rules for 2012 (and we're assuming,
++	for now anyway, for the future).
++
++
++Release 2012b - 2012-03-02 12:29:15 +0700
++
++  There is just one change to tzcode2012b (compared with 2012a):
++  the Makefile that was accidentally included with 2012a has been
++  replaced with the version that should have been there, which is
++  identical with the previous version (from tzcode2011i).
++
++  There are just two changes in tzdata2012b compared with 2012a.
++
++  Most significantly, summer time in Cuba has been delayed 3 weeks
++  (now starts April 1 rather than March 11).   Since Mar 11 (the old start
++  date, as listed in 2012a) is just a little over a week away, this
++  change is urgent.
++
++  Less importantly, an excess tab in one of the changes in zone.tab
++  in 2012a has been removed.
++
++
++Release 2012a - 2012-03-01 18:28:10 +0700
++
++  The changes in tzcode2012a (compared to the previous version, 2011i)
++  are entirely to the README and tz-art.htm and tz-link.htm files, if
++  none of those concern you, you can ignore the code update.  The changes
++  reflect the changed addresses for the mailing list and the code and
++  data distribution points & methods (and a link to DateTime::TimeZone::Tzfile
++  has been added to tz-link.htm).
++
++  In tzdata2012a (compared to the previous release, which was 2011n)
++  the major changes are:
++	Chile 2011/2012 and 2012/2013 summer time date adjustments.
++	Falkland Islands onto permanent summer time (we're assuming for the
++		foreseeable future, though 2012 is all we're fairly certain of.)
++	Armenia has abolished Summer Time.
++	Tokelau jumped the International Date Line back last December
++		(just the same as their near neighbour, Samoa).
++	America/Creston is a new zone for a small area of British Columbia
++	There will be a leapsecond 2012-06-30 23:59:60 UTC.
++
++  Other minor changes are:
++	Corrections to 1918 Canadian summer time end dates.
++	Updated URL for UK time zone history (in comments)
++	A few typos in Le Corre's list of free French place names (comments)
++
++
++Release data2011n - 2011-10-30 14:57:54 +0700
++
++  There are three changes of note - most urgently, Cuba (America/Havana)
++  has extended summer time by two weeks, now to end on Nov 13, rather than
++  the (already past) Oct 30.   Second, the Pridnestrovian Moldavian Republic
++  (Europe/Tiraspol) decided not to split from the rest of Moldova after
++  all, and consequently that zone has been removed (again) and reinstated
++  in the "backward" file as a link to Europe/Chisinau.   And third, the
++  end date for Fiji's summer time this summer was moved forward from the
++  earlier planned Feb 26, to Jan 22.
++
++  Apart from that, Moldova (MD) returns to a single entry in zone.tab
++  (and the incorrect syntax that was in the 2011m version of that file
++  is so fixed - it would have been fixed in a different way had this
++  change not happened - that's the "missing" sccs version id).
++
++
++Release data2011m - 2011-10-24 21:42:16 +0700
++
++  In particular, the typos in comments in the data (2011-11-17 should have
++  been 2011-10-17 as Alan Barrett noted, and spelling of Tiraspol that
++  Tim Parenti noted) have been fixed, and the change for Ukraine has been
++  made in all 4 Ukrainian zones, rather than just Kiev (again, thanks to
++  Tim Parenti, and also Denys Gavrysh)
++
++  In addition, I added Europe/Tiraspol to zone.tab.
++
++  This time, all the files have new version numbers...  (including the files
++  otherwise unchanged in 2011m that were changed in 2011l but didn't get new
++  version numbers there...)
++
++
++Release data2011l - 2011-10-10 11:15:43 +0700
++
++  There are just 2 changes that cause different generated tzdata files from
++  zic, to Asia/Hebron and Pacific/Fiji - the possible change for Bahia, Brazil
++  is included, but commented out.  Compared with the diff I sent out last week,
++  this version also includes attributions for the sources for the changes
++  (in much the same format as ado used, but the html tags have not been
++  checked, verified, or used in any way at all, so if there are errors there,
++  please let me know.)
++
++
++Release data2011k - 2011-09-20 17:54:03 -0400
++
++  [not summarized]
++
++
++Release data2011j - 2011-09-12 09:22:49 -0400
++
++  (contemporary changes for Samoa; past changes for Kenya, Uganda, and
++  Tanzania); there are also two spelling corrections to comments in
++  the australasia file (with thanks to Christos Zoulas).
++
++
++Release 2011i - 2011-08-29 05:56:32 -0400
++
++  [not summarized]
++
++
++Release data2011h - 2011-06-15 18:41:48 -0400
++
++  Russia and Curaçao changes
++
++
++Release 2011g - 2011-04-25 09:07:22 -0400
++
++  update the rules for Egypt to reflect its abandonment of DST this year
++
++
++Release 2011f - 2011-04-06 17:14:53 -0400
++
++  [not summarized]
++
++
++Release 2011e - 2011-03-31 16:04:38 -0400
++
++  Morocco, Chile, and tz-link changes
++
++
++Release 2011d - 2011-03-14 09:18:01 -0400
++
++  changes that impact present-day time stamps in Cuba, Samoa, and Turkey
++
++
++Release 2011c - 2011-03-07 09:30:09 -0500
++
++  These do affect current time stamps in Chile and Annette Island, Canada.
++
++
++Release 2011b - 2011-02-07 08:44:50 -0500
++
++  [not summarized]
++
++
++Release 2011a - 2011-01-24 10:30:16 -0500
++
++  [not summarized]
++
++
++Release data2010o - 2010-11-01 09:18:23 -0400
++
++  change to the end of DST in Fiji in 2011
++
++
++Release 2010n - 2010-10-25 08:19:17 -0400
++
++  [not summarized]
++
++
++Release 2010m - 2010-09-27 09:24:48 -0400
++
++  Hong Kong, Vostok, and zic.c changes
++
++
++Release 2010l - 2010-08-16 06:57:25 -0400
++
++  [not summarized]
++
++
++Release 2010k - 2010-07-26 10:42:27 -0400
++
++  [not summarized]
++
++
++Release 2010j - 2010-05-10 09:07:48 -0400
++
++  changes for Bahía de Banderas and for version naming
++
++
++Release data2010i - 2010-04-16 18:50:45 -0400
++
++  the end of DST in Morocco on 2010-08-08
++
++
++Release data2010h - 2010-04-05 09:58:56 -0400
++
++  [not summarized]
++
++
++Release data2010g - 2010-03-24 11:14:53 -0400
++
++  [not summarized]
++
++
++Release 2010f - 2010-03-22 09:45:46 -0400
++
++  [not summarized]
++
++
++Release data2010e - 2010-03-08 14:24:27 -0500
++
++  corrects the Dhaka bug found by Danvin Ruangchan
++
++
++Release data2010d - 2010-03-06 07:26:01 -0500
++
++  [not summarized]
++
++
++Release 2010c - 2010-03-01 09:20:58 -0500
++
++  changes including KRE's suggestion for earlier initialization of
++  "goahead" and "goback" structure elements
++
++
++Release code2010a - 2010-02-16 10:40:04 -0500
++
++  [not summarized]
++
++
++Release data2010b - 2010-01-20 12:37:01 -0500
++
++  Mexico changes
++
++
++Release data2010a - 2010-01-18 08:30:04 -0500
++
++  changes to Dhaka
++
++
++Release data2009u - 2009-12-26 08:32:28 -0500
++
++  changes to DST in Bangladesh
++
++
++Release 2009t - 2009-12-21 13:24:27 -0500
++
++  [not summarized]
++
++
++Release data2009s - 2009-11-14 10:26:32 -0500
++
++  (cosmetic) Antarctica change and the DST-in-Fiji-in-2009-and-2010 change
++
++
++Release 2009r - 2009-11-09 10:10:31 -0500
++
++  "antarctica" and "tz-link.htm" changes
++
++
++Release 2009q - 2009-11-02 09:12:40 -0500
++
++  with two corrections as reported by Eric Muller and Philip Newton
++
++
++Release data2009p - 2009-10-23 15:05:27 -0400
++
++  Argentina (including San Luis) changes (with the correction from
++  Mariano Absatz)
++
++
++Release data2009o - 2009-10-14 16:49:38 -0400
++
++  Samoa (commentary only), Pakistan, and Bangladesh changes
++
++
++Release data2009n - 2009-09-22 15:13:38 -0400
++
++  added commentary for Argentina and a change to the end of DST in
++  2009 in Pakistan
++
++
++Release data2009m - 2009-09-03 10:23:43 -0400
++
++  Samoa and Palestine changes
++
++
++Release data2009l - 2009-08-14 09:13:07 -0400
++
++  Samoa (comments only) and Egypt
++
++
++Release 2009k - 2009-07-20 09:46:08 -0400
++
++  [not summarized]
++
++
++Release data2009j - 2009-06-15 06:43:59 -0400
++
++  Bangladesh change (with a short turnaround since the DST change is
++  impending)
++
++
++Release 2009i - 2009-06-08 09:21:22 -0400
++
++  updating for DST in Bangladesh this year
++
++
++Release 2009h - 2009-05-26 09:19:14 -0400
++
++  [not summarized]
++
++
++Release data2009g - 2009-04-20 16:34:07 -0400
++
++  Cairo
++
++
++Release data2009f - 2009-04-10 11:00:52 -0400
++
++  correct DST in Pakistan
++
++
++Release 2009e - 2009-04-06 09:08:11 -0400
++
++  [not summarized]
++
++
++Release 2009d - 2009-03-23 09:38:12 -0400
++
++  Morocco, Tunisia, Argentina, and American Astronomical Society changes
++
++
++Release data2009c - 2009-03-16 09:47:51 -0400
++
++  change to the start of Cuban DST
++
++
++Release 2009b - 2009-02-09 11:15:22 -0500
++
++  [not summarized]
++
++
++Release 2009a - 2009-01-21 10:09:39 -0500
++
++  [not summarized]
++
++
++Release data2008i - 2008-10-21 12:10:25 -0400
++
++  southamerica and zone.tab files, with Argentina DST rule changes and
++  United States zone reordering and recommenting
++
++
++Release 2008h - 2008-10-13 07:33:56 -0400
++
++  [not summarized]
++
++
++Release 2008g - 2008-10-06 09:03:18 -0400
++
++  Fix a broken HTML anchor and update Brazil's DST transitions;
++  there's also a slight reordering of information in tz-art.htm.
++
++
++Release data2008f - 2008-09-09 22:33:26 -0400
++
++  [not summarized]
++
++
++Release 2008e - 2008-07-28 14:11:17 -0400
++
++  changes by Arthur David Olson and Jesper Nørgaard Welen
++
++
++Release data2008d - 2008-07-07 09:51:38 -0400
++
++  changes by Arthur David Olson, Paul Eggert, and Rodrigo Severo
++
++
++Release data2008c - 2008-05-19 17:48:03 -0400
++
++  Pakistan, Morocco, and Mongolia
++
++
++Release data2008b - 2008-03-24 08:30:59 -0400
++
++  including renaming Asia/Calcutta to Asia/Kolkata, with a backward
++  link provided
++
++
++Release 2008a - 2008-03-08 05:42:16 -0500
++
++  [not summarized]
++
++
++Release 2007k - 2007-12-31 10:25:22 -0500
++
++  most importantly, changes to the "southamerica" file based on
++  Argentina's readoption of daylight saving time
++
++
++Release 2007j - 2007-12-03 09:51:01 -0500
++
++  1. eliminate the "P" (parameter) macro;
++
++  2. the "noncontroversial" changes circulated on the time zone
++  mailing list (less the changes to "logwtmp.c");
++
++  3. eliminate "too many transition" errors when "min" is used in time
++  zone rules;
++
++  4. changes by Paul Eggert (including updated information for Venezuela).
++
++
++Release data2007i - 2007-10-30 10:28:11 -0400
++
++  changes for Cuba and Syria
++
++
++Release 2007h - 2007-10-01 10:05:51 -0400
++
++  changes by Paul Eggert, as well as an updated link to the ICU
++  project in tz-link.htm
++
++
++Release 2007g - 2007-08-20 10:47:59 -0400
++
++  changes by Paul Eggert
++
++  The "leapseconds" file has been updated to incorporate the most
++  recent International Earth Rotation and Reference Systems Service
++  (IERS) bulletin.
++
++  There's an addition to tz-art.htm regarding the television show "Medium".
++
++
++Release 2007f - 2007-05-07 10:46:46 -0400
++
++  changes by Paul Eggert (including Haiti, Turks and Caicos, and New
++  Zealand)
++
++  changes to zic.c to allow hour values greater than 24 (along with
++  Paul's improved time value overflow checking)
++
++
++Release 2007e - 2007-04-02 10:11:52 -0400
++
++  Syria and Honduras changes by Paul Eggert
++
++  zic.c variable renaming changes by Arthur David Olson
++
++
++Release 2007d - 2007-03-20 08:48:30 -0400
++
++  changes by Paul Eggert
++
++  the elimination of white space at the ends of lines
++
++
++Release 2007c - 2007-02-26 09:09:37 -0500
++
++  changes by Paul Eggert
++
++
++Release 2007b - 2007-02-12 09:34:20 -0500
++
++  Paul Eggert's proposed change to the quotation handling logic in zic.c.
++
++  changes to the commentary in "leapseconds" reflecting the IERS
++  announcement that there is to be no positive leap second at the end
++  of June 2007.
++
++
++Release 2007a - 2007-01-08 12:28:29 -0500
++
++  changes by Paul Eggert
++
++  Derick Rethan's Asmara change
++
++  Oscar van Vlijmen's Easter Island local mean time change
++
++  symbolic link changes
++
++
++Release 2006p - 2006-11-27 08:54:27 -0500
++
++  changes by Paul Eggert
++
++
++Release 2006o - 2006-11-06 09:18:07 -0500
++
++  changes by Paul Eggert
++
++
++Release 2006n - 2006-10-10 11:32:06 -0400
++
++  changes by Paul Eggert
++
++
++Release 2006m - 2006-10-02 15:32:35 -0400
++
++  changes for Uruguay, Palestine, and Egypt by Paul Eggert
++
++  (minimalist) changes to zic.8 to clarify "until" information
++
++
++Release data2006l - 2006-09-18 12:58:11 -0400
++
++  Paul's best-effort work on this coming weekend's Egypt time change
++
++
++Release 2006k - 2006-08-28 12:19:09 -0400
++
++  changes by Paul Eggert
++
++
++Release 2006j - 2006-08-21 09:56:32 -0400
++
++  changes by Paul Eggert
++
++
++Release code2006i - 2006-08-07 12:30:55 -0400
++
++  localtime.c fixes
++
++  Ken Pizzini's conversion script
++
++
++Release code2006h - 2006-07-24 09:19:37 -0400
++
++  adds public domain notices to four files
++
++  includes a fix for transition times being off by a second
++
++  adds a new recording to the "arts" file (information courtesy Colin Bowern)
++
++
++Release 2006g - 2006-05-08 17:18:09 -0400
++
++  northamerica changes by Paul Eggert
++
++
++Release 2006f - 2006-05-01 11:46:00 -0400
++
++  a missing version number problem is fixed (with thanks to Bradley
++  White for catching the problem)
++
++
++Release 2006d - 2006-04-17 14:33:43 -0400
++
++  changes by Paul Eggert
++
++  added new items to tz-arts.htm that were found by Paul
++
++
++Release 2006c - 2006-04-03 10:09:32 -0400
++
++  two sets of data changes by Paul Eggert
++
++  a fencepost error fix in zic.c
++
++  changes to zic.c and the "europe" file to minimize differences
++  between output produced by the old 32-bit zic and the new 64-bit
++  version
++
++
++Release 2006b - 2006-02-20 10:08:18 -0500
++  [tz32code2006b + tz64code2006b + tzdata2006b]
++
++  64-bit code
++
++  All SCCS IDs were bumped to "8.1" for this release.
++
++
++Release 2006a - 2006-01-30 08:59:31 -0500
++
++  changes by Paul Eggert (in particular, Indiana time zone moves)
++
++  an addition to the zic manual page to describe how special-case
++  transitions are handled
++
++
++Release 2005r - 2005-12-27 09:27:13 -0500
++
++  Canadian changes by Paul Eggert
++
++  They also add "<pre>" directives to time zone data files and reflect
++  changes to warning message logic in "zdump.c" (but with calls to
++  "gettext" kept unbundled at the suggestion of Ken Pizzini).
++
++
++Release 2005q - 2005-12-13 09:17:09 -0500
++
++  Nothing earth-shaking here:
++	1.  Electronic mail addresses have been removed.
++	2.  Casts of the return value of exit have been removed.
++	3.  Casts of the argument of is.* macros have been added.
++	4.  Indentation in one section of zic.c has been fixed.
++	5.  References to dead URLs in the data files have been dealt with.
++
++
++Release 2005p - 2005-12-05 10:30:53 -0500
++
++  "systemv", "tz-link.htm", and "zdump.c" changes
++  (less the casts of arguments to the is* macros)
++
++
++Release 2005o - 2005-11-28 10:55:26 -0500
++
++  Georgia, Cuba, Nicaragua, and Jordan changes by Paul Eggert
++
++  zdump.c lint fixes by Arthur David Olson
++
++
++Release 2005n - 2005-10-03 09:44:09 -0400
++
++  changes by Paul Eggert (both the Uruguay changes and the Kyrgyzstan
++  et al. changes)
++
++
++Release 2005m - 2005-08-29 12:15:40 -0400
++
++  changes by Paul Eggert (with a small tweak to the tz-art change)
++
++  a declaration of an unused variable has been removed from zdump.c
++
++
++Release 2005l - 2005-08-22 12:06:39 -0400
++
++  changes by Paul Eggert
++
++  overflow/underflow checks by Arthur David Olson, minus changes to
++  the "Theory" file about the pending addition of 64-bit data (I grow
++  less confident of the changes being accepted with each passing day,
++  and the changes no longer increase the data files nine-fold--there's
++  less than a doubling in size by my local Sun's reckoning)
++
++
++Release 2005k - 2005-07-14 14:14:24 -0400
++
++  The "leapseconds" file has been edited to reflect the recently
++  announced leap second at the end of 2005.
++
++  I've also deleted electronic mail addresses from the files as an
++  anti-spam measure.
++
++
++Release 2005j - 2005-06-13 14:34:13 -0400
++
++  These reflect changes to limit the length of time zone abbreviations
++  and the characters used in those abbreviations.
++
++  There are also changes to handle POSIX-style "quoted" time zone
++  environment variables.
++
++  The changes were circulated on the time zone mailing list; the only
++  change since then was the removal of a couple of minimum-length of
++  abbreviation checks.
++
++
++Release data2005i - 2005-04-21 15:04:16 -0400
++
++  changes (most importantly to Nicaragua and Haiti) by Paul Eggert
++
++
++Release 2005h - 2005-04-04 11:24:47 -0400
++
++  changes by Paul Eggert
++
++  minor changes to Makefile and zdump.c to produce more useful output
++  when doing a "make typecheck"
++
++
++Release 2005g - 2005-03-14 10:11:21 -0500
++
++  changes by Paul Eggert (a change to current DST rules in Uruguay and
++  an update to a link to time zone software)
++
++
++Release 2005f - 2005-03-01 08:45:32 -0500
++
++  data and documentation changes by Paul Eggert
++
++
++Release 2005e - 2005-02-10 15:59:44 -0500
++
++  [not summarized]
++
++
++Release code2005d - 2005-01-31 09:21:47 -0500
++
++  make zic complain about links to links if the -v flag is used
++
++  have "make public" do more code checking
++
++  add an include to "localtime.c" for the benefit of gcc systems
++
++
++Release 2005c - 2005-01-17 18:36:29 -0500
++
++  get better results when mktime runs on a system where time_t is double
++
++  changes to the data files (most importantly to Paraguay)
++
++
++Release 2005b - 2005-01-10 09:19:54 -0500
++
++  Get localtime and gmtime working on systems with exotic time_t types.
++
++  Update the leap second commentary in the "leapseconds" file.
++
++
++Release 2005a - 2005-01-01 13:13:44 -0500
++
++  [not summarized]
++
++
++Release code2004i - 2004-12-14 13:42:58 -0500
++
++  Deal with systems where time_t is unsigned.
++
++
++Release code2004h - 2004-12-07 11:40:18 -0500
++
++  64-bit-time_t changes
++
++
++Release 2004g - 2004-11-02 09:06:01 -0500
++
++  update to Cuba (taking effect this weekend)
++
++  other changes by Paul Eggert
++
++  correction of the spelling of Oslo
++
++  changed versions of difftime.c and private.h
++
++
++Release code2004f - 2004-10-21 10:25:22 -0400
++
++  Cope with wide-ranging tm_year values.
++
++
++Release 2004e - 2004-10-11 14:47:21 -0400
++
++  Brazil/Argentina/Israel changes by Paul Eggert
++
++  changes to tz-link.htm by Paul
++
++  one small fix to Makefile
++
++
++Release 2004d - 2004-09-22 08:27:29 -0400
++
++  Avoid overflow problems when TM_YEAR_BASE is added to an integer.
++
++
++Release 2004c - 2004-08-11 12:06:26 -0400
++
++  asctime-related changes
++
++  (variants of) some of the documentation changes suggested by Paul Eggert
++
++
++Release 2004b - 2004-07-19 14:33:35 -0400
++
++  data changes by Paul Eggert - most importantly, updates for Argentina
++
++
++Release 2004a - 2004-05-27 12:00:47 -0400
++
++  changes by Paul Eggert
++
++  Handle DST transitions that occur at the end of a month in some
++  years but at the start of the following month in other years.
++
++  Add a copy of the correspondence that's the basis for claims about
++  DST in the Navajo Nation.
++
++
++Release 2003e - 2003-12-15 09:36:47 -0500
++
++  changes by Arthur David Olson (primarily code changes)
++
++  changes by Paul Eggert (primarily data changes)
++
++  minor changes to "Makefile" and "northamerica" (in the latter case,
++  optimization of the "Toronto" rules)
++
++
++Release 2003d - 2003-10-06 09:34:44 -0400
++
++  changes by Paul Eggert
++
++
++Release 2003c - 2003-09-16 10:47:05 -0400
++
++  Fix bad returns in zic.c's inleap function.
++  Thanks to Bradley White for catching the problem!
++
++
++Release 2003b - 2003-09-16 07:13:44 -0400
++
++  Add a "--version" option (and documentation) to the zic and zdump commands.
++
++  changes to overflow/underflow checking in zic
++
++  a localtime typo fix.
++
++  Update the leapseconds and tz-art.htm files.
++
++
++Release 2003a - 2003-03-24 09:30:54 -0500
++
++  changes by Paul Eggert
++
++  a few additions and modifications to the tz-art.htm file
++
++
++Release 2002d - 2002-10-15 13:12:42 -0400
++
++  changes by Paul Eggert, less the "Britain (UK)" change in iso3166.tab
++
++  There's also a new time zone quote in "tz-art.htm".
++
++
++Release 2002c - 2002-04-04 11:55:20 -0500
++
++  changes by Paul Eggert
++
++  Change zic.c to avoid creating symlinks to files that don't exist.
++
++
++Release 2002b - 2002-01-28 12:56:03 -0500
++
++  [These change notes are for Release 2002a, which was corrupted.
++  2002b was a corrected version of 2002a.]
++
++  changes by Paul Eggert
++
++  Update the "leapseconds" file to note that there'll be no leap
++  second at the end of June, 2002.
++
++  Change "zic.c" to deal with a problem in handling the "Asia/Bishkek" zone.
++
++  Change to "difftime.c" to avoid sizeof problems.
++
++
++Release 2001d - 2001-10-09 13:31:32 -0400
++
++  changes by Paul Eggert
++
++
++Release 2001c - 2001-06-05 13:59:55 -0400
++
++  changes by Paul Eggert and Andrew Brown
++
++
++Release 2001b - 2001-04-05 16:44:38 -0400
++
++  changes by Paul Eggert (modulo jnorgard's typo fix)
++
++  tz-art.htm has been HTMLified.
++
++
++Release 2001a - 2001-03-13 12:57:44 -0500
++
++  changes by Paul Eggert
++
++  An addition to the "leapseconds" file: comments with the text of the
++  latest IERS leap second notice.
++
++  Trailing white space has been removed from data file lines, and
++  repeated spaces in "Rule Jordan" lines in the "asia" file have been
++  converted to tabs.
++
++
++Release 2000h - 2000-12-14 15:33:38 -0500
++
++  changes by Paul Eggert
++
++  one typo fix in the "art" file
++
++  With providence, this is the last update of the millennium.
++
++
++Release 2000g - 2000-10-10 11:35:22 -0400
++
++  changes by Paul Eggert
++
++  correction of John Mackin's name submitted by Robert Elz
++
++  Garry Shandling's Daylight Saving Time joke (!?!) from the recent
++  Emmy Awards broadcast.
++
++
++Release 2000f - 2000-08-10 09:31:58 -0400
++
++  changes by Paul Eggert
++
++  Added information in "tz-art.htm" on a Seinfeld reference to DST.
++
++  Error checking and messages in the "yearistype" script have been
++  improved.
++
++
++Release 2000e - 2000-07-31 09:27:54 -0400
++
++  data changes by Paul Eggert
++
++  a change to the default value of the defined constant HAVE_STRERROR
++
++  the addition of a Dave Barry quote on DST to the tz-arts file
++
++
++Release 2000d - 2000-04-20 15:43:04 -0400
++
++  changes to the documentation and code of strftime for C99 conformance
++
++  a bug fix for date.c
++
++  These are based on (though modified from) changes by Paul Eggert.
++
++
++Release 2000c - 2000-03-04 10:31:43 -0500
++
++  changes by Paul Eggert
++
++
++Release 2000b - 2000-02-21 12:16:29 -0500
++
++  changes by Paul Eggert and Joseph Myers
++
++  modest tweaks to the tz-art.htm and tz-link.htm files
++
++
++Release 2000a - 2000-01-18 09:21:26 -0500
++
++  changes by Paul Eggert
++
++  The two hypertext documents have also been renamed.
++
++
++Release code1999i-data1999j - 1999-11-15 18:43:22 -0500
++
++  Paul Eggert's changes
++
++  additions to the "zic" manual page and the "Arts.htm" file
++
++
++Release code1999h-data1999i - 1999-11-08 14:55:21 -0500
++
++  [not summarized]
++
++
++Release data1999h - 1999-10-07 03:50:29 -0400
++
++  changes by Paul Eggert to "europe" (most importantly, fixing
++  Lithuania and Estonia)
++
++
++Release 1999g - 1999-09-28 11:06:18 -0400
++
++  data changes by Paul Eggert (most importantly, the change for
++  Lebanon that buys correctness for this coming Sunday)
++
++  The "code" file contains changes to "Makefile" and "checktab.awk" to
++  allow better checking of time zone files before they are published.
++
++
++Release 1999f - 1999-09-23 09:48:14 -0400
++
++  changes by Arthur David Olson and Paul Eggert
++
++
++Release 1999e - 1999-08-17 15:20:54 -0400
++
++  changes circulated by Paul Eggert, although the change to handling
++  of DST-specifying time zone names has been commented out for now
++  (search for "XXX" in "localtime.c" for details).  These files also
++  do not make any changes to the start of DST in Brazil.
++
++  In addition to Paul's changes, there are updates to "Arts.htm" and
++  cleanups of URLs.
++
++
++Release 1999d - 1999-03-30 11:31:07 -0500
++
++  changes by Paul Eggert
++
++  The Makefile's "make public" rule has also been changed to do a test
++  compile of each individual time zone data file (which should help
++  avoid problems such as the one we had with Nicosia).
++
++
++Release 1999c - 1999-03-25 09:47:47 -0500
++
++  changes by Paul Eggert, most importantly the change for Chile.
++
++
++Release 1999b - 1999-02-01 17:51:44 -0500
++
++  changes by Paul Eggert
++
++  code changes (suggested by Mani Varadarajan, mani at be.com) for
++  correct handling of symbolic links when building using a relative directory
++
++  code changes to generate correct messages for failed links
++
++  updates to the URLs in Arts.htm
++
++
++Release 1999a - 1999-01-19 16:20:29 -0500
++
++  error message internationalizations and corrections in zic.c and
++  zdump.c (as suggested by Vladimir Michl, vladimir.michl at upol.cz,
++  to whom thanks!)
++
++
++Release code1998h-data1998i - 1998-10-01 09:56:10 -0400
++
++  changes for Brazil, Chile, and Germany
++
++  support for use of "24:00" in the input files for the time zone compiler
++
++
++Release code1998g-data1998h - 1998-09-24 10:50:28 -0400
++
++  changes by Paul Eggert
++
++  correction to a define in the "private.h" file
++
++
++Release data1998g - 1998-08-11 03:28:35 -0000
++  [tzdata1998g.tar.gz is missing!]
++
++  Lithuanian change provided by mgedmin at pub.osf.it
++
++  Move creation of the GMT link with Etc/GMT to "etcetera" (from
++  "backward") to ensure that the GMT file is created even where folks
++  don't want the "backward" links (as suggested by Paul Eggert).
++
++
++Release data1998f - 1998-07-20 13:50:00 -0000
++  [tzdata1998f.tar.gz is missing!]
++
++  Update the "leapseconds" file to include the newly-announced
++  insertion at the end of 1998.
++
++
++Release code1998f - 1998-06-01 10:18:31 -0400
++
++  addition to localtime.c by Guy Harris
++
++
++Release 1998e - 1998-05-28 09:56:26 -0400
++
++  The Makefile is changed to produce zoneinfo-posix rather than
++  zoneinfo/posix, and to produce zoneinfo-leaps rather than
++  zoneinfo/right.
++
++  data changes by Paul Eggert
++
++  changes from Guy Harris to provide asctime_r and ctime_r
++
++  A usno1998 file (substantially identical to usno1997) has been added.
++
++
++Release 1998d - 1998-05-14 11:58:34 -0400
++
++  changes to comments (in particular, elimination of references to CIA maps).
++  "Arts.htm", "WWW.htm", "asia", and "australasia" are the only places
++  where changes occur.
++
++
++Release 1998c - 1998-02-28 12:32:26 -0500
++
++  changes by Paul Eggert (save the "French correction," on which I'll
++  wait for the dust to settle)
++
++  symlink changes
++
++  changes and additions to Arts.htm
++
++
++Release 1998b - 1998-01-17 14:31:51 -0500
++
++  URL cleanups and additions
++
++
++Release 1998a - 1998-01-13 12:37:35 -0500
++
++  changes by Paul Eggert
++
++
++Release code1997i-data1997k - 1997-12-29 09:53:41 -0500
++
++  changes by Paul Eggert, with minor modifications from Arthur David
++  Olson to make the files more browser friendly
++
++
++Release code1997h-data1997j - 1997-12-18 17:47:35 -0500
++
++  minor changes to put "TZif" at the start of each time zone information file
++
++  a rule has also been added to the Makefile so you can
++	make zones
++  to just recompile the zone information files (rather than doing a
++  full "make install" with its other effects).
++
++
++Release data1997i - 1997-10-07 08:45:38 -0400
++
++  changes to Africa by Paul Eggert
++
++
++Release code1997g-data1997h - 1997-09-04 16:56:54 -0400
++
++  corrections for Uruguay (and other locations)
++
++  Arthur David Olson's simple-minded fix allowing mktime to both
++  correctly handle leap seconds and correctly handle tm_sec values
++  upon which arithmetic has been performed.
++
++
++Release code1997f-data1997g - 1997-07-19 13:15:02 -0400
++
++  Paul Eggert's updates
++
++  a small change to a function prototype;
++
++  "Music" has been renamed "Arts.htm", HTMLified, and augmented to
++  include information on Around the World in Eighty Days.
++
++
++Release code1997e-data1997f - 1997-05-03 18:52:34 -0400
++
++  fixes to zic's error handling
++
++  changes inspired by the item circulated on Slovenia
++
++  The description of Web resources has been HTMLified for browsing
++  convenience.
++
++  A new piece of tz-related music has been added to the "Music" file.
++
++
++Release code1997d-data1997e - 1997-03-29 12:48:52 -0500
++
++  Paul Eggert's latest suggestions
++
++
++Release code1997c-data1997d - 1997-03-07 20:37:54 -0500
++
++  changes to "zic.c" to correct performance of the "-s" option
++
++  a new file "usno1997"
++
++
++Release data1997c - 1997-03-04 09:58:18 -0500
++
++  changes in Israel
++
++
++Release 1997b - 1997-02-27 18:34:19 -0500
++
++  The data file incorporates the 1997 leap second.
++
++  The code file incorporates Arthur David Olson's take on the
++  zic/multiprocessor/directory-creation situation.
++
++
++Release 1997a - 1997-01-21 09:11:10 -0500
++
++  Paul Eggert's Antarctica (and other changes)
++
++  Arthur David Olson finessed the "getopt" issue by checking against
++  both -1 and EOF (regardless of POSIX, SunOS 4.1.1's manual says -1
++  is returned while SunOS 5.5's manual says EOF is returned).
++
++
++Release code1996o-data1996n - 1996-12-27 21:42:05 -0500
++
++  Paul Eggert's latest changes
++
++
++Release code1996n - 1996-12-16 09:42:02 -0500
++
++  link snapping fix from Bruce Evans (via Garrett Wollman)
++
++
++Release data1996m - 1996-11-24 02:37:34 -0000
++  [tzdata1996m.tar.gz is missing!]
++
++  Paul Eggert's batch of changes
++
++
++Release code1996m-data1996l - 1996-11-05 14:00:12 -0500
++
++  No functional changes here; the files have simply been changed to
++  make more use of ISO style dates in comments. The names of the above
++  files now include the year in full.
++
++
++Release code96l - 1996-09-08 17:12:20 -0400
++
++  tzcode96k was missing a couple of pieces.
++
++
++Release 96k - 1996-09-08 16:06:22 -0400
++
++  the latest round of changes from Paul Eggert
++
++  the recent Year 2000 material
++
++
++Release code96j - 1996-07-30 13:18:53 -0400
++
++  Set sp->typecnt as suggested by Timothy Patrick Murphy.
++
++
++Release code96i - 1996-07-27 20:11:35 -0400
++
++  Paul's suggested patch for strftime %V week numbers
++
++
++Release data96i - 1996-07-01 18:13:04 -0400
++
++  "northamerica" and "europe" changes by Paul Eggert
++
++
++Release code96h - 1996-06-05 08:02:21 -0400
++
++  fix for handling transitions specified in Universal Time
++
++  Some "public domain" notices have also been added.
++
++
++Release code96g - 1996-05-16 14:00:26 -0400
++
++  fix for the simultaneous-DST-and-zone-change challenge
++
++
++Release data96h - 1996-05-09 17:40:51 -0400
++
++  changes by Paul Eggert
++
++
++Release code96f-data96g - 1996-05-03 03:09:59 -0000
++  [tzcode96f.tar.gz + tzdata96g.tar.gz are both missing!]
++
++  The changes get us some of the way to fixing the problems noted in Paul
++  Eggert's letter yesterday (in addition to a few others).  The approach
++  has been to make zic a bit smarter about figuring out what time zone
++  abbreviations apply just after the time specified in the "UNTIL" part
++  of a zone line.  Putting the smarts in zic means avoiding having
++  transition times show up in both "Zone" lines and "Rule" lines, which
++  in turn avoids multiple transition time entries in time zone files.
++  (This also makes the zic input files such as "europe" a bit shorter and
++  should ease maintenance.)
++
++
++Release data96f - 1996-04-19 19:20:03 -0000
++  [tzdata96f.tar.gz is missing!]
++
++  The only changes are to the "northamerica" file; the time zone
++  abbreviation for Denver is corrected to MST (and MDT), and the
++  comments for Mexico have been updated.
++
++
++Release data96e - 1996-03-19 17:37:26 -0500
++
++  Proposals by Paul Eggert, in particular the Portugal change that
++  comes into play at the end of this month.
++
++
++Release data96d - 1996-03-18 20:49:39 -0500
++
++  [not summarized]
++
++
++Release code96e - 1996-02-29 15:43:27 -0000
++  [tzcode96e.tar.gz is missing!]
++
++  internationalization changes and the fix to the documentation for strftime
++
++
++Release code96d-data96c - 1996-02-12 11:05:27 -0500
++
++  The "code" file simply updates Bob Kridle's electronic address.
++
++  The "data" file updates rules for Mexico.
++
++
++Release data96b - 1996-01-27 15:44:42 -0500
++
++  Kiribati change
++
++
++Release code96c - 1996-01-16 16:58:15 -0500
++
++  leap-year streamlining and binary-search changes
++
++  fix to newctime.3
++
++
++Release code96b - 1996-01-10 20:42:39 -0500
++
++  fixes and enhancements from Paul Eggert, including code that
++  emulates the behavior of recent versions of the SunOS "date"
++  command.
++
++
++Release 96a - 1996-01-06 09:08:24 -0500
++
++  Israel updates
++
++  fixes to strftime.c for correct ISO 8601 week number generation,
++  plus support for two new formats ('G' and 'g') to give ISO 8601 year
++  numbers (which are not necessarily the same as calendar year numbers)
++
++
++Release code95i-data95m - 1995-12-21 12:46:47 -0500
++
++  The latest revisions from Paul Eggert are included, the usno1995
++  file has been updated, and a new file ("WWW") covering useful URLs
++  has been added.
++
++
++Release code95h-data95l - 1995-12-19 18:10:12 -0500
++
++  A simplification of a macro definition, a change to data for Sudan,
++  and (for last minute shoppers) notes in the "Music" file on the CD
++  "Old Man Time".
++
++
++Release code95g-data95k - 1995-10-30 10:32:47 -0500
++
++  (slightly reformatted) 8-bit-clean proposed patch
++
++  minor patch: US/Eastern -> America/New_York
++
++  snapshot of the USNO's latest data ("usno1995")
++
++  some other minor cleanups
++
++
++Release code95f-data95j - 1995-10-28 21:01:34 -0000
++  [tzcode95f.tar.gz + tzdata95j.tar.gz are both missing!]
++
++  European cleanups
++
++  support for 64-bit time_t's
++
++  optimization in localtime.c
++
++
++Release code95e - 1995-10-13 13:23:57 -0400
++
++  the mktime change to scan from future to past when trying to find time zone
++  offsets
++
++
++Release data95i - 1995-09-26 10:43:26 -0400
++
++  For Canada/Central, guess that the Sun customer's "one week too
++  early" was just a approximation, and the true error is one month
++  too early.  This is consistent with the rest of Canada.
++
++
++Release data95h - 1995-09-21 11:26:48 -0400
++
++  latest changes from Paul Eggert
++
++
++Release code95d - 1995-09-14 11:14:45 -0400
++
++  the addition of a "Music" file, which documents four recorded
++  versions of the tune "Save That Time".
++
++
++Release data95g - 1995-09-01 17:21:36 -0400
++
++  "yearistype" correction
++
++
++Release data95f - 1995-08-28 20:46:56 -0400
++
++  Paul Eggert's change to the australasia file
++
++
++Release data95e - 1995-07-08 18:02:34 -0400
++
++  The only change is a leap second at the end of this year.
++  Thanks to Bradley White for forwarding news on the leap second.
++
++
++Release data95d - 1995-07-03 13:26:22 -0400
++
++  Paul Eggert's changes
++
++
++Release data95c - 1995-07-02 19:19:28 -0400
++
++  changes to "asia", "backward", "europe", and "southamerica"
++  (read: northamericacentrics need not apply)
++
++
++Release code95c - 1995-03-13 14:00:46 -0500
++
++  one-line fix for sign extension problems in detzcode
++
++
++Release 95b - 1995-03-04 11:22:38 -0500
++
++  Minor changes in both:
++
++  The "code" file contains a workaround for the lack of "unistd.h" in
++  Microsoft C++ version 7.
++
++  The "data" file contains a fixed "Link" for America/Shiprock.
++
++
++Release 94h - 1994-12-10 12:51:14 -0500
++
++  The files:
++
++  *	incorporate the changes to "zdump" and "date" to make changes to
++	the "TZ" environment variable permanent;
++
++  *	incorporate the table changes by Paul Eggert;
++
++  *	include (and document) support for universal time specifications in
++	data files - but do not (yet) include use of this feature in the
++	data files.
++
++  Think of this as "TZ Classic" - the software has been set up not to break if
++  universal time shows up in its input, and data entries have been
++  left as is so as not to break existing implementations.
++
++
++Release data94f - 1994-08-20 12:56:09 -0400
++
++  (with thanks!) the latest data updates from Paul Eggert
++
++
++Release data94e - 1994-06-04 13:13:53 -0400
++
++  [not summarized]
++
++
++Release code94g - 1994-05-05 12:14:07 -0400
++
++  fix missing "optind.c" and a reference to it in the Makefile
++
++
++Release code94f - 1994-05-05 13:00:33 -0000
++  [tzcode94f.tar.gz is missing!]
++
++  changes to avoid overflow in difftime, as well as changes to cope
++  with the 52/53 challenge in strftime
++
++
++Release code94e - 1994-03-30 23:32:59 -0500
++
++  change for the benefit of PCTS
++
++
++Release 94d - 1994-02-24 15:42:25 -0500
++
++  Avoid clashes with POSIX semantics for zones such as GMT+4.
++
++  Some other very minor housekeeping is also present.
++
++
++Release code94c - 1994-02-10 08:52:40 -0500
++
++  Fix bug where mkdirs was broken unless you compile with
++  -fwritable-strings (which is generally losing to do).
++
++
++Release 94b - 1994-02-07 10:04:33 -0500
++
++  work by Paul Eggert who notes:
++
++  I found another book of time zone histories by E W Whitman; it's not
++  as extensive as Shanks but has a few goodies of its own.  I used it
++  to update the tables.  I also fixed some more as a result of
++  correspondence with Adam David and Peter Ilieve, and move some stray
++  links from 'europe' to 'backward'.  I corrected some scanning errors
++  in usno1989.
++
++  As far as the code goes, I fixed zic to allow years in the range
++  INT_MIN to INT_MAX; this fixed a few boundary conditions around 1900.
++  And I cleaned up the zic documentation a little bit.
++
++
++Release data94a - 1994-02-03 08:58:54 -0500
++
++  It simply incorporates the recently announced leap second into the
++  "leapseconds" file.
++
++
++Release 93g - 1993-11-22 17:28:27 -0500
++
++  Paul Eggert has provided a good deal of historic information (based
++  on Shanks), and there are some code changes to deal with the buglets
++  that crawled out in dealing with the new information.
++
++
++Release 93f - 1993-10-15 12:27:46 -0400
++
++  Paul Eggert's changes
++
++
++Release 93e - 1993-09-05 21:21:44 -0400
++
++  This has updated data for Israel, England, and Kwajalein.  There's
++  also an update to "zdump" to cope with Kwajalein's 24-hour jump.
++  Thanks to Paul Eggert and Peter Ilieve for the changes.
++
++
++Release 93d - 1993-06-17 23:34:17 -0400
++
++  new fix and new data on Israel
++
++
++Release 93c - 1993-06-06 19:31:55 -0400
++
++  [not summarized]
++
++
++Release 93b - 1993-02-02 14:53:58 -0500
++
++  updated "leapseconds" file
++
++
++Release 93 - 1993-01-08 07:01:06 -0500
++
++  At kre's suggestion, the package has been split in two - a code piece
++  (which also includes documentation) that's only of use to folks who
++  want to recompile things and a data piece useful to anyone who can
++  run "zic".
++
++  The new version has a few changes to the data files, a few
++  portability changes, and an off-by-one fix (with thanks to
++  Tom Karzes at deshaw.com for providing a description and a
++  solution).
++
++
++Release 92c - 1992-11-21 17:35:36 -0000
++  [tz92c.tar.Z is missing!]
++
++  The fallout from the latest round of DST transitions.
++
++  There are changes for Portugal, Saskatchewan, and "Pacific-New";
++  there's also a change to "zic.c" that makes it portable to more systems.
++
++
++Release 92 - 1992-04-25 18:17:03 -0000
++  [tz92.tar.Z is missing!]
++
++  By popular demand (well, at any rate, following a request by kre at munnari)
++
++
++The 1989 update of the time zone package featured:
++
++  *	POSIXization (including interpretation of POSIX-style TZ environment
++	variables, provided by Guy Harris),
++  *	ANSIfication (including versions of "mktime" and "difftime"),
++  *	SVIDulation (an "altzone" variable)
++  *	MACHination (the "gtime" function)
++  *	corrections to some time zone data (including corrections to the rules
++	for Great Britain and New Zealand)
++  *	reference data from the United States Naval Observatory for folks who
++	want to do additional time zones
++  *	and the 1989 data for Saudi Arabia.
++
++  (Since this code will be treated as "part of the implementation" in some
++  places and as "part of the application" in others, there's no good way to
++  name functions, such as timegm, that are not part of the proposed ANSI C
++  standard; such functions have kept their old, underscore-free names in this
++  update.)
++
++  And the "dysize" function has disappeared; it was present to allow
++  compilation of the "date" command on old BSD systems, and a version of "date"
++  is now provided in the package.  The "date" command is not created when you
++  "make all" since it may lack options provided by the version distributed with
++  your operating system, or may not interact with the system in the same way
++  the native version does.
++
++  Since POSIX frowns on correct leap second handling, the default behavior of
++  the "zic" command (in the absence of a "-L" option) has been changed to omit
++  leap second information from its output files.
++
++
++-----
++Notes
++
++This file contains copies of the part of each release announcement
++that talks about the changes in that release.  The text has been
++adapted and reformatted for the purposes of this file.
++
++Traditionally a release R consists of a pair of tarball files,
++tzcodeR.tar.gz and tzdataR.tar.gz.  However, some releases (e.g.,
++code2010a, data2012c) consist of just one or the other tarball, and a
++few (e.g., code2012c-data2012d) have tarballs with mixed version
++numbers.  Recent releases also come in an experimental format
++consisting of a single tarball tzdb-R.tar.lz with extra data.
++
++Release time stamps are taken from the release's commit (for newer,
++Git-based releases), from the newest file in the tarball (for older
++releases, where this info is available) or from the email announcing
++the release (if all else fails; these are marked with a time zone of
++-0000 and an "is missing!" comment).
++
++Earlier versions of the code and data were not announced on the tz
++list and are not summarized here.
++
++This file is in the public domain.
++
++Local Variables:
++coding: utf-8
++End:
+--- contrib/tzdata/README.orig
++++ contrib/tzdata/README
+@@ -0,0 +1,71 @@
++README for the tz distribution
++
++"What time is it?" -- Richard Deacon as The King
++"Any time you want it to be." -- Frank Baxter as The Scientist
++					(from the Bell System film "About Time")
++
++The Time Zone Database (often called tz or zoneinfo) contains code and
++data that represent the history of local time for many representative
++locations around the globe.  It is updated periodically to reflect
++changes made by political bodies to time zone boundaries, UTC offsets,
++and daylight-saving rules.
++
++Here is a recipe for acquiring, building, installing, and testing the
++tz distribution on a GNU/Linux or similar host.
++
++To acquire the distribution, run the following shell commands:
++
++	mkdir tz
++	cd tz
++	wget --retr-symlinks 'ftp://ftp.iana.org/tz/tz*-latest.tar.gz'
++	gzip -dc tzcode-latest.tar.gz | tar -xf -
++	gzip -dc tzdata-latest.tar.gz | tar -xf -
++
++Alternatively, the following shell commands acquire the same
++distribution, with extra data useful for regression testing:
++
++	wget --retr-symlinks 'ftp://ftp.iana.org/tz/tzdb-latest.tar.lz'
++	lzip -dc tzdb-latest.tar.lz | tar -xf -
++
++Be sure to read the comments in "Makefile" and make any changes needed
++to make things right for your system, especially if you are using some
++platform other than GNU/Linux.  Then run the following commands,
++substituting your desired installation directory for "$HOME/tzdir":
++
++	make TOPDIR=$HOME/tzdir install
++	$HOME/tzdir/etc/zdump -v America/Los_Angeles
++
++Historical local time information has been included here to:
++
++*	provide a compendium of data about the history of civil time
++	that is useful even if not 100% accurate;
++
++*	give an idea of the variety of local time rules that have
++	existed in the past and thus an idea of the variety that may be
++	expected in the future;
++
++*	provide a test of the generality of the local time rule description
++	system.
++
++The information in the time zone data files is by no means authoritative;
++fixes and enhancements are welcome.  Please see the file CONTRIBUTING
++for details.
++
++Thanks to these Time Zone Caballeros who've made major contributions to the
++time conversion package: Keith Bostic; Bob Devine; Paul Eggert; Robert Elz;
++Guy Harris; Mark Horton; John Mackin; and Bradley White.  Thanks also to
++Michael Bloom, Art Neilson, Stephen Prince, John Sovereign, and Frank Wales
++for testing work, and to Gwillim Law for checking local mean time data.
++Thanks in particular to Arthur David Olson, the project's founder and first
++maintainer, to whom the time zone community owes the greatest debt of all.
++None of them are responsible for remaining errors.
++
++Look in <ftp://ftp.iana.org/tz/releases/> for updated versions of these files.
++
++Please send comments or information to tz@iana.org.
++
++-----
++
++This file is in the public domain, so clarified as of 2009-05-17 by
++Arthur David Olson.  The other files in this distribution are either
++public domain or BSD licensed; see the file LICENSE for details.
+--- contrib/tzdata/Theory.orig
++++ contrib/tzdata/Theory
+@@ -0,0 +1,840 @@
++Theory and pragmatics of the tz code and data
++
++
++----- Outline -----
++
++	Scope of the tz database
++	Names of time zone rules
++	Time zone abbreviations
++	Accuracy of the tz database
++	Time and date functions
++	Calendrical issues
++	Time and time zones on Mars
++
++
++----- Scope of the tz database -----
++
++The tz database attempts to record the history and predicted future of
++all computer-based clocks that track civil time.  To represent this
++data, the world is partitioned into regions whose clocks all agree
++about time stamps that occur after the somewhat-arbitrary cutoff point
++of the POSIX Epoch (1970-01-01 00:00:00 UTC).  For each such region,
++the database records all known clock transitions, and labels the region
++with a notable location.  Although 1970 is a somewhat-arbitrary
++cutoff, there are significant challenges to moving the cutoff earlier
++even by a decade or two, due to the wide variety of local practices
++before computer timekeeping became prevalent.
++
++Clock transitions before 1970 are recorded for each such location,
++because most systems support time stamps before 1970 and could
++misbehave if data entries were omitted for pre-1970 transitions.
++However, the database is not designed for and does not suffice for
++applications requiring accurate handling of all past times everywhere,
++as it would take far too much effort and guesswork to record all
++details of pre-1970 civil timekeeping.
++
++As described below, reference source code for using the tz database is
++also available.  The tz code is upwards compatible with POSIX, an
++international standard for UNIX-like systems.  As of this writing, the
++current edition of POSIX is:
++
++  The Open Group Base Specifications Issue 7
++  IEEE Std 1003.1, 2013 Edition
++  <http://pubs.opengroup.org/onlinepubs/9699919799/>
++
++
++
++----- Names of time zone rules -----
++
++Each of the database's time zone rules has a unique name.
++Inexperienced users are not expected to select these names unaided.
++Distributors should provide documentation and/or a simple selection
++interface that explains the names; for one example, see the 'tzselect'
++program in the tz code.  The Unicode Common Locale Data Repository
++<http://cldr.unicode.org/> contains data that may be useful for other
++selection interfaces.
++
++The time zone rule naming conventions attempt to strike a balance
++among the following goals:
++
++ * Uniquely identify every region where clocks have agreed since 1970.
++   This is essential for the intended use: static clocks keeping local
++   civil time.
++
++ * Indicate to experts where that region is.
++
++ * Be robust in the presence of political changes.  For example, names
++   of countries are ordinarily not used, to avoid incompatibilities
++   when countries change their name (e.g. Zaire->Congo) or when
++   locations change countries (e.g. Hong Kong from UK colony to
++   China).
++
++ * Be portable to a wide variety of implementations.
++
++ * Use a consistent naming conventions over the entire world.
++
++Names normally have the form AREA/LOCATION, where AREA is the name
++of a continent or ocean, and LOCATION is the name of a specific
++location within that region.  North and South America share the same
++area, 'America'.  Typical names are 'Africa/Cairo', 'America/New_York',
++and 'Pacific/Honolulu'.
++
++Here are the general rules used for choosing location names,
++in decreasing order of importance:
++
++	Use only valid POSIX file name components (i.e., the parts of
++		names other than '/').  Do not use the file name
++		components '.' and '..'.  Within a file name component,
++		use only ASCII letters, '.', '-' and '_'.  Do not use
++		digits, as that might create an ambiguity with POSIX
++		TZ strings.  A file name component must not exceed 14
++		characters or start with '-'.  E.g., prefer 'Brunei'
++		to 'Bandar_Seri_Begawan'.  Exceptions: see the discussion
++		of legacy names below.
++	A name must not be empty, or contain '//', or start or end with '/'.
++	Do not use names that differ only in case.  Although the reference
++		implementation is case-sensitive, some other implementations
++		are not, and they would mishandle names differing only in case.
++	If one name A is an initial prefix of another name AB (ignoring case),
++		then B must not start with '/', as a regular file cannot have
++		the same name as a directory in POSIX.  For example,
++		'America/New_York' precludes 'America/New_York/Bronx'.
++	Uninhabited regions like the North Pole and Bouvet Island
++		do not need locations, since local time is not defined there.
++	There should typically be at least one name for each ISO 3166-1
++		officially assigned two-letter code for an inhabited country
++		or territory.
++	If all the clocks in a region have agreed since 1970,
++		don't bother to include more than one location
++		even if subregions' clocks disagreed before 1970.
++		Otherwise these tables would become annoyingly large.
++	If a name is ambiguous, use a less ambiguous alternative;
++		e.g. many cities are named San José and Georgetown, so
++		prefer 'Costa_Rica' to 'San_Jose' and 'Guyana' to 'Georgetown'.
++	Keep locations compact.  Use cities or small islands, not countries
++		or regions, so that any future time zone changes do not split
++		locations into different time zones.  E.g. prefer 'Paris'
++		to 'France', since France has had multiple time zones.
++	Use mainstream English spelling, e.g. prefer 'Rome' to 'Roma', and
++		prefer 'Athens' to the Greek 'Αθήνα' or the Romanized 'Athína'.
++		The POSIX file name restrictions encourage this rule.
++	Use the most populous among locations in a zone,
++		e.g. prefer 'Shanghai' to 'Beijing'.  Among locations with
++		similar populations, pick the best-known location,
++		e.g. prefer 'Rome' to 'Milan'.
++	Use the singular form, e.g. prefer 'Canary' to 'Canaries'.
++	Omit common suffixes like '_Islands' and '_City', unless that
++		would lead to ambiguity.  E.g. prefer 'Cayman' to
++		'Cayman_Islands' and 'Guatemala' to 'Guatemala_City',
++		but prefer 'Mexico_City' to 'Mexico' because the country
++		of Mexico has several time zones.
++	Use '_' to represent a space.
++	Omit '.' from abbreviations in names, e.g. prefer 'St_Helena'
++		to 'St._Helena'.
++	Do not change established names if they only marginally
++		violate the above rules.  For example, don't change
++		the existing name 'Rome' to 'Milan' merely because
++		Milan's population has grown to be somewhat greater
++		than Rome's.
++	If a name is changed, put its old spelling in the 'backward' file.
++		This means old spellings will continue to work.
++
++The file 'zone1970.tab' lists geographical locations used to name time
++zone rules.  It is intended to be an exhaustive list of names for
++geographic regions as described above; this is a subset of the names
++in the data.  Although a 'zone1970.tab' location's longitude
++corresponds to its LMT offset with one hour for every 15 degrees east
++longitude, this relationship is not exact.
++
++Older versions of this package used a different naming scheme,
++and these older names are still supported.
++See the file 'backward' for most of these older names
++(e.g., 'US/Eastern' instead of 'America/New_York').
++The other old-fashioned names still supported are
++'WET', 'CET', 'MET', and 'EET' (see the file 'europe').
++
++Older versions of this package defined legacy names that are
++incompatible with the first rule of location names, but which are
++still supported.  These legacy names are mostly defined in the file
++'etcetera'.  Also, the file 'backward' defines the legacy names
++'GMT0', 'GMT-0', 'GMT+0' and 'Canada/East-Saskatchewan', and the file
++'northamerica' defines the legacy names 'EST5EDT', 'CST6CDT',
++'MST7MDT', and 'PST8PDT'.
++
++Excluding 'backward' should not affect the other data.  If
++'backward' is excluded, excluding 'etcetera' should not affect the
++remaining data.
++
++
++----- Time zone abbreviations -----
++
++When this package is installed, it generates time zone abbreviations
++like 'EST' to be compatible with human tradition and POSIX.
++Here are the general rules used for choosing time zone abbreviations,
++in decreasing order of importance:
++
++	Use three or more characters that are ASCII alphanumerics or '+' or '-'.
++		Previous editions of this database also used characters like
++		' ' and '?', but these characters have a special meaning to
++		the shell and cause commands like
++			set `date`
++		to have unexpected effects.
++		Previous editions of this rule required upper-case letters,
++		but the Congressman who introduced Chamorro Standard Time
++		preferred "ChST", so lower-case letters are now allowed.
++		Also, POSIX from 2001 on relaxed the rule to allow '-', '+',
++		and alphanumeric characters from the portable character set
++		in the current locale.  In practice ASCII alphanumerics and
++		'+' and '-' are safe in all locales.
++
++		In other words, in the C locale the POSIX extended regular
++		expression [-+[:alnum:]]{3,} should match the abbreviation.
++		This guarantees that all abbreviations could have been
++		specified by a POSIX TZ string.
++
++	Use abbreviations that are in common use among English-speakers,
++		e.g. 'EST' for Eastern Standard Time in North America.
++		We assume that applications translate them to other languages
++		as part of the normal localization process; for example,
++		a French application might translate 'EST' to 'HNE'.
++
++	For zones whose times are taken from a city's longitude, use the
++		traditional xMT notation, e.g. 'PMT' for Paris Mean Time.
++		The only name like this in current use is 'GMT'.
++
++	Use 'LMT' for local mean time of locations before the introduction
++		of standard time; see "Scope of the tz database".
++
++	If there is no common English abbreviation, use numeric offsets like
++		-05 and +0830 that are generated by zic's %z notation.
++
++    [The remaining guidelines predate the introduction of %z.
++    They are problematic as they mean tz data entries invent
++    notation rather than record it.  These guidelines are now
++    deprecated and the plan is to gradually move to %z for
++    inhabited locations and to "-00" for uninhabited locations.]
++
++	If there is no common English abbreviation, abbreviate the English
++		translation of the usual phrase used by native speakers.
++		If this is not available or is a phrase mentioning the country
++		(e.g. "Cape Verde Time"), then:
++
++		When a country is identified with a single or principal zone,
++			append 'T' to the country's ISO	code, e.g. 'CVT' for
++			Cape Verde Time.  For summer time append 'ST';
++			for double summer time append 'DST'; etc.
++		Otherwise, take the first three letters of an English place
++			name identifying each zone and append 'T', 'ST', etc.
++			as before; e.g. 'VLAST' for VLAdivostok Summer Time.
++
++	Use UT (with time zone abbreviation '-00') for locations while
++		uninhabited.  The leading '-' is a flag that the time
++		zone is in some sense undefined; this notation is
++		derived from Internet RFC 3339.
++
++Application writers should note that these abbreviations are ambiguous
++in practice: e.g. 'CST' has a different meaning in China than
++it does in the United States.  In new applications, it's often better
++to use numeric UT offsets like '-0600' instead of time zone
++abbreviations like 'CST'; this avoids the ambiguity.
++
++
++----- Accuracy of the tz database -----
++
++The tz database is not authoritative, and it surely has errors.
++Corrections are welcome and encouraged; see the file CONTRIBUTING.
++Users requiring authoritative data should consult national standards
++bodies and the references cited in the database's comments.
++
++Errors in the tz database arise from many sources:
++
++ * The tz database predicts future time stamps, and current predictions
++   will be incorrect after future governments change the rules.
++   For example, if today someone schedules a meeting for 13:00 next
++   October 1, Casablanca time, and tomorrow Morocco changes its
++   daylight saving rules, software can mess up after the rule change
++   if it blithely relies on conversions made before the change.
++
++ * The pre-1970 entries in this database cover only a tiny sliver of how
++   clocks actually behaved; the vast majority of the necessary
++   information was lost or never recorded.  Thousands more zones would
++   be needed if the tz database's scope were extended to cover even
++   just the known or guessed history of standard time; for example,
++   the current single entry for France would need to split into dozens
++   of entries, perhaps hundreds.  And in most of the world even this
++   approach would be misleading due to widespread disagreement or
++   indifference about what times should be observed.  In her 2015 book
++   "The Global Transformation of Time, 1870-1950", Vanessa Ogle writes
++   "Outside of Europe and North America there was no system of time
++   zones at all, often not even a stable landscape of mean times,
++   prior to the middle decades of the twentieth century".  See:
++   Timothy Shenk, Booked: A Global History of Time. Dissent 2015-12-17
++   https://www.dissentmagazine.org/blog/booked-a-global-history-of-time-vanessa-ogle
++
++ * Most of the pre-1970 data entries come from unreliable sources, often
++   astrology books that lack citations and whose compilers evidently
++   invented entries when the true facts were unknown, without
++   reporting which entries were known and which were invented.
++   These books often contradict each other or give implausible entries,
++   and on the rare occasions when they are checked they are
++   typically found to be incorrect.
++
++ * For the UK the tz database relies on years of first-class work done by
++   Joseph Myers and others; see <http://www.polyomino.org.uk/british-time/>.
++   Other countries are not done nearly as well.
++
++ * Sometimes, different people in the same city would maintain clocks
++   that differed significantly.  Railway time was used by railroad
++   companies (which did not always agree with each other),
++   church-clock time was used for birth certificates, etc.
++   Often this was merely common practice, but sometimes it was set by law.
++   For example, from 1891 to 1911 the UT offset in France was legally
++   0:09:21 outside train stations and 0:04:21 inside.
++
++ * Although a named location in the tz database stands for the
++   containing region, its pre-1970 data entries are often accurate for
++   only a small subset of that region.  For example, Europe/London
++   stands for the United Kingdom, but its pre-1847 times are valid
++   only for locations that have London's exact meridian, and its 1847
++   transition to GMT is known to be valid only for the L&NW and the
++   Caledonian railways.
++
++ * The tz database does not record the earliest time for which a zone's
++   data entries are thereafter valid for every location in the region.
++   For example, Europe/London is valid for all locations in its
++   region after GMT was made the standard time, but the date of
++   standardization (1880-08-02) is not in the tz database, other than
++   in commentary.  For many zones the earliest time of validity is
++   unknown.
++
++ * The tz database does not record a region's boundaries, and in many
++   cases the boundaries are not known.  For example, the zone
++   America/Kentucky/Louisville represents a region around the city of
++   Louisville, the boundaries of which are unclear.
++
++ * Changes that are modeled as instantaneous transitions in the tz
++   database were often spread out over hours, days, or even decades.
++
++ * Even if the time is specified by law, locations sometimes
++   deliberately flout the law.
++
++ * Early timekeeping practices, even assuming perfect clocks, were
++   often not specified to the accuracy that the tz database requires.
++
++ * Sometimes historical timekeeping was specified more precisely
++   than what the tz database can handle.  For example, from 1909 to
++   1937 Netherlands clocks were legally UT +00:19:32.13, but the tz
++   database cannot represent the fractional second.
++
++ * Even when all the timestamp transitions recorded by the tz database
++   are correct, the tz rules that generate them may not faithfully
++   reflect the historical rules.  For example, from 1922 until World
++   War II the UK moved clocks forward the day following the third
++   Saturday in April unless that was Easter, in which case it moved
++   clocks forward the previous Sunday.  Because the tz database has no
++   way to specify Easter, these exceptional years are entered as
++   separate tz Rule lines, even though the legal rules did not change.
++
++ * The tz database models pre-standard time using the proleptic Gregorian
++   calendar and local mean time (LMT), but many people used other
++   calendars and other timescales.  For example, the Roman Empire used
++   the Julian calendar, and had 12 varying-length daytime hours with a
++   non-hour-based system at night.
++
++ * Early clocks were less reliable, and data entries do not represent
++   this unreliability.
++
++ * As for leap seconds, civil time was not based on atomic time before
++   1972, and we don't know the history of earth's rotation accurately
++   enough to map SI seconds to historical solar time to more than
++   about one-hour accuracy.  See: Morrison LV, Stephenson FR.
++   Historical values of the Earth's clock error Delta T and the
++   calculation of eclipses. J Hist Astron. 2004;35:327-36
++   <http://adsabs.harvard.edu/full/2004JHA....35..327M>;
++   Historical values of the Earth's clock error. J Hist Astron. 2005;36:339
++   <http://adsabs.harvard.edu/full/2005JHA....36..339M>.
++
++ * The relationship between POSIX time (that is, UTC but ignoring leap
++   seconds) and UTC is not agreed upon after 1972.  Although the POSIX
++   clock officially stops during an inserted leap second, at least one
++   proposed standard has it jumping back a second instead; and in
++   practice POSIX clocks more typically either progress glacially during
++   a leap second, or are slightly slowed while near a leap second.
++
++ * The tz database does not represent how uncertain its information is.
++   Ideally it would contain information about when data entries are
++   incomplete or dicey.  Partial temporal knowledge is a field of
++   active research, though, and it's not clear how to apply it here.
++
++In short, many, perhaps most, of the tz database's pre-1970 and future
++time stamps are either wrong or misleading.  Any attempt to pass the
++tz database off as the definition of time should be unacceptable to
++anybody who cares about the facts.  In particular, the tz database's
++LMT offsets should not be considered meaningful, and should not prompt
++creation of zones merely because two locations differ in LMT or
++transitioned to standard time at different dates.
++
++
++----- Time and date functions -----
++
++The tz code contains time and date functions that are upwards
++compatible with those of POSIX.
++
++POSIX has the following properties and limitations.
++
++*	In POSIX, time display in a process is controlled by the
++	environment variable TZ.  Unfortunately, the POSIX TZ string takes
++	a form that is hard to describe and is error-prone in practice.
++	Also, POSIX TZ strings can't deal with other (for example, Israeli)
++	daylight saving time rules, or situations where more than two
++	time zone abbreviations are used in an area.
++
++	The POSIX TZ string takes the following form:
++
++		stdoffset[dst[offset][,date[/time],date[/time]]]
++
++	where:
++
++	std and dst
++		are 3 or more characters specifying the standard
++		and daylight saving time (DST) zone names.
++		Starting with POSIX.1-2001, std and dst may also be
++		in a quoted form like "<UTC+10>"; this allows
++		"+" and "-" in the names.
++	offset
++		is of the form '[+-]hh:[mm[:ss]]' and specifies the
++		offset west of UT.  'hh' may be a single digit; 0<=hh<=24.
++		The default DST offset is one hour ahead of standard time.
++	date[/time],date[/time]
++		specifies the beginning and end of DST.  If this is absent,
++		the system supplies its own rules for DST, and these can
++		differ from year to year; typically US DST rules are used.
++	time
++		takes the form 'hh:[mm[:ss]]' and defaults to 02:00.
++		This is the same format as the offset, except that a
++		leading '+' or '-' is not allowed.
++	date
++		takes one of the following forms:
++		Jn (1<=n<=365)
++			origin-1 day number not counting February 29
++		n (0<=n<=365)
++			origin-0 day number counting February 29 if present
++		Mm.n.d (0[Sunday]<=d<=6[Saturday], 1<=n<=5, 1<=m<=12)
++			for the dth day of week n of month m of the year,
++			where week 1 is the first week in which day d appears,
++			and '5' stands for the last week in which day d appears
++			(which may be either the 4th or 5th week).
++			Typically, this is the only useful form;
++			the n and Jn forms are rarely used.
++
++	Here is an example POSIX TZ string, for US Pacific time using rules
++	appropriate from 1987 through 2006:
++
++		TZ='PST8PDT,M4.1.0/02:00,M10.5.0/02:00'
++
++	This POSIX TZ string is hard to remember, and mishandles time stamps
++	before 1987 and after 2006.  With this package you can use this
++	instead:
++
++		TZ='America/Los_Angeles'
++
++*	POSIX does not define the exact meaning of TZ values like "EST5EDT".
++	Typically the current US DST rules are used to interpret such values,
++	but this means that the US DST rules are compiled into each program
++	that does time conversion.  This means that when US time conversion
++	rules change (as in the United States in 1987), all programs that
++	do time conversion must be recompiled to ensure proper results.
++
++*	The TZ environment variable is process-global, which makes it hard
++	to write efficient, thread-safe applications that need access
++	to multiple time zones.
++
++*	In POSIX, there's no tamper-proof way for a process to learn the
++	system's best idea of local wall clock.  (This is important for
++	applications that an administrator wants used only at certain times -
++	without regard to whether the user has fiddled the "TZ" environment
++	variable.  While an administrator can "do everything in UTC" to get
++	around the problem, doing so is inconvenient and precludes handling
++	daylight saving time shifts - as might be required to limit phone
++	calls to off-peak hours.)
++
++*	POSIX provides no convenient and efficient way to determine the UT
++	offset and time zone abbreviation of arbitrary time stamps,
++	particularly for time zone settings that do not fit into the
++	POSIX model.
++
++*	POSIX requires that systems ignore leap seconds.
++
++*	The tz code attempts to support all the time_t implementations
++	allowed by POSIX.  The time_t type represents a nonnegative count of
++	seconds since 1970-01-01 00:00:00 UTC, ignoring leap seconds.
++	In practice, time_t is usually a signed 64- or 32-bit integer; 32-bit
++	signed time_t values stop working after 2038-01-19 03:14:07 UTC, so
++	new implementations these days typically use a signed 64-bit integer.
++	Unsigned 32-bit integers are used on one or two platforms,
++	and 36-bit and 40-bit integers are also used occasionally.
++	Although earlier POSIX versions allowed time_t to be a
++	floating-point type, this was not supported by any practical
++	systems, and POSIX.1-2013 and the tz code both require time_t
++	to be an integer type.
++
++These are the extensions that have been made to the POSIX functions:
++
++*	The "TZ" environment variable is used in generating the name of a file
++	from which time zone information is read (or is interpreted a la
++	POSIX); "TZ" is no longer constrained to be a three-letter time zone
++	name followed by a number of hours and an optional three-letter
++	daylight time zone name.  The daylight saving time rules to be used
++	for a particular time zone are encoded in the time zone file;
++	the format of the file allows U.S., Australian, and other rules to be
++	encoded, and allows for situations where more than two time zone
++	abbreviations are used.
++
++	It was recognized that allowing the "TZ" environment variable to
++	take on values such as "America/New_York" might cause "old" programs
++	(that expect "TZ" to have a certain form) to operate incorrectly;
++	consideration was given to using some other environment variable
++	(for example, "TIMEZONE") to hold the string used to generate the
++	time zone information file name.  In the end, however, it was decided
++	to continue using "TZ": it is widely used for time zone purposes;
++	separately maintaining both "TZ" and "TIMEZONE" seemed a nuisance;
++	and systems where "new" forms of "TZ" might cause problems can simply
++	use TZ values such as "EST5EDT" which can be used both by
++	"new" programs (a la POSIX) and "old" programs (as zone names and
++	offsets).
++
++*	The code supports platforms with a UT offset member in struct tm,
++	e.g., tm_gmtoff.
++
++*	The code supports platforms with a time zone abbreviation member in
++	struct tm, e.g., tm_zone.
++
++*	Since the "TZ" environment variable can now be used to control time
++	conversion, the "daylight" and "timezone" variables are no longer
++	needed.  (These variables are defined and set by "tzset"; however, their
++	values will not be used by "localtime.")
++
++*	Functions tzalloc, tzfree, localtime_rz, and mktime_z for
++	more-efficient thread-safe applications that need to use
++	multiple time zones.  The tzalloc and tzfree functions
++	allocate and free objects of type timezone_t, and localtime_rz
++	and mktime_z are like localtime_r and mktime with an extra
++	timezone_t argument.  The functions were inspired by NetBSD.
++
++*	A function "tzsetwall" has been added to arrange for the system's
++	best approximation to local wall clock time to be delivered by
++	subsequent calls to "localtime."  Source code for portable
++	applications that "must" run on local wall clock time should call
++	"tzsetwall();" if such code is moved to "old" systems that don't
++	provide tzsetwall, you won't be able to generate an executable program.
++	(These time zone functions also arrange for local wall clock time to be
++	used if tzset is called - directly or indirectly - and there's no "TZ"
++	environment variable; portable applications should not, however, rely
++	on this behavior since it's not the way SVR2 systems behave.)
++
++*	Negative time_t values are supported, on systems where time_t is signed.
++
++*	These functions can account for leap seconds, thanks to Bradley White.
++
++Points of interest to folks with other systems:
++
++*	Code compatible with this package is already part of many platforms,
++	including GNU/Linux, Android, the BSDs, Chromium OS, Cygwin, AIX, iOS,
++	BlackBery 10, macOS, Microsoft Windows, OpenVMS, and Solaris.
++	On such hosts, the primary use of this package
++	is to update obsolete time zone rule tables.
++	To do this, you may need to compile the time zone compiler
++	'zic' supplied with this package instead of using the system 'zic',
++	since the format of zic's input is occasionally extended,
++	and a platform may still be shipping an older zic.
++
++*	The UNIX Version 7 "timezone" function is not present in this package;
++	it's impossible to reliably map timezone's arguments (a "minutes west
++	of GMT" value and a "daylight saving time in effect" flag) to a
++	time zone abbreviation, and we refuse to guess.
++	Programs that in the past used the timezone function may now examine
++	tzname[localtime(&clock)->tm_isdst] to learn the correct time
++	zone abbreviation to use.  Alternatively, use
++	localtime(&clock)->tm_zone if this has been enabled.
++
++*	The 4.2BSD gettimeofday function is not used in this package.
++	This formerly let users obtain the current UTC offset and DST flag,
++	but this functionality was removed in later versions of BSD.
++
++*	In SVR2, time conversion fails for near-minimum or near-maximum
++	time_t values when doing conversions for places that don't use UT.
++	This package takes care to do these conversions correctly.
++	A comment in the source code tells how to get compatibly wrong
++	results.
++
++The functions that are conditionally compiled if STD_INSPIRED is defined
++should, at this point, be looked on primarily as food for thought.  They are
++not in any sense "standard compatible" - some are not, in fact, specified in
++*any* standard.  They do, however, represent responses of various authors to
++standardization proposals.
++
++Other time conversion proposals, in particular the one developed by folks at
++Hewlett Packard, offer a wider selection of functions that provide capabilities
++beyond those provided here.  The absence of such functions from this package
++is not meant to discourage the development, standardization, or use of such
++functions.  Rather, their absence reflects the decision to make this package
++contain valid extensions to POSIX, to ensure its broad acceptability.  If
++more powerful time conversion functions can be standardized, so much the
++better.
++
++
++----- Interface stability -----
++
++The tz code and data supply the following interfaces:
++
++ * A set of zone names as per "Names of time zone rules" above.
++
++ * Library functions described in "Time and date functions" above.
++
++ * The programs tzselect, zdump, and zic, documented in their man pages.
++
++ * The format of zic input files, documented in the zic man page.
++
++ * The format of zic output files, documented in the tzfile man page.
++
++ * The format of zone table files, documented in zone1970.tab.
++
++ * The format of the country code file, documented in iso3166.tab.
++
++When these interfaces are changed, an effort is made to preserve
++backward compatibility.  For example, tz data files typically do not
++rely on recently-added zic features, so that users can run older zic
++versions to process newer data files.
++
++Interfaces not listed above are less stable.  For example, users
++should not rely on particular UT offsets or abbreviations for time
++stamps, as data entries are often based on guesswork and these guesses
++may be corrected or improved.
++
++
++----- Calendrical issues -----
++
++Calendrical issues are a bit out of scope for a time zone database,
++but they indicate the sort of problems that we would run into if we
++extended the time zone database further into the past.  An excellent
++resource in this area is Nachum Dershowitz and Edward M. Reingold,
++Calendrical Calculations: Third Edition, Cambridge University Press (2008)
++<http://emr.cs.iit.edu/home/reingold/calendar-book/third-edition/>.
++Other information and sources are given below.  They sometimes disagree.
++
++
++France
++
++Gregorian calendar adopted 1582-12-20.
++French Revolutionary calendar used 1793-11-24 through 1805-12-31,
++and (in Paris only) 1871-05-06 through 1871-05-23.
++
++
++Russia
++
++From Chris Carrier (1996-12-02):
++On 1929-10-01 the Soviet Union instituted an "Eternal Calendar"
++with 30-day months plus 5 holidays, with a 5-day week.
++On 1931-12-01 it changed to a 6-day week; in 1934 it reverted to the
++Gregorian calendar while retaining the 6-day week; on 1940-06-27 it
++reverted to the 7-day week.  With the 6-day week the usual days
++off were the 6th, 12th, 18th, 24th and 30th of the month.
++(Source: Evitiar Zerubavel, _The Seven Day Circle_)
++
++
++Mark Brader reported a similar story in "The Book of Calendars", edited
++by Frank Parise (1982, Facts on File, ISBN 0-8719-6467-8), page 377.  But:
++
++From: Petteri Sulonen (via Usenet)
++Date: 14 Jan 1999 00:00:00 GMT
++...
++
++If your source is correct, how come documents between 1929 and 1940 were
++still dated using the conventional, Gregorian calendar?
++
++I can post a scan of a document dated December 1, 1934, signed by
++Yenukidze, the secretary, on behalf of Kalinin, the President of the
++Executive Committee of the Supreme Soviet, if you like.
++
++
++
++Sweden (and Finland)
++
++From: Mark Brader
++Subject: Re: Gregorian reform - a part of locale?
++<news:1996Jul6.012937.29190@sq.com>
++Date: 1996-07-06
++
++In 1700, Denmark made the transition from Julian to Gregorian.  Sweden
++decided to *start* a transition in 1700 as well, but rather than have one of
++those unsightly calendar gaps :-), they simply decreed that the next leap
++year after 1696 would be in 1744 - putting the whole country on a calendar
++different from both Julian and Gregorian for a period of 40 years.
++
++However, in 1704 something went wrong and the plan was not carried through;
++they did, after all, have a leap year that year.  And one in 1708.  In 1712
++they gave it up and went back to Julian, putting 30 days in February that
++year!...
++
++Then in 1753, Sweden made the transition to Gregorian in the usual manner,
++getting there only 13 years behind the original schedule.
++
++(A previous posting of this story was challenged, and Swedish readers
++produced the following references to support it: "Tideräkning och historia"
++by Natanael Beckman (1924) and "Tid, en bok om tideräkning och
++kalenderväsen" by Lars-Olof Lodén (1968).
++
++
++Grotefend's data
++
++From: "Michael Palmer" [with one obvious typo fixed]
++Subject: Re: Gregorian Calendar (was Re: Another FHC related question
++Newsgroups: soc.genealogy.german
++Date: Tue, 9 Feb 1999 02:32:48 -800
++...
++
++The following is a(n incomplete) listing, arranged chronologically, of
++European states, with the date they converted from the Julian to the
++Gregorian calendar:
++
++04/15 Oct 1582 - Italy (with exceptions), Spain, Portugal, Poland (Roman
++                 Catholics and Danzig only)
++09/20 Dec 1582 - France, Lorraine
++
++21 Dec 1582/
++   01 Jan 1583 - Holland, Brabant, Flanders, Hennegau
++10/21 Feb 1583 - bishopric of Liege (Lüttich)
++13/24 Feb 1583 - bishopric of Augsburg
++04/15 Oct 1583 - electorate of Trier
++05/16 Oct 1583 - Bavaria, bishoprics of Freising, Eichstedt, Regensburg,
++                 Salzburg, Brixen
++13/24 Oct 1583 - Austrian Oberelsaß and Breisgau
++20/31 Oct 1583 - bishopric of Basel
++02/13 Nov 1583 - duchy of Jülich-Berg
++02/13 Nov 1583 - electorate and city of Köln
++04/15 Nov 1583 - bishopric of Würzburg
++11/22 Nov 1583 - electorate of Mainz
++16/27 Nov 1583 - bishopric of Strassburg and the margraviate of Baden
++17/28 Nov 1583 - bishopric of Münster and duchy of Cleve
++14/25 Dec 1583 - Steiermark
++
++06/17 Jan 1584 - Austria and Bohemia
++11/22 Jan 1584 - Lucerne, Uri, Schwyz, Zug, Freiburg, Solothurn
++12/23 Jan 1584 - Silesia and the Lausitz
++22 Jan/
++   02 Feb 1584 - Hungary (legally on 21 Oct 1587)
++      Jun 1584 - Unterwalden
++01/12 Jul 1584 - duchy of Westfalen
++
++16/27 Jun 1585 - bishopric of Paderborn
++
++14/25 Dec 1590 - Transylvania
++
++22 Aug/
++   02 Sep 1612 - duchy of Prussia
++
++13/24 Dec 1614 - Pfalz-Neuburg
++
++          1617 - duchy of Kurland (reverted to the Julian calendar in
++                 1796)
++
++          1624 - bishopric of Osnabrück
++
++          1630 - bishopric of Minden
++
++15/26 Mar 1631 - bishopric of Hildesheim
++
++          1655 - Kanton Wallis
++
++05/16 Feb 1682 - city of Strassburg
++
++18 Feb/
++   01 Mar 1700 - Protestant Germany (including Swedish possessions in
++                 Germany), Denmark, Norway
++30 Jun/
++   12 Jul 1700 - Gelderland, Zutphen
++10 Nov/
++   12 Dec 1700 - Utrecht, Overijssel
++
++31 Dec 1700/
++   12 Jan 1701 - Friesland, Groningen, Zürich, Bern, Basel, Geneva,
++                 Turgau, and Schaffhausen
++
++          1724 - Glarus, Appenzell, and the city of St. Gallen
++
++01 Jan 1750    - Pisa and Florence
++
++02/14 Sep 1752 - Great Britain
++
++17 Feb/
++   01 Mar 1753 - Sweden
++
++1760-1812      - Graubünden
++
++The Russian empire (including Finland and the Baltic states) did not
++convert to the Gregorian calendar until the Soviet revolution of 1917.
++
++Source: H. Grotefend, _Taschenbuch der Zeitrechnung des deutschen
++Mittelalters und der Neuzeit_, herausgegeben von Dr. O. Grotefend
++(Hannover: Hahnsche Buchhandlung, 1941), pp. 26-28.
++
++
++----- Time and time zones on Mars -----
++
++Some people's work schedules use Mars time.  Jet Propulsion Laboratory
++(JPL) coordinators have kept Mars time on and off at least since 1997
++for the Mars Pathfinder mission.  Some of their family members have
++also adapted to Mars time.  Dozens of special Mars watches were built
++for JPL workers who kept Mars time during the Mars Exploration
++Rovers mission (2004).  These timepieces look like normal Seikos and
++Citizens but use Mars seconds rather than terrestrial seconds.
++
++A Mars solar day is called a "sol" and has a mean period equal to
++about 24 hours 39 minutes 35.244 seconds in terrestrial time.  It is
++divided into a conventional 24-hour clock, so each Mars second equals
++about 1.02749125 terrestrial seconds.
++
++The prime meridian of Mars goes through the center of the crater
++Airy-0, named in honor of the British astronomer who built the
++Greenwich telescope that defines Earth's prime meridian.  Mean solar
++time on the Mars prime meridian is called Mars Coordinated Time (MTC).
++
++Each landed mission on Mars has adopted a different reference for
++solar time keeping, so there is no real standard for Mars time zones.
++For example, the Mars Exploration Rover project (2004) defined two
++time zones "Local Solar Time A" and "Local Solar Time B" for its two
++missions, each zone designed so that its time equals local true solar
++time at approximately the middle of the nominal mission.  Such a "time
++zone" is not particularly suited for any application other than the
++mission itself.
++
++Many calendars have been proposed for Mars, but none have achieved
++wide acceptance.  Astronomers often use Mars Sol Date (MSD) which is a
++sequential count of Mars solar days elapsed since about 1873-12-29
++12:00 GMT.
++
++The tz database does not currently support Mars time, but it is
++documented here in the hopes that support will be added eventually.
++
++Sources:
++
++Michael Allison and Robert Schmunk,
++"Technical Notes on Mars Solar Time as Adopted by the Mars24 Sunclock"
++<http://www.giss.nasa.gov/tools/mars24/help/notes.html> (2012-08-08).
++
++Jia-Rui Chong, "Workdays Fit for a Martian", Los Angeles Times
++<http://articles.latimes.com/2004/jan/14/science/sci-marstime14>
++(2004-01-14), pp A1, A20-A21.
++
++Tom Chmielewski, "Jet Lag Is Worse on Mars", The Atlantic (2015-02-26)
++<http://www.theatlantic.com/technology/archive/2015/02/jet-lag-is-worse-on-mars/386033/>
++
++-----
++
++This file is in the public domain, so clarified as of 2009-05-17 by
++Arthur David Olson.
++
++-----
++Local Variables:
++coding: utf-8
++End:
+--- contrib/tzdata/africa.orig
++++ contrib/tzdata/africa
+@@ -1,32 +1,32 @@
+ # This file is in the public domain, so clarified as of
+ # 2009-05-17 by Arthur David Olson.
+ 
+-# This data is by no means authoritative; if you think you know better,
++# This file is by no means authoritative; if you think you know better,
+ # go ahead and edit the file (and please send any changes to
+-# tz@iana.org for general use in the future).
++# tz@iana.org for general use in the future).  For more, please see
++# the file CONTRIBUTING in the tz distribution.
+ 
+-# From Paul Eggert (2013-02-21):
++# From Paul Eggert (2014-10-31):
+ #
+-# A good source for time zone historical data outside the U.S. is
++# Unless otherwise specified, the source for data through 1990 is:
+ # Thomas G. Shanks and Rique Pottenger, The International Atlas (6th edition),
+ # San Diego: ACS Publications, Inc. (2003).
++# Unfortunately this book contains many errors and cites no sources.
+ #
+ # Gwillim Law writes that a good source
+ # for recent time zone data is the International Air Transport
+ # Association's Standard Schedules Information Manual (IATA SSIM),
+ # published semiannually.  Law sent in several helpful summaries
+-# of the IATA's data after 1990.
+-#
+-# Except where otherwise noted, Shanks & Pottenger is the source for
+-# entries through 1990, and IATA SSIM is the source for entries afterwards.
++# of the IATA's data after 1990.  Except where otherwise noted,
++# IATA SSIM is the source for entries after 1990.
+ #
+ # Another source occasionally used is Edward W. Whitman, World Time Differences,
+ # Whitman Publishing Co, 2 Niagara Av, Ealing, London (undated), which
+ # I found in the UCLA library.
+ #
+ # For data circa 1899, a common source is:
+-# Milne J. Civil time. Geogr J. 1899 Feb;13(2):173-94
+-# <http://www.jstor.org/stable/1774359>.
++# Milne J. Civil time. Geogr J. 1899 Feb;13(2):173-94.
++# http://www.jstor.org/stable/1774359
+ #
+ # A reliable and entertaining source about time zones is
+ # Derek Howse, Greenwich time and longitude, Philip Wilson Publishers (1997).
+@@ -64,7 +64,6 @@
+ #	 3:00	CAST	Central Africa Summer Time (no longer used)
+ #	 3:00	SAST	South Africa Summer Time (no longer used)
+ #	 3:00	EAT	East Africa Time
+-#	 4:00	EAST	East Africa Summer Time (no longer used)
+ 
+ # Algeria
+ # Rule	NAME	FROM	TO	TYPE	IN	ON	AT	SAVE	LETTER/S
+@@ -93,9 +92,9 @@
+ # Shanks & Pottenger give 0:09:20 for Paris Mean Time; go with Howse's
+ # more precise 0:09:21.
+ # Zone	NAME		GMTOFF	RULES	FORMAT	[UNTIL]
+-Zone	Africa/Algiers	0:12:12 -	LMT	1891 Mar 15 0:01
+-			0:09:21	-	PMT	1911 Mar 11    # Paris Mean Time
+-			0:00	Algeria	WE%sT	1940 Feb 25 2:00
++Zone	Africa/Algiers	0:12:12 -	LMT	1891 Mar 15  0:01
++			0:09:21	-	PMT	1911 Mar 11 # Paris Mean Time
++			0:00	Algeria	WE%sT	1940 Feb 25  2:00
+ 			1:00	Algeria	CE%sT	1946 Oct  7
+ 			0:00	-	WET	1956 Jan 29
+ 			1:00	-	CET	1963 Apr 14
+@@ -105,82 +104,55 @@
+ 			1:00	-	CET
+ 
+ # Angola
+-# Zone	NAME		GMTOFF	RULES	FORMAT	[UNTIL]
+-Zone	Africa/Luanda	0:52:56	-	LMT	1892
+-			0:52:04	-	AOT	1911 May 26 # Angola Time
+-			1:00	-	WAT
+-
+ # Benin
+-# Whitman says they switched to 1:00 in 1946, not 1934;
+-# go with Shanks & Pottenger.
+-# Zone	NAME		GMTOFF	RULES	FORMAT	[UNTIL]
+-Zone Africa/Porto-Novo	0:10:28	-	LMT	1912
+-			0:00	-	GMT	1934 Feb 26
+-			1:00	-	WAT
++# See Africa/Lagos.
+ 
+ # Botswana
+-# From Paul Eggert (2013-02-21):
+-# Milne says they were regulated by the Cape Town Signal in 1899;
+-# assume they switched to 2:00 when Cape Town did.
+-# Zone	NAME		GMTOFF	RULES	FORMAT	[UNTIL]
+-Zone	Africa/Gaborone	1:43:40 -	LMT	1885
+-			1:30	-	SAST	1903 Mar
+-			2:00	-	CAT	1943 Sep 19 2:00
+-			2:00	1:00	CAST	1944 Mar 19 2:00
+-			2:00	-	CAT
++# See Africa/Maputo.
+ 
+ # Burkina Faso
+ # See Africa/Abidjan.
+ 
+ # Burundi
+-# Zone	NAME		GMTOFF	RULES	FORMAT	[UNTIL]
+-Zone Africa/Bujumbura	1:57:28	-	LMT	1890
+-			2:00	-	CAT
++# See Africa/Maputo.
+ 
+ # Cameroon
+-# Whitman says they switched to 1:00 in 1920; go with Shanks & Pottenger.
+-# Zone	NAME		GMTOFF	RULES	FORMAT	[UNTIL]
+-Zone	Africa/Douala	0:38:48	-	LMT	1912
+-			1:00	-	WAT
++# See Africa/Lagos.
+ 
+ # Cape Verde
++#
++# Shanks gives 1907 for the transition to CVT.
++# Perhaps the 1911-05-26 Portuguese decree
++# http://dre.pt/pdf1sdip/1911/05/12500/23132313.pdf
++# merely made it official?
++#
+ # Zone	NAME		GMTOFF	RULES	FORMAT	[UNTIL]
+-Zone Atlantic/Cape_Verde -1:34:04 -	LMT	1907			# Praia
++Zone Atlantic/Cape_Verde -1:34:04 -	LMT	1907        # Praia
+ 			-2:00	-	CVT	1942 Sep
+ 			-2:00	1:00	CVST	1945 Oct 15
+-			-2:00	-	CVT	1975 Nov 25 2:00
++			-2:00	-	CVT	1975 Nov 25  2:00
+ 			-1:00	-	CVT
+ 
+ # Central African Republic
+-# Zone	NAME		GMTOFF	RULES	FORMAT	[UNTIL]
+-Zone	Africa/Bangui	1:14:20	-	LMT	1912
+-			1:00	-	WAT
++# See Africa/Lagos.
+ 
+ # Chad
+ # Zone	NAME		GMTOFF	RULES	FORMAT	[UNTIL]
+-Zone	Africa/Ndjamena	1:00:12 -	LMT	1912 # N'Djamena
++Zone	Africa/Ndjamena	1:00:12 -	LMT	1912        # N'Djamena
+ 			1:00	-	WAT	1979 Oct 14
+ 			1:00	1:00	WAST	1980 Mar  8
+ 			1:00	-	WAT
+ 
+ # Comoros
+-# Zone	NAME		GMTOFF	RULES	FORMAT	[UNTIL]
+-Zone	Indian/Comoro	2:53:04 -	LMT	1911 Jul   # Moroni, Gran Comoro
+-			3:00	-	EAT
++# See Africa/Nairobi.
+ 
+-# Democratic Republic of Congo
+-# Zone	NAME		GMTOFF	RULES	FORMAT	[UNTIL]
+-Zone Africa/Kinshasa	1:01:12 -	LMT	1897 Nov 9
+-			1:00	-	WAT
+-Zone Africa/Lubumbashi	1:49:52 -	LMT	1897 Nov 9
+-			2:00	-	CAT
++# Democratic Republic of the Congo
++# See Africa/Lagos for the western part and Africa/Maputo for the eastern.
+ 
+ # Republic of the Congo
+-# Zone	NAME		GMTOFF	RULES	FORMAT	[UNTIL]
+-Zone Africa/Brazzaville	1:01:08 -	LMT	1912
+-			1:00	-	WAT
++# See Africa/Lagos.
+ 
+-# Côte D'Ivoire / Ivory Coast
++# Côte d'Ivoire / Ivory Coast
+ # Zone	NAME		GMTOFF	RULES	FORMAT	[UNTIL]
+ Zone	Africa/Abidjan	-0:16:08 -	LMT	1912
+ 			 0:00	-	GMT
+@@ -196,9 +168,7 @@
+ Link Africa/Abidjan Atlantic/St_Helena	# St Helena
+ 
+ # Djibouti
+-# Zone	NAME		GMTOFF	RULES	FORMAT	[UNTIL]
+-Zone	Africa/Djibouti	2:52:36 -	LMT	1911 Jul
+-			3:00	-	EAT
++# See Africa/Nairobi.
+ 
+ ###############################################################################
+ 
+@@ -327,7 +297,7 @@
+ # Egypt is to change back to Daylight system on May 15
+ # http://english.ahram.org.eg/NewsContent/1/64/100735/Egypt/Politics-/Egypts-government-to-reapply-daylight-saving-time-.aspx
+ 
+-# From Gunther Vermier (2015-05-13):
++# From Gunther Vermier (2014-05-13):
+ # our Egypt office confirms that the change will be at 15 May "midnight" (24:00)
+ 
+ # From Imed Chihi (2014-06-04):
+@@ -349,35 +319,36 @@
+ # above) says DST had no affect on electricity consumption.  There is
+ # no information about when DST will end this fall.  See:
+ # http://abcnews.go.com/International/wireStory/el-sissi-pushes-egyptians-line-23614833
+-#
+-# For now, guess that later spring and fall transitions will use
+-# 2010's rules, and guess that Egypt will switch to standard time at
+-# 24:00 the last Thursday before Ramadan, and back to DST at 00:00 the
+-# first Friday after Ramadan.  To implement this,
+-# transition dates for 2015 through 2037 were determined by running
+-# the following program under GNU Emacs 24.3, with the results integrated
+-# by hand into the table below.  Ramadan again intrudes on the guessed
+-# DST starting in 2038, but that's beyond our somewhat-arbitrary cutoff.
+-# (let ((islamic-year 1436))
+-#   (while (< islamic-year 1460)
+-#     (let ((a (calendar-islamic-to-absolute (list 9 1 islamic-year)))
+-#           (b (calendar-islamic-to-absolute (list 10 1 islamic-year)))
+-#           (friday 5))
+-#       (while (/= friday (mod a 7))
+-#         (setq a (1- a)))
+-#       (while (/= friday (mod b 7))
+-#         (setq b (1+ b)))
+-#       (setq a (1- a))
+-#       (setq b (1- b))
+-#       (setq a (calendar-gregorian-from-absolute a))
+-#       (setq b (calendar-gregorian-from-absolute b))
+-#       (insert
+-#        (format
+-#         (concat "Rule\tEgypt\t%d\tonly\t-\t%s\t%2d\t24:00\t0\t-\n"
+-#                 "Rule\tEgypt\t%d\tonly\t-\t%s\t%2d\t24:00\t1:00\tS\n")
+-#         (car (cdr (cdr a))) (calendar-month-name (car a) t) (car (cdr a))
+-#         (car (cdr (cdr b))) (calendar-month-name (car b) t) (car (cdr b)))))
+-#     (setq islamic-year (+ 1 islamic-year))))
++
++# From Steffen Thorsen (2015-04-08):
++# Egypt will start DST on midnight after Thursday, April 30, 2015.
++# This is based on a law (no 35) from May 15, 2014 saying it starts the last
++# Thursday of April....  Clocks will still be turned back for Ramadan, but
++# dates not yet announced....
++# http://almogaz.com/news/weird-news/2015/04/05/1947105 ...
++# http://www.timeanddate.com/news/time/egypt-starts-dst-2015.html
++
++# From Ahmed Nazmy (2015-04-20):
++# Egypt's ministers cabinet just announced ... that it will cancel DST at
++# least for 2015.
++#
++# From Tim Parenti (2015-04-20):
++# http://english.ahram.org.eg/WriterArticles/NewsContentP/1/128195/Egypt/No-daylight-saving-this-summer-Egypts-prime-minist.aspx
++# "Egypt's cabinet agreed on Monday not to switch clocks for daylight saving
++# time this summer, and carry out studies on the possibility of canceling the
++# practice altogether in future years."
++#
++# From Paul Eggert (2015-04-24):
++# Yesterday the office of Egyptian President El-Sisi announced his
++# decision to abandon DST permanently.  See Ahram Online 2015-04-24.
++# http://english.ahram.org.eg/NewsContent/1/64/128509/Egypt/Politics-/Sisi-cancels-daylight-saving-time-in-Egypt.aspx
++
++# From Steffen Thorsen (2016-04-29):
++# Egypt will have DST from July 7 until the end of October....
++# http://english.ahram.org.eg/NewsContentP/1/204655/Egypt/Daylight-savings-time-returning-to-Egypt-on--July.aspx
++# From Mina Samuel (2016-07-04):
++# Egyptian government took the decision to cancel the DST,
++
+ Rule	Egypt	2008	only	-	Aug	lastThu	24:00	0	-
+ Rule	Egypt	2009	only	-	Aug	20	24:00	0	-
+ Rule	Egypt	2010	only	-	Aug	10	24:00	0	-
+@@ -386,59 +357,21 @@
+ Rule	Egypt	2014	only	-	May	15	24:00	1:00	S
+ Rule	Egypt	2014	only	-	Jun	26	24:00	0	-
+ Rule	Egypt	2014	only	-	Jul	31	24:00	1:00	S
+-Rule	Egypt	2014	max	-	Sep	lastThu	24:00	0	-
+-Rule	Egypt	2015	2019	-	Apr	lastFri	 0:00s	1:00	S
+-Rule	Egypt	2015	only	-	Jun	11	24:00	0	-
+-Rule	Egypt	2015	only	-	Jul	23	24:00	1:00	S
+-Rule	Egypt	2016	only	-	Jun	 2	24:00	0	-
+-Rule	Egypt	2016	only	-	Jul	 7	24:00	1:00	S
+-Rule	Egypt	2017	only	-	May	25	24:00	0	-
+-Rule	Egypt	2017	only	-	Jun	29	24:00	1:00	S
+-Rule	Egypt	2018	only	-	May	10	24:00	0	-
+-Rule	Egypt	2018	only	-	Jun	14	24:00	1:00	S
+-Rule	Egypt	2019	only	-	May	 2	24:00	0	-
+-Rule	Egypt	2019	only	-	Jun	 6	24:00	1:00	S
+-Rule	Egypt	2020	only	-	May	28	24:00	1:00	S
+-Rule	Egypt	2021	only	-	May	13	24:00	1:00	S
+-Rule	Egypt	2022	only	-	May	 5	24:00	1:00	S
+-Rule	Egypt	2023	max	-	Apr	lastFri	 0:00s	1:00	S
++Rule	Egypt	2014	only	-	Sep	lastThu	24:00	0	-
+ 
+ # Zone	NAME		GMTOFF	RULES	FORMAT	[UNTIL]
+ Zone	Africa/Cairo	2:05:09 -	LMT	1900 Oct
+ 			2:00	Egypt	EE%sT
+ 
+ # Equatorial Guinea
+-# Zone	NAME		GMTOFF	RULES	FORMAT	[UNTIL]
+-Zone	Africa/Malabo	0:35:08 -	LMT	1912
+-			0:00	-	GMT	1963 Dec 15
+-			1:00	-	WAT
++# See Africa/Lagos.
+ 
+ # Eritrea
+-# Zone	NAME		GMTOFF	RULES	FORMAT	[UNTIL]
+-Zone	Africa/Asmara	2:35:32 -	LMT	1870
+-			2:35:32	-	AMT	1890	      # Asmara Mean Time
+-			2:35:20	-	ADMT	1936 May 5    # Adis Dera MT
+-			3:00	-	EAT
+-
+ # Ethiopia
+-# From Paul Eggert (2014-07-31):
+-# Like the Swahili of Kenya and Tanzania, many Ethiopians keep a
+-# 12-hour clock starting at our 06:00, so their "8 o'clock" is our
+-# 02:00 or 14:00.  Keep this in mind when you ask the time in Amharic.
+-#
+-# Shanks & Pottenger write that Ethiopia had six narrowly-spaced time
+-# zones between 1870 and 1890, that they merged to 38E50 (2:35:20) in
+-# 1890, and that they switched to 3:00 on 1936-05-05.  Perhaps 38E50
+-# was for Adis Dera.  Quite likely the Shanks data are wrong anyway.
+-# Zone	NAME		GMTOFF	RULES	FORMAT	[UNTIL]
+-Zone Africa/Addis_Ababa	2:34:48 -	LMT	1870
+-			2:35:20	-	ADMT	1936 May 5    # Adis Dera MT
+-			3:00	-	EAT
++# See Africa/Nairobi.
+ 
+ # Gabon
+-# Zone	NAME		GMTOFF	RULES	FORMAT	[UNTIL]
+-Zone Africa/Libreville	0:37:48 -	LMT	1912
+-			1:00	-	WAT
++# See Africa/Lagos.
+ 
+ # Gambia
+ # See Africa/Abidjan.
+@@ -461,8 +394,14 @@
+ # See Africa/Abidjan.
+ 
+ # Guinea-Bissau
++#
++# Shanks gives 1911-05-26 for the transition to WAT,
++# evidently confusing the date of the Portuguese decree
++# http://dre.pt/pdf1sdip/1911/05/12500/23132313.pdf
++# with the date that it took effect, namely 1912-01-01.
++#
+ # Zone	NAME		GMTOFF	RULES	FORMAT	[UNTIL]
+-Zone	Africa/Bissau	-1:02:20 -	LMT	1911 May 26
++Zone	Africa/Bissau	-1:02:20 -	LMT	1912 Jan  1
+ 			-1:00	-	WAT	1975
+ 			 0:00	-	GMT
+ 
+@@ -473,13 +412,18 @@
+ 			2:30	-	BEAT	1940
+ 			2:45	-	BEAUT	1960
+ 			3:00	-	EAT
++Link Africa/Nairobi Africa/Addis_Ababa	 # Ethiopia
++Link Africa/Nairobi Africa/Asmara	 # Eritrea
++Link Africa/Nairobi Africa/Dar_es_Salaam # Tanzania
++Link Africa/Nairobi Africa/Djibouti
++Link Africa/Nairobi Africa/Kampala	 # Uganda
++Link Africa/Nairobi Africa/Mogadishu	 # Somalia
++Link Africa/Nairobi Indian/Antananarivo	 # Madagascar
++Link Africa/Nairobi Indian/Comoro
++Link Africa/Nairobi Indian/Mayotte
+ 
+ # Lesotho
+-# Zone	NAME		GMTOFF	RULES	FORMAT	[UNTIL]
+-Zone	Africa/Maseru	1:50:00 -	LMT	1903 Mar
+-			2:00	-	SAST	1943 Sep 19 2:00
+-			2:00	1:00	SAST	1944 Mar 19 2:00
+-			2:00	-	SAST
++# See Africa/Johannesburg.
+ 
+ # Liberia
+ # From Paul Eggert (2006-03-22):
+@@ -520,7 +464,7 @@
+ # http://www.libyaherald.com/2013/10/24/correction-no-time-change-tomorrow/
+ #
+ # From Paul Eggert (2013-10-25):
+-# For now, assume they're reverting to the pre-2012 rules of permanent UTC+2.
++# For now, assume they're reverting to the pre-2012 rules of permanent UT +02.
+ 
+ # Rule	NAME	FROM	TO	TYPE	IN	ON	AT	SAVE	LETTER/S
+ Rule	Libya	1951	only	-	Oct	14	2:00	1:00	S
+@@ -546,24 +490,18 @@
+ 			2:00	-	EET	1982
+ 			1:00	Libya	CE%sT	1990 May  4
+ # The 1996 and 1997 entries are from Shanks & Pottenger;
+-# the IATA SSIM data contain some obvious errors.
++# the IATA SSIM data entries contain some obvious errors.
+ 			2:00	-	EET	1996 Sep 30
+ 			1:00	Libya	CE%sT	1997 Oct  4
+-			2:00	-	EET	2012 Nov 10 2:00
+-			1:00	Libya	CE%sT	2013 Oct 25 2:00
++			2:00	-	EET	2012 Nov 10  2:00
++			1:00	Libya	CE%sT	2013 Oct 25  2:00
+ 			2:00	-	EET
+ 
+ # Madagascar
+-# Zone	NAME		GMTOFF	RULES	FORMAT	[UNTIL]
+-Zone Indian/Antananarivo 3:10:04 -	LMT	1911 Jul
+-			3:00	-	EAT	1954 Feb 27 23:00s
+-			3:00	1:00	EAST	1954 May 29 23:00s
+-			3:00	-	EAT
++# See Africa/Nairobi.
+ 
+ # Malawi
+-# Zone	NAME		GMTOFF	RULES	FORMAT	[UNTIL]
+-Zone	Africa/Blantyre	2:20:00 -	LMT	1903 Mar
+-			2:00	-	CAT
++# See Africa/Maputo.
+ 
+ # Mali
+ # Mauritania
+@@ -606,7 +544,7 @@
+ 
+ # From Alex Krivenyshev (2008-07-11):
+ # Seems that English language article "The revival of daylight saving
+-# time:  Energy conservation?"-# No. 16578 (07/11/2008) was originally
++# time: Energy conservation?"- No. 16578 (07/11/2008) was originally
+ # published on Monday, June 30, 2008...
+ #
+ # I guess that article in French "Le gouvernement avance l'introduction
+@@ -657,15 +595,13 @@
+ Rule Mauritius	2008	only	-	Oct	lastSun	2:00	1:00	S
+ Rule Mauritius	2009	only	-	Mar	lastSun	2:00	0	-
+ # Zone	NAME		GMTOFF	RULES	FORMAT	[UNTIL]
+-Zone Indian/Mauritius	3:50:00 -	LMT	1907		# Port Louis
++Zone Indian/Mauritius	3:50:00 -	LMT	1907 # Port Louis
+ 			4:00 Mauritius	MU%sT	# Mauritius Time
+ # Agalega Is, Rodriguez
+ # no information; probably like Indian/Mauritius
+ 
+ # Mayotte
+-# Zone	NAME		GMTOFF	RULES	FORMAT	[UNTIL]
+-Zone	Indian/Mayotte	3:00:56 -	LMT	1911 Jul	# Mamoutzou
+-			3:00	-	EAT
++# See Africa/Nairobi.
+ 
+ # Morocco
+ # See the 'europe' file for Spanish Morocco (Africa/Ceuta).
+@@ -682,7 +618,8 @@
+ # http://en.afrik.com/news11892.html
+ 
+ # From Alex Krivenyshev (2008-05-09):
+-# The Morocco time change can be confirmed on Morocco web site Maghreb Arabe Presse:
++# The Morocco time change can be confirmed on Morocco web site Maghreb Arabe
++# Presse:
+ # http://www.map.ma/eng/sections/box3/morocco_shifts_to_da/view
+ #
+ # Morocco shifts to daylight time on June 1st through September 27, Govt.
+@@ -739,7 +676,7 @@
+ # Here is a link to official document from Royaume du Maroc Premier Ministre,
+ # Ministère de la Modernisation des Secteurs Publics
+ #
+-# Under Article 1 of Royal Decree No. 455-67 of Act 23 safar 1387 (2 june 1967)
++# Under Article 1 of Royal Decree No. 455-67 of Act 23 safar 1387 (2 June 1967)
+ # concerning the amendment of the legal time, the Ministry of Modernization of
+ # Public Sectors announced that the official time in the Kingdom will be
+ # advanced 60 minutes from Sunday 31 May 2009 at midnight.
+@@ -760,8 +697,8 @@
+ 
+ # From Dan Abitol (2011-03-30):
+ # ...Rules for Africa/Casablanca are the following (24h format)
+-# The 3rd april 2011 at 00:00:00, [it] will be 3rd april 1:00:00
+-# The 31th july 2011 at 00:59:59,  [it] will be 31th July 00:00:00
++# The 3rd April 2011 at 00:00:00, [it] will be 3rd April 01:00:00
++# The 31st July 2011 at 00:59:59, [it] will be 31st July 00:00:00
+ # ...Official links of change in morocco
+ # The change was broadcast on the FM Radio
+ # I ve called ANRT (telecom regulations in Morocco) at
+@@ -831,7 +768,7 @@
+ # announced a bit in advance.  On 2012-07-11 the Moroccan government
+ # announced that year's Ramadan daylight-saving transitions would be
+ # 2012-07-20 and 2012-08-20; see
+-# <http://www.mmsp.gov.ma/fr/actualites.aspx?id=288>.
++# http://www.mmsp.gov.ma/fr/actualites.aspx?id=288
+ 
+ # From Andrew Paprocki (2013-07-02):
+ # Morocco announced that the year's Ramadan daylight-savings
+@@ -857,20 +794,41 @@
+ # will resume again at 02:00 on Saturday, August 2, 2014....
+ # http://www.mmsp.gov.ma/fr/actualites.aspx?id=586
+ 
+-# From Paul Eggert (2014-06-05):
+-# For now, guess that later spring and fall transitions will use 2014's rules,
++# From Milamber (2015-06-08):
++# (Google Translation) The hour will thus be delayed 60 minutes
++# Sunday, June 14 at 3:00, the ministry said in a statement, adding
++# that the time will be advanced again 60 minutes Sunday, July 19,
++# 2015 at 2:00.  The move comes under 2.12.126 Decree of 26 Jumada I
++# 1433 (18 April 2012) and the decision of the Head of Government of
++# 16 N. 3-29-15 Chaaban 1435 (4 June 2015).
++# Source (french):
++# http://lnt.ma/le-maroc-reculera-dune-heure-le-dimanche-14-juin/
++#
++# From Milamber (2015-06-09):
++# http://www.mmsp.gov.ma/fr/actualites.aspx?id=863
++#
++# From Michael Deckers (2015-06-09):
++# [The gov.ma announcement] would (probably) make the switch on 2015-07-19 go
++# from 03:00 to 04:00 rather than from 02:00 to 03:00, as in the patch....
++# I think the patch is correct and the quoted text is wrong; the text in
++# <http://lnt.ma/le-maroc-reculera-dune-heure-le-dimanche-14-juin/> agrees
++# with the patch.
++
++# From Paul Eggert (2015-06-08):
++# For now, guess that later spring and fall transitions will use 2015's rules,
+ # and guess that Morocco will switch to standard time at 03:00 the last
+-# Saturday before Ramadan, and back to DST at 02:00 the first Saturday after
+-# Ramadan.  To implement this, transition dates for 2015 through 2037 were
++# Sunday before Ramadan, and back to DST at 02:00 the first Sunday after
++# Ramadan.  To implement this, transition dates for 2016 through 2037 were
+ # determined by running the following program under GNU Emacs 24.3, with the
+ # results integrated by hand into the table below.
+-# (let ((islamic-year 1436))
++# (let ((islamic-year 1437))
++#   (require 'cal-islam)
+ #   (while (< islamic-year 1460)
+ #     (let ((a (calendar-islamic-to-absolute (list 9 1 islamic-year)))
+ #           (b (calendar-islamic-to-absolute (list 10 1 islamic-year)))
+-#           (saturday 6))
+-#       (while (/= saturday (mod (setq a (1- a)) 7)))
+-#       (while (/= saturday (mod b 7))
++#           (sunday 0))
++#       (while (/= sunday (mod (setq a (1- a)) 7)))
++#       (while (/= sunday (mod b 7))
+ #         (setq b (1+ b)))
+ #       (setq a (calendar-gregorian-from-absolute a))
+ #       (setq b (calendar-gregorian-from-absolute b))
+@@ -906,40 +864,38 @@
+ Rule	Morocco	2010	only	-	May	 2	 0:00	1:00	S
+ Rule	Morocco	2010	only	-	Aug	 8	 0:00	0	-
+ Rule	Morocco	2011	only	-	Apr	 3	 0:00	1:00	S
+-Rule	Morocco	2011	only	-	Jul	31	 0	0	-
++Rule	Morocco	2011	only	-	Jul	31	 0:00	0	-
+ Rule	Morocco	2012	2013	-	Apr	lastSun	 2:00	1:00	S
+-Rule	Morocco	2012	only	-	Sep	30	 3:00	0	-
+ Rule	Morocco	2012	only	-	Jul	20	 3:00	0	-
+ Rule	Morocco	2012	only	-	Aug	20	 2:00	1:00	S
++Rule	Morocco	2012	only	-	Sep	30	 3:00	0	-
+ Rule	Morocco	2013	only	-	Jul	 7	 3:00	0	-
+ Rule	Morocco	2013	only	-	Aug	10	 2:00	1:00	S
+ Rule	Morocco	2013	max	-	Oct	lastSun	 3:00	0	-
+-Rule	Morocco	2014	2022	-	Mar	lastSun	 2:00	1:00	S
++Rule	Morocco	2014	2021	-	Mar	lastSun	 2:00	1:00	S
+ Rule	Morocco	2014	only	-	Jun	28	 3:00	0	-
+ Rule	Morocco	2014	only	-	Aug	 2	 2:00	1:00	S
+-Rule	Morocco	2015	only	-	Jun	13	 3:00	0	-
+-Rule	Morocco	2015	only	-	Jul	18	 2:00	1:00	S
+-Rule	Morocco	2016	only	-	Jun	 4	 3:00	0	-
+-Rule	Morocco	2016	only	-	Jul	 9	 2:00	1:00	S
+-Rule	Morocco	2017	only	-	May	20	 3:00	0	-
+-Rule	Morocco	2017	only	-	Jul	 1	 2:00	1:00	S
+-Rule	Morocco	2018	only	-	May	12	 3:00	0	-
+-Rule	Morocco	2018	only	-	Jun	16	 2:00	1:00	S
+-Rule	Morocco	2019	only	-	May	 4	 3:00	0	-
+-Rule	Morocco	2019	only	-	Jun	 8	 2:00	1:00	S
+-Rule	Morocco	2020	only	-	Apr	18	 3:00	0	-
+-Rule	Morocco	2020	only	-	May	30	 2:00	1:00	S
+-Rule	Morocco	2021	only	-	Apr	10	 3:00	0	-
+-Rule	Morocco	2021	only	-	May	15	 2:00	1:00	S
+-Rule	Morocco	2022	only	-	Apr	 2	 3:00	0	-
+-Rule	Morocco	2022	only	-	May	 7	 2:00	1:00	S
+-Rule	Morocco	2023	only	-	Apr	22	 2:00	1:00	S
+-Rule	Morocco	2024	only	-	Apr	13	 2:00	1:00	S
+-Rule	Morocco	2025	only	-	Apr	 5	 2:00	1:00	S
++Rule	Morocco	2015	only	-	Jun	14	 3:00	0	-
++Rule	Morocco	2015	only	-	Jul	19	 2:00	1:00	S
++Rule	Morocco	2016	only	-	Jun	 5	 3:00	0	-
++Rule	Morocco	2016	only	-	Jul	10	 2:00	1:00	S
++Rule	Morocco	2017	only	-	May	21	 3:00	0	-
++Rule	Morocco	2017	only	-	Jul	 2	 2:00	1:00	S
++Rule	Morocco	2018	only	-	May	13	 3:00	0	-
++Rule	Morocco	2018	only	-	Jun	17	 2:00	1:00	S
++Rule	Morocco	2019	only	-	May	 5	 3:00	0	-
++Rule	Morocco	2019	only	-	Jun	 9	 2:00	1:00	S
++Rule	Morocco	2020	only	-	Apr	19	 3:00	0	-
++Rule	Morocco	2020	only	-	May	24	 2:00	1:00	S
++Rule	Morocco	2021	only	-	Apr	11	 3:00	0	-
++Rule	Morocco	2021	only	-	May	16	 2:00	1:00	S
++Rule	Morocco	2022	only	-	May	 8	 2:00	1:00	S
++Rule	Morocco	2023	only	-	Apr	23	 2:00	1:00	S
++Rule	Morocco	2024	only	-	Apr	14	 2:00	1:00	S
++Rule	Morocco	2025	only	-	Apr	 6	 2:00	1:00	S
+ Rule	Morocco	2026	max	-	Mar	lastSun	 2:00	1:00	S
+-Rule	Morocco	2035	only	-	Oct	27	 3:00	0	-
+-Rule	Morocco	2036	only	-	Oct	18	 3:00	0	-
+-Rule	Morocco	2037	only	-	Oct	10	 3:00	0	-
++Rule	Morocco	2036	only	-	Oct	19	 3:00	0	-
++Rule	Morocco	2037	only	-	Oct	 4	 3:00	0	-
+ 
+ # Zone	NAME		GMTOFF	RULES	FORMAT	[UNTIL]
+ Zone Africa/Casablanca	-0:30:20 -	LMT	1913 Oct 26
+@@ -963,16 +919,29 @@
+ 			 0:00	Morocco	WE%sT
+ 
+ # Mozambique
++#
++# Shanks gives 1903-03-01 for the transition to CAT.
++# Perhaps the 1911-05-26 Portuguese decree
++# http://dre.pt/pdf1sdip/1911/05/12500/23132313.pdf
++# merely made it official?
++#
+ # Zone	NAME		GMTOFF	RULES	FORMAT	[UNTIL]
+ Zone	Africa/Maputo	2:10:20 -	LMT	1903 Mar
+ 			2:00	-	CAT
++Link Africa/Maputo Africa/Blantyre	# Malawi
++Link Africa/Maputo Africa/Bujumbura	# Burundi
++Link Africa/Maputo Africa/Gaborone	# Botswana
++Link Africa/Maputo Africa/Harare	# Zimbabwe
++Link Africa/Maputo Africa/Kigali	# Rwanda
++Link Africa/Maputo Africa/Lubumbashi	# E Dem. Rep. of Congo
++Link Africa/Maputo Africa/Lusaka	# Zambia
+ 
+ # Namibia
+ # The 1994-04-03 transition is from Shanks & Pottenger.
+ # Shanks & Pottenger report no DST after 1998-04; go with IATA.
+ 
+-# From Petronella Sibeene (2007-03-30) in
+-# <http://allafrica.com/stories/200703300178.html>:
++# From Petronella Sibeene (2007-03-30):
++# http://allafrica.com/stories/200703300178.html
+ # While the entire country changes its time, Katima Mulilo and other
+ # settlements in Caprivi unofficially will not because the sun there
+ # rises and sets earlier compared to other regions.  Chief of
+@@ -989,28 +958,33 @@
+ Rule	Namibia	1995	max	-	Apr	Sun>=1	2:00	0	-
+ # Zone	NAME		GMTOFF	RULES	FORMAT	[UNTIL]
+ Zone	Africa/Windhoek	1:08:24 -	LMT	1892 Feb 8
+-			1:30	-	SWAT	1903 Mar	# SW Africa Time
+-			2:00	-	SAST	1942 Sep 20 2:00
+-			2:00	1:00	SAST	1943 Mar 21 2:00
++			1:30	-	SWAT	1903 Mar    # SW Africa Time
++			2:00	-	SAST	1942 Sep 20  2:00
++			2:00	1:00	SAST	1943 Mar 21  2:00
+ 			2:00	-	SAST	1990 Mar 21 # independence
+ 			2:00	-	CAT	1994 Apr  3
+ 			1:00	Namibia	WA%sT
+ 
+ # Niger
+-# Zone	NAME		GMTOFF	RULES	FORMAT	[UNTIL]
+-Zone	Africa/Niamey	 0:08:28 -	LMT	1912
+-			-1:00	-	WAT	1934 Feb 26
+-			 0:00	-	GMT	1960
+-			 1:00	-	WAT
++# See Africa/Lagos.
+ 
+ # Nigeria
+ # Zone	NAME		GMTOFF	RULES	FORMAT	[UNTIL]
+ Zone	Africa/Lagos	0:13:36 -	LMT	1919 Sep
+ 			1:00	-	WAT
++Link Africa/Lagos Africa/Bangui	     # Central African Republic
++Link Africa/Lagos Africa/Brazzaville # Rep. of the Congo
++Link Africa/Lagos Africa/Douala	     # Cameroon
++Link Africa/Lagos Africa/Kinshasa    # Dem. Rep. of the Congo (west)
++Link Africa/Lagos Africa/Libreville  # Gabon
++Link Africa/Lagos Africa/Luanda	     # Angola
++Link Africa/Lagos Africa/Malabo	     # Equatorial Guinea
++Link Africa/Lagos Africa/Niamey	     # Niger
++Link Africa/Lagos Africa/Porto-Novo  # Benin
+ 
+ # Réunion
+ # Zone	NAME		GMTOFF	RULES	FORMAT	[UNTIL]
+-Zone	Indian/Reunion	3:41:52 -	LMT	1911 Jun	# Saint-Denis
++Zone	Indian/Reunion	3:41:52 -	LMT	1911 Jun # Saint-Denis
+ 			4:00	-	RET	# Réunion Time
+ #
+ # Crozet Islands also observes Réunion time; see the 'antarctica' file.
+@@ -1028,9 +1002,7 @@
+ # Tromelin - inhabited until at least 1958
+ 
+ # Rwanda
+-# Zone	NAME		GMTOFF	RULES	FORMAT	[UNTIL]
+-Zone	Africa/Kigali	2:00:16 -	LMT	1935 Jun
+-			2:00	-	CAT
++# See Africa/Maputo.
+ 
+ # St Helena
+ # See Africa/Abidjan.
+@@ -1047,7 +1019,7 @@
+ 
+ # Seychelles
+ # Zone	NAME		GMTOFF	RULES	FORMAT	[UNTIL]
+-Zone	Indian/Mahe	3:41:48 -	LMT	1906 Jun	# Victoria
++Zone	Indian/Mahe	3:41:48 -	LMT	1906 Jun # Victoria
+ 			4:00	-	SCT	# Seychelles Time
+ # From Paul Eggert (2001-05-30):
+ # Aldabra, Farquhar, and Desroches, originally dependencies of the
+@@ -1060,11 +1032,7 @@
+ # See Africa/Abidjan.
+ 
+ # Somalia
+-# Zone	NAME		GMTOFF	RULES	FORMAT	[UNTIL]
+-Zone Africa/Mogadishu	3:01:28 -	LMT	1893 Nov
+-			3:00	-	EAT	1931
+-			2:30	-	BEAT	1957
+-			3:00	-	EAT
++# See Africa/Nairobi.
+ 
+ # South Africa
+ # Rule	NAME	FROM	TO	TYPE	IN	ON	AT	SAVE	LETTER/S
+@@ -1074,6 +1042,9 @@
+ Zone Africa/Johannesburg 1:52:00 -	LMT	1892 Feb 8
+ 			1:30	-	SAST	1903 Mar
+ 			2:00	SA	SAST
++Link Africa/Johannesburg Africa/Maseru	   # Lesotho
++Link Africa/Johannesburg Africa/Mbabane    # Swaziland
++#
+ # Marion and Prince Edward Is
+ # scientific station since 1947
+ # no information
+@@ -1101,16 +1072,10 @@
+ Link Africa/Khartoum Africa/Juba
+ 
+ # Swaziland
+-# Zone	NAME		GMTOFF	RULES	FORMAT	[UNTIL]
+-Zone	Africa/Mbabane	2:04:24 -	LMT	1903 Mar
+-			2:00	-	SAST
++# See Africa/Johannesburg.
+ 
+ # Tanzania
+-# Zone	NAME		GMTOFF	RULES	FORMAT	[UNTIL]
+-Zone Africa/Dar_es_Salaam 2:37:08 -	LMT	1931
+-			3:00	-	EAT	1948
+-			2:45	-	BEAUT	1961
+-			3:00	-	EAT
++# See Africa/Nairobi.
+ 
+ # Togo
+ # See Africa/Abidjan.
+@@ -1128,7 +1093,7 @@
+ #
+ # From Oscar van Vlijmen (2005-05-02):
+ # La Presse, the first national daily newspaper ...
+-# <http://www.lapresse.tn/archives/archives280405/actualites/lheure.html>
++# http://www.lapresse.tn/archives/archives280405/actualites/lheure.html
+ # ... DST for 2005: on: Sun May 1 0h standard time, off: Fri Sept. 30,
+ # 1h standard time.
+ #
+@@ -1212,23 +1177,12 @@
+ # Shanks & Pottenger say the 1911 switch was on Mar 9; go with Howse's Mar 11.
+ # Zone	NAME		GMTOFF	RULES	FORMAT	[UNTIL]
+ Zone	Africa/Tunis	0:40:44 -	LMT	1881 May 12
+-			0:09:21	-	PMT	1911 Mar 11    # Paris Mean Time
++			0:09:21	-	PMT	1911 Mar 11 # Paris Mean Time
+ 			1:00	Tunisia	CE%sT
+ 
+ # Uganda
+-# Zone	NAME		GMTOFF	RULES	FORMAT	[UNTIL]
+-Zone	Africa/Kampala	2:09:40 -	LMT	1928 Jul
+-			3:00	-	EAT	1930
+-			2:30	-	BEAT	1948
+-			2:45	-	BEAUT	1957
+-			3:00	-	EAT
++# See Africa/Nairobi.
+ 
+ # Zambia
+-# Zone	NAME		GMTOFF	RULES	FORMAT	[UNTIL]
+-Zone	Africa/Lusaka	1:53:08 -	LMT	1903 Mar
+-			2:00	-	CAT
+-
+ # Zimbabwe
+-# Zone	NAME		GMTOFF	RULES	FORMAT	[UNTIL]
+-Zone	Africa/Harare	2:04:12 -	LMT	1903 Mar
+-			2:00	-	CAT
++# See Africa/Maputo.
+--- contrib/tzdata/antarctica.orig
++++ contrib/tzdata/antarctica
+@@ -4,51 +4,14 @@
+ # From Paul Eggert (1999-11-15):
+ # To keep things manageable, we list only locations occupied year-round; see
+ # COMNAP - Stations and Bases
+-# <http://www.comnap.aq/comnap/comnap.nsf/P/Stations/>
++# http://www.comnap.aq/comnap/comnap.nsf/P/Stations/
+ # and
+ # Summary of the Peri-Antarctic Islands (1998-07-23)
+-# <http://www.spri.cam.ac.uk/bob/periant.htm>
++# http://www.spri.cam.ac.uk/bob/periant.htm
+ # for information.
+ # Unless otherwise specified, we have no time zone information.
+-#
+-# Except for the French entries,
+-# I made up all time zone abbreviations mentioned here; corrections welcome!
+-# FORMAT is 'zzz' and GMTOFF is 0 for locations while uninhabited.
+ 
+-# These rules are stolen from the 'southamerica' file.
+-# Rule	NAME	FROM	TO	TYPE	IN	ON	AT	SAVE	LETTER/S
+-Rule	ArgAQ	1964	1966	-	Mar	 1	0:00	0	-
+-Rule	ArgAQ	1964	1966	-	Oct	15	0:00	1:00	S
+-Rule	ArgAQ	1967	only	-	Apr	 2	0:00	0	-
+-Rule	ArgAQ	1967	1968	-	Oct	Sun>=1	0:00	1:00	S
+-Rule	ArgAQ	1968	1969	-	Apr	Sun>=1	0:00	0	-
+-Rule	ArgAQ	1974	only	-	Jan	23	0:00	1:00	S
+-Rule	ArgAQ	1974	only	-	May	 1	0:00	0	-
+-Rule	ChileAQ	1972	1986	-	Mar	Sun>=9	3:00u	0	-
+-Rule	ChileAQ	1974	1987	-	Oct	Sun>=9	4:00u	1:00	S
+-Rule	ChileAQ	1987	only	-	Apr	12	3:00u	0	-
+-Rule	ChileAQ	1988	1989	-	Mar	Sun>=9	3:00u	0	-
+-Rule	ChileAQ	1988	only	-	Oct	Sun>=1	4:00u	1:00	S
+-Rule	ChileAQ	1989	only	-	Oct	Sun>=9	4:00u	1:00	S
+-Rule	ChileAQ	1990	only	-	Mar	18	3:00u	0	-
+-Rule	ChileAQ	1990	only	-	Sep	16	4:00u	1:00	S
+-Rule	ChileAQ	1991	1996	-	Mar	Sun>=9	3:00u	0	-
+-Rule	ChileAQ	1991	1997	-	Oct	Sun>=9	4:00u	1:00	S
+-Rule	ChileAQ	1997	only	-	Mar	30	3:00u	0	-
+-Rule	ChileAQ	1998	only	-	Mar	Sun>=9	3:00u	0	-
+-Rule	ChileAQ	1998	only	-	Sep	27	4:00u	1:00	S
+-Rule	ChileAQ	1999	only	-	Apr	 4	3:00u	0	-
+-Rule	ChileAQ	1999	2010	-	Oct	Sun>=9	4:00u	1:00	S
+-Rule	ChileAQ	2000	2007	-	Mar	Sun>=9	3:00u	0	-
+-# N.B.: the end of March 29 in Chile is March 30 in Universal time,
+-# which is used below in specifying the transition.
+-Rule	ChileAQ	2008	only	-	Mar	30	3:00u	0	-
+-Rule	ChileAQ	2009	only	-	Mar	Sun>=9	3:00u	0	-
+-Rule	ChileAQ	2010	only	-	Apr	Sun>=1	3:00u	0	-
+-Rule	ChileAQ	2011	only	-	May	Sun>=2	3:00u	0	-
+-Rule	ChileAQ	2011	only	-	Aug	Sun>=16	4:00u	1:00	S
+-Rule	ChileAQ	2012	max	-	Apr	Sun>=23	3:00u	0	-
+-Rule	ChileAQ	2012	max	-	Sep	Sun>=2	4:00u	1:00	S
++# FORMAT is '-00' and GMTOFF is 0 for locations while uninhabited.
+ 
+ # Argentina - year-round bases
+ # Belgrano II, Confin Coast, -770227-0343737, since 1972-02-05
+@@ -63,8 +26,8 @@
+ # Heard Island, McDonald Islands (uninhabited)
+ #	previously sealers and scientific personnel wintered
+ #	Margaret Turner reports
+-#	<http://web.archive.org/web/20021204222245/http://www.dstc.qut.edu.au/DST/marg/daylight.html>
+-#	(1999-09-30) that they're UTC+5, with no DST;
++#	http://web.archive.org/web/20021204222245/http://www.dstc.qut.edu.au/DST/marg/daylight.html
++#	(1999-09-30) that they're UT +05, with no DST;
+ #	presumably this is when they have visitors.
+ #
+ # year-round bases
+@@ -101,34 +64,36 @@
+ # Background:
+ # http://www.timeanddate.com/news/time/antartica-time-changes-2010.html
+ 
++# From Steffen Thorsen (2016-10-28):
++# Australian Antarctica Division informed us that Casey changed time
++# zone to UTC+11 in "the morning of 22nd October 2016".
++
+ # Zone	NAME		GMTOFF	RULES	FORMAT	[UNTIL]
+-Zone Antarctica/Casey	0	-	zzz	1969
+-			8:00	-	AWST	2009 Oct 18 2:00
+-						# Australian Western Std Time
+-			11:00	-	CAST	2010 Mar 5 2:00
+-						# Casey Time
+-			8:00	-	AWST	2011 Oct 28 2:00
+-			11:00	-	CAST	2012 Feb 21 17:00u
+-			8:00	-	AWST
+-Zone Antarctica/Davis	0	-	zzz	1957 Jan 13
+-			7:00	-	DAVT	1964 Nov # Davis Time
+-			0	-	zzz	1969 Feb
+-			7:00	-	DAVT	2009 Oct 18 2:00
+-			5:00	-	DAVT	2010 Mar 10 20:00u
+-			7:00	-	DAVT	2011 Oct 28 2:00
+-			5:00	-	DAVT	2012 Feb 21 20:00u
+-			7:00	-	DAVT
+-Zone Antarctica/Mawson	0	-	zzz	1954 Feb 13
+-			6:00	-	MAWT	2009 Oct 18 2:00
+-						# Mawson Time
+-			5:00	-	MAWT
++Zone Antarctica/Casey	0	-	-00	1969
++			8:00	-	+08	2009 Oct 18  2:00
++			11:00	-	+11	2010 Mar  5  2:00
++			8:00	-	+08	2011 Oct 28  2:00
++			11:00	-	+11	2012 Feb 21 17:00u
++			8:00	-	+08	2016 Oct 22
++			11:00	-	+11
++Zone Antarctica/Davis	0	-	-00	1957 Jan 13
++			7:00	-	+07	1964 Nov
++			0	-	-00	1969 Feb
++			7:00	-	+07	2009 Oct 18  2:00
++			5:00	-	+05	2010 Mar 10 20:00u
++			7:00	-	+07	2011 Oct 28  2:00
++			5:00	-	+05	2012 Feb 21 20:00u
++			7:00	-	+07
++Zone Antarctica/Mawson	0	-	-00	1954 Feb 13
++			6:00	-	+06	2009 Oct 18  2:00
++			5:00	-	+05
+ # References:
+ # Casey Weather (1998-02-26)
+-# <http://www.antdiv.gov.au/aad/exop/sfo/casey/casey_aws.html>
++# http://www.antdiv.gov.au/aad/exop/sfo/casey/casey_aws.html
+ # Davis Station, Antarctica (1998-02-26)
+-# <http://www.antdiv.gov.au/aad/exop/sfo/davis/video.html>
++# http://www.antdiv.gov.au/aad/exop/sfo/davis/video.html
+ # Mawson Station, Antarctica (1998-02-25)
+-# <http://www.antdiv.gov.au/aad/exop/sfo/mawson/video.html>
++# http://www.antdiv.gov.au/aad/exop/sfo/mawson/video.html
+ 
+ # Belgium - year-round base
+ # Princess Elisabeth, Queen Maud Land, -713412+0231200, since 2007
+@@ -154,7 +119,7 @@
+ # France - year-round bases (also see "France & Italy")
+ #
+ # From Antoine Leca (1997-01-20):
+-# Time data are from Nicole Pailleau at the IFRTP
++# Time data entries are from Nicole Pailleau at the IFRTP
+ # (French Institute for Polar Research and Technology).
+ # She confirms that French Southern Territories and Terre Adélie bases
+ # don't observe daylight saving time, even if Terre Adélie supplies came
+@@ -174,8 +139,8 @@
+ #	fishing stations operated variously 1819/1931
+ #
+ # Zone	NAME		GMTOFF	RULES	FORMAT	[UNTIL]
+-Zone Indian/Kerguelen	0	-	zzz	1950	# Port-aux-Français
+-			5:00	-	TFT	# ISO code TF Time
++Zone Indian/Kerguelen	0	-	-00	1950 # Port-aux-Français
++			5:00	-	+05
+ #
+ # year-round base in the main continent
+ # Dumont d'Urville, Île des Pétrels, -6640+14001, since 1956-11
+@@ -185,10 +150,10 @@
+ # It was destroyed by fire on 1952-01-14.
+ #
+ # Zone	NAME		GMTOFF	RULES	FORMAT	[UNTIL]
+-Zone Antarctica/DumontDUrville 0 -	zzz	1947
+-			10:00	-	PMT	1952 Jan 14 # Port-Martin Time
+-			0	-	zzz	1956 Nov
+-			10:00	-	DDUT	# Dumont-d'Urville Time
++Zone Antarctica/DumontDUrville 0 -	-00	1947
++			10:00	-	+10	1952 Jan 14
++			0	-	-00	1956 Nov
++			10:00	-	+10
+ 
+ # France & Italy - year-round base
+ # Concordia, -750600+1232000, since 2005
+@@ -213,11 +178,11 @@
+ # was established on 1957-01-29.  Since Syowa station is still the main
+ # station of Japan, it's appropriate for the principal location.
+ # Zone	NAME		GMTOFF	RULES	FORMAT	[UNTIL]
+-Zone Antarctica/Syowa	0	-	zzz	1957 Jan 29
+-			3:00	-	SYOT	# Syowa Time
++Zone Antarctica/Syowa	0	-	-00	1957 Jan 29
++			3:00	-	+03
+ # See:
+ # NIPR Antarctic Research Activities (1999-08-17)
+-# <http://www.nipr.ac.jp/english/ara01.html>
++# http://www.nipr.ac.jp/english/ara01.html
+ 
+ # S Korea - year-round base
+ # Jang Bogo, Terra Nova Bay, -743700+1641205 since 2014
+@@ -251,20 +216,20 @@
+ # correct, but they should be quite close to the actual dates.
+ #
+ # From Paul Eggert (2014-03-21):
+-# The CET-switching Troll rules require zic from tzcode 2014b or later, so as
++# The CET-switching Troll rules require zic from tz 2014b or later, so as
+ # suggested by Bengt-Inge Larsson comment them out for now, and approximate
+ # with only UTC and CEST.  Uncomment them when 2014b is more prevalent.
+ #
+ # Rule	NAME	FROM	TO	TYPE	IN	ON	AT	SAVE	LETTER/S
+-#Rule	Troll	2005	max	-	Mar	 1	1:00u	1:00	CET
+-Rule	Troll	2005	max	-	Mar	lastSun	1:00u	2:00	CEST
+-#Rule	Troll	2005	max	-	Oct	lastSun	1:00u	1:00	CET
+-#Rule	Troll	2004	max	-	Nov	 7	1:00u	0:00	UTC
++#Rule	Troll	2005	max	-	Mar	 1	1:00u	1:00	+01
++Rule	Troll	2005	max	-	Mar	lastSun	1:00u	2:00	+02
++#Rule	Troll	2005	max	-	Oct	lastSun	1:00u	1:00	+01
++#Rule	Troll	2004	max	-	Nov	 7	1:00u	0:00	+00
+ # Remove the following line when uncommenting the above '#Rule' lines.
+-Rule	Troll	2004	max	-	Oct	lastSun	1:00u	0:00	UTC
++Rule	Troll	2004	max	-	Oct	lastSun	1:00u	0:00	+00
+ # Zone	NAME		GMTOFF	RULES	FORMAT	[UNTIL]
+-Zone Antarctica/Troll	0	-	zzz	2005 Feb 12
+-     			0:00	Troll	%s
++Zone Antarctica/Troll	0	-	-00	2005 Feb 12
++			0:00	Troll	%s
+ 
+ # Poland - year-round base
+ # Arctowski, King George Island, -620945-0582745, since 1977
+@@ -281,8 +246,8 @@
+ #	year-round from 1960/61 to 1992
+ 
+ # Vostok, since 1957-12-16, temporarily closed 1994-02/1994-11
+-# From Craig Mundell (1994-12-15)
+-# <http://quest.arc.nasa.gov/antarctica/QA/computers/Directions,Time,ZIP>:
++# From Craig Mundell (1994-12-15):
++# http://quest.arc.nasa.gov/antarctica/QA/computers/Directions,Time,ZIP
+ # Vostok, which is one of the Russian stations, is set on the same
+ # time as Moscow, Russia.
+ #
+@@ -302,10 +267,10 @@
+ # changes during the year and does not necessarily correspond to mean
+ # solar noon.  So the Vostok time might have been whatever the clocks
+ # happened to be during their visit.  So we still don't really know what time
+-# it is at Vostok.  But we'll guess UTC+6.
++# it is at Vostok.  But we'll guess +06.
+ #
+-Zone Antarctica/Vostok	0	-	zzz	1957 Dec 16
+-			6:00	-	VOST	# Vostok time
++Zone Antarctica/Vostok	0	-	-00	1957 Dec 16
++			6:00	-	+06
+ 
+ # S Africa - year-round bases
+ # Marion Island, -4653+03752
+@@ -337,8 +302,8 @@
+ # <http://webexhibits.org/daylightsaving/g.html> says Rothera is -03 all year.
+ #
+ # Zone	NAME		GMTOFF	RULES	FORMAT	[UNTIL]
+-Zone Antarctica/Rothera	0	-	zzz	1976 Dec  1
+-			-3:00	-	ROTT	# Rothera time
++Zone Antarctica/Rothera	0	-	-00	1976 Dec  1
++			-3:00	-	-03
+ 
+ # Uruguay - year round base
+ # Artigas, King George Island, -621104-0585107
+@@ -346,20 +311,7 @@
+ # USA - year-round bases
+ #
+ # Palmer, Anvers Island, since 1965 (moved 2 miles in 1968)
+-#
+-# From Ethan Dicks (1996-10-06):
+-# It keeps the same time as Punta Arenas, Chile, because, just like us
+-# and the South Pole, that's the other end of their supply line....
+-# I verified with someone who was there that since 1980,
+-# Palmer has followed Chile.  Prior to that, before the Falklands War,
+-# Palmer used to be supplied from Argentina.
+-#
+-# Zone	NAME		GMTOFF	RULES	FORMAT	[UNTIL]
+-Zone Antarctica/Palmer	0	-	zzz	1965
+-			-4:00	ArgAQ	AR%sT	1969 Oct 5
+-			-3:00	ArgAQ	AR%sT	1982 May
+-			-4:00	ChileAQ	CL%sT
+-#
++# See 'southamerica' for Antarctica/Palmer, since it uses South American DST.
+ #
+ # McMurdo Station, Ross Island, since 1955-12
+ # Amundsen-Scott South Pole Station, continuously occupied since 1956-11-20
+--- contrib/tzdata/asia.orig
++++ contrib/tzdata/asia
+@@ -1,32 +1,36 @@
+ # This file is in the public domain, so clarified as of
+ # 2009-05-17 by Arthur David Olson.
+ 
+-# This data is by no means authoritative; if you think you know better,
++# This file is by no means authoritative; if you think you know better,
+ # go ahead and edit the file (and please send any changes to
+-# tz@iana.org for general use in the future).
++# tz@iana.org for general use in the future).  For more, please see
++# the file CONTRIBUTING in the tz distribution.
+ 
+-# From Paul Eggert (2013-08-11):
++# From Paul Eggert (2015-08-08):
+ #
+-# A good source for time zone historical data outside the U.S. is
++# Unless otherwise specified, the source for data through 1990 is:
+ # Thomas G. Shanks and Rique Pottenger, The International Atlas (6th edition),
+ # San Diego: ACS Publications, Inc. (2003).
++# Unfortunately this book contains many errors and cites no sources.
+ #
+ # Gwillim Law writes that a good source
+ # for recent time zone data is the International Air Transport
+ # Association's Standard Schedules Information Manual (IATA SSIM),
+ # published semiannually.  Law sent in several helpful summaries
+-# of the IATA's data after 1990.
+-#
+-# Except where otherwise noted, Shanks & Pottenger is the source for
+-# entries through 1990, and IATA SSIM is the source for entries afterwards.
++# of the IATA's data after 1990.  Except where otherwise noted,
++# IATA SSIM is the source for entries after 1990.
+ #
+ # Another source occasionally used is Edward W. Whitman, World Time Differences,
+ # Whitman Publishing Co, 2 Niagara Av, Ealing, London (undated), which
+ # I found in the UCLA library.
+ #
+ # For data circa 1899, a common source is:
+-# Milne J. Civil time. Geogr J. 1899 Feb;13(2):173-94
+-# <http://www.jstor.org/stable/1774359>.
++# Milne J. Civil time. Geogr J. 1899 Feb;13(2):173-94.
++# http://www.jstor.org/stable/1774359
++#
++# For Russian data circa 1919, a source is:
++# Byalokoz EL. New Counting of Time in Russia since July 1, 1919.
++# (See the 'europe' file for a fuller citation.)
+ #
+ # A reliable and entertaining source about time zones is
+ # Derek Howse, Greenwich time and longitude, Philip Wilson Publishers (1997).
+@@ -39,18 +43,20 @@
+ #	2:00 EET  EEST	Eastern European Time
+ #	2:00 IST  IDT	Israel
+ #	3:00 AST  ADT	Arabia*
+-#	3:30 IRST IRDT	Iran
++#	3:30 IRST IRDT	Iran*
+ #	4:00 GST	Gulf*
+ #	5:30 IST	India
+-#	7:00 ICT	Indochina*
++#	7:00 ICT	Indochina, most times and locations*
+ #	7:00 WIB	west Indonesia (Waktu Indonesia Barat)
+ #	8:00 WITA	central Indonesia (Waktu Indonesia Tengah)
+ #	8:00 CST	China
++#	8:00 IDT	Indochina, 1943-45, 1947-55, 1960-75 (some locations)*
+ #	8:00 JWST	Western Standard Time (Japan, 1896/1937)*
++#	8:30 KST  KDT	Korea when at +0830*
+ #	9:00 JCST	Central Standard Time (Japan, 1896/1937)
+ #	9:00 WIT	east Indonesia (Waktu Indonesia Timur)
+ #	9:00 JST  JDT	Japan
+-#	9:00 KST  KDT	Korea
++#	9:00 KST  KDT	Korea when at +09
+ #	9:30 ACST	Australian Central Standard Time
+ #
+ # See the 'europe' file for Russia and Turkey in Asia.
+@@ -73,13 +79,9 @@
+ Rule E-EurAsia	1996	max	-	Oct	lastSun	 0:00	0	-
+ Rule RussiaAsia	1981	1984	-	Apr	1	 0:00	1:00	S
+ Rule RussiaAsia	1981	1983	-	Oct	1	 0:00	0	-
+-Rule RussiaAsia	1984	1991	-	Sep	lastSun	 2:00s	0	-
+-Rule RussiaAsia	1985	1991	-	Mar	lastSun	 2:00s	1:00	S
+-Rule RussiaAsia	1992	only	-	Mar	lastSat	23:00	1:00	S
+-Rule RussiaAsia	1992	only	-	Sep	lastSat	23:00	0	-
+-Rule RussiaAsia	1993	max	-	Mar	lastSun	 2:00s	1:00	S
+-Rule RussiaAsia	1993	1995	-	Sep	lastSun	 2:00s	0	-
+-Rule RussiaAsia	1996	max	-	Oct	lastSun	 2:00s	0	-
++Rule RussiaAsia	1984	1995	-	Sep	lastSun	 2:00s	0	-
++Rule RussiaAsia	1985	2011	-	Mar	lastSun	 2:00s	1:00	S
++Rule RussiaAsia	1996	2011	-	Oct	lastSun	 2:00s	0	-
+ 
+ # Afghanistan
+ # Zone	NAME		GMTOFF	RULES	FORMAT	[UNTIL]
+@@ -114,36 +116,40 @@
+ # http://www.worldtimezone.com/dst_news/dst_news_armenia03.html
+ # Zone	NAME		GMTOFF	RULES	FORMAT	[UNTIL]
+ Zone	Asia/Yerevan	2:58:00 -	LMT	1924 May  2
+-			3:00	-	YERT	1957 Mar    # Yerevan Time
+-			4:00 RussiaAsia YER%sT	1991 Mar 31 2:00s
+-			3:00	1:00	YERST	1991 Sep 23 # independence
+-			3:00 RussiaAsia	AM%sT	1995 Sep 24 2:00s
+-			4:00	-	AMT	1997
+-			4:00 RussiaAsia	AM%sT	2012 Mar 25 2:00s
+-			4:00	-	AMT
++			3:00	-	+03	1957 Mar
++			4:00 RussiaAsia +04/+05	1991 Mar 31  2:00s
++			3:00 RussiaAsia	+03/+04	1995 Sep 24  2:00s
++			4:00	-	+04	1997
++			4:00 RussiaAsia	+04/+05
+ 
+ # Azerbaijan
++
+ # From Rustam Aliyev of the Azerbaijan Internet Forum (2005-10-23):
+ # According to the resolution of Cabinet of Ministers, 1997
+-# Resolution available at: http://aif.az/docs/daylight_res.pdf
++# From Paul Eggert (2015-09-17): It was Resolution No. 21 (1997-03-17).
++# http://code.az/files/daylight_res.pdf
++
++# From Steffen Thorsen (2016-03-17):
++# ... the Azerbaijani Cabinet of Ministers has cancelled switching to
++# daylight saving time....
++# http://www.azernews.az/azerbaijan/94137.html
++# http://vestnikkavkaza.net/news/Azerbaijani-Cabinet-of-Ministers-cancels-daylight-saving-time.html
++# http://en.apa.az/xeber_azerbaijan_abolishes_daylight_savings_ti_240862.html
++
+ # Rule	NAME	FROM	TO	TYPE	IN	ON	AT	SAVE	LETTER/S
+-Rule	Azer	1997	max	-	Mar	lastSun	 4:00	1:00	S
+-Rule	Azer	1997	max	-	Oct	lastSun	 5:00	0	-
++Rule	Azer	1997	2015	-	Mar	lastSun	 4:00	1:00	S
++Rule	Azer	1997	2015	-	Oct	lastSun	 5:00	0	-
+ # Zone	NAME		GMTOFF	RULES	FORMAT	[UNTIL]
+ Zone	Asia/Baku	3:19:24 -	LMT	1924 May  2
+-			3:00	-	BAKT	1957 Mar    # Baku Time
+-			4:00 RussiaAsia BAK%sT	1991 Mar 31 2:00s
+-			3:00	1:00	BAKST	1991 Aug 30 # independence
+-			3:00 RussiaAsia	AZ%sT	1992 Sep lastSat 23:00
+-			4:00	-	AZT	1996 # Azerbaijan time
+-			4:00	EUAsia	AZ%sT	1997
+-			4:00	Azer	AZ%sT
++			3:00	-	+03	1957 Mar
++			4:00 RussiaAsia +04/+05	1991 Mar 31  2:00s
++			3:00 RussiaAsia	+03/+04	1992 Sep lastSun  2:00s
++			4:00	-	+04	1996
++			4:00	EUAsia	+04/+05	1997
++			4:00	Azer	+04/+05
+ 
+ # Bahrain
+-# Zone	NAME		GMTOFF	RULES	FORMAT	[UNTIL]
+-Zone	Asia/Bahrain	3:22:20 -	LMT	1920		# Manamah
+-			4:00	-	GST	1972 Jun
+-			3:00	-	AST
++# See Asia/Qatar.
+ 
+ # Bangladesh
+ # From Alexander Krivenyshev (2009-05-13):
+@@ -219,7 +225,7 @@
+ 
+ # Rule	NAME	FROM	TO	TYPE	IN	ON	AT	SAVE	LETTER/S
+ Rule	Dhaka	2009	only	-	Jun	19	23:00	1:00	S
+-Rule	Dhaka	2009	only	-	Dec	31	23:59	0	-
++Rule	Dhaka	2009	only	-	Dec	31	24:00	0	-
+ 
+ # Zone	NAME		GMTOFF	RULES	FORMAT	[UNTIL]
+ Zone	Asia/Dhaka	6:01:40 -	LMT	1890
+@@ -250,7 +256,7 @@
+ 
+ # Brunei
+ # Zone	NAME		GMTOFF	RULES	FORMAT	[UNTIL]
+-Zone	Asia/Brunei	7:39:40 -	LMT	1926 Mar   # Bandar Seri Begawan
++Zone	Asia/Brunei	7:39:40 -	LMT	1926 Mar # Bandar Seri Begawan
+ 			7:30	-	BNT	1933
+ 			8:00	-	BNT
+ 
+@@ -259,19 +265,15 @@
+ # Milne says 6:24:40 was the meridian of the time ball observatory at Rangoon.
+ 
+ # Zone	NAME		GMTOFF	RULES	FORMAT	[UNTIL]
+-Zone	Asia/Rangoon	6:24:40 -	LMT	1880		# or Yangon
+-			6:24:40	-	RMT	1920	   # Rangoon Mean Time?
+-			6:30	-	BURT	1942 May   # Burma Time
+-			9:00	-	JST	1945 May 3
+-			6:30	-	MMT		   # Myanmar Time
++Zone	Asia/Yangon	6:24:40 -	LMT	1880        # or Rangoon
++			6:24:40	-	RMT	1920        # Rangoon Mean Time?
++			6:30	-	BURT	1942 May    # Burma Time
++			9:00	-	JST	1945 May  3
++			6:30	-	MMT	# Myanmar Time
+ 
+ # Cambodia
+-# Zone	NAME		GMTOFF	RULES	FORMAT	[UNTIL]
+-Zone	Asia/Phnom_Penh	6:59:40 -	LMT	1906 Jun  9
+-			7:06:20	-	SMT	1911 Mar 11 0:01 # Saigon MT?
+-			7:00	-	ICT	1912 May
+-			8:00	-	ICT	1931 May
+-			7:00	-	ICT
++# See Asia/Bangkok.
++
+ 
+ # China
+ 
+@@ -356,8 +358,8 @@
+ #   * The Republic of China instituted Beijing mean solar time effective
+ #     the official calendar book of 1914.
+ #   * The French Concession in Shanghai set up signal stations in
+-#     French docks in the 1890s, controled by Xujiahui (Zikawei)
+-#     Obervatory and set to local mean time.
++#     French docks in the 1890s, controlled by Xujiahui (Zikawei)
++#     Observatory and set to local mean time.
+ #   * "From the end of the 19th century" it changed to UT+8.
+ #   * Chinese Customs (by then reduced to a tool of foreign powers)
+ #     eventually standardized on this time for all ports, and it
+@@ -378,35 +380,35 @@
+ # Lewiston (ME) Daily Sun (1939-05-29), p 17, said "Even the time is
+ # different - the occupied districts going by Tokyo time, an hour
+ # ahead of that prevailing in the rest of Shanghai."  Guess that the
+-# Xujiahui Observatory was under French control and stuck with UT+8.
++# Xujiahui Observatory was under French control and stuck with UT +08.
+ #
+ # In earlier versions of this file, China had many separate Zone entries, but
+-# this was based on what was apparently incorrect data in Shanks & Pottenger.
++# this was based on what were apparently incorrect data in Shanks & Pottenger.
+ # This has now been simplified to the two entries Asia/Shanghai and
+ # Asia/Urumqi, with the others being links for backward compatibility.
+ # Proposed in 1918 and theoretically in effect until 1949 (although in practice
+ # mainly observed in coastal areas), the five zones were:
+ #
+-# Changbai Time ("Long-white Time", Long-white = Heilongjiang area) UT+8.5
++# Changbai Time ("Long-white Time", Long-white = Heilongjiang area) UT +08:30
+ # Asia/Harbin (currently a link to Asia/Shanghai)
+ # Heilongjiang (except Mohe county), Jilin
+ #
+-# Zhongyuan Time ("Central plain Time") UT+8
++# Zhongyuan Time ("Central plain Time") UT +08
+ # Asia/Shanghai
+ # most of China
+ # This currently represents most other zones as well,
+ # as apparently these regions have been the same since 1970.
+ # Milne gives 8:05:43.2 for Xujiahui Observatory time; round to nearest.
+-# Guo says Shanghai switched to UT+8 "from the end of the 19th century".
++# Guo says Shanghai switched to UT +08 "from the end of the 19th century".
+ #
+-# Long-shu Time (probably due to Long and Shu being two names of that area) UT+7
++# Long-shu Time (probably due to Long and Shu being two names of the area) UT +07
+ # Asia/Chongqing (currently a link to Asia/Shanghai)
+ # Guangxi, Guizhou, Hainan, Ningxia, Sichuan, Shaanxi, and Yunnan;
+ # most of Gansu; west Inner Mongolia; west Qinghai; and the Guangdong
+ # counties Deqing, Enping, Kaiping, Luoding, Taishan, Xinxing,
+ # Yangchun, Yangjiang, Yu'nan, and Yunfu.
+ #
+-# Xin-zang Time ("Xinjiang-Tibet Time") UT+6
++# Xin-zang Time ("Xinjiang-Tibet Time") UT +06
+ # Asia/Urumqi
+ # This currently represents Kunlun Time as well,
+ # as apparently the two regions have been the same since 1970.
+@@ -419,7 +421,7 @@
+ # Shihezi, Changji, Yanqi, Heshuo, Tuokexun, Tulufan, Shanshan, Hami,
+ # Fukang, Kuitun, Kumukuli, Miquan, Qitai, and Turfan.
+ #
+-# Kunlun Time UT+5.5
++# Kunlun Time UT +05:30
+ # Asia/Kashgar (currently a link to Asia/Urumqi)
+ # West Tibet, including Pulan, Aheqi, Shufu, Shule;
+ # West Xinjiang, including Aksu, Atushi, Yining, Hetian, Cele, Luopu, Nileke,
+@@ -435,7 +437,7 @@
+ #
+ # On the other hand, ethnic Uyghurs, who make up about half the
+ # population of Xinjiang, typically use "Xinjiang time" which is two
+-# hours behind Beijing time, or UTC +0600. The government of the Xinjiang
++# hours behind Beijing time, or UT +06. The government of the Xinjiang
+ # Uyghur Autonomous Region, (XAUR, or just Xinjiang for short) as well as
+ # local governments such as the Ürümqi city government use both times in
+ # publications, referring to what is popularly called Xinjiang time as
+@@ -491,8 +493,8 @@
+ # having the same time as Beijing.
+ 
+ # From Paul Eggert (2014-06-30):
+-# In the early days of the PRC, Tibet was given its own time zone (UT+6) but
+-# this was withdrawn in 1959 and never reinstated; see Tubten Khétsun,
++# In the early days of the PRC, Tibet was given its own time zone (UT +06)
++# but this was withdrawn in 1959 and never reinstated; see Tubten Khétsun,
+ # Memories of life in Lhasa under Chinese Rule, Columbia U Press, ISBN
+ # 978-0231142861 (2008), translator's introduction by Matthew Akester, p x.
+ # As this is before our 1970 cutoff, Tibet doesn't need a separate zone.
+@@ -501,17 +503,17 @@
+ # "The Working-Calendar for The Xinjiang Uygur Autonomous Region Government"
+ # <http://www.sinkiang.gov.cn/service/ourworking/> (2014-04-22).
+ # Unfortunately, we have no good records of time in Xinjiang before 1986.
+-# During the 20th century parts of Xinjiang were ruled by the Qing dyansty,
++# During the 20th century parts of Xinjiang were ruled by the Qing dynasty,
+ # the Republic of China, various warlords, the First and Second East Turkestan
+ # Republics, the Soviet Union, the Kuomintang, and the People's Republic of
+ # China, and tracking down all these organizations' timekeeping rules would be
+ # quite a trick.  Approximate this lost history by a transition from LMT to
+-# XJT at the start of 1928, the year of accession of the warlord Jin Shuren,
++# UT +06 at the start of 1928, the year of accession of the warlord Jin Shuren,
+ # which happens to be the date given by Shanks & Pottenger (no doubt as a
+-# guess) as the transition from LMT.  Ignore the usage of UT+8 before
+-# 1986-02-01 under the theory that the transition date to UT+8 is unknown and
++# guess) as the transition from LMT.  Ignore the usage of +08 before
++# 1986-02-01 under the theory that the transition date to +08 is unknown and
+ # that the sort of users who prefer Asia/Urumqi now typically ignored the
+-# UT+8 mandate back then.
++# +08 mandate back then.
+ 
+ # Zone	NAME		GMTOFF	RULES	FORMAT	[UNTIL]
+ # Beijing time, used throughout China; represented by Shanghai.
+@@ -698,25 +700,25 @@
+ # Central Weather Bureau website was not correct.
+ #
+ # Original Bulletin:
+-# <http://subtpg.tpg.gov.tw/og/image2.asp?f=03502F0AKM1AF>
+-# <http://subtpg.tpg.gov.tw/og/image2.asp?f=0350300AKM1B0> (cont.)
++# http://subtpg.tpg.gov.tw/og/image2.asp?f=03502F0AKM1AF
++# http://subtpg.tpg.gov.tw/og/image2.asp?f=0350300AKM1B0 (cont.)
+ #
+ # In 1947, DST in Taiwan was expanded to Oct 31. There is a backup of that
+ # telegram announcement from Taiwan Province Government:
+ #
+-# <http://subtpg.tpg.gov.tw/og/image2.asp?f=0360310AKZ431>
++# http://subtpg.tpg.gov.tw/og/image2.asp?f=0360310AKZ431
+ #
+ # Here is a brief translation:
+ #
+ #   The Summer Time this year is adopted from midnight Apr 15 until Sep 20
+ #   midnight. To save (energy?) consumption, we're expanding Summer Time
+-#   adption till Oct 31 midnight.
++#   adoption till Oct 31 midnight.
+ #
+ # The Central Weather Bureau website didn't mention that, however it can
+ # be found from historical government announcement database.
+ 
+ # From Paul Eggert (2014-07-03):
+-# As per Yu-Cheng Chuang, say that Taiwan was at UT+9 from 1937-10-01
++# As per Yu-Cheng Chuang, say that Taiwan was at UT +09 from 1937-10-01
+ # until 1945-09-21 at 01:00, overriding Shanks & Pottenger.
+ # Likewise, use Yu-Cheng Chuang's data for DST in Taiwan.
+ 
+@@ -741,7 +743,7 @@
+ # Taipei or Taibei or T'ai-pei
+ Zone	Asia/Taipei	8:06:00 -	LMT	1896 Jan  1
+ 			8:00	-	JWST	1937 Oct  1
+-			9:00	-	JST	1945 Sep 21 01:00
++			9:00	-	JST	1945 Sep 21  1:00
+ 			8:00	Taiwan	C%sT
+ 
+ # Macau (Macao, Aomen)
+@@ -761,7 +763,7 @@
+ Rule	Macau	1978	1980	-	Apr	Sun>=15	0:00	1:00	S
+ Rule	Macau	1978	1980	-	Oct	Sun>=15	0:00	0	-
+ # Zone	NAME		GMTOFF	RULES	FORMAT	[UNTIL]
+-Zone	Asia/Macau	7:34:20 -	LMT	1912
++Zone	Asia/Macau	7:34:20 -	LMT	1912 Jan  1
+ 			8:00	Macau	MO%sT	1999 Dec 20 # return to China
+ 			8:00	PRC	C%sT
+ 
+@@ -769,9 +771,19 @@
+ ###############################################################################
+ 
+ # Cyprus
+-#
++
+ # Milne says the Eastern Telegraph Company used 2:14:00.  Stick with LMT.
+-#
++# IATA SSIM (1998-09) has Cyprus using EU rules for the first time.
++
++# From Paul Eggert (2016-09-09):
++# Yesterday's Cyprus Mail reports that Northern Cyprus followed Turkey's
++# lead and switched from +02/+03 to +03 year-round.
++# http://cyprus-mail.com/2016/09/08/two-time-zones-cyprus-turkey-will-not-turn-clocks-back-next-month/
++#
++# From Even Scharning (2016-10-31):
++# Looks like the time zone split in Cyprus went through last night.
++# http://cyprus-mail.com/2016/10/30/cyprus-new-division-two-time-zones-now-reality/
++
+ # Rule	NAME	FROM	TO	TYPE	IN	ON	AT	SAVE	LETTER/S
+ Rule	Cyprus	1975	only	-	Apr	13	0:00	1:00	S
+ Rule	Cyprus	1975	only	-	Oct	12	0:00	0	-
+@@ -786,7 +798,10 @@
+ Zone	Asia/Nicosia	2:13:28 -	LMT	1921 Nov 14
+ 			2:00	Cyprus	EE%sT	1998 Sep
+ 			2:00	EUAsia	EE%sT
+-# IATA SSIM (1998-09) has Cyprus using EU rules for the first time.
++Zone	Asia/Famagusta	2:15:48	-	LMT	1921 Nov 14
++			2:00	Cyprus	EE%sT	1998 Sep
++			2:00	EUAsia	EE%sT	2016 Sep  8
++			3:00	-	+03
+ 
+ # Classically, Cyprus belongs to Asia; e.g. see Herodotus, Histories, I.72.
+ # However, for various reasons many users expect to find it under Europe.
+@@ -823,21 +838,22 @@
+ # I don't know what can be done, especially knowing that some years ago our
+ # DST rules where changed THREE TIMES during one month.
+ 
+-# Milne says Tbilisi (Tiflis) time was 2:59:05.7; round to nearest.)
+-
+-# Zone	NAME		GMTOFF	RULES	FORMAT	[UNTIL]
+-Zone	Asia/Tbilisi	2:59:06 -	LMT	1880
+-			2:59:06	-	TBMT	1924 May  2 # Tbilisi Mean Time
+-			3:00	-	TBIT	1957 Mar    # Tbilisi Time
+-			4:00 RussiaAsia TBI%sT	1991 Mar 31 2:00s
+-			3:00	1:00	TBIST	1991 Apr  9 # independence
+-			3:00 RussiaAsia GE%sT	1992 # Georgia Time
+-			3:00 E-EurAsia	GE%sT	1994 Sep lastSun
+-			4:00 E-EurAsia	GE%sT	1996 Oct lastSun
+-			4:00	1:00	GEST	1997 Mar lastSun
+-			4:00 E-EurAsia	GE%sT	2004 Jun 27
+-			3:00 RussiaAsia	GE%sT	2005 Mar lastSun 2:00
+-			4:00	-	GET
++# Milne 1899 says Tbilisi (Tiflis) time was 2:59:05.7.
++# Byalokoz 1919 says Georgia was 2:59:11.
++# Go with Byalokoz.
++
++# Zone	NAME		GMTOFF	RULES	FORMAT	[UNTIL]
++Zone	Asia/Tbilisi	2:59:11 -	LMT	1880
++			2:59:11	-	TBMT	1924 May  2 # Tbilisi Mean Time
++			3:00	-	+03	1957 Mar
++			4:00 RussiaAsia +04/+05	1991 Mar 31  2:00s
++			3:00 RussiaAsia +03/+04	1992
++			3:00 E-EurAsia	+03/+04	1994 Sep lastSun
++			4:00 E-EurAsia	+04/+05	1996 Oct lastSun
++			4:00	1:00	+05	1997 Mar lastSun
++			4:00 E-EurAsia	+04/+05	2004 Jun 27
++			3:00 RussiaAsia	+03/+04	2005 Mar lastSun  2:00
++			4:00	-	+04
+ 
+ # East Timor
+ 
+@@ -864,16 +880,25 @@
+ # midnight on Saturday, September 16.
+ 
+ # Zone	NAME		GMTOFF	RULES	FORMAT	[UNTIL]
+-Zone	Asia/Dili	8:22:20 -	LMT	1912
++Zone	Asia/Dili	8:22:20 -	LMT	1912 Jan  1
+ 			8:00	-	TLT	1942 Feb 21 23:00 # E Timor Time
+ 			9:00	-	JST	1945 Sep 23
+ 			9:00	-	TLT	1976 May  3
+-			8:00	-	WITA	2000 Sep 17 00:00
++			8:00	-	WITA	2000 Sep 17  0:00
+ 			9:00	-	TLT
+ 
+ # India
++
++# From Ian P. Beacock, in "A brief history of (modern) time", The Atlantic
++# http://www.theatlantic.com/technology/archive/2015/12/the-creation-of-modern-time/421419/
++# (2015-12-22):
++# In January 1906, several thousand cotton-mill workers rioted on the
++# outskirts of Bombay....  They were protesting the proposed abolition of
++# local time in favor of Indian Standard Time....  Journalists called this
++# dispute the "Battle of the Clocks."  It lasted nearly half a century.
++
+ # Zone	NAME		GMTOFF	RULES	FORMAT	[UNTIL]
+-Zone	Asia/Kolkata	5:53:28 -	LMT	1880	# Kolkata
++Zone	Asia/Kolkata	5:53:28 -	LMT	1880        # Kolkata
+ 			5:53:20	-	HMT	1941 Oct    # Howrah Mean Time?
+ 			6:30	-	BURT	1942 May 15 # Burma Time
+ 			5:30	-	IST	1942 Sep
+@@ -886,8 +911,12 @@
+ 
+ # Indonesia
+ #
++# From Paul Eggert (2014-09-06):
++# The 1876 Report of the Secretary of the [US] Navy, p 306 says that Batavia
++# civil time was 7:07:12.5; round to even for Jakarta.
++#
+ # From Gwillim Law (2001-05-28), overriding Shanks & Pottenger:
+-# <http://www.sumatera-inc.com/go_to_invest/about_indonesia.asp#standtime>
++# http://www.sumatera-inc.com/go_to_invest/about_indonesia.asp#standtime
+ # says that Indonesia's time zones changed on 1988-01-01.  Looking at some
+ # time zone maps, I think that must refer to Western Borneo (Kalimantan Barat
+ # and Kalimantan Tengah) switching from UTC+8 to UTC+7.
+@@ -901,7 +930,7 @@
+ # These would be the earliest possible times for a change.
+ # Régimes horaires pour le monde entier, by Henri Le Corre, (Éditions
+ # Traditionnelles, 1987, Paris) says that Java and Madura switched
+-# from JST to UTC+07:30 on 1945-09-23, and gives 1944-09-01 for Jayapura
++# from UT +09 to +07:30 on 1945-09-23, and gives 1944-09-01 for Jayapura
+ # (Hollandia).  For now, assume all Indonesian locations other than Jayapura
+ # switched on 1945-09-23.
+ #
+@@ -912,11 +941,11 @@
+ # summary published by the Time and Frequency Laboratory of the
+ # Research Center for Calibration, Instrumentation and Metrology,
+ # Indonesia, <http://time.kim.lipi.go.id/time-eng.php> (2006-09-29).
+-# The abbreviations are:
++# The time zone abbreviations and UT offsets are:
+ #
+-# WIB  - UTC+7 - Waktu Indonesia Barat (Indonesia western time)
+-# WITA - UTC+8 - Waktu Indonesia Tengah (Indonesia central time)
+-# WIT  - UTC+9 - Waktu Indonesia Timur (Indonesia eastern time)
++# WIB  - +07 - Waktu Indonesia Barat (Indonesia western time)
++# WITA - +08 - Waktu Indonesia Tengah (Indonesia central time)
++# WIT  - +09 - Waktu Indonesia Timur (Indonesia eastern time)
+ #
+ # Zone	NAME		GMTOFF	RULES	FORMAT	[UNTIL]
+ # Java, Sumatra
+@@ -924,7 +953,7 @@
+ # Shanks & Pottenger say the next transition was at 1924 Jan 1 0:13,
+ # but this must be a typo.
+ 			7:07:12	-	BMT	1923 Dec 31 23:47:12 # Batavia
+-			7:20	-	JAVT	1932 Nov	 # Java Time
++			7:20	-	JAVT	1932 Nov    # Java Time
+ 			7:30	-	WIB	1942 Mar 23
+ 			9:00	-	JST	1945 Sep 23
+ 			7:30	-	WIB	1948 May
+@@ -1023,7 +1052,7 @@
+ #
+ # From Roozbeh Pournader (2007-11-05):
+ # This is quoted from Official Gazette of the Islamic Republic of
+-# Iran, Volume 63, Number 18242, dated Tuesday 1386/6/24
++# Iran, Volume 63, No. 18242, dated Tuesday 1386/6/24
+ # [2007-10-16]. I am doing the best translation I can:...
+ # The official time of the country will be moved forward for one hour
+ # on the 24 hours of the first day of the month of Farvardin and will
+@@ -1078,11 +1107,18 @@
+ Rule	Iran	2032	2033	-	Sep	21	0:00	0	S
+ Rule	Iran	2034	2035	-	Mar	22	0:00	1:00	D
+ Rule	Iran	2034	2035	-	Sep	22	0:00	0	S
+-Rule	Iran	2036	2037	-	Mar	21	0:00	1:00	D
+-Rule	Iran	2036	2037	-	Sep	21	0:00	0	S
++#
++# The following rules are approximations starting in the year 2038.
++# These are the best post-2037 approximations available, given the
++# restrictions of a single rule using a Gregorian-based data format.
++# At some point this table will need to be extended, though quite
++# possibly Iran will change the rules first.
++Rule	Iran	2036	max	-	Mar	21	0:00	1:00	D
++Rule	Iran	2036	max	-	Sep	21	0:00	0	S
++
+ # Zone	NAME		GMTOFF	RULES	FORMAT	[UNTIL]
+ Zone	Asia/Tehran	3:25:44	-	LMT	1916
+-			3:25:44	-	TMT	1946	# Tehran Mean Time
++			3:25:44	-	TMT	1946     # Tehran Mean Time
+ 			3:30	-	IRST	1977 Nov
+ 			4:00	Iran	IR%sT	1979
+ 			3:30	Iran	IR%sT
+@@ -1127,7 +1163,7 @@
+ Rule	Iraq	1991	2007	-	Oct	 1	3:00s	0	S
+ # Zone	NAME		GMTOFF	RULES	FORMAT	[UNTIL]
+ Zone	Asia/Baghdad	2:57:40	-	LMT	1890
+-			2:57:36	-	BMT	1918	    # Baghdad Mean Time?
++			2:57:36	-	BMT	1918     # Baghdad Mean Time?
+ 			3:00	-	AST	1982 May
+ 			3:00	Iraq	A%sT
+ 
+@@ -1355,7 +1391,7 @@
+ 
+ # Zone	NAME		GMTOFF	RULES	FORMAT	[UNTIL]
+ Zone	Asia/Jerusalem	2:20:54 -	LMT	1880
+-			2:20:40	-	JMT	1918	# Jerusalem Mean Time?
++			2:20:40	-	JMT	1918 # Jerusalem Mean Time?
+ 			2:00	Zion	I%sT
+ 
+ 
+@@ -1371,8 +1407,8 @@
+ # daylight saving between 1948 and 1951, but "the system was discontinued
+ # because the public believed it would lead to longer working hours."
+ 
+-# From Mayumi Negishi in the 2005-08-10 Japan Times
+-# <http://www.japantimes.co.jp/cgi-bin/getarticle.pl5?nn20050810f2.htm>:
++# From Mayumi Negishi in the 2005-08-10 Japan Times:
++# http://www.japantimes.co.jp/cgi-bin/getarticle.pl5?nn20050810f2.htm
+ # Occupation authorities imposed daylight-saving time on Japan on
+ # [1948-05-01]....  But lack of prior debate and the execution of
+ # daylight-saving time just three days after the bill was passed generated
+@@ -1396,7 +1432,8 @@
+ 
+ # From Hideyuki Suzuki (1998-11-09):
+ # 'Tokyo' usually stands for the former location of Tokyo Astronomical
+-# Observatory: 139 degrees 44' 40.90" E (9h 18m 58.727s), 35 degrees 39' 16.0" N.
++# Observatory: 139 degrees 44' 40.90" E (9h 18m 58.727s),
++# 35 degrees 39' 16.0" N.
+ # This data is from 'Rika Nenpyou (Chronological Scientific Tables) 1996'
+ # edited by National Astronomical Observatory of Japan....
+ # JST (Japan Standard Time) has been used since 1888-01-01 00:00 (JST).
+@@ -1535,24 +1572,7 @@
+ 
+ # Kazakhstan
+ 
+-# From Paul Eggert (1996-11-22):
+-# Andrew Evtichov (1996-04-13) writes that Kazakhstan
+-# stayed in sync with Moscow after 1990, and that Aqtobe (formerly Aktyubinsk)
+-# and Aqtau (formerly Shevchenko) are the largest cities in their zones.
+-# Guess that Aqtau and Aqtobe diverged in 1995, since that's the first time
+-# IATA SSIM mentions a third time zone in Kazakhstan.
+-
+-# From Paul Eggert (2006-03-22):
+-# German Iofis, ELSI, Almaty (2001-10-09) reports that Kazakhstan uses
+-# RussiaAsia rules, instead of switching at 00:00 as the IATA has it.
+-# Go with Shanks & Pottenger, who have them always using RussiaAsia rules.
+-# Also go with the following claims of Shanks & Pottenger:
+-#
+-# - Kazakhstan did not observe DST in 1991.
+-# - Qyzylorda switched from +5:00 to +6:00 on 1992-01-19 02:00.
+-# - Oral switched from +5:00 to +4:00 in spring 1989.
+-
+-# From Kazakhstan Embassy's News Bulletin #11
++# From Kazakhstan Embassy's News Bulletin No. 11
+ # <http://www.kazsociety.org.uk/news/2005/03/30.htm> (2005-03-21):
+ # The Government of Kazakhstan passed a resolution March 15 abolishing
+ # daylight saving time citing lack of economic benefits and health
+@@ -1568,68 +1588,239 @@
+ # everything else....  I guess that would make Kazakhstan time zones
+ # de jure UTC+5 and UTC+6 respectively.
+ 
++# From Stepan Golosunov (2016-03-27) ([*] means see later comments below):
++# Review of the linked documents from http://adilet.zan.kz/
++# produced the following data for post-1991 Kazakhstan:
++#
++# 0. Act of the Cabinet of Ministers of the USSR
++# from 1991-02-04 No. 20
++# http://pravo.gov.ru/proxy/ips/?docbody=&nd=102010545
++# removed the extra hour ("decree time") on the territory of the USSR
++# starting with the last Sunday of March 1991.
++# It also allowed (but not mandated) Kazakh SSR, Kirghiz SSR, Tajik SSR,
++# Turkmen SSR and Uzbek SSR to not have "summer" time.
++#
++# The 1992-01-13 act also refers to the act of the Cabinet of Ministers
++# of the Kazakh SSR from 1991-03-20 No. 170 "About the act of the Cabinet
++# of Ministers of the USSR from 1991-02-04 No. 20" but I didn't found its
++# text.
++#
++# According to Izvestia newspaper No. 68 (23334) from 1991-03-20
++# (page 6; available at http://libinfo.org/newsr/newsr2574.djvu via
++# http://libinfo.org/index.php?id=58564) on 1991-03-31 at 2:00 during
++# transition to "summer" time:
++# Republic of Georgia, Latvian SSR, Lithuanian SSR, SSR Moldova,
++# Estonian SSR; Komi ASSR; Kaliningrad oblast; Nenets autonomous okrug
++# were to move clocks 1 hour forward.
++# Kazakh SSR (excluding Uralsk oblast); Republic of Kyrgyzstan, Tajik
++# SSR; Andijan, Jizzakh, Namangan, Sirdarya, Tashkent, Fergana oblasts
++# of the Uzbek SSR were to move clocks 1 hour backwards.
++# Other territories were to not move clocks.
++# When the "summer" time would end on 1991-09-29, clocks were to be
++# moved 1 hour backwards on the territory of the USSR excluding
++# Kazakhstan, Kirghizia, Uzbekistan, Turkmenia, Tajikistan.
++#
++# Apparently there were last minute changes. Apparently Kazakh act No. 170
++# was one of such changes.
++#
++# https://ru.wikipedia.org/wiki/Декретное время
++# claims that Sovetskaya Rossiya newspaper on 1991-03-29 published that
++# Nenets autonomous okrug, Komi and Kazakhstan (excluding Uralsk oblast)
++# were to not move clocks and Uralsk oblast was to move clocks
++# forward; on 1991-09-29 Kazakhstan was to move clocks backwards.
++# (Probably there were changes even after that publication. There is an
++# article claiming that Kaliningrad oblast decided on 1991-03-29 to not
++# move clocks.)
++#
++# This implies that on 1991-03-31 Asia/Oral remained on +04/+05 while
++# the rest of Kazakhstan switched from +06/+07 to +05/06 or from +05/06
++# to +04/+05. It's unclear how Kzyl-Orda oblast moved into the fifth
++# time belt. (By switching from +04/+05 to +05/+06 on 1991-09-29?) ...
++#
++# 1. Act of the Cabinet of Ministers of the Republic of Kazakhstan
++# from 1992-01-13 No. 28
++# http://adilet.zan.kz/rus/docs/P920000028_
++# (text includes modification from the 1996 act)
++# introduced new rules for calculation of time, mirroring Russian
++# 1992-01-08 act.  It specified that time would be calculated
++# according to time belts plus extra hour ("decree time"), moved clocks
++# on the whole territory of Kazakhstan 1 hour forward on 1992-01-19 at
++# 2:00, specified DST rules.  It acknowledged that Kazakhstan was
++# located in the fourth and the fifth time belts and specified the
++# border between them to be located east of Kustanay and Aktyubinsk
++# oblasts (notably including Turgai and Kzyl-Orda oblasts into the fifth
++# time belt).
++#
++# This means switch on 1992-01-19 at 2:00 from +04/+05 to +05/+06 for
++# Asia/Aqtau, Asia/Aqtobe, Asia/Oral, Atyrau and Kustanay oblasts; from
++# +05/+06 to +06/+07 for Asia/Almaty and Asia/Qyzylorda (and Arkalyk) [*]....
++#
++# 2. Act of the Cabinet of Ministers of the Republic of Kazakhstan
++# from 1992-03-27 No. 284
++# http://adilet.zan.kz/rus/docs/P920000284_
++# cancels extra hour ("decree time") for Uralsk and Kzyl-Orda oblasts
++# since the last Sunday of March 1992, while keeping them in the fourth
++# and the fifth time belts respectively.
++#
++# 3. Order of the Prime Minister of the Republic of Kazakhstan
++# from 1994-09-23 No. 384
++# http://adilet.zan.kz/rus/docs/R940000384_
++# cancels the extra hour ("decree time") on the territory of Mangystau
++# oblast since the last Sunday of September 1994 (saying that time on
++# the territory would correspond to the third time belt as a
++# result)....
++#
++# 4. Act of the Government of the Republic of Kazakhstan
++# from 1996-05-08 No. 575
++# http://adilet.zan.kz/rus/docs/P960000575_
++# amends the 1992-01-13 act to end summer time in October instead
++# of September, mirroring identical Russian change from 1996-04-23 act.
++#
++# 5. Act of the Government of the Republic of Kazakhstan
++# from 1999-03-26 No. 305
++# http://adilet.zan.kz/rus/docs/P990000305_
++# cancels the extra hour ("decree time") for Atyrau oblast since the
++# last Sunday of March 1999 while retaining the oblast in the fourth
++# time belt.
++#
++# This means change from +05/+06 to +04/+05.
++#
++# There is no zone for Atyrau currently (listed under Asia/Aqtau in
++# zone1970.tab).[*]
++#
++# 6. Act of the Government of the Republic of Kazakhstan
++# from 2000-11-23 No. 1749
++# http://adilet.zan.kz/rus/archive/docs/P000001749_/23.11.2000
++# replaces the previous five documents.
++#
++# The only changes I noticed are in definition of the border between the
++# fourth and the fifth time belts.  They account for changes in spelling
++# and administrative division (splitting of Turgai oblast in 1997
++# probably changed time in territories incorporated into Kostanay oblast
++# (including Arkalyk) from +06/+07 to +05/+06) and move Kyzylorda oblast
++# from being in the fifth time belt and not using decree time into the
++# fourth time belt (no change in practice).[*]
++#
++# 7. Act of the Government of the Republic of Kazakhstan
++# from 2003-12-29 No. 1342
++# http://adilet.zan.kz/rus/docs/P030001342_
++# modified the 2000-11-23 act.  No relevant changes, apparently.
++#
++# 8. Act of the Government of the Republic of Kazakhstan
++# from 2004-07-20 No. 775
++# http://adilet.zan.kz/rus/archive/docs/P040000775_/20.07.2004
++# modified the 2000-11-23 act to move Kostanay and Kyzylorda oblasts into
++# the fifth time belt and add Aktobe oblast to the list of regions not
++# using extra hour ("decree time"), leaving Kazakhstan with only 2 time
++# zones (+04/+05 and +06/+07).  The changes were to be implemented
++# during DST transitions in 2004 and 2005 but the acts got radically
++# amended before implementation happened.
++#
++# 9. Act of the Government of the Republic of Kazakhstan
++# from 2004-09-15 No. 1059
++# http://adilet.zan.kz/rus/docs/P040001059_
++# modified the 2000-11-23 act to remove exceptions from the "decree time"
++# (leaving Kazakhstan in +05/+06 and +06/+07 zones), amended the
++# 2004-07-20 act to implement changes for Atyrau, West Kazakhstan,
++# Kostanay, Kyzylorda and Mangystau oblasts by not moving clocks
++# during the 2014 transition to "winter" time.
++#
++# This means transition from +04/+05 to +05/+06 for Atyrau oblast (no
++# zone currently), Asia/Oral, Asia/Aqtau and transition from +05/+06 to
++# +06/+07 for Kostanay oblast (Kostanay and Arkalyk, no zones currently)
++# and Asia/Qyzylorda on 2004-10-31 at 3:00....[*]
++#
++# 10. Act of the Government of the Republic of Kazakhstan
++# from 2005-03-15 No. 231
++# http://adilet.zan.kz/rus/docs/P050000231_
++# removes DST provisions from the 2000-11-23 act, removes most of the
++# (already implemented) provisions from the 2004-07-20 and 2004-09-15
++# acts, comes into effect 10 days after official publication.
++# The only practical effect seems to be the abolition of the summer
++# time.
++#
++# Unamended version of the act of the Government of the Russian Federation
++# No. 23 from 1992-01-08 [See 'europe' file for details].
++# Kazakh 1992-01-13 act appears to provide the same rules and 1992-03-27
++# act was to be enacted on the last Sunday of March 1992.
++
++# From Paul Eggert (2016-04-15):
++# The tables below should reflect Stepan Golosunov's remarks above,
++# except for the items marked "[*]" which I haven't gotten to yet.
++# It looks like we will need new zones Asia/Atyrau and Asia/Qostanay
++# to handle changes from 1992 through 2004 that we did not previously
++# know about.
++
+ #
+ # Zone	NAME		GMTOFF	RULES	FORMAT	[UNTIL]
+ #
+ # Almaty (formerly Alma-Ata), representing most locations in Kazakhstan
++# This includes KZ-AKM, KZ-ALA, KZ-ALM, KZ-AST, KZ-BAY, KZ-VOS, KZ-ZHA,
++# KZ-KAR, KZ-SEV, KZ-PAV, and KZ-YUZ.
+ Zone	Asia/Almaty	5:07:48 -	LMT	1924 May  2 # or Alma-Ata
+-			5:00	-	ALMT	1930 Jun 21 # Alma-Ata Time
+-			6:00 RussiaAsia ALM%sT	1991
+-			6:00	-	ALMT	1992
+-			6:00 RussiaAsia	ALM%sT	2005 Mar 15
+-			6:00	-	ALMT
+-# Qyzylorda (aka Kyzylorda, Kizilorda, Kzyl-Orda, etc.)
++			5:00	-	+05	1930 Jun 21
++			6:00 RussiaAsia +06/+07	1991 Mar 31  2:00s
++			5:00 RussiaAsia	+05/+06	1992 Jan 19  2:00s
++			6:00 RussiaAsia	+06/+07	2004 Oct 31  2:00s
++			6:00	-	+06
++# Qyzylorda (aka Kyzylorda, Kizilorda, Kzyl-Orda, etc.) (KZ-KZY)
+ Zone	Asia/Qyzylorda	4:21:52 -	LMT	1924 May  2
+-			4:00	-	KIZT	1930 Jun 21 # Kizilorda Time
+-			5:00	-	KIZT	1981 Apr  1
+-			5:00	1:00	KIZST	1981 Oct  1
+-			6:00	-	KIZT	1982 Apr  1
+-			5:00 RussiaAsia	KIZ%sT	1991
+-			5:00	-	KIZT	1991 Dec 16 # independence
+-			5:00	-	QYZT	1992 Jan 19 2:00
+-			6:00 RussiaAsia	QYZ%sT	2005 Mar 15
+-			6:00	-	QYZT
+-# Aqtobe (aka Aktobe, formerly Akt'ubinsk)
++			4:00	-	+04	1930 Jun 21
++			5:00	-	+05	1981 Apr  1
++			5:00	1:00	+06	1981 Oct  1
++			6:00	-	+06	1982 Apr  1
++			5:00 RussiaAsia	+05/+06	1991 Mar 31  2:00s
++			4:00 RussiaAsia	+04/+05	1991 Sep 29  2:00s
++			5:00 RussiaAsia	+05/+06	1992 Jan 19  2:00s
++			6:00 RussiaAsia	+06/+07	1992 Mar 29  2:00s
++			5:00 RussiaAsia	+05/+06	2004 Oct 31  2:00s
++			6:00	-	+06
++# Aqtobe (aka Aktobe, formerly Aktyubinsk) (KZ-AKT)
+ Zone	Asia/Aqtobe	3:48:40	-	LMT	1924 May  2
+-			4:00	-	AKTT	1930 Jun 21 # Aktyubinsk Time
+-			5:00	-	AKTT	1981 Apr  1
+-			5:00	1:00	AKTST	1981 Oct  1
+-			6:00	-	AKTT	1982 Apr  1
+-			5:00 RussiaAsia	AKT%sT	1991
+-			5:00	-	AKTT	1991 Dec 16 # independence
+-			5:00 RussiaAsia	AQT%sT	2005 Mar 15 # Aqtobe Time
+-			5:00	-	AQTT
+-# Mangghystau
++			4:00	-	+04	1930 Jun 21
++			5:00	-	+05	1981 Apr  1
++			5:00	1:00	+06	1981 Oct  1
++			6:00	-	+06	1982 Apr  1
++			5:00 RussiaAsia	+05/+06	1991 Mar 31  2:00s
++			4:00 RussiaAsia	+04/+05	1992 Jan 19  2:00s
++			5:00 RussiaAsia	+05/+06	2004 Oct 31  2:00s
++			5:00	-	+05
++# Qostanay (KZ-KUS)
++
++# Mangghystau (KZ-MAN)
+ # Aqtau was not founded until 1963, but it represents an inhabited region,
+ # so include time stamps before 1963.
+ Zone	Asia/Aqtau	3:21:04	-	LMT	1924 May  2
+-			4:00	-	FORT	1930 Jun 21 # Fort Shevchenko T
+-			5:00	-	FORT	1963
+-			5:00	-	SHET	1981 Oct  1 # Shevchenko Time
+-			6:00	-	SHET	1982 Apr  1
+-			5:00 RussiaAsia	SHE%sT	1991
+-			5:00	-	SHET	1991 Dec 16 # independence
+-			5:00 RussiaAsia	AQT%sT	1995 Mar lastSun 2:00 # Aqtau Time
+-			4:00 RussiaAsia	AQT%sT	2005 Mar 15
+-			5:00	-	AQTT
+-# West Kazakhstan
++			4:00	-	+04	1930 Jun 21
++			5:00	-	+05	1963
++			5:00	-	+05	1981 Oct  1
++			6:00	-	+06	1982 Apr  1
++			5:00 RussiaAsia	+05/+06	1991 Mar 31  2:00s
++			4:00 RussiaAsia	+04/+05	1992 Jan 19  2:00s
++			5:00 RussiaAsia	+05/+06	1994 Sep 25  2:00s
++			4:00 RussiaAsia	+04/+05	2004 Oct 31  2:00s
++			5:00	-	+05
++
++# West Kazakhstan (KZ-ZAP)
++# From Paul Eggert (2016-03-18):
++# The 1989 transition is from USSR act No. 227 (1989-03-14).
+ Zone	Asia/Oral	3:25:24	-	LMT	1924 May  2 # or Ural'sk
+-			4:00	-	URAT	1930 Jun 21 # Ural'sk time
+-			5:00	-	URAT	1981 Apr  1
+-			5:00	1:00	URAST	1981 Oct  1
+-			6:00	-	URAT	1982 Apr  1
+-			5:00 RussiaAsia	URA%sT	1989 Mar 26 2:00
+-			4:00 RussiaAsia	URA%sT	1991
+-			4:00	-	URAT	1991 Dec 16 # independence
+-			4:00 RussiaAsia	ORA%sT	2005 Mar 15 # Oral Time
+-			5:00	-	ORAT
++			4:00	-	+04	1930 Jun 21
++			5:00	-	+05	1981 Apr  1
++			5:00	1:00	+06	1981 Oct  1
++			6:00	-	+06	1982 Apr  1
++			5:00 RussiaAsia	+05/+06	1989 Mar 26  2:00s
++			4:00 RussiaAsia	+04/+05	1992 Jan 19  2:00s
++			5:00 RussiaAsia	+05/+06	1992 Mar 29  2:00s
++			4:00 RussiaAsia	+04/+05	2004 Oct 31  2:00s
++			5:00	-	+05
+ 
+ # Kyrgyzstan (Kirgizstan)
+ # Transitions through 1991 are from Shanks & Pottenger.
+ 
+ # From Paul Eggert (2005-08-15):
+ # According to an article dated today in the Kyrgyzstan Development Gateway
+-# <http://eng.gateway.kg/cgi-bin/page.pl?id=1&story_name=doc9979.shtml>
++# http://eng.gateway.kg/cgi-bin/page.pl?id=1&story_name=doc9979.shtml
+ # Kyrgyzstan is canceling the daylight saving time system.  I take the article
+ # to mean that they will leave their clocks at 6 hours ahead of UTC.
+ # From Malik Abdugaliev (2005-09-21):
+@@ -1643,71 +1834,103 @@
+ Rule	Kyrgyz	1997	2004	-	Oct	lastSun	2:30	0	-
+ # Zone	NAME		GMTOFF	RULES	FORMAT	[UNTIL]
+ Zone	Asia/Bishkek	4:58:24 -	LMT	1924 May  2
+-			5:00	-	FRUT	1930 Jun 21 # Frunze Time
+-			6:00 RussiaAsia FRU%sT	1991 Mar 31 2:00s
+-			5:00	1:00	FRUST	1991 Aug 31 2:00 # independence
+-			5:00	Kyrgyz	KG%sT	2005 Aug 12    # Kyrgyzstan Time
+-			6:00	-	KGT
++			5:00	-	+05	1930 Jun 21
++			6:00 RussiaAsia +06/+07	1991 Mar 31  2:00s
++			5:00 RussiaAsia	+05/+06	1991 Aug 31  2:00
++			5:00	Kyrgyz	+05/+06	2005 Aug 12
++			6:00	-	+06
+ 
+ ###############################################################################
+ 
+ # Korea (North and South)
+ 
+-# From Annie I. Bang (2006-07-10) in
+-# <http://www.koreaherald.co.kr/SITE/data/html_dir/2006/07/10/200607100012.asp>:
+-# The Ministry of Commerce, Industry and Energy has already
+-# commissioned a research project [to reintroduce DST] and has said
+-# the system may begin as early as 2008....  Korea ran a daylight
+-# saving program from 1949-61 but stopped it during the 1950-53 Korean War.
+-
+-# From Shanks & Pottenger:
+-# Rule	NAME	FROM	TO	TYPE	IN	ON	AT	SAVE	LETTER/S
+-Rule	ROK	1960	only	-	May	15	0:00	1:00	D
+-Rule	ROK	1960	only	-	Sep	13	0:00	0	S
+-Rule	ROK	1987	1988	-	May	Sun>=8	0:00	1:00	D
+-Rule	ROK	1987	1988	-	Oct	Sun>=8	0:00	0	S
+-
+-# From Paul Eggert (2014-07-01):
+-# The following entries are from Shanks & Pottenger, except that I
+-# guessed that time zone abbreviations through 1945 followed the same
++# From Annie I. Bang (2006-07-10):
++# http://www.koreaherald.com/view.php?ud=200607100012
++# Korea ran a daylight saving program from 1949-61 but stopped it
++# during the 1950-53 Korean War.  The system was temporarily enforced
++# between 1987 and 1988 ...
++
++# From Sanghyuk Jung (2014-10-29):
++# http://mm.icann.org/pipermail/tz/2014-October/021830.html
++# According to the Korean Wikipedia
++# http://ko.wikipedia.org/wiki/한국_표준시
++# [oldid=12896437 2014-09-04 08:03 UTC]
++# DST in Republic of Korea was as follows....  And I checked old
++# newspapers in Korean, all articles correspond with data in Wikipedia.
++# For example, the article in 1948 (Korean Language) proved that DST
++# started at June 1 in that year.  For another example, the article in
++# 1988 said that DST started at 2:00 AM in that year.
++
++# Rule	NAME	FROM	TO	TYPE	IN	ON	AT	SAVE	LETTER/S
++Rule	ROK	1948	only	-	Jun	 1	0:00	1:00	D
++Rule	ROK	1948	only	-	Sep	13	0:00	0	S
++Rule	ROK	1949	only	-	Apr	 3	0:00	1:00	D
++Rule	ROK	1949	1951	-	Sep	Sun>=8	0:00	0	S
++Rule	ROK	1950	only	-	Apr	 1	0:00	1:00	D
++Rule	ROK	1951	only	-	May	 6	0:00	1:00	D
++Rule	ROK	1955	only	-	May	 5	0:00	1:00	D
++Rule	ROK	1955	only	-	Sep	 9	0:00	0	S
++Rule	ROK	1956	only	-	May	20	0:00	1:00	D
++Rule	ROK	1956	only	-	Sep	30	0:00	0	S
++Rule	ROK	1957	1960	-	May	Sun>=1	0:00	1:00	D
++Rule	ROK	1957	1960	-	Sep	Sun>=18	0:00	0	S
++Rule	ROK	1987	1988	-	May	Sun>=8	2:00	1:00	D
++Rule	ROK	1987	1988	-	Oct	Sun>=8	3:00	0	S
++
++# From Paul Eggert (2016-08-23):
++# The Korean Wikipedia entry gives the following sources for UT offsets:
++#
++# 1908: Official Journal Article No. 3994 (decree No. 5)
++# 1912: Governor-General of Korea Official Gazette Issue No. 367
++#       (Announcement No. 338)
++# 1954: Presidential Decree No. 876 (1954-03-17)
++# 1961: Law No. 676 (1961-08-07)
++#
++# (Another source "1987: Law No. 3919 (1986-12-31)" was in the 2014-10-30
++# edition of the Korean Wikipedia entry.)
++#
++# I guessed that time zone abbreviations through 1945 followed the same
+ # rules as discussed under Taiwan, with nominal switches from JST to KST
+ # when the respective cities were taken over by the Allies after WWII.
++#
++# For Pyongyang, guess no changes from World War II until 2015, as we
++# have no information otherwise.
++
++# From Steffen Thorsen (2015-08-07):
++# According to many news sources, North Korea is going to change to
++# the 8:30 time zone on August 15, one example:
++# http://www.bbc.com/news/world-asia-33815049
++#
++# From Paul Eggert (2015-08-15):
++# Bells rang out midnight (00:00) Friday as part of the celebrations.  See:
++# Talmadge E. North Korea celebrates new time zone, 'Pyongyang Time'
++# http://news.yahoo.com/north-korea-celebrates-time-zone-pyongyang-time-164038128.html
++# There is no common English-language abbreviation for this time zone.
++# Use KST, as that's what we already use for 1954-1961 in ROK.
+ 
+ # Zone	NAME		GMTOFF	RULES	FORMAT	[UNTIL]
+-Zone	Asia/Seoul	8:27:52	-	LMT	1890
+-			8:30	-	KST	1904 Dec
+-			9:00	-	JCST	1928
+-			8:30	-	KST	1932
++Zone	Asia/Seoul	8:27:52	-	LMT	1908 Apr  1
++			8:30	-	KST	1912 Jan  1
+ 			9:00	-	JCST	1937 Oct  1
+ 			9:00	-	JST	1945 Sep  8
+ 			9:00	-	KST	1954 Mar 21
+-			8:00	ROK	K%sT	1961 Aug 10
+-			8:30	-	KST	1968 Oct
++			8:30	ROK	K%sT	1961 Aug 10
+ 			9:00	ROK	K%sT
+-Zone	Asia/Pyongyang	8:23:00 -	LMT	1890
+-			8:30	-	KST	1904 Dec
+-			9:00	-	JCST	1928
+-			8:30	-	KST	1932
++Zone	Asia/Pyongyang	8:23:00 -	LMT	1908 Apr  1
++			8:30	-	KST	1912 Jan  1
+ 			9:00	-	JCST	1937 Oct  1
+ 			9:00	-	JST	1945 Aug 24
+-			9:00	-	KST	1954 Mar 21
+-			8:00	-	KST	1961 Aug 10
+-			9:00	-	KST
++			9:00	-	KST	2015 Aug 15 00:00
++			8:30	-	KST
+ 
+ ###############################################################################
+ 
+ # Kuwait
+-# Zone	NAME		GMTOFF	RULES	FORMAT	[UNTIL]
+-Zone	Asia/Kuwait	3:11:56 -	LMT	1950
+-			3:00	-	AST
++# See Asia/Riyadh.
+ 
+ # Laos
+-# Zone	NAME		GMTOFF	RULES	FORMAT	[UNTIL]
+-Zone	Asia/Vientiane	6:50:24 -	LMT	1906 Jun  9 # or Viangchan
+-			7:06:20	-	SMT	1911 Mar 11 0:01 # Saigon MT?
+-			7:00	-	ICT	1912 May
+-			8:00	-	ICT	1931 May
+-			7:00	-	ICT
++# See Asia/Bangkok.
++
+ 
+ # Lebanon
+ # Rule	NAME	FROM	TO	TYPE	IN	ON	AT	SAVE	LETTER/S
+@@ -1745,8 +1968,8 @@
+ Rule	NBorneo	1935	1941	-	Dec	14	0:00	0	-
+ #
+ # peninsular Malaysia
+-# The data here are taken from Mok Ly Yng (2003-10-30)
+-# <http://www.math.nus.edu.sg/aslaksen/teaching/timezone.html>.
++# taken from Mok Ly Yng (2003-10-30)
++# http://www.math.nus.edu.sg/aslaksen/teaching/timezone.html
+ # Zone	NAME		GMTOFF	RULES	FORMAT	[UNTIL]
+ Zone Asia/Kuala_Lumpur	6:46:46 -	LMT	1901 Jan  1
+ 			6:55:25	-	SMT	1905 Jun  1 # Singapore M.T.
+@@ -1758,12 +1981,12 @@
+ 			7:30	-	MALT	1982 Jan  1
+ 			8:00	-	MYT	# Malaysia Time
+ # Sabah & Sarawak
+-# From Paul Eggert (2006-03-22):
+-# The data here are mostly from Shanks & Pottenger, but the 1942, 1945 and 1982
+-# transition dates are from Mok Ly Yng.
++# From Paul Eggert (2014-08-12):
++# The data entries here are mostly from Shanks & Pottenger, but the 1942, 1945
++# and 1982 transition dates are from Mok Ly Yng.
+ # Zone	NAME		GMTOFF	RULES	FORMAT	[UNTIL]
+ Zone Asia/Kuching	7:21:20	-	LMT	1926 Mar
+-			7:30	-	BORT	1933	# Borneo Time
++			7:30	-	BORT	1933        # Borneo Time
+ 			8:00	NBorneo	BOR%sT	1942 Feb 16
+ 			9:00	-	JST	1945 Sep 12
+ 			8:00	-	BORT	1982 Jan  1
+@@ -1771,9 +1994,9 @@
+ 
+ # Maldives
+ # Zone	NAME		GMTOFF	RULES	FORMAT	[UNTIL]
+-Zone	Indian/Maldives	4:54:00 -	LMT	1880	# Male
+-			4:54:00	-	MMT	1960	# Male Mean Time
+-			5:00	-	MVT		# Maldives Time
++Zone	Indian/Maldives	4:54:00 -	LMT	1880 # Male
++			4:54:00	-	MMT	1960 # Male Mean Time
++			5:00	-	MVT	# Maldives Time
+ 
+ # Mongolia
+ 
+@@ -1831,11 +2054,11 @@
+ # Bill Bonnet (2005-05-19) reports that the US Embassy in Ulaanbaatar says
+ # there is only one time zone and that DST is observed, citing Microsoft
+ # Windows XP as the source.  Risto Nykänen (2005-05-16) reports that
+-# travelmongolia.org says there are two time zones (UTC+7, UTC+8) with no DST.
++# travelmongolia.org says there are two time zones (UT +07, +08) with no DST.
+ # Oscar van Vlijmen (2005-05-20) reports that the Mongolian Embassy in
+ # Washington, DC says there are two time zones, with DST observed.
+ # He also found
+-# <http://ubpost.mongolnews.mn/index.php?subaction=showcomments&id=1111634894&archive=&start_from=&ucat=1&>
++# http://ubpost.mongolnews.mn/index.php?subaction=showcomments&id=1111634894&archive=&start_from=&ucat=1&
+ # which also says that there is DST, and which has a comment by "Toddius"
+ # (2005-03-31 06:05 +0700) saying "Mongolia actually has 3.5 time zones.
+ # The West (OLGII) is +7 GMT, most of the country is ULAT is +8 GMT
+@@ -1879,6 +2102,13 @@
+ # was at the start of 2008-03-31 (the day of Steffen Thorsen's report);
+ # this is almost surely wrong.
+ 
++# From Ganbold Tsagaankhuu (2015-03-10):
++# It seems like yesterday Mongolian Government meeting has concluded to use
++# daylight saving time in Mongolia....  Starting at 2:00AM of last Saturday of
++# March 2015, daylight saving time starts.  And 00:00AM of last Saturday of
++# September daylight saving time ends.  Source:
++# http://zasag.mn/news/view/8969
++
+ # Rule	NAME	FROM	TO	TYPE	IN	ON	AT	SAVE	LETTER/S
+ Rule	Mongol	1983	1984	-	Apr	1	0:00	1:00	S
+ Rule	Mongol	1983	only	-	Oct	1	0:00	0	-
+@@ -1899,17 +2129,19 @@
+ Rule	Mongol	2001	only	-	Apr	lastSat	2:00	1:00	S
+ Rule	Mongol	2001	2006	-	Sep	lastSat	2:00	0	-
+ Rule	Mongol	2002	2006	-	Mar	lastSat	2:00	1:00	S
++Rule	Mongol	2015	max	-	Mar	lastSat	2:00	1:00	S
++Rule	Mongol	2015	max	-	Sep	lastSat	0:00	0	-
+ 
+ # Zone	NAME		GMTOFF	RULES	FORMAT	[UNTIL]
+ # Hovd, a.k.a. Chovd, Dund-Us, Dzhargalant, Khovd, Jirgalanta
+ Zone	Asia/Hovd	6:06:36 -	LMT	1905 Aug
+-			6:00	-	HOVT	1978	# Hovd Time
++			6:00	-	HOVT	1978     # Hovd Time
+ 			7:00	Mongol	HOV%sT
+ # Ulaanbaatar, a.k.a. Ulan Bataar, Ulan Bator, Urga
+ Zone	Asia/Ulaanbaatar 7:07:32 -	LMT	1905 Aug
+-			7:00	-	ULAT	1978	# Ulaanbaatar Time
++			7:00	-	ULAT	1978     # Ulaanbaatar Time
+ 			8:00	Mongol	ULA%sT
+-# Choibalsan, a.k.a. Bajan Tuemen, Bajan Tumen, Chojbalsan,
++# Choibalsan, a.k.a. Bajan Tümen, Bajan Tumen, Chojbalsan,
+ # Choybalsan, Sanbejse, Tchoibalsan
+ Zone	Asia/Choibalsan	7:38:00 -	LMT	1905 Aug
+ 			7:00	-	ULAT	1978
+@@ -1924,12 +2156,7 @@
+ 			5:45	-	NPT	# Nepal Time
+ 
+ # Oman
+-
+-# Milne says 3:54:24 was the meridian of the Muscat Tidal Observatory.
+-
+-# Zone	NAME		GMTOFF	RULES	FORMAT	[UNTIL]
+-Zone	Asia/Muscat	3:54:24 -	LMT	1920
+-			4:00	-	GST
++# See Asia/Dubai.
+ 
+ # Pakistan
+ 
+@@ -1973,10 +2200,9 @@
+ # Here is an article that Pakistan plan to introduce Daylight Saving Time
+ # on June 1, 2008 for 3 months.
+ #
+-# "... The federal cabinet on Wednesday announced a new conservation plan to help
+-# reduce load shedding by approving the closure of commercial centres at 9pm and
+-# moving clocks forward by one hour for the next three months.
+-# ...."
++# "... The federal cabinet on Wednesday announced a new conservation plan to
++# help reduce load shedding by approving the closure of commercial centres at
++# 9pm and moving clocks forward by one hour for the next three months. ...."
+ #
+ # http://www.worldtimezone.net/dst_news/dst_news_pakistan01.html
+ # http://www.dailytimes.com.pk/default.asp?page=2008%5C05%5C15%5Cstory_15-5-2008_pg1_4
+@@ -2023,19 +2249,14 @@
+ 
+ # From Alexander Krivenyshev (2009-09-28):
+ # According to Associated Press Of Pakistan, it is confirmed that
+-# Pakistan clocks across the country would be turned back by an hour from October
+-# 1, 2009.
++# Pakistan clocks across the country would be turned back by an hour from
++# October 1, 2009.
+ #
+ # "Clocks to go back one hour from 1 Oct"
+ # http://www.app.com.pk/en_/index.php?option=com_content&task=view&id=86715&Itemid=2
+ # http://www.worldtimezone.com/dst_news/dst_news_pakistan07.htm
+-
+-# From Steffen Thorsen (2009-09-29):
+-# Alexander Krivenyshev wrote:
+-# > According to Associated Press Of Pakistan, it is confirmed that
+-# > Pakistan clocks across the country would be turned back by an hour from October
+-# > 1, 2009.
+ #
++# From Steffen Thorsen (2009-09-29):
+ # Now they seem to have changed their mind, November 1 is the new date:
+ # http://www.thenews.com.pk/top_story_detail.asp?Id=24742
+ # "The country's clocks will be reversed by one hour on November 1.
+@@ -2073,12 +2294,11 @@
+ # http://www.app.com.pk/en_/index.php?option=com_content&task=view&id=99374&Itemid=2
+ 
+ # Rule	NAME	FROM	TO	TYPE	IN	ON	AT	SAVE	LETTER/S
+-Rule Pakistan	2002	only	-	Apr	Sun>=2	0:01	1:00	S
+-Rule Pakistan	2002	only	-	Oct	Sun>=2	0:01	0	-
++Rule Pakistan	2002	only	-	Apr	Sun>=2	0:00	1:00	S
++Rule Pakistan	2002	only	-	Oct	Sun>=2	0:00	0	-
+ Rule Pakistan	2008	only	-	Jun	1	0:00	1:00	S
+-Rule Pakistan	2008	only	-	Nov	1	0:00	0	-
++Rule Pakistan	2008	2009	-	Nov	1	0:00	0	-
+ Rule Pakistan	2009	only	-	Apr	15	0:00	1:00	S
+-Rule Pakistan	2009	only	-	Nov	1	0:00	0	-
+ 
+ # Zone	NAME		GMTOFF	RULES	FORMAT	[UNTIL]
+ Zone	Asia/Karachi	4:28:12 -	LMT	1907
+@@ -2153,7 +2373,7 @@
+ 
+ # From Paul Eggert (1999-09-20):
+ # Daoud Kuttab writes in Holiday havoc
+-# <http://www.jpost.com/com/Archive/22.Apr.1999/Opinion/Article-2.html>
++# http://www.jpost.com/com/Archive/22.Apr.1999/Opinion/Article-2.html
+ # (Jerusalem Post, 1999-04-22) that
+ # the Palestinian National Authority changed to DST on 1999-04-15.
+ # I vaguely recall that they switch back in October (sorry, forgot the source).
+@@ -2329,13 +2549,38 @@
+ # official source...:
+ # http://www.palestinecabinet.gov.ps/ar/Views/ViewDetails.aspx?pid=1252
+ 
+-# From Paul Eggert (2013-09-24):
+-# For future dates, guess the last Thursday in March at 24:00 through
+-# the first Friday on or after September 21 at 00:00.  This is consistent with
+-# the predictions in today's editions of the following URLs,
+-# which are for Gaza and Hebron respectively:
+-# http://www.timeanddate.com/worldclock/timezone.html?n=702
+-# http://www.timeanddate.com/worldclock/timezone.html?n=2364
++# From Steffen Thorsen (2015-03-03):
++# Sources such as http://www.alquds.com/news/article/view/id/548257
++# and http://www.raya.ps/ar/news/890705.html say Palestine areas will
++# start DST on 2015-03-28 00:00 which is one day later than expected.
++#
++# From Paul Eggert (2015-03-03):
++# http://www.timeanddate.com/time/change/west-bank/ramallah?year=2014
++# says that the fall 2014 transition was Oct 23 at 24:00.
++
++# From Hannah Kreitem (2016-03-09):
++# http://www.palestinecabinet.gov.ps/WebSite/ar/ViewDetails?ID=31728
++# [Google translation]: "The Council also decided to start daylight
++# saving in Palestine as of one o'clock on Saturday morning,
++# 2016-03-26, to provide the clock 60 minutes ahead."
++#
++# From Paul Eggert (2016-03-12):
++# Predict spring transitions on March's last Saturday at 01:00 from now on.
++
++# From Sharef Mustafa (2016-10-19):
++# [T]he Palestinian cabinet decision (Mar 8th 2016) published on
++# http://www.palestinecabinet.gov.ps/WebSite/Upload/Decree/GOV_17/16032016134830.pdf
++# states that summer time will end on Oct 29th at 01:00.
++#
++# From Tim Parenti (2016-10-19):
++# Predict fall transitions on October's last Saturday at 01:00 from now on.
++# This is consistent with the 2016 transition as well as our spring
++# predictions.
++#
++# From Paul Eggert (2016-10-19):
++# It's also consistent with predictions in the following URLs today:
++# http://www.timeanddate.com/time/change/gaza-strip/gaza
++# http://www.timeanddate.com/time/change/west-bank/hebron
+ 
+ # Rule	NAME	FROM	TO	TYPE	IN	ON	AT	SAVE	LETTER/S
+ Rule EgyptAsia	1957	only	-	May	10	0:00	1:00	S
+@@ -2361,9 +2606,13 @@
+ Rule Palestine	2011	only	-	Aug	 1	0:00	0	-
+ Rule Palestine	2011	only	-	Aug	30	0:00	1:00	S
+ Rule Palestine	2011	only	-	Sep	30	0:00	0	-
+-Rule Palestine	2012	max	-	Mar	lastThu	24:00	1:00	S
++Rule Palestine	2012	2014	-	Mar	lastThu	24:00	1:00	S
+ Rule Palestine	2012	only	-	Sep	21	1:00	0	-
+-Rule Palestine	2013	max	-	Sep	Fri>=21	0:00	0	-
++Rule Palestine	2013	only	-	Sep	Fri>=21	0:00	0	-
++Rule Palestine	2014	2015	-	Oct	Fri>=21	0:00	0	-
++Rule Palestine	2015	only	-	Mar	lastFri	24:00	1:00	S
++Rule Palestine	2016	max	-	Mar	lastSat	1:00	1:00	S
++Rule Palestine	2016	max	-	Oct	lastSat	1:00	0	-
+ 
+ # Zone	NAME		GMTOFF	RULES	FORMAT	[UNTIL]
+ Zone	Asia/Gaza	2:17:52	-	LMT	1900 Oct
+@@ -2371,10 +2620,10 @@
+ 			2:00 EgyptAsia	EE%sT	1967 Jun  5
+ 			2:00	Zion	I%sT	1996
+ 			2:00	Jordan	EE%sT	1999
+-			2:00 Palestine	EE%sT	2008 Aug 29 0:00
++			2:00 Palestine	EE%sT	2008 Aug 29  0:00
+ 			2:00	-	EET	2008 Sep
+ 			2:00 Palestine	EE%sT	2010
+-			2:00	-	EET	2010 Mar 27 0:01
++			2:00	-	EET	2010 Mar 27  0:01
+ 			2:00 Palestine	EE%sT	2011 Aug  1
+ 			2:00	-	EET	2012
+ 			2:00 Palestine	EE%sT
+@@ -2394,22 +2643,23 @@
+ # Philippines, issued a proclamation announcing that 1844-12-30 was to
+ # be immediately followed by 1845-01-01; see R.H. van Gent's
+ # History of the International Date Line
+-# <http://www.staff.science.uu.nl/~gent0113/idl/idl_philippines.htm>.
+-# The rest of the data are from Shanks & Pottenger.
++# http://www.staff.science.uu.nl/~gent0113/idl/idl_philippines.htm
++# The rest of the data entries are from Shanks & Pottenger.
+ 
+-# From Paul Eggert (2006-04-25):
+-# Tomorrow's Manila Standard reports that the Philippines Department of
+-# Trade and Industry is considering adopting DST this June when the
+-# rainy season begins.  See
+-# <http://www.manilastandardtoday.com/?page=politics02_april26_2006>.
+-# For now, we'll ignore this, since it's not definite and we lack details.
+-#
+ # From Jesper Nørgaard Welen (2006-04-26):
+ # ... claims that Philippines had DST last time in 1990:
+ # http://story.philippinetimes.com/p.x/ct/9/id/145be20cc6b121c0/cid/3e5bbccc730d258c/
+ # [a story dated 2006-04-25 by Cris Larano of Dow Jones Newswires,
+ # but no details]
+ 
++# From Paul Eggert (2014-08-14):
++# The following source says DST may be instituted November-January and again
++# March-June, but this is not definite.  It also says DST was last proclaimed
++# during the Ramos administration (1992-1998); but again, no details.
++# Carcamo D. PNoy urged to declare use of daylight saving time.
++# Philippine Star 2014-08-05
++# http://www.philstar.com/headlines/2014/08/05/1354152/pnoy-urged-declare-use-daylight-saving-time
++
+ # Rule	NAME	FROM	TO	TYPE	IN	ON	AT	SAVE	LETTER/S
+ Rule	Phil	1936	only	-	Nov	1	0:00	1:00	S
+ Rule	Phil	1937	only	-	Feb	1	0:00	0	-
+@@ -2426,9 +2676,10 @@
+ 
+ # Qatar
+ # Zone	NAME		GMTOFF	RULES	FORMAT	[UNTIL]
+-Zone	Asia/Qatar	3:26:08 -	LMT	1920	# Al Dawhah / Doha
++Zone	Asia/Qatar	3:26:08 -	LMT	1920     # Al Dawhah / Doha
+ 			4:00	-	GST	1972 Jun
+ 			3:00	-	AST
++Link Asia/Qatar Asia/Bahrain
+ 
+ # Saudi Arabia
+ #
+@@ -2449,16 +2700,18 @@
+ # earlier date.
+ #
+ # Shanks & Pottenger also state that until 1968-05-01 Saudi Arabia had two
+-# time zones; the other zone, at UTC+4, was in the far eastern part of
++# time zones; the other zone, at UT +04, was in the far eastern part of
+ # the country.  Ignore this, as it's before our 1970 cutoff.
+ #
+ # Zone	NAME		GMTOFF	RULES	FORMAT	[UNTIL]
+ Zone	Asia/Riyadh	3:06:52 -	LMT	1947 Mar 14
+ 			3:00	-	AST
++Link Asia/Riyadh Asia/Aden	# Yemen
++Link Asia/Riyadh Asia/Kuwait
+ 
+ # Singapore
+-# The data here are taken from Mok Ly Yng (2003-10-30)
+-# <http://www.math.nus.edu.sg/aslaksen/teaching/timezone.html>.
++# taken from Mok Ly Yng (2003-10-30)
++# http://www.math.nus.edu.sg/aslaksen/teaching/timezone.html
+ # Zone	NAME		GMTOFF	RULES	FORMAT	[UNTIL]
+ Zone	Asia/Singapore	6:55:25 -	LMT	1901 Jan  1
+ 			6:55:25	-	SMT	1905 Jun  1 # Singapore M.T.
+@@ -2501,7 +2754,7 @@
+ # at present, become 2400 hours of April 14, 2006 (midnight of April 14, 2006).
+ 
+ # From Peter Apps and Ranga Sirila of Reuters (2006-04-12) in:
+-# <http://today.reuters.co.uk/news/newsArticle.aspx?type=scienceNews&storyID=2006-04-12T172228Z_01_COL295762_RTRIDST_0_SCIENCE-SRILANKA-TIME-DC.XML>
++# http://today.reuters.co.uk/news/newsArticle.aspx?type=scienceNews&storyID=2006-04-12T172228Z_01_COL295762_RTRIDST_0_SCIENCE-SRILANKA-TIME-DC.XML
+ # [The Tamil Tigers] never accepted the original 1996 time change and simply
+ # kept their clocks set five and a half hours ahead of Greenwich Mean
+ # Time (GMT), in line with neighbor India.
+@@ -2509,45 +2762,31 @@
+ # People who live in regions under Tamil control can use [TZ='Asia/Kolkata'],
+ # as that zone has agreed with the Tamil areas since our cutoff date of 1970.
+ 
+-# From K Sethu (2006-04-25):
+-# I think the abbreviation LKT originated from the world of computers at
+-# the time of or subsequent to the time zone changes by SL Government
+-# twice in 1996 and probably SL Government or its standardization
+-# agencies never declared an abbreviation as a national standard.
+-#
+-# I recollect before the recent change the government announcements
+-# mentioning it as simply changing Sri Lanka Standard Time or Sri Lanka
+-# Time and no mention was made about the abbreviation.
+-#
+-# If we look at Sri Lanka Department of Government's "Official News
+-# Website of Sri Lanka" ... http://www.news.lk/ we can see that they
+-# use SLT as abbreviation in time stamp at the beginning of each news
+-# item....
+-#
+-# Within Sri Lanka I think LKT is well known among computer users and
+-# administrators.  In my opinion SLT may not be a good choice because the
+-# nation's largest telcom / internet operator Sri Lanka Telcom is well
+-# known by that abbreviation - simply as SLT (there IP domains are
+-# slt.lk and sltnet.lk).
+-#
+-# But if indeed our government has adopted SLT as standard abbreviation
+-# (that we have not known so far) then  it is better that it be used for
+-# all computers.
+-
+-# From Paul Eggert (2006-04-25):
+-# One possibility is that we wait for a bit for the dust to settle down
+-# and then see what people actually say in practice.
++# From Sadika Sumanapala (2016-10-19):
++# According to http://www.sltime.org (maintained by Measurement Units,
++# Standards & Services Department, Sri Lanka) abbreviation for Sri Lanka
++# standard time is SLST.
++#
++# From Paul Eggert (2016-10-18):
++# "SLST" seems to be reasonably recent and rarely-used outside time
++# zone nerd sources.  I searched Google News and found three uses of
++# it in the International Business Times of India in February and
++# March of this year when discussing cricket match times, but nothing
++# since then (though there has been a lot of cricket) and nothing in
++# other English-language news sources.  Our old abbreviation "LKT" is
++# even worse.  For now, let's use a numeric abbreviation; we can
++# switch to "SLST" if it catches on.
+ 
+ # Zone	NAME		GMTOFF	RULES	FORMAT	[UNTIL]
+ Zone	Asia/Colombo	5:19:24 -	LMT	1880
+-			5:19:32	-	MMT	1906	# Moratuwa Mean Time
+-			5:30	-	IST	1942 Jan  5
+-			5:30	0:30	IHST	1942 Sep
+-			5:30	1:00	IST	1945 Oct 16 2:00
+-			5:30	-	IST	1996 May 25 0:00
+-			6:30	-	LKT	1996 Oct 26 0:30
+-			6:00	-	LKT	2006 Apr 15 0:30
+-			5:30	-	IST
++			5:19:32	-	MMT	1906        # Moratuwa Mean Time
++			5:30	-	+0530	1942 Jan  5
++			5:30	0:30	+0530/+06 1942 Sep
++			5:30	1:00	+0530/+0630 1945 Oct 16  2:00
++			5:30	-	+0530	1996 May 25  0:00
++			6:30	-	+0630	1996 Oct 26  0:30
++			6:00	-	+06	2006 Apr 15  0:30
++			5:30	-	+0530
+ 
+ # Syria
+ # Rule	NAME	FROM	TO	TYPE	IN	ON	AT	SAVE	LETTER/S
+@@ -2622,8 +2861,7 @@
+ 
+ # From Stephen Colebourne (2008-03-17):
+ # For everyone's info, I saw an IATA time zone change for [Syria] for
+-# this month (March 2008) in the last day or so...This is the data IATA
+-# are now using:
++# this month (March 2008) in the last day or so....
+ # Country     Time Standard   --- DST Start ---   --- DST End ---  DST
+ # Name        Zone Variation   Time    Date        Time    Date
+ # Variation
+@@ -2710,82 +2948,120 @@
+ Rule	Syria	2009	max	-	Oct	lastFri	0:00	0	-
+ 
+ # Zone	NAME		GMTOFF	RULES	FORMAT	[UNTIL]
+-Zone	Asia/Damascus	2:25:12 -	LMT	1920	# Dimashq
++Zone	Asia/Damascus	2:25:12 -	LMT	1920 # Dimashq
+ 			2:00	Syria	EE%sT
+ 
+ # Tajikistan
+ # From Shanks & Pottenger.
+ # Zone	NAME		GMTOFF	RULES	FORMAT	[UNTIL]
+ Zone	Asia/Dushanbe	4:35:12 -	LMT	1924 May  2
+-			5:00	-	DUST	1930 Jun 21 # Dushanbe Time
+-			6:00 RussiaAsia DUS%sT	1991 Mar 31 2:00s
+-			5:00	1:00	DUSST	1991 Sep  9 2:00s
+-			5:00	-	TJT		    # Tajikistan Time
++			5:00	-	+05	1930 Jun 21
++			6:00 RussiaAsia +06/+07	1991 Mar 31  2:00s
++			5:00	1:00	+05/+06	1991 Sep  9  2:00s
++			5:00	-	+05
+ 
+ # Thailand
+ # Zone	NAME		GMTOFF	RULES	FORMAT	[UNTIL]
+ Zone	Asia/Bangkok	6:42:04	-	LMT	1880
+ 			6:42:04	-	BMT	1920 Apr # Bangkok Mean Time
+ 			7:00	-	ICT
++Link Asia/Bangkok Asia/Phnom_Penh	# Cambodia
++Link Asia/Bangkok Asia/Vientiane	# Laos
+ 
+ # Turkmenistan
+ # From Shanks & Pottenger.
+ # Zone	NAME		GMTOFF	RULES	FORMAT	[UNTIL]
+ Zone	Asia/Ashgabat	3:53:32 -	LMT	1924 May  2 # or Ashkhabad
+-			4:00	-	ASHT	1930 Jun 21 # Ashkhabad Time
+-			5:00 RussiaAsia	ASH%sT	1991 Mar 31 2:00
+-			4:00 RussiaAsia	ASH%sT	1991 Oct 27 # independence
+-			4:00 RussiaAsia	TM%sT	1992 Jan 19 2:00
+-			5:00	-	TMT
++			4:00	-	+04	1930 Jun 21
++			5:00 RussiaAsia	+05/+06	1991 Mar 31  2:00
++			4:00 RussiaAsia	+04/+05	1992 Jan 19  2:00
++			5:00	-	+05
+ 
+ # United Arab Emirates
+ # Zone	NAME		GMTOFF	RULES	FORMAT	[UNTIL]
+ Zone	Asia/Dubai	3:41:12 -	LMT	1920
+ 			4:00	-	GST
++Link Asia/Dubai Asia/Muscat	# Oman
+ 
+ # Uzbekistan
++# Byalokoz 1919 says Uzbekistan was 4:27:53.
+ # Zone	NAME		GMTOFF	RULES	FORMAT	[UNTIL]
+-Zone	Asia/Samarkand	4:27:12 -	LMT	1924 May  2
+-			4:00	-	SAMT	1930 Jun 21 # Samarkand Time
+-			5:00	-	SAMT	1981 Apr  1
+-			5:00	1:00	SAMST	1981 Oct  1
+-			6:00	-	TAST	1982 Apr  1 # Tashkent Time
+-			5:00 RussiaAsia	SAM%sT	1991 Sep  1 # independence
+-			5:00 RussiaAsia	UZ%sT	1992
+-			5:00	-	UZT
++Zone	Asia/Samarkand	4:27:53 -	LMT	1924 May  2
++			4:00	-	+04	1930 Jun 21
++			5:00	-	+05	1981 Apr  1
++			5:00	1:00	+06	1981 Oct  1
++			6:00	-	+06	1982 Apr  1
++			5:00 RussiaAsia	+05/+06	1992
++			5:00	-	+05
+ # Milne says Tashkent was 4:37:10.8; round to nearest.
+ Zone	Asia/Tashkent	4:37:11 -	LMT	1924 May  2
+-			5:00	-	TAST	1930 Jun 21 # Tashkent Time
+-			6:00 RussiaAsia	TAS%sT	1991 Mar 31 2:00
+-			5:00 RussiaAsia	TAS%sT	1991 Sep  1 # independence
+-			5:00 RussiaAsia	UZ%sT	1992
+-			5:00	-	UZT
++			5:00	-	+05	1930 Jun 21
++			6:00 RussiaAsia	+06/+07	1991 Mar 31  2:00
++			5:00 RussiaAsia	+05/+06	1992
++			5:00	-	+05
+ 
+ # Vietnam
+ 
+-# From Paul Eggert (2013-02-21):
++# From Paul Eggert (2014-10-04):
+ # Milne gives 7:16:56 for the meridian of Saigon in 1899, as being
+ # used in Lower Laos, Cambodia, and Annam.  But this is quite a ways
+ # from Saigon's location.  For now, ignore this and stick with Shanks
+-# and Pottenger.
++# and Pottenger for LMT before 1906.
+ 
+ # From Arthur David Olson (2008-03-18):
+ # The English-language name of Vietnam's most populous city is "Ho Chi Minh
+ # City"; use Ho_Chi_Minh below to avoid a name of more than 14 characters.
+ 
+-# From Shanks & Pottenger:
+-# Zone	NAME		GMTOFF	RULES	FORMAT	[UNTIL]
+-Zone	Asia/Ho_Chi_Minh	7:06:40 -	LMT	1906 Jun  9
+-			7:06:20	-	SMT	1911 Mar 11 0:01 # Saigon MT?
+-			7:00	-	ICT	1912 May
+-			8:00	-	ICT	1931 May
++# From Paul Eggert (2014-10-21) after a heads-up from Trần Ngọc Quân:
++# Trần Tiến Bình's authoritative book "Lịch Việt Nam: thế kỷ XX-XXI (1901-2100)"
++# (Nhà xuất bản Văn Hoá - Thông Tin, Hanoi, 2005), pp 49-50,
++# is quoted verbatim in:
++# http://www.thoigian.com.vn/?mPage=P80D01
++# is translated by Brian Inglis in:
++# http://mm.icann.org/pipermail/tz/2014-October/021654.html
++# and is the basis for the information below.
++#
++# The 1906 transition was effective July 1 and standardized Indochina to
++# Phù Liễn Observatory, legally 104 deg. 17'17" east of Paris.
++# It's unclear whether this meant legal Paris Mean Time (00:09:21) or
++# the Paris Meridian (2 deg. 20'14.03" E); the former yields 07:06:30.1333...
++# and the latter 07:06:29.333... so either way it rounds to 07:06:30,
++# which is used below even though the modern-day Phù Liễn Observatory
++# is closer to 07:06:31.  Abbreviate Phù Liễn Mean Time as PLMT.
++#
++# The following transitions occurred in Indochina in general (before 1954)
++# and in South Vietnam in particular (after 1954):
++# To 07:00 on 1911-05-01.
++# To 08:00 on 1942-12-31 at 23:00.
++# To 09:00 in 1945-03-14 at 23:00.
++# To 07:00 on 1945-09-02 in Vietnam.
++# To 08:00 on 1947-04-01 in French-controlled Indochina.
++# To 07:00 on 1955-07-01 in South Vietnam.
++# To 08:00 on 1959-12-31 at 23:00 in South Vietnam.
++# To 07:00 on 1975-06-13 in South Vietnam.
++#
++# Trần cites the following sources; it's unclear which supplied the info above.
++#
++# Hoàng Xuân Hãn: "Lịch và lịch Việt Nam". Tập san Khoa học Xã hội,
++# No. 9, Paris, February 1982.
++#
++# Lê Thành Lân: "Lịch và niên biểu lịch sử hai mươi thế kỷ (0001-2010)",
++# NXB Thống kê, Hanoi, 2000.
++#
++# Lê Thành Lân: "Lịch hai thế kỷ (1802-2010) và các lịch vĩnh cửu",
++# NXB Thuận Hoá, Huế, 1995.
++
++# Zone	NAME		GMTOFF	RULES	FORMAT	[UNTIL]
++Zone Asia/Ho_Chi_Minh	7:06:40 -	LMT	1906 Jul  1
++			7:06:30	-	PLMT	1911 May  1
++			7:00	-	ICT	1942 Dec 31 23:00
++			8:00	-	IDT	1945 Mar 14 23:00
++			9:00	-	JST	1945 Sep  2
++			7:00	-	ICT	1947 Apr  1
++			8:00	-	IDT	1955 Jul  1
++			7:00	-	ICT	1959 Dec 31 23:00
++			8:00	-	IDT	1975 Jun 13
+ 			7:00	-	ICT
+ 
+ # Yemen
+-
+-# Milne says 2:59:54 was the meridian of the saluting battery at Aden,
+-# and that Yemen was at 1:55:56, the meridian of the Hagia Sophia.
+-
+-# Zone	NAME		GMTOFF	RULES	FORMAT	[UNTIL]
+-Zone	Asia/Aden	2:59:54	-	LMT	1950
+-			3:00	-	AST
++# See Asia/Riyadh.
+--- contrib/tzdata/australasia.orig
++++ contrib/tzdata/australasia
+@@ -60,6 +60,14 @@
+ # Hamilton is the largest, but there is also a Hamilton in Victoria,
+ # so use Lindeman.
+ #
++# From J William Piggott (2016-02-20):
++# There is no location named Holiday Islands in Queensland Australia; holiday
++# islands is a colloquial term used globally.  Hayman and Lindeman are at the
++# north and south extremes of the Whitsunday Islands archipelago, and
++# Hamilton is in between; it is reasonable to believe that this time zone
++# applies to all of the Whitsundays.
++# http://www.australia.gov.au/about-australia/australian-story/austn-islands
++#
+ # Rule	NAME	FROM	TO	TYPE	IN	ON	AT	SAVE	LETTER/S
+ Rule	AQ	1971	only	-	Oct	lastSun	2:00s	1:00	D
+ Rule	AQ	1972	only	-	Feb	lastSun	2:00s	0	S
+@@ -101,7 +109,7 @@
+ # Tasmania
+ #
+ # From Paul Eggert (2005-08-16):
+-# <http://www.bom.gov.au/climate/averages/tables/dst_times.shtml>
++# http://www.bom.gov.au/climate/averages/tables/dst_times.shtml
+ # says King Island didn't observe DST from WWII until late 1971.
+ #
+ # Rule	NAME	FROM	TO	TYPE	IN	ON	AT	SAVE	LETTER/S
+@@ -126,12 +134,12 @@
+ Rule	AT	2008	max	-	Apr	Sun>=1	2:00s	0	S
+ # Zone	NAME		GMTOFF	RULES	FORMAT	[UNTIL]
+ Zone Australia/Hobart	9:49:16	-	LMT	1895 Sep
+-			10:00	-	AEST	1916 Oct 1 2:00
++			10:00	-	AEST	1916 Oct  1  2:00
+ 			10:00	1:00	AEDT	1917 Feb
+ 			10:00	Aus	AE%sT	1967
+ 			10:00	AT	AE%sT
+ Zone Australia/Currie	9:35:28	-	LMT	1895 Sep
+-			10:00	-	AEST	1916 Oct 1 2:00
++			10:00	-	AEST	1916 Oct  1  2:00
+ 			10:00	1:00	AEDT	1917 Feb
+ 			10:00	Aus	AE%sT	1971 Jul
+ 			10:00	AT	AE%sT
+@@ -220,8 +228,8 @@
+ # Permanent occupation (scientific station) 1911-1915 and since 25 March 1948;
+ # sealing and penguin oil station operated Nov 1899 to Apr 1919.  See the
+ # Tasmania Parks & Wildlife Service history of sealing at Macquarie Island
+-# <http://www.parks.tas.gov.au/index.aspx?base=1828>
+-# <http://www.parks.tas.gov.au/index.aspx?base=1831>.
++# http://www.parks.tas.gov.au/index.aspx?base=1828
++# http://www.parks.tas.gov.au/index.aspx?base=1831
+ # Guess that it was like Australia/Hobart while inhabited before 2010.
+ #
+ # From Steffen Thorsen (2010-03-10):
+@@ -235,13 +243,13 @@
+ # will produce a binary file with an [A]EST-type as the first 32-bit type;
+ # this is required for correct handling of times before 1916 by
+ # pre-2013 versions of localtime.
+-Zone Antarctica/Macquarie 0	-	zzz	1899 Nov
+-			10:00	-	AEST	1916 Oct 1 2:00
++Zone Antarctica/Macquarie 0	-	-00	1899 Nov
++			10:00	-	AEST	1916 Oct  1  2:00
+ 			10:00	1:00	AEDT	1917 Feb
+-			10:00	Aus	AE%sT	1919 Apr 1 0:00s
+-			0	-	zzz	1948 Mar 25
++			10:00	Aus	AE%sT	1919 Apr  1  0:00s
++			0	-	-00	1948 Mar 25
+ 			10:00	Aus	AE%sT	1967
+-			10:00	AT	AE%sT	2010 Apr 4 3:00
++			10:00	AT	AE%sT	2010 Apr  4  3:00
+ 			11:00	-	MIST	# Macquarie I Standard Time
+ 
+ # Christmas
+@@ -331,31 +339,51 @@
+ # Fiji will end DST on 2014-01-19 02:00:
+ # http://www.fiji.gov.fj/Media-Center/Press-Releases/DAYLIGHT-SAVINGS-TO-END-THIS-MONTH-%281%29.aspx
+ 
+-# From Paul Eggert (2014-01-10):
+-# For now, guess that Fiji springs forward the Sunday before the fourth
+-# Monday in October, and springs back the penultimate Sunday in January.
+-# This is ad hoc, but matches recent practice.
++# From Ken Rylander (2014-10-20):
++# DST will start Nov. 2 this year.
++# http://www.fiji.gov.fj/Media-Center/Press-Releases/DAYLIGHT-SAVING-STARTS-ON-SUNDAY,-NOVEMBER-2ND.aspx
++
++# From a government order dated 2015-08-26 and published as Legal Notice No. 77
++# in the Government of Fiji Gazette Supplement No. 24 (2015-08-28),
++# via Ken Rylander (2015-09-02):
++# the daylight saving period is 1 hour in advance of the standard time
++# commencing at 2.00 am on Sunday 1st November, 2015 and ending at
++# 3.00 am on Sunday 17th January, 2016.
++
++# From Raymond Kumar (2016-10-04):
++# http://www.fiji.gov.fj/Media-Center/Press-Releases/DAYLIGHT-SAVING-STARTS-ON-6th-NOVEMBER,-2016.aspx
++# "Fiji's daylight savings will begin on Sunday, 6 November 2016, when
++# clocks go forward an hour at 2am to 3am....  Daylight Saving will
++# end at 3.00am on Sunday 15th January 2017."
++
++# From Paul Eggert (2016-10-03):
++# For now, guess DST from 02:00 the first Sunday in November to
++# 03:00 the third Sunday in January.  Although ad hoc, it matches
++# transitions since late 2014 and seems more likely to match future
++# practice than guessing no DST.
+ 
+ # Rule	NAME	FROM	TO	TYPE	IN	ON	AT	SAVE	LETTER/S
+ Rule	Fiji	1998	1999	-	Nov	Sun>=1	2:00	1:00	S
+ Rule	Fiji	1999	2000	-	Feb	lastSun	3:00	0	-
+ Rule	Fiji	2009	only	-	Nov	29	2:00	1:00	S
+ Rule	Fiji	2010	only	-	Mar	lastSun	3:00	0	-
+-Rule	Fiji	2010	max	-	Oct	Sun>=21	2:00	1:00	S
++Rule	Fiji	2010	2013	-	Oct	Sun>=21	2:00	1:00	S
+ Rule	Fiji	2011	only	-	Mar	Sun>=1	3:00	0	-
+ Rule	Fiji	2012	2013	-	Jan	Sun>=18	3:00	0	-
+-Rule	Fiji	2014	max	-	Jan	Sun>=18	2:00	0	-
++Rule	Fiji	2014	only	-	Jan	Sun>=18	2:00	0	-
++Rule	Fiji	2014	max	-	Nov	Sun>=1	2:00	1:00	S
++Rule	Fiji	2015	max	-	Jan	Sun>=15	3:00	0	-
+ # Zone	NAME		GMTOFF	RULES	FORMAT	[UNTIL]
+-Zone	Pacific/Fiji	11:55:44 -	LMT	1915 Oct 26	# Suva
++Zone	Pacific/Fiji	11:55:44 -	LMT	1915 Oct 26 # Suva
+ 			12:00	Fiji	FJ%sT	# Fiji Time
+ 
+ # French Polynesia
+ # Zone	NAME		GMTOFF	RULES	FORMAT	[UNTIL]
+-Zone	Pacific/Gambier	 -8:59:48 -	LMT	1912 Oct	# Rikitea
++Zone	Pacific/Gambier	 -8:59:48 -	LMT	1912 Oct # Rikitea
+ 			 -9:00	-	GAMT	# Gambier Time
+ Zone	Pacific/Marquesas -9:18:00 -	LMT	1912 Oct
+ 			 -9:30	-	MART	# Marquesas Time
+-Zone	Pacific/Tahiti	 -9:58:16 -	LMT	1912 Oct	# Papeete
++Zone	Pacific/Tahiti	 -9:58:16 -	LMT	1912 Oct # Papeete
+ 			-10:00	-	TAHT	# Tahiti Time
+ # Clipperton (near North America) is administered from French Polynesia;
+ # it is uninhabited.
+@@ -363,14 +391,15 @@
+ # Guam
+ # Zone	NAME		GMTOFF	RULES	FORMAT	[UNTIL]
+ Zone	Pacific/Guam	-14:21:00 -	LMT	1844 Dec 31
+-			 9:39:00 -	LMT	1901		# Agana
+-			10:00	-	GST	2000 Dec 23	# Guam
++			 9:39:00 -	LMT	1901        # Agana
++			10:00	-	GST	2000 Dec 23 # Guam
+ 			10:00	-	ChST	# Chamorro Standard Time
++Link Pacific/Guam Pacific/Saipan # N Mariana Is
+ 
+ # Kiribati
+ # Zone	NAME		GMTOFF	RULES	FORMAT	[UNTIL]
+-Zone Pacific/Tarawa	 11:32:04 -	LMT	1901		# Bairiki
+-			 12:00	-	GILT		 # Gilbert Is Time
++Zone Pacific/Tarawa	 11:32:04 -	LMT	1901 # Bairiki
++			 12:00	-	GILT	# Gilbert Is Time
+ Zone Pacific/Enderbury	-11:24:20 -	LMT	1901
+ 			-12:00	-	PHOT	1979 Oct # Phoenix Is Time
+ 			-11:00	-	PHOT	1995
+@@ -381,12 +410,7 @@
+ 			 14:00	-	LINT
+ 
+ # N Mariana Is
+-# Zone	NAME		GMTOFF	RULES	FORMAT	[UNTIL]
+-Zone Pacific/Saipan	-14:17:00 -	LMT	1844 Dec 31
+-			 9:43:00 -	LMT	1901
+-			 9:00	-	MPT	1969 Oct # N Mariana Is Time
+-			10:00	-	MPT	2000 Dec 23
+-			10:00	-	ChST	# Chamorro Standard Time
++# See Pacific/Guam.
+ 
+ # Marshall Is
+ # Zone	NAME		GMTOFF	RULES	FORMAT	[UNTIL]
+@@ -395,24 +419,24 @@
+ 			12:00	-	MHT
+ Zone Pacific/Kwajalein	11:09:20 -	LMT	1901
+ 			11:00	-	MHT	1969 Oct
+-			-12:00	-	KWAT	1993 Aug 20	# Kwajalein Time
++			-12:00	-	KWAT	1993 Aug 20 # Kwajalein Time
+ 			12:00	-	MHT
+ 
+ # Micronesia
+ # Zone	NAME		GMTOFF	RULES	FORMAT	[UNTIL]
+ Zone Pacific/Chuuk	10:07:08 -	LMT	1901
+-			10:00	-	CHUT			# Chuuk Time
+-Zone Pacific/Pohnpei	10:32:52 -	LMT	1901		# Kolonia
+-			11:00	-	PONT			# Pohnpei Time
++			10:00	-	CHUT	# Chuuk Time
++Zone Pacific/Pohnpei	10:32:52 -	LMT	1901 # Kolonia
++			11:00	-	PONT	# Pohnpei Time
+ Zone Pacific/Kosrae	10:51:56 -	LMT	1901
+-			11:00	-	KOST	1969 Oct	# Kosrae Time
++			11:00	-	KOST	1969 Oct # Kosrae Time
+ 			12:00	-	KOST	1999
+ 			11:00	-	KOST
+ 
+ # Nauru
+ # Zone	NAME		GMTOFF	RULES	FORMAT	[UNTIL]
+-Zone	Pacific/Nauru	11:07:40 -	LMT	1921 Jan 15	# Uaobe
+-			11:30	-	NRT	1942 Mar 15	# Nauru Time
++Zone	Pacific/Nauru	11:07:40 -	LMT	1921 Jan 15 # Uaobe
++			11:30	-	NRT	1942 Mar 15 # Nauru Time
+ 			9:00	-	JST	1944 Aug 15
+ 			11:30	-	NRT	1979 May
+ 			12:00	-	NRT
+@@ -489,8 +513,8 @@
+ Rule	Cook	1979	1991	-	Mar	Sun>=1	0:00	0	-
+ Rule	Cook	1979	1990	-	Oct	lastSun	0:00	0:30	HS
+ # Zone	NAME		GMTOFF	RULES	FORMAT	[UNTIL]
+-Zone Pacific/Rarotonga	-10:39:04 -	LMT	1901		# Avarua
+-			-10:30	-	CKT	1978 Nov 12	# Cook Is Time
++Zone Pacific/Rarotonga	-10:39:04 -	LMT	1901        # Avarua
++			-10:30	-	CKT	1978 Nov 12 # Cook Is Time
+ 			-10:00	Cook	CK%sT
+ 
+ ###############################################################################
+@@ -498,40 +522,68 @@
+ 
+ # Niue
+ # Zone	NAME		GMTOFF	RULES	FORMAT	[UNTIL]
+-Zone	Pacific/Niue	-11:19:40 -	LMT	1901		# Alofi
+-			-11:20	-	NUT	1951	# Niue Time
+-			-11:30	-	NUT	1978 Oct 1
++Zone	Pacific/Niue	-11:19:40 -	LMT	1901        # Alofi
++			-11:20	-	NUT	1951        # Niue Time
++			-11:30	-	NUT	1978 Oct  1
+ 			-11:00	-	NUT
+ 
+ # Norfolk
+ # Zone	NAME		GMTOFF	RULES	FORMAT	[UNTIL]
+-Zone	Pacific/Norfolk	11:11:52 -	LMT	1901		# Kingston
+-			11:12	-	NMT	1951	# Norfolk Mean Time
+-			11:30	-	NFT		# Norfolk Time
++Zone	Pacific/Norfolk	11:11:52 -	LMT	1901 # Kingston
++			11:12	-	NMT	1951 # Norfolk Mean Time
++			11:30	-	NFT	1974 Oct 27 02:00 # Norfolk T.
++			11:30	1:00	NFST	1975 Mar  2 02:00
++			11:30	-	NFT	2015 Oct  4 02:00
++			11:00	-	NFT
+ 
+ # Palau (Belau)
+ # Zone	NAME		GMTOFF	RULES	FORMAT	[UNTIL]
+-Zone Pacific/Palau	8:57:56 -	LMT	1901		# Koror
++Zone Pacific/Palau	8:57:56 -	LMT	1901 # Koror
+ 			9:00	-	PWT	# Palau Time
+ 
+ # Papua New Guinea
+ # Zone	NAME		GMTOFF	RULES	FORMAT	[UNTIL]
+ Zone Pacific/Port_Moresby 9:48:40 -	LMT	1880
+-			9:48:32	-	PMMT	1895	# Port Moresby Mean Time
+-			10:00	-	PGT		# Papua New Guinea Time
++			9:48:32	-	PMMT	1895 # Port Moresby Mean Time
++			10:00	-	PGT	# Papua New Guinea Time
++#
++# From Paul Eggert (2014-10-13):
++# Base the Bougainville entry on the Arawa-Kieta region, which appears to have
++# the most people even though it was devastated in the Bougainville Civil War.
++#
++# Although Shanks gives 1942-03-15 / 1943-11-01 for UT +09, these dates
++# are apparently rough guesswork from the starts of military campaigns.
++# The World War II entries below are instead based on Arawa-Kieta.
++# The Japanese occupied Kieta in July 1942,
++# according to the Pacific War Online Encyclopedia
++# http://pwencycl.kgbudge.com/B/o/Bougainville.htm
++# and seem to have controlled it until their 1945-08-21 surrender.
++#
++# The Autonomous Region of Bougainville switched from UT +10 to +11
++# on 2014-12-28 at 02:00.  They call +11 "Bougainville Standard Time";
++# abbreviate this as BST.  See:
++# http://www.bougainville24.com/bougainville-issues/bougainville-gets-own-timezone/
++#
++Zone Pacific/Bougainville 10:22:16 -	LMT	1880
++			 9:48:32 -	PMMT	1895
++			10:00	-	PGT	1942 Jul
++			 9:00	-	JST	1945 Aug 21
++			10:00	-	PGT	2014 Dec 28  2:00
++			11:00	-	BST
+ 
+ # Pitcairn
+ # Zone	NAME		GMTOFF	RULES	FORMAT	[UNTIL]
+-Zone Pacific/Pitcairn	-8:40:20 -	LMT	1901		# Adamstown
+-			-8:30	-	PNT	1998 Apr 27 00:00
++Zone Pacific/Pitcairn	-8:40:20 -	LMT	1901        # Adamstown
++			-8:30	-	PNT	1998 Apr 27  0:00
+ 			-8:00	-	PST	# Pitcairn Standard Time
+ 
+ # American Samoa
+ Zone Pacific/Pago_Pago	 12:37:12 -	LMT	1879 Jul  5
+ 			-11:22:48 -	LMT	1911
+-			-11:00	-	NST	1967 Apr	# N=Nome
+-			-11:00	-	BST	1983 Nov 30	# B=Bering
+-			-11:00	-	SST			# S=Samoa
++			-11:00	-	NST	1967 Apr    # N=Nome
++			-11:00	-	BST	1983 Nov 30 # B=Bering
++			-11:00	-	SST	            # S=Samoa
++Link Pacific/Pago_Pago Pacific/Midway # in US minor outlying islands
+ 
+ # Samoa (formerly and also known as Western Samoa)
+ 
+@@ -574,7 +626,7 @@
+ # From Paul Eggert (2014-06-27):
+ # The International Date Line Act 2011
+ # http://www.parliament.gov.ws/images/ACTS/International_Date_Line_Act__2011_-_Eng.pdf
+-# changed Samoa from UTC-11 to UTC+13, effective "12 o'clock midnight, on
++# changed Samoa from UT -11 to +13, effective "12 o'clock midnight, on
+ # Thursday 29th December 2011".  The International Date Line was adjusted
+ # accordingly.
+ 
+@@ -617,7 +669,7 @@
+ # Solomon Is
+ # excludes Bougainville, for which see Papua New Guinea
+ # Zone	NAME		GMTOFF	RULES	FORMAT	[UNTIL]
+-Zone Pacific/Guadalcanal 10:39:48 -	LMT	1912 Oct	# Honiara
++Zone Pacific/Guadalcanal 10:39:48 -	LMT	1912 Oct # Honiara
+ 			11:00	-	SBT	# Solomon Is Time
+ 
+ # Tokelau Is
+@@ -641,7 +693,7 @@
+ 
+ # Zone	NAME		GMTOFF	RULES	FORMAT	[UNTIL]
+ Zone	Pacific/Fakaofo	-11:24:56 -	LMT	1901
+-			-11:00	-	TKT 2011 Dec 30	# Tokelau Time
++			-11:00	-	TKT	2011 Dec 30 # Tokelau Time
+ 			13:00	-	TKT
+ 
+ # Tonga
+@@ -650,11 +702,13 @@
+ Rule	Tonga	2000	only	-	Mar	19	2:00s	0	-
+ Rule	Tonga	2000	2001	-	Nov	Sun>=1	2:00	1:00	S
+ Rule	Tonga	2001	2002	-	Jan	lastSun	2:00	0	-
++Rule	Tonga	2016	max	-	Nov	Sun>=1	2:00	1:00	S
++Rule	Tonga	2017	max	-	Jan	Sun>=15	3:00	0	-
+ # Zone	NAME		GMTOFF	RULES	FORMAT	[UNTIL]
+ Zone Pacific/Tongatapu	12:19:20 -	LMT	1901
+-			12:20	-	TOT	1941 # Tonga Time
+-			13:00	-	TOT	1999
+-			13:00	Tonga	TO%sT
++			12:20	-	+1220	1941
++			13:00	-	+13	1999
++			13:00	Tonga	+13/+14
+ 
+ # Tuvalu
+ # Zone	NAME		GMTOFF	RULES	FORMAT	[UNTIL]
+@@ -669,7 +723,7 @@
+ # 1886-1891; Baker was similar but exact dates are not known.
+ # Inhabited by civilians 1935-1942; U.S. military bases 1943-1944;
+ # uninhabited thereafter.
+-# Howland observed Hawaii Standard Time (UT-10:30) in 1937;
++# Howland observed Hawaii Standard Time (UT -10:30) in 1937;
+ # see page 206 of Elgen M. Long and Marie K. Long,
+ # Amelia Earhart: the Mystery Solved, Simon & Schuster (2000).
+ # So most likely Howland and Baker observed Hawaii Time from 1935
+@@ -701,8 +755,8 @@
+ # time from Operation Newsreel (Hardtack I/Teak shot, 1958-08-01) to the last
+ # Operation Fishbowl shot (Tightrope, 1962-11-04).... [See] Herman Hoerlin,
+ # "The United States High-Altitude Test Experience: A Review Emphasizing the
+-# Impact on the Environment", Los Alamos LA-6405, Oct 1976
+-# <http://www.fas.org/sgp/othergov/doe/lanl/docs1/00322994.pdf>.
++# Impact on the Environment", Los Alamos LA-6405, Oct 1976.
++# http://www.fas.org/sgp/othergov/doe/lanl/docs1/00322994.pdf
+ # See the table on page 4 where he lists GMT and local times for the tests; a
+ # footnote for the JI tests reads that local time is "JI time = Hawaii Time
+ # Minus One Hour".
+@@ -713,23 +767,7 @@
+ # uninhabited
+ 
+ # Midway
+-#
+-# From Mark Brader (2005-01-23):
+-# [Fallacies and Fantasies of Air Transport History, by R.E.G. Davies,
+-# published 1994 by Paladwr Press, McLean, VA, USA; ISBN 0-9626483-5-3]
+-# reproduced a Pan American Airways timeables from 1936, for their weekly
+-# "Orient Express" flights between San Francisco and Manila, and connecting
+-# flights to Chicago and the US East Coast.  As it uses some time zone
+-# designations that I've never seen before:....
+-# Fri. 6:30A Lv. HONOLOLU (Pearl Harbor), H.I.   H.L.T. Ar. 5:30P Sun.
+-#  "   3:00P Ar. MIDWAY ISLAND . . . . . . . . . M.L.T. Lv. 6:00A  "
+-#
+-Zone Pacific/Midway	-11:49:28 -	LMT	1901
+-			-11:00	-	NST	1956 Jun  3
+-			-11:00	1:00	NDT	1956 Sep  2
+-			-11:00	-	NST	1967 Apr	# N=Nome
+-			-11:00	-	BST	1983 Nov 30	# B=Bering
+-			-11:00	-	SST			# S=Samoa
++# See Pacific/Pago_Pago.
+ 
+ # Palmyra
+ # uninhabited since World War II; was probably like Pacific/Kiritimati
+@@ -749,7 +787,7 @@
+ Rule	Vanuatu	1992	1993	-	Jan	Sun>=23	0:00	0	-
+ Rule	Vanuatu	1992	only	-	Oct	Sun>=23	0:00	1:00	S
+ # Zone	NAME		GMTOFF	RULES	FORMAT	[UNTIL]
+-Zone	Pacific/Efate	11:13:16 -	LMT	1912 Jan 13		# Vila
++Zone	Pacific/Efate	11:13:16 -	LMT	1912 Jan 13 # Vila
+ 			11:00	Vanuatu	VU%sT	# Vanuatu Time
+ 
+ # Wallis and Futuna
+@@ -761,31 +799,32 @@
+ 
+ # NOTES
+ 
+-# This data is by no means authoritative; if you think you know better,
++# This file is by no means authoritative; if you think you know better,
+ # go ahead and edit the file (and please send any changes to
+-# tz@iana.org for general use in the future).
++# tz@iana.org for general use in the future).  For more, please see
++# the file CONTRIBUTING in the tz distribution.
+ 
+-# From Paul Eggert (2013-02-21):
+-# A good source for time zone historical data outside the U.S. is
++# From Paul Eggert (2014-10-31):
++#
++# Unless otherwise specified, the source for data through 1990 is:
+ # Thomas G. Shanks and Rique Pottenger, The International Atlas (6th edition),
+ # San Diego: ACS Publications, Inc. (2003).
++# Unfortunately this book contains many errors and cites no sources.
+ #
+ # Gwillim Law writes that a good source
+ # for recent time zone data is the International Air Transport
+ # Association's Standard Schedules Information Manual (IATA SSIM),
+ # published semiannually.  Law sent in several helpful summaries
+-# of the IATA's data after 1990.
+-#
+-# Except where otherwise noted, Shanks & Pottenger is the source for
+-# entries through 1990, and IATA SSIM is the source for entries afterwards.
++# of the IATA's data after 1990.  Except where otherwise noted,
++# IATA SSIM is the source for entries after 1990.
+ #
+ # Another source occasionally used is Edward W. Whitman, World Time Differences,
+ # Whitman Publishing Co, 2 Niagara Av, Ealing, London (undated), which
+ # I found in the UCLA library.
+ #
+ # For data circa 1899, a common source is:
+-# Milne J. Civil time. Geogr J. 1899 Feb;13(2):173-94
+-# <http://www.jstor.org/stable/1774359>.
++# Milne J. Civil time. Geogr J. 1899 Feb;13(2):173-94.
++# http://www.jstor.org/stable/1774359
+ #
+ # A reliable and entertaining source about time zones is
+ # Derek Howse, Greenwich time and longitude, Philip Wilson Publishers (1997).
+@@ -802,6 +841,7 @@
+ #	 10:00	AEST	AEDT	Eastern Australia
+ #	 10:00	ChST		Chamorro
+ #	 10:30	LHST	LHDT	Lord Howe*
++#	 11:00	BST		Bougainville*
+ #	 11:30	NZMT	NZST	New Zealand through 1945
+ #	 12:00	NZST	NZDT	New Zealand 1946-present
+ #	 12:15	CHAST		Chatham through 1945*
+@@ -834,12 +874,12 @@
+ 
+ # From Paul Eggert (2005-12-08):
+ # Implementation Dates of Daylight Saving Time within Australia
+-# <http://www.bom.gov.au/climate/averages/tables/dst_times.shtml>
++# http://www.bom.gov.au/climate/averages/tables/dst_times.shtml
+ # summarizes daylight saving issues in Australia.
+ 
+ # From Arthur David Olson (2005-12-12):
+ # Lawlink NSW:Daylight Saving in New South Wales
+-# <http://www.lawlink.nsw.gov.au/lawlink/Corporate/ll_agdinfo.nsf/pages/community_relations_daylight_saving>
++# http://www.lawlink.nsw.gov.au/lawlink/Corporate/ll_agdinfo.nsf/pages/community_relations_daylight_saving
+ # covers New South Wales in particular.
+ 
+ # From John Mackin (1991-03-06):
+@@ -976,13 +1016,13 @@
+ #
+ # NSW (including LHI and Broken Hill):
+ # Standard Time Act 1987 (updated 1995-04-04)
+-# <http://www.austlii.edu.au/au/legis/nsw/consol_act/sta1987137/index.html>
++# http://www.austlii.edu.au/au/legis/nsw/consol_act/sta1987137/index.html
+ # ACT
+ # Standard Time and Summer Time Act 1972
+-# <http://www.austlii.edu.au/au/legis/act/consol_act/stasta1972279/index.html>
++# http://www.austlii.edu.au/au/legis/act/consol_act/stasta1972279/index.html
+ # SA
+ # Standard Time Act, 1898
+-# <http://www.austlii.edu.au/au/legis/sa/consol_act/sta1898137/index.html>
++# http://www.austlii.edu.au/au/legis/sa/consol_act/sta1898137/index.html
+ 
+ # From David Grosz (2005-06-13):
+ # It was announced last week that Daylight Saving would be extended by
+@@ -1048,7 +1088,7 @@
+ # it matches what was used in the past.
+ 
+ # The Australian Bureau of Meteorology FAQ
+-# <http://www.bom.gov.au/faq/faqgen.htm>
++# http://www.bom.gov.au/faq/faqgen.htm
+ # (1999-09-27) writes that Giles Meteorological Station uses
+ # South Australian time even though it's located in Western Australia.
+ 
+@@ -1092,7 +1132,7 @@
+ # From Christopher Hunt (2006-11-21), after an advance warning
+ # from Jesper Nørgaard Welen (2006-11-01):
+ # WA are trialing DST for three years.
+-# <http://www.parliament.wa.gov.au/parliament/bills.nsf/9A1B183144403DA54825721200088DF1/$File/Bill175-1B.pdf>
++# http://www.parliament.wa.gov.au/parliament/bills.nsf/9A1B183144403DA54825721200088DF1/$File/Bill175-1B.pdf
+ 
+ # From Rives McDow (2002-04-09):
+ # The most interesting region I have found consists of three towns on the
+@@ -1106,7 +1146,7 @@
+ # From Paul Eggert (2002-04-09):
+ # This is confirmed by the section entitled
+ # "What's the deal with time zones???" in
+-# <http://www.earthsci.unimelb.edu.au/~awatkins/null.html>.
++# http://www.earthsci.unimelb.edu.au/~awatkins/null.html
+ #
+ # From Alex Livingston (2006-12-07):
+ # ... it was just on four years ago that I drove along the Eyre Highway,
+@@ -1262,33 +1302,32 @@
+ 
+ # From Eric Ulevik (1999-05-26):
+ # DST will start in NSW on the last Sunday of August, rather than the usual
+-# October in 2000.  [See: Matthew Moore,
+-# Two months more daylight saving
+-# Sydney Morning Herald (1999-05-26)
+-# <http://www.smh.com.au/news/9905/26/pageone/pageone4.html>]
++# October in 2000.  See: Matthew Moore,
++# Two months more daylight saving, Sydney Morning Herald (1999-05-26).
++# http://www.smh.com.au/news/9905/26/pageone/pageone4.html
+ 
+ # From Paul Eggert (1999-09-27):
+ # See the following official NSW source:
+ # Daylight Saving in New South Wales.
+-# <http://dir.gis.nsw.gov.au/cgi-bin/genobject/document/other/daylightsaving/tigGmZ>
++# http://dir.gis.nsw.gov.au/cgi-bin/genobject/document/other/daylightsaving/tigGmZ
+ #
+ # Narrabri Shire (NSW) council has announced it will ignore the extension of
+ # daylight saving next year.  See:
+ # Narrabri Council to ignore daylight saving
+-# <http://abc.net.au/news/regionals/neweng/monthly/regeng-22jul1999-1.htm>
++# http://abc.net.au/news/regionals/neweng/monthly/regeng-22jul1999-1.htm
+ # (1999-07-22).  For now, we'll wait to see if this really happens.
+ #
+ # Victoria will following NSW.  See:
+ # Vic to extend daylight saving (1999-07-28)
+-# <http://abc.net.au/local/news/olympics/1999/07/item19990728112314_1.htm>
++# http://abc.net.au/local/news/olympics/1999/07/item19990728112314_1.htm
+ #
+ # However, South Australia rejected the DST request.  See:
+ # South Australia rejects Olympics daylight savings request (1999-07-19)
+-# <http://abc.net.au/news/olympics/1999/07/item19990719151754_1.htm>
++# http://abc.net.au/news/olympics/1999/07/item19990719151754_1.htm
+ #
+ # Queensland also will not observe DST for the Olympics.  See:
+ # Qld says no to daylight savings for Olympics
+-# <http://abc.net.au/news/olympics/1999/06/item19990601114608_1.htm>
++# http://abc.net.au/news/olympics/1999/06/item19990601114608_1.htm
+ # (1999-06-01), which quotes Queensland Premier Peter Beattie as saying
+ # "Look you've got to remember in my family when this came up last time
+ # I voted for it, my wife voted against it and she said to me it's all very
+@@ -1298,7 +1337,7 @@
+ #
+ # Broken Hill will stick with South Australian time in 2000.  See:
+ # Broken Hill to be behind the times (1999-07-21)
+-# <http://abc.net.au/news/regionals/brokenh/monthly/regbrok-21jul1999-6.htm>
++# http://abc.net.au/news/regionals/brokenh/monthly/regbrok-21jul1999-6.htm
+ 
+ # IATA SSIM (1998-09) says that the spring 2000 change for Australian
+ # Capital Territory, New South Wales except Lord Howe Island and Broken
+@@ -1434,15 +1473,15 @@
+ 
+ # From Paul Eggert (2014-07-14):
+ # Chatham Island time was formally standardized on 1957-01-01 by
+-# New Zealand's Standard Time Amendment Act 1956 (1956-10-26)
+-# <http://www.austlii.edu.au/nz/legis/hist_act/staa19561956n100244.pdf>.
++# New Zealand's Standard Time Amendment Act 1956 (1956-10-26).
++# http://www.austlii.edu.au/nz/legis/hist_act/staa19561956n100244.pdf
+ # According to Google Books snippet view, a speaker in the New Zealand
+ # parliamentary debates in 1956 said "Clause 78 makes provision for standard
+ # time in the Chatham Islands.  The time there is 45 minutes in advance of New
+ # Zealand time.  I understand that is the time they keep locally, anyhow."
+ # For now, assume this practice goes back to the introduction of standard time
+ # in New Zealand, as this would make Chatham Islands time almost exactly match
+-# LMT back when New Zealand was at UTC+11:30; also, assume Chatham Islands did
++# LMT back when New Zealand was at UT +11:30; also, assume Chatham Islands did
+ # not observe New Zealand's prewar DST.
+ 
+ ###############################################################################
+@@ -1498,7 +1537,7 @@
+ # For now, we assume the Ladrones switched at the same time as the Philippines;
+ # see Asia/Manila.
+ 
+-# US Public Law 106-564 (2000-12-23) made UTC+10 the official standard time,
++# US Public Law 106-564 (2000-12-23) made UT +10 the official standard time,
+ # under the name "Chamorro Standard Time".  There is no official abbreviation,
+ # but Congressman Robert A. Underwood, author of the bill that became law,
+ # wrote in a press release (2000-12-27) that he will seek the use of "ChST".
+@@ -1510,15 +1549,15 @@
+ # "I am certain, having lived there for the past decade, that 'Truk'
+ # (now properly known as Chuuk) ... is in the time zone GMT+10."
+ #
+-# Shanks & Pottenger write that Truk switched from UTC+10 to UTC+11
++# Shanks & Pottenger write that Truk switched from UT +10 to +11
+ # on 1978-10-01; ignore this for now.
+ 
+ # From Paul Eggert (1999-10-29):
+ # The Federated States of Micronesia Visitors Board writes in
+ # The Federated States of Micronesia - Visitor Information (1999-01-26)
+-# <http://www.fsmgov.org/info/clocks.html>
+-# that Truk and Yap are UTC+10, and Ponape and Kosrae are UTC+11.
+-# We don't know when Kosrae switched from UTC+12; assume January 1 for now.
++# http://www.fsmgov.org/info/clocks.html
++# that Truk and Yap are UT +10, and Ponape and Kosrae are +11.
++# We don't know when Kosrae switched from +12; assume January 1 for now.
+ 
+ 
+ # Midway
+@@ -1537,6 +1576,20 @@
+ # started DST on June 3.  Possibly DST was observed other years
+ # in Midway, but we have no record of it.
+ 
++# Norfolk
++
++# From Alexander Krivenyshev (2015-09-23):
++# Norfolk Island will change ... from +1130 to +1100:
++# https://www.comlaw.gov.au/Details/F2015L01483/Explanatory%20Statement/Text
++# ... at 12.30 am (by legal time in New South Wales) on 4 October 2015.
++# http://www.norfolkisland.gov.nf/nia/MediaRelease/Media%20Release%20Norfolk%20Island%20Standard%20Time%20Change.pdf
++
++# From Paul Eggert (2015-09-23):
++# Transitions before 2015 are from timeanddate.com, which consulted
++# the Norfolk Island Museum and the Australian Bureau of Meteorology's
++# Norfolk Island station, and found no record of Norfolk observing DST
++# other than in 1974/5.  See:
++# http://www.timeanddate.com/time/australia/norfolk-island.html
+ 
+ # Pitcairn
+ 
+@@ -1570,11 +1623,11 @@
+ # ordaining - by a masterpiece of diplomatic flattery - that
+ # the Fourth of July should be celebrated twice in that year."
+ 
+-# Although Shanks & Pottenger says they both switched to UTC-11:30
+-# in 1911, and to UTC-11 in 1950. many earlier sources give UTC-11
++# Although Shanks & Pottenger says they both switched to UT -11:30
++# in 1911, and to -11 in 1950. many earlier sources give -11
+ # for American Samoa, e.g., the US National Bureau of Standards
+ # circular "Standard Time Throughout the World", 1932.
+-# Assume American Samoa switched to UTC-11 in 1911, not 1950,
++# Assume American Samoa switched to -11 in 1911, not 1950,
+ # and that after 1950 they agreed until (western) Samoa skipped a
+ # day in 2011.  Assume also that the Samoas follow the US and New
+ # Zealand's "ST"/"DT" style of daylight-saving abbreviations.
+@@ -1587,9 +1640,9 @@
+ # Since Kiribati has moved the Date Line it's not clear what Tonga will do.
+ 
+ # Don Mundell writes in the 1997-02-20 Tonga Chronicle
+-# How Tonga became 'The Land where Time Begins'
+-# <http://www.tongatapu.net.to/tonga/homeland/timebegins.htm>:
+-
++# How Tonga became 'The Land where Time Begins':
++# http://www.tongatapu.net.to/tonga/homeland/timebegins.htm
++#
+ # Until 1941 Tonga maintained a standard time 50 minutes ahead of NZST
+ # 12 hours and 20 minutes ahead of GMT.  When New Zealand adjusted its
+ # standard time in 1940s, Tonga had the choice of subtracting from its
+@@ -1661,9 +1714,17 @@
+ # of January the standard time in the Kingdom shall be moved backward by one
+ # hour to 1:00am.
+ 
+-# From Pulu 'Anau (2002-11-05):
++# From Pulu ʻAnau (2002-11-05):
+ # The law was for 3 years, supposedly to get renewed.  It wasn't.
+ 
++# From Pulu ʻAnau (2016-10-27):
++# http://mic.gov.to/news-today/press-releases/6375-daylight-saving-set-to-run-from-6-november-2016-to-15-january-2017
++# Cannot find anyone who knows the rules, has seen the duration or has seen
++# the cabinet decision, but it appears we are following Fiji's rule set.
++#
++# From Tim Parenti (2016-10-26):
++# Assume Tonga will observe DST from the first Sunday in November at 02:00
++# through the third Sunday in January at 03:00, like Fiji, for now.
+ 
+ # Wake
+ 
+@@ -1723,6 +1784,6 @@
+ # (2005-03-20):
+ #
+ # The American Practical Navigator (2002)
+-# <http://pollux.nss.nima.mil/pubs/pubs_j_apn_sections.html?rid=187>
++# http://pollux.nss.nima.mil/pubs/pubs_j_apn_sections.html?rid=187
+ # talks only about the 180-degree meridian with respect to ships in
+ # international waters; it ignores the international date line.
+--- contrib/tzdata/backward.orig
++++ contrib/tzdata/backward
+@@ -4,7 +4,8 @@
+ # This file provides links between current names for time zones
+ # and their old names.  Many names changed in late 1993.
+ 
+-Link	Africa/Asmara		Africa/Asmera
++# Link	TARGET			LINK-NAME
++Link	Africa/Nairobi		Africa/Asmera
+ Link	Africa/Abidjan		Africa/Timbuktu
+ Link	America/Argentina/Catamarca	America/Argentina/ComodRivadavia
+ Link	America/Adak		America/Atka
+@@ -19,8 +20,10 @@
+ Link	America/Indiana/Knox	America/Knox_IN
+ Link	America/Kentucky/Louisville	America/Louisville
+ Link	America/Argentina/Mendoza	America/Mendoza
++Link	America/Toronto		America/Montreal
+ Link	America/Rio_Branco	America/Porto_Acre
+ Link	America/Argentina/Cordoba	America/Rosario
++Link	America/Tijuana		America/Santa_Isabel
+ Link	America/Denver		America/Shiprock
+ Link	America/Port_of_Spain	America/Virgin
+ Link	Pacific/Auckland	Antarctica/South_Pole
+@@ -33,6 +36,7 @@
+ Link	Asia/Urumqi		Asia/Kashgar
+ Link	Asia/Kathmandu		Asia/Katmandu
+ Link	Asia/Macau		Asia/Macao
++Link	Asia/Yangon		Asia/Rangoon
+ Link	Asia/Ho_Chi_Minh	Asia/Saigon
+ Link	Asia/Jerusalem		Asia/Tel_Aviv
+ Link	Asia/Thimphu		Asia/Thimbu
+--- contrib/tzdata/backzone.orig
++++ contrib/tzdata/backzone
+@@ -0,0 +1,677 @@
++# Zones that go back beyond the scope of the tz database
++
++# This file is in the public domain.
++
++# This file is by no means authoritative; if you think you know
++# better, go ahead and edit it (and please send any changes to
++# tz@iana.org for general use in the future).  For more, please see
++# the file CONTRIBUTING in the tz distribution.
++
++
++# From Paul Eggert (2014-10-31):
++
++# This file contains data outside the normal scope of the tz database,
++# in that its zones do not differ from normal tz zones after 1970.
++# Links in this file point to zones in this file, superseding links in
++# the file 'backward'.
++
++# Although zones in this file may be of some use for analyzing
++# pre-1970 time stamps, they are less reliable, cover only a tiny
++# sliver of the pre-1970 era, and cannot feasibly be improved to cover
++# most of the era.  Because the zones are out of normal scope for the
++# database, less effort is put into maintaining this file.  Many of
++# the zones were formerly in other source files, but were removed or
++# replaced by links as their data entries were questionable and/or they
++# differed from other zones only in pre-1970 time stamps.
++
++# Unless otherwise specified, the source for data through 1990 is:
++# Thomas G. Shanks and Rique Pottenger, The International Atlas (6th edition),
++# San Diego: ACS Publications, Inc. (2003).
++# Unfortunately this book contains many errors and cites no sources.
++
++# This file is not intended to be compiled standalone, as it
++# assumes rules from other files.  In the tz distribution, use
++# 'make PACKRATDATA=backzone zones' to compile and install this file.
++
++# Zones are sorted by zone name.  Each zone is preceded by the
++# name of the country that the zone is in, along with any other
++# commentary and rules associated with the entry.
++#
++# As explained in the zic man page, the zone columns are:
++# Zone	NAME		GMTOFF	RULES	FORMAT	[UNTIL]
++
++# Ethiopia
++# From Paul Eggert (2014-07-31):
++# Like the Swahili of Kenya and Tanzania, many Ethiopians keep a
++# 12-hour clock starting at our 06:00, so their "8 o'clock" is our
++# 02:00 or 14:00.  Keep this in mind when you ask the time in Amharic.
++#
++# Shanks & Pottenger write that Ethiopia had six narrowly-spaced time
++# zones between 1870 and 1890, that they merged to 38E50 (2:35:20) in
++# 1890, and that they switched to 3:00 on 1936-05-05.  Perhaps 38E50
++# was for Adis Dera.  Quite likely the Shanks data entries are wrong
++# anyway.
++Zone Africa/Addis_Ababa	2:34:48 -	LMT	1870
++			2:35:20	-	ADMT	1936 May  5 # Adis Dera MT
++			3:00	-	EAT
++
++# Eritrea
++Zone	Africa/Asmara	2:35:32 -	LMT	1870
++			2:35:32	-	AMT	1890        # Asmara Mean Time
++			2:35:20	-	ADMT	1936 May  5 # Adis Dera MT
++			3:00	-	EAT
++Link Africa/Asmara Africa/Asmera
++
++# Mali (southern)
++Zone	Africa/Bamako	-0:32:00 -	LMT	1912
++			 0:00	-	GMT	1934 Feb 26
++			-1:00	-	WAT	1960 Jun 20
++			 0:00	-	GMT
++
++# Central African Republic
++Zone	Africa/Bangui	1:14:20	-	LMT	1912
++			1:00	-	WAT
++
++# Gambia
++Zone	Africa/Banjul	-1:06:36 -	LMT	1912
++			-1:06:36 -	BMT	1935 # Banjul Mean Time
++			-1:00	-	WAT	1964
++			 0:00	-	GMT
++
++# Malawi
++Zone	Africa/Blantyre	2:20:00 -	LMT	1903 Mar
++			2:00	-	CAT
++
++# Republic of the Congo
++Zone Africa/Brazzaville	1:01:08 -	LMT	1912
++			1:00	-	WAT
++
++# Burundi
++Zone Africa/Bujumbura	1:57:28	-	LMT	1890
++			2:00	-	CAT
++
++# Guinea
++Zone	Africa/Conakry	-0:54:52 -	LMT	1912
++			 0:00	-	GMT	1934 Feb 26
++			-1:00	-	WAT	1960
++			 0:00	-	GMT
++
++# Senegal
++Zone	Africa/Dakar	-1:09:44 -	LMT	1912
++			-1:00	-	WAT	1941 Jun
++			 0:00	-	GMT
++
++# Tanzania
++Zone Africa/Dar_es_Salaam 2:37:08 -	LMT	1931
++			3:00	-	EAT	1948
++			2:45	-	BEAUT	1961
++			3:00	-	EAT
++
++# Djibouti
++Zone	Africa/Djibouti	2:52:36 -	LMT	1911 Jul
++			3:00	-	EAT
++
++# Cameroon
++# Whitman says they switched to 1:00 in 1920; go with Shanks & Pottenger.
++Zone	Africa/Douala	0:38:48	-	LMT	1912
++			1:00	-	WAT
++# Sierra Leone
++# From Paul Eggert (2014-08-12):
++# The following table is from Shanks & Pottenger, but it can't be right.
++# Whitman gives Mar 31 - Aug 31 for 1931 on.
++# The International Hydrographic Bulletin, 1932-33, p 63 says that
++# Sierra Leone would advance its clocks by 20 minutes on 1933-10-01.
++# Rule	NAME	FROM	TO	TYPE	IN	ON	AT	SAVE	LETTER/S
++Rule	SL	1935	1942	-	Jun	 1	0:00	0:40	SLST
++Rule	SL	1935	1942	-	Oct	 1	0:00	0	WAT
++Rule	SL	1957	1962	-	Jun	 1	0:00	1:00	SLST
++Rule	SL	1957	1962	-	Sep	 1	0:00	0	GMT
++Zone	Africa/Freetown	-0:53:00 -	LMT	1882
++			-0:53:00 -	FMT	1913 Jun # Freetown Mean Time
++			-1:00	SL	%s	1957
++			 0:00	SL	%s
++
++# Botswana
++# From Paul Eggert (2013-02-21):
++# Milne says they were regulated by the Cape Town Signal in 1899;
++# assume they switched to 2:00 when Cape Town did.
++Zone	Africa/Gaborone	1:43:40 -	LMT	1885
++			1:30	-	SAST	1903 Mar
++			2:00	-	CAT	1943 Sep 19  2:00
++			2:00	1:00	CAST	1944 Mar 19  2:00
++			2:00	-	CAT
++
++# Zimbabwe
++Zone	Africa/Harare	2:04:12 -	LMT	1903 Mar
++			2:00	-	CAT
++
++# South Sudan
++Zone	Africa/Juba	2:06:24 -	LMT	1931
++			2:00	Sudan	CA%sT	2000 Jan 15 12:00
++			3:00	-	EAT
++
++# Uganda
++Zone	Africa/Kampala	2:09:40 -	LMT	1928 Jul
++			3:00	-	EAT	1930
++			2:30	-	BEAT	1948
++			2:45	-	BEAUT	1957
++			3:00	-	EAT
++
++# Rwanda
++Zone	Africa/Kigali	2:00:16 -	LMT	1935 Jun
++			2:00	-	CAT
++
++# Democratic Republic of the Congo (west)
++Zone Africa/Kinshasa	1:01:12 -	LMT	1897 Nov  9
++			1:00	-	WAT
++
++# Gabon
++Zone Africa/Libreville	0:37:48 -	LMT	1912
++			1:00	-	WAT
++
++# Togo
++Zone	Africa/Lome	0:04:52 -	LMT	1893
++			0:00	-	GMT
++
++# Angola
++#
++# Shanks gives 1911-05-26 for the transition to WAT,
++# evidently confusing the date of the Portuguese decree
++# http://dre.pt/pdf1sdip/1911/05/12500/23132313.pdf
++# with the date that it took effect, namely 1912-01-01.
++#
++Zone	Africa/Luanda	0:52:56	-	LMT	1892
++			0:52:04	-	AOT	1912 Jan  1 # Angola Time
++			1:00	-	WAT
++
++# Democratic Republic of the Congo (east)
++Zone Africa/Lubumbashi	1:49:52 -	LMT	1897 Nov 9
++			2:00	-	CAT
++
++# Zambia
++Zone	Africa/Lusaka	1:53:08 -	LMT	1903 Mar
++			2:00	-	CAT
++
++# Equatorial Guinea
++#
++# Although Shanks says that Malabo switched from UT +00 to +01 on 1963-12-15,
++# a Google Books search says that London Calling, Issues 432-465 (1948), p 19,
++# says that Spanish Guinea was at +01 back then.  The Shanks data entries
++# are most likely wrong, but we have nothing better; use them here for now.
++#
++Zone	Africa/Malabo	0:35:08 -	LMT	1912
++			0:00	-	GMT	1963 Dec 15
++			1:00	-	WAT
++
++# Lesotho
++Zone	Africa/Maseru	1:50:00 -	LMT	1903 Mar
++			2:00	-	SAST	1943 Sep 19  2:00
++			2:00	1:00	SAST	1944 Mar 19  2:00
++			2:00	-	SAST
++
++# Swaziland
++Zone	Africa/Mbabane	2:04:24 -	LMT	1903 Mar
++			2:00	-	SAST
++
++# Somalia
++Zone Africa/Mogadishu	3:01:28 -	LMT	1893 Nov
++			3:00	-	EAT	1931
++			2:30	-	BEAT	1957
++			3:00	-	EAT
++
++# Niger
++Zone	Africa/Niamey	 0:08:28 -	LMT	1912
++			-1:00	-	WAT	1934 Feb 26
++			 0:00	-	GMT	1960
++			 1:00	-	WAT
++
++# Mauritania
++Zone Africa/Nouakchott	-1:03:48 -	LMT	1912
++			 0:00	-	GMT	1934 Feb 26
++			-1:00	-	WAT	1960 Nov 28
++			 0:00	-	GMT
++
++# Burkina Faso
++Zone Africa/Ouagadougou	-0:06:04 -	LMT	1912
++			 0:00	-	GMT
++
++# Benin
++# Whitman says they switched to 1:00 in 1946, not 1934;
++# go with Shanks & Pottenger.
++Zone Africa/Porto-Novo	0:10:28	-	LMT	1912 Jan  1
++			0:00	-	GMT	1934 Feb 26
++			1:00	-	WAT
++
++# São Tomé and Príncipe
++Zone	Africa/Sao_Tome	 0:26:56 -	LMT	1884
++			-0:36:32 -	LMT	1912 # Lisbon Mean Time
++			 0:00	-	GMT
++
++# Mali (northern)
++Zone	Africa/Timbuktu	-0:12:04 -	LMT	1912
++			 0:00	-	GMT
++
++# Anguilla
++Zone America/Anguilla	-4:12:16 -	LMT	1912 Mar  2
++			-4:00	-	AST
++
++# Antigua and Barbuda
++Zone	America/Antigua	-4:07:12 -	LMT	1912 Mar 2
++			-5:00	-	EST	1951
++			-4:00	-	AST
++
++# Chubut, Argentina
++# The name "Comodoro Rivadavia" exceeds the 14-byte POSIX limit.
++Zone America/Argentina/ComodRivadavia -4:30:00 - LMT	1894 Oct 31
++			-4:16:48 -	CMT	1920 May
++			-4:00	-	ART	1930 Dec
++			-4:00	Arg	AR%sT	1969 Oct  5
++			-3:00	Arg	AR%sT	1991 Mar  3
++			-4:00	-	WART	1991 Oct 20
++			-3:00	Arg	AR%sT	1999 Oct  3
++			-4:00	Arg	AR%sT	2000 Mar  3
++			-3:00	-	ART	2004 Jun  1
++			-4:00	-	WART	2004 Jun 20
++			-3:00	-	ART
++
++# Aruba
++Zone	America/Aruba	-4:40:24 -	LMT	1912 Feb 12 # Oranjestad
++			-4:30	-	ANT	1965 # Netherlands Antilles Time
++			-4:00	-	AST
++
++# Cayman Is
++Zone	America/Cayman	-5:25:32 -	LMT	1890     # Georgetown
++			-5:07:11 -	KMT	1912 Feb # Kingston Mean Time
++			-5:00	-	EST
++
++# Canada
++Zone America/Coral_Harbour -5:32:40 -	LMT	1884
++			-5:00	NT_YK	E%sT	1946
++			-5:00	-	EST
++
++# Dominica
++Zone America/Dominica	-4:05:36 -	LMT	1911 Jul  1  0:01 # Roseau
++			-4:00	-	AST
++
++# Baja California
++# See 'northamerica' for why this entry is here rather than there.
++Zone America/Ensenada	-7:46:28 -	LMT	1922 Jan  1  0:13:32
++			-8:00	-	PST	1927 Jun 10 23:00
++			-7:00	-	MST	1930 Nov 16
++			-8:00	-	PST	1942 Apr
++			-7:00	-	MST	1949 Jan 14
++			-8:00	-	PST	1996
++			-8:00	Mexico	P%sT
++
++# Grenada
++Zone	America/Grenada	-4:07:00 -	LMT	1911 Jul # St George's
++			-4:00	-	AST
++
++# Guadeloupe
++Zone America/Guadeloupe	-4:06:08 -	LMT	1911 Jun  8 # Pointe-à-Pitre
++			-4:00	 -	AST
++
++# Canada
++#
++# From Paul Eggert (2015-03-24):
++# Since 1970 most of Quebec has been like Toronto; see
++# America/Toronto.  However, earlier versions of the tz database
++# mistakenly relied on data from Shanks & Pottenger saying that Quebec
++# differed from Ontario after 1970, and the following rules and zone
++# were created for most of Quebec from the incorrect Shanks &
++# Pottenger data.  The post-1970 entries have been corrected, but the
++# pre-1970 entries are unchecked and probably have errors.
++#
++# Rule	NAME	FROM	TO	TYPE	IN	ON	AT	SAVE	LETTER/S
++Rule	Mont	1917	only	-	Mar	25	2:00	1:00	D
++Rule	Mont	1917	only	-	Apr	24	0:00	0	S
++Rule	Mont	1919	only	-	Mar	31	2:30	1:00	D
++Rule	Mont	1919	only	-	Oct	25	2:30	0	S
++Rule	Mont	1920	only	-	May	 2	2:30	1:00	D
++Rule	Mont	1920	1922	-	Oct	Sun>=1	2:30	0	S
++Rule	Mont	1921	only	-	May	 1	2:00	1:00	D
++Rule	Mont	1922	only	-	Apr	30	2:00	1:00	D
++Rule	Mont	1924	only	-	May	17	2:00	1:00	D
++Rule	Mont	1924	1926	-	Sep	lastSun	2:30	0	S
++Rule	Mont	1925	1926	-	May	Sun>=1	2:00	1:00	D
++Rule	Mont	1927	1937	-	Apr	lastSat	24:00	1:00	D
++Rule	Mont	1927	1937	-	Sep	lastSat	24:00	0	S
++Rule	Mont	1938	1940	-	Apr	lastSun	0:00	1:00	D
++Rule	Mont	1938	1939	-	Sep	lastSun	0:00	0	S
++Rule	Mont	1946	1973	-	Apr	lastSun	2:00	1:00	D
++Rule	Mont	1945	1948	-	Sep	lastSun	2:00	0	S
++Rule	Mont	1949	1950	-	Oct	lastSun	2:00	0	S
++Rule	Mont	1951	1956	-	Sep	lastSun	2:00	0	S
++Rule	Mont	1957	1973	-	Oct	lastSun	2:00	0	S
++Zone America/Montreal	-4:54:16 -	LMT	1884
++			-5:00	Mont	E%sT	1918
++			-5:00	Canada	E%sT	1919
++			-5:00	Mont	E%sT	1942 Feb  9  2:00s
++			-5:00	Canada	E%sT	1946
++			-5:00	Mont	E%sT	1974
++			-5:00	Canada	E%sT
++
++# Montserrat
++# From Paul Eggert (2006-03-22):
++# In 1995 volcanic eruptions forced evacuation of Plymouth, the capital.
++# world.gazetteer.com says Cork Hill is the most populous location now.
++Zone America/Montserrat	-4:08:52 -	LMT	1911 Jul  1  0:01 # Cork Hill
++			-4:00	-	AST
++
++# Argentina
++# This entry was intended for the following areas, but has been superseded by
++# more detailed zones.
++# Santa Fe (SF), Entre Ríos (ER), Corrientes (CN), Misiones (MN), Chaco (CC),
++# Formosa (FM), La Pampa (LP), Chubut (CH)
++Zone America/Rosario	-4:02:40 -	LMT	1894 Nov
++			-4:16:44 -	CMT	1920 May
++			-4:00	-	ART	1930 Dec
++			-4:00	Arg	AR%sT	1969 Oct  5
++			-3:00	Arg	AR%sT	1991 Jul
++			-3:00	-	ART	1999 Oct  3  0:00
++			-4:00	Arg	AR%sT	2000 Mar  3  0:00
++			-3:00	-	ART
++
++# St Kitts-Nevis
++Zone America/St_Kitts	-4:10:52 -	LMT	1912 Mar  2 # Basseterre
++			-4:00	-	AST
++
++# St Lucia
++Zone America/St_Lucia	-4:04:00 -	LMT	1890 # Castries
++			-4:04:00 -	CMT	1912 # Castries Mean Time
++			-4:00	-	AST
++
++# Virgin Is
++Zone America/St_Thomas	-4:19:44 -	LMT	1911 Jul # Charlotte Amalie
++			-4:00	-	AST
++
++# St Vincent and the Grenadines
++Zone America/St_Vincent	-4:04:56 -	LMT	1890 # Kingstown
++			-4:04:56 -	KMT	1912 # Kingstown Mean Time
++			-4:00	-	AST
++
++# British Virgin Is
++Zone America/Tortola	-4:18:28 -	LMT	1911 Jul # Road Town
++			-4:00	-	AST
++
++# McMurdo, Ross Island, since 1955-12
++Zone Antarctica/McMurdo	0	-	-00	1956
++			12:00	NZ	NZ%sT
++Link Antarctica/McMurdo Antarctica/South_Pole
++
++# Yemen
++# Milne says 2:59:54 was the meridian of the saluting battery at Aden,
++# and that Yemen was at 1:55:56, the meridian of the Hagia Sophia.
++Zone	Asia/Aden	2:59:54	-	LMT	1950
++			3:00	-	AST
++
++# Bahrain
++Zone	Asia/Bahrain	3:22:20 -	LMT	1920     # Manamah
++			4:00	-	GST	1972 Jun
++			3:00	-	AST
++
++# India
++#
++# From Paul Eggert (2014-09-06):
++# The 1876 Report of the Secretary of the [US] Navy, p 305 says that Madras
++# civil time was 5:20:57.3.
++#
++# From Paul Eggert (2014-08-21):
++# In tomorrow's The Hindu, Nitya Menon reports that India had two civil time
++# zones starting in 1884, one in Bombay and one in Calcutta, and that railways
++# used a third time zone based on Madras time (80 deg. 18'30" E).  Also,
++# in 1881 Bombay briefly switched to Madras time, but switched back.  See:
++# http://www.thehindu.com/news/cities/chennai/madras-375-when-madras-clocked-the-time/article6339393.ece
++#Zone	  Asia/Chennai  [not enough info to complete]
++
++# China
++# Long-shu Time (probably due to Long and Shu being two names of that area)
++# Guangxi, Guizhou, Hainan, Ningxia, Sichuan, Shaanxi, and Yunnan;
++# most of Gansu; west Inner Mongolia; west Qinghai; and the Guangdong
++# counties Deqing, Enping, Kaiping, Luoding, Taishan, Xinxing,
++# Yangchun, Yangjiang, Yu'nan, and Yunfu.
++Zone	Asia/Chongqing	7:06:20	-	LMT	1928     # or Chungking
++			7:00	-	LONT	1980 May # Long-shu Time
++			8:00	PRC	C%sT
++Link Asia/Chongqing Asia/Chungking
++
++# Vietnam
++# From Paul Eggert (2014-10-13):
++# See Asia/Ho_Chi_Minh for the source for this data.
++# Trần's book says the 1954-55 transition to 07:00 in Hanoi was in
++# October 1954, with exact date and time unspecified.
++Zone	Asia/Hanoi	7:03:24 -	LMT	1906 Jul  1
++			7:06:30	-	PLMT	1911 May  1
++			7:00	-	ICT	1942 Dec 31 23:00
++			8:00	-	IDT	1945 Mar 14 23:00
++			9:00	-	JST	1945 Sep  2
++			7:00	-	ICT	1947 Apr  1
++			8:00	-	IDT	1954 Oct
++			7:00	-	ICT
++
++# China
++# Changbai Time ("Long-white Time", Long-white = Heilongjiang area)
++# Heilongjiang (except Mohe county), Jilin
++Zone	Asia/Harbin	8:26:44	-	LMT	1928     # or Haerbin
++			8:30	-	CHAT	1932 Mar # Changbai Time
++			8:00	-	CST	1940
++			9:00	-	CHAT	1966 May
++			8:30	-	CHAT	1980 May
++			8:00	PRC	C%sT
++
++# far west China
++Zone	Asia/Kashgar	5:03:56	-	LMT	1928     # or Kashi or Kaxgar
++			5:30	-	KAST	1940     # Kashgar Time
++			5:00	-	KAST	1980 May
++			8:00	PRC	C%sT
++
++# Kuwait
++Zone	Asia/Kuwait	3:11:56 -	LMT	1950
++			3:00	-	AST
++
++
++# Oman
++# Milne says 3:54:24 was the meridian of the Muscat Tidal Observatory.
++Zone	Asia/Muscat	3:54:24 -	LMT	1920
++			4:00	-	GST
++
++# India
++# From Paul Eggert (2014-08-11), after a heads-up from Stephen Colebourne:
++# According to a Portuguese decree (1911-05-26)
++# http://dre.pt/pdf1sdip/1911/05/12500/23132313.pdf
++# Portuguese India switched to UT +05 on 1912-01-01.
++#Zone	Asia/Panaji	[not enough info to complete]
++
++# Cambodia
++# From Paul Eggert (2014-10-11):
++# See Asia/Ho_Chi_Minh for the source for most of this data.  Also, guess
++# (1) Cambodia reverted to UT +07 on 1945-09-02, when Vietnam did, and
++# (2) they also reverted to +07 on 1953-11-09, the date of independence.
++# These guesses are probably wrong but they're better than guessing no
++# transitions there.
++Zone	Asia/Phnom_Penh	6:59:40 -	LMT	1906 Jul  1
++			7:06:30	-	PLMT	1911 May  1
++			7:00	-	ICT	1942 Dec 31 23:00
++			8:00	-	IDT	1945 Mar 14 23:00
++			9:00	-	JST	1945 Sep  2
++			7:00	-	ICT	1947 Apr  1
++			8:00	-	IDT	1953 Nov  9
++			7:00	-	ICT
++
++# Israel
++Zone	Asia/Tel_Aviv	2:19:04 -	LMT	1880
++			2:21	-	JMT	1918
++			2:00	Zion	I%sT
++
++# Laos
++# From Paul Eggert (2014-10-11):
++# See Asia/Ho_Chi_Minh for the source for most of this data.
++# Trần's book says that Laos reverted to UT +07 on 1955-04-15.
++# Also, guess that Laos reverted to +07 on 1945-09-02, when Vietnam did;
++# this is probably wrong but it's better than guessing no transition.
++Zone	Asia/Vientiane	6:50:24 -	LMT	1906 Jul  1
++			7:06:30	-	PLMT	1911 May  1
++			7:00	-	ICT	1942 Dec 31 23:00
++			8:00	-	IDT	1945 Mar 14 23:00
++			9:00	-	JST	1945 Sep  2
++			7:00	-	ICT	1947 Apr  1
++			8:00	-	IDT	1955 Apr 15
++			7:00	-	ICT
++
++# Jan Mayen
++# From Whitman:
++Zone Atlantic/Jan_Mayen	-1:00	-	EGT
++
++# St Helena
++Zone Atlantic/St_Helena	-0:22:48 -	LMT	1890 # Jamestown
++			-0:22:48 -	JMT	1951 # Jamestown Mean Time
++			 0:00	-	GMT
++
++# Northern Ireland
++Zone	Europe/Belfast	-0:23:40 -	LMT	1880 Aug  2
++			-0:25:21 -	DMT	1916 May 21  2:00
++						# DMT = Dublin/Dunsink MT
++			-0:25:21 1:00	IST	1916 Oct  1  2:00s
++						# IST = Irish Summer Time
++			 0:00	GB-Eire	%s	1968 Oct 27
++			 1:00	-	BST	1971 Oct 31  2:00u
++			 0:00	GB-Eire	%s	1996
++			 0:00	EU	GMT/BST
++
++# Guernsey
++# Data from Joseph S. Myers
++# http://mm.icann.org/pipermail/tz/2013-September/019883.html
++# References to be added
++# LMT Location - 49.27N -2.33E - St.Peter Port
++Zone	Europe/Guernsey	-0:09:19 -	LMT	1913 Jun 18
++			 0:00	GB-Eire	%s	1940 Jul  2
++			 1:00	C-Eur	CE%sT	1945 May  8
++			 0:00	GB-Eire	%s	1968 Oct 27
++			 1:00	-	BST	1971 Oct 31  2:00u
++			 0:00	GB-Eire	%s	1996
++			 0:00	EU	GMT/BST
++
++# Isle of Man
++#
++# From Lester Caine (2013-09-04):
++# The Isle of Man legislation is now on-line at
++# <http://www.legislation.gov.im>, starting with the original Statutory
++# Time Act in 1883 and including additional confirmation of some of
++# the dates of the 'Summer Time' orders originating at
++# Westminster.  There is a little uncertainty as to the starting date
++# of the first summer time in 1916 which may have be announced a
++# couple of days late.  There is still a substantial number of
++# documents to work through, but it is thought that every GB change
++# was also implemented on the island.
++#
++# AT4 of 1883 - The Statutory Time et cetera Act 1883 -
++# LMT Location - 54.1508N -4.4814E - Tynwald Hill ( Manx parliament )
++Zone Europe/Isle_of_Man	-0:17:55 -	LMT	1883 Mar 30  0:00s
++			 0:00	GB-Eire	%s	1968 Oct 27
++			 1:00	-	BST	1971 Oct 31  2:00u
++			 0:00	GB-Eire	%s	1996
++			 0:00	EU	GMT/BST
++
++# Jersey
++# Data from Joseph S. Myers
++# http://mm.icann.org/pipermail/tz/2013-September/019883.html
++# References to be added
++# LMT Location - 49.187N -2.107E - St. Helier
++Zone	Europe/Jersey	-0:08:25 -	LMT	1898 Jun 11 16:00u
++			 0:00	GB-Eire	%s	1940 Jul  2
++			 1:00	C-Eur	CE%sT	1945 May  8
++			 0:00	GB-Eire	%s	1968 Oct 27
++			 1:00	-	BST	1971 Oct 31  2:00u
++			 0:00	GB-Eire	%s	1996
++			 0:00	EU	GMT/BST
++
++# Slovenia
++Zone Europe/Ljubljana	0:58:04	-	LMT	1884
++			1:00	-	CET	1941 Apr 18 23:00
++			1:00	C-Eur	CE%sT	1945 May  8  2:00s
++			1:00	1:00	CEST	1945 Sep 16  2:00s
++			1:00	-	CET	1982 Nov 27
++			1:00	EU	CE%sT
++
++# Bosnia and Herzegovina
++Zone	Europe/Sarajevo	1:13:40	-	LMT	1884
++			1:00	-	CET	1941 Apr 18 23:00
++			1:00	C-Eur	CE%sT	1945 May  8  2:00s
++			1:00	1:00	CEST	1945 Sep 16  2:00s
++			1:00	-	CET	1982 Nov 27
++			1:00	EU	CE%sT
++
++# Macedonia
++Zone	Europe/Skopje	1:25:44	-	LMT	1884
++			1:00	-	CET	1941 Apr 18 23:00
++			1:00	C-Eur	CE%sT	1945 May  8  2:00s
++			1:00	1:00	CEST	1945 Sep 16  2:00s
++			1:00	-	CET	1982 Nov 27
++			1:00	EU	CE%sT
++
++# Moldova / Transnistria
++Zone	Europe/Tiraspol	1:58:32	-	LMT	1880
++			1:55	-	CMT	1918 Feb 15 # Chisinau MT
++			1:44:24	-	BMT	1931 Jul 24 # Bucharest MT
++			2:00	Romania	EE%sT	1940 Aug 15
++			2:00	1:00	EEST	1941 Jul 17
++			1:00	C-Eur	CE%sT	1944 Aug 24
++			3:00	Russia	MSK/MSD	1991 Mar 31  2:00
++			2:00	Russia	EE%sT	1992 Jan 19  2:00
++			3:00	Russia	MSK/MSD
++
++# Liechtenstein
++Zone	Europe/Vaduz	0:38:04 -	LMT	1894 Jun
++			1:00	-	CET	1981
++			1:00	EU	CE%sT
++
++# Croatia
++Zone	Europe/Zagreb	1:03:52	-	LMT	1884
++			1:00	-	CET	1941 Apr 18 23:00
++			1:00	C-Eur	CE%sT	1945 May  8  2:00s
++			1:00	1:00	CEST	1945 Sep 16  2:00s
++			1:00	-	CET	1982 Nov 27
++			1:00	EU	CE%sT
++
++# Madagascar
++Zone Indian/Antananarivo 3:10:04 -	LMT	1911 Jul
++			3:00	-	EAT	1954 Feb 27 23:00s
++			3:00	1:00	EAST	1954 May 29 23:00s
++			3:00	-	EAT
++
++# Comoros
++Zone	Indian/Comoro	2:53:04 -	LMT	1911 Jul # Moroni, Gran Comoro
++			3:00	-	EAT
++
++# Mayotte
++Zone	Indian/Mayotte	3:00:56 -	LMT	1911 Jul # Mamoutzou
++			3:00	-	EAT
++
++# US minor outlying islands
++Zone Pacific/Johnston	-10:00	-	HST
++
++# US minor outlying islands
++#
++# From Mark Brader (2005-01-23):
++# [Fallacies and Fantasies of Air Transport History, by R.E.G. Davies,
++# published 1994 by Paladwr Press, McLean, VA, USA; ISBN 0-9626483-5-3]
++# reproduced a Pan American Airways timetable from 1936, for their weekly
++# "Orient Express" flights between San Francisco and Manila, and connecting
++# flights to Chicago and the US East Coast.  As it uses some time zone
++# designations that I've never seen before:....
++# Fri. 6:30A Lv. HONOLOLU (Pearl Harbor), H.I.   H.L.T. Ar. 5:30P Sun.
++#  "   3:00P Ar. MIDWAY ISLAND . . . . . . . . . M.L.T. Lv. 6:00A  "
++#
++Zone Pacific/Midway	-11:49:28 -	LMT	1901
++			-11:00	-	NST	1956 Jun  3
++			-11:00	1:00	NDT	1956 Sep  2
++			-11:00	-	NST	1967 Apr    # N=Nome
++			-11:00	-	BST	1983 Nov 30 # B=Bering
++			-11:00	-	SST	            # S=Samoa
++
++# N Mariana Is
++Zone Pacific/Saipan	-14:17:00 -	LMT	1844 Dec 31
++			 9:43:00 -	LMT	1901
++			 9:00	-	MPT	1969 Oct    # N Mariana Is Time
++			10:00	-	MPT	2000 Dec 23
++			10:00	-	ChST	# Chamorro Standard Time
+--- contrib/tzdata/checklinks.awk.orig
++++ contrib/tzdata/checklinks.awk
+@@ -0,0 +1,48 @@
++# Check links in tz tables.
++
++# Contributed by Paul Eggert.  This file is in the public domain.
++
++BEGIN {
++    # Special marker indicating that the name is defined as a Zone.
++    # It is a newline so that it cannot match a valid name.
++    # It is not null so that its slot does not appear unset.
++    Zone = "\n"
++}
++
++/^Zone/ {
++    if (defined[$2]) {
++	if (defined[$2] == Zone) {
++	    printf "%s: Zone has duplicate definition\n", $2
++	} else {
++	    printf "%s: Link with same name as Zone\n", $2
++	}
++	status = 1
++    }
++    defined[$2] = Zone
++}
++
++/^Link/ {
++    if (defined[$3]) {
++	if (defined[$3] == Zone) {
++	    printf "%s: Link with same name as Zone\n", $3
++	} else if (defined[$3] == $2) {
++	    printf "%s: Link has duplicate definition\n", $3
++	} else {
++	    printf "%s: Link to both %s and %s\n", $3, defined[$3], $2
++	}
++	status = 1
++    }
++    used[$2] = 1
++    defined[$3] = $2
++}
++
++END {
++    for (tz in used) {
++	if (defined[tz] != Zone) {
++	    printf "%s: Link to non-zone\n", tz
++	    status = 1
++	}
++    }
++
++    exit status
++}
++native
+\ No newline at end of property
++FreeBSD=%H
+\ No newline at end of property
++text/plain
+\ No newline at end of property
+--- contrib/tzdata/checktab.awk.orig
++++ contrib/tzdata/checktab.awk
+@@ -0,0 +1,177 @@
++# Check tz tables for consistency.
++
++# Contributed by Paul Eggert.  This file is in the public domain.
++
++BEGIN {
++	FS = "\t"
++
++	if (!iso_table) iso_table = "iso3166.tab"
++	if (!zone_table) zone_table = "zone1970.tab"
++	if (!want_warnings) want_warnings = -1
++
++	while (getline <iso_table) {
++		iso_NR++
++		if ($0 ~ /^#/) continue
++		if (NF != 2) {
++			printf "%s:%d: wrong number of columns\n", \
++				iso_table, iso_NR >>"/dev/stderr"
++			status = 1
++		}
++		cc = $1
++		name = $2
++		if (cc !~ /^[A-Z][A-Z]$/) {
++			printf "%s:%d: invalid country code '%s'\n", \
++				iso_table, iso_NR, cc >>"/dev/stderr"
++			status = 1
++		}
++		if (cc <= cc0) {
++			if (cc == cc0) {
++				s = "duplicate";
++			} else {
++				s = "out of order";
++			}
++
++			printf "%s:%d: country code '%s' is %s\n", \
++				iso_table, iso_NR, cc, s \
++				>>"/dev/stderr"
++			status = 1
++		}
++		cc0 = cc
++		if (name2cc[name]) {
++			printf "%s:%d: '%s' and '%s' have the same name\n", \
++				iso_table, iso_NR, name2cc[name], cc \
++				>>"/dev/stderr"
++			status = 1
++		}
++		name2cc[name] = cc
++		cc2name[cc] = name
++		cc2NR[cc] = iso_NR
++	}
++
++	cc0 = ""
++
++	while (getline <zone_table) {
++		zone_NR++
++		if ($0 ~ /^#/) continue
++		if (NF != 3 && NF != 4) {
++			printf "%s:%d: wrong number of columns\n", \
++				zone_table, zone_NR >>"/dev/stderr"
++			status = 1
++		}
++		split($1, cca, /,/)
++		cc = cca[1]
++		coordinates = $2
++		tz = $3
++		comments = $4
++		if (cc < cc0) {
++			printf "%s:%d: country code '%s' is out of order\n", \
++				zone_table, zone_NR, cc >>"/dev/stderr"
++			status = 1
++		}
++		cc0 = cc
++		tztab[tz] = 1
++		tz2comments[tz] = comments
++		tz2NR[tz] = zone_NR
++		for (i in cca) {
++		    cc = cca[i]
++		    cctz = cc tz
++		    cctztab[cctz] = 1
++		    if (cc2name[cc]) {
++			cc_used[cc]++
++		    } else {
++			printf "%s:%d: %s: unknown country code\n", \
++				zone_table, zone_NR, cc >>"/dev/stderr"
++			status = 1
++		    }
++		}
++		if (coordinates !~ /^[-+][0-9][0-9][0-5][0-9][-+][01][0-9][0-9][0-5][0-9]$/ \
++		    && coordinates !~ /^[-+][0-9][0-9][0-5][0-9][0-5][0-9][-+][01][0-9][0-9][0-5][0-9][0-5][0-9]$/) {
++			printf "%s:%d: %s: invalid coordinates\n", \
++				zone_table, zone_NR, coordinates >>"/dev/stderr"
++			status = 1
++		}
++	}
++
++	for (cctz in cctztab) {
++		cc = substr (cctz, 1, 2)
++		tz = substr (cctz, 3)
++		if (1 < cc_used[cc]) {
++			comments_needed[tz] = cc
++		}
++	}
++	for (cctz in cctztab) {
++	  cc = substr (cctz, 1, 2)
++	  tz = substr (cctz, 3)
++	  if (!comments_needed[tz] && tz2comments[tz]) {
++	    printf "%s:%d: unnecessary comment '%s'\n", \
++		zone_table, tz2NR[tz], tz2comments[tz] \
++		>>"/dev/stderr"
++	    tz2comments[tz] = 0
++	    status = 1
++	  } else if (comments_needed[tz] && !tz2comments[tz]) {
++	    printf "%s:%d: missing comment for %s\n", \
++	      zone_table, tz2NR[tz], comments_needed[tz] \
++	      >>"/dev/stderr"
++	    tz2comments[tz] = 1
++	    status = 1
++	  }
++	}
++	FS = " "
++}
++
++$1 ~ /^#/ { next }
++
++{
++	tz = rules = ""
++	if ($1 == "Zone") {
++		tz = $2
++		ruleUsed[$4] = 1
++	} else if ($1 == "Link" && zone_table == "zone.tab") {
++		# Ignore Link commands if source and destination basenames
++		# are identical, e.g. Europe/Istanbul versus Asia/Istanbul.
++		src = $2
++		dst = $3
++		while ((i = index(src, "/"))) src = substr(src, i+1)
++		while ((i = index(dst, "/"))) dst = substr(dst, i+1)
++		if (src != dst) tz = $3
++	} else if ($1 == "Rule") {
++		ruleDefined[$2] = 1
++	} else {
++		ruleUsed[$2] = 1
++	}
++	if (tz && tz ~ /\//) {
++		if (!tztab[tz]) {
++			printf "%s: no data for '%s'\n", zone_table, tz \
++				>>"/dev/stderr"
++			status = 1
++		}
++		zoneSeen[tz] = 1
++	}
++}
++
++END {
++	for (tz in ruleDefined) {
++		if (!ruleUsed[tz]) {
++			printf "%s: Rule never used\n", tz
++			status = 1
++		}
++	}
++	for (tz in tztab) {
++		if (!zoneSeen[tz]) {
++			printf "%s:%d: no Zone table for '%s'\n", \
++				zone_table, tz2NR[tz], tz >>"/dev/stderr"
++			status = 1
++		}
++	}
++	if (0 < want_warnings) {
++		for (cc in cc2name) {
++			if (!cc_used[cc]) {
++				printf "%s:%d: warning: " \
++					"no Zone entries for %s (%s)\n", \
++					iso_table, cc2NR[cc], cc, cc2name[cc]
++			}
++		}
++	}
++
++	exit status
++}
++native
+\ No newline at end of property
++FreeBSD=%H
+\ No newline at end of property
++text/plain
+\ No newline at end of property
+--- contrib/tzdata/etcetera.orig
++++ contrib/tzdata/etcetera
+@@ -8,6 +8,13 @@
+ # need now for the entries that are not on UTC are for ships at sea
+ # that cannot use POSIX TZ settings.
+ 
++# Starting with POSIX 1003.1-2001, the entries below are all
++# unnecessary as settings for the TZ environment variable.  E.g.,
++# instead of TZ='Etc/GMT+4' one can use the POSIX setting TZ='<-04>+4'.
++#
++# Do not use a POSIX TZ setting like TZ='GMT+4', which is four hours
++# behind GMT but uses the completely misleading abbreviation "GMT".
++
+ Zone	Etc/GMT		0	-	GMT
+ Zone	Etc/UTC		0	-	UTC
+ Zone	Etc/UCT		0	-	UCT
+@@ -26,23 +33,13 @@
+ Link	Etc/GMT				Etc/GMT+0
+ Link	Etc/GMT				Etc/GMT0
+ 
+-# We use POSIX-style signs in the Zone names and the output abbreviations,
++# Be consistent with POSIX TZ settings in the Zone names,
+ # even though this is the opposite of what many people expect.
+ # POSIX has positive signs west of Greenwich, but many people expect
+ # positive signs east of Greenwich.  For example, TZ='Etc/GMT+4' uses
+-# the abbreviation "GMT+4" and corresponds to 4 hours behind UT
++# the abbreviation "-04" and corresponds to 4 hours behind UT
+ # (i.e. west of Greenwich) even though many people would expect it to
+ # mean 4 hours ahead of UT (i.e. east of Greenwich).
+-#
+-# In the draft 5 of POSIX 1003.1-200x, the angle bracket notation allows for
+-# TZ='<GMT-4>+4'; if you want time zone abbreviations conforming to
+-# ISO 8601 you can use TZ='<-0400>+4'.  Thus the commonly-expected
+-# offset is kept within the angle bracket (and is used for display)
+-# while the POSIX sign is kept outside the angle bracket (and is used
+-# for calculation).
+-#
+-# Do not use a TZ setting like TZ='GMT+4', which is four hours behind
+-# GMT but uses the completely misleading abbreviation "GMT".
+ 
+ # Earlier incarnations of this package were not POSIX-compliant,
+ # and had lines such as
+@@ -51,30 +48,31 @@
+ # way does a
+ #		zic -l GMT-12
+ # so we moved the names into the Etc subdirectory.
++# Also, the time zone abbreviations are now compatible with %z.
+ 
+-Zone	Etc/GMT-14	14	-	GMT-14	# 14 hours ahead of GMT
+-Zone	Etc/GMT-13	13	-	GMT-13
+-Zone	Etc/GMT-12	12	-	GMT-12
+-Zone	Etc/GMT-11	11	-	GMT-11
+-Zone	Etc/GMT-10	10	-	GMT-10
+-Zone	Etc/GMT-9	9	-	GMT-9
+-Zone	Etc/GMT-8	8	-	GMT-8
+-Zone	Etc/GMT-7	7	-	GMT-7
+-Zone	Etc/GMT-6	6	-	GMT-6
+-Zone	Etc/GMT-5	5	-	GMT-5
+-Zone	Etc/GMT-4	4	-	GMT-4
+-Zone	Etc/GMT-3	3	-	GMT-3
+-Zone	Etc/GMT-2	2	-	GMT-2
+-Zone	Etc/GMT-1	1	-	GMT-1
+-Zone	Etc/GMT+1	-1	-	GMT+1
+-Zone	Etc/GMT+2	-2	-	GMT+2
+-Zone	Etc/GMT+3	-3	-	GMT+3
+-Zone	Etc/GMT+4	-4	-	GMT+4
+-Zone	Etc/GMT+5	-5	-	GMT+5
+-Zone	Etc/GMT+6	-6	-	GMT+6
+-Zone	Etc/GMT+7	-7	-	GMT+7
+-Zone	Etc/GMT+8	-8	-	GMT+8
+-Zone	Etc/GMT+9	-9	-	GMT+9
+-Zone	Etc/GMT+10	-10	-	GMT+10
+-Zone	Etc/GMT+11	-11	-	GMT+11
+-Zone	Etc/GMT+12	-12	-	GMT+12
++Zone	Etc/GMT-14	14	-	+14
++Zone	Etc/GMT-13	13	-	+13
++Zone	Etc/GMT-12	12	-	+12
++Zone	Etc/GMT-11	11	-	+11
++Zone	Etc/GMT-10	10	-	+10
++Zone	Etc/GMT-9	9	-	+09
++Zone	Etc/GMT-8	8	-	+08
++Zone	Etc/GMT-7	7	-	+07
++Zone	Etc/GMT-6	6	-	+06
++Zone	Etc/GMT-5	5	-	+05
++Zone	Etc/GMT-4	4	-	+04
++Zone	Etc/GMT-3	3	-	+03
++Zone	Etc/GMT-2	2	-	+02
++Zone	Etc/GMT-1	1	-	+01
++Zone	Etc/GMT+1	-1	-	-01
++Zone	Etc/GMT+2	-2	-	-02
++Zone	Etc/GMT+3	-3	-	-03
++Zone	Etc/GMT+4	-4	-	-04
++Zone	Etc/GMT+5	-5	-	-05
++Zone	Etc/GMT+6	-6	-	-06
++Zone	Etc/GMT+7	-7	-	-07
++Zone	Etc/GMT+8	-8	-	-08
++Zone	Etc/GMT+9	-9	-	-09
++Zone	Etc/GMT+10	-10	-	-10
++Zone	Etc/GMT+11	-11	-	-11
++Zone	Etc/GMT+12	-12	-	-12
+--- contrib/tzdata/europe.orig
++++ contrib/tzdata/europe
+@@ -1,20 +1,24 @@
+ # This file is in the public domain, so clarified as of
+ # 2009-05-17 by Arthur David Olson.
+ 
+-# This data is by no means authoritative; if you think you know better,
++# This file is by no means authoritative; if you think you know better,
+ # go ahead and edit the file (and please send any changes to
+-# tz@iana.org for general use in the future).
++# tz@iana.org for general use in the future).  For more, please see
++# the file CONTRIBUTING in the tz distribution.
+ 
+-# From Paul Eggert (2014-05-31):
+-# A good source for time zone historical data outside the U.S. is
++# From Paul Eggert (2014-10-31):
++#
++# Unless otherwise specified, the source for data through 1990 is:
+ # Thomas G. Shanks and Rique Pottenger, The International Atlas (6th edition),
+ # San Diego: ACS Publications, Inc. (2003).
++# Unfortunately this book contains many errors and cites no sources.
+ #
+ # Gwillim Law writes that a good source
+ # for recent time zone data is the International Air Transport
+ # Association's Standard Schedules Information Manual (IATA SSIM),
+ # published semiannually.  Law sent in several helpful summaries
+-# of the IATA's data after 1990.
++# of the IATA's data after 1990.  Except where otherwise noted,
++# IATA SSIM is the source for entries after 1990.
+ #
+ # A reliable and entertaining source about time zones is
+ # Derek Howse, Greenwich time and longitude, Philip Wilson Publishers (1997).
+@@ -38,6 +42,16 @@
+ #	may be sent to Mr. John Milne, Royal Geographical Society,
+ #	Savile Row, London."  Nowadays please email them to tz@iana.org.
+ #
++#	Byalokoz EL. New Counting of Time in Russia since July 1, 1919.
++#	This Russian-language source was consulted by Vladimir Karpinsky; see
++#	http://mm.icann.org/pipermail/tz/2014-August/021320.html
++#	The full Russian citation is:
++#	Бялокоз, Евгений Людвигович. Новый счет времени в течении суток
++#	введенный декретом Совета народных комиссаров для всей России с 1-го
++#	июля 1919 г. / Изд. 2-е Междуведомственной комиссии. - Петроград:
++#	Десятая гос. тип., 1919.
++#	http://resolver.gpntb.ru/purl?docushare/dsweb/Get/Resource-2011/Byalokoz__E.L.__Novyy__schet__vremeni__v__techenie__sutok__izd__2(1).pdf
++#
+ #	Brazil's Divisão Serviço da Hora (DSHO),
+ #	History of Summer Time
+ #	<http://pcdsh01.on.br/HISTHV.htm>
+@@ -57,11 +71,11 @@
+ #        0:00       WET WEST WEMT Western Europe
+ #        0:19:32.13 AMT NST       Amsterdam, Netherlands Summer (1835-1937)*
+ #        0:20       NET NEST      Netherlands (1937-1940)*
++#        1:00       BST           British Standard (1968-1971)
+ #        1:00       CET CEST CEMT Central Europe
+ #        1:00:14    SET           Swedish (1879-1899)*
+ #        2:00       EET EEST      Eastern Europe
+-#        3:00       FET           Further-eastern Europe*
+-#        3:00       MSK MSD  MSM* Moscow
++#        3:00       MSK MSD       Moscow
+ 
+ # From Peter Ilieve (1994-12-04),
+ # The original six [EU members]: Belgium, France, (West) Germany, Italy,
+@@ -174,14 +188,18 @@
+ # between 160 and 170 hours more daylight leisure, to a war which
+ # plunged Europe into darkness for four years, and shook the
+ # foundations of civilization throughout the world.
+-#	<http://www.winstonchurchill.org/images/finesthour/Vol.01%20No.114.pdf>
+-#	"A Silent Toast to William Willett", Pictorial Weekly
++#	-- "A Silent Toast to William Willett", Pictorial Weekly;
++#	republished in Finest Hour (Spring 2002) 1(114):26
++#	http://www.winstonchurchill.org/images/finesthour/Vol.01%20No.114.pdf
+ 
+-# From Paul Eggert (1996-09-03):
++# From Paul Eggert (2015-08-08):
+ # The OED Supplement says that the English originally said "Daylight Saving"
+ # when they were debating the adoption of DST in 1908; but by 1916 this
+ # term appears only in quotes taken from DST's opponents, whereas the
+ # proponents (who eventually won the argument) are quoted as using "Summer".
++# The term "Summer Time" was introduced by Herbert Samuel, Home Secretary; see:
++# Viscount Samuel. Leisure in a Democracy. Cambridge University Press
++# ISBN 978-1-107-49471-8 (1949, reissued 2015), p 8.
+ 
+ # From Arthur David Olson (1989-01-19):
+ # A source at the British Information Office in New York avers that it's
+@@ -210,8 +228,8 @@
+ # official designation; the reply of the 21st was that there wasn't
+ # but he couldn't think of anything better than the "Double British
+ # Summer Time" that the BBC had been using informally.
+-# http://student.cusu.cam.ac.uk/~jsm28/british-time/bbc-19410418.png
+-# http://student.cusu.cam.ac.uk/~jsm28/british-time/ho-19410421.png
++# http://www.polyomino.org.uk/british-time/bbc-19410418.png
++# http://www.polyomino.org.uk/british-time/ho-19410421.png
+ 
+ # From Sir Alexander Maxwell in the above-mentioned letter (1941-04-21):
+ # [N]o official designation has as far as I know been adopted for the time
+@@ -228,15 +246,13 @@
+ # the history of summer time legislation in the United Kingdom.
+ # Since 1998 Joseph S. Myers has been updating
+ # and extending this list, which can be found in
+-# http://student.cusu.cam.ac.uk/~jsm28/british-time/
+-# History of legal time in Britain
+ # http://www.polyomino.org.uk/british-time/
+ 
+ # From Joseph S. Myers (1998-01-06):
+ #
+ # The legal time in the UK outside of summer time is definitely GMT, not UTC;
+ # see Lord Tanlaw's speech
+-# <http://www.parliament.the-stationery-office.co.uk/pa/ld199697/ldhansrd/pdvn/lds97/text/70611-20.htm#70611-20_head0>
++# http://www.publications.parliament.uk/pa/ld199798/ldhansrd/vo970611/text/70611-10.htm#70611-10_head0
+ # (Lords Hansard 11 June 1997 columns 964 to 976).
+ 
+ # From Paul Eggert (2006-03-22):
+@@ -276,6 +292,14 @@
+ #   "Timeball on the ballast office is down.  Dunsink time."
+ #   -- James Joyce, Ulysses
+ 
++# "Countess Markievicz ... claimed that the [1916] abolition of Dublin Mean Time
++# was among various actions undertaken by the 'English' government that
++# would 'put the whole country into the SF (Sinn Féin) camp'.  She claimed
++# Irish 'public feeling (was) outraged by forcing of English time on us'."
++# -- Parsons M. Dublin lost its time zone - and 25 minutes - after 1916 Rising.
++# Irish Times 2014-10-27.
++# http://www.irishtimes.com/news/politics/dublin-lost-its-time-zone-and-25-minutes-after-1916-rising-1.1977411
++
+ # From Joseph S. Myers (2005-01-26):
+ # Irish laws are available online at <http://www.irishstatutebook.ie>.
+ # These include various relating to legal time, for example:
+@@ -321,7 +345,7 @@
+ 
+ # From an anonymous contributor (1996-06-02):
+ # The law governing time in Ireland is under Statutory Instrument SI 395/94,
+-# which gives force to European Union 7th Council Directive # 94/21/EC.
++# which gives force to European Union 7th Council Directive No. 94/21/EC.
+ # Under this directive, the Minister for Justice in Ireland makes appropriate
+ # regulations. I spoke this morning with the Secretary of the Department of
+ # Justice (tel +353 1 678 9711) who confirmed to me that the correct name is
+@@ -440,25 +464,27 @@
+ # Use Europe/London for Jersey, Guernsey, and the Isle of Man.
+ 
+ # Zone	NAME		GMTOFF	RULES	FORMAT	[UNTIL]
+-Zone	Europe/London	-0:01:15 -	LMT	1847 Dec  1 0:00s
++Zone	Europe/London	-0:01:15 -	LMT	1847 Dec  1  0:00s
+ 			 0:00	GB-Eire	%s	1968 Oct 27
+-			 1:00	-	BST	1971 Oct 31 2:00u
++			 1:00	-	BST	1971 Oct 31  2:00u
+ 			 0:00	GB-Eire	%s	1996
+ 			 0:00	EU	GMT/BST
+ Link	Europe/London	Europe/Jersey
+ Link	Europe/London	Europe/Guernsey
+ Link	Europe/London	Europe/Isle_of_Man
++
++# Zone	NAME		GMTOFF	RULES	FORMAT	[UNTIL]
+ Zone	Europe/Dublin	-0:25:00 -	LMT	1880 Aug  2
+-			-0:25:21 -	DMT	1916 May 21 2:00
+-			-0:25:21 1:00	IST	1916 Oct  1 2:00s
++			-0:25:21 -	DMT	1916 May 21  2:00
++			-0:25:21 1:00	IST	1916 Oct  1  2:00s
+ 			 0:00	GB-Eire	%s	1921 Dec  6 # independence
+-			 0:00	GB-Eire	GMT/IST	1940 Feb 25 2:00
+-			 0:00	1:00	IST	1946 Oct  6 2:00
+-			 0:00	-	GMT	1947 Mar 16 2:00
+-			 0:00	1:00	IST	1947 Nov  2 2:00
+-			 0:00	-	GMT	1948 Apr 18 2:00
++			 0:00	GB-Eire	GMT/IST	1940 Feb 25  2:00
++			 0:00	1:00	IST	1946 Oct  6  2:00
++			 0:00	-	GMT	1947 Mar 16  2:00
++			 0:00	1:00	IST	1947 Nov  2  2:00
++			 0:00	-	GMT	1948 Apr 18  2:00
+ 			 0:00	GB-Eire	GMT/IST	1968 Oct 27
+-			 1:00	-	IST	1971 Oct 31 2:00u
++			 1:00	-	IST	1971 Oct 31  2:00u
+ 			 0:00	GB-Eire	GMT/IST	1996
+ 			 0:00	EU	GMT/IST
+ 
+@@ -479,7 +505,7 @@
+ # The most recent directive covers the years starting in 2002.  See:
+ # Directive 2000/84/EC of the European Parliament and of the Council
+ # of 19 January 2001 on summer-time arrangements.
+-# <http://eur-lex.europa.eu/LexUriServ/LexUriServ.do?uri=CELEX:32000L0084:EN:NOT>
++# http://eur-lex.europa.eu/LexUriServ/LexUriServ.do?uri=CELEX:32000L0084:EN:NOT
+ 
+ # W-Eur differs from EU only in that W-Eur uses standard time.
+ Rule	W-Eur	1977	1980	-	Apr	Sun>=1	 1:00s	1:00	S
+@@ -513,7 +539,7 @@
+ #    0:00 France WE%sT 1945 Sep 16  3:00
+ #
+ # Zone Europe/Monaco 0:29:32 - LMT 1891 Mar 15
+-#    0:00 France WE%sT 1945 Sep 16 3:00
++#    0:00 France WE%sT 1945 Sep 16  3:00
+ #
+ # Zone Europe/Belgrade 1:22:00 - LMT 1884
+ #    1:00 1:00 CEST 1945 Sep 16  2:00s
+@@ -556,31 +582,73 @@
+ Rule	E-Eur	1981	max	-	Mar	lastSun	 0:00	1:00	S
+ Rule	E-Eur	1996	max	-	Oct	lastSun	 0:00	0	-
+ 
++
++# Daylight saving time for Russia and the Soviet Union
++#
++# The 1917-1921 decree URLs are from Alexander Belopolsky (2016-08-23).
++
+ # Rule	NAME	FROM	TO	TYPE	IN	ON	AT	SAVE	LETTER/S
+-Rule	Russia	1917	only	-	Jul	 1	23:00	1:00	MST	# Moscow Summer Time
+-Rule	Russia	1917	only	-	Dec	28	 0:00	0	MMT	# Moscow Mean Time
+-Rule	Russia	1918	only	-	May	31	22:00	2:00	MDST	# Moscow Double Summer Time
++Rule	Russia	1917	only	-	Jul	 1	23:00	1:00	MST  # Moscow Summer Time
++#
++# Decree No. 142 (1917-12-22) http://istmat.info/node/28137
++Rule	Russia	1917	only	-	Dec	28	 0:00	0	MMT  # Moscow Mean Time
++#
++# Decree No. 497 (1918-05-30) http://istmat.info/node/30001
++Rule	Russia	1918	only	-	May	31	22:00	2:00	MDST # Moscow Double Summer Time
+ Rule	Russia	1918	only	-	Sep	16	 1:00	1:00	MST
++#
++# Decree No. 258 (1919-05-29) http://istmat.info/node/37949
+ Rule	Russia	1919	only	-	May	31	23:00	2:00	MDST
+-Rule	Russia	1919	only	-	Jul	 1	 2:00	1:00	MSD
++#
++Rule	Russia	1919	only	-	Jul	 1	 0:00u	1:00	MSD
+ Rule	Russia	1919	only	-	Aug	16	 0:00	0	MSK
++#
++# Decree No. 63 (1921-02-03) http://istmat.info/node/45840
+ Rule	Russia	1921	only	-	Feb	14	23:00	1:00	MSD
+-Rule	Russia	1921	only	-	Mar	20	23:00	2:00	MSM # Midsummer
++#
++# Decree No. 121 (1921-03-07) http://istmat.info/node/45949
++Rule	Russia	1921	only	-	Mar	20	23:00	2:00	+05
++#
+ Rule	Russia	1921	only	-	Sep	 1	 0:00	1:00	MSD
+ Rule	Russia	1921	only	-	Oct	 1	 0:00	0	-
+-# Act No.925 of the Council of Ministers of the USSR (1980-10-24):
++# Act No. 925 of the Council of Ministers of the USSR (1980-10-24):
+ Rule	Russia	1981	1984	-	Apr	 1	 0:00	1:00	S
+ Rule	Russia	1981	1983	-	Oct	 1	 0:00	0	-
+-# Act No.967 of the Council of Ministers of the USSR (1984-09-13), repeated in
+-# Act No.227 of the Council of Ministers of the USSR (1989-03-14):
+-Rule	Russia	1984	1991	-	Sep	lastSun	 2:00s	0	-
+-Rule	Russia	1985	1991	-	Mar	lastSun	 2:00s	1:00	S
+-#
+-Rule	Russia	1992	only	-	Mar	lastSat	 23:00	1:00	S
+-Rule	Russia	1992	only	-	Sep	lastSat	 23:00	0	-
+-Rule	Russia	1993	2010	-	Mar	lastSun	 2:00s	1:00	S
+-Rule	Russia	1993	1995	-	Sep	lastSun	 2:00s	0	-
++# Act No. 967 of the Council of Ministers of the USSR (1984-09-13), repeated in
++# Act No. 227 of the Council of Ministers of the USSR (1989-03-14):
++Rule	Russia	1984	1995	-	Sep	lastSun	 2:00s	0	-
++Rule	Russia	1985	2010	-	Mar	lastSun	 2:00s	1:00	S
++#
+ Rule	Russia	1996	2010	-	Oct	lastSun	 2:00s	0	-
++# As described below, Russia's 2014 change affects Zone data, not Rule data.
++
++# From Stepan Golosunov (2016-03-07):
++# Wikipedia and other sources refer to the Act of the Council of
++# Ministers of the USSR from 1988-01-04 No. 5 and the Act of the
++# Council of Ministers of the USSR from 1989-03-14 No. 227.
++#
++# I did not find full texts of these acts.  For the 1989 one we have
++# title at http://base.garant.ru/70754136/ :
++# "About change in calculation of time on the territories of
++# Lithuanian SSR, Latvian SSR and Estonian SSR, Astrakhan,
++# Kaliningrad, Kirov, Kuybyshev, Ulyanovsk and Uralsk oblasts".
++# And http://astrozet.net/files/Zones/DOC/RU/1980-925.txt appears to
++# contain quotes from both acts: Since last Sunday of March 1988 rules
++# of the second time belt are installed in Volgograd and Saratov
++# oblasts.  Since last Sunday of March 1989:
++# a) Lithuanian SSR, Latvian SSR, Estonian SSR, Kaliningrad oblast:
++# second time belt rules without extra hour (Moscow-1);
++# b) Astrakhan, Kirov, Kuybyshev, Ulyanovsk oblasts: second time belt
++# rules (Moscow time)
++# c) Uralsk oblast: third time belt rules (Moscow+1).
++
++# From Stepan Golosunov (2016-03-27):
++# Unamended version of the act of the
++# Government of the Russian Federation No. 23 from 08.01.1992
++# http://pravo.gov.ru/proxy/ips/?docbody=&nd=102014034&rdk=0
++# says that every year clocks were to be moved forward on last Sunday
++# of March at 2 hours and moved backwards on last Sunday of September
++# at 3 hours.  It was amended in 1996 to replace September with October.
+ 
+ # From Alexander Krivenyshev (2011-06-14):
+ # According to Kremlin press service, Russian President Dmitry Medvedev
+@@ -669,7 +737,7 @@
+ # Zone	NAME		GMTOFF	RULES	FORMAT	[UNTIL]
+ Zone	Europe/Andorra	0:06:04 -	LMT	1901
+ 			0:00	-	WET	1946 Sep 30
+-			1:00	-	CET	1985 Mar 31 2:00
++			1:00	-	CET	1985 Mar 31  2:00
+ 			1:00	EU	CE%sT
+ 
+ # Austria
+@@ -695,14 +763,22 @@
+ # Zone	NAME		GMTOFF	RULES	FORMAT	[UNTIL]
+ Zone	Europe/Vienna	1:05:21 -	LMT	1893 Apr
+ 			1:00	C-Eur	CE%sT	1920
+-			1:00	Austria	CE%sT	1940 Apr  1 2:00s
+-			1:00	C-Eur	CE%sT	1945 Apr  2 2:00s
+-			1:00	1:00	CEST	1945 Apr 12 2:00s
++			1:00	Austria	CE%sT	1940 Apr  1  2:00s
++			1:00	C-Eur	CE%sT	1945 Apr  2  2:00s
++			1:00	1:00	CEST	1945 Apr 12  2:00s
+ 			1:00	-	CET	1946
+ 			1:00	Austria	CE%sT	1981
+ 			1:00	EU	CE%sT
+ 
+ # Belarus
++#
++# From Stepan Golosunov (2016-07-02):
++# http://www.lawbelarus.com/repub/sub30/texf9611.htm
++# (Act of the Cabinet of Ministers of the Republic of Belarus from
++# 1992-03-25 No. 157) ... says clocks were to be moved forward at 2:00
++# on last Sunday of March and backward at 3:00 on last Sunday of September
++# (the same as previous USSR and contemporary Russian regulations).
++#
+ # From Yauhen Kharuzhy (2011-09-16):
+ # By latest Belarus government act Europe/Minsk timezone was changed to
+ # GMT+3 without DST (was GMT+2 with DST).
+@@ -711,19 +787,21 @@
+ # http://www.belta.by/ru/all_news/society/V-Belarusi-otmenjaetsja-perexod-na-sezonnoe-vremja_i_572952.html
+ # http://naviny.by/rubrics/society/2011/09/16/ic_articles_116_175144/
+ # http://news.tut.by/society/250578.html
++#
++# From Alexander Bokovoy (2014-10-09):
++# Belarussian government decided against changing to winter time....
++# http://eng.belta.by/all_news/society/Belarus-decides-against-adjusting-time-in-Russias-wake_i_76335.html
++#
+ # Zone	NAME		GMTOFF	RULES	FORMAT	[UNTIL]
+ Zone	Europe/Minsk	1:50:16 -	LMT	1880
+-			1:50	-	MMT	1924 May 2 # Minsk Mean Time
++			1:50	-	MMT	1924 May  2 # Minsk Mean Time
+ 			2:00	-	EET	1930 Jun 21
+ 			3:00	-	MSK	1941 Jun 28
+ 			1:00	C-Eur	CE%sT	1944 Jul  3
+ 			3:00	Russia	MSK/MSD	1990
+-			3:00	-	MSK	1991 Mar 31 2:00s
+-			2:00	1:00	EEST	1991 Sep 29 2:00s
+-			2:00	-	EET	1992 Mar 29 0:00s
+-			2:00	1:00	EEST	1992 Sep 27 0:00s
+-			2:00	Russia	EE%sT	2011 Mar 27 2:00s
+-			3:00	-	FET
++			3:00	-	MSK	1991 Mar 31  2:00s
++			2:00	Russia	EE%sT	2011 Mar 27  2:00s
++			3:00	-	+03
+ 
+ # Belgium
+ #
+@@ -780,7 +858,7 @@
+ Rule	Belgium	1946	only	-	Oct	 7	 2:00s	0	-
+ # Zone	NAME		GMTOFF	RULES	FORMAT	[UNTIL]
+ Zone	Europe/Brussels	0:17:30 -	LMT	1880
+-			0:17:30	-	BMT	1892 May  1 12:00 # Brussels MT
++			0:17:30	-	BMT	1892 May  1 12:00  # Brussels MT
+ 			0:00	-	WET	1914 Nov  8
+ 			1:00	-	CET	1916 May  1  0:00
+ 			1:00	C-Eur	CE%sT	1918 Nov 11 11:00u
+@@ -795,7 +873,7 @@
+ # Bulgaria
+ #
+ # From Plamen Simenov via Steffen Thorsen (1999-09-09):
+-# A document of Government of Bulgaria (No.94/1997) says:
++# A document of Government of Bulgaria (No. 94/1997) says:
+ # EET -> EETDST is in 03:00 Local time in last Sunday of March ...
+ # EETDST -> EET is in 04:00 Local time in last Sunday of October
+ #
+@@ -810,9 +888,9 @@
+ 			1:56:56	-	IMT	1894 Nov 30 # Istanbul MT?
+ 			2:00	-	EET	1942 Nov  2  3:00
+ 			1:00	C-Eur	CE%sT	1945
+-			1:00	-	CET	1945 Apr 2 3:00
++			1:00	-	CET	1945 Apr  2  3:00
+ 			2:00	-	EET	1979 Mar 31 23:00
+-			2:00	Bulg	EE%sT	1982 Sep 26  2:00
++			2:00	Bulg	EE%sT	1982 Sep 26  3:00
+ 			2:00	C-Eur	EE%sT	1991
+ 			2:00	E-Eur	EE%sT	1997
+ 			2:00	EU	EE%sT
+@@ -834,8 +912,8 @@
+ Rule	Czech	1949	only	-	Apr	 9	2:00s	1:00	S
+ # Zone	NAME		GMTOFF	RULES	FORMAT	[UNTIL]
+ Zone	Europe/Prague	0:57:44 -	LMT	1850
+-			0:57:44	-	PMT	1891 Oct     # Prague Mean Time
+-			1:00	C-Eur	CE%sT	1944 Sep 17 2:00s
++			0:57:44	-	PMT	1891 Oct    # Prague Mean Time
++			1:00	C-Eur	CE%sT	1944 Sep 17  2:00s
+ 			1:00	Czech	CE%sT	1979
+ 			1:00	EU	CE%sT
+ # Use Europe/Prague also for Slovakia.
+@@ -891,11 +969,11 @@
+ # Zone	NAME		GMTOFF	RULES	FORMAT	[UNTIL]
+ Zone Europe/Copenhagen	 0:50:20 -	LMT	1890
+ 			 0:50:20 -	CMT	1894 Jan  1 # Copenhagen MT
+-			 1:00	Denmark	CE%sT	1942 Nov  2 2:00s
+-			 1:00	C-Eur	CE%sT	1945 Apr  2 2:00
++			 1:00	Denmark	CE%sT	1942 Nov  2  2:00s
++			 1:00	C-Eur	CE%sT	1945 Apr  2  2:00
+ 			 1:00	Denmark	CE%sT	1980
+ 			 1:00	EU	CE%sT
+-Zone Atlantic/Faroe	-0:27:04 -	LMT	1908 Jan 11	# Tórshavn
++Zone Atlantic/Faroe	-0:27:04 -	LMT	1908 Jan 11 # Tórshavn
+ 			 0:00	-	WET	1981
+ 			 0:00	EU	WE%sT
+ #
+@@ -969,6 +1047,12 @@
+ # startkart.no says Thule does not observe DST, but this is clearly an error,
+ # so go with Shanks & Pottenger for Thule transitions until this year.
+ # For 2007 on assume Thule will stay in sync with US DST rules.
++
++# From J William Piggott (2016-02-20):
++# "Greenland north of the community of Scoresbysund" is officially named
++# "National Park" by Executive Order:
++# http://naalakkersuisut.gl/~/media/Nanoq/Files/Attached%20Files/Engelske-tekster/Legislation/Executive%20Order%20National%20Park.rtf
++# It is their only National Park.
+ #
+ # Rule	NAME	FROM	TO	TYPE	IN	ON	AT	SAVE	LETTER/S
+ Rule	Thule	1991	1992	-	Mar	lastSun	2:00	1:00	D
+@@ -980,20 +1064,24 @@
+ #
+ # Zone	NAME		GMTOFF	RULES	FORMAT	[UNTIL]
+ Zone America/Danmarkshavn -1:14:40 -	LMT	1916 Jul 28
+-			-3:00	-	WGT	1980 Apr  6 2:00
++			-3:00	-	WGT	1980 Apr  6  2:00
+ 			-3:00	EU	WG%sT	1996
+ 			0:00	-	GMT
+ Zone America/Scoresbysund -1:27:52 -	LMT	1916 Jul 28 # Ittoqqortoormiit
+-			-2:00	-	CGT	1980 Apr  6 2:00
++			-2:00	-	CGT	1980 Apr  6  2:00
+ 			-2:00	C-Eur	CG%sT	1981 Mar 29
+ 			-1:00	EU	EG%sT
+ Zone America/Godthab	-3:26:56 -	LMT	1916 Jul 28 # Nuuk
+-			-3:00	-	WGT	1980 Apr  6 2:00
++			-3:00	-	WGT	1980 Apr  6  2:00
+ 			-3:00	EU	WG%sT
+ Zone America/Thule	-4:35:08 -	LMT	1916 Jul 28 # Pituffik air base
+ 			-4:00	Thule	A%sT
+ 
+ # Estonia
++#
++# From Paul Eggert (2016-03-18):
++# The 1989 transition is from USSR act No. 227 (1989-03-14).
++#
+ # From Peter Ilieve (1994-10-15):
+ # A relative in Tallinn confirms the accuracy of the data for 1989 onwards
+ # [through 1994] and gives the legal authority for it,
+@@ -1011,7 +1099,7 @@
+ 
+ # From Peter Ilieve (1998-11-04), heavily edited:
+ # The 1998-09-22 Estonian time law
+-# <http://trip.rk.ee/cgi-bin/thw?${BASE}=akt&${OOHTML}=rtd&TA=1998&TO=1&AN=1390>
++# http://trip.rk.ee/cgi-bin/thw?${BASE}=akt&${OOHTML}=rtd&TA=1998&TO=1&AN=1390
+ # refers to the Eighth Directive and cites the association agreement between
+ # the EU and Estonia, ratified by the Estonian law (RT II 1995, 22-27, 120).
+ #
+@@ -1029,8 +1117,8 @@
+ # after that.
+ 
+ # From Mart Oruaas (2000-01-29):
+-# Regulation no. 301 (1999-10-12) obsoletes previous regulation
+-# no. 206 (1998-09-22) and thus sticks Estonia to +02:00 GMT for all
++# Regulation No. 301 (1999-10-12) obsoletes previous regulation
++# No. 206 (1998-09-22) and thus sticks Estonia to +02:00 GMT for all
+ # the year round.  The regulation is effective 1999-11-01.
+ 
+ # From Toomas Soome (2002-02-21):
+@@ -1042,16 +1130,16 @@
+ 
+ # Zone	NAME		GMTOFF	RULES	FORMAT	[UNTIL]
+ Zone	Europe/Tallinn	1:39:00	-	LMT	1880
+-			1:39:00	-	TMT	1918 Feb # Tallinn Mean Time
++			1:39:00	-	TMT	1918 Feb    # Tallinn Mean Time
+ 			1:00	C-Eur	CE%sT	1919 Jul
+ 			1:39:00	-	TMT	1921 May
+ 			2:00	-	EET	1940 Aug  6
+ 			3:00	-	MSK	1941 Sep 15
+ 			1:00	C-Eur	CE%sT	1944 Sep 22
+-			3:00	Russia	MSK/MSD	1989 Mar 26 2:00s
+-			2:00	1:00	EEST	1989 Sep 24 2:00s
++			3:00	Russia	MSK/MSD	1989 Mar 26  2:00s
++			2:00	1:00	EEST	1989 Sep 24  2:00s
+ 			2:00	C-Eur	EE%sT	1998 Sep 22
+-			2:00	EU	EE%sT	1999 Nov  1
++			2:00	EU	EE%sT	1999 Oct 31  4:00
+ 			2:00	-	EET	2002 Feb 21
+ 			2:00	EU	EE%sT
+ 
+@@ -1195,7 +1283,7 @@
+ # on PMT-0:09:21 until 1978-08-09, when the time base finally switched to UTC.
+ # Zone	NAME		GMTOFF	RULES	FORMAT	[UNTIL]
+ Zone	Europe/Paris	0:09:21 -	LMT	1891 Mar 15  0:01
+-			0:09:21	-	PMT	1911 Mar 11  0:01  # Paris MT
++			0:09:21	-	PMT	1911 Mar 11  0:01 # Paris MT
+ # Shanks & Pottenger give 1940 Jun 14 0:00; go with Excoffier and Le Corre.
+ 			0:00	France	WE%sT	1940 Jun 14 23:00
+ # Le Corre says Paris stuck with occupied-France time after the liberation;
+@@ -1214,14 +1302,14 @@
+ 
+ # From Jörg Schilling (2002-10-23):
+ # In 1945, Berlin was switched to Moscow Summer time (GMT+4) by
+-# <http://www.dhm.de/lemo/html/biografien/BersarinNikolai/>
++# http://www.dhm.de/lemo/html/biografien/BersarinNikolai/
+ # General [Nikolai] Bersarin.
+ 
+ # From Paul Eggert (2003-03-08):
+ # http://www.parlament-berlin.de/pds-fraktion.nsf/727459127c8b66ee8525662300459099/defc77cb784f180ac1256c2b0030274b/$FILE/bersarint.pdf
+ # says that Bersarin issued an order to use Moscow time on May 20.
+ # However, Moscow did not observe daylight saving in 1945, so
+-# this was equivalent to CEMT (GMT+3), not GMT+4.
++# this was equivalent to UT +03, not +04.
+ 
+ 
+ # Rule	NAME	FROM	TO	TYPE	IN	ON	AT	SAVE	LETTER/S
+@@ -1243,7 +1331,7 @@
+ 
+ # Zone	NAME		GMTOFF	RULES	FORMAT	[UNTIL]
+ Zone	Europe/Berlin	0:53:28 -	LMT	1893 Apr
+-			1:00	C-Eur	CE%sT	1945 May 24 2:00
++			1:00	C-Eur	CE%sT	1945 May 24  2:00
+ 			1:00 SovietZone	CE%sT	1946
+ 			1:00	Germany	CE%sT	1980
+ 			1:00	EU	CE%sT
+@@ -1259,7 +1347,7 @@
+ # http://www.srf.ch/player/video?id=c012c029-03b7-4c2b-9164-aa5902cd58d3
+ 
+ # From Arthur David Olson (2012-03-03):
+-# Busingen and Zurich have shared clocks since 1970.
++# Büsingen and Zurich have shared clocks since 1970.
+ 
+ Link	Europe/Zurich	Europe/Busingen
+ 
+@@ -1270,8 +1358,8 @@
+ 
+ # Gibraltar
+ # Zone	NAME		GMTOFF	RULES	FORMAT	[UNTIL]
+-Zone Europe/Gibraltar	-0:21:24 -	LMT	1880 Aug  2 0:00s
+-			0:00	GB-Eire	%s	1957 Apr 14 2:00
++Zone Europe/Gibraltar	-0:21:24 -	LMT	1880 Aug  2  0:00s
++			0:00	GB-Eire	%s	1957 Apr 14  2:00
+ 			1:00	-	CET	1982
+ 			1:00	EU	CE%sT
+ 
+@@ -1302,7 +1390,7 @@
+ Rule	Greece	1980	only	-	Sep	28	0:00	0	-
+ # Zone	NAME		GMTOFF	RULES	FORMAT	[UNTIL]
+ Zone	Europe/Athens	1:34:52 -	LMT	1895 Sep 14
+-			1:34:52	-	AMT	1916 Jul 28 0:01     # Athens MT
++			1:34:52	-	AMT	1916 Jul 28  0:01 # Athens MT
+ 			2:00	Greece	EE%sT	1941 Apr 30
+ 			1:00	Greece	CE%sT	1944 Apr  4
+ 			2:00	Greece	EE%sT	1981
+@@ -1374,36 +1462,33 @@
+ # might be a reference to the Julian calendar as opposed to Gregorian, or it
+ # might mean something else (???).
+ #
+-# From Paul Eggert (2006-03-22):
+-# The Iceland Almanak, Shanks & Pottenger, and Whitman disagree on many points.
+-# We go with the Almanak, except for one claim from Shanks & Pottenger, namely
+-# that Reykavik was 21W57 from 1837 to 1908, local mean time before that.
++# From Paul Eggert (2014-11-22):
++# The information below is taken from the 1988 Almanak; see
++# http://www.almanak.hi.is/klukkan.html
+ #
+ # Rule	NAME	FROM	TO	TYPE	IN	ON	AT	SAVE	LETTER/S
+-Rule	Iceland	1917	1918	-	Feb	19	23:00	1:00	S
++Rule	Iceland	1917	1919	-	Feb	19	23:00	1:00	S
+ Rule	Iceland	1917	only	-	Oct	21	 1:00	0	-
+-Rule	Iceland	1918	only	-	Nov	16	 1:00	0	-
++Rule	Iceland	1918	1919	-	Nov	16	 1:00	0	-
++Rule	Iceland	1921	only	-	Mar	19	23:00	1:00	S
++Rule	Iceland	1921	only	-	Jun	23	 1:00	0	-
+ Rule	Iceland	1939	only	-	Apr	29	23:00	1:00	S
+-Rule	Iceland	1939	only	-	Nov	29	 2:00	0	-
++Rule	Iceland	1939	only	-	Oct	29	 2:00	0	-
+ Rule	Iceland	1940	only	-	Feb	25	 2:00	1:00	S
+-Rule	Iceland	1940	only	-	Nov	 3	 2:00	0	-
+-Rule	Iceland	1941	only	-	Mar	 2	 1:00s	1:00	S
+-Rule	Iceland	1941	only	-	Nov	 2	 1:00s	0	-
+-Rule	Iceland	1942	only	-	Mar	 8	 1:00s	1:00	S
+-Rule	Iceland	1942	only	-	Oct	25	 1:00s	0	-
++Rule	Iceland	1940	1941	-	Nov	Sun>=2	 1:00s	0	-
++Rule	Iceland	1941	1942	-	Mar	Sun>=2	 1:00s	1:00	S
+ # 1943-1946 - first Sunday in March until first Sunday in winter
+ Rule	Iceland	1943	1946	-	Mar	Sun>=1	 1:00s	1:00	S
+-Rule	Iceland	1943	1948	-	Oct	Sun>=22	 1:00s	0	-
++Rule	Iceland	1942	1948	-	Oct	Sun>=22	 1:00s	0	-
+ # 1947-1967 - first Sunday in April until first Sunday in winter
+ Rule	Iceland	1947	1967	-	Apr	Sun>=1	 1:00s	1:00	S
+-# 1949 Oct transition delayed by 1 week
++# 1949 and 1967 Oct transitions delayed by 1 week
+ Rule	Iceland	1949	only	-	Oct	30	 1:00s	0	-
+ Rule	Iceland	1950	1966	-	Oct	Sun>=22	 1:00s	0	-
+ Rule	Iceland	1967	only	-	Oct	29	 1:00s	0	-
+ # Zone	NAME		GMTOFF	RULES	FORMAT	[UNTIL]
+-Zone Atlantic/Reykjavik	-1:27:24 -	LMT	1837
+-			-1:27:48 -	RMT	1908 # Reykjavik Mean Time?
+-			-1:00	Iceland	IS%sT	1968 Apr 7 1:00s
++Zone Atlantic/Reykjavik	-1:28	-	LMT	1908
++			-1:00	Iceland	IS%sT	1968 Apr  7  1:00s
+ 			 0:00	-	GMT
+ 
+ # Italy
+@@ -1415,73 +1500,84 @@
+ # But these events all occurred before the 1970 cutoff,
+ # so record only the time in Rome.
+ #
+-# From Paul Eggert (2006-03-22):
+-# For Italian DST we have three sources: Shanks & Pottenger, Whitman, and
+-# F. Pollastri
+-# Day-light Saving Time in Italy (2006-02-03)
+-# <http://toi.iriti.cnr.it/uk/ienitlt.html>
+-# ('FP' below), taken from an Italian National Electrotechnical Institute
+-# publication. When the three sources disagree, guess who's right, as follows:
+-#
+-# year	FP	Shanks&P. (S)	Whitman (W)	Go with:
+-# 1916	06-03	06-03 24:00	06-03 00:00	FP & W
+-#	09-30	09-30 24:00	09-30 01:00	FP; guess 24:00s
+-# 1917	04-01	03-31 24:00	03-31 00:00	FP & S
+-#	09-30	09-29 24:00	09-30 01:00	FP & W
+-# 1918	03-09	03-09 24:00	03-09 00:00	FP & S
+-#	10-06	10-05 24:00	10-06 01:00	FP & W
+-# 1919	03-01	03-01 24:00	03-01 00:00	FP & S
+-#	10-04	10-04 24:00	10-04 01:00	FP; guess 24:00s
+-# 1920	03-20	03-20 24:00	03-20 00:00	FP & S
+-#	09-18	09-18 24:00	10-01 01:00	FP; guess 24:00s
+-# 1944	04-02	04-03 02:00			S (see C-Eur)
+-#	09-16	10-02 03:00			FP; guess 24:00s
+-# 1945	09-14	09-16 24:00			FP; guess 24:00s
+-# 1970	05-21	05-31 00:00			S
+-#	09-20	09-27 00:00			S
+-#
+-# Rule	NAME	FROM	TO	TYPE	IN	ON	AT	SAVE	LETTER/S
+-Rule	Italy	1916	only	-	Jun	 3	0:00s	1:00	S
+-Rule	Italy	1916	only	-	Oct	 1	0:00s	0	-
+-Rule	Italy	1917	only	-	Apr	 1	0:00s	1:00	S
+-Rule	Italy	1917	only	-	Sep	30	0:00s	0	-
+-Rule	Italy	1918	only	-	Mar	10	0:00s	1:00	S
+-Rule	Italy	1918	1919	-	Oct	Sun>=1	0:00s	0	-
+-Rule	Italy	1919	only	-	Mar	 2	0:00s	1:00	S
+-Rule	Italy	1920	only	-	Mar	21	0:00s	1:00	S
+-Rule	Italy	1920	only	-	Sep	19	0:00s	0	-
+-Rule	Italy	1940	only	-	Jun	15	0:00s	1:00	S
+-Rule	Italy	1944	only	-	Sep	17	0:00s	0	-
+-Rule	Italy	1945	only	-	Apr	 2	2:00	1:00	S
+-Rule	Italy	1945	only	-	Sep	15	0:00s	0	-
+-Rule	Italy	1946	only	-	Mar	17	2:00s	1:00	S
+-Rule	Italy	1946	only	-	Oct	 6	2:00s	0	-
+-Rule	Italy	1947	only	-	Mar	16	0:00s	1:00	S
+-Rule	Italy	1947	only	-	Oct	 5	0:00s	0	-
+-Rule	Italy	1948	only	-	Feb	29	2:00s	1:00	S
+-Rule	Italy	1948	only	-	Oct	 3	2:00s	0	-
+-Rule	Italy	1966	1968	-	May	Sun>=22	0:00	1:00	S
+-Rule	Italy	1966	1969	-	Sep	Sun>=22	0:00	0	-
+-Rule	Italy	1969	only	-	Jun	 1	0:00	1:00	S
+-Rule	Italy	1970	only	-	May	31	0:00	1:00	S
+-Rule	Italy	1970	only	-	Sep	lastSun	0:00	0	-
+-Rule	Italy	1971	1972	-	May	Sun>=22	0:00	1:00	S
+-Rule	Italy	1971	only	-	Sep	lastSun	1:00	0	-
+-Rule	Italy	1972	only	-	Oct	 1	0:00	0	-
+-Rule	Italy	1973	only	-	Jun	 3	0:00	1:00	S
+-Rule	Italy	1973	1974	-	Sep	lastSun	0:00	0	-
+-Rule	Italy	1974	only	-	May	26	0:00	1:00	S
+-Rule	Italy	1975	only	-	Jun	 1	0:00s	1:00	S
+-Rule	Italy	1975	1977	-	Sep	lastSun	0:00s	0	-
+-Rule	Italy	1976	only	-	May	30	0:00s	1:00	S
+-Rule	Italy	1977	1979	-	May	Sun>=22	0:00s	1:00	S
+-Rule	Italy	1978	only	-	Oct	 1	0:00s	0	-
+-Rule	Italy	1979	only	-	Sep	30	0:00s	0	-
++# From Michael Deckers (2016-10-24):
++# http://www.ac-ilsestante.it/MERIDIANE/ora_legale quotes a law of 1893-08-10
++# ... [translated as] "The preceding dispositions will enter into
++# force at the instant at which, according to the time specified in
++# the 1st article, the 1st of November 1893 will begin...."
++#
++# From Pierpaolo Bernardi (2016-10-20):
++# The authoritative source for time in Italy is the national metrological
++# institute, which has a summary page of historical DST data at
++# http://www.inrim.it/res/tf/ora_legale_i.shtml
++# (2016-10-24):
++# http://www.renzobaldini.it/le-ore-legali-in-italia/
++# has still different data for 1944.  It divides Italy in two, as
++# there were effectively two governments at the time, north of Gothic
++# Line German controlled territory, official government RSI, and south
++# of the Gothic Line, controlled by allied armies.
++#
++# From Brian Inglis (2016-10-23):
++# Viceregal LEGISLATIVE DECREE. 14 September 1944, no. 219.
++# Restoration of Standard Time. (044U0219) (OJ 62 of 30.9.1944) ...
++# Given the R. law decreed on 1944-03-29, no. 92, by which standard time is
++# advanced to sixty minutes later starting at hour two on 1944-04-02; ...
++# Starting at hour three on the date 1944-09-17 standard time will be resumed.
++#
++# From Paul Eggert (2016-10-27):
++# Go with INRiM for DST rules, except as corrected by Inglis for 1944
++# for the Kingdom of Italy.  This is consistent with Renzo Baldini.
++# Model Rome's occupation by using using C-Eur rules from 1943-09-10
++# to 1944-06-04; although Rome was an open city during this period, it
++# was effectively controlled by Germany.
++#
++# Rule	NAME	FROM	TO	TYPE	IN	ON	AT	SAVE	LETTER/S
++Rule	Italy	1916	only	-	Jun	 3	24:00	1:00	S
++Rule	Italy	1916	1917	-	Sep	30	24:00	0	-
++Rule	Italy	1917	only	-	Mar	31	24:00	1:00	S
++Rule	Italy	1918	only	-	Mar	 9	24:00	1:00	S
++Rule	Italy	1918	only	-	Oct	 6	24:00	0	-
++Rule	Italy	1919	only	-	Mar	 1	24:00	1:00	S
++Rule	Italy	1919	only	-	Oct	 4	24:00	0	-
++Rule	Italy	1920	only	-	Mar	20	24:00	1:00	S
++Rule	Italy	1920	only	-	Sep	18	24:00	0	-
++Rule	Italy	1940	only	-	Jun	14	24:00	1:00	S
++Rule	Italy	1942	only	-	Nov	 2	 2:00s	0	-
++Rule	Italy	1943	only	-	Mar	29	 2:00s	1:00	S
++Rule	Italy	1943	only	-	Oct	 4	 2:00s	0	-
++Rule	Italy	1944	only	-	Apr	 2	 2:00s	1:00	S
++Rule	Italy	1944	only	-	Sep	17	 2:00s	0	-
++Rule	Italy	1945	only	-	Apr	 2	 2:00	1:00	S
++Rule	Italy	1945	only	-	Sep	15	 1:00	0	-
++Rule	Italy	1946	only	-	Mar	17	 2:00s	1:00	S
++Rule	Italy	1946	only	-	Oct	 6	 2:00s	0	-
++Rule	Italy	1947	only	-	Mar	16	 0:00s	1:00	S
++Rule	Italy	1947	only	-	Oct	 5	 0:00s	0	-
++Rule	Italy	1948	only	-	Feb	29	 2:00s	1:00	S
++Rule	Italy	1948	only	-	Oct	 3	 2:00s	0	-
++Rule	Italy	1966	1968	-	May	Sun>=22	 0:00s	1:00	S
++Rule	Italy	1966	only	-	Sep	24	24:00	0	-
++Rule	Italy	1967	1969	-	Sep	Sun>=22	 0:00s	0	-
++Rule	Italy	1969	only	-	Jun	 1	 0:00s	1:00	S
++Rule	Italy	1970	only	-	May	31	 0:00s	1:00	S
++Rule	Italy	1970	only	-	Sep	lastSun	 0:00s	0	-
++Rule	Italy	1971	1972	-	May	Sun>=22	 0:00s	1:00	S
++Rule	Italy	1971	only	-	Sep	lastSun	 0:00s	0	-
++Rule	Italy	1972	only	-	Oct	 1	 0:00s	0	-
++Rule	Italy	1973	only	-	Jun	 3	 0:00s	1:00	S
++Rule	Italy	1973	1974	-	Sep	lastSun	 0:00s	0	-
++Rule	Italy	1974	only	-	May	26	 0:00s	1:00	S
++Rule	Italy	1975	only	-	Jun	 1	 0:00s	1:00	S
++Rule	Italy	1975	1977	-	Sep	lastSun	 0:00s	0	-
++Rule	Italy	1976	only	-	May	30	 0:00s	1:00	S
++Rule	Italy	1977	1979	-	May	Sun>=22	 0:00s	1:00	S
++Rule	Italy	1978	only	-	Oct	 1	 0:00s	0	-
++Rule	Italy	1979	only	-	Sep	30	 0:00s	0	-
+ # Zone	NAME		GMTOFF	RULES	FORMAT	[UNTIL]
+ Zone	Europe/Rome	0:49:56 -	LMT	1866 Sep 22
+-			0:49:56	-	RMT	1893 Nov  1 0:00s # Rome Mean
+-			1:00	Italy	CE%sT	1942 Nov  2 2:00s
+-			1:00	C-Eur	CE%sT	1944 Jul
++			0:49:56	-	RMT	1893 Oct 31 23:49:56 # Rome Mean
++			1:00	Italy	CE%sT	1943 Sep 10
++			1:00	C-Eur	CE%sT	1944 Jun  4
+ 			1:00	Italy	CE%sT	1980
+ 			1:00	EU	CE%sT
+ 
+@@ -1497,21 +1593,21 @@
+ # correct data in juridical acts and I found some juridical documents about
+ # changes in the counting of time in Latvia from 1981....
+ #
+-# Act No.35 of the Council of Ministers of Latvian SSR of 1981-01-22 ...
+-# according to the Act No.925 of the Council of Ministers of USSR of 1980-10-24
++# Act No. 35 of the Council of Ministers of Latvian SSR of 1981-01-22 ...
++# according to the Act No. 925 of the Council of Ministers of USSR of 1980-10-24
+ # ...: all year round the time of 2nd time zone + 1 hour, in addition turning
+ # the hands of the clock 1 hour forward on 1 April at 00:00 (GMT 31 March 21:00)
+ # and 1 hour backward on the 1 October at 00:00 (GMT 30 September 20:00).
+ #
+-# Act No.592 of the Council of Ministers of Latvian SSR of 1984-09-24 ...
+-# according to the Act No.967 of the Council of Ministers of USSR of 1984-09-13
++# Act No. 592 of the Council of Ministers of Latvian SSR of 1984-09-24 ...
++# according to the Act No. 967 of the Council of Ministers of USSR of 1984-09-13
+ # ...: all year round the time of 2nd time zone + 1 hour, in addition turning
+ # the hands of the clock 1 hour forward on the last Sunday of March at 02:00
+ # (GMT 23:00 on the previous day) and 1 hour backward on the last Sunday of
+ # September at 03:00 (GMT 23:00 on the previous day).
+ #
+-# Act No.81 of the Council of Ministers of Latvian SSR of 1989-03-22 ...
+-# according to the Act No.227 of the Council of Ministers of USSR of 1989-03-14
++# Act No. 81 of the Council of Ministers of Latvian SSR of 1989-03-22 ...
++# according to the Act No. 227 of the Council of Ministers of USSR of 1989-03-14
+ # ...: since the last Sunday of March 1989 in Lithuanian SSR, Latvian SSR,
+ # Estonian SSR and Kaliningrad region of Russian Federation all year round the
+ # time of 2nd time zone (Moscow time minus one hour). On the territory of Latvia
+@@ -1528,17 +1624,17 @@
+ # From Andrei Ivanov (2000-03-06):
+ # This year Latvia will not switch to Daylight Savings Time (as specified in
+ # The Regulations of the Cabinet of Ministers of the Rep. of Latvia of
+-# 29-Feb-2000 (#79) <http://www.lv-laiks.lv/wwwraksti/2000/071072/vd4.htm>,
++# 29-Feb-2000 (No. 79) <http://www.lv-laiks.lv/wwwraksti/2000/071072/vd4.htm>,
+ # in Latvian for subscribers only).
+ 
+ # From RFE/RL Newsline
+-# <http://www.rferl.org/newsline/2001/01/3-CEE/cee-030101.html>
++# http://www.rferl.org/newsline/2001/01/3-CEE/cee-030101.html
+ # (2001-01-03), noted after a heads-up by Rives McDow:
+ # The Latvian government on 2 January decided that the country will
+ # institute daylight-saving time this spring, LETA reported.
+ # Last February the three Baltic states decided not to turn back their
+ # clocks one hour in the spring....
+-# Minister of Economy Aigars Kalvitis noted that Latvia had too few
++# Minister of Economy Aigars Kalvītis noted that Latvia had too few
+ # daylight hours and thus decided to comply with a draft European
+ # Commission directive that provides for instituting daylight-saving
+ # time in EU countries between 2002 and 2006. The Latvian government
+@@ -1549,20 +1645,22 @@
+ Rule	Latvia	1989	1996	-	Mar	lastSun	 2:00s	1:00	S
+ Rule	Latvia	1989	1996	-	Sep	lastSun	 2:00s	0	-
+ 
+-# Milne says Riga time was 1:36:28 (Polytechnique House time).
++# Milne 1899 says Riga was 1:36:28 (Polytechnique House time).
++# Byalokoz 1919 says Latvia was 1:36:34.
++# Go with Byalokoz.
+ 
+ # Zone	NAME		GMTOFF	RULES	FORMAT	[UNTIL]
+-Zone	Europe/Riga	1:36:28	-	LMT	1880
+-			1:36:28	-	RMT	1918 Apr 15 2:00 #Riga Mean Time
+-			1:36:28	1:00	LST	1918 Sep 16 3:00 #Latvian Summer
+-			1:36:28	-	RMT	1919 Apr  1 2:00
+-			1:36:28	1:00	LST	1919 May 22 3:00
+-			1:36:28	-	RMT	1926 May 11
++Zone	Europe/Riga	1:36:34	-	LMT	1880
++			1:36:34	-	RMT	1918 Apr 15  2:00 # Riga MT
++			1:36:34	1:00	LST	1918 Sep 16  3:00 # Latvian ST
++			1:36:34	-	RMT	1919 Apr  1  2:00
++			1:36:34	1:00	LST	1919 May 22  3:00
++			1:36:34	-	RMT	1926 May 11
+ 			2:00	-	EET	1940 Aug  5
+ 			3:00	-	MSK	1941 Jul
+ 			1:00	C-Eur	CE%sT	1944 Oct 13
+-			3:00	Russia	MSK/MSD	1989 Mar lastSun 2:00s
+-			2:00	1:00	EEST	1989 Sep lastSun 2:00s
++			3:00	Russia	MSK/MSD	1989 Mar lastSun  2:00s
++			2:00	1:00	EEST	1989 Sep lastSun  2:00s
+ 			2:00	Latvia	EE%sT	1997 Jan 21
+ 			2:00	EU	EE%sT	2000 Feb 29
+ 			2:00	-	EET	2001 Jan  2
+@@ -1588,6 +1686,9 @@
+ 
+ # Lithuania
+ 
++# From Paul Eggert (2016-03-18):
++# The 1989 transition is from USSR act No. 227 (1989-03-14).
++
+ # From Paul Eggert (1996-11-22):
+ # IATA SSIM (1992/1996) says Lithuania uses W-Eur rules, but since it is
+ # known to be wrong about Estonia and Latvia, assume it's wrong here too.
+@@ -1620,18 +1721,18 @@
+ 
+ # Zone	NAME		GMTOFF	RULES	FORMAT	[UNTIL]
+ Zone	Europe/Vilnius	1:41:16	-	LMT	1880
+-			1:24:00	-	WMT	1917	    # Warsaw Mean Time
++			1:24:00	-	WMT	1917        # Warsaw Mean Time
+ 			1:35:36	-	KMT	1919 Oct 10 # Kaunas Mean Time
+ 			1:00	-	CET	1920 Jul 12
+ 			2:00	-	EET	1920 Oct  9
+ 			1:00	-	CET	1940 Aug  3
+ 			3:00	-	MSK	1941 Jun 24
+ 			1:00	C-Eur	CE%sT	1944 Aug
+-			3:00	Russia	MSK/MSD	1991 Mar 31 2:00s
+-			2:00	1:00	EEST	1991 Sep 29 2:00s
++			3:00	Russia	MSK/MSD	1989 Mar 26  2:00s
++			2:00	Russia	EE%sT	1991 Sep 29  2:00s
+ 			2:00	C-Eur	EE%sT	1998
+-			2:00	-	EET	1998 Mar 29 1:00u
+-			1:00	EU	CE%sT	1999 Oct 31 1:00u
++			2:00	-	EET	1998 Mar 29  1:00u
++			1:00	EU	CE%sT	1999 Oct 31  1:00u
+ 			2:00	-	EET	2003 Jan  1
+ 			2:00	EU	EE%sT
+ 
+@@ -1665,9 +1766,9 @@
+ # Zone	NAME		GMTOFF	RULES	FORMAT	[UNTIL]
+ Zone Europe/Luxembourg	0:24:36 -	LMT	1904 Jun
+ 			1:00	Lux	CE%sT	1918 Nov 25
+-			0:00	Lux	WE%sT	1929 Oct  6 2:00s
+-			0:00	Belgium	WE%sT	1940 May 14 3:00
+-			1:00	C-Eur	WE%sT	1944 Sep 18 3:00
++			0:00	Lux	WE%sT	1929 Oct  6  2:00s
++			0:00	Belgium	WE%sT	1940 May 14  3:00
++			1:00	C-Eur	WE%sT	1944 Sep 18  3:00
+ 			1:00	Belgium	CE%sT	1977
+ 			1:00	EU	CE%sT
+ 
+@@ -1675,6 +1776,10 @@
+ # See Europe/Belgrade.
+ 
+ # Malta
++#
++# From Paul Eggert (2016-10-21):
++# Assume 1900-1972 was like Rome, overriding Shanks.
++#
+ # Rule	NAME	FROM	TO	TYPE	IN	ON	AT	SAVE	LETTER/S
+ Rule	Malta	1973	only	-	Mar	31	0:00s	1:00	S
+ Rule	Malta	1973	only	-	Sep	29	0:00s	0	-
+@@ -1684,15 +1789,23 @@
+ Rule	Malta	1975	1980	-	Sep	Sun>=15	2:00	0	-
+ Rule	Malta	1980	only	-	Mar	31	2:00	1:00	S
+ # Zone	NAME		GMTOFF	RULES	FORMAT	[UNTIL]
+-Zone	Europe/Malta	0:58:04 -	LMT	1893 Nov  2 0:00s # Valletta
+-			1:00	Italy	CE%sT	1942 Nov  2 2:00s
+-			1:00	C-Eur	CE%sT	1945 Apr  2 2:00s
++Zone	Europe/Malta	0:58:04 -	LMT	1893 Nov  2  0:00s # Valletta
+ 			1:00	Italy	CE%sT	1973 Mar 31
+ 			1:00	Malta	CE%sT	1981
+ 			1:00	EU	CE%sT
+ 
+ # Moldova
+ 
++# From Stepan Golosunov (2016-03-07):
++# the act of the government of the Republic of Moldova Nr. 132 from 1990-05-04
++# http://lex.justice.md/viewdoc.php?action=view&view=doc&id=298782&lang=2
++# ... says that since 1990-05-06 on the territory of the Moldavian SSR
++# time would be calculated as the standard time of the second time belt
++# plus one hour of the "summer" time. To implement that clocks would be
++# adjusted one hour backwards at 1990-05-06 2:00. After that "summer"
++# time would be cancelled last Sunday of September at 3:00 and
++# reintroduced last Sunday of March at 2:00.
++
+ # From Paul Eggert (2006-03-22):
+ # A previous version of this database followed Shanks & Pottenger, who write
+ # that Tiraspol switched to Moscow time on 1992-01-19 at 02:00.
+@@ -1731,6 +1844,18 @@
+ # News from Moldova (in russian):
+ # http://ru.publika.md/link_317061.html
+ 
++# From Roman Tudos (2015-07-02):
++# http://lex.justice.md/index.php?action=view&view=doc&lang=1&id=355077
++# From Paul Eggert (2015-07-01):
++# The abovementioned official link to IGO1445-868/2014 states that
++# 2014-10-26's fallback transition occurred at 03:00 local time.  Also,
++# http://www.trm.md/en/social/la-30-martie-vom-trece-la-ora-de-vara
++# says the 2014-03-30 spring-forward transition was at 02:00 local time.
++# Guess that since 1997 Moldova has switched one hour before the EU.
++
++# Rule	NAME	FROM	TO	TYPE	IN	ON	AT	SAVE	LETTER/S
++Rule	Moldova	1997	max	-	Mar	lastSun	 2:00	1:00	S
++Rule	Moldova	1997	max	-	Oct	lastSun	 3:00	0	-
+ 
+ # Zone	NAME		GMTOFF	RULES	FORMAT	[UNTIL]
+ Zone	Europe/Chisinau	1:55:20 -	LMT	1880
+@@ -1739,21 +1864,19 @@
+ 			2:00	Romania	EE%sT	1940 Aug 15
+ 			2:00	1:00	EEST	1941 Jul 17
+ 			1:00	C-Eur	CE%sT	1944 Aug 24
+-			3:00	Russia	MSK/MSD	1990
+-			3:00	-	MSK	1990 May 6
+-			2:00	-	EET	1991
++			3:00	Russia	MSK/MSD	1990 May  6  2:00
+ 			2:00	Russia	EE%sT	1992
+ 			2:00	E-Eur	EE%sT	1997
+ # See Romania commentary for the guessed 1997 transition to EU rules.
+-			2:00	EU	EE%sT
++			2:00	Moldova	EE%sT
+ 
+ # Monaco
+ # Shanks & Pottenger give 0:09:20 for Paris Mean Time; go with Howse's
+ # more precise 0:09:21.
+ # Zone	NAME		GMTOFF	RULES	FORMAT	[UNTIL]
+ Zone	Europe/Monaco	0:29:32 -	LMT	1891 Mar 15
+-			0:09:21	-	PMT	1911 Mar 11    # Paris Mean Time
+-			0:00	France	WE%sT	1945 Sep 16 3:00
++			0:09:21	-	PMT	1911 Mar 11 # Paris Mean Time
++			0:00	France	WE%sT	1945 Sep 16  3:00
+ 			1:00	France	CE%sT	1977
+ 			1:00	EU	CE%sT
+ 
+@@ -1797,8 +1920,8 @@
+ # was not until 1866 when they were all required by law to observe
+ # Amsterdam mean time.
+ 
+-# The data before 1945 are taken from
+-# <http://www.phys.uu.nl/~vgent/wettijd/wettijd.htm>.
++# The data entries before 1945 are taken from
++# http://www.staff.science.uu.nl/~gent0113/wettijd/wettijd.htm
+ 
+ # Rule	NAME	FROM	TO	TYPE	IN	ON	AT	SAVE	LETTER/S
+ Rule	Neth	1916	only	-	May	 1	0:00	1:00	NST	# Netherlands Summer Time
+@@ -1829,8 +1952,8 @@
+ # Zone	NAME		GMTOFF	RULES	FORMAT	[UNTIL]
+ Zone Europe/Amsterdam	0:19:32 -	LMT	1835
+ 			0:19:32	Neth	%s	1937 Jul  1
+-			0:20	Neth	NE%sT	1940 May 16 0:00 # Dutch Time
+-			1:00	C-Eur	CE%sT	1945 Apr  2 2:00
++			0:20	Neth	NE%sT	1940 May 16  0:00 # Dutch Time
++			1:00	C-Eur	CE%sT	1945 Apr  2  2:00
+ 			1:00	Neth	CE%sT	1977
+ 			1:00	EU	CE%sT
+ 
+@@ -1893,7 +2016,7 @@
+ # <http://www.svalbard.com/SvalbardFAQ.html> says that the Germans were
+ # expelled on 1942-05-14.  However, small parties of Germans did return,
+ # and according to Wilhelm Dege's book "War North of 80" (1954)
+-# <http://www.ucalgary.ca/UofC/departments/UP/1-55238/1-55238-110-2.html>
++# http://www.ucalgary.ca/UofC/departments/UP/1-55238/1-55238-110-2.html
+ # the German armed forces at the Svalbard weather station code-named
+ # Haudegen did not surrender to the Allies until September 1945.
+ #
+@@ -1917,7 +2040,7 @@
+ Rule	Poland	1945	only	-	Nov	 1	0:00	0	-
+ # For 1946 on the source is Kazimierz Borkowski,
+ # Toruń Center for Astronomy, Dept. of Radio Astronomy, Nicolaus Copernicus U.,
+-# <http://www.astro.uni.torun.pl/~kb/Artykuly/U-PA/Czas2.htm#tth_tAb1>
++# http://www.astro.uni.torun.pl/~kb/Artykuly/U-PA/Czas2.htm#tth_tAb1
+ # Thanks to Przemysław Augustyniak (2005-05-28) for this reference.
+ # He also gives these further references:
+ # Mon Pol nr 13, poz 162 (1995) <http://www.abc.com.pl/serwis/mp/1995/0162.htm>
+@@ -1938,10 +2061,10 @@
+ Rule	Poland	1962	1964	-	Sep	lastSun	1:00s	0	-
+ # Zone	NAME		GMTOFF	RULES	FORMAT	[UNTIL]
+ Zone	Europe/Warsaw	1:24:00 -	LMT	1880
+-			1:24:00	-	WMT	1915 Aug  5   # Warsaw Mean Time
+-			1:00	C-Eur	CE%sT	1918 Sep 16 3:00
++			1:24:00	-	WMT	1915 Aug  5 # Warsaw Mean Time
++			1:00	C-Eur	CE%sT	1918 Sep 16  3:00
+ 			2:00	Poland	EE%sT	1922 Jun
+-			1:00	Poland	CE%sT	1940 Jun 23 2:00
++			1:00	Poland	CE%sT	1940 Jun 23  2:00
+ 			1:00	C-Eur	CE%sT	1944 Oct
+ 			1:00	Poland	CE%sT	1977
+ 			1:00	W-Eur	CE%sT	1988
+@@ -1949,6 +2072,14 @@
+ 
+ # Portugal
+ #
++# From Paul Eggert (2014-08-11), after a heads-up from Stephen Colebourne:
++# According to a Portuguese decree (1911-05-26)
++# http://dre.pt/pdf1sdip/1911/05/12500/23132313.pdf
++# Lisbon was at -0:36:44.68, but switched to GMT on 1912-01-01 at 00:00.
++# Round the old offset to -0:36:45.  This agrees with Willett but disagrees
++# with Shanks, who says the transition occurred on 1911-05-24 at 00:00 for
++# Europe/Lisbon, Atlantic/Azores, and Atlantic/Madeira.
++#
+ # From Rui Pedro Salgueiro (1992-11-12):
+ # Portugal has recently (September, 27) changed timezone
+ # (from WET to MET or CET) to harmonize with EEC.
+@@ -2028,28 +2159,27 @@
+ Rule	Port	1980	only	-	Mar	lastSun	 0:00s	1:00	S
+ Rule	Port	1981	1982	-	Mar	lastSun	 1:00s	1:00	S
+ Rule	Port	1983	only	-	Mar	lastSun	 2:00s	1:00	S
++#
+ # Zone	NAME		GMTOFF	RULES	FORMAT	[UNTIL]
+-# Shanks & Pottenger say the transition from LMT to WET occurred 1911-05-24;
+-# Willett says 1912-01-01.  Go with Willett.
+-Zone	Europe/Lisbon	-0:36:32 -	LMT	1884
+-			-0:36:32 -	LMT	1912 Jan  1  # Lisbon Mean Time
+-			 0:00	Port	WE%sT	1966 Apr  3 2:00
+-			 1:00	-	CET	1976 Sep 26 1:00
+-			 0:00	Port	WE%sT	1983 Sep 25 1:00s
+-			 0:00	W-Eur	WE%sT	1992 Sep 27 1:00s
+-			 1:00	EU	CE%sT	1996 Mar 31 1:00u
++Zone	Europe/Lisbon	-0:36:45 -	LMT	1884
++			-0:36:45 -	LMT	1912 Jan  1 # Lisbon Mean Time
++			 0:00	Port	WE%sT	1966 Apr  3  2:00
++			 1:00	-	CET	1976 Sep 26  1:00
++			 0:00	Port	WE%sT	1983 Sep 25  1:00s
++			 0:00	W-Eur	WE%sT	1992 Sep 27  1:00s
++			 1:00	EU	CE%sT	1996 Mar 31  1:00u
+ 			 0:00	EU	WE%sT
+-Zone Atlantic/Azores	-1:42:40 -	LMT	1884		# Ponta Delgada
+-			-1:54:32 -	HMT	1911 May 24  # Horta Mean Time
+-			-2:00	Port	AZO%sT	1966 Apr  3 2:00 # Azores Time
+-			-1:00	Port	AZO%sT	1983 Sep 25 1:00s
+-			-1:00	W-Eur	AZO%sT	1992 Sep 27 1:00s
+-			 0:00	EU	WE%sT	1993 Mar 28 1:00u
++Zone Atlantic/Azores	-1:42:40 -	LMT	1884        # Ponta Delgada
++			-1:54:32 -	HMT	1912 Jan  1 # Horta Mean Time
++			-2:00	Port	AZO%sT	1966 Apr  3  2:00  # Azores Time
++			-1:00	Port	AZO%sT	1983 Sep 25  1:00s
++			-1:00	W-Eur	AZO%sT	1992 Sep 27  1:00s
++			 0:00	EU	WE%sT	1993 Mar 28  1:00u
+ 			-1:00	EU	AZO%sT
+-Zone Atlantic/Madeira	-1:07:36 -	LMT	1884		# Funchal
+-			-1:07:36 -	FMT	1911 May 24  # Funchal Mean Time
+-			-1:00	Port	MAD%sT	1966 Apr  3 2:00 # Madeira Time
+-			 0:00	Port	WE%sT	1983 Sep 25 1:00s
++Zone Atlantic/Madeira	-1:07:36 -	LMT	1884        # Funchal
++			-1:07:36 -	FMT	1912 Jan  1 # Funchal Mean Time
++			-1:00	Port	MAD%sT	1966 Apr  3  2:00 # Madeira Time
++			 0:00	Port	WE%sT	1983 Sep 25  1:00s
+ 			 0:00	EU	WE%sT
+ 
+ # Romania
+@@ -2073,8 +2203,8 @@
+ Rule	Romania	1991	1993	-	Sep	lastSun	 0:00s	0	-
+ # Zone	NAME		GMTOFF	RULES	FORMAT	[UNTIL]
+ Zone Europe/Bucharest	1:44:24 -	LMT	1891 Oct
+-			1:44:24	-	BMT	1931 Jul 24	# Bucharest MT
+-			2:00	Romania	EE%sT	1981 Mar 29 2:00s
++			1:44:24	-	BMT	1931 Jul 24 # Bucharest MT
++			2:00	Romania	EE%sT	1981 Mar 29  2:00s
+ 			2:00	C-Eur	EE%sT	1991
+ 			2:00	Romania	EE%sT	1994
+ 			2:00	E-Eur	EE%sT	1997
+@@ -2084,7 +2214,7 @@
+ # Russia
+ 
+ # From Alexander Krivenyshev (2011-09-15):
+-# Based on last Russian Government Decree # 725 on August 31, 2011
++# Based on last Russian Government Decree No. 725 on August 31, 2011
+ # (Government document
+ # http://www.government.ru/gov/results/16355/print/
+ # in Russian)
+@@ -2094,7 +2224,7 @@
+ # http://www.worldtimezone.com/dst_news/dst_news_russia36.htm
+ 
+ # From Sanjeev Gupta (2011-09-27):
+-# Scans of [Decree #23 of January 8, 1992] are available at:
++# Scans of [Decree No. 23 of January 8, 1992] are available at:
+ # http://government.consultant.ru/page.aspx?1223966
+ # They are in Cyrillic letters (presumably Russian).
+ 
+@@ -2105,19 +2235,19 @@
+ # One source is
+ # http://government.ru/gov/results/16355/
+ # which, according to translate.google.com, begins "Decree of August 31,
+-# 2011 No 725" and contains no other dates or "effective date" information.
++# 2011 No. 725" and contains no other dates or "effective date" information.
+ #
+ # Another source is
+ # http://www.rg.ru/2011/09/06/chas-zona-dok.html
+ # which, according to translate.google.com, begins "Resolution of the
+ # Government of the Russian Federation on August 31, 2011 N 725" and also
+ # contains "Date first official publication: September 6, 2011 Posted on:
+-# in the 'RG' - Federal Issue number 5573 September 6, 2011" but which
++# in the 'RG' - Federal Issue No. 5573 September 6, 2011" but which
+ # does not contain any "effective date" information.
+ #
+ # Another source is
+ # http://en.wikipedia.org/wiki/Oymyakonsky_District#cite_note-RuTime-7
+-# which, in note 8, contains "Resolution #725 of August 31, 2011...
++# which, in note 8, contains "Resolution No. 725 of August 31, 2011...
+ # Effective as of after 7 days following the day of the official publication"
+ # but which does not contain any reference to September 6, 2011.
+ #
+@@ -2156,7 +2286,6 @@
+ # http://www.worldtimezone.com/dst_news/dst_news_russia-map-2014-07.html
+ 
+ # From Paul Eggert (2006-03-22):
+-# Except for Moscow after 1919-07-01, I invented the time zone abbreviations.
+ # Moscow time zone abbreviations after 1919-07-01, and Moscow rules after 1991,
+ # are from Andrey A. Chernov.  The rest is from Shanks & Pottenger,
+ # except we follow Chernov's report that 1992 DST transitions were Sat
+@@ -2210,73 +2339,179 @@
+ 
+ # From Tim Parenti (2014-07-03):
+ # Europe/Kaliningrad covers...
+-# 39	RU-KGD 	Kaliningrad Oblast
++# 39	RU-KGD	Kaliningrad Oblast
++
++# From Paul Eggert (2016-03-18):
++# The 1989 transition is from USSR act No. 227 (1989-03-14).
++
++# From Stepan Golosunov (2016-03-07):
++# http://www.rgo.ru/ru/kaliningradskoe-oblastnoe-otdelenie/ob-otdelenii/publikacii/kak-nam-zhilos-bez-letnego-vremeni
++# confirms that the 1989 change to Moscow-1 was implemented.
++# (The article, though, is misattributed to 1990 while saying that
++# summer->winter transition would be done on the 24 of September. But
++# 1990-09-24 was Monday, while 1989-09-24 was Sunday as expected.)
++# ...
++# http://www.kaliningradka.ru/site_pc/cherez/index.php?ELEMENT_ID=40091
++# says that Kaliningrad switched to Moscow-1 on 1989-03-26, avoided
++# at the last moment switch to Moscow-1 on 1991-03-31, switched to
++# Moscow on 1991-11-03, switched to Moscow-1 on 1992-01-19.
+ 
+ Zone Europe/Kaliningrad	 1:22:00 -	LMT	1893 Apr
+ 			 1:00	C-Eur	CE%sT	1945
+ 			 2:00	Poland	CE%sT	1946
+-			 3:00	Russia	MSK/MSD	1991 Mar 31 2:00s
+-			 2:00	Russia	EE%sT	2011 Mar 27 2:00s
+-			 3:00	-	FET	2014 Oct 26 2:00s
++			 3:00	Russia	MSK/MSD	1989 Mar 26  2:00s
++			 2:00	Russia	EE%sT	2011 Mar 27  2:00s
++			 3:00	-	+03	2014 Oct 26  2:00s
+ 			 2:00	-	EET
+ 
+ 
+-# From Tim Parenti (2014-07-03), per Oscar van Vlijmen (2001-08-25):
++# From Paul Eggert (2016-02-21), per Tim Parenti (2014-07-03) and
++# Oscar van Vlijmen (2001-08-25):
+ # Europe/Moscow covers...
+-# 01	RU-AD 	Adygea, Republic of
+-# 05	RU-DA 	Dagestan, Republic of
+-# 06	RU-IN 	Ingushetia, Republic of
+-# 07	RU-KB 	Kabardino-Balkar Republic
+-# 08	RU-KL 	Kalmykia, Republic of
+-# 09	RU-KC 	Karachay-Cherkess Republic
+-# 10	RU-KR 	Karelia, Republic of
+-# 11	RU-KO 	Komi Republic
+-# 12	RU-ME 	Mari El Republic
+-# 13	RU-MO 	Mordovia, Republic of
+-# 15	RU-SE 	North Ossetia-Alania, Republic of
+-# 16	RU-TA 	Tatarstan, Republic of
+-# 20	RU-CE 	Chechen Republic
+-# 21	RU-CU 	Chuvash Republic
+-# 23	RU-KDA 	Krasnodar Krai
+-# 26 	RU-STA 	Stavropol Krai
+-# 29	RU-ARK 	Arkhangelsk Oblast
+-# 31	RU-BEL 	Belgorod Oblast
+-# 32	RU-BRY 	Bryansk Oblast
+-# 33	RU-VLA 	Vladimir Oblast
+-# 35	RU-VLG 	Vologda Oblast
+-# 36	RU-VOR 	Voronezh Oblast
+-# 37	RU-IVA 	Ivanovo Oblast
+-# 40	RU-KLU 	Kaluga Oblast
+-# 44	RU-KOS 	Kostroma Oblast
+-# 46	RU-KRS 	Kursk Oblast
+-# 47	RU-LEN 	Leningrad Oblast
+-# 48	RU-LIP 	Lipetsk Oblast
+-# 50	RU-MOS 	Moscow Oblast
+-# 51	RU-MUR 	Murmansk Oblast
+-# 52	RU-NIZ 	Nizhny Novgorod Oblast
+-# 53	RU-NGR 	Novgorod Oblast
+-# 57	RU-ORL 	Oryol Oblast
+-# 58	RU-PNZ 	Penza Oblast
+-# 60	RU-PSK 	Pskov Oblast
+-# 61	RU-ROS 	Rostov Oblast
+-# 62	RU-RYA 	Ryazan Oblast
+-# 67	RU-SMO 	Smolensk Oblast
+-# 68	RU-TAM 	Tambov Oblast
+-# 69	RU-TVE 	Tver Oblast
+-# 71	RU-TUL 	Tula Oblast
+-# 73	RU-ULY 	Ulyanovsk Oblast
+-# 76	RU-YAR 	Yaroslavl Oblast
+-# 77	RU-MOW 	Moscow
+-# 78	RU-SPE 	Saint Petersburg
+-# 83	RU-NEN 	Nenets Autonomous Okrug
++# 01	RU-AD	Adygea, Republic of
++# 05	RU-DA	Dagestan, Republic of
++# 06	RU-IN	Ingushetia, Republic of
++# 07	RU-KB	Kabardino-Balkar Republic
++# 08	RU-KL	Kalmykia, Republic of
++# 09	RU-KC	Karachay-Cherkess Republic
++# 10	RU-KR	Karelia, Republic of
++# 11	RU-KO	Komi Republic
++# 12	RU-ME	Mari El Republic
++# 13	RU-MO	Mordovia, Republic of
++# 15	RU-SE	North Ossetia-Alania, Republic of
++# 16	RU-TA	Tatarstan, Republic of
++# 20	RU-CE	Chechen Republic
++# 21	RU-CU	Chuvash Republic
++# 23	RU-KDA	Krasnodar Krai
++# 26	RU-STA	Stavropol Krai
++# 29	RU-ARK	Arkhangelsk Oblast
++# 31	RU-BEL	Belgorod Oblast
++# 32	RU-BRY	Bryansk Oblast
++# 33	RU-VLA	Vladimir Oblast
++# 35	RU-VLG	Vologda Oblast
++# 36	RU-VOR	Voronezh Oblast
++# 37	RU-IVA	Ivanovo Oblast
++# 40	RU-KLU	Kaluga Oblast
++# 44	RU-KOS	Kostroma Oblast
++# 46	RU-KRS	Kursk Oblast
++# 47	RU-LEN	Leningrad Oblast
++# 48	RU-LIP	Lipetsk Oblast
++# 50	RU-MOS	Moscow Oblast
++# 51	RU-MUR	Murmansk Oblast
++# 52	RU-NIZ	Nizhny Novgorod Oblast
++# 53	RU-NGR	Novgorod Oblast
++# 57	RU-ORL	Oryol Oblast
++# 58	RU-PNZ	Penza Oblast
++# 60	RU-PSK	Pskov Oblast
++# 61	RU-ROS	Rostov Oblast
++# 62	RU-RYA	Ryazan Oblast
++# 67	RU-SMO	Smolensk Oblast
++# 68	RU-TAM	Tambov Oblast
++# 69	RU-TVE	Tver Oblast
++# 71	RU-TUL	Tula Oblast
++# 76	RU-YAR	Yaroslavl Oblast
++# 77	RU-MOW	Moscow
++# 78	RU-SPE	Saint Petersburg
++# 83	RU-NEN	Nenets Autonomous Okrug
++
++# From Paul Eggert (2016-08-23):
++# The Soviets switched to UT-based time in 1919.  Decree No. 59
++# (1919-02-08) http://istmat.info/node/35567 established UT-based time
++# zones, and Decree No. 147 (1919-03-29) http://istmat.info/node/35854
++# specified a transition date of 1919-07-01, apparently at 00:00 UT.
++# No doubt only the Soviet-controlled regions switched on that date;
++# later transitions to UT-based time in other parts of Russia are
++# taken from what appear to be guesses by Shanks.
++# (Thanks to Alexander Belopolsky for pointers to the decrees.)
++
++# From Stepan Golosunov (2016-03-07):
++# 11. Regions-violators, 1981-1982.
++# Wikipedia refers to
++# http://maps.monetonos.ru/maps/raznoe/Old_Maps/Old_Maps/Articles/022/3_1981.html
++# http://besp.narod.ru/nauka_1981_3.htm
++#
++# The second link provides two articles scanned from the Nauka i Zhizn
++# magazine No. 3, 1981 and a scan of the short article attributed to
++# the Trud newspaper from February 1982.  The first link provides the
++# same Nauka i Zhizn articles converted to the text form (but misses
++# time belt changes map).
++#
++# The second Nauka i Zhizn article says that in addition to
++# introduction of summer time on 1981-04-01 there are some time belt
++# border changes on 1981-10-01, mostly affecting Nenets Autonomous
++# Okrug, Krasnoyarsk Krai, Yakutia, Magadan Oblast and Chukotka
++# according to the provided map (colored one).  In addition to that
++# "time violators" (regions which were not using rules of the time
++# belts in which they were located) would not be moving off the DST on
++# 1981-10-01 to restore the decree time usage.  (Komi ASSR was
++# supposed to repeat that move in October 1982 to account for the 2
++# hour difference.)  Map depicting "time violators" before 1981-10-01
++# is also provided.
++#
++# The article from Trud says that 1981-10-01 changes caused problems
++# and some territories would be moved to pre-1981-10-01 time by not
++# moving to summer time on 1982-04-01.  Namely: Dagestan,
++# Kabardino-Balkar, Kalmyk, Komi, Mari, Mordovian, North Ossetian,
++# Tatar, Chechen-Ingush and Chuvash ASSR, Krasnodar and Stavropol
++# krais, Arkhangelsk, Vladimir, Vologda, Voronezh, Gorky, Ivanovo,
++# Kostroma, Lipetsk, Penza, Rostov, Ryazan, Tambov, Tyumen and
++# Yaroslavl oblasts, Nenets and Evenk autonomous okrugs, Khatangsky
++# district of Taymyr Autonomous Okrug.  As a result Evenk Autonomous
++# Okrug and Khatangsky district of Taymyr Autonomous Okrug would end
++# up on Moscow+4, Tyumen Oblast on Moscow+2 and the rest on Moscow
++# time.
++#
++# http://astrozet.net/files/Zones/DOC/RU/1980-925.txt
++# attributes the 1982 changes to the Act of the Council of Ministers
++# of the USSR No. 126 from 18.02.1982.  1980-925.txt also adds
++# Udmurtia to the list of affected territories and lists Khatangsky
++# district separately from Taymyr Autonomous Okrug.  Probably erroneously.
++#
++# The affected territories are currently listed under Europe/Moscow,
++# Asia/Yekaterinburg and Asia/Krasnoyarsk.
++#
++# 12. Udmurtia
++# The fact that Udmurtia is depicted as a violator in the Nauka i
++# Zhizn article hints at Izhevsk being on different time from
++# Kuybyshev before 1981-10-01. Udmurtia is not mentioned in the 1989 act.
++# http://astrozet.net/files/Zones/DOC/RU/1980-925.txt
++# implies Udmurtia was on Moscow time after 1982-04-01.
++# Wikipedia implies Udmurtia being on Moscow+1 until 1991.
++#
++# ...
++#
++# All Russian zones are supposed to have by default a -1 change at
++# 1991-03-31 2:00 (cancellation of the decree time in the USSR) and a +1
++# change at 1992-01-19 2:00 (restoration of the decree time in Russia).
++#
++# There were some exceptions, though.
++# Wikipedia says newspapers listed Astrakhan, Saratov, Kirov, Volgograd,
++# Izhevsk, Grozny, Kazan and Samara as such exceptions for the 1992
++# change. (Different newspapers providing different lists. And some
++# lists found in the internet are quite wild.)
++#
++# And apparently some exceptions were reverted in the last moment.
++# http://www.kaliningradka.ru/site_pc/cherez/index.php?ELEMENT_ID=40091
++# says that Kaliningrad decided not to be an exception 2 days before the
++# 1991-03-31 switch and one person at
++# http://izhevsk.ru/forum_light_message/50/682597-m8369040.html
++# says he remembers that Samara opted out of the 1992-01-19 exception
++# 2 days before the switch.
++#
++#
++# From Paul Eggert (2016-03-18):
++# Given the above, we appear to be missing some Zone entries for the
++# chaotic early 1980s in Russia.  It's not clear what these entries
++# should be.  For now, sweep this under the rug and just document the
++# time in Moscow.
+ 
+ # From Vladimir Karpinsky (2014-07-08):
+ # LMT in Moscow (before Jul 3, 1916) is 2:30:17, that was defined by Moscow
+ # Observatory (coordinates: 55 deg. 45'29.70", 37 deg. 34'05.30")....
+ # LMT in Moscow since Jul 3, 1916 is 2:31:01 as a result of new standard.
+-# (The info is from the book by Byalokoz E.L. New Counting of Time in Russia
+-# since July 1, 1919, p. 18.)  The time in St. Petersburg as capital of Russia
+-# was defined by Pulkov observatory, near St. Petersburg.  In 1916 LMT Moscow
++# (The info is from the book by Byalokoz ... p. 18.)
++# The time in St. Petersburg as capital of Russia was defined by
++# Pulkov observatory, near St. Petersburg.  In 1916 LMT Moscow
+ # was synchronized with LMT St. Petersburg (+30 minutes), (Pulkov observatory
+ # coordinates: 59 deg. 46'18.70", 30 deg. 19'40.70") so 30 deg. 19'40.70" >
+ # 2h01m18.7s = 2:01:19.  LMT Moscow = LMT St.Petersburg + 30m 2:01:19 + 0:30 =
+@@ -2290,14 +2525,14 @@
+ 
+ Zone Europe/Moscow	 2:30:17 -	LMT	1880
+ 			 2:30:17 -	MMT	1916 Jul  3 # Moscow Mean Time
+-			 2:31:19 Russia	%s	1919 Jul  1 2:00
++			 2:31:19 Russia	%s	1919 Jul  1  0:00u
+ 			 3:00	Russia	%s	1921 Oct
+ 			 3:00	Russia	MSK/MSD	1922 Oct
+ 			 2:00	-	EET	1930 Jun 21
+-			 3:00	Russia	MSK/MSD	1991 Mar 31 2:00s
+-			 2:00	Russia	EE%sT	1992 Jan 19 2:00s
+-			 3:00	Russia	MSK/MSD	2011 Mar 27 2:00s
+-			 4:00	-	MSK	2014 Oct 26 2:00s
++			 3:00	Russia	MSK/MSD	1991 Mar 31  2:00s
++			 2:00	Russia	EE%sT	1992 Jan 19  2:00s
++			 3:00	Russia	MSK/MSD	2011 Mar 27  2:00s
++			 4:00	-	MSK	2014 Oct 26  2:00s
+ 			 3:00	-	MSK
+ 
+ 
+@@ -2312,7 +2547,7 @@
+ 			 3:00	-	MSK	1941 Nov
+ 			 1:00	C-Eur	CE%sT	1944 Apr 13
+ 			 3:00	Russia	MSK/MSD	1990
+-			 3:00	-	MSK	1990 Jul  1 2:00
++			 3:00	-	MSK	1990 Jul  1  2:00
+ 			 2:00	-	EET	1992
+ # Central Crimea used Moscow time 1994/1997.
+ #
+@@ -2325,12 +2560,12 @@
+ # changed in May.
+ 			 2:00	E-Eur	EE%sT	1994 May
+ # From IATA SSIM (1994/1997), which also says that Kerch is still like Kiev.
+-			 3:00	E-Eur	MSK/MSD	1996 Mar 31 3:00s
+-			 3:00	1:00	MSD	1996 Oct 27 3:00s
++			 3:00	E-Eur	MSK/MSD	1996 Mar 31  0:00s
++			 3:00	1:00	MSD	1996 Oct 27  3:00s
+ # IATA SSIM (1997-09) says Crimea switched to EET/EEST.
+ # Assume it happened in March by not changing the clocks.
+ 			 3:00	Russia	MSK/MSD	1997
+-			 3:00	-	MSK	1997 Mar lastSun 1:00u
++			 3:00	-	MSK	1997 Mar lastSun  1:00u
+ # From Alexander Krivenyshev (2014-03-17):
+ # time change at 2:00 (2am) on March 30, 2014
+ # http://vz.ru/news/2014/3/17/677464.html
+@@ -2338,113 +2573,268 @@
+ # Simferopol and Sevastopol reportedly changed their central town clocks
+ # late the previous day, but this appears to have been ceremonial
+ # and the discrepancies are small enough to not worry about.
+-			 2:00	EU	EE%sT	2014 Mar 30 2:00
+-			 4:00	-	MSK	2014 Oct 26 2:00s
++			 2:00	EU	EE%sT	2014 Mar 30  2:00
++			 4:00	-	MSK	2014 Oct 26  2:00s
+ 			 3:00	-	MSK
+ 
+ 
+-# From Tim Parenti (2014-07-03):
+-# Europe/Volgograd covers...
+-# 30	RU-AST 	Astrakhan Oblast
+-# 34	RU-VGG 	Volgograd Oblast
+-# 43	RU-KIR 	Kirov Oblast
+-# 64	RU-SAR 	Saratov Oblast
+-
+-# From Paul Eggert (2006-05-09):
+-# Shanks & Pottenger say Kirov is still at +0400 but Wikipedia says +0300.
+-# Perhaps it switched after the others?  But we have no data.
++# From Paul Eggert (2016-03-18):
++# Europe/Astrakhan covers:
++# 30	RU-AST	Astrakhan Oblast
++#
++# The 1989 transition is from USSR act No. 227 (1989-03-14).
++
++# From Alexander Krivenyshev (2016-01-12):
++# On February 10, 2016 Astrakhan Oblast got approval by the Federation
++# Council to change its time zone to UTC+4 (from current UTC+3 Moscow time)....
++# This Federal Law shall enter into force on 27 March 2016 at 02:00.
++# From Matt Johnson (2016-03-09):
++# http://publication.pravo.gov.ru/Document/View/0001201602150056
++
++Zone Europe/Astrakhan	 3:12:12 -	LMT	1924 May
++			 3:00	-	+03	1930 Jun 21
++			 4:00	Russia	+04/+05	1989 Mar 26  2:00s
++			 3:00	Russia	+03/+04	1991 Mar 31  2:00s
++			 4:00	-	+04	1992 Mar 29  2:00s
++			 3:00	Russia	+03/+04	2011 Mar 27  2:00s
++			 4:00	-	+04	2014 Oct 26  2:00s
++			 3:00	-	+03	2016 Mar 27  2:00s
++			 4:00	-	+04
++
++# From Paul Eggert (2016-03-18):
++# Europe/Volgograd covers:
++# 34	RU-VGG	Volgograd Oblast
++# 64	RU-SAR	Saratov Oblast
++# The 1988 transition is from USSR act No. 5 (1988-01-04).
+ 
+ Zone Europe/Volgograd	 2:57:40 -	LMT	1920 Jan  3
+-			 3:00	-	TSAT	1925 Apr  6 # Tsaritsyn Time
+-			 3:00	-	STAT	1930 Jun 21 # Stalingrad Time
+-			 4:00	-	STAT	1961 Nov 11
+-			 4:00	Russia	VOL%sT	1989 Mar 26 2:00s # Volgograd T
+-			 3:00	Russia	VOL%sT	1991 Mar 31 2:00s
+-			 4:00	-	VOLT	1992 Mar 29 2:00s
+-			 3:00	Russia	MSK	2011 Mar 27 2:00s
+-			 4:00	-	MSK	2014 Oct 26 2:00s
+-			 3:00	-	MSK
+-
++			 3:00	-	+03	1930 Jun 21
++			 4:00	-	+04	1961 Nov 11
++			 4:00	Russia	+04/+05	1988 Mar 27  2:00s
++			 3:00	Russia	+03/+04	1991 Mar 31  2:00s
++			 4:00	-	+04	1992 Mar 29  2:00s
++			 3:00	Russia	+03/+04	2011 Mar 27  2:00s
++			 4:00	-	+04	2014 Oct 26  2:00s
++			 3:00	-	+03
++
++# From Paul Eggert (2016-03-18):
++# Europe/Kirov covers:
++# 43	RU-KIR	Kirov Oblast
++# The 1989 transition is from USSR act No. 227 (1989-03-14).
++#
++Zone Europe/Kirov	 3:18:48 -	LMT	1919 Jul  1  0:00u
++			 3:00	-	+03	1930 Jun 21
++			 4:00	Russia	+04/+05	1989 Mar 26  2:00s
++			 3:00	Russia	+03/+04	1991 Mar 31  2:00s
++			 4:00	-	+04	1992 Mar 29  2:00s
++			 3:00	Russia	+03/+04	2011 Mar 27  2:00s
++			 4:00	-	+04	2014 Oct 26  2:00s
++			 3:00	-	+03
+ 
+ # From Tim Parenti (2014-07-03), per Oscar van Vlijmen (2001-08-25):
+ # Europe/Samara covers...
+-# 18	RU-UD 	Udmurt Republic
+-# 63	RU-SAM 	Samara Oblast
+-
+-Zone Europe/Samara	 3:20:36 -	LMT	1919 Jul  1 2:00
+-			 3:00	-	SAMT	1930 Jun 21
+-			 4:00	-	SAMT	1935 Jan 27
+-			 4:00	Russia	KUY%sT	1989 Mar 26 2:00s # Kuybyshev
+-			 3:00	Russia	MSK/MSD	1991 Mar 31 2:00s
+-			 2:00	Russia	EE%sT	1991 Sep 29 2:00s
+-			 3:00	-	KUYT	1991 Oct 20 3:00
+-			 4:00	Russia	SAM%sT	2010 Mar 28 2:00s # Samara Time
+-			 3:00	Russia	SAM%sT	2011 Mar 27 2:00s
+-			 4:00	-	SAMT
++# 18	RU-UD	Udmurt Republic
++# 63	RU-SAM	Samara Oblast
+ 
++# From Paul Eggert (2016-03-18):
++# Byalokoz 1919 says Samara was 3:20:20.
++# The 1989 transition is from USSR act No. 227 (1989-03-14).
++
++Zone Europe/Samara	 3:20:20 -	LMT	1919 Jul  1  0:00u
++			 3:00	-	+03	1930 Jun 21
++			 4:00	-	+04	1935 Jan 27
++			 4:00	Russia	+04/+05	1989 Mar 26  2:00s
++			 3:00	Russia	+03/+04	1991 Mar 31  2:00s
++			 2:00	Russia	+02/+03	1991 Sep 29  2:00s
++			 3:00	-	+03	1991 Oct 20  3:00
++			 4:00	Russia	+04/+05	2010 Mar 28  2:00s
++			 3:00	Russia	+03/+04	2011 Mar 27  2:00s
++			 4:00	-	+04
++
++# From Paul Eggert (2016-03-18):
++# Europe/Ulyanovsk covers:
++# 73	RU-ULY	Ulyanovsk Oblast
++
++# The 1989 transition is from USSR act No. 227 (1989-03-14).
++
++# From Alexander Krivenyshev (2016-02-17):
++# Ulyanovsk ... on their way to change time zones by March 27, 2016 at 2am.
++# Ulyanovsk Oblast ... from MSK to MSK+1 (UTC+3 to UTC+4) ...
++# 920582-6 ... 02/17/2016 The State Duma passed the bill in the first reading.
++# From Matt Johnson (2016-03-09):
++# http://publication.pravo.gov.ru/Document/View/0001201603090051
++
++Zone Europe/Ulyanovsk	 3:13:36 -	LMT	1919 Jul  1  0:00u
++			 3:00	-	+03	1930 Jun 21
++			 4:00	Russia	+04/+05	1989 Mar 26  2:00s
++			 3:00	Russia	+03/+04	1991 Mar 31  2:00s
++			 2:00	Russia	+02/+03	1992 Jan 19  2:00s
++			 3:00	Russia	+03/+04	2011 Mar 27  2:00s
++			 4:00	-	+04	2014 Oct 26  2:00s
++			 3:00	-	+03	2016 Mar 27  2:00s
++			 4:00	-	+04
+ 
+ # From Tim Parenti (2014-07-03), per Oscar van Vlijmen (2001-08-25):
+ # Asia/Yekaterinburg covers...
+-# 02	RU-BA 	Bashkortostan, Republic of
+-# 90	RU-PER 	Perm Krai
+-# 45	RU-KGN 	Kurgan Oblast
+-# 56	RU-ORE 	Orenburg Oblast
+-# 66	RU-SVE 	Sverdlovsk Oblast
+-# 72	RU-TYU 	Tyumen Oblast
+-# 74	RU-CHE 	Chelyabinsk Oblast
+-# 86	RU-KHM 	Khanty-Mansi Autonomous Okrug - Yugra
+-# 89	RU-YAN 	Yamalo-Nenets Autonomous Okrug
++# 02	RU-BA	Bashkortostan, Republic of
++# 90	RU-PER	Perm Krai
++# 45	RU-KGN	Kurgan Oblast
++# 56	RU-ORE	Orenburg Oblast
++# 66	RU-SVE	Sverdlovsk Oblast
++# 72	RU-TYU	Tyumen Oblast
++# 74	RU-CHE	Chelyabinsk Oblast
++# 86	RU-KHM	Khanty-Mansi Autonomous Okrug - Yugra
++# 89	RU-YAN	Yamalo-Nenets Autonomous Okrug
+ #
+ # Note: Effective 2005-12-01, (59) Perm Oblast and (81) Komi-Permyak
+ # Autonomous Okrug merged to form (90, RU-PER) Perm Krai.
+ 
+-# Milne says Yekaterinburg time was 4:02:32.9; round to nearest.
+-
+-Zone Asia/Yekaterinburg	 4:02:33 -	LMT	1919 Jul 15 4:00
+-			 4:00	-	SVET	1930 Jun 21 # Sverdlovsk Time
+-			 5:00	Russia	SVE%sT	1991 Mar 31 2:00s
+-			 4:00	Russia	SVE%sT	1992 Jan 19 2:00s
+-			 5:00	Russia	YEK%sT	2011 Mar 27 2:00s
+-			 6:00	-	YEKT	2014 Oct 26 2:00s
+-			 5:00	-	YEKT
++# Milne says Yekaterinburg was 4:02:32.9; round to nearest.
++# Byalokoz 1919 says its provincial time was based on Perm, at 3:45:05.
++# Assume it switched on 1916-07-03, the time of the new standard.
++# The 1919 and 1930 transitions are from Shanks.
++
++Zone Asia/Yekaterinburg	 4:02:33 -	LMT	1916 Jul  3
++			 3:45:05 -	PMT	1919 Jul 15  4:00
++			 4:00	-	+04	1930 Jun 21
++			 5:00	Russia	+05/+06	1991 Mar 31  2:00s
++			 4:00	Russia	+04/+05	1992 Jan 19  2:00s
++			 5:00	Russia	+05/+06	2011 Mar 27  2:00s
++			 6:00	-	+06	2014 Oct 26  2:00s
++			 5:00	-	+05
+ 
+ 
+ # From Tim Parenti (2014-07-03), per Oscar van Vlijmen (2001-08-25):
+ # Asia/Omsk covers...
+-# 04	RU-AL 	Altai Republic
+-# 22	RU-ALT 	Altai Krai
+-# 55	RU-OMS 	Omsk Oblast
+-
+-Zone Asia/Omsk		 4:53:36 -	LMT	1919 Nov 14
+-			 5:00	-	OMST	1930 Jun 21 # Omsk Time
+-			 6:00	Russia	OMS%sT	1991 Mar 31 2:00s
+-			 5:00	Russia	OMS%sT	1992 Jan 19 2:00s
+-			 6:00	Russia	OMS%sT	2011 Mar 27 2:00s
+-			 7:00	-	OMST	2014 Oct 26 2:00s
+-			 6:00	-	OMST
++# 55	RU-OMS	Omsk Oblast
+ 
++# Byalokoz 1919 says Omsk was 4:53:30.
+ 
+-# From Tim Parenti (2014-07-03):
+-# Asia/Novosibirsk covers...
+-# 54	RU-NVS 	Novosibirsk Oblast
+-# 70	RU-TOM 	Tomsk Oblast
+-
+-# From Paul Eggert (2006-08-19): I'm guessing about Tomsk here; it's
+-# not clear when it switched from +7 to +6.
+-
+-Zone Asia/Novosibirsk	 5:31:40 -	LMT	1919 Dec 14 6:00
+-			 6:00	-	NOVT	1930 Jun 21 # Novosibirsk Time
+-			 7:00	Russia	NOV%sT	1991 Mar 31 2:00s
+-			 6:00	Russia	NOV%sT	1992 Jan 19 2:00s
+-			 7:00	Russia	NOV%sT	1993 May 23 # say Shanks & P.
+-			 6:00	Russia	NOV%sT	2011 Mar 27 2:00s
+-			 7:00	-	NOVT	2014 Oct 26 2:00s
+-			 6:00	-	NOVT
++Zone Asia/Omsk		 4:53:30 -	LMT	1919 Nov 14
++			 5:00	-	+05	1930 Jun 21
++			 6:00	Russia	+06/+07	1991 Mar 31  2:00s
++			 5:00	Russia	+05/+06	1992 Jan 19  2:00s
++			 6:00	Russia	+06/+07	2011 Mar 27  2:00s
++			 7:00	-	+07	2014 Oct 26  2:00s
++			 6:00	-	+06
++
++# From Paul Eggert (2016-02-22):
++# Asia/Barnaul covers:
++# 04	RU-AL	Altai Republic
++# 22	RU-ALT	Altai Krai
++
++# Data before 1991 are from Shanks & Pottenger.
++
++# From Stepan Golosunov (2016-03-07):
++# Letter of Bank of Russia from 1995-05-25
++# http://www.bestpravo.ru/rossijskoje/lj-akty/y3a.htm
++# suggests that Altai Republic transitioned to Moscow+3 on
++# 1995-05-28.
++#
++# http://regnum.ru/news/society/1957270.html
++# has some historical data for Altai Krai:
++# before 1957: west part on UTC+6, east on UTC+7
++# after 1957: UTC+7
++# since 1995: UTC+6
++# http://barnaul.rusplt.ru/index/pochemu_altajskij_kraj_okazalsja_v_neprivychnom_chasovom_pojase-17648.html
++# confirms that and provides more details including 1995-05-28 transition date.
++
++# From Alexander Krivenyshev (2016-02-17):
++# Altai Krai and Altai Republic on their way to change time zones
++# by March 27, 2016 at 2am....
++# Altai Republic / Gorno-Altaysk MSK+3 to MSK+4 (UTC+6 to UTC+7) ...
++# Altai Krai / Barnaul MSK+3 to MSK+4 (UTC+6 to UTC+7)
++# From Matt Johnson (2016-03-09):
++# http://publication.pravo.gov.ru/Document/View/0001201603090043
++# http://publication.pravo.gov.ru/Document/View/0001201603090038
++
++Zone Asia/Barnaul	 5:35:00 -	LMT	1919 Dec 10
++			 6:00	-	+06	1930 Jun 21
++			 7:00	Russia	+07/+08	1991 Mar 31  2:00s
++			 6:00	Russia	+06/+07	1992 Jan 19  2:00s
++			 7:00	Russia	+07/+08	1995 May 28
++			 6:00	Russia	+06/+07	2011 Mar 27  2:00s
++			 7:00	-	+07	2014 Oct 26  2:00s
++			 6:00	-	+06	2016 Mar 27  2:00s
++			 7:00	-	+07
++
++# From Paul Eggert (2016-03-18):
++# Asia/Novosibirsk covers:
++# 54	RU-NVS	Novosibirsk Oblast
++
++# From Stepan Golosunov (2016-05-30):
++# http://asozd2.duma.gov.ru/main.nsf/(Spravka)?OpenAgent&RN=1085784-6
++# moves Novosibirsk oblast from UTC+6 to UTC+7.
++# From Stepan Golosunov (2016-07-04):
++# The law was signed yesterday and published today on
++# http://publication.pravo.gov.ru/Document/View/0001201607040064
++
++Zone Asia/Novosibirsk	 5:31:40 -	LMT	1919 Dec 14  6:00
++			 6:00	-	+06	1930 Jun 21
++			 7:00	Russia	+07/+08	1991 Mar 31  2:00s
++			 6:00	Russia	+06/+07	1992 Jan 19  2:00s
++			 7:00	Russia	+07/+08	1993 May 23 # say Shanks & P.
++			 6:00	Russia	+06/+07	2011 Mar 27  2:00s
++			 7:00	-	+07	2014 Oct 26  2:00s
++			 6:00	-	+06	2016 Jul 24  2:00s
++			 7:00	-	+07
++
++# From Paul Eggert (2016-03-18):
++# Asia/Tomsk covers:
++# 70	RU-TOM	Tomsk Oblast
++
++# From Stepan Golosunov (2016-03-24):
++# Byalokoz listed Tomsk at 5:39:51.
++
++# From Stanislaw A. Kuzikowski (1994-06-29):
++# Tomsk is still 4 hours ahead of Moscow.
++
++# From Stepan Golosunov (2016-03-19):
++# http://pravo.gov.ru/proxy/ips/?docbody=&nd=102075743
++# (fifth time belt being UTC+5+1(decree time)
++# / UTC+5+1(decree time)+1(summer time)) ...
++# Note that time belts (numbered from 2 (Moscow) to 12 according to their
++# GMT/UTC offset and having too many exceptions like regions formally
++# belonging to one belt but using time from another) were replaced
++# with time zones in 2011 with different numbering (there was a
++# 2-hour gap between second and third zones in 2011-2014).
++
++# From Stepan Golosunov (2016-04-12):
++# http://asozd2.duma.gov.ru/main.nsf/(SpravkaNew)?OpenAgent&RN=1006865-6
++# This bill was approved in the first reading today.  It moves Tomsk oblast
++# from UTC+6 to UTC+7 and is supposed to come into effect on 2016-05-29 at
++# 2:00.  The bill needs to be approved in the second and the third readings by
++# the State Duma, approved by the Federation Council, signed by the President
++# and published to become a law.  Minor changes in the text are to be expected
++# before the second reading (references need to be updated to account for the
++# recent changes).
++#
++# Judging by the ultra-short one-day amendments period, recent similar laws,
++# the State Duma schedule and the Federation Council schedule
++# http://www.duma.gov.ru/legislative/planning/day-shedule/por_vesna_2016/
++# http://council.gov.ru/activity/meetings/schedule/63303
++# I speculate that the final text of the bill will be proposed tomorrow, the
++# bill will be approved in the second and the third readings on Friday,
++# approved by the Federation Council on 2016-04-20, signed by the President and
++# published as a law around 2016-04-26.
++
++# From Matt Johnson (2016-04-26):
++# http://publication.pravo.gov.ru/Document/View/0001201604260048
++
++Zone	Asia/Tomsk	 5:39:51 -	LMT	1919 Dec 22
++			 6:00	-	+06	1930 Jun 21
++			 7:00	Russia	+07/+08	1991 Mar 31  2:00s
++			 6:00	Russia	+06/+07	1992 Jan 19  2:00s
++			 7:00	Russia	+07/+08	2002 May  1  3:00
++			 6:00	Russia	+06/+07	2011 Mar 27  2:00s
++			 7:00	-	+07	2014 Oct 26  2:00s
++			 6:00	-	+06	2016 May 29  2:00s
++			 7:00	-	+07
+ 
+ 
+ # From Tim Parenti (2014-07-03):
+ # Asia/Novokuznetsk covers...
+-# 42	RU-KEM 	Kemerovo Oblast
++# 42	RU-KEM	Kemerovo Oblast
+ 
+ # From Alexander Krivenyshev (2009-10-13):
+ # Kemerovo oblast' (Kemerovo region) in Russia will change current time zone on
+@@ -2452,7 +2842,7 @@
+ # from current Russia Zone 6 - Krasnoyarsk Time Zone (KRA) UTC +0700
+ # to Russia Zone 5 - Novosibirsk Time Zone (NOV) UTC +0600
+ #
+-# This is according to Government of Russia decree # 740, on September
++# This is according to Government of Russia decree No. 740, on September
+ # 14, 2009 "Application in the territory of the Kemerovo region the Fifth
+ # time zone." ("Russia Zone 5" or old "USSR Zone 5" is GMT +0600)
+ #
+@@ -2464,81 +2854,87 @@
+ #
+ # Thus, when Russia will switch to DST on the night of March 28, 2010
+ # Kemerovo region (Kemerovo oblast') will not change the clock.
+-#
+-# As a result, Kemerovo oblast' will be in the same time zone as
+-# Novosibirsk, Omsk, Tomsk, Barnaul and Altai Republic.
+ 
+ # From Tim Parenti (2014-07-02), per Alexander Krivenyshev (2014-07-02):
+ # The Kemerovo region will remain at UTC+7 through the 2014-10-26 change, thus
+ # realigning itself with KRAT.
+ 
+-Zone Asia/Novokuznetsk	 5:48:48 -	NMT	1920 Jan  6
+-			 6:00	-	KRAT	1930 Jun 21 # Krasnoyarsk Time
+-			 7:00	Russia	KRA%sT	1991 Mar 31 2:00s
+-			 6:00	Russia	KRA%sT	1992 Jan 19 2:00s
+-			 7:00	Russia	KRA%sT	2010 Mar 28 2:00s
+-			 6:00	Russia	NOV%sT	2011 Mar 27 2:00s # Novosibirsk T
+-			 7:00	-	NOVT	2014 Oct 26 2:00s
+-			 7:00	-	KRAT	# Krasnoyarsk Time
+-
++Zone Asia/Novokuznetsk	 5:48:48 -	LMT	1924 May  1
++			 6:00	-	+06	1930 Jun 21
++			 7:00	Russia	+07/+08	1991 Mar 31  2:00s
++			 6:00	Russia	+06/+07	1992 Jan 19  2:00s
++			 7:00	Russia	+07/+08	2010 Mar 28  2:00s
++			 6:00	Russia	+06/+07	2011 Mar 27  2:00s
++			 7:00	-	+07
+ 
+ # From Tim Parenti (2014-07-03), per Oscar van Vlijmen (2001-08-25):
+ # Asia/Krasnoyarsk covers...
+-# 17	RU-TY 	Tuva Republic
+-# 19	RU-KK 	Khakassia, Republic of
+-# 24	RU-KYA 	Krasnoyarsk Krai
++# 17	RU-TY	Tuva Republic
++# 19	RU-KK	Khakassia, Republic of
++# 24	RU-KYA	Krasnoyarsk Krai
+ #
+ # Note: Effective 2007-01-01, (88) Evenk Autonomous Okrug and (84) Taymyr
+ # Autonomous Okrug were merged into (24, RU-KYA) Krasnoyarsk Krai.
+ 
+-Zone Asia/Krasnoyarsk	 6:11:20 -	LMT	1920 Jan  6
+-			 6:00	-	KRAT	1930 Jun 21 # Krasnoyarsk Time
+-			 7:00	Russia	KRA%sT	1991 Mar 31 2:00s
+-			 6:00	Russia	KRA%sT	1992 Jan 19 2:00s
+-			 7:00	Russia	KRA%sT	2011 Mar 27 2:00s
+-			 8:00	-	KRAT	2014 Oct 26 2:00s
+-			 7:00	-	KRAT
++# Byalokoz 1919 says Krasnoyarsk was 6:11:26.
++
++Zone Asia/Krasnoyarsk	 6:11:26 -	LMT	1920 Jan  6
++			 6:00	-	+06	1930 Jun 21
++			 7:00	Russia	+07/+08	1991 Mar 31  2:00s
++			 6:00	Russia	+06/+07	1992 Jan 19  2:00s
++			 7:00	Russia	+07/+08	2011 Mar 27  2:00s
++			 8:00	-	+08	2014 Oct 26  2:00s
++			 7:00	-	+07
+ 
+ 
+ # From Tim Parenti (2014-07-03), per Oscar van Vlijmen (2001-08-25):
+ # Asia/Irkutsk covers...
+-# 03	RU-BU 	Buryatia, Republic of
+-# 38	RU-IRK 	Irkutsk Oblast
++# 03	RU-BU	Buryatia, Republic of
++# 38	RU-IRK	Irkutsk Oblast
+ #
+ # Note: Effective 2008-01-01, (85) Ust-Orda Buryat Autonomous Okrug was
+ # merged into (38, RU-IRK) Irkutsk Oblast.
+ 
+-# Milne says Irkutsk time was 6:57:15.
+-
+-Zone Asia/Irkutsk	 6:57:15 -	LMT	1880
+-			 6:57:15 -	IMT	1920 Jan 25 # Irkutsk Mean Time
+-			 7:00	-	IRKT	1930 Jun 21 # Irkutsk Time
+-			 8:00	Russia	IRK%sT	1991 Mar 31 2:00s
+-			 7:00	Russia	IRK%sT	1992 Jan 19 2:00s
+-			 8:00	Russia	IRK%sT	2011 Mar 27 2:00s
+-			 9:00	-	IRKT	2014 Oct 26 2:00s
+-			 8:00	-	IRKT
++# Milne 1899 says Irkutsk was 6:57:15.
++# Byalokoz 1919 says Irkutsk was 6:57:05.
++# Go with Byalokoz.
++
++Zone Asia/Irkutsk	 6:57:05 -	LMT	1880
++			 6:57:05 -	IMT	1920 Jan 25 # Irkutsk Mean Time
++			 7:00	-	+07	1930 Jun 21
++			 8:00	Russia	+08/+09	1991 Mar 31  2:00s
++			 7:00	Russia	+07/+08	1992 Jan 19  2:00s
++			 8:00	Russia	+08/+09	2011 Mar 27  2:00s
++			 9:00	-	+09	2014 Oct 26  2:00s
++			 8:00	-	+08
+ 
+ 
+ # From Tim Parenti (2014-07-06):
+ # Asia/Chita covers...
+-# 92	RU-ZAB 	Zabaykalsky Krai
++# 92	RU-ZAB	Zabaykalsky Krai
+ #
+ # Note: Effective 2008-03-01, (75) Chita Oblast and (80) Agin-Buryat
+ # Autonomous Okrug merged to form (92, RU-ZAB) Zabaykalsky Krai.
+ 
++# From Alexander Krivenyshev (2016-01-02):
++# [The] time zone in the Trans-Baikal Territory (Zabaykalsky Krai) -
++# Asia/Chita [is changing] from UTC+8 to UTC+9.  Effective date will
++# be March 27, 2016 at 2:00am....
++# http://publication.pravo.gov.ru/Document/View/0001201512300107
++
+ Zone Asia/Chita	 7:33:52 -	LMT	1919 Dec 15
+-			 8:00	-	YAKT	1930 Jun 21 # Yakutsk Time
+-			 9:00	Russia	YAK%sT	1991 Mar 31 2:00s
+-			 8:00	Russia	YAK%sT	1992 Jan 19 2:00s
+-			 9:00	Russia	YAK%sT	2011 Mar 27 2:00s
+-			10:00	-	YAKT	2014 Oct 26 2:00s
+-			 8:00	-	IRKT
++			 8:00	-	+08	1930 Jun 21
++			 9:00	Russia	+09/+10	1991 Mar 31  2:00s
++			 8:00	Russia	+08/+09	1992 Jan 19  2:00s
++			 9:00	Russia	+09/+10	2011 Mar 27  2:00s
++			10:00	-	+10	2014 Oct 26  2:00s
++			 8:00	-	+08	2016 Mar 27  2:00
++			 9:00	-	+09
+ 
+ 
+ # From Tim Parenti (2014-07-03), per Oscar van Vlijmen (2009-11-29):
+ # Asia/Yakutsk covers...
+-# 28	RU-AMU 	Amur Oblast
++# 28	RU-AMU	Amur Oblast
+ #
+ # ...and parts of (14, RU-SA) Sakha (Yakutia) Republic:
+ # 14-02	****	Aldansky District
+@@ -2570,34 +2966,38 @@
+ # Since the surrounding districts of Sakha are all YAKT, assume this is, too.
+ # Also assume its history has been the same as the rest of Asia/Yakutsk.
+ 
+-Zone Asia/Yakutsk	 8:38:40 -	LMT	1919 Dec 15
+-			 8:00	-	YAKT	1930 Jun 21 # Yakutsk Time
+-			 9:00	Russia	YAK%sT	1991 Mar 31 2:00s
+-			 8:00	Russia	YAK%sT	1992 Jan 19 2:00s
+-			 9:00	Russia	YAK%sT	2011 Mar 27 2:00s
+-			10:00	-	YAKT	2014 Oct 26 2:00s
+-			 9:00	-	YAKT
++# Byalokoz 1919 says Yakutsk was 8:38:58.
++
++Zone Asia/Yakutsk	 8:38:58 -	LMT	1919 Dec 15
++			 8:00	-	+08	1930 Jun 21
++			 9:00	Russia	+09/+10	1991 Mar 31  2:00s
++			 8:00	Russia	+08/+09	1992 Jan 19  2:00s
++			 9:00	Russia	+09/+10	2011 Mar 27  2:00s
++			10:00	-	+10	2014 Oct 26  2:00s
++			 9:00	-	+09
+ 
+ 
+ # From Tim Parenti (2014-07-03), per Oscar van Vlijmen (2009-11-29):
+ # Asia/Vladivostok covers...
+-# 25	RU-PRI 	Primorsky Krai
+-# 27	RU-KHA 	Khabarovsk Krai
+-# 79	RU-YEV 	Jewish Autonomous Oblast
++# 25	RU-PRI	Primorsky Krai
++# 27	RU-KHA	Khabarovsk Krai
++# 79	RU-YEV	Jewish Autonomous Oblast
+ #
+ # ...and parts of (14, RU-SA) Sakha (Yakutia) Republic:
+ # 14-09	****	Verkhoyansky District
+ # 14-31	****	Ust-Yansky District
+ 
+-# Milne says Vladivostok time was 8:47:33.5; round to nearest.
+-
+-Zone Asia/Vladivostok	 8:47:34 -	LMT	1922 Nov 15
+-			 9:00	-	VLAT	1930 Jun 21 # Vladivostok Time
+-			10:00	Russia	VLA%sT	1991 Mar 31 2:00s
+-			 9:00	Russia	VLA%sT	1992 Jan 19 2:00s
+-			10:00	Russia	VLA%sT	2011 Mar 27 2:00s
+-			11:00	-	VLAT	2014 Oct 26 2:00s
+-			10:00	-	VLAT
++# Milne 1899 says Vladivostok was 8:47:33.5.
++# Byalokoz 1919 says Vladivostok was 8:47:31.
++# Go with Byalokoz.
++
++Zone Asia/Vladivostok	 8:47:31 -	LMT	1922 Nov 15
++			 9:00	-	+09	1930 Jun 21
++			10:00	Russia	+10/+11	1991 Mar 31  2:00s
++			 9:00	Russia	+09/+10	1992 Jan 19  2:00s
++			10:00	Russia	+10/+11	2011 Mar 27  2:00s
++			11:00	-	+11	2014 Oct 26  2:00s
++			10:00	-	+10
+ 
+ 
+ # From Tim Parenti (2014-07-03):
+@@ -2615,37 +3015,42 @@
+ # This transition is no doubt wrong, but we have no better info.
+ 
+ Zone Asia/Khandyga	 9:02:13 -	LMT	1919 Dec 15
+-			 8:00	-	YAKT	1930 Jun 21 # Yakutsk Time
+-			 9:00	Russia	YAK%sT	1991 Mar 31 2:00s
+-			 8:00	Russia	YAK%sT	1992 Jan 19 2:00s
+-			 9:00	Russia	YAK%sT	2004
+-			10:00	Russia	VLA%sT	2011 Mar 27 2:00s
+-			11:00	-	VLAT	2011 Sep 13 0:00s # Decree 725?
+-			10:00	-	YAKT	2014 Oct 26 2:00s
+-			 9:00	-	YAKT
++			 8:00	-	+08	1930 Jun 21
++			 9:00	Russia	+09/+10	1991 Mar 31  2:00s
++			 8:00	Russia	+08/+09	1992 Jan 19  2:00s
++			 9:00	Russia	+09/+10	2004
++			10:00	Russia	+10/+11	2011 Mar 27  2:00s
++			11:00	-	+11	2011 Sep 13  0:00s # Decree 725?
++			10:00	-	+10	2014 Oct 26  2:00s
++			 9:00	-	+09
+ 
+ 
+ # From Tim Parenti (2014-07-03):
+ # Asia/Sakhalin covers...
+-# 65	RU-SAK 	Sakhalin Oblast
++# 65	RU-SAK	Sakhalin Oblast
+ # ...with the exception of:
+ # 65-11	****	Severo-Kurilsky District (North Kuril Islands)
+ 
++# From Matt Johnson (2016-02-22):
++# Asia/Sakhalin is moving (in entirety) from UTC+10 to UTC+11 ...
++# (2016-03-09):
++# http://publication.pravo.gov.ru/Document/View/0001201603090044
++
+ # The Zone name should be Asia/Yuzhno-Sakhalinsk, but that's too long.
+ Zone Asia/Sakhalin	 9:30:48 -	LMT	1905 Aug 23
+-			 9:00	-	JCST	1937 Oct  1
+-			 9:00	-	JST	1945 Aug 25
+-			11:00	Russia	SAK%sT	1991 Mar 31 2:00s # Sakhalin T.
+-			10:00	Russia	SAK%sT	1992 Jan 19 2:00s
+-			11:00	Russia	SAK%sT	1997 Mar lastSun 2:00s
+-			10:00	Russia	SAK%sT	2011 Mar 27 2:00s
+-			11:00	-	SAKT	2014 Oct 26 2:00s
+-			10:00	-	SAKT
++			 9:00	-	+09	1945 Aug 25
++			11:00	Russia	+11/+12	1991 Mar 31  2:00s # Sakhalin T
++			10:00	Russia	+10/+11	1992 Jan 19  2:00s
++			11:00	Russia	+11/+12	1997 Mar lastSun  2:00s
++			10:00	Russia	+10/+11	2011 Mar 27  2:00s
++			11:00	-	+11	2014 Oct 26  2:00s
++			10:00	-	+10	2016 Mar 27  2:00s
++			11:00	-	+11
+ 
+ 
+ # From Tim Parenti (2014-07-03), per Oscar van Vlijmen (2009-11-29):
+ # Asia/Magadan covers...
+-# 49	RU-MAG 	Magadan Oblast
++# 49	RU-MAG	Magadan Oblast
+ 
+ # From Tim Parenti (2014-07-06), per Alexander Krivenyshev (2014-07-02):
+ # Magadan Oblast is moving from UTC+12 to UTC+10 on 2014-10-26; however,
+@@ -2654,13 +3059,22 @@
+ # until now by Asia/Magadan, will instead move to UTC+11.  These regions will
+ # need their own zone.
+ 
++# From Alexander Krivenyshev (2016-03-27):
++# ... draft bill 948300-6 to change its time zone from UTC+10 to UTC+11 ...
++# will take ... effect ... on April 24, 2016 at 2 o'clock
++#
++# From Matt Johnson (2016-04-05):
++# ... signed by the President today ...
++# http://publication.pravo.gov.ru/Document/View/0001201604050038
++
+ Zone Asia/Magadan	10:03:12 -	LMT	1924 May  2
+-			10:00	-	MAGT	1930 Jun 21 # Magadan Time
+-			11:00	Russia	MAG%sT	1991 Mar 31 2:00s
+-			10:00	Russia	MAG%sT	1992 Jan 19 2:00s
+-			11:00	Russia	MAG%sT	2011 Mar 27 2:00s
+-			12:00	-	MAGT	2014 Oct 26 2:00s
+-			10:00	-	MAGT
++			10:00	-	+10	1930 Jun 21 # Magadan Time
++			11:00	Russia	+11/+12	1991 Mar 31  2:00s
++			10:00	Russia	+10/+11	1992 Jan 19  2:00s
++			11:00	Russia	+11/+12	2011 Mar 27  2:00s
++			12:00	-	+12	2014 Oct 26  2:00s
++			10:00	-	+10	2016 Apr 24  2:00s
++			11:00	-	+11
+ 
+ 
+ # From Tim Parenti (2014-07-06):
+@@ -2703,17 +3117,14 @@
+ # in Russian.)  In addition, Srednekolymsk appears to be a much older
+ # settlement and the population of Zyryanka seems to be declining.
+ # Go with Srednekolymsk.
+-#
+-# Since Magadan Oblast moves to UTC+10 on 2014-10-26, we cannot keep using MAGT
+-# as the abbreviation.  Use SRET instead.
+ 
+ Zone Asia/Srednekolymsk	10:14:52 -	LMT	1924 May  2
+-			10:00	-	MAGT	1930 Jun 21 # Magadan Time
+-			11:00	Russia	MAG%sT	1991 Mar 31 2:00s
+-			10:00	Russia	MAG%sT	1992 Jan 19 2:00s
+-			11:00	Russia	MAG%sT	2011 Mar 27 2:00s
+-			12:00	-	MAGT	2014 Oct 26 2:00s
+-			11:00	-	SRET # Srednekolymsk Time
++			10:00	-	+10	1930 Jun 21
++			11:00	Russia	+11/+12	1991 Mar 31  2:00s
++			10:00	Russia	+10/+11	1992 Jan 19  2:00s
++			11:00	Russia	+11/+12	2011 Mar 27  2:00s
++			12:00	-	+12	2014 Oct 26  2:00s
++			11:00	-	+11
+ 
+ 
+ # From Tim Parenti (2014-07-03):
+@@ -2731,19 +3142,19 @@
+ # UTC+12 since at least then, too.
+ 
+ Zone Asia/Ust-Nera	 9:32:54 -	LMT	1919 Dec 15
+-			 8:00	-	YAKT	1930 Jun 21 # Yakutsk Time
+-			 9:00	Russia	YAKT	1981 Apr  1
+-			11:00	Russia	MAG%sT	1991 Mar 31 2:00s
+-			10:00	Russia	MAG%sT	1992 Jan 19 2:00s
+-			11:00	Russia	MAG%sT	2011 Mar 27 2:00s
+-			12:00	-	MAGT	2011 Sep 13 0:00s # Decree 725?
+-			11:00	-	VLAT	2014 Oct 26 2:00s
+-			10:00	-	VLAT
++			 8:00	-	+08	1930 Jun 21
++			 9:00	Russia	+09/+10	1981 Apr  1
++			11:00	Russia	+11/+12	1991 Mar 31  2:00s
++			10:00	Russia	+10/+11	1992 Jan 19  2:00s
++			11:00	Russia	+11/+12	2011 Mar 27  2:00s
++			12:00	-	+12	2011 Sep 13  0:00s # Decree 725?
++			11:00	-	+11	2014 Oct 26  2:00s
++			10:00	-	+10
+ 
+ 
+ # From Tim Parenti (2014-07-03), per Oscar van Vlijmen (2001-08-25):
+ # Asia/Kamchatka covers...
+-# 91	RU-KAM 	Kamchatka Krai
++# 91	RU-KAM	Kamchatka Krai
+ #
+ # Note: Effective 2007-07-01, (41) Kamchatka Oblast and (82) Koryak
+ # Autonomous Okrug merged to form (91, RU-KAM) Kamchatka Krai.
+@@ -2751,26 +3162,26 @@
+ # The Zone name should be Asia/Petropavlovsk-Kamchatski or perhaps
+ # Asia/Petropavlovsk-Kamchatsky, but these are too long.
+ Zone Asia/Kamchatka	10:34:36 -	LMT	1922 Nov 10
+-			11:00	-	PETT	1930 Jun 21 # P-K Time
+-			12:00	Russia	PET%sT	1991 Mar 31 2:00s
+-			11:00	Russia	PET%sT	1992 Jan 19 2:00s
+-			12:00	Russia	PET%sT	2010 Mar 28 2:00s
+-			11:00	Russia	PET%sT	2011 Mar 27 2:00s
+-			12:00	-	PETT
++			11:00	-	+11	1930 Jun 21
++			12:00	Russia	+12/+13	1991 Mar 31  2:00s
++			11:00	Russia	+11/+12	1992 Jan 19  2:00s
++			12:00	Russia	+12/+13	2010 Mar 28  2:00s
++			11:00	Russia	+11/+12	2011 Mar 27  2:00s
++			12:00	-	+12
+ 
+ 
+ # From Tim Parenti (2014-07-03):
+ # Asia/Anadyr covers...
+-# 87	RU-CHU 	Chukotka Autonomous Okrug
++# 87	RU-CHU	Chukotka Autonomous Okrug
+ 
+ Zone Asia/Anadyr	11:49:56 -	LMT	1924 May  2
+-			12:00	-	ANAT	1930 Jun 21 # Anadyr Time
+-			13:00	Russia	ANA%sT	1982 Apr  1 0:00s
+-			12:00	Russia	ANA%sT	1991 Mar 31 2:00s
+-			11:00	Russia	ANA%sT	1992 Jan 19 2:00s
+-			12:00	Russia	ANA%sT	2010 Mar 28 2:00s
+-			11:00	Russia	ANA%sT	2011 Mar 27 2:00s
+-			12:00	-	ANAT
++			12:00	-	+12	1930 Jun 21
++			13:00	Russia	+13/+14	1982 Apr  1  0:00s
++			12:00	Russia	+12/+13	1991 Mar 31  2:00s
++			11:00	Russia	+11/+12	1992 Jan 19  2:00s
++			12:00	Russia	+12/+13	2010 Mar 28  2:00s
++			11:00	Russia	+11/+12	2011 Mar 27  2:00s
++			12:00	-	+12
+ 
+ 
+ # San Marino
+@@ -2781,7 +3192,7 @@
+ Zone	Europe/Belgrade	1:22:00	-	LMT	1884
+ 			1:00	-	CET	1941 Apr 18 23:00
+ 			1:00	C-Eur	CE%sT	1945
+-			1:00	-	CET	1945 May 8 2:00s
++			1:00	-	CET	1945 May  8  2:00s
+ 			1:00	1:00	CEST	1945 Sep 16  2:00s
+ # Metod Koželj reports that the legal date of
+ # transition to EU rules was 1982-11-27, for all of Yugoslavia at the time.
+@@ -2861,13 +3272,13 @@
+ 			 0:00	1:00	WEST	1918 Oct  7 23:00
+ 			 0:00	-	WET	1924
+ 			 0:00	Spain	WE%sT	1929
+-			 0:00 SpainAfrica WE%sT 1984 Mar 16
++			 0:00 SpainAfrica WE%sT	1984 Mar 16
+ 			 1:00	-	CET	1986
+ 			 1:00	EU	CE%sT
+ Zone	Atlantic/Canary	-1:01:36 -	LMT	1922 Mar # Las Palmas de Gran C.
+-			-1:00	-	CANT	1946 Sep 30 1:00 # Canaries Time
+-			 0:00	-	WET	1980 Apr  6 0:00s
+-			 0:00	1:00	WEST	1980 Sep 28 0:00s
++			-1:00	-	CANT	1946 Sep 30  1:00 # Canaries T
++			 0:00	-	WET	1980 Apr  6  0:00s
++			 0:00	1:00	WEST	1980 Sep 28  1:00u
+ 			 0:00	EU	WE%sT
+ # IATA SSIM (1996-09) says the Canaries switch at 2:00u, not 1:00u.
+ # Ignore this for now, as the Canaries are part of the EU.
+@@ -2920,9 +3331,9 @@
+ 
+ # Zone	NAME		GMTOFF	RULES	FORMAT	[UNTIL]
+ Zone Europe/Stockholm	1:12:12 -	LMT	1879 Jan  1
+-			1:00:14	-	SET	1900 Jan  1	# Swedish Time
++			1:00:14	-	SET	1900 Jan  1 # Swedish Time
+ 			1:00	-	CET	1916 May 14 23:00
+-			1:00	1:00	CEST	1916 Oct  1 01:00
++			1:00	1:00	CEST	1916 Oct  1  1:00
+ 			1:00	-	CET	1980
+ 			1:00	EU	CE%sT
+ 
+@@ -2991,7 +3402,7 @@
+ 
+ # From Pierre-Yves Berger (2013-09-11):
+ # the "Circulaire du conseil fédéral" (December 11 1893)
+-# <http://www.amtsdruckschriften.bar.admin.ch/viewOrigDoc.do?id=10071353> ...
++# http://www.amtsdruckschriften.bar.admin.ch/viewOrigDoc.do?id=10071353
+ # clearly states that the [1894-06-01] change should be done at midnight
+ # but if no one is present after 11 at night, could be postponed until one
+ # hour before the beginning of service.
+@@ -3023,28 +3434,30 @@
+ Rule	Swiss	1941	1942	-	Oct	Mon>=1	2:00	0	-
+ # Zone	NAME		GMTOFF	RULES	FORMAT	[UNTIL]
+ Zone	Europe/Zurich	0:34:08 -	LMT	1853 Jul 16 # See above comment.
+-			0:29:46	-	BMT	1894 Jun # Bern Mean Time
++			0:29:46	-	BMT	1894 Jun    # Bern Mean Time
+ 			1:00	Swiss	CE%sT	1981
+ 			1:00	EU	CE%sT
+ 
+ # Turkey
+ 
+-# From Amar Devegowda (2007-01-03):
+-# The time zone rules for Istanbul, Turkey have not been changed for years now.
+-# ... The latest rules are available at:
+-# http://www.timeanddate.com/worldclock/timezone.html?n=107
+-# From Steffen Thorsen (2007-01-03):
+-# I have been able to find press records back to 1996 which all say that
+-# DST started 01:00 local time and end at 02:00 local time.  I am not sure
+-# what happened before that.  One example for each year from 1996 to 2001:
+-# http://newspot.byegm.gov.tr/arsiv/1996/21/N4.htm
+-# http://www.byegm.gov.tr/YAYINLARIMIZ/CHR/ING97/03/97X03X25.TXT
+-# http://www.byegm.gov.tr/YAYINLARIMIZ/CHR/ING98/03/98X03X02.HTM
+-# http://www.byegm.gov.tr/YAYINLARIMIZ/CHR/ING99/10/99X10X26.HTM#%2016
+-# http://www.byegm.gov.tr/YAYINLARIMIZ/CHR/ING2000/03/00X03X06.HTM#%2021
+-# http://www.byegm.gov.tr/YAYINLARIMIZ/CHR/ING2001/03/23x03x01.HTM#%2027
+-# From Paul Eggert (2007-01-03):
+-# Prefer the above source to Shanks & Pottenger for time stamps after 1990.
++# From Kıvanç Yazan (2016-09-25):
++# 1) For 1986-2006, DST started at 01:00 local and ended at 02:00 local, with
++#    no exceptions.
++# 2) 1994's lastSun was overridden with Mar 20 ...
++# Here are official papers:
++# http://www.resmigazete.gov.tr/arsiv/19032.pdf  - page 2 for 1986
++# http://www.resmigazete.gov.tr/arsiv/19400.pdf  - page 4 for 1987
++# http://www.resmigazete.gov.tr/arsiv/19752.pdf  - page 15 for 1988
++# http://www.resmigazete.gov.tr/arsiv/20102.pdf  - page 6 for 1989
++# http://www.resmigazete.gov.tr/arsiv/20464.pdf  - page 1 for 1990 - 1992
++# http://www.resmigazete.gov.tr/arsiv/21531.pdf  - page 15 for 1993 - 1995
++# http://www.resmigazete.gov.tr/arsiv/21879.pdf  - page 1 for overriding 1994
++# http://www.resmigazete.gov.tr/arsiv/22588.pdf  - page 1 for 1996, 1997
++# http://www.resmigazete.gov.tr/arsiv/23286.pdf  - page 10 for 1998 - 2000
++# http://www.resmigazete.gov.tr/eskiler/2001/03/20010324.htm#2  - for 2001
++# http://www.resmigazete.gov.tr/eskiler/2002/03/20020316.htm#2  - for 2002-2006
++# From Paul Eggert (2016-09-25):
++# Prefer the above sources to Shanks & Pottenger for time stamps after 1985.
+ 
+ # From Steffen Thorsen (2007-03-09):
+ # Starting 2007 though, it seems that they are adopting EU's 1:00 UTC
+@@ -3080,6 +3493,25 @@
+ # http://www.balkaneu.com/eventful-elections-turkey/ 2014-03-30.
+ # I guess the best we can do is document the official time.
+ 
++# From Fatih (2015-09-29):
++# It's officially announced now by the Ministry of Energy.
++# Turkey delays winter time to 8th of November 04:00
++# http://www.aa.com.tr/tr/turkiye/yaz-saati-uygulamasi-8-kasimda-sona-erecek/362217
++#
++# From BBC News (2015-10-25):
++# Confused Turks are asking "what's the time?" after automatic clocks defied a
++# government decision ... "For the next two weeks #Turkey is on EEST... Erdogan
++# Engineered Standard Time," said Twitter user @aysekarahasan.
++# http://www.bbc.com/news/world-europe-34631326
++
++# From Burak AYDIN (2016-09-08):
++# Turkey will stay in Daylight Saving Time even in winter....
++# http://www.resmigazete.gov.tr/eskiler/2016/09/20160908-2.pdf
++#
++# From Paul Eggert (2016-09-07):
++# The change is permanent, so this is the new standard time in Turkey.
++# It takes effect today, which is not much notice.
++
+ # Rule	NAME	FROM	TO	TYPE	IN	ON	AT	SAVE	LETTER/S
+ Rule	Turkey	1916	only	-	May	 1	0:00	1:00	S
+ Rule	Turkey	1916	only	-	Oct	 1	0:00	0	-
+@@ -3134,22 +3566,25 @@
+ Rule	Turkey	1983	only	-	Oct	 2	0:00	0	-
+ Rule	Turkey	1985	only	-	Apr	20	0:00	1:00	S
+ Rule	Turkey	1985	only	-	Sep	28	0:00	0	-
+-Rule	Turkey	1986	1990	-	Mar	lastSun	2:00s	1:00	S
+-Rule	Turkey	1986	1990	-	Sep	lastSun	2:00s	0	-
+-Rule	Turkey	1991	2006	-	Mar	lastSun	1:00s	1:00	S
+-Rule	Turkey	1991	1995	-	Sep	lastSun	1:00s	0	-
++Rule	Turkey	1986	1993	-	Mar	lastSun	1:00s	1:00	S
++Rule	Turkey	1986	1995	-	Sep	lastSun	1:00s	0	-
++Rule	Turkey	1994	only	-	Mar	20	1:00s	1:00	S
++Rule	Turkey	1995	2006	-	Mar	lastSun	1:00s	1:00	S
+ Rule	Turkey	1996	2006	-	Oct	lastSun	1:00s	0	-
+ # Zone	NAME		GMTOFF	RULES	FORMAT	[UNTIL]
+ Zone	Europe/Istanbul	1:55:52 -	LMT	1880
+ 			1:56:56	-	IMT	1910 Oct # Istanbul Mean Time?
+ 			2:00	Turkey	EE%sT	1978 Oct 15
+-			3:00	Turkey	TR%sT	1985 Apr 20 # Turkey Time
++			3:00	Turkey	+03/+04	1985 Apr 20
+ 			2:00	Turkey	EE%sT	2007
+-			2:00	EU	EE%sT	2011 Mar 27 1:00u
+-			2:00	-	EET	2011 Mar 28 1:00u
+-			2:00	EU	EE%sT	2014 Mar 30 1:00u
+-			2:00	-	EET	2014 Mar 31 1:00u
+-			2:00	EU	EE%sT
++			2:00	EU	EE%sT	2011 Mar 27  1:00u
++			2:00	-	EET	2011 Mar 28  1:00u
++			2:00	EU	EE%sT	2014 Mar 30  1:00u
++			2:00	-	EET	2014 Mar 31  1:00u
++			2:00	EU	EE%sT	2015 Oct 25  1:00u
++			2:00	1:00	EEST	2015 Nov  8  1:00u
++			2:00	EU	EE%sT	2016 Sep  7
++			3:00	-	+03
+ Link	Europe/Istanbul	Asia/Istanbul	# Istanbul is in both continents.
+ 
+ # Ukraine
+@@ -3157,7 +3592,7 @@
+ # From Igor Karpov, who works for the Ukrainian Ministry of Justice,
+ # via Garrett Wollman (2003-01-27):
+ # BTW, I've found the official document on this matter. It's government
+-# regulations number 509, May 13, 1996. In my poor translation it says:
++# regulations No. 509, May 13, 1996. In my poor translation it says:
+ # "Time in Ukraine is set to second timezone (Kiev time). Each last Sunday
+ # of March at 3am the time is changing to 4am and each last Sunday of
+ # October the time at 4am is changing to 3am"
+@@ -3166,7 +3601,7 @@
+ # On September 20, 2011 the deputies of the Verkhovna Rada agreed to
+ # abolish the transfer clock to winter time.
+ #
+-# Bill number 8330 of MP from the Party of Regions Oleg Nadoshi got
++# Bill No. 8330 of MP from the Party of Regions Oleg Nadoshi got
+ # approval from 266 deputies.
+ #
+ # Ukraine abolishes transfer back to the winter time (in Russian)
+@@ -3230,8 +3665,8 @@
+ 			2:00	-	EET	1930 Jun 21
+ 			3:00	-	MSK	1941 Sep 20
+ 			1:00	C-Eur	CE%sT	1943 Nov  6
+-			3:00	Russia	MSK/MSD	1990 Jul  1 2:00
+-			2:00	1:00	EEST	1991 Sep 29 3:00
++			3:00	Russia	MSK/MSD	1990 Jul  1  2:00
++			2:00	1:00	EEST	1991 Sep 29  3:00
+ 			2:00	E-Eur	EE%sT	1995
+ 			2:00	EU	EE%sT
+ # Ruthenia used CET 1990/1991.
+@@ -3243,8 +3678,8 @@
+ 			1:00	1:00	CEST	1944 Oct 26
+ 			1:00	-	CET	1945 Jun 29
+ 			3:00	Russia	MSK/MSD	1990
+-			3:00	-	MSK	1990 Jul  1 2:00
+-			1:00	-	CET	1991 Mar 31 3:00
++			3:00	-	MSK	1990 Jul  1  2:00
++			1:00	-	CET	1991 Mar 31  3:00
+ 			2:00	-	EET	1992
+ 			2:00	E-Eur	EE%sT	1995
+ 			2:00	EU	EE%sT
+@@ -3258,7 +3693,7 @@
+ 			2:00	-	EET	1930 Jun 21
+ 			3:00	-	MSK	1941 Aug 25
+ 			1:00	C-Eur	CE%sT	1943 Oct 25
+-			3:00	Russia	MSK/MSD	1991 Mar 31 2:00
++			3:00	Russia	MSK/MSD	1991 Mar 31  2:00
+ 			2:00	E-Eur	EE%sT	1995
+ 			2:00	EU	EE%sT
+ 
+@@ -3284,7 +3719,7 @@
+ # ...
+ #
+ # ...the European time rules are...standardized since 1981, when
+-# most European coun[tr]ies started DST.  Before that year, only
++# most European countries started DST.  Before that year, only
+ # a few countries (UK, France, Italy) had DST, each according
+ # to own national rules.  In 1981, however, DST started on
+ # 'Apr firstSun', and not on 'Mar lastSun' as in the following
+--- contrib/tzdata/factory.orig
++++ contrib/tzdata/factory
+@@ -1,9 +1,10 @@
+ # This file is in the public domain, so clarified as of
+ # 2009-05-17 by Arthur David Olson.
+ 
+-# For companies who don't want to put time zone specification in
+-# their installation procedures.  When users run date, they'll get the message.
+-# Also useful for the "comp.sources" version.
++# For distributors who don't want to put time zone specification in
++# their installation procedures.  Users that run 'date' will get the
++# time zone abbreviation "-00", indicating that the actual time zone
++# is unknown.
+ 
+ # Zone	NAME	GMTOFF	RULES	FORMAT
+ Zone	Factory	0	- "Local time zone must be set--use tzsetup"
+--- contrib/tzdata/leap-seconds.list.orig
++++ contrib/tzdata/leap-seconds.list
+@@ -47,7 +47,7 @@
+ #	and can be ignored for many purposes. These differences
+ #	are tabulated in Circular T, which is published monthly
+ #	by the International Bureau of Weights and Measures
+-#	(BIPM). See www.bipm.fr for more information.
++#	(BIPM). See www.bipm.org for more information.
+ #
+ #	3. The current definition of the relationship between UTC
+ #	and TAI dates from 1 January 1972. A number of different
+@@ -127,6 +127,15 @@
+ #	with, since the difficulty of unambiguously representing the epoch
+ #	during the leap second does not arise.
+ #
++#	Some systems implement leap seconds by amortizing the leap second
++#	over the last few minutes of the day. The frequency of the local
++#	clock is decreased (or increased) to realize the positive (or
++#	negative) leap second. This method removes the time step described
++#	above. Although the long-term behavior of the time scale is correct
++#	in this case, this method introduces an error during the adjustment
++#	period both in time and in frequency with respect to the official
++#	definition of UTC.
++#
+ #	Questions or comments to:
+ #		Judah Levine
+ #		Time and Frequency Division
+@@ -134,7 +143,7 @@
+ #		Boulder, Colorado
+ #		Judah.Levine@nist.gov
+ #
+-#	Last Update of leap second values:   11 January 2012
++#	Last Update of leap second values:   8 July 2016
+ #
+ #	The following line shows this last update date in NTP timestamp
+ #	format. This is the date on which the most recent change to
+@@ -142,7 +151,7 @@
+ #	be identified by the unique pair of characters in the first two
+ #	columns as shown below.
+ #
+-#$	 3535228800
++#$	 3676924800
+ #
+ #	The NTP timestamps are in units of seconds since the NTP epoch,
+ #	which is 1 January 1900, 00:00:00. The Modified Julian Day number
+@@ -190,10 +199,10 @@
+ #	current -- the update time stamp, the data and the name of the file
+ #	will not change.
+ #
+-#	Updated through IERS Bulletin C48
+-#	File expires on:  28 June 2015
++#	Updated through IERS Bulletin C52
++#	File expires on:  28 June 2017
+ #
+-#@	3644438400
++#@	3707596800
+ #
+ 2272060800	10	# 1 Jan 1972
+ 2287785600	11	# 1 Jul 1972
+@@ -221,6 +230,8 @@
+ 3345062400	33	# 1 Jan 2006
+ 3439756800	34	# 1 Jan 2009
+ 3550089600	35	# 1 Jul 2012
++3644697600	36	# 1 Jul 2015
++3692217600	37	# 1 Jan 2017
+ #
+ #	the following special comment contains the
+ #	hash value of the data in this file computed
+@@ -236,4 +247,4 @@
+ #	the hash line is also ignored in the
+ #	computation.
+ #
+-#h	a4862ccd c6f43c6 964f3604 85944a26 b5cfad4e
++#h	dacf2c42 2c4765d6 3c797af8 2cf630eb 699c8c67
+--- contrib/tzdata/leapseconds.orig
++++ contrib/tzdata/leapseconds
+@@ -48,6 +48,7 @@
+ Leap	2005	Dec	31	23:59:60	+	S
+ Leap	2008	Dec	31	23:59:60	+	S
+ Leap	2012	Jun	30	23:59:60	+	S
++Leap	2016	Dec	31	23:59:60	+	S
+ 
+ # INTERNATIONAL EARTH ROTATION AND REFERENCE SYSTEMS SERVICE (IERS)
+ #
+--- contrib/tzdata/leapseconds.awk.orig
++++ contrib/tzdata/leapseconds.awk
+@@ -0,0 +1,76 @@
++# Generate the 'leapseconds' file from 'leap-seconds.list'.
++
++# This file is in the public domain.
++
++BEGIN {
++  print "# Allowance for leap seconds added to each time zone file."
++  print ""
++  print "# This file is in the public domain."
++  print ""
++  print "# This file is generated automatically from the data in the public-domain"
++  print "# leap-seconds.list file available from most NIST time servers."
++  print "# If the URL <ftp://time.nist.gov/pub/leap-seconds.list> does not work,"
++  print "# you should be able to pick up leap-seconds.list from a secondary NIST server."
++  print "# See <http://tf.nist.gov/tf-cgi/servers.cgi> for a list of secondary servers."
++  print "# For more about leap-seconds.list, please see"
++  print "# The NTP Timescale and Leap Seconds"
++  print "# http://www.eecis.udel.edu/~mills/leap.html"
++  print ""
++  print "# The International Earth Rotation and Reference Systems Service"
++  print "# periodically uses leap seconds to keep UTC to within 0.9 s of UT1"
++  print "# (which measures the true angular orientation of the earth in space); see"
++  print "# Terry J Quinn, The BIPM and the accurate measure of time,"
++  print "# Proc IEEE 79, 7 (July 1991), 894-905 <http://dx.doi.org/10.1109/5.84965>."
++  print "# There were no leap seconds before 1972, because the official mechanism"
++  print "# accounting for the discrepancy between atomic time and the earth's rotation"
++  print "# did not exist until the early 1970s."
++  print ""
++  print "# The correction (+ or -) is made at the given time, so lines"
++  print "# will typically look like:"
++  print "#	Leap	YEAR	MON	DAY	23:59:60	+	R/S"
++  print "# or"
++  print "#	Leap	YEAR	MON	DAY	23:59:59	-	R/S"
++  print ""
++  print "# If the leapsecond is Rolling (R) the given time is local time."
++  print "# If the leapsecond is Stationary (S) the given time is UTC."
++  print ""
++  print "# Leap	YEAR	MONTH	DAY	HH:MM:SS	CORR	R/S"
++}
++
++/^ *$/ { next }
++
++/^#\tUpdated through/ || /^#\tFile expires on:/ {
++    last_lines = last_lines $0 "\n"
++}
++
++/^#/ { next }
++
++{
++    NTP_timestamp = $1
++    TAI_minus_UTC = $2
++    hash_mark = $3
++    one = $4
++    month = $5
++    year = $6
++    if (old_TAI_minus_UTC) {
++	if (old_TAI_minus_UTC < TAI_minus_UTC) {
++	    sign = "23:59:60\t+"
++	} else {
++	    sign = "23:59:59\t-"
++	}
++	if (month == "Jan") {
++	    year--;
++	    month = "Dec";
++	    day = 31
++	} else if (month == "Jul") {
++	    month = "Jun";
++	    day = 30
++	}
++	printf "Leap\t%s\t%s\t%s\t%s\tS\n", year, month, day, sign
++    }
++    old_TAI_minus_UTC = TAI_minus_UTC
++}
++
++END {
++    printf "\n%s", last_lines
++}
++native
+\ No newline at end of property
++FreeBSD=%H
+\ No newline at end of property
++text/plain
+\ No newline at end of property
+--- contrib/tzdata/northamerica.orig
++++ contrib/tzdata/northamerica
+@@ -3,9 +3,10 @@
+ 
+ # also includes Central America and the Caribbean
+ 
+-# This data is by no means authoritative; if you think you know better,
++# This file is by no means authoritative; if you think you know better,
+ # go ahead and edit the file (and please send any changes to
+-# tz@iana.org for general use in the future).
++# tz@iana.org for general use in the future).  For more, please see
++# the file CONTRIBUTING in the tz distribution.
+ 
+ # From Paul Eggert (1999-03-22):
+ # A reliable and entertaining source about time zones is
+@@ -23,8 +24,32 @@
+ # was the result of his proposals at the Convention of Railroad Trunk Lines
+ # in New York City (1869-10).  His 1870 proposal was based on Washington, DC,
+ # but in 1872-05 he moved the proposed origin to Greenwich.
+-# His proposal was adopted by the railroads on 1883-11-18 at 12:00,
+-# and the most of the country soon followed suit.
++
++# From Paul Eggert (2016-09-21):
++# Dowd's proposal left many details unresolved, such as where to draw
++# lines between time zones.  The key individual who made time zones
++# work in the US was William Frederick Allen - railway engineer,
++# managing editor of the Travelers' Guide, and secretary of the
++# General Time Convention, a railway standardization group.  Allen
++# spent months in dialogs with scientific and railway leaders,
++# developed a workable plan to institute time zones, and presented it
++# to the General Time Convention on 1883-04-11, saying that his plan
++# meant "local time would be practically abolished" - a plus for
++# railway scheduling.  By the next convention on 1883-10-11 nearly all
++# railroads had agreed and it took effect on 1883-11-18 at 12:00.
++# That Sunday was called the "day of two noons", as the eastern parts
++# of the new zones observed noon twice.  Allen witnessed the
++# transition in New York City, writing:
++#
++#   I heard the bells of St. Paul's strike on the old time.  Four
++#   minutes later, obedient to the electrical signal from the Naval
++#   Observatory ... the time-ball made its rapid descent, the chimes
++#   of old Trinity rang twelve measured strokes, and local time was
++#   abandoned, probably forever.
++#
++# Most of the US soon followed suit.  See:
++# Bartky IR. The adoption of standard time. Technol Cult 1989 Jan;30(1):25-56.
++# http://dx.doi.org/10.2307/3105430
+ 
+ # From Paul Eggert (2005-04-16):
+ # That 1883 transition occurred at 12:00 new time, not at 12:00 old time.
+@@ -59,8 +84,8 @@
+ #
+ # For more about the first ten years of DST in the United States, see
+ # Robert Garland, Ten years of daylight saving from the Pittsburgh standpoint
+-# (Carnegie Library of Pittsburgh, 1927)
+-# <http://www.clpgh.org/exhibit/dst.html>.
++# (Carnegie Library of Pittsburgh, 1927).
++# http://www.clpgh.org/exhibit/dst.html
+ #
+ # Shanks says that DST was called "War Time" in the US in 1918 and 1919.
+ # However, DST was imposed by the Standard Time Act of 1918, which
+@@ -79,8 +104,8 @@
+ # From Arthur David Olson (2000-09-25):
+ # Last night I heard part of a rebroadcast of a 1945 Arch Oboler radio drama.
+ # In the introduction, Oboler spoke of "Eastern Peace Time."
+-# An AltaVista search turned up
+-# <http://rowayton.org/rhs/hstaug45.html>:
++# An AltaVista search turned up:
++# http://rowayton.org/rhs/hstaug45.html
+ # "When the time is announced over the radio now, it is 'Eastern Peace
+ # Time' instead of the old familiar 'Eastern War Time.'  Peace is wonderful."
+ # (August 1945) by way of confirmation.
+@@ -123,7 +148,7 @@
+ Rule	US	1918	1919	-	Oct	lastSun	2:00	0	S
+ Rule	US	1942	only	-	Feb	9	2:00	1:00	W # War
+ Rule	US	1945	only	-	Aug	14	23:00u	1:00	P # Peace
+-Rule	US	1945	only	-	Sep	30	2:00	0	S
++Rule	US	1945	only	-	Sep	lastSun	2:00	0	S
+ Rule	US	1967	2006	-	Oct	lastSun	2:00	0	S
+ Rule	US	1967	1973	-	Apr	lastSun	2:00	1:00	D
+ Rule	US	1974	only	-	Jan	6	2:00	1:00	D
+@@ -226,9 +251,14 @@
+ # The law doesn't give abbreviations.
+ #
+ # From Paul Eggert (2000-01-08), following a heads-up from Rives McDow:
+-# Public law 106-564 (2000-12-23) introduced the abbreviation
+-# "Chamorro Standard Time" for time in Guam and the Northern Marianas.
+-# See the file "australasia".
++# Public law 106-564 (2000-12-23) introduced ... "Chamorro Standard Time"
++# for time in Guam and the Northern Marianas.  See the file "australasia".
++#
++# From Paul Eggert (2015-04-17):
++# HST and HDT are standardized abbreviations for Hawaii-Aleutian
++# standard and daylight times.  See section 9.47 (p 234) of the
++# U.S. Government Printing Office Style Manual (2008)
++# http://www.gpo.gov/fdsys/pkg/GPO-STYLEMANUAL-2008/pdf/GPO-STYLEMANUAL-2008.pdf
+ 
+ # From Arthur David Olson, 2005-08-09
+ # The following was signed into law on 2005-08-08.
+@@ -268,7 +298,7 @@
+ 
+ # From Paul Eggert (2005-08-26):
+ # According to today's Huntsville Times
+-# <http://www.al.com/news/huntsvilletimes/index.ssf?/base/news/1125047783228320.xml&coll=1>
++# http://www.al.com/news/huntsvilletimes/index.ssf?/base/news/1125047783228320.xml&coll=1
+ # a few towns on Alabama's "eastern border with Georgia, such as Phenix City
+ # in Russell County, Lanett in Chambers County and some towns in Lee County,
+ # set their watches and clocks on Eastern time."  It quotes H.H. "Bubba"
+@@ -276,6 +306,12 @@
+ # time zone, but we do go by the Eastern time zone because so many people work
+ # in Columbus."
+ 
++# From Paul Eggert (2014-09-06):
++# Monthly Notices of the Royal Astronomical Society 44, 4 (1884-02-08), 208
++# says that New York City Hall time was 3 minutes 58.4 seconds fast of
++# Eastern time (i.e., -4:56:01.6) just before the 1883 switch.  Round to the
++# nearest second.
++
+ # Rule	NAME	FROM	TO	TYPE	IN	ON	AT	SAVE	LETTER
+ Rule	NYC	1920	only	-	Mar	lastSun	2:00	1:00	D
+ Rule	NYC	1920	only	-	Oct	lastSun	2:00	0	S
+@@ -313,6 +349,16 @@
+ # Statue 175 closer in synch with the US Congress' intent....
+ # http://www.legis.state.wi.us/2007/data/acts/07Act3.pdf
+ 
++# From an email administrator of the City of Fort Pierre, SD (2015-12-21):
++# Fort Pierre is technically located in the Mountain time zone as is
++# the rest of Stanley County.  Most of Stanley County and Fort Pierre
++# uses the Central time zone due to doing most of their business in
++# Pierre so it simplifies schedules.  I have lived in Stanley County
++# all my life and it has been that way since I can remember.  (43 years!)
++#
++# From Paul Eggert (2015-12-25):
++# Assume this practice predates 1970, so Fort Pierre can use America/Chicago.
++
+ # Rule	NAME	FROM	TO	TYPE	IN	ON	AT	SAVE	LETTER
+ Rule	Chicago	1920	only	-	Jun	13	2:00	1:00	D
+ Rule	Chicago	1920	1921	-	Oct	lastSun	2:00	0	S
+@@ -323,15 +369,15 @@
+ # Zone	NAME		GMTOFF	RULES	FORMAT	[UNTIL]
+ Zone America/Chicago	-5:50:36 -	LMT	1883 Nov 18 12:09:24
+ 			-6:00	US	C%sT	1920
+-			-6:00	Chicago	C%sT	1936 Mar  1 2:00
+-			-5:00	-	EST	1936 Nov 15 2:00
++			-6:00	Chicago	C%sT	1936 Mar  1  2:00
++			-5:00	-	EST	1936 Nov 15  2:00
+ 			-6:00	Chicago	C%sT	1942
+ 			-6:00	US	C%sT	1946
+ 			-6:00	Chicago	C%sT	1967
+ 			-6:00	US	C%sT
+ # Oliver County, ND switched from mountain to central time on 1992-10-25.
+ Zone America/North_Dakota/Center -6:45:12 - LMT	1883 Nov 18 12:14:48
+-			-7:00	US	M%sT	1992 Oct 25 02:00
++			-7:00	US	M%sT	1992 Oct 25  2:00
+ 			-6:00	US	C%sT
+ # Morton County, ND, switched from mountain to central time on
+ # 2003-10-26, except for the area around Mandan which was already central time.
+@@ -340,8 +386,8 @@
+ # Jones, Mellette, and Todd Counties in South Dakota;
+ # but in practice these other counties were already observing central time.
+ # See <http://www.epa.gov/fedrgstr/EPA-IMPACT/2003/October/Day-28/i27056.htm>.
+-Zone America/North_Dakota/New_Salem -6:45:39 - LMT 1883 Nov 18 12:14:21
+-			-7:00	US	M%sT	2003 Oct 26 02:00
++Zone America/North_Dakota/New_Salem -6:45:39 - LMT	1883 Nov 18 12:14:21
++			-7:00	US	M%sT	2003 Oct 26  2:00
+ 			-6:00	US	C%sT
+ 
+ # From Josh Findley (2011-01-21):
+@@ -358,8 +404,8 @@
+ # at 47 degrees 15' 51" N, 101 degrees 46' 40" W, which yields an offset
+ # of 6h47'07".
+ 
+-Zone America/North_Dakota/Beulah -6:47:07 - LMT 1883 Nov 18 12:12:53
+-			-7:00	US	M%sT	2010 Nov  7 2:00
++Zone America/North_Dakota/Beulah -6:47:07 - LMT	1883 Nov 18 12:12:53
++			-7:00	US	M%sT	2010 Nov  7  2:00
+ 			-6:00	US	C%sT
+ 
+ # US mountain time, represented by Denver
+@@ -391,11 +437,42 @@
+ # north of the Salmon River, and the towns of Burgdorf and Warren),
+ # Nevada (except West Wendover), Oregon (except the northern 3/4 of
+ # Malheur county), and Washington
++
++# From Paul Eggert (2016-08-20):
++# In early February 1948, in response to California's electricity shortage,
++# PG&E changed power frequency from 60 to 59.5 Hz during daylight hours,
++# causing electric clocks to lose six minutes per day.  (This did not change
++# legal time, and is not part of the data here.)  See:
++# Ross SA. An energy crisis from the past: Northern California in 1948.
++# Working Paper No. 8, Institute of Governmental Studies, UC Berkeley,
++# 1973-11.  http://escholarship.org/uc/item/8x22k30c
++#
++# In another measure to save electricity, DST was instituted from 1948-03-14
++# at 02:01 to 1949-01-16 at 02:00, with the governor having the option to move
++# the fallback transition earlier.  See pages 3-4 of:
++# http://clerk.assembly.ca.gov/sites/clerk.assembly.ca.gov/files/archive/Statutes/1948/48Vol1_Chapters.pdf
++#
++# In response:
++#
++#   Governor Warren received a torrent of objecting mail, and it is not too much
++#   to speculate that the objections to Daylight Saving Time were one important
++#   factor in the defeat of the Dewey-Warren Presidential ticket in California.
++#     -- Ross, p 25
++#
++# On December 8 the governor exercised the option, setting the date to January 1
++# (LA Times 1948-12-09).  The transition time was 02:00 (LA Times 1949-01-01).
++#
++# Despite the controversy, in 1949 California voters approved Proposition 12,
++# which established DST from April's last Sunday at 01:00 until September's
++# last Sunday at 02:00. This was amended by 1962's Proposition 6, which changed
++# the fall-back date to October's last Sunday. See:
++# http://repository.uchastings.edu/cgi/viewcontent.cgi?article=1501&context=ca_ballot_props
++# http://repository.uchastings.edu/cgi/viewcontent.cgi?article=1636&context=ca_ballot_props
+ #
+ # Rule	NAME	FROM	TO	TYPE	IN	ON	AT	SAVE	LETTER
+-Rule	CA	1948	only	-	Mar	14	2:00	1:00	D
++Rule	CA	1948	only	-	Mar	14	2:01	1:00	D
+ Rule	CA	1949	only	-	Jan	 1	2:00	0	S
+-Rule	CA	1950	1966	-	Apr	lastSun	2:00	1:00	D
++Rule	CA	1950	1966	-	Apr	lastSun	1:00	1:00	D
+ Rule	CA	1950	1961	-	Sep	lastSun	2:00	0	S
+ Rule	CA	1962	1966	-	Oct	lastSun	2:00	0	S
+ # Zone	NAME		GMTOFF	RULES	FORMAT	[UNTIL]
+@@ -469,15 +546,21 @@
+ # For lack of better information, assume that Metlakatla's
+ # abandonment of use of daylight saving resulted from the 1983 vote.
+ 
++# From Steffen Thorsen (2015-11-09):
++# It seems Metlakatla did go off PST on Sunday, November 1, changing
++# their time to AKST and are going to follow Alaska's DST, switching
++# between AKST and AKDT from now on....
++# http://www.krbd.org/2015/10/30/annette-island-times-they-are-a-changing/
++
+ # Zone	NAME		GMTOFF	RULES	FORMAT	[UNTIL]
+ Zone America/Juneau	 15:02:19 -	LMT	1867 Oct 18
+ 			 -8:57:41 -	LMT	1900 Aug 20 12:00
+ 			 -8:00	-	PST	1942
+ 			 -8:00	US	P%sT	1946
+ 			 -8:00	-	PST	1969
+-			 -8:00	US	P%sT	1980 Apr 27 2:00
+-			 -9:00	US	Y%sT	1980 Oct 26 2:00
+-			 -8:00	US	P%sT	1983 Oct 30 2:00
++			 -8:00	US	P%sT	1980 Apr 27  2:00
++			 -9:00	US	Y%sT	1980 Oct 26  2:00
++			 -8:00	US	P%sT	1983 Oct 30  2:00
+ 			 -9:00	US	Y%sT	1983 Nov 30
+ 			 -9:00	US	AK%sT
+ Zone America/Sitka	 14:58:47 -	LMT	1867 Oct 18
+@@ -485,7 +568,7 @@
+ 			 -8:00	-	PST	1942
+ 			 -8:00	US	P%sT	1946
+ 			 -8:00	-	PST	1969
+-			 -8:00	US	P%sT	1983 Oct 30 2:00
++			 -8:00	US	P%sT	1983 Oct 30  2:00
+ 			 -9:00	US	Y%sT	1983 Nov 30
+ 			 -9:00	US	AK%sT
+ Zone America/Metlakatla	 15:13:42 -	LMT	1867 Oct 18
+@@ -493,8 +576,9 @@
+ 			 -8:00	-	PST	1942
+ 			 -8:00	US	P%sT	1946
+ 			 -8:00	-	PST	1969
+-			 -8:00	US	P%sT	1983 Oct 30 2:00
+-			 -8:00	-	PST
++			 -8:00	US	P%sT	1983 Oct 30  2:00
++			 -8:00	-	PST	2015 Nov  1  2:00
++			 -9:00	US	AK%sT
+ Zone America/Yakutat	 14:41:05 -	LMT	1867 Oct 18
+ 			 -9:18:55 -	LMT	1900 Aug 20 12:00
+ 			 -9:00	-	YST	1942
+@@ -509,7 +593,7 @@
+ 			-10:00	US	CAT/CAPT 1946 # Peace
+ 			-10:00	-	CAT	1967 Apr
+ 			-10:00	-	AHST	1969
+-			-10:00	US	AH%sT	1983 Oct 30 2:00
++			-10:00	US	AH%sT	1983 Oct 30  2:00
+ 			 -9:00	US	Y%sT	1983 Nov 30
+ 			 -9:00	US	AK%sT
+ Zone America/Nome	 12:58:21 -	LMT	1867 Oct 18
+@@ -518,7 +602,7 @@
+ 			-11:00	US	N%sT	1946
+ 			-11:00	-	NST	1967 Apr
+ 			-11:00	-	BST	1969
+-			-11:00	US	B%sT	1983 Oct 30 2:00
++			-11:00	US	B%sT	1983 Oct 30  2:00
+ 			 -9:00	US	Y%sT	1983 Nov 30
+ 			 -9:00	US	AK%sT
+ Zone America/Adak	 12:13:21 -	LMT	1867 Oct 18
+@@ -527,9 +611,9 @@
+ 			-11:00	US	N%sT	1946
+ 			-11:00	-	NST	1967 Apr
+ 			-11:00	-	BST	1969
+-			-11:00	US	B%sT	1983 Oct 30 2:00
++			-11:00	US	B%sT	1983 Oct 30  2:00
+ 			-10:00	US	AH%sT	1983 Nov 30
+-			-10:00	US	HA%sT
++			-10:00	US	H%sT
+ # The following switches don't quite make our 1970 cutoff.
+ #
+ # Shanks writes that part of southwest Alaska (e.g. Aniak)
+@@ -545,7 +629,7 @@
+ #  Minutes of the Unalaska City Council Meeting, January 10, 1967:
+ #  "Except for St. Paul and Akutan, Unalaska is the only important
+ #  location not on Alaska Standard Time.  The following resolution was
+-#  made by William Robinson and seconded by Henry Swanson:  Be it
++#  made by William Robinson and seconded by Henry Swanson: Be it
+ #  resolved that the City of Unalaska hereby goes to Alaska Standard
+ #  Time as of midnight Friday, January 13, 1967 (1 A.M. Saturday,
+ #  January 14, Alaska Standard Time.)  This resolution was passed with
+@@ -578,7 +662,7 @@
+ # year, the standard time of this Territory shall be advanced one
+ # hour...This Act shall take effect upon its approval. Approved this 26th
+ # day of April, A. D. 1933. LAWRENCE M JUDD, Governor of the Territory of
+-# Hawaii." Page 172:  "Act 163...Act 90 of the Session Laws of 1933 is
++# Hawaii." Page 172: "Act 163...Act 90 of the Session Laws of 1933 is
+ # hereby repealed...This Act shall take effect upon its approval, upon
+ # which date the standard time of this Territory shall be restored to
+ # that existing immediately prior to the taking effect of said Act 90.
+@@ -588,14 +672,14 @@
+ # Note that 1933-05-21 was a Sunday.
+ # We're left to guess the time of day when Act 163 was approved; guess noon.
+ 
+-Zone Pacific/Honolulu	-10:31:26 -	LMT	1896 Jan 13 12:00 #Schmitt&Cox
+-			-10:30	-	HST	1933 Apr 30 2:00 #Laws 1933
+-			-10:30	1:00	HDT	1933 May 21 12:00 #Laws 1933+12
+-			-10:30	-	HST	1942 Feb 09 2:00 #Schmitt&Cox+2
+-			-10:30	1:00	HDT	1945 Sep 30 2:00 #Schmitt&Cox+2
+-			-10:30	-	HST	1947 Jun  8 2:00 #Schmitt&Cox+2
++# Zone	NAME		GMTOFF	RULES	FORMAT	[UNTIL]
++Zone Pacific/Honolulu	-10:31:26 -	LMT	1896 Jan 13 12:00
++			-10:30	-	HST	1933 Apr 30  2:00
++			-10:30	1:00	HDT	1933 May 21 12:00
++			-10:30	-	HST	1942 Feb  9  2:00
++			-10:30	1:00	HDT	1945 Sep 30  2:00
++			-10:30	-	HST	1947 Jun  8  2:00
+ 			-10:00	-	HST
+-
+ Link Pacific/Honolulu Pacific/Johnston
+ 
+ # Now we turn to US areas that have diverged from the consensus since 1970.
+@@ -621,10 +705,11 @@
+ # Shanks says the 1944 experiment came to an end on 1944-03-17.
+ # Go with the Arizona State Library instead.
+ 
++# Zone	NAME		GMTOFF	RULES	FORMAT	[UNTIL]
+ Zone America/Phoenix	-7:28:18 -	LMT	1883 Nov 18 11:31:42
+-			-7:00	US	M%sT	1944 Jan  1 00:01
+-			-7:00	-	MST	1944 Apr  1 00:01
+-			-7:00	US	M%sT	1944 Oct  1 00:01
++			-7:00	US	M%sT	1944 Jan  1  0:01
++			-7:00	-	MST	1944 Apr  1  0:01
++			-7:00	US	M%sT	1944 Oct  1  0:01
+ 			-7:00	-	MST	1967
+ 			-7:00	US	M%sT	1968 Mar 21
+ 			-7:00	-	MST
+@@ -648,16 +733,15 @@
+ #
+ # Zone	NAME		GMTOFF	RULES	FORMAT	[UNTIL]
+ Zone America/Boise	-7:44:49 -	LMT	1883 Nov 18 12:15:11
+-			-8:00	US	P%sT	1923 May 13 2:00
++			-8:00	US	P%sT	1923 May 13  2:00
+ 			-7:00	US	M%sT	1974
+-			-7:00	-	MST	1974 Feb  3 2:00
++			-7:00	-	MST	1974 Feb  3  2:00
+ 			-7:00	US	M%sT
+ 
+ # Indiana
+ #
+ # For a map of Indiana's time zone regions, see:
+-# What time is it in Indiana? (2006-03-01)
+-# <http://www.mccsc.edu/time.html>
++# http://en.wikipedia.org/wiki/Time_in_Indiana
+ #
+ # From Paul Eggert (2007-08-17):
+ # Since 1970, most of Indiana has been like America/Indiana/Indianapolis,
+@@ -683,9 +767,6 @@
+ # that they would be ambiguous if we left them at the 'America' level.
+ # So we reluctantly put them all in a subdirectory 'America/Indiana'.
+ 
+-# From Paul Eggert (2005-08-16):
+-# http://www.mccsc.edu/time.html says that Indiana will use DST starting 2006.
+-
+ # From Paul Eggert (2014-06-26):
+ # https://www.federalregister.gov/articles/2006/01/20/06-563/standard-time-zone-boundary-in-the-state-of-indiana
+ # says "DOT is relocating the time zone boundary in Indiana to move Starke,
+@@ -707,13 +788,13 @@
+ Rule Indianapolis 1941	1954	-	Sep	lastSun	2:00	0	S
+ Rule Indianapolis 1946	1954	-	Apr	lastSun	2:00	1:00	D
+ # Zone	NAME		GMTOFF	RULES	FORMAT	[UNTIL]
+-Zone America/Indiana/Indianapolis -5:44:38 - LMT 1883 Nov 18 12:15:22
++Zone America/Indiana/Indianapolis -5:44:38 - LMT	1883 Nov 18 12:15:22
+ 			-6:00	US	C%sT	1920
+ 			-6:00 Indianapolis C%sT	1942
+ 			-6:00	US	C%sT	1946
+-			-6:00 Indianapolis C%sT	1955 Apr 24 2:00
+-			-5:00	-	EST	1957 Sep 29 2:00
+-			-6:00	-	CST	1958 Apr 27 2:00
++			-6:00 Indianapolis C%sT	1955 Apr 24  2:00
++			-5:00	-	EST	1957 Sep 29  2:00
++			-6:00	-	CST	1958 Apr 27  2:00
+ 			-5:00	-	EST	1969
+ 			-5:00	US	E%sT	1971
+ 			-5:00	-	EST	2006
+@@ -729,10 +810,10 @@
+ # Zone	NAME		GMTOFF	RULES	FORMAT	[UNTIL]
+ Zone America/Indiana/Marengo -5:45:23 -	LMT	1883 Nov 18 12:14:37
+ 			-6:00	US	C%sT	1951
+-			-6:00	Marengo	C%sT	1961 Apr 30 2:00
++			-6:00	Marengo	C%sT	1961 Apr 30  2:00
+ 			-5:00	-	EST	1969
+-			-5:00	US	E%sT	1974 Jan  6 2:00
+-			-6:00	1:00	CDT	1974 Oct 27 2:00
++			-5:00	US	E%sT	1974 Jan  6  2:00
++			-6:00	1:00	CDT	1974 Oct 27  2:00
+ 			-5:00	US	E%sT	1976
+ 			-5:00	-	EST	2006
+ 			-5:00	US	E%sT
+@@ -753,11 +834,11 @@
+ # Zone	NAME		GMTOFF	RULES	FORMAT	[UNTIL]
+ Zone America/Indiana/Vincennes -5:50:07 - LMT	1883 Nov 18 12:09:53
+ 			-6:00	US	C%sT	1946
+-			-6:00 Vincennes	C%sT	1964 Apr 26 2:00
++			-6:00 Vincennes	C%sT	1964 Apr 26  2:00
+ 			-5:00	-	EST	1969
+ 			-5:00	US	E%sT	1971
+-			-5:00	-	EST	2006 Apr  2 2:00
+-			-6:00	US	C%sT	2007 Nov  4 2:00
++			-5:00	-	EST	2006 Apr  2  2:00
++			-6:00	US	C%sT	2007 Nov  4  2:00
+ 			-5:00	US	E%sT
+ #
+ # Perry County, Indiana, switched from eastern to central time in April 2006.
+@@ -774,10 +855,10 @@
+ # Zone	NAME		GMTOFF	RULES	FORMAT	[UNTIL]
+ Zone America/Indiana/Tell_City -5:47:03 - LMT	1883 Nov 18 12:12:57
+ 			-6:00	US	C%sT	1946
+-			-6:00 Perry	C%sT	1964 Apr 26 2:00
++			-6:00 Perry	C%sT	1964 Apr 26  2:00
+ 			-5:00	-	EST	1969
+ 			-5:00	US	E%sT	1971
+-			-5:00	-	EST	2006 Apr  2 2:00
++			-5:00	-	EST	2006 Apr  2  2:00
+ 			-6:00	US	C%sT
+ #
+ # Pike County, Indiana moved from central to eastern time in 1977,
+@@ -790,11 +871,11 @@
+ # Zone	NAME		GMTOFF	RULES	FORMAT	[UNTIL]
+ Zone America/Indiana/Petersburg -5:49:07 - LMT	1883 Nov 18 12:10:53
+ 			-6:00	US	C%sT	1955
+-			-6:00	Pike	C%sT	1965 Apr 25 2:00
+-			-5:00	-	EST	1966 Oct 30 2:00
+-			-6:00	US	C%sT	1977 Oct 30 2:00
+-			-5:00	-	EST	2006 Apr  2 2:00
+-			-6:00	US	C%sT	2007 Nov  4 2:00
++			-6:00	Pike	C%sT	1965 Apr 25  2:00
++			-5:00	-	EST	1966 Oct 30  2:00
++			-6:00	US	C%sT	1977 Oct 30  2:00
++			-5:00	-	EST	2006 Apr  2  2:00
++			-6:00	US	C%sT	2007 Nov  4  2:00
+ 			-5:00	US	E%sT
+ #
+ # Starke County, Indiana moved from central to eastern time in 1991,
+@@ -812,10 +893,10 @@
+ # Zone	NAME		GMTOFF	RULES	FORMAT	[UNTIL]
+ Zone America/Indiana/Knox -5:46:30 -	LMT	1883 Nov 18 12:13:30
+ 			-6:00	US	C%sT	1947
+-			-6:00	Starke	C%sT	1962 Apr 29 2:00
+-			-5:00	-	EST	1963 Oct 27 2:00
+-			-6:00	US	C%sT	1991 Oct 27 2:00
+-			-5:00	-	EST	2006 Apr  2 2:00
++			-6:00	Starke	C%sT	1962 Apr 29  2:00
++			-5:00	-	EST	1963 Oct 27  2:00
++			-6:00	US	C%sT	1991 Oct 27  2:00
++			-5:00	-	EST	2006 Apr  2  2:00
+ 			-6:00	US	C%sT
+ #
+ # Pulaski County, Indiana, switched from eastern to central time in
+@@ -828,17 +909,17 @@
+ # Zone	NAME		GMTOFF	RULES	FORMAT	[UNTIL]
+ Zone America/Indiana/Winamac -5:46:25 - LMT	1883 Nov 18 12:13:35
+ 			-6:00	US	C%sT	1946
+-			-6:00	Pulaski	C%sT	1961 Apr 30 2:00
++			-6:00	Pulaski	C%sT	1961 Apr 30  2:00
+ 			-5:00	-	EST	1969
+ 			-5:00	US	E%sT	1971
+-			-5:00	-	EST	2006 Apr  2 2:00
+-			-6:00	US	C%sT	2007 Mar 11 2:00
++			-5:00	-	EST	2006 Apr  2  2:00
++			-6:00	US	C%sT	2007 Mar 11  2:00
+ 			-5:00	US	E%sT
+ #
+ # Switzerland County, Indiana, did not observe DST from 1973 through 2005.
+ # Zone	NAME		GMTOFF	RULES	FORMAT	[UNTIL]
+ Zone America/Indiana/Vevay -5:40:16 -	LMT	1883 Nov 18 12:19:44
+-			-6:00	US	C%sT	1954 Apr 25 2:00
++			-6:00	US	C%sT	1954 Apr 25  2:00
+ 			-5:00	-	EST	1969
+ 			-5:00	US	E%sT	1973
+ 			-5:00	-	EST	2006
+@@ -859,16 +940,16 @@
+ 			-6:00	US	C%sT	1921
+ 			-6:00 Louisville C%sT	1942
+ 			-6:00	US	C%sT	1946
+-			-6:00 Louisville C%sT	1961 Jul 23 2:00
++			-6:00 Louisville C%sT	1961 Jul 23  2:00
+ 			-5:00	-	EST	1968
+-			-5:00	US	E%sT	1974 Jan  6 2:00
+-			-6:00	1:00	CDT	1974 Oct 27 2:00
++			-5:00	US	E%sT	1974 Jan  6  2:00
++			-6:00	1:00	CDT	1974 Oct 27  2:00
+ 			-5:00	US	E%sT
+ #
+ # Wayne County, Kentucky
+ #
+ # From Lake Cumberland LIFE
+-# <http://www.lake-cumberland.com/life/archive/news990129time.shtml>
++# http://www.lake-cumberland.com/life/archive/news990129time.shtml
+ # (1999-01-29) via WKYM-101.7:
+ # Clinton County has joined Wayne County in asking the DoT to change from
+ # the Central to the Eastern time zone....  The Wayne County government made
+@@ -887,7 +968,7 @@
+ # From Paul Eggert (2001-07-16):
+ # The final rule was published in the
+ # Federal Register 65, 160 (2000-08-17), pp 50154-50158.
+-# <http://frwebgate.access.gpo.gov/cgi-bin/getdoc.cgi?dbname=2000_register&docid=fr17au00-22>
++# http://frwebgate.access.gpo.gov/cgi-bin/getdoc.cgi?dbname=2000_register&docid=fr17au00-22
+ #
+ Zone America/Kentucky/Monticello -5:39:24 - LMT	1883 Nov 18 12:20:36
+ 			-6:00	US	C%sT	1946
+@@ -913,7 +994,7 @@
+ # West Wendover, NV officially switched from Pacific to mountain time on
+ # 1999-10-31.  See the
+ # Federal Register 64, 203 (1999-10-21), pp 56705-56707.
+-# <http://frwebgate.access.gpo.gov/cgi-bin/getdoc.cgi?dbname=1999_register&docid=fr21oc99-15>
++# http://frwebgate.access.gpo.gov/cgi-bin/getdoc.cgi?dbname=1999_register&docid=fr21oc99-15
+ # However, the Federal Register says that West Wendover already operated
+ # on mountain time, and the rule merely made this official;
+ # hence a separate tz entry is not needed.
+@@ -951,12 +1032,12 @@
+ Rule	Detroit	1967	only	-	Oct	lastSun	2:00	0	S
+ # Zone	NAME		GMTOFF	RULES	FORMAT	[UNTIL]
+ Zone America/Detroit	-5:32:11 -	LMT	1905
+-			-6:00	-	CST	1915 May 15 2:00
++			-6:00	-	CST	1915 May 15  2:00
+ 			-5:00	-	EST	1942
+ 			-5:00	US	E%sT	1946
+ 			-5:00	Detroit	E%sT	1973
+ 			-5:00	US	E%sT	1975
+-			-5:00	-	EST	1975 Apr 27 2:00
++			-5:00	-	EST	1975 Apr 27  2:00
+ 			-5:00	US	E%sT
+ #
+ # Dickinson, Gogebic, Iron, and Menominee Counties, Michigan,
+@@ -969,8 +1050,8 @@
+ # Zone	NAME		GMTOFF	RULES	FORMAT	[UNTIL]
+ Zone America/Menominee	-5:50:27 -	LMT	1885 Sep 18 12:00
+ 			-6:00	US	C%sT	1946
+-			-6:00 Menominee	C%sT	1969 Apr 27 2:00
+-			-5:00	-	EST	1973 Apr 29 2:00
++			-6:00 Menominee	C%sT	1969 Apr 27  2:00
++			-5:00	-	EST	1973 Apr 29  2:00
+ 			-6:00	US	C%sT
+ 
+ # Navassa
+@@ -987,19 +1068,19 @@
+ ################################################################################
+ 
+ 
+-# From Paul Eggert (2006-03-22):
+-# A good source for time zone historical data outside the U.S. is
++# From Paul Eggert (2014-10-31):
++#
++# Unless otherwise specified, the source for data through 1990 is:
+ # Thomas G. Shanks and Rique Pottenger, The International Atlas (6th edition),
+ # San Diego: ACS Publications, Inc. (2003).
++# Unfortunately this book contains many errors and cites no sources.
+ #
+ # Gwillim Law writes that a good source
+ # for recent time zone data is the International Air Transport
+ # Association's Standard Schedules Information Manual (IATA SSIM),
+ # published semiannually.  Law sent in several helpful summaries
+-# of the IATA's data after 1990.
+-#
+-# Except where otherwise noted, Shanks & Pottenger is the source for
+-# entries through 1990, and IATA SSIM is the source for entries afterwards.
++# of the IATA's data after 1990.  Except where otherwise noted,
++# IATA SSIM is the source for entries after 1990.
+ #
+ # Other sources occasionally used include:
+ #
+@@ -1050,7 +1131,7 @@
+ # From Paul Eggert (1994-11-22):
+ # Alas, this sort of thing must be handled by localization software.
+ 
+-# Unless otherwise specified, the data for Canada are all from Shanks
++# Unless otherwise specified, the data entries for Canada are all from Shanks
+ # & Pottenger.
+ 
+ # From Chris Walton (2006-04-01, 2006-04-25, 2006-06-26, 2007-01-31,
+@@ -1097,17 +1178,16 @@
+ # An amendment to the Interpretation Act was registered on February 19/2007....
+ # http://action.attavik.ca/home/justice-gn/attach/2007/gaz02part2.pdf
+ 
+-# From Paul Eggert (2006-04-25):
++# From Paul Eggert (2014-10-18):
+ # H. David Matthews and Mary Vincent's map
+ # "It's about TIME", _Canadian Geographic_ (September-October 1998)
+-# <http://www.canadiangeographic.ca/Magazine/SO98/geomap.asp>
++# http://www.canadiangeographic.ca/Magazine/SO98/alacarte.asp
+ # contains detailed boundaries for regions observing nonstandard
+ # time and daylight saving time arrangements in Canada circa 1998.
+ #
+-# INMS, the Institute for National Measurement Standards in Ottawa, has
+-# information about standard and daylight saving time zones in Canada.
+-# <http://inms-ienm.nrc-cnrc.gc.ca/en/time_services/daylight_saving_e.php>
+-# (updated periodically).
++# National Research Council Canada maintains info about time zones and DST.
++# http://www.nrc-cnrc.gc.ca/eng/services/time/time_zones.html
++# http://www.nrc-cnrc.gc.ca/eng/services/time/faq/index.html#Q5
+ # Its unofficial information is often taken from Matthews and Vincent.
+ 
+ # From Paul Eggert (2006-06-27):
+@@ -1220,17 +1300,26 @@
+ 			-3:30	-	NST	1936
+ 			-3:30	StJohns	N%sT	1942 May 11
+ 			-3:30	Canada	N%sT	1946
+-			-3:30	StJohns	N%sT	1966 Mar 15 2:00
++			-3:30	StJohns	N%sT	1966 Mar 15  2:00
+ 			-4:00	StJohns	A%sT	2011 Nov
+ 			-4:00	Canada	A%sT
+ 
+ 
+ # west Labrador, Nova Scotia, Prince Edward I
+ 
+-# From Paul Eggert (2006-03-22):
++# From Brian Inglis (2015-07-20):
++# From the historical weather station records available at:
++# https://weatherspark.com/history/28351/1971/Sydney-Nova-Scotia-Canada
++# Sydney shares the same time history as Glace Bay, so was
++# likely to be the same across the island....
++# Sydney, as the capital and most populous location, or Cape Breton, would
++# have been better names for the zone had we known this in 1996.
++
++# From Paul Eggert (2015-07-20):
+ # Shanks & Pottenger write that since 1970 most of this region has been like
+ # Halifax.  Many locales did not observe peacetime DST until 1972;
+-# Glace Bay, NS is the largest that we know of.
++# the Cape Breton area, represented by Glace Bay, is the largest we know of
++# (Glace Bay was perhaps not the best name choice but no point changing now).
+ # Shanks & Pottenger also write that Liverpool, NS was the only town
+ # in Canada to observe DST in 1971 but not 1970; for now we'll assume
+ # this is a typo.
+@@ -1281,7 +1370,7 @@
+ Zone America/Halifax	-4:14:24 -	LMT	1902 Jun 15
+ 			-4:00	Halifax	A%sT	1918
+ 			-4:00	Canada	A%sT	1919
+-			-4:00	Halifax	A%sT	1942 Feb  9 2:00s
++			-4:00	Halifax	A%sT	1942 Feb  9  2:00s
+ 			-4:00	Canada	A%sT	1946
+ 			-4:00	Halifax	A%sT	1974
+ 			-4:00	Canada	A%sT
+@@ -1328,14 +1417,9 @@
+ 
+ # Quebec
+ 
+-# From Paul Eggert (2013-08-30):
+-# Since 1970 most of Quebec has been like Toronto.
+-# However, because earlier versions of the tz database mistakenly relied on data
+-# from Shanks & Pottenger saying that Quebec differed from Ontario after 1970,
+-# a separate entry was created for most of Quebec.  We're loath to lose
+-# its pre-1970 info, even though the tz database is normally limited to
+-# zones that differ after 1970, so keep this otherwise out-of-scope entry.
+-
++# From Paul Eggert (2015-03-24):
++# See America/Toronto for most of Quebec, including Montreal.
++#
+ # Matthews and Vincent (1998) also write that Quebec east of the -63
+ # meridian is supposed to observe AST, but residents as far east as
+ # Natashquan use EST/EDT, and residents east of Natashquan use AST.
+@@ -1349,47 +1433,10 @@
+ # For lack of better info, guess this practice began around 1970, contra to
+ # Shanks & Pottenger who have this region observing AST/ADT.
+ 
+-# Rule	NAME	FROM	TO	TYPE	IN	ON	AT	SAVE	LETTER/S
+-Rule	Mont	1917	only	-	Mar	25	2:00	1:00	D
+-Rule	Mont	1917	only	-	Apr	24	0:00	0	S
+-Rule	Mont	1919	only	-	Mar	31	2:30	1:00	D
+-Rule	Mont	1919	only	-	Oct	25	2:30	0	S
+-Rule	Mont	1920	only	-	May	 2	2:30	1:00	D
+-Rule	Mont	1920	1922	-	Oct	Sun>=1	2:30	0	S
+-Rule	Mont	1921	only	-	May	 1	2:00	1:00	D
+-Rule	Mont	1922	only	-	Apr	30	2:00	1:00	D
+-Rule	Mont	1924	only	-	May	17	2:00	1:00	D
+-Rule	Mont	1924	1926	-	Sep	lastSun	2:30	0	S
+-Rule	Mont	1925	1926	-	May	Sun>=1	2:00	1:00	D
+-# The 1927-to-1937 rules can be expressed more simply as
+-# Rule	Mont	1927	1937	-	Apr	lastSat	24:00	1:00	D
+-# Rule	Mont	1927	1937	-	Sep	lastSat	24:00	0	S
+-# The rules below avoid use of 24:00
+-# (which pre-1998 versions of zic cannot handle).
+-Rule	Mont	1927	only	-	May	1	0:00	1:00	D
+-Rule	Mont	1927	1932	-	Sep	lastSun	0:00	0	S
+-Rule	Mont	1928	1931	-	Apr	lastSun	0:00	1:00	D
+-Rule	Mont	1932	only	-	May	1	0:00	1:00	D
+-Rule	Mont	1933	1940	-	Apr	lastSun	0:00	1:00	D
+-Rule	Mont	1933	only	-	Oct	1	0:00	0	S
+-Rule	Mont	1934	1939	-	Sep	lastSun	0:00	0	S
+-Rule	Mont	1946	1973	-	Apr	lastSun	2:00	1:00	D
+-Rule	Mont	1945	1948	-	Sep	lastSun	2:00	0	S
+-Rule	Mont	1949	1950	-	Oct	lastSun	2:00	0	S
+-Rule	Mont	1951	1956	-	Sep	lastSun	2:00	0	S
+-Rule	Mont	1957	1973	-	Oct	lastSun	2:00	0	S
+-
+ # Zone	NAME		GMTOFF	RULES	FORMAT	[UNTIL]
+ Zone America/Blanc-Sablon -3:48:28 -	LMT	1884
+ 			-4:00	Canada	A%sT	1970
+ 			-4:00	-	AST
+-Zone America/Montreal	-4:54:16 -	LMT	1884
+-			-5:00	Mont	E%sT	1918
+-			-5:00	Canada	E%sT	1919
+-			-5:00	Mont	E%sT	1942 Feb  9 2:00s
+-			-5:00	Canada	E%sT	1946
+-			-5:00	Mont	E%sT	1974
+-			-5:00	Canada	E%sT
+ 
+ # Ontario
+ 
+@@ -1419,7 +1466,7 @@
+ # says that Atikokan, Ontario currently does not observe DST,
+ # but will vote on 11-10 whether to use EST/EDT.
+ # He also writes that the Ontario Time Act (1990, Chapter T.9)
+-# <http://www.gov.on.ca/MBS/english/publications/statregs/conttext.html>
++# http://www.gov.on.ca/MBS/english/publications/statregs/conttext.html
+ # says that Ontario east of 90W uses EST/EDT, and west of 90W uses CST/CDT.
+ # Officially Atikokan is therefore on CST/CDT, and most likely this report
+ # concerns a non-official time observed as a matter of local practice.
+@@ -1509,26 +1556,26 @@
+ # ing in 1930. The information for the province of Quebec is definite,
+ # for the other provinces only approximate:
+ #
+-# 	Province	Daylight saving time used
++#	Province	Daylight saving time used
+ # Prince Edward Island	Not used.
+ # Nova Scotia		In Halifax only.
+ # New Brunswick		In St. John only.
+ # Quebec		In the following places:
+-# 			Montreal	Lachine
+-# 			Quebec		Mont-Royal
+-# 			Lévis		Iberville
+-# 			St. Lambert	Cap de la Madelèine
+-# 			Verdun		Loretteville
+-# 			Westmount	Richmond
+-# 			Outremont	St. Jérôme
+-# 			Longueuil	Greenfield Park
+-# 			Arvida		Waterloo
+-# 			Chambly-Canton	Beaulieu
+-# 			Melbourne	La Tuque
+-# 			St. Théophile	Buckingham
++#			Montreal	Lachine
++#			Quebec		Mont-Royal
++#			Lévis		Iberville
++#			St. Lambert	Cap de la Madelèine
++#			Verdun		Loretteville
++#			Westmount	Richmond
++#			Outremont	St. Jérôme
++#			Longueuil	Greenfield Park
++#			Arvida		Waterloo
++#			Chambly-Canton	Beaulieu
++#			Melbourne	La Tuque
++#			St. Théophile	Buckingham
+ # Ontario		Used generally in the cities and towns along
+-# 			the southerly part of the province. Not
+-# 			used in the northwesterly part.
++#			the southerly part of the province. Not
++#			used in the northwesterly part.
+ # Manitoba		Not used.
+ # Saskatchewan		In Regina only.
+ # Alberta		Not used.
+@@ -1597,7 +1644,7 @@
+ # Zone	NAME		GMTOFF	RULES	FORMAT	[UNTIL]
+ Zone America/Toronto	-5:17:32 -	LMT	1895
+ 			-5:00	Canada	E%sT	1919
+-			-5:00	Toronto	E%sT	1942 Feb  9 2:00s
++			-5:00	Toronto	E%sT	1942 Feb  9  2:00s
+ 			-5:00	Canada	E%sT	1946
+ 			-5:00	Toronto	E%sT	1974
+ 			-5:00	Canada	E%sT
+@@ -1610,16 +1657,16 @@
+ 			-5:00	Canada	E%sT
+ Zone America/Nipigon	-5:53:04 -	LMT	1895
+ 			-5:00	Canada	E%sT	1940 Sep 29
+-			-5:00	1:00	EDT	1942 Feb  9 2:00s
++			-5:00	1:00	EDT	1942 Feb  9  2:00s
+ 			-5:00	Canada	E%sT
+ Zone America/Rainy_River -6:18:16 -	LMT	1895
+ 			-6:00	Canada	C%sT	1940 Sep 29
+-			-6:00	1:00	CDT	1942 Feb  9 2:00s
++			-6:00	1:00	CDT	1942 Feb  9  2:00s
+ 			-6:00	Canada	C%sT
+ Zone America/Atikokan	-6:06:28 -	LMT	1895
+ 			-6:00	Canada	C%sT	1940 Sep 29
+-			-6:00	1:00	CDT	1942 Feb  9 2:00s
+-			-6:00	Canada	C%sT	1945 Sep 30 2:00
++			-6:00	1:00	CDT	1942 Feb  9  2:00s
++			-6:00	Canada	C%sT	1945 Sep 30  2:00
+ 			-5:00	-	EST
+ 
+ 
+@@ -1755,12 +1802,12 @@
+ Rule	Swift	1960	1961	-	Sep	lastSun	2:00	0	S
+ # Zone	NAME		GMTOFF	RULES	FORMAT	[UNTIL]
+ Zone America/Regina	-6:58:36 -	LMT	1905 Sep
+-			-7:00	Regina	M%sT	1960 Apr lastSun 2:00
++			-7:00	Regina	M%sT	1960 Apr lastSun  2:00
+ 			-6:00	-	CST
+ Zone America/Swift_Current -7:11:20 -	LMT	1905 Sep
+-			-7:00	Canada	M%sT	1946 Apr lastSun 2:00
++			-7:00	Canada	M%sT	1946 Apr lastSun  2:00
+ 			-7:00	Regina	M%sT	1950
+-			-7:00	Swift	M%sT	1972 Apr lastSun 2:00
++			-7:00	Swift	M%sT	1972 Apr lastSun  2:00
+ 			-6:00	-	CST
+ 
+ 
+@@ -1818,25 +1865,25 @@
+ # Unfortunately the exact date for the time change in June 1918 remains
+ # unknown and will be difficult to ascertain.  I e-mailed Tammy a few months
+ # ago to ask if Sunday June 2 was a reasonable guess.  She said it was just
+-# as plausible as any other date (in June).  She also said that after writing the
+-# article she had discovered another time change in 1916; this is the subject
+-# of another article which she wrote in October 2010.
++# as plausible as any other date (in June).  She also said that after writing
++# the article she had discovered another time change in 1916; this is the
++# subject of another article which she wrote in October 2010.
+ # http://www.creston.museum.bc.ca/index.php?module=comments&uop=view_comment&cm+id=56
+ 
+ # Here is a summary of the three clock change events in Creston's history:
+ # 1. 1884 or 1885: adoption of Mountain Standard Time (GMT-7)
+ # Exact date unknown
+ # 2. Oct 1916: switch to Pacific Standard Time (GMT-8)
+-# Exact date in October unknown;  Sunday October 1 is a reasonable guess.
++# Exact date in October unknown; Sunday October 1 is a reasonable guess.
+ # 3. June 1918: switch to Pacific Daylight Time (GMT-7)
+ # Exact date in June unknown; Sunday June 2 is a reasonable guess.
+-# note#1:
++# note 1:
+ # On Oct 27/1918 when daylight saving ended in the rest of Canada,
+ # Creston did not change its clocks.
+-# note#2:
++# note 2:
+ # During WWII when the Federal Government legislated a mandatory clock change,
+ # Creston did not oblige.
+-# note#3:
++# note 3:
+ # There is no guarantee that Creston will remain on Mountain Standard Time
+ # (UTC-7) forever.
+ # The subject was debated at least once this year by the town Council.
+@@ -1851,6 +1898,22 @@
+ 
+ # The transition dates (and times) are guesses.
+ 
++# From Matt Johnson (2015-09-21):
++# Fort Nelson, BC, Canada will cancel DST this year.  So while previously they
++# were aligned with America/Vancouver, they're now aligned with
++# America/Dawson_Creek.
++# http://www.northernrockies.ca/EN/meta/news/archives/2015/northern-rockies-time-change.html
++#
++# From Tim Parenti (2015-09-23):
++# This requires a new zone for the Northern Rockies Regional Municipality,
++# America/Fort_Nelson.  The resolution of 2014-12-08 was reached following a
++# 2014-11-15 poll with nearly 75% support.  Effectively, the municipality has
++# been on MST (-0700) like Dawson Creek since it advanced its clocks on
++# 2015-03-08.
++#
++# From Paul Eggert (2015-09-23):
++# Shanks says Fort Nelson did not observe DST in 1946, unlike Vancouver.
++
+ # Rule	NAME	FROM	TO	TYPE	IN	ON	AT	SAVE	LETTER/S
+ Rule	Vanc	1918	only	-	Apr	14	2:00	1:00	D
+ Rule	Vanc	1918	only	-	Oct	27	2:00	0	S
+@@ -1867,7 +1930,13 @@
+ 			-8:00	Canada	P%sT
+ Zone America/Dawson_Creek -8:00:56 -	LMT	1884
+ 			-8:00	Canada	P%sT	1947
+-			-8:00	Vanc	P%sT	1972 Aug 30 2:00
++			-8:00	Vanc	P%sT	1972 Aug 30  2:00
++			-7:00	-	MST
++Zone America/Fort_Nelson	-8:10:47 -	LMT	1884
++			-8:00	Vanc	P%sT	1946
++			-8:00	-	PST	1947
++			-8:00	Vanc	P%sT	1987
++			-8:00	Canada	P%sT	2015 Mar  8  2:00
+ 			-7:00	-	MST
+ Zone America/Creston	-7:46:04 -	LMT	1884
+ 			-7:00	-	MST	1916 Oct 1
+@@ -1880,22 +1949,120 @@
+ # Dawson switched to PST in 1973.  Inuvik switched to MST in 1979.
+ # Mathew Englander (1996-10-07) gives the following refs:
+ #	* 1967. Paragraph 28(34)(g) of the Interpretation Act, S.C. 1967-68,
+-#	c. 7 defines Yukon standard time as UTC-9.  This is still valid;
++#	c. 7 defines Yukon standard time as UTC-9....
+ #	see Interpretation Act, R.S.C. 1985, c. I-21, s. 35(1).
++#	[http://canlii.ca/t/7vhg]
+ #	* C.O. 1973/214 switched Yukon to PST on 1973-10-28 00:00.
+ #	* O.I.C. 1980/02 established DST.
+ #	* O.I.C. 1987/056 changed DST to Apr firstSun 2:00 to Oct lastSun 2:00.
+-# Shanks & Pottenger say Yukon's 1973-10-28 switch was at 2:00; go
+-# with Englander.
+-# From Chris Walton (2006-06-26):
+-# Here is a link to the old daylight saving portion of the interpretation
+-# act which was last updated in 1987:
+-# http://www.gov.yk.ca/legislation/regs/oic1987_056.pdf
++
++# From Brian Inglis (2015-04-14):
++#
++# I tried to trace the history of Yukon time and found the following
++# regulations, giving the reference title and URL if found, regulation name,
++# and relevant quote if available.  Each regulation specifically revokes its
++# predecessor.  The final reference is to the current Interpretation Act
++# authorizing and resulting from these regulatory changes.
++#
++# Only recent regulations were retrievable via Yukon government site search or
++# index, and only some via Canadian legal sources.  Other sources used include
++# articles titled "Standard Time and Time Zones in Canada" from JRASC via ADS
++# Abstracts, cited by ADO for 1932 ..., and updated versions from 1958 and
++# 1970 quoted below; each article includes current extracts from provincial
++# and territorial ST and DST regulations at the end, summaries and details of
++# standard times and daylight saving time at many locations across Canada,
++# with time zone maps, tables and calculations for Canadian Sunrise, Sunset,
++# and LMST; they also cover many countries and global locations, with a chart
++# and table showing current Universal Time offsets, and may be useful as
++# another source of information for 1970 and earlier.
++#
++# * Standard Time and Time Zones in Canada; Smith, C.C.; JRASC, Vol. 26,
++#   pp.49-77; February 1932; SAO/NASA Astrophysics Data System (ADS)
++#   http://adsabs.harvard.edu/abs/1932JRASC..26...49S from p.75:
++#   Yukon Interpretation Ordinance
++#   Yukon standard time is the local mean time at the one hundred and
++#   thirty-fifth meridian.
++#
++# * Standard Time and Time Zones in Canada; Smith, C.C.; Thomson, Malcolm M.;
++#   JRASC, Vol. 52, pp.193-223; October 1958; SAO/NASA Astrophysics Data System
++#   (ADS) http://adsabs.harvard.edu/abs/1958JRASC..52..193S from pp.220-1:
++#   Yukon Interpretation Ordinance, 1955, Chap. 16.
++#
++#     (1) Subject to this section, standard time shall be reckoned as nine
++#     hours behind Greenwich Time and called Yukon Standard Time.
++#
++#     (2) Notwithstanding subsection (1), the Commissioner may make regulations
++#     varying the manner of reckoning standard time.
++#
++# * Yukon Territory Commissioner's Order 1966-20 Interpretation Ordinance
++#   http://? - no online source found
++#
++# * Standard Time and Time Zones in Canada; Thomson, Malcolm M.; JRASC,
++#   Vol. 64, pp.129-162; June 1970; SAO/NASA Astrophysics Data System (ADS)
++#   http://adsabs.harvard.edu/abs/1970JRASC..64..129T from p.156: Yukon
++#   Territory Commissioner's Order 1967-59 Interpretation Ordinance ...
++#
++#     1. Commissioner's Order 1966-20 dated at Whitehorse in the Yukon
++#     Territory on 27th January, 1966, is hereby revoked.
++#
++#     2. Yukon (East) Standard Time as defined by section 36 of the
++#     Interpretation Ordinance from and after mid-night on the 28th day of May,
++#     1967 shall be reckoned in the same manner as Pacific Standard Time, that
++#     is to say, eight hours behind Greenwich Time in the area of the Yukon
++#     Territory lying east of the 138th degree longitude west.
++#
++#     3. In the remainder of the Territory, lying west of the 138th degree
++#     longitude west, Yukon (West) Standard Time shall be reckoned as nine
++#     hours behind Greenwich Time.
++#
++# * Yukon Standard Time defined as Pacific Standard Time, YCO 1973/214
++#   http://www.canlii.org/en/yk/laws/regu/yco-1973-214/latest/yco-1973-214.html
++#   C.O. 1973/214 INTERPRETATION ACT ...
++#
++#     1. Effective October 28, 1973 Commissioner's Order 1967/59 is hereby
++#     revoked.
++#
++#     2. Yukon Standard Time as defined by section 36 of the Interpretation
++#     Act from and after midnight on the twenty-eighth day of October, 1973
++#     shall be reckoned in the same manner as Pacific Standard Time, that is
++#     to say eight hours behind Greenwich Time.
++#
++# * O.I.C. 1980/02 INTERPRETATION ACT
++#   http://? - no online source found
++#
++# * Yukon Daylight Saving Time, YOIC 1987/56
++#   http://www.canlii.org/en/yk/laws/regu/yoic-1987-56/latest/yoic-1987-56.html
++#   O.I.C. 1987/056 INTERPRETATION ACT ...
++#
++#   In every year between
++#     (a) two o'clock in the morning in the first Sunday in April, and
++#     (b) two o'clock in the morning in the last Sunday in October,
++#   Standard Time shall be reckoned as seven hours behind Greenwich Time and
++#   called Yukon Daylight Saving Time.
++#   ...
++#   Dated ... 9th day of March, A.D., 1987.
++#
++# * Yukon Daylight Saving Time 2006, YOIC 2006/127
++#   http://www.canlii.org/en/yk/laws/regu/yoic-2006-127/latest/yoic-2006-127.html
++#   O.I.C. 2006/127 INTERPRETATION ACT ...
++#
++#     1. In Yukon each year the time for general purposes shall be 7 hours
++#     behind Greenwich mean time during the period commencing at two o'clock
++#     in the forenoon on the second Sunday of March and ending at two o'clock
++#     in the forenoon on the first Sunday of November and shall be called
++#     Yukon Daylight Saving Time.
++#
++#     2. Order-in-Council 1987/56 is revoked.
++#
++#     3. This order comes into force January 1, 2007.
++#
++# * Interpretation Act, RSY 2002, c 125
++# http://www.canlii.org/en/yk/laws/stat/rsy-2002-c-125/latest/rsy-2002-c-125.html
+ 
+ # From Rives McDow (1999-09-04):
+ # Nunavut ... moved ... to incorporate the whole territory into one time zone.
+ # Nunavut moves to single time zone Oct. 31
+-# <http://www.nunatsiaq.com/nunavut/nvt90903_13.html>
++# http://www.nunatsiaq.com/nunavut/nvt90903_13.html
+ #
+ # From Antoine Leca (1999-09-06):
+ # We then need to create a new timezone for the Kitikmeot region of Nunavut
+@@ -1903,7 +2070,7 @@
+ 
+ # From Paul Eggert (1999-09-20):
+ # Basic Facts: The New Territory
+-# <http://www.nunavut.com/basicfacts/english/basicfacts_1territory.html>
++# http://www.nunavut.com/basicfacts/english/basicfacts_1territory.html
+ # (1999) reports that Pangnirtung operates on eastern time,
+ # and that Coral Harbour does not observe DST.  We don't know when
+ # Pangnirtung switched to eastern time; we'll guess 1995.
+@@ -1932,8 +2099,8 @@
+ # the current state of affairs.
+ 
+ # From Michaela Rodrigue, writing in the
+-# Nunatsiaq News (1999-11-19)
+-# <http://www.nunatsiaq.com/archives/nunavut991130/nvt91119_17.html>:
++# Nunatsiaq News (1999-11-19):
++# http://www.nunatsiaq.com/archives/nunavut991130/nvt91119_17.html
+ # Clyde River, Pangnirtung and Sanikiluaq now operate with two time zones,
+ # central - or Nunavut time - for government offices, and eastern time
+ # for municipal offices and schools....  Igloolik [was similar but then]
+@@ -1980,10 +2147,7 @@
+ # [Also see <http://www.nunatsiaq.com/nunavut/nvt10309_06.html> (2001-03-09).]
+ 
+ # From Gwillim Law (2005-05-21):
+-# According to maps at
+-# http://inms-ienm.nrc-cnrc.gc.ca/images/time_services/TZ01SWE.jpg
+-# http://inms-ienm.nrc-cnrc.gc.ca/images/time_services/TZ01SSE.jpg
+-# (both dated 2003), and
++# According to ...
+ # http://www.canadiangeographic.ca/Magazine/SO98/geomap.asp
+ # (from a 1998 Canadian Geographic article), the de facto and de jure time
+ # for Southampton Island (at the north end of Hudson Bay) is UTC-5 all year
+@@ -1992,9 +2156,11 @@
+ # predates the creation of Nunavut, it probably goes back many years....
+ # The Inuktitut name of Coral Harbour is Sallit, but it's rarely used.
+ #
+-# From Paul Eggert (2005-07-26):
++# From Paul Eggert (2014-10-17):
+ # For lack of better information, assume that Southampton Island observed
+-# daylight saving only during wartime.
++# daylight saving only during wartime.  Gwillim Law's email also
++# mentioned maps now maintained by National Research Council Canada;
++# see above for an up-to-date link.
+ 
+ # From Chris Walton (2007-03-01):
+ # ... the community of Resolute (located on Cornwallis Island in
+@@ -2080,48 +2246,48 @@
+ Rule	NT_YK	1987	2006	-	Apr	Sun>=1	2:00	1:00	D
+ # Zone	NAME		GMTOFF	RULES	FORMAT	[UNTIL]
+ # aka Panniqtuuq
+-Zone America/Pangnirtung 0	-	zzz	1921 # trading post est.
+-			-4:00	NT_YK	A%sT	1995 Apr Sun>=1 2:00
+-			-5:00	Canada	E%sT	1999 Oct 31 2:00
+-			-6:00	Canada	C%sT	2000 Oct 29 2:00
++Zone America/Pangnirtung 0	-	-00	1921 # trading post est.
++			-4:00	NT_YK	A%sT	1995 Apr Sun>=1  2:00
++			-5:00	Canada	E%sT	1999 Oct 31  2:00
++			-6:00	Canada	C%sT	2000 Oct 29  2:00
+ 			-5:00	Canada	E%sT
+ # formerly Frobisher Bay
+-Zone America/Iqaluit	0	-	zzz	1942 Aug # Frobisher Bay est.
+-			-5:00	NT_YK	E%sT	1999 Oct 31 2:00
+-			-6:00	Canada	C%sT	2000 Oct 29 2:00
++Zone America/Iqaluit	0	-	-00	1942 Aug # Frobisher Bay est.
++			-5:00	NT_YK	E%sT	1999 Oct 31  2:00
++			-6:00	Canada	C%sT	2000 Oct 29  2:00
+ 			-5:00	Canada	E%sT
+ # aka Qausuittuq
+-Zone America/Resolute	0	-	zzz	1947 Aug 31 # Resolute founded
+-			-6:00	NT_YK	C%sT	2000 Oct 29 2:00
+-			-5:00	-	EST	2001 Apr  1 3:00
+-			-6:00	Canada	C%sT	2006 Oct 29 2:00
+-			-5:00	-	EST	2007 Mar 11 3:00
++Zone America/Resolute	0	-	-00	1947 Aug 31 # Resolute founded
++			-6:00	NT_YK	C%sT	2000 Oct 29  2:00
++			-5:00	-	EST	2001 Apr  1  3:00
++			-6:00	Canada	C%sT	2006 Oct 29  2:00
++			-5:00	-	EST	2007 Mar 11  3:00
+ 			-6:00	Canada	C%sT
+ # aka Kangiqiniq
+-Zone America/Rankin_Inlet 0	-	zzz	1957 # Rankin Inlet founded
+-			-6:00	NT_YK	C%sT	2000 Oct 29 2:00
+-			-5:00	-	EST	2001 Apr  1 3:00
++Zone America/Rankin_Inlet 0	-	-00	1957 # Rankin Inlet founded
++			-6:00	NT_YK	C%sT	2000 Oct 29  2:00
++			-5:00	-	EST	2001 Apr  1  3:00
+ 			-6:00	Canada	C%sT
+ # aka Iqaluktuuttiaq
+-Zone America/Cambridge_Bay 0	-	zzz	1920 # trading post est.?
+-			-7:00	NT_YK	M%sT	1999 Oct 31 2:00
+-			-6:00	Canada	C%sT	2000 Oct 29 2:00
+-			-5:00	-	EST	2000 Nov  5 0:00
+-			-6:00	-	CST	2001 Apr  1 3:00
++Zone America/Cambridge_Bay 0	-	-00	1920 # trading post est.?
++			-7:00	NT_YK	M%sT	1999 Oct 31  2:00
++			-6:00	Canada	C%sT	2000 Oct 29  2:00
++			-5:00	-	EST	2000 Nov  5  0:00
++			-6:00	-	CST	2001 Apr  1  3:00
+ 			-7:00	Canada	M%sT
+-Zone America/Yellowknife 0	-	zzz	1935 # Yellowknife founded?
++Zone America/Yellowknife 0	-	-00	1935 # Yellowknife founded?
+ 			-7:00	NT_YK	M%sT	1980
+ 			-7:00	Canada	M%sT
+-Zone America/Inuvik	0	-	zzz	1953 # Inuvik founded
+-			-8:00	NT_YK	P%sT	1979 Apr lastSun 2:00
++Zone America/Inuvik	0	-	-00	1953 # Inuvik founded
++			-8:00	NT_YK	P%sT	1979 Apr lastSun  2:00
+ 			-7:00	NT_YK	M%sT	1980
+ 			-7:00	Canada	M%sT
+ Zone America/Whitehorse	-9:00:12 -	LMT	1900 Aug 20
+-			-9:00	NT_YK	Y%sT	1966 Jul 1 2:00
++			-9:00	NT_YK	Y%sT	1967 May 28  0:00
+ 			-8:00	NT_YK	P%sT	1980
+ 			-8:00	Canada	P%sT
+ Zone America/Dawson	-9:17:40 -	LMT	1900 Aug 20
+-			-9:00	NT_YK	Y%sT	1973 Oct 28 0:00
++			-9:00	NT_YK	Y%sT	1973 Oct 28  0:00
+ 			-8:00	NT_YK	P%sT	1980
+ 			-8:00	Canada	P%sT
+ 
+@@ -2130,11 +2296,11 @@
+ 
+ # Mexico
+ 
+-# From Paul Eggert (2001-03-05):
++# From Paul Eggert (2014-12-07):
+ # The Investigation and Analysis Service of the
+ # Mexican Library of Congress (MLoC) has published a
+ # history of Mexican local time (in Spanish)
+-# <http://www.cddhcu.gob.mx/bibliot/publica/inveyana/polisoc/horver/>.
++# http://www.diputados.gob.mx/bibliot/publica/inveyana/polisoc/horver/index.htm
+ #
+ # Here are the discrepancies between Shanks & Pottenger (S&P) and the MLoC.
+ # (In all cases we go with the MLoC.)
+@@ -2179,8 +2345,8 @@
+ # -------------- End Forwarded Message --------------
+ # From Paul Eggert (1996-06-12):
+ # For an English translation of the decree, see
+-# "Diario Oficial: Time Zone Changeover" (1996-01-04)
+-# <http://mexico-travel.com/extra/timezone_eng.html>.
++# "Diario Oficial: Time Zone Changeover" (1996-01-04).
++# http://mexico-travel.com/extra/timezone_eng.html
+ 
+ # From Rives McDow (1998-10-08):
+ # The State of Quintana Roo has reverted back to central STD and DST times
+@@ -2205,7 +2371,7 @@
+ # January 17, 2000 - The Energy Secretary, Ernesto Martens, announced
+ # that Summer Time will be reduced from seven to five months, starting
+ # this year....
+-# <http://www.publico.com.mx/scripts/texto3.asp?action=pagina&pag=21&pos=p&secc=naci&date=01/17/2001>
++# http://www.publico.com.mx/scripts/texto3.asp?action=pagina&pag=21&pos=p&secc=naci&date=01/17/2001
+ # [translated], says "summer time will ... take effect on the first Sunday
+ # in May, and end on the last Sunday of September.
+ 
+@@ -2219,13 +2385,13 @@
+ # observation of Daylight Saving Time.
+ 
+ # Official statute published by the Energy Department
+-# <http://www.conae.gob.mx/ahorro/decretohorver2001.html#decre>
++# http://www.conae.gob.mx/ahorro/decretohorver2001.html#decre
+ # (2001-02-01) shows Baja and Chihauhua as still using US DST rules,
+ # and Sonora with no DST.  This was reported by Jesper Nørgaard (2001-02-03).
+ 
+ # From Paul Eggert (2001-03-03):
+ #
+-# <http://www.latimes.com/news/nation/20010303/t000018766.html>
++# http://www.latimes.com/news/nation/20010303/t000018766.html
+ # James F. Smith writes in today's LA Times
+ # * Sonora will continue to observe standard time.
+ # * Last week Mexico City's mayor Andrés Manuel López Obrador decreed that
+@@ -2303,6 +2469,40 @@
+ # efecto desde las dos horas del segundo domingo de marzo y concluirá a
+ # las dos horas del primer domingo de noviembre.
+ 
++# From Steffen Thorsen (2014-12-08), translated by Gwillim Law:
++# The Mexican state of Quintana Roo will likely change to EST in 2015.
++#
++# http://www.unioncancun.mx/articulo/2014/12/04/medio-ambiente/congreso-aprueba-una-hora-mas-de-sol-en-qroo
++# "With this change, the time conflict that has existed between the municipios
++# of Quintana Roo and the municipio of Felipe Carrillo Puerto may come to an
++# end. The latter declared itself in rebellion 15 years ago when a time change
++# was initiated in Mexico, and since then it has refused to change its time
++# zone along with the rest of the country."
++#
++# From Steffen Thorsen (2015-01-14), translated by Gwillim Law:
++# http://sipse.com/novedades/confirman-aplicacion-de-nueva-zona-horaria-para-quintana-roo-132331.html
++# "...the new time zone will come into effect at two o'clock on the first Sunday
++# of February, when we will have to advance the clock one hour from its current
++# time..."
++# Also, the new zone will not use DST.
++#
++# From Carlos Raúl Perasso (2015-02-02):
++# The decree that modifies the Mexican Hour System Law has finally
++# been published at the Diario Oficial de la Federación
++# http://www.dof.gob.mx/nota_detalle.php?codigo=5380123&fecha=31/01/2015
++# It establishes 5 zones for Mexico:
++# 1- Zona Centro (Central Zone): Corresponds to longitude 90 W,
++#    includes most of Mexico, excluding what's mentioned below.
++# 2- Zona Pacífico (Pacific Zone): Longitude 105 W, includes the
++#    states of Baja California Sur; Chihuahua; Nayarit (excluding Bahía
++#    de Banderas which lies in Central Zone); Sinaloa and Sonora.
++# 3- Zona Noroeste (Northwest Zone): Longitude 120 W, includes the
++#    state of Baja California.
++# 4- Zona Sureste (Southeast Zone): Longitude 75 W, includes the state
++#    of Quintana Roo.
++# 5- The islands, reefs and keys shall take their timezone from the
++#    longitude they are located at.
++
+ # Rule	NAME	FROM	TO	TYPE	IN	ON	AT	SAVE	LETTER/S
+ Rule	Mexico	1939	only	-	Feb	5	0:00	1:00	D
+ Rule	Mexico	1939	only	-	Jun	25	0:00	0	S
+@@ -2323,35 +2523,48 @@
+ Zone America/Cancun	-5:47:04 -	LMT	1922 Jan  1  0:12:56
+ 			-6:00	-	CST	1981 Dec 23
+ 			-5:00	Mexico	E%sT	1998 Aug  2  2:00
+-			-6:00	Mexico	C%sT
++			-6:00	Mexico	C%sT	2015 Feb  1  2:00
++			-5:00	-	EST
+ # Campeche, Yucatán; represented by Mérida
+ Zone America/Merida	-5:58:28 -	LMT	1922 Jan  1  0:01:32
+ 			-6:00	-	CST	1981 Dec 23
+ 			-5:00	-	EST	1982 Dec  2
+ 			-6:00	Mexico	C%sT
+-# Coahuila, Durango, Nuevo León, Tamaulipas (near US border)
++# Coahuila, Nuevo León, Tamaulipas (near US border)
++# This includes the following municipalities:
++#   in Coahuila: Ocampo, Acuña, Zaragoza, Jiménez, Piedras Negras, Nava,
++#     Guerrero, Hidalgo.
++#   in Nuevo León: Anáhuac, Los Aldama.
++#   in Tamaulipas: Nuevo Laredo, Guerrero, Mier, Miguel Alemán, Camargo,
++#     Gustavo Díaz Ordaz, Reynosa, Río Bravo, Valle Hermoso, Matamoros.
++# See: Inicia mañana Horario de Verano en zona fronteriza, El Universal,
++# 2016-03-12
++# http://www.eluniversal.com.mx/articulo/estados/2016/03/12/inicia-manana-horario-de-verano-en-zona-fronteriza
+ Zone America/Matamoros	-6:40:00 -	LMT	1921 Dec 31 23:20:00
+ 			-6:00	-	CST	1988
+ 			-6:00	US	C%sT	1989
+ 			-6:00	Mexico	C%sT	2010
+ 			-6:00	US	C%sT
+-# Coahuila, Durango, Nuevo León, Tamaulipas (away from US border)
++# Durango; Coahuila, Nuevo León, Tamaulipas (away from US border)
+ Zone America/Monterrey	-6:41:16 -	LMT	1921 Dec 31 23:18:44
+ 			-6:00	-	CST	1988
+ 			-6:00	US	C%sT	1989
+ 			-6:00	Mexico	C%sT
+ # Central Mexico
+-Zone America/Mexico_City -6:36:36 -	LMT	1922 Jan  1 0:23:24
++Zone America/Mexico_City -6:36:36 -	LMT	1922 Jan  1  0:23:24
+ 			-7:00	-	MST	1927 Jun 10 23:00
+ 			-6:00	-	CST	1930 Nov 15
+ 			-7:00	-	MST	1931 May  1 23:00
+ 			-6:00	-	CST	1931 Oct
+ 			-7:00	-	MST	1932 Apr  1
+-			-6:00	Mexico	C%sT	2001 Sep 30 02:00
++			-6:00	Mexico	C%sT	2001 Sep 30  2:00
+ 			-6:00	-	CST	2002 Feb 20
+ 			-6:00	Mexico	C%sT
+ # Chihuahua (near US border)
+-Zone America/Ojinaga	-6:57:40 -	LMT	1922 Jan 1 0:02:20
++# This includes the municipalities of Janos, Ascensión, Juárez, Guadalupe,
++# Práxedis G Guerrero, Coyame del Sotol, Ojinaga, and Manuel Benavides.
++# (See the 2016-03-12 El Universal source mentioned above.)
++Zone America/Ojinaga	-6:57:40 -	LMT	1922 Jan  1  0:02:20
+ 			-7:00	-	MST	1927 Jun 10 23:00
+ 			-6:00	-	CST	1930 Nov 15
+ 			-7:00	-	MST	1931 May  1 23:00
+@@ -2359,7 +2572,7 @@
+ 			-7:00	-	MST	1932 Apr  1
+ 			-6:00	-	CST	1996
+ 			-6:00	Mexico	C%sT	1998
+-			-6:00	-	CST	1998 Apr Sun>=1 3:00
++			-6:00	-	CST	1998 Apr Sun>=1  3:00
+ 			-7:00	Mexico	M%sT	2010
+ 			-7:00	US	M%sT
+ # Chihuahua (away from US border)
+@@ -2371,7 +2584,7 @@
+ 			-7:00	-	MST	1932 Apr  1
+ 			-6:00	-	CST	1996
+ 			-6:00	Mexico	C%sT	1998
+-			-6:00	-	CST	1998 Apr Sun>=1 3:00
++			-6:00	-	CST	1998 Apr Sun>=1  3:00
+ 			-7:00	Mexico	M%sT
+ # Sonora
+ Zone America/Hermosillo	-7:23:52 -	LMT	1921 Dec 31 23:36:08
+@@ -2435,10 +2648,10 @@
+ 			-6:00	-	CST	1942 Apr 24
+ 			-7:00	-	MST	1949 Jan 14
+ 			-8:00	-	PST	1970
+-			-7:00	Mexico	M%sT	2010 Apr 4 2:00
++			-7:00	Mexico	M%sT	2010 Apr  4  2:00
+ 			-6:00	Mexico	C%sT
+ 
+-# Baja California (near US border)
++# Baja California
+ Zone America/Tijuana	-7:48:04 -	LMT	1922 Jan  1  0:11:56
+ 			-7:00	-	MST	1924
+ 			-8:00	-	PST	1927 Jun 10 23:00
+@@ -2458,25 +2671,6 @@
+ 			-8:00	US	P%sT	2002 Feb 20
+ 			-8:00	Mexico	P%sT	2010
+ 			-8:00	US	P%sT
+-# Baja California (away from US border)
+-Zone America/Santa_Isabel	-7:39:28 -	LMT	1922 Jan  1  0:20:32
+-			-7:00	-	MST	1924
+-			-8:00	-	PST	1927 Jun 10 23:00
+-			-7:00	-	MST	1930 Nov 15
+-			-8:00	-	PST	1931 Apr  1
+-			-8:00	1:00	PDT	1931 Sep 30
+-			-8:00	-	PST	1942 Apr 24
+-			-8:00	1:00	PWT	1945 Aug 14 23:00u
+-			-8:00	1:00	PPT	1945 Nov 12 # Peace
+-			-8:00	-	PST	1948 Apr  5
+-			-8:00	1:00	PDT	1949 Jan 14
+-			-8:00	-	PST	1954
+-			-8:00	CA	P%sT	1961
+-			-8:00	-	PST	1976
+-			-8:00	US	P%sT	1996
+-			-8:00	Mexico	P%sT	2001
+-			-8:00	US	P%sT	2002 Feb 20
+-			-8:00	Mexico	P%sT
+ # From Paul Eggert (2006-03-22):
+ # Formerly there was an America/Ensenada zone, which differed from
+ # America/Tijuana only in that it did not observe DST from 1976
+@@ -2489,19 +2683,21 @@
+ # other than America/Tijuana for Baja, but it's not clear yet what its
+ # name or contents should be.
+ #
++# From Paul Eggert (2015-10-08):
++# Formerly there was an America/Santa_Isabel zone, but this appears to
++# have come from a misreading of
++# http://dof.gob.mx/nota_detalle.php?codigo=5127480&fecha=06/01/2010
++# It has been moved to the 'backward' file.
++#
++#
+ # Revillagigedo Is
+ # no information
+ 
+ ###############################################################################
+ 
+ # Anguilla
+-# See America/Port_of_Spain.
+-
+ # Antigua and Barbuda
+-# Zone	NAME		GMTOFF	RULES	FORMAT	[UNTIL]
+-Zone	America/Antigua	-4:07:12 -	LMT	1912 Mar 2
+-			-5:00	-	EST	1951
+-			-4:00	-	AST
++# See America/Port_of_Spain.
+ 
+ # Bahamas
+ #
+@@ -2531,8 +2727,8 @@
+ Rule	Barb	1979	only	-	Sep	30	2:00	0	S
+ Rule	Barb	1980	only	-	Sep	25	2:00	0	S
+ # Zone	NAME		GMTOFF	RULES	FORMAT	[UNTIL]
+-Zone America/Barbados	-3:58:29 -	LMT	1924		# Bridgetown
+-			-3:58:29 -	BMT	1932	  # Bridgetown Mean Time
++Zone America/Barbados	-3:58:29 -	LMT	1924 # Bridgetown
++			-3:58:29 -	BMT	1932 # Bridgetown Mean Time
+ 			-4:00	Barb	A%sT
+ 
+ # Belize
+@@ -2562,16 +2758,13 @@
+ # http://www.theroyalgazette.com/apps/pbcs.dll/article?AID=/20060529/NEWS/105290135
+ 
+ # Zone	NAME		GMTOFF	RULES	FORMAT	[UNTIL]
+-Zone Atlantic/Bermuda	-4:19:18 -	LMT	1930 Jan  1 2:00    # Hamilton
+-			-4:00	-	AST	1974 Apr 28 2:00
++Zone Atlantic/Bermuda	-4:19:18 -	LMT	1930 Jan  1  2:00 # Hamilton
++			-4:00	-	AST	1974 Apr 28  2:00
+ 			-4:00	Canada	A%sT	1976
+ 			-4:00	US	A%sT
+ 
+ # Cayman Is
+-# Zone	NAME		GMTOFF	RULES	FORMAT	[UNTIL]
+-Zone	America/Cayman	-5:25:32 -	LMT	1890		# Georgetown
+-			-5:07:11 -	KMT	1912 Feb    # Kingston Mean Time
+-			-5:00	-	EST
++# See America/Panama.
+ 
+ # Costa Rica
+ 
+@@ -2587,7 +2780,7 @@
+ Rule	CR	1992	only	-	Mar	15	0:00	0	S
+ # There are too many San Josés elsewhere, so we'll use 'Costa Rica'.
+ # Zone	NAME		GMTOFF	RULES	FORMAT	[UNTIL]
+-Zone America/Costa_Rica	-5:36:13 -	LMT	1890		# San José
++Zone America/Costa_Rica	-5:36:13 -	LMT	1890        # San José
+ 			-5:36:13 -	SJMT	1921 Jan 15 # San José Mean Time
+ 			-6:00	CR	C%sT
+ # Coco
+@@ -2831,8 +3024,8 @@
+ Zone America/Santo_Domingo -4:39:36 -	LMT	1890
+ 			-4:40	-	SDMT	1933 Apr  1 12:00 # S. Dom. MT
+ 			-5:00	DR	E%sT	1974 Oct 27
+-			-4:00	-	AST	2000 Oct 29 02:00
+-			-5:00	US	E%sT	2000 Dec  3 01:00
++			-4:00	-	AST	2000 Oct 29  2:00
++			-5:00	US	E%sT	2000 Dec  3  1:00
+ 			-4:00	-	AST
+ 
+ # El Salvador
+@@ -2843,7 +3036,7 @@
+ # There are too many San Salvadors elsewhere, so use America/El_Salvador
+ # instead of America/San_Salvador.
+ # Zone	NAME		GMTOFF	RULES	FORMAT	[UNTIL]
+-Zone America/El_Salvador -5:56:48 -	LMT	1921		# San Salvador
++Zone America/El_Salvador -5:56:48 -	LMT	1921 # San Salvador
+ 			-6:00	Salv	C%sT
+ 
+ # Grenada
+@@ -2864,7 +3057,7 @@
+ # From Paul Eggert (2006-06-22):
+ # The Ministry of Energy and Mines, press release CP-15/2006
+ # (2006-04-19), says DST ends at 24:00.  See
+-# <http://www.sieca.org.gt/Sitio_publico/Energeticos/Doc/Medidas/Cambio_Horario_Nac_190406.pdf>.
++# http://www.sieca.org.gt/Sitio_publico/Energeticos/Doc/Medidas/Cambio_Horario_Nac_190406.pdf
+ 
+ # Rule	NAME	FROM	TO	TYPE	IN	ON	AT	SAVE	LETTER/S
+ Rule	Guat	1973	only	-	Nov	25	0:00	1:00	D
+@@ -2934,6 +3127,13 @@
+ # http://radiovision2000haiti.net/public/haiti-avis-changement-dheure-dimanche/
+ # http://www.canalplushaiti.net/?p=6714
+ 
++# From Steffen Thorsen (2016-03-12):
++# Jean Antoine, editor of www.haiti-reference.com informed us that Haiti
++# are not going on DST this year.  Several other resources confirm this: ...
++# http://www.radiotelevisioncaraibes.com/presse/heure_d_t_pas_de_changement_d_heure_pr_vu_pour_cet_ann_e.html
++# http://www.vantbefinfo.com/changement-dheure-pas-pour-haiti/
++# http://news.anmwe.com/haiti-lheure-nationale-ne-sera-ni-avancee-ni-reculee-cette-annee/
++
+ # Rule	NAME	FROM	TO	TYPE	IN	ON	AT	SAVE	LETTER/S
+ Rule	Haiti	1983	only	-	May	8	0:00	1:00	D
+ Rule	Haiti	1984	1987	-	Apr	lastSun	0:00	1:00	D
+@@ -2944,8 +3144,8 @@
+ Rule	Haiti	1988	1997	-	Oct	lastSun	1:00s	0	S
+ Rule	Haiti	2005	2006	-	Apr	Sun>=1	0:00	1:00	D
+ Rule	Haiti	2005	2006	-	Oct	lastSun	0:00	0	S
+-Rule	Haiti	2012	max	-	Mar	Sun>=8	2:00	1:00	D
+-Rule	Haiti	2012	max	-	Nov	Sun>=1	2:00	0	S
++Rule	Haiti	2012	2015	-	Mar	Sun>=8	2:00	1:00	D
++Rule	Haiti	2012	2015	-	Nov	Sun>=1	2:00	0	S
+ # Zone	NAME		GMTOFF	RULES	FORMAT	[UNTIL]
+ Zone America/Port-au-Prince -4:49:20 -	LMT	1890
+ 			-4:49	-	PPMT	1917 Jan 24 12:00 # P-a-P MT
+@@ -2967,8 +3167,8 @@
+ # http://www.worldtimezone.com/dst_news/dst_news_honduras04.html
+ 
+ # From Paul Eggert (2006-08-08):
+-# Also see Diario El Heraldo, The country returns to standard time (2006-08-08)
+-# <http://www.elheraldo.hn/nota.php?nid=54941&sec=12>.
++# Also see Diario El Heraldo, The country returns to standard time (2006-08-08).
++# http://www.elheraldo.hn/nota.php?nid=54941&sec=12
+ # It mentions executive decree 18-2006.
+ 
+ # From Steffen Thorsen (2006-08-17):
+@@ -2995,17 +3195,28 @@
+ # Shanks & Pottenger give -5:07:12, but Milne records -5:07:10.41 from an
+ # unspecified official document, and says "This time is used throughout the
+ # island".  Go with Milne.  Round to the nearest second as required by zic.
++#
++# Shanks & Pottenger give April 28 for the 1974 spring-forward transition, but
++# Lance Neita writes that Prime Minister Michael Manley decreed it January 5.
++# Assume Neita meant Jan 6 02:00, the same as the US.  Neita also writes that
++# Manley's supporters associated this act with Manley's nickname "Joshua"
++# (recall that in the Bible the sun stood still at Joshua's request),
++# and with the Rod of Correction which Manley said he had received from
++# Haile Selassie, Emperor of Ethiopia.  See:
++# Neita L. The politician in all of us. Jamaica Observer 2014-09-20
++# http://www.jamaicaobserver.com/columns/The-politician-in-all-of-us_17573647
++#
+ # Zone	NAME		GMTOFF	RULES	FORMAT	[UNTIL]
+-Zone	America/Jamaica	-5:07:11 -	LMT	1890		# Kingston
++Zone	America/Jamaica	-5:07:11 -	LMT	1890        # Kingston
+ 			-5:07:11 -	KMT	1912 Feb    # Kingston Mean Time
+-			-5:00	-	EST	1974 Apr 28 2:00
++			-5:00	-	EST	1974
+ 			-5:00	US	E%sT	1984
+ 			-5:00	-	EST
+ 
+ # Martinique
+ # Zone	NAME		GMTOFF	RULES	FORMAT	[UNTIL]
+-Zone America/Martinique	-4:04:20 -      LMT	1890		# Fort-de-France
+-			-4:04:20 -	FFMT	1911 May     # Fort-de-France MT
++Zone America/Martinique	-4:04:20 -      LMT	1890        # Fort-de-France
++			-4:04:20 -	FFMT	1911 May    # Fort-de-France MT
+ 			-4:00	-	AST	1980 Apr  6
+ 			-4:00	1:00	ADT	1980 Sep 28
+ 			-4:00	-	AST
+@@ -3034,7 +3245,7 @@
+ # From Gwillim Law (2005-04-21):
+ # The Associated Press story on the time change, which can be found at
+ # http://www.lapalmainteractivo.com/guias/content/gen/ap/America_Latina/AMC_GEN_NICARAGUA_HORA.html
+-# and elsewhere, says (fifth paragraph, translated from Spanish):  "The last
++# and elsewhere, says (fifth paragraph, translated from Spanish): "The last
+ # time that a change of clocks was applied to save energy was in the year 2000
+ # during the Arnoldo Alemán administration."...
+ # The northamerica file says that Nicaragua has been on UTC-6 continuously
+@@ -3072,7 +3283,7 @@
+ 			-5:45:12 -	MMT	1934 Jun 23 # Managua Mean Time?
+ 			-6:00	-	CST	1973 May
+ 			-5:00	-	EST	1975 Feb 16
+-			-6:00	Nic	C%sT	1992 Jan  1 4:00
++			-6:00	Nic	C%sT	1992 Jan  1  4:00
+ 			-5:00	-	EST	1992 Sep 24
+ 			-6:00	-	CST	1993
+ 			-5:00	-	EST	1997
+@@ -3081,13 +3292,14 @@
+ # Panama
+ # Zone	NAME		GMTOFF	RULES	FORMAT	[UNTIL]
+ Zone	America/Panama	-5:18:08 -	LMT	1890
+-			-5:19:36 -	CMT	1908 Apr 22   # Colón Mean Time
++			-5:19:36 -	CMT	1908 Apr 22 # Colón Mean Time
+ 			-5:00	-	EST
++Link America/Panama America/Cayman
+ 
+ # Puerto Rico
+ # There are too many San Juans elsewhere, so we'll use 'Puerto_Rico'.
+ # Zone	NAME		GMTOFF	RULES	FORMAT	[UNTIL]
+-Zone America/Puerto_Rico -4:24:25 -	LMT	1899 Mar 28 12:00    # San Juan
++Zone America/Puerto_Rico -4:24:25 -	LMT	1899 Mar 28 12:00 # San Juan
+ 			-4:00	-	AST	1942 May  3
+ 			-4:00	US	A%sT	1946
+ 			-4:00	-	AST
+@@ -3099,7 +3311,7 @@
+ # St Pierre and Miquelon
+ # There are too many St Pierres elsewhere, so we'll use 'Miquelon'.
+ # Zone	NAME		GMTOFF	RULES	FORMAT	[UNTIL]
+-Zone America/Miquelon	-3:44:40 -	LMT	1911 May 15	# St Pierre
++Zone America/Miquelon	-3:44:40 -	LMT	1911 May 15 # St Pierre
+ 			-4:00	-	AST	1980 May
+ 			-3:00	-	PMST	1987 # Pierre & Miquelon Time
+ 			-3:00	Canada	PM%sT
+@@ -3110,7 +3322,7 @@
+ # Turks and Caicos
+ #
+ # From Chris Dunn in
+-# <http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=415007>
++# http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=415007
+ # (2007-03-15): In the Turks & Caicos Islands (America/Grand_Turk) the
+ # daylight saving dates for time changes have been adjusted to match
+ # the recent U.S. change of dates.
+@@ -3123,20 +3335,21 @@
+ # Clocks are set back one hour at 2:00 a.m. local Daylight Saving Time"
+ # indicating that the normal ET rules are followed.
+ #
+-# From Paul Eggert (2006-05-01):
+-# Shanks & Pottenger say they use US DST rules, but IATA SSIM (1991/1998)
+-# says they switch at midnight.  Go with Shanks & Pottenger.
++# From Paul Eggert (2014-08-19):
++# The 2014-08-13 Cabinet meeting decided to stay on UT -04 year-round.  See:
++# http://tcweeklynews.com/daylight-savings-time-to-be-maintained-p5353-127.htm
++# Model this as a switch from EST/EDT to AST ...
++# From Chris Walton (2014-11-04):
++# ... the TCI government appears to have delayed the switch to
++# "permanent daylight saving time" by one year....
++# http://tcweeklynews.com/time-change-to-go-ahead-this-november-p5437-127.htm
+ #
+-# Rule	NAME	FROM	TO	TYPE	IN	ON	AT	SAVE	LETTER/S
+-Rule	TC	1979	1986	-	Apr	lastSun	2:00	1:00	D
+-Rule	TC	1979	2006	-	Oct	lastSun	2:00	0	S
+-Rule	TC	1987	2006	-	Apr	Sun>=1	2:00	1:00	D
+-Rule	TC	2007	max	-	Mar	Sun>=8	2:00	1:00	D
+-Rule	TC	2007	max	-	Nov	Sun>=1	2:00	0	S
+ # Zone	NAME		GMTOFF	RULES	FORMAT	[UNTIL]
+ Zone America/Grand_Turk	-4:44:32 -	LMT	1890
+-			-5:07:11 -	KMT	1912 Feb    # Kingston Mean Time
+-			-5:00	TC	E%sT
++			-5:07:11 -	KMT	1912 Feb # Kingston Mean Time
++			-5:00	-	EST	1979
++			-5:00	US	E%sT	2015 Nov Sun>=1 2:00
++			-4:00	-	AST
+ 
+ # British Virgin Is
+ # Virgin Is
+--- contrib/tzdata/southamerica.orig
++++ contrib/tzdata/southamerica
+@@ -1,27 +1,28 @@
+ # This file is in the public domain, so clarified as of
+ # 2009-05-17 by Arthur David Olson.
+ 
+-# This data is by no means authoritative; if you think you know better,
++# This file is by no means authoritative; if you think you know better,
+ # go ahead and edit the file (and please send any changes to
+-# tz@iana.org for general use in the future).
++# tz@iana.org for general use in the future).  For more, please see
++# the file CONTRIBUTING in the tz distribution.
+ 
+-# From Paul Eggert (2006-03-22):
+-# A good source for time zone historical data outside the U.S. is
++# From Paul Eggert (2014-10-31):
++#
++# Unless otherwise specified, the source for data through 1990 is:
+ # Thomas G. Shanks and Rique Pottenger, The International Atlas (6th edition),
+ # San Diego: ACS Publications, Inc. (2003).
+-#
+-# For data circa 1899, a common source is:
+-# Milne J. Civil time. Geogr J. 1899 Feb;13(2):173-94
+-# <http://www.jstor.org/stable/1774359>.
++# Unfortunately this book contains many errors and cites no sources.
+ #
+ # Gwillim Law writes that a good source
+ # for recent time zone data is the International Air Transport
+ # Association's Standard Schedules Information Manual (IATA SSIM),
+ # published semiannually.  Law sent in several helpful summaries
+-# of the IATA's data after 1990.
++# of the IATA's data after 1990.  Except where otherwise noted,
++# IATA SSIM is the source for entries after 1990.
+ #
+-# Except where otherwise noted, Shanks & Pottenger is the source for
+-# entries through 1990, and IATA SSIM is the source for entries afterwards.
++# For data circa 1899, a common source is:
++# Milne J. Civil time. Geogr J. 1899 Feb;13(2):173-94.
++# http://www.jstor.org/stable/1774359
+ #
+ # Earlier editions of these tables used the North American style (e.g. ARST and
+ # ARDT for Argentine Standard and Daylight Time), but the following quote
+@@ -29,7 +30,7 @@
+ #	I suggest the use of _Summer time_ instead of the more cumbersome
+ #	_daylight-saving time_.  _Summer time_ seems to be in general use
+ #	in Europe and South America.
+-#	-- E O Cutler, _New York Times_ (1937-02-14), quoted in
++#	-- E O Cutler, _New York Times_ (1937-02-14), quoted in
+ #	H L Mencken, _The American Language: Supplement I_ (1960), p 466
+ #
+ # Earlier editions of these tables also used the North American style
+@@ -130,7 +131,7 @@
+ # Timezone Law (which never was effectively applied) will (would?) be
+ # in effect.... The article is at
+ # http://ar.clarin.com/diario/2001-06-06/e-01701.htm
+-# ... The Law itself is "Ley No 25155", sanctioned on 1999-08-25, enacted
++# ... The Law itself is "Ley No. 25155", sanctioned on 1999-08-25, enacted
+ # 1999-09-17, and published 1999-09-21.  The official publication is at:
+ # http://www.boletin.jus.gov.ar/BON/Primera/1999/09-Septiembre/21/PDF/BO21-09-99LEG.PDF
+ # Regretfully, you have to subscribe (and pay) for the on-line version....
+@@ -174,21 +175,17 @@
+ # http://www.worldtimezone.com/dst_news/dst_news_argentina03.html
+ # http://www.impulsobaires.com.ar/nota.php?id=57832 (in spanish)
+ 
+-# From Rodrigo Severo (2008-10-06):
+-# Here is some info available at a Gentoo bug related to TZ on Argentina's DST:
+-# ...
+-# ------- Comment #1 from [jmdocile]  2008-10-06 16:28 0000 -------
+-# Hi, there is a problem with timezone-data-2008e and maybe with
+-# timezone-data-2008f
+-# Argentinian law [Number] 25.155 is no longer valid.
++# From Juan Manuel Docile in https://bugs.gentoo.org/240339 (2008-10-07)
++# via Rodrigo Severo:
++# Argentinian law No. 25.155 is no longer valid.
+ # http://www.infoleg.gov.ar/infolegInternet/anexos/60000-64999/60036/norma.htm
+-# The new one is law [Number] 26.350
++# The new one is law No. 26.350
+ # http://www.infoleg.gov.ar/infolegInternet/anexos/135000-139999/136191/norma.htm
+ # So there is no summer time in Argentina for now.
+ 
+ # From Mariano Absatz (2008-10-20):
+-# Decree 1693/2008 applies Law 26.350 for the summer 2008/2009 establishing DST in Argentina
+-# From 2008-10-19 until 2009-03-15
++# Decree 1693/2008 applies Law 26.350 for the summer 2008/2009 establishing DST
++# in Argentina from 2008-10-19 until 2009-03-15.
+ # http://www.boletinoficial.gov.ar/Bora.Portal/CustomControls/PdfContent.aspx?fp=16102008&pi=3&pf=4&s=0&sec=01
+ #
+ 
+@@ -197,14 +194,16 @@
+ # Pampa, Neuquén, Rio Negro, Chubut, Santa Cruz and Tierra del Fuego
+ # http://www.boletinoficial.gov.ar/Bora.Portal/CustomControls/PdfContent.aspx?fp=17102008&pi=1&pf=1&s=0&sec=01
+ #
+-# Press release 235 dated Saturday October 18th, from the Government of the Province of Jujuy saying
+-# it will not apply DST either (even when it was not included in Decree 1705/2008)
++# Press release 235 dated Saturday October 18th, from the Government of the
++# Province of Jujuy saying it will not apply DST either (even when it was not
++# included in Decree 1705/2008).
+ # http://www.jujuy.gov.ar/index2/partes_prensa/18_10_08/235-181008.doc
+ 
+ # From fullinet (2009-10-18):
+ # As announced in
+ # http://www.argentina.gob.ar/argentina/portal/paginas.dhtml?pagina=356
+-# (an official .gob.ar) under title: "Sin Cambio de Hora" (english: "No hour change")
++# (an official .gob.ar) under title: "Sin Cambio de Hora"
++# (English: "No hour change").
+ #
+ # "Por el momento, el Gobierno Nacional resolvió no modificar la hora
+ # oficial, decisión que estaba en estudio para su implementación el
+@@ -225,9 +224,9 @@
+ # It's Law No. 7,210.  This change is due to a public power emergency, so for
+ # now we'll assume it's for this year only.
+ #
+-# From Paul Eggert (2006-03-22):
+-# Hora de verano para la Republica Argentina (2003-06-08)
+-# <http://www.spicasc.net/horvera.html>
++# From Paul Eggert (2014-08-09):
++# Hora de verano para la República Argentina
++# http://buenasiembra.com.ar/esoterismo/astrologia/hora-de-verano-de-la-republica-argentina-27.html
+ # says that standard time in Argentina from 1894-10-31
+ # to 1920-05-01 was -4:16:48.25.  Go with this more-precise value
+ # over Shanks & Pottenger.
+@@ -300,7 +299,7 @@
+ # confirms that upon request the provinces San Juan and Mendoza
+ # refused to follow San Luis in this change.
+ #
+-# The change is supposed to take place Monday the 21.st at 0:00
++# The change is supposed to take place Monday the 21st at 0:00
+ # hours. As far as I understand it if this goes ahead, we need
+ # a new timezone for San Luis (although there are also documented
+ # independent changes in the southamerica file of San Luis in
+@@ -332,9 +331,9 @@
+ # back in 2004, when these provinces changed to UTC-4 for a few days, I
+ # mailed them personally and never got an answer).
+ 
+-# From Paul Eggert (2008-06-30):
+-# Unless otherwise specified, data are from Shanks & Pottenger through 1992,
+-# from the IATA otherwise.  As noted below, Shanks & Pottenger say that
++# From Paul Eggert (2014-08-12):
++# Unless otherwise specified, data entries are from Shanks & Pottenger through
++# 1992, from the IATA otherwise.  As noted below, Shanks & Pottenger say that
+ # America/Cordoba split into 6 subregions during 1991/1992, one of which
+ # was America/San_Luis, but we haven't verified this yet so for now we'll
+ # keep America/Cordoba a single region rather than splitting it into the
+@@ -394,7 +393,7 @@
+ # ...
+ 
+ # From Alexander Krivenyshev (2010-04-09):
+-# According to news reports from El Diario de la Republica Province San
++# According to news reports from El Diario de la República Province San
+ # Luis, Argentina (standard time UTC-04) will keep Daylight Saving Time
+ # after April 11, 2010 - will continue to have same time as rest of
+ # Argentina (UTC-3) (no DST).
+@@ -411,10 +410,10 @@
+ # stuck on Summer daylight savings time even though the summer is over.
+ 
+ # From Paul Eggert (2013-09-05):
+-# Perhaps San Luis operates on the legal fiction that it is at UTC-4
++# Perhaps San Luis operates on the legal fiction that it is at -04
+ # with perpetual summer time, but ordinary usage typically seems to
+-# just say it's at UTC-3; see, for example,
+-# <http://es.wikipedia.org/wiki/Hora_oficial_argentina>.
++# just say it's at -03; see, for example,
++# http://es.wikipedia.org/wiki/Hora_oficial_argentina
+ # We've documented similar situations as being plain changes to
+ # standard time, so let's do that here too.  This does not change UTC
+ # offsets, only tm_isdst and the time zone abbreviations.  One minor
+@@ -427,8 +426,8 @@
+ # Zone	NAME		GMTOFF	RULES	FORMAT	[UNTIL]
+ #
+ # Buenos Aires (BA), Capital Federal (CF),
+-Zone America/Argentina/Buenos_Aires -3:53:48 - LMT 1894 Oct 31
+-			-4:16:48 -	CMT	1920 May # Córdoba Mean Time
++Zone America/Argentina/Buenos_Aires -3:53:48 - LMT	1894 Oct 31
++			-4:16:48 -	CMT	1920 May    # Córdoba Mean Time
+ 			-4:00	-	ART	1930 Dec
+ 			-4:00	Arg	AR%sT	1969 Oct  5
+ 			-3:00	Arg	AR%sT	1999 Oct  3
+@@ -578,8 +577,8 @@
+ 			-3:00	-	ART
+ #
+ # Santa Cruz (SC)
+-Zone America/Argentina/Rio_Gallegos -4:36:52 - LMT 1894 Oct 31
+-			-4:16:48 -	CMT	1920 May # Córdoba Mean Time
++Zone America/Argentina/Rio_Gallegos -4:36:52 - LMT	1894 Oct 31
++			-4:16:48 -	CMT	1920 May    # Córdoba Mean Time
+ 			-4:00	-	ART	1930 Dec
+ 			-4:00	Arg	AR%sT	1969 Oct  5
+ 			-3:00	Arg	AR%sT	1999 Oct  3
+@@ -590,8 +589,8 @@
+ 			-3:00	-	ART
+ #
+ # Tierra del Fuego, Antártida e Islas del Atlántico Sur (TF)
+-Zone America/Argentina/Ushuaia -4:33:12 - LMT 1894 Oct 31
+-			-4:16:48 -	CMT	1920 May # Córdoba Mean Time
++Zone America/Argentina/Ushuaia -4:33:12 - LMT	1894 Oct 31
++			-4:16:48 -	CMT	1920 May    # Córdoba Mean Time
+ 			-4:00	-	ART	1930 Dec
+ 			-4:00	Arg	AR%sT	1969 Oct  5
+ 			-3:00	Arg	AR%sT	1999 Oct  3
+@@ -685,7 +684,7 @@
+ # Oficial da União"...) in Brazil there are changes in the timezones,
+ # effective today (00:00am at June 24, 2008) as follows:
+ #
+-# a) The timezone UTC+5 is e[x]tinguished, with all the Acre state and the
++# a) The timezone UTC+5 is extinguished, with all the Acre state and the
+ # part of the Amazonas state that had this timezone now being put to the
+ # timezone UTC+4
+ # b) The whole Pará state now is put at timezone UTC+3, instead of just
+@@ -722,8 +721,8 @@
+ 
+ # From Paul Eggert (2002-10-10):
+ # The official decrees referenced below are mostly taken from
+-# Decretos sobre o Horário de Verão no Brasil
+-# <http://pcdsh01.on.br/DecHV.html>.
++# Decretos sobre o Horário de Verão no Brasil.
++# http://pcdsh01.on.br/DecHV.html
+ 
+ # From Steffen Thorsen (2008-08-29):
+ # As announced by the government and many newspapers in Brazil late
+@@ -768,7 +767,7 @@
+ #	 [ and in a second message (same day): ]
+ # I found the decree.
+ #
+-# DECRETO No- 7.584, DE 13 DE OUTUBRO DE 2011
++# DECRETO No. 7.584, DE 13 DE OUTUBRO DE 2011
+ # Link :
+ # http://www.in.gov.br/visualiza/index.jsp?data=13/10/2011&jornal=1000&pagina=6&totalArquivos=6
+ 
+@@ -986,7 +985,7 @@
+ # West Pará includes Altamira, Óbidos, Prainha, Oriximiná, and Santarém.
+ Zone America/Santarem	-3:38:48 -	LMT	1914
+ 			-4:00	Brazil	AM%sT	1988 Sep 12
+-			-4:00	-	AMT	2008 Jun 24 00:00
++			-4:00	-	AMT	2008 Jun 24  0:00
+ 			-3:00	-	BRT
+ #
+ # Maranhão (MA), Piauí (PI), Ceará (CE), Rio Grande do Norte (RN),
+@@ -1041,7 +1040,7 @@
+ # Espírito Santo (ES), Rio de Janeiro (RJ), São Paulo (SP), Paraná (PR),
+ # Santa Catarina (SC), Rio Grande do Sul (RS)
+ Zone America/Sao_Paulo	-3:06:28 -	LMT	1914
+-			-3:00	Brazil	BR%sT	1963 Oct 23 00:00
++			-3:00	Brazil	BR%sT	1963 Oct 23  0:00
+ 			-3:00	1:00	BRST	1964
+ 			-3:00	Brazil	BR%sT
+ #
+@@ -1082,19 +1081,73 @@
+ 			-5:00	Brazil	AC%sT	1988 Sep 12
+ 			-5:00	-	ACT	1993 Sep 28
+ 			-5:00	Brazil	AC%sT	1994 Sep 22
+-			-5:00	-	ACT	2008 Jun 24 00:00
++			-5:00	-	ACT	2008 Jun 24  0:00
+ 			-4:00	-	AMT	2013 Nov 10
+ 			-5:00	-	ACT
+ #
+ # Acre (AC)
+ Zone America/Rio_Branco	-4:31:12 -	LMT	1914
+ 			-5:00	Brazil	AC%sT	1988 Sep 12
+-			-5:00	-	ACT	2008 Jun 24 00:00
++			-5:00	-	ACT	2008 Jun 24  0:00
+ 			-4:00	-	AMT	2013 Nov 10
+ 			-5:00	-	ACT
+ 
+ # Chile
+ 
++# From Paul Eggert (2015-04-03):
++# Shanks & Pottenger says America/Santiago introduced standard time in
++# 1890 and rounds its UTC offset to 70W40; guess that in practice this
++# was the same offset as in 1916-1919.  It also says Pacific/Easter
++# standardized on 109W22 in 1890; assume this didn't change the clocks.
++#
++# Dates for America/Santiago from 1910 to 2004 are primarily from
++# the following source, cited by Oscar van Vlijmen (2006-10-08):
++# [1] Chile Law
++# http://www.webexhibits.org/daylightsaving/chile.html
++# This contains a copy of a this official table:
++# Cambios en la hora oficial de Chile desde 1900 (retrieved 2008-03-30)
++# http://web.archive.org/web/20080330200901/http://www.horaoficial.cl/cambio.htm
++# [1] needs several corrections, though.
++#
++# The first set of corrections is from:
++# [2] History of the Official Time of Chile
++# http://www.horaoficial.cl/ing/horaof_ing.html (retrieved 2012-03-06).  See:
++# http://web.archive.org/web/20120306042032/http://www.horaoficial.cl/ing/horaof_ing.html
++# This is an English translation of:
++# Historia de la hora oficial de Chile (retrieved 2012-10-24).  See:
++# http://web.archive.org/web/20121024234627/http://www.horaoficial.cl/horaof.htm
++# A fancier Spanish version (requiring mouse-clicking) is at:
++# http://www.horaoficial.cl/historia_hora.html
++# Conflicts between [1] and [2] were resolved as follows:
++#
++#  - [1] says the 1910 transition was Jan 1, [2] says Jan 10 and cites
++#    Boletín No. 1, Aviso No. 1 (1910).  Go with [2].
++#
++#  - [1] says SMT was -4:42:45, [2] says Chile's official time from
++#    1916 to 1919 was -4:42:46.3, the meridian of Chile's National
++#    Astronomical Observatory (OAN), then located in what is now
++#    Quinta Normal in Santiago.  Go with [2], rounding it to -4:42:46.
++#
++#  - [1] says the 1918 transition was Sep 1, [2] says Sep 10 and cites
++#    Boletín No. 22, Aviso No. 129/1918 (1918-08-23).  Go with [2].
++#
++#  - [1] does not give times for transitions; assume they occur
++#    at midnight mainland time, the current common practice.  However,
++#    go with [2]'s specification of 23:00 for the 1947-05-21 transition.
++#
++# Another correction to [1] is from Jesper Nørgaard Welen, who
++# wrote (2006-10-08), "I think that there are some obvious mistakes in
++# the suggested link from Oscar van Vlijmen,... for instance entry 66
++# says that GMT-4 ended 1990-09-12 while entry 67 only begins GMT-3 at
++# 1990-09-15 (they should have been 1990-09-15 and 1990-09-16
++# respectively), but anyhow it clears up some doubts too."
++#
++# Data for Pacific/Easter from 1910 through 1967 come from Shanks &
++# Pottenger.  After that, for lack of better info assume
++# Pacific/Easter is always two hours behind America/Santiago;
++# this is known to work for DST transitions starting in 2008 and
++# may well be true for earlier transitions.
++
+ # From Eduardo Krell (1995-10-19):
+ # The law says to switch to DST at midnight [24:00] on the second SATURDAY
+ # of October....  The law is the same for March and October.
+@@ -1107,78 +1160,35 @@
+ # Because of the same drought, the government decided to end DST later,
+ # on April 3, (one-time change).
+ 
+-# From Oscar van Vlijmen (2006-10-08):
+-# http://www.horaoficial.cl/cambio.htm
+-
+-# From Jesper Nørgaard Welen (2006-10-08):
+-# I think that there are some obvious mistakes in the suggested link
+-# from Oscar van Vlijmen,... for instance entry 66 says that GMT-4
+-# ended 1990-09-12 while entry 67 only begins GMT-3 at 1990-09-15
+-# (they should have been 1990-09-15 and 1990-09-16 respectively), but
+-# anyhow it clears up some doubts too.
+-
+-# From Paul Eggert (2006-12-27):
+-# The following data for Chile and America/Santiago are from
+-# <http://www.horaoficial.cl/horaof.htm> (2006-09-20), transcribed by
+-# Jesper Nørgaard Welen.  The data for Pacific/Easter are from Shanks
+-# & Pottenger, except with DST transitions after 1932 cloned from
+-# America/Santiago.  The pre-1980 Pacific/Easter data are dubious,
+-# but we have no other source.
+-
+ # From Germán Poo-Caamaño (2008-03-03):
+ # Due to drought, Chile extends Daylight Time in three weeks.  This
+ # is one-time change (Saturday 3/29 at 24:00 for America/Santiago
+ # and Saturday 3/29 at 22:00 for Pacific/Easter)
+ # The Supreme Decree is located at
+ # http://www.shoa.cl/servicios/supremo316.pdf
+-# and the instructions for 2008 are located in:
+-# http://www.horaoficial.cl/cambio.htm
+-
++#
+ # From José Miguel Garrido (2008-03-05):
+-# ...
+-# You could see the announces of the change on
+ # http://www.shoa.cl/noticias/2008/04hora/hora.htm
+ 
+ # From Angel Chiang (2010-03-04):
+ # Subject: DST in Chile exceptionally extended to 3 April due to earthquake
+ # http://www.gobiernodechile.cl/viewNoticia.aspx?idArticulo=30098
+-# (in Spanish, last paragraph).
+ #
+-# This is breaking news. There should be more information available later.
+-
+-# From Arthur Daivd Olson (2010-03-06):
++# From Arthur David Olson (2010-03-06):
+ # Angel Chiang's message confirmed by Julio Pacheco; Julio provided a patch.
+ 
+-# From Glenn Eychaner (2011-03-02): [geychaner@mac.com]
+-# It appears that the Chilean government has decided to postpone the
+-# change from summer time to winter time again, by three weeks to April
+-# 2nd:
+-# http://www.emol.com/noticias/nacional/detalle/detallenoticias.asp?idnoticia=467651
+-#
+-# This is not yet reflected in the official "cambio de hora" site, but
+-# probably will be soon:
+-# http://www.horaoficial.cl/cambio.htm
+-
+-# From Arthur David Olson (2011-03-02):
+-# The emol.com article mentions a water shortage as the cause of the
+-# postponement, which may mean that it's not a permanent change.
+-
+ # From Glenn Eychaner (2011-03-28):
+-# The article:
+ # http://diario.elmercurio.com/2011/03/28/_portada/_portada/noticias/7565897A-CA86-49E6-9E03-660B21A4883E.htm?id=3D{7565897A-CA86-49E6-9E03-660B21A4883E}
+-#
+ # In English:
+ # Chile's clocks will go back an hour this year on the 7th of May instead
+ # of this Saturday. They will go forward again the 3rd Saturday in
+-# August, not in October as they have since 1968. This is a pilot plan
+-# which will be reevaluated in 2012.
++# August, not in October as they have since 1968.
+ 
+ # From Mauricio Parada (2012-02-22), translated by Glenn Eychaner (2012-02-23):
+ # As stated in the website of the Chilean Energy Ministry
+ # http://www.minenergia.cl/ministerio/noticias/generales/gobierno-anuncia-fechas-de-cambio-de.html
+ # The Chilean Government has decided to postpone the entrance into winter time
+-# (to leave DST) from March 11 2012 to April 28th 2012. The decision has not
+-# been yet formalized but it will within the next days.
++# (to leave DST) from March 11 2012 to April 28th 2012....
+ # Quote from the website communication:
+ #
+ # 6. For the year 2012, the dates of entry into winter time will be as follows:
+@@ -1203,17 +1213,31 @@
+ # DST Start: first Saturday of September 2014 (Sun 07 Sep 2014 04:00 UTC)
+ # http://www.diariooficial.interior.gob.cl//media/2014/02/19/do-20140219.pdf
+ 
+-# NOTE: ChileAQ rules for Antarctic bases are stored separately in the
+-# 'antarctica' file.
++# From Eduardo Romero Urra (2015-03-03):
++# Today has been published officially that Chile will use the DST time
++# permanently until March 25 of 2017
++# http://www.diariooficial.interior.gob.cl/media/2015/03/03/1-large.jpg
++#
++# From Paul Eggert (2015-03-03):
++# For now, assume that the extension will persist indefinitely.
++
++# From Juan Correa (2016-03-18):
++# The decree regarding DST has been published in today's Official Gazette:
++# http://www.diariooficial.interior.gob.cl/versiones-anteriores/do/20160318/
++# http://www.leychile.cl/Navegar?idNorma=1088502
++# It does consider the second Saturday of May and August as the dates
++# for the transition; and it lists DST dates until 2019, but I think
++# this scheme will stick.
++#
++# From Paul Eggert (2016-03-18):
++# For now, assume the pattern holds for the indefinite future.
++# The decree says transitions occur at 24:00; in practice this appears
++# to mean 24:00 mainland time, not 24:00 local time, so that Easter
++# Island is always two hours behind the mainland.
+ 
+ # Rule	NAME	FROM	TO	TYPE	IN	ON	AT	SAVE	LETTER/S
+-Rule	Chile	1927	1932	-	Sep	 1	0:00	1:00	S
++Rule	Chile	1927	1931	-	Sep	 1	0:00	1:00	S
+ Rule	Chile	1928	1932	-	Apr	 1	0:00	0	-
+-Rule	Chile	1942	only	-	Jun	 1	4:00u	0	-
+-Rule	Chile	1942	only	-	Aug	 1	5:00u	1:00	S
+-Rule	Chile	1946	only	-	Jul	15	4:00u	1:00	S
+-Rule	Chile	1946	only	-	Sep	 1	3:00u	0:00	-
+-Rule	Chile	1947	only	-	Apr	 1	4:00u	0	-
+ Rule	Chile	1968	only	-	Nov	 3	4:00u	1:00	S
+ Rule	Chile	1969	only	-	Mar	30	3:00u	0	-
+ Rule	Chile	1969	only	-	Nov	23	4:00u	1:00	S
+@@ -1224,10 +1248,8 @@
+ Rule	Chile	1973	only	-	Sep	30	4:00u	1:00	S
+ Rule	Chile	1974	1987	-	Oct	Sun>=9	4:00u	1:00	S
+ Rule	Chile	1987	only	-	Apr	12	3:00u	0	-
+-Rule	Chile	1988	1989	-	Mar	Sun>=9	3:00u	0	-
+-Rule	Chile	1988	only	-	Oct	Sun>=1	4:00u	1:00	S
+-Rule	Chile	1989	only	-	Oct	Sun>=9	4:00u	1:00	S
+-Rule	Chile	1990	only	-	Mar	18	3:00u	0	-
++Rule	Chile	1988	1990	-	Mar	Sun>=9	3:00u	0	-
++Rule	Chile	1988	1989	-	Oct	Sun>=9	4:00u	1:00	S
+ Rule	Chile	1990	only	-	Sep	16	4:00u	1:00	S
+ Rule	Chile	1991	1996	-	Mar	Sun>=9	3:00u	0	-
+ Rule	Chile	1991	1997	-	Oct	Sun>=9	4:00u	1:00	S
+@@ -1244,28 +1266,54 @@
+ Rule	Chile	2010	only	-	Apr	Sun>=1	3:00u	0	-
+ Rule	Chile	2011	only	-	May	Sun>=2	3:00u	0	-
+ Rule	Chile	2011	only	-	Aug	Sun>=16	4:00u	1:00	S
+-Rule	Chile	2012	max	-	Apr	Sun>=23	3:00u	0	-
+-Rule	Chile	2012	max	-	Sep	Sun>=2	4:00u	1:00	S
++Rule	Chile	2012	2014	-	Apr	Sun>=23	3:00u	0	-
++Rule	Chile	2012	2014	-	Sep	Sun>=2	4:00u	1:00	S
++Rule	Chile	2016	max	-	May	Sun>=9	3:00u	0	-
++Rule	Chile	2016	max	-	Aug	Sun>=9	4:00u	1:00	S
+ # IATA SSIM anomalies: (1992-02) says 1992-03-14;
+ # (1996-09) says 1998-03-08.  Ignore these.
+ # Zone	NAME		GMTOFF	RULES	FORMAT	[UNTIL]
+ Zone America/Santiago	-4:42:46 -	LMT	1890
+-			-4:42:46 -	SMT	1910 	    # Santiago Mean Time
++			-4:42:46 -	SMT	1910 Jan 10 # Santiago Mean Time
+ 			-5:00	-	CLT	1916 Jul  1 # Chile Time
+-			-4:42:46 -	SMT	1918 Sep  1 # Santiago Mean Time
+-			-4:00	-	CLT	1919 Jul  1 # Chile Time
+-			-4:42:46 -	SMT	1927 Sep  1 # Santiago Mean Time
+-			-5:00	Chile	CL%sT	1947 May 22 # Chile Time
++			-4:42:46 -	SMT	1918 Sep 10
++			-4:00	-	CLT	1919 Jul  1
++			-4:42:46 -	SMT	1927 Sep  1
++			-5:00	Chile	CL%sT	1932 Sep  1
++			-4:00	-	CLT	1942 Jun  1
++			-5:00	-	CLT	1942 Aug  1
++			-4:00	-	CLT	1946 Jul 15
++			-4:00	1:00	CLST	1946 Sep  1 # central Chile
++			-4:00	-	CLT	1947 Apr  1
++			-5:00	-	CLT	1947 May 21 23:00
+ 			-4:00	Chile	CL%sT
+-Zone Pacific/Easter	-7:17:44 -	LMT	1890
++Zone Pacific/Easter	-7:17:28 -	LMT	1890
+ 			-7:17:28 -	EMT	1932 Sep    # Easter Mean Time
+-			-7:00	Chile	EAS%sT	1982 Mar 13 21:00 # Easter I Time
++			-7:00	Chile	EAS%sT	1982 Mar 14 3:00u # Easter Time
+ 			-6:00	Chile	EAS%sT
+ #
+ # Salas y Gómez Island is uninhabited.
+ # Other Chilean locations, including Juan Fernández Is, Desventuradas Is,
+ # and Antarctic bases, are like America/Santiago.
+ 
++# Antarctic base using South American rules
++# (See the file 'antarctica' for more.)
++#
++# Palmer, Anvers Island, since 1965 (moved 2 miles in 1968)
++#
++# From Ethan Dicks (1996-10-06):
++# It keeps the same time as Punta Arenas, Chile, because, just like us
++# and the South Pole, that's the other end of their supply line....
++# I verified with someone who was there that since 1980,
++# Palmer has followed Chile.  Prior to that, before the Falklands War,
++# Palmer used to be supplied from Argentina.
++#
++# Zone	NAME		GMTOFF	RULES	FORMAT	[UNTIL]
++Zone Antarctica/Palmer	0	-	-00	1965
++			-4:00	Arg	AR%sT	1969 Oct  5
++			-3:00	Arg	AR%sT	1982 May
++			-4:00	Chile	CL%sT
++
+ # Colombia
+ 
+ # Milne gives 4:56:16.4 for Bogotá time in 1899; round to nearest.  He writes,
+@@ -1300,7 +1348,7 @@
+ # though, as far as we know.
+ #
+ # Zone	NAME		GMTOFF	RULES	FORMAT	[UNTIL]
+-Zone	America/Curacao	-4:35:47 -	LMT	1912 Feb 12	# Willemstad
++Zone	America/Curacao	-4:35:47 -	LMT	1912 Feb 12 # Willemstad
+ 			-4:30	-	ANT	1965 # Netherlands Antilles Time
+ 			-4:00	-	AST
+ 
+@@ -1325,10 +1373,10 @@
+ # Zone	NAME		GMTOFF	RULES	FORMAT	[UNTIL]
+ Zone America/Guayaquil	-5:19:20 -	LMT	1890
+ 			-5:14:00 -	QMT	1931 # Quito Mean Time
+-			-5:00	-	ECT	     # Ecuador Time
++			-5:00	-	ECT	# Ecuador Time
+ Zone Pacific/Galapagos	-5:58:24 -	LMT	1931 # Puerto Baquerizo Moreno
+ 			-5:00	-	ECT	1986
+-			-6:00	-	GALT	     # Galápagos Time
++			-6:00	-	GALT	# Galápagos Time
+ 
+ # Falklands
+ 
+@@ -1427,10 +1475,10 @@
+ Rule	Falk	2001	2010	-	Sep	Sun>=1	2:00	1:00	S
+ # Zone	NAME		GMTOFF	RULES	FORMAT	[UNTIL]
+ Zone Atlantic/Stanley	-3:51:24 -	LMT	1890
+-			-3:51:24 -	SMT	1912 Mar 12  # Stanley Mean Time
+-			-4:00	Falk	FK%sT	1983 May     # Falkland Is Time
++			-3:51:24 -	SMT	1912 Mar 12 # Stanley Mean Time
++			-4:00	Falk	FK%sT	1983 May    # Falkland Is Time
+ 			-3:00	Falk	FK%sT	1985 Sep 15
+-			-4:00	Falk	FK%sT	2010 Sep 5 02:00
++			-4:00	Falk	FK%sT	2010 Sep  5  2:00
+ 			-3:00	-	FKST
+ 
+ # French Guiana
+@@ -1441,7 +1489,7 @@
+ 
+ # Guyana
+ # Zone	NAME		GMTOFF	RULES	FORMAT	[UNTIL]
+-Zone	America/Guyana	-3:52:40 -	LMT	1915 Mar	# Georgetown
++Zone	America/Guyana	-3:52:40 -	LMT	1915 Mar    # Georgetown
+ 			-3:45	-	GBGT	1966 May 26 # Br Guiana Time
+ 			-3:45	-	GYT	1975 Jul 31 # Guyana Time
+ 			-3:00	-	GYT	1991
+@@ -1478,8 +1526,8 @@
+ # (10-01).
+ #
+ # Translated by Gwillim Law (2001-02-27) from
+-# Noticias, a daily paper in Asunción, Paraguay (2000-10-01)
+-# <http://www.diarionoticias.com.py/011000/nacional/naciona1.htm>:
++# Noticias, a daily paper in Asunción, Paraguay (2000-10-01):
++# http://www.diarionoticias.com.py/011000/nacional/naciona1.htm
+ # Starting at 0:00 today, the clock will be set forward 60 minutes, in
+ # fulfillment of Decree No. 7,273 of the Executive Power....  The time change
+ # system has been operating for several years.  Formerly there was a separate
+@@ -1494,7 +1542,7 @@
+ # (1999-09) reports no date; go with above sources and Gerd Knops (2001-02-27).
+ Rule	Para	1998	2001	-	Mar	Sun>=1	0:00	0	-
+ # From Rives McDow (2002-02-28):
+-# A decree was issued in Paraguay (no. 16350) on 2002-02-26 that changed the
++# A decree was issued in Paraguay (No. 16350) on 2002-02-26 that changed the
+ # dst method to be from the first Sunday in September to the first Sunday in
+ # April.
+ Rule	Para	2002	2004	-	Apr	Sun>=1	0:00	0	-
+@@ -1506,7 +1554,7 @@
+ # From Steffen Thorsen (2005-01-05):
+ # Decree 1,867 (2004-03-05)
+ # From Carlos Raúl Perasso via Jesper Nørgaard Welen (2006-10-13)
+-# <http://www.presidencia.gov.py/decretos/D1867.pdf>
++# http://www.presidencia.gov.py/decretos/D1867.pdf
+ Rule	Para	2004	2009	-	Oct	Sun>=15	0:00	1:00	S
+ Rule	Para	2005	2009	-	Mar	Sun>=8	0:00	0	-
+ # From Carlos Raúl Perasso (2010-02-18):
+@@ -1538,7 +1586,7 @@
+ # Zone	NAME		GMTOFF	RULES	FORMAT	[UNTIL]
+ Zone America/Asuncion	-3:50:40 -	LMT	1890
+ 			-3:50:40 -	AMT	1931 Oct 10 # Asunción Mean Time
+-			-4:00	-	PYT	1972 Oct # Paraguay Time
++			-4:00	-	PYT	1972 Oct    # Paraguay Time
+ 			-3:00	-	PYT	1974 Apr
+ 			-4:00	Para	PY%sT
+ 
+@@ -1571,7 +1619,7 @@
+ 
+ # South Georgia
+ # Zone	NAME		GMTOFF	RULES	FORMAT	[UNTIL]
+-Zone Atlantic/South_Georgia -2:26:08 -	LMT	1890		# Grytviken
++Zone Atlantic/South_Georgia -2:26:08 -	LMT	1890 # Grytviken
+ 			-2:00	-	GST	# South Georgia Time
+ 
+ # South Sandwich Is
+@@ -1581,9 +1629,9 @@
+ # Zone	NAME		GMTOFF	RULES	FORMAT	[UNTIL]
+ Zone America/Paramaribo	-3:40:40 -	LMT	1911
+ 			-3:40:52 -	PMT	1935     # Paramaribo Mean Time
+-			-3:40:36 -	PMT	1945 Oct # The capital moved?
++			-3:40:36 -	PMT	1945 Oct    # The capital moved?
+ 			-3:30	-	NEGT	1975 Nov 20 # Dutch Guiana Time
+-			-3:30	-	SRT	1984 Oct # Suriname Time
++			-3:30	-	SRT	1984 Oct    # Suriname Time
+ 			-3:00	-	SRT
+ 
+ # Trinidad and Tobago
+@@ -1593,6 +1641,7 @@
+ 
+ # These all agree with Trinidad and Tobago since 1970.
+ Link America/Port_of_Spain America/Anguilla
++Link America/Port_of_Spain America/Antigua
+ Link America/Port_of_Spain America/Dominica
+ Link America/Port_of_Spain America/Grenada
+ Link America/Port_of_Spain America/Guadeloupe
+@@ -1657,7 +1706,7 @@
+ Rule	Uruguay	1992	only	-	Oct	18	 0:00	1:00	S
+ Rule	Uruguay	1993	only	-	Feb	28	 0:00	0	-
+ # From Eduardo Cota (2004-09-20):
+-# The uruguayan government has decreed a change in the local time....
++# The Uruguayan government has decreed a change in the local time....
+ # http://www.presidencia.gub.uy/decretos/2004091502.htm
+ Rule	Uruguay	2004	only	-	Sep	19	 0:00	1:00	S
+ # From Steffen Thorsen (2005-03-11):
+@@ -1673,16 +1722,31 @@
+ Rule	Uruguay	2006	only	-	Mar	12	 2:00	0	-
+ # From Jesper Nørgaard Welen (2006-09-06):
+ # http://www.presidencia.gub.uy/_web/decretos/2006/09/CM%20210_08%2006%202006_00001.PDF
+-Rule	Uruguay	2006	max	-	Oct	Sun>=1	 2:00	1:00	S
+-Rule	Uruguay	2007	max	-	Mar	Sun>=8	 2:00	0	-
++#
++# From Steffen Thorsen (2015-06-30):
++# ... it looks like they will not be using DST the coming summer:
++# http://www.elobservador.com.uy/gobierno-resolvio-que-no-habra-cambio-horario-verano-n656787
++# http://www.republica.com.uy/este-ano-no-se-modificara-el-huso-horario-en-uruguay/523760/
++# From Paul Eggert (2015-06-30):
++# Apparently restaurateurs complained that DST caused people to go to the beach
++# instead of out to dinner.
++# From Pablo Camargo (2015-07-13):
++# http://archivo.presidencia.gub.uy/sci/decretos/2015/06/cons_min_201.pdf
++# [dated 2015-06-29; repeals Decree 311/006 dated 2006-09-04]
++Rule	Uruguay	2006	2014	-	Oct	Sun>=1	 2:00	1:00	S
++Rule	Uruguay	2007	2015	-	Mar	Sun>=8	 2:00	0	-
+ # Zone	NAME		GMTOFF	RULES	FORMAT	[UNTIL]
+ Zone America/Montevideo	-3:44:44 -	LMT	1898 Jun 28
+-			-3:44:44 -	MMT	1920 May  1	# Montevideo MT
+-			-3:30	Uruguay	UY%sT	1942 Dec 14	# Uruguay Time
++			-3:44:44 -	MMT	1920 May  1 # Montevideo MT
++			-3:30	Uruguay	UY%sT	1942 Dec 14 # Uruguay Time
+ 			-3:00	Uruguay	UY%sT
+ 
+ # Venezuela
+ #
++# From Paul Eggert (2015-07-28):
++# For the 1965 transition see Gaceta Oficial No. 27.619 (1964-12-15), p 205.533
++# http://www.pgr.gob.ve/dmdocuments/1964/27619.pdf
++#
+ # From John Stainforth (2007-11-28):
+ # ... the change for Venezuela originally expected for 2007-12-31 has
+ # been brought forward to 2007-12-09.  The official announcement was
+@@ -1691,9 +1755,25 @@
+ # resolution publication)
+ # http://www.globovision.com/news.php?nid=72208
+ 
++# From Alexander Krivenyshev (2016-04-15):
++# https://actualidad.rt.com/actualidad/204758-venezuela-modificar-huso-horario-sequia-elnino
++#
++# From Paul Eggert (2016-04-15):
++# Clocks advance 30 minutes on 2016-05-01 at 02:30....
++# "'Venezuela's new time-zone: hours without light, hours without water,
++# hours of presidential broadcasts, hours of lines,' quipped comedian
++# Jean Mary Curró ...". See: Cawthorne A, Kai D. Venezuela scraps
++# half-hour time difference set by Chavez. Reuters 2016-04-15 14:50 -0400
++# http://www.reuters.com/article/us-venezuela-timezone-idUSKCN0XC2BE
++#
++# From Matt Johnson (2016-04-20):
++# ... published in the official Gazette [2016-04-18], here:
++# http://historico.tsj.gob.ve/gaceta_ext/abril/1842016/E-1842016-4551.pdf
++
+ # Zone	NAME		GMTOFF	RULES	FORMAT	[UNTIL]
+ Zone	America/Caracas	-4:27:44 -	LMT	1890
+ 			-4:27:40 -	CMT	1912 Feb 12 # Caracas Mean Time?
+-			-4:30	-	VET	1965	     # Venezuela Time
+-			-4:00	-	VET	2007 Dec  9 03:00
+-			-4:30	-	VET
++			-4:30	-	VET	1965 Jan  1  0:00 # Venezuela T.
++			-4:00	-	VET	2007 Dec  9  3:00
++			-4:30	-	VET	2016 May  1  2:30
++			-4:00	-	VET
+--- contrib/tzdata/version.orig
++++ contrib/tzdata/version
+@@ -0,0 +1 @@
++2016i
+--- contrib/tzdata/zone.tab.orig
++++ contrib/tzdata/zone.tab
+@@ -17,8 +17,8 @@
+ # that of zone1970.tab.
+ #
+ # This table is intended as an aid for users, to help them select time
+-# zone data appropriate for their practical needs.  It is not intended
+-# to take or endorse any position on legal or territorial claims.
++# zone data entries appropriate for their practical needs.  It is not
++# intended to take or endorse any position on legal or territorial claims.
+ #
+ #country-
+ #code	coordinates	TZ			comments
+@@ -30,22 +30,22 @@
+ AL	+4120+01950	Europe/Tirane
+ AM	+4011+04430	Asia/Yerevan
+ AO	-0848+01314	Africa/Luanda
+-AQ	-7750+16636	Antarctica/McMurdo	McMurdo, South Pole, Scott (New Zealand time)
+-AQ	-6734-06808	Antarctica/Rothera	Rothera Station, Adelaide Island
+-AQ	-6448-06406	Antarctica/Palmer	Palmer Station, Anvers Island
+-AQ	-6736+06253	Antarctica/Mawson	Mawson Station, Holme Bay
+-AQ	-6835+07758	Antarctica/Davis	Davis Station, Vestfold Hills
+-AQ	-6617+11031	Antarctica/Casey	Casey Station, Bailey Peninsula
+-AQ	-7824+10654	Antarctica/Vostok	Vostok Station, Lake Vostok
+-AQ	-6640+14001	Antarctica/DumontDUrville	Dumont-d'Urville Station, Terre Adelie
+-AQ	-690022+0393524	Antarctica/Syowa	Syowa Station, E Ongul I
+-AQ	-720041+0023206	Antarctica/Troll	Troll Station, Queen Maud Land
++AQ	-7750+16636	Antarctica/McMurdo	New Zealand time - McMurdo, South Pole
++AQ	-6617+11031	Antarctica/Casey	Casey
++AQ	-6835+07758	Antarctica/Davis	Davis
++AQ	-6640+14001	Antarctica/DumontDUrville	Dumont-d'Urville
++AQ	-6736+06253	Antarctica/Mawson	Mawson
++AQ	-6448-06406	Antarctica/Palmer	Palmer
++AQ	-6734-06808	Antarctica/Rothera	Rothera
++AQ	-690022+0393524	Antarctica/Syowa	Syowa
++AQ	-720041+0023206	Antarctica/Troll	Troll
++AQ	-7824+10654	Antarctica/Vostok	Vostok
+ AR	-3436-05827	America/Argentina/Buenos_Aires	Buenos Aires (BA, CF)
+-AR	-3124-06411	America/Argentina/Cordoba	most locations (CB, CC, CN, ER, FM, MN, SE, SF)
+-AR	-2447-06525	America/Argentina/Salta	(SA, LP, NQ, RN)
++AR	-3124-06411	America/Argentina/Cordoba	Argentina (most areas: CB, CC, CN, ER, FM, MN, SE, SF)
++AR	-2447-06525	America/Argentina/Salta	Salta (SA, LP, NQ, RN)
+ AR	-2411-06518	America/Argentina/Jujuy	Jujuy (JY)
+ AR	-2649-06513	America/Argentina/Tucuman	Tucuman (TM)
+-AR	-2828-06547	America/Argentina/Catamarca	Catamarca (CT), Chubut (CH)
++AR	-2828-06547	America/Argentina/Catamarca	Catamarca (CT); Chubut (CH)
+ AR	-2926-06651	America/Argentina/La_Rioja	La Rioja (LR)
+ AR	-3132-06831	America/Argentina/San_Juan	San Juan (SJ)
+ AR	-3253-06849	America/Argentina/Mendoza	Mendoza (MZ)
+@@ -56,17 +56,17 @@
+ AT	+4813+01620	Europe/Vienna
+ AU	-3133+15905	Australia/Lord_Howe	Lord Howe Island
+ AU	-5430+15857	Antarctica/Macquarie	Macquarie Island
+-AU	-4253+14719	Australia/Hobart	Tasmania - most locations
+-AU	-3956+14352	Australia/Currie	Tasmania - King Island
++AU	-4253+14719	Australia/Hobart	Tasmania (most areas)
++AU	-3956+14352	Australia/Currie	Tasmania (King Island)
+ AU	-3749+14458	Australia/Melbourne	Victoria
+-AU	-3352+15113	Australia/Sydney	New South Wales - most locations
+-AU	-3157+14127	Australia/Broken_Hill	New South Wales - Yancowinna
+-AU	-2728+15302	Australia/Brisbane	Queensland - most locations
+-AU	-2016+14900	Australia/Lindeman	Queensland - Holiday Islands
++AU	-3352+15113	Australia/Sydney	New South Wales (most areas)
++AU	-3157+14127	Australia/Broken_Hill	New South Wales (Yancowinna)
++AU	-2728+15302	Australia/Brisbane	Queensland (most areas)
++AU	-2016+14900	Australia/Lindeman	Queensland (Whitsunday Islands)
+ AU	-3455+13835	Australia/Adelaide	South Australia
+ AU	-1228+13050	Australia/Darwin	Northern Territory
+-AU	-3157+11551	Australia/Perth	Western Australia - most locations
+-AU	-3143+12852	Australia/Eucla	Western Australia - Eucla area
++AU	-3157+11551	Australia/Perth	Western Australia (most areas)
++AU	-3143+12852	Australia/Eucla	Western Australia (Eucla)
+ AW	+1230-06958	America/Aruba
+ AX	+6006+01957	Europe/Mariehamn
+ AZ	+4023+04951	Asia/Baku
+@@ -85,62 +85,63 @@
+ BO	-1630-06809	America/La_Paz
+ BQ	+120903-0681636	America/Kralendijk
+ BR	-0351-03225	America/Noronha	Atlantic islands
+-BR	-0127-04829	America/Belem	Amapa, E Para
+-BR	-0343-03830	America/Fortaleza	NE Brazil (MA, PI, CE, RN, PB)
++BR	-0127-04829	America/Belem	Para (east); Amapa
++BR	-0343-03830	America/Fortaleza	Brazil (northeast: MA, PI, CE, RN, PB)
+ BR	-0803-03454	America/Recife	Pernambuco
+ BR	-0712-04812	America/Araguaina	Tocantins
+ BR	-0940-03543	America/Maceio	Alagoas, Sergipe
+ BR	-1259-03831	America/Bahia	Bahia
+-BR	-2332-04637	America/Sao_Paulo	S & SE Brazil (GO, DF, MG, ES, RJ, SP, PR, SC, RS)
++BR	-2332-04637	America/Sao_Paulo	Brazil (southeast: GO, DF, MG, ES, RJ, SP, PR, SC, RS)
+ BR	-2027-05437	America/Campo_Grande	Mato Grosso do Sul
+ BR	-1535-05605	America/Cuiaba	Mato Grosso
+-BR	-0226-05452	America/Santarem	W Para
++BR	-0226-05452	America/Santarem	Para (west)
+ BR	-0846-06354	America/Porto_Velho	Rondonia
+ BR	+0249-06040	America/Boa_Vista	Roraima
+-BR	-0308-06001	America/Manaus	E Amazonas
+-BR	-0640-06952	America/Eirunepe	W Amazonas
++BR	-0308-06001	America/Manaus	Amazonas (east)
++BR	-0640-06952	America/Eirunepe	Amazonas (west)
+ BR	-0958-06748	America/Rio_Branco	Acre
+ BS	+2505-07721	America/Nassau
+ BT	+2728+08939	Asia/Thimphu
+ BW	-2439+02555	Africa/Gaborone
+ BY	+5354+02734	Europe/Minsk
+ BZ	+1730-08812	America/Belize
+-CA	+4734-05243	America/St_Johns	Newfoundland Time, including SE Labrador
+-CA	+4439-06336	America/Halifax	Atlantic Time - Nova Scotia (most places), PEI
+-CA	+4612-05957	America/Glace_Bay	Atlantic Time - Nova Scotia - places that did not observe DST 1966-1971
+-CA	+4606-06447	America/Moncton	Atlantic Time - New Brunswick
+-CA	+5320-06025	America/Goose_Bay	Atlantic Time - Labrador - most locations
+-CA	+5125-05707	America/Blanc-Sablon	Atlantic Standard Time - Quebec - Lower North Shore
+-CA	+4339-07923	America/Toronto	Eastern Time - Ontario & Quebec - most locations
+-CA	+4901-08816	America/Nipigon	Eastern Time - Ontario & Quebec - places that did not observe DST 1967-1973
+-CA	+4823-08915	America/Thunder_Bay	Eastern Time - Thunder Bay, Ontario
+-CA	+6344-06828	America/Iqaluit	Eastern Time - east Nunavut - most locations
+-CA	+6608-06544	America/Pangnirtung	Eastern Time - Pangnirtung, Nunavut
+-CA	+744144-0944945	America/Resolute	Central Time - Resolute, Nunavut
+-CA	+484531-0913718	America/Atikokan	Eastern Standard Time - Atikokan, Ontario and Southampton I, Nunavut
+-CA	+624900-0920459	America/Rankin_Inlet	Central Time - central Nunavut
+-CA	+4953-09709	America/Winnipeg	Central Time - Manitoba & west Ontario
+-CA	+4843-09434	America/Rainy_River	Central Time - Rainy River & Fort Frances, Ontario
+-CA	+5024-10439	America/Regina	Central Standard Time - Saskatchewan - most locations
+-CA	+5017-10750	America/Swift_Current	Central Standard Time - Saskatchewan - midwest
+-CA	+5333-11328	America/Edmonton	Mountain Time - Alberta, east British Columbia & west Saskatchewan
+-CA	+690650-1050310	America/Cambridge_Bay	Mountain Time - west Nunavut
+-CA	+6227-11421	America/Yellowknife	Mountain Time - central Northwest Territories
+-CA	+682059-1334300	America/Inuvik	Mountain Time - west Northwest Territories
+-CA	+4906-11631	America/Creston	Mountain Standard Time - Creston, British Columbia
+-CA	+5946-12014	America/Dawson_Creek	Mountain Standard Time - Dawson Creek & Fort Saint John, British Columbia
+-CA	+4916-12307	America/Vancouver	Pacific Time - west British Columbia
+-CA	+6043-13503	America/Whitehorse	Pacific Time - south Yukon
+-CA	+6404-13925	America/Dawson	Pacific Time - north Yukon
++CA	+4734-05243	America/St_Johns	Newfoundland; Labrador (southeast)
++CA	+4439-06336	America/Halifax	Atlantic - NS (most areas); PE
++CA	+4612-05957	America/Glace_Bay	Atlantic - NS (Cape Breton)
++CA	+4606-06447	America/Moncton	Atlantic - New Brunswick
++CA	+5320-06025	America/Goose_Bay	Atlantic - Labrador (most areas)
++CA	+5125-05707	America/Blanc-Sablon	AST - QC (Lower North Shore)
++CA	+4339-07923	America/Toronto	Eastern - ON, QC (most areas)
++CA	+4901-08816	America/Nipigon	Eastern - ON, QC (no DST 1967-73)
++CA	+4823-08915	America/Thunder_Bay	Eastern - ON (Thunder Bay)
++CA	+6344-06828	America/Iqaluit	Eastern - NU (most east areas)
++CA	+6608-06544	America/Pangnirtung	Eastern - NU (Pangnirtung)
++CA	+484531-0913718	America/Atikokan	EST - ON (Atikokan); NU (Coral H)
++CA	+4953-09709	America/Winnipeg	Central - ON (west); Manitoba
++CA	+4843-09434	America/Rainy_River	Central - ON (Rainy R, Ft Frances)
++CA	+744144-0944945	America/Resolute	Central - NU (Resolute)
++CA	+624900-0920459	America/Rankin_Inlet	Central - NU (central)
++CA	+5024-10439	America/Regina	CST - SK (most areas)
++CA	+5017-10750	America/Swift_Current	CST - SK (midwest)
++CA	+5333-11328	America/Edmonton	Mountain - AB; BC (E); SK (W)
++CA	+690650-1050310	America/Cambridge_Bay	Mountain - NU (west)
++CA	+6227-11421	America/Yellowknife	Mountain - NT (central)
++CA	+682059-1334300	America/Inuvik	Mountain - NT (west)
++CA	+4906-11631	America/Creston	MST - BC (Creston)
++CA	+5946-12014	America/Dawson_Creek	MST - BC (Dawson Cr, Ft St John)
++CA	+5848-12242	America/Fort_Nelson	MST - BC (Ft Nelson)
++CA	+4916-12307	America/Vancouver	Pacific - BC (most areas)
++CA	+6043-13503	America/Whitehorse	Pacific - Yukon (south)
++CA	+6404-13925	America/Dawson	Pacific - Yukon (north)
+ CC	-1210+09655	Indian/Cocos
+-CD	-0418+01518	Africa/Kinshasa	west Dem. Rep. of Congo
+-CD	-1140+02728	Africa/Lubumbashi	east Dem. Rep. of Congo
++CD	-0418+01518	Africa/Kinshasa	Dem. Rep. of Congo (west)
++CD	-1140+02728	Africa/Lubumbashi	Dem. Rep. of Congo (east)
+ CF	+0422+01835	Africa/Bangui
+ CG	-0416+01517	Africa/Brazzaville
+ CH	+4723+00832	Europe/Zurich
+ CI	+0519-00402	Africa/Abidjan
+ CK	-2114-15946	Pacific/Rarotonga
+-CL	-3327-07040	America/Santiago	most locations
++CL	-3327-07040	America/Santiago	Chile (most areas)
+ CL	-2709-10926	Pacific/Easter	Easter Island
+ CM	+0403+00942	Africa/Douala
+ CN	+3114+12128	Asia/Shanghai	Beijing Time
+@@ -151,30 +152,31 @@
+ CV	+1455-02331	Atlantic/Cape_Verde
+ CW	+1211-06900	America/Curacao
+ CX	-1025+10543	Indian/Christmas
+-CY	+3510+03322	Asia/Nicosia
++CY	+3510+03322	Asia/Nicosia	Cyprus (most areas)
++CY	+3507+03357	Asia/Famagusta	Northern Cyprus
+ CZ	+5005+01426	Europe/Prague
+-DE	+5230+01322	Europe/Berlin	most locations
++DE	+5230+01322	Europe/Berlin	Germany (most areas)
+ DE	+4742+00841	Europe/Busingen	Busingen
+ DJ	+1136+04309	Africa/Djibouti
+ DK	+5540+01235	Europe/Copenhagen
+ DM	+1518-06124	America/Dominica
+ DO	+1828-06954	America/Santo_Domingo
+ DZ	+3647+00303	Africa/Algiers
+-EC	-0210-07950	America/Guayaquil	mainland
++EC	-0210-07950	America/Guayaquil	Ecuador (mainland)
+ EC	-0054-08936	Pacific/Galapagos	Galapagos Islands
+ EE	+5925+02445	Europe/Tallinn
+ EG	+3003+03115	Africa/Cairo
+ EH	+2709-01312	Africa/El_Aaiun
+ ER	+1520+03853	Africa/Asmara
+-ES	+4024-00341	Europe/Madrid	mainland
+-ES	+3553-00519	Africa/Ceuta	Ceuta & Melilla
++ES	+4024-00341	Europe/Madrid	Spain (mainland)
++ES	+3553-00519	Africa/Ceuta	Ceuta, Melilla
+ ES	+2806-01524	Atlantic/Canary	Canary Islands
+ ET	+0902+03842	Africa/Addis_Ababa
+ FI	+6010+02458	Europe/Helsinki
+ FJ	-1808+17825	Pacific/Fiji
+ FK	-5142-05751	Atlantic/Stanley
+-FM	+0725+15147	Pacific/Chuuk	Chuuk (Truk) and Yap
+-FM	+0658+15813	Pacific/Pohnpei	Pohnpei (Ponape)
++FM	+0725+15147	Pacific/Chuuk	Chuuk/Truk, Yap
++FM	+0658+15813	Pacific/Pohnpei	Pohnpei/Ponape
+ FM	+0519+16259	Pacific/Kosrae	Kosrae
+ FO	+6201-00646	Atlantic/Faroe
+ FR	+4852+00220	Europe/Paris
+@@ -186,10 +188,10 @@
+ GG	+4927-00232	Europe/Guernsey
+ GH	+0533-00013	Africa/Accra
+ GI	+3608-00521	Europe/Gibraltar
+-GL	+6411-05144	America/Godthab	most locations
+-GL	+7646-01840	America/Danmarkshavn	east coast, north of Scoresbysund
+-GL	+7029-02158	America/Scoresbysund	Scoresbysund / Ittoqqortoormiit
+-GL	+7634-06847	America/Thule	Thule / Pituffik
++GL	+6411-05144	America/Godthab	Greenland (most areas)
++GL	+7646-01840	America/Danmarkshavn	National Park (east coast)
++GL	+7029-02158	America/Scoresbysund	Scoresbysund/Ittoqqortoormiit
++GL	+7634-06847	America/Thule	Thule/Pituffik
+ GM	+1328-01639	Africa/Banjul
+ GN	+0931-01343	Africa/Conakry
+ GP	+1614-06132	America/Guadeloupe
+@@ -205,10 +207,10 @@
+ HR	+4548+01558	Europe/Zagreb
+ HT	+1832-07220	America/Port-au-Prince
+ HU	+4730+01905	Europe/Budapest
+-ID	-0610+10648	Asia/Jakarta	Java & Sumatra
+-ID	-0002+10920	Asia/Pontianak	west & central Borneo
+-ID	-0507+11924	Asia/Makassar	east & south Borneo, Sulawesi (Celebes), Bali, Nusa Tengarra, west Timor
+-ID	-0232+14042	Asia/Jayapura	west New Guinea (Irian Jaya) & Malukus (Moluccas)
++ID	-0610+10648	Asia/Jakarta	Java, Sumatra
++ID	-0002+10920	Asia/Pontianak	Borneo (west, central)
++ID	-0507+11924	Asia/Makassar	Borneo (east, south); Sulawesi/Celebes, Bali, Nusa Tengarra; Timor (west)
++ID	-0232+14042	Asia/Jayapura	New Guinea (West Papua / Irian Jaya); Malukus/Moluccas
+ IE	+5320-00615	Europe/Dublin
+ IL	+314650+0351326	Asia/Jerusalem
+ IM	+5409-00428	Europe/Isle_of_Man
+@@ -234,10 +236,10 @@
+ KR	+3733+12658	Asia/Seoul
+ KW	+2920+04759	Asia/Kuwait
+ KY	+1918-08123	America/Cayman
+-KZ	+4315+07657	Asia/Almaty	most locations
+-KZ	+4448+06528	Asia/Qyzylorda	Qyzylorda (Kyzylorda, Kzyl-Orda)
+-KZ	+5017+05710	Asia/Aqtobe	Aqtobe (Aktobe)
+-KZ	+4431+05016	Asia/Aqtau	Atyrau (Atirau, Gur'yev), Mangghystau (Mankistau)
++KZ	+4315+07657	Asia/Almaty	Kazakhstan (most areas)
++KZ	+4448+06528	Asia/Qyzylorda	Qyzylorda/Kyzylorda/Kzyl-Orda
++KZ	+5017+05710	Asia/Aqtobe	Aqtobe/Aktobe
++KZ	+4431+05016	Asia/Aqtau	Atyrau/Atirau/Gur'yev, Mangghystau/Mankistau
+ KZ	+5113+05121	Asia/Oral	West Kazakhstan
+ LA	+1758+10236	Asia/Vientiane
+ LB	+3353+03530	Asia/Beirut
+@@ -256,12 +258,12 @@
+ ME	+4226+01916	Europe/Podgorica
+ MF	+1804-06305	America/Marigot
+ MG	-1855+04731	Indian/Antananarivo
+-MH	+0709+17112	Pacific/Majuro	most locations
++MH	+0709+17112	Pacific/Majuro	Marshall Islands (most areas)
+ MH	+0905+16720	Pacific/Kwajalein	Kwajalein
+ MK	+4159+02126	Europe/Skopje
+ ML	+1239-00800	Africa/Bamako
+-MM	+1647+09610	Asia/Rangoon
+-MN	+4755+10653	Asia/Ulaanbaatar	most locations
++MM	+1647+09610	Asia/Yangon
++MN	+4755+10653	Asia/Ulaanbaatar	Mongolia (most areas)
+ MN	+4801+09139	Asia/Hovd	Bayan-Olgiy, Govi-Altai, Hovd, Uvs, Zavkhan
+ MN	+4804+11430	Asia/Choibalsan	Dornod, Sukhbaatar
+ MO	+2214+11335	Asia/Macau
+@@ -273,20 +275,19 @@
+ MU	-2010+05730	Indian/Mauritius
+ MV	+0410+07330	Indian/Maldives
+ MW	-1547+03500	Africa/Blantyre
+-MX	+1924-09909	America/Mexico_City	Central Time - most locations
+-MX	+2105-08646	America/Cancun	Central Time - Quintana Roo
++MX	+1924-09909	America/Mexico_City	Central Time
++MX	+2105-08646	America/Cancun	Eastern Standard Time - Quintana Roo
+ MX	+2058-08937	America/Merida	Central Time - Campeche, Yucatan
+-MX	+2540-10019	America/Monterrey	Mexican Central Time - Coahuila, Durango, Nuevo Leon, Tamaulipas away from US border
+-MX	+2550-09730	America/Matamoros	US Central Time - Coahuila, Durango, Nuevo Leon, Tamaulipas near US border
+-MX	+2313-10625	America/Mazatlan	Mountain Time - S Baja, Nayarit, Sinaloa
+-MX	+2838-10605	America/Chihuahua	Mexican Mountain Time - Chihuahua away from US border
+-MX	+2934-10425	America/Ojinaga	US Mountain Time - Chihuahua near US border
++MX	+2540-10019	America/Monterrey	Central Time - Durango; Coahuila, Nuevo Leon, Tamaulipas (most areas)
++MX	+2550-09730	America/Matamoros	Central Time US - Coahuila, Nuevo Leon, Tamaulipas (US border)
++MX	+2313-10625	America/Mazatlan	Mountain Time - Baja California Sur, Nayarit, Sinaloa
++MX	+2838-10605	America/Chihuahua	Mountain Time - Chihuahua (most areas)
++MX	+2934-10425	America/Ojinaga	Mountain Time US - Chihuahua (US border)
+ MX	+2904-11058	America/Hermosillo	Mountain Standard Time - Sonora
+-MX	+3232-11701	America/Tijuana	US Pacific Time - Baja California near US border
+-MX	+3018-11452	America/Santa_Isabel	Mexican Pacific Time - Baja California away from US border
+-MX	+2048-10515	America/Bahia_Banderas	Mexican Central Time - Bahia de Banderas
+-MY	+0310+10142	Asia/Kuala_Lumpur	peninsular Malaysia
+-MY	+0133+11020	Asia/Kuching	Sabah & Sarawak
++MX	+3232-11701	America/Tijuana	Pacific Time US - Baja California
++MX	+2048-10515	America/Bahia_Banderas	Central Time - Bahia de Banderas
++MY	+0310+10142	Asia/Kuala_Lumpur	Malaysia (peninsula)
++MY	+0133+11020	Asia/Kuching	Sabah, Sarawak
+ MZ	-2558+03235	Africa/Maputo
+ NA	-2234+01706	Africa/Windhoek
+ NC	-2216+16627	Pacific/Noumea
+@@ -299,7 +300,7 @@
+ NP	+2743+08519	Asia/Kathmandu
+ NR	-0031+16655	Pacific/Nauru
+ NU	-1901-16955	Pacific/Niue
+-NZ	-3652+17446	Pacific/Auckland	most locations
++NZ	-3652+17446	Pacific/Auckland	New Zealand (most areas)
+ NZ	-4357-17633	Pacific/Chatham	Chatham Islands
+ OM	+2336+05835	Asia/Muscat
+ PA	+0858-07932	America/Panama
+@@ -307,7 +308,8 @@
+ PF	-1732-14934	Pacific/Tahiti	Society Islands
+ PF	-0900-13930	Pacific/Marquesas	Marquesas Islands
+ PF	-2308-13457	Pacific/Gambier	Gambier Islands
+-PG	-0930+14710	Pacific/Port_Moresby
++PG	-0930+14710	Pacific/Port_Moresby	Papua New Guinea (most areas)
++PG	-0613+15534	Pacific/Bougainville	Bougainville
+ PH	+1435+12100	Asia/Manila
+ PK	+2452+06703	Asia/Karachi
+ PL	+5215+02100	Europe/Warsaw
+@@ -316,7 +318,7 @@
+ PR	+182806-0660622	America/Puerto_Rico
+ PS	+3130+03428	Asia/Gaza	Gaza Strip
+ PS	+313200+0350542	Asia/Hebron	West Bank
+-PT	+3843-00908	Europe/Lisbon	mainland
++PT	+3843-00908	Europe/Lisbon	Portugal (mainland)
+ PT	+3238-01654	Atlantic/Madeira	Madeira Islands
+ PT	+3744-02540	Atlantic/Azores	Azores
+ PW	+0720+13429	Pacific/Palau
+@@ -325,27 +327,32 @@
+ RE	-2052+05528	Indian/Reunion
+ RO	+4426+02606	Europe/Bucharest
+ RS	+4450+02030	Europe/Belgrade
+-RU	+5443+02030	Europe/Kaliningrad	Moscow-01 - Kaliningrad
+-RU	+554521+0373704	Europe/Moscow	Moscow+00 - west Russia
+-RU	+4457+03406	Europe/Simferopol	Moscow+00 - Crimea
+-RU	+4844+04425	Europe/Volgograd	Moscow+00 - Caspian Sea
+-RU	+5312+05009	Europe/Samara	Moscow+00 (Moscow+01 after 2014-10-26) - Samara, Udmurtia
+-RU	+5651+06036	Asia/Yekaterinburg	Moscow+02 - Urals
+-RU	+5500+07324	Asia/Omsk	Moscow+03 - west Siberia
+-RU	+5502+08255	Asia/Novosibirsk	Moscow+03 - Novosibirsk
+-RU	+5345+08707	Asia/Novokuznetsk	Moscow+03 (Moscow+04 after 2014-10-26) - Kemerovo
+-RU	+5601+09250	Asia/Krasnoyarsk	Moscow+04 - Yenisei River
+-RU	+5216+10420	Asia/Irkutsk	Moscow+05 - Lake Baikal
+-RU	+5203+11328	Asia/Chita	Moscow+06 (Moscow+05 after 2014-10-26) - Zabaykalsky
+-RU	+6200+12940	Asia/Yakutsk	Moscow+06 - Lena River
+-RU	+623923+1353314	Asia/Khandyga	Moscow+06 - Tomponsky, Ust-Maysky
+-RU	+4310+13156	Asia/Vladivostok	Moscow+07 - Amur River
+-RU	+4658+14242	Asia/Sakhalin	Moscow+07 - Sakhalin Island
+-RU	+643337+1431336	Asia/Ust-Nera	Moscow+07 - Oymyakonsky
+-RU	+5934+15048	Asia/Magadan	Moscow+08 (Moscow+07 after 2014-10-26) - Magadan
+-RU	+6728+15343	Asia/Srednekolymsk	Moscow+08 - E Sakha, N Kuril Is
+-RU	+5301+15839	Asia/Kamchatka	Moscow+08 (Moscow+09 after 2014-10-26) - Kamchatka
+-RU	+6445+17729	Asia/Anadyr	Moscow+08 (Moscow+09 after 2014-10-26) - Bering Sea
++RU	+5443+02030	Europe/Kaliningrad	MSK-01 - Kaliningrad
++RU	+554521+0373704	Europe/Moscow	MSK+00 - Moscow area
++RU	+4457+03406	Europe/Simferopol	MSK+00 - Crimea
++RU	+4844+04425	Europe/Volgograd	MSK+00 - Volgograd, Saratov
++RU	+5836+04939	Europe/Kirov	MSK+00 - Kirov
++RU	+4621+04803	Europe/Astrakhan	MSK+01 - Astrakhan
++RU	+5312+05009	Europe/Samara	MSK+01 - Samara, Udmurtia
++RU	+5420+04824	Europe/Ulyanovsk	MSK+01 - Ulyanovsk
++RU	+5651+06036	Asia/Yekaterinburg	MSK+02 - Urals
++RU	+5500+07324	Asia/Omsk	MSK+03 - Omsk
++RU	+5502+08255	Asia/Novosibirsk	MSK+03 - Novosibirsk
++RU	+5322+08345	Asia/Barnaul	MSK+04 - Altai
++RU	+5630+08458	Asia/Tomsk	MSK+04 - Tomsk
++RU	+5345+08707	Asia/Novokuznetsk	MSK+04 - Kemerovo
++RU	+5601+09250	Asia/Krasnoyarsk	MSK+04 - Krasnoyarsk area
++RU	+5216+10420	Asia/Irkutsk	MSK+05 - Irkutsk, Buryatia
++RU	+5203+11328	Asia/Chita	MSK+06 - Zabaykalsky
++RU	+6200+12940	Asia/Yakutsk	MSK+06 - Lena River
++RU	+623923+1353314	Asia/Khandyga	MSK+06 - Tomponsky, Ust-Maysky
++RU	+4310+13156	Asia/Vladivostok	MSK+07 - Amur River
++RU	+643337+1431336	Asia/Ust-Nera	MSK+07 - Oymyakonsky
++RU	+5934+15048	Asia/Magadan	MSK+08 - Magadan
++RU	+4658+14242	Asia/Sakhalin	MSK+08 - Sakhalin Island
++RU	+6728+15343	Asia/Srednekolymsk	MSK+08 - Sakha (E); North Kuril Is
++RU	+5301+15839	Asia/Kamchatka	MSK+09 - Kamchatka
++RU	+6445+17729	Asia/Anadyr	MSK+09 - Bering Sea
+ RW	-0157+03004	Africa/Kigali
+ SA	+2438+04643	Asia/Riyadh
+ SB	-0932+16012	Pacific/Guadalcanal
+@@ -384,45 +391,45 @@
+ TV	-0831+17913	Pacific/Funafuti
+ TW	+2503+12130	Asia/Taipei
+ TZ	-0648+03917	Africa/Dar_es_Salaam
+-UA	+5026+03031	Europe/Kiev	most locations
++UA	+5026+03031	Europe/Kiev	Ukraine (most areas)
+ UA	+4837+02218	Europe/Uzhgorod	Ruthenia
+-UA	+4750+03510	Europe/Zaporozhye	Zaporozh'ye, E Lugansk / Zaporizhia, E Luhansk
++UA	+4750+03510	Europe/Zaporozhye	Zaporozh'ye/Zaporizhia; Lugansk/Luhansk (east)
+ UG	+0019+03225	Africa/Kampala
+ UM	+1645-16931	Pacific/Johnston	Johnston Atoll
+ UM	+2813-17722	Pacific/Midway	Midway Islands
+ UM	+1917+16637	Pacific/Wake	Wake Island
+-US	+404251-0740023	America/New_York	Eastern Time
+-US	+421953-0830245	America/Detroit	Eastern Time - Michigan - most locations
+-US	+381515-0854534	America/Kentucky/Louisville	Eastern Time - Kentucky - Louisville area
+-US	+364947-0845057	America/Kentucky/Monticello	Eastern Time - Kentucky - Wayne County
+-US	+394606-0860929	America/Indiana/Indianapolis	Eastern Time - Indiana - most locations
+-US	+384038-0873143	America/Indiana/Vincennes	Eastern Time - Indiana - Daviess, Dubois, Knox & Martin Counties
+-US	+410305-0863611	America/Indiana/Winamac	Eastern Time - Indiana - Pulaski County
+-US	+382232-0862041	America/Indiana/Marengo	Eastern Time - Indiana - Crawford County
+-US	+382931-0871643	America/Indiana/Petersburg	Eastern Time - Indiana - Pike County
+-US	+384452-0850402	America/Indiana/Vevay	Eastern Time - Indiana - Switzerland County
+-US	+415100-0873900	America/Chicago	Central Time
+-US	+375711-0864541	America/Indiana/Tell_City	Central Time - Indiana - Perry County
+-US	+411745-0863730	America/Indiana/Knox	Central Time - Indiana - Starke County
+-US	+450628-0873651	America/Menominee	Central Time - Michigan - Dickinson, Gogebic, Iron & Menominee Counties
+-US	+470659-1011757	America/North_Dakota/Center	Central Time - North Dakota - Oliver County
+-US	+465042-1012439	America/North_Dakota/New_Salem	Central Time - North Dakota - Morton County (except Mandan area)
+-US	+471551-1014640	America/North_Dakota/Beulah	Central Time - North Dakota - Mercer County
+-US	+394421-1045903	America/Denver	Mountain Time
+-US	+433649-1161209	America/Boise	Mountain Time - south Idaho & east Oregon
+-US	+332654-1120424	America/Phoenix	Mountain Standard Time - Arizona (except Navajo)
+-US	+340308-1181434	America/Los_Angeles	Pacific Time
+-US	+550737-1313435	America/Metlakatla	Pacific Standard Time - Annette Island, Alaska
+-US	+611305-1495401	America/Anchorage	Alaska Time
+-US	+581807-1342511	America/Juneau	Alaska Time - Alaska panhandle
+-US	+571035-1351807	America/Sitka	Alaska Time - southeast Alaska panhandle
+-US	+593249-1394338	America/Yakutat	Alaska Time - Alaska panhandle neck
+-US	+643004-1652423	America/Nome	Alaska Time - west Alaska
++US	+404251-0740023	America/New_York	Eastern (most areas)
++US	+421953-0830245	America/Detroit	Eastern - MI (most areas)
++US	+381515-0854534	America/Kentucky/Louisville	Eastern - KY (Louisville area)
++US	+364947-0845057	America/Kentucky/Monticello	Eastern - KY (Wayne)
++US	+394606-0860929	America/Indiana/Indianapolis	Eastern - IN (most areas)
++US	+384038-0873143	America/Indiana/Vincennes	Eastern - IN (Da, Du, K, Mn)
++US	+410305-0863611	America/Indiana/Winamac	Eastern - IN (Pulaski)
++US	+382232-0862041	America/Indiana/Marengo	Eastern - IN (Crawford)
++US	+382931-0871643	America/Indiana/Petersburg	Eastern - IN (Pike)
++US	+384452-0850402	America/Indiana/Vevay	Eastern - IN (Switzerland)
++US	+415100-0873900	America/Chicago	Central (most areas)
++US	+375711-0864541	America/Indiana/Tell_City	Central - IN (Perry)
++US	+411745-0863730	America/Indiana/Knox	Central - IN (Starke)
++US	+450628-0873651	America/Menominee	Central - MI (Wisconsin border)
++US	+470659-1011757	America/North_Dakota/Center	Central - ND (Oliver)
++US	+465042-1012439	America/North_Dakota/New_Salem	Central - ND (Morton rural)
++US	+471551-1014640	America/North_Dakota/Beulah	Central - ND (Mercer)
++US	+394421-1045903	America/Denver	Mountain (most areas)
++US	+433649-1161209	America/Boise	Mountain - ID (south); OR (east)
++US	+332654-1120424	America/Phoenix	MST - Arizona (except Navajo)
++US	+340308-1181434	America/Los_Angeles	Pacific
++US	+611305-1495401	America/Anchorage	Alaska (most areas)
++US	+581807-1342511	America/Juneau	Alaska - Juneau area
++US	+571035-1351807	America/Sitka	Alaska - Sitka area
++US	+550737-1313435	America/Metlakatla	Alaska - Annette Island
++US	+593249-1394338	America/Yakutat	Alaska - Yakutat
++US	+643004-1652423	America/Nome	Alaska (west)
+ US	+515248-1763929	America/Adak	Aleutian Islands
+ US	+211825-1575130	Pacific/Honolulu	Hawaii
+ UY	-3453-05611	America/Montevideo
+-UZ	+3940+06648	Asia/Samarkand	west Uzbekistan
+-UZ	+4120+06918	Asia/Tashkent	east Uzbekistan
++UZ	+3940+06648	Asia/Samarkand	Uzbekistan (west)
++UZ	+4120+06918	Asia/Tashkent	Uzbekistan (east)
+ VA	+415408+0122711	Europe/Vatican
+ VC	+1309-06114	America/St_Vincent
+ VE	+1030-06656	America/Caracas
+--- contrib/tzdata/zone1970.tab.orig
++++ contrib/tzdata/zone1970.tab
+@@ -29,8 +29,8 @@
+ # most populous zones first, where that does not contradict (1).
+ #
+ # This table is intended as an aid for users, to help them select time
+-# zone data appropriate for their practical needs.  It is not intended
+-# to take or endorse any position on legal or territorial claims.
++# zone data entries appropriate for their practical needs.  It is not
++# intended to take or endorse any position on legal or territorial claims.
+ #
+ #country-
+ #codes	coordinates	TZ	comments
+@@ -39,21 +39,21 @@
+ AF	+3431+06912	Asia/Kabul
+ AL	+4120+01950	Europe/Tirane
+ AM	+4011+04430	Asia/Yerevan
+-AQ	-6734-06808	Antarctica/Rothera	Rothera Station, Adelaide Island
+-AQ	-6448-06406	Antarctica/Palmer	Palmer Station, Anvers Island
+-AQ	-6736+06253	Antarctica/Mawson	Mawson Station, Holme Bay
+-AQ	-6835+07758	Antarctica/Davis	Davis Station, Vestfold Hills
+-AQ	-6617+11031	Antarctica/Casey	Casey Station, Bailey Peninsula
+-AQ	-7824+10654	Antarctica/Vostok	Vostok Station, Lake Vostok
+-AQ	-6640+14001	Antarctica/DumontDUrville	Dumont-d'Urville Station, Terre Adelie
+-AQ	-690022+0393524	Antarctica/Syowa	Syowa Station, E Ongul I
+-AQ	-720041+0023206	Antarctica/Troll	Troll Station, Queen Maud Land
++AQ	-6617+11031	Antarctica/Casey	Casey
++AQ	-6835+07758	Antarctica/Davis	Davis
++AQ	-6640+14001	Antarctica/DumontDUrville	Dumont-d'Urville
++AQ	-6736+06253	Antarctica/Mawson	Mawson
++AQ	-6448-06406	Antarctica/Palmer	Palmer
++AQ	-6734-06808	Antarctica/Rothera	Rothera
++AQ	-690022+0393524	Antarctica/Syowa	Syowa
++AQ	-720041+0023206	Antarctica/Troll	Troll
++AQ	-7824+10654	Antarctica/Vostok	Vostok
+ AR	-3436-05827	America/Argentina/Buenos_Aires	Buenos Aires (BA, CF)
+-AR	-3124-06411	America/Argentina/Cordoba	most locations (CB, CC, CN, ER, FM, MN, SE, SF)
+-AR	-2447-06525	America/Argentina/Salta	(SA, LP, NQ, RN)
++AR	-3124-06411	America/Argentina/Cordoba	Argentina (most areas: CB, CC, CN, ER, FM, MN, SE, SF)
++AR	-2447-06525	America/Argentina/Salta	Salta (SA, LP, NQ, RN)
+ AR	-2411-06518	America/Argentina/Jujuy	Jujuy (JY)
+ AR	-2649-06513	America/Argentina/Tucuman	Tucumán (TM)
+-AR	-2828-06547	America/Argentina/Catamarca	Catamarca (CT), Chubut (CH)
++AR	-2828-06547	America/Argentina/Catamarca	Catamarca (CT); Chubut (CH)
+ AR	-2926-06651	America/Argentina/La_Rioja	La Rioja (LR)
+ AR	-3132-06831	America/Argentina/San_Juan	San Juan (SJ)
+ AR	-3253-06849	America/Argentina/Mendoza	Mendoza (MZ)
+@@ -64,17 +64,17 @@
+ AT	+4813+01620	Europe/Vienna
+ AU	-3133+15905	Australia/Lord_Howe	Lord Howe Island
+ AU	-5430+15857	Antarctica/Macquarie	Macquarie Island
+-AU	-4253+14719	Australia/Hobart	Tasmania - most locations
+-AU	-3956+14352	Australia/Currie	Tasmania - King Island
++AU	-4253+14719	Australia/Hobart	Tasmania (most areas)
++AU	-3956+14352	Australia/Currie	Tasmania (King Island)
+ AU	-3749+14458	Australia/Melbourne	Victoria
+-AU	-3352+15113	Australia/Sydney	New South Wales - most locations
+-AU	-3157+14127	Australia/Broken_Hill	New South Wales - Yancowinna
+-AU	-2728+15302	Australia/Brisbane	Queensland - most locations
+-AU	-2016+14900	Australia/Lindeman	Queensland - Holiday Islands
++AU	-3352+15113	Australia/Sydney	New South Wales (most areas)
++AU	-3157+14127	Australia/Broken_Hill	New South Wales (Yancowinna)
++AU	-2728+15302	Australia/Brisbane	Queensland (most areas)
++AU	-2016+14900	Australia/Lindeman	Queensland (Whitsunday Islands)
+ AU	-3455+13835	Australia/Adelaide	South Australia
+ AU	-1228+13050	Australia/Darwin	Northern Territory
+-AU	-3157+11551	Australia/Perth	Western Australia - most locations
+-AU	-3143+12852	Australia/Eucla	Western Australia - Eucla area
++AU	-3157+11551	Australia/Perth	Western Australia (most areas)
++AU	-3143+12852	Australia/Eucla	Western Australia (Eucla)
+ AZ	+4023+04951	Asia/Baku
+ BB	+1306-05937	America/Barbados
+ BD	+2343+09025	Asia/Dhaka
+@@ -84,57 +84,58 @@
+ BN	+0456+11455	Asia/Brunei
+ BO	-1630-06809	America/La_Paz
+ BR	-0351-03225	America/Noronha	Atlantic islands
+-BR	-0127-04829	America/Belem	Amapá, E Pará
+-BR	-0343-03830	America/Fortaleza	NE Brazil (MA, PI, CE, RN, PB)
++BR	-0127-04829	America/Belem	Pará (east); Amapá
++BR	-0343-03830	America/Fortaleza	Brazil (northeast: MA, PI, CE, RN, PB)
+ BR	-0803-03454	America/Recife	Pernambuco
+ BR	-0712-04812	America/Araguaina	Tocantins
+ BR	-0940-03543	America/Maceio	Alagoas, Sergipe
+ BR	-1259-03831	America/Bahia	Bahia
+-BR	-2332-04637	America/Sao_Paulo	S & SE Brazil (GO, DF, MG, ES, RJ, SP, PR, SC, RS)
++BR	-2332-04637	America/Sao_Paulo	Brazil (southeast: GO, DF, MG, ES, RJ, SP, PR, SC, RS)
+ BR	-2027-05437	America/Campo_Grande	Mato Grosso do Sul
+ BR	-1535-05605	America/Cuiaba	Mato Grosso
+-BR	-0226-05452	America/Santarem	W Pará
++BR	-0226-05452	America/Santarem	Pará (west)
+ BR	-0846-06354	America/Porto_Velho	Rondônia
+ BR	+0249-06040	America/Boa_Vista	Roraima
+-BR	-0308-06001	America/Manaus	E Amazonas
+-BR	-0640-06952	America/Eirunepe	W Amazonas
++BR	-0308-06001	America/Manaus	Amazonas (east)
++BR	-0640-06952	America/Eirunepe	Amazonas (west)
+ BR	-0958-06748	America/Rio_Branco	Acre
+ BS	+2505-07721	America/Nassau
+ BT	+2728+08939	Asia/Thimphu
+ BY	+5354+02734	Europe/Minsk
+ BZ	+1730-08812	America/Belize
+-CA	+4734-05243	America/St_Johns	Newfoundland Time, including SE Labrador
+-CA	+4439-06336	America/Halifax	Atlantic Time - Nova Scotia (most places), PEI
+-CA	+4612-05957	America/Glace_Bay	Atlantic Time - Nova Scotia - places that did not observe DST 1966-1971
+-CA	+4606-06447	America/Moncton	Atlantic Time - New Brunswick
+-CA	+5320-06025	America/Goose_Bay	Atlantic Time - Labrador - most locations
+-CA	+5125-05707	America/Blanc-Sablon	Atlantic Standard Time - Quebec - Lower North Shore
+-CA	+4339-07923	America/Toronto	Eastern Time - Ontario & Quebec - most locations
+-CA	+4901-08816	America/Nipigon	Eastern Time - Ontario & Quebec - places that did not observe DST 1967-1973
+-CA	+4823-08915	America/Thunder_Bay	Eastern Time - Thunder Bay, Ontario
+-CA	+6344-06828	America/Iqaluit	Eastern Time - east Nunavut - most locations
+-CA	+6608-06544	America/Pangnirtung	Eastern Time - Pangnirtung, Nunavut
+-CA	+744144-0944945	America/Resolute	Central Time - Resolute, Nunavut
+-CA	+484531-0913718	America/Atikokan	Eastern Standard Time - Atikokan, Ontario and Southampton I, Nunavut
+-CA	+624900-0920459	America/Rankin_Inlet	Central Time - central Nunavut
+-CA	+4953-09709	America/Winnipeg	Central Time - Manitoba & west Ontario
+-CA	+4843-09434	America/Rainy_River	Central Time - Rainy River & Fort Frances, Ontario
+-CA	+5024-10439	America/Regina	Central Standard Time - Saskatchewan - most locations
+-CA	+5017-10750	America/Swift_Current	Central Standard Time - Saskatchewan - midwest
+-CA	+5333-11328	America/Edmonton	Mountain Time - Alberta, east British Columbia & west Saskatchewan
+-CA	+690650-1050310	America/Cambridge_Bay	Mountain Time - west Nunavut
+-CA	+6227-11421	America/Yellowknife	Mountain Time - central Northwest Territories
+-CA	+682059-1334300	America/Inuvik	Mountain Time - west Northwest Territories
+-CA	+4906-11631	America/Creston	Mountain Standard Time - Creston, British Columbia
+-CA	+5946-12014	America/Dawson_Creek	Mountain Standard Time - Dawson Creek & Fort Saint John, British Columbia
+-CA	+4916-12307	America/Vancouver	Pacific Time - west British Columbia
+-CA	+6043-13503	America/Whitehorse	Pacific Time - south Yukon
+-CA	+6404-13925	America/Dawson	Pacific Time - north Yukon
++CA	+4734-05243	America/St_Johns	Newfoundland; Labrador (southeast)
++CA	+4439-06336	America/Halifax	Atlantic - NS (most areas); PE
++CA	+4612-05957	America/Glace_Bay	Atlantic - NS (Cape Breton)
++CA	+4606-06447	America/Moncton	Atlantic - New Brunswick
++CA	+5320-06025	America/Goose_Bay	Atlantic - Labrador (most areas)
++CA	+5125-05707	America/Blanc-Sablon	AST - QC (Lower North Shore)
++CA	+4339-07923	America/Toronto	Eastern - ON, QC (most areas)
++CA	+4901-08816	America/Nipigon	Eastern - ON, QC (no DST 1967-73)
++CA	+4823-08915	America/Thunder_Bay	Eastern - ON (Thunder Bay)
++CA	+6344-06828	America/Iqaluit	Eastern - NU (most east areas)
++CA	+6608-06544	America/Pangnirtung	Eastern - NU (Pangnirtung)
++CA	+484531-0913718	America/Atikokan	EST - ON (Atikokan); NU (Coral H)
++CA	+4953-09709	America/Winnipeg	Central - ON (west); Manitoba
++CA	+4843-09434	America/Rainy_River	Central - ON (Rainy R, Ft Frances)
++CA	+744144-0944945	America/Resolute	Central - NU (Resolute)
++CA	+624900-0920459	America/Rankin_Inlet	Central - NU (central)
++CA	+5024-10439	America/Regina	CST - SK (most areas)
++CA	+5017-10750	America/Swift_Current	CST - SK (midwest)
++CA	+5333-11328	America/Edmonton	Mountain - AB; BC (E); SK (W)
++CA	+690650-1050310	America/Cambridge_Bay	Mountain - NU (west)
++CA	+6227-11421	America/Yellowknife	Mountain - NT (central)
++CA	+682059-1334300	America/Inuvik	Mountain - NT (west)
++CA	+4906-11631	America/Creston	MST - BC (Creston)
++CA	+5946-12014	America/Dawson_Creek	MST - BC (Dawson Cr, Ft St John)
++CA	+5848-12242	America/Fort_Nelson	MST - BC (Ft Nelson)
++CA	+4916-12307	America/Vancouver	Pacific - BC (most areas)
++CA	+6043-13503	America/Whitehorse	Pacific - Yukon (south)
++CA	+6404-13925	America/Dawson	Pacific - Yukon (north)
+ CC	-1210+09655	Indian/Cocos
+ CH,DE,LI	+4723+00832	Europe/Zurich	Swiss time
+ CI,BF,GM,GN,ML,MR,SH,SL,SN,ST,TG	+0519-00402	Africa/Abidjan
+ CK	-2114-15946	Pacific/Rarotonga
+-CL	-3327-07040	America/Santiago	most locations
++CL	-3327-07040	America/Santiago	Chile (most areas)
+ CL	-2709-10926	Pacific/Easter	Easter Island
+ CN	+3114+12128	Asia/Shanghai	Beijing Time
+ CN	+4348+08735	Asia/Urumqi	Xinjiang Time
+@@ -144,25 +145,26 @@
+ CV	+1455-02331	Atlantic/Cape_Verde
+ CW,AW,BQ,SX	+1211-06900	America/Curacao
+ CX	-1025+10543	Indian/Christmas
+-CY	+3510+03322	Asia/Nicosia
++CY	+3510+03322	Asia/Nicosia	Cyprus (most areas)
++CY	+3507+03357	Asia/Famagusta	Northern Cyprus
+ CZ,SK	+5005+01426	Europe/Prague
+-DE	+5230+01322	Europe/Berlin	Berlin time
++DE	+5230+01322	Europe/Berlin	Germany (most areas)
+ DK	+5540+01235	Europe/Copenhagen
+ DO	+1828-06954	America/Santo_Domingo
+ DZ	+3647+00303	Africa/Algiers
+-EC	-0210-07950	America/Guayaquil	mainland
++EC	-0210-07950	America/Guayaquil	Ecuador (mainland)
+ EC	-0054-08936	Pacific/Galapagos	Galápagos Islands
+ EE	+5925+02445	Europe/Tallinn
+ EG	+3003+03115	Africa/Cairo
+ EH	+2709-01312	Africa/El_Aaiun
+-ES	+4024-00341	Europe/Madrid	mainland
+-ES	+3553-00519	Africa/Ceuta	Ceuta & Melilla
++ES	+4024-00341	Europe/Madrid	Spain (mainland)
++ES	+3553-00519	Africa/Ceuta	Ceuta, Melilla
+ ES	+2806-01524	Atlantic/Canary	Canary Islands
+ FI,AX	+6010+02458	Europe/Helsinki
+ FJ	-1808+17825	Pacific/Fiji
+ FK	-5142-05751	Atlantic/Stanley
+-FM	+0725+15147	Pacific/Chuuk	Chuuk (Truk) and Yap
+-FM	+0658+15813	Pacific/Pohnpei	Pohnpei (Ponape)
++FM	+0725+15147	Pacific/Chuuk	Chuuk/Truk, Yap
++FM	+0658+15813	Pacific/Pohnpei	Pohnpei/Ponape
+ FM	+0519+16259	Pacific/Kosrae	Kosrae
+ FO	+6201-00646	Atlantic/Faroe
+ FR	+4852+00220	Europe/Paris
+@@ -171,10 +173,10 @@
+ GF	+0456-05220	America/Cayenne
+ GH	+0533-00013	Africa/Accra
+ GI	+3608-00521	Europe/Gibraltar
+-GL	+6411-05144	America/Godthab	most locations
+-GL	+7646-01840	America/Danmarkshavn	east coast, north of Scoresbysund
+-GL	+7029-02158	America/Scoresbysund	Scoresbysund / Ittoqqortoormiit
+-GL	+7634-06847	America/Thule	Thule / Pituffik
++GL	+6411-05144	America/Godthab	Greenland (most areas)
++GL	+7646-01840	America/Danmarkshavn	National Park (east coast)
++GL	+7029-02158	America/Scoresbysund	Scoresbysund/Ittoqqortoormiit
++GL	+7634-06847	America/Thule	Thule/Pituffik
+ GR	+3758+02343	Europe/Athens
+ GS	-5416-03632	Atlantic/South_Georgia
+ GT	+1438-09031	America/Guatemala
+@@ -185,10 +187,10 @@
+ HN	+1406-08713	America/Tegucigalpa
+ HT	+1832-07220	America/Port-au-Prince
+ HU	+4730+01905	Europe/Budapest
+-ID	-0610+10648	Asia/Jakarta	Java & Sumatra
+-ID	-0002+10920	Asia/Pontianak	west & central Borneo
+-ID	-0507+11924	Asia/Makassar	east & south Borneo, Sulawesi (Celebes), Bali, Nusa Tengarra, west Timor
+-ID	-0232+14042	Asia/Jayapura	west New Guinea (Irian Jaya) & Malukus (Moluccas)
++ID	-0610+10648	Asia/Jakarta	Java, Sumatra
++ID	-0002+10920	Asia/Pontianak	Borneo (west, central)
++ID	-0507+11924	Asia/Makassar	Borneo (east, south); Sulawesi/Celebes, Bali, Nusa Tengarra; Timor (west)
++ID	-0232+14042	Asia/Jayapura	New Guinea (West Papua / Irian Jaya); Malukus/Moluccas
+ IE	+5320-00615	Europe/Dublin
+ IL	+314650+0351326	Asia/Jerusalem
+ IN	+2232+08822	Asia/Kolkata
+@@ -207,10 +209,10 @@
+ KI	+0152-15720	Pacific/Kiritimati	Line Islands
+ KP	+3901+12545	Asia/Pyongyang
+ KR	+3733+12658	Asia/Seoul
+-KZ	+4315+07657	Asia/Almaty	most locations
+-KZ	+4448+06528	Asia/Qyzylorda	Qyzylorda (Kyzylorda, Kzyl-Orda)
+-KZ	+5017+05710	Asia/Aqtobe	Aqtobe (Aktobe)
+-KZ	+4431+05016	Asia/Aqtau	Atyrau (Atirau, Gur'yev), Mangghystau (Mankistau)
++KZ	+4315+07657	Asia/Almaty	Kazakhstan (most areas)
++KZ	+4448+06528	Asia/Qyzylorda	Qyzylorda/Kyzylorda/Kzyl-Orda
++KZ	+5017+05710	Asia/Aqtobe	Aqtobe/Aktobe
++KZ	+4431+05016	Asia/Aqtau	Atyrau/Atirau/Gur'yev, Mangghystau/Mankistau
+ KZ	+5113+05121	Asia/Oral	West Kazakhstan
+ LB	+3353+03530	Asia/Beirut
+ LK	+0656+07951	Asia/Colombo
+@@ -222,10 +224,10 @@
+ MA	+3339-00735	Africa/Casablanca
+ MC	+4342+00723	Europe/Monaco
+ MD	+4700+02850	Europe/Chisinau
+-MH	+0709+17112	Pacific/Majuro	most locations
++MH	+0709+17112	Pacific/Majuro	Marshall Islands (most areas)
+ MH	+0905+16720	Pacific/Kwajalein	Kwajalein
+-MM	+1647+09610	Asia/Rangoon
+-MN	+4755+10653	Asia/Ulaanbaatar	most locations
++MM	+1647+09610	Asia/Yangon
++MN	+4755+10653	Asia/Ulaanbaatar	Mongolia (most areas)
+ MN	+4801+09139	Asia/Hovd	Bayan-Ölgii, Govi-Altai, Hovd, Uvs, Zavkhan
+ MN	+4804+11430	Asia/Choibalsan	Dornod, Sükhbaatar
+ MO	+2214+11335	Asia/Macau
+@@ -233,25 +235,24 @@
+ MT	+3554+01431	Europe/Malta
+ MU	-2010+05730	Indian/Mauritius
+ MV	+0410+07330	Indian/Maldives
+-MX	+1924-09909	America/Mexico_City	Central Time - most locations
+-MX	+2105-08646	America/Cancun	Central Time - Quintana Roo
++MX	+1924-09909	America/Mexico_City	Central Time
++MX	+2105-08646	America/Cancun	Eastern Standard Time - Quintana Roo
+ MX	+2058-08937	America/Merida	Central Time - Campeche, Yucatán
+-MX	+2540-10019	America/Monterrey	Mexican Central Time - Coahuila, Durango, Nuevo León, Tamaulipas away from US border
+-MX	+2550-09730	America/Matamoros	US Central Time - Coahuila, Durango, Nuevo León, Tamaulipas near US border
+-MX	+2313-10625	America/Mazatlan	Mountain Time - S Baja, Nayarit, Sinaloa
+-MX	+2838-10605	America/Chihuahua	Mexican Mountain Time - Chihuahua away from US border
+-MX	+2934-10425	America/Ojinaga	US Mountain Time - Chihuahua near US border
++MX	+2540-10019	America/Monterrey	Central Time - Durango; Coahuila, Nuevo León, Tamaulipas (most areas)
++MX	+2550-09730	America/Matamoros	Central Time US - Coahuila, Nuevo León, Tamaulipas (US border)
++MX	+2313-10625	America/Mazatlan	Mountain Time - Baja California Sur, Nayarit, Sinaloa
++MX	+2838-10605	America/Chihuahua	Mountain Time - Chihuahua (most areas)
++MX	+2934-10425	America/Ojinaga	Mountain Time US - Chihuahua (US border)
+ MX	+2904-11058	America/Hermosillo	Mountain Standard Time - Sonora
+-MX	+3232-11701	America/Tijuana	US Pacific Time - Baja California near US border
+-MX	+3018-11452	America/Santa_Isabel	Mexican Pacific Time - Baja California away from US border
+-MX	+2048-10515	America/Bahia_Banderas	Mexican Central Time - Bahía de Banderas
+-MY	+0310+10142	Asia/Kuala_Lumpur	peninsular Malaysia
+-MY	+0133+11020	Asia/Kuching	Sabah & Sarawak
+-MZ,BI,BW,CD,MW,RW,ZM,ZW	-2558+03235	Africa/Maputo	Central Africa Time (UTC+2)
++MX	+3232-11701	America/Tijuana	Pacific Time US - Baja California
++MX	+2048-10515	America/Bahia_Banderas	Central Time - Bahía de Banderas
++MY	+0310+10142	Asia/Kuala_Lumpur	Malaysia (peninsula)
++MY	+0133+11020	Asia/Kuching	Sabah, Sarawak
++MZ,BI,BW,CD,MW,RW,ZM,ZW	-2558+03235	Africa/Maputo	Central Africa Time
+ NA	-2234+01706	Africa/Windhoek
+ NC	-2216+16627	Pacific/Noumea
+ NF	-2903+16758	Pacific/Norfolk
+-NG,AO,BJ,CD,CF,CG,CM,GA,GQ,NE	+0627+00324	Africa/Lagos	West Africa Time (UTC+1)
++NG,AO,BJ,CD,CF,CG,CM,GA,GQ,NE	+0627+00324	Africa/Lagos	West Africa Time
+ NI	+1209-08617	America/Managua
+ NL	+5222+00454	Europe/Amsterdam
+ NO,SJ	+5955+01045	Europe/Oslo
+@@ -265,7 +266,8 @@
+ PF	-1732-14934	Pacific/Tahiti	Society Islands
+ PF	-0900-13930	Pacific/Marquesas	Marquesas Islands
+ PF	-2308-13457	Pacific/Gambier	Gambier Islands
+-PG	-0930+14710	Pacific/Port_Moresby
++PG	-0930+14710	Pacific/Port_Moresby	Papua New Guinea (most areas)
++PG	-0613+15534	Pacific/Bougainville	Bougainville
+ PH	+1435+12100	Asia/Manila
+ PK	+2452+06703	Asia/Karachi
+ PL	+5215+02100	Europe/Warsaw
+@@ -274,36 +276,41 @@
+ PR	+182806-0660622	America/Puerto_Rico
+ PS	+3130+03428	Asia/Gaza	Gaza Strip
+ PS	+313200+0350542	Asia/Hebron	West Bank
+-PT	+3843-00908	Europe/Lisbon	mainland
++PT	+3843-00908	Europe/Lisbon	Portugal (mainland)
+ PT	+3238-01654	Atlantic/Madeira	Madeira Islands
+ PT	+3744-02540	Atlantic/Azores	Azores
+ PW	+0720+13429	Pacific/Palau
+ PY	-2516-05740	America/Asuncion
+ QA,BH	+2517+05132	Asia/Qatar
+-RE,TF	-2052+05528	Indian/Reunion	Réunion, Crozet Is, Scattered Is
++RE,TF	-2052+05528	Indian/Reunion	Réunion, Crozet, Scattered Islands
+ RO	+4426+02606	Europe/Bucharest
+ RS,BA,HR,ME,MK,SI	+4450+02030	Europe/Belgrade
+-RU	+5443+02030	Europe/Kaliningrad	Moscow-01 - Kaliningrad
+-RU	+554521+0373704	Europe/Moscow	Moscow+00 - west Russia
+-RU	+4457+03406	Europe/Simferopol	Moscow+00 - Crimea
+-RU	+4844+04425	Europe/Volgograd	Moscow+00 - Caspian Sea
+-RU	+5312+05009	Europe/Samara	Moscow+00 (Moscow+01 after 2014-10-26) - Samara, Udmurtia
+-RU	+5651+06036	Asia/Yekaterinburg	Moscow+02 - Urals
+-RU	+5500+07324	Asia/Omsk	Moscow+03 - west Siberia
+-RU	+5502+08255	Asia/Novosibirsk	Moscow+03 - Novosibirsk
+-RU	+5345+08707	Asia/Novokuznetsk	Moscow+03 (Moscow+04 after 2014-10-26) - Kemerovo
+-RU	+5601+09250	Asia/Krasnoyarsk	Moscow+04 - Yenisei River
+-RU	+5216+10420	Asia/Irkutsk	Moscow+05 - Lake Baikal
+-RU	+5203+11328	Asia/Chita	Moscow+06 (Moscow+05 after 2014-10-26) - Zabaykalsky
+-RU	+6200+12940	Asia/Yakutsk	Moscow+06 - Lena River
+-RU	+623923+1353314	Asia/Khandyga	Moscow+06 - Tomponsky, Ust-Maysky
+-RU	+4310+13156	Asia/Vladivostok	Moscow+07 - Amur River
+-RU	+4658+14242	Asia/Sakhalin	Moscow+07 - Sakhalin Island
+-RU	+643337+1431336	Asia/Ust-Nera	Moscow+07 - Oymyakonsky
+-RU	+5934+15048	Asia/Magadan	Moscow+08 (Moscow+07 after 2014-10-26) - Magadan
+-RU	+6728+15343	Asia/Srednekolymsk	Moscow+08 - E Sakha, N Kuril Is
+-RU	+5301+15839	Asia/Kamchatka	Moscow+08 (Moscow+09 after 2014-10-26) - Kamchatka
+-RU	+6445+17729	Asia/Anadyr	Moscow+08 (Moscow+09 after 2014-10-26) - Bering Sea
++RU	+5443+02030	Europe/Kaliningrad	MSK-01 - Kaliningrad
++RU	+554521+0373704	Europe/Moscow	MSK+00 - Moscow area
++RU	+4457+03406	Europe/Simferopol	MSK+00 - Crimea
++RU	+4844+04425	Europe/Volgograd	MSK+00 - Volgograd, Saratov
++RU	+5836+04939	Europe/Kirov	MSK+00 - Kirov
++RU	+4621+04803	Europe/Astrakhan	MSK+01 - Astrakhan
++RU	+5312+05009	Europe/Samara	MSK+01 - Samara, Udmurtia
++RU	+5420+04824	Europe/Ulyanovsk	MSK+01 - Ulyanovsk
++RU	+5651+06036	Asia/Yekaterinburg	MSK+02 - Urals
++RU	+5500+07324	Asia/Omsk	MSK+03 - Omsk
++RU	+5502+08255	Asia/Novosibirsk	MSK+03 - Novosibirsk
++RU	+5322+08345	Asia/Barnaul	MSK+04 - Altai
++RU	+5630+08458	Asia/Tomsk	MSK+04 - Tomsk
++RU	+5345+08707	Asia/Novokuznetsk	MSK+04 - Kemerovo
++RU	+5601+09250	Asia/Krasnoyarsk	MSK+04 - Krasnoyarsk area
++RU	+5216+10420	Asia/Irkutsk	MSK+05 - Irkutsk, Buryatia
++RU	+5203+11328	Asia/Chita	MSK+06 - Zabaykalsky
++RU	+6200+12940	Asia/Yakutsk	MSK+06 - Lena River
++RU	+623923+1353314	Asia/Khandyga	MSK+06 - Tomponsky, Ust-Maysky
++RU	+4310+13156	Asia/Vladivostok	MSK+07 - Amur River
++RU	+643337+1431336	Asia/Ust-Nera	MSK+07 - Oymyakonsky
++RU	+5934+15048	Asia/Magadan	MSK+08 - Magadan
++RU	+4658+14242	Asia/Sakhalin	MSK+08 - Sakhalin Island
++RU	+6728+15343	Asia/Srednekolymsk	MSK+08 - Sakha (E); North Kuril Is
++RU	+5301+15839	Asia/Kamchatka	MSK+09 - Kamchatka
++RU	+6445+17729	Asia/Anadyr	MSK+09 - Bering Sea
+ SA,KW,YE	+2438+04643	Asia/Riyadh
+ SB	-0932+16012	Pacific/Guadalcanal
+ SC	-0440+05528	Indian/Mahe
+@@ -315,8 +322,8 @@
+ SY	+3330+03618	Asia/Damascus
+ TC	+2128-07108	America/Grand_Turk
+ TD	+1207+01503	Africa/Ndjamena
+-TF	-492110+0701303	Indian/Kerguelen	Kerguelen, St Paul I, Amsterdam I
+-TH,KH,LA,VN	+1345+10031	Asia/Bangkok
++TF	-492110+0701303	Indian/Kerguelen	Kerguelen, St Paul Island, Amsterdam Island
++TH,KH,LA,VN	+1345+10031	Asia/Bangkok	Indochina (most areas)
+ TJ	+3835+06848	Asia/Dushanbe
+ TK	-0922-17114	Pacific/Fakaofo
+ TL	-0833+12535	Asia/Dili
+@@ -324,46 +331,47 @@
+ TN	+3648+01011	Africa/Tunis
+ TO	-2110-17510	Pacific/Tongatapu
+ TR	+4101+02858	Europe/Istanbul
+-TT,AG,AI,BL,DM,GD,GP,MF,LC,KN,MS,VC,VG,VI	+1039-06131	America/Port_of_Spain
++TT,AG,AI,BL,DM,GD,GP,KN,LC,MF,MS,VC,VG,VI	+1039-06131	America/Port_of_Spain
+ TV	-0831+17913	Pacific/Funafuti
+ TW	+2503+12130	Asia/Taipei
+-UA	+5026+03031	Europe/Kiev	most locations
++UA	+5026+03031	Europe/Kiev	Ukraine (most areas)
+ UA	+4837+02218	Europe/Uzhgorod	Ruthenia
+-UA	+4750+03510	Europe/Zaporozhye	Zaporozh'ye, E Lugansk / Zaporizhia, E Luhansk
++UA	+4750+03510	Europe/Zaporozhye	Zaporozh'ye/Zaporizhia; Lugansk/Luhansk (east)
+ UM	+1917+16637	Pacific/Wake	Wake Island
+-US	+404251-0740023	America/New_York	Eastern Time
+-US	+421953-0830245	America/Detroit	Eastern Time - Michigan - most locations
+-US	+381515-0854534	America/Kentucky/Louisville	Eastern Time - Kentucky - Louisville area
+-US	+364947-0845057	America/Kentucky/Monticello	Eastern Time - Kentucky - Wayne County
+-US	+394606-0860929	America/Indiana/Indianapolis	Eastern Time - Indiana - most locations
+-US	+384038-0873143	America/Indiana/Vincennes	Eastern Time - Indiana - Daviess, Dubois, Knox & Martin Counties
+-US	+410305-0863611	America/Indiana/Winamac	Eastern Time - Indiana - Pulaski County
+-US	+382232-0862041	America/Indiana/Marengo	Eastern Time - Indiana - Crawford County
+-US	+382931-0871643	America/Indiana/Petersburg	Eastern Time - Indiana - Pike County
+-US	+384452-0850402	America/Indiana/Vevay	Eastern Time - Indiana - Switzerland County
+-US	+415100-0873900	America/Chicago	Central Time
+-US	+375711-0864541	America/Indiana/Tell_City	Central Time - Indiana - Perry County
+-US	+411745-0863730	America/Indiana/Knox	Central Time - Indiana - Starke County
+-US	+450628-0873651	America/Menominee	Central Time - Michigan - Dickinson, Gogebic, Iron & Menominee Counties
+-US	+470659-1011757	America/North_Dakota/Center	Central Time - North Dakota - Oliver County
+-US	+465042-1012439	America/North_Dakota/New_Salem	Central Time - North Dakota - Morton County (except Mandan area)
+-US	+471551-1014640	America/North_Dakota/Beulah	Central Time - North Dakota - Mercer County
+-US	+394421-1045903	America/Denver	Mountain Time
+-US	+433649-1161209	America/Boise	Mountain Time - south Idaho & east Oregon
+-US	+332654-1120424	America/Phoenix	Mountain Standard Time - Arizona (except Navajo)
+-US	+340308-1181434	America/Los_Angeles	Pacific Time
+-US	+550737-1313435	America/Metlakatla	Pacific Standard Time - Annette Island, Alaska
+-US	+611305-1495401	America/Anchorage	Alaska Time
+-US	+581807-1342511	America/Juneau	Alaska Time - Alaska panhandle
+-US	+571035-1351807	America/Sitka	Alaska Time - southeast Alaska panhandle
+-US	+593249-1394338	America/Yakutat	Alaska Time - Alaska panhandle neck
+-US	+643004-1652423	America/Nome	Alaska Time - west Alaska
++US	+404251-0740023	America/New_York	Eastern (most areas)
++US	+421953-0830245	America/Detroit	Eastern - MI (most areas)
++US	+381515-0854534	America/Kentucky/Louisville	Eastern - KY (Louisville area)
++US	+364947-0845057	America/Kentucky/Monticello	Eastern - KY (Wayne)
++US	+394606-0860929	America/Indiana/Indianapolis	Eastern - IN (most areas)
++US	+384038-0873143	America/Indiana/Vincennes	Eastern - IN (Da, Du, K, Mn)
++US	+410305-0863611	America/Indiana/Winamac	Eastern - IN (Pulaski)
++US	+382232-0862041	America/Indiana/Marengo	Eastern - IN (Crawford)
++US	+382931-0871643	America/Indiana/Petersburg	Eastern - IN (Pike)
++US	+384452-0850402	America/Indiana/Vevay	Eastern - IN (Switzerland)
++US	+415100-0873900	America/Chicago	Central (most areas)
++US	+375711-0864541	America/Indiana/Tell_City	Central - IN (Perry)
++US	+411745-0863730	America/Indiana/Knox	Central - IN (Starke)
++US	+450628-0873651	America/Menominee	Central - MI (Wisconsin border)
++US	+470659-1011757	America/North_Dakota/Center	Central - ND (Oliver)
++US	+465042-1012439	America/North_Dakota/New_Salem	Central - ND (Morton rural)
++US	+471551-1014640	America/North_Dakota/Beulah	Central - ND (Mercer)
++US	+394421-1045903	America/Denver	Mountain (most areas)
++US	+433649-1161209	America/Boise	Mountain - ID (south); OR (east)
++US	+332654-1120424	America/Phoenix	MST - Arizona (except Navajo)
++US	+340308-1181434	America/Los_Angeles	Pacific
++US	+611305-1495401	America/Anchorage	Alaska (most areas)
++US	+581807-1342511	America/Juneau	Alaska - Juneau area
++US	+571035-1351807	America/Sitka	Alaska - Sitka area
++US	+550737-1313435	America/Metlakatla	Alaska - Annette Island
++US	+593249-1394338	America/Yakutat	Alaska - Yakutat
++US	+643004-1652423	America/Nome	Alaska (west)
+ US	+515248-1763929	America/Adak	Aleutian Islands
+-US,UM	+211825-1575130	Pacific/Honolulu	Hawaii time
++US,UM	+211825-1575130	Pacific/Honolulu	Hawaii
+ UY	-3453-05611	America/Montevideo
+-UZ	+3940+06648	Asia/Samarkand	west Uzbekistan
+-UZ	+4120+06918	Asia/Tashkent	east Uzbekistan
++UZ	+3940+06648	Asia/Samarkand	Uzbekistan (west)
++UZ	+4120+06918	Asia/Tashkent	Uzbekistan (east)
+ VE	+1030-06656	America/Caracas
++VN	+1045+10640	Asia/Ho_Chi_Minh	Vietnam (south)
+ VU	-1740+16825	Pacific/Efate
+ WF	-1318-17610	Pacific/Wallis
+ WS	-1350-17144	Pacific/Apia
+--- contrib/tzdata/zoneinfo2tdf.pl.orig
++++ contrib/tzdata/zoneinfo2tdf.pl
+@@ -0,0 +1,52 @@
++#! /usr/bin/perl -w
++
++# Courtesy Ken Pizzini.
++
++use strict;
++
++#This file released to the public domain.
++
++# Note: error checking is poor; trust the output only if the input
++# has been checked by zic.
++
++my $contZone = '';
++while (<>) {
++  my $origline = $_;
++  my @fields = ();
++  while (s/^\s*((?:"[^"]*"|[^\s#])+)//) {
++    push @fields, $1;
++  }
++  next unless @fields;
++
++  my $type = lc($fields[0]);
++  if ($contZone) {
++    @fields >= 3 or warn "bad continuation line";
++    unshift @fields, '+', $contZone;
++    $type = 'zone';
++  }
++
++  $contZone = '';
++  if ($type eq 'zone') {
++    # Zone  NAME  GMTOFF  RULES/SAVE  FORMAT  [UNTIL]
++    my $nfields = @fields;
++    $nfields >= 5 or warn "bad zone line";
++    if ($nfields > 6) {
++      #this splice is optional, depending on one's preference
++      #(one big date-time field, or componentized date and time):
++      splice(@fields, 5, $nfields-5, "@fields[5..$nfields-1]");
++    }
++    $contZone = $fields[1] if @fields > 5;
++  } elsif ($type eq 'rule') {
++    # Rule  NAME  FROM  TO  TYPE  IN  ON  AT  SAVE  LETTER/S
++    @fields == 10 or warn "bad rule line";
++  } elsif ($type eq 'link') {
++    # Link  TARGET  LINK-NAME
++    @fields == 3 or warn "bad link line";
++  } elsif ($type eq 'leap') {
++    # Leap  YEAR  MONTH  DAY  HH:MM:SS  CORR  R/S
++    @fields == 7 or warn "bad leap line";
++  } else {
++    warn "Fubar at input line $.: $origline";
++  }
++  print join("\t", @fields), "\n";
++}
++native
+\ No newline at end of property
++*
+\ No newline at end of property
++FreeBSD=%H
+\ No newline at end of property
++text/plain
+\ No newline at end of property

Property changes on: user/gjb/releng-rewrite/share/security/patches/EN-16:20/tzdata-9.3.patch
___________________________________________________________________
Added: fbsd:nokeywords
## -0,0 +1 ##
+yes
\ No newline at end of property
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Added: svn:mime-type
## -0,0 +1 ##
+text/plain
\ No newline at end of property
Index: user/gjb/releng-rewrite/share/security/patches/EN-16:20/tzdata-9.3.patch.asc
===================================================================
--- user/gjb/releng-rewrite/share/security/patches/EN-16:20/tzdata-9.3.patch.asc	(nonexistent)
+++ user/gjb/releng-rewrite/share/security/patches/EN-16:20/tzdata-9.3.patch.asc	(revision 49725)
@@ -0,0 +1,16 @@
+-----BEGIN PGP SIGNATURE-----
+
+iQIcBAABCgAGBQJYRw1sAAoJEO1n7NZdz2rnen0QAKWZS5ORCqx9YkmgNXb97kA5
+GoHXOFgvKZapLY2fUNgZj45nnrnuH2Xjx/A72KrtRhWdQhxX0SEKLq/oBrgEuSNO
+aN/8iZcblP4U0SRsdvpemDmZlNOTD1V+aCIgw/4fqB+lekH1gTY4eb2Ag+oCUy7C
+ImTzRpq8rktXZDH8thNnVcTdMN5Vc6qewqwCMx1SxG5FsSLFXoVG0QykStl6bXql
+43ub1DGchiEEqDQMW75KwxFcMOMlMVQzMKQG6kH12bfpaWu576ZZVCXHQv2oVAIt
+auNd8cV0mlB7xgE/0BDfWoChSIxN8etAS05k75ib7de26PRc+wXYCCS7EqK28Xtq
+vpuRPQr3VhoJ2nfrlPBiZCzw8DSmk0gu7HDawrz+/B2VmsTuNK2DpPE/vFb5bfyM
+6J9uvEaPMr3o21dR0/+lFst2xZI+GJtMMPsS1GWDOxVsKXyD/oau0hQJrkB/V5i8
+ekbQTySUaguP1Hd/Z+R5lT2d3X8xtYN7C/taFrtBGHTQ0cojCeoFKBHBRBttzTFk
+Ptl5r5B7vueeYygFMvTJBGCUV5oVh8SmR9mqHUfqdT1yFULfqa/5ZbgUypsgcdET
+FnEds9bDpElLsc2mBEBHGLPoG1y/sy4yQhPz+J0Cu/6pLpQnu9A59CHjsPf9BBiV
+tlA2MUnU3mPXzt2T7bjS
+=XU0U
+-----END PGP SIGNATURE-----

Property changes on: user/gjb/releng-rewrite/share/security/patches/EN-16:20/tzdata-9.3.patch.asc
___________________________________________________________________
Added: fbsd:nokeywords
## -0,0 +1 ##
+yes
\ No newline at end of property
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Added: svn:mime-type
## -0,0 +1 ##
+text/plain
\ No newline at end of property
Index: user/gjb/releng-rewrite/share/security/patches/EN-16:21/localedef.patch
===================================================================
--- user/gjb/releng-rewrite/share/security/patches/EN-16:21/localedef.patch	(nonexistent)
+++ user/gjb/releng-rewrite/share/security/patches/EN-16:21/localedef.patch	(revision 49725)
@@ -0,0 +1,78 @@
+--- contrib/netbsd-tests/lib/libc/locale/t_mbstowcs.c.orig
++++ contrib/netbsd-tests/lib/libc/locale/t_mbstowcs.c
+@@ -88,7 +88,7 @@
+ 		0xFFFF, 0x5D, 0x5B, 0x10000, 0x10FFFF, 0x5D, 0x0A
+ 	},
+ #ifdef __FreeBSD__
+-	{	 1, -1, -1,  1,  1, -1, 1,  1,  1, 1, -1,  1,  1, -1, -1,
++	{	 1, -1, -1,  1,  1, -1, -1,  1,  1, 1, -1,  1,  1, -1, -1,
+ #else
+ 	{	 1, -1, -1,  1,  1, -1, -1,  1,  1, -1, -1,  1,  1, -1, -1,
+ #endif
+--- usr.bin/localedef/ctype.c.orig
++++ usr.bin/localedef/ctype.c
+@@ -407,9 +407,9 @@
+ 			continue;
+ 		}
+ 
+-		if ((last_ct != NULL) && (last_ct->ctype == ctn->ctype)) {
++		if ((last_ct != NULL) && (last_ct->ctype == ctn->ctype) &&
++		    (last_ct->wc + 1 == wc)) {
+ 			ct[rl.runetype_ext_nranges-1].max = wc;
+-			last_ct = ctn;
+ 		} else {
+ 			rl.runetype_ext_nranges++;
+ 			ct = realloc(ct,
+@@ -417,8 +417,8 @@
+ 			ct[rl.runetype_ext_nranges - 1].min = wc;
+ 			ct[rl.runetype_ext_nranges - 1].max = wc;
+ 			ct[rl.runetype_ext_nranges - 1].map = ctn->ctype;
+-			last_ct = ctn;
+ 		}
++		last_ct = ctn;
+ 		if (ctn->tolower == 0) {
+ 			last_lo = NULL;
+ 		} else if ((last_lo != NULL) &&
+--- usr.bin/localedef/parser.y.orig
++++ usr.bin/localedef/parser.y
+@@ -27,6 +27,8 @@
+  * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+  * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+  * POSSIBILITY OF SUCH DAMAGE.
++ *
++ * $FreeBSD$
+  */
+ 
+ /*
+@@ -321,22 +323,19 @@
+ 		| T_TOLOWER conv_list T_NL
+ 		;
+ 
++cc_list		: cc_list T_SEMI cc_range_end
++		| cc_list T_SEMI cc_char
++		| cc_char
++		;
+ 
+-cc_list		: cc_list T_SEMI T_CHAR
++cc_range_end	: T_ELLIPSIS T_SEMI T_CHAR
+ 		{
+-			add_ctype($3);
++			add_ctype_range($3);
+ 		}
+-		| cc_list T_SEMI T_SYMBOL
++		;
++
++cc_char		: T_CHAR
+ 		{
+-			add_charmap_undefined($3);
+-		}
+-		| cc_list T_SEMI T_ELLIPSIS T_SEMI T_CHAR
+-		{
+-			/* note that the endpoints *must* be characters */
+-			add_ctype_range($5);
+-		}
+-		| T_CHAR
+-		{
+ 			add_ctype($1);
+ 		}
+ 		| T_SYMBOL

Property changes on: user/gjb/releng-rewrite/share/security/patches/EN-16:21/localedef.patch
___________________________________________________________________
Added: fbsd:nokeywords
## -0,0 +1 ##
+yes
\ No newline at end of property
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Added: svn:mime-type
## -0,0 +1 ##
+text/plain
\ No newline at end of property
Index: user/gjb/releng-rewrite/share/security/patches/EN-16:21/localedef.patch.asc
===================================================================
--- user/gjb/releng-rewrite/share/security/patches/EN-16:21/localedef.patch.asc	(nonexistent)
+++ user/gjb/releng-rewrite/share/security/patches/EN-16:21/localedef.patch.asc	(revision 49725)
@@ -0,0 +1,16 @@
+-----BEGIN PGP SIGNATURE-----
+
+iQIcBAABCgAGBQJYRw1tAAoJEO1n7NZdz2rn64MQAIvo/c5zlJN213CfGtBL2PeC
+ZO6O0pC7c4mFA/C2TR2WKWMjFtwlkCxlln6wq54T0m4s/O1pYeKFiXNIeNzkjs9G
+MfRwbFr3bsacfVoYpREFODYerxkN6zL31LB37oL+jKZApvoUz1aQh1gqsshQWBx6
+chaSfbWDIltA3gyDm8ONiifCebeqgCyvk6L8blVZOCD6HNC706GUiTnLYaIytWFX
+jXT7x6vlYjVF6xfPQCAVpLG/OwkFYlqbr6NfIXSr0zcVzIYdq0r/6oYSLG/DYZNZ
+LsItycwHSWP7inFOwV6Xuluv9KdfFMf6YjMempxk21Gq0qqTYkzemI0CuCjYWegA
+ffSiCIJP3KwMvtznS65bYivYo0KJT3B4GFAf1DkKYPCZWYoiEd3Hmx9rOr3Z0ZFW
+vmt0KphhfUlWvPnoqAWy71ihf4hjxf4SBxMX2RuUNSGNq6+4StfUuiqYHJYtX8Nv
+G7b37D9T6b5xqYJ46bQC2OA65bOmr41/vYGxmq3mm/GxpGf/NfSpMn45tp0lpG/v
+cPV8d5VVxqiZDscPmDThqRwbnZ9YP0nsMiQN3RtFa23gJanC1mWMnLwVLVpXyIR/
+KgbHrOQ0kFQSsSYLngkLwyhab6Oz4cLepUDxlWoTOdjL/Esr1CzZz7jap4egjPMI
+Hih/OXbF4dLE5cXgbAq+
+=Cle8
+-----END PGP SIGNATURE-----

Property changes on: user/gjb/releng-rewrite/share/security/patches/EN-16:21/localedef.patch.asc
___________________________________________________________________
Added: fbsd:nokeywords
## -0,0 +1 ##
+yes
\ No newline at end of property
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Added: svn:mime-type
## -0,0 +1 ##
+text/plain
\ No newline at end of property
Index: user/gjb/releng-rewrite/share/security/patches/SA-16:36/telnetd.patch
===================================================================
--- user/gjb/releng-rewrite/share/security/patches/SA-16:36/telnetd.patch	(nonexistent)
+++ user/gjb/releng-rewrite/share/security/patches/SA-16:36/telnetd.patch	(revision 49725)
@@ -0,0 +1,26 @@
+--- contrib/telnet/telnetd/sys_term.c.orig
++++ contrib/telnet/telnetd/sys_term.c
+@@ -1159,7 +1159,7 @@
+ 		 */
+ 		argv = (char **)malloc(sizeof(*argv) * 12);
+ 		if (argv == NULL)
+-			return(NULL);
++			fatal(net, "failure allocating argument space");
+ 		*argv++ = (char *)10;
+ 		*argv = (char *)0;
+ 	}
+@@ -1170,11 +1170,12 @@
+ 		*argv = (char *)((long)(*argv) + 10);
+ 		argv = (char **)realloc(argv, sizeof(*argv)*((long)(*argv) + 2));
+ 		if (argv == NULL)
+-			return(NULL);
++			fatal(net, "failure allocating argument space");
+ 		argv++;
+ 		cpp = &argv[(long)argv[-1] - 10];
+ 	}
+-	*cpp++ = strdup(val);
++	if ((*cpp++ = strdup(val)) == NULL)
++		fatal(net, "failure allocating argument space");
+ 	*cpp = 0;
+ 	return(argv);
+ }

Property changes on: user/gjb/releng-rewrite/share/security/patches/SA-16:36/telnetd.patch
___________________________________________________________________
Added: fbsd:nokeywords
## -0,0 +1 ##
+yes
\ No newline at end of property
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Added: svn:mime-type
## -0,0 +1 ##
+text/plain
\ No newline at end of property
Index: user/gjb/releng-rewrite/share/security/patches/SA-16:36/telnetd.patch.asc
===================================================================
--- user/gjb/releng-rewrite/share/security/patches/SA-16:36/telnetd.patch.asc	(nonexistent)
+++ user/gjb/releng-rewrite/share/security/patches/SA-16:36/telnetd.patch.asc	(revision 49725)
@@ -0,0 +1,16 @@
+-----BEGIN PGP SIGNATURE-----
+
+iQIcBAABCgAGBQJYRw1uAAoJEO1n7NZdz2rn22kP/RhWrm5MQlipB7qojG+NdeFo
+KI+FFAPCFvDvqj1r+zXOlhwuBrI+E09PlbeUg1qkG2G4BO67Mu7WkzwQ4GtK6Pis
+pDI8mrkfZKEigy2GRUHHuYhWoY5V7bEAl5PL4X1gIifJsuXFKoyb/9JF6O8OXjZQ
+dE8pGkAtdXmlBF2dfjsDXxCpLXuJpBU7os0DlOmQ/0y6Xxj7CauLU1CLpBURsE/Q
+KlONRPWmneEzFdaQHyIKB/l2tEAOY6vndDMFy7M7sM0N5KIwmZEHNgkhDu6waen8
+jiF6XxXBDeEk6YvI2cyG1Y1mR3RokrfuVr/MzKfwnM7Mxd/9VIKnMFIjEHQaFg79
+GRt5Qg6sqVzpqmeIdhxQaHzwNAI4ytUuNGuGGst+vTYH3UTzSe4EC0RRzZpQALS7
+K4wIHqn676v8gEr6FlZmerjwoKFMV1KZw8O1OzIDWjtK4OyEZCR1ozGYlOT3IqhF
+NC6xtK4enhQRTkb8YRUnXsgDceO2T5SARiVadSPqQGOYe1469qD9BjquTGG9xRcE
+KPU11VEzRBUrI6D0Bf5GH+WvTkxVKnTxit7Vo4i0MqkbhziVgFKshKVzTskyqnxz
+zMUNHh/hWRC9+0v1afVlvtjt+8SucRgy085+x9LHHv7k5xgF1Q36iAucSQLM6R6e
+OnLF+t0NpquvI9+vhvKl
+=pzU/
+-----END PGP SIGNATURE-----

Property changes on: user/gjb/releng-rewrite/share/security/patches/SA-16:36/telnetd.patch.asc
___________________________________________________________________
Added: fbsd:nokeywords
## -0,0 +1 ##
+yes
\ No newline at end of property
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Added: svn:mime-type
## -0,0 +1 ##
+text/plain
\ No newline at end of property
Index: user/gjb/releng-rewrite/share/security/patches/SA-16:37/libc-inc.patch
===================================================================
--- user/gjb/releng-rewrite/share/security/patches/SA-16:37/libc-inc.patch	(nonexistent)
+++ user/gjb/releng-rewrite/share/security/patches/SA-16:37/libc-inc.patch	(revision 49725)
@@ -0,0 +1,43 @@
+--- lib/libc/net/linkaddr.c.orig
++++ lib/libc/net/linkaddr.c
+@@ -125,7 +125,7 @@
+ 	static char obuf[64];
+ 	_Static_assert(sizeof(obuf) >= IFNAMSIZ + 20, "obuf is too small");
+ 	char *out;
+-	const char *in, *inlim;
++	const u_char *in, *inlim;
+ 	int namelen, i, rem;
+ 
+ 	namelen = (sdl->sdl_nlen <= IFNAMSIZ) ? sdl->sdl_nlen : IFNAMSIZ;
+@@ -142,11 +142,11 @@
+ 		}
+ 	}
+ 
+-	in = (const char *)sdl->sdl_data + sdl->sdl_nlen;
++	in = (const u_char *)sdl->sdl_data + sdl->sdl_nlen;
+ 	inlim = in + sdl->sdl_alen;
+ 
+ 	while (in < inlim && rem > 1) {
+-		if (in != (const char *)sdl->sdl_data + sdl->sdl_nlen) {
++		if (in != (const u_char *)sdl->sdl_data + sdl->sdl_nlen) {
+ 			*out++ = '.';
+ 			rem--;
+ 		}
+@@ -154,15 +154,14 @@
+ 		if (i > 0xf) {
+ 			if (rem < 3)
+ 				break;
++			*out++ = hexlist[i >> 4];
+ 			*out++ = hexlist[i & 0xf];
+-			i >>= 4;
+-			*out++ = hexlist[i];
+ 			rem -= 2;
+ 		} else {
+ 			if (rem < 2)
+ 				break;
+ 			*out++ = hexlist[i];
+-			rem++;
++			rem--;
+ 		}
+ 	}
+ 	*out = 0;

Property changes on: user/gjb/releng-rewrite/share/security/patches/SA-16:37/libc-inc.patch
___________________________________________________________________
Added: fbsd:nokeywords
## -0,0 +1 ##
+yes
\ No newline at end of property
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Added: svn:mime-type
## -0,0 +1 ##
+text/plain
\ No newline at end of property
Index: user/gjb/releng-rewrite/share/security/patches/SA-16:37/libc-inc.patch.asc
===================================================================
--- user/gjb/releng-rewrite/share/security/patches/SA-16:37/libc-inc.patch.asc	(nonexistent)
+++ user/gjb/releng-rewrite/share/security/patches/SA-16:37/libc-inc.patch.asc	(revision 49725)
@@ -0,0 +1,16 @@
+-----BEGIN PGP SIGNATURE-----
+
+iQIcBAABCgAGBQJYSNpCAAoJEO1n7NZdz2rnQhwQAIB9bWgYA4tn7fHwbpmEZrrz
+9clKJ+DUrINrgjD4R5J52b2vTirwSX+jLhwcblDcFz85VeoIc8xDPpd8rvFa9znC
+UZ2SBI0itfVZQkEGu+uEJE+9QdEr2jbwq1LIr3Ye3SECQJORlg11detvPEbNyDvm
+20DrfR+BPFvDSGKGEbKvegGaPUTv+MYXx3Km4jiXDB/Bo7lUjmE/mdIZszskzJpM
+AKx4moCR0Wep73vxGOhi2GArf+p4ZUe9eu0wdU/NTKzYH5DdjGnV+bNam2SdpgDT
+rMfrvpUJ+uqdZ1cj7yCsPjuKzskKdWihOCD+vHS3rC00ggYCQv5gnnnyo08z4qRE
+e0yU/4lj68i0X1E6gUIvATW7Y4r4EqX5xNl/nKfpgFQSqJRtZGbmlUH/7eni82Fh
+W3BKZsUyTtZJIod+SlmEloOlsqpRpL+ePSKXv5e0vLq6pr4tdLFFrPaKsi+6AbFO
+mfVSHGJIdB7WUaau34ymhpyb1SI1qrEoNNoYki6SNfuXsghgQKgghwl0cWpJEsUp
+Atg+BQH7ea2sPQh9BXqsiSiUb6wuyi/JHeuBQ4pQcKzyf7RuyxaA7rtr2p0w+UBG
+MRgceUP4H8XxCCltddq2WrNTB5dmac0t5ehYO8eJpQgtWPsl8yG5PldHkXWkhEa6
+gJVPBsoQJObVrkM/PXrl
+=/W0I
+-----END PGP SIGNATURE-----

Property changes on: user/gjb/releng-rewrite/share/security/patches/SA-16:37/libc-inc.patch.asc
___________________________________________________________________
Added: fbsd:nokeywords
## -0,0 +1 ##
+yes
\ No newline at end of property
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Added: svn:mime-type
## -0,0 +1 ##
+text/plain
\ No newline at end of property
Index: user/gjb/releng-rewrite/share/security/patches/SA-16:37/libc.patch
===================================================================
--- user/gjb/releng-rewrite/share/security/patches/SA-16:37/libc.patch	(nonexistent)
+++ user/gjb/releng-rewrite/share/security/patches/SA-16:37/libc.patch	(revision 49725)
@@ -0,0 +1,75 @@
+--- lib/libc/net/linkaddr.c.orig
++++ lib/libc/net/linkaddr.c
+@@ -35,6 +35,7 @@
+ 
+ #include <sys/types.h>
+ #include <sys/socket.h>
++#include <net/if.h>
+ #include <net/if_dl.h>
+ #include <string.h>
+ 
+@@ -122,31 +123,46 @@
+ link_ntoa(const struct sockaddr_dl *sdl)
+ {
+ 	static char obuf[64];
+-	char *out = obuf;
+-	int i;
+-	u_char *in = (u_char *)LLADDR(sdl);
+-	u_char *inlim = in + sdl->sdl_alen;
+-	int firsttime = 1;
++	_Static_assert(sizeof(obuf) >= IFNAMSIZ + 20, "obuf is too small");
++	char *out;
++	const u_char *in, *inlim;
++	int namelen, i, rem;
+ 
+-	if (sdl->sdl_nlen) {
+-		bcopy(sdl->sdl_data, obuf, sdl->sdl_nlen);
+-		out += sdl->sdl_nlen;
+-		if (sdl->sdl_alen)
++	namelen = (sdl->sdl_nlen <= IFNAMSIZ) ? sdl->sdl_nlen : IFNAMSIZ;
++
++	out = obuf;
++	rem = sizeof(obuf);
++	if (namelen > 0) {
++		bcopy(sdl->sdl_data, out, namelen);
++		out += namelen;
++		rem -= namelen;
++		if (sdl->sdl_alen > 0) {
+ 			*out++ = ':';
++			rem--;
++		}
+ 	}
+-	while (in < inlim) {
+-		if (firsttime)
+-			firsttime = 0;
+-		else
++
++	in = (const u_char *)sdl->sdl_data + sdl->sdl_nlen;
++	inlim = in + sdl->sdl_alen;
++
++	while (in < inlim && rem > 1) {
++		if (in != (const u_char *)sdl->sdl_data + sdl->sdl_nlen) {
+ 			*out++ = '.';
++			rem--;
++		}
+ 		i = *in++;
+ 		if (i > 0xf) {
+-			out[1] = hexlist[i & 0xf];
+-			i >>= 4;
+-			out[0] = hexlist[i];
+-			out += 2;
+-		} else
++			if (rem < 3)
++				break;
++			*out++ = hexlist[i >> 4];
++			*out++ = hexlist[i & 0xf];
++			rem -= 2;
++		} else {
++			if (rem < 2)
++				break;
+ 			*out++ = hexlist[i];
++			rem--;
++		}
+ 	}
+ 	*out = 0;
+ 	return (obuf);

Property changes on: user/gjb/releng-rewrite/share/security/patches/SA-16:37/libc.patch
___________________________________________________________________
Added: fbsd:nokeywords
## -0,0 +1 ##
+yes
\ No newline at end of property
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Added: svn:mime-type
## -0,0 +1 ##
+text/plain
\ No newline at end of property
Index: user/gjb/releng-rewrite/share/security/patches/SA-16:37/libc.patch.asc
===================================================================
--- user/gjb/releng-rewrite/share/security/patches/SA-16:37/libc.patch.asc	(nonexistent)
+++ user/gjb/releng-rewrite/share/security/patches/SA-16:37/libc.patch.asc	(revision 49725)
@@ -0,0 +1,16 @@
+-----BEGIN PGP SIGNATURE-----
+
+iQIcBAABCgAGBQJYSNpCAAoJEO1n7NZdz2rn878P/Apo2QqeYGpvg35269V/BSL/
+jV42W8llFJ+5sxieWMgxTX3RxymwqhxZPQU6gFoBadnESWo/Z00mtNHygP7JIkDZ
+SKmOBJl2uZDuZpXAwt2wpKqzYixBAzA19R7gxHI9nXU9CiAG4Ql+EAD99QbUZhPf
+CjELbPmYwdkt77QrRJXdUZd+vUV3QkvB/4B+eww+aoaG5pTZ1IVjO45PXQn4FDsW
+04UNYlvgKXQCpEBDYKbsht1B75JCrlvgMpG0KBeDzVMtWxLcTtj8l4U4HH70N6Jx
+OTcvyCuzRMNltKVEcl5j8HX8YbHq8cGSzdbtKXbCrP4BHGjNJpL9ZGZyZt0DpwI1
+/vjij8ChpMUH9g+lrIGZF6WvXaY3L4OInldtUvBuYuVuJMiXiR2WuRJSzyMHVgxN
+2+k3+wgkwPHwJ24UTu+pj0GJ/e7HdWTEUK+Ox6m/+ynj69jlRoUipf1JrFMCsBVh
+BfoPZdYEXjy2Y8hAs4ybQvufFdBs/A7G+xHR4qgQ7XxnTaCTR3GObHAvp1ytHj19
+J1nHjPoF7t9wq7ZBOXJNJGtZ4T1S5E5POtXQvxXm/pk+I9JqauESUDyBkhaStEJB
+O+g0cS3G51tJpcfhEnaNQnFeI20NIXkqeqGZSDdCMHXseWzJuWqux7xKICv0iA2x
+Sc88sLhCDB/Hu+VGm5DX
+=hvSq
+-----END PGP SIGNATURE-----

Property changes on: user/gjb/releng-rewrite/share/security/patches/SA-16:37/libc.patch.asc
___________________________________________________________________
Added: fbsd:nokeywords
## -0,0 +1 ##
+yes
\ No newline at end of property
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Added: svn:mime-type
## -0,0 +1 ##
+text/plain
\ No newline at end of property
Index: user/gjb/releng-rewrite/share/security/patches/SA-16:38/bhyve-10.patch
===================================================================
--- user/gjb/releng-rewrite/share/security/patches/SA-16:38/bhyve-10.patch	(nonexistent)
+++ user/gjb/releng-rewrite/share/security/patches/SA-16:38/bhyve-10.patch	(revision 49725)
@@ -0,0 +1,19 @@
+--- lib/libvmmapi/vmmapi.c.orig
++++ lib/libvmmapi/vmmapi.c
+@@ -263,12 +263,14 @@
+ 	/* XXX VM_MMAP_SPARSE not implemented yet */
+ 	assert(ctx->vms == VM_MMAP_ALL);
+ 
+-	if (gaddr < ctx->lowmem && gaddr + len <= ctx->lowmem)
++	if (gaddr < ctx->lowmem && len <= ctx->lowmem &&
++	    gaddr + len <= ctx->lowmem)
+ 		return ((void *)(ctx->lowmem_addr + gaddr));
+ 
+ 	if (gaddr >= 4*GB) {
+ 		gaddr -= 4*GB;
+-		if (gaddr < ctx->highmem && gaddr + len <= ctx->highmem)
++		if (gaddr < ctx->highmem && len <= ctx->highmem &&
++		    gaddr + len <= ctx->highmem)
+ 			return ((void *)(ctx->highmem_addr + gaddr));
+ 	}
+ 

Property changes on: user/gjb/releng-rewrite/share/security/patches/SA-16:38/bhyve-10.patch
___________________________________________________________________
Added: fbsd:nokeywords
## -0,0 +1 ##
+yes
\ No newline at end of property
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Added: svn:mime-type
## -0,0 +1 ##
+text/plain
\ No newline at end of property
Index: user/gjb/releng-rewrite/share/security/patches/SA-16:38/bhyve-10.patch.asc
===================================================================
--- user/gjb/releng-rewrite/share/security/patches/SA-16:38/bhyve-10.patch.asc	(nonexistent)
+++ user/gjb/releng-rewrite/share/security/patches/SA-16:38/bhyve-10.patch.asc	(revision 49725)
@@ -0,0 +1,16 @@
+-----BEGIN PGP SIGNATURE-----
+
+iQIcBAABCgAGBQJYRw1wAAoJEO1n7NZdz2rnd+kP+wYnUY3tGokDR46N0MbjmkdY
+X8bedjtyUPzQdIW2gexICCLzMrxkN9a4yVEmOOHwTKmtoaFtjXNbn82T8ge1Pf10
+cX4qZg48WYOF4Ei188ZaD9xbnyabuBC5oxAMz4zkTVPlu5FuDI9kP1XyVvzA/8hA
+Q3d1106bxMrkJ/kvqyXy+tt8Rfmp5WG+D0D7zSQc4lREs+l5D49e5d1UFI0TrX1Y
+PTumDnzLZMfH6DO4rzMXRy+yohkGb8D5AW9IHbBVDaeLEeLnkzpHiiMcth3cg5LS
+2Nw+sDmAOaHJ4ea/B820T01mRpd3s8M1gfQz9bAoEd+wVuIBse2hBvaQMrXGJ5G3
+bsJtark4yi8rHg2mQ+z7hgkl1yJ/owIVVo0PvenuzFeRiKf93vxX8nFJvl2zdzDt
+hJWwzNTxg9zPsyWI4VnRqBQIw1ZUhNLwt1Y8buMwVUMv7n0nsqQ/tpKIG1KnFTl5
+no4agfA23+DksTPeZ/OuLTEq/lxRIzEdlAaSlSb6jp3RASHcGfYuf+A9+N2tyGT0
+4rhjvo9juHLsoqDXfMewKBLgyKJFfzMPDQ0Ykun7yrQKWoGG+9o1ZNvMVTMjQn9u
+ZdFMc5WHZAQPlYjB55ldTfeQ4ZX2yBaUTT+WREl2P4zsURM0DV6c7KbQB+XWQzIc
+cWECaLYiir4QRwA+atBZ
+=qWsA
+-----END PGP SIGNATURE-----

Property changes on: user/gjb/releng-rewrite/share/security/patches/SA-16:38/bhyve-10.patch.asc
___________________________________________________________________
Added: fbsd:nokeywords
## -0,0 +1 ##
+yes
\ No newline at end of property
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Added: svn:mime-type
## -0,0 +1 ##
+text/plain
\ No newline at end of property
Index: user/gjb/releng-rewrite/share/security/patches/SA-16:38/bhyve.patch
===================================================================
--- user/gjb/releng-rewrite/share/security/patches/SA-16:38/bhyve.patch	(nonexistent)
+++ user/gjb/releng-rewrite/share/security/patches/SA-16:38/bhyve.patch	(revision 49725)
@@ -0,0 +1,24 @@
+--- lib/libvmmapi/vmmapi.c.orig
++++ lib/libvmmapi/vmmapi.c
+@@ -426,13 +426,18 @@
+ {
+ 
+ 	if (ctx->lowmem > 0) {
+-		if (gaddr < ctx->lowmem && gaddr + len <= ctx->lowmem)
++		if (gaddr < ctx->lowmem && len <= ctx->lowmem &&
++		    gaddr + len <= ctx->lowmem)
+ 			return (ctx->baseaddr + gaddr);
+ 	}
+ 
+ 	if (ctx->highmem > 0) {
+-		if (gaddr >= 4*GB && gaddr + len <= 4*GB + ctx->highmem)
+-			return (ctx->baseaddr + gaddr);
++                if (gaddr >= 4*GB) {
++			if (gaddr < 4*GB + ctx->highmem &&
++			    len <= ctx->highmem &&
++			    gaddr + len <= 4*GB + ctx->highmem)
++				return (ctx->baseaddr + gaddr);
++		}
+ 	}
+ 
+ 	return (NULL);

Property changes on: user/gjb/releng-rewrite/share/security/patches/SA-16:38/bhyve.patch
___________________________________________________________________
Added: fbsd:nokeywords
## -0,0 +1 ##
+yes
\ No newline at end of property
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Added: svn:mime-type
## -0,0 +1 ##
+text/plain
\ No newline at end of property
Index: user/gjb/releng-rewrite/share/security/patches/SA-16:38/bhyve.patch.asc
===================================================================
--- user/gjb/releng-rewrite/share/security/patches/SA-16:38/bhyve.patch.asc	(nonexistent)
+++ user/gjb/releng-rewrite/share/security/patches/SA-16:38/bhyve.patch.asc	(revision 49725)
@@ -0,0 +1,16 @@
+-----BEGIN PGP SIGNATURE-----
+
+iQIcBAABCgAGBQJYRw1xAAoJEO1n7NZdz2rnBkgQAJWvZDz/GCdcuqp7jUfLvhKR
+/TZaPIe4v702RnoHEsR0pQqNx6wrXSswieiY8VIVE0IIyR6bMO1JgUE7HbSG2m/0
+uI6sgnlTmPKTpKipHmS+lHk/1Rr/bTIAUagyO5XFeq5LinHWdkvKpAgbk0WAFdR4
+0fzOMtyTyW+3+wRAKNG15aoZkscjU4gcEQzS1yVZWEoHQBHIV39sRteqr4/AT2vY
+3wiIjVuW5OwWFqRfX5vamwe/BK3ps07P+OaylnedyScgmI11csCbB6AOxDhlz5/r
+vkLzByMvSwZB7V4EEIvVMmTO57LRaUE5iJ7YNNFyh+4lVHbE+otetAgrf9KE4VIz
+d3DyGELIrAdxUNTx1A/Isog3MAMayxcItNu1kJZz93VxlWJVmrGFufwQigPwNQEd
+R+FeQNGDXYZBDSnl3k16ImL1QW0WLtQqCzSLE+y0Xna3HHUJcddunwLs5duDkaUT
+bHbPL8irN5FBY1WAPWmeusFO0GM1zaWjqYhVCyJLkv+H6aS+4nBIFF2hAmKXyzAc
++PK+rOl2G0HGs09ALKR8DgfzIbeGbB3mvknhUBmX527t6RrA3rWR4gZEwrvCYe4I
+q9lbvvPVoC/xJi3Lsa8xliuo1f7YazEgDNmzkzFjWJQinJKQn4ow3XSiXXqarUm2
+CSrOQJY+0UF23sJScppo
+=nJXA
+-----END PGP SIGNATURE-----

Property changes on: user/gjb/releng-rewrite/share/security/patches/SA-16:38/bhyve.patch.asc
___________________________________________________________________
Added: fbsd:nokeywords
## -0,0 +1 ##
+yes
\ No newline at end of property
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Added: svn:mime-type
## -0,0 +1 ##
+text/plain
\ No newline at end of property
Index: user/gjb/releng-rewrite/share/xml/advisories.xml
===================================================================
--- user/gjb/releng-rewrite/share/xml/advisories.xml	(revision 49724)
+++ user/gjb/releng-rewrite/share/xml/advisories.xml	(revision 49725)
@@ -1,4266 +1,4286 @@
 <?xml version="1.0"?>
 <advisories>
     <cvs:keyword xmlns:cvs="http://www.FreeBSD.org/XML/CVS">
       $FreeBSD$
     </cvs:keyword>
 
   <year>
     <name>2016</name>
 
     <month>
+      <name>12</name>
+
+      <day>
+        <name>6</name>
+
+        <advisory>
+          <name>FreeBSD-SA-16:38.bhyve</name>
+        </advisory>
+
+        <advisory>
+          <name>FreeBSD-SA-16:37.libc</name>
+        </advisory>
+
+        <advisory>
+          <name>FreeBSD-SA-16:36.telnetd</name>
+        </advisory>
+      </day>
+    </month>
+
+    <month>
       <name>11</name>
 
       <day>
         <name>2</name>
 
         <advisory>
           <name>FreeBSD-SA-16:35.openssl</name>
         </advisory>
 
         <advisory>
           <name>FreeBSD-SA-16:34.bind</name>
         </advisory>
 
         <advisory>
           <name>FreeBSD-SA-16:33.openssh</name>
         </advisory>
       </day>
     </month>
 
     <month>
       <name>10</name>
 
       <day>
         <name>25</name>
 
         <advisory>
           <name>FreeBSD-SA-16:32.bhyve</name>
         </advisory>
       </day>
 
       <day>
         <name>10</name>
 
         <advisory>
           <name>FreeBSD-SA-16:31.libarchive</name>
         </advisory>
 
         <advisory>
           <name>FreeBSD-SA-16:30.portsnap</name>
         </advisory>
 
         <advisory>
           <name>FreeBSD-SA-16:29.bspatch</name>
         </advisory>
 
         <advisory>
           <name>FreeBSD-SA-16:28.bind</name>
         </advisory>
 
         <advisory>
           <name>FreeBSD-SA-16:27.openssl</name>
         </advisory>
       </day>
     </month>
 
     <month>
       <name>9</name>
 
       <day>
         <name>23</name>
 
         <advisory>
           <name>FreeBSD-SA-16:26.openssl</name>
         </advisory>
       </day>
     </month>
 
     <month>
       <name>7</name>
 
       <day>
         <name>25</name>
 
         <advisory>
           <name>FreeBSD-SA-16:25.bspatch</name>
         </advisory>
       </day>
     </month>
 
     <month>
       <name>6</name>
 
       <day>
         <name>4</name>
 
         <advisory>
           <name>FreeBSD-SA-16:24.ntp</name>
         </advisory>
       </day>
     </month>
 
     <month>
       <name>5</name>
 
       <day>
         <name>31</name>
 
         <advisory>
           <name>FreeBSD-SA-16:23.libarchive</name>
         </advisory>
 
         <advisory>
           <name>FreeBSD-SA-16:22.libarchive</name>
         </advisory>
 
         <advisory>
           <name>FreeBSD-SA-16:21.43bsd</name>
         </advisory>
 
         <advisory>
           <name>FreeBSD-SA-16:20.linux</name>
         </advisory>
       </day>
 
       <day>
         <name>17</name>
 
         <advisory>
           <name>FreeBSD-SA-16:19.sendmsg</name>
         </advisory>
 
         <advisory>
           <name>FreeBSD-SA-16:18.atkbd</name>
         </advisory>
       </day>
 
       <day>
         <name>4</name>
 
         <advisory>
           <name>FreeBSD-SA-16:17.openssl</name>
         </advisory>
       </day>
     </month>
 
     <month>
       <name>4</name>
 
       <day>
         <name>29</name>
 
         <advisory>
           <name>FreeBSD-SA-16:16.ntp</name>
         </advisory>
       </day>
     </month>
 
     <month>
       <name>3</name>
 
       <day>
         <name>16</name>
 
         <advisory>
           <name>FreeBSD-SA-16:15.sysarch</name>
         </advisory>
 
         <advisory>
           <name>FreeBSD-SA-16:14.openssh</name>
         </advisory>
       </day>
 
       <day>
         <name>10</name>
 
         <advisory>
           <name>FreeBSD-SA-16:13.bind</name>
         </advisory>
 
         <advisory>
           <name>FreeBSD-SA-16:12.openssl</name>
         </advisory>
       </day>
     </month>
 
     <month>
       <name>1</name>
 
       <day>
         <name>30</name>
 
         <advisory>
           <name>FreeBSD-SA-16:11.openssl</name>
         </advisory>
       </day>
 
       <day>
         <name>27</name>
 
         <advisory>
           <name>FreeBSD-SA-16:10.linux</name>
         </advisory>
 
         <advisory>
           <name>FreeBSD-SA-16:09.ntp</name>
         </advisory>
 
         <advisory>
           <name>FreeBSD-SA-16:08.bind</name>
         </advisory>
       </day>
 
       <day>
         <name>14</name>
 
         <advisory>
           <name>FreeBSD-SA-16:07.openssh</name>
         </advisory>
 
         <advisory>
           <name>FreeBSD-SA-16:06.bsnmpd</name>
         </advisory>
 
         <advisory>
           <name>FreeBSD-SA-16:05.tcp</name>
         </advisory>
 
         <advisory>
           <name>FreeBSD-SA-16:04.linux</name>
         </advisory>
 
         <advisory>
           <name>FreeBSD-SA-16:03.linux</name>
         </advisory>
 
         <advisory>
           <name>FreeBSD-SA-16:02.ntp</name>
         </advisory>
 
         <advisory>
           <name>FreeBSD-SA-16:01.sctp</name>
         </advisory>
       </day>
     </month>
   </year>
 
   <year>
     <name>2015</name>
 
     <month>
       <name>12</name>
 
       <day>
         <name>16</name>
 
         <advisory>
           <name>FreeBSD-SA-15:27.bind</name>
         </advisory>
       </day>
 
       <day>
         <name>6</name>
 
         <advisory>
           <name>FreeBSD-SA-15:26.openssl</name>
         </advisory>
       </day>
     </month>
 
     <month>
       <name>10</name>
 
       <day>
         <name>26</name>
 
         <advisory>
           <name>FreeBSD-SA-15:25.ntp</name>
         </advisory>
       </day>
     </month>
 
     <month>
       <name>9</name>
 
       <day>
         <name>29</name>
 
         <advisory>
           <name>FreeBSD-SA-15:24.rpcbind</name>
         </advisory>
       </day>
 
       <day>
         <name>2</name>
 
         <advisory>
           <name>FreeBSD-SA-15:23.bind</name>
         </advisory>
       </day>
     </month>
 
     <month>
       <name>8</name>
 
       <day>
         <name>25</name>
 
         <advisory>
           <name>FreeBSD-SA-15:22.openssh</name>
         </advisory>
 
         <advisory>
           <name>FreeBSD-SA-15:21.amd64</name>
         </advisory>
       </day>
 
       <day>
         <name>18</name>
 
         <advisory>
           <name>FreeBSD-SA-15:20.expat</name>
         </advisory>
       </day>
 
       <day>
         <name>5</name>
 
         <advisory>
           <name>FreeBSD-SA-15:19.routed</name>
         </advisory>
 
         <advisory>
           <name>FreeBSD-SA-15:18.bsdpatch</name>
         </advisory>
       </day>
     </month>
 
     <month>
       <name>7</name>
 
       <day>
         <name>28</name>
 
         <advisory>
           <name>FreeBSD-SA-15:17.bind</name>
         </advisory>
 
         <advisory>
           <name>FreeBSD-SA-15:16.openssh</name>
         </advisory>
 
         <advisory>
           <name>FreeBSD-SA-15:15.tcp</name>
         </advisory>
 
         <advisory>
           <name>FreeBSD-SA-15:14.bsdpatch</name>
         </advisory>
       </day>
 
       <day>
         <name>21</name>
 
         <advisory>
           <name>FreeBSD-SA-15:13.tcp</name>
         </advisory>
       </day>
 
       <day>
         <name>9</name>
 
         <advisory>
           <name>FreeBSD-SA-15:12.openssl</name>
         </advisory>
       </day>
 
       <day>
         <name>7</name>
 
         <advisory>
           <name>FreeBSD-SA-15:11.bind</name>
         </advisory>
       </day>
     </month>
 
     <month>
       <name>6</name>
 
       <day>
         <name>12</name>
 
         <advisory>
           <name>FreeBSD-SA-15:10.openssl</name>
         </advisory>
       </day>
     </month>
 
     <month>
       <name>4</name>
 
       <day>
         <name>7</name>
 
         <advisory>
           <name>FreeBSD-SA-15:09.ipv6</name>
         </advisory>
 
         <advisory>
           <name>FreeBSD-SA-15:08.bsdinstall</name>
         </advisory>
 
         <advisory>
           <name>FreeBSD-SA-15:07.ntp</name>
         </advisory>
       </day>
     </month>
 
     <month>
       <name>3</name>
 
       <day>
         <name>19</name>
 
         <advisory>
           <name>FreeBSD-SA-15:06.openssl</name>
         </advisory>
       </day>
     </month>
 
     <month>
       <name>2</name>
 
       <day>
         <name>25</name>
 
         <advisory>
           <name>FreeBSD-SA-15:05.bind</name>
         </advisory>
 
         <advisory>
           <name>FreeBSD-SA-15:04.igmp</name>
         </advisory>
       </day>
     </month>
 
     <month>
       <name>1</name>
 
       <day>
         <name>27</name>
 
         <advisory>
           <name>FreeBSD-SA-15:03.sctp</name>
         </advisory>
 
         <advisory>
           <name>FreeBSD-SA-15:02.kmem</name>
         </advisory>
       </day>
 
       <day>
         <name>14</name>
 
         <advisory>
           <name>FreeBSD-SA-15:01.openssl</name>
         </advisory>
       </day>
     </month>
   </year>
 
   <year>
     <name>2014</name>
 
     <month>
       <name>12</name>
 
       <day>
         <name>23</name>
 
         <advisory>
           <name>FreeBSD-SA-14:31.ntp</name>
         </advisory>
       </day>
 
       <day>
         <name>17</name>
 
         <advisory>
           <name>FreeBSD-SA-14:30.unbound</name>
         </advisory>
       </day>
 
       <day>
 	<name>10</name>
 
 	<advisory>
 	  <name>FreeBSD-SA-14:29.bind</name>
 	</advisory>
 
 	<advisory>
 	  <name>FreeBSD-SA-14:28.file</name>
 	</advisory>
 
 	<advisory>
 	  <name>FreeBSD-SA-14:27.stdio</name>
 	</advisory>
       </day>
     </month>
 
     <month>
       <name>11</name>
 
       <day>
 	<name>04</name>
 
 	<advisory>
 	  <name>FreeBSD-SA-14:26.ftp</name>
 	</advisory>
 
 	<advisory>
 	  <name>FreeBSD-SA-14:25.setlogin</name>
 	</advisory>
 
 	<advisory>
 	  <name>FreeBSD-SA-14:24.sshd</name>
 	</advisory>
       </day>
     </month>
 
     <month>
       <name>10</name>
 
       <day>
 	<name>21</name>
 
 	<advisory>
 	  <name>FreeBSD-SA-14:23.openssl</name>
 	</advisory>
 
 	<advisory>
 	  <name>FreeBSD-SA-14:22.namei</name>
 	</advisory>
 
 	<advisory>
 	  <name>FreeBSD-SA-14:21.routed</name>
 	</advisory>
 
 	<advisory>
 	  <name>FreeBSD-SA-14:20.rtsold</name>
 	</advisory>
       </day>
     </month>
 
     <month>
       <name>9</name>
 
       <day>
 	<name>16</name>
 
 	<advisory>
 	  <name>FreeBSD-SA-14:19.tcp</name>
 	</advisory>
       </day>
 
       <day>
 	<name>9</name>
 
 	<advisory>
 	  <name>FreeBSD-SA-14:18.openssl</name>
 	</advisory>
       </day>
     </month>
 
     <month>
       <name>7</name>
 
       <day>
 	<name>8</name>
 
 	<advisory>
 	  <name>FreeBSD-SA-14:17.kmem</name>
 	</advisory>
       </day>
     </month>
 
     <month>
       <name>6</name>
 
       <day>
 	<name>24</name>
 
 	<advisory>
 	  <name>FreeBSD-SA-14:16.file</name>
 	</advisory>
 
 	<advisory>
 	  <name>FreeBSD-SA-14:15.iconv</name>
 	</advisory>
       </day>
 
       <day>
 	<name>5</name>
 
 	<advisory>
 	  <name>FreeBSD-SA-14:14.openssl</name>
 	</advisory>
       </day>
 
       <day>
 	<name>3</name>
 
 	<advisory>
 	  <name>FreeBSD-SA-14:13.pam</name>
 	</advisory>
 
 	<advisory>
 	  <name>FreeBSD-SA-14:12.ktrace</name>
 	</advisory>
 
 	<advisory>
 	  <name>FreeBSD-SA-14:11.sendmail</name>
 	</advisory>
       </day>
     </month>
 
     <month>
       <name>5</name>
 
       <day>
 	<name>13</name>
 
 	<advisory>
 	  <name>FreeBSD-SA-14:10.openssl</name>
 	</advisory>
       </day>
     </month>
 
     <month>
       <name>4</name>
 
       <day>
 	<name>30</name>
 
 	<advisory>
 	  <name>FreeBSD-SA-14:09.openssl</name>
 	</advisory>
 
 	<advisory>
 	  <name>FreeBSD-SA-14:08.tcp</name>
 	</advisory>
 
 	<advisory>
 	  <name>FreeBSD-SA-14:07.devfs</name>
 	</advisory>
       </day>
 
       <day>
 	<name>08</name>
 
 	<advisory>
 	  <name>FreeBSD-SA-14:06.openssl</name>
 	</advisory>
 
 	<advisory>
 	  <name>FreeBSD-SA-14:05.nfsserver</name>
 	</advisory>
       </day>
     </month>
 
     <month>
       <name>1</name>
 
       <day>
 	<name>14</name>
 
 	<advisory>
 	  <name>FreeBSD-SA-14:04.bind</name>
 	</advisory>
 
 	<advisory>
 	  <name>FreeBSD-SA-14:03.openssl</name>
 	</advisory>
 
 	<advisory>
 	  <name>FreeBSD-SA-14:02.ntpd</name>
 	</advisory>
 
 	<advisory>
 	  <name>FreeBSD-SA-14:01.bsnmpd</name>
 	</advisory>
       </day>
     </month>
 
   </year>
 
   <year>
     <name>2013</name>
 
     <month>
       <name>11</name>
 
       <day>
 	<name>19</name>
 
 	<advisory>
 	  <name>FreeBSD-SA-13:14.openssh</name>
 	</advisory>
       </day>
     </month>
 
     <month>
       <name>9</name>
 
       <day>
 	<name>10</name>
 
 	<advisory>
 	  <name>FreeBSD-SA-13:13.nullfs</name>
 	</advisory>
 
 	<advisory>
 	  <name>FreeBSD-SA-13:12.ifioctl</name>
 	</advisory>
 
 	<advisory>
 	  <name>FreeBSD-SA-13:11.sendfile</name>
 	</advisory>
       </day>
     </month>
 
     <month>
       <name>8</name>
 
       <day>
 	<name>22</name>
 
 	<advisory>
 	  <name>FreeBSD-SA-13:10.sctp</name>
 	</advisory>
 
 	<advisory>
 	  <name>FreeBSD-SA-13:09.ip_multicast</name>
 	</advisory>
       </day>
     </month>
 
     <month>
       <name>7</name>
 
       <day>
 	<name>26</name>
 
 	<advisory>
 	  <name>FreeBSD-SA-13:08.nfsserver</name>
 	</advisory>
 
 	<advisory>
 	  <name>FreeBSD-SA-13:07.bind</name>
 	</advisory>
       </day>
 
     </month>
 
     <month>
       <name>6</name>
 
       <day>
 	<name>18</name>
 
 	<advisory>
 	  <name>FreeBSD-SA-13:06.mmap</name>
 	</advisory>
       </day>
 
     </month>
 
     <month>
       <name>4</name>
 
       <day>
 	<name>29</name>
 
 	<advisory>
 	  <name>FreeBSD-SA-13:05.nfsserver</name>
 	</advisory>
       </day>
 
       <day>
 	<name>2</name>
 
 	<advisory>
 	  <name>FreeBSD-SA-13:04.bind</name>
 	</advisory>
 
 	<advisory>
 	  <name>FreeBSD-SA-13:03.openssl</name>
 	</advisory>
       </day>
     </month>
 
     <month>
       <name>2</name>
 
       <day>
 	<name>19</name>
 
 	<advisory>
 	  <name>FreeBSD-SA-13:02.libc</name>
 	</advisory>
 
 	<advisory>
 	  <name>FreeBSD-SA-13:01.bind</name>
 	</advisory>
       </day>
     </month>
   </year>
 
   <year>
     <name>2012</name>
 
     <month>
       <name>11</name>
 
       <day>
 	<name>22</name>
 
 	<advisory>
 	  <name>FreeBSD-SA-12:08.linux</name>
 	</advisory>
 
 	<advisory>
 	  <name>FreeBSD-SA-12:07.hostapd</name>
 	</advisory>
 
 	<advisory>
 	  <name>FreeBSD-SA-12:06.bind</name>
 	</advisory>
       </day>
     </month>
 
     <month>
       <name>8</name>
 
       <day>
 	<name>6</name>
 
 	<advisory>
 	  <name>FreeBSD-SA-12:05.bind</name>
 	</advisory>
       </day>
     </month>
 
     <month>
       <name>6</name>
 
       <day>
 	<name>12</name>
 
 	<advisory>
 	  <name>FreeBSD-SA-12:04.sysret</name>
 	</advisory>
 
 	<advisory>
 	  <name>FreeBSD-SA-12:03.bind</name>
 	</advisory>
       </day>
     </month>
 
     <month>
       <name>5</name>
 
       <day>
 	<name>30</name>
 
 	<advisory>
 	  <name>FreeBSD-SA-12:02.crypt</name>
 	</advisory>
       </day>
 
       <day>
 	<name>30</name>
 
 	<advisory>
 	  <name>FreeBSD-SA-12:01.openssl</name>
 	</advisory>
       </day>
     </month>
   </year>
 
   <year>
     <name>2011</name>
 
     <month>
       <name>12</name>
 
       <day>
 	<name>23</name>
 
 	<advisory>
 	  <name>FreeBSD-SA-11:10.pam</name>
 	</advisory>
 
 	<advisory>
 	  <name>FreeBSD-SA-11:09.pam_ssh</name>
 	</advisory>
 
 	<advisory>
 	  <name>FreeBSD-SA-11:08.telnetd</name>
 	</advisory>
 
 	<advisory>
 	  <name>FreeBSD-SA-11:07.chroot</name>
 	</advisory>
 
 	<advisory>
 	  <name>FreeBSD-SA-11:06.bind</name>
 	</advisory>
       </day>
     </month>
 
     <month>
       <name>9</name>
 
       <day>
 	<name>28</name>
 
 	<advisory>
 	  <name>FreeBSD-SA-11:05.unix</name>
 	</advisory>
 
 	<advisory>
 	  <name>FreeBSD-SA-11:04.compress</name>
 	</advisory>
 
 	<advisory>
 	  <name>FreeBSD-SA-11:03.bind</name>
 	</advisory>
       </day>
     </month>
 
     <month>
       <name>5</name>
 
       <day>
 	<name>28</name>
 
 	<advisory>
 	  <name>FreeBSD-SA-11:02.bind</name>
 	</advisory>
       </day>
     </month>
 
     <month>
       <name>4</name>
 
       <day>
 	<name>20</name>
 
 	<advisory>
 	  <name>FreeBSD-SA-11:01.mountd</name>
 	</advisory>
       </day>
     </month>
   </year>
 
   <year>
     <name>2010</name>
 
     <month>
       <name>11</name>
 
       <day>
 	<name>29</name>
 
 	<advisory>
 	  <name>FreeBSD-SA-10:10.openssl</name>
 	</advisory>
       </day>
 
       <day>
 	<name>10</name>
 
 	<advisory>
 	  <name>FreeBSD-SA-10:09.pseudofs</name>
 	</advisory>
       </day>
     </month>
 
     <month>
       <name>9</name>
 
       <day>
 	<name>20</name>
 
 	<advisory>
 	  <name>FreeBSD-SA-10:08.bzip2</name>
 	</advisory>
       </day>
     </month>
 
     <month>
       <name>7</name>
 
       <day>
 	<name>13</name>
 
 	<advisory>
 	  <name>FreeBSD-SA-10:07.mbuf</name>
 	</advisory>
       </day>
     </month>
 
     <month>
       <name>5</name>
 
       <day>
 	<name>27</name>
 
 	<advisory>
 	  <name>FreeBSD-SA-10:06.nfsclient</name>
 	</advisory>
 
 	<advisory>
 	  <name>FreeBSD-SA-10:05.opie</name>
 	</advisory>
 
 	<advisory>
 	  <name>FreeBSD-SA-10:04.jail</name>
 	</advisory>
       </day>
     </month>
 
     <month>
       <name>1</name>
 
       <day>
 	<name>6</name>
 
 	<advisory>
 	  <name>FreeBSD-SA-10:03.zfs</name>
 	</advisory>
 
 	<advisory>
 	  <name>FreeBSD-SA-10:02.ntpd</name>
 	</advisory>
 
 	<advisory>
 	  <name>FreeBSD-SA-10:01.bind</name>
 	</advisory>
       </day>
     </month>
   </year>
 
   <year>
     <name>2009</name>
 
     <month>
       <name>12</name>
 
       <day>
 	<name>3</name>
 
 	<advisory>
 	  <name>FreeBSD-SA-09:17.freebsd-update</name>
 	</advisory>
 
 	<advisory>
 	  <name>FreeBSD-SA-09:16.rtld</name>
 	</advisory>
 
 	<advisory>
 	  <name>FreeBSD-SA-09:15.ssl</name>
 	</advisory>
       </day>
     </month>
 
     <month>
       <name>10</name>
 
       <day>
 	<name>2</name>
 
 	<advisory>
 	  <name>FreeBSD-SA-09:14.devfs</name>
 	</advisory>
 
 	<advisory>
 	  <name>FreeBSD-SA-09:13.pipe</name>
 	</advisory>
       </day>
     </month>
 
     <month>
       <name>7</name>
 
       <day>
 	<name>29</name>
 
 	<advisory>
 	  <name>FreeBSD-SA-09:12.bind</name>
 	</advisory>
       </day>
     </month>
 
     <month>
       <name>6</name>
 
       <day>
 	<name>10</name>
 
 	<advisory>
 	  <name>FreeBSD-SA-09:11.ntpd</name>
 	</advisory>
 
 	<advisory>
 	  <name>FreeBSD-SA-09:10.ipv6</name>
 	</advisory>
 
 	<advisory>
 	  <name>FreeBSD-SA-09:09.pipe</name>
 	</advisory>
       </day>
     </month>
 
     <month>
       <name>4</name>
 
       <day>
 	<name>22</name>
 
 	<advisory>
 	  <name>FreeBSD-SA-09:08.openssl</name>
 	</advisory>
 
 	<advisory>
 	  <name>FreeBSD-SA-09:07.libc</name>
 	</advisory>
       </day>
     </month>
 
     <month>
       <name>3</name>
 
       <day>
 	<name>23</name>
 
 	<advisory>
 	  <name>FreeBSD-SA-09:06.ktimer</name>
 	</advisory>
       </day>
     </month>
 
     <month>
       <name>2</name>
 
       <day>
 	<name>16</name>
 
 	<advisory>
 	  <name>FreeBSD-SA-09:05.telnetd</name>
 	</advisory>
       </day>
     </month>
 
     <month>
       <name>1</name>
 
       <day>
 	<name>13</name>
 
 	<advisory>
 	  <name>FreeBSD-SA-09:04.bind</name>
 	</advisory>
 
 	<advisory>
 	  <name>FreeBSD-SA-09:03.ntpd</name>
 	</advisory>
       </day>
 
       <day>
 	<name>7</name>
 
 	<advisory>
 	  <name>FreeBSD-SA-09:02.openssl</name>
 	</advisory>
 
 	<advisory>
 	  <name>FreeBSD-SA-09:01.lukemftpd</name>
 	</advisory>
       </day>
     </month>
   </year>
 
   <year>
     <name>2008</name>
 
     <month>
       <name>12</name>
 
       <day>
 	<name>23</name>
 
 	<advisory>
 	  <name>FreeBSD-SA-08:13.protosw</name>
 	</advisory>
 
 	<advisory>
 	  <name>FreeBSD-SA-08:12.ftpd</name>
 	</advisory>
       </day>
     </month>
 
     <month>
       <name>11</name>
 
       <day>
 	<name>24</name>
 
 	<advisory>
 	  <name>FreeBSD-SA-08:11.arc4random</name>
 	</advisory>
       </day>
     </month>
 
     <month>
       <name>10</name>
 
       <day>
 	<name>2</name>
 
 	<advisory>
 	  <name>FreeBSD-SA-08:10.nd6</name>
 	</advisory>
       </day>
     </month>
 
     <month>
       <name>9</name>
 
       <day>
 	<name>3</name>
 
 	<advisory>
 	  <name>FreeBSD-SA-08:09.icmp6</name>
 	</advisory>
 
 	<advisory>
 	  <name>FreeBSD-SA-08:08.nmount</name>
 	</advisory>
 
 	<advisory>
 	  <name>FreeBSD-SA-08:07.amd64</name>
 	</advisory>
       </day>
     </month>
 
     <month>
       <name>7</name>
 
       <day>
 	<name>13</name>
 
 	<advisory>
 	  <name>FreeBSD-SA-08:06.bind</name>
 	</advisory>
       </day>
     </month>
 
     <month>
       <name>4</name>
 
       <day>
 	<name>17</name>
 
 	<advisory>
 	  <name>FreeBSD-SA-08:05.openssh</name>
 	</advisory>
       </day>
     </month>
 
     <month>
       <name>2</name>
 
       <day>
 	<name>14</name>
 
 	<advisory>
 	  <name>FreeBSD-SA-08:04.ipsec</name>
 	</advisory>
 
 	<advisory>
 	  <name>FreeBSD-SA-08:03.sendfile</name>
 	</advisory>
       </day>
     </month>
 
     <month>
       <name>1</name>
 
       <day>
         <name>18</name>
 
         <release>
           <name>FreeBSD 6.3-RELEASE</name>
         </release>
       </day>
 
       <day>
 	<name>14</name>
 
 	<advisory>
 	  <name>FreeBSD-SA-08:02.libc</name>
 	</advisory>
 
 	<advisory>
 	  <name>FreeBSD-SA-08:01.pty</name>
 	</advisory>
       </day>
     </month>
   </year>
 
   <year>
     <name>2007</name>
 
     <month>
       <name>11</name>
 
       <day>
 	<name>29</name>
 
 	<advisory>
 	  <name>FreeBSD-SA-07:10.gtar</name>
 	</advisory>
 
 	<advisory>
 	  <name>FreeBSD-SA-07:09.random</name>
 	</advisory>
       </day>
     </month>
 
     <month>
       <name>10</name>
 
       <day>
 	<name>3</name>
 
 	<advisory>
 	  <name>FreeBSD-SA-07:08.openssl</name>
 	</advisory>
       </day>
     </month>
 
 
     <month>
       <name>8</name>
 
       <day>
 	<name>1</name>
 
 	<advisory>
 	  <name>FreeBSD-SA-07:07.bind</name>
 	</advisory>
 
 	<advisory>
 	  <name>FreeBSD-SA-07:06.tcpdump</name>
 	</advisory>
       </day>
     </month>
 
     <month>
       <name>7</name>
 
       <day>
 	<name>12</name>
 
 	<advisory>
 	  <name>FreeBSD-SA-07:05.libarchive</name>
 	</advisory>
       </day>
     </month>
 
     <month>
       <name>5</name>
 
       <day>
 	<name>23</name>
 
 	<advisory>
 	  <name>FreeBSD-SA-07:04.file</name>
 	</advisory>
       </day>
     </month>
 
     <month>
       <name>4</name>
 
       <day>
 	<name>26</name>
 
 	<advisory>
 	  <name>FreeBSD-SA-07:03.ipv6</name>
 	</advisory>
       </day>
     </month>
 
     <month>
       <name>2</name>
 
       <day>
 	<name>9</name>
 
 	<advisory>
 	  <name>FreeBSD-SA-07:02.bind</name>
 	</advisory>
       </day>
     </month>
 
     <month>
       <name>1</name>
 
       <day>
         <name>15</name>
 
         <release>
           <name>FreeBSD 6.2-RELEASE</name>
         </release>
       </day>
 
       <day>
 	<name>11</name>
 
 	<advisory>
 	  <name>FreeBSD-SA-07:01.jail</name>
 	</advisory>
       </day>
     </month>
   </year>
 
   <year>
     <name>2006</name>
 
     <month>
       <name>12</name>
 
       <day>
 	<name>6</name>
 
 	<advisory>
 	  <name>FreeBSD-SA-06:26.gtar</name>
 	</advisory>
 
 	<advisory>
 	  <name>FreeBSD-SA-06:25.kmem</name>
 	</advisory>
       </day>
     </month>
 
     <month>
       <name>11</name>
 
       <day>
 	<name>8</name>
 
 	<advisory>
 	  <name>FreeBSD-SA-06:24.libarchive</name>
 	</advisory>
       </day>
     </month>
 
     <month>
       <name>9</name>
 
       <day>
 	<name>30</name>
 
 	<advisory>
 	  <name>FreeBSD-SA-06:22.openssh</name>
 	</advisory>
       </day>
 
       <day>
 	<name>28</name>
 
 	<advisory>
 	  <name>FreeBSD-SA-06:23.openssl</name>
 	</advisory>
       </day>
 
       <day>
 	<name>19</name>
 
 	<advisory>
 	  <name>FreeBSD-SA-06:21.gzip</name>
 	</advisory>
       </day>
 
       <day>
 	<name>6</name>
 
 	<advisory>
 	  <name>FreeBSD-SA-06:20.bind</name>
 	</advisory>
 
 	<advisory>
 	  <name>FreeBSD-SA-06:19.openssl</name>
 	</advisory>
       </day>
     </month>
 
     <month>
       <name>8</name>
 
       <day>
 	<name>23</name>
 
 	<advisory>
 	  <name>FreeBSD-SA-06:18.ppp</name>
 	</advisory>
       </day>
     </month>
 
     <month>
       <name>6</name>
 
       <day>
 	<name>14</name>
 
 	<advisory>
 	  <name>FreeBSD-SA-06:17.sendmail</name>
 	</advisory>
       </day>
     </month>
 
     <month>
       <name>5</name>
 
       <day>
 	<name>31</name>
 
 	<advisory>
 	  <name>FreeBSD-SA-06:16.smbfs</name>
 	</advisory>
 
 	<advisory>
 	  <name>FreeBSD-SA-06:15.ypserv</name>
 	</advisory>
       </day>
 
       <day>
         <name>25</name>
 
         <release>
           <name>FreeBSD 5.5-RELEASE</name>
         </release>
       </day>
 
       <day>
         <name>9</name>
 
         <release>
           <name>FreeBSD 6.1-RELEASE</name>
         </release>
       </day>
 
     </month>
 
     <month>
       <name>4</name>
 
       <day>
 	<name>19</name>
 
 	<advisory>
 	  <name>FreeBSD-SA-06:14.fpu</name>
 	</advisory>
       </day>
     </month>
 
     <month>
       <name>3</name>
 
       <day>
 	<name>22</name>
 
 	<advisory>
 	  <name>FreeBSD-SA-06:13.sendmail</name>
 	</advisory>
 
 	<advisory>
 	  <name>FreeBSD-SA-06:12.opie</name>
 	</advisory>
 
 	<advisory>
 	  <name>FreeBSD-SA-06:11.ipsec</name>
 	</advisory>
       </day>
 
       <day>
 	<name>1</name>
 
 	<advisory>
 	  <name>FreeBSD-SA-06:10.nfs</name>
 	</advisory>
 
 	<advisory>
 	  <name>FreeBSD-SA-06:09.openssh</name>
 	</advisory>
       </day>
     </month>
 
     <month>
       <name>2</name>
 
       <day>
 	<name>1</name>
 
 	<advisory>
 	  <name>FreeBSD-SA-06:08.sack</name>
 	</advisory>
       </day>
     </month>
 
     <month>
       <name>1</name>
 
       <day>
 	<name>25</name>
 
 	<advisory>
 	  <name>FreeBSD-SA-06:07.pf</name>
 	</advisory>
 
 	<advisory>
 	  <name>FreeBSD-SA-06:06.kmem</name>
 	</advisory>
       </day>
 
       <day>
 	<name>18</name>
 
 	<advisory>
 	  <name>FreeBSD-SA-06:05.80211</name>
 	</advisory>
       </day>
 
       <day>
 	<name>11</name>
 
 	<advisory>
 	  <name>FreeBSD-SA-06:04.ipfw</name>
 	</advisory>
 
 	<advisory>
 	  <name>FreeBSD-SA-06:03.cpio</name>
 	</advisory>
 
 	<advisory>
 	  <name>FreeBSD-SA-06:02.ee</name>
 	</advisory>
 
 	<advisory>
 	  <name>FreeBSD-SA-06:01.texindex</name>
 	</advisory>
       </day>
     </month>
   </year>
 
   <year>
     <name>2005</name>
 
     <month>
       <name>11</name>
 
       <day>
         <name>4</name>
 
         <release>
           <name>FreeBSD 6.0-RELEASE</name>
         </release>
       </day>
     </month>
 
     <month>
       <name>10</name>
 
       <day>
         <name>11</name>
 
         <advisory>
           <name>FreeBSD-SA-05:21.openssl</name>
         </advisory>
       </day>
     </month>
 
     <month>
       <name>9</name>
 
       <day>
         <name>7</name>
 
         <advisory>
           <name>FreeBSD-SA-05:20.cvsbug</name>
         </advisory>
       </day>
     </month>
 
     <month>
       <name>7</name>
 
       <day>
         <name>27</name>
 
         <advisory>
           <name>FreeBSD-SA-05:19.ipsec</name>
         </advisory>
 
         <advisory>
           <name>FreeBSD-SA-05:18.zlib</name>
         </advisory>
       </day>
 
       <day>
         <name>20</name>
 
 	<advisory>
 	  <name>FreeBSD-SA-05:17.devfs</name>
 	</advisory>
       </day>
 
       <day>
         <name>6</name>
 
 	<advisory>
 	  <name>FreeBSD-SA-05:16.zlib</name>
 	</advisory>
       </day>
     </month>
 
     <month>
       <name>6</name>
 
       <day>
         <name>29</name>
 
 	<advisory>
 	  <name>FreeBSD-SA-05:15.tcp</name>
 	</advisory>
 
 	<advisory>
 	  <name>FreeBSD-SA-05:14.bzip2</name>
 	</advisory>
 
 	<advisory>
 	  <name>FreeBSD-SA-05:13.ipfw</name>
 	</advisory>
       </day>
 
       <day>
         <name>9</name>
 
 	<advisory>
 	  <name>FreeBSD-SA-05:12.bind9</name>
 	</advisory>
 
 	<advisory>
 	  <name>FreeBSD-SA-05:11.gzip</name>
 	</advisory>
 
 	<advisory>
 	  <name>FreeBSD-SA-05:10.tcpdump</name>
 	</advisory>
       </day>
     </month>
 
     <month>
       <name>5</name>
 
       <day>
         <name>13</name>
 
 	<advisory>
 	  <name>FreeBSD-SA-05:09.htt</name>
 	</advisory>
       </day>
 
       <day>
 	<name>9</name>
 
 	<release>
 	  <name>FreeBSD 5.4-RELEASE</name>
 	</release>
       </day>
 
       <day>
 	<name>6</name>
 
 	<advisory>
 	  <name>FreeBSD-SA-05:08.kmem</name>
 	</advisory>
 
 	<advisory>
 	  <name>FreeBSD-SA-05:07.ldt</name>
 	</advisory>
 
 	<advisory>
 	  <name>FreeBSD-SA-05:06.iir</name>
 	</advisory>
       </day>
     </month>
 
     <month>
       <name>4</name>
 
       <day>
 	<name>22</name>
 
 	<advisory>
 	  <name>FreeBSD-SA-05:05.cvs</name>
 	</advisory>
       </day>
 
       <day>
 	<name>15</name>
 
 	<advisory>
 	  <name>FreeBSD-SA-05:04.ifconf</name>
 	</advisory>
       </day>
 
       <day>
 	<name>6</name>
 
 	<advisory>
 	  <name>FreeBSD-SA-05:03.amd64</name>
 	</advisory>
       </day>
 
       <day>
 	<name>4</name>
 
 	<advisory>
 	  <name>FreeBSD-SA-05:02.sendfile</name>
 	</advisory>
       </day>
     </month>
 
     <month>
       <name>3</name>
 
       <day>
 	<name>28</name>
 
 	<advisory>
 	  <name>FreeBSD-SA-05:01.telnet</name>
 	</advisory>
       </day>
     </month>
 
     <month>
       <name>1</name>
 
 	<day>
 	  <name>25</name>
 
 	  <release>
 	    <name>FreeBSD 4.11-RELEASE</name>
 	  </release>
 	</day>
     </month>
   </year>
 
     <year>
       <name>2004</name>
 
       <month>
 	<name>12</name>
 
 	<day>
 	  <name>1</name>
 
 	  <advisory>
 	    <name>FreeBSD-SA-04:17.procfs</name>
 	  </advisory>
 	</day>
       </month>
 
       <month>
         <name>11</name>
 
 	<day>
 	  <name>18</name>
 
 	  <advisory>
 	    <name>FreeBSD-SA-04:16.fetch</name>
 	  </advisory>
 	</day>
 
 	<day>
 	  <name>6</name>
 
 	  <release>
 	    <name>FreeBSD 5.3-RELEASE</name>
 	  </release>
 	</day>
       </month>
 
       <month>
         <name>10</name>
 
 	<day>
 	  <name>4</name>
 
 	  <advisory>
 	    <name>FreeBSD-SA-04:15.syscons</name>
 	  </advisory>
 	</day>
       </month>
 
       <month>
         <name>9</name>
 
 	<day>
 	  <name>19</name>
 
 	  <advisory>
 	    <name>FreeBSD-SA-04:14.cvs</name>
 	  </advisory>
 	</day>
       </month>
 
       <month>
         <name>6</name>
 
 	<day>
 	  <name>30</name>
 
 	  <advisory>
 	    <name>FreeBSD-SA-04:13.linux</name>
 	  </advisory>
 	</day>
 
 	<day>
 	  <name>7</name>
 
 	  <advisory>
 	    <name>FreeBSD-SA-04:12.jailroute</name>
 	  </advisory>
 	</day>
       </month>
 
       <month>
 	<name>5</name>
 
 	<day>
 	  <name>27</name>
 
 	  <release>
 	    <name>FreeBSD 4.10-RELEASE</name>
 	  </release>
 	</day>
 
 	<day>
 	  <name>19</name>
 
 	  <advisory>
 	    <name>FreeBSD-SA-04:11.msync</name>
 	  </advisory>
 	</day>
 
 	<day>
 	  <name>19</name>
 
 	  <advisory>
 	    <name>FreeBSD-SA-04:10.cvs</name>
 	  </advisory>
 	</day>
 
 	<day>
 	  <name>5</name>
 
 	  <advisory>
 	    <name>FreeBSD-SA-04:09.kadmind</name>
 	  </advisory>
 	  <advisory>
 	    <name>FreeBSD-SA-04:08.heimdal</name>
 	  </advisory>
 	</day>
       </month>
 
       <month>
 	<name>4</name>
 
 	<day>
 	  <name>15</name>
 
 	  <advisory>
 	    <name>FreeBSD-SA-04:07.cvs</name>
 	  </advisory>
 	</day>
       </month>
 
       <month>
 	<name>3</name>
 
 	<day>
 	  <name>29</name>
 
 	  <advisory>
 	    <name>FreeBSD-SA-04:06.ipv6</name>
 	  </advisory>
 	</day>
 
 	<day>
 	  <name>17</name>
 
 	  <advisory>
 	    <name>FreeBSD-SA-04:05.openssl</name>
 	  </advisory>
 	</day>
 
 	<day>
 	  <name>2</name>
 
 	  <advisory>
 	    <name>FreeBSD-SA-04:04.tcp</name>
 	  </advisory>
 	</day>
       </month>
 
       <month>
 	<name>2</name>
 
 	<day>
 	  <name>26</name>
 
 	  <release>
 	    <name>FreeBSD 5.2.1-RELEASE</name>
 	  </release>
 	</day>
 
 	<day>
 	  <name>25</name>
 
 	  <advisory>
 	    <name>FreeBSD-SA-04:03.jail</name>
 	  </advisory>
 	</day>
 
 	<day>
 	  <name>05</name>
 
 	  <advisory>
 	    <name>FreeBSD-SA-04:02.shmat</name>
 	  </advisory>
 	</day>
       </month>
 
       <month>
 	<name>1</name>
 
 	<day>
 	  <name>30</name>
 
 	  <advisory>
 	    <name>FreeBSD-SA-04:01.mksnap_ffs</name>
 	  </advisory>
 	</day>
 
 
 	<day>
 	  <name>12</name>
 
 	  <release>
 	    <name>FreeBSD 5.2-RELEASE</name>
 	  </release>
 	</day>
 
       </month>
 
     </year>
 
     <year>
       <name>2003</name>
 
       <month>
 	<name>11</name>
 
 	<day>
 	  <name>28</name>
 
 	  <advisory>
 	    <name>FreeBSD-SA-03:19.bind</name>
 	  </advisory>
 	</day>
       </month>
 
       <month>
 	<name>10</name>
 
 	<day>
 	  <name>27</name>
 
 	  <release>
 	    <name>FreeBSD 4.9-RELEASE</name>
 	  </release>
 	</day>
 
 	<day>
 	  <name>5</name>
 
 	  <advisory>
 	    <name>FreeBSD-SA-03:15.openssh</name>
 	  </advisory>
 	</day>
 
 	<day>
 	  <name>3</name>
 
 	  <advisory>
 	    <name>FreeBSD-SA-03:18.openssl</name>
 	  </advisory>
 	  <advisory>
 	    <name>FreeBSD-SA-03:17.procfs</name>
 	  </advisory>
 	</day>
 
 	<day>
 	  <name>2</name>
 
 	  <advisory>
 	    <name>FreeBSD-SA-03:16.filedesc</name>
 	  </advisory>
 	</day>
       </month>
 
       <month>
 	<name>9</name>
 
 	<day>
 	  <name>23</name>
 
 	  <advisory>
 	    <name>FreeBSD-SA-03:14.arp</name>
 	  </advisory>
 	</day>
 
 	<day>
 	  <name>17</name>
 
 	  <advisory>
 	    <name>FreeBSD-SA-03:13.sendmail</name>
 	  </advisory>
 	</day>
 
 	<day>
 	  <name>16</name>
 
 	  <advisory>
 	    <name>FreeBSD-SA-03:12.openssh</name>
 	  </advisory>
 	</day>
       </month>
 
       <month>
 	<name>8</name>
 
 	<day>
 	  <name>26</name>
 
 	  <advisory>
 	    <name>FreeBSD-SA-03:11.sendmail</name>
 	    <ulink lang="ja">http://home.jp.freebsd.org/cgi-bin/showmail/announce-jp/1170</ulink>
 	  </advisory>
 	</day>
 
 	<day>
 	  <name>10</name>
 
 	  <advisory>
 	    <name>FreeBSD-SA-03:10.ibcs2</name>
 	    <ulink lang="ja">http://home.jp.freebsd.org/cgi-bin/showmail/announce-jp/1164</ulink>
 	  </advisory>
 
 	  <advisory>
 	    <name>FreeBSD-SA-03:09.signal</name>
 	    <ulink lang="ja">http://home.jp.freebsd.org/cgi-bin/showmail/announce-jp/1163</ulink>
 	  </advisory>
 	</day>
 
 	<day>
 	  <name>3</name>
 
 	  <advisory>
 	    <name>FreeBSD-SA-03:08.realpath</name>
 	    <ulink lang="ja">http://home.jp.freebsd.org/cgi-bin/showmail/announce-jp/1158</ulink>
 	  </advisory>
 	</day>
       </month>
 
       <month>
 	<name>6</name>
 
 	<day>
 	  <name>9</name>
 
 	  <release>
 	    <name>FreeBSD 5.1-RELEASE</name>
 	  </release>
 	</day>
       </month>
 
       <month>
 	<name>4</name>
 
 	<day>
 	  <name>8</name>
 
 	  <advisory>
 	    <name>FreeBSD-SN-03:02</name>
 	  </advisory>
 	</day>
 
 	<day>
 	  <name>7</name>
 
 	  <advisory>
 	    <name>FreeBSD-SN-03:01</name>
 	  </advisory>
 	</day>
 
 	<day>
 	  <name>3</name>
 
 	  <release>
 	    <name>FreeBSD 4.8-RELEASE</name>
 	  </release>
 	</day>
       </month>
 
       <month>
 	<name>3</name>
 
 	<day>
 	  <name>30</name>
 
 	  <advisory>
 	    <name>FreeBSD-SA-03:07.sendmail</name>
 	    <ulink lang="ja">http://home.jp.freebsd.org/cgi-bin/showmail/announce-jp/1122</ulink>
 	  </advisory>
 	</day>
 
 	<day>
 	  <name>21</name>
 
 	  <advisory>
 	    <name>FreeBSD-SA-03:06.openssl</name>
 	    <ulink lang="ja">http://home.jp.freebsd.org/cgi-bin/showmail/announce-jp/1118</ulink>
 	  </advisory>
 	</day>
 
 	<day>
 	  <name>20</name>
 
 	  <advisory>
 	    <name>FreeBSD-SA-03:05.xdr</name>
 	    <ulink lang="ja">http://home.jp.freebsd.org/cgi-bin/showmail/announce-jp/1117</ulink>
 	  </advisory>
 	</day>
 
 	<day>
 	  <name>3</name>
 
 	  <advisory>
 	    <name>FreeBSD-SA-03:04.sendmail</name>
 	    <ulink lang="ja">http://home.jp.freebsd.org/cgi-bin/showmail/announce-jp/1112</ulink>
 	  </advisory>
 	</day>
       </month>
 
       <month>
 	<name>2</name>
 
 	<day>
 	  <name>24</name>
 
 	  <advisory>
 	    <name>FreeBSD-SA-03:03.syncookies</name>
 	    <ulink lang="ja">http://home.jp.freebsd.org/cgi-bin/showmail/announce-jp/1106</ulink>
 	  </advisory>
 
 	  <advisory>
 	    <name>FreeBSD-SA-03:02.openssl</name>
 	    <ulink lang="ja">http://home.jp.freebsd.org/cgi-bin/showmail/announce-jp/1105</ulink>
 	  </advisory>
 	</day>
 
 	<day>
 	  <name>04</name>
 
 	  <advisory>
 	    <name>FreeBSD-SA-03:01.cvs</name>
 	    <ulink lang="ja">http://home.jp.freebsd.org/cgi-bin/showmail/announce-jp/1100</ulink>
 	  </advisory>
 	</day>
 
       </month>
 
       <month>
 	<name>1</name>
 
 	<day>
 	  <name>19</name>
 
 	  <release>
 	    <name>FreeBSD 5.0-RELEASE</name>
 	  </release>
 	</day>
 
 	<day>
 	  <name>07</name>
 
 	  <advisory>
 	    <name>FreeBSD-SA-02:44.filedesc</name>
 	    <ulink lang="ja">http://home.jp.freebsd.org/cgi-bin/showmail/announce-jp/1090</ulink>
 	  </advisory>
 	</day>
 
       </month>
 
     </year>
 
     <year>
       <name>2002</name>
 
       <month>
 	<name>11</name>
 
 	<day>
 	  <name>15</name>
 
 	  <advisory>
 	    <name>FreeBSD-SA-02:43.bind</name>
 	    <ulink lang="ja">http://home.jp.freebsd.org/cgi-bin/showmail/announce-jp/1084</ulink>
 	  </advisory>
 
 	  <advisory>
 	    <name>FreeBSD-SA-02:41.smrsh</name>
 	    <ulink lang="ja">http://home.jp.freebsd.org/cgi-bin/showmail/announce-jp/1082</ulink>
 	  </advisory>
 	</day>
 
 	<day>
 	  <name>12</name>
 
 	  <advisory>
 	    <name>FreeBSD-SA-02:42.resolv</name>
 	    <ulink lang="ja">http://home.jp.freebsd.org/cgi-bin/showmail/announce-jp/1083</ulink>
 	  </advisory>
 
 	  <advisory>
 	    <name>FreeBSD-SA-02:40.kadmind</name>
 	    <ulink lang="ja">http://home.jp.freebsd.org/cgi-bin/showmail/announce-jp/1081</ulink>
 	  </advisory>
 	</day>
 
       </month>
 
       <month>
 	<name>10</name>
 
 	<day>
 	  <name>10</name>
 
 	  <release>
 	    <name>FreeBSD 4.7-RELEASE</name>
 	  </release>
 
 	  <advisory>
 	    <name>FreeBSD-SN-02:06</name>
 	  </advisory>
 	</day>
 
       </month>
 
       <month>
 	<name>9</name>
 
 	<day>
 	  <name>16</name>
 
 	  <advisory>
 	    <name>FreeBSD-SA-02:39.libkvm</name>
 	    <ulink lang="ja">http://home.jp.freebsd.org/cgi-bin/showmail/announce-jp/1051</ulink>
 	  </advisory>
 	</day>
 
       </month>
 
 
       <month>
 	<name>8</name>
 
 	<day>
 	  <name>28</name>
 
 	  <advisory>
 	    <name>FreeBSD-SN-02:05</name>
 	  </advisory>
 	</day>
 
 	<day>
 	  <name>19</name>
 
 	  <advisory>
 	    <name>FreeBSD-SA-02:38.signed-error</name>
 	    <ulink lang="ja">http://home.jp.freebsd.org/cgi-bin/showmail/announce-jp/1041</ulink>
 	  </advisory>
 	</day>
 
 	<day>
 	  <name>15</name>
 
 	  <release>
 	    <name>FreeBSD 4.6.2-RELEASE</name>
 	  </release>
 	</day>
 
 	<day>
 	  <name>05</name>
 
 	  <advisory>
 	    <name>FreeBSD-SA-02:37.kqueue</name>
 	    <ulink lang="ja">http://home.jp.freebsd.org/cgi-bin/showmail/announce-jp/1033</ulink>
 	  </advisory>
 
 	  <advisory>
 	    <name>FreeBSD-SA-02:36.nfs</name>
 	    <ulink lang="ja">http://home.jp.freebsd.org/cgi-bin/showmail/announce-jp/1032</ulink>
 	  </advisory>
 
 	  <advisory>
 	    <name>FreeBSD-SA-02:35.ffs</name>
 	    <ulink lang="ja">http://home.jp.freebsd.org/cgi-bin/showmail/announce-jp/1031</ulink>
 	  </advisory>
 
 	  <advisory>
 	    <name>FreeBSD-SA-02:33.openssl</name>
 	    <ulink lang="ja">http://home.jp.freebsd.org/cgi-bin/showmail/announce-jp/1023</ulink>
 	  </advisory>
 	</day>
 
 	<day>
 	  <name>01</name>
 
 	  <advisory>
 	    <name>FreeBSD-SA-02:34.rpc</name>
 	    <ulink lang="ja">http://home.jp.freebsd.org/cgi-bin/showmail/announce-jp/1024</ulink>
 	  </advisory>
 	</day>
 
       </month>
 
       <month>
 	<name>7</name>
 
 	<day>
 	  <name>31</name>
 
 	  <advisory>
 	    <name>FreeBSD-SA-02:32.pppd</name>
 	    <ulink lang="ja">http://home.jp.freebsd.org/cgi-bin/showmail/announce-jp/1022</ulink>
 	  </advisory>
 	</day>
 
 	<day>
 	  <name>15</name>
 
 	  <advisory>
 	    <name>FreeBSD-SA-02:31.openssh</name>
 	  </advisory>
 	</day>
 
 	<day>
 	  <name>12</name>
 
 	  <advisory>
 	    <name>FreeBSD-SA-02:30.ktrace</name>
 	  </advisory>
 	  <advisory>
 	    <name>FreeBSD-SA-02:29.tcpdump</name>
 	  </advisory>
 	</day>
 
       </month>
 
       <month>
 	<name>6</name>
 
 	<day>
 	  <name>26</name>
 
 	  <advisory>
 	    <name>FreeBSD-SA-02:28.resolv</name>
 	  </advisory>
 	</day>
 
 	<day>
 	  <name>19</name>
 
 	  <advisory>
 	    <name>FreeBSD-SN-02:04</name>
 	  </advisory>
 	</day>
 
 	<day>
 	  <name>15</name>
 
 	  <release>
 	    <name>FreeBSD 4.6-RELEASE</name>
 	  </release>
 	</day>
       </month>
 
       <month>
 	<name>5</name>
 
 	<day>
 	  <name>29</name>
 
 	  <advisory>
 	    <name>FreeBSD-SA-02:27.rc</name>
 	  </advisory>
 	  <advisory>
 	    <name>FreeBSD-SA-02:26.accept</name>
 	  </advisory>
 	</day>
 
 	<day>
 	  <name>28</name>
 
 	  <advisory>
 	    <name>FreeBSD-SN-02:03</name>
 	  </advisory>
 	</day>
 
 	<day>
 	  <name>20</name>
 
 	  <advisory>
 	    <name>FreeBSD-SA-02:25.bzip2</name>
 	  </advisory>
 	  <advisory>
 	    <name>FreeBSD-SA-02:24.k5su</name>
 	  </advisory>
 	</day>
 
 	<day>
 	  <name>13</name>
 
 	  <advisory>
 	    <name>FreeBSD-SN-02:02</name>
 	  </advisory>
 	</day>
 
       </month>
 
       <month>
 	<name>4</name>
 
 	<day>
 	  <name>22</name>
 
 	  <advisory>
 	    <name>FreeBSD-SA-02:23.stdio</name>
 	    <ulink lang="ja">http://home.jp.freebsd.org/cgi-bin/showmail/announce-jp/1021</ulink>
 	  </advisory>
 	</day>
 
 	<day>
 	  <name>18</name>
 
 	  <advisory>
 	    <name>FreeBSD-SA-02:22.mmap</name>
 	  </advisory>
 	</day>
 
 	<day>
 	  <name>17</name>
 
 	  <advisory>
 	    <name>FreeBSD-SA-02:21.tcpip</name>
 	    <ulink lang="ja">http://home.jp.freebsd.org/cgi-bin/showmail/announce-jp/980</ulink>
 	  </advisory>
 	</day>
 
 	<day>
 	  <name>16</name>
 
 	  <advisory>
 	    <name>FreeBSD-SA-02:20.syncache</name>
 	    <ulink lang="ja">http://home.jp.freebsd.org/cgi-bin/showmail/announce-jp/979</ulink>
 	  </advisory>
 	</day>
 
       </month>
 
       <month>
 	<name>3</name>
 
 	<day>
 	  <name>30</name>
 
 	  <advisory>
 	    <name>FreeBSD-SN-02:01</name>
 	  </advisory>
 	</day>
 
 	<day>
 	  <name>26</name>
 
 	  <advisory>
 	    <name>FreeBSD-SA-02:19.squid</name>
 	    <ulink lang="ja">http://home.jp.freebsd.org/cgi-bin/showmail/announce-jp/960</ulink>
 	  </advisory>
 	</day>
 
 	<day>
 	  <name>18</name>
 
 	  <advisory>
 	    <name>FreeBSD-SA-02:18.zlib</name>
 	    <ulink lang="ja">http://home.jp.freebsd.org/cgi-bin/showmail/announce-jp/978</ulink>
 	  </advisory>
 	</day>
 
 	<day>
 	  <name>12</name>
 
 	  <advisory>
 	    <name>FreeBSD-SA-02:17.mod_frontpage</name>
 	    <ulink lang="ja">http://home.jp.freebsd.org/cgi-bin/showmail/announce-jp/954</ulink>
 	  </advisory>
 
 	  <advisory>
 	    <name>FreeBSD-SA-02:16.netscape</name>
 	    <ulink lang="ja">http://home.jp.freebsd.org/cgi-bin/showmail/announce-jp/953</ulink>
 	  </advisory>
 
 	  <advisory>
 	    <name>FreeBSD-SA-02:15.cyrus-sasl</name>
 	    <ulink lang="ja">http://home.jp.freebsd.org/cgi-bin/showmail/announce-jp/952</ulink>
 	  </advisory>
 
 	  <advisory>
 	    <name>FreeBSD-SA-02:14.pam-pgsql</name>
 	    <ulink lang="ja">http://home.jp.freebsd.org/cgi-bin/showmail/announce-jp/951</ulink>
 	  </advisory>
 	</day>
 
 	<day>
 	  <name>07</name>
 
 	  <advisory>
 	    <name>FreeBSD-SA-02:13.openssh</name>
 	    <ulink lang="ja">http://home.jp.freebsd.org/cgi-bin/showmail/announce-jp/945</ulink>
 	  </advisory>
 	</day>
 
       </month>
 
       <month>
 	<name>2</name>
 
 	<day>
 	  <name>21</name>
 
 	  <advisory>
 	    <name>FreeBSD-SA-02:12.squid</name>
 	    <ulink lang="ja">http://home.jp.freebsd.org/cgi-bin/showmail/announce-jp/938</ulink>
 	  </advisory>
 	</day>
 
 	<day>
 	  <name>12</name>
 
 	  <advisory>
 	    <name>FreeBSD-SA-02:11.snmp</name>
 	    <ulink lang="ja">http://home.jp.freebsd.org/cgi-bin/showmail/announce-jp/936</ulink>
 	  </advisory>
 	</day>
 
 	<day>
 	  <name>06</name>
 
 	  <advisory>
 	    <name>FreeBSD-SA-02:10.rsync</name>
 	    <ulink lang="ja">http://home.jp.freebsd.org/cgi-bin/showmail/announce-jp/928</ulink>
 	  </advisory>
 
 	  <advisory>
 	    <name>FreeBSD-SA-02:09.fstatfs</name>
 	    <ulink lang="ja">http://home.jp.freebsd.org/cgi-bin/showmail/announce-jp/927</ulink>
 	  </advisory>
 	</day>
 
       </month>
 
       <month>
 	<name>1</name>
 
 	<day>
 	  <name>29</name>
 
 	  <release>
 	    <name>FreeBSD 4.5-RELEASE</name>
 	  </release>
 	</day>
 
 	<day>
 	  <name>24</name>
 
 	  <advisory>
 	    <name>FreeBSD-SA-02:08.exec</name>
 	    <ulink lang="ja">http://home.jp.freebsd.org/cgi-bin/showmail/announce-jp/923</ulink>
 	  </advisory>
 	</day>
 
 	<day>
 	  <name>18</name>
 
 	  <advisory>
 	    <name>FreeBSD-SA-02:07.k5su</name>
 	    <ulink lang="ja">http://home.jp.freebsd.org/cgi-bin/showmail/announce-jp/912</ulink>
 	  </advisory>
 	</day>
 
 	<day>
 	  <name>16</name>
 
 	  <advisory>
 	    <name>FreeBSD-SA-02:06.sudo</name>
 	    <ulink lang="ja">http://home.jp.freebsd.org/cgi-bin/showmail/announce-jp/909</ulink>
 	  </advisory>
 	</day>
 
 	<day>
 	  <name>04</name>
 
 	  <advisory>
 	    <name>FreeBSD-SA-02:05.pine</name>
 	    <ulink lang="ja">http://home.jp.freebsd.org/cgi-bin/showmail/announce-jp/894</ulink>
 	  </advisory>
 
 	  <advisory>
 	    <name>FreeBSD-SA-02:04.mutt</name>
 	    <ulink lang="ja">http://home.jp.freebsd.org/cgi-bin/showmail/announce-jp/893</ulink>
 	  </advisory>
 
 	  <advisory>
 	    <name>FreeBSD-SA-02:03.mod_auth_pgsql</name>
 	    <ulink lang="ja">http://home.jp.freebsd.org/cgi-bin/showmail/announce-jp/892</ulink>
 	  </advisory>
 
 	  <advisory>
 	    <name>FreeBSD-SA-02:02.pw</name>
 	    <ulink lang="ja">http://home.jp.freebsd.org/cgi-bin/showmail/announce-jp/891</ulink>
 	  </advisory>
 
 	  <advisory>
 	    <name>FreeBSD-SA-02:01.pkg_add</name>
 	    <ulink lang="ja">http://home.jp.freebsd.org/cgi-bin/showmail/announce-jp/898</ulink>
 	  </advisory>
 	</day>
 
       </month>
 
     </year>
 
     <year>
       <name>2001</name>
 
       <month>
 	<name>12</name>
 
 	<day>
 	  <name>04</name>
 
 	  <advisory>
 	    <name>FreeBSD-SA-01:64.wu-ftpd</name>
 	    <ulink lang="ja">http://home.jp.freebsd.org/cgi-bin/showmail/announce-jp/870</ulink>
 	  </advisory>
 	</day>
 
 	<day>
 	  <name>02</name>
 
 	  <advisory>
 	    <name>FreeBSD-SA-01:63.openssh</name>
 	    <ulink lang="ja">http://home.jp.freebsd.org/cgi-bin/showmail/announce-jp/871</ulink>
 	  </advisory>
 	</day>
 
       </month>
 
       <month>
 	<name>10</name>
 
 	<day>
 	  <name>08</name>
 
 	  <advisory>
 	    <name>FreeBSD-SA-01:62.uucp</name>
 	  </advisory>
 
 	  <advisory>
 	    <name>FreeBSD-SA-01:61.squid</name>
 	  </advisory>
 	</day>
 
       </month>
 
       <month>
 	<name>9</name>
 
 	<day>
 	  <name>24</name>
 
 	  <advisory>
 	    <name>FreeBSD-SA-01:60.procmail</name>
 	  </advisory>
 	</day>
 
 	<day>
 	  <name>20</name>
 
 	  <release>
 	    <name>FreeBSD 4.4-RELEASE</name>
 	  </release>
 	</day>
 
 	<day>
 	  <name>04</name>
 
 	  <advisory>
 	    <name>FreeBSD-SA-01:59.rmuser</name>
 	  </advisory>
 	</day>
 
       </month>
 
       <month>
 	<name>8</name>
 
 	<day>
 	  <name>30</name>
 
 	  <advisory>
 	    <name>FreeBSD-SA-01:58.lpd</name>
 	  </advisory>
 	</day>
 
 	<day>
 	  <name>27</name>
 
 	  <advisory>
 	    <name>FreeBSD-SA-01:57.sendmail</name>
 	  </advisory>
 	</day>
 
 	<day>
 	  <name>23</name>
 
 	  <advisory>
 	    <name>FreeBSD-SA-01:56.tcp_wrappers</name>
 	  </advisory>
 	</day>
 
 	<day>
 	  <name>21</name>
 
 	  <advisory>
 	    <name>FreeBSD-SA-01:55.procfs</name>
 	  </advisory>
 	</day>
 
 	<day>
 	  <name>20</name>
 
 	  <advisory>
 	    <name>FreeBSD-SA-01:54.ports-telnetd</name>
 	  </advisory>
 	</day>
 
 	<day>
 	  <name>17</name>
 
 	  <advisory>
 	    <name>FreeBSD-SA-01:53.ipfw</name>
 	  </advisory>
 	</day>
 
 	<day>
 	  <name>06</name>
 
 	  <advisory>
 	    <name>FreeBSD-SA-01:52.fragment</name>
 	  </advisory>
 	</day>
 
       </month>
 
       <month>
 	<name>7</name>
 
 	<day>
 	  <name>30</name>
 
 	  <advisory>
 	    <name>FreeBSD-SA-01:51.openssl</name>
 	  </advisory>
 	</day>
 
 	<day>
 	  <name>27</name>
 
 	  <advisory>
 	    <name>FreeBSD-SA-01:50.windowmaker</name>
 	  </advisory>
 	</day>
 
 	<day>
 	  <name>23</name>
 
 	  <advisory>
 	    <name>FreeBSD-SA-01:49.telnetd</name>
 	  </advisory>
 	</day>
 
 	<day>
 	  <name>17</name>
 
 	  <advisory>
 	    <name>FreeBSD-SA-01:48.tcpdump</name>
 	  </advisory>
 	</day>
 
 	<day>
 	  <name>10</name>
 
 	  <advisory>
 	    <name>FreeBSD-SA-01:47.xinetd</name>
 	  </advisory>
 	  <advisory>
 	    <name>FreeBSD-SA-01:46.w3m</name>
 	  </advisory>
 	  <advisory>
 	    <name>FreeBSD-SA-01:45.samba</name>
 	  </advisory>
 	  <advisory>
 	    <name>FreeBSD-SA-01:44.gnupg</name>
 	  </advisory>
 	  <advisory>
 	    <name>FreeBSD-SA-01:43.fetchmail</name>
 	  </advisory>
 	  <advisory>
 	    <name>FreeBSD-SA-01:42.signal</name>
 	  </advisory>
 	</day>
 
 	<day>
 	  <name>09</name>
 
 	  <advisory>
 	    <name>FreeBSD-SA-01:41.hanterm</name>
 	  </advisory>
 	</day>
 
       </month>
 
       <month>
 	<name>6</name>
 
 	<day>
 	  <name>04</name>
 
 	  <advisory>
 	    <name>FreeBSD-SA-01:40.fts</name>
 	  </advisory>
 	</day>
 
       </month>
 
       <month>
 	<name>5</name>
 
 	<day>
 	  <name>02</name>
 
 	  <advisory>
 	    <name>FreeBSD-SA-01:39.tcp-isn</name>
 	  </advisory>
 	</day>
 
       </month>
 
       <month>
 	<name>4</name>
 
 	<day>
 	  <name>23</name>
 
 	  <advisory>
 	    <name>FreeBSD-SA-01:38.sudo</name>
 	  </advisory>
 	  <advisory>
 	    <name>FreeBSD-SA-01:37.slrn</name>
 	  </advisory>
 	  <advisory>
 	    <name>FreeBSD-SA-01:36.samba</name>
 	  </advisory>
 	  <advisory>
 	    <name>FreeBSD-SA-01:35.licq</name>
 	  </advisory>
 	  <advisory>
 	    <name>FreeBSD-SA-01:34.hylafax</name>
 	  </advisory>
 	</day>
 
 	<day>
 	  <name>20</name>
 
 	  <release>
 	    <name>FreeBSD 4.3-RELEASE</name>
 	  </release>
 	</day>
 
 	<day>
 	  <name>17</name>
 
 	  <advisory>
 	    <name>FreeBSD-SA-01:33.ftpd-glob</name>
 	  </advisory>
 	</day>
 
 	<day>
 	  <name>16</name>
 
 	  <advisory>
 	    <name>FreeBSD-SA-01:32.ipfilter</name>
 	  </advisory>
 	</day>
 
 	<day>
 	  <name>06</name>
 
 	  <advisory>
 	    <name>FreeBSD-SA-01:31.ntpd</name>
 	  </advisory>
 	</day>
 
       </month>
 
       <month>
 	<name>3</name>
 
 	<day>
 	  <name>22</name>
 
 	  <advisory>
 	    <name>FreeBSD-SA-01:30.ufs-ext2fs</name>
 	    <ulink lang="ja">http://home.jp.freebsd.org/cgi-bin/showmail/announce-jp/738</ulink>
 	  </advisory>
 	</day>
 
 	<day>
 	  <name>12</name>
 
 	  <advisory>
 	    <name>FreeBSD-SA-01:29.rwhod</name>
 	    <ulink lang="ja">http://home.jp.freebsd.org/cgi-bin/showmail/announce-jp/732</ulink>
 	  </advisory>
 
 	  <advisory>
 	    <name>FreeBSD-SA-01:28.timed</name>
 	    <ulink lang="ja">http://home.jp.freebsd.org/cgi-bin/showmail/announce-jp/731</ulink>
 	  </advisory>
 
 	  <advisory>
 	    <name>FreeBSD-SA-01:27.cfengine</name>
 	    <ulink lang="ja">http://home.jp.freebsd.org/cgi-bin/showmail/announce-jp/730</ulink>
 	  </advisory>
 
 	  <advisory>
 	    <name>FreeBSD-SA-01:26.interbase</name>
 	    <ulink lang="ja">http://home.jp.freebsd.org/cgi-bin/showmail/announce-jp/729</ulink>
 	  </advisory>
 
 	  <advisory>
 	    <name>FreeBSD-SA-01:23.icecast</name>
 	    <ulink lang="ja">http://home.jp.freebsd.org/cgi-bin/showmail/announce-jp/728</ulink>
 	  </advisory>
 	</day>
 
       </month>
 
       <month>
 	<name>2</name>
 
 	<day>
 	  <name>14</name>
 
 	  <advisory>
 	    <name>FreeBSD-SA-01:25.kerberosIV</name>
 	    <ulink lang="ja">http://home.jp.freebsd.org/cgi-bin/showmail/announce-jp/716</ulink>
 	  </advisory>
 	</day>
 
 	<day>
 	  <name>12</name>
 
 	  <advisory>
 	    <name>FreeBSD-SA-01:24.ssh</name>
 	    <ulink lang="ja">http://home.jp.freebsd.org/cgi-bin/showmail/announce-jp/715</ulink>
 	  </advisory>
 	</day>
 
 	<day>
 	  <name>07</name>
 
 	  <advisory>
 	    <name>FreeBSD-SA-01:22.dc20ctrl</name>
 	    <ulink lang="ja">http://home.jp.freebsd.org/cgi-bin/showmail/announce-jp/714</ulink>
 	  </advisory>
 
 	  <advisory>
 	    <name>FreeBSD-SA-01:21.ja-elvis</name>
 	    <ulink lang="ja">http://home.jp.freebsd.org/cgi-bin/showmail/announce-jp/713</ulink>
 	  </advisory>
 
 	  <advisory>
 	    <name>FreeBSD-SA-01:20.mars_nwe</name>
 	    <ulink lang="ja">http://home.jp.freebsd.org/cgi-bin/showmail/announce-jp/712</ulink>
 	  </advisory>
 
 	  <advisory>
 	    <name>FreeBSD-SA-01:19.ja-klock</name>
 	    <ulink lang="ja">http://home.jp.freebsd.org/cgi-bin/showmail/announce-jp/707</ulink>
 	  </advisory>
 	</day>
 
       </month>
 
       <month>
 	<name>1</name>
 
 	<day>
 	  <name>31</name>
 
 	  <advisory>
 	    <name>FreeBSD-SA-01:18.bind</name>
 	    <ulink lang="ja">http://home.jp.freebsd.org/cgi-bin/showmail/announce-jp/706</ulink>
 	  </advisory>
 	</day>
 
 	<day>
 	  <name>29</name>
 
 	  <advisory>
 	    <name>FreeBSD-SA-01:17.exmh</name>
 	    <ulink lang="ja">http://home.jp.freebsd.org/cgi-bin/showmail/announce-jp/705</ulink>
 	  </advisory>
 
 	  <advisory>
 	    <name>FreeBSD-SA-01:16.mysql</name>
 	    <ulink lang="ja">http://home.jp.freebsd.org/cgi-bin/showmail/announce-jp/704</ulink>
 	  </advisory>
 
 	  <advisory>
 	    <name>FreeBSD-SA-01:15.tinyproxy</name>
 	    <ulink lang="ja">http://home.jp.freebsd.org/cgi-bin/showmail/announce-jp/703</ulink>
 	  </advisory>
 
 	  <advisory>
 	    <name>FreeBSD-SA-01:14.micq</name>
 	    <ulink lang="ja">http://home.jp.freebsd.org/cgi-bin/showmail/announce-jp/702</ulink>
 	  </advisory>
 
 	  <advisory>
 	    <name>FreeBSD-SA-01:13.sort</name>
 	    <ulink lang="ja">http://home.jp.freebsd.org/cgi-bin/showmail/announce-jp/701</ulink>
 	  </advisory>
 
 	  <advisory>
 	    <name>FreeBSD-SA-01:12.periodic</name>
 	    <ulink lang="ja">http://home.jp.freebsd.org/cgi-bin/showmail/announce-jp/700</ulink>
 	  </advisory>
 
 	  <advisory>
 	    <name>FreeBSD-SA-01:11.inetd</name>
 	    <ulink lang="ja">http://home.jp.freebsd.org/cgi-bin/showmail/announce-jp/699</ulink>
 	  </advisory>
 	</day>
 
 	<day>
 	  <name>23</name>
 
 	  <advisory>
 	    <name>FreeBSD-SA-01:10.bind</name>
 	    <ulink lang="ja">http://home.jp.freebsd.org/cgi-bin/showmail/announce-jp/698</ulink>
 	  </advisory>
 
 	  <advisory>
 	    <name>FreeBSD-SA-01:09.crontab</name>
 	    <ulink lang="ja">http://home.jp.freebsd.org/cgi-bin/showmail/announce-jp/697</ulink>
 	  </advisory>
 
 	  <advisory>
 	    <name>FreeBSD-SA-01:08.ipfw</name>
 	    <ulink lang="ja">http://home.jp.freebsd.org/cgi-bin/showmail/announce-jp/696</ulink>
 	  </advisory>
 
 	  <advisory>
 	    <name>FreeBSD-SA-01:07.xfree86</name>
 	  </advisory>
 	</day>
 
 	<day>
 	  <name>15</name>
 
 	  <advisory>
 	    <name>FreeBSD-SA-01:06.zope</name>
 	    <ulink lang="ja">http://home.jp.freebsd.org/cgi-bin/showmail/announce-jp/669</ulink>
 	  </advisory>
 
 	  <advisory>
 	    <name>FreeBSD-SA-01:05.stunnel</name>
 	    <ulink lang="ja">http://home.jp.freebsd.org/cgi-bin/showmail/announce-jp/668</ulink>
 	  </advisory>
 
 	  <advisory>
 	    <name>FreeBSD-SA-01:04.joe</name>
 	    <ulink lang="ja">http://home.jp.freebsd.org/cgi-bin/showmail/announce-jp/667</ulink>
 	  </advisory>
 
 	  <advisory>
 	    <name>FreeBSD-SA-01:03.bash1</name>
 	    <ulink lang="ja">http://home.jp.freebsd.org/cgi-bin/showmail/announce-jp/666</ulink>
 	  </advisory>
 
 	  <advisory>
 	    <name>FreeBSD-SA-01:02.syslog-ng</name>
 	    <ulink lang="ja">http://home.jp.freebsd.org/cgi-bin/showmail/announce-jp/665</ulink>
 	  </advisory>
 
 	  <advisory>
 	    <name>FreeBSD-SA-01:01.openssh</name>
 	    <ulink lang="ja">http://home.jp.freebsd.org/cgi-bin/showmail/announce-jp/664</ulink>
 	  </advisory>
 	</day>
 
       </month>
 
     </year>
 
     <year>
       <name>2000</name>
 
       <month>
 	<name>12</name>
 
 	<day>
 	  <name>20</name>
 
 	  <advisory>
 	    <name>FreeBSD-SA-00:81.ethereal</name>
 	    <ulink lang="ja">http://home.jp.freebsd.org/cgi-bin/showmail/announce-jp/651</ulink>
 	  </advisory>
 
 	  <advisory>
 	    <name>FreeBSD-SA-00:80.halflifeserver</name>
 	    <ulink lang="ja">http://home.jp.freebsd.org/cgi-bin/showmail/announce-jp/650</ulink>
 	  </advisory>
 
 	  <advisory>
 	    <name>FreeBSD-SA-00:79.oops</name>
 	    <ulink lang="ja">http://home.jp.freebsd.org/cgi-bin/showmail/announce-jp/649</ulink>
 	  </advisory>
 
 	  <advisory>
 	    <name>FreeBSD-SA-00:78.bitchx</name>
 	    <ulink lang="ja">http://home.jp.freebsd.org/cgi-bin/showmail/announce-jp/648</ulink>
 	  </advisory>
 	</day>
 
 	<day>
 	  <name>18</name>
 
 	  <advisory>
 	    <name>FreeBSD-SA-00:77.procfs</name>
 	    <ulink lang="ja">http://home.jp.freebsd.org/cgi-bin/showmail/announce-jp/647</ulink>
 	  </advisory>
 	</day>
 
       </month>
 
       <month>
 	<name>11</name>
 
 	<day>
 	  <name>20</name>
 
 	  <advisory>
 	    <name>FreeBSD-SA-00:76.tcsh-csh</name>
 	    <ulink lang="ja">http://home.jp.freebsd.org/cgi-bin/showmail/announce-jp/628</ulink>
 	  </advisory>
 
 	  <advisory>
 	    <name>FreeBSD-SA-00:75.php</name>
 	    <ulink lang="ja">http://home.jp.freebsd.org/cgi-bin/showmail/announce-jp/627</ulink>
 	  </advisory>
 
 	  <advisory>
 	    <name>FreeBSD-SA-00:74.gaim</name>
 	  </advisory>
 
 	  <advisory>
 	    <name>FreeBSD-SA-00:73.thttpd</name>
 	    <ulink lang="ja">http://home.jp.freebsd.org/cgi-bin/showmail/announce-jp/626</ulink>
 	  </advisory>
 
 	  <advisory>
 	    <name>FreeBSD-SA-00:72.curl</name>
 	    <ulink lang="ja">http://home.jp.freebsd.org/cgi-bin/showmail/announce-jp/625</ulink>
 	  </advisory>
 
 	  <advisory>
 	    <name>FreeBSD-SA-00:71.mgetty</name>
 	    <ulink lang="ja">http://home.jp.freebsd.org/cgi-bin/showmail/announce-jp/624</ulink>
 	  </advisory>
 	</day>
 
 	<day>
 	  <name>14</name>
 
 	  <advisory>
 	    <name>FreeBSD-SA-00:70.ppp-nat</name>
 	    <ulink lang="ja">http://home.jp.freebsd.org/cgi-bin/showmail/announce-jp/623</ulink>
 	  </advisory>
 
 	  <advisory>
 	    <name>FreeBSD-SA-00:69.telnetd</name>
 	    <ulink lang="ja">http://home.jp.freebsd.org/cgi-bin/showmail/announce-jp/622</ulink>
 	  </advisory>
 	</day>
 
 	<day>
 	  <name>13</name>
 
 	  <advisory>
 	    <name>FreeBSD-SA-00:68.ncurses</name>
 	    <ulink lang="ja">http://home.jp.freebsd.org/cgi-bin/showmail/announce-jp/621</ulink>
 	  </advisory>
 	</day>
 
 	<day>
 	  <name>10</name>
 
 	  <advisory>
 	    <name>FreeBSD-SA-00:67.gnupg</name>
 	    <ulink lang="ja">http://home.jp.freebsd.org/cgi-bin/showmail/announce-jp/620</ulink>
 	  </advisory>
 	</day>
 
 	<day>
 	  <name>06</name>
 
 	  <advisory>
 	    <name>FreeBSD-SA-00:66.netscape</name>
 	    <ulink lang="ja">http://home.jp.freebsd.org/cgi-bin/showmail/announce-jp/619</ulink>
 	  </advisory>
 
 	  <advisory>
 	    <name>FreeBSD-SA-00:65.xfce</name>
 	    <ulink lang="ja">http://home.jp.freebsd.org/cgi-bin/showmail/announce-jp/618</ulink>
 	  </advisory>
 
 	  <advisory>
 	    <name>FreeBSD-SA-00:64.global</name>
 	    <ulink lang="ja">http://home.jp.freebsd.org/cgi-bin/showmail/announce-jp/617</ulink>
 	  </advisory>
 	</day>
 
 	<day>
 	  <name>01</name>
 
 	  <advisory>
 	    <name>FreeBSD-SA-00:63.getnameinfo</name>
 	    <ulink lang="ja">http://home.jp.freebsd.org/cgi-bin/showmail/announce-jp/589</ulink>
 	  </advisory>
 
 	  <advisory>
 	    <name>FreeBSD-SA-00:62.top</name>
 	    <ulink lang="ja">http://home.jp.freebsd.org/cgi-bin/showmail/announce-jp/616</ulink>
 	  </advisory>
 	</day>
 
       </month>
 
       <month>
 	<name>10</name>
 
 	<day>
 	  <name>31</name>
 
 	  <advisory>
 	    <name>FreeBSD-SA-00:61.tcpdump</name>
 	    <ulink lang="ja">http://home.jp.freebsd.org/cgi-bin/showmail/announce-jp/615</ulink>
 	  </advisory>
 	</day>
 
 	<day>
 	  <name>30</name>
 
 	  <advisory>
 	    <name>FreeBSD-SA-00:60.boa</name>
 	    <ulink lang="ja">http://home.jp.freebsd.org/cgi-bin/showmail/announce-jp/586</ulink>
 	  </advisory>
 
 	  <advisory>
 	    <name>FreeBSD-SA-00:59.pine</name>
 	    <ulink lang="ja">http://home.jp.freebsd.org/cgi-bin/showmail/announce-jp/585</ulink>
 	  </advisory>
 
 	  <advisory>
 	    <name>FreeBSD-SA-00:58.chpass</name>
 	    <ulink lang="ja">http://home.jp.freebsd.org/cgi-bin/showmail/announce-jp/584</ulink>
 	  </advisory>
 	</day>
 
 	<day>
 	  <name>13</name>
 
 	  <advisory>
 	    <name>FreeBSD-SA-00:57.muh</name>
 	    <ulink lang="ja">http://home.jp.freebsd.org/cgi-bin/showmail/announce-jp/570</ulink>
 	  </advisory>
 
 	  <advisory>
 	    <name>FreeBSD-SA-00:56.lprng</name>
 	    <ulink lang="ja">http://home.jp.freebsd.org/cgi-bin/showmail/announce-jp/569</ulink>
 	  </advisory>
 
 	  <advisory>
 	    <name>FreeBSD-SA-00:55.xpdf</name>
 	    <ulink lang="ja">http://home.jp.freebsd.org/cgi-bin/showmail/announce-jp/568</ulink>
 	  </advisory>
 
 	  <advisory>
 	    <name>FreeBSD-SA-00:54.fingerd</name>
 	    <ulink lang="ja">http://home.jp.freebsd.org/cgi-bin/showmail/announce-jp/567</ulink>
 	  </advisory>
 	</day>
 
 	<day>
 	  <name>06</name>
 
 	  <advisory>
 	    <name>FreeBSD-SA-00:52.tcp-iss</name>
 	    <ulink lang="ja">http://home.jp.freebsd.org/cgi-bin/showmail/announce-jp/561</ulink>
 	  </advisory>
 	</day>
 
       </month>
 
       <month>
 	<name>9</name>
 
 	<day>
 	  <name>27</name>
 
 	  <advisory>
 	    <name>FreeBSD-SA-00:53.catopen</name>
 	    <ulink lang="ja">http://home.jp.freebsd.org/cgi-bin/showmail/announce-jp/562</ulink>
 	  </advisory>
 	</day>
 
 	<day>
 	  <name>13</name>
 
 	  <advisory>
 	    <name>FreeBSD-SA-00:51.mailman</name>
 	    <ulink lang="ja">http://home.jp.freebsd.org/cgi-bin/showmail/announce-jp/550</ulink>
 	  </advisory>
 
 	  <advisory>
 	    <name>FreeBSD-SA-00:50.listmanager</name>
 	    <ulink lang="ja">http://home.jp.freebsd.org/cgi-bin/showmail/announce-jp/549</ulink>
 	  </advisory>
 
 	  <advisory>
 	    <name>FreeBSD-SA-00:49.eject</name>
 	    <ulink lang="ja">http://home.jp.freebsd.org/cgi-bin/showmail/announce-jp/548</ulink>
 	  </advisory>
 
 	  <advisory>
 	    <name>FreeBSD-SA-00:48.xchat</name>
 	    <ulink lang="ja">http://home.jp.freebsd.org/cgi-bin/showmail/announce-jp/547</ulink>
 	  </advisory>
 
 	  <advisory>
 	    <name>FreeBSD-SA-00:47.pine</name>
 	    <ulink lang="ja">http://home.jp.freebsd.org/cgi-bin/showmail/announce-jp/546</ulink>
 	  </advisory>
 
 	  <advisory>
 	    <name>FreeBSD-SA-00:46.screen</name>
 	    <ulink lang="ja">http://home.jp.freebsd.org/cgi-bin/showmail/announce-jp/545</ulink>
 	  </advisory>
 	</day>
 
       </month>
 
       <month>
 	<name>8</name>
 
 	<day>
 	  <name>31</name>
 
 	  <advisory>
 	    <name>FreeBSD-SA-00:45.esound</name>
 	    <ulink lang="ja">http://home.jp.freebsd.org/cgi-bin/showmail/announce-jp/526</ulink>
 	  </advisory>
 	</day>
 
 	<day>
 	  <name>28</name>
 
 	  <advisory>
 	    <name>FreeBSD-SA-00:44.xlock</name>
 	    <ulink lang="ja">http://home.jp.freebsd.org/cgi-bin/showmail/announce-jp/523</ulink>
 	  </advisory>
 
 	  <advisory>
 	    <name>FreeBSD-SA-00:43.brouted</name>
 	    <ulink lang="ja">http://home.jp.freebsd.org/cgi-bin/showmail/announce-jp/520</ulink>
 	  </advisory>
 
 	  <advisory>
 	    <name>FreeBSD-SA-00:42.linux</name>
 	    <ulink lang="ja">http://home.jp.freebsd.org/cgi-bin/showmail/announce-jp/530</ulink>
 	  </advisory>
 
 	  <advisory>
 	    <name>FreeBSD-SA-00:41.elf</name>
 	    <ulink lang="ja">http://home.jp.freebsd.org/cgi-bin/showmail/announce-jp/527</ulink>
 	  </advisory>
 
 	  <advisory>
 	    <name>FreeBSD-SA-00:40.mopd</name>
 	    <ulink lang="ja">http://home.jp.freebsd.org/cgi-bin/showmail/announce-jp/521</ulink>
 	  </advisory>
 
 	  <advisory>
 	    <name>FreeBSD-SA-00:39.netscape</name>
 	    <ulink lang="ja">http://home.jp.freebsd.org/cgi-bin/showmail/announce-jp/528</ulink>
 	  </advisory>
 	</day>
 
 	<day>
 	  <name>14</name>
 
 	  <advisory>
 	    <name>FreeBSD-SA-00:38.zope</name>
 	    <ulink lang="ja">http://home.jp.freebsd.org/cgi-bin/showmail/announce-jp/525</ulink>
 	  </advisory>
 
 	  <advisory>
 	    <name>FreeBSD-SA-00:37.cvsweb</name>
 	    <ulink lang="ja">http://home.jp.freebsd.org/cgi-bin/showmail/announce-jp/524</ulink>
 	  </advisory>
 
 	  <advisory>
 	    <name>FreeBSD-SA-00:36.ntop</name>
 	    <ulink lang="ja">http://home.jp.freebsd.org/cgi-bin/showmail/announce-jp/531</ulink>
 	  </advisory>
 
 	  <advisory>
 	    <name>FreeBSD-SA-00:35.proftpd</name>
 	    <ulink lang="ja">http://home.jp.freebsd.org/cgi-bin/showmail/announce-jp/522</ulink>
 	  </advisory>
 
 	  <advisory>
 	    <name>FreeBSD-SA-00:34.dhclient</name>
 	    <ulink lang="ja">http://home.jp.freebsd.org/cgi-bin/showmail/announce-jp/529</ulink>
 	  </advisory>
 	</day>
 
       </month>
 
       <month>
 	<name>7</name>
 
 	<day>
 	  <name>12</name>
 
 	  <advisory>
 	    <name>FreeBSD-SA-00:33.kerberosIV</name>
 	    <ulink lang="ja">http://home.jp.freebsd.org/cgi-bin/showmail/announce-jp/488</ulink>
 	  </advisory>
 	</day>
 
 	<day>
 	  <name>05</name>
 
 	  <advisory>
 	    <name>FreeBSD-SA-00:32.bitchx</name>
 	    <ulink lang="ja">http://home.jp.freebsd.org/cgi-bin/showmail/announce-jp/487</ulink>
 	  </advisory>
 
 	  <advisory>
 	    <name>FreeBSD-SA-00:31.canna</name>
 	    <ulink lang="ja">http://home.jp.freebsd.org/cgi-bin/showmail/announce-jp/486</ulink>
 	  </advisory>
 
 	  <advisory>
 	    <name>FreeBSD-SA-00:30.openssh</name>
 	    <ulink lang="ja">http://home.jp.freebsd.org/cgi-bin/showmail/announce-jp/485</ulink>
 	  </advisory>
 
 	  <advisory>
 	    <name>FreeBSD-SA-00:29.wu-ftpd</name>
 	    <ulink lang="ja">http://home.jp.freebsd.org/cgi-bin/showmail/announce-jp/489</ulink>
 	  </advisory>
 
 	  <advisory>
 	    <name>FreeBSD-SA-00:28.majordomo</name>
 	    <ulink lang="ja">http://home.jp.freebsd.org/cgi-bin/showmail/announce-jp/484</ulink>
 	  </advisory>
 
 	  <advisory>
 	    <name>FreeBSD-SA-00:27.XFree86-4</name>
 	    <ulink lang="ja">http://home.jp.freebsd.org/cgi-bin/showmail/announce-jp/483</ulink>
 	  </advisory>
 
 	  <advisory>
 	    <name>FreeBSD-SA-00:26.popper</name>
 	    <ulink lang="ja">http://home.jp.freebsd.org/cgi-bin/showmail/announce-jp/482</ulink>
 	  </advisory>
 
 	  <advisory>
 	    <name>FreeBSD-SA-00:24.libedit</name>
 	    <ulink lang="ja">http://home.jp.freebsd.org/cgi-bin/showmail/announce-jp/481</ulink>
 	  </advisory>
 	</day>
 
       </month>
 
       <month>
 	<name>6</name>
 
 	<day>
 	  <name>19</name>
 
 	  <advisory>
 	    <name>FreeBSD-SA-00:23.ip-options</name>
 	    <ulink lang="ja">http://home.jp.freebsd.org/cgi-bin/showmail/announce-jp/480</ulink>
 	  </advisory>
 	</day>
 
 	<day>
 	  <name>12</name>
 
 	  <advisory>
 	    <name>FreeBSD-SA-00:25.alpha-random</name>
 	    <ulink lang="ja">http://home.jp.freebsd.org/cgi-bin/showmail/announce-jp/473</ulink>
 	  </advisory>
 	</day>
 
 	<day>
 	  <name>07</name>
 
 	  <advisory>
 	    <name>FreeBSD-SA-00:22.apsfilter</name>
 	    <ulink lang="ja">http://home.jp.freebsd.org/cgi-bin/showmail/announce-jp/461</ulink>
 	  </advisory>
 
 	  <advisory>
 	    <name>FreeBSD-SA-00:21.ssh</name>
 	    <ulink lang="ja">http://home.jp.freebsd.org/cgi-bin/showmail/announce-jp/459</ulink>
 	  </advisory>
 	</day>
 
       </month>
 
       <month>
 	<name>5</name>
 
 	<day>
 	  <name>26</name>
 
 	  <advisory>
 	    <name>FreeBSD-SA-00:20.krb5</name>
 	    <ulink lang="ja">http://home.jp.freebsd.org/cgi-bin/showmail/announce-jp/452</ulink>
 	  </advisory>
 	</day>
 
 	<day>
 	  <name>23</name>
 
 	  <advisory>
 	    <name>FreeBSD-SA-00:19.semconfig</name>
 	    <ulink lang="ja">http://home.jp.freebsd.org/cgi-bin/showmail/announce-jp/451</ulink>
 	  </advisory>
 	</day>
 
 	<day>
 	  <name>09</name>
 
 	  <advisory>
 	    <name>FreeBSD-SA-00:18.gnapster.knapster</name>
 	    <ulink lang="ja">http://home.jp.freebsd.org/cgi-bin/showmail/announce-jp/429</ulink>
 	  </advisory>
 
 	  <advisory>
 	    <name>FreeBSD-SA-00:17.libmytinfo</name>
 	    <ulink lang="ja">http://home.jp.freebsd.org/cgi-bin/showmail/announce-jp/442</ulink>
 	  </advisory>
 
 	  <advisory>
 	    <name>FreeBSD-SA-00:16.golddig</name>
 	    <ulink lang="ja">http://home.jp.freebsd.org/cgi-bin/showmail/announce-jp/439</ulink>
 	  </advisory>
 	</day>
 
       </month>
 
       <month>
 	<name>4</name>
 
 	<day>
 	  <name>24</name>
 
 	  <advisory>
 	    <name>FreeBSD-SA-00:15.imap-uw</name>
 	    <ulink lang="ja">http://home.jp.freebsd.org/cgi-bin/showmail/announce-jp/438</ulink>
 	  </advisory>
 
 	  <advisory>
 	    <name>FreeBSD-SA-00:14.imap-uw</name>
 	    <ulink lang="ja">http://home.jp.freebsd.org/cgi-bin/showmail/announce-jp/441</ulink>
 	  </advisory>
 	</day>
 
 	<day>
 	  <name>19</name>
 
 	  <advisory>
 	    <name>FreeBSD-SA-00:13.generic-nqs</name>
 	    <ulink lang="ja">http://home.jp.freebsd.org/cgi-bin/showmail/announce-jp/437</ulink>
 	  </advisory>
 	</day>
 
 	<day>
 	  <name>10</name>
 
 	  <advisory>
 	    <name>FreeBSD-SA-00:12.healthd</name>
 	    <ulink lang="ja">http://home.jp.freebsd.org/cgi-bin/showmail/announce-jp/436</ulink>
 	  </advisory>
 
 	  <advisory>
 	    <name>FreeBSD-SA-00:11.ircii</name>
 	    <ulink lang="ja">http://home.jp.freebsd.org/cgi-bin/showmail/announce-jp/440</ulink>
 	  </advisory>
 	</day>
 
       </month>
 
       <month>
 	<name>3</name>
 
 	<day>
 	  <name>15</name>
 
 	  <advisory>
 	    <name>FreeBSD-SA-00:10.orville-write</name>
 	    <ulink lang="ja">http://home.jp.freebsd.org/cgi-bin/showmail/announce-jp/408</ulink>
 	  </advisory>
 
 	  <advisory>
 	    <name>FreeBSD-SA-00:09.mtr</name>
 	    <ulink lang="ja">http://home.jp.freebsd.org/cgi-bin/showmail/announce-jp/408</ulink>
 	  </advisory>
 
 	  <advisory>
 	    <name>FreeBSD-SA-00:08.lynx</name>
 	    <ulink lang="ja">http://home.jp.freebsd.org/cgi-bin/showmail/announce-jp/407</ulink>
 	  </advisory>
 
 	  <advisory>
 	    <name>FreeBSD-SA-00:07.mh</name>
 	    <ulink lang="ja">http://home.jp.freebsd.org/cgi-bin/showmail/announce-jp/411</ulink>
 	  </advisory>
 	</day>
 
 	<day>
 	  <name>01</name>
 
 	  <advisory>
 	    <name>FreeBSD-SA-00:06.htdig</name>
 	    <ulink lang="ja">http://home.jp.freebsd.org/cgi-bin/showmail/announce-jp/403</ulink>
 	  </advisory>
 	</day>
 
       </month>
 
       <month>
 	<name>2</name>
 
 	<day>
 	  <name>28</name>
 
 	  <advisory>
 	    <name>FreeBSD-SA-00:05.mysql</name>
 	    <ulink lang="ja">http://home.jp.freebsd.org/cgi-bin/showmail/announce-jp/402</ulink>
 	  </advisory>
 	</day>
 
 	<day>
 	  <name>19</name>
 
 	  <advisory>
 	    <name>FreeBSD-SA-00:04.delegate</name>
 	    <ulink lang="ja">http://home.jp.freebsd.org/cgi-bin/showmail/announce-jp/392</ulink>
 	  </advisory>
 
 	  <advisory>
 	    <name>FreeBSD-SA-00:03.asmon</name>
 	    <ulink lang="ja">http://home.jp.freebsd.org/cgi-bin/showmail/announce-jp/391</ulink>
 	  </advisory>
 	</day>
 
       </month>
 
       <month>
 	<name>1</name>
 
 	<day>
 	  <name>24</name>
 
 	  <advisory>
 	    <name>FreeBSD-SA-00:02.procfs</name>
 	    <ulink lang="ja">http://home.jp.freebsd.org/cgi-bin/showmail/announce-jp/380</ulink>
 	  </advisory>
 	</day>
 
 	<day>
 	  <name>19</name>
 
 	  <advisory>
 	    <name>FreeBSD-SA-00:01.make</name>
 	  </advisory>
 
 	</day>
 
       </month>
 
     </year>
 
     <year>
       <name>1999</name>
 
       <month>
 	<name>9</name>
 
 	<day>
 	  <name>16</name>
 
 	  <advisory>
 	    <name role="old">FreeBSD-SA-99:06.amd</name>
 	    <ulink lang="ja">http://home.jp.freebsd.org/cgi-bin/showmail/announce-jp/318</ulink>
 	  </advisory>
 	</day>
 
 	<day>
 	  <name>15</name>
 
 	  <advisory>
 	    <name role="old">FreeBSD-SA-99:05.fts</name>
 	    <ulink lang="ja">http://home.jp.freebsd.org/cgi-bin/showmail/announce-jp/313</ulink>
 	  </advisory>
 
 	  <advisory>
 	    <name role="old">FreeBSD-SA-99:04.core</name>
 	    <ulink lang="ja">http://home.jp.freebsd.org/cgi-bin/showmail/announce-jp/312</ulink>
 	  </advisory>
 	</day>
 
 	<day>
 	  <name>05</name>
 
 	  <advisory>
 	    <name role="old">FreeBSD-SA-99:03.ftpd</name>
 	    <ulink lang="ja">http://home.jp.freebsd.org/cgi-bin/showmail/announce-jp/311</ulink>
 	  </advisory>
 	</day>
 
 	<day>
 	  <name>04</name>
 
 	  <advisory>
 	    <name role="old">FreeBSD-SA-99:02.profil</name>
 	  </advisory>
 
 	  <advisory>
 	    <name role="old">FreeBSD-SA-99:01.chflags</name>
 	  </advisory>
 	</day>
 
       </month>
 
     </year>
 
     <year>
       <name>1998</name>
 
       <month>
 	<name>11</name>
 
 	<day>
 	  <name>04</name>
 
 	  <advisory>
 	    <name role="old">FreeBSD-SA-98:08.fragment</name>
 	  </advisory>
 	</day>
       </month>
 
       <month>
 	<name>10</name>
 
 	<day>
 	  <name>13</name>
 
 	  <advisory>
 	    <name role="old">FreeBSD-SA-98:07.rst</name>
 	  </advisory>
 	</day>
 
       </month>
 
       <month>
 	<name>6</name>
 
 	<day>
 	  <name>10</name>
 
 	  <advisory>
 	    <name role="old">FreeBSD-SA-98:06.icmp</name>
 	  </advisory>
 	</day>
 
 	<day>
 	  <name>04</name>
 
 	  <advisory>
 	    <name role="old">FreeBSD-SA-98:05.nfs</name>
 	  </advisory>
 	</day>
 
 	<day>
 	  <name>02</name>
 
 	  <advisory>
 	    <name role="old">FreeBSD-SA-98:04.mmap</name>
 	  </advisory>
 	</day>
 
       </month>
 
       <month>
 	<name>5</name>
 
 	<day>
 	  <name>14</name>
 
 	  <advisory>
 	    <name role="old">FreeBSD-SA-98:03.ttcp</name>
 	  </advisory>
 	</day>
 
       </month>
 
       <month>
 	<name>3</name>
 
 	<day>
 	  <name>12</name>
 
 	  <advisory>
 	    <name role="old">FreeBSD-SA-98:02.mmap</name>
 	  </advisory>
 	</day>
 
       </month>
 
     </year>
 
     <year>
       <name>1997</name>
 
       <month>
 	<name>12</name>
 
 	<day>
 	  <name>09</name>
 
 	  <advisory>
 	    <name role="old">FreeBSD-SA-97:06.f00f</name>
 	  </advisory>
 	</day>
 
 	<day>
 	  <name>01</name>
 
 	  <advisory>
 	    <name role="old">FreeBSD-SA-98:01.land</name>
 	  </advisory>
 	</day>
 
       </month>
 
       <month>
 	<name>10</name>
 
 	<day>
 	  <name>29</name>
 
 	  <advisory>
 	    <name role="old">FreeBSD-SA-97:05.open</name>
 	  </advisory>
 	</day>
 
       </month>
 
       <month>
 	<name>8</name>
 
 	<day>
 	  <name>19</name>
 
 	  <advisory>
 	    <name role="old">FreeBSD-SA-97:04.procfs</name>
 	  </advisory>
 	</day>
 
       </month>
 
       <month>
 	<name>4</name>
 
 	<day>
 	  <name>07</name>
 
 	  <advisory>
 	    <name role="old">FreeBSD-SA-97:03.sysinstall</name>
 	  </advisory>
 	</day>
 
       </month>
 
       <month>
 	<name>3</name>
 
 	<day>
 	  <name>26</name>
 
 	  <advisory>
 	    <name role="old">FreeBSD-SA-97:02.lpd</name>
 	  </advisory>
 	</day>
 
       </month>
 
       <month>
 	<name>2</name>
 
 	<day>
 	  <name>05</name>
 
 	  <advisory>
 	    <name role="old">FreeBSD-SA-97:01.setlocale</name>
 	  </advisory>
 
 	</day>
 
       </month>
 
       <month>
 	<name>1</name>
 
 	<day>
 	  <name>18</name>
 
 	  <advisory>
 	    <name role="old">FreeBSD-SA-96:21.talkd</name>
 	  </advisory>
 	</day>
 
       </month>
 
     </year>
 
     <year>
       <name>1996</name>
 
       <month>
 	<name>12</name>
 
 	<day>
 	  <name>16</name>
 
 	  <advisory>
 	    <name role="old">FreeBSD-SA-96:20.stack-overflow</name>
 	  </advisory>
 	</day>
 
 	<day>
 	  <name>10</name>
 
 	  <advisory>
 	    <name role="old">FreeBSD-SA-96:19.modstat</name>
 	  </advisory>
 	</day>
 
       </month>
 
       <month>
 	<name>11</name>
 
 	<day>
 	  <name>25</name>
 
 	  <advisory>
 	    <name role="old">FreeBSD-SA-96:18.lpr</name>
 	  </advisory>
 	</day>
 
       </month>
 
       <month>
 	<name>7</name>
 
 	<day>
 	  <name>16</name>
 
 	  <advisory>
 	    <name role="old">FreeBSD-SA-96:17.rzsz</name>
 	  </advisory>
 	</day>
 
 	<day>
 	  <name>12</name>
 
 	  <advisory>
 	    <name role="old">FreeBSD-SA-96:16.rdist</name>
 	  </advisory>
 	</day>
 
 	<day>
 	  <name>04</name>
 
 	  <advisory>
 	    <name role="old">FreeBSD-SA-96:15.ppp</name>
 	  </advisory>
 	</day>
 
       </month>
 
       <month>
 	<name>6</name>
 
 	<day>
 	  <name>28</name>
 
 	  <advisory>
 	    <name role="old">FreeBSD-SA-96:12.perl</name>
 	  </advisory>
 	</day>
 
 	<day>
 	  <name>24</name>
 
 	  <advisory>
 	    <name role="old">FreeBSD-SA-96:14.ipfw</name>
 	  </advisory>
 	</day>
 
 	<day>
 	  <name>05</name>
 
 	  <advisory>
 	    <name role="old">FreeBSD-SA-96:13.comsat</name>
 	  </advisory>
 	</day>
 
       </month>
 
       <month>
 	<name>5</name>
 
 	<day>
 	  <name>21</name>
 
 	  <advisory>
 	    <name role="old">FreeBSD-SA-96:11.man</name>
 	  </advisory>
 	</day>
 
 	<day>
 	  <name>17</name>
 
 	  <advisory>
 	    <name role="old">FreeBSD-SA-96:10.mount_union</name>
 	  </advisory>
 	  <advisory>
 	    <name role="old">FreeBSD-SA-96:09.vfsload</name>
 	  </advisory>
 	</day>
 
       </month>
 
       <month>
 	<name>4</name>
 
 	<day>
 	  <name>22</name>
 
 	  <advisory>
 	    <name role="old">FreeBSD-SA-96:02.apache</name>
 	  </advisory>
 	</day>
 
 	<day>
 	  <name>21</name>
 
 	  <advisory>
 	    <name role="old">FreeBSD-SA-96:08.syslog</name>
 	  </advisory>
 	  <advisory>
 	    <name role="old">FreeBSD-SA-96:01.sliplogin</name>
 	  </advisory>
 	</day>
 
 	<day>
 	  <name>20</name>
 
 	  <advisory>
 	    <name role="old">FreeBSD-SA-96:03.sendmail-suggestion</name>
 	  </advisory>
 	</day>
 
       </month>
     </year>
 
 </advisories>
Index: user/gjb/releng-rewrite/share/xml/commercial.hardware.xml
===================================================================
--- user/gjb/releng-rewrite/share/xml/commercial.hardware.xml	(revision 49724)
+++ user/gjb/releng-rewrite/share/xml/commercial.hardware.xml	(revision 49725)
@@ -1,805 +1,805 @@
 <?xml version="1.0"?>
 <!DOCTYPE entries PUBLIC "-//FreeBSD//DTD FreeBSD XML Database for Commercial Gallery//EN"
                          "http://www.FreeBSD.org/XML/share/xml/gallery.dtd">
 <!-- $FreeBSD$ -->
 
 <entries>
     <cvs:keyword xmlns:cvs="http://www.FreeBSD.org/XML/CVS">
       $FreeBSD$
     </cvs:keyword>
 
   <entry id="ABMX">
     <name>ABMX Servers</name>
     <url>http://www.abmx.com/</url>
     <description>
       ABMX based in California, offers custom-build Rackmount Servers
       optimized for FreeBSD.  We can custom build just about anything.
       If it can be configured, we will configure it.  Please contact our
       friendly engineers at 1-800-711-1788 or visit <a
       href="http://www.abmx.com/">http://www.abmx.com/</a>.
     </description>
   </entry>
 
   <entry id="ACNODES">
     <name>Acnodes Corporation</name>
     <url>http://www.acnodes.com/</url>
     <description>
       <p>Acnodes Corporation provides FreeBSD and Linux-based computer
 	for customers in the industrial control, automation industries
 	and the military.  Our rack mount computers, embedded systems
 	and Panel PCs are fully configurable and support FreeBSD, Linux
 	or any other operating system.</p>
 
       <p>Our product line includes <a
 	href="http://www.acnodes.com/Rackmount-computer.htm">Rackmount
 	computers</a> (1U to 4U rack-mount ready computers, standard ATX
 	or SBC systems), <a
 	href="http://www.acnodes.com/Panel-PC.htm">Panel PCs</a> (panel
 	mount ready touch screen computer), <a
 	href="http://www.acnodes.com/Fanless-embedded-microbox-system.htm">
 	Embedded system boxes</a> (fan less all-in-one computer integrated
 	into a rugged metal compact-size micro box), <a
 	href="http://www.acnodes.com/Monitor-keyboard-drawer.htm">Monitor
 	keyboard drawers</a> (space-saving 1U/2U control console, optional
 	for Cat6, IP KVM switch) and <a
 	href="http://www.acnodes.com/Rackmount-LCD-monitor.htm">Rackmount
 	LCD monitors</a> (rack-mount ready LCD monitors up to 20-inch).</p>
 
       <p>Our product line configurations are illustrated on our <a
 	href="http://www.acnodes.com">website</a>.  However, most of the
 	commercial and industrial computers are custom built to your
 	exact requirements.  <a
 	href="http://www.acnodes.com/zebpage_contactus.htm">Contact</a>
 	us via e-mail or telephone to discover how we can provide you
 	with the equipment you need for your specific needs.</p>
     </description>
   </entry>
 
   <entry id="ActiveWire">
     <name>ActiveWire Inc.</name>
     <url>http://www.ActiveWireInc.com/</url>
     <description>
       ActiveWire Inc. provides an extremely flexible, USB-based I/O board
       that connects to buttons, switches, and LEDs, providing a simple API
       to read and write to the I/O pins on the board. The USB port is
       supported in <a href="http://www.FreeBSD.org">FreeBSD 4.0</a>
       or later.  An additional EZ USB chip firmware downloader is
       available in the Ports Collection.
     </description>
   </entry>
 
   <entry id="ASA">
     <name>ASA Computers</name>
     <url>http://www.asacomputers.com/</url>
     <description>
       ASA Computers offers a wide range of performance-oriented servers,
       workstations, and networking products. We are experienced in quality
       configuration and support of FreeBSD, Linux, and other operating
       systems. Multiple-OS experience and knowledge are our strengths. We
       resell a variety of communication and networking products, including
       3COM, Cisco, Cyclades, DIGI, Livingston, and U.S. Robotics. Please
       take a look at the pre-configured systems on our web page. Contact us
       at <a href="mailto:unix@asacomputers.com">unix@asacomputers.com</a>
       to configure them your own way or if you have questions or comments.
     </description>
   </entry>
 
-  <entry id="aspensystemsdirect">
-    <name>Aspen Systems Direct</name>
-    <url>http://www.aspensystemsdirect.com/</url>
+  <entry id="aspensystems">
+    <name>Aspen Systems</name>
+    <url>http://www.aspsys.com/</url>
     <description>
       Aspen Systems is based out of Wheat Ridge, CO and has been in
       business for over 30 years offering customizable rackmount servers
       and workstations featuring FreeBSD and other open source operating
       systems.  We also provide custom turn-key High Performance Computing
       Clusters for government, universities, and corporations throughout
       the world.  Please contact a sales engineer today at <a
-      href="tel:8882271286">1-888-227-1286</a> or visit our <a
-      href="http://www.aspensystemsdirect.com">website</a> for more
+      href="tel:8009929242">1(800)992-9242</a> or visit our <a
+      href="http://www.aspsys.com">website</a> for more
       information.
     </description>
   </entry>
 
   <entry id="atto">
     <name>ATTO Technology</name>
     <url>http://www.attotech.com</url>
     <description>
       For over 25 years, ATTO Technology, Inc. has been a global leader in
       storage and network connectivity and infrastructure solutions for
       data-intensive computing environments. ATTO manufactures Host Bus
       Adapters, RAID adapters, network adapters, RAID storage controllers,
       Thunderbolt-enabled Desklink devices, bridges, switches and software.
       ATTO's Celerity 16Gb Fibre Channel adapters, ExpressSAS 12Gb SAS/SATA
       HBAs and SAN Storage Controllers all support &os; 9.3 and 10.x operating
       systems.
     </description>
   </entry>
 
   <entry id="catpipe">
     <name>catpipe Systems</name>
     <url>http://www.catpipe.net/</url>
     <description>
       catpipe Systems ApS provides managed services and support contracts
       for FreeBSD, implemented on rackmountable servers preloaded with
       FreeBSD.
     </description>
   </entry>
 
   <entry id="CoreSystems">
     <name>Core Systems</name>
     <url>http://www.coresystemsusa.com/</url>
     <description>
       Core Systems is the market leader in <a
       href="http://www.coresystemsusa.com/industrial-computers.php">rackmount
       computers</a> and <a
       href="http://www.coresystemsusa.com/industrial-lcd-displays.php">rackmount
       LCD displays</a> and supports multiple versions of FreeBSD.  We
       manufacture a complete line of <a
       href="http://www.coresystemsusa.com/rackmount-industrial-computer-chassis.php">
       industrial computer chassis</a>, <a
       href="http://www.coresystemsusa.com/industrial-single-board-computer.php">
       single board computer</a> and <a
       href="http://www.coresystemsusa.com/passive-backplanes.php">passive
       backplane</a> <a
       href="http://www.coresystemsusa.com/atx-eatx-systems.php">rackmount
       systems</a>.  We design and manufacture all of our 1U and 4U
       rack mounted systems in-house to maintain strict revision control over
       our entire product line.  Our systems engineering design and
       development staff is second to none in the rackmount industry.
       Please visit our <a href="http://www.coresystemsusa.com/">website</a>
       for further information.
     </description>
   </entry>
 
   <entry id="CoyotePointSystems">
     <name>Coyote Point Systems</name>
     <url>http://www.coyotepoint.com/</url>
     <description>
       Coyote Point Systems offers the <a
       href="http://www.coyotepoint.com/products.htm">Equalizer</a> Load
       Balancing Appliance. Equalizer distributes client UDP/TCP requests to
       multiple server machines and includes load balancing, server failure
       detection/correction, and an easy-to-use administrative interface.
       Capable of handling over 20,000 HTTP GET operations per minute,
       Equalizer enhances the Scalability, Availability and Manageability of
       any server cluster. Equalizer works with all standard protocols,
       including: HTTP, FTP, POP, SMTP, DNS, etc. Equalizer is based on the
       FreeBSD kernel.
     </description>
   </entry>
 
   <entry id="DAVICOM">
     <name>DAVICOM Semiconductor, Inc.</name>
     <url>http://www.davicom.com.tw/</url>
     <description>
       DAVICOM Semiconductor, Inc. designs, develops, and markets
       cost-effective integrated circuit (IC) solutions for mainstream
       networking and communications applications. DAVICOM is one of the
       leading suppliers of Local Area Network (LAN) and Wide Area Network
       (WAN) chip sets to international original equipment manufactures
       (OEMs) of networking and communications equipment. <p> The current
       products of DAVICOM Semiconductor, Inc. that will support the FreeBSD
       driver are DM9102 (10M/100M PCI Fast Ethernet single chip), DM9102A
       (3.3 volts Low Power10M/100M PCI Fast Ethernet single chip), DM9101
       (10M/100M PCI Fast Ethernet PHY chip, included into DM9102 single
       chip), DM9131 (3.3 volts Low Power10M/100M PCI Fast Ethernet PHY
       chip, included into DM9102A single chip) and DM9801 (1M8 Home PNA PHY
       chip). </p> <p> Please visit <a href="http://www.davicom.com.tw">our
       web site</a> for more information about our company. </p>
     </description>
   </entry>
 
   <entry id="EmergingTechnologies">
     <name>Emerging Technologies</name>
     <url>http://www.etinc.com/</url>
     <description>
       Emerging Technologies, Inc. has high-speed serial-communications
       adapters, allowing FreeBSD systems to connect directly to leased
       lines at speeds from 56k to T1/E1. ET drivers support up to 16 T1/E1
       lines on a single FreeBSD-based PC. The adapters include a complete
       set of drivers and utilities that allow a FreeBSD machine to
       communicate directly with virtually any IP router via synchronous
       PPP, Frame Relay, X.25, and directly to Cisco brand routers with
       Cisco serial encapsulation. Full documentation and support are
       included. Hardware choices are available for both ISA and PCI buses,
       ranging from an economical single-port ISA adapter to a four T1/E1
       port PCI card with four dedicated 25MHz processors on-board. To
       contact Emerging Technologies, send E-mail to <a
       href="mailto:info@etinc.com">info@etinc.com</a>.
     </description>
   </entry>
 
   <entry id="EMT">
     <name>EMT</name>
     <url>http://www.emt.co.jp/</url>
     <description>
       Based in Japan, EMT offers tailor-made Servers and Workstations
       optimized for FreeBSD.  We provide high-quality and high-reliable
       systems by carrying out a thorough examination and offer
       Hardware Warranty Support.  Please contact us via <a
       href="mailto:sales@emt.co.jp">email</a> or visit our <a
       href="http://www.emt.co.jp/">website</a>.
     </description>
   </entry>
 
   <entry id="EssenzConsulting">
     <name>Essenz Consulting</name>
     <url>http://www.essenz.com</url>
     <description>
       Essenz Consulting is a leading provider of high-performance rackmount
       server equipment. All of our <a
       href="http://www.essenz.com/servers/index.html">servers</a> feature
       dual processor capability, dual onboard networking, high-capacity
       memory support, and integrated video. From 1U Hot-Swap SCSI systems
       to 2U Hot-Swap 64-bit SCSI RAID with 2x300W Hot-Swap Power Supply,
       all Essenz Servers can be custom configured with immediate online
       pricing. For more information, visit us <a
       href="http://www.essenz.com">online</a> or call our 24/7 Sales and
       Support department at 1-800-248-1736.
     </description>
   </entry>
 
   <entry id="FreedomTechnologies">
     <name>Freedom Technologies</name>
     <url>http://www.freedomtc.com</url>
     <description>
       Freedom Technologies offers you a wide range of Premium Quality Servers
       in Rackmount and Tower configurations and, High-Performance Raid Systems.
       All our Servers will run FreeBSD out of the box (i386 and AMD/64).  We
       offer several <a
 	href="http://www.freedomtc.com/nebs3.php">NEBS Level-3 1U and 2U</a>
       Rackmount Servers with standard A.C. power or with -48 Volt D.C. Power.
       We offer several <a
 	href="http://www.freedomtc.com/short_depth_servers.php">short depth 1U
 	and 2U Rackmount Servers</a>.  You will find a good selection of
       External Direct and Network Attached <a
 	href="http://www.freedomtc.com/raid.php">RAID Enclosure Systems</a>
       from 8-Bay to 24-Bay.  Our focus is providing you with premium quality,
       trouble free Servers and RAID Storage Systems at best possible prices.
       <a href="http://www.freedomtc.com/">Visit us online</a> and get pricing
       instantly or call us toll-free 1.877.963.1900.
     </description>
   </entry>
 
   <entry id="Gallantry">
     <name>Gallantry Technologies, Inc.</name>
     <url>http://www.gallantry.com/</url>
     <description>
       Gallantry Technologies Inc. offers a business broadband gateway for
       small- to medium-sized businesses. Our products are focused on
       offering an easy-to-use product that provides multiple services
       routing, firewall, e-mail, web server, DHCP, NAT, FTP, DNS, and print
       server. All these features can be accessed via an easy-to-use web
       interface. The GallantWEB-100 is an affordable and easy-to-use
       business broadband gateway that is ideal for connecting small and
       medium offices to the Internet via any broadband connection including
       xDSL, Cable, Frame Relay/T1, or ISDN. The GallantWEB-200 is the
       industry's first business broadband gateway to include a built-in
       SDSL router. This innovative one-box solution makes it easy for DSL
       service providers to deploy and manage.
     </description>
   </entry>
 
   <entry id="GenstorSystems">
     <name>Genstor Systems, Inc.</name>
     <url>http://www.genstor.com/</url>
     <description>
       Genstor Systems specializes in systems customized for FreeBSD.  You
       will find Storage (like multi-TB storage using SATA disks) and
       Server options, built around quality hardware.  We also build
       clusters and provide OEM services for appliance integration.
       Genstor keeps abreast of drivers and bugs so you do not have to.
       We customize systems around Linux, and x86 Solaris as well.
       Contact us via email at
       <a href="mailto:sales@genstor.com">sales@genstor.com</a>
       or call us at (877)25-SERVERS and test our capabilities.
     </description>
   </entry>
 
   <entry id="GND">
     <name>GND Distribution, Ltd.</name>
     <url>http://www.gnd.com/</url>
     <description>
       GND Distribution, Ltd., a London, UK-based company, specializes in
       bespoke computer systems for FreeBSD and Linux. All GND computer
       systems are built to order, using only top-quality components. Our
       build quality is second to none. Systems are supplied configured and
       optimized to our customer's requirements. We also supply a large
       range of system components, including ASUSTeK mainboards, which are
       popular within the FreeBSD and Linux communities.
     </description>
   </entry>
 
   <entry id="Highpoint">
     <name>HighPoint Technologies</name>
     <url>http://www.highpoint-tech.com/</url>
     <description>
       HighPoint sells SATA RAID Controller products which are supported
       natively by FreeBSD 6.3 and 7.0.  Drivers for older versions of
       FreeBSD are available on their website.  HighPoint is specialized
       in providing SATA RAID solutions, including an Enterprise Series,
       Value Line Series and Upgrade Series of RAID controllers.  Their
       motto is "One Size Does Not Fit All".
     </description>
   </entry>
 
   <entry id="INetU">
     <name>INetU Dedicated Managed Hosting</name>
     <url>http://www.inetu.net/</url>
     <description>
       INetU Dedicated Managed Hosting are one of the top rated hosting
       firms focused on dedicated managed hosting, INetU provides managed
       dedicated FreeBSD servers, along with firewalls, load balancing,
       advanced monitoring and data backup services. They offer more free
       tech support than most other hosts and have a lucrative partner
       program for consultants and developers.
     </description>
   </entry>
 
   <entry id="IronSystems">
     <name>Iron Systems</name>
     <url>http://www.ironsystems.com/</url>
     <description>
       Iron Systems, located in San Jose, California, is a provider of
       high-density rack-mount Internet systems, low cost hosting solutions
       and OEM integration services. System solutions are either
       built-to-order iServers with custom-configured hardware, OS, kernel
       and applications; or a set of pre-configured network infrastructure
       iEngines and iClusters, specially designed to deliver a dedicated
       application. Iron Systems backs all solutions with world-class
       technical support for FreeBSD and Linux. Our team at an average
       has over 10 years of experience in building BSD-based systems. We
       understand that our servers run your mission-critical applications -
       that's why we use only the highest quality components and test all
       systems in advance. We are confident that you will appreciate our
       approach. Give us an opportunity to serve you! Please send us email
       at <a href="mailto:info@ironsystems.com">info@ironsystems.com</a> or
       call 1-800-921-IRON.
     </description>
   </entry>
 
   <entry id="ItautecPhilco">
     <name>Itautec Philco</name>
     <url>http://www.itautec.com.br/</url>
     <description>
       Itautec Philco is one of Brazil's leading IT products manufacturers
       and one the leaders in the Brazilian Market and significant market
       share in Portugal, Uruguay and Argentina. Products such as the
       Infoway and the InfoServer are fully compatible with FreeBSD, Linux,
       and other Operating Systems. Itautec Philco also manufactures Banking
       and Retail Automation products, as well as Consumer Electronics
       products. We provide complete solutions for our customers, from
       Infrastructure (such as LAN) to software applications, to Web
       development and hosting services, to call-center services.
     </description>
   </entry>
 
   <entry id="KYTEX">
     <name>KYTEX Computers Ltd</name>
     <url>http://www.kytex.bg/</url>
     <description>
       KYTEX Computers Ltd offers K-SERVER family of pre-installed xBSD and
       Linux Internet appliances. K-SERVER product line include small
       footprint all-in-one solutions for small to middle networks and
       rackmount servers for ISP/ASP and corporate networks. All-in-one
       solutions provides Internet access via dial-up, leased lines, xDSL,
       wireless technology and offer filesharing for Windows and MacOS
       workstations across the network at no additional cost, users WEB-,
       Mail-, Firewall-, DNS-server applications started and partially
       configured for easy integration in any existing networks. K-SERVER
       setup and management is very simple - just start any browser on your
       workstation and follow the setup instructions and menus. If you have
       any questions or proposals, please e-mail us.
     </description>
   </entry>
 
   <entry id="MOXA">
     <name>MOXA</name>
     <url>http://www.moxa.com/</url>
     <description>
       MOXA makes attractively priced multi-port serial cards which are
       compatible with FreeBSD's <em>sio</em> serial driver. The C104 / C168
       family of 2/4/8 serial port cards features custom ASIC design, speeds
       up to 921.6Kbps, surge protection, independent and
       software-configurable I/O ports and IRQs.
     </description>
   </entry>
 
   <entry id="Netgate">
     <name>Netgate</name>
     <url>http://store.netgate.com/</url>
     <description>
       Netgate is a high quality communications appliance manufacturer
       that designs highly configurable computers engineered for
       low-power, high-throughput, dependable deployments.  We offer
       quick deployment with off-the-shelf systems, specialized custom
       product solutions and an end-to-end OEM service program for
       large customers.
 
       <p>Netgate directly supports Open Source software and Open
 	Source hardware projects by providing management, engineering
 	and support resources for the pfSense project.</p>
     </description>
   </entry>
 
   <entry id="NetWolves">
     <name>NetWolves Corporation</name>
     <url>http://www.netwolves.com</url>
     <description>
       NetWolves Corporation produces the FoxBox line of Multi-services
       Internet Communications Gateway systems. These Internet Access
       Devices offer a three stage firewall, unlimited e-mail, site hosting,
       filtered browsing, web and DNS caching, DHCP for ease of set up, file
       sharing/serving, e-mail archiving, and a series of productivity
       enhancing reports - cost effectively. The FoxBox OS is based on
       FreeBSD. Bandwidth options range from V.90 modems to T-1, cable
       modems, and DSL speeds. The FoxBox provides Internet access for
       between 8 and 1000 users on one or more LANs and is available
       internationally through our VAR reseller network. Visit <a
       href="http://www.netwolves.com/">our site</a> for more information or
       contact us by <a href="mailto:sales@netwolves.com">email</a>.
     </description>
   </entry>
 
   <entry id="iXsystems">
     <name>iXsystems</name>
     <url>http://www.iXsystems.com/</url>
     <description>
       iXsystems (formerly OffMyServer) provides FreeBSD and Linux-based
       Internet infrastructure-grade rackmount servers, network appliances,
       enterprise blade servers, and storage products to a global market.
       We use only the best quality components and do the required testing
       in advance - knowing that you are going to run your mission-critical
       applications on our servers.  We are confident that you will appreciate
       our approach - give us an opportunity to server you!  Send us an email
       at <a href="mailto:info@iXsystems.com">info@iXsystems.com</a>.
     </description>
   </entry>
 
   <entry id="OrbitMicro">
     <name>Orbit Micro</name>
     <url>http://www.orbitmicro.com/</url>
     <description>
       Orbit Micro is a system integrator of servers, workstations,
       industrial computers and networking products.  Our application
       design approach allows us to maximize performance for your
       computing needs.  Our products line also includes a vareity of
       computer components and peripherals as well as software.  Contact
       us at <a href="mailto:sales@orbitmicro.com">
 	sales@orbitmicro.com</a> to speak to a sales engineer or if you
       have questions or comments.
     </description>
   </entry>
 
   <entry id="PCW">
     <name>PCW Microsystems, Inc.</name>
     <url>http://www.rackmount.com/</url>
     <description>
       PCW Microsystems, Inc. offers rackmount workstations and servers,
       optimized for the FreeBSD operating system. We carry full line of
       rackmount chassis, RAID, WAN, and LAN products for FreeBSD OS. Please
       <a href="http://www.rackmount.com/">visit our web site</a> for more
       information or send us an e-mail at <a
       href="mailto:sales@pcwnet.com">sales@pcwnet.com</a>
     </description>
   </entry>
 
   <entry id="PSSCLabs">
     <name>PSSC Labs</name>
     <url>http://www.pssclabs.com/</url>
     <description>
       PSSC Labs provides custom configured computer solutions to meet any
       budget or specification. Visit our website to build your computer
       just the way you want it, including hard-drive partitioning and
       operating system setup.
     </description>
   </entry>
 
   <entry id="psychsoftpc">
     <name>Psychsoftpc</name>
     <url>http://www.psychsoftpc.com/</url>
     <description>
       Psychsoftpc is a manufacturer of high performance computers,
       workstations and clusters with Linux or FreeBSD preinstalled upon
       request.
     </description>
   </entry>
 
   <entry id="RandDAssociates">
     <name>R and D Associates, Inc.</name>
     <url>http://www.RnDAssociates.com/</url>
     <description>
       R and D Associates, Inc. developed ServeTheWeb.com utilizing FreeBSD
       running Apache. We employed consulting services from <a
       href="mailto:phk@FreeBSD.org">Poul-Henning Kamp</a> to develop our
       Virtual Server solution (which is now available in <a
       href="http://www.FreeBSD.org">FreeBSD</a> 4.0). <p> <a
       href="http://ServeTheWeb.com/">ServeTheWeb.com</a> is our System
       Admin level of Virtual Servers. Please visit <a
       href="http://www.ServeTheWeb.com/">www.ServeTheWeb.com</a> for
       additional information on this product. </p> <p> R and D Associates,
       Inc. is an application development firm, specializing in
       client/server designs. We use FreeBSD, running Apache and utilizing
       PHP's and MySQL (As well as NT with ASP's and SQL/Access). </p>
     </description>
   </entry>
 
   <entry id="PerleSpecialix">
     <name>Perle Specialix</name>
     <url>http://www.perle.com/</url>
     <description>
       Perle Specialix makes a wide variety of multi-port async serial
       expansion products. The ISA, EISA, and PCI SI/XIO host cards work
       under FreeBSD, using the <em>si</em> driver.
     </description>
   </entry>
 
   <entry id="Stallion">
     <name>Stallion Technologies, Inc.</name>
     <url>http://www.stallion.com/</url>
     <description>
       Stallion Technologies, Inc. offers a range of multiport serial boards
       for the ISA, EISA, MCA and PCI buses. Although Stallion does not
       officially support drivers for FreeBSD, there is an unsupported,
       freely available driver available from their <a
       href="ftp://ftp.stallion.com/drivers/unsupported/FreeBSD/stalbsd-2.0.0.tar.gz">FTP site</a>.
       This driver supports the Stallion
       <em>EasyIO</em>, <em>EasyConnection 8/32</em> and
       <em>EasyConnection 8/64</em> PCI range of multiport boards.
       For local pricing and availability information, contact Stallion
       via their <a href="http://www.stallion.com/">WWW page</a>.
     </description>
   </entry>
 
   <entry id="StoreAnyWhere">
     <name>StoreAnyWhere.com</name>
     <url>http://StoreAnyWhere.com/</url>
     <description>
       StoreAnyWhere.com offers a wide range of high-performance and
       cost-effective quad- and dual-processor servers, workstations, and
       networking products with FreeBSD and Linux as their operating
       systems. Just go to our website for servers in a variety of
       configurations or custom-made systems.
     </description>
   </entry>
 
   <entry id="SWTechnology">
     <name>SW Technology</name>
     <url>http://freebsd.swt.com/</url>
     <description>
       SW Technology offers quality Pentium machines with FreeBSD
       pre-installed.
     </description>
   </entry>
 
   <entry id="Synetic">
     <name>Synetic, Inc.</name>
     <url>http://www.synetic.net/</url>
     <description>
       Synetic Inc. is a Canadian and North American distributor for
       IDE-to-IDE, SCSI-to-IDE and SCSI-to-SCSI RAID controllers, supporting
       the FreeBSD platform. Our products can be found at <a
       href="http://www.synetic.net/prodman.htm">www.synetic.net/prodman.htm</a>
       or <a href="http://www.synetic.net/prodspec.htm">
       www.synetic.net/prodspec.htm</a>
     </description>
   </entry>
 
   <entry id="Zantech">
     <name>Zantech KVM Australia</name>
     <url>http://www.zantech.com.au/</url>
     <description>
       Zantech KVM Australia is an Australian distributor of FreeBSD
       compatible KVM switches, KVM over IP products and serial console
       terminal servers.
     </description>
   </entry>
 
   <entry id="Znyx">
     <name>Znyx</name>
     <url>http://www.znyx.com/</url>
     <description>
       Znyx Corporation specializes in high-availability, high-performance,
       single and multi-channel Fast Ethernet adapters for PCI, CompactPCI,
       and PCI Mezzanine Connector (PMC). FreeBSD, Linux, QNX, NetWare,
       OS/2, and SCO Unixware are supported on virtually all products.
     </description>
   </entry>
 
   <entry id="NCSTechnologies">
     <name>NCS Technologies</name>
     <url>http://www.ncst.com/</url>
     <description>
       NCS Technologies offers "NCS Swift Appliance Partner Program
       (NCSAPP)" for Independent Software Vendors (ISVs) and other OEMs.
       Under this program, NCS develops "turn-key" server appliances for its
       ISV partners by bundling their appliance software with its own
       hardware platforms. These appliance hardware platforms are built
       using the latest industry standard chipsets and components and can
       run FreeBSD based applications.
     </description>
   </entry>
 
   <entry id="ColoMachine">
     <name>ColoMachine</name>
     <url>http://www.colomachine.com/</url>
     <description>
       ColoMachine offers high quality sub-$500 1U rackmount servers
       optimized for the FreeBSD operating system.
     </description>
   </entry>
 
   <entry id="rackmountnet">
     <name>RackmountNet</name>
     <url>http://www.rackmountnet.com/</url>
     <description>
       RackmountNet offers a full line of 1U, 2U, 3U, 4U, 5U, 7U 19"
       rackmount chassis and servers for industrial mission critical
       applications.
     </description>
   </entry>
 
   <entry id="eracks">
     <name>eRacks Open Source Systems</name>
     <url>http://eracks.com/</url>
     <description>
       eRacks Open Source Systems is a leading provider of open source
       solutions. The company manufactures rackmount computer servers,
       specializes in custom-designed systems, and
       offers a wide array of services including open source enterprise
       migration, security, and network architecture design. eRacks
       offers a full range of open source operating systems configured
       on its systems, including FreeBSD. For more information, contact
       eRacks at <a href="mailto:info@eracks.com">info@eracks.com</a>.
     </description>
   </entry>
 
   <entry id="pyramidusa">
     <name>Pyramid computer</name>
     <url>http://www.pyramid-usa.com</url>
     <description>
       Pyramid Computer is a leading supplier of custom branded appliance
       solutions to ISVs and OEMs.  We will enable you to deliver an
       appliance solution that meets your exact needs.  We offer a
       complete range of design, manufacturing and logistics services
       that allow you to effortlessly deliver a superior product to
       customers on a world wide basis, and focus your attention on core
       business activities.  We are experts in FreeBSD, as well as Linux
       based appliances.  Most of all, Pyramid Computer is a service
       oriented supplier.  We distinguish ourselves by our ability to
       craft programs to the unique needs of your business, and to meet
       your expectations in all our endeavors.  Please contact us to
       learn more about how we can help you to achieve your business
       objectives.
     </description>
   </entry>
 
   <entry id="rackmountmart">
     <name>Synergy Global Inc</name>
     <url>http://www.rackmountmart.com</url>
     <description>
       We are a FreeBSD and Linux Rackmount LCD Monitor keyboard Drawer,
       Rackmount chassis, server manufacturer and distributor.
     </description>
   </entry>
 
   <entry id="42u">
     <name>42U</name>
     <url>http://www.42u.com/</url>
     <description>
       42U is specialized in providing remote access solutions including
       FreeBSD compatible serial console servers, KVM switches, KVM over
       IP products, remote power reboot, and environmental monitoring.
       For more information, contact <a href="mailto:info@42u.com">
 	info@42u.com</a> or visit <a href="http://www.42u.com/">
 	www.42u.com</a>.
     </description>
   </entry>
 
   <entry id="kvmonline">
     <name>KVM Switches Online</name>
     <url>http://www.kvm-switches-online.com</url>
     <description>
       KVM Switches Online is a leading provider of server room
       solutions featuring server management &amp; server space
       optimization solutions utilizing FreeBSD compatible serial
       console servers and KVM switching products.  For more
       information, contact <a
 	href="mailto:info@kvm-switches-online.com">
 	info@kvm-switches-online.com</a> or visit <a
 	href="http://www.kvm-switches-online.com">
 	www.kvm-switches-online.com</a>.
     </description>
   </entry>
 
   <entry id="serverrack">
     <name>Server Racks Online</name>
     <url>http://www.server-rack-online.com</url>
     <description>
       Server Racks Online computer rack superstore.  At Server Racks
       Online we also allow you to easily configure our computer racks,
       server cabinets, and accessories to suit your exact requirements
       and your FreeBSD needs.  Server Rack Online strives to provide a
       wide selection of server rack products and accessories for every
       solution. For more information, contact
       <a href="mailto:infor@server-rack-online.com?subject=FreeBSD Site">
         info@server-rack-online.com</a> or visit
       <a href="http://www.server-rack-online.com">
         www.server-rack-online.com</a>
     </description>
   </entry>
 
   <entry id="ChassisPlans">
     <name>Chassis Plans Rackmount Systems</name>
     <url>http://www.chassis-plans.com</url>
     <description>
       <p>Chassis Plans is a recognized leader in manufacturing fully configured
 	turn-key industrial <a
 	  href="http://www.chassis-plans.com">rackmount systems</a> that support
 	FreeBSD for the industrial, rugged, and military markets.  We manufacture
 	1U to 6U ATX and <a
 	  href="http://www.chassis-plans.com/single_board_computers.html">Single Board Computer systems</a>
 	tailored exactly to customer application requirements.  We also
 	manufacture a full line of industrial <a
 	  href="http://www.chassis-plans.com/rackmount_keyboards.html">rackmount LCD keyboard drawers</a>
 	and <a
 	  href="http://www.chassis-plans.com/rackmount_keyboards.html">panel mount LCD monitors.</a></p>
 
       <p>Chassis Plans specializes in long-life product support offering
 	unmatched in-house custom chassis design, long-life industrial
 	motherboards and SBC's with strict revision control and material
 	obsolescence management for trouble free program deployment.  Key
 	military customers include companies such as L3, Lockheed, and Northrop
 	Grumman.  Notable commercial customers include Siemens, Nikon, and
 	General Electric. Chassis Plans' Systems are Engineered to
 	Perform!&#8482;</p>
 
       <p>Our knowledgable sales engineers can be reached at 858-571-4330
 	(California, United States) or at <a
 	  href="mailto:saleseng@chassisplans.com">saleseng@chassis-plans.com</a>.</p>
     </description>
   </entry>
 
   <entry id="servaris">
     <name>Servaris Corporation</name>
     <url>http://www.servaris.com</url>
     <description>
       <p>Servaris builds Premium Rack Mount, <a
 	href="http://www.servaris.com/blade_servers.php" title="Blade
 	Servers	with Fail-over and Clustering">Blade Servers</a> and <a
 	href="http://www.servaris.com/tower_servers.php" title="Tower
 	Servers">Tower Servers</a> as well as <a
 	href="http://www.servaris.com/raid.php" title="RAID Storage
 	Subsystems">RAID Storage</a> Subsystems.</p>
 
       <p>Servaris ProServ <a
 	href="http://www.servaris.com/1u_rack_server.php" title="FreeBSD
 	1U Rack Servers">1U Rack Servers</a> and ProServ <a
 	href="http://www.servaris.com/2u-rack-server.php" title="FreeBSD
 	2U Rack Servers"> 2U Rack Servers</a> and 4U <a
 	href="http://www.servaris.com/servers_4680.php" title="Quad
 	Six-Core Rack Server">High Performance Computing Server</a> are
 	all FreeBSD compatible.  Almost all the ProServ Servers have
 	lights-out remote management via java enabled web browser.
 	Servaris will pre-install FreeBSD AMD/64 or i386 with a Generic
 	or fully customized FreeBSD installation.  Servaris <a
 	href="http://www.servaris.com/blade_servers.php" title="Blade
 	Servers	by Servaris">Blade Servers</a> are an 'all in one'
 	clustering and fail-over solution with complete remote management
 	via any java enabled web browser and feature Intel's latest 5500
 	Quad Core Xeon Processors.  <a
 	href="http://www.servaris.com/raid.php" title="iStor RAID Storage
 	Systems"> Servaris iStor RAID Storage</a> Subsystems are 4GB/8GB
 	Fibre to SAS/SATA and are available in 12-Bay, 16-Bay and 24-Bay
 	Chassis.  asily expandable, simple to maintain and completely
 	manageable via web browser.</p>
 
       <p>Servaris has friendly staff that can answer your questions.
 	Please give Servaris a call at 1.877.963.1900 or <a
 	href="http://www.servaris.com/contact.php">contact them from
 	here</a>.  Servaris will provide you with Superior Quality
 	Servers and RAID Systems with excellent Warranties at
 	reasonable prices:  "Servaris, Excellence through Passion."</p>
     </description>
   </entry>
 </entries>
Index: user/gjb/releng-rewrite/share/xml/events2016.xml
===================================================================
--- user/gjb/releng-rewrite/share/xml/events2016.xml	(revision 49724)
+++ user/gjb/releng-rewrite/share/xml/events2016.xml	(revision 49725)
@@ -1,340 +1,364 @@
 <?xml version="1.0"?>
 
 <!DOCTYPE events PUBLIC
   "-//FreeBSD//DTD FreeBSD XML Database for Events//EN"
   "http://www.FreeBSD.org/XML/share/xml/events.dtd">
 
 <!--
     Events which might be interesting for FreeBSD users.
 
     Sort events by start date, with more recent events earlier
     in the file.
 -->
 
 <events>
     <cvs:keyword xmlns:cvs="http://www.FreeBSD.org/XML/CVS">
       $FreeBSD$
     </cvs:keyword>
 
+  <event id="gandi-tw-2016">
+    <name>Building Products with FreeBSD</name>
+    <url>http://freebsd.kktix.cc/events/gnn-talk-2016</url>
+    <startdate>
+      <year>2016</year>
+      <month>12</month>
+      <day>11</day>
+    </startdate>
+    <enddate>
+      <year>2016</year>
+      <month>12</month>
+      <day>11</day>
+    </enddate>
+    <location>
+      <country code="TW">Taiwan</country>
+      <city>Taipei</city>
+      <site>Gandi Asia Co. Ltd</site>
+    </location>
+
+    <description>George Neville-Neil will be giving a talk entitled
+      "Building Products with FreeBSD". In addition he will introduce the
+      FreeBSD community and FreeBSD Foundation.</description>
+  </event>
+
   <event id="lisa-2016">
     <name>Usenix LISA 2016</name>
     <url>https://www.usenix.org/conference/lisa16</url>
     <startdate>
       <year>2016</year>
       <month>12</month>
       <day>4</day>
     </startdate>
     <enddate>
       <year>2016</year>
       <month>12</month>
       <day>9</day>
     </enddate>
     <location>
       <country code="US">United States</country>
       <city>Boston, MA</city>
       <site>Sheraton Boston Hotel</site>
     </location>
 
     <description>USENIX’s Large Installation System Administration
       (LISA) conference&mdash;now in its 30th year&mdash;is the
       premier conference for IT operations, where systems engineers,
       operations professionals, and academic researchers share
       real-world knowledge about designing, building, and maintaining
       the critical systems of our interconnected world.</description>
   </event>
 
   <event id="meetbsd-2016">
     <name>MeetBSD 2016</name>
     <url>https://www.meetbsd.com/</url>
     <startdate>
       <year>2016</year>
       <month>11</month>
       <day>11</day>
     </startdate>
     <enddate>
       <year>2016</year>
       <month>11</month>
       <day>12</day>
     </enddate>
     <location>
       <country code="US">United States</country>
       <city>Berkeley, CA</city>
       <site>Clark Kerr Campus, UC Berkeley</site>
     </location>
 
     <description>MeetBSD 2016 is a mixed unConference format featuring
       both scheduled talks and community-driven events such as
       birds-of-a-feather meetings, breakout sessions, lightning talks,
       and speed geeking sessions.</description>
   </event>
 
   <event id="ohiolinuxfest-2016">
     <name>Ohio Linux Fest 2016</name>
     <url>https://ohiolinux.org/</url>
     <startdate>
       <year>2016</year>
       <month>10</month>
       <day>7</day>
     </startdate>
     <enddate>
       <year>2016</year>
       <month>10</month>
       <day>8</day>
     </enddate>
     <location>
       <country code="US">United States</country>
       <city>Columbus, OH</city>
       <site>Hyatt Regency</site>
     </location>
 
     <description>The Ohio LinuxFest is a grassroots conference for the
       GNU/Linux/Open Source Software/Free Software community that
       started in 2003 as a large inter-LUG (Linux User Group) meeting
       and has grown steadily since.  It is a place for the community
       to gather and share information about Linux and Open Source
       Software.  A large expo area adjacent to the conference rooms
       will feature exhibits from our sponsors as well as a large
       .org section from non-profit Open Source/Free Software
       projects.</description>
   </event>
 
   <event id="openzfs-2016">
     <name>OpenZFS Developers Summit 2016</name>
     <url>http://open-zfs.org/wiki/OpenZFS_Developer_Summit_2016</url>
     <startdate>
       <year>2016</year>
       <month>9</month>
       <day>26</day>
     </startdate>
     <enddate>
       <year>2016</year>
       <month>9</month>
       <day>27</day>
     </enddate>
     <location>
       <country code="US">United States</country>
       <city>San Francisco, CA</city>
       <site>Children's Creativity Museum</site>
     </location>
 
     <description>The goal of the event is to foster cross-community
       discussions of OpenZFS work and to make progress on some of the
       projects we have proposed.  This 2-day event consisted of 1 day
       of presentation and a 1-day hackathon.  The call for papers is
       open until August 1, 2016.</description>
   </event>
 
   <event id="eurobsdcon-2016">
     <name>EuroBSDcon 2016</name>
     <url>http://2016.eurobsdcon.org/</url>
     <startdate>
       <year>2016</year>
       <month>9</month>
       <day>22</day>
     </startdate>
     <enddate>
       <year>2016</year>
       <month>9</month>
       <day>25</day>
     </enddate>
     <location>
       <country code="RS">Serbia</country>
       <city>Belgrade</city>
       <site>Radisson Blu Old Mill Hotel</site>
     </location>
 
     <description>EuroBSDcon is the premier European conference on the
       open source BSD operating systems attracting about 250 highly
       skilled engineering professionals, software developers, computer
       science students and professors, and users from all over Europe
       and other parts of the world.  The goal of EuroBSDcon is to
       exchange knowledge about the BSD operating systems, facilitate
       coordination and cooperation among users and
       developers.</description>
   </event>
 
   <event id="texaslinuxfest-2016">
     <name>Texas Linux Fest 2016</name>
     <url>http://2016.texaslinuxfest.org/</url>
     <startdate>
       <year>2016</year>
       <month>7</month>
       <day>8</day>
     </startdate>
     <enddate>
       <year>2016</year>
       <month>7</month>
       <day>9</day>
     </enddate>
     <location>
       <country code="US">United States</country>
       <city>San Marcos, TX</city>
       <site>Austin Convention Center</site>
     </location>
 
     <description>Texas Linux Fest is an open source software event for
       Texas and the surrounding region.  It includes two days of
       general sessions and vendor sessions with two full days of
       expo floor.  Texas Linux Fest is for the business and home
       user, and for the experienced developer and newcomer
       alike.</description>
   </event>
 
   <event id="bsdcan-2016">
     <name>BSDCan 2016</name>
     <url>http://www.bsdcan.org/2016/</url>
     <startdate>
       <year>2016</year>
       <month>6</month>
       <day>8</day>
     </startdate>
     <enddate>
       <year>2016</year>
       <month>6</month>
       <day>11</day>
     </enddate>
     <location>
       <country code="CA">Canada</country>
       <city>Ottawa</city>
       <site>University of Ottawa</site>
     </location>
     <description>BSDCan is a technical conference for people working
       on and with BSD operating systems and related projects.  It is
       a conference for users and developers with a strong focus on
       emerging technologies, research projects, and works in progress.
       It also features Userland infrastructure projects and invites
       contributions from both free software developers and those
       from commercial vendors.  BSDCan is followed immediately by
       PGCon at the same location.</description>
   </event>
 
   <event id="asiabsdcon-2016">
     <name>AsiaBSDCon 2016</name>
     <url>http://2016.asiabsdcon.org/</url>
     <startdate>
       <year>2016</year>
       <month>3</month>
       <day>10</day>
     </startdate>
     <enddate>
       <year>2016</year>
       <month>3</month>
       <day>13</day>
     </enddate>
     <location>
       <country code="JP">Japan</country>
       <city>Tokyo</city>
       <site>Tokyo University of Science</site>
     </location>
     <description>AsiaBSDCon is a conference for users and developers
       on BSD based systems.  The conference is for anyone developing,
       deploying and using systems based on &os;, NetBSD, OpenBSD,
       DragonFlyBSD, Darwin and MacOS X.  AsiaBSDCon is a technical
       conference and aims to collect the best technical papers and
       presentations available to ensure that the latest developments
       in our open source community are shared with the widest
       possible audience.
     </description>
   </event>
 
   <event id="fosdem-2016">
     <name>Fosdem 2016</name>
     <url>https://fosdem.org/2016/</url>
     <startdate>
       <year>2016</year>
       <month>1</month>
       <day>30</day>
     </startdate>
     <enddate>
       <year>2016</year>
       <month>1</month>
       <day>31</day>
     </enddate>
     <location>
       <country code="BE">Belgium</country>
       <city>Brussels</city>
       <site>ULB Campus Solbosch</site>
     </location>
     <description>FOSDEM is a free event for software developers to
       meet, share ideas and attend interesting talks and presentations
       on various topics by project leaders and committers.  The BSDs
       will be there, you can visit us during the two days in our
       booth, try to pass the <a
 	href="https://fosdem.org/2016/schedule/event/cert_bsdcg/">BSDCG
 	Exam</a> on Saturday, and come to the
       <a href="https://fosdem.org/2016/schedule/track/bsd/">BSD
 	devroom</a> on Sunday to attend talks about your favorite
       BSDs.</description>
   </event>
 
   <event id="mckusick-kernel-2016">
     <name>FreeBSD Kernel Internals: An Intensive Code
       Walkthrough</name>
     <url>https://www.mckusick.com/courses/adveveclass.html</url>
     <startdate>
       <year>2016</year>
       <month>1</month>
       <day>21</day>
     </startdate>
     <enddate>
       <year>2016</year>
       <month>5</month>
       <day>12</day>
     </enddate>
     <location>
       <country code="US">United States</country>
       <city>Berkeley</city>
       <site>Hillside Club</site>
     </location>
     <description>Marshall Kirk McKusick will be teaching his course
       &quot;FreeBSD Kernel Internals: An Intensive Code
       Walkthrough&quot; on Thursday evenings in Berkeley California
       beginning January 21, 2016.  The class will be held at the
       historic <a href="http://www.hillsideclub.org/">Hillside
 	Club</a> at 2286 Cedar Street, Berkeley, CA 94709 just three
       blocks north of the Berkeley campus once per week from 6:30PM
       to 10:00PM starting Thursday January 21st and finishing on
       Thursday May 12th.  You can sign up for the class at <a
 	href="https://www.mckusick.com/courses/advclassform.html">https://www.mckusick.com/courses/advclassform.html</a>.
       Those not living in the Bay Area that would like to take the
       class remotely can sign up for a subscription to receive the
       classes week-by-week as they are recorded.</description>
   </event>
 
   <event id="scale">
     <name>SCaLE 14x: The Southern California Linux Expo</name>
     <url>https://www.socallinuxexpo.org</url>
     <startdate>
       <year>2016</year>
       <month>1</month>
       <day>21</day>
     </startdate>
     <enddate>
       <year>2016</year>
       <month>1</month>
       <day>24</day>
     </enddate>
     <location>
       <country code="US">United States</country>
       <city>Pasadena</city>
       <site>Pasadena Convention Center</site>
     </location>
     <description>
       Now celebrating its 14th year, the Southern California Linux
       Expo SCALE 14X is the largest Linux and Open Source Software
       show in North America.  The four-day event -- from Jan 21-24,
       2016, at the Pasadena Convention Center -- attracts top speakers
       and exhibitors from all over North America.  Sessions and
       workshops range from beginner tutorials to seminars for
       experienced system administrators or software developers.  In
       addition, specialty seminars prior to the weekend are conducted
       by various groups in the Free and Open Source Software
       community.  While Linux is in our name, we tend to have a fair
       amount of BSD content including booths from the FreeBSD
       Foundation and the FreeBSD project.  This year will also include
       onsite BSDA exams.  For more information, or to register, visit
       <a
 	href="https://www.socallinuxexpo.org">https://www.socallinuxexpo.org</a>.
     </description>
   </event>
 </events>
Index: user/gjb/releng-rewrite/share/xml/libcommon.xsl
===================================================================
--- user/gjb/releng-rewrite/share/xml/libcommon.xsl	(revision 49724)
+++ user/gjb/releng-rewrite/share/xml/libcommon.xsl	(revision 49725)
@@ -1,1705 +1,1705 @@
 <?xml version="1.0" encoding="iso-8859-1" ?>
 <!DOCTYPE xsl:stylesheet PUBLIC "-//FreeBSD//DTD FreeBSD XSLT 1.0 DTD//EN"
 				"http://www.FreeBSD.org/XML/share/xml/xslt10-freebsd.dtd">
 <!-- $FreeBSD$ -->
 
 <xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
   version="1.0"
   xmlns:cvs="http://www.FreeBSD.org/XML/CVS"
   xmlns:date="http://exslt.org/dates-and-times"
   xmlns:str="http://exslt.org/strings"
   extension-element-prefixes="date str"
   exclude-result-prefixes="date cvs">
 
   <xsl:import href="./transtable-common.xsl" />
 
   <xsl:variable name="svnKeyword">
     <xsl:value-of select="normalize-space(//cvs:keyword[1])"/>
   </xsl:variable>
 
   <xsl:variable name="date">
     <xsl:value-of select="str:split($svnKeyword, ' ')[4]"/>
   </xsl:variable>
 
   <!-- default format for date string -->
   <xsl:param name="param-l10n-date-format-YMD"
              select="'%Y-%M-%D'" />
   <xsl:param name="param-l10n-date-format-YM"
              select="'%M %Y'" />
   <xsl:param name="param-l10n-date-format-MD"
              select="'%D %M'" />
   <xsl:param name="param-l10n-date-format-rfc822"
              select="'%W, %D %m %Y 00:00:00 PST'" />
 
   <xsl:variable name="curdate.year" select="date:year()"/>
   <xsl:variable name="curdate.month" select="date:month-in-year()"/>
   <xsl:variable name="curdate.day" select="date:day-in-month()"/>
 
   <!--
      Used to copy HTML chunks to the output.
   -->
   <xsl:template match="*" mode="copy.html">
     <xsl:element name="{local-name()}" namespace="http://www.w3.org/1999/xhtml">
       <xsl:copy-of select="attribute::*"/>
       <xsl:apply-templates select="child::node()" mode="copy.html"/>
     </xsl:element>
   </xsl:template>
 
   <!--
      template name                               used in
 
      html-usergroups-map			 templates.usergroups.xsl
      html-usergroups-list-regions                templates.usergroups.xsl
      html-usergroups-list-entries                templates.usergroups.xsl
      html-usergroups-list-header                 templates.usergroups.xsl (for l10n)
 
      html-news-list-newsflash-preface            templates.newsflash.xsl (for l10n)
      html-news-list-newsflash                    templates.newsflash.xsl
      html-news-list-press                        templates.press.xsl
      html-news-list-datelabel                    templates.newsflash.xsl
      html-news-generate-anchor                   templates.newsflash.xsl
      html-news-make-olditems-list                templates.newsflash.xsl (for l10n)
      html-news-list-newsflash-homelink           templates.newsflash.xsl (for l10n)
 
      html-news-list-press-preface                templates.press.xsl (for l10n)
      html-news-list-press                        templates.press.xsl
 
      html-events-map			 	 templates.events.xsl (for l10n)
      html-events-list-preface                    templates.events.xsl (for l10n)
      html-events-list-upcoming-heading           templates.events.xsl (for l10n)
      html-events-list-past-heading               templates.events.xsl (for l10n)
 
      html-list-advisories                        security/mkindex.xsl
      html-list-advisories-putitems               security/mkindex.xsl
      html-list-advisories-release-label          security/mkindex.xsl (for l10n)
      rdf-security-advisories                     security/security-rdf.xsl
      rdf-security-advisories-title               security/security-rdf.xsl (for l10n)
      rdf-security-advisories-items               security/security-rdf.xsl
 
      rss-security-advisories                     security/security-rss.xsl
      rss-security-advisories-title               security/security-rss.xsl (for l10n)
      rss-security-advisories-items               security/security-rss.xsl
 
      rss-errata-notices				 security/errata-rss.xsl
      rss-errata-notices-title			 security/errata-rss.xsl (for l10n)
      rss-errata-notices-items			 security/errata-rss.xsl
 
      html-index-advisories-items                   index.xsl
      html-index-advisories-items-lastmodified      index.xsl (for i10n)
      html-index-news-project-items                 index.xsl
      html-index-news-project-items-lastmodified    index.xsl (for i10n)
      html-index-news-press-items                   index.xsl
      html-index-news-press-items-lastmodified      index.xsl (for i10n)
      html-index-events-items                       index.xsl
      html-index-mirrors-options-list               index.xsl
 
      misc-format-date-string                     generic
      calculate-dow                               generic
 
      gen-long-en-month                           templates.events.xsl
      gen-short-en-month                          templates.news-rss.xsl
      gen-date-interval                           templates.events.xsl
      generate-event-anchor                       templates.events.xsl
 
      generate-story-anchor                       templates.press.xsl
 
   -->
 
   <!-- template: "html-usergroups-list-regions"
        list all regions in a usergroup database -->
 
   <xsl:key name="html-usergroups-regions-key" match="entry" use="../../@name" />
   <xsl:key name="html-usergroups-id-key" match="entry" use="@id" />
 
   <xsl:template name="html-usergroups-map">
     <xsl:param name="mapurl" select="'none'" />
 
     <img>
       <xsl:attribute name="src">
         <xsl:value-of select="$mapurl" />
       </xsl:attribute>
     </img>
   </xsl:template>
 
   <xsl:template name="html-usergroups-list-regions">
     <xsl:param name="usergroups.xml" select="'usergroups.xml'" />
 
     <ul>
       <xsl:for-each select="document($usergroups.xml)//continent">
       <xsl:sort select="format-number(count(country/entry), '000')"
       		order="descending"/>
 
 	<xsl:variable name="id" select="
 	  translate(@name,
 	  ' ,ABCDEFGHIJKLMNOPQRSTUVWXYZ',
 	  '--abcdefghijklmnopqrstuvwxyz')" />
 
 	<li>
 	  <p><xsl:element name="a">
 	      <xsl:attribute name="href">
 		<xsl:value-of select="concat('#', $id)" />
 	      </xsl:attribute>
 
 	      <xsl:call-template name="transtable-lookup">
 		<xsl:with-param name="word-group" select="'continents'" />
 		<xsl:with-param name="word" select="@name" />
 	      </xsl:call-template>
 	    </xsl:element>
 	    ( <xsl:value-of select="count(country/entry)" /> user groups )</p>
 	</li>
       </xsl:for-each>
     </ul>
   </xsl:template>
 
   <!-- template: "html-usergroups-list-entries"
        list all entries in a usergroup database -->
 
   <xsl:template name="html-usergroups-list-entries">
     <xsl:param name="usergroups.xml" select="'usergroups.xml'" />
     <xsl:param name="usergroups-local.xml" select="'usergroups-local.xml'" />
 
     <xsl:for-each select="document($usergroups.xml)//continent">
       <xsl:sort select="format-number(count(country/entry), '000')"
       		order="descending"/>
 
       <xsl:variable name="continent" select="@name" />
       <xsl:variable name="continent-lc" select="
 	translate(@name,
 	' ,ABCDEFGHIJKLMNOPQRSTUVWXYZ',
 	'--abcdefghijklmnopqrstuvwxyz')" />
 
       <h3><a name="{$continent-lc}" id="{$continent-lc}">
 	  <xsl:call-template name="transtable-lookup">
 	    <xsl:with-param name="word-group" select="'continents'" />
 	    <xsl:with-param name="word" select="$continent" />
 	  </xsl:call-template></a></h3>
 
       <dl>
         <xsl:for-each select="country/entry">
 
 	  <xsl:variable name="id"><xsl:value-of select="@id" /></xsl:variable>
 
 	  <xsl:variable name="name">
 	    <xsl:for-each select="document($usergroups-local.xml)">
 	      <xsl:choose>
 		<!-- $p[count(.|$q) = count($q)] means product set of $p and $q-->
 		<xsl:when test="
 		  key('html-usergroups-regions-key', string($continent))
 		  [count(.|key('html-usergroups-id-key', string($id)))
 		  = count(key('html-usergroups-id-key', string($id)))]
 		  ">
 		  <xsl:copy-of select="
 		    key('html-usergroups-regions-key', string($continent))
 		    [count(.|key('html-usergroups-id-key', string($id)))
 		    = count(key('html-usergroups-id-key', string($id)))]/name/node()
 		    " />
 		</xsl:when>
 		<xsl:otherwise>
 		  <xsl:for-each select="document($usergroups.xml)">
 		    <xsl:copy-of select="key('html-usergroups-id-key', string($id))/name/node()" />
 		  </xsl:for-each>
 		</xsl:otherwise>
 	      </xsl:choose>
 	    </xsl:for-each>
 	  </xsl:variable>
 
 	  <xsl:variable name="desc">
 	    <xsl:for-each select="document($usergroups-local.xml)">
 	      <xsl:choose>
 		<!-- $p[count(.|$q) = count($q)] means product set of $p and $q-->
 		<xsl:when test="
 		  key('html-usergroups-regions-key', string($continent))
 		  [count(.|key('html-usergroups-id-key', string($id)))
 		  = count(key('html-usergroups-id-key', string($id)))]
 		  ">
 		  <xsl:apply-templates select="
 		    key('html-usergroups-regions-key', string($continent))
 		    [count(.|key('html-usergroups-id-key', string($id)))
 		    = count(key('html-usergroups-id-key', string($id)))]/description/node()
 		    " mode="copy.html"/>
 		</xsl:when>
 		<xsl:otherwise>
 		  <xsl:for-each select="document($usergroups.xml)">
 		    <xsl:apply-templates select="key('html-usergroups-id-key', string($id))/description/node()" mode="copy.html"/>
 		  </xsl:for-each>
 		</xsl:otherwise>
 	      </xsl:choose>
 	    </xsl:for-each>
 	  </xsl:variable>
 
 	  <dt><a name="{$continent-lc}-{$id}" href="{url}"><xsl:copy-of select="$name" /></a></dt>
 
 	  <dd><p><xsl:copy-of select="$desc" /></p></dd>
 	</xsl:for-each>
       </dl>
     </xsl:for-each>
   </xsl:template>
 
   <!-- template: "html-usergroups-list-header"
        print header part of usergroup listing (l10n) -->
 
   <xsl:template name="html-usergroups-list-header">
     <p>FreeBSD's widespread popularity has spawned a number of user groups
       around the world.</p>
     <p>If you know of a FreeBSD user group not listed here,
       please fill out a <a href="https://www.FreeBSD.org/support/bugreports.html">
 	problem report</a> in category Documentation->Website with the following information:</p>
     <ol>
       <li>A URL for the user group's website.</li>
       <li>An email contact address of a human in charge,
          for use by our visitors and website administrators.</li>
       <li>A short (one paragraph) description of the user group.</li>
     </ol>
 
     <p>Submissions should be in HTML. In keeping with the spirit of
       FreeBSD, we prefer user groups that are active and which conduct
       their business in public.  If there is no local group,
       <a
       href="http://bsd.meetup.com/">http://bsd.meetup.com/</a> can
       be used to locate interested individuals near by.  Consider
       forming your own user group!</p>
 
     <h3>Regions:</h3>
   </xsl:template>
 
   <!-- template: "calculate-dow"
        calculate the RFC822 day of the week for a given
        date between 1/1/2000 and 12/31/2099 -->
 
   <xsl:template name="calculate-dow">
     <xsl:param name="year" select="'none'" />
     <xsl:param name="month" select="'none'" />
     <xsl:param name="day" select="'none'" />
 
     <!-- whether the current year is a leap year -->
     <xsl:variable name="leap">
       <xsl:choose>
         <xsl:when test="(number($year) mod 4)=0">1</xsl:when>
         <xsl:otherwise>0</xsl:otherwise>
       </xsl:choose>
     </xsl:variable>
 
     <!-- number of days since Jan 1 of the current year -->
     <xsl:variable name="daysthisyear">
       <xsl:choose>
         <xsl:when test="$month=1"><xsl:value-of select="number($day)"/></xsl:when>
         <xsl:when test="$month=2"><xsl:value-of select="31 + number($day)"/></xsl:when>
         <xsl:when test="$month=3"><xsl:value-of select="59 + $leap + number($day)"/></xsl:when>
         <xsl:when test="$month=4"><xsl:value-of select="90 + $leap + number($day)"/></xsl:when>
         <xsl:when test="$month=5"><xsl:value-of select="120 + $leap + number($day)"/></xsl:when>
         <xsl:when test="$month=6"><xsl:value-of select="151 + $leap + number($day)"/></xsl:when>
         <xsl:when test="$month=7"><xsl:value-of select="181 + $leap + number($day)"/></xsl:when>
         <xsl:when test="$month=8"><xsl:value-of select="212 + $leap + number($day)"/></xsl:when>
         <xsl:when test="$month=9"><xsl:value-of select="243 + $leap + number($day)"/></xsl:when>
         <xsl:when test="$month=10"><xsl:value-of select="273 + $leap + number($day)"/></xsl:when>
         <xsl:when test="$month=11"><xsl:value-of select="304 + $leap + number($day)"/></xsl:when>
         <xsl:when test="$month=12"><xsl:value-of select="334 + $leap + number($day)"/></xsl:when>
 	<xsl:otherwise><xsl:value-of select="number(0)"/></xsl:otherwise>
       </xsl:choose>
     </xsl:variable>
 
     <!-- number of leap years prior to current year (after 2000). -->
     <xsl:variable name="leapyears" select="floor((number($year + 3) - 2000) div 4)"/>
 
     <xsl:variable name="totaldayssince2000" select="(number($year)-2000)*365 + $leapyears + $daysthisyear"/>
 
     <!-- 5 is constant for day of week Jan 1 2000. -->
     <xsl:variable name="dow" select="(5 + $totaldayssince2000) mod 7"/>
 
     <xsl:choose>
       <xsl:when test="$dow=0">Sun</xsl:when>
       <xsl:when test="$dow=1">Mon</xsl:when>
       <xsl:when test="$dow=2">Tue</xsl:when>
       <xsl:when test="$dow=3">Wed</xsl:when>
       <xsl:when test="$dow=4">Thu</xsl:when>
       <xsl:when test="$dow=5">Fri</xsl:when>
       <xsl:when test="$dow=6">Sat</xsl:when>
       <xsl:when test="$dow=7">Sun</xsl:when>
       <xsl:otherwise>???</xsl:otherwise>
     </xsl:choose>
   </xsl:template>
 
   <!-- template: "misc-format-date-string"
        format date string with localization if needed -->
 
   <xsl:template name="misc-format-date-string">
     <xsl:param name="year" select="'none'" />
     <xsl:param name="month" select="'none'" />
     <xsl:param name="day" select="'none'" />
     <xsl:param name="date-format" select="$param-l10n-date-format-YMD" />
 
     <xsl:param name="dow">
       <xsl:call-template name="calculate-dow">
         <xsl:with-param name="year" select="$year" />
         <xsl:with-param name="month" select="$month" />
         <xsl:with-param name="day" select="$day" />
       </xsl:call-template>
     </xsl:param>
 
     <xsl:param name="lmonth">
       <xsl:call-template name="transtable-lookup">
 	<xsl:with-param name="word-group" select="'number-month'" />
 	<xsl:with-param name="word" select="$month" />
       </xsl:call-template>
     </xsl:param>
 
     <xsl:param name="smonth">
       <xsl:call-template name="gen-short-en-month">
 	<xsl:with-param name="nummonth" select="$month" />
       </xsl:call-template>
     </xsl:param>
 
     <xsl:param name="tmp-replace-year">
       <xsl:call-template name="misc-format-date-string-replace">
 	<xsl:with-param name="target" select="$date-format" />
 	<xsl:with-param name="before" select="'%Y'" />
 	<xsl:with-param name="after" select="$year" />
       </xsl:call-template>
     </xsl:param>
 
     <xsl:param name="tmp-replace-day">
       <xsl:call-template name="misc-format-date-string-replace">
 	<xsl:with-param name="target" select="$tmp-replace-year" />
 	<xsl:with-param name="before" select="'%D'" />
 	<xsl:with-param name="after" select="$day" />
       </xsl:call-template>
     </xsl:param>
 
     <xsl:param name="tmp-replace-day-of-week">
       <xsl:call-template name="misc-format-date-string-replace">
 	<xsl:with-param name="target" select="$tmp-replace-day" />
 	<xsl:with-param name="before" select="'%W'" />
 	<xsl:with-param name="after" select="$dow" />
       </xsl:call-template>
     </xsl:param>
 
     <xsl:param name="tmp-replace-month">
       <xsl:call-template name="misc-format-date-string-replace">
 	<xsl:with-param name="target" select="$tmp-replace-day-of-week" />
 	<xsl:with-param name="before" select="'%M'" />
 	<xsl:with-param name="after" select="$lmonth" />
       </xsl:call-template>
     </xsl:param>
 
     <xsl:call-template name="misc-format-date-string-replace">
       <xsl:with-param name="target" select="$tmp-replace-month" />
       <xsl:with-param name="before" select="'%m'" />
       <xsl:with-param name="after" select="$smonth" />
     </xsl:call-template>
   </xsl:template>
 
   <xsl:template name="misc-format-date-string-replace">
     <xsl:param name="target" select="''" />
     <xsl:param name="before" select="''" />
     <xsl:param name="after" select="''" />
 
     <xsl:choose>
       <xsl:when test="contains($target, $before)">
 	<xsl:value-of select="substring-before($target, $before)" />
 	<xsl:value-of select="$after" />
 	<xsl:call-template name="misc-format-date-string-replace">
 	  <xsl:with-param name="target" select="substring-after($target, $before)" />
 	  <xsl:with-param name="before" select="$before" />
 	  <xsl:with-param name="after" select="$after" />
 	</xsl:call-template>
       </xsl:when>
       <xsl:otherwise>
 	<xsl:value-of select="$target" />
       </xsl:otherwise>
     </xsl:choose>
   </xsl:template>
 
   <!-- template: "html-news-make-olditems-list" -->
   <xsl:template name="html-news-make-olditems-list">
     <p>Old announcements:
       <a href="2009/index.html">2009</a>,
       <a href="2008/index.html">2008</a>,
       <a href="2007/index.html">2007</a>,
       <a href="2006/index.html">2006</a>,
       <a href="2005/index.html">2005</a>,
       <a href="2004/index.html">2004</a>,
       <a href="2003/index.html">2003</a>,
       <a href="2002/index.html">2002</a>,
       <a href="2001/index.html">2001</a>,
       <a href="2000/index.html">2000</a>,
       <a href="1999/index.html">1999</a>,
       <a href="1998/index.html">1998</a>,
       <a href="1997/index.html">1997</a>,
       <a href="1996/index.html">1996</a>,
       <a href="1993/index.html">1993</a></p>
   </xsl:template>
 
   <!-- template: "html-press-make-olditems-list" -->
   <xsl:template name="html-press-make-olditems-list">
     <p>Old press publications:
       <a href="2009/press.html">2009</a>,
       <a href="2008/press.html">2008</a>,
       <a href="2007/press.html">2007</a>,
       <a href="2006/press.html">2006</a>,
       <a href="2005/press.html">2005</a>,
       <a href="2004/press.html">2004</a>,
       <a href="2003/press.html">2003</a>,
       <a href="2002/press.html">2002</a>,
       <a href="2001/press.html">2001</a>,
       <a href="2000/press.html">2000</a>,
       <a href="1999/press.html">1999</a>,
       <a href="1998/press.html">1998-1996</a></p>
   </xsl:template>
 
   <!-- template: "html-news-list-newsflash-preface" -->
   <xsl:template name="html-news-list-newsflash-preface">
     <img src="&base;/gifs/news.jpg" align="right" border="0" width="193"
       height="144" alt="FreeBSD News"/>
 
     <p>FreeBSD is a rapidly developing operating system.  Keeping up on
       the latest developments can be a chore!  To keep on top of things,
       check this page periodically.  News is also announced on the
       <a href="https://lists.FreeBSD.org/mailman/listinfo/freebsd-announce">freebsd-announce
 	mailing list</a> and the <a href="rss.xml">RSS feed</a>.</p>
 
     <p>The following projects have their own news pages, which should
       be checked for project specific updates.</p>
 
     <ul>
       <li><a href="http://freebsd.kde.org/">KDE on FreeBSD</a></li>
       <li><a href="&base;/gnome/newsflash.html">GNOME on FreeBSD</a></li>
     </ul>
 
     <p>For a detailed description of past, present, and future releases,
       see the <a href="&base;/releases/index.html">Release Information</a>
       page.</p>
 
     <p>FreeBSD security information and a list of available
       Security Advisories are available on the
       <a href="&base;/security/">Security Information</a> page.</p>
   </xsl:template>
 
   <!-- template: "html-news-list-newsflash-homelink" -->
   <xsl:template name="html-news-list-newsflash-homelink">
     <a href="&base;/news/news.html">News Home</a>
   </xsl:template>
 
   <!-- template: "html-news-list-press-preface" -->
   <xsl:template name="html-news-list-press-preface">
     <p>Please send details of any news stories featuring FreeBSD
       to <a
 	href="mailto:freebsd-doc@FreeBSD.org">freebsd-doc@FreeBSD.org</a>.</p>
   </xsl:template>
 
   <xsl:template name="html-events-list-preface">
     <p>Please send details of any FreeBSD related events or events that
       are of interest for FreeBSD users which are not listed here
       to <a href="mailto:freebsd-doc@FreeBSD.org"
 	>freebsd-doc@FreeBSD.org</a>.</p>
 
     <p>Users with organizational software that uses the
       iCalendar format can subscribe to the
       <a href="&base;/events/events.ics">FreeBSD events calendar</a>
       which contains all of the events listed here.</p>
   </xsl:template>
 
   <xsl:template name="html-events-map">
     <xsl:param name="mapurl" select="'none'" />
 
     <p>Countries and regions displayed in dark red on the map below
       are hosting upcoming FreeBSD-related events.  Countries that
       have hosted FreeBSD-related events in the past show up in yellow
       or orange, with darker colors representing a larger number of
       previous events.</p>
 
     <img>
       <xsl:attribute name="src">
         <xsl:value-of select="$mapurl" />
       </xsl:attribute>
     </img>
   </xsl:template>
 
   <xsl:template name="html-events-list-upcoming-heading">
     <h2 id="upcoming">Current/Upcoming Events:</h2>
   </xsl:template>
 
   <xsl:template name="html-events-list-past-heading">
     <h2 id="past">Past Events:</h2>
   </xsl:template>
 
   <!-- template: "html-news-list-newsflash" -->
   <xsl:template name="html-news-list-newsflash">
     <xsl:param name="news.project.xml-master" select="'none'" />
     <xsl:param name="news.project.xml" select="'none'" />
 
     <xsl:for-each select="document($news.project.xml-master)//descendant::year">
       <xsl:variable name="year" select="name" />
 
       <xsl:for-each select="month">
 	<xsl:variable name="month" select="name" />
 
 	<h1>
 	  <xsl:call-template name="misc-format-date-string">
 	    <xsl:with-param name="year" select="$year" />
 	    <xsl:with-param name="month" select="$month" />
 	    <xsl:with-param name="date-format" select="$param-l10n-date-format-YM" />
 	  </xsl:call-template>
 	</h1>
 
 	<ul>
 	  <xsl:for-each select="day">
 	    <xsl:variable name="day" select="name" />
 	    <xsl:variable name="index" select="position()" />
 
 	    <!-- search localized items per day basis -->
 	    <xsl:variable name="localizeditems"
 	      select="document($news.project.xml)
 	              //descendant::year[name = $year]
 	              /month[name = $month]
 	              /day[name = $day and position() = $index]" />
 
 	    <xsl:choose>
 	      <xsl:when test="$localizeditems">
 		<!-- when localized item exists -->
 		<xsl:for-each select="$localizeditems/event">
 		  <xsl:variable name="anchor-position" select="position()" />
 
 		  <li><p class="localized">
 		      <a><xsl:attribute name="name">
 			  <xsl:call-template name="html-news-generate-anchor">
 			    <xsl:with-param name="label" select="local-name()" />
 			    <xsl:with-param name="year" select="$year" />
 			    <xsl:with-param name="month" select="$month" />
 			    <xsl:with-param name="day" select="$day" />
 			    <xsl:with-param name="pos" select="$anchor-position" />
 			  </xsl:call-template>
 			</xsl:attribute></a>
 		      <b><xsl:call-template name="html-news-datelabel">
 			  <xsl:with-param name="year" select="$year" />
 			  <xsl:with-param name="month">
 			    <xsl:call-template name="transtable-lookup">
 			      <xsl:with-param name="word-group" select="'number-month'" />
 			      <xsl:with-param name="word" select="$month" />
 			    </xsl:call-template>
 			  </xsl:with-param>
 			  <xsl:with-param name="day" select="$day" />
 			</xsl:call-template></b>
 		      <!-- put localized text -->
 		      <xsl:text> </xsl:text>
 		      <xsl:for-each select="p">
 		      <xsl:if test="position() &gt; 1"><br /><br /></xsl:if>
 		      <xsl:apply-templates select="child::node()" mode="copy.html"/>
 		      </xsl:for-each>
 		    </p>
 		  </li>
 		</xsl:for-each>
 	      </xsl:when>
 
 	      <xsl:otherwise>
 		<!-- when localized item does not exist -->
 		<xsl:for-each select="event">
 		  <xsl:variable name="anchor-position" select="position()" />
 
 		  <li><p class="original">
 		      <a><xsl:attribute name="name">
 			  <xsl:call-template name="html-news-generate-anchor">
 			    <xsl:with-param name="label" select="local-name()" />
 			    <xsl:with-param name="year" select="$year" />
 			    <xsl:with-param name="month" select="$month" />
 			    <xsl:with-param name="day" select="$day" />
 			    <xsl:with-param name="pos" select="$anchor-position" />
 			  </xsl:call-template>
 			</xsl:attribute></a>
 		      <b><xsl:call-template name="html-news-datelabel">
 			  <xsl:with-param name="year" select="$year" />
 			  <xsl:with-param name="month">
 			    <xsl:call-template name="transtable-lookup">
 			      <xsl:with-param name="word-group" select="'number-month'" />
 			      <xsl:with-param name="word" select="$month" />
 			    </xsl:call-template>
 			  </xsl:with-param>
 			  <xsl:with-param name="day" select="$day" />
 			</xsl:call-template></b>
 		      <!-- put English text -->
 		      <xsl:text> </xsl:text>
 		      <xsl:for-each select="p">
 		      <xsl:if test="position() &gt; 1"><br /><br /></xsl:if>
 		      <xsl:apply-templates select="child::node()" mode="copy.html"/>
 		      </xsl:for-each>
 		    </p>
 		  </li>
 		</xsl:for-each>
 	      </xsl:otherwise>
 	    </xsl:choose>
 	  </xsl:for-each>
 	</ul>
       </xsl:for-each>
     </xsl:for-each>
   </xsl:template>
 
   <!-- template: "html-news-list-press" -->
   <xsl:template name="html-news-list-press">
     <xsl:param name="news.press.xml-master" select="'none'" />
     <xsl:param name="news.press.xml" select="'none'" />
 
     <xsl:for-each select="document($news.press.xml-master)//descendant::year">
       <xsl:variable name="year" select="name" />
 
       <xsl:for-each select="month">
 	<xsl:variable name="month" select="name" />
 
 	<h1>
 	  <xsl:call-template name="misc-format-date-string">
 	    <xsl:with-param name="year" select="$year" />
 	    <xsl:with-param name="month" select="$month" />
 	    <xsl:with-param name="date-format" select="$param-l10n-date-format-YM" />
 	  </xsl:call-template>
 	</h1>
 
 	<ul>
 	  <xsl:for-each select="story">
 	    <xsl:variable name="url"><xsl:value-of select="url"/></xsl:variable>
 	    <xsl:variable name="site-url"><xsl:value-of select="site-url"/></xsl:variable>
 
 	    <!-- search localized items per story(URL) basis -->
 	    <xsl:variable name="localizeditems"
 	      select="document($news.press.xml)
 	              //descendant::year[name = $year]
 	              /month[name = $month]
 	              /story[url = $url]" />
 
 	    <xsl:variable name="anchor-position" select="position()" />
 
 	    <xsl:choose>
 	      <xsl:when test="$localizeditems">
 		<xsl:for-each select="$localizeditems">
 		  <li><p>
 		      <a><xsl:attribute name="name">
 			  <xsl:call-template name="html-news-generate-anchor">
 			    <xsl:with-param name="label" select="local-name()" />
 			    <xsl:with-param name="year" select="$year" />
 			    <xsl:with-param name="month" select="$month" />
 			    <xsl:with-param name="pos" select="$anchor-position" />
 			  </xsl:call-template>
 			</xsl:attribute></a>
 		      <a href="{$url}"><b><xsl:value-of select="name"/></b></a><br/>
 		      <a href="{$site-url}"><xsl:value-of select="site-name"/></a>,
 		      <xsl:value-of select="author"/><br/>
 		      <xsl:apply-templates select="p/child::node()" mode="copy.html"/>
 		    </p>
 		  </li>
 		</xsl:for-each>
 	      </xsl:when>
 
 	      <xsl:otherwise>
 		<xsl:for-each select=".">
 		  <li><p>
 		      <a><xsl:attribute name="name">
 			  <xsl:call-template name="html-news-generate-anchor">
 			    <xsl:with-param name="label" select="local-name()" />
 			    <xsl:with-param name="year" select="$year" />
 			    <xsl:with-param name="month" select="$month" />
 			    <xsl:with-param name="pos" select="$anchor-position" />
 			  </xsl:call-template>
 			</xsl:attribute></a>
 
 		      <a href="{$url}"><b><xsl:value-of select="name"/></b></a><br/>
 		      <a href="{$site-url}"><xsl:value-of select="site-name"/></a>,
 		      <xsl:value-of select="author"/><br/>
 		      <xsl:apply-templates select="p/child::node()" mode="copy.html"/>
 		    </p>
 		  </li>
 		</xsl:for-each>
 	      </xsl:otherwise>
 	    </xsl:choose>
 	  </xsl:for-each>
 	</ul>
       </xsl:for-each>
     </xsl:for-each>
   </xsl:template>
 
   <!-- template: "html-news-datelabel" -->
   <xsl:template name="html-news-datelabel">
     <xsl:param name="year" />
     <xsl:param name="month" />
     <xsl:param name="day" />
 
     <xsl:call-template name="misc-format-date-string">
       <xsl:with-param name="month" select="$month" />
       <xsl:with-param name="day" select="$day" />
       <xsl:with-param name="date-format" select="$param-l10n-date-format-MD" />
     </xsl:call-template>
 
     <xsl:text>:</xsl:text>
   </xsl:template>
 
   <!-- template: "generate-month-num" -->
   <xsl:template name="generate-month-num">
     <xsl:param name="month" />
 
     <xsl:choose>
       <xsl:when test="$month='January'">1</xsl:when>
       <xsl:when test="$month='February'">2</xsl:when>
       <xsl:when test="$month='March'">3</xsl:when>
       <xsl:when test="$month='April'">4</xsl:when>
       <xsl:when test="$month='May'">5</xsl:when>
       <xsl:when test="$month='June'">6</xsl:when>
       <xsl:when test="$month='July'">7</xsl:when>
       <xsl:when test="$month='August'">8</xsl:when>
       <xsl:when test="$month='September'">9</xsl:when>
       <xsl:when test="$month='October'">10</xsl:when>
       <xsl:when test="$month='November'">11</xsl:when>
       <xsl:when test="$month='December'">12</xsl:when>
       <xsl:otherwise>???</xsl:otherwise>
     </xsl:choose>
   </xsl:template>
 
   <!-- template: "html-news-generate-anchor" (for l10n) -->
   <xsl:template name="html-news-generate-anchor">
     <xsl:param name="label" />
     <xsl:param name="year" />
     <xsl:param name="month" />
     <xsl:param name="day" />
     <xsl:param name="pos" />
 
     <xsl:value-of select="concat(
       $label,
       format-number($year, '0000'),
       format-number($month, '00'))" />
     <xsl:if test="$label = 'event'" >
       <xsl:value-of select="format-number($day, '00')" />
     </xsl:if>
     <xsl:value-of select="format-number($pos, ':00')" />
   </xsl:template>
 
   <!-- template: "html-list-advisories"
        generate a list of all security advisories -->
 
   <xsl:template name="html-list-advisories">
     <xsl:param name="advisories.xml" select="'none'" />
     <xsl:param name="type" select="'advisory'" />
 
     <xsl:choose>
       <xsl:when test="$type = 'advisory'">
         <xsl:call-template name="html-list-advisories-putitems">
           <xsl:with-param name="items" select="document($advisories.xml)//advisory" />
           <xsl:with-param name="itemtype" select="'Advisory'" />
           <xsl:with-param name="prefix" select="'&ftpbase;'" />
         </xsl:call-template>
       </xsl:when>
 
       <xsl:when test="$type = 'notice'">
 	<xsl:call-template name="html-list-advisories-putitems">
 	  <xsl:with-param name="items" select="document($advisories.xml)//notice" />
 	  <xsl:with-param name="itemtype" select="'Errata Notice'" />
 	  <xsl:with-param name="prefix" select="'&ftpbaseerrata;'" />
 	</xsl:call-template>
       </xsl:when>
     </xsl:choose>
   </xsl:template>
 
   <!-- template: "html-list-advisories-putitems"
        sub-routine to generate a list -->
 
   <xsl:template name="html-list-advisories-putitems">
     <xsl:param name="items" select="''" />
     <xsl:param name="itemtype" select="''" />
     <xsl:param name="prefix" select="''" />
     <xsl:param name="prefixold" select="''" />
 
     <xsl:if test="$items">
       <table xmlns="http://www.w3.org/1999/xhtml">
         <tr><th>Date</th><th><xsl:value-of select='$itemtype' /> name</th></tr>
         <xsl:for-each select="$items">
           <xsl:variable name="year" select="../../../name" />
           <xsl:variable name="month" select="../../name" />
           <xsl:variable name="day" select="../name" />
           <tr>
             <td class="txtdate">
 	      <xsl:value-of select='
 		concat(format-number($year, "####"), "-",
 		format-number($month, "00"), "-",
 		format-number($day, "00"))' />
             </td>
             <td>
 	    <xsl:choose>
 	      <xsl:when test="@type='release'">
                 <i><xsl:value-of select="name" /></i>
 	      </xsl:when>
 	      <xsl:when test="@omithref='yes'">
 		<xsl:value-of select="name" />
 	      </xsl:when>
 	      <xsl:otherwise>
 		<a><xsl:attribute name="href">
 		    <xsl:value-of select="concat($prefix, name, '.asc')" />
 		  </xsl:attribute>
 		  <xsl:value-of select="name" /></a>
 	      </xsl:otherwise>
 	    </xsl:choose>
           </td></tr>
 	</xsl:for-each>
       </table>
     </xsl:if>
   </xsl:template>
 
   <!-- template: "html-list-advisories-release-label"
        put label for release -->
 
   <xsl:template name="html-list-advisories-release-label">
     <xsl:param name="relname" select="'none'" />
 
     <p><xsl:value-of select="$relname" /> released.</p>
   </xsl:template>
 
   <!-- template: "html-index-advisories-items"
        pulls in the 6 most recent security advisories -->
 
   <xsl:template name="html-index-advisories-items">
     <xsl:param name="advisories.xml" select="''" />
     <xsl:param name="type" select="'advisory'" />
 
     <xsl:choose>
       <xsl:when test="$type = 'advisory'">
 	<xsl:for-each select="document($advisories.xml)/descendant::advisory[position() &lt;= 4]">
 	  <xsl:variable name="year" select="../../../name" />
           <xsl:variable name="month" select="../../name" />
           <xsl:variable name="day" select="../name" />
 	<p>
 	  <span class="txtdate">
 	      <xsl:value-of select='
 		concat(format-number($year, "####"), "-",
 		format-number($month, "00"), "-",
 		format-number($day, "00"))' />
 	  </span><br />
 	  <xsl:choose>
 	    <xsl:when test="@omithref = 'yes'">
 	      <xsl:value-of select="name"/>
 	    </xsl:when>
 	    <xsl:otherwise>
 	      <a><xsl:attribute name="href">
 		  <xsl:value-of select="concat('&ftpbase;', name, '.asc')"/>
 		</xsl:attribute>
 		<xsl:value-of select="name"/></a>
 	    </xsl:otherwise>
 	  </xsl:choose>
 	  </p>
 	</xsl:for-each>
       </xsl:when>
       <xsl:when test="$type = 'notice'">
 	<xsl:for-each select="document($advisories.xml)/descendant::notice[position() &lt;= 2]">
 	<xsl:variable name="year" select="../../../name" />
 	<xsl:variable name="month" select="../../name" />
 	<xsl:variable name="day" select="../name" />
 	<p>
 	  <span class="txtdate">
 	      <xsl:value-of select='
 		concat(format-number($year, "####"), "-",
 		format-number($month, "00"), "-",
 		format-number($day, "00"))' />
 	  </span><br />
 	  <xsl:choose>
 	    <xsl:when test="@omithref = 'yes'">
 	      <xsl:value-of select="name"/>
 	    </xsl:when>
 	    <xsl:otherwise>
 	      <a><xsl:attribute name="href">
 		  <xsl:value-of select="concat('&ftpbaseerrata;', name, '.asc')"/>
 		</xsl:attribute>
 		<xsl:value-of select="name"/></a>
 	    </xsl:otherwise>
 	  </xsl:choose>
 	  </p>
 	</xsl:for-each>
       </xsl:when>
     </xsl:choose>
   </xsl:template>
 
   <!-- template: "html-index-advisories-items-lastmodified" -->
 
   <xsl:template name="html-index-advisories-items-lastmodified">
     <xsl:param name="advisories.xml" select="''" />
     <xsl:param name="type" select="'advisory'" />
 
     <xsl:choose>
       <xsl:when test="$type = 'advisory'">
 	<xsl:call-template name="misc-format-date-string">
 	  <xsl:with-param name="year"
 	    select="document($advisories.xml)/descendant::year[month/day/advisory[position() = 1]]/name" />
 	  <xsl:with-param name="month"
 	    select="document($advisories.xml)/descendant::month[day/advisory[position() = 1]]/name"/>
 	  <xsl:with-param name="day"
 	    select="document($advisories.xml)/descendant::day[advisory[position() = 1]]/name" />
 	</xsl:call-template>
       </xsl:when>
 
       <xsl:when test="$type = 'notice'">
 	<xsl:call-template name="misc-format-date-string">
 	  <xsl:with-param name="year"
 	    select="document($advisories.xml)/descendant::year[month/day/notice[position() = 1]]/name" />
 	  <xsl:with-param name="month"
 	    select="document($advisories.xml)/descendant::month[day/notice[position() = 1]]/name" />
 	  <xsl:with-param name="day"
 	    select="document($advisories.xml)/descendant::day[notice[position() = 1]]/name" />
 	</xsl:call-template>
       </xsl:when>
     </xsl:choose>
   </xsl:template>
 
   <!-- template: "rdf-security-advisories"
        generate a rdf of 10 most recent security advisories -->
 
   <xsl:template name="rdf-security-advisories">
     <xsl:param name="advisories.xml" select="''" />
 
     <rdf:RDF xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
 	     xmlns="http://my.netscape.com/rdf/simple/0.9/">
 
       <xsl:call-template name="rdf-security-advisories-title" />
 
       <xsl:call-template name="rdf-security-advisories-items">
 	<xsl:with-param name="advisories.xml" select="$advisories.xml" />
       </xsl:call-template>
     </rdf:RDF>
   </xsl:template>
 
   <!-- template: "rdf-security-advisories-title"
        generate title for the security advisories rdf -->
 
   <xsl:template name="rdf-security-advisories-title"
                 xmlns="http://my.netscape.com/rdf/simple/0.9/">
     <channel>
       <title>FreeBSD Security Advisories</title>
       <link>https://www.FreeBSD.org/security/</link>
       <description>Security advisories published from the FreeBSD Project</description>
     </channel>
   </xsl:template>
 
   <!-- template: "rdf-security-advisories-items"
        pulls in the 10 most recent security advisories -->
 
   <xsl:template name="rdf-security-advisories-items"
                 xmlns="http://my.netscape.com/rdf/simple/0.9/">
     <xsl:param name="advisories.xml" select="''" />
 
     <xsl:for-each select="document($advisories.xml)/descendant::advisory[position() &lt;= 10]">
       <item>
 	<title><xsl:value-of select="name"/></title>
 	<xsl:choose>
 	  <xsl:when test="@omithref = 'yes'">
 	    <xsl:value-of select="name"/>
 	  </xsl:when>
 	  <xsl:otherwise>
 	    <link><xsl:value-of select="concat('&ftpbase;', name, '.asc')" /></link>
 	  </xsl:otherwise>
 	</xsl:choose>
 
       </item>
     </xsl:for-each>
   </xsl:template>
 
   <!-- template: "rss-security-advisories"
        generate a rdf of 10 most recent security advisories -->
 
   <xsl:template name="rss-security-advisories">
     <xsl:param name="advisories.xml" select="''" />
 
     <rss version="2.0" xmlns:atom="http://www.w3.org/2005/Atom">
       <channel>
         <xsl:call-template name="rss-security-advisories-title">
 	  <xsl:with-param name="advisories.xml" select="$advisories.xml" />
         </xsl:call-template>
         <xsl:call-template name="rss-security-advisories-items">
 	  <xsl:with-param name="advisories.xml" select="$advisories.xml" />
         </xsl:call-template>
       </channel>
     </rss>
 
   </xsl:template>
 
   <!-- template: "rss-security-advisories-title"
        pulls in the 10 most recent security advisories -->
 
   <xsl:template name="rss-security-advisories-title"
                 xmlns:atom="http://www.w3.org/2005/Atom">
     <xsl:param name="advisories.xml" select="''" />
 
     <xsl:variable name="title">FreeBSD Security Advisories</xsl:variable>
     <xsl:variable name="link">https://www.FreeBSD.org/security/</xsl:variable>
 
     <title><xsl:value-of select="$title" /></title>
     <link><xsl:value-of select="$link" /></link>
     <description>Security advisories published from the FreeBSD Project</description>
     <language>en-us</language>
     <webMaster>secteam@FreeBSD.org (FreeBSD Security Team)</webMaster>
     <managingEditor>secteam@FreeBSD.org (FreeBSD Security Team)</managingEditor>
     <docs>http://blogs.law.harvard.edu/tech/rss</docs>
     <ttl>120</ttl>
     <image>
       <url>https://www.FreeBSD.org/logo/logo-full.png</url>
       <title><xsl:value-of select="$title" /></title>
       <link><xsl:value-of select="$link" /></link>
     </image>
     <atom:link rel="self" type="application/rss+xml">
       <xsl:attribute name="href">
         <xsl:value-of select="$link" /><xsl:text>rss.xml</xsl:text>
       </xsl:attribute>
     </atom:link>
   </xsl:template>
 
   <!-- template: "rss-security-advisories-items"
        pulls in the 10 most recent security advisories -->
 
   <xsl:template name="rss-security-advisories-items"
                 xmlns:atom="http://www.w3.org/2005/Atom">
     <xsl:param name="advisories.xml" select="''" />
 
     <xsl:for-each select="document($advisories.xml)/descendant::advisory[position() &lt;= 10]">
       <item>
 	<title><xsl:value-of select="name"/></title>
 	<xsl:choose>
 	  <xsl:when test="@omithref = 'yes'">
 	    <link>https://www.FreeBSD.org/security</link>
 	  </xsl:when>
 	  <xsl:otherwise>
-	    <link><xsl:value-of select="concat('&ftpbase;', name, '.asc')" /></link>
+	    <link><xsl:value-of select="concat('https:', '&ftpbase;', name, '.asc')" /></link>
 	  </xsl:otherwise>
 	</xsl:choose>
-        <guid><xsl:value-of select="concat('&ftpbase;', name, '.asc')" /></guid>
+        <guid><xsl:value-of select="concat('https:', '&ftpbase;', name, '.asc')" /></guid>
         <pubDate>
           <xsl:call-template name="misc-format-date-string">
             <xsl:with-param name="year" select="../../../name" />
             <xsl:with-param name="month" select="../../name" />
             <xsl:with-param name="day" select="../name" />
             <xsl:with-param name="date-format" select="$param-l10n-date-format-rfc822" />
           </xsl:call-template>
         </pubDate>
       </item>
     </xsl:for-each>
   </xsl:template>
 
   <!-- template: "rss-errata-notices"
        generate a rdf of 10 most recent errata notices -->
 
   <xsl:template name="rss-errata-notices">
     <xsl:param name="notices.xml" select="''" />
 
     <rss version="2.0" xmlns:atom="http://www.w3.org/2005/Atom">
       <channel>
         <xsl:call-template name="rss-errata-notices-title">
 	  <xsl:with-param name="notices.xml" select="$notices.xml" />
         </xsl:call-template>
         <xsl:call-template name="rss-errata-notices-items">
 	  <xsl:with-param name="notices.xml" select="$notices.xml" />
         </xsl:call-template>
       </channel>
     </rss>
 
   </xsl:template>
 
   <!-- template: "rss-errata-notices-title"
        pulls in the 10 most recent errata notices -->
 
   <xsl:template name="rss-errata-notices-title"
                 xmlns:atom="http://www.w3.org/2005/Atom">
     <xsl:param name="notices.xml" select="''" />
 
     <xsl:variable name="title">FreeBSD Errata Notices</xsl:variable>
     <xsl:variable name="link">https://www.FreeBSD.org/security/</xsl:variable>
 
     <title><xsl:value-of select="$title" /></title>
     <link><xsl:value-of select="$link" /></link>
     <description>Errata notices published from the FreeBSD Project</description>
     <language>en-us</language>
     <webMaster>secteam@FreeBSD.org (FreeBSD Security Team)</webMaster>
     <managingEditor>secteam@FreeBSD.org (FreeBSD Security Team)</managingEditor>
     <docs>http://blogs.law.harvard.edu/tech/rss</docs>
     <ttl>120</ttl>
     <image>
       <url>https://www.FreeBSD.org/logo/logo-full.png</url>
       <title><xsl:value-of select="$title" /></title>
       <link><xsl:value-of select="$link" /></link>
     </image>
     <atom:link type="application/rss+xml">
       <xsl:attribute name="href">
         <xsl:value-of select="$link" /><xsl:text>rss.xml</xsl:text>
       </xsl:attribute>
     </atom:link>
   </xsl:template>
 
   <!-- template: "rss-errata-notices-items"
        pulls in the 10 most recent errata notices -->
 
   <xsl:template name="rss-errata-notices-items"
                 xmlns:atom="http://www.w3.org/2005/Atom">
     <xsl:param name="notices.xml" select="''" />
 
     <xsl:for-each select="document($notices.xml)/descendant::notice[position() &lt;= 10]">
       <item>
 	<title><xsl:value-of select="name"/></title>
 	<xsl:choose>
 	  <xsl:when test="@omithref = 'yes'">
 	    <link>https://www.FreeBSD.org/security</link>
 	  </xsl:when>
 	  <xsl:otherwise>
-	    <link><xsl:value-of select="concat('&ftpbase;', name, '.asc')" /></link>
+	    <link><xsl:value-of select="concat('https:', '&ftpbase;', name, '.asc')" /></link>
 	  </xsl:otherwise>
 	</xsl:choose>
-        <guid><xsl:value-of select="concat('&ftpbase;', name, '.asc')" /></guid>
+        <guid><xsl:value-of select="concat('https:', '&ftpbase;', name, '.asc')" /></guid>
         <pubDate>
           <xsl:call-template name="misc-format-date-string">
             <xsl:with-param name="year" select="../../../name" />
             <xsl:with-param name="month" select="../../name" />
             <xsl:with-param name="day" select="../name" />
             <xsl:with-param name="date-format" select="$param-l10n-date-format-rfc822" />
           </xsl:call-template>
         </pubDate>
       </item>
     </xsl:for-each>
   </xsl:template>
 
   <!-- template: "html-index-news-project-items"
        pulls in the 6 most recent project items -->
 
   <xsl:template name="html-index-news-project-items">
     <xsl:param name="news.project.xml-master" select="'none'" />
     <xsl:param name="news.project.xml" select="'none'" />
 
     <xsl:for-each select="document($news.project.xml-master)/descendant::day[position() &lt;= 6]">
       <xsl:variable name="year" select="ancestor::year/name" />
       <xsl:variable name="month" select="ancestor::month/name" />
       <xsl:variable name="day" select="name" />
 
       <!-- search localized items per day basis -->
       <xsl:variable name="localizeditems"
 	select="document($news.project.xml)
 	//descendant::year[name = $year]
 	/month[name = $month]
 	/day[name = $day]" />
 
       <xsl:choose>
 	<xsl:when test="$localizeditems/event">
 	  <xsl:for-each select="$localizeditems/event">
 	    <xsl:variable name="anchor-position" select="position()" />
 
 	    <p>
 	    <span class="txtdate">
 		<xsl:value-of select='
 		  concat(format-number($year, "####"), "-",
 		  format-number($month, "00"), "-",
 		  format-number($day, "00"))' />
 	    </span><br />
 	    <a>
 	      <xsl:attribute name="href">
 		<xsl:choose>
 		  <xsl:when test="$news.project.xml = $news.project.xml-master">&enbase;/</xsl:when>
 		  <xsl:otherwise>&base;/</xsl:otherwise>
 		</xsl:choose>
 		<xsl:text>news/newsflash.html#</xsl:text>
 		<xsl:call-template name="html-news-generate-anchor">
 		  <xsl:with-param name="label" select="'event'" />
 		  <xsl:with-param name="year" select="$year" />
 		  <xsl:with-param name="month" select="$month" />
 		  <xsl:with-param name="day" select="$day" />
 		  <xsl:with-param name="pos" select="$anchor-position" />
 		</xsl:call-template>
 	      </xsl:attribute>
 
 	      <xsl:choose>
 		<xsl:when test="count(child::title)">
 		  <xsl:value-of select="title"/><br/>
 		</xsl:when>
 		<xsl:otherwise>
 		  <xsl:value-of select="p"/><br/>
 		</xsl:otherwise>
 	      </xsl:choose>
 	    </a>
 	    </p>
 	  </xsl:for-each>
 	</xsl:when>
 
 	<xsl:otherwise>
 	  <xsl:for-each select="event">
 	    <xsl:variable name="anchor-position" select="position()" />
 
 	    <p>
 	    <span class="txtdate">
 	      <xsl:value-of select='
 		  concat(format-number($year, "####"), "-",
 		  format-number($month, "00"), "-",
 		  format-number($day, "00"))' />
 	    </span><br />
 	    <a>
 	      <xsl:attribute name="href">
 		<xsl:text>news/newsflash.html#</xsl:text>
 		<xsl:call-template name="html-news-generate-anchor">
 		  <xsl:with-param name="label" select="'event'" />
 		  <xsl:with-param name="year" select="$year" />
 		  <xsl:with-param name="month" select="$month" />
 		  <xsl:with-param name="day" select="$day" />
 		  <xsl:with-param name="pos" select="$anchor-position" />
 		</xsl:call-template>
 	      </xsl:attribute>
 
 	      <xsl:choose>
 		<xsl:when test="count(child::title)">
 		  <xsl:value-of select="title"/><br/>
 		</xsl:when>
 		<xsl:otherwise>
 		  <xsl:value-of select="p"/><br/>
 		</xsl:otherwise>
 	      </xsl:choose>
 	    </a>
 	    </p>
 	  </xsl:for-each>
 	</xsl:otherwise>
       </xsl:choose>
     </xsl:for-each>
   </xsl:template>
 
   <!-- template: "html-index-news-project-items-lastmodified" -->
 
   <xsl:template name="html-index-news-project-items-lastmodified">
     <xsl:param name="news.project.xml-master" select="''" />
 
     <xsl:call-template name="misc-format-date-string">
       <xsl:with-param name="year"
 	select="document($news.project.xml-master)/descendant::year[position() = 1]/name" />
       <xsl:with-param name="month"
 	select="document($news.project.xml-master)/descendant::month[position() = 1]/name" />
       <xsl:with-param name="day"
 	select="document($news.project.xml-master)/descendant::day[position() = 1]/name" />
     </xsl:call-template>
   </xsl:template>
 
   <!-- template: "html-index-news-press-items"
        pulls in the 6 most recent press items -->
 
   <xsl:template name="html-index-news-press-items">
     <xsl:param name="news.press.xml-master" select="'none'" />
     <xsl:param name="news.press.xml" select="''" />
 
     <xsl:for-each select="document($news.press.xml-master)/descendant::story[position() &lt;= 6]">
       <xsl:variable name="year" select="../../name" />
       <xsl:variable name="month" select="../name" />
       <xsl:variable name="day" select="../name" />
       <xsl:variable name="url" select="url" />
       <xsl:variable name="site-url" select="site-url" />
 
       <xsl:variable name="pos">
 	<xsl:for-each select="../story">
 	  <xsl:if test="url = $url">
 	    <xsl:value-of select="position()" />
 	  </xsl:if>
 	</xsl:for-each>
       </xsl:variable>
 
       <!-- search localized items per story(URL) basis -->
       <xsl:variable name="localizeditems"
 	select="document($news.press.xml)
 	//descendant::year[name = $year]
 	/month[name = $month]
 	/story[url = $url]" />
 
       <p>
       <span class="txtdate">
 	<xsl:value-of select='
 	    concat(format-number($year, "####"), "-",
 	    format-number($month, "00"))' />
       </span><br />
       <a>
 	<xsl:attribute name="href">
 	  <xsl:choose>
 	    <xsl:when test="$news.press.xml = $news.press.xml-master">&enbase;/</xsl:when>
 	    <xsl:otherwise>&base;/</xsl:otherwise>
 	  </xsl:choose>
 	  <xsl:text>news/press.html#</xsl:text>
 	  <xsl:call-template name="html-news-generate-anchor">
 	    <xsl:with-param name="label" select="'story'" />
 	    <xsl:with-param name="year" select="$year" />
 	    <xsl:with-param name="month" select="$month" />
 	    <xsl:with-param name="pos" select="$pos" />
 	  </xsl:call-template>
 	</xsl:attribute>
 
 	<xsl:choose>
 	  <xsl:when test="$localizeditems">
 	    <xsl:value-of select="$localizeditems/name"/>
 	  </xsl:when>
 
 	  <xsl:otherwise>
 	    <xsl:value-of select="name"/>
 	  </xsl:otherwise>
 	</xsl:choose>
       </a></p>
 
     </xsl:for-each>
   </xsl:template>
 
   <!-- template: "html-index-news-press-items-lastmodified" -->
 
   <xsl:template name="html-index-news-press-items-lastmodified">
     <xsl:param name="news.press.xml-master" select="''" />
 
     <xsl:call-template name="misc-format-date-string">
       <xsl:with-param name="year"
 	select="document($news.press.xml-master)/descendant::year[position() = 1]/name" />
       <xsl:with-param name="month"
 	select="document($news.press.xml-master)/descendant::month[position() = 1]/name" />
       <xsl:with-param name="date-format"
 	select="$param-l10n-date-format-YM" />
     </xsl:call-template>
   </xsl:template>
 
   <!-- template: "html-index-navigation-link-list"
        generates navigation bar in index.html -->
 
   <xsl:template name="html-index-navigation-link-list">
     <xsl:param name="navigation.xml" select="''" />
     <xsl:for-each select="document($navigation.xml)/navigation/category">
       <p>
 	<xsl:choose>
 	  <xsl:when test="boolean(@src)">
 	  <a>
 	    <xsl:attribute name="href">
 	      <xsl:choose>
 		<xsl:when test="@path = 'base'">&base;/</xsl:when>
 		<xsl:when test="@path = 'enbase'">&enbase;/</xsl:when>
 	      </xsl:choose>
 	      <xsl:value-of select="@src"/>
 	    </xsl:attribute>
 	    <font size="+1" color="#990000"><b><xsl:value-of select="@name"/></b></font>
 	  </a>
 	  </xsl:when>
 
 	  <xsl:otherwise>
 	    <font size="+1" color="#990000"><b><xsl:value-of select="@name"/></b></font>
 	  </xsl:otherwise>
 	</xsl:choose>
 	<br/>
 	<small>
 	  <xsl:apply-templates select="link"/>
 	</small>
       </p>
     </xsl:for-each>
   </xsl:template>
 
   <!-- template: "link" generates links inside of category -->
   <xsl:template match="link">
     &leadingmark;
     <a>
       <xsl:attribute name="href">
 	<xsl:choose>
 	  <xsl:when test="@path = 'base'">&base;/</xsl:when>
 	  <xsl:when test="@path = 'enbase'">&enbase;/</xsl:when>
 	</xsl:choose>
 	<xsl:value-of select="@src"/>
       </xsl:attribute>
       <xsl:value-of select="@name"/></a><br/>
   </xsl:template>
 
  <!-- template: "html-index-events-items"
        pulls in the 5 most recent events items -->
 
   <xsl:template name="html-index-events-items">
     <xsl:param name="events.xml-master" select="'none'" />
     <xsl:param name="events.xml" select="''" />
 
     <xsl:for-each select="document($events.xml-master)/descendant::event[
 									   ((number(enddate/year) &gt; number($curdate.year)) or
 								            (number(enddate/year) = number($curdate.year) and
 								             number(enddate/month) &gt; number($curdate.month)) or
 						          		    (number(enddate/year) = number($curdate.year) and
 								             number(enddate/month) = number($curdate.month) and
 						   	            	     enddate/day &gt;= $curdate.day))]">
       <xsl:sort select="startdate/year" order="ascending"/>
       <xsl:sort select="format-number(startdate/month, '00')" order="ascending"/>
       <xsl:sort select="format-number(startdate/day, '00')" order="ascending"/>
 
       <xsl:if test="position() &lt;= 5">
 
       <p>
       <span class="txtdate">
          <xsl:value-of select='
 	    concat(format-number(startdate/year, "####"), "-",
 	    format-number(startdate/month, "00"), "-",
 	    format-number(startdate/day, "00"), " -  ",
 	    format-number(enddate/year, "####"), "-",
 	    format-number(enddate/month, "00"), "-",
 	    format-number(enddate/day, "00"))' />
       </span><br />
       <a>
         <xsl:attribute name="href">
 	  <xsl:choose>
 	    <xsl:when test="$events.xml = $events.xml-master">&enbase;/</xsl:when>
 	    <xsl:otherwise>&base;/</xsl:otherwise>
 	  </xsl:choose>
 	  <xsl:text>events/#</xsl:text>
 	  <xsl:call-template name="generate-event-anchor"/>
         </xsl:attribute>
 
         <xsl:value-of select="name"/>
 
 	<br />
 	<xsl:if test="location/city!='' and location/country!=''">
 	  (<xsl:value-of select='location/city' />, <xsl:value-of select='location/country' />)
 	</xsl:if>
       </a></p>
     </xsl:if>
     </xsl:for-each>
   </xsl:template>
 
   <!-- template: "html-index-mirrors-options-list"
        generates mirror sites list in index.html -->
 
   <xsl:template name="html-index-mirrors-options-list">
     <xsl:param name="mirrors.xml" select="''" />
 
     <xsl:choose>
       <xsl:when test="$mirrors.xml = ''">
 	<option value="NONE">
 	  **No Data**
 	</option>
       </xsl:when>
 
       <xsl:otherwise>
 	<xsl:for-each select="document($mirrors.xml)/mirrors/entry[
                               (not(country/@role) or country/@role != 'primary') and
                               host[@type = 'www']/url[@proto = 'httpv6']]">
 	  <xsl:sort select="country/@sortkey" data-type="number" />
 	  <xsl:sort select="country" />
 
 	  <xsl:for-each select="host[@type = 'www']/url[@proto = 'httpv6']">
 	    <option><xsl:attribute name="value"><xsl:value-of select="." /></xsl:attribute>
 	      <xsl:choose>
 		<xsl:when test="last() = 1">
 		  <xsl:value-of select="concat('IPv6 ', ../../country)" />
 		</xsl:when>
 		<xsl:otherwise>
 		  <xsl:value-of select="concat('IPv6 ', ../../country, '/', position())" />
 		</xsl:otherwise>
 	      </xsl:choose>
 	    </option>
 	  </xsl:for-each>
 	</xsl:for-each>
 
 	<xsl:for-each select="document($mirrors.xml)/mirrors/entry[
                               (not(country/@role) or country/@role != 'primary') and
                               host[@type = 'www']/url[@proto = 'http']]">
 	  <xsl:sort select="country/@sortkey" data-type="number" />
 	  <xsl:sort select="country" />
 
 	  <xsl:for-each select="host[@type = 'www']/url[@proto = 'http']">
 	    <option><xsl:attribute name="value"><xsl:value-of select="." /></xsl:attribute>
 	      <xsl:choose>
 		<xsl:when test="last() = 1">
 		  <xsl:value-of select="../../country" />
 		</xsl:when>
 		<xsl:otherwise>
 		  <xsl:value-of select="concat(../../country, '/', position())" />
 		</xsl:otherwise>
 	      </xsl:choose>
 	    </option>
 	  </xsl:for-each>
 	</xsl:for-each>
       </xsl:otherwise>
     </xsl:choose>
   </xsl:template>
 
   <!-- Generate a unique anchor for this event. -->
   <xsl:template name="generate-event-anchor">
     <xsl:text>event</xsl:text>
     <xsl:value-of select="ancestor::year/name"/>
     <xsl:value-of select="ancestor::month/name"/>
     <xsl:value-of select="ancestor::day/name"/>:<xsl:value-of select="count(preceding-sibling::event)"/>
   </xsl:template>
 
   <!-- Generate a unique anchor for this story -->
   <xsl:template name="generate-story-anchor">
     <xsl:text>story</xsl:text>
     <xsl:value-of select="ancestor::year/name"/>
     <xsl:value-of select="ancestor::month/name"/>:<xsl:text/>
     <xsl:value-of select="count(following-sibling::story)"/>
   </xsl:template>
 
   <!-- Convert a month number to the corresponding long English name. -->
   <xsl:template name="gen-long-en-month">
     <xsl:param name="nummonth"/>
     <xsl:variable name="month" select="number($nummonth)"/>
     <xsl:choose>
       <xsl:when test="$month=1">January</xsl:when>
       <xsl:when test="$month=2">February</xsl:when>
       <xsl:when test="$month=3">March</xsl:when>
       <xsl:when test="$month=4">April</xsl:when>
       <xsl:when test="$month=5">May</xsl:when>
       <xsl:when test="$month=6">June</xsl:when>
       <xsl:when test="$month=7">July</xsl:when>
       <xsl:when test="$month=8">August</xsl:when>
       <xsl:when test="$month=9">September</xsl:when>
       <xsl:when test="$month=10">October</xsl:when>
       <xsl:when test="$month=11">November</xsl:when>
       <xsl:when test="$month=12">December</xsl:when>
       <xsl:otherwise>Invalid month</xsl:otherwise>
     </xsl:choose>
   </xsl:template>
 
   <!-- Convert a month number to the corresponding short English name. -->
   <xsl:template name="gen-short-en-month">
     <xsl:param name="nummonth"/>
     <xsl:variable name="month" select="number($nummonth)"/>
     <xsl:choose>
       <xsl:when test="$month=1">Jan</xsl:when>
       <xsl:when test="$month=2">Feb</xsl:when>
       <xsl:when test="$month=3">Mar</xsl:when>
       <xsl:when test="$month=4">Apr</xsl:when>
       <xsl:when test="$month=5">May</xsl:when>
       <xsl:when test="$month=6">Jun</xsl:when>
       <xsl:when test="$month=7">Jul</xsl:when>
       <xsl:when test="$month=8">Aug</xsl:when>
       <xsl:when test="$month=9">Sep</xsl:when>
       <xsl:when test="$month=10">Oct</xsl:when>
       <xsl:when test="$month=11">Nov</xsl:when>
       <xsl:when test="$month=12">Dec</xsl:when>
       <xsl:otherwise>Invalid month</xsl:otherwise>
     </xsl:choose>
   </xsl:template>
 
   <!-- Generate a date interval. -->
   <!-- Sample: 27 November, 2002 - 29 December, 2003 -->
   <xsl:template name="gen-date-interval">
     <xsl:param name="startdate"/>
     <xsl:param name="enddate"/>
 
     <xsl:value-of select="startdate/day"/>
 
     <xsl:if test="number(startdate/month) != number(enddate/month) or
 		  number(startdate/day) != number(enddate/day) or
 		  number(startdate/year) != number(enddate/year)">
 
       <xsl:if test="number(startdate/month) != number(enddate/month) or
 		    number(startdate/year) != number(enddate/year)">
 	<xsl:text> </xsl:text>
 	<xsl:call-template name="gen-long-en-month">
 	  <xsl:with-param name="nummonth" select="startdate/month"/>
 	</xsl:call-template>
       </xsl:if>
 
       <xsl:if test="number(startdate/year) != number(enddate/year)">
 	<xsl:text>, </xsl:text>
 	<xsl:value-of select="startdate/year"/>
       </xsl:if>
       <xsl:text> - </xsl:text>
 
       <xsl:if test="number(startdate/day) != number(enddate/day) or
 		    number(startdate/month) != number(enddate/month) or
 		    number(startdate/year) != number(enddate/year)">
 	<xsl:value-of select="enddate/day"/>
       </xsl:if>
     </xsl:if>
 
     <xsl:text> </xsl:text>
     <xsl:call-template name="gen-long-en-month">
       <xsl:with-param name="nummonth" select="enddate/month"/>
     </xsl:call-template>
 
     <xsl:text>, </xsl:text>
     <xsl:value-of select="enddate/year"/>
   </xsl:template>
 
   <!-- Generate sitemap -->
   <xsl:template name="html-sitemap">
     <!--
           We iterate over all categories and list all the sitemap
           items that are enumerated for that category.
           Listing is not done in alphabetical order but in
           document order so that items can be arranged in a
           logical order.
     -->
 
     <dl>
       <xsl:for-each select="/sitemap/category">
         <dt><strong><xsl:value-of select="@name"/></strong></dt>
 
         <dd>
           <xsl:for-each select="item">
             <a>
               <xsl:attribute name="href">
                 <xsl:value-of select="destination"/>
               </xsl:attribute>
 
               <xsl:value-of select="text"/>
             </a>
           </xsl:for-each>
         </dd>
       </xsl:for-each>
     </dl>
   </xsl:template>
 
   <xsl:variable name="lowercase" select="'abcdefghijklmnopqrstuvwxyz'"/>
   <xsl:variable name="uppercase" select="'ABCDEFGHIJKLMNOPQRSTUVWXYZ'"/>
 
   <!-- Generate index toc -->
   <xsl:template name="html-index-toc">
     <!--
           First we make a toc by iterating over the index terms.
           We need one entry per initial letter so this is done
           by using a key and only processing the first term for
           each initial letter.  For each initial letter, we emit
           a link that will point to entries beginning with that letter.
     -->
 
     <a name="toc"></a>
 
     <table border="4">
       <tr>
         <xsl:for-each select="/sitemap/term">
           <xsl:sort select="text"/>
 
           <xsl:variable name="firstLetter" select="translate(substring(text, 1, 1), $lowercase, $uppercase)"/>
 
           <xsl:if test="generate-id(.) = generate-id(key('indexLetter', $firstLetter)[1])">
             <td><a>
               <xsl:attribute name="href">
                 <xsl:value-of select="concat('#', $firstLetter)"/>
               </xsl:attribute>
 
               <xsl:value-of select="$firstLetter"/>
             </a></td>
           </xsl:if>
         </xsl:for-each>
       </tr>
     </table>
   </xsl:template>
 
   <!-- Generate index -->
   <xsl:template name="html-index">
     <!--
           Then we need to generate the actual entries but grouped by their
           initial letter.  The same method is used here as above:
           take the first entry of each initial letter; it gives us the
           letter.  And then, we do another iteration but only process
           those terms that begin with the current letter and emit
           an unordered list of them.
     -->
 
     <xsl:for-each select="/sitemap/term">
       <xsl:sort select="text"/>
 
       <xsl:variable name="firstLetter" select="translate(substring(text, 1, 1), $lowercase, $uppercase)"/>
 
       <xsl:if test="generate-id(.) = generate-id(key('indexLetter', $firstLetter)[1])">
         <h2><a href="#toc" name="{$firstLetter}">
           <xsl:value-of select="$firstLetter"/>
         </a></h2>
 
         <ul>
           <xsl:for-each select="/sitemap/term[translate(substring(text, 1, 1), $lowercase, $uppercase) = $firstLetter]">
             <xsl:sort select="text"/>
 
             <li><a>
               <xsl:attribute name="href">
                 <xsl:value-of select="destination"/>
               </xsl:attribute>
 
               <xsl:value-of select="text"/>
             </a></li>
           </xsl:for-each>
         </ul>
       </xsl:if>
     </xsl:for-each>
   </xsl:template>
 </xsl:stylesheet>
Index: user/gjb/releng-rewrite/share/xml/notices.xml
===================================================================
--- user/gjb/releng-rewrite/share/xml/notices.xml	(revision 49724)
+++ user/gjb/releng-rewrite/share/xml/notices.xml	(revision 49725)
@@ -1,724 +1,744 @@
 <?xml version="1.0"?>
 <advisories>
     <cvs:keyword xmlns:cvs="http://www.FreeBSD.org/XML/CVS">
       $FreeBSD$
     </cvs:keyword>
 
   <year>
     <name>2016</name>
 
     <month>
+      <name>12</name>
+
+      <day>
+        <name>6</name>
+
+        <notice>
+          <name>FreeBSD-EN-16:21.localedef</name>
+        </notice>
+
+        <notice>
+          <name>FreeBSD-EN-16:20.tzdata</name>
+        </notice>
+
+        <notice>
+          <name>FreeBSD-EN-16:19.tzcode</name>
+        </notice>
+      </day>
+    </month>
+
+    <month>
       <name>10</name>
 
       <day>
         <name>25</name>
 
         <notice>
           <name>FreeBSD-EN-16:18.loader</name>
         </notice>
 
         <notice>
           <name>FreeBSD-EN-16:17.vm</name>
         </notice>
       </day>
     </month>
 
     <month>
       <name>8</name>
 
       <day>
         <name>12</name>
 
         <notice>
           <name>FreeBSD-EN-16:16.hv_storvsc</name>
         </notice>
 
         <notice>
           <name>FreeBSD-EN-16:15.vmbus</name>
         </notice>
 
         <notice>
           <name>FreeBSD-EN-16:14.hv_storvsc</name>
         </notice>
 
         <notice>
           <name>FreeBSD-EN-16:13.vmbus</name>
         </notice>
 
         <notice>
           <name>FreeBSD-EN-16:12.hv_storvsc</name>
         </notice>
 
         <notice>
           <name>FreeBSD-EN-16:11.vmbus</name>
         </notice>
 
         <notice>
           <name>FreeBSD-EN-16:10.dhclient</name>
         </notice>
       </day>
     </month>
 
     <month>
       <name>7</name>
 
       <day>
         <name>25</name>
 
         <notice>
           <name>FreeBSD-EN-16:09.freebsd-update</name>
         </notice>
       </day>
     </month>
 
     <month>
       <name>5</name>
 
       <day>
         <name>4</name>
 
         <notice>
           <name>FreeBSD-EN-16:08.zfs</name>
         </notice>
 
         <notice>
           <name>FreeBSD-EN-16:07.ipi</name>
         </notice>
 
         <notice>
           <name>FreeBSD-EN-16:06.libc</name>
         </notice>
       </day>
     </month>
 
     <month>
       <name>3</name>
 
       <day>
         <name>16</name>
 
         <notice>
           <name>FreeBSD-EN-16:05.hv_netvsc</name>
         </notice>
 
         <notice>
           <name>FreeBSD-EN-16:04.hyperv</name>
         </notice>
       </day>
     </month>
 
 
     <month>
       <name>1</name>
 
       <day>
         <name>14</name>
 
         <notice>
           <name>FreeBSD-EN-16:03.yplib</name>
         </notice>
 
         <notice>
           <name>FreeBSD-EN-16:02.pf</name>
         </notice>
 
         <notice>
           <name>FreeBSD-EN-16:01.filemon</name>
         </notice>
       </day>
     </month>
   </year>
 
   <year>
     <name>2015</name>
 
     <month>
       <name>11</name>
 
       <day>
         <name>4</name>
 
         <notice>
           <name>FreeBSD-EN-15:20.vm</name>
         </notice>
 
         <notice>
           <name>FreeBSD-EN-15:19.kqueue</name>
         </notice>
       </day>
     </month>
 
     <month>
       <name>9</name>
 
       <day>
         <name>16</name>
 
         <notice>
           <name>FreeBSD-EN-15:18.pkg</name>
         </notice>
 
         <notice>
           <name>FreeBSD-EN-15:17.libc</name>
         </notice>
 
         <notice>
           <name>FreeBSD-EN-15:16.pw</name>
         </notice>
       </day>
     </month>
 
     <month>
       <name>8</name>
 
       <day>
         <name>25</name>
 
         <notice>
           <name>FreeBSD-EN-15:15.pkg</name>
         </notice>
 
         <notice>
           <name>FreeBSD-EN-15:14.ixgbe</name>
         </notice>
       </day>
 
       <day>
         <name>18</name>
 
         <notice>
           <name>FreeBSD-EN-15:13.vidcontrol</name>
         </notice>
 
         <notice>
           <name>FreeBSD-EN-15:12.netstat</name>
         </notice>
 
         <notice>
           <name>FreeBSD-EN-15:11.toolchain</name>
         </notice>
       </day>
     </month>
 
     <month>
       <name>6</name>
 
       <day>
         <name>30</name>
 
         <notice>
           <name>FreeBSD-EN-15:10.iconv</name>
         </notice>
 
         <notice>
           <name>FreeBSD-EN-15:09.xlocale</name>
         </notice>
       </day>
 
       <day>
         <name>18</name>
 
         <notice>
           <name>FreeBSD-EN-15:08.sendmail</name>
         </notice>
       </day>
 
       <day>
         <name>9</name>
 
         <notice>
           <name>FreeBSD-EN-15:07.zfs</name>
         </notice>
 
         <notice>
           <name>FreeBSD-EN-15:06.file</name>
         </notice>
       </day>
     </month>
 
     <month>
       <name>5</name>
 
       <day>
         <name>13</name>
 
         <notice>
           <name>FreeBSD-EN-15:05.ufs</name>
         </notice>
 
         <notice>
           <name>FreeBSD-EN-15:04.freebsd-update</name>
         </notice>
       </day>
     </month>
 
     <month>
       <name>2</name>
 
       <day>
         <name>25</name>
 
         <notice>
           <name>FreeBSD-EN-15:03.freebsd-update</name>
         </notice>
 
         <notice>
           <name>FreeBSD-EN-15:02.openssl</name>
         </notice>
 
         <notice>
           <name>FreeBSD-EN-15:01.vt</name>
         </notice>
       </day>
     </month>
   </year>
 
   <year>
     <name>2014</name>
 
     <month>
       <name>12</name>
 
       <day>
         <name>23</name>
 
         <notice>
           <name>FreeBSD-EN-14:13.freebsd-update</name>
         </notice>
       </day>
     </month>
 
     <month>
       <name>11</name>
 
       <day>
 	<name>04</name>
 
 	<notice>
 	  <name>FreeBSD-EN-14:12.zfs</name>
 	</notice>
       </day>
     </month>
 
     <month>
       <name>10</name>
 
       <day>
 	<name>22</name>
 
 	<notice>
 	  <name>FreeBSD-EN-14:11.crypt</name>
 	</notice>
 
 	<notice>
 	  <name>FreeBSD-EN-14:10.tzdata</name>
 	</notice>
       </day>
     </month>
 
     <month>
       <name>7</name>
 
       <day>
 	<name>8</name>
 
 	<notice>
 	  <name>FreeBSD-EN-14:09.jail</name>
 	</notice>
       </day>
     </month>
 
     <month>
       <name>6</name>
 
       <day>
 	<name>24</name>
 
 	<notice>
 	  <name>FreeBSD-EN-14:08.heimdal</name>
 	</notice>
 
 	<notice>
 	  <name>FreeBSD-EN-14:07.pmap</name>
 	</notice>
       </day>
 
       <day>
 	<name>3</name>
 
 	<notice>
 	  <name>FreeBSD-EN-14:06.exec</name>
 	</notice>
       </day>
     </month>
 
     <month>
       <name>5</name>
 
       <day>
 	<name>13</name>
 
 	<notice>
 	  <name>FreeBSD-EN-14:05.ciss</name>
 	</notice>
 
 	<notice>
 	  <name>FreeBSD-EN-14:04.kldxref</name>
 	</notice>
 
 	<notice>
 	  <name>FreeBSD-EN-14:03.pkg</name>
 	</notice>
       </day>
     </month>
 
     <month>
       <name>1</name>
 
       <day>
 	<name>14</name>
 
 	<notice>
 	  <name>FreeBSD-EN-14:02.mmap</name>
 	</notice>
 
 	<notice>
 	  <name>FreeBSD-EN-14:01.random</name>
 	</notice>
       </day>
     </month>
   </year>
 
   <year>
     <name>2013</name>
 
     <month>
       <name>11</name>
 
       <day>
 	<name>28</name>
 
 	<notice>
 	  <name>FreeBSD-EN-13:05.freebsd-update</name>
 	</notice>
       </day>
     </month>
 
     <month>
       <name>10</name>
 
       <day>
 	<name>26</name>
 
 	<notice>
 	  <name>FreeBSD-EN-13:04.freebsd-update</name>
 	</notice>
       </day>
     </month>
 
     <month>
       <name>8</name>
 
       <day>
 	<name>22</name>
 
 	<notice>
 	  <name>FreeBSD-EN-13:03.mfi</name>
 	</notice>
       </day>
     </month>
 
     <month>
       <name>6</name>
 
       <day>
 	<name>28</name>
 
 	<notice>
 	  <name>FreeBSD-EN-13:01.fxp</name>
 	</notice>
 
 	<notice>
 	  <name>FreeBSD-EN-13:02.vtnet</name>
 	</notice>
       </day>
     </month>
 
   </year>
 
   <year>
     <name>2012</name>
 
     <month>
       <name>6</name>
 
       <day>
 	<name>12</name>
 
 	<notice>
 	  <name>FreeBSD-EN-12:02.ipv6refcount</name>
 	</notice>
       </day>
     </month>
 
     <month>
       <name>1</name>
 
       <day>
 	<name>4</name>
 
 	<notice>
 	  <name>FreeBSD-EN-12:01.freebsd-update</name>
 	</notice>
       </day>
     </month>
   </year>
 
   <year>
     <name>2010</name>
 
     <month>
       <name>2</name>
 
       <day>
 	<name>27</name>
 
 	<notice>
 	  <name>FreeBSD-EN-10:02.sched_ule</name>
 	</notice>
       </day>
     </month>
 
     <month>
       <name>1</name>
 
       <day>
 	<name>6</name>
 
 	<notice>
 	  <name>FreeBSD-EN-10:01.freebsd</name>
 	</notice>
       </day>
     </month>
   </year>
 
   <year>
     <name>2009</name>
 
     <month>
       <name>10</name>
 
       <day>
 	<name>2</name>
 
 	<notice>
 	  <name>FreeBSD-EN-09:05.null</name>
 	</notice>
       </day>
     </month>
 
     <month>
       <name>6</name>
 
       <day>
 	<name>24</name>
 
 	<notice>
 	  <name>FreeBSD-EN-09:04.fork</name>
 	</notice>
 
 	<notice>
 	  <name>FreeBSD-EN-09:03.fxp</name>
 	</notice>
 
 	<notice>
 	  <name>FreeBSD-EN-09:02.bce</name>
 	</notice>
       </day>
     </month>
 
     <month>
       <name>3</name>
 
       <day>
 	<name>23</name>
 
 	<notice>
 	  <name>FreeBSD-EN-09:01.kenv</name>
 	</notice>
       </day>
     </month>
   </year>
 
   <year>
     <name>2008</name>
 
     <month>
       <name>6</name>
 
       <day>
 	<name>19</name>
 
 	<notice>
 	  <name>FreeBSD-EN-08:02.tcp</name>
 	</notice>
       </day>
     </month>
 
     <month>
       <name>4</name>
 
       <day>
 	<name>17</name>
 
 	<notice>
 	  <name>FreeBSD-EN-08:01.libpthread</name>
 	</notice>
       </day>
     </month>
   </year>
 
   <year>
     <name>2007</name>
 
     <month>
       <name>3</name>
 
       <day>
 	<name>15</name>
 
 	<notice>
 	  <name>FreeBSD-EN-07:05.freebsd-update</name>
 	</notice>
       </day>
     </month>
 
     <month>
       <name>2</name>
 
       <day>
 	<name>28</name>
 
 	<notice>
 	  <name>FreeBSD-EN-07:04.zoneinfo</name>
 	</notice>
 
 	<notice>
 	  <name>FreeBSD-EN-07:03.rc.d_jail</name>
 	</notice>
 
 	<notice>
 	  <name>FreeBSD-EN-07:02.net</name>
 	</notice>
       </day>
 
       <day>
 	<name>14</name>
 
 	<notice>
 	  <name>FreeBSD-EN-07:01.nfs</name>
 	</notice>
       </day>
     </month>
   </year>
 
   <year>
     <name>2006</name>
 
     <month>
       <name>8</name>
 
       <day>
 	<name>28</name>
 
 	<notice>
 	  <name>FreeBSD-EN-06:02.net</name>
 	</notice>
       </day>
     </month>
 
     <month>
       <name>7</name>
 
       <day>
 	<name>7</name>
 
 	<notice>
 	  <name>FreeBSD-EN-06:01.jail</name>
 	</notice>
       </day>
     </month>
   </year>
 
   <year>
     <name>2005</name>
 
     <month>
       <name>12</name>
 
       <day>
 	<name>19</name>
 
 	<notice>
 	  <name>FreeBSD-EN-05:04.nfs</name>
 	</notice>
       </day>
     </month>
 
     <month>
       <name>1</name>
 
       <day>
 	<name>16</name>
 
 	<notice>
 	  <name>FreeBSD-EN-05:03.ipi</name>
 	</notice>
       </day>
 
       <day>
 	<name>6</name>
 
 	<notice>
 	  <name>FreeBSD-EN-05:02.sk</name>
 	</notice>
       </day>
 
       <day>
 	<name>5</name>
 
 	<notice>
 	  <name>FreeBSD-EN-05:01.nfs</name>
 	</notice>
       </day>
     </month>
   </year>
 
   <year>
     <name>2004</name>
 
     <month>
       <name>6</name>
 
       <day>
 	<name>28</name>
 
 	<notice>
 	  <name>FreeBSD-EN-04:01.twe</name>
 	</notice>
       </day>
     </month>
 
     <month>
       <name>2</name>
 
       <day>
 	<name>26</name>
 
 	<release>
 	  <name>FreeBSD 5.2.1-RELEASE</name>
 	</release>
       </day>
     </month>
   </year>
 </advisories>
Index: user/gjb/releng-rewrite/share/xml/usergroups.xml
===================================================================
--- user/gjb/releng-rewrite/share/xml/usergroups.xml	(revision 49724)
+++ user/gjb/releng-rewrite/share/xml/usergroups.xml	(revision 49725)
@@ -1,1131 +1,1141 @@
 <?xml version="1.0"?>
 <!DOCTYPE usergroups PUBLIC "-//FreeBSD//DTD FreeBSD XML Database for UserGroups//EN"
                             "http://www.FreeBSD.org/XML/share/xml/usergoups.dtd">
 
 <usergroups>
     <cvs:keyword xmlns:cvs="http://www.FreeBSD.org/XML/CVS">
       $FreeBSD$
     </cvs:keyword>
 
 <!--
 
 Please keep this file sorted. The schema is quite simple.
 
 <usergroups>
   <continent name="foo">
     <country code="XX" name="bar">
       <entry id="baz">
 
       </entry>
       ...
     </country>
     ...
   </continent>
   ...
 </usergroups>
 
 The country codes are precise ISO3166 codes from, e.g.
 
   https://www.iso.org/obp/ui/#search/code/
 
 -->
 
 <continent name="Global">
   <country name="Global">
   <entry id="metabug" continent="North America">
     <name>The Global BSD User Groups</name>
     <url>http://metabug.org/</url>
     <description>The Global BSD User Groups organization was founded to help
       promote local BSD user groups by helping to share ideas and experiences
       with other BUG organizations.  Our goals are:
       <ul>
 	<li>Foster inter-BUG relations and communications to increase unity
 	  in the BSD user group communities.</li>
 	<li>Assist in increasing awareness of smaller user groups in the
 	  community.</li>
 	<li>Facilitate idea and resource sharing through common access to
 	  meeting presentation topics and materials.</li>
 	<li>Increase exposure to other BSD projects where local user
 	  groups may have less member interest or experience.</li>
 	<li>Offer a BSD user group for those without a local BUG.</li>
       </ul>
       We are working on ways to provide remote participation through streaming
       video of presentations.  You can check our <a
 	href="http://metabug.org/">website</a> or contact us via <a
 	href="mailto:info@metabug">e-mail</a>.
     </description>
   </entry>
   </country>
   </continent>
 
   <continent name="Oceania">
     <country name="Australia" code="AU">
 
     <entry id="humbug">
       <name>Home Unix Users Group for Brisbane</name>
       <url>http://www.humbug.org.au/</url>
       <description>We meet fortnightly at meeting rooms provided by the
         <a href="http://www.uq.edu.au/">University of Queensland</a>.
         More information, including how to join the mailing lists, is
         available at <a
         href="http://www.humbug.org.au/">http://www.humbug.org.au</a>.
         Located in Queensland.
       </description>
     </entry>
 
     <entry id="buga">
       <name>BUGA, The BSD User Group of Adelaide</name>
       <url>mailto:majordomo@lemis.com</url>
       <description>We meet at irregular intervals. Join the mailing
         list by sending a message to <a
         href="mailto:majordomo@lemis.com">majordomo@lemis.com</a> with
         the text <code>subscribe BUGA</code> in the body. Located in
         South Australia.
       </description>
     </entry>
 
     <entry id="bugs">
       <name>BSD Users Group, Sydney (BUGS)</name>
       <url>http://www.bugs.au.FreeBSD.org/</url>
       <description>The BSD Users Group, Sydney (BUGS) meets occasionally
         in Sydney and surrounds. We have members from all over NSW. To
         join the mailing list or IRC channel, visit <a
   	href="http://www.bugs.au.freebsd.org/">
 	http://www.bugs.au.freebsd.org/</a>.  Located in New South Wales.
       </description>
     </entry>
   </country>
 </continent>
 
 <continent name="Europe">
   <country code="AT" name="Austria">
     <entry id="bsdgraz">
       <name>Grazer BSD Stammtisch</name>
       <url>http://graz.bsdstammtisch.at</url>
 
       <description>The "Grazer BSD Stammtisch" is a
         german-language oriented user group with members living in or
         near Graz/Austria.  We usually meet once per month to discuss
         BSD related topics.  For more information please visit our
         <a href="http://graz.bsdstammtisch.at">website</a> or our <a
         href="https://www.facebook.com/GrazerBSDStammtisch">Facebook page</a>.
       </description>
     </entry>
 
     <entry id="bsdwien">
       <name>Wiener BSD Stammtisch</name>
       <url>http://wien.bsdstammtisch.at/</url>
 
       <description>The "Wiener BSD Stammtisch" is a
         german-language oriented user group.  Visit our <a
         href="http://wien.bsdstammtisch.at">website</a> for more information.
         Located in Austria.
       </description>
     </entry>
   </country>
 
   <country code="DK" name="Denmark">
     <entry id="bsd-dk">
       <name>BSD-DK</name>
       <url>http://www.bsd-dk.dk/</url>
       <description>The Danish BSD User Group. Promotion and support of the
         BSD derived Operating Systems in Denmark. Mailing lists, lecture
         and workshops. Send mail subscription requests to <a
         href="mailto:bsd-dk-request@bsd-dk.dk">
 	bsd-dk-request@bsd-dk.dk</a>.  Located in Denmark.
       </description>
     </entry>
   </country>
 
   <country code="AL" name="Albania">
     <entry id="albabug">
       <name>AlbaBUG</name>
       <url>http://www.AlbaBSD.org</url>
       <description>The Albanian BSD Users Group is a group that represents
         and supports *BSD in Albanian language.  More information is
         available at <a href="http://www.AlbaBSD.org">
   	http://www.AlbaBSD.org</a>. Located in Prishtina, Kosova.
       </description>
     </entry>
   </country>
 
   <country code="DE" name="Germany">
     <entry id="augusta">
       <name>Augusta</name>
       <url>http://www.augusta.de/</url>
       <description>The BSD User Group of the Augsburger Computer Forum
         e.V. meets every second Saturday at 17.00.  Please visit our
         <a href="http://www.augusta.de/">web site</a> for more
         information on dates and our address.  We have all kinds of
         BSD, but mainly FreeBSD and Mac OS X.  Located in Germany,
         Augsburg.
       </description>
     </entry>
 
     <entry id="bsdhh">
       <name>BSD User Group Hamburg (BSDHH)</name>
       <url>http://www.bsdhh.org/bsdhh-de-index.html</url>
 
       <description>The BSD User Group Hamburg (BSDHH) meets on the
         first Wednesday of the month at 7.00pm in the restaurant
         <em>L&eacute;on</em> (Koppel 1, 20099 Hamburg).
         Most members are FreeBSD users, although
         users of all BSD flavors are welcome.  Located in Germany,
         Hamburg.
       </description>
     </entry>
 
     <entry id="happabsd">
       <name>HappaBSD Regensburg</name>
       <url>http://www.HappaBSD.de/</url>
 
       <description>HappaBSD is a regulars' table taking place every
 	month in Regensburg, Bavaria, Germany.  For more information
 	see the <a href="http://www.HappaBSD.de/">HappaBSD website</a>.
       </description>
     </entry>
 
     <entry id="uugrn">
       <name>Unix Users Group Rhein-Neckar e.V. (UUGRN e.V.)</name>
       <url>http://www.uugrn.org/</url>
       <description>The Unix Users Group Rhein-Neckar e.V. (UUGRN e.V.)
         provides a regional forum for users of all Unix flavors, with
         a stress on Linux and BSD. <a
         href="http://stammtisch.uugrn.org/">Meetings</a>
         are held on the third Monday of each month in Heidelberg.
         The <a href="http://fixme.uugrn.org/">FIXME</a> meeting happens
         every first Friday of each month in the
         <a href="http://raumzeitlabor.de/">RaumZeitLabor</a> in
         Mannheim.  Located in Germany, <a
         href="http://rhein-neckar-wiki.de/">Rhine-Neckar-Region</a>.
       </description>
     </entry>
 
     <entry id="bim">
       <name>Berkeley in Munich (BIM)</name>
       <url>http://berklix.org/bim/</url>
       <description>The Berkeley in Munich (BIM) caters for users of
         BSD based systems in Oberbayern.  Located in Germany, Munich.
       </description>
     </entry>
 
     <entry id="u-bus">
       <name>Ulmer BSD User Stammtisch</name>
       <url>http://www.u-bus.de</url>
 
       <description>The U-BUS meets every last Thursday of the month.
         For more information about meetings and related issues, please
         check the web page (<a href="http://www.u-bus.de">u-bus</a>).
         Located in Germany, Ulm.
       </description>
     </entry>
 
     <entry id="bluefrogs">
       <name>Bluefrogs e.V.</name>
       <url>http://www.bluefrogs.de/</url>
 
       <description>Unix and Linux User Group in Bergisch Gladbach
         (near Cologne), German.  Meetings are held twice a month.  We
         are working with all Open Source Unix derivates: FreeBSD,
         NetBSD, OpenBSD, Linux and others.  We give workshops,
         lectures, talks and install parties.  For more information
         please email us at: <a
         href="mailto:info@bluefrogs.de">info@bluefrogs.de</a>
       </description>
     </entry>
 
     <entry id="koeln-lug">
       <name>The Koelner Linux und U.n.i.x Gruppe</name>
       <url>http://www.koeln-lug.de/</url>
 
       <description>The Koelner Linux und U.n.i.x Gruppe(Cologne Linux
         and U.n.i.x Group) is a community of Linux and Unix users
         located in Germany, Koeln (Cologne) with a mailing list and
         meetings two times a month.
       </description>
     </entry>
 
     <entry id="bse">
       <name>BSE M&uuml;nchen</name>
       <url>http://bse.42.org/</url>
 
       <description>BSE (BSD Social Event) is located in M&uuml;nchen
         (Munich), Germany.  Feel free to visit our regular meetings
         (every four weeks) or join the mailing list.  For more
         information visit the <a href="http://bse.42.org/">BSE web
         site</a>.
       </description>
     </entry>
   </country>
 
   <country code="ES" name="Spain">
     <entry id="freebsdspain">
       <name>FreeBSD Spain</name>
       <url>http://freebsdspain.blogspot.com/</url>
       <description>FreeBSD Spain is a new FreeBSD user group for
 	Spanish FreeBSD users, where they can share knowledge,
 	ideas, opinions and seek help.  For more information please
 	visit our <a
 	href="http://freebsdspain.blogspot.com/">website</a>.
       </description>
     </entry>
   </country>
 
   <country code="FR" name="France">
     <entry id="fug-fr">
       <name>FUG-FR</name>
       <url>http://www.fug-fr.org/</url>
 
       <description>The FreeBSD User Group France (FUG-FR) is an group
         of FreeBSD enthusiasts in France currently involved
         translating marketing papers etc. They are also active in
         helping out FOSDEM (held in Brussels).  For more information
         please visit our web page <a
         href="http://www.fug-fr.org/">http://www.fug-fr.org</a> or
         contact <a href="mailto:rodrigo@bebik.net">Rodrigo Osorio</a>.
       </description>
     </entry>
   </country>
 
   <country code="RS" name="Serbia">
     <entry id="bsd-srbija">
       <name>The Serbian BSD User Group</name>
       <url>http://www.bsdserbia.org/</url>
 
       <description>The Serbian BSD Users Group provides an open forum
         for all things BSD-related in the Serbian language.  Located
         in Serbia.
       </description>
     </entry>
   </country>
 
   <country code="RU" name="Russia">
     <entry id="lissyara">
       <name>Lissyara.su</name>
       <url>http://www.lissyara.su</url>
 
       <description>We are a russian FreeBSD community.  On our site we
 	offer several articles for setting up FreeBSD and various other
 	applications.  In addtition to the articles we also provide a <a
 	href="http://forum.lissyara.su/">user forum</a> where experienced
 	users of FreeBSD are pleased to be able to help other users.
       </description>
     </entry>
 
     <entry id="rfug">
       <name>Russian FreeBSD User Group (RFUG)</name>
       <url>http://bsdportal.ru</url>
 
       <description>The Russian FreeBSD User Group (RFUG) is a Russian
         language oriented user group for the Russian and ex-USSR
         users.  Located in the Russia.
       </description>
     </entry>
   </country>
 
   <country code="IT" name="Italy">
     <entry id="gufi">
       <name>Gruppo Utenti FreeBSD Italia (GUFI)</name>
       <url>http://www.gufi.org/</url>
 
       <description>The Gruppo Utenti FreeBSD Italia (GUFI) is a
         "italian powered" FreeBSD User Group. It is intended to help
         Italian FreeBSD users to find support and articles on/about
         FreeBSD in the italian language. Please follow this <a
         href="http://www.gufi.org/">link</a> to know more about us.
         Located in Italia.
       </description>
     </entry>
   </country>
 
   <country code="RO" name="Romania">
     <entry id="bsdforums">
       <name>Romanian BSD Forums</name>
       <url>http://bsdforums.unixro.net/</url>
 
       <description>Romanian BSD Forums provides a friendly place for
         the Romanian *BSD community to share knowledge. A specific
         FreeBSD section is available on the forum.
       </description>
     </entry>
 
     <entry id="rofug">
       <name>The Romanian FreeBSD Users Group/Free Unix Group
         (ROFUG)</name>
       <url>http://www.rofug.ro/</url>
 
       <description>The ROFUG (Romanian FreeBSD Users Group/Free Unix
         Group) is a User Group for the Romanian users of FreeBSD and
         Open Source in general, promoting and supporting FreeBSD and
         Open Source usage.  To join the mailing lists, send an email
         to <a href="mailto:listar@rofug.ro">listar@rofug.ro</a> with
         <code>subscribe rofug</code> and/or <code>subscribe
         rofug-announce</code> in the body of the message. Located in
         Romania.
       </description>
     </entry>
   </country>
 
   <country code="LV" name="Latvia">
     <entry id="bug-lv" >
       <name>BSD User Group Latvia</name>
       <url>http://www.bug.lv</url>
 
       <description>To learn more about the BSD User Group Latvia,
         please visit our <a href="http://www.bug.lv/">site</a> and our
         <a href="http://www.bug.lv/">forums</a>.  Located in Latvia.
       </description>
     </entry>
   </country>
 
   <country code="NO" name="Norway">
     <entry id="nobug" >
       <name>The Norwegian BSD User Group (NOBUG)</name>
       <url>http://www.nobug.no/</url>
 
       <description>The Norwegian BSD User Group (NOBUG) is a User
         Group for BSD users and enthusiasts in Norway.  Meetings are
         currently held in Oslo and Bergen.  Visit our website for more
         information.  There is also a Unix User Group (<a
         href="http://www.nuug.no/"> NUUG</a>) with more regular
         meetings, sometimes even with a BSD subject.  Located in
         Norway.
       </description>
     </entry>
   </country>
 
   <country code="PL" name="Poland">
     <entry id="lublin" >
       <name>The Lublin BSD Users Group</name>
       <url>http://www.FreeBSD.lublin.pl/</url>
       <description>Please follow the link for details.  Located in Poland.
       </description>
     </entry>
   </country>
 
   <country code="PT" name="Portuguese">
     <entry id="ptbsd" >
       <name>The Portuguese *BSD Users Group</name>
       <url>mailto:ptbsd@yahoo.com</url>
 
       <description>The Portuguese *BSD Users Group is a User Group for
         Portuguese users of BSD operating systems.  Contact Rui
         Pereira <a href="mailto:ptbsd@yahoo.com">ptbsd@yahoo.com</a>
         for more information.  Located in Portugal, Amadora.
       </description>
     </entry>
   </country>
 
   <!-- Ask pgj@ before touching this entry. -->
   <country code="HU" name="Hungary">
     <entry id="bsdhu">
       <name>The Hungarian BSD Group</name>
       <url>http://www.bsd.hu/</url>
 
       <description>The Hungarian BSD Group is a group of NetBSD, &os;,
 	and OpenBSD users located in Hungary.  Their meetings occur on
 	the second Friday of the month.  The website of the group is <a
 	  href="http://www.bsd.hu/">http://www.bsd.hu/</a>.</description>
     </entry>
   </country>
 
   <country code="SE" name="Sweden">
     <entry id="bus" >
       <name>BSD Users Sweden (BUS)</name>
       <url>http://bsdusers.se/</url>
 
       <description>The BSD Users Sweden (BUS) maintains a mailing
         list. To join send an email to <a
         href="mailto:majordomo@stacken.kth.se">
         majordomo@stacken.kth.se</a> with <code>subscribe bus</code>
         in the body. Located in Sweden.
       </description>
     </entry>
 
     <entry id="freebsd-se" >
       <name>The Swedish FreeBSD Community</name>
       <url>http://www.FreeBSD.se/</url>
 
       <description>FreeBSD.se is a Swedish FreeBSD community in which
         one can read and post articles and how-to:s in Swedish.  There
         is also an active forum for asking questions and helping
         others with problems related to FreeBSD.
       </description>
     </entry>
   </country>
 
   <country code="UA" name="Ukraine">
     <entry id="uafug" >
       <name>Ukrainian FreeBSD User Group (UAFUG)</name>
       <url>http://www.uafug.org.ua/</url>
 
       <description>The Ukrainian FreeBSD User Group (UAFUG) is a
         Russian/Ukrainian languages oriented user group for the
         Ukrainian users of BSD-derivatives, promoting and supporting
         BSD flavours and Open Source usage.  The UAFUG has had its
         first meeting on 2 June 2002 and meets every 2-3 weeks.  We
         also provide an open forum for all BSD-related things in the
         Russian and Ukrainian languages (though we can read/write in
         english as well).  To join the mailing list send a message to
         <a href="mailto:majordomo@FreeBSDDiary.org.ua">
         majordomo@FreeBSDDiary.org.ua</a> with <code>subscribe
         freebsd</code> in the body of the message. Check the <a
         href="http://www.uafug.org.ua/">link</a> above for more
         information.  Located in the Ukraine.
       </description>
     </entry>
   </country>
 
   <country code="GB" name="UK">
     <entry id="bsdgroups" >
       <name>Manchester BSD Users Group</name>
       <url>http://www.bsdgroups.org.uk/manchester</url>
 
       <description>The Manchester BSD Users Group meets reasonably
         often in the Lass O'Gowrie, on Charles Street, Manchester.
         Contact <a href="mailto:sams@bsdgroups.org.uk">Sam Smith</a>
         for more information.  Located in The United Kingdom,
         Manchester.
       </description>
     </entry>
 
     <entry id="ukug">
       <name>FreeBSD UK Users group (FreeBSD UKUG)</name>
       <url>http://mailman.uk.freebsd.org/mailman/listinfo/ukfreebsd</url>
 
       <description>The FreeBSD UKUG (FreeBSD UK User's Group) exists
         for the benefit of FreeBSD users in the United Kingdom.
         Please follow the link for more information.  Located in
         the United Kingdom.
       </description>
     </entry>
   </country>
 </continent>
 
 <continent name="North America">
   <country code="US" name="USA">
   <entry id="amesfug">
     <name>The Ames Free-Unix Group (amesfug)</name>
     <url>http://www.amesfug.org</url>
     <description>The Ames Free-Unix Group aims to promote the use of
       Free Unix.  We meet on the campus of Iowa State University once a
       month and hold a presentation with an open question and answer
       session afterwards.  You can join our mailing list by visiting
       <a href="http://lists.amesfug.org/mailman/listinfo">
 	http://lists.amesfug.org/mailman/listinfo</a>.  Located in
       Ames, Iowa.
     </description>
   </entry>
 
   <entry id="bugor">
     <name>BSD User Group Oak Ridge (BUGOR)</name>
     <url>http://sites.google.com/site/bugortn/Home</url>
     <description>BUGOR is an open and free network of BSD users in the
       Oak Ridge TN area.  Ideally, professional sysadmins, programmers
       and grizzled old hackers will meet each week to explore and debate
       the intricacies of the Unix design philosophy and the art of Unix
       programming while mentoring neophyte users and rehabilitating
       WIMP users.
     </description>
   </entry>
 
   <entry id="buug">
     <name>The Berkeley Unix User Group</name>
     <url>http://www.buug.org</url>
     <description>The Berkeley Unix User Group is a general Unix Users
       Group for anyone in the San Fransico Bay Area.  We meet on a
       weekly basis in downtown Berkeley.  Visit the web site or send a
       message to <a href="mailto:buug-request@weak.org">
         buug-request@weak.org</a> with <code>subscribe</code> in the
       body.  Located in Berkeley, CA.
     </description>
   </entry>
 
   <entry id="cdbug">
     <name>The Capitals District *BSD Users Group</name>
     <url>http://lists.nycbug.org/mailman/listinfo/cdbug-talk</url>
     <description>The Capitals District *BSD Users Group draws it's
       membership from New York's capital district and the surrounding
       communities.  CDBUG was founded in December of 2004 and has a
       small but growing membership.  We currently meet on the last
       Sunday of every month in the Albany area.  Our mailing list is
       graciously being hosted by NYCBUG at: <a
 	href="http://lists.nycbug.org/mailman/listinfo/cdbug-talk">
 	http://lists.nycbug.org/mailman/listinfo/cdbug-talk</a>.
       Located in Albany, NY.
     </description>
   </entry>
 
   <entry id="chifug">
     <name>The Users of Free Operating Systems (UFO Chicago)</name>
     <url>http://www.chifug.org</url>
     <description>The Users of Free Operating Systems (UFO Chicago) is
       an open-source Unix User Group that meets twice a month
       in Chicago.  For directions and mailing list information, please
       check our web site <a href="http://ufo.chicago.il.us">
         http://ufo.chicago.il.us</a>.  Chicago, IL.
     </description>
   </entry>
 
   <entry id="cfug">
     <name>The Connecticut Free Unix Users Group (CFUG)</name>
     <url>http://www.cfug.org</url>
     <description>The Connecticut Free Unix Users Group (CFUG) is
       devoted to free Unix, but has resources for almost all Unixen.
       Their area of operation is Connecticut and Western Massachusetts.
       More information can be found at <a href="http://www.cfug.org/">
         http://www.cfug.org</a>.  Located in Connecticut.
     </description>
   </entry>
 
   <entry id="cobug">
     <name>The Colorado BSD Users Group (CoBUG)</name>
     <url>http://cobug.org</url>
     <description>Created in 2014, CoBUG is a completely open BSD community,
       established with the intention of spreading love for the BSDs.
       Located in Colorado.
     </description>
   </entry>
 
   <entry id="kulua">
     <name>Kansas Unix &amp; Linux Users Association (KULUA)</name>
     <url>http://kulua.org</url>
     <description>The Kansas Unix &amp; Linux Users Association (KULUA)
       is a Free Unix User Group based in Lawrence, Kansas, but with
       users throughout eastern Kansas and western Missouri.  We have
       about 120 members and meet biweekly.  Visit the web site or email
       <a href="mailto:kulua@kulua.org">kulua@kulua.org</a> for more
       information.  Located in Lawrence, Kansas.
     </description>
   </entry>
 
   <entry id="knoxbug">
     <name>KnoxBUG</name>
     <url>http://knoxbug.org</url>
     <description>The Knoxville, Tennessee BSD User Group (KnoxBUG)
       meets once a month. For more information, please visit
       <a href="http://knoxbug.org">http://knoxbug.org</a> and/or
       subscribe to our <a
 	href="http://lists.nycbug.org/mailman/listinfo/knoxbug-talk">mailing
 	list</a>.
     </description>
   </entry>
 
   <entry id="yahoo-club">
     <name>The Yahoo Club</name>
     <url>http://groups.yahoo.com/neo/groups/bsdusersoflosangeles/info</url>
     <description>The Yahoo Club group is a foundation for a Los Angeles
       based BSD User Group.  Located in Los Angeles, CA.
     </description>
   </entry>
 
   <entry id="nmlug">
     <name>NMLUG</name>
     <url>mailto:majordomo@swcp.com</url>
     <description>The NMLUG in Alburquerque meets once a month and
       supports both BSD and Linux users.  To join the mailing list,
       send a message to <a href="mailto:majordomo@swcp.com">
         majordomo@swcp.com</a> with <code>subscribe nmlug</code> in
       the body.  Located in New Mexico.
     </description>
   </entry>
 
   <entry id="nycbug">
     <name>New York City *BSD User Group (NYCBUG)</name>
     <url>http://www.nycbug.org</url>
     <description>The New York City *BSD User Group (NYCBUG) meets the
       first Wednesday of the month.  Mailing lists are available at
       <a href="http://lists.nycbug.org">http://lists.nycbug.org</a>.
       Located in New York, NY.
     </description>
   </entry>
 
   <entry id="raleighbug">
     <name>The Raleigh BSD Users Group </name>
     <url>http://www.raleighbug.org/</url>
     <description>The Raleigh BSD Users group welcomes all BSD users
       of the Raleigh, NC area.  The purpose of the group is to
       exchange ideas and learn about Unix.  Please visit <a
       href="http://www.raleighbug.org">our website</a> for
       more information.
     </description>
   </entry>
 
   <entry id="sacblug">
     <name>The Sacramento BSD and Linux Users Group (SacBLUG)</name>
     <url>http://sacblug.org/</url>
     <description>The Sacramento BSD and Linux Users Group (SacBLUG) is
       a collaborative effort amongst *BSD/Linux professionals in the
       Sacramento area, with a focus on enterprise and server
       environments.  Our aim is to share our experiences in managing
       and maintaining systems while also providing a social network
       for members.  Check out <a
       href="http://sacblug.org">our website</a> for more information.
     </description>
   </entry>
 
   <entry id="yfuug">
     <name>Yavapai Free Unix Users Group</name>
     <url>mailto:rcarter@consys.com</url>
     <description>The Yavapai Free Unix Users Group is now forming for
       *BSD/Linux, etc., users in Northern Arizona.  Please contact
       Russel Carter (<a href="mailto:rcarter@consys.com">
         rcarter@consys.com</a>) for details.  Located in Northern
       Arizona.
     </description>
   </entry>
 
   <entry id="wplug">
     <name>Western Pennsylvania Linux Users Group (WPLUG)</name>
     <url>http://www.wplug.org</url>
     <description>The Western Pennsylvania Linux Users Group (WPLUG)
       has a strong and growing community of BSD users that it supports.
       See our home page (<a href="http://www.wplug.org">
         http://www.wplug.org</a>) for information on regular meetings
       and join the mailing lists.  Located in Pennsylvania.
     </description>
   </entry>
 
   <entry id="pbclug">
     <name>Palm Beach County Linux Users Group</name>
     <url>http://groups.yahoo.com/group/pbclinux</url>
     <description>We are a user group for discussion and advocacy of
       Linux, FreeBSD and other Open Source operating systems and Open
       Source software.  While most members run Linux systems, there are
       FreeBSD users in the group.  Discussion and questions on any
       Open Source operating system topic or on Open Source software
       in general is welcome.  The organization also actively
       participates in events such as Software Freedom Day.
       Send us an <a href="mailto:pbclug@Comcast.net">email</a> or
       join our <a
       href="http://groups.yahoo.com/group/pbclinux">mailinglist</a>.
     </description>
   </entry>
 
   <entry id="phoenix">
     <name>Phoenix BSD Users Group</name>
     <url>http://bsd.phoenix.az.us</url>
     <description>The Phoenix BSD Users Group is fully open for business.
       Anyone from the Phoenix area please feel free to join in <a
         href="http://bsd.phoenix.az.us">http://bsd.phoenix.az.us</a>.
       Located in Phoenix, AZ.
     </description>
   </entry>
 
   <entry id="portland">
     <name>Portland (Oregon) FreeBSD Users Group</name>
     <url>mailto:pdx-freebsd@toybox.placo.com</url>
     <description>The Portland (Oregon) FreeBSD Users Group meets on the
       third Thursday of each month.  Mail <a
         href="mailto:pdx-freebsd@toybox.placo.com">The Portland FreeBSD
 	Users Group</a>.  Located in Portland, OR.
     </description>
   </entry>
 
   <entry id="rlug">
     <name>Reno Linux Users Group (RLUG)</name>
     <url>http://www.rlug.org</url>
     <description>The Reno Linux Users Group (RLUG) meets monthly in Reno,
       Nevada and discusses the use of BSD and Linux.  Visit <a
 	href="http://www.rlug.org">our website</a> for more information,
       where you may also join our mailing list. Located in Reno, NV.
     </description>
   </entry>
 
   <entry id="seabug">
     <name>Seattle BSD Users Group (SeaBUG)</name>
     <url>http://www.seabug.org</url>
     <description>The Seattle BSD Users Group (SeaBUG) meets
       occasionally.  View our web site for more details and for
       information on how to join our mailing list.  Located in
       Seattle, WA.
     </description>
   </entry>
 
   <entry id="sdbug">
     <name>San Diego BSD Users Group</name>
     <url>http://www.sdbug.org</url>
     <description>The San Diego BSD Users Group for users of FreeBSD,
       OpenBSD and NetBSD.  The meeting is first Thursday of every month
       at Boll Weevil off Clairemont Mesa Blvd., near the intersection
       with Ruffin Road.  More information can be found <a
         href="http://www.sdbug.org">here</a>.  Located in San Diego, CA.
     </description>
   </entry>
 
   <entry id="bafug">
     <name>Bay Area FreeBSD Users Group (BAFUG)</name>
     <url>http://www.bafug.org</url>
     <description>The Bay Area FreeBSD Users Group (BAFUG) has monthly
       meetings at the Hacker Dojo.  More information can be found <a
       href="http://www.bafug.org">on their site</a>.  Located in the San
       Francisco Bay Area.
     </description>
   </entry>
 
   <entry id="tfug">
     <name>Tucson Free Unix Group (TFUG)</name>
     <url>http://www.tfug.org</url>
     <description>Tucson Free Unix Group, Arizona.  Located in Tucson,
       AZ.
     </description>
   </entry>
 
   <entry id="su3g">
     <name>The Southern Utah Unix Users Group (SU3G)</name>
     <url>http://www.su3g.org</url>
     <description>
       The Southern Utah Unix Users Group (SU<sup>3</sup>G, SU^3G, SU3G,
       or SUUUG) is for users of any version of Unix or Unix-like
       operating system, commercial or open source.  So, whether you use
       FreeBSD, Linux, Mac OS X, BSD/OS, Solaris, OpenBSD, or any other
       Unix or Unix-like OS, and if you live, work, or associate with
       someone who lives or works in southwestern Utah, then consider
       joining the SU<sup>3</sup>G.  For more information send an email
       to <a href="mailto:kendall@su3g.org">kendall@su3g.org</a> or
       visit the website at <a href="http://www.su3g.org/">
         http://www.su3g.org/</a>.
     </description>
   </entry>
 
   <entry id="gllug">
     <name>Greater Lansing Linux User Group</name>
     <url>http://gllug.org</url>
     <description>GLLUG is an organization for users of Linux, FreeBSD,
       and associated free software in Lansing, Michigan (USA) and the
       surrounding area.  As with the organization at large, the weekly
       meetings are very informal.  We talk about what we've been working
       on for the last few weeks and catch each other up with what is
       going on.  Often there is an official topic proposed ahead of time
       on the mailing list, but sometimes we just discuss what is on our
       minds.
     </description>
   </entry>
 
   <entry id="capbug">
     <name>Capital Area BSD Users Group</name>
     <url>http://capbug.org</url>
     <description>We meet on the last Tuesday of the month.  Join our
       <a href="http://groups.google.com/group/capbug">mailing list</a>
       or visit our web site <a href="http://www.capbug.org">here</a>.
       We meet in Maryland, but welcome anyone from MD, DC or VA.
     </description>
   </entry>
 
   <entry id="kcbug">
     <name>Kansas City Area *BSD User.s Group</name>
     <url>http://www.kcbug.org</url>
     <description>We are a beginning BSD User Group with currently two
       members. If you would like to join, please visit our web site
       <a href="http://www.kcbug.org/">here</a>.  Our goals are to have
       fun, help others to learn about and using *BSD and evangelize the
       BSD operating systems.
     </description>
   </entry>
 
   <entry id="wcosug">
     <name>Western Connecticut's Open Source User Group (WCOSUG)</name>
     <url>http://wcosug.org</url>
     <description>WCOSUG is The Western Connecticut Open Source User
       Group. Unlike Linux User Groups we also recognize the BSD's and
       other operating systems. We are based in Fairfield County, CT,
       we have several users based on the CT, NY border and due to lack
       of an Eastern NY User Group we feel that it is our job to pull up
       the slack and help these users out.
     </description>
   </entry>
 
   </country>
 
   <country code="CA" name="Canada">
   <entry id="gtabug">
     <name>GTABUG</name>
     <url>http://www.gtabug.ca</url>
     <description>The GTABUG User Group welcomes all BSD users.  Monthly
       meetings give attendees a chance to share ideas, discussion and
       information.  Installations and other events help preach the good
       news of BSD to the community.  Come drop by for a meeting!
       Located in Greater Toronto Area, Ontario.
     </description>
   </entry>
   <entry id="wuug">
     <name>Windsor Unix Users Group</name>
     <url>http://www.wuug.org</url>
     <description>The Windsor Unix Users Group (Windsor, Ontario, Canada)
       covers BSD, Solaris, SCO and others.  This is not specifically a
       FreeBSD User Group, but we do already have members running
       FreeBSD.  The group operates a mailing list
       (wuug-list@unixpower.org).  More information can be found at <a
       href="http://www.wuug.org">http://www.wuug.org</a>.
     </description>
   </entry>
 
   <entry id="ottawa">
     <name>Ottawa-Carleton Unix Users Group</name>
     <url>http://www.ocbug.ca/</url>
     <description>We are a small group of
       hobbyists, users, authors, sysadmins, and hackers that meet monthly to
       discuss the latest topics in a very informal setting.  Check our
       <a href="http://mail.ocbug.ca/mailman/listinfo/ocbug_ocbug.ca">mailing list</a>
       for the latest information.
       Located in Ottawa, Ontario.
     </description>
   </entry>
   </country>
 
   <country code="MX" name="Mexico">
   <entry id="freebsd-mexico">
     <name>The FreeBSD Mexican Community</name>
     <url>http://www.freebsd.mx</url>
     <description>The FreeBSD Mexican Community is a spanish language
       orientated user group which wants to promote and educate people about
       BSD operating systems by making tutorials and organizing events and
       conferences.  We are also working with other Open Source Unix
       derivates like NetBSD, OpenBSD and Linux.  For more
       information please visit our <a href="http://freebsd.mx/">website</a>
       or send us an <a href="mailto:ernesto@freebsd.mx">email</a>.
     </description>
   </entry>
   </country>
 </continent>
 
 <continent name="South America">
   <country code="AR" name="Argentina">
   <entry id="beersd-argentina">
     <name>bug.dc.uba.ar</name>
     <url>http://bug.dc.uba.ar</url>
 
     <description>Buenos Aires based group with monthly meetings.
       Comprised of many students at the University of Buenos Aires
       Computer Science department.</description>
   </entry>
   </country>
 
   <country code="PE" name="Peru">
   <entry id="bsdperu">
     <name>The BSD Users Group Peru</name>
     <url>http://www.bsd-peru.org</url>
     <description>The BSD Users Group Peru is a group of people with the
       objective to promote the use of the different *BSD systems in Peru.
       They provide information, documentation and forums for discussion.
       For more information you can use their web site <a
 	href="http://www.bsd-peru.org">http://www.bsd-peru.org</a> or write to
       <a href="mailto:contacto@bsd-peru.org">contacto@bsd-peru.org</a>
     </description>
   </entry>
   </country>
 
   <country code="VE" name="Venezuela">
   <entry id="bsd-ve">
     <name>Grupo de Usuarios BSD de Venezuela</name>
     <url>http://groups.google.com/group/bsd-ve/about</url>
     <description>The Grupo de Usuarios BSD de Venezuela is a forum
       for *BSD users in Venezuela.  For more information please
       contact the group admin <a
       href="mailto:amijaresp@gmail.com">Alberto Mijares</a>.
     </description>
   </entry>
   </country>
   
   <country code="BR" name="Brazil">
   <entry id="fugspbr">
     <name>The Brazilian FreeBSD User Group (FUG-BR)</name>
     <url>http://www.fug.com.br</url>
     <description>The Brazilian FreeBSD User Group (FUG-BR) is a
       Portuguese language oriented User Group intended to help
       Brazilian FreeBSD users to find support and articles on and
       about FreeBSD in the Portuguese language.  We keep some projects
       such as the "<a href="http://www.sourceforge.net/projects/livecd">
 	FreeBSD LiveCD</a>".  Currently the group has over 800 members and
       our mailing list has an average traffic of 80 messages per day.
       To join FUG-BR mailing list, visit <a
 	href="https://www.fug.com.br/mailman/listinfo/www">
 	https://www.fug.com.br/mailman/listinfo/www</a>.
     </description>
   </entry>
 
   <entry id="bsdsul">
     <name>User Group BsdSul</name>
     <url>http://www.bsdsul.com.br/</url>
     <description>The User Group BsdSul (Grupo de Usuarios
       de FreeBSD du Sul do Brasil) is a South Brazilian
       User Group of FreeBSD.  They provide information,
       documentation and forums for discussion.  For more
       information you can use their web site.
     </description>
   </entry>
   </country>
 
   <country code="CL" name="Chile">
   <entry id="bsdcl">
     <name>BSD Chile</name>
     <url>http://www.bsd.cl</url>
 
     <description>The BSD Chile User Group (bsd.cl) maintains mirrors,
       documents, and mailing lists for the Chilean BSD community.  The
       group also provides infrastructure for BSD events in Chile and
       can be reached on the IRC server irc.bsd.cl #BSD in addition to
       the <a href="http://www.bsd.cl">www.bsd.cl</a> web site.
       </description>
 
   </entry>
   </country>
 </continent>
 
 <continent name="Asia">
   <country code="CN" name="China">
   <entry id="freebsdchina">
     <name>The FreeBSD China Community</name>
     <url>http://www.freebsdchina.org</url>
     <description>The FreeBSD China Community was formed June
       2002.  We provide Web based support <a
 	href="http://www.FreeBSDChina.org/forum/">forum</a>
       and <a href="http://wiki.FreeBSDChina.org/">wiki</a>
       on FreeBSD and other *BSD technologies.</description>
   </entry>
   </country>
 
   <country code="JP" name="Japan">
   <entry id="debug">
     <name>The Daibou East *BSD Users Group (DEBUG)</name>
     <url>http://www.debug.gr.jp</url>
     <description>The Daibou East *BSD Users Group (DEBUG) is now
       forming for *BSD users in Tsukuba area.  Located in Ibaraki,
       Japan.
     </description>
   </entry>
   <entry id="kbug">
     <name>The Kansai *BSD Users Group (K*BUG)</name>
     <url>http://www.kbug.gr.jp</url>
     <description>The Kansai *BSD Users Group was established on
       November 13, 1999.  It is expected to promote communication of
       any of the BSD variants' users.  Some of its activities are to
       hold friendly parties of the members, and to hold seminars
       covering wide variety of topics.  Please e-mail here (<a
         href="mailto:kbug-admin@kbug.gr.jp">kbug-admin@kbug.gr.jp</a>).
       Located in Kansai, Japan.
     </description>
   </entry>
   <entry id="ebug">
     <name>The Echigo BSD Users Group (EBUG)</name>
     <url>http://www.ebug.jp</url>
     <description>The Echigo BSD Users Group is the users group for BSD
       users around Echigo (aka Niigata).  For more information on our
       events and mailing lists, please check the EBUG web site.
     </description>
   </entry>
 
   </country>
 
   <country code="ID" name="Indonesia">
   <entry id="jfug">
     <name>The Jogja FreeBSD Users Group</name>
     <url>mailto:22961476@students.ukdw.ac.id</url>
     <description>The Jogja FreeBSD Users Group is based in Yogyakarta
       City, Indonesia.  Send email to <a
         href="mailto:22961476@students.ukdw.ac.id">
 	22961476@students.ukdw.ac.id</a> for more information.
     </description>
   </entry>
+
+  <entry id="fiug">
+    <name>FreeBSD Indonesia User Group</name>
+    <url>http://www.belajarfreebsd.or.id</url>
+    <description>We are FreeBSD Indonesia User Group.  We share, we
+      learn all about the BSD system, and all about Open Source.  For
+      more information, visit <a
+	href="http://www.belajarfreebsd.or.id ">http://www.belajarfreebsd.or.id</a>.
+    </description>
+  </entry>
   </country>
 
   <country code="IL" name="Israel">
 
   <entry id="ibug">
     <name>The Israeli *BSD Users Group</name>
     <url>mailto:bsd-il@libagent.org</url>
     <description>The Israeli *BSD Users Group has a mailing list for
       general discussion of *BSD operating systems for Israeli users,
       which includes topics such as setting up and working with
       Hebrew in BSD and setting up Internet connections with ISPs.
       The Israeli *BSD mailing list promotes the use of *BSD throughout
       the country, and acts as an information center for all *BSD users.
       Mailing list posts can be sent to <a
         href="mailto:bsd-il@libagent.org">bsd-il@libagent.org</a>.
       Visit <a href="http://www.libagent.org/mailman/listinfo/bsd-il">
         http://www.libagent.org/mailman/listinfo/bsd-il</a> to
       subscribe. Located in Israel.
     </description>
   </entry>
   </country>
 
   <country code="MY" name="Malaysia">
   <entry id="mybsd-malaysia">
     <name>The MyBSD Malaysia Project</name>
     <url>http://www.mybsd.org.my</url>
     <description>The MyBSD Malaysia Project is a Kuala Lumpur based User
       Group for BSD users and open-source in general, promoting and
       supporting FreeBSD, OpenBSD, NetBSD and open source usage.  We
       meet once a month, usually at Universiti Malaya or Restaurant
       Bahadur Shah.  One of our projects is to develop a <a
         href="http://staff.mybsd.org.my/skywizard/bsd-explorer">Unix
 	file manager</a>.  Visit our web site or contact <a
 	href="mailto:info@mybsd.org.my">info@MyBSD.org.my</a> for more
       information.
     </description>
   </entry>
   </country>
 
   <country code="PK" name="Pakistan">
   <entry id="bsdpakistan">
     <name>BSD Pakistan</name>
     <url>http://bsdpakistan.org/</url>
     <description>BSD Pakistan is a user community who aims to promote
       and educate people about BSD Operating Systems; including FreeBSD,
       NetBSD, OpenBSD, DragonFly BSD and Mac OS X.  For more information
       please visit our web site.
     </description>
   </entry>
   </country>
 
   <country code="IN" name="India">
   <entry id="ndbug">
     <name>New Delhi BSD User Group</name>
     <url>http://ndbug.in</url>
     <description>The New Delhi BSD User Group (NDBUG) is a group of
       hobbyists, professionals, and enthusiasts. Our members share
       interests in BSD Unix and free implementations of Unix, as well
       as other open source software. NDBUG was founded to disseminate
       knowledge of BSD Unix, open source software, and related technologies
       and interests in India and New Delhi specifically.</description>
   </entry>
   </country>
 
   <country code="MN" name="Mongolia">
 
   <entry id="muug">
     <name>Mongolian Unix User Group (MUUG)</name>
     <url>http://www.unix.org.mn/</url>
     <description>MUUG - (Mongolian Unix User Group) was formed in 2004
       and it is based in Ulaanbaatar, Mongolia.  It was established to
       share the knowledge, promote and educate people about
       Unix, Linux, and BSD operating systems and open source software.
       For more information please visit the web site at
       <a href="http://www.unix.org.mn/">http://www.unix.org.mn/</a>.
       The web site is in Mongolian only.</description>
   </entry>
   </country>
 
   <country code="BD" name="Bangladesh">
   <entry id="bangladesh">
     <name>Bangladeshi FreeBSD User Group</name>
     <url>http://www.freebsdmovement.org/</url>
     <description>The Bangladeshi FreeBSD User Group is a group of the FreeBSD
       users in Bangladesh.  This group aims to build the scope of sharing
       knowledge and experiences on FreeBSD.
     </description>
   </entry>
   </country>
 
   <country code="TR" name="Turkey">
   <entry id="enderunix">
     <name>EnderUNIX (Turkish *BSD team)</name>
     <url>http://www.enderunix.org/?lng=en</url>
     <description>EnderUNIX is a Turkish BSD user group that provides
       documentation, tips, mailing lists, and mirrors for BSD operating
       systems.</description>
   </entry>
   </country>
 
 </continent>
 </usergroups>
Index: user/gjb/releng-rewrite/share
===================================================================
--- user/gjb/releng-rewrite/share	(revision 49724)
+++ user/gjb/releng-rewrite/share	(revision 49725)

Property changes on: user/gjb/releng-rewrite/share
___________________________________________________________________
Modified: svn:mergeinfo
## -0,0 +0,1 ##
   Merged /head/share:r49706-49724
Index: user/gjb/releng-rewrite/zh_TW.UTF-8/share/xml/news.xml
===================================================================
--- user/gjb/releng-rewrite/zh_TW.UTF-8/share/xml/news.xml	(revision 49724)
+++ user/gjb/releng-rewrite/zh_TW.UTF-8/share/xml/news.xml	(revision 49725)
@@ -1,2641 +1,2697 @@
 <?xml version="1.0" encoding="utf-8" ?>
 <!DOCTYPE news PUBLIC "-//FreeBSD//DTD FreeBSD XML Database for News//EN"
                       "http://www.FreeBSD.org/XML/www/share/xml/news.dtd">
 
 <!-- Simple schema for FreeBSD Project news.
 
      Divide time in to <year>, <month>, and <day> elements, each of which
      has a <name>.
 
      each <day> element contains one or more <event> elements.
 
      Each <event> contains an optional <title>, and then a <p>.  <p> elements
      can contain <a> anchors.  Within the "href" attribute of the anchor
      &base; or &enbase; will be replaced with the base URI necessary to reach
      the FreeBSD document root, and should always be used to start URLs at
      www.FreeBSD.org or one of the mirrors.
 
      Use the <title> element if the <p> content is lengthy.  When generating
      synopses of this information (e.g., for syndication using RDF files),
      the contents of <title> will be preferred over <p>.
 
      The FreeBSD Traditional Chinese Documentation Project
      Original Revision: 1.40
      From: www/share/xml/news.xml
 -->
 
 <news>
     <cvs:keyword xmlns:cvs="http://www.FreeBSD.org/XML/CVS">
       $FreeBSD$
     </cvs:keyword>
 
   <year>
     <name>2016</name>
 
     <month>
       <name>11</name>
 
       <day>
 	<name>15</name>
 
 	<event>
 	  <p>新任 committer:
 	    <a href="mailto:misha@FreeBSD.org">Mikhail Pchelin</a> (ports)</p>
 	</event>
       </day>
 
 
       <day>
 	<name>13</name>
 	
 	<event>
 	  <title>2016 第三季開發進度報告發佈</title>
 
 	  <p><a
 	      href="&enbase;/news/status/report-2016-07-2016-09.html">
 	      2016 第三季開發進度報告</a>現已發佈</p>
 	</event>
       </day>
       
       <day>
 	<name>2</name>
 
 	<event>
 	  <p>新任 committer:
 	    <a href="mailto:def@FreeBSD.org">Konrad Witaszczyk</a> (src)</p>
 	</event>
       </day>
     </month>
     
     <month>
       <name>10</name>
 
       <day>
 	<name>22</name>
 
 	<event>
 	  <p>新任 committer:
 	    <a href="mailto:dab@FreeBSD.org">David Bright </a> (src)</p>
 	</event>
       </day>
 
       <day>
 	<name>10</name>
 
 	<event>
 	  <title>&os;&nbsp;11.0-RELEASE 發佈了</title>
 	  <p><a href="&enbase;/releases/11.0R/announce.html">FreeBSD 11.0-RELEASE</a>現已發佈了。安裝前，請查看 <a href="&enbase;/releases/11.0R/relnotes.html">發佈通知</a> 和 <a href="&enbase;/releases/11.0R/errata.html">發行勘誤</a> 以了解 11.0的最新消息和問題。更多資訊可查看<a href="&enbase;/releases/index.html">發行版資訊</a>頁面</p>
 	</event>
       </day>
 
     </month>
+
+    <month>
+      <name>9</name>
+
+      <day>
+	<name>16</name>
+
+	<event>
+	  <p>新任 committer:
+	    <a href="mailto:sevan@FreeBSD.org">Sevan Janiyan</a>
+	    (doc)</p>
+	</event>
+      </day>	
+
+      <day>
+	<name>28</name>
+
+	<event>
+	  <title>&os;&nbsp;11.0-RELEASE 進度更新</title>
+
+	  <p>為了處理一些發佈時最新更新的項目，最終的 11.0-RELEASE 將重新建構。
+	    更多資訊請參見發行工程團隊的 <a
+	      href="&lists.announce;/2016-September/001753.html">官方公告
+	    </a>。
+	    </p>
+	</event>
+      </day>
+
+      <day>
+	<name>17</name>
+
+	<event>
+	  <p>新任 committer:
+	    <a href="mailto:rcyu@FreeBSD.org">Ruey-Cherng Yu</a>
+	    (doc)</p>
+	</event>
+
+        <event>
+	  <p>新任 committer:
+            <a href="mailto:jrm@FreeBSD.org">Joseph Mingrone</a>
+            (ports)</p>
+        </event>        
+
+	<event>
+	  <title>&os;&nbsp;11.0-RC3 發佈了</title>
+
+	  <p> &os;&nbsp;11.0 的第三個候選發佈版本現已發佈。
+	      用於 amd64、armv6,i386、aarch64、powerpc、powerpc64 和 sparc6 的 ISO 映像檔案
+	    已經<a
+	      href="&lists.stable;/2016-September/085645.html">發佈</a>，
+	    可以在多數的<a
+	      href="&url.doc.base-en;/books/handbook/mirrors-ftp.html">&os;
+	      鏡像站</a>取得</p>
+	</event>
+      </day>
+    </month>
   </year>
 
   <year>
     <name>2006</name>
     <month>
       <name>12</name>
 
       <day>
 	<name>27</name>
 	<event>
 	  <p>New committer: <a href="mailto:jls@freebsd.org">Jordan Sissel</a>
 	    (src)</p>
 	</event>
 
 	<event>
 	  <title>FreeBSD 6.2-RC2 Available</title>
 
 	  <p>FreeBSD 6.2 的第二個候選發佈版本現已 <a
 	    href="http://lists.freebsd.org/pipermail/freebsd-stable/2006-December/031742.html">發佈</a>。
 	    用於 Tier-1 平台的 ISO 映像檔案，已可以透過眾多的
 	    <a href="http://www.FreeBSD.org/doc/zh_TW.UTF-8/books/handbook/mirrors-ftp.html">
 	    FreeBSD 鏡像站點</a> 獲得。</p>
 	</event>
       </day>
 
       <day>
 	<name>26</name>
 	<event>
 	  <p>新增 committer：<a href="mailto:dryice@FreeBSD.org">劉棟</a>
 	    (ports)</p>
 	</event>
       </day>
 
       <day>
 	<name>22</name>
 	<event>
 	  <p>新增 committer：<a href="mailto:nox@FreeBSD.org">Juergen Lock</a>
 	    (ports)</p>
 	</event>
       </day>
 
       <day>
 	<name>10</name>
 	<event>
 	  <title>對 FreeBSD 開發人員 Joseph Koshy 的 Podcast 訪談</title>
 
 	  <p>在最新一期 <a href="http://bsdtalk.blogspot.com/">bsdtalk</a>
 	    podcast 中，Will Backman 就 FreeBSD 開發人員 Joseph Koshy
 	    近期在 libElf 上所做的工作進行了訪談。 這期 podcast 可以透過
 	    <a
 	      href="http://cisx1.uma.maine.edu/~wbackman/bsdtalk/bsdtalk087.mp3">
 	      http://cisx1.uma.maine.edu/~wbackman/bsdtalk/bsdtalk087.mp3</a> 收聽。</p>
 	</event>
       </day>
 
       <day>
 	<name>7</name>
 	<event>
 	  <title>對 FreeBSD 開發人員 Kip Macy 的 Podcast 訪談</title>
 
 	  <p>在最新一期 <a href="http://bsdtalk.blogspot.com/">bsdtalk</a>
 	    podcast 中，Will Backman 就近期 FreeBSD/sun4v
 	    的移植進展，對 FreeBSD 開發人員 Joseph Koshy 進行了採訪。 這期 podcast 可以透過
 	    <a
 	      href="http://cisx1.uma.maine.edu/~wbackman/bsdtalk/bsdtalk086.mp3">
 	      http://cisx1.uma.maine.edu/~wbackman/bsdtalk/bsdtalk086.mp3</a> 收聽。</p>
 	</event>
       </day>
 
       <day>
 	<name>5</name>
 	<event>
 	  <p>新增 committer：<a href="mailto:nivit@FreeBSD.org">Nicola Vitale</a>
 	  (ports)</p>
 	</event>
 
 	<event>
 	  <p>新增 committer：<a href="mailto:gabor@FreeBSD.org">G&aacute;bor K&ouml;vesd&aacute;n</a>
 	    (ports)</p>
 	</event>
       </day>
 
       <day>
 	<name>1</name>
 	<event>
 	  <title>對 FreeBSD 開發人員 Tom McLaughlin 的 Podcast 訪談</title>
 
 	  <p>在最新一期 <a href="http://bsdtalk.blogspot.com/">bsdtalk</a>
 	    podcast 中，Will Backman 就 BSD# 計劃和 FreeBSD 上的 Mono
 	    對 FreeBSD 開發人員 Tom McLaughlin 進行了採訪。 這期 podcast 可以透過
 	    <a
 	      href="http://cisx1.uma.maine.edu/~wbackman/bsdtalk/bsdtalk085.mp3">
 	      http://cisx1.uma.maine.edu/~wbackman/bsdtalk/bsdtalk085.mp3</a> 收聽。</p>
 	</event>
       </day>
     </month>
 
     <month>
       <name>11</name>
 
       <day>
 	<name>29</name>
 	<event>
 	  <p>新增 committer：<a href="mailto:lx@FreeBSD.org">David Thiel</a>
 	  (ports)</p>
 	</event>
 
 	<event>
 	  <title>對 FreeBSD release engineer馬源浩的 Podcast 訪談</title>
 
 	  <p>在最新一期 <a href="http://bsdtalk.blogspot.com/">bsdtalk</a>
 	    podcast 中，Will Backman 就將要發佈的 FreeBSD 6.2 版對release engineer馬源浩 (Bruce
 	    Mah) 進行了採訪。 這期 podcast 可以透過
 	    <a
 	      href="http://cisx1.uma.maine.edu/~wbackman/bsdtalk/bsdtalk084.mp3">
 	      http://cisx1.uma.maine.edu/~wbackman/bsdtalk/bsdtalk084.mp3</a> 收聽</p>
 	</event>
       </day>
 
       <day>
 	<name>17</name>
 	<event>
 	  <title>FreeBSD 6.2-RC1 發佈了</title>
 
 	  <p>FreeBSD 6.2 的第一個候選發佈版本現已 <a
 	    href="http://lists.freebsd.org/pipermail/freebsd-stable/2006-November/030811.html">發佈</a>。
 	    用於 Tier-1 平台的 ISO 映像檔案，已可透過眾多的
 	    <a href="http://www.FreeBSD.org/doc/zh_TW.UTF-8/books/handbook/mirrors-ftp.html">
 	    FreeBSD 鏡像站點</a> 獲得。</p>
 	</event>
       </day>
 
       <day>
 	<name>16</name>
 	<event>
 	  <title>FreeBSD 基金會秋季募捐</title>
 
 	  <p><a
 	      href="http://www.freebsdfoundation.org/">FreeBSD 基金會</a>
 	    正在舉行 <a
 	      href="http://www.freebsdfoundation.org/donate/">秋季募捐</a>。
 	    本次募捐將在很大程度上影響明年基金會的預算。</p>
 	</event>
       </day>
 
       <day>
 	<name>14</name>
 	<event>
 	  <title>FreeBSD.org 系統搬移推遲</title>
 
           <p>計劃於 11 月 13 日 (周一) 進行的 FreeBSD.org 系統搬移工作因故推遲。
             目前的最新計劃是於美國太平洋時間 11 月 17 日 (周五) 進行此項工作。</p>
         </event>
       </day>
 
       <day>
       	<name>12</name>
 	<event>
 	  <title>FreeBSD/sun4v 安裝 / Live CD 發佈了</title>
 
 	  <p>在 Sun 的 UltraSparc-T1 架構上的 FreeBSD 移植工作目前已經取得了階段性的進展，
 	    我們制作了一張包含現場檔案系統的安裝 ISO。 更多細節請參見
 	    <a href="http://www.FreeBSD.org/platforms/sun4v.html">FreeBSD/sun4v 計劃專頁</a>。</p>
 	</event>
 
 	<event>
 	  <p>新增 committer：<a href="mailto:koitsu@FreeBSD.org">Jeremy Chadwick</a>
 	  (ports)</p>
 	</event>
       </day>
 
       <day>
       	<name>7</name>
 	<event>
 	  <p>新增 committer：<a href="mailto:farrokhi@FreeBSD.org">Babak Farrokhi</a>
 	  (ports)</p>
 	</event>
 
 	<event>
 	  <p>新增 committer：<a href="mailto:laszlof@FreeBSD.org">Frank J. Laszlo</a>
 	  (ports)</p>
 	</event>
       </day>
 
       <day>
 	<name>5</name>
 	<event>
 	  <title>FreeBSD.org 系統遷移</title>
 
 	  <p>用於提供 FreeBSD Project 郵件、web、CVS 等的 FreeBSD.org 伺服器，
 	    即將遷移到新的數據中心。 我們計劃在 11 月 13 日周一 (美國太平洋標準時間)
 	    進行本次遷移。</p>
 
 	  <p>本次搬移的準備過程可能導致 FreeBSD.org 在最終完成遷移之前出現短暫的服務停止。
 	    在搬移的當天，只有靜態的部分 (例如，純 HTML 頁面，而不包括 CGI) 的 <a
 	      href="http://www.FreeBSD.org/">http://www.FreeBSD.org/</a>
 	    會提供服務。</p>
 	</event>
       </day>
     </month>
 
     <month>
       <name>10</name>
 
       <day>
 	<name>31</name>
 	<event>
 	  <title>FreeBSD 6.2-BETA3 發佈了</title>
 
 	  <p>FreeBSD 6.2 的第三個 beta 版本現已 <a
 	    href="http://lists.freebsd.org/pipermail/freebsd-stable/2006-November/030277.html">發佈</a>。
 	    用於 Tier-1 平台的 ISO 映像檔案，已可以透過眾多的
 	    <a href="http://www.FreeBSD.org/doc/zh_TW.UTF-8/books/handbook/mirrors-ftp.html">
 	    FreeBSD 鏡像站點</a> 獲得。</p>
 	</event>
       </day>
 
       <day>
          <name>25</name>
          <event>
 	   <title>Summer of Code 計劃結項了</title>
 
            <p>我們非常高興全部 14 位學生都成功地完成了他們的 FreeBSD <a
              href="&base;/projects/summerofcode-2006.html">Summer of
              Code</a> 計劃。 在此祝賀參與計劃的導師和學生，並感謝 <a
              href="http://www.google.com/bsd">Google</a> 運營此項活動，
              並為其提供資金贊助。</p>
 
          </event>
       </day>
 
       <day>
 	 <name>19</name>
 	 <event>
 	   <title>2006 年第三季度開發進度報告</title>
 
            <p>2006 年第三季度開發進度報告 <a
              href="&base;/news/status/report-june-2006-oct-2006.html">現已發表</a>，其中介紹了 49 項內容。</p>
         </event>
       </day>
 
       <day>
 	 <name>14</name>
 	 <event>
 	  <title>用於 FreeBSD 的 GNOME 2.16.1 發佈了</title>
 
 	  <p>GNOME 2.16.1 已經發佈，並已合併到了 FreeBSD
 	      ports tree。 請訪問
 	      <a href="&enbase;/gnome/index.html">FreeBSD GNOME 主頁</a>
 	      以查看正式的公告，以及重要的
 	      <a href="&base;/gnome/docs/faq216.html">升級指南</a>。</p>
       	</event>
       </day>
 
       <day>
         <name>8</name>
         <event>
           <p>新增 committer：<a
 	    href="mailto:syrinx@FreeBSD.org">Shteryana Shopova</a>
 	    (src)</p>
         </event>
       </day>
 
       <day>
 	<name>5</name>
 	<event>
 	  <title>FreeBSD 6.2-BETA2 發佈了</title>
 
 	  <p>FreeBSD 6.2 的第二個 beta 版本現已 <a
 	    href="http://lists.freebsd.org/pipermail/freebsd-stable/2006-October/029171.html">發佈</a>。
 	    用於 Tier-1 平台的 ISO 映像檔案，已可以透過眾多的
 	    <a href="http://www.FreeBSD.org/doc/zh_TW.UTF-8/books/handbook/mirrors-ftp.html">
 	    FreeBSD 鏡像站點</a> 獲得。</p>
 	</event>
       </day>
     </month>
     <month>
       <name>9</name>
 
       <day>
         <name>28</name>
         <event>
           <p>新增 committer：<a href="mailto:xride@FreeBSD.org">Soeren Straarup</a> (ports)</p>
         </event>
       </day>
 
       <day>
         <name>21</name>
         <event>
           <p>新增 committer：<a href="mailto:jfv@FreeBSD.org">Jack F. Vogel</a>
             (src)</p>
         </event>
 
 	<event>
 	  <title>FreeBSD 6.2-BETA1 發佈了</title>
 
 	  <p>FreeBSD 6.2 的第一個 beta 版本現已 <a
 	    href="http://lists.freebsd.org/pipermail/freebsd-stable/2006-September/028584.html">發佈</a>。
 	    本次 BETA1 的 ISO 映像檔案，已可以透過眾多的
 	    <a href="http://www.FreeBSD.org/doc/zh_TW.UTF-8/books/handbook/mirrors-ftp.html">
 	    FreeBSD 鏡像站點</a> 獲得。</p>
 	</event>
       </day>
 
       <day>
         <name>20</name>
         <event>
           <p>新增 committer：<a href="mailto:chinsan@FreeBSD.org">黃青山</a>
             (doc)</p>
         </event>
       </day>
 
       <day>
         <name>18</name>
         <event>
           <p>新增 committer：<a href="mailto:stas@FreeBSD.org">Stanislav Sedov</a>
             (ports)</p>
         </event>
       </day>
 
       <day>
         <name>12</name>
         <event>
           <p>新增 committer：<a href="mailto:alexbl@FreeBSD.org">Alexander Botero-Lowry</a>
             (ports)</p>
         </event>
       </day>
 
       <day>
 	<name>1</name>
 	<event>
 	  <p>新增 committer：<a href="mailto:rrs@FreeBSD.org">Randall R. Stewart</a>
             (src)</p>
 	</event>
       </day>
     </month>
     <month>
       <name>8</name>
 
       <day>
 	<name>20</name>
 	<event>
 	  <p>新增 committer：<a href="mailto:danger@FreeBSD.org">Daniel
 	    Ger&zcaron;o</a> (doc)</p>
 	</event>
       </day>
     </month>
 
     <month>
       <name>7</name>
       <day>
 	<name>26</name>
 	<event>
 	  <title>選舉產生了新一屆 FreeBSD Core Team</title>
 
 	  <p>FreeBSD Core Team 競選已經結束。
 	    選舉結果已在 <a
 	    href="http://docs.freebsd.org/cgi/getmsg.cgi?fetch=0+0+archive/2006/freebsd-announce/20060730.freebsd-announce">這裡</a> 公布。
 	  </p>
 	</event>
       </day>
 
       <day>
 	<name>19</name>
 	<event>
 	  <title>對 FreeBSD 開發人員 Greg Lehey 的 Podcast 訪談</title>
 
 	  <p>在最新一期 <a href="http://bsdtalk.blogspot.com/">bsdtalk</a>
 	    podcast 中，Will Backman 對 FreeBSD 開發人員 Greg Lehey
 	    就他在 FreeBSD 和 MySQL 上的工作進行了採訪。 這期 podcast 可以透過
 	    <a
 	      href="http://cisx1.uma.maine.edu/~wbackman/bsdtalk/bsdtalk055.mp3">
 	    http://cisx1.uma.maine.edu/~wbackman/bsdtalk/bsdtalk055.mp3</a> 收聽。</p>
 	</event>
       </day>
 
       <day>
 	<name>18</name>
 	<event>
 	 <p>新增 committer：<a href="mailto:acm@FreeBSD.org">Jose Alonso Cardenas Marquez</a>
             (ports)</p>
 	</event>
       </day>
 
       <day>
 	<name>13</name>
 	<event>
 	  <title>對 FreeBSD 開發人員 Pawel Jakub Dawidek 的 Podcast 訪談</title>
 
 	  <p>在最新一期 <a href="http://bsdtalk.blogspot.com/">bsdtalk</a>
 	    podcast 中，Will Backman 對 FreeBSD 開發人員 Pawel Jakub Dawidek
 	    就他在 FreeBSD 上的工作，特別是 GEOM 日志計劃進行了採訪。 這期
 	    podcast 可以透過 <a
 	      href="http://cisx1.uma.maine.edu/~wbackman/bsdtalk/bsdtalk052.mp3">
 	    http://cisx1.uma.maine.edu/~wbackman/bsdtalk/bsdtalk052.mp3</a> 收聽。</p>
 	</event>
       </day>
 
       <day>
         <name>12</name>
         <event>
 	  <title>2006 年第二季度開發進度報告發佈了</title>
 
 	  <p>2006 年第二季度的開發進度報告 <a
 	    href="&enbase;/news/status/report-apr-2006-jun-2006.html">現已發佈</a>，
 	    其中介紹了 39 項內容。</p>
         </event>
       </day>
 
       <day>
         <name>5</name>
         <event>
 	  <title>FreeBSD 基金會發佈了用於 FreeBSD 5.5、6.1 以及 AMD64 平台的預編譯 Java</title>
 
 	  <p>FreeBSD 基金會現已開始提供基於 Sun Microsystems UPDATE7 的專用於 FreeBSD
 	    的預編譯版本 Java JDK 和 JRE 1.5。 欲了解更多詳情，
 	    請參見 FreeBSD 基金會 <a
 	    href="http://www.freebsdfoundation.org/press/20060705-PRrelease.shtml">
 	      發佈的新聞</a>。</p>
         </event>
       </day>
     </month>
 
     <month>
       <name>6</name>
 
       <day>
         <name>24</name>
         <event>
           <p>
             新增 committer：<a href="mailto:rafan@FreeBSD.org">範榮恩</a>
             (ports)
           </p>
         </event>
       </day>
 
       <day>
         <name>21</name>
         <event>
           <p>
             新增 committer：<a href="mailto:bsam@FreeBSD.org">Boris Samorodov</a>
             (ports)
           </p>
         </event>
       </day>
 
       <day>
         <name>19</name>
 	<event>
 	    <p>新增 committer：<a
 	    href="mailto:shaun@FreeBSD.org">Shaun Amott</a>
 	    (ports)</p>
 	</event>
       </day>
 
       <day>
         <name>5</name>
         <event>
 	    <p>新增 committer：<a
 		href="mailto:kib@FreeBSD.org">Konstantin Belousov</a>
 		(src)</p>
 	</event>
 
         <event>
 	    <p>新增 committer：<a
 	    href="mailto:miwi@FreeBSD.org">Martin Wilke</a>
 	    (ports)</p>
 	</event>
     </day>
     </month>
 
     <month>
       <name>5</name>
       <day>
         <name>30</name>
 	<event>
 	  <title>在校生計劃資助計劃公告</title>
 
 	  <p>The FreeBSD Project 收到了超過 120 份 <a
 	    href="http://code.google.com/summerofcode.html">Google's
 	    Summer of Code</a> 計劃計劃申請，並從中選出了 14 個進行資助。
 	    非常遺憾的是，第一流的申請遠遠超出了學生的名額。 不過，
 	    我們鼓勵在校生繼續與我們一起工作。 The FreeBSD Project
 	    一直都希望能夠透過我們的郵件列表和開發論壇，
 	    幫助帶領學生了解更多關於操作系統開發。 為開源軟體計劃提供幫助，
 	    是 Computer Scienc 教育中的重要一環，
 	    同時也是軟體開發職業生涯的一項絕佳的準備條件。</p>
 
 	  <p>選出的完整的學生和計劃名單可以在 <a
 href="http://www.freebsd.org/projects/summerofcode.html">這裡</a> 找到。 <a
 href="http://wikitest.freebsd.org/moin.cgi/SummerOfCode2006">Summer of Code wiki</a> 也提供了更多的細節資訊。</p>
          </event>
 
          <event>
             <title>新增 committer：<a
                                 href="mailto:piso@FreeBSD.org">Paolo Pisati</a>
                (src)。 前 SoC2005 計劃成員。</title>
 
             <p><a href="mailto:piso@FreeBSD.org">Paolo Pisati</a>，
 	      去年 Summer of Code 計劃的獲選學生，仍在繼續參加 FreeBSD Project
 	      並成為了正式的 src/ committer。</p>
 
          </event>
       </day>
 
       <day>
 	<name>26</name>
 	<event>
 	  <title>對 FreeBSD 開發者 Poul-Henning Kamp 的 Podcast 訪談</title>
 
 	  <p>在最新的 <a href="http://bsdtalk.blogspot.com/">bsdtalk</a>
 	    podcast 中，Will Backman 就 FreeBSD 上的開發活動採訪了 FreeBSD
 	    開發者 Poul-Henning Kamp。 這期 podcast 可以透過 <a
 	      href="http://cisx1.uma.maine.edu/~wbackman/bsdtalk/bsdtalk048.mp3">
 	    http://cisx1.uma.maine.edu/~wbackman/bsdtalk/bsdtalk048.mp3</a> 收聽。</p>
 	</event>
       </day>
 
       <day>
         <name>25</name>
         <event>
          <title>FreeBSD 5.5-RELEASE 發佈了</title>
 
           <p><a href="&enbase;/releases/5.5R/announce.html">FreeBSD
 	    5.5-RELEASE</a> 發佈了。 請查看 <a
 	    href="&enbase;/releases/5.5R/errata.html">發行版勘誤</a>
 	    以了解最新發生的新聞和已知問題。 <a
 	    href="&enbase;/releases/index.html">發行版資訊</a>
 	    網頁提供了關於 FreeBSD 發行版的進一步詳情。</p>
         </event>
       </day>
 
       <day>
 	<name>21</name>
 	<event>
 	  <title>FreeBSD 能夠在 Sun T1 處理器上獨立運行了</title>
 
 	  <p>FreeBSD 目前已經能夠在 <a
 	    href="http://www.sun.com/processors/UltraSPARC-T1/">採用 CoolThreads
 	      技術的 Sun T1 處理器</a> 的電腦上完整地完成
 	    "make buildworld" 命令，從而達到了獨立運行的目標。
 	    這些原始碼目前存放於 <a
 	    href="http://perforce.freebsd.org/branchView.cgi?BRANCH=kmacy%5fsun4v">
 	      FreeBSD 的 Perforce 版本控制系統</a> 中，
 	    並將在對 logical domaining 的支持功能完成後，會合併回官方的 CVS repository。
 	    開機過程的 log 檔可以在 <a
 	    href="http://www.fsmware.com/sun4v/dmesg_latest.txt">這裡</a> 找到。</p>
 	</event>
       </day>
 
       <day>
          <name>17</name>
          <event>
             <p>新增 committer：<a
                                 href="mailto:twinterg@FreeBSD.org">Thomas Wintergerst</a>
                (src)</p>
          </event>
       </day>
 
       <day>
         <name>16</name>
 
         <event>
 	  <title>FreeBSD 5.5-RC1 發佈了</title>
 
 	  <p>FreeBSD 5.5 的首個，同時也有望成為最終的發行候選版本 <a
 	    href="http://lists.freebsd.org/pipermail/freebsd-stable/2006-May/025589.html">發佈了</a>。
 	    RC1 ISO 映像檔案，已經可以從眾多
 	    <a href="http://www.FreeBSD.org/doc/en_US.ISO8859-1/books/handbook/mirrors-ftp.html">
 	    FreeBSD 鏡像站點</a> 獲得。</p>
         </event>
       </day>
 
       <day>
         <name>8</name>
         <event>
          <title>FreeBSD 6.1-RELEASE 發佈了</title>
 
           <p><a href="&enbase;/releases/6.1R/announce.html">FreeBSD
 	    6.1-RELEASE</a> 正式發佈了。 在安裝前，請查看 <a
 	    href="&enbase;/releases/6.1R/errata.html">發行版勘誤</a>
 	    以了解關於 6.1 最新的消息和已知問題。 在 <a
 	    href="&enbase;/releases/index.html">發行版資訊</a>
 	    頁面上提供了關於 FreeBSD 發行版的進一步資訊。</p>
         </event>
 
         <event>
 	  <title>Summer of Code 申請最後期限延長 1 天</title>
 
           <p>Google 的 <a
 	    href="http://code.google.com/summerofcode.html">Summer
             of Code 2006</a> 活動的申請最後期限已延長至太平洋時間周二
 	    11:00AM PDT。 關於 FreeBSD 專屬計劃以及候選導師的資訊可以在 <a
             href="&enbase;/projects/summerofcode.html">here</a> 找到。</p>
         </event>
 
       </day>
 
       <day>
         <name>7</name>
         <event>
           <p>新增 committer：<a
             href="mailto:itetcu@FreeBSD.org">Ion-Mihai Tetcu</a>
             (ports)</p>
         </event>
       </day>
 
       <day>
 	<name>6</name>
 	<event>
 	  <p>新增 committer：<a
 	    href="mailto:stefan@FreeBSD.org">Stefan Walter</a>
 	    (ports)</p>
 	</event>
 
 	<event>
 	  <p>新增 committer：<a
 	    href="mailto:sat@FreeBSD.org">Andrew Pantyukhin</a>
 	    (ports)</p>
 	</event>
       </day>
 
       <day>
         <name>2</name>
 
         <event>
 	  <title>FreeBSD 6.1-RC2 發佈了</title>
 
 	  <p>FreeBSD 6.1 的第二個，也應該是最後一個候選發行版 <a
 	    href="http://lists.freebsd.org/pipermail/freebsd-hackers/2006-May/016386.html">發佈了</a>。
 	    RC2 ISO 映像檔案，可以從眾多
 	    <a href="http://www.FreeBSD.org/doc/zh_TW.UTF-8/books/handbook/mirrors-ftp.html">
 	    FreeBSD 鏡像站點</a> 獲得。</p>
         </event>
       </day>
 
       <day>
 	<name>1</name>
         <event>
 	  <title>開始接受 Summer of Code 計劃申請</title>
 
           <p>FreeBSD Project 現在開始接受先前宣布的 Google <a
 	    href="http://code.google.com/summerofcode.html">Summer
             of Code 2006</a> 計劃的計劃申請。
             這個計劃將為在暑期為開源計劃提供幫助的學生提供資助。
             FreeBSD 專有的計劃以及潛在的導師名單，可以在 <a
             href="&enbase;/projects/summerofcode.html">這裡</a> 找到。</p>
 
           <p>如果找到了合適的計劃以及導師，則有興趣參與計劃的學生應完成申請，
 	    並提交給 Google。 這些申請的最後期限是太平洋日光時間 2006 年
 	    5 月 8 日 17:00 (UTC 時間 2006 年 5 月 9 日午夜)。 獲贗的候選人，
 	    將在五月下旬宣布。 請參見 <a
 	    href="http://code.google.com/soc/studentfaq.html">Student
 	    FAQ</a> 以了解進一步的資訊。</p>
         </event>
 
         <event>
 	  <title>新增了用於 HighPoint RocketRAID 232x SATA RAID 控制器的驅動</title>
 
 	  <p>在 FreeBSD-CURRENT 以及 RELENG_6 和 RELENG_6_1 分支中，
 	    新增了 HighPoint 的 RocketRAID 232x 系列 SATA RAID 控制器驅動 rr232x(4)。
 	    這一驅動將包含在將發佈的 FreeBSD 6.1-RELEASE 版本中。</p>
         </event>
 
 	<event>
 	  <p>commit 權限提升：<a
 	    href="mailto:delphij@FreeBSD.org">李鑫</a>
 	    (src, doc, ports)</p>
 	</event>
       </day>
     </month>
 
     <month>
       <name>4</name>
 
       <day>
 	<name>30</name>
 	<event>
 	  <p>新增 committer：<a
 	    href="mailto:lbr@FreeBSD.org">Lars Balker Rasmussen</a>
 	    (ports)</p>
 	</event>
       </day>
 
       <day>
 	<name>15</name>
 	<event>
 	  <title>對 FreeBSD 開發者 Joe Marcus Clarke 的 Podcast 訪談</title>
 
 	  <p>在最新的 <a href="http://bsdtalk.blogspot.com/">bsdtalk</a>
 	    podcast中，Will Backman 訪問了 FreeBSD 開發者 Joe Marcus Clarke，
 	    討論了與 FreeBSD 上的 GNOME 桌面環境有關的話題。 這期 podcast 可以從 <a
 	      href="http://cisx1.uma.maine.edu/~wbackman/bsdtalk/bsdtalk032.mp3">
 	    http://cisx1.uma.maine.edu/~wbackman/bsdtalk/bsdtalk032.mp3</a> 下載。</p>
 	</event>
       </day>
 
       <day>
         <name>14</name>
         <event>
 	  <title>2006 年一至三月進度報告</title>
 
 	  <p>現在可以訪問包含 29 個計劃的 2006 年一至三月 <a
 	    href="&enbase;/news/status/report-jan-2006-mar-2006.html">進度報告</a>
 	    了。</p>
         </event>
 
         <event>
           <title>Summer of Code</title>
 
           <p>FreeBSD Project 愉快地參加了 Google 的
             <a href="http://code.google.com/summerofcode.html">Summer
             of Code 2006</a> 計劃。 這一計劃將為在校生參與開源計劃提供資助。
             FreeBSD 專屬的計劃和導師候選人可以在 <a
             href="&enbase;/projects/summerofcode.html">這裡</a> 訪問。</p>
 	</event>
      </day>
 
       <day>
         <name>13</name>
         <event>
 	  <title>FreeBSD 6.1-RC1 發佈了</title>
 
 	  <p>FreeBSD 6.1 的第一個候選發行版 <a
 	    href="http://lists.freebsd.org/pipermail/freebsd-hackers/2006-April/016104.html">發佈了</a>。
 	    RC1 的 ISO 映像檔案可以從多數
 	    <a href="http://www.FreeBSD.org/doc/zh_TW.UTF-8/books/handbook/mirrors-ftp.html">
 	    FreeBSD 鏡像站點</a> 獲得。</p>
         </event>
       </day>
 
       <day>
         <name>11</name>
         <event>
 	  <title>新增了用於 Broadcom NetXtreme II 千兆以太網芯片的驅動</title>
 
 	  <p>在 FreeBSD-CURRENT 中新增了 bce(4)，一個用於
 	    Broadcom NetXtreme II 系列千兆以太網控制芯片的驅動。
 	    這一驅動將很快合併至 FreeBSD 6-STABLE 分支。</p>
         </event>
       </day>
 
       <day>
         <name>6</name>
         <event>
 	  <title>FreeBSD 基金會宣布用於 FreeBSD 的預編譯版本 Java JDK 和 JRE 1.5</title>
 
 	  <p>FreeBSD 基金會現在開始提供用於 FreeBSD 的預編譯版本 Java JDK 和 JRE
 	    1.5。 更多細節，請參見
 	    FreeBSD 基金會的 <a
 	    href="http://www.freebsdfoundation.org/press/20060405-PRrelease.shtml">
 	      新聞稿</a>。</p>
         </event>
       </day>
 
       <day>
         <name>4</name>
         <event>
           <p>新增 committer：<a
             href="mailto:alepulver@FreeBSD.org">Alejandro Pulver</a>
             (ports)</p>
         </event>
       </day>
 
       <day>
         <name>2</name>
         <event>
           <p>新增 committer：<a
             href="mailto:johans@FreeBSD.org">Johan van Selst</a>
             (ports)</p>
         </event>
       </day>
     </month>
 
     <month>
       <name>3</name>
 
       <day>
         <name>31</name>
         <event>
           <p>新增 committer：<a
             href="mailto:jmelo@FreeBSD.org">Jean Milanez Melo</a>
             (ports)</p>
         </event>
       </day>
 
       <day>
 	<name>15</name>
 	<event>
 	  <title>FreeBSD 5.5-BETA4 和 6.1-BETA4 發佈了</title>
 
 	  <p>FreeBSD 5.5 和 FreeBSD 6.1 的第四個 beta 版本 <a
 	    href="http://lists.freebsd.org/pipermail/freebsd-hackers/2006-March/015730.html">發佈了</a>。
 	    這些 BETA4 ISO 映像檔案，可以在多數
 	    <a href="http://www.FreeBSD.org/doc/en_US.ISO8859-1/books/handbook/mirrors-ftp.html">
 	    FreeBSD 鏡像站點</a> 上獲得。</p>
 	</event>
       </day>
     </month>
 
     <month>
       <name>2</name>
 
       <day>
 	<name>22</name>
 	<event>
           <p>新增 committer： <a
             href="mailto:wkoszek@FreeBSD.org">Wojciech A. Koszek</a>
             (src)</p>
 	</event>
       </day>
 
       <day>
 	<name>20</name>
 	<event>
 	  <title>FreeBSD 5.5-BETA2 和 6.1-BETA2 發佈了</title>
 
 	  <p>FreeBSD 5.5 和 FreeBSD 6.1 的第二個 BETA 版本現在 <a
 	    href="http://lists.freebsd.org/pipermail/freebsd-hackers/2006-February/015499.html">可用了</a>。
 	    對應的 BETA2 ISO 鏡像檔案可以從眾多
 	    <a href="http://www.FreeBSD.org/doc/en_US.ISO8859-1/books/handbook/mirrors-ftp.html">
 	    FreeBSD 鏡像站點</a> 之一下載。</p>
 	</event>
       </day>
 
       <day>
 	<name>18</name>
 	<event>
 	  <title>對 FreeBSD 開發者 Kirk McKusick 的 Podcast 訪談</title>
 
 	  <p>在最新的 <a href="http://bsdtalk.blogspot.com/">bsdtalk</a>
 	    podcast 中，Will Backman 訪問了 FreeBSD 開發者 Marshall Kirk
 	    McKusick。 這期 podcast 可以從 <a
 	    href="http://cisx1.uma.maine.edu/~wbackman/bsdtalk/bsdtalk018.mp3">
 	    http://cisx1.uma.maine.edu/~wbackman/bsdtalk/bsdtalk018.mp3</a>
 	    下載。</p>
 	</event>
       </day>
 
       <day>
 	<name>17</name>
 	<event>
 	  <title>對 FreeBSD release engineer Scott Long 的 Podcast 訪談</title>
 
   	  <p>在 <a href="http://bsdtalk.blogspot.com/">bsdtalk</a>
 	    系列 podcast 的第 17 期中，Will Backman 訪問了 FreeBSD release engineer 之一的
 	    Scott Long，並就正在開發的 FreeBSD 5.5 和 6.1 版本，
 	    以及一些相關話題進行了討論。 這期 podcast 可以從 <a
 	    href="http://cisx1.uma.maine.edu/~wbackman/bsdtalk/bsdtalk017.mp3">
 	    http://cisx1.uma.maine.edu/~wbackman/bsdtalk/bsdtalk017.mp3</a>
 	    下載。
 	    </p>
 	</event>
       </day>
 
       <day>
 	<name>13</name>
         <event>
           <p>新增 committer：<a
             href="mailto:cel@FreeBSD.org">Chuck Lever</a>
             (src)</p>
         </event>
 
 	<event>
 	  <title>即將進行的晚間 FreeBSD kernel code 導讀課程</title>
 
 	  <p>在 2006 年春季將舉辦 “FreeBSD Kernel Internals: An Intensive Code
 	    Walkthrough” 課程。 這一課程將在具有歷史意義的 Hillside Club
 	    進行，其地址是 2286 Cedar Strett, Berkeley, CA 94709，
 	    從伯克利校園出發向北三個街區即可到達。 課程從 2 月 22 日周三開始，
 	    到 6 月 13 日結束，每周一次，從 6:30PM 到
 	    9:45PM。 您可以從 <a
 	    href="http://www.mckusick.com/courses/adveveclass.html">這裡</a>
 	    了解參加這一培訓班的詳情。</p>
         </event>
       </day>
 
       <day>
 	<name>9</name>
 	<event>
 	  <title>FreeBSD 5.5-BETA1 和 6.1-BETA1 發佈了</title>
 
 	  <p>FreeBSD 5.5 和 FreeBSD 6.1 的首個 BETA 版本現在 <a
 	    href="http://lists.freebsd.org/pipermail/freebsd-hackers/2006-February/015418.html">可用</a> 了。
 	    對應的 BETA1 ISO 鏡像可以從許多
 	    <a href="http://www.FreeBSD.org/doc/zh_TW.UTF-8/books/handbook/mirrors-ftp.html">
 	    FreeBSD 鏡像站點</a> 之一下載。</p>
 	</event>
       </day>
     </month>
 
     <month>
       <name>1</name>
 
       <day>
         <name>31</name>
         <event>
           <p>commit 權限提升：<a
             href="mailto:cperciva@FreeBSD.org">Colin Percival</a>
             (src, ports)</p>
         </event>
       </day>
 
       <day>
         <name>26</name>
         <event>
 	  <title>2005 年十至十二月進度報告</title>
 
 	  <p>現在可以訪問包含 26 個計劃的 2005 年十至十二月 <a
 	    href="&enbase;/news/status/report-oct-2005-dec-2005.html">進度報告</a>
 	    了。</p>
         </event>
       </day>
       <day>
         <name>19</name>
         <event>
           <p>新增 committer：<a
             href="mailto:matteo@FreeBSD.org">Matteo Riondato</a>
             (src)</p>
         </event>
 
         <event>
           <p>新增 committer：<a
             href="mailto:vd@FreeBSD.org">Vasil Dimov</a>
             (ports)</p>
         </event>
       </day>
 
       <day>
         <name>16</name>
         <event>
           <p>新增 committer：<a
             href="mailto:rink@FreeBSD.org">Rink Springer</a>
             (src)</p>
         </event>
       </day>
     </month>
   </year>
 
   <year>
     <name>2005</name>
 
     <month>
       <name>12</name>
 
       <day>
 	<name>23</name>
 	<event>
 	  <title>FreeBSD 基金會發佈十二月通訊</title>
 
 	  <p>FreeBSD 基金會發佈了其 <a
 	    href="http://www.freebsdfoundation.org/press/2005Dec-newsletter.shtml">十二月通訊</a>，
 	    對本年度基金會的活動進行了總結。</p>
 	</event>
       </day>
 
       <day>
 	<name>21</name>
 	<event>
 	  <p>歸來的 committer： <a
 	    href="mailto:jasone@FreeBSD.org">Jason Evans</a>
 	    (src)</p>
 	</event>
       </day>
 
       <day>
 	<name>17</name>
 	<event>
 	  <title>2006 年發行版工作計劃</title>
 
 	  <p>Scott Long 代表交付工程組宣布了 2006 年度的發行版工作計劃。
 	    請參見 <a
 	    href="http://lists.freebsd.org/pipermail/freebsd-current/2005-December/058964.html">
 	      公告</a> 以了解進一步的資訊。</p>
 	</event>
       </day>
 
       <day>
 	<name>14</name>
 	<event>
 	  <title>在 FreeBSD-CURRENT 上加入了 XFS 的只讀支持</title>
 
 	  <p>在 FreeBSD 上加入了 XFS 文件系統的只讀支持。 這些原始碼派生自 SGI
 	    所發佈的 source code ，它受限於 GPL 授權。 您可以在 <a
 	    href="http://lists.freebsd.org/pipermail/freebsd-current/2005-December/058907.html">
 	      公告</a> 中找到更多資訊。</p>
 	</event>
       </day>
 
       <day>
 	<name>12</name>
 	<event>
 	  <p>新增 committer： <a
 	    href="mailto:anray@FreeBSD.org">Andrey Slusar</a>
 	    (ports)</p>
 	</event>
       </day>
 
       <day>
 	<name>7</name>
 	<event>
 	  <title>新增網站欄目： 針對志願者的計劃和想法</title>
 
 	  <p>FreeBSD project 有數百名遍布世界各地的活躍的開發人員，
 	    他們分別在 source code 樹上的不同部分進行工作。 但是，
 	    還有許多新的有趣的計劃和想法需要加以研究和評估，
 	    在這些地方，FreeBSD project 需要來自志願者的英雄般的努力。
 	    在 FreeBSD 網站上新增了一個欄目，其中列出了這樣的計劃。
 	    盡管這個列表還有待進一步的補充，但它是希望在未來成為
 	    committer 的志願者的一個很好的起點。 您可以 <a
 	    href="&enbase;/projects/ideas/">在這裡查看計劃列表</a>。</p>
 	</event>
       </day>
 
       <day>
         <name>1</name>
 
 	<event>
 	  <title>惠普公司向 FreeBSD 基金會捐獻 blade 式伺服器 cluster</title>
 
 	  <p>FreeBSD 基金會收到了來自惠普公司的一項 blade 系統捐贈，
 	    它將用作 third-party 軟體的構建工作。 這個包含 20 個節點的 HP BladeSystem
 	    cluster 將 i386 預編譯 package 的構建過程提高了三倍。 您可以 <a
 	    href="http://www.freebsdfoundation.org/press/20051201-PRreleaseHP.pdf">
 	      在這裡看到更多的細節</a>。</p>
 	</event>
 
         <event>
           <p>新增 committer： <a
             href="mailto:tdb@FreeBSD.org">Tim Bishop</a>
             (ports)</p>
         </event>
       </day>
     </month>
 
     <month>
       <name>11</name>
 
       <day>
         <name>29</name>
         <event>
           <p>新增 committer： <a
             href="mailto:oleg@FreeBSD.org">Oleg Bulyzhin</a>
             (src)</p>
         </event>
       </day>
 
       <day>
         <name>27</name>
 
         <event>
           <title>新文章： 用 FreeBSD 來做產品</title>
 
           <p>一篇新的文章，<a
               href="&enbase;/doc/en_US.ISO8859-1/articles/building-products/">
 	      用 FreeBSD 來做產品</a> 介紹了在開發產品時與 FreeBSD
             project 合作的好處。 成功的軟體產品中的技術投入的一大部分，
             是來自於如何讓其符合不斷變化的市場節奏。 透過使用成熟的、
 	    採用寬鬆授權的原始碼，例如 FreeBSD project 的原始碼作為基礎，
             並遵循這篇文章中所介紹的最佳實踐，
             開發組織就能夠從因此而降低的研發投入和更好的市場佔有率中受益。</p>
         </event>
       </day>
 
       <day>
 	<name>18</name>
 
 	<event>
 	  <title>2005 年七月至十月進度報告</title>
 
 	  <p>2005 年七月至十月的進度報告 <a
 	    href="&enbase;/news/status/report-july-2005-oct-2005.html">現在發佈了</a>，
 	    其中包括了 37 項內容。</p>
 	</event>
       </day>
 
       <day>
         <name>5</name>
 
 	<event>
 	  <title>FreeBSD 版本的 KDE 3.4.3 發佈了</title>
 
 	  <p>KDE 3.4.3 已經合併到了 ports tree 中。
 	    要了解自 KDE 3.4.2 版本以來的改進，
 	    請參見 KDE 3.4.2 <a
 	    href="http://www.kde.org/announcements/changelogs/changelog3_4_2to3_4_3.php">
 	    修改日志</a>。 要了解進一步資訊，請參見 KDE 3.4.3
 	    <a href="http://www.kde.org/info/3.4.3.php">資訊頁</a>。
 	    要了解關於在 FreeBSD 上運行 KDE 的日常資訊，
 	    請參閱 FreeBSD 上的 KDE <a href="http://freebsd.kde.org">計劃主頁</a>。</p>
 	</event>
 
         <event>
           <title>FreeBSD 版本的 GNOME 2.12.1 發佈了</title>
 
           <p>伴隨著 6.0 的發佈，GNOME 2.12.1 也已經進入 ports tree 。
             請務必閱讀 <a href="&enbase;/gnome/docs/faq212.html">升級 FAQ</a>
             以了解全部修改、升級指導，以及已知問題。
             您還可以在 <a href="&enbase;/gnome/index.html">FreeBSD GNOME
             主頁</a> 上找到更多資料。</p>
         </event>
       </day>
 
       <day>
         <name>4</name>
 
        <event>
          <title>FreeBSD 6.0-RELEASE 發佈了</title>
 
           <p><a href="&enbase;/releases/6.0R/announce.html">FreeBSD
 	    6.0-RELEASE</a> 發佈了。 請在安裝前參見 <a
 	    href="&enbase;/releases/6.0R/errata.html">發行版勘誤</a>
 	    以了解關於 6.0 的最新新聞和問題。 在 <a
 	    href="&enbase;/releases/index.html">發行版資訊</a>
 	    網頁中提供了關於 FreeBSD 發行版的進一步資訊。</p>
        </event>
       </day>
 
       <day>
 	<name>1</name>
 	<event>
 	  <title>FreeBSD 標志設計大賽結果</title>
 
 	  <p>我們非常愉快地宣布我們的標志設計大賽的勝者： Anton K. Gural。
 	    要了解關於比賽的進一步詳情，請參見 <a
 	    href="http://logo-contest.freebsd.org/result/">比賽結果網頁</a>。
 	    透過新的標志，我們將能夠更好的在網絡上展示我們的身份，
 	    同時也為市場推廣鋪平了道路。 我們將很快發佈一個指導性頁面，
 	    其中將給出使用規則，以及可用的 (矢量格式) 標志數據，
 	    以與 FreeBSD 同樣的 BSD 授權發佈。</p>
 	</event>
       </day>
     </month>
 
     <month>
       <name>10</name>
 
       <day>
         <name>30</name>
         <event>
           <p>新增 committer： <a
             href="mailto:aaron@FreeBSD.org">Aaron Dalton</a>
             (ports)</p>
         </event>
       </day>
 
       <day>
         <name>18</name>
 	<event>
 	  <p>新增 committer： <a
 	    href="mailto:ariff@FreeBSD.org">Ariff Abdullah</a>
             (src)</p>
 	</event>
       </day>
 
       <day>
         <name>11</name>
 	<event>
 	  <title>FreeBSD 6.0-RC1 發佈了</title>
 
          <p>FreeBSD 6.0 的第一個發行候選版本 <a
 	   href="http://lists.freebsd.org/pipermail/freebsd-stable/2005-October/018790.html">發佈了</a>。
            RC1 ISO 鏡像，以及透過 FTP 的安裝支持可以在絕大多數的
            <a href="&enbase;/doc/zh_TW.UTF-8/books/handbook/mirrors-ftp.html">
            FreeBSD 鏡像站點</a> 找到。</p>
 
 	</event>
       </day>
 
       <day>
         <name>6</name>
         <event>
 	  <title>新增成功案例： Argentina.com</title>
 
 	  <p>新增了成功案例，<a
 	    href="&enbase;/doc/en_US.ISO8859-1/articles/casestudy-argentina.com/">
 	    argentina.com</a>，介紹了在拉丁美洲的一家 ISP
 	    是如何透過使用 FreeBSD 在競爭激烈的市場上取得成功的。</p>
 	</event>
       </day>
 
       <day>
         <name>5</name>
         <event>
 	  <title>新網站發佈了</title>
 
           <p>新網站發佈了。 我們希望新的設計能夠使瀏覽變得更容易。
             這一版本的網站是 Emily Boyd 在 <a
 	    href="http://code.google.com/summerofcode.html">Google 的
 	    Summer of Code</a> 計劃中完成的。 出於比較的目的，
 	    舊網站的備份留在了
             <a href="http://www.FreeBSD.org/old">這裡</a>。
             請將您關於新站點的看法發到 freebsd-www@FreeBSD.org 郵件列表。</p>
         </event>
       </day>
 
       <day>
 	<name>3</name>
 	<event>
 	  <p>新增 committer： <a
 	    href="mailto:bvs@FreeBSD.org">Vitaly Bogdanov</a>
             (doc)</p>
         </event>
 
         <event>
           <p>新增 committer： <a
             href="mailto:ehaupt@FreeBSD.org">Emanuel Haupt</a>
             (ports)</p>
          </event>
 
         <event>
           <p>新增 committer： <a
             href="mailto:az@FreeBSD.org">Andrej Zverev</a>
             (ports)</p>
          </event>
       </day>
     </month>
 
     <month>
       <name>9</name>
 
       <day>
 	<name>18</name>
 	<event>
 	  <p>新增 committer： <a
 	    href="mailto:tmclaugh@FreeBSD.org">Tom McLaughlin</a>
 	    (ports)</p>
 	</event>
       </day>
 
       <day>
       	<name>15</name>
 	<event>
 	  <p>新增 committer： <a
 	    href="mailto:mnag@FreeBSD.org">Marcus Alves Grando</a>
 	    (ports)</p>
 	</event>
       </day>
 
       <day>
 	<name>7</name>
 	<event>
 	  <title>FreeBSD 6.0-BETA4 發佈了</title>
 	  <p><a href="http://lists.freebsd.org/pipermail/freebsd-stable/2005-September/018186.html">6.0-BETA4 發佈公告</a>。</p>
 	</event>
       </day>
     </month>
 
     <month>
       <name>8</name>
 
       <day>
         <name>29</name>
 	<event>
 	  <title>FreeBSD 6.0-BETA3 發佈了</title>
 	  <p><a href="http://lists.freebsd.org/pipermail/freebsd-stable/2005-August/018061.html">6.0-BETA3 發佈公告</a>。</p>
 	</event>
       </day>
 
       <day>
       	<name>22</name>
 	<event>
 	  <p>新增 committer： <a
 	    href="mailto:garys@FreeBSD.org">Gary W. Swearingen</a>
 	    (doc)</p>
 	</event>
       </day>
 
       <day>
         <name>21</name>
 
 	<event>
 	  <title>新任安全官： Colin Percival</title>
 
 	  <p>在擔任安全官 43 個月之後，Jacques Vidrine
 	    將這一職務交給了 Colin Percival。 Colin 的主要作品包括
 	    FreeBSD Update、portsnap、bsdiff 工具，
 	    以及最近發表的關於在 hyperthreaded 處理器系統上敏感資訊洩露問題的論文
 	    "Cache missing for fun and profit"。 您可以在 <a
 	      href="http://lists.freebsd.org/pipermail/freebsd-security/2005-August/003115.html">
 	      這裡</a> 找到進一步的資訊。
 	  </p>
 	</event>
       </day>
 
       <day>
 	<name>17</name>
 
 	<event>
 	  <title>增加了 FreeBSD 活動的 iCalendar Feed</title>
 
 	  <p>使用能夠支持 iCalendar 格式的日程軟體的用戶，現在可以訂閱
 	    <a href="&enbase;/events/events.ics">FreeBSD 近期活動歷</a> 了。</p>
 	</event>
 
 	<event>
 	  <title>新增文章： 如何選擇 FreeBSD 版本</title>
 
 	  <p>新增的一篇文章，<a
 	    href="http://docs.freebsd.org/doc/9.0-RELEASE/usr/share/doc/freebsd/en_US.ISO8859-1/articles/version-guide/index.html">
 	    選擇適合您的 FreeBSD 版本</a>，
 	    討論了選擇最適合具體應用的 FreeBSD 版本時所需要考慮的問題。
 	    其中包括發行版與分支，以及 FreeBSD-STABLE 和
 	    FreeBSD-CURRENT 等一些概念的區別。 此外，它還介紹了 FreeBSD
 	    的開發過程如何達到適應頻繁發佈主要版本的目標，
 	    如何引入較小的功能集，並比較了過去的發行版所採用的方法。
 	    這篇文章的目標讀者是正準備安裝 FreeBSD 的新用戶，
 	    以及準備未來進行升級的現有用戶。</p>
 	</event>
       </day>
 
       <day>
         <name>5</name>
 
 	<event>
 	  <title>FreeBSD 6.0-BETA2 發佈了</title>
 
 	  <p><a href="http://lists.freebsd.org/pipermail/freebsd-stable/2005-August/017586.html">6.0-BETA2 發佈公告</a>。</p>
 	</event>
       </day>
 
       <day>
 	<name>1</name>
 
 	<event>
 	  <title>新的 FreeBSD/Linux 白皮書</title>
 
 	  <p>Dru Lavigne 剛剛發佈了 <a
 	    href="&enbase;/doc/en_US.ISO8859-1/articles/linux-comparison/">FreeBSD：
 	    Linux 的一種開源替代品</a>。 這篇白皮書的目的是，
 	    介紹 FreeBSD 所提供的功能和好處，並與 Linux
 	    進行適當的比較。 它為那些打算尋找 Linux
 	    的開源替代品的人提供了一個好的起點。</p>
 	</event>
       </day>
     </month>
 
     <month>
       <name>7</name>
 
       <day>
 	<name>22</name>
 
 	<event>
 	  <title>2005 年 三月至六月進度報告</title>
 
 	  <p>2005 三月至六月的進度報告 <a
 	      href="&enbase;/news/status/report-mar-2005-june-2005.html">現已發佈</a>，
 	     其中包括了 43 個計劃。</p>
 	</event>
       </day>
 
       <day>
       	<name>20</name>
 	<event>
 	  <p>新增 committer： <a
 	    href="mailto:vsevolod@FreeBSD.org">Vsevolod Stakhov</a>
 	    (ports)</p>
 	</event>
       </day>
 
       <day>
 	<name>18</name>
 	<event>
 	  <p>新增 committer： <a
 	    href="mailto:bruno@FreeBSD.org">Bruno Ducrot</a>
 	    (src)</p>
 	</event>
       </day>
 
       <day>
         <name>16</name>
 
 	<event>
 	  <title>宣布了受資助的在校生計劃</title>
 
 	  <p>FreeBSD Project 收到了超過 350 個關於 <a
 	    href="http://code.google.com/summerofcode.html">Google 的
 	    Summer of Code</a> 計劃的申請，其中選出了 18 個進行資助。
 	    遺憾的是，能夠進行資助的數量不到申請數量的零頭。
 	    不過，我們鼓勵在校生與我們一同進行全年的工作。 FreeBSD
 	    Project 一直希望，透過我們日常的社區郵件列表，
 	    以及開發論壇來幫助指導在校生了解更多的關於操作系統開發的過程。
 	    為開源軟體計劃提供幫助，是計算科學教育中非常有價值的一部分，
 	    也是個人軟體開發職業生涯的一項重要準備。</p>
 
 	  <p>關於資助在校生計劃的更多資訊，可以從 <a
 	    href="http://wikitest.freebsd.org/moin.cgi/SummerOfCode2005">FreeBSD
 	    Summer of Code Wiki</a> 獲得。</p>
 
 	</event>
       </day>
 
       <day>
         <name>15</name>
 
 	<event>
 	  <title>FreeBSD 6.0-BETA1 發佈了</title>
 
 	  <p><a href="http://lists.freebsd.org/pipermail/freebsd-stable/2005-July/016958.html">6.0-BETA1 發佈公告</a>.</p>
 	</event>
       </day>
 
       <day>
         <name>11</name>
 
 	<event>
 	  <title>6-STABLE 分支 (RELENG_6) 建立了</title>
 
 	  <p>我們已經到達了 6.0-RELEASE 過程的下一個裡程碑。 RELENG_6
 	  CVS 分支已經從 HEAD 上分離出來。 即將發佈的 6.0-RELEASE，
 	  以及所有後續的 6.x 版本，都將從這一分支上開發。
 	  更多詳情請參見：
 	  <a href="&enbase;/releases/6.0R/schedule.html">6.0-RELEASE 計劃</a>、
 	  <a href="http://lists.freebsd.org/pipermail/freebsd-stable/2005-July/016855.html">RELENG_6 公告</a>。</p>
 	</event>
 
 	<event>
 	  <p>新增 committer： <a
 	    href="mailto:garga@FreeBSD.org">Renato Botelho</a>
 	    (ports)</p>
 	</event>
       </day>
 
       <day>
 	<name>6</name>
 	<event>
 	  <p>新增 committer： <a
 	    href="mailto:jkim@FreeBSD.org">Jung-uk Kim</a>
 	    (src)</p>
 	</event>
       </day>
 
       <day>
         <name>2</name>
 
 	<event>
 	  <title>2005 年 7 月的快照版本發佈了</title>
 
 	  <p>FreeBSD 6-CURRENT 在 2005 年 7 月的快照版本發佈了。
 	    這應該是 RELENG_6 分支創建前的最後一個 6.0-CURRENT 快照版本。
 	    FreeBSD 交付工程組發佈了 5-STABLE 和 6-CURRENT
 	    以鼓勵人們測試其中的新功能，並改善其可靠性。
 	    要了解更進一步的細節，請參見
 	    <a href="&enbase;/snapshots/index.html">快照主頁</a>。</p>
 	</event>
       </day>
 
       <day>
         <name>1</name>
 
         <event>
           <p>新增 committer： <a
              href="mailto:wsalamon@FreeBSD.org">Wayne Salamon</a>
              (src)</p>
         </event>
       </day>
     </month>
 
     <month>
       <name>6</name>
 
       <day>
         <name>17</name>
 
         <event>
           <p>新增志願者： <a
              href="mailto:matteo@FreeBSD.org">Matteo Riondato</a>
              (PR database)</p>
         </event>
 
         <event>
           <p>新增 committer： <a
             href="mailto:kmacy@FreeBSD.org">Kip Macy</a>
             (src)</p>
         </event>
       </day>
 
       <day>
         <name>11</name>
 
         <event>
           <title>6.0-RELEASE 原始碼凍結開始</title>
 
           <p><a href="&enbase;/releases/6.0R/schedule.html">FreeBSD
           6.0</a> 原始碼凍結開始了。 開發人員在 src/ 的 HEAD 分支上提交原始碼之前，
           必須首先得到 re@FreeBSD.org 的許可。 您可以從 FTP 站點下載
           6.0 的最新快照版本，並幫助測試這個新的 FreeBSD 主要版本。
           要了解進一步的資訊，請參見網站的 <a
           href="&enbase;/releng/index.html">交付工程</a> 部分。</p>
         </event>
       </day>
 
       <day>
         <name>1</name>
 
         <event>
           <title>受資助的在校生編碼工作機會</title>
 
           <p>FreeBSD Project 很高興地參加了 Google 的
             <a href="http://code.google.com/summerofcode.html">Summer
             of Code 2005</a> 計劃，為將在暑期參與開源軟體計劃的在校學生提供資助。
             FreeBSD 專屬的計劃列表和候選導師可以在 <a
             href="&enbase;/projects/summerofcode.html">這裡</a> 找到。</p>
         </event>
 
         <event>
           <p>新增 committer： <a
             href="mailto:brd@FreeBSD.org">Brad Davis</a>
             (doc)</p>
         </event>
       </day>
     </month>
 
     <month>
       <name>5</name>
 
       <day>
         <name>26</name>
 
         <event>
           <p>新增 committer： <a
              href="mailto:thompsa@FreeBSD.org">Andrew Thompson</a>
              (src)</p>
         </event>
       </day>
 
       <day>
         <name>21</name>
 
         <event>
 	  <p>新增 committer： <a
 	    href="mailto:rodrigc@FreeBSD.org">Craig Rodrigues</a>
 	    (src)</p>
         </event>
       </day>
 
       <day>
         <name>15</name>
 
        <event>
          <title>BSDCan 大會總結</title>
 
           <p>在渥太華的又一次 <a href="http://www.bsdcan.org">BSD
             conference</a> 盛會已經圓滿結束了。 此前舉行了為期兩天的 FreeBSD
             開發人員峰會。 特別感謝 Dan Langille 組織本次會議，以及由
             Scott Long 組織的峰會。</p>
 
        </event>
       </day>
 
       <day>
         <name>9</name>
 
        <event>
          <title>FreeBSD 5.4-RELEASE 正式發佈了</title>
 
           <p><a href="&enbase;/releases/5.4R/announce.html">FreeBSD
 	    5.4-RELEASE</a> 正式發佈了。 安裝前，請查看 <a
 	    href="&enbase;/releases/5.4R/errata.html">發行勘誤</a>
 	    以了解 5.4 上新發現的問題。 <a
 	    href="&enbase;/releases/index.html">發行版資訊</a>
 	    網頁提供了關於 FreeBSD 發行版的更多資訊。</p>
 
        </event>
       </day>
 
       <day>
         <name>3</name>
 
        <event>
          <title>FreeBSD 5.4-RC4 版發佈了</title>
 
          <p>FreeBSD 5.4-RC4 版本已經發佈。 FreeBSD 交付工程組愉快地宣布，
             現在 FreeBSD 5.4-RC3，FreeBSD 5.4
             交付工程中的第四個發行候選版本已經可用。 除非發現重大問題，
             這將是最後一個發行候選版本。 RC4 ISO 映像檔案，
             以及透過 FTP 的安裝支持，已經可以從眾多
             <a href="http://www.FreeBSD.org/doc/zh_TW.UTF-8/books/handbook/mirrors-ftp.html"
               >FreeBSD 鏡像站點</a> 上獲得。</p>
        </event>
 
 	<event>
 	  <title>PF 更新到了 3.7</title>
 
 	  <p>packet filter (pf) 原始碼已經被更新為即將發佈的
 	    OpenBSD 3.7 相同的版本。 包括嵌套 anchor 和連接速率限制，
 	    現在都可以為 FreeBSD 用戶直接使用了。</p>
 	</event>
       </day>
     </month>
 
     <month>
       <name>4</name>
 
       <day>
         <name>21</name>
 
 	<event>
 	  <title>2005 年第一季度開發進度報告</title>
 
 	  <p>2005 年第一季度開發進度報告共有 39 個條目，可以在 <a
 	      href="&enbase;/news/status/report-jan-2005-mar-2005.html">這裡</a>訪問。</p>
 	</event>
       </day>
 
       <day>
         <name>18</name>
 
         <event>
           <title>FreeBSD 5.4-RC3 版發佈了</title>
 
           <p>FreeBSD 5.4-RC3 版本已經發佈。 FreeBSD 交付工程組愉快地宣布，
             現在 FreeBSD 5.4-RC3，FreeBSD 5.4
             交付工程中的第三個發行候選版本已經可用。 RC3 ISO 映像檔案，
             以及透過 FTP 的安裝支持，已經可以從眾多
             <a href="http://www.FreeBSD.org/doc/zh_TW.UTF-8/books/handbook/mirrors-ftp.html"
               >FreeBSD 鏡像站點</a> 上獲得。</p>
         </event>
       </day>
 
       <day>
         <name>13</name>
 
         <event>
 	  <p>新增 committer：<a
 	    href="mailto:qingli@FreeBSD.org">Qing Li</a>
 	    (src)</p>
         </event>
       </day>
 
       <day>
         <name>12</name>
 
         <event>
 	  <p>新增 committer：<a
 	    href="mailto:jylefort@FreeBSD.org">Jean-Yves Lefort</a>
 	    (ports)</p>
         </event>
 
         <event>
 	  <p>新增 committer：<a
 	    href="mailto:lawrance@FreeBSD.org">Sam Lawrance</a>
 	    (ports)</p>
         </event>
       </day>
 
       <day>
         <name>11</name>
 
         <event>
           <title>FreeBSD 5.4-RC2 版發佈了</title>
 
           <p>FreeBSD 5.4-RC2 版本已經發佈。 FreeBSD 交付工程組愉快地宣布，
             現在 FreeBSD 5.4-RC2，FreeBSD 5.4
             交付工程中的第二個發行候選版本已經可用。
             我們鼓勵大家對這個版本進行測試，
             以便發現其中的遺留問題並加以修正。 RC2 ISO 映像檔案，
             以及透過 FTP 的安裝支持，已經可以從眾多
             <a href="&enbase;/doc/zh_TW.UTF-8/books/handbook/mirrors-ftp.html"
               >FreeBSD 鏡像站點</a> 上獲得。</p>
         </event>
       </day>
 
       <day>
         <name>7</name>
 
         <event>
 	  <p>新增 committer：<a
 	    href="mailto:joel@FreeBSD.org">Joel Dahl</a>
 	    (doc)</p>
         </event>
       </day>
 
       <day>
         <name>5</name>
 
         <event>
           <title>FreeBSD 5.4-RC1 版發佈了</title>
 
           <p>FreeBSD 5.4-RC1 版發佈了。
             FreeBSD 交付工程組愉快地宣布，
             現在 FreeBSD 5.4-RC1，FreeBSD 5.4
             的第一個發行候選版本已經發佈。 我們鼓勵人們幫助對其進行測試，
             以便發現其中的遺留問題並加以修正。 RC1 ISO 映像檔案，
             以及透過 FTP 的安裝支持，已經可以從眾多
             <a href="&enbase;/doc/zh_TW.UTF-8/books/handbook/mirrors-ftp.html"
               >FreeBSD 鏡像站點</a> 上找到。</p>
         </event>
       </day>
     </month>
 
     <month>
       <name>3</name>
 
       <day>
 	<name>31</name>
 
 	<event>
             <p>增強 commit 權限：<a href="mailto:netchild@FreeBSD.org">Alexander Leidinger</a> (src, ports)</p>
 	</event>
       </day>
 
       <day>
 	<name>20</name>
 
 	<event>
 	  <title>FreeBSD 5.4-BETA1 版發佈了</title>
 
 	  <p>FreeBSD 5.4-BETA1 版正式發佈了。
 	    這是 FreeBSD 5.4 發行周期的第一個 BETA 版本，Release Engineering
 	    團隊鼓勵人們幫助測試以便於在正式發佈前確定並解決任何最終的
 	    bug。安裝支持的 ISO 鏡像和 FTP 可以訪問大多數的
 	    <a href="http://www.FreeBSD.org/doc/zh_TW.UTF-8/books/handbook/mirrors-ftp.html"
 	      >FreeBSD 鏡像站點</a>。</p>
 	</event>
       </day>
 
       <day>
 	<name>17</name>
 
 	<event>
 	  <title>2005 年三月版的快照發行版可用了</title>
 
 	  <p>FreeBSD 6-CURRENT 的 2005 年三月快照版本現在可用了。
 	    請注意本月的快照並不包括 5-STABLE，因為很快將發佈
 	    5.4-PRERELEASE。 FreeBSD Release Engineering 團隊，
 	    透過發佈每月一次的 5-STABLE 和 6-CURRENT 快照版本，
 	    來鼓勵人們常識新特性，並提高軟體的可靠性。
 	    要了解更多細節，請訪問
 	    <a href="&enbase;/snapshots/index.html">快照</a> 的網頁。</p>
 	</event>
       </day>
 
       <day>
 	  <name>12</name>
 
 	  <event>
 	      <title>GNOME 2.10.0 可以在 FreeBSD 上用了</title>
 
 	      <p>GNOME 2.10.0 已經發佈，並進入了 ports tree，
 		  從而可以趕上 5.4-RELEASE 的進度了。 請務必閱讀我們的
 		  <a href="&enbase;/gnome/docs/faq210.html">升級 FAQ</a>
 		  以了解關於變動、升級指導，以及已知的問題。
 		  更多資源，可以在 <a href="&enbase;/gnome/index.html">FreeBSD GNOME
 		      主頁</a> 找到。</p>
 	  </event>
       </day>
 
       <day>
 	<name>7</name>
 
 	<event>
         <p>新增 committer： <a href="mailto:novel@FreeBSD.org">Roman Bogorodskiy</a> (ports)</p>
 	</event>
       </day>
 
       <day>
 	<name>3</name>
 
 	<event>
 	    <p>新增 committer： <a href="mailto:damien@FreeBSD.org">Damien Bergamini</a> (src)</p>
 	</event>
       </day>
 
       <day>
 	<name>1</name>
 
 	<event>
 	    <p>新增 committer： <a href="mailto:jcamou@FreeBSD.org">Jesus R. Camou</a> (doc)</p>
 	</event>
 
 	<event>
 	    <p>新增 committer： <a href="mailto:flz@FreeBSD.org">Florent Thoumie</a> (ports)</p>
 	</event>
       </day>
     </month>
 
     <month>
       <name>2</name>
 
       <day>
 	<name>27</name>
 
 	<event>
 	    <p>新增 committer： <a href="mailto:barner@FreeBSD.org">Simon Barner</a> (ports)</p>
 	</event>
       </day>
 
       <day>
 	<name>22</name>
 
 	<event>
 	    <p><a href="http://logo-contest.FreeBSD.org/">標志設計競賽</a> 全面啟動。</p>
 	</event>
 
 	<event>
 	    <p>新增 committer： <a href="mailto:avatar@FreeBSD.org">Tai-hwa Liang</a> (src)</p>
 	</event>
       </day>
     </month>
 
     <month>
       <name>1</name>
 
       <day>
 	<name>25</name>
 	<event>
 	  <title>FreeBSD 4.11-RELEASE 正式發佈了</title>
 
 	  <p><a href="&enbase;/releases/4.11R/announce.html">FreeBSD
 	      4.11-RELEASE</a> 正式發佈了。 安裝之前請查看 <a
 	      href="&enbase;/releases/4.11R/errata.html">發行版勘誤</a>
 	    以了解新發現的 4.11 版本的問題。 <a
 	      href="&enbase;/releases/index.html">發行版資料</a>
 	    頁提供了關於 FreeBSD 發行版更為詳盡的資料。</p>
 	</event>
       </day>
 
       <day>
 	<name>17</name>
 
 	<event>
 	  <title>2004 年 下半年度計劃狀況報告</title>
 
 	  <p>您 <a
 	      href="&enbase;/news/status/report-july-2004-dec-2004.html">現在</a>
 	    就可以從包含了 44 個條目的狀況報告，來了解去年七月到十二月的計劃發展情況。</p>
 	</event>
 
 	<event>
 	  <title>FreeBSD 4.11 RC3 發佈了</title>
 
 	  <p>FreeBSD 4.11 的第三個發行候選版本現在已經可以使用了。 請參見
 	    FreeBSD-STABLE 郵件列表上的 <a
 	    href="http://docs.freebsd.org/cgi/mid.cgi?20050117020739.GA2736">這份公告</a>。
 	    完整的 4.11 發佈計劃可以在 <a
 	    href="&enbase;/releases/4.11R/schedule.html">這裡</a> 找到。</p>
 	</event>
       </day>
 
       <day>
 	<name>2</name>
 
 	<event>
 	  <title>FreeBSD 4.11 RC2 發佈了</title>
 
 	  <p>FreeBSD 4.11 的第二個發行候選版本現在已經可以使用了。 請參見
 	    FreeBSD-STABLE 郵件列表上的 <a
 	    href="http://docs.freebsd.org/cgi/mid.cgi?20050103054251.GA60361">這份</a>
 	    完整的公告。 完整的 4.11 發佈計劃可以在 <a
 	    href="&enbase;/releases/4.11R/schedule.html">這裡</a> 找到。</p>
 	</event>
       </day>
     </month>
   </year>
 
   <year>
     <name>2004</name>
 
     <month>
       <name>12</name>
 
 	<day>
 	  <name>28</name>
 
 	  <event>
 	    <title>Mozilla 授權 FreeBSD 的 thunderbird 和 firefox ports</title>
 
 	    <p><a href="http://www.mozilla.org/foundation/licensing.html">Mozilla 授權團隊</a>
 	      已經 <a href="http://people.freebsd.org/~ahze/firefox_thunderbird-approved.txt">授權</a>
 	      <a href="/gnome/index.html">FreeBSD Gnome 團隊</a>
 	      使用 Firefox 和 Thunderbird 的名稱、官方圖標，
 	      以及制作官方品牌的預編譯版本。</p>
 	  </event>
 	  <event>
 	    <p>新增 committer： <a href="mailto:sah@FreeBSD.org">Sam Hopkins</a> (src)</p>
 	  </event>
 	</day>
 
         <day>
           <name>23</name>
 
           <event>
 	    <title>FreeBSD 基金會季刊發佈</title>
 
 	    <p>FreeBSD 基金會發佈了它的 <a
 	      href="http://www.freebsdfoundation.org/press/20041221-newsletter.shtml">
 	      季刊</a>，並借此呼籲對其進行捐助以維持它的 501(c)3
 	      非盈利慈善團體地位。</p>
           </event>
         </day>
 
 	<day>
 	  <name>18</name>
 
 	  <event>
 	    <title>FreeBSD 4.11 RC1 發佈了</title>
 
 	  <p>FreeBSD 4.11 的第一個發行候選版本現在已經可以使用了。 請參見
 	    FreeBSD-STABLE 郵件列表上的 <a
 	      href="http://docs.freebsd.org/cgi/getmsg.cgi?fetch=495816+0+archive/2004/freebsd-stable/20041219.freebsd-stable">完整公告</a>。
 	    完整的 4.11 發佈計劃可以在 <a
 	    href="&enbase;/releases/4.11R/schedule.html">這裡</a> 找到。</p>
 	  </event>
 	</day>
 
 	<day>
 	  <name>13</name>
 
 	  <event>
 	    <p>新增 committer： <a
 	      href="mailto:niels@FreeBSD.org">Niels Heinen</a>
 	      (ports)</p>
 	  </event>
 	</day>
 
 	<day>
 	  <name>6</name>
 
 	  <event>
 	    <p><a href="http://www.FreeSBIE.org/">FreeSBIE</a> 1.1 FreeBSD
 	      Live CD 發佈了 ── 參見 <a href="http://www.freesbie.org/doc/1.1/ANNOUNCE.txt">
 	      發佈公告</a> 了解更進一步的詳情。</p>
 	  </event>
 
 	  <event>
 	    <p>新增 committer： <a
 	      href="mailto:girgen@FreeBSD.org">Palle Girgensohn</a>
 	      (ports)</p>
 	  </event>
 	</day>
 
 	<day>
 	  <name>2</name>
 
 	  <event>
 	    <title>正式公告 FreeBSD 4.11 發行日程</title>
 
 	    <p>FreeBSD 4.11 發行版的發行日程已經正式公告，
 	      我們的目標是在 2005 年 1 月 24 日發佈它。
 	      完整的日程表在 <a
 	      href="http://www.freebsd.org/releases/4.11R/schedule.html">
 	      這裡</a>。</p>
 	  </event>
 	</day>
 
 	<day>
 	  <name>1</name>
 
 	  <event>
 	    <p>新增 committer： <a
 	      href="mailto:dumbbell@FreeBSD.org">Jean-S&#233;bastien P&#233;dron</a>
 	      (src)</p>
 	  </event>
 	</day>
     </month>
 
     <month>
       <name>11</name>
 
 	<day>
 	  <name>27</name>
 
 	  <event>
 	    <title>FreeBSD 商標已轉入基金會名下</title>
 
 	    <p>'FreeBSD' 商標在 1996 年曾被授予由 Walnut Creek CDROM (現在的 <a
 	      href="http://www.freebsdmall.com">FreeBSD Mall,
 	      Inc.</a>) 使用，它現在已經轉到了 <a
 	      href="http://www.freebsdfoundation.org">FreeBSD
 	      基金會</a> 名下。</p>
 	  </event>
 	</day>
 
 	<day>
 	  <name>19</name>
 
 	  <event>
 	    <p>新增 committer： <a
 	      href="mailto:carvay@FreeBSD.org">Vicente Carrasco</a>
 	      (doc)</p>
 	  </event>
 	</day>
 
 	<day>
 	  <name>11</name>
 
 	  <event>
 	    <p>新增 committer： <a
 	      href="mailto:jkois@FreeBSD.org">Johann Kois</a>
 	      (doc)</p>
 	  </event>
 	</day>
 
 	<day>
 	  <name>7</name>
 
 	  <event>
 	    <title>GNOME 2.8.1 發佈了 FreeBSD 版本</title>
 
 	    <p>在 FreeBSD 5.3 發佈之後，GNOME 2.8.1 已經合併到了 ports tree 中。
 	      請參見
 	      <a href="&enbase;/gnome/index.html">FreeBSD GNOME
 	        主頁</a> 以獲取升級的具體步驟。</p>
 	  </event>
 	</day>
 
 	<day>
 	  <name>6</name>
 
 	  <event>
 	    <title>FreeBSD 5.3-RELEASE 發佈了</title>
 
           <p><a href="&enbase;/releases/5.3R/announce.html">FreeBSD
 	    5.3-RELEASE</a> 正式發佈了。 在安裝前請查看 <a
 	    href="&enbase;/releases/5.3R/errata.html">發行版勘誤</a>
 	    以了解 5.3 上面新近發現的問題和新聞。 <a
 	    href="&enbase;/releases/index.html">發行版資訊</a>
 	    頁面提供了更多的關於發行版的資訊。</p>
 
 	  </event>
 	</day>
     </month>
 
     <month>
        <name>10</name>
 
 	<day>
 	  <name>31</name>
 
 	  <event>
 	    <title>FreeBSD 5.3-RC2 發佈了</title>
 
 	    <p>FreeBSD Release Engineering Team 驕傲地宣布，
 	      FreeBSD 5.3-RC2 已經可以用了。
 	      由於在 RC1 測試中發現了兩個嚴重問題，
 	      我們認為需要再發佈一個 RC 以讓這些問題的修正得到更廣泛的測試。
 	      如果沒有再出現新的嚴重問題，這將是 5.3-RELEASE
 	      之前的最後一個發行測試版本。 請參見
 	      FreeBSD-CURRENT 上的完整公告，它在 <a
 	      href="http://docs.freebsd.org/cgi/getmsg.cgi?fetch=219950+0+current/freebsd-current">這裡</a>。</p>
 	  </event>
 	</day>
 
 	<day>
 	  <name>29</name>
 
 	  <event>
 	    <p>新增 committer： <a
 	      href="mailto:ahze@FreeBSD.org">Michael Johnson</a> (ports)</p>
 	  </event>
 	</day>
 
 	<day>
 	  <name>16</name>
 
 	  <event>
 	    <p>新增 committer： <a
 	      href="mailto:remko@FreeBSD.org">Remko Lodder</a> (doc)</p>
 	  </event>
 	</day>
 
  	<day>
         <name>12</name>
         <event>
           <p>新增 committer： <a
           href="mailto:gnn@FreeBSD.org">George V. Neville-Neil</a>
           (src)</p>
         </event>
       </day>
 
  	<day>
         <name>8</name>
         <event>
           <p>新增 committer： <a
           href="mailto:ups@FreeBSD.org">Stephan Uphoff</a>
           (src)</p>
         </event>
       </day>
 
     </month>
 
     <month>
       <name>9</name>
 
       <day>
 	<name>15</name>
 	<event>
 	  <p>新增 committer： <a
 	  href="mailto:kwm@FreeBSD.org">Koop Mast</a>
 	  (ports)</p>
 	</event>
 
 	<event>
 	  <p>新增 committer： <a
 	    href="mailto:delphij@FreeBSD.org">李鑫</a>
 	    (src, doc)</p>
 	</event>
       </day>
 
     </month>
 
     <month>
       <name>8</name>
 
       <day>
 	<name>20</name>
 	<event>
 	  <p>新增 committer： <a
 	    href="mailto:danfe@FreeBSD.org">Alexey Dokuchaev</a>
 	    (ports)</p>
 	</event>
       </day>
 
       <day>
 	<name>19</name>
 	<event>
 	  <p>新增 committer： <a
 	    href="mailto:lesi@FreeBSD.org">Dejan Lesjak</a>
 	    (ports)</p>
 	</event>
       </day>
 
       <day>
 	<name>18</name>
 	<event>
 	  <p>新增 committer： <a
 	    href="mailto:clsung@FreeBSD.org">宋政隆</a>
 	    (ports)</p>
 	</event>
       </day>
 
       <day>
 	<name>10</name>
 	<event>
 	  <p>新增 committer： <a
 	    href="mailto:marck@FreeBSD.org">Dmitry Morozovsky</a>
 	    (doc)</p>
 	</event>
       </day>
 
       <day>
 	<name>5</name>
 	<event>
 	  <p>新增 committer： <a
 	    href="mailto:hq@FreeBSD.org">Herve Quiroz</a>
 	    (ports)</p>
 	</event>
       </day>
 
       <day>
 	<name>2</name>
 	<event>
 	  <p>新增 committer： <a
 	    href="mailto:yongari@FreeBSD.org">Pyun YongHyeon</a>
 	    (src)</p>
 	</event>
       </day>
 
     </month>
 
     <month>
       <name>7</name>
 
       <day>
 	<name>27</name>
 	<event>
 	  <p>新增 committer： <a
 	    href="mailto:bz@FreeBSD.org">Bjoern A. Zeeb</a>
 	    (src)</p>
 	</event>
       </day>
 
        <day>
          <name>26</name>
 	 <event>
 	   <title>2004 年五月至六月進度報告發佈</title>
 
 	   <p>五月至六月的進度報告發佈了； 請參見 <a
 	     href="&enbase;/news/status/status.html">進度報告 Web
 	     頁</a> 了解具體資訊。</p> </event>
       </day>
 
       <day>
 	<name>24</name>
 	<event>
 	  <p>新增 committer： <a
 	    href="mailto:ssouhlal@FreeBSD.org">Suleiman Souhlal</a>
 	    (PowerPC)</p>
 	</event>
       </day>
 
       <day>
 	<name>23</name>
 	<event>
 	  <title>FreeBSD 切換為使用 X.Org</title>
 	  <p>FreeBSD-CURRENT 現在默認採用 X.Org 的 X 系統，
 	    而 XFree86 仍然繼續被支持。 欲了解如何在 -CURRENT 和 -STABLE 上升級到 X.org
 	    的詳情，請參考
 	    <a href="http://lists.freebsd.org/pipermail/freebsd-current/2004-July/032267.html">
 	      HEADS UP</a>。</p>
 	</event>
       </day>
 
       <day>
         <name>14</name>
 	<event>
 	  <p>新增 committer： <a
 	    href="mailto:glebius@FreeBSD.org">Gleb Smirnoff</a>
 	    (src)</p>
 	</event>
       </day>
 
       <day>
         <name>7</name>
 	<event>
 	  <p>新增 committer： <a
 	    href="mailto:sem@FreeBSD.org">Sergey Matveychuk</a>
 	    (ports)</p>
 	</event>
       </day>
 
     </month>
 
     <month>
       <name>5</name>
 
       <day>
 	<name>30</name>
 	<event>
 	  <p>新增 committer： <a
 	    href="mailto:lth@FreeBSD.org">Lars Thegler</a>
 	    (ports)</p>
 	</event>
       </day>
 
       <day>
 	<name>27</name>
 	<event>
 	  <title>FreeBSD 4.10-RELEASE 正式發佈了</title>
 
 	  <p><a href="&enbase;/releases/4.10R/announce.html">FreeBSD
 	      4.10-RELEASE</a> 已經正式發佈了。 在安裝之前請首先參考 <a
 	      href="&enbase;/releases/4.10R/errata.html">發佈版勘誤</a>
 	    以了解關於 4.10 的最新的消息和已知問題。
 	    <a
 	      href="&enbase;/releases/index.html">Release Information</a>
 	    頁提供了關於 FreeBSD 發行版本的進一步資訊。</p>
 	</event>
       </day>
 
       <day>
 	<name>23</name>
 	<event>
 	  <p>新增 committer： <a
 	    href="mailto:metal@FreeBSD.org">Koichi Suzuki</a>
 	    (doc)</p>
 	</event>
       </day>
 
        <day>
          <name>15</name>
 	 <event>
 	   <title>2004 年 3、4 月開發進度報告</title>
 
 	   <p> 3、4 月開發進度報告，更多資訊請看
 	     <a href="&enbase;/news/status/status.html">web狀態頁面</a>。
 	     </p>
 	 </event>
        </day>
 
       <day>
 	<name>4</name>
 	<event>
 	  <p>新增 committer： <a
 	    href="mailto:csjp@FreeBSD.org">Christian S.J. Peron</a>
 	    (src)</p>
 	</event>
 	<event>
 	  <p>新增 committer： <a
 	    href="mailto:stefanf@FreeBSD.org">Stefan Farfeleder</a>
 	    (src)</p>
 	</event>
       </day>
 
     </month>
 
     <month>
       <name>4</name>
 
       <day>
 	<name>30</name>
 	<event>
 	  <p>新增 committer： <a
 	    href="mailto:mezz@FreeBSD.org">Jeremy Messenger</a>
 	    (ports)</p>
 	</event>
       </day>
 
       <day>
 	<name>19</name>
 	<event>
 	  <p>新增 committer： <a
 	    href="mailto:tackerman@FreeBSD.org">Tony Ackerman</a>
 	    (src)</p>
 	</event>
       </day>
 
       <day>
 	<name>17</name>
 	<event>
 	  <p>新增 committer： <a
 	    href="mailto:marius@FreeBSD.org">Marius Strobl</a>
 	    (src)</p>
 	</event>
       </day>
 
       <day>
 	<name>5</name>
 	<event>
 	  <p>新增 committer： <a
 	    href="mailto:dhartmei@FreeBSD.org">Daniel Hartmeier</a>
 	    (src)</p>
 	</event>
       </day>
 
     </month>
 
     <month>
       <name>3</name>
 
       <day>
         <name>29</name>
         <event>
           <p>新增 committer： <a
             href="mailto:niklas@FreeBSD.org">Niklas J. Saers</a>
             (doc)</p>
         </event>
       </day>
 
 
       <day>
 	<name>25</name>
 	<event>
 	  <title>刪去了 Gallery</title>
 
 	  <p>由於維護困難而收效甚微，我們決定刪去
 	    <a href="&enbase;/gallery/">gallery</a> 頁面。
 	    這些內容將在兩周後刪除，今後提交的內容將不再受理。
 	    不過，這並不影響
 	    <a href="&enbase;/commercial/">Commercial Gallery</a>。</p>
 	</event>
       </day>
 
        <day>
          <name>18</name>
          <event>
            <p>新增 committer： <a
              href="mailto:marks@FreeBSD.org">Mark Santcroos</a>
              (src)</p>
          </event>
        </day>
 
        <day>
          <name>17</name>
 	 <event>
 	   <title>2004 年一月至二月進度報告</title>
 
 	   <p>一月至二月的進度報告現在發佈了； 請參見
 	     <a href="&enbase;/news/status/status.html">進度報告網站</a>
 	     了解更多資訊。</p>
 	 </event>
        </day>
        <day>
          <name>13</name>
          <event>
            <p>新增 committer： <a
              href="mailto:thierry@FreeBSD.org">Thierry Thomas</a>
              (ports)</p>
          </event>
        </day>
 
        <day>
          <name>10</name>
          <event>
            <p>新增 committer： <a
              href="mailto:vs@FreeBSD.org">Volker Stolz</a>
              (ports)</p>
          </event>
        </day>
 
       <day>
 	<name>9</name>
 	<event>
 	  <p>新增 committer： <a
 	    href="mailto:peadar@FreeBSD.org">Peter Edwards</a>
 	    (src)</p>
 	</event>
       </day>
 
     </month>
 
     <month>
       <name>2</name>
 
       <day>
 	<name>26</name>
 	<event>
 	  <p>新增 committer： <a
 	    href="mailto:vkashyap@FreeBSD.org">Vinod Kashyap</a>
 	    (src)</p>
 	</event>
       </day>
 
       <day>
         <name>25</name>
 	<event>
 	  <title>FreeBSD 5.2.1-RELEASE 發佈了</title>
 
           <p><a href="&enbase;/releases/5.2.1R/announce.html">FreeBSD
 	    5.2.1-RELEASE</a> 發佈了。 在安裝前，請查看 <a
 	    href="&enbase;/releases/5.2.1R/errata.html">發行版勘誤</a>
 	    以了解最新消息和 5.2.1 發佈之後所發現的問題。 在 <a
 	    href="&enbase;/releases/index.html">發行版資訊</a>
 	    網頁中，您可以找到更多關於 FreeBSD 發行版的資訊。</p>
 
 	</event>
       </day>
 
       <day>
 	<name>22</name>
 	<event>
 	  <p>新增 committer： <a
 	    href="mailto:markus@FreeBSD.org">Markus Br&#252;ffer</a>
 	    (Ports)</p>
 	</event>
       </day>
 
       <day>
 	<name>17</name>
 	<event>
 	  <p>新增 committer： <a
 	    href="mailto:rees@FreeBSD.org">Jim Rees</a>
 	    (src)</p>
 	</event>
       </day>
 
       <day>
 	<name>15</name>
 	<event>
 	  <p>核心團隊成員辭職： <a
 	    href="mailto:grog@FreeBSD.org">Greg Lehey</a> </p>
 	</event>
       </day>
 
       <day>
 	<name>10</name>
 	<event>
 	  <p>新增 committer： <a
 	    href="mailto:mlaier@FreeBSD.org">Max Laier</a>
 	    (src)</p>
 	</event>
       </day>
 
       <day>
 	<name>2</name>
 	<event>
 	  <p>新增 committer： <a
 	    href="mailto:le@FreeBSD.org">Lukas Ertl</a>
 	    (src)</p>
 	</event>
 
 	<event>
 	  <p>新增 committer： <a
 	    href="mailto:pjd@FreeBSD.org">Pawel Jakub Dawidek</a>
 	    (src)</p>
 	</event>
       </day>
 
     </month>
 
     <month>
       <name>1</name>
 
       <day>
 	<name>28</name>
 
 	<event>
 	  <title>2003 年十月至十二月開發進度報告</title>
 
 	  <p>剛剛發表了十月至十二月的開發進度報告； 請參見
 	    <a href="&enbase;/news/status/status.html">進度報告網站</a>
 	    以了解進一步的資訊。</p>
 	</event>
       </day>
 
       <day>
 	<name>21</name>
 	<event>
 	  <p>新增 committer：<a
 	    href="mailto:philip@FreeBSD.org">Philip Paeps</a>
 	    (src)</p>
 	</event>
 
 	<event>
 	  <p>新增 committer：<a
 	    href="mailto:cperciva@FreeBSD.org">Colin Percival</a>
 	    (src)</p>
 	</event>
       </day>
 
       <day>
 	<name>15</name>
 	<event>
 	  <p>新增 committer：<a
 	    href="mailto:josef@FreeBSD.org">Josef El-Rayes</a>
 	    (docs)</p>
 	</event>
       </day>
 
       <day>
         <name>12</name>
 	<event>
 	  <title>FreeBSD 5.2-RELEASE 正式發佈了</title>
 
           <p><a href="&enbase;/releases/5.2R/announce.html">FreeBSD
 	    5.2-RELEASE</a> 正式發佈了。 安裝之前請查閱 <a
 	    href="&enbase;/releases/5.2R/errata.html">發行版勘誤資訊</a>
 	    以便了解關於 5.2 發表之後的新聞和問題。 <a
 	    href="&enbase;/releases/index.html">發行版資訊</a>
 	    提供了關於 FreeBSD 發行版的進一步資訊。</p>
 
 	</event>
       </day>
 
       <day>
         <name>4</name>
 	<event>
 	  <p>新增 committer： <a
             href="mailto:viny@FreeBSD.org">Vincent Tougait</a>
 	    (文件計劃)</p>
 	</event>
       </day>
 
     </month>
 
   </year>
 
 </news>
Index: user/gjb/releng-rewrite/zh_TW.UTF-8
===================================================================
--- user/gjb/releng-rewrite/zh_TW.UTF-8	(revision 49724)
+++ user/gjb/releng-rewrite/zh_TW.UTF-8	(revision 49725)

Property changes on: user/gjb/releng-rewrite/zh_TW.UTF-8
___________________________________________________________________
Modified: svn:mergeinfo
## -0,0 +0,1 ##
   Merged /head/zh_TW.UTF-8:r49706-49724
Index: user/gjb/releng-rewrite
===================================================================
--- user/gjb/releng-rewrite	(revision 49724)
+++ user/gjb/releng-rewrite	(revision 49725)

Property changes on: user/gjb/releng-rewrite
___________________________________________________________________
Modified: svn:mergeinfo
## -0,0 +0,1 ##
   Merged /head:r49706-49724