git: 677a7402cea4 - stable/13 - sys/*/conf/*, docs: fix links to handbook

From: Ed Maste <emaste_at_FreeBSD.org>
Date: Wed, 10 Jan 2024 03:07:55 UTC
The branch stable/13 has been updated by emaste:

URL: https://cgit.FreeBSD.org/src/commit/?id=677a7402cea46eb253a241b443471ab072e2b6a7

commit 677a7402cea46eb253a241b443471ab072e2b6a7
Author:     Ceri Davies <ceri@FreeBSD.org>
AuthorDate: 2021-05-20 08:26:02 +0000
Commit:     Ed Maste <emaste@FreeBSD.org>
CommitDate: 2024-01-10 03:07:46 +0000

    sys/*/conf/*, docs: fix links to handbook
    
    While here, fix all links to older en_US.ISO8859-1 documentation
    in the src/ tree.
    
    PR:             255026
    Reported by:    Michael B√ľker <freebsd@michael-bueker.de>
    Reviewed by:    dbaio
    Differential Revision: https://reviews.freebsd.org/D30265
    
    (cherry picked from commit c1a148873d6488f1dac1cfb207a5927cef89888e)
---
 bin/timeout/timeout.1                 | 4 ++--
 release/Makefile                      | 1 -
 share/man/man4/mac.4                  | 2 +-
 share/man/man7/release.7              | 4 ++--
 share/man/man9/mac.9                  | 4 ++--
 share/man/man9/pci.9                  | 4 ++--
 sys/amd64/conf/GENERIC                | 2 +-
 sys/amd64/conf/GENERIC-KCSAN          | 2 +-
 sys/amd64/conf/MINIMAL                | 2 +-
 sys/arm/conf/ALPINE                   | 2 +-
 sys/arm/conf/APALIS-IMX6              | 2 +-
 sys/arm/conf/ARMADAXP                 | 2 +-
 sys/arm/conf/COLIBRI-VF50             | 2 +-
 sys/arm/conf/COSMIC                   | 2 +-
 sys/arm/conf/EFIKA_MX                 | 2 +-
 sys/arm/conf/GENERIC                  | 2 +-
 sys/arm/conf/IMX53                    | 2 +-
 sys/arm/conf/IMX6                     | 2 +-
 sys/arm/conf/JETSON-TK1               | 2 +-
 sys/arm/conf/QUARTZ                   | 2 +-
 sys/arm/conf/RPI-B                    | 2 +-
 sys/arm/conf/SOCDK                    | 2 +-
 sys/arm/conf/SOCFPGA                  | 2 +-
 sys/arm/conf/SOCKIT                   | 2 +-
 sys/arm/conf/SOCKIT-BERI              | 2 +-
 sys/arm/conf/TEGRA124                 | 2 +-
 sys/arm/conf/VERSATILEPB              | 2 +-
 sys/arm/conf/VYBRID                   | 2 +-
 sys/arm/conf/ZEDBOARD                 | 2 +-
 sys/arm64/conf/GENERIC                | 2 +-
 sys/arm64/conf/GENERIC-UP             | 2 +-
 sys/contrib/zstd/FREEBSD-upgrade      | 2 +-
 sys/i386/conf/GENERIC                 | 2 +-
 sys/i386/conf/MINIMAL                 | 2 +-
 sys/mips/conf/ERL                     | 2 +-
 sys/mips/conf/OCTEON1                 | 2 +-
 sys/mips/conf/XLP64                   | 2 +-
 sys/mips/conf/XLPN32                  | 2 +-
 sys/powerpc/conf/GENERIC              | 2 +-
 sys/powerpc/conf/GENERIC64            | 2 +-
 sys/powerpc/conf/GENERIC64LE          | 2 +-
 sys/riscv/conf/GENERIC                | 2 +-
 usr.bin/fortune/datfiles/freebsd-tips | 3 +--
 usr.sbin/lpr/lpd/printcap             | 2 +-
 usr.sbin/mergemaster/mergemaster.8    | 5 ++---
 usr.sbin/ppp/ppp.8                    | 8 +++-----
 46 files changed, 52 insertions(+), 57 deletions(-)

diff --git a/bin/timeout/timeout.1 b/bin/timeout/timeout.1
index e3be41f884dc..921fe1160023 100644
--- a/bin/timeout/timeout.1
+++ b/bin/timeout/timeout.1
@@ -178,7 +178,7 @@ $ echo $?
 .Pp
 Try to
 .Xr fetch 1
-the single page version of the
+the PDF version of the
 .Fx
 Handbook.
 Send a
@@ -188,7 +188,7 @@ signal after 1 minute and send a
 signal 5 seconds later if the process refuses to stop:
 .Bd -literal -offset indent
 $ timeout -k 5s 1m fetch \\
-> https://www.freebsd.org/doc/en_US.ISO8859-1/books/handbook/book.html
+> https://download.freebsd.org/ftp/doc/en/books/handbook/book.pdf
 .Ed
 .Sh SEE ALSO
 .Xr kill 1 ,
diff --git a/release/Makefile b/release/Makefile
index 212d32623fb3..7e6bc566961c 100644
--- a/release/Makefile
+++ b/release/Makefile
@@ -35,7 +35,6 @@
 
 WORLDDIR?=	${.CURDIR}/..
 PORTSDIR?=	/usr/ports
-RELNOTES_LANG?= en_US.ISO8859-1
 
 .if !defined(TARGET) || empty(TARGET)
 TARGET=		${MACHINE}
diff --git a/share/man/man4/mac.4 b/share/man/man4/mac.4
index fe19b36a8306..4a4081d899f0 100644
--- a/share/man/man4/mac.4
+++ b/share/man/man4/mac.4
@@ -221,7 +221,7 @@ man page.
 .Rs
 .%B "The FreeBSD Handbook"
 .%T "Mandatory Access Control"
-.%U https://www.FreeBSD.org/doc/en_US.ISO8859-1/books/handbook/mac.html
+.%U https://docs.FreeBSD.org/en/books/handbook/mac/
 .Re
 .Sh HISTORY
 The
diff --git a/share/man/man7/release.7 b/share/man/man7/release.7
index 548ba540f6c0..78cac0dde34e 100644
--- a/share/man/man7/release.7
+++ b/share/man/man7/release.7
@@ -719,11 +719,11 @@ variable in
 .Xr sysctl 8
 .Rs
 .%T "FreeBSD Release Engineering"
-.%U https://www.FreeBSD.org/doc/en_US.ISO8859-1/articles/freebsd-releng/
+.%U https://docs.freebsd.org/en/articles/freebsd-releng/
 .Re
 .Rs
 .%T "FreeBSD Developers' Handbook"
-.%U https://www.FreeBSD.org/doc/en_US.ISO8859-1/books/developers-handbook/
+.%U https://docs.freebsd.org/en/books/developers-handbook/
 .Re
 .Sh HISTORY
 .Fx
diff --git a/share/man/man9/mac.9 b/share/man/man9/mac.9
index d5be03949e9b..661c46569bc0 100644
--- a/share/man/man9/mac.9
+++ b/share/man/man9/mac.9
@@ -31,7 +31,7 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.Dd July 25, 2015
+.Dd May 20, 2021
 .Dt MAC 9
 .Os
 .Sh NAME
@@ -155,7 +155,7 @@ for information on the MAC Framework APIs.
 .Xr VFS 9
 .Rs
 .%T "The FreeBSD Architecture Handbook"
-.%U "https://www.FreeBSD.org/doc/en_US.ISO8859-1/books/arch-handbook/"
+.%U "https://docs.freebsd.org/en/books/arch-handbook/"
 .Re
 .Sh HISTORY
 The
diff --git a/share/man/man9/pci.9 b/share/man/man9/pci.9
index da7981cc00a5..3c3e54bf8760 100644
--- a/share/man/man9/pci.9
+++ b/share/man/man9/pci.9
@@ -23,7 +23,7 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.Dd January 15, 2017
+.Dd May 20, 2021
 .Dt PCI 9
 .Os
 .Sh NAME
@@ -1102,7 +1102,7 @@ is unattached but with valid instance variables.
 .Rs
 .%B FreeBSD Developers' Handbook
 .%T NewBus
-.%U https://www.FreeBSD.org/doc/en_US.ISO8859-1/books/developers-handbook/
+.%U https://docs.freebsd.org/en/books/developers-handbook/
 .Re
 .Rs
 .%A Shanley
diff --git a/sys/amd64/conf/GENERIC b/sys/amd64/conf/GENERIC
index 57254059ca1c..28d2f29a7876 100644
--- a/sys/amd64/conf/GENERIC
+++ b/sys/amd64/conf/GENERIC
@@ -4,7 +4,7 @@
 # For more information on this file, please read the config(5) manual page,
 # and/or the handbook section on Kernel Configuration Files:
 #
-#    https://www.FreeBSD.org/doc/en_US.ISO8859-1/books/handbook/kernelconfig-config.html
+#    https://docs.freebsd.org/en/books/handbook/kernelconfig/#kernelconfig-config
 #
 # The handbook is also available locally in /usr/share/doc/handbook
 # if you've installed the doc distribution, otherwise always see the
diff --git a/sys/amd64/conf/GENERIC-KCSAN b/sys/amd64/conf/GENERIC-KCSAN
index f38d695c5aaf..a0970f2a46a4 100644
--- a/sys/amd64/conf/GENERIC-KCSAN
+++ b/sys/amd64/conf/GENERIC-KCSAN
@@ -12,7 +12,7 @@
 # For more information on this file, please read the config(5) manual page,
 # and/or the handbook section on Kernel Configuration Files:
 #
-#    https://www.FreeBSD.org/doc/en_US.ISO8859-1/books/handbook/kernelconfig-config.html
+#    https://docs.freebsd.org/en/books/handbook/kernelconfig/#kernelconfig-config
 #
 # The handbook is also available locally in /usr/share/doc/handbook
 # if you've installed the doc distribution, otherwise always see the
diff --git a/sys/amd64/conf/MINIMAL b/sys/amd64/conf/MINIMAL
index b5b821e1f5c6..9af1b14f5733 100644
--- a/sys/amd64/conf/MINIMAL
+++ b/sys/amd64/conf/MINIMAL
@@ -14,7 +14,7 @@
 # For more information on this file, please read the config(5) manual page,
 # and/or the handbook section on Kernel Configuration Files:
 #
-#    https://www.FreeBSD.org/doc/en_US.ISO8859-1/books/handbook/kernelconfig-config.html
+#    https://docs.freebsd.org/en/books/handbook/kernelconfig/#kernelconfig-config
 #
 # The handbook is also available locally in /usr/share/doc/handbook
 # if you've installed the doc distribution, otherwise always see the
diff --git a/sys/arm/conf/ALPINE b/sys/arm/conf/ALPINE
index 7cc93f994813..6937a790a8c6 100644
--- a/sys/arm/conf/ALPINE
+++ b/sys/arm/conf/ALPINE
@@ -3,7 +3,7 @@
 # For more information on this file, please read the config(5) manual page,
 # and/or the handbook section on Kernel Configuration Files:
 #
-#    https://www.FreeBSD.org/doc/en_US.ISO8859-1/books/handbook/kernelconfig-config.html
+#    https://docs.freebsd.org/en/books/handbook/kernelconfig/#kernelconfig-config
 #
 # The handbook is also available locally in /usr/share/doc/handbook
 # if you've installed the doc distribution, otherwise always see the
diff --git a/sys/arm/conf/APALIS-IMX6 b/sys/arm/conf/APALIS-IMX6
index fa215f0c0660..5507699f80cd 100644
--- a/sys/arm/conf/APALIS-IMX6
+++ b/sys/arm/conf/APALIS-IMX6
@@ -3,7 +3,7 @@
 # For more information on this file, please read the config(5) manual page,
 # and/or the handbook section on Kernel Configuration Files:
 #
-#    https://www.FreeBSD.org/doc/en_US.ISO8859-1/books/handbook/kernelconfig-config.html
+#    https://docs.freebsd.org/en/books/handbook/kernelconfig/#kernelconfig-config
 #
 # The handbook is also available locally in /usr/share/doc/handbook
 # if you've installed the doc distribution, otherwise always see the
diff --git a/sys/arm/conf/ARMADAXP b/sys/arm/conf/ARMADAXP
index e74fb588df12..e198651e69b3 100644
--- a/sys/arm/conf/ARMADAXP
+++ b/sys/arm/conf/ARMADAXP
@@ -4,7 +4,7 @@
 # For more information on this file, please read the config(5) manual page,
 # and/or the handbook section on Kernel Configuration Files:
 #
-#    https://www.FreeBSD.org/doc/en_US.ISO8859-1/books/handbook/kernelconfig-config.html
+#    https://docs.freebsd.org/en/books/handbook/kernelconfig/#kernelconfig-config
 #
 # The handbook is also available locally in /usr/share/doc/handbook
 # if you've installed the doc distribution, otherwise always see the
diff --git a/sys/arm/conf/COLIBRI-VF50 b/sys/arm/conf/COLIBRI-VF50
index 3b55affb0ff5..6f3d4b3259c2 100644
--- a/sys/arm/conf/COLIBRI-VF50
+++ b/sys/arm/conf/COLIBRI-VF50
@@ -3,7 +3,7 @@
 # For more information on this file, please read the config(5) manual page,
 # and/or the handbook section on Kernel Configuration Files:
 #
-#    https://www.FreeBSD.org/doc/en_US.ISO8859-1/books/handbook/kernelconfig-config.html
+#    https://docs.freebsd.org/en/books/handbook/kernelconfig/#kernelconfig-config
 #
 # The handbook is also available locally in /usr/share/doc/handbook
 # if you've installed the doc distribution, otherwise always see the
diff --git a/sys/arm/conf/COSMIC b/sys/arm/conf/COSMIC
index efb17ccfe539..047e112fcb58 100644
--- a/sys/arm/conf/COSMIC
+++ b/sys/arm/conf/COSMIC
@@ -3,7 +3,7 @@
 # For more information on this file, please read the config(5) manual page,
 # and/or the handbook section on Kernel Configuration Files:
 #
-#    https://www.FreeBSD.org/doc/en_US.ISO8859-1/books/handbook/kernelconfig-config.html
+#    https://docs.freebsd.org/en/books/handbook/kernelconfig/#kernelconfig-config
 #
 # The handbook is also available locally in /usr/share/doc/handbook
 # if you've installed the doc distribution, otherwise always see the
diff --git a/sys/arm/conf/EFIKA_MX b/sys/arm/conf/EFIKA_MX
index c81bed74a4f6..b7180da50314 100644
--- a/sys/arm/conf/EFIKA_MX
+++ b/sys/arm/conf/EFIKA_MX
@@ -4,7 +4,7 @@
 # For more information on this file, please read the config(5) manual page,
 # and/or the handbook section on Kernel Configuration Files:
 #
-#    https://www.FreeBSD.org/doc/en_US.ISO8859-1/books/handbook/kernelconfig-config.html
+#    https://docs.freebsd.org/en/books/handbook/kernelconfig/#kernelconfig-config
 #
 # The handbook is also available locally in /usr/share/doc/handbook
 # if you've installed the doc distribution, otherwise always see the
diff --git a/sys/arm/conf/GENERIC b/sys/arm/conf/GENERIC
index d21a45d77c33..be9ebe344d62 100644
--- a/sys/arm/conf/GENERIC
+++ b/sys/arm/conf/GENERIC
@@ -4,7 +4,7 @@
 # For more information on this file, please read the config(5) manual page,
 # and/or the handbook section on Kernel Configuration Files:
 #
-#    https://www.FreeBSD.org/doc/en_US.ISO8859-1/books/handbook/kernelconfig-config.html
+#    https://docs.freebsd.org/en/books/handbook/kernelconfig/#kernelconfig-config
 #
 # The handbook is also available locally in /usr/share/doc/handbook
 # if you've installed the doc distribution, otherwise always see the
diff --git a/sys/arm/conf/IMX53 b/sys/arm/conf/IMX53
index 420478e42a17..b482e561226e 100644
--- a/sys/arm/conf/IMX53
+++ b/sys/arm/conf/IMX53
@@ -4,7 +4,7 @@
 # For more information on this file, please read the config(5) manual page,
 # and/or the handbook section on Kernel Configuration Files:
 #
-#    https://www.FreeBSD.org/doc/en_US.ISO8859-1/books/handbook/kernelconfig-config.html
+#    https://docs.freebsd.org/en/books/handbook/kernelconfig/#kernelconfig-config
 #
 # The handbook is also available locally in /usr/share/doc/handbook
 # if you've installed the doc distribution, otherwise always see the
diff --git a/sys/arm/conf/IMX6 b/sys/arm/conf/IMX6
index 5ef7149bc72a..6fe75f75b1ec 100644
--- a/sys/arm/conf/IMX6
+++ b/sys/arm/conf/IMX6
@@ -4,7 +4,7 @@
 # For more information on this file, please read the config(5) manual page,
 # and/or the handbook section on Kernel Configuration Files:
 #
-#    https://www.FreeBSD.org/doc/en_US.ISO8859-1/books/handbook/kernelconfig-config.html
+#    https://docs.freebsd.org/en/books/handbook/kernelconfig/#kernelconfig-config
 #
 # The handbook is also available locally in /usr/share/doc/handbook
 # if you've installed the doc distribution, otherwise always see the
diff --git a/sys/arm/conf/JETSON-TK1 b/sys/arm/conf/JETSON-TK1
index 06f753850e2a..bc57d67e59ad 100644
--- a/sys/arm/conf/JETSON-TK1
+++ b/sys/arm/conf/JETSON-TK1
@@ -3,7 +3,7 @@
 # For more information on this file, please read the config(5) manual page,
 # and/or the handbook section on Kernel Configuration Files:
 #
-#    https://www.FreeBSD.org/doc/en_US.ISO8859-1/books/handbook/kernelconfig-config.html
+#    https://docs.freebsd.org/en/books/handbook/kernelconfig/#kernelconfig-config
 #
 # The handbook is also available locally in /usr/share/doc/handbook
 # if you've installed the doc distribution, otherwise always see the
diff --git a/sys/arm/conf/QUARTZ b/sys/arm/conf/QUARTZ
index 85dcf42ad968..2b247be5defa 100644
--- a/sys/arm/conf/QUARTZ
+++ b/sys/arm/conf/QUARTZ
@@ -3,7 +3,7 @@
 # For more information on this file, please read the config(5) manual page,
 # and/or the handbook section on Kernel Configuration Files:
 #
-#    https://www.FreeBSD.org/doc/en_US.ISO8859-1/books/handbook/kernelconfig-config.html
+#    https://docs.freebsd.org/en/books/handbook/kernelconfig/#kernelconfig-config
 #
 # The handbook is also available locally in /usr/share/doc/handbook
 # if you've installed the doc distribution, otherwise always see the
diff --git a/sys/arm/conf/RPI-B b/sys/arm/conf/RPI-B
index a03f7af6c6ef..3f2b9eba510b 100644
--- a/sys/arm/conf/RPI-B
+++ b/sys/arm/conf/RPI-B
@@ -4,7 +4,7 @@
 # For more information on this file, please read the config(5) manual page,
 # and/or the handbook section on Kernel Configuration Files:
 #
-#    https://www.FreeBSD.org/doc/en_US.ISO8859-1/books/handbook/kernelconfig-config.html
+#    https://docs.freebsd.org/en/books/handbook/kernelconfig/#kernelconfig-config
 #
 # The handbook is also available locally in /usr/share/doc/handbook
 # if you've installed the doc distribution, otherwise always see the
diff --git a/sys/arm/conf/SOCDK b/sys/arm/conf/SOCDK
index 40776eb0b807..c0804a2c13e5 100644
--- a/sys/arm/conf/SOCDK
+++ b/sys/arm/conf/SOCDK
@@ -4,7 +4,7 @@
 # For more information on this file, please read the config(5) manual page,
 # and/or the handbook section on Kernel Configuration Files:
 #
-#    https://www.FreeBSD.org/doc/en_US.ISO8859-1/books/handbook/kernelconfig-config.html
+#    https://docs.freebsd.org/en/books/handbook/kernelconfig/#kernelconfig-config
 #
 # The handbook is also available locally in /usr/share/doc/handbook
 # if you've installed the doc distribution, otherwise always see the
diff --git a/sys/arm/conf/SOCFPGA b/sys/arm/conf/SOCFPGA
index 7c7229a461a4..9fbd21b6e6ef 100644
--- a/sys/arm/conf/SOCFPGA
+++ b/sys/arm/conf/SOCFPGA
@@ -4,7 +4,7 @@
 # For more information on this file, please read the config(5) manual page,
 # and/or the handbook section on Kernel Configuration Files:
 #
-#    https://www.FreeBSD.org/doc/en_US.ISO8859-1/books/handbook/kernelconfig-config.html
+#    https://docs.freebsd.org/en/books/handbook/kernelconfig/#kernelconfig-config
 #
 # The handbook is also available locally in /usr/share/doc/handbook
 # if you've installed the doc distribution, otherwise always see the
diff --git a/sys/arm/conf/SOCKIT b/sys/arm/conf/SOCKIT
index 423e633a724b..0dc59480aff5 100644
--- a/sys/arm/conf/SOCKIT
+++ b/sys/arm/conf/SOCKIT
@@ -4,7 +4,7 @@
 # For more information on this file, please read the config(5) manual page,
 # and/or the handbook section on Kernel Configuration Files:
 #
-#    https://www.FreeBSD.org/doc/en_US.ISO8859-1/books/handbook/kernelconfig-config.html
+#    https://docs.freebsd.org/en/books/handbook/kernelconfig/#kernelconfig-config
 #
 # The handbook is also available locally in /usr/share/doc/handbook
 # if you've installed the doc distribution, otherwise always see the
diff --git a/sys/arm/conf/SOCKIT-BERI b/sys/arm/conf/SOCKIT-BERI
index 776f9cb4b32d..e85d1b13e817 100644
--- a/sys/arm/conf/SOCKIT-BERI
+++ b/sys/arm/conf/SOCKIT-BERI
@@ -4,7 +4,7 @@
 # For more information on this file, please read the config(5) manual page,
 # and/or the handbook section on Kernel Configuration Files:
 #
-#    https://www.FreeBSD.org/doc/en_US.ISO8859-1/books/handbook/kernelconfig-config.html
+#    https://docs.freebsd.org/en/books/handbook/kernelconfig/#kernelconfig-config
 #
 # The handbook is also available locally in /usr/share/doc/handbook
 # if you've installed the doc distribution, otherwise always see the
diff --git a/sys/arm/conf/TEGRA124 b/sys/arm/conf/TEGRA124
index c800746fb45c..dc733facc39b 100644
--- a/sys/arm/conf/TEGRA124
+++ b/sys/arm/conf/TEGRA124
@@ -4,7 +4,7 @@
 # For more information on this file, please read the config(5) manual page,
 # and/or the handbook section on Kernel Configuration Files:
 #
-#    https://www.FreeBSD.org/doc/en_US.ISO8859-1/books/handbook/kernelconfig-config.html
+#    https://docs.freebsd.org/en/books/handbook/kernelconfig/#kernelconfig-config
 #
 # The handbook is also available locally in /usr/share/doc/handbook
 # if you've installed the doc distribution, otherwise always see the
diff --git a/sys/arm/conf/VERSATILEPB b/sys/arm/conf/VERSATILEPB
index c51e7768c2fb..0e24b2472583 100644
--- a/sys/arm/conf/VERSATILEPB
+++ b/sys/arm/conf/VERSATILEPB
@@ -4,7 +4,7 @@
 # For more information on this file, please read the config(5) manual page,
 # and/or the handbook section on Kernel Configuration Files:
 #
-#    https://www.FreeBSD.org/doc/en_US.ISO8859-1/books/handbook/kernelconfig-config.html
+#    https://docs.freebsd.org/en/books/handbook/kernelconfig/#kernelconfig-config
 #
 # The handbook is also available locally in /usr/share/doc/handbook
 # if you've installed the doc distribution, otherwise always see the
diff --git a/sys/arm/conf/VYBRID b/sys/arm/conf/VYBRID
index 026600440247..bee77fcb6559 100644
--- a/sys/arm/conf/VYBRID
+++ b/sys/arm/conf/VYBRID
@@ -4,7 +4,7 @@
 # For more information on this file, please read the config(5) manual page,
 # and/or the handbook section on Kernel Configuration Files:
 #
-#    https://www.FreeBSD.org/doc/en_US.ISO8859-1/books/handbook/kernelconfig-config.html
+#    https://docs.freebsd.org/en/books/handbook/kernelconfig/#kernelconfig-config
 #
 # The handbook is also available locally in /usr/share/doc/handbook
 # if you've installed the doc distribution, otherwise always see the
diff --git a/sys/arm/conf/ZEDBOARD b/sys/arm/conf/ZEDBOARD
index de3a55909694..29f28a0cbf35 100644
--- a/sys/arm/conf/ZEDBOARD
+++ b/sys/arm/conf/ZEDBOARD
@@ -5,7 +5,7 @@
 # For more information on this file, please read the config(5) manual page,
 # and/or the handbook section on Kernel Configuration Files:
 #
-#    https://www.FreeBSD.org/doc/en_US.ISO8859-1/books/handbook/kernelconfig-config.html
+#    https://docs.freebsd.org/en/books/handbook/kernelconfig/#kernelconfig-config
 #
 # The handbook is also available locally in /usr/share/doc/handbook
 # if you've installed the doc distribution, otherwise always see the
diff --git a/sys/arm64/conf/GENERIC b/sys/arm64/conf/GENERIC
index a1fa345d4918..41f9ee5ae311 100644
--- a/sys/arm64/conf/GENERIC
+++ b/sys/arm64/conf/GENERIC
@@ -4,7 +4,7 @@
 # For more information on this file, please read the config(5) manual page,
 # and/or the handbook section on Kernel Configuration Files:
 #
-#    https://www.FreeBSD.org/doc/en_US.ISO8859-1/books/handbook/kernelconfig-config.html
+#    https://docs.freebsd.org/en/books/handbook/kernelconfig/#kernelconfig-config
 #
 # The handbook is also available locally in /usr/share/doc/handbook
 # if you've installed the doc distribution, otherwise always see the
diff --git a/sys/arm64/conf/GENERIC-UP b/sys/arm64/conf/GENERIC-UP
index 76d73fae89c0..f99a4ce4ddc9 100644
--- a/sys/arm64/conf/GENERIC-UP
+++ b/sys/arm64/conf/GENERIC-UP
@@ -4,7 +4,7 @@
 # For more information on this file, please read the config(5) manual page,
 # and/or the handbook section on Kernel Configuration Files:
 #
-#    https://www.FreeBSD.org/doc/en_US.ISO8859-1/books/handbook/kernelconfig-config.html
+#    https://docs.freebsd.org/en/books/handbook/kernelconfig/#kernelconfig-config
 #
 # The handbook is also available locally in /usr/share/doc/handbook
 # if you've installed the doc distribution, otherwise always see the
diff --git a/sys/contrib/zstd/FREEBSD-upgrade b/sys/contrib/zstd/FREEBSD-upgrade
index dfcad88572b2..fb46da059004 100644
--- a/sys/contrib/zstd/FREEBSD-upgrade
+++ b/sys/contrib/zstd/FREEBSD-upgrade
@@ -11,4 +11,4 @@ we don't want.
 
 Please find instructions for importing new releases and merging to HEAD here:
 
-https://www.freebsd.org/doc/en_US.ISO8859-1/articles/committers-guide/subversion-primer.html#idp45937784
+https://docs.freebsd.org/en/articles/committers-guide/#vendor-import-git
diff --git a/sys/i386/conf/GENERIC b/sys/i386/conf/GENERIC
index d8ebd111cd1d..5f3824a9b611 100644
--- a/sys/i386/conf/GENERIC
+++ b/sys/i386/conf/GENERIC
@@ -4,7 +4,7 @@
 # For more information on this file, please read the config(5) manual page,
 # and/or the handbook section on Kernel Configuration Files:
 #
-#    https://www.FreeBSD.org/doc/en_US.ISO8859-1/books/handbook/kernelconfig-config.html
+#    https://docs.freebsd.org/en/books/handbook/kernelconfig/#kernelconfig-config
 #
 # The handbook is also available locally in /usr/share/doc/handbook
 # if you've installed the doc distribution, otherwise always see the
diff --git a/sys/i386/conf/MINIMAL b/sys/i386/conf/MINIMAL
index ff41e634b048..a5103dcf559b 100644
--- a/sys/i386/conf/MINIMAL
+++ b/sys/i386/conf/MINIMAL
@@ -18,7 +18,7 @@
 # For more information on this file, please read the config(5) manual page,
 # and/or the handbook section on Kernel Configuration Files:
 #
-#    https://www.FreeBSD.org/doc/en_US.ISO8859-1/books/handbook/kernelconfig-config.html
+#    https://docs.freebsd.org/en/books/handbook/kernelconfig/#kernelconfig-config
 #
 # The handbook is also available locally in /usr/share/doc/handbook
 # if you've installed the doc distribution, otherwise always see the
diff --git a/sys/mips/conf/ERL b/sys/mips/conf/ERL
index 28db1ea23326..fa468ae1a1ac 100644
--- a/sys/mips/conf/ERL
+++ b/sys/mips/conf/ERL
@@ -5,7 +5,7 @@
 # For more information on this file, please read the config(5) manual page,
 # and/or the handbook section on Kernel Configuration Files:
 #
-#    https://www.FreeBSD.org/doc/en_US.ISO8859-1/books/handbook/kernelconfig-config.html
+#    https://docs.freebsd.org/en/books/handbook/kernelconfig/#kernelconfig-config
 #
 # The handbook is also available locally in /usr/share/doc/handbook
 # if you've installed the doc distribution, otherwise always see the
diff --git a/sys/mips/conf/OCTEON1 b/sys/mips/conf/OCTEON1
index e7a5ee3552d6..8ef8c7ac613b 100644
--- a/sys/mips/conf/OCTEON1
+++ b/sys/mips/conf/OCTEON1
@@ -4,7 +4,7 @@
 # For more information on this file, please read the config(5) manual page,
 # and/or the handbook section on Kernel Configuration Files:
 #
-#    https://www.FreeBSD.org/doc/en_US.ISO8859-1/books/handbook/kernelconfig-config.html
+#    https://docs.freebsd.org/en/books/handbook/kernelconfig/#kernelconfig-config
 #
 # The handbook is also available locally in /usr/share/doc/handbook
 # if you've installed the doc distribution, otherwise always see the
diff --git a/sys/mips/conf/XLP64 b/sys/mips/conf/XLP64
index 883f2856dc54..140faaae647b 100644
--- a/sys/mips/conf/XLP64
+++ b/sys/mips/conf/XLP64
@@ -3,7 +3,7 @@
 # For more information on this file, please read the handbook section on
 # Kernel Configuration Files:
 #
-#    https://www.FreeBSD.org/doc/en_US.ISO8859-1/books/handbook/kernelconfig-config.html
+#    https://docs.freebsd.org/en/books/handbook/kernelconfig/#kernelconfig-config
 #
 # The handbook is also available locally in /usr/share/doc/handbook
 # if you've installed the doc distribution, otherwise always see the
diff --git a/sys/mips/conf/XLPN32 b/sys/mips/conf/XLPN32
index c8380df242d1..58eabe500ba8 100644
--- a/sys/mips/conf/XLPN32
+++ b/sys/mips/conf/XLPN32
@@ -3,7 +3,7 @@
 # For more information on this file, please read the handbook section on
 # Kernel Configuration Files:
 #
-#    https://www.FreeBSD.org/doc/en_US.ISO8859-1/books/handbook/kernelconfig-config.html
+#    https://docs.freebsd.org/en/books/handbook/kernelconfig/#kernelconfig-config
 #
 # The handbook is also available locally in /usr/share/doc/handbook
 # if you've installed the doc distribution, otherwise always see the
diff --git a/sys/powerpc/conf/GENERIC b/sys/powerpc/conf/GENERIC
index bf7423488bc2..95fdc72571a3 100644
--- a/sys/powerpc/conf/GENERIC
+++ b/sys/powerpc/conf/GENERIC
@@ -4,7 +4,7 @@
 # For more information on this file, please read the handbook section on
 # Kernel Configuration Files:
 #
-#    https://www.FreeBSD.org/doc/en_US.ISO8859-1/books/handbook/kernelconfig-config.html
+#    https://docs.freebsd.org/en/books/handbook/kernelconfig/#kernelconfig-config
 #
 # The handbook is also available locally in /usr/share/doc/handbook
 # if you've installed the doc distribution, otherwise always see the
diff --git a/sys/powerpc/conf/GENERIC64 b/sys/powerpc/conf/GENERIC64
index 672aa92b4cc0..0bce690358a8 100644
--- a/sys/powerpc/conf/GENERIC64
+++ b/sys/powerpc/conf/GENERIC64
@@ -4,7 +4,7 @@
 # For more information on this file, please read the handbook section on
 # Kernel Configuration Files:
 #
-#    https://www.FreeBSD.org/doc/en_US.ISO8859-1/books/handbook/kernelconfig-config.html
+#    https://docs.freebsd.org/en/books/handbook/kernelconfig/#kernelconfig-config
 #
 # The handbook is also available locally in /usr/share/doc/handbook
 # if you've installed the doc distribution, otherwise always see the
diff --git a/sys/powerpc/conf/GENERIC64LE b/sys/powerpc/conf/GENERIC64LE
index c43e644594ea..34751066f356 100644
--- a/sys/powerpc/conf/GENERIC64LE
+++ b/sys/powerpc/conf/GENERIC64LE
@@ -4,7 +4,7 @@
 # For more information on this file, please read the handbook section on
 # Kernel Configuration Files:
 #
-#    https://www.FreeBSD.org/doc/en_US.ISO8859-1/books/handbook/kernelconfig-config.html
+#    https://docs.freebsd.org/en/books/handbook/kernelconfig/#kernelconfig-config
 #
 # The handbook is also available locally in /usr/share/doc/handbook
 # if you've installed the doc distribution, otherwise always see the
diff --git a/sys/riscv/conf/GENERIC b/sys/riscv/conf/GENERIC
index a4824ae3a02f..db6ae4b5b1a3 100644
--- a/sys/riscv/conf/GENERIC
+++ b/sys/riscv/conf/GENERIC
@@ -4,7 +4,7 @@
 # For more information on this file, please read the config(5) manual page,
 # and/or the handbook section on Kernel Configuration Files:
 #
-#    https://www.FreeBSD.org/doc/en_US.ISO8859-1/books/handbook/kernelconfig-config.html
+#    https://docs.freebsd.org/en/books/handbook/kernelconfig/#kernelconfig-config
 #
 # The handbook is also available locally in /usr/share/doc/handbook
 # if you've installed the doc distribution, otherwise always see the
diff --git a/usr.bin/fortune/datfiles/freebsd-tips b/usr.bin/fortune/datfiles/freebsd-tips
index d1edb8688f23..489926778233 100644
--- a/usr.bin/fortune/datfiles/freebsd-tips
+++ b/usr.bin/fortune/datfiles/freebsd-tips
@@ -64,8 +64,7 @@ If you need a reminder to leave your terminal, type "leave +hhmm" where
 %
 If you need to ask a question on the FreeBSD-questions mailing list then
 
-	https://www.FreeBSD.org/doc/en_US.ISO8859-1/articles/\
-		freebsd-questions/index.html
+	https://docs.freebsd.org/en/articles/freebsd-questions
 
 contains lots of useful advice to help you get the best results.
 %
diff --git a/usr.sbin/lpr/lpd/printcap b/usr.sbin/lpr/lpd/printcap
index 96eb0fccff0e..193f872763ab 100644
--- a/usr.sbin/lpr/lpd/printcap
+++ b/usr.sbin/lpr/lpd/printcap
@@ -21,7 +21,7 @@
 #
 # Do also refer to the "printing" section of the handbook.
 #
-#	https://www.freebsd.org/doc/en_US.ISO8859-1/books/handbook/printing.html
+#	https://docs.freebsd.org/en/books/handbook/printing/
 #
 # A local copy can be found under
 #
diff --git a/usr.sbin/mergemaster/mergemaster.8 b/usr.sbin/mergemaster/mergemaster.8
index 203fdf474518..695f1bba3474 100644
--- a/usr.sbin/mergemaster/mergemaster.8
+++ b/usr.sbin/mergemaster/mergemaster.8
@@ -467,9 +467,8 @@ comparison, use:
 .Pp
 .Pa /usr/src/etc/Makefile
 .Rs
-.%U https://www.FreeBSD.org/doc/en_US.ISO8859-1/books/handbook/makeworld.html
-.%T The Cutting Edge (using make world)
-.%A Nik Clayton
+.%U https://docs.freebsd.org/en/books/handbook/cutting-edge/#makeworld
+.%T The FreeBSD Handbook
 .Re
 .Sh HISTORY
 The
diff --git a/usr.sbin/ppp/ppp.8 b/usr.sbin/ppp/ppp.8
index 9c7a7bc69519..ff7d0d3dea7b 100644
--- a/usr.sbin/ppp/ppp.8
+++ b/usr.sbin/ppp/ppp.8
@@ -23,7 +23,7 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.Dd July 11, 2020
+.Dd May 20, 2021
 .Dt PPP 8
 .Os
 .Sh NAME
@@ -5958,12 +5958,10 @@ and
 .Dq show ?\&
 to get online information about what is available.
 .It
-The following URLs contain useful information:
+The following URL contains useful information:
 .Bl -bullet -compact
 .It
-https://www.FreeBSD.org/doc/en_US.ISO8859-1/books/faq/ppp.html
-.It
-https://www.FreeBSD.org/doc/handbook/userppp.html
+https://docs.freebsd.org/en/books/handbook/ppp-and-slip/
 .El
 .El
 .Sh FILES