diff --git a/man2/accept.2 b/man2/accept.2
index 2306de79f..030ed8be8 100644
--- a/man2/accept.2
+++ b/man2/accept.2
@@ -275,7 +275,7 @@ Portable programs should not rely on inheritance or non-inheritance
 of file status flags and always explicitly set all required flags on
 the socket returned from
 .BR accept ().
-.SH NOTE
+.SH NOTES
 The third argument of
 .BR accept ()
 was originally declared as an `int *' (and is that under libc4 and libc5
diff --git a/man2/bind.2 b/man2/bind.2
index 97b1af74c..9a6d03faa 100644
--- a/man2/bind.2
+++ b/man2/bind.2
@@ -272,7 +272,7 @@ function first appeared in 4.2BSD).
 .\" and
 .\" .B EISDIR
 .\" Unix-domain error conditions.
-.SH NOTE
+.SH NOTES
 The third argument of
 .BR bind ()
 is in reality an
diff --git a/man2/cacheflush.2 b/man2/cacheflush.2
index 881d6a5ff..7155a6d25 100644
--- a/man2/cacheflush.2
+++ b/man2/cacheflush.2
@@ -65,6 +65,6 @@ and
 .I nbytes
 arguments.
 Therefore, the whole cache is always flushed.
-.SH NOTE
+.SH NOTES
 This system call is only available on MIPS based systems.
 It should not be used in programs intended to be portable.
diff --git a/man2/connect.2 b/man2/connect.2
index 12f7fc5ba..2d8b5b729 100644
--- a/man2/connect.2
+++ b/man2/connect.2
@@ -235,7 +235,7 @@ function first appeared in 4.2BSD), POSIX.1-2001.
 .\" .BR ENOSR .
 .\" It also
 .\" documents many additional error conditions not described here.
-.SH NOTE
+.SH NOTES
 The third argument of
 .BR connect ()
 is in reality an
diff --git a/man2/getpeername.2 b/man2/getpeername.2
index 0ec677dab..d68a0dd9c 100644
--- a/man2/getpeername.2
+++ b/man2/getpeername.2
@@ -92,7 +92,7 @@ is a file, not a socket.
 SVr4, 4.4BSD (the
 .BR getpeername ()
 function call first appeared in 4.2BSD), POSIX.1-2001.
-.SH NOTE
+.SH NOTES
 The third argument of
 .BR getpeername ()
 is in reality an
diff --git a/man2/getsockname.2 b/man2/getsockname.2
index 938439b77..6df4787c8 100644
--- a/man2/getsockname.2
+++ b/man2/getsockname.2
@@ -92,7 +92,7 @@ SVr4, 4.4BSD (the
 function call appeared in 4.2BSD), POSIX.1-2001.
 .\" SVr4 documents additional ENOMEM
 .\" and ENOSR error codes.
-.SH NOTE
+.SH NOTES
 The third argument of
 .BR getsockname ()
 is in reality an `int *' (and this is what 4.x BSD and libc4 and libc5 have).
diff --git a/man2/getsockopt.2 b/man2/getsockopt.2
index 63731ddf4..adce5df9a 100644
--- a/man2/getsockopt.2
+++ b/man2/getsockopt.2
@@ -170,7 +170,7 @@ POSIX.1-2001.
 .\" not document the
 .\" .BR SO_SNDLOWAT ", " SO_RCVLOWAT ", " SO_SNDTIMEO ", " SO_RCVTIMEO
 .\" options
-.SH NOTE
+.SH NOTES
 The
 .I optlen
 argument of
diff --git a/man2/gettimeofday.2 b/man2/gettimeofday.2
index 9c2f8ef1b..280cf72ed 100644
--- a/man2/gettimeofday.2
+++ b/man2/gettimeofday.2
@@ -212,7 +212,7 @@ The calling process has insufficient privilege to call
 under Linux the
 .B CAP_SYS_TIME
 capability is required.
-.SH NOTE
+.SH NOTES
 The prototype for
 .BR settimeofday ()
 and the defines for
