jafingerhut · Oct 16, 2024 · Oct 25, 2024 · Oct 31, 2024 · Nov 3, 2024 · Nov 7, 2024
diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md
@@ -1,7 +1,7 @@
 <!--
 SPDX-FileCopyrightText: 2024 Abhinav Kumar
 
-SPDX-License-Identifier: Apache-2.0
+SPDX-License-Identifier: CC-BY-4.0
 -->
 
 ---

diff --git a/LICENSES/CC-BY-4.0.txt b/LICENSES/CC-BY-4.0.txt
diff --git a/P4_tutorial.pdf.license b/P4_tutorial.pdf.license
@@ -1,3 +1,3 @@
 SPDX-FileCopyrightText: 2018 Nate Foster
 
-SPDX-License-Identifier: Apache-2.0
+SPDX-License-Identifier: CC-BY-4.0
diff --git a/README.md b/README.md
@@ -1,7 +1,7 @@
 <!--
 SPDX-FileCopyrightText: 2015 Antonin Bas
 
-SPDX-License-Identifier: Apache-2.0
+SPDX-License-Identifier: CC-BY-4.0
 -->
 
 # P4 Tutorial

diff --git a/doc/P4sim/README.md b/doc/P4sim/README.md
@@ -1,7 +1,7 @@
 <!--
 SPDX-FileCopyrightText: 2026 Vineet Goel
 
-SPDX-License-Identifier: Apache-2.0
+SPDX-License-Identifier: CC-BY-4.0
 -->
 
 # P4sim: P4-Programmable Packet Processing in ns-3

diff --git a/doc/licenses.md b/doc/licenses.md
@@ -1,7 +1,7 @@
 <!--
 SPDX-FileCopyrightText: 2025 Andy Fingerhut
 
-SPDX-License-Identifier: Apache-2.0
+SPDX-License-Identifier: CC-BY-4.0
 -->
 
 # Introduction

diff --git a/exercises/basic/README.md b/exercises/basic/README.md
@@ -1,7 +1,7 @@
 <!--
 SPDX-FileCopyrightText: 2018 Nate Foster
 
-SPDX-License-Identifier: Apache-2.0
+SPDX-License-Identifier: CC-BY-4.0
 -->
 
 # Implementing Basic Forwarding

diff --git a/exercises/basic/pod-topo/pod-topo.png.license b/exercises/basic/pod-topo/pod-topo.png.license
@@ -1,3 +1,3 @@
 SPDX-FileCopyrightText: 2019 Stephen Ibanez
 
-SPDX-License-Identifier: Apache-2.0
+SPDX-License-Identifier: CC-BY-4.0
diff --git a/exercises/basic_tunnel/README.md b/exercises/basic_tunnel/README.md
@@ -1,7 +1,7 @@
 <!--
 SPDX-FileCopyrightText: 2018 Nate Foster
 
-SPDX-License-Identifier: Apache-2.0
+SPDX-License-Identifier: CC-BY-4.0
 -->
 
 # Implementing Basic Tunneling

diff --git a/exercises/basic_tunnel/topo.pdf.license b/exercises/basic_tunnel/topo.pdf.license
@@ -1,3 +1,3 @@
 SPDX-FileCopyrightText: 2018 Nate Foster
 
-SPDX-License-Identifier: Apache-2.0
+SPDX-License-Identifier: CC-BY-4.0
diff --git a/exercises/basic_tunnel/topo.png.license b/exercises/basic_tunnel/topo.png.license
@@ -1,3 +1,3 @@
 SPDX-FileCopyrightText: 2018 Nate Foster
 
-SPDX-License-Identifier: Apache-2.0
+SPDX-License-Identifier: CC-BY-4.0
diff --git a/exercises/calc/README.md b/exercises/calc/README.md
@@ -1,7 +1,7 @@
 <!--
 SPDX-FileCopyrightText: 2018 Nate Foster
 
-SPDX-License-Identifier: Apache-2.0
+SPDX-License-Identifier: CC-BY-4.0
 -->
 
 # Implementing a P4 Calculator

diff --git a/exercises/ecn/README.md b/exercises/ecn/README.md
@@ -1,7 +1,7 @@
 <!--
 SPDX-FileCopyrightText: 2018 Nate Foster
 
