diff options
| author | Florian Frank <flori@ping.de> | 2011-07-08 16:29:21 +0200 |
|---|---|---|
| committer | Florian Frank <flori@ping.de> | 2011-07-08 16:32:06 +0200 |
| commit | f7f78896607b6f6226cdee4ae76de922d4583d32 (patch) | |
| tree | fb8b18ce241984a125d881c29fd317a007358bd9 /lib/json.rb | |
| parent | dcfa15b6a1179a29d4ee7b3ff16807fa9b1f96a4 (diff) | |
| parent | 24f84d63beef15eafd2e59df3d809f1928774d00 (diff) | |
| download | json-f7f78896607b6f6226cdee4ae76de922d4583d32.tar.gz | |
Merge branch 'master' of https://github.com/nobu/json into development
Conflicts:
ext/json/ext/parser/parser.c
Diffstat (limited to 'lib/json.rb')
| -rw-r--r-- | lib/json.rb | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/lib/json.rb b/lib/json.rb index cc33f72..d7bc1a2 100644 --- a/lib/json.rb +++ b/lib/json.rb @@ -15,7 +15,7 @@ # # To parse a JSON string received by another application, or generated within # your existing application: -# +# # require 'json' # # my_hash = JSON.parse('{"hello": "goodbye"}') @@ -32,7 +32,7 @@ # just as simple. # # require 'json' -# +# # my_hash = {:hello => "goodbye"} # puts JSON.generate(my_hash) => "{\"hello\":\"goodbye\"}" # @@ -41,8 +41,8 @@ # require 'json' # puts {:hello => "goodbye"}.to_json => "{\"hello\":\"goodbye\"}" # -# <tt>JSON.generate</tt> only allows objects or arrays to be converted -# to JSON syntax. While <tt>to_json</tt> accepts many Ruby classes +# <tt>JSON.generate</tt> only allows objects or arrays to be converted +# to JSON syntax. While <tt>to_json</tt> accepts many Ruby classes # even though it only acts a method for serialization: # # require 'json' |