Merge pull request #3265 from mikerite/fix-export

[rust.git] / README.md

diff --git a/README.md b/README.md
index 40ece34c6faf9442296d2f0c66f5d454aa1ffd0c..9dd41f6513c25882c9b42570c725ea3d9471ada9 100644 (file)
--- a/README.md
+++ b/README.md
@@ -5,7 +5,7 @@ We are currently in the process of discussing Clippy 1.0 via the RFC process in
 [![Build Status](https://travis-ci.org/rust-lang-nursery/rust-clippy.svg?branch=master)](https://travis-ci.org/rust-lang-nursery/rust-clippy)
 [![Windows Build status](https://ci.appveyor.com/api/projects/status/id677xpw1dguo7iw?svg=true)](https://ci.appveyor.com/project/rust-lang-libs/rust-clippy)
 [![Current Version](https://meritbadge.herokuapp.com/clippy)](https://crates.io/crates/clippy)
-[![License: MPL-2.0](https://img.shields.io/crates/l/clippy.svg)](#license)
+[![License: MIT/Apache-2.0](https://img.shields.io/crates/l/clippy.svg)](#license)
 
 A collection of lints to catch common mistakes and improve your [Rust](https://github.com/rust-lang/rust) code.
 
@@ -149,5 +149,10 @@ If you do not want to include your lint levels in your code, you can globally en
 
 ## License
 
-Licensed under [MPL](https://www.mozilla.org/MPL/2.0/).
-If you're having issues with the license, let me know and I'll try to change it to something more permissive.
+Copyright 2014-2018 The Rust Project Developers
+
+Licensed under the Apache License, Version 2.0 <LICENSE-APACHE or
+http://www.apache.org/licenses/LICENSE-2.0> or the MIT license
+<LICENSE-MIT or http://opensource.org/licenses/MIT>, at your
+option. All files in the project carrying such notice may not be
+copied, modified, or distributed except according to those terms.