-SPDX-License-Identifier: Apache-2.0
+SPDX-License-Identifier: CC-BY-4.0
 -->
 
 # Implementing ECN

diff --git a/exercises/ecn/setup.png.license b/exercises/ecn/setup.png.license
@@ -1,3 +1,3 @@
 SPDX-FileCopyrightText: 2018 Nate Foster
 
-SPDX-License-Identifier: Apache-2.0
+SPDX-License-Identifier: CC-BY-4.0
diff --git a/exercises/firewall/README.md b/exercises/firewall/README.md
@@ -1,7 +1,7 @@
 <!--
 SPDX-FileCopyrightText: 2019 Stephen Ibanez
 
-SPDX-License-Identifier: Apache-2.0
+SPDX-License-Identifier: CC-BY-4.0
 -->
 
 # Implementing A Basic Stateful Firewall

diff --git a/exercises/firewall/firewall-topo.png.license b/exercises/firewall/firewall-topo.png.license
@@ -1,3 +1,3 @@
 SPDX-FileCopyrightText: 2019 Stephen Ibanez
 
-SPDX-License-Identifier: Apache-2.0
+SPDX-License-Identifier: CC-BY-4.0
diff --git a/exercises/flowcache/README.md b/exercises/flowcache/README.md
@@ -1,7 +1,7 @@
 <!--
 SPDX-FileCopyrightText: 2025 Davide Scano
 
-SPDX-License-Identifier: Apache-2.0
+SPDX-License-Identifier: CC-BY-4.0
 -->
 
 ## Introduction

diff --git a/exercises/link_monitor/README.md b/exercises/link_monitor/README.md
@@ -1,7 +1,7 @@
 <!--
 SPDX-FileCopyrightText: 2019 Stephen Ibanez
 
-SPDX-License-Identifier: Apache-2.0
+SPDX-License-Identifier: CC-BY-4.0
 -->
 
 # Implementing Link Monitoring

diff --git a/exercises/link_monitor/link-monitor-topo.png.license b/exercises/link_monitor/link-monitor-topo.png.license
@@ -1,3 +1,3 @@
 SPDX-FileCopyrightText: 2019 Stephen Ibanez
 
-SPDX-License-Identifier: Apache-2.0
+SPDX-License-Identifier: CC-BY-4.0
diff --git a/exercises/load_balance/README.md b/exercises/load_balance/README.md
@@ -1,7 +1,7 @@
 <!--
 SPDX-FileCopyrightText: 2018 Nate Foster
 
-SPDX-License-Identifier: Apache-2.0
+SPDX-License-Identifier: CC-BY-4.0
 -->
 
 # Load Balancing

diff --git a/exercises/mri/README.md b/exercises/mri/README.md
@@ -1,7 +1,7 @@
 <!--
 SPDX-FileCopyrightText: 2018 Nate Foster
 
-SPDX-License-Identifier: Apache-2.0
+SPDX-License-Identifier: CC-BY-4.0
 -->
 
 # Implementing MRI

diff --git a/exercises/mri/setup.png.license b/exercises/mri/setup.png.license
@@ -1,3 +1,3 @@
 SPDX-FileCopyrightText: 2018 Nate Foster
 
-SPDX-License-Identifier: Apache-2.0
+SPDX-License-Identifier: CC-BY-4.0
diff --git a/exercises/multicast/README.md b/exercises/multicast/README.md
@@ -1,7 +1,7 @@
 <!--
 SPDX-FileCopyrightText: 2019 Tu Dang
 
-SPDX-License-Identifier: Apache-2.0
+SPDX-License-Identifier: CC-BY-4.0
 -->
 
 # Implementing Multicast

diff --git a/exercises/multicast/topo.png.license b/exercises/multicast/topo.png.license
@@ -1,3 +1,3 @@
 SPDX-FileCopyrightText: 2024 Abhinav Kumar
 
-SPDX-License-Identifier: Apache-2.0
+SPDX-License-Identifier: CC-BY-4.0
diff --git a/exercises/p4runtime/README.md b/exercises/p4runtime/README.md
@@ -1,7 +1,7 @@
 <!--
 SPDX-FileCopyrightText: 2018 Nate Foster
 
