merge revision(s) 57778,57779:

	string.c: [DOC] fix doc formatting for String#==, #===
	math.c: more accuracy

	* math.c (math_log10): calculate log10(2) for more accuracy.
	  [ruby-core:79907] [Bug #13279]

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

3 files changed, 3 insertions, 5 deletions

diff --git a/math.c b/math.c
index 74dff9e720..523937ecb3 100644
--- a/math.c
+++ b/math.c
@@ -563,7 +563,7 @@ math_log10(VALUE unused_obj, VALUE x)
     /* check for pole error */
     if (d == 0.0) return DBL2NUM(-INFINITY);
 
-    return DBL2NUM(log10(d) + numbits * M_LN2/M_LN10); /* log10(d * 2 ** numbits) */
+    return DBL2NUM(log10(d) + numbits * log10(2)); /* log10(d * 2 ** numbits) */
 }
 
 /*
diff --git a/string.c b/string.c
index f023091d8e..6f1c8c4446 100644
--- a/string.c
+++ b/string.c
@@ -3046,9 +3046,7 @@ str_eql(const VALUE str1, const VALUE str2)
  *     str == obj    -> true or false
  *     str === obj   -> true or false
  *
- *  === Equality
- *
- *  Returns whether +str+ == +obj+, similar to Object#==.
+ *  Equality---Returns whether +str+ == +obj+, similar to Object#==.
  *
  *  If +obj+ is not an instance of String but responds to +to_str+, then the
  *  two strings are compared using <code>obj.==</code>.
diff --git a/version.h b/version.h
index 42cb9c5233..35aa3d3bde 100644
--- a/version.h
+++ b/version.h
@@ -1,6 +1,6 @@
 #define RUBY_VERSION "2.4.0"
 #define RUBY_RELEASE_DATE "2017-03-13"
-#define RUBY_PATCHLEVEL 83
+#define RUBY_PATCHLEVEL 84
 
 #define RUBY_RELEASE_YEAR 2017
 #define RUBY_RELEASE_MONTH 3