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

Update mdbook #73671

Merged
merged 2 commits into from
Jun 28, 2020
Merged

Update mdbook #73671

merged 2 commits into from
Jun 28, 2020

Conversation

ehuss
Copy link
Contributor

@ehuss ehuss commented Jun 23, 2020

This updates mdbook to 0.4. The list of changes can be found at https://github.com/rust-lang/mdBook/blob/master/CHANGELOG.md#mdbook-040. I think the most important one is the change to include fonts with the book instead of using the Google Fonts CDN. This adds a few megabytes of fonts to the docs component. It may be possible to share the fonts across the books, but would take a fair bit of work to make that happen, so I'm not sure if it is necessary.

This also removes mdbook-linkcheck. It is currently not being used, and I don't foresee it going back into use anytime soon. I would prefer not to maintain something that isn't being used, and it removes a very large number of dependencies.

@rust-highfive
Copy link
Collaborator

r? @Mark-Simulacrum

(rust_highfive has picked a reviewer for you, use r? to override)

@rust-highfive rust-highfive added the S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. label Jun 23, 2020
@bors
Copy link
Contributor

bors commented Jun 26, 2020

☔ The latest upstream changes (presumably #73756) made this pull request unmergeable. Please resolve the merge conflicts.

@Mark-Simulacrum
Copy link
Member

Hm, so with the google fonts change -- I am a bit worried about redistributing those in our artifacts. Do we know if the licensing allows for that? Do we need some call out? Maybe we should disable copying the fonts for now and deal with it later (or never).

@Mark-Simulacrum Mark-Simulacrum added S-waiting-on-author Status: This is awaiting some action (such as code changes or more information) from the author. and removed S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. labels Jun 26, 2020
@ehuss
Copy link
Contributor Author

ehuss commented Jun 26, 2020

I'm pretty sure the license is OK. Open-Sans is apache and source code pro is OFL which explicitly allows redistributing. The licenses are also included in the distribution. I don't think there is any requirement for attribution. Rustdoc already copies/embeds source-code-pro (among other fonts).

@Mark-Simulacrum
Copy link
Member

Okay, seems good, thanks for checking. @bors r+

@bors
Copy link
Contributor

bors commented Jun 26, 2020

📌 Commit 6bcbc42 has been approved by Mark-Simulacrum

@bors bors added S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. and removed S-waiting-on-author Status: This is awaiting some action (such as code changes or more information) from the author. labels Jun 26, 2020
@Mark-Simulacrum
Copy link
Member

I'm actually going to @bors rollup=never this as well because it seems like we'd want to be able to bisect accurately just in case

@Dylan-DPC-zz
Copy link

@bors p=1

@bors
Copy link
Contributor

bors commented Jun 27, 2020

⌛ Testing commit 6bcbc42 with merge 9bdd2db...

@bors
Copy link
Contributor

bors commented Jun 28, 2020

☀️ Test successful - checks-azure
Approved by: Mark-Simulacrum
Pushing 9bdd2db to master...

@bors bors added the merged-by-bors This PR was explicitly merged by bors. label Jun 28, 2020
@bors bors merged commit 9bdd2db into rust-lang:master Jun 28, 2020
@cuviper cuviper added this to the 1.46 milestone May 2, 2024
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
merged-by-bors This PR was explicitly merged by bors. S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

6 participants