From b14c060ddabfad99deff3e56d847034f7d0946be Mon Sep 17 00:00:00 2001 From: naruse Date: Tue, 30 Aug 2011 02:23:12 +0000 Subject: * ext/json: Merge json gem 1.5.4+ (2149f4185c598fb97db1). [Bug #5173] [ruby-core:38866] git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@33122 b2dd03c8-39d4-4d8f-98ff-823fe69b080e --- ext/json/lib/json.rb | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'ext/json/lib/json.rb') diff --git a/ext/json/lib/json.rb b/ext/json/lib/json.rb index d7bc1a2d23..00fe4cae84 100644 --- a/ext/json/lib/json.rb +++ b/ext/json/lib/json.rb @@ -7,13 +7,13 @@ # # Built on two universally available structures: # 1. A collection of name/value pairs. Often referred to as an _object_, hash table, record, struct, keyed list, or associative array. -# 2. An orderd list of values. More commonly named as an _array_, vector, sequence, or list. +# 2. An ordered list of values. More commonly called an _array_, vector, sequence or list. # # To read more about JSON visit: http://json.org # # == Parsing JSON # -# To parse a JSON string received by another application, or generated within +# To parse a JSON string received by another application or generated within # your existing application: # # require 'json' @@ -42,8 +42,8 @@ # puts {:hello => "goodbye"}.to_json => "{\"hello\":\"goodbye\"}" # # JSON.generate only allows objects or arrays to be converted -# to JSON syntax. While to_json accepts many Ruby classes -# even though it only acts a method for serialization: +# to JSON syntax. to_json, however, accepts many Ruby classes +# even though it acts only as a method for serialization: # # require 'json' # -- cgit v1.2.3