Merge pull request #42 from f5devcentral/develop

Merge from Dev ahead of AppWorld
f5devcentral · Jan 29, 2024 · d44338f · d44338f
2 parents b02e5bc + dbea354
commit d44338f
Show file tree

Hide file tree

Showing 368 changed files with 500 additions and 4,216 deletions.
diff --git a/buildhtml.bat b/buildhtml.bat
diff --git a/containthedocs-build.sh b/containthedocs-build.sh
@@ -2,12 +2,14 @@
 
 set -x
 
-COMMAND=(/bin/bash -c "sudo pip install -r requirements.txt -U ; make -C docs clean html")
+COMMAND="make -C docs html"
 
 . ./containthedocs-image
 
-exec docker run --rm -t \
+rm -rf docs/_build
+
+exec podman run --rm -it \
   -v "$PWD":"$PWD" --workdir "$PWD" \
   ${DOCKER_RUN_ARGS} \
   -e "LOCAL_USER_ID=$(id -u)" \
-  ${DOC_IMG} "${COMMAND[@]}"
+  ${DOC_IMG} ${COMMAND}
diff --git a/containthedocs-clean.sh b/containthedocs-clean.sh
@@ -6,7 +6,7 @@ COMMAND="make -C docs clean"
 
 . ./containthedocs-image
 
-exec docker run --rm -it \
+exec podman run --rm -it \
   -v "$PWD":"$PWD" --workdir "$PWD" \
   ${DOCKER_RUN_ARGS} \
   -e "LOCAL_USER_ID=$(id -u)" \

diff --git a/containthedocs-cleanbuild.sh b/containthedocs-cleanbuild.sh
@@ -6,7 +6,7 @@ COMMAND="make -C docs clean html"
 
 . ./containthedocs-image
 
-exec docker run --rm -it \
+exec podman run --rm -it \
   -v "$PWD":"$PWD" --workdir "$PWD" \
   ${DOCKER_RUN_ARGS} \
   -e "LOCAL_USER_ID=$(id -u)" \

diff --git a/docs/class5/class5.rst b/docs/class5/class5.rst
@@ -1,9 +1,11 @@
-Class 5 - DNS over HTTPS/DNS over TLS
-=====================================
+Class 5 - DNS over HTTPS/DNS over TLS (Pre TMOS 16.1)
+=====================================================
 
 Introduction
 ~~~~~~~~~~~~
 
+**NOTE: This lab is deprected for Class 6 and the native DoH/DoT support in TMOS, and is kepts for informational purposes only.**
+
 In this lab, you will see DNS over HTTPS (DoH) and DNS over TLS (DoT) queries proxied in both directions. That is, traditional DNS queries will be proxied to backend DoT/DoH servers, as well as DoH/DoT queries being proxied to traditional DNS servers.
 
 DoT is "simpler" to proxy as the original DNS protocol is simply encapsulated in TLS using client-SSL (DoT-to-DNS) or server-ssl (DNS-to-DoT) profiles.

diff --git a/docs/class5/topology.rst b/docs/class5/topology.rst
@@ -5,7 +5,6 @@ This lab consists of a single BIG-IP that is proxying the various DNS
 packet types. A single Windows jump host sits in the client segment
 while an Ubuntu jump server sits in the server segment.
 
-|image2.png|
 
 .. |image2.png| image:: _images/image2.png
    :width: 7.5in