diff --git a/man2/ioctl.2 b/man2/ioctl.2
index e05c1e2da..d608ee252 100644
--- a/man2/ioctl.2
+++ b/man2/ioctl.2
@@ -112,7 +112,7 @@ The specified request does not apply to the kind of object that the
 descriptor
 .I d
 references.
-.SH NOTE
+.SH NOTES
 In order to use this call, one needs an open file descriptor.
 Often the
 .BR open (2)
diff --git a/man2/open.2 b/man2/open.2
index d68314959..b9e6a26c1 100644
--- a/man2/open.2
+++ b/man2/open.2
@@ -514,7 +514,7 @@ The
 flag was specified, and an incompatible lease was held on the file
 (see
 .BR fcntl (2)).
-.SH NOTE
+.SH NOTES
 Under Linux, the O_NONBLOCK flag indicates that one wants to open
 but does not necessarily have the intention to read or write.
 This is typically used to open devices in order to get a file descriptor
diff --git a/man2/socket.2 b/man2/socket.2
index 2d8168050..c76491813 100644
--- a/man2/socket.2
+++ b/man2/socket.2
@@ -323,7 +323,7 @@ appeared in 4.2BSD.
 It is generally portable to/from
 non-BSD systems supporting clones of the BSD socket layer (including
 System V variants).
-.SH NOTE
+.SH NOTES
 The manifest constants used under 4.x BSD for protocol families
 are PF_UNIX, PF_INET, etc., while AF_UNIX etc. are used for address
 families.
diff --git a/man2/sysfs.2 b/man2/sysfs.2
index 501cad68b..0c4ff278e 100644
--- a/man2/sysfs.2
+++ b/man2/sysfs.2
@@ -89,7 +89,7 @@ is out-of-bounds;
 is invalid.
 .SH "CONFORMING TO"
 SVr4.
-.SH NOTE
+.SH NOTES
 On Linux with the
 .I proc
 filesystem mounted on
diff --git a/man3/addseverity.3 b/man3/addseverity.3
index db965aa3c..28b2f62a9 100644
--- a/man3/addseverity.3
+++ b/man3/addseverity.3
@@ -45,7 +45,7 @@ Upon error, the return value is
 .BR MM_NOTOK .
 Possible errors include: out of memory, attempt to remove a
 nonexistent or default severity class.
-.SH NOTE
+.SH NOTES
 New severity classes can also be added by setting the environment variable
 .BR SEV_LEVEL .
 .SH "CONFORMING TO"
diff --git a/man3/aio_suspend.3 b/man3/aio_suspend.3
index 53d81c4b7..dd5228906 100644
--- a/man3/aio_suspend.3
+++ b/man3/aio_suspend.3
@@ -67,7 +67,7 @@ had completed.
 .B EINTR
 The call was ended by signal.
 (Possibly the completion signal of one of the operations we were waiting for.)
-.SH NOTE
+.SH NOTES
 One can achieve polling by using a non-NULL
 .I timeout
 that specifies a zero time interval.
diff --git a/man3/bstring.3 b/man3/bstring.3
index 6883ca6ce..ab4560977 100644
--- a/man3/bstring.3
+++ b/man3/bstring.3
@@ -65,7 +65,7 @@ The byte string functions perform operations on strings (byte arrays)
 that are not necessarily null-terminated.
 See the individual man pages
 for descriptions of each function.
-.SH NOTE
+.SH NOTES
 The functions
 .BR bcmp (),
 .BR bcopy ()
diff --git a/man3/cabs.3 b/man3/cabs.3
index 9363bf2c7..94f1162aa 100644
--- a/man3/cabs.3
+++ b/man3/cabs.3
@@ -19,7 +19,7 @@ The
 .BR cabs ()
 function returns the absolute value of the complex number z. The
 result is a real number.
-.SH NOTE
+.SH NOTES
 The function is actually an alias for hypot(a,b) = sqrt(a*a+b*b).
 .SH "CONFORMING TO"
 C99
diff --git a/man3/cimag.3 b/man3/cimag.3
index 269952872..1b8e6b364 100644
--- a/man3/cimag.3
+++ b/man3/cimag.3
@@ -20,8 +20,9 @@ The
 function returns the imaginary part of the complex number z.
 .LP
 One has z = creal(z) + I * cimag(z).
