doc fixes

JuliaLang · Oct 18, 2016 · 2e854b4 · 2e854b4
1 parent d42c6b0
commit 2e854b4
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 8 deletions.
diff --git a/base/channels.jl b/base/channels.jl
@@ -105,7 +105,7 @@ fetch_unbuffered(c::Channel) = throw(ErrorException("`fetch` is not supported on
 """
     take!(c::Channel)
 
-Removes and returns a value from a `Channel`. Blocks till data is available.
+Removes and returns a value from a `Channel`. Blocks until data is available.
 
 For unbuffered channels, blocks until a `put!` is performed by a different
 task.

diff --git a/base/docs/helpdb/Base.jl b/base/docs/helpdb/Base.jl
@@ -1427,14 +1427,14 @@ endof
     Channel{T}(sz::Int)
 
 Constructs a `Channel` with an internal buffer that can hold a maximum of `sz` objects
-of type `T`. `put!` calls on a full channel block till an object is removed with `take!`.
+of type `T`. `put!` calls on a full channel block until an object is removed with `take!`.
 
-`Channel(0)` constructs an unbuffered channel. `put!` blocks till a matching `take!` is called.
+`Channel(0)` constructs an unbuffered channel. `put!` blocks until a matching `take!` is called.
 And vice-versa.
 
 Other constructors:
 
-- `Channel(Inf)` - equivalent to `Channel{Any}(typemax(UInt))`
+- `Channel(Inf)` - equivalent to `Channel{Any}(typemax(Int))`
 - `Channel(sz)` equivalent to `Channel{Any}(sz)`
 """
 Channel

diff --git a/doc/stdlib/parallel.rst b/doc/stdlib/parallel.rst
@@ -115,13 +115,13 @@ Tasks
 
    .. Docstring generated from Julia source
 
-   Constructs a ``Channel`` with an internal buffer that can hold a maximum of ``sz`` objects of type ``T``\ . ``put!`` calls on a full channel block till an object is removed with ``take!``\ .
+   Constructs a ``Channel`` with an internal buffer that can hold a maximum of ``sz`` objects of type ``T``\ . ``put!`` calls on a full channel block until an object is removed with ``take!``\ .
 
-   ``Channel(0)`` constructs an unbuffered channel. ``put!`` blocks till a matching ``take!`` is called. And vice-versa.
+   ``Channel(0)`` constructs an unbuffered channel. ``put!`` blocks until a matching ``take!`` is called. And vice-versa.
 
    Other constructors:
 
-   * ``Channel(Inf)`` - equivalent to ``Channel{Any}(typemax(UInt))``
+   * ``Channel(Inf)`` - equivalent to ``Channel{Any}(typemax(Int))``
    * ``Channel(sz)`` equivalent to ``Channel{Any}(sz)``
 
 .. function:: put!(c::Channel, v)
@@ -136,7 +136,7 @@ Tasks
 
    .. Docstring generated from Julia source
 
-   Removes and returns a value from a ``Channel``\ . Blocks till data is available.
+   Removes and returns a value from a ``Channel``\ . Blocks until data is available.
 
    For unbuffered channels, blocks until a ``put!`` is performed by a different task.