aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--ChangeLog6
-rw-r--r--array.c12
2 files changed, 12 insertions, 6 deletions
diff --git a/ChangeLog b/ChangeLog
index 1599485daa..eacbef8bf1 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+Tue Sep 15 12:49:10 2015 Jason Barnabe <jason.barnabe@gmail.com>
+
+ * array.c (rb_ary_sort_bang, rb_ary_sort): [DOC] Correct
+ description of array sort block return values. And also fix up
+ the grammar a bit. [Fix GH-1020]
+
Tue Sep 15 12:44:32 2015 Nobuyoshi Nakada <nobu@ruby-lang.org>
* util.c (ruby_qsort): use BSD-style qsort_r if available.
diff --git a/array.c b/array.c
index d101d3bb6a..9f6e538de7 100644
--- a/array.c
+++ b/array.c
@@ -2445,9 +2445,9 @@ sort_2(const void *ap, const void *bp, void *dummy)
* Comparisons for the sort will be done using the <code><=></code> operator
* or using an optional code block.
*
- * The block must implement a comparison between +a+ and +b+, and return
- * +-1+, when +a+ follows +b+, +0+ when +a+ and +b+ are equivalent, or ++1+
- * if +b+ follows +a+.
+ * The block must implement a comparison between +a+ and +b+ and return
+ * +-1+ when +b+ follows +a+, +0+ when +a+ and +b+ are equivalent, or ++1+
+ * when +a+ follows +b+.
*
* See also Enumerable#sort_by.
*
@@ -2526,9 +2526,9 @@ rb_ary_sort_bang(VALUE ary)
* Comparisons for the sort will be done using the <code><=></code> operator
* or using an optional code block.
*
- * The block must implement a comparison between +a+ and +b+, and return
- * +-1+, when +a+ follows +b+, +0+ when +a+ and +b+ are equivalent, or ++1+
- * if +b+ follows +a+.
+ * The block must implement a comparison between +a+ and +b+ and return
+ * +-1+ when +b+ follows +a+, +0+ when +a+ and +b+ are equivalent, or ++1+
+ * when +a+ follows +b+.
*
*
* See also Enumerable#sort_by.