-.SH NOTE
-gcc also supports __imag__. That is a GNU extension.
+.SH NOTES
+gcc also supports __imag__.
+That is a GNU extension.
 .SH "CONFORMING TO"
 C99
 .SH "SEE ALSO"
diff --git a/man3/clock_getres.3 b/man3/clock_getres.3
index 33e4e0837..9c4547eca 100644
--- a/man3/clock_getres.3
+++ b/man3/clock_getres.3
@@ -138,10 +138,10 @@ specified is not supported on this system.
 .B EPERM
 .BR clock_settime ()
 does not have permission to set the clock indicated.
-.SH NOTE
+.SH NOTES
 Most systems require the program be linked with the librt
 library to use these functions.
-.SH NOTE for SMP systems
+.SS Note for SMP systems
 The
 .B CLOCK_PROCESS_CPUTIME_ID
 and
diff --git a/man3/cproj.3 b/man3/cproj.3
index 2a7e2e909..1fee9a919 100644
--- a/man3/cproj.3
+++ b/man3/cproj.3
@@ -22,7 +22,7 @@ Every complex infinite value is projected to a single infinite value,
 namely to positive infinity on the real axis.
 .SH "CONFORMING TO"
 C99
-.SH NOTE
+.SH NOTES
 The glibc implementation is broken and does something entirely different.
 .SH "SEE ALSO"
 .BR cabs (3),
diff --git a/man3/creal.3 b/man3/creal.3
index 8c670b984..d18fb1548 100644
--- a/man3/creal.3
+++ b/man3/creal.3
@@ -20,8 +20,9 @@ The
 function returns the real part of the complex number z.
 .LP
 One has z = creal(z) + I * cimag(z).
-.SH NOTE
-The gcc supports also __real__. That is a GNU extension.
+.SH NOTES
+The gcc supports also __real__.
+That is a GNU extension.
 .SH "CONFORMING TO"
 C99
 .SH "SEE ALSO"
diff --git a/man3/encrypt.3 b/man3/encrypt.3
index b3c0458ad..eeb458fe7 100644
--- a/man3/encrypt.3
+++ b/man3/encrypt.3
@@ -135,8 +135,8 @@ main(void)
     encrypt(txt, 1);   /* decode */
 }
 .fi
-.SH "NOTE"
-In glibc2.2 these functions use the DES algorithm.
+.SH NOTES
+In glibc 2.2 these functions use the DES algorithm.
 .SH "CONFORMING TO"
 The functions
 .BR encrypt ()
diff --git a/man3/finite.3 b/man3/finite.3
index 8ae016dce..c7256e068 100644
--- a/man3/finite.3
+++ b/man3/finite.3
@@ -63,7 +63,7 @@ The
 .BR isinf ()
 functions return 1 if \fIx\fP is plus infinity, \-1 is \fIx\fP
 is minus infinity, and 0 otherwise.
-.SH NOTE
+.SH NOTES
 Note that these functions are obsolete.
 C99 defines macros
 isfinite(), isinf() and isnan() (for all types) replacing them.
diff --git a/man3/fpclassify.3 b/man3/fpclassify.3
index a1f87ccce..0cb94ca39 100644
--- a/man3/fpclassify.3
+++ b/man3/fpclassify.3
@@ -74,7 +74,7 @@ returns 1 if
 is positive infinity, and \-1 if
 .I x
 is negative infinity.
-.SH NOTE
+.SH NOTES
 In glibc 2.01 and earlier,
 .BR isinf ()
 returns a non-zero value (actually: 1) if
diff --git a/man3/getnameinfo.3 b/man3/getnameinfo.3
index 4b85c6b63..df08fe094 100644
--- a/man3/getnameinfo.3
+++ b/man3/getnameinfo.3
@@ -174,7 +174,7 @@ suitable for error reporting.
 /etc/nsswitch.conf
 .br
 /etc/resolv.conf
-.SH NOTE
+.SH NOTES
 In order to assist the programmer in choosing reasonable sizes
 for the supplied buffers,
 .I <netdb.h>
