Skip to content

Commit

Permalink
Merge branch 'master' into search
Browse files Browse the repository at this point in the history
  • Loading branch information
visr authored Feb 24, 2019
2 parents fe5cd3b + b3b90b0 commit d3a4c12
Show file tree
Hide file tree
Showing 2 changed files with 8 additions and 3 deletions.
5 changes: 5 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -46,6 +46,10 @@
blocks are now interpreted to be relative `pwd`, which is set to the output directory of the
resulting file. ([#941][github-941])

## Version `v0.21.5`

* ![Bugfix][badge-bugfix] Deprecation warnings for `format` now get printed correctly when multiple formats are passed as a `Vector`. ([#967][github-967])

## Version `v0.21.4`

* ![Bugfix][badge-bugfix] A bug in `jldoctest`-blocks that, in rare cases, resulted in
Expand Down Expand Up @@ -259,6 +263,7 @@
[github-958]: https://github.com/JuliaDocs/Documenter.jl/pull/958
[github-959]: https://github.com/JuliaDocs/Documenter.jl/pull/959
[github-960]: https://github.com/JuliaDocs/Documenter.jl/pull/960
[github-967]: https://github.com/JuliaDocs/Documenter.jl/pull/967

[documenterlatex]: https://github.com/JuliaDocs/DocumenterLaTeX.jl
[documentermarkdown]: https://github.com/JuliaDocs/DocumenterMarkdown.jl
Expand Down
6 changes: 3 additions & 3 deletions src/Documenter.jl
Original file line number Diff line number Diff line change
Expand Up @@ -240,14 +240,14 @@ function makedocs(components...; debug = false, format = HTML(),

# deprecation of format as Symbols
function fmt(f)
if format === :html
if f === :html
Base.depwarn("`format = :html` is deprecated, use `format = Documenter.HTML()` instead.", :makedocs)
return Writers.HTMLWriter.HTML(; html_keywords...)
elseif format === :latex
elseif f === :latex
Base.depwarn("`format = :latex` is deprecated, use `format = LaTeX()` from " *
"the DocumenterLaTeX package instead.", :makedocs)
return Writers.LaTeXWriter.LaTeX()
elseif format === :markdown
elseif f === :markdown
Base.depwarn("`format = :markdown` is deprecated, use `format = Markdown()` " *
"from the DocumenterMarkdown package instead.", :makedocs)
return Writers.MarkdownWriter.Markdown()
Expand Down

0 comments on commit d3a4c12

Please sign in to comment.