tzinfo 0.3.37 → 0.3.38

data/lib/tzinfo/definitions/Pacific/Johnston.rb

@@ -4,10 +4,7 @@ module TZInfo
       module Johnston
         include TimezoneDefinition
         
-        timezone 'Pacific/Johnston' do |tz|
-          tz.offset :o0, -36000, 0, :HST
-          
-        end
+        linked_timezone 'Pacific/Johnston', 'Pacific/Honolulu'
       end
     end
   end

data/lib/tzinfo/indexes/countries.rb

@@ -28,8 +28,7 @@ module TZInfo
         c.timezone 'Africa/Luanda', -44, 5, 397, 30
       end
       country 'AQ', 'Antarctica' do |c|
-        c.timezone 'Antarctica/McMurdo', -467, 6, 833, 5, 'McMurdo Station, Ross Island'
-        c.timezone 'Antarctica/South_Pole', -90, 1, 0, 1, 'Amundsen-Scott Station, South Pole'
+        c.timezone 'Antarctica/McMurdo', -467, 6, 833, 5, 'McMurdo, South Pole, Scott (New Zealand time)'
         c.timezone 'Antarctica/Rothera', -2027, 30, -1022, 15, 'Rothera Station, Adelaide Island'
         c.timezone 'Antarctica/Palmer', -324, 5, -641, 10, 'Palmer Station, Anvers Island'
         c.timezone 'Antarctica/Mawson', -338, 5, 3773, 60, 'Mawson Station, Holme Bay'
@@ -38,7 +37,6 @@ module TZInfo
         c.timezone 'Antarctica/Vostok', -392, 5, 1069, 10, 'Vostok Station, Lake Vostok'
         c.timezone 'Antarctica/DumontDUrville', -200, 3, 8401, 60, 'Dumont-d\'Urville Station, Terre Adelie'
         c.timezone 'Antarctica/Syowa', -124211, 1800, 3959, 100, 'Syowa Station, E Ongul I'
-        c.timezone 'Antarctica/Macquarie', -109, 2, 3179, 20, 'Macquarie Island Station, Macquarie Island'
       end
       country 'AR', 'Argentina' do |c|
         c.timezone 'America/Argentina/Buenos_Aires', -173, 5, -1169, 20, 'Buenos Aires (BA, CF)'
@@ -62,6 +60,7 @@ module TZInfo
       end
       country 'AU', 'Australia' do |c|
         c.timezone 'Australia/Lord_Howe', -631, 20, 1909, 12, 'Lord Howe Island'
+        c.timezone 'Antarctica/Macquarie', -109, 2, 3179, 20, 'Macquarie Island'
         c.timezone 'Australia/Hobart', -2573, 60, 8839, 60, 'Tasmania - most locations'
         c.timezone 'Australia/Currie', -599, 15, 2158, 15, 'Tasmania - King Island'
         c.timezone 'Australia/Melbourne', -2269, 60, 4349, 30, 'Victoria'
@@ -122,7 +121,7 @@ module TZInfo
       country 'BO', 'Bolivia' do |c|
         c.timezone 'America/La_Paz', -33, 2, -1363, 20
       end
-      country 'BQ', 'Bonaire Sint Eustatius & Saba' do |c|
+      country 'BQ', 'Caribbean Netherlands' do |c|
         c.timezone 'America/Kralendijk', 14581, 1200, -20483, 300
       end
       country 'BR', 'Brazil' do |c|
@@ -166,8 +165,7 @@ module TZInfo
         c.timezone 'America/Moncton', 461, 10, -3887, 60, 'Atlantic Time - New Brunswick'
         c.timezone 'America/Goose_Bay', 160, 3, -725, 12, 'Atlantic Time - Labrador - most locations'
         c.timezone 'America/Blanc-Sablon', 617, 12, -3427, 60, 'Atlantic Standard Time - Quebec - Lower North Shore'
-        c.timezone 'America/Montreal', 2731, 60, -2207, 30, 'Eastern Time - Quebec - most locations'
-        c.timezone 'America/Toronto', 873, 20, -4763, 60, 'Eastern Time - Ontario - most locations'
+        c.timezone 'America/Toronto', 873, 20, -4763, 60, 'Eastern Time - Ontario & Quebec - most locations'
         c.timezone 'America/Nipigon', 2941, 60, -1324, 15, 'Eastern Time - Ontario & Quebec - places that did not observe DST 1967-1973'
         c.timezone 'America/Thunder_Bay', 2903, 60, -357, 4, 'Eastern Time - Thunder Bay, Ontario'
         c.timezone 'America/Iqaluit', 956, 15, -1027, 15, 'Eastern Time - east Nunavut - most locations'
