Skip to content

Make rustdoc output comply with licenses #28573

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

Merged
merged 2 commits into from
Oct 5, 2015
Merged

Conversation

ruuda
Copy link
Contributor

@ruuda ruuda commented Sep 21, 2015

The output of rustdoc includes resources licensed under the SIL Open
Font License, the MIT license, and the Apache License 2.0. All of these
licenses permit redistribution provided that the license text is also
redistributed. Previously this was not the case, making rustdoc output
unsuitable for distribution by default. This resolves that problem by
including the license texts in rustdoc output.

See also: https://users.rust-lang.org/t/licensing-rustdoc-output/2880

The output of rustdoc includes resources licensed under the SIL Open
Font License, the MIT license, and the Apache License 2.0. All of these
licenses permit redistribution provided that the license text is also
redistributed. Previously this was not the case, making rustdoc output
unsuitable for distribution by default. This resolves that problem by
including the license texts in rustdoc output.
@rust-highfive
Copy link
Contributor

r? @brson

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

@brson
Copy link
Contributor

brson commented Sep 21, 2015

Thanks!

This looks fine to me as the simplest solution that will work. The only concern I have here is that it's not clear what MIT/Apache 2.0 apply to. Perhaps a top-level COPYRIGHT file (like in the rust tree), that explains more precisely which components are covered by what, and that the content is not covered. What do you think about that @ruud-v-a?

cc @alexcrichton @aturon

@ruuda
Copy link
Contributor Author

ruuda commented Sep 21, 2015

Good idea. Something like this?

@alexcrichton
Copy link
Member

I've always personally on the side of just removing all our font business, it's ended up being a never-ending series of small paper cuts, but other than that this seems fine.

@Manishearth
Copy link
Member

Updates?

@brson
Copy link
Contributor

brson commented Oct 4, 2015

@bors r+

@bors
Copy link
Collaborator

bors commented Oct 4, 2015

📌 Commit 6c56652 has been approved by brson

@bors
Copy link
Collaborator

bors commented Oct 4, 2015

⌛ Testing commit 6c56652 with merge 11a6127...

bors added a commit that referenced this pull request Oct 4, 2015
The output of rustdoc includes resources licensed under the SIL Open
Font License, the MIT license, and the Apache License 2.0. All of these
licenses permit redistribution provided that the license text is also
redistributed. Previously this was not the case, making rustdoc output
unsuitable for distribution by default. This resolves that problem by
including the license texts in rustdoc output.

See also: https://users.rust-lang.org/t/licensing-rustdoc-output/2880
@bors bors merged commit 6c56652 into rust-lang:master Oct 5, 2015
@ruuda ruuda deleted the rustdoc-license branch November 30, 2016 09:59
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

6 participants