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

Add summary and reference to Rust trademark guide #59748

Merged
merged 2 commits into from
Apr 15, 2019

Conversation

agnxy
Copy link
Contributor

@agnxy agnxy commented Apr 6, 2019

@rust-highfive
Copy link
Collaborator

r? @alexcrichton

(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 Apr 6, 2019
@agnxy agnxy mentioned this pull request Apr 6, 2019
@alexcrichton
Copy link
Member

r? @skade

Would you be willing to review this?

@skade
Copy link
Contributor

skade commented Apr 10, 2019

This looks okay, with the extension that we also have a licenses page: https://www.rust-lang.org/policies/licenses I would add that as well.

It's quite important, as some media (especially pictures) on the page are used with permission and not owned by the Rust team.

@steveklabnik
Copy link
Member

Thanks for this! I agree with @skade , adding a link to that would be great as well. Thanks so much!

@agnxy
Copy link
Contributor Author

agnxy commented Apr 13, 2019

Hi @skade @steveklabnik ,
Thanks for your suggestions. I have added a link to the licenses page.

@skade
Copy link
Contributor

skade commented Apr 14, 2019

@agnxy Perfect, thanks!

r+

/cc @alexcrichton

@alexcrichton
Copy link
Member

@bors: r=skade

@bors
Copy link
Contributor

bors commented Apr 15, 2019

📌 Commit 98beb12 has been approved by skade

@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 Apr 15, 2019
@Centril
Copy link
Contributor

Centril commented Apr 15, 2019

@alexcrichton Please rollup PRs such as this :)

@bors rollup

Centril added a commit to Centril/rust that referenced this pull request Apr 15, 2019
Add summary and reference to Rust trademark guide

Fix rust-lang#53287
cc @steveklabnik
bors added a commit that referenced this pull request Apr 15, 2019
Rollup of 6 pull requests

Successful merges:

 - #59648 (Add must_use annotations to Result::is_ok and is_err)
 - #59748 (Add summary and reference to Rust trademark guide)
 - #59779 (Uplift `get_def_path` from Clippy)
 - #59955 (bump stdsimd; make intra_doc_link_resolution_failure an error again; make lints more consistent)
 - #59978 (rustdoc: Remove default keyword from re-exported trait methods)
 - #59989 (Fix links to Atomic* in RELEASES.md)

Failed merges:

r? @ghost
@bors bors merged commit 98beb12 into rust-lang:master Apr 15, 2019
@agnxy agnxy deleted the trademark branch April 15, 2019 22:30
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.

Trademark restrictions?
7 participants