diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md new file mode 100644 index 0000000..5685b08 --- /dev/null +++ b/CONTRIBUTING.md @@ -0,0 +1,16 @@ +# Contributing + +## License + +Licensed under either of + + * 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 the work by you, as defined in the Apache-2.0 license, shall be dual licensed as above, without any +additional terms or conditions. diff --git a/Cargo.toml b/Cargo.toml index a9174bd..1d3c2fc 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -3,7 +3,7 @@ name = "num_cpus" version = "1.6.2" description = "Get the number of CPUs on a machine." -authors = ["Sean McArthur "] +authors = ["Sean McArthur "] license = "MIT/Apache-2.0" repository = "https://github.com/seanmonstar/num_cpus" documentation = "https://docs.rs/num_cpus" diff --git a/README.md b/README.md index a111b99..8f4c30a 100644 --- a/README.md +++ b/README.md @@ -4,7 +4,8 @@ [![Travis CI Status](https://travis-ci.org/seanmonstar/num_cpus.svg?branch=master)](https://travis-ci.org/seanmonstar/num_cpus) [![AppVeyor status](https://ci.appveyor.com/api/projects/status/qn8t6grhko5jwno6?svg=true)](https://ci.appveyor.com/project/seanmonstar/num-cpus) -[Documentation](https://docs.rs/num_cpus) +- [Documentation](https://docs.rs/num_cpus) +- [CHANGELOG](CHANGELOG.md) Count the number of CPUs on the current machine. @@ -25,18 +26,3 @@ extern crate num_cpus; // elsewhere let num = num_cpus::get(); ``` - -## License - -Licensed under either of - - * 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 the work by you, as defined in the Apache-2.0 license, shall be dual licensed as above, without any -additional terms or conditions.