21 files changed, 30 insertions, 26 deletions
diff --git a/Changes b/Changes
index 0553481e42..3c85109d17 100644
--- a/Changes
+++ b/Changes
@@ -122,7 +122,11 @@ Various pages
 
 Various pages
     Michael Kerrisk
-        ERRORS: Place errors in alphabetical order
+        SEE ALSO: Place entries in correct order
+
+Various pages
+    Michael Kerrisk
+        Add section number to references to functions documented in other pages
 
 Various pages
     Michael Kerrisk
diff --git a/man2/clone.2 b/man2/clone.2
index c7d4c09d2d..fea94f311b 100644
--- a/man2/clone.2
+++ b/man2/clone.2
@@ -978,7 +978,7 @@ In particular,
 if a signal is delivered to the child immediately after the
 .BR clone ()
 call, then a call to
-.BR getpid ()
+.BR getpid (2)
 in a handler for the signal may return the PID
 of the calling process ("the parent"),
 if the clone wrapper has not yet had a chance to update the PID
@@ -986,7 +986,7 @@ cache in the child.
 (This discussion ignores the case where the child was created using
 .BR CLONE_THREAD ,
 when
-.BR getpid ()
+.BR getpid (2)
 .I should
 return the same value in the child and in the process that called
 .BR clone (),
diff --git a/man2/mount.2 b/man2/mount.2
index dba0b64cb9..c088b79f27 100644
--- a/man2/mount.2
+++ b/man2/mount.2
@@ -430,13 +430,13 @@ the mount namespace is preserved across an
 
 A process can obtain a private mount namespace if:
 it was created using the
-.BR clone ()
+.BR clone (2)
 .BR CLONE_NEWNS
 flag,
 in which case its new namespace is initialized to be a
 .I copy
 of the namespace of the process that called
-.BR clone ();
+.BR clone (2);
 or it calls
 .BR unshare (2)
 with the
diff --git a/man2/nanosleep.2 b/man2/nanosleep.2
index 6ad3a6cfe8..f1bbcff590 100644
--- a/man2/nanosleep.2
+++ b/man2/nanosleep.2
@@ -158,7 +158,7 @@ clock.
 .\" Subject: nanosleep() uses CLOCK_MONOTONIC, should be CLOCK_REALTIME?
 .\" Date: 2008-06-22 07:35:41 GMT
 This probably does not matter, since the POSIX.1 specification for
-.BR clock_settime ()
+.BR clock_settime (2)
 says that discontinuous changes in
 .B CLOCK_REALTIME
 should not affect
@@ -168,7 +168,7 @@ should not affect
 Setting the value of the
 .B CLOCK_REALTIME
 clock via
-.BR clock_settime ()
+.BR clock_settime (2)
 shall
 have no effect on threads that are blocked waiting for a relative time
 service based upon this clock, including the
diff --git a/man2/sigaltstack.2 b/man2/sigaltstack.2
index b9cd128cde..235e3acccc 100644
--- a/man2/sigaltstack.2
+++ b/man2/sigaltstack.2
@@ -192,7 +192,7 @@ A successful call to
 removes any existing alternate
 signal stack.
 A child process created via
-.BR fork ()
+.BR fork (2)
 inherits a copy of its parent's alternate signal stack settings.
 .P
 .BR sigaltstack ()
diff --git a/man2/statfs.2 b/man2/statfs.2
index bcd8a0e86d..f6e3149b99 100644
--- a/man2/statfs.2
+++ b/man2/statfs.2
@@ -256,7 +256,7 @@ when NFS-exported, and giving it out is a security concern.
 Under some operating systems the
 .I fsid
 can be used as second argument to the
-.BR sysfs ()
+.BR sysfs (2)
 system call.
 .SH "SEE ALSO"
 .BR stat (2),
diff --git a/man2/timer_settime.2 b/man2/timer_settime.2
index fe0ced8e59..b6b9cde541 100644
--- a/man2/timer_settime.2
+++ b/man2/timer_settime.2
@@ -80,7 +80,7 @@ structure that allows a time value to be specified
 in seconds and nanoseconds.
 These time values are measured according to the clock
 that was specified when the timer was created by
-.BR timer_create ()
+.BR timer_create (2)
 
 If
 .I new_value->it_value
diff --git a/man3/ctime.3 b/man3/ctime.3
index f1cd657f8f..2c5d0ba42b 100644
--- a/man3/ctime.3
+++ b/man3/ctime.3
@@ -348,13 +348,13 @@ This is a BSD extension, present in 4.3BSD-Reno.
 According to POSIX.1-2004,
 .BR localtime ()
 is required to behave as though
-.BR tzset ()
+.BR tzset (3)
 was called, while
 .BR localtime_r ()
 does not have this requirement.
 .\" See http://thread.gmane.org/gmane.comp.time.tz/2034/
 For portable code
-.BR tzset ()
+.BR tzset (3)
 should be called before
 .BR localtime_r ().
 .SH "SEE ALSO"
diff --git a/man3/fmemopen.3 b/man3/fmemopen.3
index 7d14bffdd4..430c2a8e22 100644
--- a/man3/fmemopen.3
+++ b/man3/fmemopen.3
@@ -202,7 +202,7 @@ will return an error if called on the returned stream).
 In glibc before version 2.7, seeking past the end of a stream created by
 .BR open_memstream ()
 does not enlarge the buffer; instead the
