usa	2016-10-01 00:52:42 +0900 (Sat, 01 Oct 2016)

  New Revision: 56304

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

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

  Modified directories:
    branches/ruby_2_2/
  Modified files:
    branches/ruby_2_2/ChangeLog
    branches/ruby_2_2/man/irb.1
    branches/ruby_2_2/version.h
Index: ruby_2_2/version.h
===================================================================
--- ruby_2_2/version.h	(revision 56303)
+++ ruby_2_2/version.h	(revision 56304)
@@ -1,6 +1,6 @@ https://github.com/ruby/ruby/blob/trunk/ruby_2_2/version.h#L1
 #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
Index: ruby_2_2/man/irb.1
===================================================================
--- ruby_2_2/man/irb.1	(revision 56303)
+++ ruby_2_2/man/irb.1	(revision 56304)
@@ -119,7 +119,7 @@ Sets internal debug level to n (not for https://github.com/ruby/ruby/blob/trunk/ruby_2_2/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_2/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_2/ChangeLog
===================================================================
--- ruby_2_2/ChangeLog	(revision 56303)
+++ ruby_2_2/ChangeLog	(revision 56304)
@@ -1,3 +1,8 @@ https://github.com/ruby/ruby/blob/trunk/ruby_2_2/ChangeLog#L1
+Sat Oct  1 00:52:34 2016  Nobuyoshi Nakada  <nobu@r...>
+
+	* man/irb.1: remove useless -width option.
+	  [ruby-dev:49767] [Bug #12692]
+
 Sat Oct  1 00:49:40 2016  Masaki Suketa <masaki.suketa@n...>
 
 	* ext/win32ole/win32ole.c (Init_win32ole): should not use atexit to

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


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