13 files changed, 14 insertions, 13 deletions
diff --git a/share/man/man3/pthread_attr.3 b/share/man/man3/pthread_attr.3
index 54d4344e6ae0..5412c5913328 100644
--- a/share/man/man3/pthread_attr.3
+++ b/share/man/man3/pthread_attr.3
@@ -1,4 +1,4 @@
-.\" Copyright (C) 2000 Jason Evans <jasone@freebsd.org>.
+.\" Copyright (C) 2000 Jason Evans <jasone@FreeBSD.org>.
 .\" All rights reserved.
 .\"
 .\" Redistribution and use in source and binary forms, with or without
diff --git a/share/man/man3/pthread_condattr.3 b/share/man/man3/pthread_condattr.3
index d117c7505642..28df565c60f2 100644
--- a/share/man/man3/pthread_condattr.3
+++ b/share/man/man3/pthread_condattr.3
@@ -1,4 +1,4 @@
-.\" Copyright (C) 2000 Jason Evans <jasone@freebsd.org>.
+.\" Copyright (C) 2000 Jason Evans <jasone@FreeBSD.org>.
 .\" All rights reserved.
 .\"
 .\" Redistribution and use in source and binary forms, with or without
diff --git a/share/man/man3/pthread_kill.3 b/share/man/man3/pthread_kill.3
index a18a969cdd75..7a33cf6c6016 100644
--- a/share/man/man3/pthread_kill.3
+++ b/share/man/man3/pthread_kill.3
@@ -1,4 +1,4 @@
-.\" Copyright (C) 2000 Jason Evans <jasone@freebsd.org>.
+.\" Copyright (C) 2000 Jason Evans <jasone@FreeBSD.org>.
 .\" All rights reserved.
 .\"
 .\" Redistribution and use in source and binary forms, with or without
diff --git a/share/man/man3/pthread_mutexattr.3 b/share/man/man3/pthread_mutexattr.3
index 555cdd4735db..707984606094 100644
--- a/share/man/man3/pthread_mutexattr.3
+++ b/share/man/man3/pthread_mutexattr.3
@@ -1,4 +1,4 @@
-.\" Copyright (C) 2000 Jason Evans <jasone@freebsd.org>.
+.\" Copyright (C) 2000 Jason Evans <jasone@FreeBSD.org>.
 .\" All rights reserved.
 .\"
 .\" Redistribution and use in source and binary forms, with or without
diff --git a/share/man/man3/pthread_schedparam.3 b/share/man/man3/pthread_schedparam.3
index 96287e5b6e7b..50c556f2824a 100644
--- a/share/man/man3/pthread_schedparam.3
+++ b/share/man/man3/pthread_schedparam.3
@@ -1,4 +1,4 @@
-.\" Copyright (C) 2000 Jason Evans <jasone@freebsd.org>.
+.\" Copyright (C) 2000 Jason Evans <jasone@FreeBSD.org>.
 .\" All rights reserved.
 .\"
 .\" Redistribution and use in source and binary forms, with or without
diff --git a/share/man/man3/pthread_sigmask.3 b/share/man/man3/pthread_sigmask.3
index 6af3464edc76..2b23d3ba8149 100644
--- a/share/man/man3/pthread_sigmask.3
+++ b/share/man/man3/pthread_sigmask.3
@@ -1,4 +1,4 @@
-.\" Copyright (C) 2000 Jason Evans <jasone@freebsd.org>.
+.\" Copyright (C) 2000 Jason Evans <jasone@FreeBSD.org>.
 .\" All rights reserved.
 .\"
 .\" Redistribution and use in source and binary forms, with or without
diff --git a/share/man/man4/man4.i386/svr4.4 b/share/man/man4/man4.i386/svr4.4
index 08a04fb4a6c3..be719a0075c5 100644
--- a/share/man/man4/man4.i386/svr4.4
+++ b/share/man/man4/man4.i386/svr4.4
@@ -173,7 +173,7 @@ to automatically create the
 environment do not exist.
 .Xr tar 1
 archives containing pre-populated trees can be obtained from
