forked from rust-lang/mdBook
-
Notifications
You must be signed in to change notification settings - Fork 0
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
rebase on latest mdbook from https://github.com/rust-lang/mdBook #12
Closed
lovettchris
wants to merge
149
commits into
leanprover:master
from
lovettchris:clovett/rebase_on_latest
Closed
rebase on latest mdbook from https://github.com/rust-lang/mdBook #12
lovettchris
wants to merge
149
commits into
leanprover:master
from
lovettchris:clovett/rebase_on_latest
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This reverts commit 0eb23ef.
Make page-break configurable
style: add missing word
Config to toggle the run button on codeblocks
…-events Fix `SummaryParser::parse_title()` consuming events (rust-lang#1743)
livereload uses host, port and HTTP(S) protocol of current page
Add proper title to 404 page
Before, a code block would always end with a final newline. The newline was added unconditionally by `hide_lines`. When the code block is syntax highlighted by highlight.js, this is not a problem, no empty line is added for a final trailing `\n` character. However, when the code block is editable and thus handled by the ACE editor, a trailing newline _is_ significant. I believe this issue is most closely described by ajaxorg/ace#2083 in the upstream repository. The effect of the way ACE handles newlines is that a code block like <pre> Some code </pre> will create an editor with _two_ lines, not just one. By trimming trailing whitespace, we ensure that we don’t accidentally create more lines in the ACE editor than necessary.
Avoid empty last line in editable code blocks
Make sure people use the right kind of asset-urls. This issue only shows up when deploying, not using `mdbook serve`.
Explain how to use `site-url` with asset URLs
Sometimes when working on large books it is handy to be able to run mdbook on a single chapter of a book.
Remove unneeded `type` attribute for `<script>`
* remove old mdbook ci scripts. * Create build.yml * fix tests * fix build.yml syntax * fix indentation * rename workflow * rename build * upload build artifact on successful build. * trigger new release if atag named "releases/v*" is created. * echo github.ref * make release tag name consistent * don't need to upload artifacts * add trigger on tag create * fix binary drop names * compress the target folders. * fix zip names * fix macos zip file name
lovettchris
changed the title
rebase on latest mdbook from git@github.com:rust-lang/mdBook.git
rebase on latest mdbook from https://github.com/rust-lang/mdBook
Sep 2, 2022
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
I'm not sure why it's saying it can't merge, I did the rebase and tons of manual tedious conflict resolving, so I was hoping this would "just work". It all builds and runs fine on my machine... note this brings the new official version of
--chapter
from rust-lang#1741.My branch says: "This branch is 148 commits ahead, 25 commits behind leanprover:master." and when I try and merge these 25 commits I get the conflicts all over again. So I think this means we will have to do a "git push -f " to push this rebased version and override what is in master, so that from then on rebasing from rust-lang will be easier.