Index: share/man/man9/style.9 =================================================================== --- share/man/man9/style.9 +++ share/man/man9/style.9 @@ -114,7 +114,7 @@ .Pp After any copyright and license comment, there is a blank line, and the .Li $\&FreeBSD$ -for non C/C++ language source files. +for non C/C++ language source files, if applicable. 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,9 +132,20 @@ 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. +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 once +stable/12 is no longer supported. .Bd -literal /* From: @(#)style 1.14 (Berkeley) 4/28/95 */ - #include __FBSDID("$FreeBSD$"); .Ed