merge revision(s) 39415:

	* array.c (rb_ary_diff, rb_ary_and, rb_ary_or): Document return order
	  [RubySpec #7803]


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

3 files changed, 11 insertions, 4 deletions

diff --git a/ChangeLog b/ChangeLog
index 849e42dfff..af3eeab916 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+Sat Mar  9 22:45:01 2013  Zachary Scott  <zachary@zacharyscott.net>
+
+	* array.c (rb_ary_diff, rb_ary_and, rb_ary_or): Document return order
+	  [RubySpec #7803]
+
 Sat Mar  9 22:38:26 2013  Zachary Scott  <zachary@zacharyscott.net>
 
 	* object.c (rb_obj_comp): Documenting Object#<=> return values
diff --git a/array.c b/array.c
index 4977692d80..e2f89b237d 100644
--- a/array.c
+++ b/array.c
@@ -3801,7 +3801,8 @@ ary_recycle_hash(VALUE hash)
  *  Array Difference
  *
  *  Returns a new array that is a copy of the original array, removing any
- *  items that also appear in +other_ary+.
+ *  items that also appear in +other_ary+. The order is preserved from the
+ *  original array.
  *
  *  It compares elements using their #hash and #eql? methods for efficiency.
  *
@@ -3833,7 +3834,8 @@ rb_ary_diff(VALUE ary1, VALUE ary2)
  *     ary & other_ary      -> new_ary
  *
  *  Set Intersection --- Returns a new array containing elements common to the
- *  two arrays, excluding any duplicates.
+ *  two arrays, excluding any duplicates. The order is preserved from the
+ *  original array.
  *
  *  It compares elements using their #hash and #eql? methods for efficiency.
  *
@@ -3875,7 +3877,7 @@ rb_ary_and(VALUE ary1, VALUE ary2)
  *     ary | other_ary     -> new_ary
  *
  *  Set Union --- Returns a new array by joining +ary+ with +other_ary+,
- *  excluding any duplicates.
+ *  excluding any duplicates and preserving the order from the original array.
  *
  *  It compares elements using their #hash and #eql? methods for efficiency.
  *
diff --git a/version.h b/version.h
index 00f3eb7988..9d321bb91c 100644
--- a/version.h
+++ b/version.h
@@ -1,6 +1,6 @@
 #define RUBY_VERSION "2.0.0"
 #define RUBY_RELEASE_DATE "2013-03-09"
-#define RUBY_PATCHLEVEL 33
+#define RUBY_PATCHLEVEL 34
 
 #define RUBY_RELEASE_YEAR 2013
 #define RUBY_RELEASE_MONTH 3