nagachika	2013-07-14 00:17:18 +0900 (Sun, 14 Jul 2013)

  New Revision: 41957

  http://svn.ruby-lang.org/cgi-bin/viewvc.cgi?view=rev&revision=41957

  Log:
    merge revision(s) 41906: [Backport #8620]
    
    * man/ri.1: Incorrect use of .Dd macro [Bug #8620] by Tristan Hill

  Modified directories:
    branches/ruby_2_0_0/
  Modified files:
    branches/ruby_2_0_0/ChangeLog
    branches/ruby_2_0_0/man/ri.1
    branches/ruby_2_0_0/version.h

Index: ruby_2_0_0/ChangeLog
===================================================================
--- ruby_2_0_0/ChangeLog	(revision 41956)
+++ ruby_2_0_0/ChangeLog	(revision 41957)
@@ -1,3 +1,7 @@ https://github.com/ruby/ruby/blob/trunk/ruby_2_0_0/ChangeLog#L1
+Sun Jul 14 00:17:07 2013  Zachary Scott  <zachary@z...>
+
+	* man/ri.1: Incorrect use of .Dd macro [Bug #8620] by Tristan Hill
+
 Sun Jul 14 00:15:26 2013  Zachary Scott  <zachary@z...>
 
 	* lib/logger.rb: Use :call-seq: for method signature rdoc
Index: ruby_2_0_0/man/ri.1
===================================================================
--- ruby_2_0_0/man/ri.1	(revision 41956)
+++ ruby_2_0_0/man/ri.1	(revision 41957)
@@ -77,7 +77,8 @@ directories.  May be repeated. https://github.com/ruby/ruby/blob/trunk/ruby_2_0_0/man/ri.1#L77
 .It Fl -fmt Ar FORMAT
 .It Fl -format Ns = Ns FORMAT
 Format to use when displaying output:
-.Dd ansi, bs, html, plain, simple
+.Pp
+ansi, bs, html, plain, simple
 .Pp
 Use 'bs' (backspace) with most pager programs. To use ANSI, either disable the
 pager or tell the pager to allow control characters.
Index: ruby_2_0_0/version.h
===================================================================
--- ruby_2_0_0/version.h	(revision 41956)
+++ ruby_2_0_0/version.h	(revision 41957)
@@ -1,6 +1,6 @@ https://github.com/ruby/ruby/blob/trunk/ruby_2_0_0/version.h#L1
 #define RUBY_VERSION "2.0.0"
 #define RUBY_RELEASE_DATE "2013-07-14"
-#define RUBY_PATCHLEVEL 268
+#define RUBY_PATCHLEVEL 269
 
 #define RUBY_RELEASE_YEAR 2013
 #define RUBY_RELEASE_MONTH 7

Property changes on: ruby_2_0_0
___________________________________________________________________
Modified: svn:mergeinfo
   Merged /trunk:r41906


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