Skip to content

Commit

Permalink
Merge pull request #12435 from JuliaLang/omm/md-conversion
Browse files Browse the repository at this point in the history
The Doc Knight Rises
  • Loading branch information
MikeInnes committed Aug 19, 2015
2 parents e5e8ed5 + a2bedf3 commit 47f124c
Show file tree
Hide file tree
Showing 27 changed files with 10,540 additions and 9,948 deletions.
38 changes: 19 additions & 19 deletions base/docs/basedocs.jl
Original file line number Diff line number Diff line change
Expand Up @@ -284,17 +284,17 @@ keywords[:immutable] = doc"""
See `type` and the manual for more information.
"""

"""
Executes an expression, printing the time it took to
execute and the total number of bytes its execution caused to be
allocated. Returns the value of the expression. For example:
@time begin
sleep(1)
2+2
end
"""
:@time
# """
# Executes an expression, printing the time it took to
# execute and the total number of bytes its execution caused to be
# allocated. Returns the value of the expression. For example:
#
# @time begin
# sleep(1)
# 2+2
# end
# """
# :@time

doc"""
Construct a regex, such as `r"^[a-z]*$"`. The regex also accepts
Expand All @@ -315,14 +315,14 @@ For example, this regex has all three flags enabled:
"""
:(r"")

"""
push!(collection, items...) → collection
Insert `items` at the end of `collection`.
push!([1,2,3], 4) == [1,2,3,4]
"""
push!
# """
# push!(collection, items...) → collection
#
# Insert `items` at the end of `collection`.
#
# push!([1,2,3], 4) == [1,2,3,4]
# """
# push!

if Base.USE_GPL_LIBS

Expand Down
Loading

0 comments on commit 47f124c

Please sign in to comment.