-SPDX-License-Identifier: Apache-2.0
+SPDX-License-Identifier: CC-BY-4.0
 -->
 
 # Implementing a Control Plane using P4Runtime

diff --git a/exercises/qos/README.md b/exercises/qos/README.md
@@ -1,7 +1,7 @@
 <!--
 SPDX-FileCopyrightText: 2020 nikkytub
 
-SPDX-License-Identifier: Apache-2.0
+SPDX-License-Identifier: CC-BY-4.0
 -->
 
 # Implementing QOS

diff --git a/exercises/qos/setup.png.license b/exercises/qos/setup.png.license
@@ -1,3 +1,3 @@
 SPDX-FileCopyrightText: 2020 nikkytub
 
-SPDX-License-Identifier: Apache-2.0
+SPDX-License-Identifier: CC-BY-4.0
diff --git a/exercises/source_routing/README.md b/exercises/source_routing/README.md
@@ -1,7 +1,7 @@
 <!--
 SPDX-FileCopyrightText: 2018 Nate Foster
 
-SPDX-License-Identifier: Apache-2.0
+SPDX-License-Identifier: CC-BY-4.0
 -->
 
 # Implementing Source Routing

diff --git a/exercises/source_routing/setup.png.license b/exercises/source_routing/setup.png.license
@@ -1,3 +1,3 @@
 SPDX-FileCopyrightText: 2024 Adarsh Rawat
 
-SPDX-License-Identifier: Apache-2.0
+SPDX-License-Identifier: CC-BY-4.0
diff --git a/p4-cheat-sheet.pdf.license b/p4-cheat-sheet.pdf.license
@@ -1,3 +1,3 @@
 SPDX-FileCopyrightText: 2018 Stephen Ibanez
 
-SPDX-License-Identifier: Apache-2.0
+SPDX-License-Identifier: CC-BY-4.0
diff --git a/utils/README.md b/utils/README.md
@@ -1,7 +1,7 @@
 <!--
 SPDX-FileCopyrightText: 2024 Duarte Dias
 
-SPDX-License-Identifier: Apache-2.0
+SPDX-License-Identifier: CC-BY-4.0
 -->
 
 # P4 Utils

diff --git a/utils/cheat_sheet_src/main.tex b/utils/cheat_sheet_src/main.tex
@@ -1,7 +1,7 @@
 % SPDX-FileCopyrightText: 2018 Stephen Ibanez
 %
-% SPDX-License-Identifier: Apache-2.0
-%
+% SPDX-License-Identifier: CC-BY-4.0
+
 % P4 Cheat Sheet
 % By P4.org
 

diff --git a/utils/cheat_sheet_src/src/actions.txt.license b/utils/cheat_sheet_src/src/actions.txt.license
@@ -1,3 +1,3 @@
 SPDX-FileCopyrightText: 2018 Stephen Ibanez
 
-SPDX-License-Identifier: Apache-2.0
+SPDX-License-Identifier: CC-BY-4.0
diff --git a/utils/cheat_sheet_src/src/adv_parsing.txt.license b/utils/cheat_sheet_src/src/adv_parsing.txt.license
@@ -1,3 +1,3 @@
 SPDX-FileCopyrightText: 2018 Stephen Ibanez
 
-SPDX-License-Identifier: Apache-2.0
+SPDX-License-Identifier: CC-BY-4.0
diff --git a/utils/cheat_sheet_src/src/architecture.txt.license b/utils/cheat_sheet_src/src/architecture.txt.license
@@ -1,3 +1,3 @@
 SPDX-FileCopyrightText: 2018 Stephen Ibanez
 
-SPDX-License-Identifier: Apache-2.0
+SPDX-License-Identifier: CC-BY-4.0
diff --git a/utils/cheat_sheet_src/src/control_flow.txt.license b/utils/cheat_sheet_src/src/control_flow.txt.license
@@ -1,3 +1,3 @@
 SPDX-FileCopyrightText: 2018 Stephen Ibanez
 
-SPDX-License-Identifier: Apache-2.0
+SPDX-License-Identifier: CC-BY-4.0
diff --git a/utils/cheat_sheet_src/src/counters.txt.license b/utils/cheat_sheet_src/src/counters.txt.license
@@ -1,3 +1,3 @@
 SPDX-FileCopyrightText: 2018 Stephen Ibanez
 
