Permalink
Browse files

Merge branch 'master' of github.com:ohler55/oj

  • Loading branch information...
2 parents da3f12b + 1b7cd9d commit e078c7a5bbf5815011555608efd34f23b20fb28b @ohler55 committed Feb 19, 2014
Showing with 3 additions and 3 deletions.
  1. +1 −1 ext/oj/oj.c
  2. +1 −1 lib/oj/saj.rb
  3. +1 −1 lib/oj/schandler.rb
View
@@ -519,7 +519,7 @@ oj_parse_options(VALUE ropts, Options copts) {
* true, false, or nil. It parses using a mode that is strict in that it maps
* each primitive JSON type to a similar Ruby type. The :create_id is not
* honored in this mode. Note that a Ruby Hash is used to represent the JSON
- * Object type. These two are not the same since teh JSON Object type can have
+ * Object type. These two are not the same since the JSON Object type can have
* repeating entries with the same key and Ruby Hash can not.
*
* Raises an exception if the JSON is malformed or the classes specified are not
View
@@ -13,7 +13,7 @@ module Oj
# @hash_cnt = 0
# end
#
- # def start_hash(key)
+ # def hash_start(key)
# @hash_cnt += 1
# end
# end
View
@@ -14,7 +14,7 @@ module Oj
# @hash_cnt = 0
# end
#
- # def start_hash()
+ # def hash_start()
# @hash_cnt += 1
# end
# end

0 comments on commit e078c7a

Please sign in to comment.