fix rebase glitches

Author: stevengj

base/broadcast.jl

@@ -10,7 +10,8 @@ export broadcast_getindex, broadcast_setindex!
 
 ## Broadcasting utilities ##
 
-# fallback for some special cases
+# fallbacks for some special cases
+@inline broadcast(f, x::Number...) = f(x...)
 @inline broadcast{N}(f, t::NTuple{N}, ts::Vararg{NTuple{N}}) = map(f, t, ts...)
 @inline broadcast(f, As::AbstractArray...) = broadcast_t(f, promote_eltype_op(f, As...), As...)
 

base/docs/helpdb/Base.jl

@@ -989,21 +989,6 @@ Numerator of the rational representation of `x`.
 """
 num
 
-"""
-    .<(x, y)
-
-Element-wise less-than comparison operator.
-
-```jldoctest
-julia> [1; 2; 3] .< [2; 1; 4]
-3-element BitArray{1}:
-  true
- false
-  true
-```
-"""
-Base.:(.<)
-
 """
     UndefRefError()
 
@@ -1430,6 +1415,14 @@ isnull
 
 Squared absolute value of `x`.
 """
+abs2
+
+"""
+    sizehint!(s, n)
+
+Suggest that collection `s` reserve capacity for at least `n` elements. This can improve performance.
+"""
+sizehint!
 
 """
     OutOfMemoryError()
@@ -2198,21 +2191,6 @@ Compute the minimum value of `A` over the singleton dimensions of `r`, and write
 """
 minimum!
 
-"""
-    .-(x, y)
-
-Element-wise subtraction operator.
-
-```jldoctest
-julia> [4; 5; 6] .- [1; 2; 4]
-3-element Array{Int64,1}:
- 3
- 3
- 2
-```
-"""
-Base.:(.-)
-
 """
     unsafe_trunc(T, x)
 
@@ -2403,52 +2381,6 @@ passing them as the second argument.
 """
 countlines
 
-"""
-    .\\(x, y)
-
-Element-wise left division operator.
-
-```jldoctest
-julia> A = [1 2; 3 4]
-2×2 Array{Int64,2}:
- 1  2
- 3  4
-
-julia> A .\ [1 2]
-2×2 Array{Float64,2}:
- 1.0       1.0
- 0.333333  0.5
-```
-
-```jldoctest
-julia> A = [1 0; 0 -1];
-
-julia> B = [0 1; 1 0];
-
-julia> C = [A, B]
-2-element Array{Array{Int64,2},1}:
- [1 0; 0 -1]
- [0 1; 1 0]
-
-julia> x = [1; 0];
-
-julia> y = [0; 1];
-
-julia> D = [x, y]
-2-element Array{Array{Int64,1},1}:
- [1,0]
- [0,1]
-
-julia> C .\\ D
-2-element Array{Array{Float64,1},1}:
- [1.0,-0.0]
- [1.0,0.0]
-```
-
-See also [`broadcast`](:func:`broadcast`).
-"""
-Base.:(.\)(x,y)
-
 """
 ```
 *(x, y...)

base/sysimg.jl

@@ -70,9 +70,7 @@ Symbol(x...) = Symbol(string(x...))
 # broadcast.jl, so that we can overload broadcast methods for
 # specific array types etc.
 #  --Here, just define fallback routines for broadcasting with no arguments
-#    or with scalars to just produce a scalar result:
 broadcast(f) = f()
-@inline broadcast(f, x::Number...) = f(x...)
 
 # array structures
 include("abstractarray.jl")
@@ -306,9 +304,6 @@ include("client.jl")
 # misc useful functions & macros
 include("util.jl")
 
-include("broadcast.jl")
-importall .Broadcast
-
 # dense linear algebra
 include("linalg/linalg.jl")
 importall .LinAlg