33 files changed, 33 insertions, 40 deletions

diff --git a/etc/rc.d/devmatch b/etc/rc.d/devmatch
index 8bcde70702b5f..d8f83e6bb5845 100755
--- a/etc/rc.d/devmatch
+++ b/etc/rc.d/devmatch
@@ -1,7 +1,6 @@
 #!/bin/sh
 
-# Copyright (c) 2018 Warner Losh
-# All rights reserved.
+# Copyright (c) 2018 M. Warner Losh
 #
 # Redistribution and use in source and binary forms, with or without
 # modification, are permitted provided that the following conditions
diff --git a/share/man/man4/sn.4 b/share/man/man4/sn.4
index f8605368b20fd..28dbdcce3c9ee 100644
--- a/share/man/man4/sn.4
+++ b/share/man/man4/sn.4
@@ -1,6 +1,5 @@
 .\"
-.\" Copyright (c) 2000 Warner Losh
-.\" All rights reserved.
+.\" Copyright (c) 2000 M. Warner Losh
 .\"
 .\" Redistribution and use in source and binary forms, with or without
 .\" modification, are permitted provided that the following conditions
diff --git a/stand/common/zfs_cmd.c b/stand/common/zfs_cmd.c
index ae5a4b1a9377d..eca560bbfda9b 100644
--- a/stand/common/zfs_cmd.c
+++ b/stand/common/zfs_cmd.c
@@ -1,6 +1,5 @@
 /*-
- * Copyright (c) 2018 Warner Losh <imp@freebd.org>
- * All rights reserved.
+ * Copyright (c) 2018 M. Warner Losh <imp@freebd.org>
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
diff --git a/stand/liblua/float.h b/stand/liblua/float.h
index fa69951138072..c37bbaa29f01f 100644
--- a/stand/liblua/float.h
+++ b/stand/liblua/float.h
@@ -1,6 +1,5 @@
 /*-
- * Copyright (c) 2018 M Warner Losh
- * All rights reserved.
+ * Copyright (c) 2018 M. Warner Losh
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
diff --git a/stand/liblua/locale.h b/stand/liblua/locale.h
index 787dbd73c352d..d082202582141 100644
--- a/stand/liblua/locale.h
+++ b/stand/liblua/locale.h
@@ -1,6 +1,5 @@
 /*-
- * Copyright (c) 2018 M Warner Losh
- * All rights reserved.
+ * Copyright (c) 2018 M. Warner Losh
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
diff --git a/stand/liblua/math.h b/stand/liblua/math.h
index 1e6d2dd1db8b8..8d95a6ebc560e 100644
--- a/stand/liblua/math.h
+++ b/stand/liblua/math.h
@@ -1,6 +1,5 @@
 /*-
- * Copyright (c) 2018 M Warner Losh
- * All rights reserved.
+ * Copyright (c) 2018 M. Warner Losh
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
diff --git a/sys/dev/exca/exca.c b/sys/dev/exca/exca.c
index 899375bce7330..060e0a548c95a 100644
--- a/sys/dev/exca/exca.c
+++ b/sys/dev/exca/exca.c
@@ -1,7 +1,7 @@
 /*-
  * SPDX-License-Identifier: BSD-4-Clause AND BSD-2-Clause-FreeBSD
  *
- * Copyright (c) 2002-2005 M Warner Losh.  All rights reserved.
+ * Copyright (c) 2002-2005 M. Warner Losh.
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
diff --git a/sys/dev/exca/excareg.h b/sys/dev/exca/excareg.h
index 0cb419d6d9a71..547d53122f8a8 100644
--- a/sys/dev/exca/excareg.h
+++ b/sys/dev/exca/excareg.h
@@ -4,7 +4,7 @@
 /*-
  * SPDX-License-Identifier: BSD-4-Clause AND BSD-2-Clause-FreeBSD
  *
- * Copyright (c) 2002 M Warner Losh.  All rights reserved.
+ * Copyright (c) 2002 M. Warner Losh.
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
diff --git a/sys/dev/exca/excavar.h b/sys/dev/exca/excavar.h
index c4a8a556bbb98..4e0fa61e727de 100644
--- a/sys/dev/exca/excavar.h
+++ b/sys/dev/exca/excavar.h
@@ -3,7 +3,7 @@
 /*-
  * SPDX-License-Identifier: BSD-4-Clause AND BSD-2-Clause-FreeBSD
  *
- * Copyright (c) 2002 M Warner Losh.  All rights reserved.
+ * Copyright (c) 2002 M. Warner Losh.
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
diff --git a/sys/dev/iicbus/icee.c b/sys/dev/iicbus/icee.c
index df67261048b91..d3472d17eab6a 100644
--- a/sys/dev/iicbus/icee.c
+++ b/sys/dev/iicbus/icee.c
@@ -1,7 +1,7 @@
 /*-
  * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
  *
- * Copyright (c) 2006 Warner Losh.  All rights reserved.
+ * Copyright (c) 2006 M. Warner Losh.
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
diff --git a/sys/dev/nand/nfc_at91.h b/sys/dev/nand/nfc_at91.h
index f12b764468c9f..42f140163eae0 100644
--- a/sys/dev/nand/nfc_at91.h
+++ b/sys/dev/nand/nfc_at91.h
@@ -1,8 +1,7 @@
 /*-
  * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
  *
- * Copyright (C) 2014 Warner Losh.
- * All rights reserved.
+ * Copyright (C) 2014 M. Warner Losh.
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
diff --git a/sys/dev/pccbb/pccbbvar.h b/sys/dev/pccbb/pccbbvar.h
index 3e1f56a4e8238..400e466b0779e 100644
--- a/sys/dev/pccbb/pccbbvar.h
+++ b/sys/dev/pccbb/pccbbvar.h
@@ -1,7 +1,7 @@
 /*-
  * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
  *
- * Copyright (c) 2003-2004 Warner Losh.
+ * Copyright (c) 2003-2004 M. Warner Losh.
  * Copyright (c) 2000,2001 Jonathan Chen.
  * All rights reserved.
  *
diff --git a/tools/tools/nanobsd/dhcpd/common b/tools/tools/nanobsd/dhcpd/common
index 685435692bdfe..635b8d7b91546 100644
--- a/tools/tools/nanobsd/dhcpd/common
+++ b/tools/tools/nanobsd/dhcpd/common
@@ -1,7 +1,7 @@
 # $FreeBSD$
 
 #-
-# Copyright (c) 2014 Warner Losh. All Rights Reserved.
+# Copyright (c) 2014 M. Warner Losh.
 # Copyright (c) 2010 iXsystems, Inc., All rights reserved.
 #
 # Redistribution and use in source and binary forms, with or without
diff --git a/tools/tools/nanobsd/dhcpd/os-base b/tools/tools/nanobsd/dhcpd/os-base
index 10e1a8fb33324..bb6b48edf030d 100644
--- a/tools/tools/nanobsd/dhcpd/os-base
+++ b/tools/tools/nanobsd/dhcpd/os-base
@@ -1,7 +1,7 @@
 # $FreeBSD$
 
 #-
-# Copyright (c) 2014 Warner Losh. All Rights Reserved.
+# Copyright (c) 2014 M. Warner Losh.
 # Copyright (c) 2010-2011 iXsystems, Inc., All rights reserved.
 #
 # Redistribution and use in source and binary forms, with or without
diff --git a/tools/tools/nanobsd/embedded/beaglebone.cfg b/tools/tools/nanobsd/embedded/beaglebone.cfg
index 6bee7f334500e..e82d4a1466c27 100644
--- a/tools/tools/nanobsd/embedded/beaglebone.cfg
+++ b/tools/tools/nanobsd/embedded/beaglebone.cfg
@@ -1,7 +1,7 @@
 # $FreeBSD$
 
 #-
-# Copyright (c) 2015 Warner Losh. All Rights Reserved.
+# Copyright (c) 2015 M. Warner Losh.
 # Copyright (c) 2010-2011 iXsystems, Inc., All rights reserved.
 #
 # Redistribution and use in source and binary forms, with or without
diff --git a/tools/tools/nanobsd/embedded/common b/tools/tools/nanobsd/embedded/common
index 33263fc60b383..4d3085883e87e 100644
--- a/tools/tools/nanobsd/embedded/common
+++ b/tools/tools/nanobsd/embedded/common
@@ -1,7 +1,7 @@
 # $FreeBSD$
 
 #-
-# Copyright (c) 2015 Warner Losh. All Rights Reserved.
+# Copyright (c) 2015 M. Warner Losh.
 # Copyright (c) 2010-2011 iXsystems, Inc., All rights reserved.
 #
 # Redistribution and use in source and binary forms, with or without
diff --git a/tools/tools/nanobsd/embedded/i386.cfg b/tools/tools/nanobsd/embedded/i386.cfg
index 7fd9a5282acdf..8ce6d89c80357 100644
--- a/tools/tools/nanobsd/embedded/i386.cfg
+++ b/tools/tools/nanobsd/embedded/i386.cfg
@@ -1,7 +1,7 @@
 # $FreeBSD$
 
 #-
-# Copyright (c) 2015 Warner Losh. All Rights Reserved.
+# Copyright (c) 2015 M. Warner Losh.
 # Copyright (c) 2010-2011 iXsystems, Inc., All rights reserved.
 #
 # Redistribution and use in source and binary forms, with or without
diff --git a/tools/tools/nanobsd/embedded/pandaboard.cfg b/tools/tools/nanobsd/embedded/pandaboard.cfg
index 4684bb68cf34e..356614c5097cf 100644
--- a/tools/tools/nanobsd/embedded/pandaboard.cfg
+++ b/tools/tools/nanobsd/embedded/pandaboard.cfg
@@ -1,7 +1,7 @@
 # $FreeBSD$
 
 #-
-# Copyright (c) 2016 Warner Losh. All Rights Reserved.
+# Copyright (c) 2016 M. Warner Losh.
 # Copyright (c) 2010-2011 iXsystems, Inc., All rights reserved.
 #
 # Redistribution and use in source and binary forms, with or without
diff --git a/tools/tools/nanobsd/embedded/qemu-amd64-uefi-bios.cfg b/tools/tools/nanobsd/embedded/qemu-amd64-uefi-bios.cfg
index c8c48aaae207d..ac12d60e7a17b 100644
--- a/tools/tools/nanobsd/embedded/qemu-amd64-uefi-bios.cfg
+++ b/tools/tools/nanobsd/embedded/qemu-amd64-uefi-bios.cfg
@@ -1,7 +1,7 @@
 # $FreeBSD$
 
 #-
-# Copyright (c) 2015 Warner Losh. All Rights Reserved.
+# Copyright (c) 2015 M. Warner Losh.
 # Copyright (c) 2010-2011 iXsystems, Inc., All rights reserved.
 #
 # Redistribution and use in source and binary forms, with or without
diff --git a/tools/tools/nanobsd/embedded/qemu-amd64-uefi.cfg b/tools/tools/nanobsd/embedded/qemu-amd64-uefi.cfg
index 7e8f59553fdce..9834726e334fc 100644
--- a/tools/tools/nanobsd/embedded/qemu-amd64-uefi.cfg
+++ b/tools/tools/nanobsd/embedded/qemu-amd64-uefi.cfg
@@ -1,7 +1,7 @@
 # $FreeBSD$
 
 #-
-# Copyright (c) 2015 Warner Losh. All Rights Reserved.
+# Copyright (c) 2015 M. Warner Losh.
 # Copyright (c) 2010-2011 iXsystems, Inc., All rights reserved.
 #
 # Redistribution and use in source and binary forms, with or without
diff --git a/tools/tools/nanobsd/embedded/qemu-amd64.cfg b/tools/tools/nanobsd/embedded/qemu-amd64.cfg
index d4f7fe75a787b..94420e375dbc1 100644
--- a/tools/tools/nanobsd/embedded/qemu-amd64.cfg
+++ b/tools/tools/nanobsd/embedded/qemu-amd64.cfg
@@ -1,7 +1,7 @@
 # $FreeBSD$
 
 #-
-# Copyright (c) 2015 Warner Losh. All Rights Reserved.
+# Copyright (c) 2015 M. Warner Losh.
 # Copyright (c) 2010-2011 iXsystems, Inc., All rights reserved.
 #
 # Redistribution and use in source and binary forms, with or without
diff --git a/tools/tools/nanobsd/embedded/qemu-armv7.cfg b/tools/tools/nanobsd/embedded/qemu-armv7.cfg
index aa98779725e04..1e72f4fb1d381 100644
--- a/tools/tools/nanobsd/embedded/qemu-armv7.cfg
+++ b/tools/tools/nanobsd/embedded/qemu-armv7.cfg
@@ -2,7 +2,7 @@
 
 #-
 # Copyright (c) 2016 Andrew Turner. All Rights Reserved.
-# Copyright (c) 2015 Warner Losh. All Rights Reserved.
+# Copyright (c) 2015 M. Warner Losh.
 # Copyright (c) 2010-2011 iXsystems, Inc., All rights reserved.
 #
 # Redistribution and use in source and binary forms, with or without
diff --git a/tools/tools/nanobsd/embedded/qemu-i386.cfg b/tools/tools/nanobsd/embedded/qemu-i386.cfg
index 96ce026d48cf1..9f777d2c1e7ff 100644
--- a/tools/tools/nanobsd/embedded/qemu-i386.cfg
+++ b/tools/tools/nanobsd/embedded/qemu-i386.cfg
@@ -1,7 +1,7 @@
 # $FreeBSD$
 
 #-
-# Copyright (c) 2015 Warner Losh. All Rights Reserved.
+# Copyright (c) 2015 M. Warner Losh.
 # Copyright (c) 2010-2011 iXsystems, Inc., All rights reserved.
 #
 # Redistribution and use in source and binary forms, with or without
diff --git a/tools/tools/nanobsd/embedded/qemu-mips.cfg b/tools/tools/nanobsd/embedded/qemu-mips.cfg
index 9242b8974917a..01f86f8720363 100644
--- a/tools/tools/nanobsd/embedded/qemu-mips.cfg
+++ b/tools/tools/nanobsd/embedded/qemu-mips.cfg
@@ -1,7 +1,7 @@
 # $FreeBSD$
 
 #-
-# Copyright (c) 2015 Warner Losh. All Rights Reserved.
+# Copyright (c) 2015 M. Warner Losh.
 # Copyright (c) 2010-2011 iXsystems, Inc., All rights reserved.
 #
 # Redistribution and use in source and binary forms, with or without
diff --git a/tools/tools/nanobsd/embedded/qemu-mips64.cfg b/tools/tools/nanobsd/embedded/qemu-mips64.cfg
index 69fff3af39454..b5574defae3d8 100644
--- a/tools/tools/nanobsd/embedded/qemu-mips64.cfg
+++ b/tools/tools/nanobsd/embedded/qemu-mips64.cfg
@@ -1,7 +1,7 @@
 # $FreeBSD$
 
 #-
-# Copyright (c) 2015 Warner Losh. All Rights Reserved.
+# Copyright (c) 2015 M. Warner Losh.
 # Copyright (c) 2010-2011 iXsystems, Inc., All rights reserved.
 #
 # Redistribution and use in source and binary forms, with or without
diff --git a/tools/tools/nanobsd/embedded/qemu-powerpc.cfg b/tools/tools/nanobsd/embedded/qemu-powerpc.cfg
index effdd4b6dac6a..124eb71a355ce 100644
--- a/tools/tools/nanobsd/embedded/qemu-powerpc.cfg
+++ b/tools/tools/nanobsd/embedded/qemu-powerpc.cfg
@@ -1,7 +1,7 @@
 # $FreeBSD$
 
 #-
-# Copyright (c) 2015 Warner Losh. All Rights Reserved.
+# Copyright (c) 2015 M. Warner Losh.
 # Copyright (c) 2010-2011 iXsystems, Inc., All rights reserved.
 #
 # Redistribution and use in source and binary forms, with or without
diff --git a/tools/tools/nanobsd/embedded/qemu-powerpc64.cfg b/tools/tools/nanobsd/embedded/qemu-powerpc64.cfg
index 525afc6402cfa..20561cfbeca7c 100644
--- a/tools/tools/nanobsd/embedded/qemu-powerpc64.cfg
+++ b/tools/tools/nanobsd/embedded/qemu-powerpc64.cfg
@@ -1,7 +1,7 @@
 # $FreeBSD$
 
 #-
-# Copyright (c) 2015 Warner Losh. All Rights Reserved.
+# Copyright (c) 2015 M. Warner Losh.
 # Copyright (c) 2010-2011 iXsystems, Inc., All rights reserved.
 #
 # Redistribution and use in source and binary forms, with or without
diff --git a/tools/tools/nanobsd/embedded/qemu-sparc64.cfg b/tools/tools/nanobsd/embedded/qemu-sparc64.cfg
index d5b565d9da2a8..748894523c50b 100644
--- a/tools/tools/nanobsd/embedded/qemu-sparc64.cfg
+++ b/tools/tools/nanobsd/embedded/qemu-sparc64.cfg
@@ -1,7 +1,7 @@
 # $FreeBSD$
 
 #-
-# Copyright (c) 2015 Warner Losh. All Rights Reserved.
+# Copyright (c) 2015 M. Warner Losh.
 # Copyright (c) 2010-2011 iXsystems, Inc., All rights reserved.
 #
 # Redistribution and use in source and binary forms, with or without
diff --git a/tools/tools/nanobsd/embedded/rpi.cfg b/tools/tools/nanobsd/embedded/rpi.cfg
index 25304e44629d1..bed07fe279e0e 100644
--- a/tools/tools/nanobsd/embedded/rpi.cfg
+++ b/tools/tools/nanobsd/embedded/rpi.cfg
@@ -1,7 +1,7 @@
 # $FreeBSD$
 
 #-
-# Copyright (c) 2015 Warner Losh. All Rights Reserved.
+# Copyright (c) 2015 M. Warner Losh.
 # Copyright (c) 2010-2011 iXsystems, Inc., All rights reserved.
 #
 # Redistribution and use in source and binary forms, with or without
diff --git a/tools/tools/nanobsd/embedded/rpi2.cfg b/tools/tools/nanobsd/embedded/rpi2.cfg
index 5d63c5b879621..410eacd423b27 100644
--- a/tools/tools/nanobsd/embedded/rpi2.cfg
+++ b/tools/tools/nanobsd/embedded/rpi2.cfg
@@ -1,7 +1,7 @@
 # $FreeBSD$
 
 #-
-# Copyright (c) 2015 Warner Losh. All Rights Reserved.
+# Copyright (c) 2015 M. Warner Losh.
 # Copyright (c) 2010-2011 iXsystems, Inc., All rights reserved.
 #
 # Redistribution and use in source and binary forms, with or without
diff --git a/tools/tools/nanobsd/embedded/rpi3.cfg b/tools/tools/nanobsd/embedded/rpi3.cfg
index 1379aa2d651af..982d69db2a9ab 100644
--- a/tools/tools/nanobsd/embedded/rpi3.cfg
+++ b/tools/tools/nanobsd/embedded/rpi3.cfg
@@ -1,7 +1,7 @@
 # $FreeBSD$
 
 #-
-# Copyright (c) 2015 Warner Losh. All Rights Reserved.
+# Copyright (c) 2015 M. Warner Losh.
 # Copyright (c) 2010-2011 iXsystems, Inc., All rights reserved.
 #
 # Redistribution and use in source and binary forms, with or without
diff --git a/tools/tools/nanobsd/embedded/sam9260ek.cfg b/tools/tools/nanobsd/embedded/sam9260ek.cfg
index 50bbf1dd2d609..da3225ca1c372 100644
--- a/tools/tools/nanobsd/embedded/sam9260ek.cfg
+++ b/tools/tools/nanobsd/embedded/sam9260ek.cfg
@@ -1,7 +1,7 @@
 # $FreeBSD$
 
 #-
-# Copyright (c) 2015 Warner Losh. All Rights Reserved.
+# Copyright (c) 2015 M. Warner Losh.
 # Copyright (c) 2010-2011 iXsystems, Inc., All rights reserved.
 #
 # Redistribution and use in source and binary forms, with or without
diff --git a/tools/tools/nanobsd/embedded/sam9g20ek.cfg b/tools/tools/nanobsd/embedded/sam9g20ek.cfg
index 6964e3f9850d0..1cd5e974f7843 100644
--- a/tools/tools/nanobsd/embedded/sam9g20ek.cfg
+++ b/tools/tools/nanobsd/embedded/sam9g20ek.cfg
@@ -1,7 +1,7 @@
 # $FreeBSD$
 
 #-
-# Copyright (c) 2015 Warner Losh. All Rights Reserved.
+# Copyright (c) 2015 M. Warner Losh.
 # Copyright (c) 2010-2011 iXsystems, Inc., All rights reserved.
 #
 # Redistribution and use in source and binary forms, with or without