diff --git a/man2/arch_prctl.2 b/man2/arch_prctl.2
index 94c45e23b..7032f7eb8 100644
--- a/man2/arch_prctl.2
+++ b/man2/arch_prctl.2
@@ -139,5 +139,5 @@ may be already used by the threading library.
 .BR modify_ldt (2),
 .BR prctl (2),
 .BR set_thread_area (2)
-.sp
+
 AMD X86-64 Programmer's manual
diff --git a/man2/fcntl.2 b/man2/fcntl.2
index 390563698..38be5b8cb 100644
--- a/man2/fcntl.2
+++ b/man2/fcntl.2
@@ -1302,17 +1302,16 @@ It is therefore inadvisable to rely on mandatory locking.
 .BR lockf (3),
 .BR capabilities (7),
 .BR feature_test_macros (7)
-.P
-See also
+
 .IR locks.txt ,
 .IR mandatory-locking.txt ,
 and
 .I dnotify.txt
-in the kernel source directory
-.IR Documentation/filesystems/ .
-(On older kernels, these files are directly under the
+in the Linux kernel source directory
+.IR Documentation/filesystems/
+(on older kernels, these files are directly under the
 .I Documentation/
 directory, and
 .I mandatory-locking.txt
 is called
-.IR mandatory.txt .)
+.IR mandatory.txt )
diff --git a/man2/flock.2 b/man2/flock.2
index 5a1314f9e..f1110f96a 100644
--- a/man2/flock.2
+++ b/man2/flock.2
@@ -206,8 +206,7 @@ and occurs on many other implementations.)
 .BR open (2),
 .BR lockf (3)
 
-See also
 .I Documentation/filesystem/locks.txt
-in the kernel source
+in the Linux kernel source tree
 .RI ( Documentation/locks.txt
-in older kernels).
+in older kernels)
diff --git a/man2/get_robust_list.2 b/man2/get_robust_list.2
index 7af71ef1f..2ed2ae04f 100644
--- a/man2/get_robust_list.2
+++ b/man2/get_robust_list.2
@@ -126,9 +126,9 @@ to use this functionality should use the robust mutexes provided by glibc.
 .SH "SEE ALSO"
 .BR futex (2)
 .\" .BR pthread_mutexattr_setrobust_np (3)
-.br
-The kernel source files
+
 .IR Documentation/robust-futexes.txt
 and
-.IR Documentation/robust-futex-ABI.txt .
+.IR Documentation/robust-futex-ABI.txt
+in the kernel source tree
 .\" http://lwn.net/Articles/172149/
diff --git a/man2/getpriority.2 b/man2/getpriority.2
index 36d241591..2e09a40d9 100644
--- a/man2/getpriority.2
+++ b/man2/getpriority.2
@@ -225,6 +225,6 @@ defined in
 .BR renice (1),
 .BR fork (2),
 .BR capabilities (7)
-.sp
+
 .I Documentation/scheduler/sched-nice-design.txt
-in the kernel source tree (since Linux 2.6.23).
+in the Linux kernel source tree (since Linux 2.6.23)
diff --git a/man2/ioprio_set.2 b/man2/ioprio_set.2
index ce421825f..10f516b31 100644
--- a/man2/ioprio_set.2
+++ b/man2/ioprio_set.2
@@ -348,5 +348,6 @@ Suitable definitions can be found in
 .BR getpriority (2),
 .BR open (2),
 .BR capabilities (7)
-.sp
-Documentation/block/ioprio.txt in the kernel source tree.
+
+.I Documentation/block/ioprio.txt
+in the Linux kernel source tree
diff --git a/man2/migrate_pages.2 b/man2/migrate_pages.2
index 9c7416e6b..a7fced442 100644
--- a/man2/migrate_pages.2
+++ b/man2/migrate_pages.2
@@ -153,7 +153,7 @@ or a similar package.
 .BR cpuset (7),
 .BR numa (7),
 .BR migratepages (8),
-.BR numa_stat (8);
-.br
-the kernel source file
-.IR Documentation/vm/page_migration .
+.BR numa_stat (8)
+
+.IR Documentation/vm/page_migration
+in the Linux kernel source tree
diff --git a/man2/mmap.2 b/man2/mmap.2
index ac1717f86..6ee59e8c5 100644
--- a/man2/mmap.2
+++ b/man2/mmap.2
@@ -663,7 +663,7 @@ main(int argc, char *argv[])
 .BR shmat (2),
 .BR shm_open (3),
 .BR shm_overview (7)
