From 4977c4c04132594c4b8ab4fe88c1c8f3f60f6f55 Mon Sep 17 00:00:00 2001 From: "W. Trevor King" Date: Mon, 8 Jan 2018 10:39:13 -0800 Subject: [PATCH] Cargo.toml: Replace '/' with 'OR' in 'license' Catch up with our recommendations from 7dee65fe (src/doc/manifest: Pin 'license' to SPDX 2.1 expressions and the 2.4 list, 2018-01-04, #4898), which deprecated '/' in favor of vanilla SPDX license expressions. I've gone with the disjunctive OR, because the README has: > Cargo is primarily distributed under the terms of both the MIT > license and the Apache License (Version 2.0). --- Cargo.toml | 2 +- src/crates-io/Cargo.toml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/Cargo.toml b/Cargo.toml index 29f3055721a..2907d4cd906 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -4,7 +4,7 @@ version = "0.26.0" authors = ["Yehuda Katz ", "Carl Lerche ", "Alex Crichton "] -license = "MIT/Apache-2.0" +license = "MIT OR Apache-2.0" homepage = "https://crates.io" repository = "https://github.com/rust-lang/cargo" documentation = "https://docs.rs/cargo" diff --git a/src/crates-io/Cargo.toml b/src/crates-io/Cargo.toml index e3c56aaa03c..03ccdbbee39 100644 --- a/src/crates-io/Cargo.toml +++ b/src/crates-io/Cargo.toml @@ -2,7 +2,7 @@ name = "crates-io" version = "0.15.0" authors = ["Alex Crichton "] -license = "MIT/Apache-2.0" +license = "MIT OR Apache-2.0" repository = "https://github.com/rust-lang/cargo" description = """ Helpers for interacting with crates.io