nagachika	2016-09-25 15:07:29 +0900 (Sun, 25 Sep 2016)

  New Revision: 56232

  https://svn.ruby-lang.org/cgi-bin/viewvc.cgi?view=revision&revision=56232

  Log:
    merge revision(s) 55984: [Backport #12692]
    
    * man/irb.1: remove useless -width option.
      [ruby-dev:49767] [Bug #12692]

  Modified directories:
    branches/ruby_2_3/
  Modified files:
    branches/ruby_2_3/ChangeLog
    branches/ruby_2_3/man/irb.1
    branches/ruby_2_3/version.h
Index: ruby_2_3/version.h
===================================================================
--- ruby_2_3/version.h	(revision 56231)
+++ ruby_2_3/version.h	(revision 56232)
@@ -1,10 +1,10 @@ https://github.com/ruby/ruby/blob/trunk/ruby_2_3/version.h#L1
 #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"
 
Index: ruby_2_3/man/irb.1
===================================================================
--- ruby_2_3/man/irb.1	(revision 56231)
+++ ruby_2_3/man/irb.1	(revision 56232)
@@ -119,7 +119,7 @@ Sets internal debug level to n (not for https://github.com/ruby/ruby/blob/trunk/ruby_2_3/man/irb.1#L119
 .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 https://github.com/ruby/ruby/blob/trunk/ruby_2_3/man/irb.1#L130
 .Xr ruby 1 .
 .Pp
 .Sh FILES
-.Bl -tag -width "RUBYLIB_PREFIX" -compact
+.Bl -tag -compact
 .It Pa ~/.irbrc
 Personal irb initialization.
 .Pp
Index: ruby_2_3/ChangeLog
===================================================================
--- ruby_2_3/ChangeLog	(revision 56231)
+++ ruby_2_3/ChangeLog	(revision 56232)
@@ -1,3 +1,8 @@ https://github.com/ruby/ruby/blob/trunk/ruby_2_3/ChangeLog#L1
+Sun Sep 25 15:07:19 2016  Nobuyoshi Nakada  <nobu@r...>
+
+	* man/irb.1: remove useless -width option.
+	  [ruby-dev:49767] [Bug #12692]
+
 Tue Aug 30 05:24:33 2016  Kazuki Yamaguchi  <k@r...>
 
 	* ext/openssl/ossl_x509ext.c: additional fix memory leak.

Property changes on: ruby_2_3
___________________________________________________________________
Modified: svn:mergeinfo
   Merged /trunk:r55984


--
ML: ruby-changes@q...
Info: http://www.atdot.net/~ko1/quickml/