diff --git a/libexec/rc/rc.conf b/libexec/rc/rc.conf
--- a/libexec/rc/rc.conf
+++ b/libexec/rc/rc.conf
@@ -45,7 +45,7 @@
 devd_enable="YES" 	# Run devd, to trigger programs on device tree changes.
 devd_flags=""		# Additional flags for devd(8).
 devmatch_enable="YES"	# Demand load kernel modules based on device ids.
-devmatch_blacklist=""	# List of modules (w/o .ko) to exclude from devmatch.
+devmatch_blocklist=""	# List of modules (w/o .ko) to exclude from devmatch.
 #kld_list="" 		# Kernel modules to load after local disks are mounted
 kldxref_enable="YES"	# Build linker.hints files with kldxref(8).
 kldxref_clobber="NO"	# Overwrite old linker.hints at boot.
diff --git a/libexec/rc/rc.d/devmatch b/libexec/rc/rc.d/devmatch
--- a/libexec/rc/rc.d/devmatch
+++ b/libexec/rc/rc.d/devmatch
@@ -59,9 +59,9 @@
 	# or drivers that have symbolic links that
 	# confuse devmatch by running it -n.
 	# Finally, we filter out all items in the
-	# devmactch_blacklist.
+	# devmatch_blocklist.
 	devctl freeze
-	x=$(echo ${devmatch_blacklist} | tr ' ' '#')
+	x=$(echo ${devmatch_blocklist:-${devmatch_blacklist}} | tr ' ' '#')
 	for m in ${list}; do
 		case "#${x}#" in
 		*"#${m}#"*) continue ;;
diff --git a/share/man/man5/rc.conf.5 b/share/man/man5/rc.conf.5
--- a/share/man/man5/rc.conf.5
+++ b/share/man/man5/rc.conf.5
@@ -24,7 +24,7 @@
 .\"
 .\" $FreeBSD$
 .\"
-.Dd May 13, 2021
+.Dd June 17, 2021
 .Dt RC.CONF 5
 .Os
 .Sh NAME
@@ -257,8 +257,16 @@
 .Dq Li NO ,
 disable auto-loading of kernel modules with
 .Xr devmatch 8 .
+.It Va devmatch_blocklist
+.Pq Vt str
+A whitespace-separated list of kernel modules to be ignored by
+.Xr devmatch 8 .
 .It Va devmatch_blacklist
 .Pq Vt str
+This variable is deprecated.
+Use
+.Va devmatch_blocklist
+instead.
 A whitespace-separated list of kernel modules to be ignored by
 .Xr devmatch 8 .
 .It Va kld_list
diff --git a/share/man/man9/style.9 b/share/man/man9/style.9
--- a/share/man/man9/style.9
+++ b/share/man/man9/style.9
@@ -112,9 +112,16 @@
 lines should only be added when making substantial changes to the file,
 not for trivial changes.
 .Pp
-After any copyright and license comment, there is a blank line, and the
+After any copyright and license comment, there is a blank line.
+For non C/C++ language source files,
 .Li $\&FreeBSD$
-for non C/C++ language source files.
+is next, if applicable.
+If your code needs to be merged into stable/12 or earlier, it
+needs to have the
+.Li $\&FreeBSD$
+tag.
+Otherwise, this tag should be omitted in new code.
+Legacy code will have the tag removed in the future.
 Version control system ID tags should only exist once in a file
 (unlike in this one).
 Non-C/C++ source files follow the example above, while C/C++ source files
@@ -132,6 +139,11 @@
 Only add
 .Dq Li "From: "
 in front of foreign VCS IDs if the file is renamed.
+Add
+.Dq Li "From: "
+and FreeBSD git hash with full path name if the file was derived
+from another FreeBSD file and include relevant copyright info
+from the original file.
 .Bd -literal
 /* From: @(#)style	1.14 (Berkeley) 4/28/95 */