diff --git a/docs/class6/_figures/0001.jpg b/docs/class6/_figures/0001.jpg
diff --git a/docs/class6/_figures/1.jpg b/docs/class6/_figures/1.jpg
diff --git a/docs/class6/_figures/1.png b/docs/class6/_figures/1.png
diff --git a/docs/class6/_figures/10.jpg b/docs/class6/_figures/10.jpg
diff --git a/docs/class6/_figures/10.png b/docs/class6/_figures/10.png
diff --git a/docs/class6/_figures/100.png b/docs/class6/_figures/100.png
diff --git a/docs/class6/_figures/100_updated.png b/docs/class6/_figures/100_updated.png
diff --git a/docs/class6/_figures/101.png b/docs/class6/_figures/101.png
diff --git a/docs/class6/_figures/101_updated.png b/docs/class6/_figures/101_updated.png
diff --git a/docs/class6/_figures/102.png b/docs/class6/_figures/102.png
diff --git a/docs/class6/_figures/102_updated.png b/docs/class6/_figures/102_updated.png
diff --git a/docs/class6/_figures/103.png b/docs/class6/_figures/103.png
diff --git a/docs/class6/_figures/103_updated.png b/docs/class6/_figures/103_updated.png
diff --git a/docs/class6/_figures/104.png b/docs/class6/_figures/104.png
diff --git a/docs/class6/_figures/104_updated.png b/docs/class6/_figures/104_updated.png
diff --git a/docs/class6/_figures/105.png b/docs/class6/_figures/105.png
diff --git a/docs/class6/_figures/106.png b/docs/class6/_figures/106.png
diff --git a/docs/class6/_figures/106_updated.png b/docs/class6/_figures/106_updated.png
diff --git a/docs/class6/_figures/107.jpg b/docs/class6/_figures/107.jpg
diff --git a/docs/class6/_figures/107.png b/docs/class6/_figures/107.png
diff --git a/docs/class6/_figures/107_updated.png b/docs/class6/_figures/107_updated.png
diff --git a/docs/class6/_figures/108.png b/docs/class6/_figures/108.png
diff --git a/docs/class6/_figures/108_updated.png b/docs/class6/_figures/108_updated.png
diff --git a/docs/class6/_figures/109.png b/docs/class6/_figures/109.png
diff --git a/docs/class6/_figures/10_updated.png b/docs/class6/_figures/10_updated.png
diff --git a/docs/class6/_figures/11.jpg b/docs/class6/_figures/11.jpg
diff --git a/docs/class6/_figures/11.png b/docs/class6/_figures/11.png
diff --git a/docs/class6/_figures/110.png b/docs/class6/_figures/110.png
diff --git a/docs/class6/_figures/111.png b/docs/class6/_figures/111.png
diff --git a/docs/class6/_figures/112.png b/docs/class6/_figures/112.png
diff --git a/docs/class6/_figures/113.png b/docs/class6/_figures/113.png
diff --git a/docs/class6/_figures/114.png b/docs/class6/_figures/114.png
diff --git a/docs/class6/_figures/115.png b/docs/class6/_figures/115.png
diff --git a/docs/class6/_figures/116.png b/docs/class6/_figures/116.png
diff --git a/docs/class6/_figures/117.png b/docs/class6/_figures/117.png
diff --git a/docs/class6/_figures/118.jpg b/docs/class6/_figures/118.jpg
diff --git a/docs/class6/_figures/118.png b/docs/class6/_figures/118.png
diff --git a/docs/class6/_figures/118_updated.png b/docs/class6/_figures/118_updated.png
diff --git a/docs/class6/_figures/119.jpg b/docs/class6/_figures/119.jpg
diff --git a/docs/class6/_figures/119.png b/docs/class6/_figures/119.png
diff --git a/docs/class6/_figures/119_B.png b/docs/class6/_figures/119_B.png
diff --git a/docs/class6/_figures/119_updated.png b/docs/class6/_figures/119_updated.png
diff --git a/docs/class6/_figures/11_updated.png b/docs/class6/_figures/11_updated.png
diff --git a/docs/class6/_figures/12.jpg b/docs/class6/_figures/12.jpg
diff --git a/docs/class6/_figures/12.png b/docs/class6/_figures/12.png
diff --git a/docs/class6/_figures/120.jpg b/docs/class6/_figures/120.jpg
diff --git a/docs/class6/_figures/120.png b/docs/class6/_figures/120.png
diff --git a/docs/class6/_figures/121.png b/docs/class6/_figures/121.png
diff --git a/docs/class6/_figures/121_1.png b/docs/class6/_figures/121_1.png
diff --git a/docs/class6/_figures/121_2.png b/docs/class6/_figures/121_2.png
diff --git a/docs/class6/_figures/121_3.png b/docs/class6/_figures/121_3.png
diff --git a/docs/class6/_figures/122.png b/docs/class6/_figures/122.png
diff --git a/docs/class6/_figures/122_updated.png b/docs/class6/_figures/122_updated.png
diff --git a/docs/class6/_figures/123.png b/docs/class6/_figures/123.png
diff --git a/docs/class6/_figures/123_updated.png b/docs/class6/_figures/123_updated.png
diff --git a/docs/class6/_figures/12_updated.png b/docs/class6/_figures/12_updated.png
diff --git a/docs/class6/_figures/13.png b/docs/class6/_figures/13.png
diff --git a/docs/class6/_figures/13_updated.png b/docs/class6/_figures/13_updated.png
diff --git a/docs/class6/_figures/14.png b/docs/class6/_figures/14.png
diff --git a/docs/class6/_figures/14_updated.png b/docs/class6/_figures/14_updated.png
diff --git a/docs/class6/_figures/15.png b/docs/class6/_figures/15.png
diff --git a/docs/class6/_figures/16.png b/docs/class6/_figures/16.png
diff --git a/docs/class6/_figures/16_updated.png b/docs/class6/_figures/16_updated.png
diff --git a/docs/class6/_figures/17.png b/docs/class6/_figures/17.png
diff --git a/docs/class6/_figures/17_B.png b/docs/class6/_figures/17_B.png
diff --git a/docs/class6/_figures/17_updated.png b/docs/class6/_figures/17_updated.png
diff --git a/docs/class6/_figures/18.png b/docs/class6/_figures/18.png
diff --git a/docs/class6/_figures/18_updated.png b/docs/class6/_figures/18_updated.png
diff --git a/docs/class6/_figures/19.png b/docs/class6/_figures/19.png
diff --git a/docs/class6/_figures/19_updated.png b/docs/class6/_figures/19_updated.png
diff --git a/docs/class6/_figures/2.jpg b/docs/class6/_figures/2.jpg
diff --git a/docs/class6/_figures/2.png b/docs/class6/_figures/2.png
diff --git a/docs/class6/_figures/20.png b/docs/class6/_figures/20.png
diff --git a/docs/class6/_figures/200.jpg b/docs/class6/_figures/200.jpg
diff --git a/docs/class6/_figures/202.jpg b/docs/class6/_figures/202.jpg
diff --git a/docs/class6/_figures/20_updated.png b/docs/class6/_figures/20_updated.png
diff --git a/docs/class6/_figures/21.png b/docs/class6/_figures/21.png
diff --git a/docs/class6/_figures/21_updated.png b/docs/class6/_figures/21_updated.png
diff --git a/docs/class6/_figures/22.png b/docs/class6/_figures/22.png
diff --git a/docs/class6/_figures/221.png b/docs/class6/_figures/221.png
diff --git a/docs/class6/_figures/22_updated.png b/docs/class6/_figures/22_updated.png
diff --git a/docs/class6/_figures/23.png b/docs/class6/_figures/23.png
diff --git a/docs/class6/_figures/23_updated.png b/docs/class6/_figures/23_updated.png
diff --git a/docs/class6/_figures/24.png b/docs/class6/_figures/24.png
diff --git a/docs/class6/_figures/24_updated.png b/docs/class6/_figures/24_updated.png
diff --git a/docs/class6/_figures/25.png b/docs/class6/_figures/25.png
diff --git a/docs/class6/_figures/25_updated.png b/docs/class6/_figures/25_updated.png
diff --git a/docs/class6/_figures/26.jpg b/docs/class6/_figures/26.jpg
diff --git a/docs/class6/_figures/26.png b/docs/class6/_figures/26.png
diff --git a/docs/class6/_figures/26_updated.png b/docs/class6/_figures/26_updated.png
diff --git a/docs/class6/_figures/27.jpg b/docs/class6/_figures/27.jpg
diff --git a/docs/class6/_figures/27.png b/docs/class6/_figures/27.png
diff --git a/docs/class6/_figures/28.jpg b/docs/class6/_figures/28.jpg
diff --git a/docs/class6/_figures/28.png b/docs/class6/_figures/28.png
diff --git a/docs/class6/_figures/29.jpg b/docs/class6/_figures/29.jpg
diff --git a/docs/class6/_figures/29.png b/docs/class6/_figures/29.png
diff --git a/docs/class6/_figures/29_updated.png b/docs/class6/_figures/29_updated.png
diff --git a/docs/class6/_figures/29_updated2.png b/docs/class6/_figures/29_updated2.png
diff --git a/docs/class6/_figures/2_updated.png b/docs/class6/_figures/2_updated.png
diff --git a/docs/class6/_figures/3.png b/docs/class6/_figures/3.png
diff --git a/docs/class6/_figures/30.jpg b/docs/class6/_figures/30.jpg
diff --git a/docs/class6/_figures/30.png b/docs/class6/_figures/30.png
diff --git a/docs/class6/_figures/300.png b/docs/class6/_figures/300.png
diff --git a/docs/class6/_figures/300_updated.png b/docs/class6/_figures/300_updated.png
diff --git a/docs/class6/_figures/301.png b/docs/class6/_figures/301.png
diff --git a/docs/class6/_figures/301_updated.png b/docs/class6/_figures/301_updated.png
diff --git a/docs/class6/_figures/302.png b/docs/class6/_figures/302.png
diff --git a/docs/class6/_figures/302_updated.png b/docs/class6/_figures/302_updated.png
diff --git a/docs/class6/_figures/31.jpg b/docs/class6/_figures/31.jpg
diff --git a/docs/class6/_figures/31.png b/docs/class6/_figures/31.png
diff --git a/docs/class6/_figures/32.png b/docs/class6/_figures/32.png
diff --git a/docs/class6/_figures/33.jpg b/docs/class6/_figures/33.jpg
diff --git a/docs/class6/_figures/33.png b/docs/class6/_figures/33.png
diff --git a/docs/class6/_figures/34.png b/docs/class6/_figures/34.png
diff --git a/docs/class6/_figures/35.png b/docs/class6/_figures/35.png
diff --git a/docs/class6/_figures/36.png b/docs/class6/_figures/36.png
diff --git a/docs/class6/_figures/37.png b/docs/class6/_figures/37.png
diff --git a/docs/class6/_figures/38.png b/docs/class6/_figures/38.png
diff --git a/docs/class6/_figures/39.png b/docs/class6/_figures/39.png
diff --git a/docs/class6/_figures/4.png b/docs/class6/_figures/4.png
diff --git a/docs/class6/_figures/40.jpg b/docs/class6/_figures/40.jpg
diff --git a/docs/class6/_figures/40.png b/docs/class6/_figures/40.png
diff --git a/docs/class6/_figures/41.jpg b/docs/class6/_figures/41.jpg
diff --git a/docs/class6/_figures/41.png b/docs/class6/_figures/41.png
diff --git a/docs/class6/_figures/42.jpg b/docs/class6/_figures/42.jpg
diff --git a/docs/class6/_figures/42.png b/docs/class6/_figures/42.png
diff --git a/docs/class6/_figures/43.jpg b/docs/class6/_figures/43.jpg
diff --git a/docs/class6/_figures/43.png b/docs/class6/_figures/43.png
diff --git a/docs/class6/_figures/44.jpg b/docs/class6/_figures/44.jpg
diff --git a/docs/class6/_figures/44.png b/docs/class6/_figures/44.png
diff --git a/docs/class6/_figures/45.png b/docs/class6/_figures/45.png
diff --git a/docs/class6/_figures/46.png b/docs/class6/_figures/46.png
diff --git a/docs/class6/_figures/47.jpg b/docs/class6/_figures/47.jpg
diff --git a/docs/class6/_figures/47.png b/docs/class6/_figures/47.png
diff --git a/docs/class6/_figures/48.jpg b/docs/class6/_figures/48.jpg
diff --git a/docs/class6/_figures/48.png b/docs/class6/_figures/48.png
diff --git a/docs/class6/_figures/49.jpg b/docs/class6/_figures/49.jpg
diff --git a/docs/class6/_figures/49.png b/docs/class6/_figures/49.png
diff --git a/docs/class6/_figures/4_updated.png b/docs/class6/_figures/4_updated.png
diff --git a/docs/class6/_figures/5-6.jpg b/docs/class6/_figures/5-6.jpg
diff --git a/docs/class6/_figures/5.png b/docs/class6/_figures/5.png
diff --git a/docs/class6/_figures/50.jpg b/docs/class6/_figures/50.jpg
diff --git a/docs/class6/_figures/50.png b/docs/class6/_figures/50.png
diff --git a/docs/class6/_figures/51.png b/docs/class6/_figures/51.png
diff --git a/docs/class6/_figures/52.jpg b/docs/class6/_figures/52.jpg
diff --git a/docs/class6/_figures/52.png b/docs/class6/_figures/52.png
diff --git a/docs/class6/_figures/53.jpg b/docs/class6/_figures/53.jpg
diff --git a/docs/class6/_figures/53.png b/docs/class6/_figures/53.png
diff --git a/docs/class6/_figures/54.jpg b/docs/class6/_figures/54.jpg
diff --git a/docs/class6/_figures/54.png b/docs/class6/_figures/54.png
diff --git a/docs/class6/_figures/55.jpg b/docs/class6/_figures/55.jpg
diff --git a/docs/class6/_figures/55.png b/docs/class6/_figures/55.png
diff --git a/docs/class6/_figures/56.jpg b/docs/class6/_figures/56.jpg
diff --git a/docs/class6/_figures/56.png b/docs/class6/_figures/56.png
diff --git a/docs/class6/_figures/56_updated.png b/docs/class6/_figures/56_updated.png
diff --git a/docs/class6/_figures/57.jpg b/docs/class6/_figures/57.jpg
diff --git a/docs/class6/_figures/57.png b/docs/class6/_figures/57.png
diff --git a/docs/class6/_figures/58.jpg b/docs/class6/_figures/58.jpg
diff --git a/docs/class6/_figures/58.png b/docs/class6/_figures/58.png
diff --git a/docs/class6/_figures/59.png b/docs/class6/_figures/59.png
diff --git a/docs/class6/_figures/6.png b/docs/class6/_figures/6.png
diff --git a/docs/class6/_figures/60.jpg b/docs/class6/_figures/60.jpg
diff --git a/docs/class6/_figures/60.png b/docs/class6/_figures/60.png
diff --git a/docs/class6/_figures/61.jpg b/docs/class6/_figures/61.jpg
diff --git a/docs/class6/_figures/61.png b/docs/class6/_figures/61.png
diff --git a/docs/class6/_figures/62.png b/docs/class6/_figures/62.png
diff --git a/docs/class6/_figures/63.png b/docs/class6/_figures/63.png
diff --git a/docs/class6/_figures/64.png b/docs/class6/_figures/64.png
diff --git a/docs/class6/_figures/65.png b/docs/class6/_figures/65.png
diff --git a/docs/class6/_figures/66.png b/docs/class6/_figures/66.png
diff --git a/docs/class6/_figures/67.png b/docs/class6/_figures/67.png
diff --git a/docs/class6/_figures/68.png b/docs/class6/_figures/68.png
diff --git a/docs/class6/_figures/68_updated.png b/docs/class6/_figures/68_updated.png
diff --git a/docs/class6/_figures/68_updated2.png b/docs/class6/_figures/68_updated2.png
diff --git a/docs/class6/_figures/68_updated3.png b/docs/class6/_figures/68_updated3.png
diff --git a/docs/class6/_figures/69.png b/docs/class6/_figures/69.png
diff --git a/docs/class6/_figures/7.png b/docs/class6/_figures/7.png
diff --git a/docs/class6/_figures/70.png b/docs/class6/_figures/70.png
diff --git a/docs/class6/_figures/71.png b/docs/class6/_figures/71.png
diff --git a/docs/class6/_figures/72.png b/docs/class6/_figures/72.png
diff --git a/docs/class6/_figures/73.png b/docs/class6/_figures/73.png
diff --git a/docs/class6/_figures/74.png b/docs/class6/_figures/74.png
diff --git a/docs/class6/_figures/75.png b/docs/class6/_figures/75.png
diff --git a/docs/class6/_figures/75_updated.png b/docs/class6/_figures/75_updated.png
diff --git a/docs/class6/_figures/76.png b/docs/class6/_figures/76.png
diff --git a/docs/class6/_figures/77.png b/docs/class6/_figures/77.png
diff --git a/docs/class6/_figures/78.png b/docs/class6/_figures/78.png
diff --git a/docs/class6/_figures/78_updated.png b/docs/class6/_figures/78_updated.png
diff --git a/docs/class6/_figures/78a.png b/docs/class6/_figures/78a.png
diff --git a/docs/class6/_figures/79.jpg b/docs/class6/_figures/79.jpg
diff --git a/docs/class6/_figures/79.png b/docs/class6/_figures/79.png
diff --git a/docs/class6/_figures/8.png b/docs/class6/_figures/8.png
diff --git a/docs/class6/_figures/80.jpg b/docs/class6/_figures/80.jpg
diff --git a/docs/class6/_figures/80.png b/docs/class6/_figures/80.png
diff --git a/docs/class6/_figures/81.jpg b/docs/class6/_figures/81.jpg
diff --git a/docs/class6/_figures/81.png b/docs/class6/_figures/81.png
diff --git a/docs/class6/_figures/82.png b/docs/class6/_figures/82.png
diff --git a/docs/class6/_figures/82_updated.png b/docs/class6/_figures/82_updated.png
diff --git a/docs/class6/_figures/83.png b/docs/class6/_figures/83.png
diff --git a/docs/class6/_figures/84.jpg b/docs/class6/_figures/84.jpg
diff --git a/docs/class6/_figures/84.png b/docs/class6/_figures/84.png
diff --git a/docs/class6/_figures/85.png b/docs/class6/_figures/85.png
diff --git a/docs/class6/_figures/85_updated.png b/docs/class6/_figures/85_updated.png
diff --git a/docs/class6/_figures/86.jpg b/docs/class6/_figures/86.jpg
diff --git a/docs/class6/_figures/86.png b/docs/class6/_figures/86.png
diff --git a/docs/class6/_figures/86_updated.png b/docs/class6/_figures/86_updated.png
diff --git a/docs/class6/_figures/87.png b/docs/class6/_figures/87.png
diff --git a/docs/class6/_figures/87_updated.png b/docs/class6/_figures/87_updated.png
diff --git a/docs/class6/_figures/88.png b/docs/class6/_figures/88.png
diff --git a/docs/class6/_figures/89.jpg b/docs/class6/_figures/89.jpg
diff --git a/docs/class6/_figures/89.png b/docs/class6/_figures/89.png
diff --git a/docs/class6/_figures/9.jpg b/docs/class6/_figures/9.jpg
diff --git a/docs/class6/_figures/9.png b/docs/class6/_figures/9.png
diff --git a/docs/class6/_figures/90.jpg b/docs/class6/_figures/90.jpg
diff --git a/docs/class6/_figures/90.png b/docs/class6/_figures/90.png
diff --git a/docs/class6/_figures/91.png b/docs/class6/_figures/91.png
diff --git a/docs/class6/_figures/92.png b/docs/class6/_figures/92.png
diff --git a/docs/class6/_figures/92_updated.png b/docs/class6/_figures/92_updated.png
diff --git a/docs/class6/_figures/93.jpg b/docs/class6/_figures/93.jpg
diff --git a/docs/class6/_figures/93.png b/docs/class6/_figures/93.png
diff --git a/docs/class6/_figures/93_updated.png b/docs/class6/_figures/93_updated.png
diff --git a/docs/class6/_figures/94.jpg b/docs/class6/_figures/94.jpg
diff --git a/docs/class6/_figures/94.png b/docs/class6/_figures/94.png
diff --git a/docs/class6/_figures/94_updated.png b/docs/class6/_figures/94_updated.png
diff --git a/docs/class6/_figures/94_updated2.png b/docs/class6/_figures/94_updated2.png
diff --git a/docs/class6/_figures/95.jpg b/docs/class6/_figures/95.jpg
diff --git a/docs/class6/_figures/95.png b/docs/class6/_figures/95.png
diff --git a/docs/class6/_figures/95_updated.png b/docs/class6/_figures/95_updated.png
diff --git a/docs/class6/_figures/96.png b/docs/class6/_figures/96.png
diff --git a/docs/class6/_figures/96_updated.png b/docs/class6/_figures/96_updated.png
diff --git a/docs/class6/_figures/96_updated2.png b/docs/class6/_figures/96_updated2.png
diff --git a/docs/class6/_figures/97.png b/docs/class6/_figures/97.png
diff --git a/docs/class6/_figures/97_updated.png b/docs/class6/_figures/97_updated.png
diff --git a/docs/class6/_figures/97_updated2.png b/docs/class6/_figures/97_updated2.png
diff --git a/docs/class6/_figures/98.png b/docs/class6/_figures/98.png
diff --git a/docs/class6/_figures/99.png b/docs/class6/_figures/99.png
diff --git a/docs/class6/_figures/Auction.png b/docs/class6/_figures/Auction.png
diff --git a/docs/class6/_figures/Diagram.png b/docs/class6/_figures/Diagram.png
diff --git a/docs/class6/_figures/postman-udf.png b/docs/class6/_figures/postman-udf.png
diff --git a/docs/class6/_images/Chrome-DOH-enable-disable.png b/docs/class6/_images/Chrome-DOH-enable-disable.png
diff --git a/docs/class6/_images/DNS-Lab-Components.png b/docs/class6/_images/DNS-Lab-Components.png
diff --git a/docs/class6/_images/DNS-Listeners-DOH-DOT-GTM.png b/docs/class6/_images/DNS-Listeners-DOH-DOT-GTM.png
diff --git a/docs/class6/_images/DOH-to-DOH-dohProxy-configuration.png b/docs/class6/_images/DOH-to-DOH-dohProxy-configuration.png
diff --git a/docs/class6/_images/DOHDOT-virtualservers-configuration.png b/docs/class6/_images/DOHDOT-virtualservers-configuration.png
diff --git a/docs/class6/_images/DOT-to-DNS-KDIG-command.png b/docs/class6/_images/DOT-to-DNS-KDIG-command.png
diff --git a/docs/class6/_images/DOT-to-DNS-pool-statistics.png b/docs/class6/_images/DOT-to-DNS-pool-statistics.png
diff --git a/docs/class6/_images/DOT-to-DNS-tcpdump.png b/docs/class6/_images/DOT-to-DNS-tcpdump.png
diff --git a/docs/class6/_images/DOT-to-DNS-vs-statistics.png b/docs/class6/_images/DOT-to-DNS-vs-statistics.png
diff --git a/docs/class6/_images/DOTDOH-profile-configuration.png b/docs/class6/_images/DOTDOH-profile-configuration.png
diff --git a/docs/class6/_images/F5-BIG-IP-Login-Prompt-Window.png b/docs/class6/_images/F5-BIG-IP-Login-Prompt-Window.png
diff --git a/docs/class6/_images/HTTP2-POST-example.png b/docs/class6/_images/HTTP2-POST-example.png
diff --git a/docs/class6/_images/HTTP2-binary-payload-example.png b/docs/class6/_images/HTTP2-binary-payload-example.png
diff --git a/docs/class6/_images/about-config-firefox-screenshot.png b/docs/class6/_images/about-config-firefox-screenshot.png
diff --git a/docs/class6/_images/about-networking-contd-browsing.png b/docs/class6/_images/about-networking-contd-browsing.png
diff --git a/docs/class6/_images/about-networking-dns-lookup.png b/docs/class6/_images/about-networking-dns-lookup.png
diff --git a/docs/class6/_images/about-networking-dns-screen-results.png b/docs/class6/_images/about-networking-dns-screen-results.png
diff --git a/docs/class6/_images/big-ip-statistics-reporting-doh.png b/docs/class6/_images/big-ip-statistics-reporting-doh.png
diff --git a/docs/class6/_images/browser-certificate-error-mozilla.png b/docs/class6/_images/browser-certificate-error-mozilla.png
diff --git a/docs/class6/_images/dns-configuration.png b/docs/class6/_images/dns-configuration.png
diff --git a/docs/class6/_images/dot-to-dns-vip-configuration.png b/docs/class6/_images/dot-to-dns-vip-configuration.png
diff --git a/docs/class6/_images/f5-app-world-2024_og.png b/docs/class6/_images/f5-app-world-2024_og.png
diff --git a/docs/class6/_images/firefox-trr-about-config.png b/docs/class6/_images/firefox-trr-about-config.png
diff --git a/docs/class6/_images/kdig-example.png b/docs/class6/_images/kdig-example.png
diff --git a/docs/class6/_images/kdig-tls-DOT-screenshot.png b/docs/class6/_images/kdig-tls-DOT-screenshot.png
diff --git a/docs/class6/_images/ltm-nodes-shown.png b/docs/class6/_images/ltm-nodes-shown.png
diff --git a/docs/class6/_images/ntp-configuration.png b/docs/class6/_images/ntp-configuration.png
diff --git a/docs/class6/_images/pool-statistics-image.png b/docs/class6/_images/pool-statistics-image.png
diff --git a/docs/class6/_images/pools-configuration.png b/docs/class6/_images/pools-configuration.png
diff --git a/docs/class6/_images/rdp-login-screen-example.png b/docs/class6/_images/rdp-login-screen-example.png
diff --git a/docs/class6/_images/resource-provisioning.png b/docs/class6/_images/resource-provisioning.png
diff --git a/docs/class6/_images/tcpdump-doh-testing.png b/docs/class6/_images/tcpdump-doh-testing.png
diff --git a/docs/class6/_images/viewing-statistics-DOT-TO-DNS.png b/docs/class6/_images/viewing-statistics-DOT-TO-DNS.png
diff --git a/docs/class6/_images/vlans-screen-twoshown-n.png b/docs/class6/_images/vlans-screen-twoshown-n.png
diff --git a/docs/class6/_images/windows-desktop-bigipdnsproxy.png b/docs/class6/_images/windows-desktop-bigipdnsproxy.png
diff --git a/docs/class6/_images/windows-rdp-desktop.png b/docs/class6/_images/windows-rdp-desktop.png
diff --git a/docs/class6/class6.rst b/docs/class6/class6.rst
@@ -1,12 +1,64 @@
-Class 6 - F5 DNS Cloud Service & F5 DNS Load Balancer Cloud Service   
-===================================================================
+Class 6 - Native DNS over HTTPS/DNS over TLS
+============================================
 
