Merge pull request JuliaLang#25623 from mortenpi/doc-build-updates

Additional Documenter updates
tekverkp · Jan 18, 2018 · 0379a38 · 0379a38
2 parents 71173e4 + 035a4bb
commit 0379a38
Showing 1 changed file with 2 additions and 1 deletion.
diff --git a/doc/make.jl b/doc/make.jl
@@ -151,7 +151,7 @@ end
 makedocs(
  build = joinpath(pwd(), "_build/html/en"),
  modules = [Base, Core, BuildSysImg, [Base.root_module(stdlib.stdlib) for stdlib in STDLIB_DOCS]...],
- clean = false,
+ clean = true,
  doctest = "doctest" in ARGS,
  linkcheck = "linkcheck" in ARGS,
  linkcheck_ignore = ["https://bugs.kde.org/show_bug.cgi?id=136779"], # fails to load from nanosoldier?
@@ -163,6 +163,7 @@ makedocs(
  analytics = "UA-28835595-6",
  pages = PAGES,
  html_prettyurls = ("deploy" in ARGS),
+ html_canonical = ("deploy" in ARGS) ? "https://docs.julialang.org/en/stable/" : nothing,
 )
 
 if "deploy" in ARGS