[dpdk-web] [PATCH 3/3] update license policy wording

[Thomas Monjalon <thomas@monjalon.net>]

Linux Foundation asks to
- change wording of the license names
- use spdx.org to describe licenses
- change dual licensing wording with "OR" keyword
- replace "shall" by "will"

Signed-off-by: Thomas Monjalon <thomas@monjalon.net>
---
 about/charter.html | 36 ++++++++++++++++++------------------
 1 file changed, 18 insertions(+), 18 deletions(-)

diff --git a/about/charter.html b/about/charter.html
index 235ebba..9ac8a32 100644
--- a/about/charter.html
+++ b/about/charter.html
@@ -447,11 +447,11 @@
 <ol>
 	<li>
 		All new inbound contributions to DPDK
-		shall be made under the following licenses:
+		will be made under the following licenses:
 	<ol>
 		<li>
-			The <a href="https://www.gnu.org/licenses/old-licenses/gpl-2.0.en.html"
-			>GPLv2 license</a>
+			The <a href="https://spdx.org/licenses/GPL-2.0.html"
+			>GPL-2.0 license</a>
 			shall be used for code that runs in the kernel.
 			Current examples of this are:
 		<ol>
@@ -465,20 +465,20 @@
 				lib/librte_eal/linuxapp/kni/ethtool/ixgbe
 		</ol>
 		<li>
-			A dual
-			<a href="https://opensource.org/licenses/BSD-3-Clause"
-			>3-clause BSD</a> /
-			<a href="https://www.gnu.org/licenses/old-licenses/gpl-2.0.en.html"
-			>GPLv2</a> license or
-			<a href="https://opensource.org/licenses/BSD-3-Clause"
-			>3-clause BSD</a> /
-			<a href="https://www.gnu.org/licenses/old-licenses/lgpl-2.0.en.html"
-			>LGPLv2</a> license
-			shall be used for code that is shared between the kernel and userspace.
+			A disjonctive licence choice of
+			<a href="https://spdx.org/licenses/BSD-3-Clause.html"
+			>BSD-3-Clause</a> OR
+			<a href="https://spdx.org/licenses/GPL-2.0.html"
+			>GPL-2.0</a> or
+			<a href="https://spdx.org/licenses/BSD-3-Clause.html"
+			>BSD-3-Clause</a> OR
+			<a href="https://spdx.org/licenses/LGPL-2.0.html"
+			>LGPL-2.0</a>
+			will be used for code that is shared between the kernel and userspace.
 			Current examples of this are:
 		<ul>
 			<li>
-				BSD/GPLv2:
+				BSD-3-Clause OR GPL-2.0:
 			<ol>
 				<li>
 					All files in
@@ -496,7 +496,7 @@
 					>dom0_mm_misc.c</a>
 			</ol>
 			<li>
-				BSD/LGPLv2:
+				BSD-3-Clause OR LGPL-2.0:
 			<ol start="4">
 				<li>
 					<a href="/browse/dpdk/tree/lib/librte_eal/bsdapp/eal/include/exec-env/rte_dom0_common.h"
@@ -509,9 +509,9 @@
 			</ol>
 		</ul>
 		<li>
-			The <a href="https://opensource.org/licenses/BSD-3-Clause"
-			>3-clause BSD license</a>
-			shall be used for all other contributions.
+			The <a href="https://spdx.org/licenses/BSD-3-Clause.html"
+			>BSD-3-Clause license</a>
+			will be used for all other contributions.
 	</ol>
 	<li>
 		All contributions shall include a "Signed-off-by:" line
-- 
2.14.2