-This class will cover the following topics:
+Introduction
+~~~~~~~~~~~~
+
+DNS over HTTPS (DoH) & DNS over TLS (DoT) are protocols for performing Domain Name System (DNS) resolution via the HTTPS protocol or via TLS (Transport Layer Security) encryption. The goal of both DoH and DoT is to provide increased security and end-user privacy on an otherwise open and transparent DNS query and response.  It is worth noting that DoH is NOT DNS protocol – it uses the HTTP/2 protocol. 
+
+BIG-IP DNS decrypts and resolves DNS queries over HTTPS (DoH) without affecting RPS. DNS over TLS (DoT) ensures that DNS requests and responses are not tampered with or forged via on-path attacks.
+
+Starting in BIG-IP 16.1, F5 now includes profiles that support DNS over HTTPS.  These DoH profiles are included with the Local Traffic Manager + DNS license.  The BIG-IP supports DoH in the following modes:
+
+-  BIG-IP DoH Proxy—A passthrough proxy that proxies the client’s DoH request to a backend DoH server and the backend DoH server’s response back to the DoH client.  In “F5-speak”, this is a full HUDCHAIN with DoH support on both the client and server sides of the connection.
+
+-  BIG-IP DoH server— In this method, BIG-IP terminates the DoH connections and all subsequent DNS requests are handled by the DNS profile on the BIG-IP.
+
+-  The DoH-Server translates the client’s DoH request into a standard DNS request and forwards the DNS request using TCP or UDP to the configured DNS server or pool, such as the BIG-IP named process or the BIG-IP DNS cache feature. When the BIG-IP system receives a response from the configured DNS server, it translates the DNS response into a DoH response before sending it to the DoH client.
+
+.. note::
+   F5 has support for DNS over HTTPS on BIG-IP versions prior to 16.1.0 via an iRuleLX implementation (Link here: https://clouddocs.f5.com/training/community/dns/html/class5/class5.html).  This iRulesLX method will still be supported, but BIG-IP’s native LTM and DNS profiles created for DoH are the preferred method for implementation
+
+DoH, on its own, is somewhat complex and is not DNS from a protocol perspective, meaning that traditional DNS tools cannot understand it. It is done with either HTTP GET or HTTP POST and uses tcp/443 along with TLS1.3 and encrypted SNI. Using the BIG-IP DNS, we can convert either method from DoH to a standard DNS query (DoH to DNS). For the HTTP GET method, we must take the DNS request, encode the URL with base64url, and then encapsulate it into a binary HTTPS payload, as seen here:
+
+.. image:: _images/HTTP2-binary-payload-example.png
+   :width: 7.5in
+   :height: 4.6875in
+
+For the HTTP POST method, we must take the DNS request, encode the DNS message in DNS Wire Format, and then encapsulate it into the HTTPS payload, as seen here:
+
+.. image:: _images/HTTP2-POST-example.png
+   :width: 7.5in
+   :height: 4.6875in
+
+We can also do the same thing in reverse by converting a standard DNS request into a DoH formatted/encapsulated request (DNS-to-DoH), so that standard DNS clients can communicate with DoH Servers.
+
+.. note::
+   In this lab, we will configure DoH-SERVER (DoH to DNS) objects for testing.
+
+DoT, on the other hand, is “simpler” to proxy as it is considered DNS from a protocol perspective, with an added TLS wrapper for transport security. In fact, in its simplest terms, the original DNS protocol is simply sent on tcp/853 and encapsulated in TLS using client-SSL (DoT-to-DNS) or server-SSL (DNS-to-DoT) profiles. This allows for remarkably simple lookups using standard DNS utilities, such as ‘kdig’, with the ‘+tls’ directive:
+
+.. image:: _images/kdig-example.png
+   :width: 7.5in
+   :height: 4.6875in
+
+Lab Overview
+~~~~~~~~~~~~
+
+This lab consists of two primary sections:
+
+-  Proxying DNS queries over HTTPS to traditional DNS servers
+
+   -  In this section, you will use Mozilla Firefox as a DoH client to browse the web using encrypted DNS through the BIG-IP using DNS over HTTPS
+
+-  Proxying DNS queries over TLS to traditional DNS servers
+
+   -  In this section, you will use the kdig utility as a DoT client to perform queries through the BIG-IP using DNS over TLS
 
 .. toctree::
    :maxdepth: 1
    :glob:
 
-   intro
-   labinfo
-   lab*/lab*
+   topology
+   components
+   configuration
diff --git a/docs/class6/components.rst b/docs/class6/components.rst
@@ -0,0 +1,54 @@
+Components
+~~~~~~~~~~
+
+The lab consists of the following items:
+
+-  Subnets
+
+   -  Management: 10.1.1.0/24
+
+   -  DNS VIPs: 10.1.10.0/24
+
+   -  DNS Servers: 10.1.20.0/24
+
+-  Hosts
+
+   -  Windows Jump Host
+
+      -  Credentials: user / user
+
+      -  Management IP: 10.1.1.4
+
+   -  Ubuntu Jump Host – for Attacks
+
+      -  Credentials: user / f5agility!
+
+      -  Management IP: 10.1.1.7
+
+      -  External IP: 10.1.10.7
+
+   -  Ubuntu DNS server – “Victim” server
+
+      -  Credentials: user / f5agility!
+
+      -  Management IP: 10.1.1.6
+
+      -  External IP: 10.1.20.6
+
+   -  F5 BIG-IP Proxy:
+
+      -  Credentials: admin / default \| root / default
+
+      -  Management IP: 10.1.1.8
+
+      -  External Subnet IP: 10.1.10.5/24
+
+      -  Internal Subnet IP: 10.1.20.5/24
+
+      -  DNS VIPs
+
+         -  DoT-to-DNS: 10.1.10.6 (TCP/853)
+
+         -  DoH-to-DNS: 10.1.10.6 (TCP/443)
+
+         -  DNS-traditional (TCP/53 and UDP/53)