@@ -398,7 +396,7 @@ module TZInfo
         c.timezone 'Europe/Dublin', 160, 3, -25, 4
       end
       country 'IL', 'Israel' do |c|
-        c.timezone 'Asia/Jerusalem', 953, 30, 1057, 30
+        c.timezone 'Asia/Jerusalem', 11441, 360, 63403, 1800
       end
       country 'IM', 'Isle of Man' do |c|
         c.timezone 'Europe/Isle_of_Man', 1083, 20, -67, 15
@@ -425,7 +423,7 @@ module TZInfo
         c.timezone 'Europe/Jersey', 246, 5, -127, 60
       end
       country 'JM', 'Jamaica' do |c|
-        c.timezone 'America/Jamaica', 18, 1, -384, 5
+        c.timezone 'America/Jamaica', 12937, 720, -11519, 150
       end
       country 'JO', 'Jordan' do |c|
         c.timezone 'Asia/Amman', 639, 20, 539, 15
@@ -765,7 +763,7 @@ module TZInfo
       country 'SV', 'El Salvador' do |c|
         c.timezone 'America/El_Salvador', 137, 10, -446, 5
       end
-      country 'SX', 'Sint Maarten' do |c|
+      country 'SX', 'St Maarten (Dutch part)' do |c|
         c.timezone 'America/Lower_Princes', 12997, 720, -22697, 360
       end
       country 'SY', 'Syria' do |c|
@@ -856,8 +854,7 @@ module TZInfo
         c.timezone 'America/North_Dakota/Beulah', 56717, 1200, -916, 9, 'Central Time - North Dakota - Mercer County'
         c.timezone 'America/Denver', 47687, 1200, -125981, 1200, 'Mountain Time'
         c.timezone 'America/Boise', 157009, 3600, -46481, 400, 'Mountain Time - south Idaho & east Oregon'
-        c.timezone 'America/Shiprock', 33107, 900, -391271, 3600, 'Mountain Time - Navajo'
-        c.timezone 'America/Phoenix', 20069, 600, -16811, 150, 'Mountain Standard Time - Arizona'
+        c.timezone 'America/Phoenix', 20069, 600, -16811, 150, 'Mountain Standard Time - Arizona (except Navajo)'
         c.timezone 'America/Los_Angeles', 30647, 900, -212837, 1800, 'Pacific Time'
         c.timezone 'America/Anchorage', 44077, 720, -539641, 3600, 'Alaska Time'
         c.timezone 'America/Juneau', 209887, 3600, -483911, 3600, 'Alaska Time - Alaska panhandle'

data/lib/tzinfo/indexes/timezones.rb

@@ -29,7 +29,7 @@ module TZInfo
       timezone 'Africa/Gaborone'
       timezone 'Africa/Harare'
       timezone 'Africa/Johannesburg'
-      timezone 'Africa/Juba'
+      linked_timezone 'Africa/Juba'
       timezone 'Africa/Kampala'
       timezone 'Africa/Khartoum'
       timezone 'Africa/Kigali'
@@ -59,7 +59,7 @@ module TZInfo
       timezone 'Africa/Windhoek'
       timezone 'America/Adak'
       timezone 'America/Anchorage'
-      timezone 'America/Anguilla'
+      linked_timezone 'America/Anguilla'
       timezone 'America/Antigua'
       timezone 'America/Araguaina'
       timezone 'America/Argentina/Buenos_Aires'
@@ -75,7 +75,7 @@ module TZInfo
       timezone 'America/Argentina/San_Luis'
       timezone 'America/Argentina/Tucuman'
       timezone 'America/Argentina/Ushuaia'
-      timezone 'America/Aruba'
+      linked_timezone 'America/Aruba'
       timezone 'America/Asuncion'
       timezone 'America/Atikokan'
       linked_timezone 'America/Atka'
@@ -109,7 +109,7 @@ module TZInfo
       timezone 'America/Dawson_Creek'
       timezone 'America/Denver'
       timezone 'America/Detroit'
-      timezone 'America/Dominica'
+      linked_timezone 'America/Dominica'
       timezone 'America/Edmonton'
       timezone 'America/Eirunepe'
       timezone 'America/El_Salvador'
@@ -120,8 +120,8 @@ module TZInfo
       timezone 'America/Godthab'
       timezone 'America/Goose_Bay'
       timezone 'America/Grand_Turk'