-.Pa http://people.freebsd.org/~newton/freebsd-svr4/ .
+.Pa http://people.FreeBSD.org/~newton/freebsd-svr4/ .
 .Pp
 Extensive testing has only really been carried out with Solaris 2.x binaries,
 with anecdotal reports of limited success coming from testers with
diff --git a/share/man/man4/ng_mppc.4 b/share/man/man4/ng_mppc.4
index c0888c9fc9de..fbd6d53253cb 100644
--- a/share/man/man4/ng_mppc.4
+++ b/share/man/man4/ng_mppc.4
@@ -190,4 +190,4 @@ However, Microsoft combined both compression and encryption into their
 .%O RFC 2637
 .Re
 .Sh AUTHORS
-Archie Cobbs <archie@FreeBSD.org>
+.An Archie Cobbs Aq archie@FreeBSD.org
diff --git a/share/man/man4/pass.4 b/share/man/man4/pass.4
index b55c5634e455..c192899c80fa 100644
--- a/share/man/man4/pass.4
+++ b/share/man/man4/pass.4
@@ -107,7 +107,7 @@ None.
 The CAM passthrough driver first appeared in
 .Fx 3.0 .
 .Sh AUTHORS
-.An Kenneth Merry Aq ken@FreeBSD.ORG
+.An Kenneth Merry Aq ken@FreeBSD.org
 .Sh BUGS
 It might be nice to have a way to asynchronously send CCBs through the
 passthrough driver.  This would probably require some sort of read/write
diff --git a/share/man/man4/pci.4 b/share/man/man4/pci.4
index d31bd173a44d..bc2430fb7877 100644
--- a/share/man/man4/pci.4
+++ b/share/man/man4/pci.4
@@ -284,7 +284,7 @@ Support for device listing and matching was re-implemented by
 Kenneth Merry, and first appeared in
 .Fx 3.0 .
 .Sh AUTHORS
-.An Kenneth Merry Aq ken@FreeBSD.ORG
+.An Kenneth Merry Aq ken@FreeBSD.org
 .Sh BUGS
 It isn't possible for users to specify an accurate offset into the device
 list without calling the
diff --git a/share/man/man5/elf.5 b/share/man/man5/elf.5
index f31fe2b4b6d4..337470bfa617 100644
--- a/share/man/man5/elf.5
+++ b/share/man/man5/elf.5
@@ -246,7 +246,8 @@ Monterey project ABI.
 .It Dv ELFOSABI_IRIX
 IRIX operating system ABI.
 .It Dv ELFOSABI_FREEBSD
-FreeBSD operating system ABI.
+.Fx
+operating system ABI.
 .It Dv ELFOSABI_TRU64
 TRU64 UNIX operating system ABI.
 .It Dv ELFOSABI_ARM
diff --git a/share/man/man9/condvar.9 b/share/man/man9/condvar.9
index 0288fb33f0e4..79b2de2706c5 100644
--- a/share/man/man9/condvar.9
+++ b/share/man/man9/condvar.9
@@ -1,5 +1,5 @@
 .\"
-.\" Copyright (C) 2000 Jason Evans <jasone@freebsd.org>. All rights reserved.
+.\" Copyright (C) 2000 Jason Evans <jasone@FreeBSD.org>. 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/share/man/man9/sx.9 b/share/man/man9/sx.9
index acb088052479..2fa030224838 100644
--- a/share/man/man9/sx.9
+++ b/share/man/man9/sx.9
@@ -1,5 +1,5 @@
 .\"
-.\" Copyright (C) 2001 Jason Evans <jasone@freebsd.org>.  All rights reserved.
+.\" Copyright (C) 2001 Jason Evans <jasone@FreeBSD.org>.  All rights reserved.
 .\"
 .\" Redistribution and use in source and binary forms, with or without
 .\" modification, are permitted provided that the following conditions