-.BR fseek ()
+.BR fseek (3)
 call fails, returning \-1.
 .\" http://sourceware.org/bugzilla/show_bug.cgi?id=1996
 .SH "EXAMPLE"
diff --git a/man3/nl_langinfo.3 b/man3/nl_langinfo.3
index 03f0d63a8f..04ddc64838 100644
--- a/man3/nl_langinfo.3
+++ b/man3/nl_langinfo.3
@@ -98,7 +98,7 @@ For a more detailed list, consult
 .IR "The GNU C Library Reference Manual" .
 .SH "RETURN VALUE"
 If no locale has been selected by
-.BR setlocale ()
+.BR setlocale (3)
 for the appropriate category,
 .BR nl_langinfo ()
 returns a pointer to the corresponding string in the
diff --git a/man3/posix_memalign.3 b/man3/posix_memalign.3
index 2e0f78196d..1884af8d23 100644
--- a/man3/posix_memalign.3
+++ b/man3/posix_memalign.3
@@ -85,7 +85,7 @@ is 0, then
 returns either NULL,
 .\" glibc does this:
 or a unique pointer value that can later be successfully passed to
-.BR free ().
+.BR free (3).
 
 The obsolete function
 .BR memalign ()
diff --git a/man3/pthread_attr_init.3 b/man3/pthread_attr_init.3
index c1a982c3f3..83b64e1205 100644
--- a/man3/pthread_attr_init.3
+++ b/man3/pthread_attr_init.3
@@ -87,7 +87,7 @@ The program below optionally makes use of
 and various related functions to initialize a thread attributes
 object that is used to create a single thread.
 Once created, the thread uses the
-.BR pthread_getattr_np ()
+.BR pthread_getattr_np (3)
 function (a nonstandard GNU extension) to retrieve the thread's
 attributes, and then displays those attributes.
 
diff --git a/man3/pthread_setaffinity_np.3 b/man3/pthread_setaffinity_np.3
index 6816491c9b..47e370ba8d 100644
--- a/man3/pthread_setaffinity_np.3
+++ b/man3/pthread_setaffinity_np.3
@@ -146,7 +146,7 @@ Instead the CPU set size given to the underlying system calls was always
 .IR sizeof(cpu_set_t) .
 
 A new thread created by
-.BR pthread_create ()
+.BR pthread_create (3)
 inherits a copy of its creator's CPU affinity mask.
 .SH EXAMPLE
 In the following program, the main thread uses