-.br
+
 B.O. Gallmeister, POSIX.4, O'Reilly, pp. 128-129 and 389-391.
 .\"
 .\" Repeat after me: private read-only mappings are 100% equivalent to
diff --git a/man2/mremap.2 b/man2/mremap.2
index e38ce8037..ad6f4eb13 100644
--- a/man2/mremap.2
+++ b/man2/mremap.2
@@ -206,8 +206,9 @@ argument.
 .BR sbrk (2),
 .BR malloc (3),
 .BR realloc (3)
-.P
-Your favorite OS text book for more information on paged memory.
-(\fIModern Operating Systems\fP by Andrew S. Tanenbaum,
+
+Your favorite text book on operating systems
+for more information on paged memory
+(e.g., \fIModern Operating Systems\fP by Andrew S. Tanenbaum,
 \fIInside Linux\fP by Randolf Bentson,
-\fIThe Design of the UNIX Operating System\fP by Maurice J. Bach.)
+\fIThe Design of the UNIX Operating System\fP by Maurice J. Bach)
diff --git a/man2/msync.2 b/man2/msync.2
index 772cf3533..d5b9ef618 100644
--- a/man2/msync.2
+++ b/man2/msync.2
@@ -117,5 +117,5 @@ are defined in \fI<unistd.h>\fP to a value greater than 0.
 .\" glibc defines them to 1.
 .SH "SEE ALSO"
 .BR mmap (2)
-.br
+
 B.O. Gallmeister, POSIX.4, O'Reilly, pp. 128-129 and 389-391.
diff --git a/man2/sched_get_priority_max.2 b/man2/sched_get_priority_max.2
index d5bc3007e..36c85a231 100644
--- a/man2/sched_get_priority_max.2
+++ b/man2/sched_get_priority_max.2
@@ -109,4 +109,4 @@ POSIX.1-2001.
 .BR sched_setscheduler (2)
 .PP
 .I Programming for the real world \- POSIX.4
-by Bill O. Gallmeister, O'Reilly & Associates, Inc., ISBN 1-56592-074-0
+by Bill O. Gallmeister, O'Reilly & Associates, Inc., ISBN 1-56592-074-0.
diff --git a/man2/sched_rr_get_interval.2 b/man2/sched_rr_get_interval.2
index 7ac9cf1ac..9169810db 100644
--- a/man2/sched_rr_get_interval.2
+++ b/man2/sched_rr_get_interval.2
@@ -128,4 +128,4 @@ quantum cannot be modified.
 has a description of the Linux scheduling scheme.
 .PP
 .I Programming for the real world \- POSIX.4
-by Bill O. Gallmeister, O'Reilly & Associates, Inc., ISBN 1-56592-074-0
+by Bill O. Gallmeister, O'Reilly & Associates, Inc., ISBN 1-56592-074-0.
diff --git a/man2/sched_setparam.2 b/man2/sched_setparam.2
index 075751372..1921c1b8c 100644
--- a/man2/sched_setparam.2
+++ b/man2/sched_setparam.2
@@ -123,4 +123,4 @@ POSIX.1-2001.
 .BR capabilities (7)
 .PP
 .I Programming for the real world \- POSIX.4
-by Bill O. Gallmeister, O'Reilly & Associates, Inc., ISBN 1-56592-074-0
+by Bill O. Gallmeister, O'Reilly & Associates, Inc., ISBN 1-56592-074-0.
diff --git a/man2/sched_setscheduler.2 b/man2/sched_setscheduler.2
index 436320dcc..b5ba95a85 100644
--- a/man2/sched_setscheduler.2
+++ b/man2/sched_setscheduler.2
@@ -535,8 +535,8 @@ since it always returns 0 on success.
 .BR cpuset (7)
 .PP
 .I Programming for the real world \- POSIX.4
-by Bill O. Gallmeister, O'Reilly & Associates, Inc., ISBN 1-56592-074-0
+by Bill O. Gallmeister, O'Reilly & Associates, Inc., ISBN 1-56592-074-0.
 .PP
-The kernel source file
 .I Documentation/scheduler/sched-rt-group.txt
+in the Linux kernel source tree
 (since kernel 2.6.25).
diff --git a/man2/sched_yield.2 b/man2/sched_yield.2
index 057e6756f..834ab4e81 100644
--- a/man2/sched_yield.2
+++ b/man2/sched_yield.2
@@ -78,7 +78,7 @@ since doing so will result in unnecessary context switches,
 which will degrade system performance.
 .SH "SEE ALSO"
 .BR sched_setscheduler (2)
-for a description of Linux scheduling.
+for a description of Linux scheduling
 .PP
 .I Programming for the real world \- POSIX.4
