Skip to content

Commit

Permalink
Fix some typos in comments/docs (JuliaLang#34057)
Browse files Browse the repository at this point in the history
  • Loading branch information
bwignall authored and fredrikekre committed Dec 9, 2019
1 parent 83d7466 commit 1da8d7e
Show file tree
Hide file tree
Showing 7 changed files with 8 additions and 8 deletions.
2 changes: 1 addition & 1 deletion base/reducedim.jl
Original file line number Diff line number Diff line change
Expand Up @@ -144,7 +144,7 @@ for (f1, f2, initval) in ((:min, :max, :Inf), (:max, :min, :(-Inf)))
# otherwise use the min/max of the first slice as initial value
v0 = mapreduce(f, $f2, A1)

# but NaNs need to be avoided as intial values
# but NaNs need to be avoided as initial values
v0 = v0 != v0 ? typeof(v0)($initval) : v0

T = _realtype(f, promote_union(eltype(A)))
Expand Down
2 changes: 1 addition & 1 deletion base/special/cbrt.jl
Original file line number Diff line number Diff line change
Expand Up @@ -52,7 +52,7 @@ Adding a bias of -0.03306235651 to the `(e%3+m)÷3` term reduces the error to ab
32.
With the IEEE floating point representation, for finite positive normal values, ordinary
integer divison of the value in bits magically gives almost exactly the RHS of the above
integer division of the value in bits magically gives almost exactly the RHS of the above
provided we first subtract the exponent bias and later add it back. We do the
subtraction virtually to keep e >= 0 so that ordinary integer division rounds towards
minus infinity; this is also efficient. All operations can be done in 32-bit.
Expand Down
4 changes: 2 additions & 2 deletions base/stream.jl
Original file line number Diff line number Diff line change
Expand Up @@ -51,7 +51,7 @@ function eof(s::LibuvStream)
# and that we won't return true if there's a readerror pending (it'll instead get thrown).
# This requires some careful ordering here (TODO: atomic loads)
bytesavailable(s) > 0 && return false
open = isopen(s) # must preceed readerror check
open = isopen(s) # must precede readerror check
s.readerror === nothing || throw(s.readerror)
return !open
end
Expand Down Expand Up @@ -332,7 +332,7 @@ end
function wait_readnb(x::LibuvStream, nb::Int)
# fast path before iolock acquire
bytesavailable(x.buffer) >= nb && return
open = isopen(x) # must preceed readerror check
open = isopen(x) # must precede readerror check
x.readerror === nothing || throw(x.readerror)
open || return
iolock_begin()
Expand Down
2 changes: 1 addition & 1 deletion contrib/mac/frameworkapp/ExecSandbox/ExecSandboxProtocol.h
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@
@param executableBookmark NSURL file bookmark for the julia executable to run.
@param args Arguments to pass to julia.
@param reply Async result with task and standard in, out, and error. An error
occured if task is nil.
occurred if task is nil.
*/
- (void)eval:(NSString *_Nonnull)juliaProgram
withJulia:(NSData *_Nonnull)executableBookmark
Expand Down
2 changes: 1 addition & 1 deletion contrib/windows/build-installer.iss
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@ PreparingDesc=
InstallingLabel=
ClickFinish=
FinishedHeadingLabel=Installation complete
FinishedLabelNoIcons=[name] has been succesfully installed.
FinishedLabelNoIcons=[name] has been successfully installed.
FinishedLabel=
StatusExtractFiles=Extracting...
StatusUninstalling=Removing...
Expand Down
2 changes: 1 addition & 1 deletion doc/src/devdocs/types.md
Original file line number Diff line number Diff line change
Expand Up @@ -82,7 +82,7 @@ f3(A::Array{T}) where {T<:Any} = 3
f4(A::Array{Any}) = 4
```

The signature - as decribed in [Function calls](@ref) - of `f3` is a `UnionAll` type wrapping a tuple type: `Tuple{typeof(f3), Array{T}} where T`.
The signature - as described in [Function calls](@ref) - of `f3` is a `UnionAll` type wrapping a tuple type: `Tuple{typeof(f3), Array{T}} where T`.
All but `f4` can be called with `a = [1,2]`; all but `f2` can be called with `b = Any[1,2]`.

Let's look at these types a little more closely:
Expand Down
2 changes: 1 addition & 1 deletion stdlib/REPL/test/repl.jl
Original file line number Diff line number Diff line change
Expand Up @@ -1086,7 +1086,7 @@ fake_repl() do stdin_write, stdout_read, repl
# for the "region_active" to have time to be updated

@test LineEdit.state(repl.mistate).region_active == :off
@test s4 == "anything" # no control characters between the last two occurences of "anything"
@test s4 == "anything" # no control characters between the last two occurrences of "anything"
write(stdin_write, "\x15\x04")
Base.wait(repltask)
end

0 comments on commit 1da8d7e

Please sign in to comment.