-SPDX-License-Identifier: Apache-2.0
+SPDX-License-Identifier: CC-BY-4.0
diff --git a/utils/cheat_sheet_src/src/data_types.txt.license b/utils/cheat_sheet_src/src/data_types.txt.license
@@ -1,3 +1,3 @@
 SPDX-FileCopyrightText: 2018 Stephen Ibanez
 
-SPDX-License-Identifier: Apache-2.0
+SPDX-License-Identifier: CC-BY-4.0
diff --git a/utils/cheat_sheet_src/src/deparsing.txt.license b/utils/cheat_sheet_src/src/deparsing.txt.license
@@ -1,3 +1,3 @@
 SPDX-FileCopyrightText: 2018 Stephen Ibanez
 
-SPDX-License-Identifier: Apache-2.0
+SPDX-License-Identifier: CC-BY-4.0
diff --git a/utils/cheat_sheet_src/src/expressions.txt.license b/utils/cheat_sheet_src/src/expressions.txt.license
@@ -1,3 +1,3 @@
 SPDX-FileCopyrightText: 2018 Stephen Ibanez
 
-SPDX-License-Identifier: Apache-2.0
+SPDX-License-Identifier: CC-BY-4.0
diff --git a/utils/cheat_sheet_src/src/header_stack.txt.license b/utils/cheat_sheet_src/src/header_stack.txt.license
@@ -1,3 +1,3 @@
 SPDX-FileCopyrightText: 2018 Stephen Ibanez
 
-SPDX-License-Identifier: Apache-2.0
+SPDX-License-Identifier: CC-BY-4.0
diff --git a/utils/cheat_sheet_src/src/parsers.txt.license b/utils/cheat_sheet_src/src/parsers.txt.license
@@ -1,3 +1,3 @@
 SPDX-FileCopyrightText: 2018 Stephen Ibanez
 
-SPDX-License-Identifier: Apache-2.0
+SPDX-License-Identifier: CC-BY-4.0
diff --git a/utils/cheat_sheet_src/src/tables.txt.license b/utils/cheat_sheet_src/src/tables.txt.license
@@ -1,3 +1,3 @@
 SPDX-FileCopyrightText: 2018 Stephen Ibanez
 
-SPDX-License-Identifier: Apache-2.0
+SPDX-License-Identifier: CC-BY-4.0
diff --git a/utils/cheat_sheet_src/src/v1model_std_metadata.txt.license b/utils/cheat_sheet_src/src/v1model_std_metadata.txt.license
@@ -1,3 +1,3 @@
 SPDX-FileCopyrightText: 2018 Stephen Ibanez
 
-SPDX-License-Identifier: Apache-2.0
+SPDX-License-Identifier: CC-BY-4.0
diff --git a/utils/img/TopoExample.png.license b/utils/img/TopoExample.png.license
@@ -1,3 +1,3 @@
 SPDX-FileCopyrightText: 2024 Duarte Dias
 
-SPDX-License-Identifier: Apache-2.0
+SPDX-License-Identifier: CC-BY-4.0
diff --git a/utils/img/minipython.png.license b/utils/img/minipython.png.license
@@ -1,3 +1,3 @@
 SPDX-FileCopyrightText: 2024 Duarte Dias
 
-SPDX-License-Identifier: Apache-2.0
+SPDX-License-Identifier: CC-BY-4.0
diff --git a/utils/img/summary.png.license b/utils/img/summary.png.license
@@ -1,3 +1,3 @@
 SPDX-FileCopyrightText: 2024 Duarte Dias
 
-SPDX-License-Identifier: Apache-2.0
+SPDX-License-Identifier: CC-BY-4.0
diff --git a/vm-ubuntu-20.04/README.md b/vm-ubuntu-20.04/README.md
@@ -1,7 +1,7 @@
 <!--
 SPDX-FileCopyrightText: 2021 Andy Fingerhut
 
-SPDX-License-Identifier: Apache-2.0
+SPDX-License-Identifier: CC-BY-4.0
 -->
 
 # Creating the VM

