diff mbox series

[RFC,2/8] doc: Correct documentation on license declaration

Message ID 20210331134502.17297-3-toertel@gmail.com
State RFC
Headers show
Series Make SWUpdate REUSE-compliant | expand

Commit Message

Mark Jonas March 31, 2021, 1:44 p.m. UTC 
The SPDX standard requires that multiple license shall be combined using
AND and OR operators.

Signed-off-by: Mark Jonas <toertel@gmail.com>
---
 doc/source/licensing.rst | 13 +++++++------
 1 file changed, 7 insertions(+), 6 deletions(-)
diff mbox series

Patch

diff --git a/doc/source/licensing.rst b/doc/source/licensing.rst
index fe84c67..667cbc6 100644
--- a/doc/source/licensing.rst
+++ b/doc/source/licensing.rst
@@ -18,21 +18,22 @@  replaced by a single line:
 
 ::
 
-	SPDX-License-Identifier:	GPL-2.0+
+	SPDX-License-Identifier:	GPL-2.0-or-later
 
 Ideally, the license terms of all files in the source tree should be
 defined by such License Identifiers; in no case a file can contain
 more than one such License Identifier list.
 
-If a "SPDX-License-Identifier:" line references more than one Unique
-License Identifier, then this means that the respective file can be
-used under the terms of either of these licenses, i. e. with
+If a "SPDX-License-Identifier:" line concatenates more than one Unique
+License Identifier using the OR operator, then this means that the
+respective file can be used under the terms of either of these licenses,
+i. e. with
 
 ::
 
-	SPDX-License-Identifier:	GPL-2.0+	BSD-3-Clause
+	SPDX-License-Identifier:	GPL-2.0-or-later OR BSD-3-Clause
 
-you can choose between GPL-2.0+ and BSD-3-Clause licensing.
+you can choose between GPL-2.0-or-later and BSD-3-Clause licensing.
 
 We use the SPDX_ Unique License Identifiers (SPDX-Identifiers_)