git: e738085b9463 - main - Remove my middle name.

From: Dag-Erling Smørgrav <des_at_FreeBSD.org>
Date: Thu, 17 Aug 2023 13:09:07 UTC
The branch main has been updated by des:

URL: https://cgit.FreeBSD.org/src/commit/?id=e738085b94631f90e21a49852538ac95974baf44

commit e738085b94631f90e21a49852538ac95974baf44
Author:     Dag-Erling Smørgrav <des@FreeBSD.org>
AuthorDate: 2023-08-17 13:08:11 +0000
Commit:     Dag-Erling Smørgrav <des@FreeBSD.org>
CommitDate: 2023-08-17 13:08:30 +0000

    Remove my middle name.
---
 contrib/openbsm/compat/flopen.h                              | 2 +-
 lib/libutil/flopen.3                                         | 2 +-
 lib/libutil/flopen.c                                         | 2 +-
 lib/libutil/kld.3                                            | 2 +-
 lib/libutil/kld.c                                            | 2 +-
 lib/libutil/quotafile.3                                      | 2 +-
 lib/libutil/quotafile.c                                      | 2 +-
 lib/libutil/tests/flopen_test.c                              | 2 +-
 lib/libutil/tests/pidfile_test.c                             | 2 +-
 share/man/man4/aio.4                                         | 2 +-
 share/man/man4/coretemp.4                                    | 2 +-
 share/man/man4/ichwd.4                                       | 2 +-
 share/man/man4/ucycom.4                                      | 2 +-
 share/man/man9/LOCK_PROFILING.9                              | 2 +-
 share/man/man9/pseudofs.9                                    | 2 +-
 share/man/man9/sbuf.9                                        | 2 +-
 share/man/man9/zone.9                                        | 2 +-
 sys/compat/linprocfs/linprocfs.c                             | 2 +-
 sys/dev/fb/splash_pcx.c                                      | 2 +-
 sys/dev/syscons/logo/logo_saver.c                            | 2 +-
 sys/dev/syscons/rain/rain_saver.c                            | 2 +-
 sys/dev/syscons/warp/warp_saver.c                            | 2 +-
 sys/dev/usb/serial/ucycom.c                                  | 2 +-
 sys/fs/pseudofs/pseudofs.c                                   | 2 +-
 sys/fs/pseudofs/pseudofs.h                                   | 2 +-
 sys/fs/pseudofs/pseudofs_fileno.c                            | 2 +-
 sys/fs/pseudofs/pseudofs_internal.h                          | 2 +-
 sys/fs/pseudofs/pseudofs_vncache.c                           | 2 +-
 sys/fs/pseudofs/pseudofs_vnops.c                             | 2 +-
 sys/kern/subr_sbuf.c                                         | 2 +-
 sys/sys/sbuf.h                                               | 2 +-
 tools/regression/pthread/mutex_isowned_np/mutex_isowned_np.c | 2 +-
 tools/tools/ansify/ansify.pl                                 | 2 +-
 tools/tools/genericize/genericize.pl                         | 2 +-
 tools/tools/hcomp/hcomp.pl                                   | 2 +-
 tools/tools/mtxstat/mtxstat.pl                               | 2 +-
 tools/tools/track/track.sh                                   | 2 +-
 usr.bin/grep/file.c                                          | 2 +-
 usr.bin/grep/grep.c                                          | 2 +-
 usr.bin/grep/grep.h                                          | 2 +-
 usr.bin/grep/queue.c                                         | 2 +-
 usr.bin/grep/util.c                                          | 2 +-
 usr.bin/logins/logins.1                                      | 2 +-
 usr.bin/logins/logins.c                                      | 2 +-
 usr.bin/sockstat/sockstat.1                                  | 2 +-
 usr.bin/sockstat/sockstat.c                                  | 2 +-
 usr.sbin/acpi/acpiconf/acpiconf.8                            | 2 +-
 usr.sbin/chkgrp/chkgrp.8                                     | 2 +-
 usr.sbin/chkgrp/chkgrp.c                                     | 2 +-
 usr.sbin/kldxref/kldxref.8                                   | 2 +-
 50 files changed, 50 insertions(+), 50 deletions(-)