diff --git a/vm-ubuntu-20.04/create-vm-image-for-others.md b/vm-ubuntu-20.04/create-vm-image-for-others.md
@@ -1,7 +1,7 @@
 <!--
 SPDX-FileCopyrightText: 2024 Andy Fingerhut
 
-SPDX-License-Identifier: Apache-2.0
+SPDX-License-Identifier: CC-BY-4.0
 -->
 
 # Creating a VM image for distribution to others

diff --git a/vm-ubuntu-20.04/p4-logo.png.license b/vm-ubuntu-20.04/p4-logo.png.license
@@ -1,3 +1,3 @@
 SPDX-FileCopyrightText: 2018 Nate Foster
 
-SPDX-License-Identifier: Apache-2.0
+SPDX-License-Identifier: CC-BY-4.0
diff --git a/vm-ubuntu-24.04/README-create-vm-using-iso-installer-for-ubuntu-desktop.md b/vm-ubuntu-24.04/README-create-vm-using-iso-installer-for-ubuntu-desktop.md
@@ -1,7 +1,7 @@
 <!--
 SPDX-FileCopyrightText: 2024 Andy Fingerhut
 
-SPDX-License-Identifier: Apache-2.0
+SPDX-License-Identifier: CC-BY-4.0
 -->
 
 # Creating a VM using VirtualBox and an ISO disk image with an Ubuntu Desktop Linux 24.04 installer

diff --git a/vm-ubuntu-24.04/README-create-vm-using-iso-installer-for-ubuntu-server.md b/vm-ubuntu-24.04/README-create-vm-using-iso-installer-for-ubuntu-server.md
@@ -1,7 +1,7 @@
 <!--
 SPDX-FileCopyrightText: 2024 Andy Fingerhut
 
-SPDX-License-Identifier: Apache-2.0
+SPDX-License-Identifier: CC-BY-4.0
 -->
 
 # Creating a VM using VirtualBox and an ISO disk image with an Ubuntu Server Linux 24.04 installer

diff --git a/vm-ubuntu-24.04/README-create-vm-using-iso-installer.md b/vm-ubuntu-24.04/README-create-vm-using-iso-installer.md
@@ -1,7 +1,7 @@
 <!--
 SPDX-FileCopyrightText: 2024 Andy Fingerhut
 
-SPDX-License-Identifier: Apache-2.0
+SPDX-License-Identifier: CC-BY-4.0
 -->
 
 # Create VM using ISO installer

diff --git a/vm-ubuntu-24.04/README-create-vm-using-vagrant.md b/vm-ubuntu-24.04/README-create-vm-using-vagrant.md
@@ -1,7 +1,7 @@
 <!--
 SPDX-FileCopyrightText: 2024 Andy Fingerhut
 
-SPDX-License-Identifier: Apache-2.0
+SPDX-License-Identifier: CC-BY-4.0
 -->
 
 ## Creating the VM using VirtualBox and Vagrant

diff --git a/vm-ubuntu-24.04/README.md b/vm-ubuntu-24.04/README.md
@@ -1,7 +1,7 @@
 <!--
 SPDX-FileCopyrightText: 2024 Andy Fingerhut
 
-SPDX-License-Identifier: Apache-2.0
+SPDX-License-Identifier: CC-BY-4.0
 -->
 
 # Introduction

diff --git a/vm-ubuntu-24.04/create-vm-image-for-others.md b/vm-ubuntu-24.04/create-vm-image-for-others.md
@@ -1,7 +1,7 @@
 <!--
 SPDX-FileCopyrightText: 2024 Andy Fingerhut
 
-SPDX-License-Identifier: Apache-2.0
+SPDX-License-Identifier: CC-BY-4.0
 -->
 
 # Creating a VM image for distribution to others

diff --git a/vm-ubuntu-26.04/README-create-vm-using-iso-installer-for-ubuntu-desktop.md b/vm-ubuntu-26.04/README-create-vm-using-iso-installer-for-ubuntu-desktop.md
@@ -1,7 +1,7 @@
 <!--
 SPDX-FileCopyrightText: 2024 Andy Fingerhut
 
-SPDX-License-Identifier: Apache-2.0
+SPDX-License-Identifier: CC-BY-4.0
 -->
 
 # Creating a VM using VirtualBox and an ISO disk image with an Ubuntu Desktop Linux 26.04 installer