aboutsummaryrefslogtreecommitdiffstats
path: root/doc
diff options
context:
space:
mode:
Diffstat (limited to 'doc')
-rw-r--r--doc/CMakeLists.txt2
-rw-r--r--doc/Makefile.am2
-rw-r--r--doc/README.stats_tree2
-rwxr-xr-xdoc/extcap_example.py2
-rwxr-xr-xdoc/make-authors-format.pl2
-rwxr-xr-xdoc/make-authors-short.pl2
-rw-r--r--doc/packet-PROTOABBREV.c2
-rwxr-xr-xdoc/perlnoutf.pl2
-rw-r--r--doc/plugins.example/Makefile.am2
-rw-r--r--doc/plugins.example/hello.c2
10 files changed, 10 insertions, 10 deletions
diff --git a/doc/CMakeLists.txt b/doc/CMakeLists.txt
index 333e356e2a..c0cf6c11fc 100644
--- a/doc/CMakeLists.txt
+++ b/doc/CMakeLists.txt
@@ -4,7 +4,7 @@
# By Gerald Combs <gerald@wireshark.org>
# Copyright 1998 Gerald Combs
#
-# SPDX-License-Identifier: GPL-2.0+
+# SPDX-License-Identifier: GPL-2.0-or-later
#
add_custom_command(
diff --git a/doc/Makefile.am b/doc/Makefile.am
index fe517fe4cf..5bcacb26c0 100644
--- a/doc/Makefile.am
+++ b/doc/Makefile.am
@@ -5,7 +5,7 @@
# By Gerald Combs <gerald@wireshark.org>
# Copyright 1998 Gerald Combs
#
-# SPDX-License-Identifier: GPL-2.0+
+# SPDX-License-Identifier: GPL-2.0-or-later
#
# We include dependencies on ../config.h in order to
diff --git a/doc/README.stats_tree b/doc/README.stats_tree
index 811dd754ed..24d4479945 100644
--- a/doc/README.stats_tree
+++ b/doc/README.stats_tree
@@ -47,7 +47,7 @@ A small example of a very basic stats_tree plugin follows.
* By Gerald Combs <gerald@wireshark.org>
* Copyright 1998 Gerald Combs
*
- * SPDX-License-Identifier: GPL-2.0+
+ * SPDX-License-Identifier: GPL-2.0-or-later
*/
#include "config.h"
diff --git a/doc/extcap_example.py b/doc/extcap_example.py
index a2ee6fb3b9..6d1d1d32bc 100755
--- a/doc/extcap_example.py
+++ b/doc/extcap_example.py
@@ -6,7 +6,7 @@
# By Gerald Combs <gerald@wireshark.org>
# Copyright 1998 Gerald Combs
#
-# SPDX-License-Identifier: GPL-2.0+
+# SPDX-License-Identifier: GPL-2.0-or-later
#
"""
diff --git a/doc/make-authors-format.pl b/doc/make-authors-format.pl
index 2c37dca54f..33d4a116a5 100755
--- a/doc/make-authors-format.pl
+++ b/doc/make-authors-format.pl
@@ -9,7 +9,7 @@
# By Gerald Combs <gerald@wireshark.org>
# Copyright 1998 Gerald Combs
#
-# SPDX-License-Identifier: GPL-2.0+
+# SPDX-License-Identifier: GPL-2.0-or-later
#
use strict;
diff --git a/doc/make-authors-short.pl b/doc/make-authors-short.pl
index 00e23c3132..5500bfd244 100755
--- a/doc/make-authors-short.pl
+++ b/doc/make-authors-short.pl
@@ -9,7 +9,7 @@
# By Gerald Combs <gerald@wireshark.org>
# Copyright 1998 Gerald Combs
#
-# SPDX-License-Identifier: GPL-2.0+
+# SPDX-License-Identifier: GPL-2.0-or-later
#
use strict;
diff --git a/doc/packet-PROTOABBREV.c b/doc/packet-PROTOABBREV.c
index 8d564e473f..69262e8acc 100644
--- a/doc/packet-PROTOABBREV.c
+++ b/doc/packet-PROTOABBREV.c
@@ -6,7 +6,7 @@
* By Gerald Combs <gerald@wireshark.org>
* Copyright 1998 Gerald Combs
*
- * SPDX-License-Identifier: GPL-2.0+
+ * SPDX-License-Identifier: GPL-2.0-or-later
*/
/*
diff --git a/doc/perlnoutf.pl b/doc/perlnoutf.pl
index a562f964a5..8a6fea3395 100755
--- a/doc/perlnoutf.pl
+++ b/doc/perlnoutf.pl
@@ -9,7 +9,7 @@
# By Gerald Combs <gerald@wireshark.org>
# Copyright 1998 Gerald Combs
#
-# SPDX-License-Identifier: GPL-2.0+
+# SPDX-License-Identifier: GPL-2.0-or-later
#
use strict;
diff --git a/doc/plugins.example/Makefile.am b/doc/plugins.example/Makefile.am
index d33e186757..10abf565e8 100644
--- a/doc/plugins.example/Makefile.am
+++ b/doc/plugins.example/Makefile.am
@@ -4,7 +4,7 @@
# By Gerald Combs <gerald@wireshark.org>
# Copyright 1998 Gerald Combs
#
-# SPDX-License-Identifier: GPL-2.0+
+# SPDX-License-Identifier: GPL-2.0-or-later
#
WARNFLAGS = -Wall -Wextra
diff --git a/doc/plugins.example/hello.c b/doc/plugins.example/hello.c
index 455b4741a6..52c4a50ec6 100644
--- a/doc/plugins.example/hello.c
+++ b/doc/plugins.example/hello.c
@@ -4,7 +4,7 @@
* By Gerald Combs <gerald@wireshark.org>
* Copyright 1998 Gerald Combs
*
- * SPDX-License-Identifier: GPL-2.0+
+ * SPDX-License-Identifier: GPL-2.0-or-later
*/
#ifdef HAVE_CONFIG_H