Merge commit 'v1.2.3'

Merged in some additional features from the v1.2 branch.

1 files changed, 5 insertions, 0 deletions

diff --git a/lib/json/common.rb b/lib/json/common.rb
index c0b35e2..cd9d1c6 100644
--- a/lib/json/common.rb
+++ b/lib/json/common.rb
@@ -130,9 +130,14 @@ module JSON
   # * *allow_nan*: If set to true, allow NaN, Infinity and -Infinity in
   #   defiance of RFC 4627 to be parsed by the Parser. This option defaults
   #   to false.
+  # * *symbolize_names*: If set to true, returns symbols for the names
+  #   (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.
+  # * *object_class*: Defaults to Hash
+  # * *array_class*: Defaults to Array
   def parse(source, opts = {})
     Parser.new(source, opts).parse
   end