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_2@56304 b2dd03c8-39d4-4d8f-98ff-823fe69b080e

3 files changed, 8 insertions, 3 deletions

diff --git a/ChangeLog b/ChangeLog
index 23c50869df..f03ef1433b 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+Sat Oct  1 00:52:34 2016  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* man/irb.1: remove useless -width option.
+	  [ruby-dev:49767] [Bug #12692]
+
 Sat Oct  1 00:49:40 2016  Masaki Suketa <masaki.suketa@nifty.ne.jp>
 
 	* ext/win32ole/win32ole.c (Init_win32ole): should not use atexit to
diff --git a/man/irb.1 b/man/irb.1
index 543217e099..22b8e0a227 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 e0dd5ec40e..bdf363bd2d 100644
--- a/version.h
+++ b/version.h
@@ -1,6 +1,6 @@
 #define RUBY_VERSION "2.2.6"
 #define RUBY_RELEASE_DATE "2016-10-01"
-#define RUBY_PATCHLEVEL 373
+#define RUBY_PATCHLEVEL 374
 
 #define RUBY_RELEASE_YEAR 2016
 #define RUBY_RELEASE_MONTH 10