diff --git a/documentation/themes/beastie/layouts/partials/trademarks.html b/documentation/themes/beastie/layouts/partials/trademarks.html
index f0ed62b11c..68a19a144a 100644
--- a/documentation/themes/beastie/layouts/partials/trademarks.html
+++ b/documentation/themes/beastie/layouts/partials/trademarks.html
@@ -1,152 +1,160 @@
 <div class="legalnotice">
   <a id="trademarks"></a>
   <details>
     <summary>{{ i18n "trademarks" }}</summary>
     {{ $trademarks := . }}
 
     {{ if in $trademarks "freebsd" }}
       <p>{{ i18n "freebsd-copyright" }}</p>
     {{ end }}
 
     {{ if in $trademarks "pam" }}
       <p>{{ i18n "pam" }}</p>
     {{ end }}
 
     {{ if in $trademarks "coverity" }}
       <p>{{ i18n "coverity" }}</p>
     {{ end }}
 
     {{ if in $trademarks "ibm" }}
       <p>{{ i18n "ibm" }}</p>
     {{ end }}
 
     {{ if in $trademarks "ieee" }}
       <p>{{ i18n "ieee" }}</p>
     {{ end }}
 
     {{ if in $trademarks "redhat" }}
       <p>{{ i18n "redhat" }}</p>
     {{ end }}
 
     {{ if in $trademarks "3com" }}
       <p>{{ i18n "3com" }}</p>
     {{ end }}
 
     {{ if in $trademarks "amd" }}
       <p>{{ i18n "amd" }}</p>
     {{ end }}
 
     {{ if in $trademarks "adobe" }}
       <p>{{ i18n "adobe" }}</p>
     {{ end }}
 
     {{ if in $trademarks "apple" }}
       <p>{{ i18n "apple" }}</p>
     {{ end }}
 
     {{ if in $trademarks "intel" }}
       <p>{{ i18n "intel" }}</p>
     {{ end }}
 
     {{ if in $trademarks "linux" }}
       <p>{{ i18n "linux" }}</p>
     {{ end }}
 
     {{ if in $trademarks "microsoft" }}
       <p>{{ i18n "microsoft" }}</p>
     {{ end }}
 
+    {{ if in $trademarks "nginx" }}
+      <p>{{ i18n "nginx" }}</p>
+    {{ end }}
+
+    {{ if in $trademarks "nvidia" }}
+      <p>{{ i18n "nvidia" }}</p>
+    {{ end }}
+
     {{ if in $trademarks "opengroup" }}
       <p>{{ i18n "opengroup" }}</p>
     {{ end }}
 
     {{ if in $trademarks "qualcomm" }}
       <p>{{ i18n "qualcomm" }}</p>
     {{ end }}
 
     {{ if in $trademarks "sparc" }}
       <p>{{ i18n "sparc" }}</p>
     {{ end }}
 
     {{ if in $trademarks "sun" }}
       <p>{{ i18n "sun" }}</p>
     {{ end }}
 
     {{ if in $trademarks "unix" }}
       <p>{{ i18n "unix" }}</p>
     {{ end }}
 
     {{ if in $trademarks "netbsd" }}
       <p>{{ i18n "netbsd" }}</p>
     {{ end }}
 
     {{ if in $trademarks "realnetworks" }}
       <p>{{ i18n "realnetworks" }}</p>
     {{ end }}
 
     {{ if in $trademarks "oracle" }}
       <p>{{ i18n "oracle" }}</p>
     {{ end }}
 
     {{ if in $trademarks "3ware" }}
       <p>{{ i18n "3ware" }}</p>
     {{ end }}
 
     {{ if in $trademarks "arm" }}
       <p>{{ i18n "arm" }}</p>
     {{ end }}
 
     {{ if in $trademarks "adaptec" }}
       <p>{{ i18n "adaptec" }}</p>
     {{ end }}
 
     {{ if in $trademarks "google" }}
       <p>{{ i18n "google" }}</p>
     {{ end }}
 
     {{ if in $trademarks "heidelberger" }}
       <p>{{ i18n "heidelberger" }}</p>
     {{ end }}
 
     {{ if in $trademarks "intuit" }}
       <p>{{ i18n "intuit" }}</p>
     {{ end }}
 
     {{ if in $trademarks "lsilogic" }}
       <p>{{ i18n "lsilogic" }}</p>
     {{ end }}
 
     {{ if in $trademarks "themathworks" }}
       <p>{{ i18n "themathworks" }}</p>
     {{ end }}
 
     {{ if in $trademarks "thomson" }}
       <p>{{ i18n "thomson" }}</p>
     {{ end }}
 
     {{ if in $trademarks "vmware" }}
       <p>{{ i18n "vmware" }}</p>
     {{ end }}
 
     {{ if in $trademarks "wolframresearch" }}
       <p>{{ i18n "wolframresearch" }}</p>
     {{ end }}
 
     {{ if in $trademarks "xiph" }}
       <p>{{ i18n "xiph" }}</p>
     {{ end }}
 
     {{ if in $trademarks "xfree86" }}
       <p>{{ i18n "xfree86" }}</p>
     {{ end }}
 
     {{ if in $trademarks "daemon-news" }}
       <p>{{ i18n "daemon-news" }}</p>
     {{ end }}
 
     {{ if in $trademarks "general" }}
       <p>{{ i18n "general" }}</p>
     {{ end }}
   </details>
 </div>
 
