diff options
| author | nagachika <nagachika@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2013-07-13 14:36:33 +0000 |
|---|---|---|
| committer | nagachika <nagachika@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2013-07-13 14:36:33 +0000 |
| commit | ce75312a67dc2bbb0f721c4759447fcd48a4d814 (patch) | |
| tree | 4d1c01ea937d50d40a7791ec9e52442d52a33863 /ext | |
| parent | 725da5a34c1cabe1cc4b48c5311cf10e1ceaf0e3 (diff) | |
merge revision(s) 41862:
fixup stying of `Json#generate` parameter docs by @daveworth [fixes GH-339]
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_2_0_0@41949 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
Diffstat (limited to 'ext')
| -rw-r--r-- | ext/json/lib/json/common.rb | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/ext/json/lib/json/common.rb b/ext/json/lib/json/common.rb index 65a74a1aa4..a547679962 100644 --- a/ext/json/lib/json/common.rb +++ b/ext/json/lib/json/common.rb @@ -179,9 +179,10 @@ module JSON end # Generate a JSON document from the Ruby data structure _obj_ and return - # it. _state_ is * a JSON::State object, + # it. _state_ is + # * a JSON::State object, # * or a Hash like object (responding to to_hash), - # * an object convertible into a hash by a to_h method, + # * or an object convertible into a hash by a to_h method, # that is used as or to configure a State object. # # It defaults to a state object, that creates the shortest possible JSON text |