diff options
| author | hsbt <hsbt@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2014-12-28 22:29:11 +0000 |
|---|---|---|
| committer | hsbt <hsbt@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2014-12-28 22:29:11 +0000 |
| commit | 4a481ad400a88e704d07c68aa8112c2a28bdf2c9 (patch) | |
| tree | f0d67488a812a3c77be765c08484368bacf79e52 /ext/json/parser | |
| parent | 5547719573c6b37566480eaadf0c17bd0c5529bd (diff) | |
* ext/json, test/json: merge JSON HEAD(17fe8e7)
https://github.com/flori/json/compare/v1.8.1...17fe8e7
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@49051 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
Diffstat (limited to 'ext/json/parser')
| -rw-r--r-- | ext/json/parser/parser.c | 4 | ||||
| -rw-r--r-- | ext/json/parser/parser.rl | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/ext/json/parser/parser.c b/ext/json/parser/parser.c index b692cb43b6..f4617aae44 100644 --- a/ext/json/parser/parser.c +++ b/ext/json/parser/parser.c @@ -1626,8 +1626,8 @@ static VALUE convert_encoding(VALUE source) * (keys) in a JSON object. Otherwise strings are returned, which is also * the default. * * *create_additions*: If set to false, the Parser doesn't create - * additions even if a matchin class and create_id was found. This option - * defaults to true. + * additions even if a matching class and create_id was found. This option + * defaults to false. * * *object_class*: Defaults to Hash * * *array_class*: Defaults to Array */ diff --git a/ext/json/parser/parser.rl b/ext/json/parser/parser.rl index e69fe57781..9bc5efb66c 100644 --- a/ext/json/parser/parser.rl +++ b/ext/json/parser/parser.rl @@ -610,7 +610,7 @@ static VALUE convert_encoding(VALUE source) * (keys) in a JSON object. Otherwise strings are returned, which is also * the default. * * *create_additions*: If set to false, the Parser doesn't create - * additions even if a matchin class and create_id was found. This option + * additions even if a matching class and create_id was found. This option * defaults to true. * * *object_class*: Defaults to Hash * * *array_class*: Defaults to Array |