From acec6356eea2ad9c249b038703c6a17c3e0ec0a8 Mon Sep 17 00:00:00 2001 From: Alex Crichton Date: Mon, 30 Oct 2017 14:06:47 -0700 Subject: [PATCH] process: Clarify wording of license information in README. --- README.md | 16 ++++++++++++---- 1 file changed, 12 insertions(+), 4 deletions(-) diff --git a/README.md b/README.md index 9da882340..869b9a611 100644 --- a/README.md +++ b/README.md @@ -23,12 +23,20 @@ Next, add this to your crate: extern crate tokio_process; ``` + # License -`tokio-process` is primarily distributed under the terms of both the MIT -license and the Apache License (Version 2.0), with portions covered by various -BSD-like licenses. +Serde is licensed under either of -See LICENSE-APACHE, and LICENSE-MIT for details. + * Apache License, Version 2.0, ([LICENSE-APACHE](LICENSE-APACHE) or + http://www.apache.org/licenses/LICENSE-2.0) + * MIT license ([LICENSE-MIT](LICENSE-MIT) or + http://opensource.org/licenses/MIT) +at your option. +### Contribution + +Unless you explicitly state otherwise, any contribution intentionally submitted +for inclusion in Serde by you, as defined in the Apache-2.0 license, shall be +dual licensed as above, without any additional terms or conditions.