Skip to content

Couple of small docs fixes #18784

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 2 commits into from
Oct 6, 2016
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 0 additions & 8 deletions base/docs/helpdb/Base.jl
Original file line number Diff line number Diff line change
Expand Up @@ -3058,14 +3058,6 @@ Return `true` if `A` is a subset of or equal to `S`.
"""
issubset

"""
stringmime(mime, x)

Returns an `AbstractString` containing the representation of `x` in the requested `mime`
type. This is similar to [`reprmime`](:func:`reprmime`) except that binary data is base64-encoded as an ASCII string.
"""
stringmime

"""
zero(x)
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Was this copied out of helpdb and someone forgot to remove it?

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Apparently as part of bc9b6ef (#18441), yes.


Expand Down
5 changes: 3 additions & 2 deletions base/expr.jl
Original file line number Diff line number Diff line change
Expand Up @@ -88,8 +88,9 @@ julia> macro m()
julia> M.f()
(1,2)
```
With `@macroexpand` the expression expands where `@macroexpand` appears in the code (module `M`).
With `macroexpand` the expressions expands in the current module where the code was finally called (REPL).
With `@macroexpand` the expression expands where `@macroexpand` appears in the code (module
`M` in the example). With `macroexpand` the expression expands in the current module where
the code was finally called (REPL in the example).
Note that when calling `macroexpand` or `@macroexpand` directly from the REPL, both of these contexts coincide, hence there is no difference.
"""
macro macroexpand(code)
Expand Down
25 changes: 22 additions & 3 deletions doc/stdlib/base.rst
Original file line number Diff line number Diff line change
Expand Up @@ -832,7 +832,27 @@ Nullables

.. Docstring generated from Julia source

Is the ``Nullable`` object ``x`` null, i.e. missing a value?
Return whether or not ``x`` is null for :obj:`Nullable` ``x``\ ; return ``false`` for all other ``x``\ .

.. doctest::

julia> x = Nullable(1, false)
Nullable{Int64}(1)

julia> isnull(x)
false

julia> x = Nullable(1, true)
Nullable{Int64}()

julia> isnull(x)
true

julia> x = 1
1

julia> isnull(x)
false

System
------
Expand Down Expand Up @@ -1545,7 +1565,7 @@ Internals
julia> M.f()
(1,2)

With @macroexpand the expression expands where @macroexpand appears in the code (module M). With macroexpand the expressions expands in the current module where the code was finally called. Note that when calling macroexpand or @macroexpand directly from the REPL, both of these contexts coincide, hence there is no difference.
With ``@macroexpand`` the expression expands where ``@macroexpand`` appears in the code (module ``M`` in the example). With ``macroexpand`` the expression expands in the current module where the code was finally called (REPL in the example). Note that when calling ``macroexpand`` or ``@macroexpand`` directly from the REPL, both of these contexts coincide, hence there is no difference.

.. function:: expand(x)

Expand Down Expand Up @@ -1620,4 +1640,3 @@ Internals
.. Docstring generated from Julia source

Compile the given function ``f`` for the argument tuple (of types) ``args``\ , but do not execute it.

2 changes: 1 addition & 1 deletion doc/stdlib/io-network.rst
Original file line number Diff line number Diff line change
Expand Up @@ -839,7 +839,7 @@ stack with:

.. Docstring generated from Julia source

Determine whether a MIME type is text data.
Determine whether a MIME type is text data. MIME types are assumed to be binary data except for a set of types known to be text data (possibly Unicode).

Memory-mapped I/O
-----------------
Expand Down