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

2 files changed, 4 insertions, 3 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
diff --git a/version.h b/version.h
index 9c86a0856a..08eb4d9371 100644
--- a/version.h
+++ b/version.h
@@ -1,6 +1,6 @@
 #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