diff --git a/contrib/openbsm/compat/flopen.h b/contrib/openbsm/compat/flopen.h
index 7871b13c183f..be9114ab4f44 100644
--- a/contrib/openbsm/compat/flopen.h
+++ b/contrib/openbsm/compat/flopen.h
@@ -1,5 +1,5 @@
 /*-
- * Copyright (c) 2007 Dag-Erling Coïdan Smørgrav
+ * Copyright (c) 2007 Dag-Erling Smørgrav
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
diff --git a/lib/libutil/flopen.3 b/lib/libutil/flopen.3
index 61c26231cc59..259bbe16e9f7 100644
--- a/lib/libutil/flopen.3
+++ b/lib/libutil/flopen.3
@@ -1,5 +1,5 @@
 .\"-
-.\" Copyright (c) 2007 Dag-Erling Coïdan Smørgrav
+.\" Copyright (c) 2007 Dag-Erling Smørgrav
 .\" All rights reserved.
 .\"
 .\" Redistribution and use in source and binary forms, with or without
diff --git a/lib/libutil/flopen.c b/lib/libutil/flopen.c
index b1961894c11f..9fb3ec8aeae0 100644
--- a/lib/libutil/flopen.c
+++ b/lib/libutil/flopen.c
@@ -1,7 +1,7 @@
 /*-
  * SPDX-License-Identifier: BSD-2-Clause
  *
- * Copyright (c) 2007-2009 Dag-Erling Coïdan Smørgrav
+ * Copyright (c) 2007-2009 Dag-Erling Smørgrav
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
diff --git a/lib/libutil/kld.3 b/lib/libutil/kld.3
index 0f751e5ee194..6bcf62508aea 100644
--- a/lib/libutil/kld.3
+++ b/lib/libutil/kld.3
@@ -1,5 +1,5 @@
 .\"-
-.\" Copyright (c) 2006 Dag-Erling Coïdan Smørgrav
+.\" Copyright (c) 2006 Dag-Erling Smørgrav
 .\" All rights reserved.
 .\"
 .\" Redistribution and use in source and binary forms, with or without
diff --git a/lib/libutil/kld.c b/lib/libutil/kld.c
index 2a79c9302f0f..374a1992bc55 100644
--- a/lib/libutil/kld.c
+++ b/lib/libutil/kld.c
@@ -1,7 +1,7 @@
 /*-
  * SPDX-License-Identifier: BSD-2-Clause
  *
- * Copyright (c) 2006 Dag-Erling Coïdan Smørgrav
+ * Copyright (c) 2006 Dag-Erling Smørgrav
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
diff --git a/lib/libutil/quotafile.3 b/lib/libutil/quotafile.3
index 9654d14cf669..5d2bff56baba 100644
--- a/lib/libutil/quotafile.3
+++ b/lib/libutil/quotafile.3
@@ -1,5 +1,5 @@
 .\"-
-.\" Copyright (c) 2009 Dag-Erling Coïdan Smørgrav and
+.\" Copyright (c) 2009 Dag-Erling Smørgrav and
 .\" Marshall Kirk McKusick. All rights reserved.
 .\"
 .\" Redistribution and use in source and binary forms, with or without
diff --git a/lib/libutil/quotafile.c b/lib/libutil/quotafile.c
index 047a2a0e6c2f..1f02813dee92 100644
--- a/lib/libutil/quotafile.c
+++ b/lib/libutil/quotafile.c
@@ -1,7 +1,7 @@
 /*-
  * SPDX-License-Identifier: BSD-2-Clause
  *
- * Copyright (c) 2008 Dag-Erling Coïdan Smørgrav
+ * Copyright (c) 2008 Dag-Erling Smørgrav
  * Copyright (c) 2008 Marshall Kirk McKusick
  * All rights reserved.
  *
diff --git a/lib/libutil/tests/flopen_test.c b/lib/libutil/tests/flopen_test.c
index b86dd123eb9b..94129ebfac46 100644
--- a/lib/libutil/tests/flopen_test.c
+++ b/lib/libutil/tests/flopen_test.c
@@ -1,5 +1,5 @@
 /*-
- * Copyright (c) 2007-2009 Dag-Erling Coïdan Smørgrav
+ * Copyright (c) 2007-2009 Dag-Erling Smørgrav
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
diff --git a/lib/libutil/tests/pidfile_test.c b/lib/libutil/tests/pidfile_test.c
index 0463b7b29c87..bb11d6a19b79 100644
--- a/lib/libutil/tests/pidfile_test.c
+++ b/lib/libutil/tests/pidfile_test.c
@@ -1,5 +1,5 @@
 /*-
- * Copyright (c) 2007-2009 Dag-Erling Coïdan Smørgrav
+ * Copyright (c) 2007-2009 Dag-Erling Smørgrav
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
diff --git a/share/man/man4/aio.4 b/share/man/man4/aio.4
index e7b04544ba5e..21332a3b1037 100644
--- a/share/man/man4/aio.4
+++ b/share/man/man4/aio.4
@@ -1,5 +1,5 @@
 .\"-
-.\" Copyright (c) 2002 Dag-Erling Coïdan Smørgrav
+.\" Copyright (c) 2002 Dag-Erling Smørgrav
 .\" All rights reserved.
 .\"
 .\" Redistribution and use in source and binary forms, with or without
diff --git a/share/man/man4/coretemp.4 b/share/man/man4/coretemp.4
index 54948c2da13a..210b9d0fae62 100644
--- a/share/man/man4/coretemp.4
+++ b/share/man/man4/coretemp.4
@@ -1,5 +1,5 @@
 .\"-
-.\" Copyright (c) 2007 Dag-Erling Coïdan Smørgrav
+.\" Copyright (c) 2007 Dag-Erling Smørgrav
 .\" All rights reserved.
 .\"
 .\" Redistribution and use in source and binary forms, with or without
diff --git a/share/man/man4/ichwd.4 b/share/man/man4/ichwd.4
index f2a931405456..cc6924f7f866 100644
--- a/share/man/man4/ichwd.4
+++ b/share/man/man4/ichwd.4
@@ -1,5 +1,5 @@
 .\"-
-.\" Copyright (c) 2007 Dag-Erling Coïdan Smørgrav
+.\" Copyright (c) 2007 Dag-Erling Smørgrav
 .\" All rights reserved.
 .\"
 .\" Redistribution and use in source and binary forms, with or without
diff --git a/share/man/man4/ucycom.4 b/share/man/man4/ucycom.4
index 056b220f6d02..4f4790f51c03 100644
--- a/share/man/man4/ucycom.4
+++ b/share/man/man4/ucycom.4
@@ -1,5 +1,5 @@
 .\"-
-.\" Copyright (c) 2004 Dag-Erling Coïdan Smørgrav
+.\" Copyright (c) 2004 Dag-Erling Smørgrav
 .\" All rights reserved.
 .\"
 .\" Redistribution and use in source and binary forms, with or without
diff --git a/share/man/man9/LOCK_PROFILING.9 b/share/man/man9/LOCK_PROFILING.9
index 94f9596a63e9..e2b42cadb08b 100644
--- a/share/man/man9/LOCK_PROFILING.9
+++ b/share/man/man9/LOCK_PROFILING.9
@@ -1,5 +1,5 @@
 .\"-
-.\" Copyright (c) 2004 Dag-Erling Coïdan Smørgrav
+.\" Copyright (c) 2004 Dag-Erling Smørgrav
 .\" Copyright (c) 2005 Robert N. M. Watson
 .\" Copyright (c) 2006 Kip Macy
 .\" All rights reserved.
diff --git a/share/man/man9/pseudofs.9 b/share/man/man9/pseudofs.9
index 54b80b5b95e5..e076c398c711 100644
--- a/share/man/man9/pseudofs.9
+++ b/share/man/man9/pseudofs.9
@@ -1,5 +1,5 @@
 .\"-
-.\" Copyright (c) 2001 Dag-Erling Coïdan Smørgrav
+.\" Copyright (c) 2001 Dag-Erling Smørgrav
 .\" All rights reserved.
 .\"
 .\" Redistribution and use in source and binary forms, with or without
diff --git a/share/man/man9/sbuf.9 b/share/man/man9/sbuf.9
index 499b9b194d35..5ab045118f51 100644
--- a/share/man/man9/sbuf.9
+++ b/share/man/man9/sbuf.9
@@ -1,5 +1,5 @@
 .\"-
-.\" Copyright (c) 2000 Poul-Henning Kamp and Dag-Erling Coïdan Smørgrav
+.\" Copyright (c) 2000 Poul-Henning Kamp and Dag-Erling Smørgrav
 .\" All rights reserved.
 .\"
 .\" Redistribution and use in source and binary forms, with or without
diff --git a/share/man/man9/zone.9 b/share/man/man9/zone.9
index 24cd2b4cb2d8..a6b8d2dfedbe 100644
--- a/share/man/man9/zone.9
+++ b/share/man/man9/zone.9
@@ -1,5 +1,5 @@
 .\"-
-.\" Copyright (c) 2001 Dag-Erling Coïdan Smørgrav
+.\" Copyright (c) 2001 Dag-Erling Smørgrav
 .\" All rights reserved.
 .\"
 .\" Redistribution and use in source and binary forms, with or without
diff --git a/sys/compat/linprocfs/linprocfs.c b/sys/compat/linprocfs/linprocfs.c
index 5c812353f989..856e5aca07d6 100644
--- a/sys/compat/linprocfs/linprocfs.c
+++ b/sys/compat/linprocfs/linprocfs.c
@@ -1,7 +1,7 @@
 /*-
  * SPDX-License-Identifier: BSD-4-Clause
  *
- * Copyright (c) 2000 Dag-Erling Coïdan Smørgrav
+ * Copyright (c) 2000 Dag-Erling Smørgrav
  * Copyright (c) 1999 Pierre Beyssac
  * Copyright (c) 1993 Jan-Simon Pendry
  * Copyright (c) 1993
diff --git a/sys/dev/fb/splash_pcx.c b/sys/dev/fb/splash_pcx.c
index e7fade552d04..d2b0b7719426 100644
--- a/sys/dev/fb/splash_pcx.c
+++ b/sys/dev/fb/splash_pcx.c
@@ -3,7 +3,7 @@
  *
  * Copyright (c) 1999 Michael Smith <msmith@freebsd.org>
  * Copyright (c) 1999 Kazutaka YOKOTA <yokota@freebsd.org>
- * Copyright (c) 1999 Dag-Erling Coïdan Smørgrav
+ * Copyright (c) 1999 Dag-Erling Smørgrav
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
diff --git a/sys/dev/syscons/logo/logo_saver.c b/sys/dev/syscons/logo/logo_saver.c
index c209dc4032db..513d68be98e3 100644
--- a/sys/dev/syscons/logo/logo_saver.c
+++ b/sys/dev/syscons/logo/logo_saver.c
@@ -1,7 +1,7 @@
 /*-
  * SPDX-License-Identifier: BSD-3-Clause
  *
- * Copyright (c) 1998 Dag-Erling Coïdan Smørgrav
+ * Copyright (c) 1998 Dag-Erling Smørgrav
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
diff --git a/sys/dev/syscons/rain/rain_saver.c b/sys/dev/syscons/rain/rain_saver.c
index 06d26b6fe02d..7fce014bdbe4 100644
--- a/sys/dev/syscons/rain/rain_saver.c
+++ b/sys/dev/syscons/rain/rain_saver.c
@@ -1,7 +1,7 @@
 /*-
  * SPDX-License-Identifier: BSD-3-Clause
  *
- * Copyright (c) 1998 Dag-Erling Coïdan Smørgrav
+ * Copyright (c) 1998 Dag-Erling Smørgrav
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
diff --git a/sys/dev/syscons/warp/warp_saver.c b/sys/dev/syscons/warp/warp_saver.c
index d1c79ea82d10..54f9fd4f1749 100644
--- a/sys/dev/syscons/warp/warp_saver.c
+++ b/sys/dev/syscons/warp/warp_saver.c
@@ -1,7 +1,7 @@
 /*-
  * SPDX-License-Identifier: BSD-3-Clause
  *
- * Copyright (c) 1998 Dag-Erling Coïdan Smørgrav
+ * Copyright (c) 1998 Dag-Erling Smørgrav
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
diff --git a/sys/dev/usb/serial/ucycom.c b/sys/dev/usb/serial/ucycom.c
index d1e975516c90..664cb7f05263 100644
--- a/sys/dev/usb/serial/ucycom.c
+++ b/sys/dev/usb/serial/ucycom.c
@@ -2,7 +2,7 @@
 /*-
  * SPDX-License-Identifier: BSD-2-Clause
  *
- * Copyright (c) 2004 Dag-Erling Coïdan Smørgrav
+ * Copyright (c) 2004 Dag-Erling Smørgrav
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
diff --git a/sys/fs/pseudofs/pseudofs.c b/sys/fs/pseudofs/pseudofs.c
index 47a812262fad..eb4ca8a82456 100644
--- a/sys/fs/pseudofs/pseudofs.c
+++ b/sys/fs/pseudofs/pseudofs.c
@@ -1,7 +1,7 @@
 /*-
  * SPDX-License-Identifier: BSD-3-Clause
  *
- * Copyright (c) 2001 Dag-Erling Coïdan Smørgrav
+ * Copyright (c) 2001 Dag-Erling Smørgrav
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
diff --git a/sys/fs/pseudofs/pseudofs.h b/sys/fs/pseudofs/pseudofs.h
index c28d7cbb8078..c60dd7b339d1 100644
--- a/sys/fs/pseudofs/pseudofs.h
+++ b/sys/fs/pseudofs/pseudofs.h
@@ -1,7 +1,7 @@
 /*-
  * SPDX-License-Identifier: BSD-3-Clause
  *
- * Copyright (c) 2001 Dag-Erling Coïdan Smørgrav
+ * Copyright (c) 2001 Dag-Erling Smørgrav
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
diff --git a/sys/fs/pseudofs/pseudofs_fileno.c b/sys/fs/pseudofs/pseudofs_fileno.c
index 8d526994e299..3c1b18bdda1e 100644
--- a/sys/fs/pseudofs/pseudofs_fileno.c
+++ b/sys/fs/pseudofs/pseudofs_fileno.c
@@ -1,7 +1,7 @@
 /*-
  * SPDX-License-Identifier: BSD-3-Clause
  *
- * Copyright (c) 2001 Dag-Erling Coïdan Smørgrav
+ * Copyright (c) 2001 Dag-Erling Smørgrav
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
diff --git a/sys/fs/pseudofs/pseudofs_internal.h b/sys/fs/pseudofs/pseudofs_internal.h
index bb2187aa1ce9..cefeba8d0326 100644
--- a/sys/fs/pseudofs/pseudofs_internal.h
+++ b/sys/fs/pseudofs/pseudofs_internal.h
@@ -1,7 +1,7 @@
 /*-
  * SPDX-License-Identifier: BSD-3-Clause
  *
- * Copyright (c) 2001 Dag-Erling Coïdan Smørgrav
+ * Copyright (c) 2001 Dag-Erling Smørgrav
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
diff --git a/sys/fs/pseudofs/pseudofs_vncache.c b/sys/fs/pseudofs/pseudofs_vncache.c
index 2120398f5b2e..33023dd0d08f 100644
--- a/sys/fs/pseudofs/pseudofs_vncache.c
+++ b/sys/fs/pseudofs/pseudofs_vncache.c
@@ -1,7 +1,7 @@
 /*-
  * SPDX-License-Identifier: BSD-3-Clause
  *
- * Copyright (c) 2001 Dag-Erling Coïdan Smørgrav
+ * Copyright (c) 2001 Dag-Erling Smørgrav
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
diff --git a/sys/fs/pseudofs/pseudofs_vnops.c b/sys/fs/pseudofs/pseudofs_vnops.c
index 48adbfdb4c47..0bdfedffafcb 100644
--- a/sys/fs/pseudofs/pseudofs_vnops.c
+++ b/sys/fs/pseudofs/pseudofs_vnops.c
@@ -1,7 +1,7 @@
 /*-
  * SPDX-License-Identifier: BSD-3-Clause
  *
- * Copyright (c) 2001 Dag-Erling Coïdan Smørgrav
+ * Copyright (c) 2001 Dag-Erling Smørgrav
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
diff --git a/sys/kern/subr_sbuf.c b/sys/kern/subr_sbuf.c
index 1d361dcc1391..0ce2427f6dbb 100644
--- a/sys/kern/subr_sbuf.c
+++ b/sys/kern/subr_sbuf.c
@@ -2,7 +2,7 @@
  * SPDX-License-Identifier: BSD-2-Clause
  *
  * Copyright (c) 2000-2008 Poul-Henning Kamp
- * Copyright (c) 2000-2008 Dag-Erling Coïdan Smørgrav
+ * Copyright (c) 2000-2008 Dag-Erling Smørgrav
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
diff --git a/sys/sys/sbuf.h b/sys/sys/sbuf.h
index 201c90229732..60dcda53a461 100644
--- a/sys/sys/sbuf.h
+++ b/sys/sys/sbuf.h
@@ -2,7 +2,7 @@
  * SPDX-License-Identifier: BSD-2-Clause
  *
  * Copyright (c) 2000-2008 Poul-Henning Kamp
- * Copyright (c) 2000-2008 Dag-Erling Coïdan Smørgrav
+ * Copyright (c) 2000-2008 Dag-Erling Smørgrav
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
diff --git a/tools/regression/pthread/mutex_isowned_np/mutex_isowned_np.c b/tools/regression/pthread/mutex_isowned_np/mutex_isowned_np.c
index c1dd5159dc8a..9032c7dd3968 100644
--- a/tools/regression/pthread/mutex_isowned_np/mutex_isowned_np.c
+++ b/tools/regression/pthread/mutex_isowned_np/mutex_isowned_np.c
@@ -1,5 +1,5 @@
 /*-
- * Copyright (c) 2008 Dag-Erling Coïdan Smørgrav
+ * Copyright (c) 2008 Dag-Erling Smørgrav
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
diff --git a/tools/tools/ansify/ansify.pl b/tools/tools/ansify/ansify.pl
index 76538b8b0f7e..3664c7fcb484 100644
--- a/tools/tools/ansify/ansify.pl
+++ b/tools/tools/ansify/ansify.pl
@@ -1,6 +1,6 @@
 #!/usr/bin/perl -w
 #-
-# Copyright (c) 2005 Dag-Erling Coïdan Smørgrav
+# Copyright (c) 2005 Dag-Erling Smørgrav
 # All rights reserved.
 #
 # Redistribution and use in source and binary forms, with or without
diff --git a/tools/tools/genericize/genericize.pl b/tools/tools/genericize/genericize.pl
index 5eaf1ab2e830..6ed2d1d60e85 100755
--- a/tools/tools/genericize/genericize.pl
+++ b/tools/tools/genericize/genericize.pl
@@ -1,6 +1,6 @@
 #!/usr/bin/perl -w
 #-
-# Copyright (c) 2004 Dag-Erling Coïdan Smørgrav
+# Copyright (c) 2004 Dag-Erling Smørgrav
 # All rights reserved.
 #
 # Redistribution and use in source and binary forms, with or without
diff --git a/tools/tools/hcomp/hcomp.pl b/tools/tools/hcomp/hcomp.pl
index 280b5360d200..6d15eef08542 100644
--- a/tools/tools/hcomp/hcomp.pl
+++ b/tools/tools/hcomp/hcomp.pl
@@ -1,6 +1,6 @@
 #!/usr/bin/perl -w
 #-
-# Copyright (c) 2003 Dag-Erling Coïdan Smørgrav
+# Copyright (c) 2003 Dag-Erling Smørgrav
 # All rights reserved.
 #
 # Redistribution and use in source and binary forms, with or without
diff --git a/tools/tools/mtxstat/mtxstat.pl b/tools/tools/mtxstat/mtxstat.pl
index c755bbb5288a..eaf95cf1df54 100644
--- a/tools/tools/mtxstat/mtxstat.pl
+++ b/tools/tools/mtxstat/mtxstat.pl
@@ -1,6 +1,6 @@
 #!/usr/bin/perl -Tw
 #-
-# Copyright (c) 2002 Dag-Erling Coïdan Smørgrav
+# Copyright (c) 2002 Dag-Erling Smørgrav
 # All rights reserved.
 #
 # Redistribution and use in source and binary forms, with or without
diff --git a/tools/tools/track/track.sh b/tools/tools/track/track.sh
index 9050c9f1b183..31e93166cef2 100644
--- a/tools/tools/track/track.sh
+++ b/tools/tools/track/track.sh
@@ -1,6 +1,6 @@
 #!/bin/sh
 #-
-# Copyright (c) 2008 Dag-Erling Coïdan Smørgrav
+# Copyright (c) 2008 Dag-Erling Smørgrav
 # All rights reserved.
 #
 # Redistribution and use in source and binary forms, with or without
diff --git a/usr.bin/grep/file.c b/usr.bin/grep/file.c
index 2845f0ec225d..cd2764811776 100644
--- a/usr.bin/grep/file.c
+++ b/usr.bin/grep/file.c
@@ -4,7 +4,7 @@
 /*-
  * SPDX-License-Identifier: BSD-2-Clause
  *
- * Copyright (c) 1999 James Howard and Dag-Erling Coïdan Smørgrav
+ * Copyright (c) 1999 James Howard and Dag-Erling Smørgrav
  * Copyright (C) 2008-2010 Gabor Kovesdan <gabor@FreeBSD.org>
  * Copyright (C) 2010 Dimitry Andric <dimitry@andric.com>
  * All rights reserved.
diff --git a/usr.bin/grep/grep.c b/usr.bin/grep/grep.c
index cbf52a4df820..9f960f74dbb6 100644
--- a/usr.bin/grep/grep.c
+++ b/usr.bin/grep/grep.c
@@ -4,7 +4,7 @@
 /*-
  * SPDX-License-Identifier: BSD-2-Clause
  *
- * Copyright (c) 1999 James Howard and Dag-Erling Coïdan Smørgrav
+ * Copyright (c) 1999 James Howard and Dag-Erling Smørgrav
  * Copyright (C) 2008-2009 Gabor Kovesdan <gabor@FreeBSD.org>
  * All rights reserved.
  *
diff --git a/usr.bin/grep/grep.h b/usr.bin/grep/grep.h
index 02f612aecf1f..211fe1ae75c8 100644
--- a/usr.bin/grep/grep.h
+++ b/usr.bin/grep/grep.h
@@ -4,7 +4,7 @@
 /*-
  * SPDX-License-Identifier: BSD-2-Clause
  *
- * Copyright (c) 1999 James Howard and Dag-Erling Coïdan Smørgrav
+ * Copyright (c) 1999 James Howard and Dag-Erling Smørgrav
  * Copyright (c) 2008-2009 Gabor Kovesdan <gabor@FreeBSD.org>
  * All rights reserved.
  *
diff --git a/usr.bin/grep/queue.c b/usr.bin/grep/queue.c
index 3ef8a640b37d..6c4815992d0f 100644
--- a/usr.bin/grep/queue.c
+++ b/usr.bin/grep/queue.c
@@ -3,7 +3,7 @@
 /*-
  * SPDX-License-Identifier: BSD-2-Clause
  *
- * Copyright (c) 1999 James Howard and Dag-Erling Coïdan Smørgrav
+ * Copyright (c) 1999 James Howard and Dag-Erling Smørgrav
  * All rights reserved.
  * Copyright (c) 2020 Kyle Evans <kevans@FreeBSD.org>
  *
diff --git a/usr.bin/grep/util.c b/usr.bin/grep/util.c
index 68bfd504279e..1805cc74bfc6 100644
--- a/usr.bin/grep/util.c
+++ b/usr.bin/grep/util.c
@@ -4,7 +4,7 @@
 /*-
  * SPDX-License-Identifier: BSD-2-Clause
  *
- * Copyright (c) 1999 James Howard and Dag-Erling Coïdan Smørgrav
+ * Copyright (c) 1999 James Howard and Dag-Erling Smørgrav
  * Copyright (C) 2008-2010 Gabor Kovesdan <gabor@FreeBSD.org>
  * Copyright (C) 2017 Kyle Evans <kevans@FreeBSD.org>
  * All rights reserved.
diff --git a/usr.bin/logins/logins.1 b/usr.bin/logins/logins.1
index bdd00ed96a03..2b6f27d71f1d 100644
--- a/usr.bin/logins/logins.1
+++ b/usr.bin/logins/logins.1
@@ -1,5 +1,5 @@
 .\"-
-.\" Copyright (c) 2004 Dag-Erling Coïdan Smørgrav
+.\" Copyright (c) 2004 Dag-Erling Smørgrav
 .\" All rights reserved.
 .\"
 .\" Redistribution and use in source and binary forms, with or without
diff --git a/usr.bin/logins/logins.c b/usr.bin/logins/logins.c
index aef7eb7aba5b..683abf321547 100644
--- a/usr.bin/logins/logins.c
+++ b/usr.bin/logins/logins.c
@@ -1,7 +1,7 @@
 /*-
  * SPDX-License-Identifier: BSD-3-Clause
  *
- * Copyright (c) 2004 Dag-Erling Coïdan Smørgrav
+ * Copyright (c) 2004 Dag-Erling Smørgrav
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
diff --git a/usr.bin/sockstat/sockstat.1 b/usr.bin/sockstat/sockstat.1
index e6eb67c2e5a2..2e1b06688afa 100644
--- a/usr.bin/sockstat/sockstat.1
+++ b/usr.bin/sockstat/sockstat.1
@@ -1,5 +1,5 @@
 .\"-
-.\" Copyright (c) 1999 Dag-Erling Coïdan Smørgrav
+.\" Copyright (c) 1999 Dag-Erling Smørgrav
 .\" All rights reserved.
 .\"
 .\" Redistribution and use in source and binary forms, with or without
diff --git a/usr.bin/sockstat/sockstat.c b/usr.bin/sockstat/sockstat.c
index 378fbbf0fef5..52c494f03045 100644
--- a/usr.bin/sockstat/sockstat.c
+++ b/usr.bin/sockstat/sockstat.c
@@ -1,7 +1,7 @@
 /*-
  * SPDX-License-Identifier: BSD-2-Clause
  *
- * Copyright (c) 2002 Dag-Erling Coïdan Smørgrav
+ * Copyright (c) 2002 Dag-Erling Smørgrav
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
diff --git a/usr.sbin/acpi/acpiconf/acpiconf.8 b/usr.sbin/acpi/acpiconf/acpiconf.8
index e337de5ad27c..24af8b5c8719 100644
--- a/usr.sbin/acpi/acpiconf/acpiconf.8
+++ b/usr.sbin/acpi/acpiconf/acpiconf.8
@@ -1,5 +1,5 @@
 .\"-
-.\" Copyright (c) 2000 Dag-Erling Coïdan Smørgrav
+.\" Copyright (c) 2000 Dag-Erling Smørgrav
 .\" All rights reserved.
 .\"
 .\" Redistribution and use in source and binary forms, with or without
diff --git a/usr.sbin/chkgrp/chkgrp.8 b/usr.sbin/chkgrp/chkgrp.8
index 20d4ee9a0349..3837e5fe6803 100644
--- a/usr.sbin/chkgrp/chkgrp.8
+++ b/usr.sbin/chkgrp/chkgrp.8
@@ -1,4 +1,4 @@
-.\" Copyright (c) 1998 Dag-Erling Coïdan Smørgrav
+.\" Copyright (c) 1998 Dag-Erling Smørgrav
 .\" All rights reserved.
 .\"
 .\" Redistribution and use in source and binary forms, with or without
diff --git a/usr.sbin/chkgrp/chkgrp.c b/usr.sbin/chkgrp/chkgrp.c
index 650448d9e40b..69eff6e7574d 100644
--- a/usr.sbin/chkgrp/chkgrp.c
+++ b/usr.sbin/chkgrp/chkgrp.c
@@ -1,7 +1,7 @@
 /*-
  * SPDX-License-Identifier: BSD-3-Clause
  *
- * Copyright (c) 1998 Dag-Erling Coïdan Smørgrav
+ * Copyright (c) 1998 Dag-Erling Smørgrav
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
diff --git a/usr.sbin/kldxref/kldxref.8 b/usr.sbin/kldxref/kldxref.8
index 4a06e62e7feb..0b141bb18a1c 100644
--- a/usr.sbin/kldxref/kldxref.8
+++ b/usr.sbin/kldxref/kldxref.8
@@ -1,6 +1,6 @@
 .\"-
 .\" Copyright (c) 2001 Boris Popov
-.\" Copyright (c) 2001 Dag-Erling Coïdan Smørgrav
+.\" Copyright (c) 2001 Dag-Erling Smørgrav
 .\" All rights reserved.
 .\"
 .\" Redistribution and use in source and binary forms, with or without