diff --git a/man3/pthread_setschedprio.3 b/man3/pthread_setschedprio.3
index 887eebf099..8c33d1ba62 100644
--- a/man3/pthread_setschedprio.3
+++ b/man3/pthread_setschedprio.3
@@ -74,7 +74,7 @@ POSIX.1-2001 also documents an
 .B ENOTSUP
 ("attempt was made to set the priority
 to an unsupported value") error for
-.BR pthread_setschedparam ().
+.BR pthread_setschedparam (3).
 .SH VERSIONS
 This function is available in glibc since version 2.3.4.
 .SH CONFORMING TO
diff --git a/man3/pthread_testcancel.3 b/man3/pthread_testcancel.3
index 45c2862ff2..65a0478a65 100644
--- a/man3/pthread_testcancel.3
+++ b/man3/pthread_testcancel.3
@@ -42,7 +42,7 @@ If cancelability is disabled (using
 .BR pthread_setcancelstate (3)),
 or no cancellation request is pending,
 then a call to
-.BR pthread_cancel ()
+.BR pthread_cancel (3)
 has no effect.
 .SH RETURN VALUE
 This function does not return a value.
diff --git a/man3/setjmp.3 b/man3/setjmp.3
index b23d7fb935..b2a333fb2f 100644
--- a/man3/setjmp.3
+++ b/man3/setjmp.3
@@ -106,7 +106,7 @@ is defined.
 If you want to portably save and restore signal masks, use
 .BR sigsetjmp ()
 and
-.BR siglongjmp ().
+.BR siglongjmp (3).
 .P
 .BR setjmp ()
 and
diff --git a/man3/sigwait.3 b/man3/sigwait.3
index fb45c3e427..ce6378c6fd 100644
--- a/man3/sigwait.3
+++ b/man3/sigwait.3
@@ -54,7 +54,7 @@ and returns the signal number in
 The operation of
 .BR sigwait ()
 is the same as
-.BR sigwaitinfo (),
+.BR sigwaitinfo (2),
 except that:
 .IP * 2
 .BR sigwait ()
diff --git a/man4/tty_ioctl.4 b/man4/tty_ioctl.4
index 12a0e43b96..2c5db8ba61 100644
--- a/man4/tty_ioctl.4
+++ b/man4/tty_ioctl.4
@@ -11,7 +11,7 @@ tty_ioctl \- ioctls for terminals and serial lines
 .BI "int ioctl(int " fd ", int " cmd ", ...);"
 .SH DESCRIPTION
 The
-.BR ioctl ()
+.BR ioctl (2)
 call for terminals and serial ports accepts many possible command arguments.
 Most require a third argument, of varying type, here called \fIargp\fP
 or \fIarg\fP.
@@ -430,7 +430,7 @@ corresponding to
 .\" Set serial info.
 .SH "RETURN VALUE"
 The
-.BR ioctl ()
+.BR ioctl (2)
 system call returns 0 on success.
 On error it returns \-1 and sets
 .I errno
diff --git a/man7/epoll.7 b/man7/epoll.7
index a0ad8af1fa..d97f341002 100644
--- a/man7/epoll.7
+++ b/man7/epoll.7
@@ -415,7 +415,7 @@ A file descriptor is removed from an
 set only after all the file descriptors referring to the underlying
 open file description have been closed
 (or before if the descriptor is explicitly removed using
-.BR epoll_ctl ()
+.BR epoll_ctl (2)
 .BR EPOLL_CTL_DEL ).
 This means that even after a file descriptor that is part of an
 .B epoll
diff --git a/man7/posixoptions.7 b/man7/posixoptions.7
index 5833417d22..8ed53de99e 100644
--- a/man7/posixoptions.7
+++ b/man7/posixoptions.7
@@ -39,7 +39,7 @@ For more detail, see
 .BR sysconf (3).
 .LP
 We give the name of the POSIX abbreviation, the option, the name of the
-.BR sysconf ()
+.BR sysconf (3)
 parameter used to inquire about the option, and possibly
 a very short description.
 Much more precise detail can be found in the POSIX standard itself,
diff --git a/man7/unix.7 b/man7/unix.7
index 5ead1c5590..bab5c8b60e 100644
--- a/man7/unix.7
+++ b/man7/unix.7
@@ -152,7 +152,7 @@ a unique name in the abstract namespace will be generated automatically.
 Expects an integer boolean flag.
 .SS Autobind Feature
 If a
-.BR bind ()
+.BR bind (2)
 call specifies
 .I addrlen
 as