Skip to content
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

Upgrade to new Documenter #29470

Merged
merged 1 commit into from
Oct 3, 2018
Merged

Upgrade to new Documenter #29470

merged 1 commit into from
Oct 3, 2018

Conversation

fredrikekre
Copy link
Member

We should probably wait until Documenter v0.20 is tagged, but here is a WIP for that.
cc @mortenpi

@fredrikekre fredrikekre added the docsystem The documentation building system label Oct 2, 2018
@mortenpi
Copy link
Contributor

mortenpi commented Oct 2, 2018

You suggested at some point that we could test the Documenter master here for a while, before tagging. I think that is a good idea, so I'd merge like this for now, and then upgrade v0.20 when that is released in a follow-up PR.

doc/make.jl Outdated
deps = nothing,
make = nothing,
devurl = "1.1-DEV",
versions = ["v#.#", "1.1-DEV" => "1.1-DEV"]
Copy link
Contributor

Choose a reason for hiding this comment

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

Will "v#.#" also create v1/? From the docs:

"v#.#": includes links to the latest documentation for each minor release cycle (i.e. v2.0, v1.1, v1.0, v0.1).

Copy link
Member Author

@fredrikekre fredrikekre Oct 3, 2018

Choose a reason for hiding this comment

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

Create as in create the symlink? Yes. Create as in included in the selector? No. As the code is now it will create this:

v1.0 (pointing to v1.0.1)
v0.7 (pointing to v0.7.0)
v0.6 (pointing to v0.6.4)
v0.5 (pointing to v0.5.2)
v0.4 (pointing to v0.4.7)
v0.3 (pointing to v0.3.12)
v1.1-DEV

Copy link
Contributor

Choose a reason for hiding this comment

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

We should clarify the docs for versions a bit, to make it clear what symlinks it creates as well.

doc/make.jl Outdated
repo = "github.com/JuliaLang/julia.git",
target = "_build/html/en",
dirname = "en",
deps = nothing,
make = nothing,
devurl = "1.1-DEV",
Copy link
Contributor

Choose a reason for hiding this comment

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

Having this be lowercase would look better in the URL in my opinion (/en/1.1-dev/).

Copy link
Member Author

Choose a reason for hiding this comment

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

We have

julia> VERSION
v"1.1.0-DEV.361"

though?

Copy link
Contributor

Choose a reason for hiding this comment

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

They don't necessarily have to agree I'd say. In any case, I think it would be fine to have uppercase in the selector, but we can't separate it from what the URL is at the moment.

Copy link
Member Author

Choose a reason for hiding this comment

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

but we can't separate it from what the URL is at the moment.

Why not? We can have devurl = "v1.1-dev" and "v1.1-DEV" => "v1.1-dev" in versions.

@fredrikekre fredrikekre merged commit a897365 into master Oct 3, 2018
@fredrikekre fredrikekre deleted the fe/doc branch October 3, 2018 14:45
KristofferC pushed a commit that referenced this pull request Oct 29, 2018
(cherry picked from commit a897365)
KristofferC pushed a commit that referenced this pull request Feb 11, 2019
(cherry picked from commit a897365)
KristofferC pushed a commit that referenced this pull request Feb 20, 2020
(cherry picked from commit a897365)
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
docsystem The documentation building system
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants