18 files changed, 17 insertions, 25 deletions
diff --git a/usr.sbin/efibootmgr/efibootmgr.8 b/usr.sbin/efibootmgr/efibootmgr.8
index 689d53d200f0..c19e8f18799a 100644
--- a/usr.sbin/efibootmgr/efibootmgr.8
+++ b/usr.sbin/efibootmgr/efibootmgr.8
@@ -1,5 +1,5 @@
-.\" Copyright (c) 2017-2018 Netflix, Inc
-.\" All rights reserved.
+.\"
+.\" Copyright (c) 2017-2018 Netflix, Inc.
 .\"
 .\" Redistribution and use in source and binary forms, with or without
 .\" modification, are permitted provided that the following conditions
diff --git a/usr.sbin/efibootmgr/efibootmgr.c b/usr.sbin/efibootmgr/efibootmgr.c
index 06bd55866c69..5793388fbcc0 100644
--- a/usr.sbin/efibootmgr/efibootmgr.c
+++ b/usr.sbin/efibootmgr/efibootmgr.c
@@ -1,6 +1,5 @@
 /*-
  * Copyright (c) 2017-2018 Netflix, Inc.
- * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
diff --git a/usr.sbin/efidp/efidp.8 b/usr.sbin/efidp/efidp.8
index 40bd7b945759..ad98428a97a5 100644
--- a/usr.sbin/efidp/efidp.8
+++ b/usr.sbin/efidp/efidp.8
@@ -1,5 +1,5 @@
-.\" Copyright (c) 2017 Netflix, Inc
-.\" All rights reserved.
+.\"
+.\" Copyright (c) 2017 Netflix, Inc.
 .\"
 .\" Redistribution and use in source and binary forms, with or without
 .\" modification, are permitted provided that the following conditions
diff --git a/usr.sbin/efidp/efidp.c b/usr.sbin/efidp/efidp.c
index e12491ecabf5..aef154112d66 100644
--- a/usr.sbin/efidp/efidp.c
+++ b/usr.sbin/efidp/efidp.c
@@ -1,6 +1,5 @@
 /*-
  * Copyright (c) 2016 Netflix, Inc.
- * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
diff --git a/usr.sbin/efivar/efiutil.c b/usr.sbin/efivar/efiutil.c
index 0ccf2950df2a..ff35b29bf9cc 100644
--- a/usr.sbin/efivar/efiutil.c
+++ b/usr.sbin/efivar/efiutil.c
@@ -1,6 +1,5 @@
 /*-
  * Copyright (c) 2017 Netflix, Inc.
- * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
diff --git a/usr.sbin/efivar/efiutil.h b/usr.sbin/efivar/efiutil.h
index 143fd464f6ca..dbcb598c789e 100644
--- a/usr.sbin/efivar/efiutil.h
+++ b/usr.sbin/efivar/efiutil.h
@@ -1,6 +1,5 @@
 /*-
  * Copyright (c) 2017 Netflix, Inc.
- * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
diff --git a/usr.sbin/efivar/efivar.8 b/usr.sbin/efivar/efivar.8
index 7113ba931e46..215708dd8afe 100644
--- a/usr.sbin/efivar/efivar.8
+++ b/usr.sbin/efivar/efivar.8
@@ -1,5 +1,5 @@
-.\" Copyright (c) 2017 Netflix, Inc
-.\" All rights reserved.
+.\"
+.\" Copyright (c) 2017 Netflix, Inc.
 .\"
 .\" Redistribution and use in source and binary forms, with or without
 .\" modification, are permitted provided that the following conditions
diff --git a/usr.sbin/efivar/efivar.c b/usr.sbin/efivar/efivar.c
index f278ecd78b6a..8146812534e4 100644
--- a/usr.sbin/efivar/efivar.c
+++ b/usr.sbin/efivar/efivar.c
@@ -1,6 +1,5 @@
 /*-
  * Copyright (c) 2016 Netflix, Inc.
- * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
diff --git a/usr.sbin/mpsutil/mps_cmd.c b/usr.sbin/mpsutil/mps_cmd.c
index 6053c9265261..8e1e431d65f3 100644
--- a/usr.sbin/mpsutil/mps_cmd.c
+++ b/usr.sbin/mpsutil/mps_cmd.c
@@ -2,7 +2,6 @@
  * Copyright (c) 2015 Baptiste Daroussin <bapt@FreeBSD.org>
  *
  * Copyright (c) 2015 Netflix, Inc.
- * All rights reserved.
  * Written by: Scott Long <scottl@freebsd.org>
  *
  * Copyright (c) 2008 Yahoo!, Inc.
diff --git a/usr.sbin/mpsutil/mps_debug.c b/usr.sbin/mpsutil/mps_debug.c
index 24ddbd2cb11d..4c462ef65f6c 100644
--- a/usr.sbin/mpsutil/mps_debug.c
+++ b/usr.sbin/mpsutil/mps_debug.c
@@ -1,6 +1,5 @@
 /*-
  * Copyright (c) 2018 Netflix, Inc.
- * All rights reserved.
  * Written by: Scott Long <scottl@freebsd.org>
  *
  * Redistribution and use in source and binary forms, with or without
diff --git a/usr.sbin/mpsutil/mps_show.c b/usr.sbin/mpsutil/mps_show.c
index 81265aacf7bb..57aed20a7d60 100644
--- a/usr.sbin/mpsutil/mps_show.c
+++ b/usr.sbin/mpsutil/mps_show.c
@@ -1,6 +1,5 @@
 /*-
  * Copyright (c) 2015 Netflix, Inc.
- * All rights reserved.
  * Written by: Scott Long <scottl@freebsd.org>
  *
  * Copyright (c) 2008 Yahoo!, Inc.
diff --git a/usr.sbin/mpsutil/mpsutil.c b/usr.sbin/mpsutil/mpsutil.c
index cb15d0d0a566..d7209afd175f 100644
--- a/usr.sbin/mpsutil/mpsutil.c
+++ b/usr.sbin/mpsutil/mpsutil.c
@@ -1,6 +1,5 @@
 /*-
  * Copyright (c) 2015 Netflix, Inc.
- * All rights reserved.
  * Written by: Scott Long <scottl@freebsd.org>
  *
  * Copyright (c) 2008 Yahoo!, Inc.
diff --git a/usr.sbin/pmcstat/pmcpl_annotate_cg.c b/usr.sbin/pmcstat/pmcpl_annotate_cg.c
index b8ad3c697cab..d6274e1f2b73 100644
--- a/usr.sbin/pmcstat/pmcpl_annotate_cg.c
+++ b/usr.sbin/pmcstat/pmcpl_annotate_cg.c
@@ -3,9 +3,11 @@
  *
  * Copyright (c) 2005-2007, Joseph Koshy
  * Copyright (c) 2007 The FreeBSD Foundation
- * Copyright (c) 2014, Adrian Chadd, Netflix Inc.
  * All rights reserved.
  *
+ * Copyright (c) 2014 Netflix, Inc.
+ * Written by: Adrian Chadd <adrian@FreeBSD.org>
+ *
  * Portions of this software were developed by A. Joseph Koshy under
  * sponsorship from the FreeBSD Foundation and Google, Inc.
  *
diff --git a/usr.sbin/pmcstat/pmcpl_annotate_cg.h b/usr.sbin/pmcstat/pmcpl_annotate_cg.h
index cf11c8de519d..afd5209ee756 100644
--- a/usr.sbin/pmcstat/pmcpl_annotate_cg.h
+++ b/usr.sbin/pmcstat/pmcpl_annotate_cg.h
@@ -3,9 +3,11 @@
  *
  * Copyright (c) 2005-2007, Joseph Koshy
  * Copyright (c) 2007 The FreeBSD Foundation
- * Copyright (c) 2014, Adrian Chadd, Netflix Inc.
  * All rights reserved.
  *
+ * Copyright (c) 2014 Netflix, Inc.
+ * Written by: Adrian Chadd <adrian@FreeBSD.org>
+ *
  * Portions of this software were developed by A. Joseph Koshy under
  * sponsorship from the FreeBSD Foundation and Google, Inc.
  *
diff --git a/usr.sbin/pmcstudy/eval_expr.c b/usr.sbin/pmcstudy/eval_expr.c
index d8999a98ab99..984e5ea72176 100644
--- a/usr.sbin/pmcstudy/eval_expr.c
+++ b/usr.sbin/pmcstudy/eval_expr.c
@@ -1,6 +1,5 @@
 /*-
- * Copyright (c) 2015 Netflix Inc.
- * All rights reserved.
+ * Copyright (c) 2015 Netflix, Inc.
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
diff --git a/usr.sbin/pmcstudy/eval_expr.h b/usr.sbin/pmcstudy/eval_expr.h
index f095513a8aa5..2c264ff711b2 100644
--- a/usr.sbin/pmcstudy/eval_expr.h
+++ b/usr.sbin/pmcstudy/eval_expr.h
@@ -1,8 +1,7 @@
 #ifndef __eval_expr_h__
 #define __eval_expr_h__
 /*-
- * Copyright (c) 2015 Netflix Inc.
- * All rights reserved.
+ * Copyright (c) 2015 Netflix, Inc.
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
diff --git a/usr.sbin/pmcstudy/pmcstudy.8 b/usr.sbin/pmcstudy/pmcstudy.8
index a3ec51ad8c1a..34d76b1de80c 100644
--- a/usr.sbin/pmcstudy/pmcstudy.8
+++ b/usr.sbin/pmcstudy/pmcstudy.8
@@ -1,5 +1,5 @@
-.\" Copyright (c) 2015
-.\"		Netflix Inc.
+.\"
+.\" Copyright (c) 2015 Netflix, Inc.
 .\"
 .\" Redistribution and use in source and binary forms, with or without
 .\" modification, are permitted provided that the following conditions
diff --git a/usr.sbin/pmcstudy/pmcstudy.c b/usr.sbin/pmcstudy/pmcstudy.c
index 3cf1f8e328a8..69d926a05e5d 100644
--- a/usr.sbin/pmcstudy/pmcstudy.c
+++ b/usr.sbin/pmcstudy/pmcstudy.c
@@ -1,6 +1,5 @@
 /*-
- * Copyright (c) 2014, 2015 Netflix Inc.
- * All rights reserved.
+ * Copyright (c) 2014-2015 Netflix, Inc.
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions