3 files changed, 10 insertions, 5 deletions
diff --git a/ChangeLog b/ChangeLog
index 7a64a0d011..6526ada48e 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+Wed Jun 18 10:18:11 2008  Nobuyoshi Nakada  <[email protected]>
+
+	* ext/etc/etc.c (etc_passwd, etc_group): fixed rdoc.  a patch from
+	  okkez <okkez000 AT gmail.com> in [ruby-dev:35141].
+
 Mon Jun 16 21:58:38 2008  Nobuyoshi Nakada  <[email protected]>
 
 	* ext/stringio/stringio.c (strio_each, strio_readlines): IO#each and
diff --git a/ext/etc/etc.c b/ext/etc/etc.c
index ecb9e16411..250e131e01 100644
--- a/ext/etc/etc.c
+++ b/ext/etc/etc.c
@@ -196,7 +196,7 @@ passwd_iterate()
 /* Provides a convenient Ruby iterator which executes a block for each entry 
  * in the /etc/passwd file.
  *
- * The code block is passed an Etc::Passwd struct; see getpwent above for 
+ * The code block is passed an Struct::Passwd struct; see getpwent above for 
  * details.
  *
  * Example:
@@ -401,7 +401,7 @@ group_iterate()
 /* Provides a convenient Ruby iterator which executes a block for each entry 
  * in the /etc/group file.
  *
- * The code block is passed an Etc::Group struct; see getgrent above for 
+ * The code block is passed an Struct::Group struct; see getgrent above for 
  * details.
  *
  * Example:
diff --git a/version.h b/version.h
index 8bea0e110c..77840f49d2 100644
--- a/version.h
+++ b/version.h
@@ -1,7 +1,7 @@
 #define RUBY_VERSION "1.8.7"
-#define RUBY_RELEASE_DATE "2008-06-16"
+#define RUBY_RELEASE_DATE "2008-06-18"
 #define RUBY_VERSION_CODE 187
-#define RUBY_RELEASE_CODE 20080616
+#define RUBY_RELEASE_CODE 20080618
 #define RUBY_PATCHLEVEL 5000
 
 #define RUBY_VERSION_MAJOR 1
@@ -9,7 +9,7 @@
 #define RUBY_VERSION_TEENY 7
 #define RUBY_RELEASE_YEAR 2008
 #define RUBY_RELEASE_MONTH 6
-#define RUBY_RELEASE_DAY 16
+#define RUBY_RELEASE_DAY 18
 
 #ifdef RUBY_EXTERN
 RUBY_EXTERN const char ruby_version[];