-      timezone 'America/Grenada'
-      timezone 'America/Guadeloupe'
+      linked_timezone 'America/Grenada'
+      linked_timezone 'America/Guadeloupe'
       timezone 'America/Guatemala'
       timezone 'America/Guayaquil'
       timezone 'America/Guyana'
@@ -168,7 +168,7 @@ module TZInfo
       timezone 'America/Monterrey'
       timezone 'America/Montevideo'
       timezone 'America/Montreal'
-      timezone 'America/Montserrat'
+      linked_timezone 'America/Montserrat'
       timezone 'America/Nassau'
       timezone 'America/New_York'
       timezone 'America/Nipigon'
@@ -204,17 +204,17 @@ module TZInfo
       timezone 'America/Sitka'
       linked_timezone 'America/St_Barthelemy'
       timezone 'America/St_Johns'
-      timezone 'America/St_Kitts'
-      timezone 'America/St_Lucia'
-      timezone 'America/St_Thomas'
-      timezone 'America/St_Vincent'
+      linked_timezone 'America/St_Kitts'
+      linked_timezone 'America/St_Lucia'
+      linked_timezone 'America/St_Thomas'
+      linked_timezone 'America/St_Vincent'
       timezone 'America/Swift_Current'
       timezone 'America/Tegucigalpa'
       timezone 'America/Thule'
       timezone 'America/Thunder_Bay'
       timezone 'America/Tijuana'
       timezone 'America/Toronto'
-      timezone 'America/Tortola'
+      linked_timezone 'America/Tortola'
       timezone 'America/Vancouver'
       linked_timezone 'America/Virgin'
       timezone 'America/Whitehorse'
@@ -226,7 +226,7 @@ module TZInfo
       timezone 'Antarctica/DumontDUrville'
       timezone 'Antarctica/Macquarie'
       timezone 'Antarctica/Mawson'
-      timezone 'Antarctica/McMurdo'
+      linked_timezone 'Antarctica/McMurdo'
       timezone 'Antarctica/Palmer'
       timezone 'Antarctica/Rothera'
       linked_timezone 'Antarctica/South_Pole'
@@ -470,7 +470,7 @@ module TZInfo
       timezone 'Europe/Tirane'
       linked_timezone 'Europe/Tiraspol'
       timezone 'Europe/Uzhgorod'
-      timezone 'Europe/Vaduz'
+      linked_timezone 'Europe/Vaduz'
       linked_timezone 'Europe/Vatican'
       timezone 'Europe/Vienna'
       timezone 'Europe/Vilnius'
@@ -535,7 +535,7 @@ module TZInfo
       timezone 'Pacific/Guadalcanal'
       timezone 'Pacific/Guam'
       timezone 'Pacific/Honolulu'
-      timezone 'Pacific/Johnston'
+      linked_timezone 'Pacific/Johnston'
       timezone 'Pacific/Kiritimati'
       timezone 'Pacific/Kosrae'
       timezone 'Pacific/Kwajalein'

data/lib/tzinfo/info_timezone.rb

@@ -1,5 +1,5 @@
 #--
-# Copyright (c) 2006-2010 Philip Ross
+# Copyright (c) 2006-2013 Philip Ross
 # 
 # Permission is hereby granted, free of charge, to any person obtaining a copy
 # of this software and associated documentation files (the "Software"), to deal
@@ -23,6 +23,8 @@
 module TZInfo
 
   # A Timezone based on a TimezoneInfo.
+  #
+  # @private
   class InfoTimezone < Timezone #:nodoc:
     
     # Constructs a new InfoTimezone with a TimezoneInfo instance.

data/lib/tzinfo/linked_timezone.rb

@@ -1,5 +1,5 @@
 #--
-# Copyright (c) 2006-2010 Philip Ross
+# Copyright (c) 2006-2013 Philip Ross
 # 
 # Permission is hereby granted, free of charge, to any person obtaining a copy
 # of this software and associated documentation files (the "Software"), to deal
@@ -22,6 +22,9 @@
 
 module TZInfo
 
+  # A Timezone based on a LinkedTimezoneInfo.
+  #
+  # @private
   class LinkedTimezone < InfoTimezone #:nodoc:
     # Returns the TimezonePeriod for the given UTC time. utc can either be
     # a DateTime, Time or integer timestamp (Time.to_i). Any timezone 

data/lib/tzinfo/linked_timezone_info.rb

@@ -1,5 +1,5 @@
 #--
