usa	2018-01-31 20:11:41 +0900 (Wed, 31 Jan 2018)

  New Revision: 62129

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

  Log:
    merge revision(s) 58409: [Backport #10838]
    
    ri.1: fix errors in ri man page
    
    * man/ri.1: fix some errors in ri man page (add missing options,
      remove options that do not exist, fix formatter list).
    
      Reported by Josh Cheek.  [ruby-core:68065] [Bug #10838]

  Modified directories:
    branches/ruby_2_3/
  Modified files:
    branches/ruby_2_3/ChangeLog
    branches/ruby_2_3/man/ri.1
    branches/ruby_2_3/version.h
Index: ruby_2_3/version.h
===================================================================
--- ruby_2_3/version.h	(revision 62128)
+++ ruby_2_3/version.h	(revision 62129)
@@ -1,6 +1,6 @@ https://github.com/ruby/ruby/blob/trunk/ruby_2_3/version.h#L1
 #define RUBY_VERSION "2.3.7"
 #define RUBY_RELEASE_DATE "2018-01-31"
-#define RUBY_PATCHLEVEL 390
+#define RUBY_PATCHLEVEL 391
 
 #define RUBY_RELEASE_YEAR 2018
 #define RUBY_RELEASE_MONTH 1
Index: ruby_2_3/man/ri.1
===================================================================
--- ruby_2_3/man/ri.1	(revision 62128)
+++ ruby_2_3/man/ri.1	(revision 62129)
@@ -7,14 +7,14 @@ https://github.com/ruby/ruby/blob/trunk/ruby_2_3/man/ri.1#L7
 .Nd Ruby API reference front end
 .Sh SYNOPSIS
 .Nm
-.Op Fl Ti
+.Op Fl alTi
 .Op Fl d Ar directory
 .Op Fl f Ar format
-.Op Fl -list-doc-dirs
+.Op Fl w Ar width
+.Op Fl -server Ns [= Ns Ar PORT Ns ]
 .Op Fl -no-standard-docs
+.Op Fl - Ns Oo Cm no- Oc Ns Cm list-doc-dirs
 .Op Fl - Ns Oo Cm no- Oc Ns Bro Cm system Ns | Ns Cm site Ns | Ns Cm gems Ns | Ns Cm home Brc
-.Op Fl - Ns Oo Cm no- Oc Ns Cm use-cache
-.Op Fl -width Ns = Ns Ar width
 .Op Ar target ...
 .Sh DESCRIPTION
 .Nm
@@ -60,9 +60,22 @@ ri compact\! https://github.com/ruby/ruby/blob/trunk/ruby_2_3/man/ri.1#L60
 .Sh OPTIONS
 .Bl -tag -width "1234567890123" -compact
 .Pp
+.It Fl -help
+Show help and exit.
+.Pp
+.It Fl v
 .It Fl -version
-Prints the version of
-.Nm .
+Output version information and exit.
+.Pp
+.It Fl a
+.It Fl - Ns Oo Cm no- Oc Ns Cm all
+Show all documentation for a class or module.
+.Pp
+.It Fl l
+.It Fl - Ns Oo Cm no- Oc Ns Cm list
+List classes
+.Nm
+knows about.
 .Pp
 .It Fl T
 .It Fl -no-pager
@@ -73,18 +86,20 @@ Send output directly to stdout, rather t https://github.com/ruby/ruby/blob/trunk/ruby_2_3/man/ri.1#L86
 List of directories from which to source documentation in addition to the standard
 directories.  May be repeated.
 .Pp
+.It Fl -server Ns [= Ns Ar PORT Ns ]
+Run RDoc server on the given port.  The default port is 8214.
+.Pp
 .It Fl f Ar FORMAT
-.It Fl -fmt Ar FORMAT
 .It Fl -format Ns = Ns FORMAT
 Format to use when displaying output:
 .Pp
-ansi, bs, html, plain, simple
+ansi, bs, markdown, rdoc
 .Pp
 Use 'bs' (backspace) with most pager programs. To use ANSI, either disable the
 pager or tell the pager to allow control characters.
 .Pp
 .It Fl i
-.It Fl -interactive
+.It Fl - Ns Oo Cm no- Oc Ns Cm interactive
 This makes
 .Nm
 go into interactive mode.
@@ -96,7 +111,7 @@ methods in case multiple methods match a https://github.com/ruby/ruby/blob/trunk/ruby_2_3/man/ri.1#L111
 will allow the user to enter in a method name (with auto-completion, if readline
 is supported) when viewing a class.
 .Pp
-.It Fl -list-doc-dirs
+.It Fl - Ns Oo Cm no- Oc Ns Cm list-doc-dirs
 List the directories from which ri will source documentation on stdout and exit.
 .Pp
 .It Fl -no-standard-docs
@@ -122,11 +137,6 @@ Include documentation from RubyGems. Def https://github.com/ruby/ruby/blob/trunk/ruby_2_3/man/ri.1#L137
 .It Fl - Ns Oo Cm no- Oc Ns Cm home
 Include documentation stored in ~/.rdoc.  Defaults to true.
 .Pp
-.It Fl - Ns Oo Cm no- Oc Ns Cm use-cache
-Whether or not to use
-.Nm Ns
-.Ns 's cache. True by default.
-.Pp
 .It Fl w Ar width
 .It Fl -width Ns = Ns Ar width
 Set the width of the output.
Index: ruby_2_3/ChangeLog
===================================================================
--- ruby_2_3/ChangeLog	(revision 62128)
+++ ruby_2_3/ChangeLog	(revision 62129)
@@ -1,3 +1,12 @@ https://github.com/ruby/ruby/blob/trunk/ruby_2_3/ChangeLog#L1
+Wed Jan 31 20:11:20 2018  Marcus Stollsteimer  <sto.mar@w...>
+
+	ri.1: fix errors in ri man page
+
+	* man/ri.1: fix some errors in ri man page (add missing options,
+	  remove options that do not exist, fix formatter list).
+
+	  Reported by Josh Cheek.  [ruby-core:68065] [Bug #10838]
+
 Wed Jan 31 20:09:50 2018  Marcus Stollsteimer  <sto.mar@w...>
 
 	date_core.c: fix error in DateTime docs
Index: ruby_2_3
===================================================================
--- ruby_2_3	(revision 62128)
+++ ruby_2_3	(revision 62129)

Property changes on: ruby_2_3
___________________________________________________________________
Modified: svn:mergeinfo
## -0,0 +0,1 ##
   Merged /trunk:r58409

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