merges r32239 from trunk into ruby_1_9_2.

--
* parse.y (rb_parser_end_seen_p): fix documentation about return
  value. patched by Sho Hashimoto. [Bug #4511]

git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_9_2@32909 b2dd03c8-39d4-4d8f-98ff-823fe69b080e

3 files changed, 9 insertions, 5 deletions

diff --git a/ChangeLog b/ChangeLog
index 98ab25ccb5..a76e5144d7 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+Mon Jun 27 00:44:53 2011  NARUSE, Yui  <naruse@ruby-lang.org>
+
+	* parse.y (rb_parser_end_seen_p): fix documentation about return
+	  value. patched by Sho Hashimoto. [Bug #4511]
+
 Wed Jun  1 06:43:13 2011  Masaya Tarui  <tarui@ruby-lang.org>
 
 	* load.c (loaded_feature_path): cut nonsence loop execution to fix
diff --git a/parse.y b/parse.y
index b207798564..5f02f9dfcc 100644
--- a/parse.y
+++ b/parse.y
@@ -10068,8 +10068,7 @@ rb_parser_new(void)
  *  call-seq:
  *    ripper#end_seen?   -> Boolean
  *
- *  Return if parsed source ended by +\_\_END\_\_+.
- *  This number starts from 1.
+ *  Return true if parsed source ended by +\_\_END\_\_+.
  */
 VALUE
 rb_parser_end_seen_p(VALUE vparser)
diff --git a/version.h b/version.h
index 0860251fb0..bdd83049bf 100644
--- a/version.h
+++ b/version.h
@@ -1,13 +1,13 @@
 #define RUBY_VERSION "1.9.2"
-#define RUBY_PATCHLEVEL 294
+#define RUBY_PATCHLEVEL 295
 #define RUBY_VERSION_MAJOR 1
 #define RUBY_VERSION_MINOR 9
 #define RUBY_VERSION_TEENY 1
 
 #define RUBY_RELEASE_YEAR 2011
 #define RUBY_RELEASE_MONTH 8
-#define RUBY_RELEASE_DAY 7
-#define RUBY_RELEASE_DATE "2011-08-07"
+#define RUBY_RELEASE_DAY 11
+#define RUBY_RELEASE_DATE "2011-08-11"
 
 #include "ruby/version.h"