nagachika	2013-07-13 23:36:33 +0900 (Sat, 13 Jul 2013)

  New Revision: 41949

  http://svn.ruby-lang.org/cgi-bin/viewvc.cgi?view=rev&revision=41949

  Log:
    merge revision(s) 41862:
    
    fixup stying of `Json#generate` parameter docs by @daveworth [fixes GH-339]

  Modified directories:
    branches/ruby_2_0_0/
  Modified files:
    branches/ruby_2_0_0/ext/json/lib/json/common.rb
    branches/ruby_2_0_0/version.h

Index: ruby_2_0_0/ext/json/lib/json/common.rb
===================================================================
--- ruby_2_0_0/ext/json/lib/json/common.rb	(revision 41948)
+++ ruby_2_0_0/ext/json/lib/json/common.rb	(revision 41949)
@@ -179,9 +179,10 @@ module JSON https://github.com/ruby/ruby/blob/trunk/ruby_2_0_0/ext/json/lib/json/common.rb#L179
   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
Index: ruby_2_0_0/version.h
===================================================================
--- ruby_2_0_0/version.h	(revision 41948)
+++ ruby_2_0_0/version.h	(revision 41949)
@@ -1,6 +1,6 @@ https://github.com/ruby/ruby/blob/trunk/ruby_2_0_0/version.h#L1
 #define RUBY_VERSION "2.0.0"
 #define RUBY_RELEASE_DATE "2013-07-13"
-#define RUBY_PATCHLEVEL 262
+#define RUBY_PATCHLEVEL 263
 
 #define RUBY_RELEASE_YEAR 2013
 #define RUBY_RELEASE_MONTH 7

Property changes on: ruby_2_0_0
___________________________________________________________________
Modified: svn:mergeinfo
   Merged /trunk:r41862


--
ML: ruby-changes@q...
Info: http://www.atdot.net/~ko1/quickml/