-# Copyright (c) 2006-2010 Philip Ross
+# Copyright (c) 2006-2013 Philip Ross
 # 
 # Permission is hereby granted, free of charge, to any person obtaining a copy
 # of this software and associated documentation files (the "Software"), to deal
@@ -22,6 +22,8 @@
 
 module TZInfo
   # Represents a linked timezone defined in a data module.
+  #
+  # @private
   class LinkedTimezoneInfo < TimezoneInfo #:nodoc:
         
     # The zone that provides the data (that this zone is an alias for).

data/lib/tzinfo/offset_rationals.rb

@@ -1,5 +1,5 @@
 #--
-# Copyright (c) 2006-2010 Philip Ross
+# Copyright (c) 2006-2013 Philip Ross
 # 
 # Permission is hereby granted, free of charge, to any person obtaining a copy
 # of this software and associated documentation files (the "Software"), to deal
@@ -26,7 +26,9 @@ module TZInfo
   
   # Provides a method for getting Rationals for a timezone offset in seconds.
   # Pre-reduced rationals are returned for all the half-hour intervals between
-  # -14 and +14 hours to avoid having to call gcd at runtime.  
+  # -14 and +14 hours to avoid having to call gcd at runtime.
+  #
+  # @private
   module OffsetRationals #:nodoc:
     @@rational_cache = {
       -50400 => RubyCoreSupport.rational_new!(-7,12), 

data/lib/tzinfo/ruby_core_support.rb

@@ -1,5 +1,5 @@
 #--
-# Copyright (c) 2008-2010 Philip Ross
+# Copyright (c) 2008-2013 Philip Ross
 # 
 # Permission is hereby granted, free of charge, to any person obtaining a copy
 # of this software and associated documentation files (the "Software"), to deal
@@ -26,6 +26,8 @@ require 'rational' unless defined?(Rational)
 module TZInfo
   
   # Methods to support different versions of Ruby.
+  #
+  # @private
   module RubyCoreSupport #:nodoc:
   
     # Use Rational.new! for performance reasons in Ruby 1.8.
@@ -77,4 +79,4 @@ module TZInfo
       end
     end
   end
-end
+end

data/lib/tzinfo/time_or_datetime.rb

@@ -1,5 +1,5 @@
 #--
-# Copyright (c) 2006-2012 Philip Ross
+# Copyright (c) 2006-2013 Philip Ross
 # 
 # Permission is hereby granted, free of charge, to any person obtaining a copy
 # of this software and associated documentation files (the "Software"), to deal
@@ -26,6 +26,8 @@ require 'time'
 module TZInfo
   # Used by TZInfo internally to represent either a Time, DateTime or integer
   # timestamp (seconds since 1970-01-01 00:00:00).
+  #
+  # @private
   class TimeOrDateTime #:nodoc:
     include Comparable
     

data/lib/tzinfo/timezone.rb

@@ -1,5 +1,5 @@
 #--
-# Copyright (c) 2005-2010 Philip Ross
+# Copyright (c) 2005-2013 Philip Ross
 # 
 # Permission is hereby granted, free of charge, to any person obtaining a copy
 # of this software and associated documentation files (the "Software"), to deal
@@ -63,13 +63,19 @@ module TZInfo
     
     # Cache of loaded zones by identifier to avoid using require if a zone
     # has already been loaded.
+    #
+    # @!visibility private
     @@loaded_zones = {}
     
     # Whether the timezones index has been loaded yet.
+    #
+    # @!visibility private
     @@index_loaded = false
     
     # Default value of the dst parameter of the local_to_utc and 
     # period_for_local methods.
+    #
+    # @!visibility private
     @@default_dst = nil
     
     # Sets the default value of the optional dst parameter of the 

data/lib/tzinfo/timezone_definition.rb

@@ -1,5 +1,5 @@
 #--
-# Copyright (c) 2006-2010 Philip Ross
+# Copyright (c) 2006-2013 Philip Ross
 # 
 # Permission is hereby granted, free of charge, to any person obtaining a copy
 # of this software and associated documentation files (the "Software"), to deal
@@ -24,6 +24,8 @@ module TZInfo
   
   # TimezoneDefinition is included into Timezone definition modules.
   # TimezoneDefinition provides the methods for defining timezones.
+  #
+  # @private
   module TimezoneDefinition #:nodoc:
     # Add class methods to the includee.
     def self.append_features(base)
@@ -32,6 +34,8 @@ module TZInfo
     end
     
     # Class methods for inclusion.
+    #
+    # @private
     module ClassMethods #:nodoc:
       # Returns and yields a DataTimezoneInfo object to define a timezone.
       def timezone(identifier)

data/lib/tzinfo/timezone_index_definition.rb

@@ -1,5 +1,5 @@
 #--
-# Copyright (c) 2006 Philip Ross
+# Copyright (c) 2006-2013 Philip Ross
 # 
 # Permission is hereby granted, free of charge, to any person obtaining a copy
 # of this software and associated documentation files (the "Software"), to deal
@@ -23,6 +23,8 @@
 module TZInfo
   # The timezone index file includes TimezoneIndexDefinition which provides
   # methods used to define timezones in the index.
+  #
+  # @private
   module TimezoneIndexDefinition #:nodoc:
     def self.append_features(base)
       super
@@ -34,6 +36,9 @@ module TZInfo
       end
     end
     
+    # Class methods for inclusion.
+    #
+    # @private
     module ClassMethods #:nodoc:
       # Defines a timezone based on data.
       def timezone(identifier)

data/lib/tzinfo/timezone_info.rb

@@ -1,5 +1,5 @@
 #--
-# Copyright (c) 2006 Philip Ross
+# Copyright (c) 2006-2013 Philip Ross
 # 
 # Permission is hereby granted, free of charge, to any person obtaining a copy
 # of this software and associated documentation files (the "Software"), to deal
@@ -22,6 +22,8 @@
 
 module TZInfo
   # Represents a timezone defined in a data module.
+  #
+  # @private
   class TimezoneInfo #:nodoc:
     
     # The timezone identifier.

data/lib/tzinfo/timezone_offset_info.rb

@@ -1,5 +1,5 @@
 #--
-# Copyright (c) 2006-2012 Philip Ross
+# Copyright (c) 2006-2013 Philip Ross
 # 
 # Permission is hereby granted, free of charge, to any person obtaining a copy
 # of this software and associated documentation files (the "Software"), to deal
@@ -22,6 +22,8 @@
 
 module TZInfo
   # Represents an offset defined in a Timezone data file.
+  #
+  # @private
   class TimezoneOffsetInfo #:nodoc:
     # The base offset of the timezone from UTC in seconds.
     attr_reader :utc_offset

data/lib/tzinfo/timezone_transition_info.rb

@@ -1,5 +1,5 @@
 #--
-# Copyright (c) 2006-2012 Philip Ross
+# Copyright (c) 2006-2013 Philip Ross
 # 
 # Permission is hereby granted, free of charge, to any person obtaining a copy
 # of this software and associated documentation files (the "Software"), to deal
@@ -24,6 +24,8 @@ require 'date'
 
 module TZInfo
   # Represents an offset defined in a Timezone data file.
+  #
+  # @private
   class TimezoneTransitionInfo #:nodoc:
     # The offset this transition changes to (a TimezoneOffsetInfo instance).
     attr_reader :offset

data/lib/tzinfo/tzdataparser.rb

@@ -1,5 +1,5 @@
 #--
-# Copyright (c) 2005-2010 Philip Ross
+# Copyright (c) 2005-2013 Philip Ross
 # 
 # Permission is hereby granted, free of charge, to any person obtaining a copy
 # of this software and associated documentation files (the "Software"), to deal
@@ -73,17 +73,15 @@ module TZInfo
     # Reads the tzdata source and generates the classes. Takes a long time
     # to run. Currently outputs debugging information to standard out.
     def execute
-      Dir.foreach(@input_dir) {|file|
-        load_rules(file) if file =~ /^[^\.]+$/        
-      }  
-      
-      Dir.foreach(@input_dir) {|file|
-        load_zones(file) if file =~ /^[^\.]+$/        
-      }
-      
-      Dir.foreach(@input_dir) {|file|
-        load_links(file) if file =~ /^[^\.]+$/        
-      }
+      files = Dir.entries(@input_dir).select do |file|
+        file =~ /\A[^\.]+\z/ &&            
+          !%w(leapseconds leapseconds.awk leap-seconds.list Makefile README SOURCE).include?(file) &&
+          File.file?(File.join(@input_dir, file))
+      end
+    
+      files.each {|file| load_rules(file) }
+      files.each {|file| load_zones(file) }
+      files.each {|file| load_links(file) }
       
       load_countries
       
@@ -341,6 +339,8 @@ module TZInfo
   end
   
   # Base class for all rule sets.
+  #
+  # @private
   class TZDataRules #:nodoc:
     # Name of the rule set, e.g. EU.
     attr_reader :name
@@ -355,6 +355,8 @@ module TZInfo
   end
   
   # Empty rule set with a fixed daylight savings (std) offset.
+  #
+  # @private
   class TZDataFixedOffsetRules < TZDataRules #:nodoc:
     attr_reader :offset
     
@@ -365,6 +367,8 @@ module TZInfo
   end
   
   # An empty set of rules.
+  #
+  # @private
   class TZDataNoRules < TZDataRules #:nodoc:
     def initialize
       super('-')
@@ -372,6 +376,8 @@ module TZInfo
   end
   
   # A rule set (as defined by Rule name in the tz data).
+  #
+  # @private
   class TZDataRuleSet < TZDataRules #:nodoc:       
     attr_reader :rules
     
@@ -395,6 +401,8 @@ module TZInfo
   end    
   
   # A rule in a RuleSet (a single Rule line in the tz data).
+  #
+  # @private
   class TZDataRule #:nodoc:
     attr_reader :from
     attr_reader :to
@@ -476,6 +484,8 @@ module TZInfo
   end
   
   # Base class for Zones and Links.
+  #
+  # @private
   class TZDataDefinition #:nodoc:
     attr_reader :name
     attr_reader :name_elements
@@ -539,6 +549,8 @@ module TZInfo
   end
   
   # A tz data Link.
+  #
+  # @private
   class TZDataLink < TZDataDefinition #:nodoc:
     attr_reader :link_to
     
@@ -563,6 +575,8 @@ module TZInfo
   end
   
   # A tz data Zone. Each line from the tz data is loaded as a TZDataObservance.
+  #
+  # @private
   class TZDataZone < TZDataDefinition #:nodoc:    
     attr_reader :observances
     
@@ -693,6 +707,8 @@ module TZInfo
   end
   
   # A observance within a zone (a line within the zone definition).
+  #
+  # @private
   class TZDataObservance #:nodoc:
     attr_reader :utc_offset
     attr_reader :rule_set
@@ -716,6 +732,8 @@ module TZInfo
   end
   
   # Collection of TZDataTransition instances used when building a zone class.
+  #
+  # @private
   class TZDataTransitions #:nodoc:
     
     def initialize
@@ -850,6 +868,8 @@ module TZInfo
   end
   
   # A transition that will be used to write the periods in a zone class.
+  #
+  # @private
   class TZDataTransition #:nodoc:
     include Comparable
     
@@ -908,6 +928,8 @@ module TZInfo
   end
    
   # An instance of a rule for a year.
+  #
+  # @private
   class TZDataActivatedRule #:nodoc:
     attr_reader :rule
     attr_reader :year
@@ -926,6 +948,8 @@ module TZInfo
   
   # A tz data time definition - an hour, minute, second and reference. Reference
   # is either :utc, :standard or :wall_clock.
+  #
+  # @private
   class TZDataTime #:nodoc:
     attr_reader :hour
     attr_reader :minute
@@ -960,6 +984,8 @@ module TZInfo
     
   # A tz data day of the month reference. Can either be an absolute day,
   # a last week day or a week day >= or <= than a specific day of month.
+  #
+  # @private
   class TZDataDayOfMonth #:nodoc:
     attr_reader :type
     attr_reader :day_of_month
@@ -1044,6 +1070,8 @@ module TZInfo
   end   
   
   # A tz data Zone until reference.
+  #
+  # @private
   class TZDataUntil #:nodoc:
     attr_reader :year
     attr_reader :month
@@ -1068,6 +1096,8 @@ module TZInfo
   
   # A tz data Zone format string. Either alternate standard/daylight-savings,
   # substitution (%s) format or a fixed string.
+  #
+  # @private
   class TZDataFormat #:nodoc:        
     def initialize(spec)
       if spec =~ /([A-z]+)\/([A-z]+)/
@@ -1110,6 +1140,8 @@ module TZInfo
   end
   
   # A location (latitude + longitude)
+  #
+  # @private
   class TZDataLocation #:nodoc:
     attr_reader :latitude
     attr_reader :longitude
@@ -1132,10 +1164,13 @@ module TZInfo
       @longitude = -@longitude if $5 == '-'
     end
   end  
-  
+
+  # @private
   TZDataCountryTimezone = Struct.new(:timezone, :description, :location)  
   
   # An ISO 3166 country.
+  #
+  # @private
   class TZDataCountry #:nodoc:
     attr_reader :code
     attr_reader :name