diff --git a/docs/annexes/license-matching-guidelines-and-templates.md b/docs/annexes/license-matching-guidelines-and-templates.md index 815dfb1a6c38..b38a9d083616 100644 --- a/docs/annexes/license-matching-guidelines-and-templates.md +++ b/docs/annexes/license-matching-guidelines-and-templates.md @@ -53,7 +53,7 @@ The following XML tag is used to implement this guideline. `` with 2 attrib The original text is enclosed within the beginning and ending alt tags. For example: -`Copyright The Linux Foundation` +`Copyright The Linux Foundation` The original replaceable text appears on the SPDX License List webpage in red text. @@ -258,7 +258,7 @@ the more expressive XML format. A legacy template is composed of text with zero or more rules embedded in it. A rule is a variable section of a license wrapped between double angle brackets -`<<>>` and is composed of 4 fields. +`<<>>` and is composed of either 2 or 4 fields. Each field is separated with a semi-colon `;`. Rules shall not be embedded within other rules. Rule fields begin with a case sensitive tag followed by an equal sign `=`. diff --git a/docs/annexes/rdf-model.md b/docs/annexes/rdf-model.md index 61ac170f514f..c9b8853d4068 100644 --- a/docs/annexes/rdf-model.md +++ b/docs/annexes/rdf-model.md @@ -3,7 +3,7 @@ ## Model definition The SPDX RDF ontology is expressed in RDF/OWL/SHACL format -and is published in online at +and is published online at [SPDX 3.0 model](https://spdx.org/rdf/3.0/spdx-model.ttl) ## Diagrams diff --git a/docs/annexes/spdx-license-expressions.md b/docs/annexes/spdx-license-expressions.md index b125df8e5723..4f3bee092d4f 100644 --- a/docs/annexes/spdx-license-expressions.md +++ b/docs/annexes/spdx-license-expressions.md @@ -135,7 +135,7 @@ An example where three different licenses apply would be: LGPL-2.1-only AND MIT AND BSD-2-Clause ``` -The "AND" operator is the only operator that can be used in conjuction with the special identifiers "NONE" or "NOASSERTION". +The "AND" operator is the only operator that can be used in conjunction with the special identifiers "NONE" or "NOASSERTION". ### Additive "WITH" operator @@ -195,7 +195,7 @@ is described by the following ABNF: ```ABNF ; ABNF Grammar for License Expressions -SPSX-license-expression = (or-operand *( required-ws "OR" required-ws or-operand )) / special-identifier +SPDX-license-expression = (or-operand *( required-ws "OR" required-ws or-operand )) / special-identifier or-operand = (term required-ws "AND" required-ws term *( required-ws "AND" required-ws term )) / base-term @@ -211,7 +211,7 @@ identifier = license-id / or-later-expression / license-ref or-later-expression = license-id PLUS -parenthesized-expression = LPAREN optional-ws expression optional-ws RPAREN +parenthesized-expression = LPAREN optional-ws SPDX-license-expression optional-ws RPAREN special-identifier = "NONE" / "NOASSERTION" @@ -225,7 +225,7 @@ license-exception-id =