Skip to content

Commit 2d95ac9

Browse files
committed
Clarify wording of license information in README.
This text historically was copied verbatim from rust-lang/rust's own README [1] with the intention of licensing projects the same as rustc's own license, namely a dual MIT/Apache-2.0 license. The clause about "various BSD-like licenses" isn't actually correct for almost all projects other than rust-lang/rust and the wording around "both" was slightly ambiguous. This commit updates the wording to match more precisely what's in the standard library [2], namely clarifying that there aren't any BSD-like licenses in this repository and that the source is licensable under either license, at your own discretion. [1]: https://github.com/rust-lang/rust/tree/f0fe716dbcbf2363ab8f929325d32a17e51039d0#license [2]: https://github.com/rust-lang/rust/blob/f0fe716dbcbf2363ab8f929325d32a17e51039d0/src/libstd/lib.rs#L5-L9
1 parent 6d861ee commit 2d95ac9

File tree

1 file changed

+13
-4
lines changed

1 file changed

+13
-4
lines changed

README.md

Lines changed: 13 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -44,8 +44,17 @@ futures = { version = "0.1.14", default-features = false }
4444

4545
# License
4646

47-
`futures-rs` is primarily distributed under the terms of both the MIT license and
48-
the Apache License (Version 2.0), with portions covered by various BSD-like
49-
licenses.
47+
This project is licensed under either of
5048

51-
See LICENSE-APACHE, and LICENSE-MIT for details.
49+
* Apache License, Version 2.0, ([LICENSE-APACHE](LICENSE-APACHE) or
50+
http://www.apache.org/licenses/LICENSE-2.0)
51+
* MIT license ([LICENSE-MIT](LICENSE-MIT) or
52+
http://opensource.org/licenses/MIT)
53+
54+
at your option.
55+
56+
### Contribution
57+
58+
Unless you explicitly state otherwise, any contribution intentionally submitted
59+
for inclusion in Serde by you, as defined in the Apache-2.0 license, shall be
60+
dual licensed as above, without any additional terms or conditions.

0 commit comments

Comments
 (0)