merge revision(s) 41906: [Backport #8620]

	* man/ri.1: Incorrect use of .Dd macro [Bug #8620] by Tristan Hill


git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_2_0_0@41957 b2dd03c8-39d4-4d8f-98ff-823fe69b080e

3 files changed, 7 insertions, 2 deletions

diff --git a/ChangeLog b/ChangeLog
index 91e534caab..3fad1b1e9f 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+Sun Jul 14 00:17:07 2013  Zachary Scott  <zachary@zacharyscott.net>
+
+	* man/ri.1: Incorrect use of .Dd macro [Bug #8620] by Tristan Hill
+
 Sun Jul 14 00:15:26 2013  Zachary Scott  <zachary@zacharyscott.net>
 
 	* lib/logger.rb: Use :call-seq: for method signature rdoc
diff --git a/man/ri.1 b/man/ri.1
index 5c467b32df..cadf4b8e16 100644
--- a/man/ri.1
+++ b/man/ri.1
@@ -77,7 +77,8 @@ directories.  May be repeated.
 .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.
diff --git a/version.h b/version.h
index e0ff891fdb..9d7aa9cf4e 100644
--- a/version.h
+++ b/version.h
@@ -1,6 +1,6 @@
 #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