Index: share/man/man9/style.9
===================================================================
--- share/man/man9/style.9
+++ 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 */