merge revision(s) 55984: [Backport #12692]

	* man/irb.1: remove useless -width option.
	  [ruby-dev:49767] [Bug #12692]


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

3 files changed, 11 insertions, 6 deletions

diff --git a/ChangeLog b/ChangeLog
index 9ed3d54497..cd9d2432ab 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+Sun Sep 25 15:07:19 2016  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* man/irb.1: remove useless -width option.
+	  [ruby-dev:49767] [Bug #12692]
+
 Tue Aug 30 05:24:33 2016  Kazuki Yamaguchi  <k@rhe.jp>
 
 	* ext/openssl/ossl_x509ext.c: additional fix memory leak.
diff --git a/man/irb.1 b/man/irb.1
index 1f1800d45d..269d2517b0 100644
--- a/man/irb.1
+++ b/man/irb.1
@@ -119,7 +119,7 @@ Sets internal debug level to n (not for popular use)
 .El
 .Pp
 .Sh ENVIRONMENT
-.Bl -tag -width "RUBYLIB_PREFIX" -compact
+.Bl -tag -compact
 .It Ev IRBRC
 .Pp
 .El
@@ -130,7 +130,7 @@ depends on same variables as
 .Xr ruby 1 .
 .Pp
 .Sh FILES
-.Bl -tag -width "RUBYLIB_PREFIX" -compact
+.Bl -tag -compact
 .It Pa ~/.irbrc
 Personal irb initialization.
 .Pp
diff --git a/version.h b/version.h
index d4c6567c34..c84b487403 100644
--- a/version.h
+++ b/version.h
@@ -1,10 +1,10 @@
 #define RUBY_VERSION "2.3.2"
-#define RUBY_RELEASE_DATE "2016-08-30"
-#define RUBY_PATCHLEVEL 182
+#define RUBY_RELEASE_DATE "2016-09-25"
+#define RUBY_PATCHLEVEL 183
 
 #define RUBY_RELEASE_YEAR 2016
-#define RUBY_RELEASE_MONTH 8
-#define RUBY_RELEASE_DAY 30
+#define RUBY_RELEASE_MONTH 9
+#define RUBY_RELEASE_DAY 25
 
 #include "ruby/version.h"