diff --git a/website/content/en/applications.adoc b/website/content/en/applications.adoc
index b630e37890..08fdea34fd 100644
--- a/website/content/en/applications.adoc
+++ b/website/content/en/applications.adoc
@@ -1,43 +1,43 @@
 ---
 title: "About Applications for FreeBSD"
 sidenav: about
 ---
 
 = About Applications for FreeBSD
 
 == Experience the possibilities with FreeBSD
 
 FreeBSD can handle nearly any task you would expect of a UNIX(R) workstation, as well as many you might not expect:
 
 == FreeBSD is a true open system with full source code.
 
 There is no doubt that so-called open systems are _the_ requirement for today's computing applications. But no commercial vendor-supplied solution is more open than one which includes full source code to the entire operating system, including the kernel and all of the system daemons, programs, and utilities. You can modify any part of FreeBSD to suit your personal, organizational, or corporate needs.
 
 With its generous link:../copyright/freebsd-license/[licensing policy], you can use FreeBSD as the basis for any number of free _or commercial_ applications.
 
 == FreeBSD runs thousands of applications.
 
 Because FreeBSD is based on 4.4BSD, an industry-standard version of UNIX, it is easy to compile and run programs. FreeBSD also includes an extensive link:../where/[packages collection] and link:../ports/[ports collection] that bring precompiled and easy-to-build software right to your desktop or enterprise server. There is also a growing number of link:../commercial/software/[commercial applications] written for FreeBSD.
 
 Here are some examples of the environments in which FreeBSD is used:
 