-by Bill O. Gallmeister, O'Reilly & Associates, Inc., ISBN 1-56592-074-0
+by Bill O. Gallmeister, O'Reilly & Associates, Inc., ISBN 1-56592-074-0.
diff --git a/man2/select.2 b/man2/select.2
index 2b7a2049a..9c3be4850 100644
--- a/man2/select.2
+++ b/man2/select.2
@@ -572,10 +572,6 @@ main(void)
 }
 .fi
 .SH "SEE ALSO"
-For a tutorial with discussion and examples, see
-.BR select_tut (2).
-.LP
-For vaguely related stuff, see
 .BR accept (2),
 .BR connect (2),
 .BR poll (2),
@@ -586,3 +582,6 @@ For vaguely related stuff, see
 .BR write (2),
 .BR epoll (7),
 .BR time (7)
+
+For a tutorial with discussion and examples, see
+.BR select_tut (2).
diff --git a/man2/socket.2 b/man2/socket.2
index 1bc002a37..fcc126e0a 100644
--- a/man2/socket.2
+++ b/man2/socket.2
@@ -408,11 +408,9 @@ is shown in
 .BR tcp (7),
 .BR udp (7),
 .BR unix (7)
-.PP
+
 \(lqAn Introductory 4.3BSD Interprocess Communication Tutorial\(rq
-is reprinted in
-.I UNIX Programmer's Supplementary Documents Volume 1.
-.PP
-\(lqBSD Interprocess Communication Tutorial\(rq
-is reprinted in
+and
+\(lqBSD Interprocess Communication Tutorial\(rq,
+reprinted in
 .I UNIX Programmer's Supplementary Documents Volume 1.
diff --git a/man2/subpage_prot.2 b/man2/subpage_prot.2
index 9256bccf4..209f3b264 100644
--- a/man2/subpage_prot.2
+++ b/man2/subpage_prot.2
@@ -125,7 +125,7 @@ hardware pages (on machines with hardware 64-kB page support).
 .\" the affected segment, not the whole process.
 .SH SEE ALSO
 .BR mprotect (2),
-.BR syscall (2);
-.br
-the kernel source file
-.IR Documentation/vm/hugetlbpage.txt .
+.BR syscall (2)
+
+.IR Documentation/vm/hugetlbpage.txt
+in the Linux kernel source tree
diff --git a/man2/unshare.2 b/man2/unshare.2
index df47b445c..2efa1ce24 100644
--- a/man2/unshare.2
+++ b/man2/unshare.2
@@ -244,5 +244,7 @@ Such functionality may be added in the future, if required.
 .SH SEE ALSO
 .BR clone (2),
 .BR fork (2),
-.BR vfork (2),
-Documentation/unshare.txt
+.BR vfork (2)
+
+.I Documentation/unshare.txt
+in the Linux kernel source tree
diff --git a/man3/btree.3 b/man3/btree.3
index 1bc61eb5d..e1a4c7c24 100644
--- a/man3/btree.3
+++ b/man3/btree.3
@@ -240,13 +240,13 @@ Only big and little endian byte order is supported.
 .BR hash (3),
 .BR mpool (3),
 .BR recno (3)
-.sp
+
 .IR "The Ubiquitous B-tree" ,
 Douglas Comer, ACM Comput. Surv. 11, 2 (June 1979), 121-138.
-.sp
+
 .IR "Prefix B-trees" ,
 Bayer and Unterauer, ACM Transactions on Database Systems, Vol. 2, 1
 (March 1977), 11-26.
-.sp
+
 .IR "The Art of Computer Programming Vol. 3: Sorting and Searching" ,
 D.E. Knuth, 1968, pp 471-480.
diff --git a/man3/dbopen.3 b/man3/dbopen.3
index 5bc8495f8..637def358 100644
--- a/man3/dbopen.3
+++ b/man3/dbopen.3
@@ -554,6 +554,6 @@ locking, or transactions.
 .BR hash (3),
 .BR mpool (3),
 .BR recno (3)
-.sp
+
 .IR "LIBTP: Portable, Modular Transactions for UNIX" ,
 Margo Seltzer, Michael Olson, USENIX proceedings, Winter 1992.
diff --git a/man3/dl_iterate_phdr.3 b/man3/dl_iterate_phdr.3
index fa1959791..fbc30f6ef 100644
--- a/man3/dl_iterate_phdr.3
+++ b/man3/dl_iterate_phdr.3
@@ -198,7 +198,7 @@ main(int argc, char *argv[])
 .BR readelf (1),
 .BR dlopen (3),
 .BR elf (5),
-.BR ld.so (8),
-and the
-.I "Executable and Linking Format Specification"
+.BR ld.so (8)
+
+.IR "Executable and Linking Format Specification" ,
 available at various locations online.
diff --git a/man3/dlopen.3 b/man3/dlopen.3
index 808736a46..e2a50950d 100644
--- a/man3/dlopen.3
+++ b/man3/dlopen.3
@@ -510,5 +510,6 @@ follows, using \fIbar.c\fP as the example name:
 .BR dl_iterate_phdr (3),
 .BR rtld-audit (7),
 .BR ld.so (8),
-.BR ldconfig (8),
+.BR ldconfig (8)
+
 ld.so info pages, gcc info pages, ld info pages
diff --git a/man3/getnameinfo.3 b/man3/getnameinfo.3
index fd5df7cc9..f1001cd81 100644
--- a/man3/getnameinfo.3
+++ b/man3/getnameinfo.3
@@ -284,21 +284,21 @@ can be found in
 .BR services (5),
 .BR hostname (7),
 .BR named (8)
-.LP
+
 R. Gilligan, S. Thomson, J. Bound and W. Stevens,
 .IR "Basic Socket Interface Extensions for IPv6" ,
 RFC\ 2553, March 1999.
-.LP
+
 Tatsuya Jinmei and Atsushi Onoe,
 .IR "An Extension of Format for IPv6 Scoped Addresses" ,
-internet draft, work in progress.
+internet draft, work in progress
 .UR ftp://ftp.ietf.org\:/internet\-drafts\:/draft\-ietf\-ipngwg\-scopedaddr\-format\-02.txt
-.UE
-.LP
+.UE .
+
 Craig Metz,
 .IR "Protocol Independence Using the Sockets API" ,
 Proceedings of the freenix track:
-2000 USENIX annual technical conference, June 2000.
+2000 USENIX annual technical conference, June 2000
 .ad l
 .UR http://www.usenix.org\:/publications\:/library\:/proceedings\:/usenix2000\:/freenix\:/metzprotocol.html
-.UE
+.UE .
diff --git a/man3/hash.3 b/man3/hash.3
index 645eb958d..4af6d1f12 100644
--- a/man3/hash.3
+++ b/man3/hash.3
@@ -160,9 +160,9 @@ Only big and little endian byte order are supported.
 .BR dbopen (3),
 .BR mpool (3),
 .BR recno (3)
-.sp
+
 .IR "Dynamic Hash Tables" ,
 Per-Ake Larson, Communications of the ACM, April 1988.
-.sp
+
 .IR "A New Hash Package for UNIX" ,
 Margo Seltzer, USENIX Proceedings, Winter 1991.
diff --git a/man3/lockf.3 b/man3/lockf.3
index 84b5143f4..e178b25d1 100644
--- a/man3/lockf.3
+++ b/man3/lockf.3
@@ -150,16 +150,15 @@ SVr4, POSIX.1-2001.
 .SH "SEE ALSO"
 .BR fcntl (2),
 .BR flock (2)
-.br
-There are also
+
 .I locks.txt
 and
 .I mandatory-locking.txt
-in the kernel source directory
-.IR Documentation/filesystems .
-(On older kernels, these files are directly under the
-.I Documentation/
+in the Linux kernel source directory
+.IR Documentation/filesystems 
+(on older kernels, these files are directly under the
+.I Documentation
 directory, and
 .I mandatory-locking.txt
 is called
-.IR mandatory.txt .)
+.IR mandatory.txt )
diff --git a/man3/netlink.3 b/man3/netlink.3
index 771fb8b88..20db76002 100644
--- a/man3/netlink.3
+++ b/man3/netlink.3
@@ -87,8 +87,7 @@ It is often better to use netlink via
 than via the low-level kernel interface.
 .SH "SEE ALSO"
 .BR netlink (7)
-.br
-and
+
 .UR ftp://ftp.inr.ac.ru\:/ip-routing\:/iproute2*
 .UE
 for libnetlink
diff --git a/man3/recno.3 b/man3/recno.3
index 9ca083d4a..843ab1efa 100644
--- a/man3/recno.3
+++ b/man3/recno.3
@@ -224,7 +224,7 @@ Only big and little endian byte order is supported.
 .BR dbopen (3),
 .BR hash (3),
 .BR mpool (3)
-.sp
+
 .IR "Document Processing in a Relational Database System" ,
 Michael Stonebraker, Heidi Stettner, Joseph Kalash, Antonin Guttman,
 Nadene Lynn, Memorandum No. UCB/ERL M82/32, May 1982.
diff --git a/man3/rpc.3 b/man3/rpc.3
index 545cea490..e4d8188f9 100644
--- a/man3/rpc.3
+++ b/man3/rpc.3
@@ -1099,7 +1099,7 @@ Service implementors usually do not need this routine.
 .\" We don't have an rpc_secure.3 page in the set at the moment -- MTK, 19 Sep 05
 .\" .BR rpc_secure (3),
 .BR xdr (3)
-.br
+
 The following manuals:
 .RS
 Remote Procedure Calls: Protocol Specification
@@ -1109,6 +1109,7 @@ Remote Procedure Call Programming Guide
 rpcgen Programming Guide
 .br
 .RE
+
 .IR "RPC: Remote Procedure Call Protocol Specification" ,
 RFC\ 1050, Sun Microsystems, Inc.,
 USC-ISI.
diff --git a/man3/xdr.3 b/man3/xdr.3
index da02912e8..d717e1f46 100644
--- a/man3/xdr.3
+++ b/man3/xdr.3
@@ -537,6 +537,7 @@ one of the most frequently used primitives, requires three.
 Returns one if it succeeds, zero otherwise.
 .SH "SEE ALSO"
 .BR rpc (3)
+
 .LP
 The following manuals:
 .RS
diff --git a/man4/cciss.4 b/man4/cciss.4
index e35c8c1d5..85fb1c280 100644
--- a/man4/cciss.4
+++ b/man4/cciss.4
@@ -351,12 +351,14 @@ for example) before I/O can proceed again to a tape drive that was reset.
 .BR hpsa (4),
 .BR hpacucli (8),
 .BR hpacuxe (8),
+
 .UR http://cciss.sf.net
 .UE ,
-and the Linux kernel source files
+and
 .I Documentation/blockdev/cciss.txt
 and
 .I Documentation/ABI/testing/sysfs-bus-pci-devices-cciss
+in the Linux kernel source tree
 .\" .SH AUTHORS
 .\" Don Brace, Steve Cameron, Chase Maupin, Mike Miller, Michael Ni,
 .\" Charles White, Francis Wiran
diff --git a/man4/console_ioctl.4 b/man4/console_ioctl.4
index 6e5a64501..02135f7dd 100644
--- a/man4/console_ioctl.4
+++ b/man4/console_ioctl.4
@@ -633,6 +633,7 @@ Use POSIX functions.
 .BR charsets (7),
 .BR mapscrn (8),
 .BR resizecons (8),
-.BR setfont (8),
+.BR setfont (8)
+
 .IR /usr/include/linux/kd.h ,
 .I /usr/include/linux/vt.h
diff --git a/man4/hpsa.4 b/man4/hpsa.4
index 5f849afb1..be9af7dad 100644
--- a/man4/hpsa.4
+++ b/man4/hpsa.4
@@ -182,12 +182,14 @@ for some examples.
 .BR cciss_vol_status (8),
 .BR hpacucli (8),
 .BR hpacuxe (8),
+
 .UR http://cciss.sf.net
 .UE ,
-and the Linux kernel source files
+and 
 .I Documentation/scsi/hpsa.txt
 and
 .I Documentation/ABI/testing/sysfs-bus-pci-devices-cciss
+in the Linux kernel source tree
 .\" .SH AUTHORS
 .\" Don Brace, Steve Cameron, Tom Lawler, Mike Miller, Scott Teel
 .\" and probably some other people.
diff --git a/man4/initrd.4 b/man4/initrd.4
index 5773129a5..e36a5b443 100644
--- a/man4/initrd.4
+++ b/man4/initrd.4
@@ -477,7 +477,6 @@ The behavior may change in future versions of the Linux kernel.
 .BR freeramdisk (8),
 .BR rdev (8)
 
-The documentation file
-.I initrd.txt
-in the kernel source package, the LILO documentation,
-the LOADLIN documentation, the SYSLINUX documentation.
+.I Documentation/initrd.txt
+in the Linux kernel source tree, the LILO documentation,
+the LOADLIN documentation, the SYSLINUX documentation
diff --git a/man4/msr.4 b/man4/msr.4
index ec172d163..1fb0d8088 100644
--- a/man4/msr.4
+++ b/man4/msr.4
@@ -52,5 +52,5 @@ to load it explicitly before use:
     $ \fImodprobe msr\fP
 .SH SEE ALSO
 Intel Corporation Intel 64 and IA-32 Architectures
-Software Developer's Manual Volume 3B Appendix B
+Software Developer's Manual Volume 3B Appendix B,
 for an overview of the Intel CPU MSRs.
diff --git a/man4/rtc.4 b/man4/rtc.4
index e1c5db865..e2832b0c3 100644
--- a/man4/rtc.4
+++ b/man4/rtc.4
@@ -336,5 +336,7 @@ capabilities that are not currently exposed by this API.
 .BR time (2),
 .BR gmtime (3),
 .BR time (7),
-.BR hwclock (8),
-/usr/src/linux/Documentation/rtc.txt
+.BR hwclock (8)
+
+.I Documentation/rtc.txt
+in the Linux kernel source tree
diff --git a/man4/st.4 b/man4/st.4
index 78585c79d..7037f124d 100644
--- a/man4/st.4
+++ b/man4/st.4
@@ -956,6 +956,6 @@ The file
 .I drivers/scsi/README.st
 or
 .I Documentation/scsi/st.txt
-(kernel >= 2.6) in the kernel sources contains
+(kernel >= 2.6) in the Linux kernel source tree contains
 the most recent information about the driver and its configuration
-possibilities.
+possibilities
diff --git a/man5/hosts.5 b/man5/hosts.5
index 513a4e373..1e3ea0c59 100644
--- a/man5/hosts.5
+++ b/man5/hosts.5
@@ -117,7 +117,8 @@ I just found three, from 92,
 .BR resolver (3),
 .BR resolver (5),
 .BR hostname (7),
-.BR named (8),
+.BR named (8)
+
 Internet RFC\ 952
 .\" .SH AUTHOR
 .\" This manual page was written by Manoj Srivastava <srivasta@debian.org>,
diff --git a/man5/services.5 b/man5/services.5
index 5c393529e..468d53299 100644
--- a/man5/services.5
+++ b/man5/services.5
@@ -217,4 +217,4 @@ Definition of
 .BR protocols (5),
 .BR inetd (8)
 
-Assigned Numbers RFC, most recently RFC\ 1700, (AKA STD0002)
+Assigned Numbers RFC, most recently RFC\ 1700, (AKA STD0002).
diff --git a/man5/tzfile.5 b/man5/tzfile.5
index 0b01cd89c..f89fb72de 100644
--- a/man5/tzfile.5
+++ b/man5/tzfile.5
@@ -154,6 +154,6 @@ such instants).
 .BR ctime (3),
 .BR tzset (3),
 .BR tzselect (8),
-and
+
 .I timezone/tzfile.h
-in the glibc source code.
+in the glibc source tree
diff --git a/man7/aio.7 b/man7/aio.7
index 37562c1d4..2b17c8cda 100644
--- a/man7/aio.7
+++ b/man7/aio.7
@@ -455,6 +455,7 @@ main(int argc, char *argv[])
 .BR aio_read (3),
 .BR aio_return (3),
 .BR aio_write (3),
-.BR lio_listio (3),
+.BR lio_listio (3)
+
 .UR http://www.squid-cache.org\:/~adrian\:/Reprint-Pulavarty-OLS2003.pdf
 .UE
diff --git a/man7/arp.7 b/man7/arp.7
index 12fb57cd8..50cdc4072 100644
--- a/man7/arp.7
+++ b/man7/arp.7
@@ -301,8 +301,6 @@ functionality together.
 .BR ip (7)
 .PP
 RFC\ 826 for a description of ARP.
-.br
 RFC\ 2461 for a description of IPv6 neighbor discovery and the base
 algorithms used.
-.LP
 Linux 2.2+ IPv4 ARP uses the IPv6 algorithms when applicable.
diff --git a/man7/capabilities.7 b/man7/capabilities.7
index 61290ff2c..1d1d4c922 100644
--- a/man7/capabilities.7
+++ b/man7/capabilities.7
@@ -1078,6 +1078,5 @@ created on the system.
 .BR getcap (8),
 .BR setcap (8)
 .PP
-Comments on the purposes of various capabilities in
 .I include/linux/capability.h
-in the kernel source
+in the Linux kernel source tree
diff --git a/man7/cpuset.7 b/man7/cpuset.7
index 52943fbea..4803b8f80 100644
--- a/man7/cpuset.7
+++ b/man7/cpuset.7
@@ -1499,5 +1499,5 @@ syntax that works on any shell, but alas more obscurely, by using the
 .BR migratepages (8),
 .BR numactl (8)
 .PP
-The kernel source file
-.IR Documentation/cpusets.txt .
+.IR Documentation/cpusets.txt
+in the Linux kernel source tree
diff --git a/man7/feature_test_macros.7 b/man7/feature_test_macros.7
index 135fa0511..f8ae7520b 100644
--- a/man7/feature_test_macros.7
+++ b/man7/feature_test_macros.7
@@ -594,9 +594,9 @@ main(int argc, char *argv[])
 .SH SEE ALSO
 .BR libc (7),
 .BR standards (7)
-.sp
+
 The section "Feature Test Macros" under
 .IR "info libc" .
 .\" But beware: the info libc document is out of date (Jul 07, mtk)
-.sp
+
 .I /usr/include/features.h
diff --git a/man7/futex.7 b/man7/futex.7
index bafa14155..367f732cf 100644
--- a/man7/futex.7
+++ b/man7/futex.7
@@ -111,7 +111,7 @@ primitives: it is by no means the only one.
 .\" This page written by bert hubert.
 .SH "SEE ALSO"
 .BR futex (2)
-.PP
+
 .IR "Fuss, Futexes and Furwocks: Fast Userlevel Locking in Linux"
 (proceedings of the Ottawa Linux Symposium 2002),
 futex example library, futex-*.tar.bz2
diff --git a/man7/inotify.7 b/man7/inotify.7
index 2992fdc95..25c2bd9d9 100644
--- a/man7/inotify.7
+++ b/man7/inotify.7
@@ -445,5 +445,7 @@ unread event.
 .BR inotify_init1 (2),
 .BR inotify_rm_watch (2),
 .BR read (2),
-.BR stat (2),
-.IR Documentation/filesystems/inotify.txt .
+.BR stat (2)
+
+.IR Documentation/filesystems/inotify.txt
+in the Linux kernel source tree
diff --git a/man7/ip.7 b/man7/ip.7
index 9f560df51..95a640195 100644
--- a/man7/ip.7
+++ b/man7/ip.7
@@ -1096,8 +1096,6 @@ does not work in some 2.2 kernels.
 .BR udp (7)
 .PP
 RFC\ 791 for the original IP specification.
-.br
 RFC\ 1122 for the IPv4 host requirements.
-.br
 RFC\ 1812 for the IPv4 router requirements.
 .\" FIXME autobind INADDR REUSEADDR
diff --git a/man7/ipv6.7 b/man7/ipv6.7
index ce75541f5..c53908317 100644
--- a/man7/ipv6.7
+++ b/man7/ipv6.7
@@ -333,7 +333,6 @@ This man page is not complete.
 .BR cmsg (3),
 .BR ip (7)
 .PP
-RFC\ 2553: IPv6 BASIC API.
+RFC\ 2553: IPv6 BASIC API;
 Linux tries to be compliant to this.
-.PP
 RFC\ 2460: IPv6 specification.
diff --git a/man7/iso_8859-16.7 b/man7/iso_8859-16.7
index db6e50988..968bbaaed 100644
--- a/man7/iso_8859-16.7
+++ b/man7/iso_8859-16.7
@@ -172,8 +172,7 @@ _
 .BR iso_8859-1 (7),
 .BR iso_8859-15 (7),
 .BR iso_8859-2 (7)
-.P
-Additional information:
+
 .I ISO 8859-16 (Latin 10) Resources
 .UR http://bucovina.chem.tue.nl\:/fonturi\:/index-en.html
 .UE .
diff --git a/man7/iso_8859-2.7 b/man7/iso_8859-2.7
index f3b609e20..b5b3d1fdf 100644
--- a/man7/iso_8859-2.7
+++ b/man7/iso_8859-2.7
@@ -174,8 +174,7 @@ _
 .BR ascii (7),
 .BR iso_8859-1 (7),
 .BR iso_8859-16 (7)
-.P
-Additional information:
+
 .I ISO 8859-2 (Latin 2) Resources
 .UR http://sizif.mf.uni-lj.si\:/linux\:/cee\:/iso8859-2.html
 .UE .
diff --git a/man7/koi8-r.7 b/man7/koi8-r.7
index a758e03b3..8944ff12a 100644
--- a/man7/koi8-r.7
+++ b/man7/koi8-r.7
@@ -190,7 +190,8 @@ _
 .SH "SEE ALSO"
 .BR ascii (7),
 .BR iso-8859-5 (7),
-.BR koi8-u (7),
+.BR koi8-u (7)
+
 RFC\ 1489,
 .UR http://koi8.pp.ru/
 .UE
diff --git a/man7/math_error.7 b/man7/math_error.7
index eae7735bf..e0369d313 100644
--- a/man7/math_error.7
+++ b/man7/math_error.7
@@ -260,5 +260,5 @@ An error can still be tested for using
 .BR isgreater (3),
 .BR matherr (3),
 .BR nan (3)
-.br
+
 .I "info libc"
diff --git a/man7/netlink.7 b/man7/netlink.7
index 9fd470f1e..ec3bf2488 100644
--- a/man7/netlink.7
+++ b/man7/netlink.7
@@ -466,13 +466,13 @@ for (nh = (struct nlmsghdr *) buf; NLMSG_OK (nh, len);
 .BR netlink (3),
 .BR capabilities (7),
 .BR rtnetlink (7)
-.PP
+
 .UR ftp://ftp.inr.ac.ru\:/ip-routing\:/iproute2*
 information about libnetlink
 .UE
-.br
+
 .UR http://people.suug.ch\:/~tgr\:/libnl/
 information about libnl
 .UE
-.br
+
 RFC 3549 "Linux Netlink as an IP Services Protocol"
diff --git a/man7/packet.7 b/man7/packet.7
index 374f6da8a..81948905c 100644
--- a/man7/packet.7
+++ b/man7/packet.7
@@ -395,7 +395,6 @@ packets via
 .BR socket (7)
 
 RFC\ 894 for the standard IP Ethernet encapsulation.
-
 RFC\ 1700 for the IEEE 802.3 IP encapsulation.
 
 The
diff --git a/man7/pthreads.7 b/man7/pthreads.7
index d2740b627..9d438db0c 100644
--- a/man7/pthreads.7
+++ b/man7/pthreads.7
@@ -900,8 +900,8 @@ bash$ $( LD_ASSUME_KERNEL=2.2.5 ldd /bin/ls | grep libc.so | \\
 .BR futex (7),
 .BR sigevent (7),
 .BR signal (7),
-.br
-and various Pthreads manual pages, for example:
+
+Various Pthreads manual pages, for example:
 .BR pthread_attr_init (3),
 .BR pthread_atfork (3),
 .BR pthread_cancel (3),
diff --git a/man7/raw.7 b/man7/raw.7
index de6122873..868848b2a 100644
--- a/man7/raw.7
+++ b/man7/raw.7
@@ -271,8 +271,7 @@ call is always used.
 
 .B RFC\ 1191
 for path MTU discovery.
-
 .B RFC\ 791
 and the
 .I <linux/ip.h>
-include file for the IP protocol.
+header file for the IP protocol.
diff --git a/man7/spufs.7 b/man7/spufs.7
index 9caea7c79..5eb38dc43 100644
--- a/man7/spufs.7
+++ b/man7/spufs.7
@@ -766,5 +766,6 @@ none  	/spu  	spufs  	gid=spu  	0	0
 .BR close (2),
 .BR spu_create (2),
 .BR spu_run (2),
-.BR capabilities (7),
+.BR capabilities (7)
+
 .I The Cell Broadband Engine Architecture (CBEA) specification
diff --git a/man7/udplite.7 b/man7/udplite.7
index a090c87fe..5aa7fc255 100644
--- a/man7/udplite.7
+++ b/man7/udplite.7
@@ -147,6 +147,7 @@ UDP-Litev4/v6 first appeared in Linux 2.6.20.
 .BR socket (7),
 .BR udp (7)
 
-RFC\ 3828 for the Lightweight User Datagram Protocol (UDP-Lite)
-.br
+RFC\ 3828 for the Lightweight User Datagram Protocol (UDP-Lite).
+
 .I Documentation/networking/udplite.txt
+in the Linux kernel source tree
diff --git a/man7/uri.7 b/man7/uri.7
index 9e7d7f793..5606f7fe5 100644
--- a/man7/uri.7
+++ b/man7/uri.7
@@ -706,7 +706,8 @@ tools) and invokes the right tool for any URI.
 .BR lynx (1),
 .BR man2html (1),
 .BR mailaddr (7),
-.BR utf-8 (7),
+.BR utf-8 (7)
+
 .UR http://www.ietf.org\:/rfc\:/rfc2255.txt
 IETF RFC\ 2255
 .UE
diff --git a/man7/x25.7 b/man7/x25.7
index acf2478c0..ac6b8cb36 100644
--- a/man7/x25.7
+++ b/man7/x25.7
@@ -117,7 +117,5 @@ if a reset occurred, data might be lost without notice.
 Jonathan Simon Naylor:
 \(lqThe Re-Analysis and Re-Implementation of X.25.\(rq
 The URL is
-.RS
 .UR ftp://ftp.pspt.fi\:/pub\:/ham\:/linux\:/ax25\:/x25doc.tgz
-.UE
-.RE
+.UE .