summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorusa <usa@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2017-03-25 17:03:06 +0000
committerusa <usa@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2017-03-25 17:03:06 +0000
commit673310ec7bd9057808235226d77d131d71f61ff7 (patch)
tree5f798238d18cac33349bb31295b29baf11e477f7
parentad075f697ddad20d9d26cfea913f5255704f8a5f (diff)
merge revision(s) 57780: [Backport #12975]
docs for IO#print * io.c: [DOC] split documentation for IO#print into smaller paragraphs, delete duplicate sentence, fix call-seq. Based on a patch by Dario Daic. [ruby-core:78291] [Bug #12975] git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_2_2@58104 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
-rw-r--r--io.c22
-rw-r--r--version.h2
2 files changed, 13 insertions, 11 deletions
diff --git a/io.c b/io.c
index 1e0ac0bb6d..8f55f95ed0 100644
--- a/io.c
+++ b/io.c
@@ -6938,18 +6938,20 @@ rb_f_printf(int argc, VALUE *argv)
/*
* call-seq:
- * ios.print() -> nil
+ * ios.print -> nil
* ios.print(obj, ...) -> nil
*
- * Writes the given object(s) to <em>ios</em>. The stream must be
- * opened for writing. If the output field separator (<code>$,</code>)
- * is not <code>nil</code>, it will be inserted between each object.
- * If the output record separator (<code>$\\</code>)
- * is not <code>nil</code>, it will be appended to the output. If no
- * arguments are given, prints <code>$_</code>. Objects that aren't
- * strings will be converted by calling their <code>to_s</code> method.
- * With no argument, prints the contents of the variable <code>$_</code>.
- * Returns <code>nil</code>.
+ * Writes the given object(s) to <em>ios</em>. Returns <code>nil</code>.
+ *
+ * The stream must be opened for writing.
+ * Each given object that isn't a string will be converted by calling
+ * its <code>to_s</code> method.
+ * When called without arguments, prints the contents of <code>$_</code>.
+ *
+ * If the output field separator (<code>$,</code>) is not <code>nil</code>,
+ * it is inserted between objects.
+ * If the output record separator (<code>$\\</code>) is not <code>nil</code>,
+ * it is appended to the output.
*
* $stdout.print("This is ", 100, " percent.\n")
*
diff --git a/version.h b/version.h
index 42e3991cae..03c320c7b2 100644
--- a/version.h
+++ b/version.h
@@ -1,6 +1,6 @@
#define RUBY_VERSION "2.2.7"
#define RUBY_RELEASE_DATE "2017-03-26"
-#define RUBY_PATCHLEVEL 436
+#define RUBY_PATCHLEVEL 437
#define RUBY_RELEASE_YEAR 2017
#define RUBY_RELEASE_MONTH 3