-
Notifications
You must be signed in to change notification settings - Fork 1.6k
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
Convert manual to markdown/mdbook #15795
base: master
Are you sure you want to change the base?
Conversation
aa0ec91
to
a8e8c4f
Compare
Some time ago I made a proof-of-concept for a better configuration page. The information on the current site is lacking important information such as possible configuration values for enums (and their description) or values of previous rust-analyzer version if anyone cannot use the newest version. Edit: removed confusing "since" at beginning of the second sentence. expand the examples of "important information" |
☔ The latest upstream changes (presumably #15871) made this pull request unmergeable. Please resolve the merge conflicts. |
a8e8c4f
to
5fcf528
Compare
Argh what did I do. |
d9b8f08
to
f160f31
Compare
☔ The latest upstream changes (presumably #15870) made this pull request unmergeable. Please resolve the merge conflicts. |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Can we no longer link to images/gifs with this setup? I'd really rather us not having to put the images/gifs into the repo.
We can, no problem. I thought it might be easier to manage them in the same place as the docs but either way works. I can go through and fix all the links. |
Adding the images to the repo increases the repo size, which would be fine for just a few images, but we might add more, might update some etc. And it's not much of a management burden to handle links like this, so I'd prefer keeping the images out of the repo for the time being. |
There are merge commits (commits with multiple parents) in your changes. We have a no merge policy so these commits will need to be removed for this pull request to be merged. You can start a rebase with the following commands:
The following commits are merge commits: |
☔ The latest upstream changes (presumably #15882) made this pull request unmergeable. Please resolve the merge conflicts. |
e4e0df5
to
d78f3e0
Compare
Done, they should all point to the links that were previously there. |
54f8c7e
to
3afdf72
Compare
No problem, I'm here when you're ready. |
☔ The latest upstream changes (presumably #17374) made this pull request unmergeable. Please resolve the merge conflicts. |
Sorry I'm so late to the party, but actually we can't hotlink them any more. It still works for old media if you remove |
I wonder, can we just put images into a different repo and link to those? (to prevent polluting the main repo with image files) |
Sounds like a pain, but we'll probably need to. We could put them in the website repo, I guess. We need a place for the changelog images anyway. |
cddea9d
to
19d2ea0
Compare
Or maybe there's another way: GitHub emails can't use the JWT, so they have links like https://github.com/rust-lang/rust-analyzer/assets/3886057/d0c1f6db-c9e9-4295-b4d7-be2ae7555da7, which seem to work even if you're not logged in. |
Current state, everything should be set with the final missing piece being integration in the website CI build step rust-analyzer/rust-analyzer.github.io#223 |
☔ The latest upstream changes (presumably #17434) made this pull request unmergeable. Please resolve the merge conflicts. |
manual.adoc to markdown add entire static manual and toc move generated adoc to md in book dir add features add features add assists add config add diagnostics split up book, clean up links update book config add intro remove old docs, add a README clean up ignores add temporary workflow temporary makefile remove workflow Fix import preference config keys convert manual to mdbook manual.adoc to markdown add entire static manual and toc move generated adoc to md in book dir add features add features add assists add config add diagnostics split up book, clean up links update book config add intro remove old docs, add a README clean up ignores add temporary workflow temporary makefile remove workflow remove generated config.md rework generated locations and ignores remove img, replace with externally linked remove img, replace with externally linked these should be gone remove these fix kbd Co-authored-by: Lukas Wirth <[email protected]> fix md header smaller header fix highlight_related list update book readme
Okay so, really the only blocker is on integrating the mdbook site as a subsite in jekyll but I do not understand jekyll. I've been looking through its docs and have not found a single option that would make this work (rust-analyzer/rust-analyzer.github.io#223 is just a dry run which copies things into the repo) |
☔ The latest upstream changes (presumably #17795) made this pull request unmergeable. Please resolve the merge conflicts. |
@Veykril I don't think you need to integrate with jekyll, do you? I'd have thought that the website repo could just do an mdbook build and include it in the output directory generated by jekyll. Something like this in
|
Maybe? I tried things out locally and that didn't work (though likely because the local jekyll server just doesn't do that) |
OK, here's a tested version: rust-analyzer/rust-analyzer.github.io#224 This works as far as I can tell, but ideally there would be a separate xtask for the various generated.md files. |
Actually you can just run the release command with the |
Ok, let's try this one more time!
Comments/reviews appreciated. This time it's just about bare bones moving the manual from adoc to mdbook.
Live deploy at http://joshrotenberg.com/rust-analyzer/index.html
Fixes #9504.