diff --git a/man3/inet.3 b/man3/inet.3
index 5d4006257..108b209d0 100644
--- a/man3/inet.3
+++ b/man3/inet.3
@@ -135,7 +135,7 @@ struct in_addr {
 Note that on the i80x86 the host byte order is Least Significant Byte
 first (little endian), whereas the network byte order, as used on the
 Internet, is Most Significant Byte first (big endian).
-.SH NOTE
+.SH NOTES
 When you using numbers-and-dots notation for addresses,
 be aware that each number will be interpreted as octal
 if preceded by a 0 and as hexadecimal if preceded by 0x.
diff --git a/man3/isalpha.3 b/man3/isalpha.3
index ed0b45d45..96ad3f8cd 100644
--- a/man3/isalpha.3
+++ b/man3/isalpha.3
@@ -151,7 +151,7 @@ is a BSD extension
 and is also an SVr4 extension.
 .BR isblank ()
 conforms to POSIX.1-2001 and C99 7.4.1.3.
-.SH NOTE
+.SH NOTES
 The details of what characters belong into which class depend on the current
 locale.
 For example,
diff --git a/man3/isgreater.3 b/man3/isgreater.3
index f7df3afb6..650e222d5 100644
--- a/man3/isgreater.3
+++ b/man3/isgreater.3
@@ -53,7 +53,7 @@ true if x or y is NaN.
 .TP
 isunordered()
 is true if x or y is NaN and false otherwise.
-.SH NOTE
+.SH NOTES
 Not all hardware supports these functions, and where it doesn't, they
 will be emulated by macros.
 This will give you a performance penalty.
diff --git a/man3/key_setsecret.3 b/man3/key_setsecret.3
index 66cc8f638..388e10dad 100644
--- a/man3/key_setsecret.3
+++ b/man3/key_setsecret.3
@@ -53,10 +53,9 @@ The function
 .BR key_secretkey_is_set ()
 can be used to determine whether a key has been
 set for the effective UID of the calling process.
-.SH NOTE
+.SH NOTES
 Note that we talk about two types of encryption here.
-One is
-asymmetric using a public and secret key.
+One is asymmetric using a public and secret key.
 The other is symmetric, the
 64-bit DES.
 .br
diff --git a/man3/login.3 b/man3/login.3
index fd34fc342..985c629ca 100644
--- a/man3/login.3
+++ b/man3/login.3
@@ -86,7 +86,7 @@ The
 .BR logout ()
 function returns 1 if the entry was successfully written to the
 database, or 0 if an error occurred.
-.SH NOTE
+.SH NOTES
 These functions are included in libutil, hence you'll need to add
 .B \-lutil
 to your compiler command line.
diff --git a/man3/mktemp.3 b/man3/mktemp.3
index 8f3f0df6e..5dcde48e7 100644
--- a/man3/mktemp.3
+++ b/man3/mktemp.3
@@ -65,7 +65,7 @@ is made an empty string.
 The last six characters of \fItemplate\fP were not XXXXXX.
 .SH "CONFORMING TO"
 4.3BSD, POSIX.1-2001.
-.SH NOTE
+.SH NOTES
 The prototype is in
 .I <unistd.h>
 for libc4, libc5, glibc1; glibc2 follows the Single Unix Specification
diff --git a/man3/mtrace.3 b/man3/mtrace.3
index e98c12923..8ed5e9abb 100644
--- a/man3/mtrace.3
+++ b/man3/mtrace.3
@@ -32,7 +32,7 @@ This file must be writable to the user or
 .BR mtrace ()
 will do nothing.
 If the file is not empty it will be truncated.
-.SH NOTE
+.SH NOTES
 The output of
 .BR mtrace ()
 will be ASCII but not in a friendly format.
diff --git a/man3/perror.3 b/man3/perror.3
index 2fd75bf54..fa3852d13 100644
--- a/man3/perror.3
+++ b/man3/perror.3
@@ -108,7 +108,7 @@ The externals
 and
 .I sys_errlist
 conform to BSD.
-.SH NOTE
+.SH NOTES
 The externals
 .I sys_nerr
 and
diff --git a/man3/pow10.3 b/man3/pow10.3
index 4e48864a8..aaf977b1a 100644
--- a/man3/pow10.3
+++ b/man3/pow10.3
@@ -43,7 +43,7 @@ function  returns the value of 10 raised to the
 power \fIx\fP.
 .SH "CONFORMING TO"
 This is a GNU extension.
-.SH NOTE
+.SH NOTES
 These functions are identical to the functions listed under
 .BR exp10 (3).
 .SH "SEE ALSO"
diff --git a/man3/qsort.3 b/man3/qsort.3
index 87539018b..df1a34c41 100644
--- a/man3/qsort.3
+++ b/man3/qsort.3
@@ -64,7 +64,7 @@ The
 function returns no value.
 .SH "CONFORMING TO"
 SVr4, 4.3BSD, C89, C99.
-.SH NOTE
+.SH NOTES
 Library routines suitable for use as the
 .I compar
 argument include
diff --git a/man3/remove.3 b/man3/remove.3
index 0882c0aaf..50e9ea60d 100644
--- a/man3/remove.3
+++ b/man3/remove.3
@@ -72,7 +72,7 @@ C89, C99, 4.3BSD, POSIX.1-2001.
 .SH BUGS
 Infelicities in the protocol underlying NFS can cause the unexpected
 disappearance of files which are still being used.
-.SH NOTE
+.SH NOTES
 Under libc4 and libc5,
 .BR remove ()
 was an alias for
diff --git a/man4/console_codes.4 b/man4/console_codes.4
index 419091a78..ebc53cc94 100644
--- a/man4/console_codes.4
+++ b/man4/console_codes.4
@@ -575,7 +575,7 @@ http://invisible-island.net/vttest/
 demonstrates many of these control sequences.
 The \fIxterm\fP source distribution also contains sample
 scripts which exercise other features.
-.SH NOTE
+.SH NOTES
 ESC 8 (DECRC) is not able to restore the character set changed with
 ESC %.
 .SH BUGS
diff --git a/man5/hosts.5 b/man5/hosts.5
index 522c0954a..5c0191a4e 100644
--- a/man5/hosts.5
+++ b/man5/hosts.5
@@ -91,10 +91,10 @@ advantage.
 146.82.138.7    master.debian.org      master
 209.237.226.90  www.opensource.org
 .fi
-.SH "NOTE"
+.SH NOTES
 Modifications to this file normally take effect immediately,
 except in cases where the file is cached by applications.
-.SH "HISTORICAL NOTES"
+.SS "Historical Notes"
 RFC\ 952 gave the original format for the host table, though it has
 since changed.
 
diff --git a/man5/passwd.5 b/man5/passwd.5
index 48b2ca2dd..f6d7595a4 100644
--- a/man5/passwd.5
+++ b/man5/passwd.5
@@ -108,7 +108,7 @@ If set to a non-existing executable, the user will be unable to login
 through
 .BR login (1).
 .RE
-.SH NOTE
+.SH NOTES
 If you want to create
 user groups, their GIDs must be equal and there must be an entry in
 \fI/etc/group\fP, or no group will exist.
diff --git a/man7/koi8-r.7 b/man7/koi8-r.7
index ff00ba605..6ec633e50 100644
--- a/man7/koi8-r.7
+++ b/man7/koi8-r.7
@@ -36,7 +36,7 @@ services at least all over the ex-SU territory.
 .PP
 KOI8-R is defined by RFC\ 1489 (Registration of a Cyrillic Character
 Set).
-.SH NOTE
+.SH NOTES
 KOI8-R was designed for mixed Russian/English texts and covers
 only Russian Cyrillic characters, so if you're looking for Ukrainian,
 Byelorussian, etc.
diff --git a/man8/zic.8 b/man8/zic.8
index 898f7be8e..1abe554de 100644
--- a/man8/zic.8
+++ b/man8/zic.8
@@ -403,7 +403,7 @@ or
 .q Rolling
 if the leap second time given by the other fields should be interpreted as
 local wall clock time.
-.SH NOTE
+.SH NOTES
 For areas with more than two types of local time,
 you may need to use local standard time in the
 .B AT