Skip to content

Commit 96e7bea

Browse files
RexJaeschkegoneall
authored andcommitted
Correct and change headings to title case
Signed-off-by: Rex Jaeschke <[email protected]>
1 parent b9875da commit 96e7bea

File tree

4 files changed

+31
-31
lines changed

4 files changed

+31
-31
lines changed

chapters/SPDX-license-expressions.md

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -81,7 +81,7 @@ For the `tag:value` format, any license expression that consists of more than on
8181

8282
Nested parentheses can also be used to specify an order of precedence which is discussed in more detail in [D.4.5](#D.4.5).
8383

84-
### D.4.2 Disjunctive "OR" Operator <a name="D.4.2"></a>
84+
### D.4.2 Disjunctive "OR" operator <a name="D.4.2"></a>
8585

8686
If presented with a choice between two or more licenses, use the disjunctive binary "OR" operator to construct a new license expression, where both the left and right operands are valid license expression values.
8787

@@ -97,7 +97,7 @@ An example representing a choice between three different licenses would be:
9797
LGPL-2.1-only OR MIT OR BSD-3-Clause
9898
```
9999

100-
### D.4.3 Conjunctive "AND" Operator <a name="D.4.3"></a>
100+
### D.4.3 Conjunctive "AND" operator <a name="D.4.3"></a>
101101

102102
If required to simultaneously comply with two or more licenses, use the conjunctive binary "AND" operator to construct a new license expression, where both the left and right operands are a valid license expression values.
103103

@@ -113,7 +113,7 @@ An example where all three different licenses apply would be:
113113
LGPL-2.1-only AND MIT AND BSD-2-Clause
114114
```
115115

116-
### D.4.4 Exception "WITH" Operator <a name="D.4.4"></a>
116+
### D.4.4 Exception "WITH" operator <a name="D.4.4"></a>
117117

118118
Sometimes a set of license terms apply except under special circumstances. In this case, use the binary "WITH" operator to construct a new license expression to represent the special exception situation. A valid `<license-expression>` is where the left operand is a `<simple-expression>` value and the right operand is a `<license-exception-id>` that represents the special exception terms.
119119

@@ -125,7 +125,7 @@ GPL-2.0-or-later WITH Bison-exception-2.2
125125

126126
The current set of valid exceptions can be found in Annex [A.2](SPDX-license-list.md#A.2). For the most up to date set of exceptions please see [spdx.org/licenses](https://spdx.org/licenses). If the applicable exception is not found on the SPDX License Exception List, then use a single `<license-ref>` to represent the entire license terms (including the exception).
127127

128-
### D.4.5 Order of Precedence and Parentheses <a name="D.4.5"></a>
128+
### D.4.5 Order of precedence and parentheses <a name="D.4.5"></a>
129129

130130
The order of application of the operators in an expression matters (similar to mathematical operators). The default operator order of precedence of a `<license-expression>` a is:
131131

@@ -156,7 +156,7 @@ MIT AND (LGPL-2.1-or-later OR BSD-3-Clause)
156156

157157
states the OR operator should be applied before the AND operator. That is, one should first select between the LGPL-2.1-or-later or the BSD-3-Clause license before applying the MIT license.
158158

159-
### D.4.6 License Expressions in RDF <a name="D.4.6"></a>
159+
### D.4.6 License expressions in RDF <a name="D.4.6"></a>
160160

161161
A conjunctive license can be expressed in RDF via a `<spdx:ConjunctiveLicenseSet>` element, with an spdx:member property for each element in the conjunctive license. Two or more members are required.
162162

chapters/SPDX-license-list.md

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
# Annex A SPDX License List (Informative)
1+
# Annex A SPDX license List (Informative)
22

33
The SPDX License List is a list of commonly found licenses and exceptions used for open source and other collaborative software. The purpose of the SPDX License List is to enable easy and efficient identification of such licenses and exceptions in an SPDX document (or elsewhere). The SPDX License List includes a standardized short identifier, full name for each license, vetted license text, other basic information, and a canonical permanent URL for each license and exception. By providing a short identifier, users can efficiently refer to a license without having to redundantly reproduce the full license. License exceptions can be used with the License Expression Syntax operator, "WITH" to create a license with an exception.
44

@@ -16,7 +16,7 @@ The SPDX License List is a list of commonly found licenses and exceptions used f
1616

1717
The following table contains the full names and short identifiers for the SPDX License List, v3.8 which was released 2020-02-09. For the full and most up-to-date version of the SPDX License List as well as other related information, please see [http://spdx.org/licenses/](http://spdx.org/licenses/)
1818

19-
## A.1 Licenses with Short Identifiers <a name="A.1"></a>
19+
## A.1 Licenses with short identifiers <a name="A.1"></a>
2020

2121
The OSI column in Table A.1 refers to Open Source Initiative licenses [see Reference 2].
2222

@@ -406,7 +406,7 @@ The OSI column in Table A.1 refers to Open Source Initiative licenses [see Refer
406406
| Zope Public License 2.0 | [ZPL-2.0](https://spdx.org/licenses/ZPL-2.0.html) | Y |
407407
| Zope Public License 2.1 | [ZPL-2.1](https://spdx.org/licenses/ZPL-2.1.html) | |
408408

409-
## A.2 Exceptions List <a name="A.2"></a>
409+
## A.2 Exceptions list <a name="A.2"></a>
410410

411411
**Table A.2 — Exception names and license links**
412412

@@ -450,7 +450,7 @@ The OSI column in Table A.1 refers to Open Source Initiative licenses [see Refer
450450
| Universal FOSS Exception, Version 1.0 | [Universal-FOSS-exception-1.0](https://spdx.org/licenses/Universal-FOSS-exception-1.0.html) |
451451
| WxWindows Library Exception 3.1 | [WxWindows-exception-3.1](https://spdx.org/licenses/WxWindows-exception-3.1.html) |
452452

453-
## A.3 Deprecated Licenses <a name="A.3"></a>
453+
## A.3 Deprecated licenses <a name="A.3"></a>
454454

455455
**Table A.3 — Deprecated license short identifiers**
456456

chapters/composition-of-an-SPDX-document.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -101,15 +101,15 @@ Cardinality: Optional, one or many.
101101

102102
See [Clause 10](other-licensing-information-detected.md) for details of the fields in this kind of section.
103103

104-
### 5.2.6 Relationships Between SPDX Elements section <a name="5.2.6"></a>
104+
### 5.2.6 Relationships between SPDX elements information section <a name="5.2.6"></a>
105105

106106
Packages, files, and snippets are all considered to be SPDX Elements, and relationships can be made explicit between these SPDX elements by using the fields in this section.
107107

108108
Cardinality: Optional, one or many.
109109

110110
See [Clause 11](relationships-between-SPDX-elements.md) for details of the fields in this kind of section.
111111

112-
### 5.2.7 Annotations section <a name="5.2.7"></a>
112+
### 5.2.7 Annotations information section <a name="5.2.7"></a>
113113

114114
Annotations permit the addition of information to validate and clarify ambiguous SPDX Elements (Packages, Files or Snippets).
115115

chapters/license-matching-guidelines-and-templates.md

Lines changed: 20 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -1,40 +1,40 @@
1-
# Annex B License Matching Guidelines and Templates (Informative)
1+
# Annex B License matching guidelines and templates (Informative)
22

3-
## B.1 SPDX License List Matching Guidelines <a name="B.1"></a>
3+
## B.1 SPDX license list matching guidelines <a name="B.1"></a>
44

55
The [SPDX License List Matching Guidelines](https://spdx.org/spdx-license-list/matching-guidelines) provide guidelines to be used for the purposes of matching licenses and license exceptions against those included on the SPDX License List. There is no intent here to make a judgment or interpretation, but merely to ensure that when one SPDX user identifies a license as "BSD-3-Clause," for example, it is indeed the same license as what someone else identifies as "BSD-3-Clause" and the same license as what is listed on the SPDX License List. Examples of how to apply some of the matching guidelines to a license or exception are provided via templates. Templates are comprised of technical markup within the master license text file to provide further or specific guidance to SPDX document creators or tool makers. Not all licenses or exceptions will have templates.
66

7-
## B.2 How These Guidelines Are Applied <a name="B.2"></a>
7+
## B.2 How these guidelines are applied <a name="B.2"></a>
88

99
### B.2.1 Purpose <a name="B.2.1"></a>
1010

1111
To ensure consistent results by different SPDX document creators when matching license information that will be included in the License Information in File field. SPDX document creators or tools may match on the license or exception text itself, the official license header, or the SPDX License List short identifier.
1212

13-
### B.2.2 Guideline: Official License Headers <a name="B.2.2"></a>
13+
### B.2.2 Guideline: official license headers <a name="B.2.2"></a>
1414

1515
The same matching guidelines used for license and exception text apply to the official license headers. Where applicable, an official license header template file with markup is included with the SPDX License List. Official license headers are defined by the SPDX License List as specific text specified within the license itself to be put in the header of files. (see https://spdx.org/spdx-license-list/license-list-overview for more info).
1616

17-
## B.3 Substantive Text <a name="B.3"></a>
17+
## B.3 Substantive text <a name="B.3"></a>
1818

1919
### B.3.1 Purpose <a name="B.3.1"></a>
2020

2121
To ensure that when matching licenses and exceptions to the SPDX License List, there is an appropriate balance between matching against the substantive text and disregarding parts of the text that do not alter the substantive text. Further guidelines of what can be disregarded or considered replaceable for purposes of matching are listed below here and in the subsequent specific guidelines. A conservative approach is taken in regard to rules about disregarded or replaceable text.
2222

23-
### B.3.2 Guideline: Verbatim Text <a name="B.3.2"></a>
23+
### B.3.2 Guideline: verbatim text <a name="B.3.2"></a>
2424

2525
License and exception text should be the same verbatim text (except for the guidelines stated here). The text should be in the same order, e.g., differently ordered paragraphs would not be considered a match.
2626

27-
### B.3.3 Guideline: No Additional Text <a name="B.3.3"></a>
27+
### B.3.3 Guideline: no additional text <a name="B.3.3"></a>
2828

2929
Matched text should only include that found in the vetted license or exception text. Where a license or exception found includes additional text or clauses, this should not be considered a match.
3030

31-
### B.3.4 Guideline: Replaceable Text <a name="B.3.4"></a>
31+
### B.3.4 Guideline: replaceable text <a name="B.3.4"></a>
3232

3333
Some licenses include text that refers to the specific copyright holder or author, yet the rest of the license is exactly the same as a generic version. The intent here is to avoid the inclusion of a specific name in one part of the license resulting in a non-match where the license is otherwise an exact match (e.g., the third clause and disclaimer in the BSD licenses, or the third, fourth, and fifth clauses of Apache-1.1). In these cases, there should be a positive license match.
3434

3535
Text that can be considered replaceable for matching purposes is indicated in the SPDX License List template with mark-up and in the corresponding HTML pages with colored text. The text indicated as such can be replaced with similar values (e.g., a different name or generic term; different date) and still be considered a positive match. This rule also applies to text-matching in official license headers (see Guideline #1).
3636

37-
### B.3.5 Guideline: Omittable Text <a name="B.3.5"></a>
37+
### B.3.5 Guideline: omittable text <a name="B.3.5"></a>
3838

3939
Some licenses have text that can simply be ignored. The intent here is to avoid the inclusion of certain text that is superfluous or irrelevant in regards to the substantive license text resulting in a non-match where the license is otherwise an exact match (e.g., directions on how to apply the license or other similar non-substantive exhibits). In these cases, there should be a positive license match.
4040

@@ -66,11 +66,11 @@ All uppercase and lowercase letters should be treated as lowercase letters. Temp
6666

6767
Because punctuation can change the meaning of a sentence, punctuation needs to be included in the matching process. License template files do not include markup for this guideline.
6868

69-
### B.6.2 Guideline: Punctuation <a name="B.6.2"></a>
69+
### B.6.2 Guideline: punctuation <a name="B.6.2"></a>
7070

7171
Punctuation should be matched, unless otherwise stated in these guidelines.
7272

73-
### B.6.3 Guideline: Hyphens, Dashes <a name="B.6.3"></a>
73+
### B.6.3 Guideline: hyphens, dashes <a name="B.6.3"></a>
7474

7575
Any hyphen, dash, en dash, em dash, or other variation should be considered equivalent.
7676

@@ -88,7 +88,7 @@ To avoid the possibility of a non-match due to the existence or absence of code
8888

8989
Any kind of code comment indicator or prefix which occurs at the beginning of each line in a matchable section should be ignored for matching purposes. Templates do not include markup for this guideline.
9090

91-
## B.8 Bullets and Numbering <a name="B.8"></a>
91+
## B.8 Bullets and numbering <a name="B.8"></a>
9292

9393
### B.8.1 Purpose <a name="B.8.1"></a>
9494

@@ -98,7 +98,7 @@ To avoid the possibility of a non-match due to the otherwise same license using
9898

9999
Where a line starts with a bullet, number, letter, or some form of a list item (determined where list item is followed by a space, then the text of the sentence), ignore the list item for matching purposes. Templates do not include markup for this guideline.
100100

101-
## B.9 Varietal Word Spelling <a name="B.9"></a>
101+
## B.9 Varietal word spelling <a name="B.9"></a>
102102

103103
### B.9.1 Purpose <a name="B.9.1"></a>
104104

@@ -108,7 +108,7 @@ English uses different spelling for some words. By identifying the spelling vari
108108

109109
The words in each line of the text file available at <https://spdx.org/licenses/equivalentwords.txt> are considered equivalent and interchangeable. Templates do not include markup for this guideline.
110110

111-
## B.10 Copyright Symbol <a name="B.10"></a>
111+
## B.10 Copyright symbol <a name="B.10"></a>
112112

113113
### B.10.1 Purpose <a name="B.10.1"></a>
114114

@@ -118,7 +118,7 @@ By having a rule regarding the use of "©", "(c)", or "copyright", we avoid the
118118

119119
"©", "(c)", or "Copyright" should be considered equivalent and interchangeable. Templates do not include markup for this guideline.
120120

121-
## B.11 Copyright Notice <a name="B.11"></a>
121+
## B.11 Copyright notice <a name="B.11"></a>
122122

123123
### B.11.1 Purpose <a name="B.11.1"></a>
124124

@@ -128,7 +128,7 @@ To avoid a license mismatch merely because the copyright notice (usually found a
128128

129129
Ignore copyright notices. A copyright notice consists of the following elements, for example: "2012 Copyright, John Doe. All rights reserved." or "(c) 2012 John Doe." Templates may or may not include markup for this guideline.
130130

131-
## B.12 License Name or Title <a name="B.12"></a>
131+
## B.12 License name or title <a name="B.12"></a>
132132

133133
### B.12.1 Purpose <a name="B.12.1"></a>
134134

@@ -138,7 +138,7 @@ To avoid a license mismatch merely because the name or title of the license is d
138138

139139
Ignore the license name or title for matching purposes, so long as what ignored is the title only and there is no additional substantive text added here. Templates do not include markup for this guideline.
140140

141-
## B.13 Extraneous Text At the End of a License <a name="B.13"></a>
141+
## B.13 Extraneous text at the end of a license <a name="B.13"></a>
142142

143143
### B.13.1 Purpose <a name="B.13.1"></a>
144144

@@ -158,15 +158,15 @@ To avoid a license mismatch due to a difference in a hyperlink protocol (e.g. ht
158158

159159
HTTP:// and HTTPS:// should be considered equivalent. Templates may or may not include markup for this guideline.
160160

161-
## B.15 SPDX License List <a name="B.15"></a>
161+
## B.15 SPDX License list <a name="B.15"></a>
162162

163-
### B.15.1 Template Access <a name="B.15.1"></a>
163+
### B.15.1 Template access <a name="B.15.1"></a>
164164

165165
The master files for the SPDX License List includes a spreadsheet listing all the licenses, deprecated licenses, and license exceptions; and the text for each license in a .txt file. These files are available in a Git repository at <https://github.com/spdx/license-list-XML>. Text that can be considered replaceable or omittable for matching purposes is indicated in the .txt file with markup as per the description below.
166166

167167
RDFa Access: The template text for the license can be accessed using the RDF tag licenseTemplate on the web page containing the license.
168168

169-
### B.15.2 Template Format <a name="B.15.2"></a>
169+
### B.15.2 Template format <a name="B.15.2"></a>
170170

171171
A template is composed of text with zero or more rules embedded in it.
172172

0 commit comments

Comments
 (0)