Skip to content

Commit

Permalink
Auto merge of #9209 - ehuss:update-spdx, r=alexcrichton
Browse files Browse the repository at this point in the history
Update SPDX version in docs.

The version is being updated in rust-lang/crates.io#3335.
  • Loading branch information
bors committed Feb 26, 2021
2 parents f3e63d6 + af7ab03 commit 85cae85
Showing 1 changed file with 2 additions and 2 deletions.
4 changes: 2 additions & 2 deletions src/doc/src/reference/manifest.md
Original file line number Diff line number Diff line change
Expand Up @@ -209,7 +209,7 @@ containing the text of the license (relative to this `Cargo.toml`).

[crates.io] interprets the `license` field as an [SPDX 2.1 license
expression][spdx-2.1-license-expressions]. The name must be a known license
from the [SPDX license list 3.6][spdx-license-list-3.6]. Parentheses are not
from the [SPDX license list 3.11][spdx-license-list-3.11]. Parentheses are not
currently supported. See the [SPDX site] for more information.

SPDX license expressions support AND and OR operators to combine multiple
Expand Down Expand Up @@ -514,7 +514,7 @@ more detail.
[publishing]: publishing.md
[Rust Edition]: ../../edition-guide/index.html
[spdx-2.1-license-expressions]: https://spdx.org/spdx-specification-21-web-version#h.jxpfx0ykyb60
[spdx-license-list-3.6]: https://github.com/spdx/license-list-data/tree/v3.6
[spdx-license-list-3.11]: https://github.com/spdx/license-list-data/tree/v3.11
[SPDX site]: https://spdx.org/license-list
[TOML]: https://toml.io/

Expand Down

0 comments on commit 85cae85

Please sign in to comment.