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

Clarify manifest format docs for [badges] section #7694

Merged
merged 1 commit into from
Dec 11, 2019
Merged

Clarify manifest format docs for [badges] section #7694

merged 1 commit into from
Dec 11, 2019

Conversation

danielparks
Copy link
Contributor

Previously the [badges] section documentation was mixed in with the [package] section. This extracts it out under its own heading.

This also pulls the license and license-file field documentation out of the package metadata code block. It sets the example license to “MIT OR Apache-2.0” since that is the typical licensing scheme for many crates.

This includes minor rewrites for clarity and to match the register of the rest of the document.

This resolves issue #7691.

Previously the `[badges]` section documentation was mixed in with the
`[package]` section. This extracts it out under its own heading.

This also pulls the `license` and `license-file` field documentation out
of the package metadata code block. It sets the example license to “MIT
OR Apache-2.0” since that is the typical licensing scheme for many
crates.

This includes minor rewrites for clarity and to match the register of
the rest of the document.

This resolves issue #7691.
@rust-highfive
Copy link

Thanks for the pull request, and welcome! The Rust team is excited to review your changes, and you should hear from @Eh2406 (or someone else) soon.

If any changes to this PR are deemed necessary, please add them as extra commits. This ensures that the reviewer can see what has changed since they last reviewed the code. Due to the way GitHub handles out-of-date commits, this should also make it reasonably obvious what issues have or haven't been addressed. Large or tricky changes may require several passes of review and changes.

Please see the contribution instructions for more information.

@rust-highfive rust-highfive added the S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. label Dec 10, 2019
@Eh2406
Copy link
Contributor

Eh2406 commented Dec 11, 2019

Looks good to me, @ehuss Thoughts?

@ehuss
Copy link
Contributor

ehuss commented Dec 11, 2019

Looks great, thank you!
@bors r+

@bors
Copy link
Contributor

bors commented Dec 11, 2019

📌 Commit 80e37c3 has been approved by ehuss

@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-review Status: Awaiting review from the assignee but also interested parties. labels Dec 11, 2019
@bors
Copy link
Contributor

bors commented Dec 11, 2019

⌛ Testing commit 80e37c3 with merge 6f9b77a11b0fec288128af5a7df04da7d841ca45...

@bors
Copy link
Contributor

bors commented Dec 11, 2019

💔 Test failed - checks-azure

@bors bors added S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. and removed S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. labels Dec 11, 2019
@ehuss
Copy link
Contributor

ehuss commented Dec 11, 2019

@bors retry
504 Gateway Timeout on https://download.mono-project.com/repo/ubuntu

@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-review Status: Awaiting review from the assignee but also interested parties. labels Dec 11, 2019
@bors
Copy link
Contributor

bors commented Dec 11, 2019

⌛ Testing commit 80e37c3 with merge 89d4ab5...

bors added a commit that referenced this pull request Dec 11, 2019
… r=ehuss

Clarify manifest format docs for [badges] section

Previously the `[badges]` section documentation was mixed in with the `[package]` section. This extracts it out under its own heading.

This also pulls the `license` and `license-file` field documentation out of the package metadata code block. It sets the example license to “MIT OR Apache-2.0” since that is the typical licensing scheme for many crates.

This includes minor rewrites for clarity and to match the register of the rest of the document.

This resolves issue #7691.
@bors
Copy link
Contributor

bors commented Dec 11, 2019

☀️ Test successful - checks-azure
Approved by: ehuss
Pushing 89d4ab5 to master...

@bors bors merged commit 80e37c3 into rust-lang:master Dec 11, 2019
@danielparks danielparks deleted the issue-7691-manifest-badges-section branch December 12, 2019 01:33
@ehuss ehuss added this to the 1.42.0 milestone Feb 6, 2022
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
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.

5 participants