Merge pull request #757 from atouchet/lic

Update Readme and use SPDX license format

Author: valenting

README.md

@@ -11,4 +11,4 @@ URL library for Rust, based on the [URL Standard](https://url.spec.whatwg.org/).
 
 [Documentation](https://docs.rs/url/)
 
-Please see [UPGRADING.md](https://github.com/servo/rust-url/blob/master/UPGRADING.md) if you are upgrading from 0.x to 1.x.
+Please see [UPGRADING.md](https://github.com/servo/rust-url/blob/master/UPGRADING.md) if you are upgrading from a previous version.

form_urlencoded/Cargo.toml

@@ -4,7 +4,7 @@ version = "1.0.1"
 authors = ["The rust-url developers"]
 description = "Parser and serializer for the application/x-www-form-urlencoded syntax, as used by HTML forms."
 repository = "https://github.com/servo/rust-url"
-license = "MIT/Apache-2.0"
+license = "MIT OR Apache-2.0"
 edition = "2018"
 rust-version = "1.45"
 

idna/Cargo.toml

@@ -4,7 +4,7 @@ version = "0.2.3"
 authors = ["The rust-url developers"]
 description = "IDNA (Internationalizing Domain Names in Applications) and Punycode."
 repository = "https://github.com/servo/rust-url/"
-license = "MIT/Apache-2.0"
+license = "MIT OR Apache-2.0"
 autotests = false
 edition = "2018"
 rust-version = "1.45"

percent_encoding/Cargo.toml

@@ -4,7 +4,7 @@ version = "2.1.0"
 authors = ["The rust-url developers"]
 description = "Percent encoding and decoding"
 repository = "https://github.com/servo/rust-url/"
-license = "MIT/Apache-2.0"
+license = "MIT OR Apache-2.0"
 edition = "2018"
 rust-version = "1.45"
 

url/Cargo.toml

@@ -11,7 +11,7 @@ repository = "https://github.com/servo/rust-url"
 readme = "../README.md"
 keywords = ["url", "parser"]
 categories = ["parser-implementations", "web-programming", "encoding"]
-license = "MIT/Apache-2.0"
+license = "MIT OR Apache-2.0"
 include = ["src/**/*", "LICENSE-*", "README.md", "tests/**"]
 edition = "2018"
 rust-version = "1.45"