Merge pull request #16092 from giordano/master

jiahao · jiahao · commit e8601e8a19f4 · 2016-04-28T08:43:23.000-04:00
Fix docstring of hypot
diff --git a/base/math.jl b/base/math.jl
@@ -184,7 +184,7 @@ end
 """
     hypot(x...)
 
-Compute the hypotenuse ``\\sqrt{\\sum x_i}`` avoiding overflow and underflow.
+Compute the hypotenuse ``\\sqrt{\\sum x_i^2}`` avoiding overflow and underflow.
 """
 hypot(x::Number...) = vecnorm(x)
 
diff --git a/doc/stdlib/math.rst b/doc/stdlib/math.rst
@@ -890,7 +890,7 @@ Mathematical Functions
 
    .. Docstring generated from Julia source
 
-   Compute the hypotenuse :math:`\sqrt{\sum x_i}` avoiding overflow and underflow.
+   Compute the hypotenuse :math:`\sqrt{\sum x_i^2}` avoiding overflow and underflow.
 
 .. function:: log(x)
 