-* *Internet services.* Many Internet Service Providers (ISPs) find FreeBSD ideal, running WWW, Usenet news, FTP, Email, and other services. Ready-to-run software like the http://nginx.org[nginx] or http://www.apache.org/[Apache] web server or the http://proftpd.org/[ProFTPD] or http://security.appspot.com/vsftpd.html[vsftpd] FTP server make it easy to set up a business or community-centered ISP. Of course, with FreeBSD's unbeatable link:../internet/[networking], your users will enjoy high speed, reliable services.
-* *X Window workstation.* From an inexpensive X terminal to an advanced X display, FreeBSD works quite well. Free X software (http://x.org/[X.Org](T)) comes with the system. http://www.nvidia.com/[nVidia] offers native drivers for their high-performance graphics hardware, and the industry standard http://www.opengroup.org/motif/[Motif](R) and http://www.opengl.org/[OpenGL](R) libraries are supported. The http://xfce.org/[Xfce] and http://lxde.org/[LXDE] products provide a desktop environment. The http://www.kde.org[KDE] and http://www.gnome.org[GNOME] desktop environments also enjoy full support and provide office suite functionality, with further good functionality available in the https://www.libreoffice.org/[LibreOffice], http://www.openoffice.org/[OpenOffice.Org] and http://www.softmaker.com/en/[TextMaker] products.
+* *Internet services.* Many Internet Service Providers (ISPs) find FreeBSD ideal, running WWW, Usenet news, FTP, Email, and other services. Ready-to-run software like the http://nginx.org[NGINX] or http://www.apache.org/[Apache] web server or the http://proftpd.org/[ProFTPD] or http://security.appspot.com/vsftpd.html[vsftpd] FTP server make it easy to set up a business or community-centered ISP. Of course, with FreeBSD's unbeatable link:../internet/[networking], your users will enjoy high speed, reliable services.
+* *X Window workstation.* From an inexpensive X terminal to an advanced X display, FreeBSD works quite well. Free X software (http://x.org/[X.Org](T)) comes with the system. http://www.nvidia.com/[NVIDIA] offers native drivers for their high-performance graphics hardware, and the industry standard http://www.opengroup.org/motif/[Motif](R) and http://www.opengl.org/[OpenGL](R) libraries are supported. The http://xfce.org/[Xfce] and http://lxde.org/[LXDE] products provide a desktop environment. The http://www.kde.org[KDE] and http://www.gnome.org[GNOME] desktop environments also enjoy full support and provide office suite functionality, with further good functionality available in the https://www.libreoffice.org/[LibreOffice], http://www.openoffice.org/[OpenOffice.Org] and http://www.softmaker.com/en/[TextMaker] products.
 * *Networking.* From packet filtering to routing to name service, FreeBSD can turn any PC into a Internet firewall, email host, print server, PC/NFS server, and more.
 * *Software development.* A suite of development tools comes with FreeBSD, including the GNU C/C++ compiler and debugger. The LLVM-based clang suite is also provided and will eventually replace the GNU suite. Java(R) and Tcl/Tk development are also possible for example, and more esoteric programming languages like Icon work just fine, too. And FreeBSD's shared libraries have always been easy to make and use. You can also choose from a wide range of popular and powerful editors, such as Emacs and Vim.
 * *Net surfing.* A real UNIX workstation makes a great Internet surfboard. FreeBSD versions of http://www.chromium.org/Home[Chromium] and http://www.mozilla.org/firefox/[Firefox] are available for serious web users. Surf the web, publish your own web pages, read Usenet news, and send and receive email with a FreeBSD system on your desktop.
 * *Education and research.* FreeBSD makes an excellent research platform because it includes complete source code. Students and researchers of operating systems or other computer science fields can benefit greatly from such an open and well-documented system.
 * *And much more.* Accounting, action games, MIS databases, scientific visualization, video conferencing, Internet relay chat (IRC), home automation, multiuser dungeons, bulletin board systems, image scanning, and more are all real uses for FreeBSD today.
 
 == FreeBSD is an operating system that will grow with your needs.
 
 Though FreeBSD is free software, it is also _user supported_ software. Any questions you have can be posted to hundreds of FreeBSD developers and users simply by e-mailing the freebsd-questions@FreeBSD.org mailing list.
 
 FreeBSD also has a worldwide group of programmers and writers who fix bugs, add new features and document the system. Support for new devices or special features is an almost constant development process, and the team keeps a special eye out for problems which affect system stability. FreeBSD users are quite proud of not only how fast but how reliable their systems are.
 
 == What experts have to say . . .
 
 _"FreeBSD handles [our] heavy load quite well and it is nothing short of amazing. Salutations to the FreeBSD team."_
 
 [.right]
 ---Mark Hittinger, administrator of WinNet Communications, Inc.
diff --git a/website/content/en/copyright/trademarks.adoc b/website/content/en/copyright/trademarks.adoc
index df67aaa629..e7b43068b1 100644
--- a/website/content/en/copyright/trademarks.adoc
+++ b/website/content/en/copyright/trademarks.adoc
@@ -1,40 +1,44 @@
 ---
 title: "Trademark Legend"
 sidenav: about
 ---
 
 = Trademark Legend
 
 FreeBSD is a registered trademark of The FreeBSD Foundation.
 
 The FreeBSD Logo is a trademark of The FreeBSD Foundation.
 
 See https://www.freebsdfoundation.org/[The FreeBSD Foundation's] https://www.freebsdfoundation.org/legal/trademark-usage-terms-and-conditions/[Trademark Usage Terms and Conditions] page for information on use of the FreeBSD marks.
 
 Adobe, Acrobat, Acrobat Reader, and PostScript are either registered trademarks or trademarks of Adobe Systems Incorporated in the United States and/or other countries.
 
 AMD, Am486, Am5X86, AMD Athlon, AMD Duron, AMD Opteron, AMD-K6, Athlon, Élan, Opteron, and PCnet are trademarks of Advanced Micro Devices, Inc.
 
 Apple, FireWire, Mac, Macintosh, Mac OS, Quicktime, and TrueType are trademarks of Apple Computer, Inc., registered in the United States and other countries.
 
 CVSup is a registered trademark of John D. Polstra.
 
+F5, F5 Networks, and the F5 logo are trademarks of F5 Networks, Inc. in the U.S. and in certain other countries. Other F5 trademarks are identified at f5.com. Any other products, services, taglines/slogans, or company names referenced herein may be trademarks of their respective owners with no endorsement or affiliation, expressed or implied, claimed by F5.
+
 IBM and PowerPC are trademarks of International Business Machines Corporation in the United States, other countries, or both.
 
 IEEE, POSIX, and 802 are registered trademarks of The Institute of Electrical and Electronics Engineers, Inc.
 
 Intel, Celeron, EtherExpress, i386, i486, Itanium, Pentium, and Xeon are trademarks or registered trademarks of Intel Corporation or its subsidiaries in the United States and other countries.
 
 Linux is a registered trademark of Linus Torvalds in the United States.
 
 Motif, OSF/1, and UNIX are registered trademarks and IT DialTone and The Open Group are trademarks of The Open Group in the United States and other countries.
 
 MySQL is a registered trademark of MySQL AB in the United States, the European Union and other countries.
 
+NVIDIA, the NVIDIA logo, 3D Play, 3D Vision Pro, 4-Plus-1, APEX, BattleBox, BFGD, Big Format Gaming Display, CUDA, Dabbler, DALI, DGX Station, DirectStylus, DirectTouch, Game Ready, GameStream, Geared For Gaming, GeForce, GeForce Experience, GeForce GTX, GeForce RTX, GPUDirect, G-SYNC, GRID LINK, GRID VGX, IceClear, ICERA, I AM AI, Iray, Jetson, Jetson AGX Xavier, Kepler, Made To Game, Maximus, Mental Ray, NSIST on NVIDIA, nTersect, NVIDIA 3D Vision, NVIDIA AGX, NVIDIA AutoWorks, NVIDIA BATTERY BOOST, NVIDIA BFGD, NVIDIA Big Format Gaming Display, NVIDIA Business Platform, NVIDIA Clara, NVIDIA DALI, NVIDIA Denver, NVIDIA DesignWorks, NVIDIA DGX, NVIDIA DGX POD, NVIDIA DGX Superpod, NVIDIA DRIVE, NVIDIA DRIVE Autopilot, NVIDIA DRIVE Constellation, NVIDIA DRIVE Hyperion, NVIDIA DRIVE Sim, NVIDIA GameWorks, NVIDIA GPU BOOST, NVIDIA GPU CLOUD, NVIDIA GRID, NVIDIA GRID vGPU, NVIDIA G-SYNC, NVIDIA HGX, NVIDIA Holodeck, NVIDIA IndeX, NVIDIA Isaac, NVIDIA Isaac SDK, NVIDIA Isaac SIM, NVIDIA Jetpack, NVIDIA Kepler, NVIDIA Maglev, NVIDIA Maximus, NVIDIA Maxwell, NVIDIA nForce, NVIDIA OptiX, NVIDIA Orin, NVIDIA PartnerForce, NVIDIA PureAudio, NVIDIA Quadro, NVIDIA RTX, NVIDIA SHIELD, NVIDIA SLI, NVIDIA SLI Ready, NVIDIA Slide Cover, NVIDIA SPOT, NVIDIA Tegra, NVIDIA Turing, nView, NVLink, NVS, NVSwitch, OpenACC, Openautomate, Optimus, OptiX, Pascal, Pegasus, PGI, PGI Visual Fortran, PhysX, Quadro, Quadro Experience, Quadro RTX, RealityServer, SceniX, Shadowplay, SHIELD, SLI, Surround, Tegra, Tegra NOTE, TegraZone, TensorRT, Tesla, The Way It's Meant to be Played,  TWIMTBP, ULMB, vGPU, Vibrante, VisionWorks, VRLync, and Xavier are trademarks and/or registered trademarks of NVIDIA Corporation in the U.S. and/or other countries
+
 Silicon Graphics, SGI, and OpenGL are registered trademarks of Silicon Graphics, Inc., in the United States and/or other countries worldwide.
 
 Sparc, Sparc64, SPARCEngine, and UltraSPARC are trademarks of SPARC International, Inc in the United States and other countries. Products bearing SPARC trademarks are based upon architecture developed by Sun Microsystems, Inc.
 
 Sun, Sun Microsystems, SunOS, Solaris, and Java are trademarks or registered trademarks of Sun Microsystems, Inc. in the United States and other countries.
 
 Many of the designations used by manufacturers and sellers to distinguish their products are claimed as trademarks. Where those designations appear on this website, and the FreeBSD Project was aware of the trademark claim, the designations have been followed by the '(TM)' or the '(R)' symbol.