git: c1a148873d64 - main - sys/*/conf/*, docs: fix links to handbook
Ceri Davies
ceri at FreeBSD.org
Thu May 20 08:27:40 UTC 2021
The branch main has been updated by ceri (doc committer):
URL: https://cgit.FreeBSD.org/src/commit/?id=c1a148873d6488f1dac1cfb207a5927cef89888e
commit c1a148873d6488f1dac1cfb207a5927cef89888e
Author: Ceri Davies <ceri at FreeBSD.org>
AuthorDate: 2021-05-20 08:26:02 +0000
Commit: Ceri Davies <ceri at FreeBSD.org>
CommitDate: 2021-05-20 08:27:10 +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 at michael-bueker.de>
Reviewed by: dbaio
Approved by: blackend (mentor), re (gjb)
MFC after: 10 days
Differential Revision: https://reviews.freebsd.org/D30265
---
UPDATING | 2 +-
release/Makefile | 1 -
share/man/man4/mac.4 | 4 ++--
share/man/man7/release.7 | 6 +++---
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/GENERIC-NODEBUG | 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/GENERIC-NODEBUG | 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/VYBRID | 2 +-
sys/arm/conf/ZEDBOARD | 2 +-
sys/arm64/conf/GENERIC | 2 +-
sys/arm64/conf/GENERIC-NODEBUG | 2 +-
sys/arm64/conf/GENERIC-UP | 2 +-
sys/contrib/zstd/FREEBSD-upgrade | 2 +-
sys/i386/conf/GENERIC | 2 +-
sys/i386/conf/GENERIC-NODEBUG | 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/GENERIC-NODEBUG | 2 +-
sys/powerpc/conf/GENERIC64 | 2 +-
sys/powerpc/conf/GENERIC64-NODEBUG | 2 +-
sys/powerpc/conf/GENERIC64LE | 2 +-
sys/riscv/conf/GENERIC | 2 +-
sys/riscv/conf/GENERIC-NODEBUG | 2 +-
usr.bin/fortune/datfiles/freebsd-tips | 3 +--
usr.bin/timeout/timeout.1 | 6 +++---
usr.sbin/lpr/lpd/printcap | 2 +-
usr.sbin/mergemaster/mergemaster.8 | 7 +++----
usr.sbin/ppp/ppp.8 | 8 +++-----
53 files changed, 63 insertions(+), 68 deletions(-)
diff --git a/UPDATING b/UPDATING
index efccbf3b2fff..45f85647980b 100644
--- a/UPDATING
+++ b/UPDATING
@@ -6,7 +6,7 @@ COMMON ITEMS: section later in the file. These instructions assume that you
basically know what you are doing. If not, then please consult the FreeBSD
handbook:
- https://www.freebsd.org/doc/en_US.ISO8859-1/books/handbook/makeworld.html
+ https://docs.freebsd.org/en/books/handbook/cutting-edge/#makeworld
Items affecting the ports and packages system can be found in
/usr/ports/UPDATING. Please read that file before updating system packages
diff --git a/release/Makefile b/release/Makefile
index c176ae6f2bb7..646b9f8738d2 100644
--- a/release/Makefile
+++ b/release/Makefile
@@ -36,7 +36,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 135301962f3b..ecc13257960d 100644
--- a/share/man/man4/mac.4
+++ b/share/man/man4/mac.4
@@ -30,7 +30,7 @@
.\"
.\" $FreeBSD$
.\"
-.Dd July 25, 2015
+.Dd May 20, 2021
.Dt MAC 4
.Os
.Sh NAME
@@ -219,7 +219,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 a474de83ec93..aa0cee1e32b8 100644
--- a/share/man/man7/release.7
+++ b/share/man/man7/release.7
@@ -24,7 +24,7 @@
.\"
.\" $FreeBSD$
.\"
-.Dd March 4, 2021
+.Dd May 20, 2021
.Dt RELEASE 7
.Os
.Sh NAME
@@ -697,11 +697,11 @@ are therefore no longer supported.
.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 89238d28b61c..9357c1189bd7 100644
--- a/share/man/man9/mac.9
+++ b/share/man/man9/mac.9
@@ -33,7 +33,7 @@
.\"
.\" $FreeBSD$
.\"
-.Dd February 27, 2021
+.Dd May 20, 2021
.Dt MAC 9
.Os
.Sh NAME
@@ -166,7 +166,7 @@ for information on the MAC Framework APIs.
.Xr VOP_SETLABEL 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 e55ea02547b6..5dc9ef099a87 100644
--- a/share/man/man9/pci.9
+++ b/share/man/man9/pci.9
@@ -25,7 +25,7 @@
.\"
.\" $FreeBSD$
.\"
-.Dd January 15, 2017
+.Dd May 20, 2021
.Dt PCI 9
.Os
.Sh NAME
@@ -1104,7 +1104,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 bb7299a60382..696d15698baf 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 2864596860ab..b578fbf641cd 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/GENERIC-NODEBUG b/sys/amd64/conf/GENERIC-NODEBUG
index 332cf85eb372..1c767e84d483 100644
--- a/sys/amd64/conf/GENERIC-NODEBUG
+++ b/sys/amd64/conf/GENERIC-NODEBUG
@@ -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 603fce8320bb..b03b17b1bfcd 100644
--- a/sys/amd64/conf/MINIMAL
+++ b/sys/amd64/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/arm/conf/ALPINE b/sys/arm/conf/ALPINE
index fdfb591f8614..871ee698b953 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 9b5886216ada..084bee232a12 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 96c90c639a42..39727aad4403 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 86dcb0b9ef73..af0085615786 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 cd49dbc5b050..b9d1ffc5aa42 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 724d742e03af..d45d6e815269 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 3cfe16ccfe54..dc6e2657779d 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/GENERIC-NODEBUG b/sys/arm/conf/GENERIC-NODEBUG
index 6e60deff7569..517d3310c9d5 100644
--- a/sys/arm/conf/GENERIC-NODEBUG
+++ b/sys/arm/conf/GENERIC-NODEBUG
@@ -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/arm/conf/IMX53 b/sys/arm/conf/IMX53
index 0372cb62088d..4cbd14aa13a4 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 6d8388ff0d60..5288b4a75622 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 b12186d91c2c..859d1535842f 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 3e7d239785e2..de6d38463b17 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 36eaff0c0f28..ebaa0462b155 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 4c92aaea108a..59f93d480a86 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 3d7511565307..717f7546a594 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 c83a3f260691..d1e9a85d7bd9 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 7dd37a340502..0e21f5c27604 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 68d7bf037525..881d6e811a85 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/VYBRID b/sys/arm/conf/VYBRID
index e7ded5f42d82..24297a6febe2 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 24490a5129e5..1a7d011f51b0 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 430ba8a4a45f..23126cc81127 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-NODEBUG b/sys/arm64/conf/GENERIC-NODEBUG
index 8b99852be971..accbc464862c 100644
--- a/sys/arm64/conf/GENERIC-NODEBUG
+++ b/sys/arm64/conf/GENERIC-NODEBUG
@@ -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/arm64/conf/GENERIC-UP b/sys/arm64/conf/GENERIC-UP
index f6c4e6edeca9..f18c5defc1a6 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 874c3237ec77..1b4d853fe1d4 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/GENERIC-NODEBUG b/sys/i386/conf/GENERIC-NODEBUG
index d09663e1b9db..f0b3ecd818fd 100644
--- a/sys/i386/conf/GENERIC-NODEBUG
+++ b/sys/i386/conf/GENERIC-NODEBUG
@@ -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/i386/conf/MINIMAL b/sys/i386/conf/MINIMAL
index 8eed963b8f0a..f80c5cf40b48 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 d0bb25455fa4..ae18cddd84ba 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 99a839ac8b28..7596a61a09da 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 cf35005f0768..537091458e00 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 bc2593d6ebdb..cf8dbcffb020 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 7854e89d17b7..cdf1266ec5a6 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/GENERIC-NODEBUG b/sys/powerpc/conf/GENERIC-NODEBUG
index b86116253d78..b21984636e1d 100644
--- a/sys/powerpc/conf/GENERIC-NODEBUG
+++ b/sys/powerpc/conf/GENERIC-NODEBUG
@@ -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/powerpc/conf/GENERIC64 b/sys/powerpc/conf/GENERIC64
index 634a8c2731a8..93a130e07dc6 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/GENERIC64-NODEBUG b/sys/powerpc/conf/GENERIC64-NODEBUG
index da382e5e76de..cc82f38fb22c 100644
--- a/sys/powerpc/conf/GENERIC64-NODEBUG
+++ b/sys/powerpc/conf/GENERIC64-NODEBUG
@@ -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/powerpc/conf/GENERIC64LE b/sys/powerpc/conf/GENERIC64LE
index 41815a6a01cc..6bd0c8154673 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 a04d5557c83c..4c31e5dcf31d 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/sys/riscv/conf/GENERIC-NODEBUG b/sys/riscv/conf/GENERIC-NODEBUG
index 9b1d9fe5a9af..09155b59f46f 100644
--- a/sys/riscv/conf/GENERIC-NODEBUG
+++ b/sys/riscv/conf/GENERIC-NODEBUG
@@ -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/usr.bin/fortune/datfiles/freebsd-tips b/usr.bin/fortune/datfiles/freebsd-tips
index 0b596dec4575..eb7339cec698 100644
--- a/usr.bin/fortune/datfiles/freebsd-tips
+++ b/usr.bin/fortune/datfiles/freebsd-tips
@@ -62,8 +62,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.bin/timeout/timeout.1 b/usr.bin/timeout/timeout.1
index b9613128755e..87a86c81e6ee 100644
--- a/usr.bin/timeout/timeout.1
+++ b/usr.bin/timeout/timeout.1
@@ -26,7 +26,7 @@
.\"
.\" $FreeBSD$
.\"
-.Dd July 7, 2020
+.Dd May 20, 2021
.Dt TIMEOUT 1
.Os
.Sh NAME
@@ -180,7 +180,7 @@ $ echo $?
.Pp
Try to
.Xr fetch 1
-the single page version of the
+the PDF version of the
.Fx
Handbook.
Send a
@@ -190,7 +190,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/usr.sbin/lpr/lpd/printcap b/usr.sbin/lpr/lpd/printcap
index b1f83b344c8f..1bfa1abb4c20 100644
--- a/usr.sbin/lpr/lpd/printcap
+++ b/usr.sbin/lpr/lpd/printcap
@@ -22,7 +22,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 b76799e39cd5..2f5b85f30b4c 100644
--- a/usr.sbin/mergemaster/mergemaster.8
+++ b/usr.sbin/mergemaster/mergemaster.8
@@ -24,7 +24,7 @@
.\"
.\" $FreeBSD$
.\"
-.Dd November 27, 2018
+.Dd May 20, 2021
.Dt MERGEMASTER 8
.Os
.Sh NAME
@@ -458,9 +458,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 02819b1b3578..00470f6e5273 100644
--- a/usr.sbin/ppp/ppp.8
+++ b/usr.sbin/ppp/ppp.8
@@ -25,7 +25,7 @@
.\"
.\" $FreeBSD$
.\"
-.Dd July 11, 2020
+.Dd May 20, 2021
.Dt PPP 8
.Os
.Sh NAME
@@ -5963,12 +5963,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
More information about the dev-commits-src-all
mailing list