18 files changed, 102 insertions, 65 deletions
diff --git a/man7/aio.7 b/man7/aio.7
index f45d8225ae..37562c1d41 100644
--- a/man7/aio.7
+++ b/man7/aio.7
@@ -21,7 +21,7 @@
 .\" Formatted or processed versions of this manual, if unaccompanied by
 .\" the source, must acknowledge the copyright and authors of this work.
 .\"
-.TH AIO 7  2010-10-02 "Linux" "Linux Programmer's Manual"
+.TH AIO 7 2012-08-05 "Linux" "Linux Programmer's Manual"
 .SH NAME
 aio \- POSIX asynchronous I/O overview
 .SH DESCRIPTION
@@ -456,4 +456,5 @@ main(int argc, char *argv[])
 .BR aio_return (3),
 .BR aio_write (3),
 .BR lio_listio (3),
-http://www.squid-cache.org/~adrian/Reprint-Pulavarty-OLS2003.pdf
+.UR http://www.squid-cache.org\:/~adrian\:/Reprint-Pulavarty-OLS2003.pdf
+.UE
diff --git a/man7/capabilities.7 b/man7/capabilities.7
index caae733885..61290ff2cc 100644
--- a/man7/capabilities.7
+++ b/man7/capabilities.7
@@ -43,7 +43,7 @@
 .\"     other capabilities where the permitted or inheritable bit is set.
 .\" 2011-09-07, mtk/Serge hallyn: Add CAP_SYSLOG
 .\"
-.TH CAPABILITIES 7 2012-07-18 "Linux" "Linux Programmer's Manual"
+.TH CAPABILITIES 7 2012-08-05 "Linux" "Linux Programmer's Manual"
 .SH NAME
 capabilities \- overview of Linux capabilities
 .SH DESCRIPTION
@@ -1009,7 +1009,8 @@ prctl(PR_SET_SECUREBITS,
 .PP
 No standards govern capabilities, but the Linux capability implementation
 is based on the withdrawn POSIX.1e draft standard; see
-.IR http://wt.xpilot.org/publications/posix.1e/ .
+.UR http://wt.xpilot.org\:/publications\:/posix.1e/
+.UE .
 .SH NOTES
 Since kernel 2.5.27, capabilities are an optional kernel component,
 and can be enabled/disabled via the CONFIG_SECURITY_CAPABILITIES
@@ -1037,7 +1038,8 @@ and
 programs.
 It can be found at
 .br
-.IR http://www.kernel.org/pub/linux/libs/security/linux-privs .
+.UR http://www.kernel.org\:/pub\:/linux\:/libs\:/security\:/linux-privs
+.UE .
 
 Before kernel 2.6.24, and since kernel 2.6.24 if
 file capabilities are not enabled, a thread with the
diff --git a/man7/charsets.7 b/man7/charsets.7
index 3446cf79ce..8703cad760 100644
--- a/man7/charsets.7
+++ b/man7/charsets.7
@@ -10,7 +10,7 @@
 .\" research by esr.  Portions derive from a writeup by Roman Czyborra.
 .\"
 .\" Last changed by David Starner <dstarner98@aasaa.ofe.org>.
-.TH CHARSETS 7 2008-06-03 "Linux" "Linux Programmer's Manual"
+.TH CHARSETS 7 2012-08-05 "Linux" "Linux Programmer's Manual"
 .SH NAME
 charsets \- programmer's view of character sets and internationalization
 .SH DESCRIPTION
@@ -229,7 +229,9 @@ integers, Unicode is usually encoded as 32-bit integers internally and
 either a series of 16-bit integers (UTF-16) (needing two 16-bit integers
 only when encoding certain rare characters) or a series of 8-bit bytes
 (UTF-8).
-Information on Unicode is available at <http://www.unicode.org>.
+Information on Unicode is available at
+.UR http://www.unicode.org
+.UE .
 .LP
 Linux represents Unicode using the 8-bit Unicode Transformation Format
 (UTF-8).
diff --git a/man7/feature_test_macros.7 b/man7/feature_test_macros.7
index c2bd747569..135fa0511b 100644
--- a/man7/feature_test_macros.7
+++ b/man7/feature_test_macros.7
@@ -22,7 +22,7 @@
 .\" Formatted or processed versions of this manual, if unaccompanied by
 .\" the source, must acknowledge the copyright and authors of this work.
 .\"
-.TH FEATURE_TEST_MACROS 7 2012-01-18 "Linux" "Linux Programmer's Manual"
+.TH FEATURE_TEST_MACROS 7 2012-08-05 "Linux" "Linux Programmer's Manual"
 .SH NAME
 feature_test_macros \- feature test macros
 .SH SYNOPSIS
@@ -223,7 +223,9 @@ This macro is recognized since glibc 2.16.
 Expose definitions for the alternative API specified by the
 LFS (Large File Summit) as a "transitional extension" to the
 Single UNIX Specification.
-(See http://opengroup.org/platform/lfs.html.)
+(See
+.UR http:\:/\:/opengroup.org\:/platform\:/lfs.html
+.UE )
 The alternative API consists of a set of new objects
 (i.e., functions and types) whose names are suffixed with "64"
 (e.g.,
diff --git a/man7/futex.7 b/man7/futex.7
index 241fee269d..bafa14155f 100644
--- a/man7/futex.7
+++ b/man7/futex.7
@@ -5,7 +5,7 @@
 .\" <http://shell.ipoline.com/~elmert/comp/docbook2X/>
 .\" Please send any bug reports, improvements, comments, patches,
 .\" etc. to Steve Cheng <steve@ggi-project.org>.
-.TH FUTEX 7 2002-12-31 "Linux" "Linux Programmer's Manual"
+.TH FUTEX 7 2012-08-05 "Linux" "Linux Programmer's Manual"
 .SH NAME
 futex \- Fast Userspace Locking
 .SH SYNOPSIS
@@ -115,4 +115,5 @@ primitives: it is by no means the only one.
 .IR "Fuss, Futexes and Furwocks: Fast Userlevel Locking in Linux"
 (proceedings of the Ottawa Linux Symposium 2002),
 futex example library, futex-*.tar.bz2
-<ftp://ftp.kernel.org/pub/linux/kernel/people/rusty/>.
+.UR ftp://ftp.kernel.org\:/pub\:/linux\:/kernel\:/people\:/rusty/
+.UE .
diff --git a/man7/hier.7 b/man7/hier.7
index 8acfbfeb1d..08bbea2ac3 100644
--- a/man7/hier.7
+++ b/man7/hier.7
@@ -26,7 +26,7 @@
 .\" Modified Mon Feb  6 16:41:00 1999 by Nicol�s Lichtmaier <nick@debian.org>
 .\" Modified Tue Feb  8 16:46:45 2000 by Chris Pepper <pepper@tgg.com>
 .\" Modified Fri Sep  7 20:32:45 2001 by Tammy Fox <tfox@redhat.com>
-.TH HIER 7  2009-03-30 "Linux" "Linux Programmer's Manual"
+.TH HIER 7 2012-08-05 "Linux" "Linux Programmer's Manual"
 .SH NAME
 hier \- Description of the file system hierarchy
 .SH DESCRIPTION
@@ -490,7 +490,9 @@ this directory holds temporary files stored for an unspecified duration.
 .I /var/yp
 Database files for NIS.
 .SH "CONFORMING TO"
-The Filesystem Hierarchy Standard, Version 2.2 <http://www.pathname.com/fhs/>.
+The Filesystem Hierarchy Standard, Version 2.2
+.UR http://www.pathname.com\:/fhs/
+.UE .
 .SH BUGS
 This list is not exhaustive; different systems may be configured
 differently.
diff --git a/man7/iso_8859-16.7 b/man7/iso_8859-16.7
index f73c561a50..db6e509882 100644
--- a/man7/iso_8859-16.7
+++ b/man7/iso_8859-16.7
@@ -21,7 +21,7 @@
 .\" Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111,
 .\" USA.
 .\"
-.TH ISO_8859-16 7 2003-03-05 "Linux" "Linux Programmer's Manual"
+.TH ISO_8859-16 7 2012-08-05 "Linux" "Linux Programmer's Manual"
 .nh
 .SH NAME
 iso_8859-16 \- ISO 8859-16 character set encoded in octal, decimal,
@@ -175,4 +175,5 @@ _
 .P
 Additional information:
 .I ISO 8859-16 (Latin 10) Resources
-(http://bucovina.chem.tue.nl/fonturi/index-en.html).
+.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 1f9fbff43e..f3b609e203 100644
--- a/man7/iso_8859-2.7
+++ b/man7/iso_8859-2.7
@@ -24,7 +24,7 @@
 .\"
 .\" Slightly rearranged, aeb, 950713
 .\" Updated, dpo, 990531
-.TH ISO_8859-2 7 2007-11-25 "Linux" "Linux Programmer's Manual"
+.TH ISO_8859-2 7 2012-08-05 "Linux" "Linux Programmer's Manual"
 .nh
 .SH NAME
 iso_8859-2 \- ISO 8859-2 character set encoded in octal, decimal,
@@ -177,4 +177,5 @@ _
 .P
 Additional information:
 .I ISO 8859-2 (Latin 2) Resources
-(http://sizif.mf.uni-lj.si/linux/cee/iso8859-2.html).
+.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 1036621f16..a758e03b34 100644
--- a/man7/koi8-r.7
+++ b/man7/koi8-r.7
@@ -22,7 +22,7 @@
 .\" License along with this manual; if not, write to the Free
 .\" Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111,
 .\" USA.
-.TH KOI8-R 7 2010-10-24 "Linux" "Linux Programmer's Manual"
+.TH KOI8-R 7 2012-08-05 "Linux" "Linux Programmer's Manual"
 .nh
 .SH NAME
 koi8-r \- Russian character set encoded in octal, decimal, and
@@ -192,4 +192,5 @@ _
 .BR iso-8859-5 (7),
 .BR koi8-u (7),
 RFC\ 1489,
-http://koi8.pp.ru/
+.UR http://koi8.pp.ru/
+.UE
diff --git a/man7/libc.7 b/man7/libc.7
index 747f8b98f4..15ecbf25d8 100644
--- a/man7/libc.7
+++ b/man7/libc.7
@@ -21,7 +21,7 @@
 .\" Formatted or processed versions of this manual, if unaccompanied by
 .\" the source, must acknowledge the copyright and authors of this work.
 .\"
-.TH LIBC 7 2009-01-13 "Linux" "Linux Programmer's Manual"
+.TH LIBC 7 2012-08-05 "Linux" "Linux Programmer's Manual"
 .SH NAME
 libc \- Overview of standard C libraries on Linux
 .SH DESCRIPTION
@@ -33,7 +33,8 @@ Because of some history (see below), use of the term "libc"
 to refer to the standard C library is somewhat ambiguous on Linux.
 .SS glibc
 By far the most widely used C library on Linux is the GNU C Library
-.RI ( http://www.gnu.org/software/libc/ ),
+.UR http://www.gnu.org\:/software\:/libc/
+.UE ,
 often referred to as
 .IR glibc .
 This is the C library that is nowadays used in all
diff --git a/man7/man.7 b/man7/man.7
index f928de35d6..f4d642ba7a 100644
--- a/man7/man.7
+++ b/man7/man.7
@@ -29,7 +29,7 @@
 .\" Modified Tue Jul 27 20:12:02 2004 by Colin Watson <cjwatson@debian.org>
 .\" 2007-05-30, mtk: various rewrites and moved much text to new man-pages.7.
 .\"
-.TH MAN 7 2011-10-05 "Linux" "Linux Programmer's Manual"
+.TH MAN 7 2012-08-05 "Linux" "Linux Programmer's Manual"
 .SH NAME
 man \- macros to format man pages
 .SH SYNOPSIS
@@ -483,8 +483,10 @@ You can also use the new
 .B URL
 macro to identify links to related information.
 If you include URLs, use the full URL
-(e.g., <http://www.kernelnotes.org>) to ensure that tools
-can automatically find the URLs.
+(e.g.,
+.UR http://www.kernelnotes.org
+.UE )
+to ensure that tools can automatically find the URLs.
 .PP
 Tools processing these files should open the file and examine the first
 nonwhitespace character.
diff --git a/man7/netlink.7 b/man7/netlink.7
index 35016a2876..9fd470f1e8 100644
--- a/man7/netlink.7
+++ b/man7/netlink.7
@@ -4,7 +4,7 @@
 .\" Based on the original comments from Alexey Kuznetsov
 .\" Modified 2005-12-27 by Hasso Tepper <hasso@estpak.ee>
 .\" $Id: netlink.7,v 1.8 2000/06/22 13:23:00 ak Exp $
-.TH NETLINK  7 2012-07-28 "Linux" "Linux Programmer's Manual"
+.TH NETLINK  7 2012-08-05 "Linux" "Linux Programmer's Manual"
 .SH NAME
 netlink \- Communication between kernel and userspace (AF_NETLINK)
 .SH SYNOPSIS
@@ -467,10 +467,12 @@ for (nh = (struct nlmsghdr *) buf; NLMSG_OK (nh, len);
 .BR capabilities (7),
 .BR rtnetlink (7)
 .PP
-ftp://ftp.inr.ac.ru/ip-routing/iproute2*
-for information about libnetlink.
-
-http://people.suug.ch/~tgr/libnl/
-for information about libnl.
-
+.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/numa.7 b/man7/numa.7
index 64af9a8bef..8356f98aa8 100644
--- a/man7/numa.7
+++ b/man7/numa.7
@@ -24,7 +24,7 @@
 .\" Formatted or processed versions of this manual, if unaccompanied by
 .\" the source, must acknowledge the copyright and authors of this work.
 .\"
-.TH NUMA 7 2008-08-15 "Linux" "Linux Programmer's Manual"
+.TH NUMA 7 2012-08-05 "Linux" "Linux Programmer's Manual"
 .SH NAME
 numa \- overview of Non-Uniform Memory Architecture
 .SH DESCRIPTION
@@ -169,7 +169,8 @@ package is recommended.
 The
 .I numactl
 package is available at
-.IR ftp://oss.sgi.com/www/projects/libnuma/download/ .
+.UR ftp://oss.sgi.com\:/www\:/projects\:/libnuma\:/download/
+.UE .
 The package is also included in some Linux distributions.
 Some distributions include the development library and header
 in the separate
diff --git a/man7/standards.7 b/man7/standards.7
index 73f736cd7d..e1dcb882be 100644
--- a/man7/standards.7
+++ b/man7/standards.7
@@ -22,7 +22,7 @@
 .\" Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111,
 .\" USA.
 .\"
-.TH STANDARDS 7 2009-06-01 "Linux" "Linux Programmer's Manual"
+.TH STANDARDS 7 2012-08-05 "Linux" "Linux Programmer's Manual"
 .SH NAME
 standards \- C and UNIX Standards
 .SH DESCRIPTION
@@ -84,7 +84,9 @@ and is considered the definitive System V release.
 .TP
 .B SVID 4
 System V Interface Definition version 4, issued in 1995.
-Available online at http://www.sco.com/developers/devspecs/ .
+Available online at
+.UR http://www.sco.com\:/developers\:/devspecs/
+.UE .
 .TP
 .B C89
 This was the first C language standard, ratified by ANSI
@@ -104,7 +106,8 @@ and is thus occasionally referred to as
 This revision of the C language standard was ratified by ISO in 1999
 .RI ( "ISO/IEC 9899:1999" ).
 Available online at
-http://www.open-std.org/jtc1/sc22/wg14/www/standards.
+.UR http://www.open-std.org\:/jtc1\:/sc22\:/wg14\:/www\:/standards
+.UE .
 .TP
 .B POSIX.1-1990
 "Portable Operating System Interface for Computing Environments".
@@ -171,15 +174,18 @@ This standard appeared in 1997.
 Systems conforming to this standard can be branded
 .IR "UNIX 98" .
 See also
-http://www.UNIX-systems.org/version2/ .)
+.UR http://www.UNIX-systems.org\:/version2/
+.UE .)
 .TP
 .B POSIX.1-2001, SUSv3
 This was a 2001 revision and consolidation of the
 POSIX.1, POSIX.2, and SUS standards into a single document,
 conducted under the auspices of the Austin group
-(http://www.opengroup.org/austin/ .)
+.UR http://www.opengroup.org\:/austin/
+.UE .
 The standard is available online at
-http://www.unix-systems.org/version3/ ,
+.UR http://www.unix-systems.org\:/version3/
+.UE ,
 and the interfaces that it describes are also available in the Linux
 manual pages package under sections 1p and 3p (e.g., "man 3p open").
 
@@ -249,7 +255,8 @@ lists POSIX.1-2001, it can be assumed that the interface also
 conforms to POSIX.1-2008, unless otherwise noted.
 
 Further information can be found on the Austin group web site,
-http://www.opengroup.org/austin/ .
+.UR http://www.opengroup.org\:/austin/
+.UE .
 .SH "SEE ALSO"
 .BR feature_test_macros (7),
 .BR libc (7),
diff --git a/man7/unicode.7 b/man7/unicode.7
index 2f6a9167f3..b353c4e101 100644
--- a/man7/unicode.7
+++ b/man7/unicode.7
@@ -27,7 +27,7 @@
 .\" 2001-05-11  Markus Kuhn <mgk25@cl.cam.ac.uk>
 .\"      Update
 .\"
-.TH UNICODE 7 2001-05-11 "GNU" "Linux Programmer's Manual"
+.TH UNICODE 7 2012-08-05 "GNU" "Linux Programmer's Manual"
 .SH NAME
 Unicode \- universal character set
 .SH DESCRIPTION
@@ -244,7 +244,9 @@ for Standardization, Geneva, 2000.
 
 This is the official specification of
 .BR UCS .
-Available as a PDF file on CD-ROM from http://www.iso.ch/.
+Available as a PDF file on CD-ROM from
+.UR http://www.iso.ch/
+.UE .
 .TP
 *
 The Unicode Standard, Version 3.0.
@@ -265,13 +267,15 @@ which improved wide and multibyte character support even further.
 *
 Unicode Technical Reports.
 .RS
-http://www.unicode.org/unicode/reports/
+.UR http://www.unicode.org\:/unicode\:/reports/
+.UE
 .RE
 .TP
 *
 Markus Kuhn: UTF-8 and Unicode FAQ for UNIX/Linux.
 .RS
-http://www.cl.cam.ac.uk/~mgk25/unicode.html
+.UR http://www.cl.cam.ac.uk\:/~mgk25\:/unicode.html
+.UE
 
 Provides subscription information for the
 .I linux-utf8
@@ -282,7 +286,8 @@ Unicode under Linux.
 *
 Bruno Haible: Unicode HOWTO.
 .RS
-ftp://ftp.ilog.fr/pub/Users/haible/utf8/Unicode-HOWTO.html
+.UR ftp://ftp.ilog.fr\:/pub\:/Users\:/haible\:/utf8\:/Unicode-HOWTO.html
+.UE
 .RE
 .SH BUGS
 When this man page was last revised, the GNU C Library support for
diff --git a/man7/units.7 b/man7/units.7
index 87e7fb6f74..f4889eeae5 100644
--- a/man7/units.7
+++ b/man7/units.7
@@ -21,7 +21,7 @@
 .\" Formatted or processed versions of this manual, if unaccompanied by
 .\" the source, must acknowledge the copyright and authors of this work.
 .\"
-.TH UNITS 7 2001-12-22 "Linux" "Linux Programmer's Manual"
+.TH UNITS 7 2012-08-05 "Linux" "Linux Programmer's Manual"
 .SH NAME
 units, kilo, kibi, mega, mebi, giga, gibi \- decimal and binary prefixes
 .SH DESCRIPTION
@@ -61,7 +61,8 @@ in an ASCII context where this Greek letter is not available.
 See also
 .sp
 .RS
-http://physics.nist.gov/cuu/Units/prefixes.html
+.UR http://physics.nist.gov\:/cuu\:/Units\:/prefixes.html
+.UE
 .RE
 .SS Binary prefixes
 The binary prefixes resemble the decimal ones,
@@ -85,9 +86,8 @@ Ei	exbi	2^60 = 1152921504606846976
 
 See also
 .sp
-.RS
-http://physics.nist.gov/cuu/Units/binary.html
-.RE
+.UR http://physics.nist.gov\:/cuu\:/Units\:/binary.html
+.UE
 .SS Discussion
 Before these binary prefixes were introduced, it was fairly
 common to use k=1000 and K=1024, just like b=bit, B=byte.
diff --git a/man7/uri.7 b/man7/uri.7
index 087632a163..9e7d7f7936 100644
--- a/man7/uri.7
+++ b/man7/uri.7
@@ -44,7 +44,7 @@
 .\" Modified Fri Aug 21 23:00:00 1999 by David A. Wheeler (dwheeler@dwheeler.com)
 .\" Modified Tue Mar 14 2000 by David A. Wheeler (dwheeler@dwheeler.com)
 .\"
-.TH URI 7 2000-03-14 "Linux" "Linux Programmer's Manual"
+.TH URI 7 2012-08-05 "Linux" "Linux Programmer's Manual"
 .SH NAME
 uri, url, urn \- uniform resource identifier (URI), including a URL or URN
 .SH SYNOPSIS
@@ -170,7 +170,9 @@ may be too long to store as a URI, so they use a different
 interaction mechanism (called POST) which does
 not include the data in the URI.
 See the Common Gateway Interface specification at
-<http://www.w3.org/CGI> for more information.
+.UR http://www.w3.org\:/CGI
+.UE
+for more information.
 .PP
 .B "ftp \- File Transfer Protocol (FTP)"
 .PP
@@ -238,7 +240,7 @@ An example is <news:comp.lang.ada>.
 A
 .I message-id
 corresponds to the Message-ID of
-.UR http://www.ietf.org/rfc/rfc1036.txt
+.UR http://www.ietf.org\:/rfc\:/rfc1036.txt
 IETF RFC\ 1036,
 .UE
 without the enclosing "<"
@@ -378,7 +380,7 @@ Lightweight Directory Access Protocol (LDAP), a protocol for querying
 a set of servers for hierarchically organized information
 (such as people and computing resources).
 See
-.UR http://www.ietf.org/rfc/rfc2255.txt
+.UR http://www.ietf.org\:/rfc\:/rfc2255.txt
 RFC\ 2255
 .UE
 for more information on the LDAP URL scheme.
@@ -391,7 +393,7 @@ If empty, the client determines which the LDAP server to use.
 .IP dn
 the LDAP Distinguished Name, which identifies
 the base object of the LDAP search (see
-.UR http://www.ietf.org/rfc/rfc2253.txt
+.UR http://www.ietf.org\:/rfc\:/rfc2253.txt
 RFC\ 2253
 .UE
 section 3).
@@ -409,7 +411,7 @@ specifies the search filter (subset of entries
 to return).
 If omitted, all entries should be returned.
 See
-.UR http://www.ietf.org/rfc/rfc2254.txt
+.UR http://www.ietf.org\:/rfc\:/rfc2254.txt
 RFC\ 2254
 .UE
 section 4.
@@ -451,7 +453,7 @@ ldap://host.com:6666/o=University%20of%20Michigan,c=US??sub?(cn=Babs%20Jensen)
 .PP
 This scheme designates a WAIS database, search, or document
 (see
-.UR http://www.ietf.org/rfc/rfc1625.txt
+.UR http://www.ietf.org\:/rfc\:/rfc1625.txt
 IETF RFC\ 1625
 .UE
 for more information on WAIS).
@@ -551,7 +553,8 @@ This latter system, called the 'new' or 'logical' quoting system by
 is preferred practice in Great Britain and hackers worldwide
 (see the
 Jargon File's section on Hacker Writing Style,
-.IR http://www.fwi.uva.nl/~mes/jargon/h/HackerWritingStyle.html ,
+.UR http://www.fwi.uva.nl\:/~mes\:/jargon\:/h\:/HackerWritingStyle.html
+.UE ,
 for more information).
 Older documents suggested inserting the prefix "URL:"
 just before the URI, but this form has never caught on.
@@ -579,10 +582,12 @@ Don't use abbreviated URIs as hypertext links inside a document;
 use the standard format as described here.
 .SH "CONFORMING TO"
 .PP
-.I http://www.ietf.org/rfc/rfc2396.txt
-(IETF RFC\ 2396),
-.I http://www.w3.org/TR/REC-html40
-(HTML 4.0).
+.UR http://www.ietf.org\:/rfc\:/rfc2396.txt
+(IETF RFC\ 2396)
+.UE ,
+.UR http://www.w3.org\:/TR\:/REC-html40
+(HTML 4.0)
+.UE .
 .SH NOTES
 Any tool accepting URIs (e.g., a web browser) on a Linux system should
 be able to handle (directly or indirectly) all of the
@@ -702,6 +707,6 @@ tools) and invokes the right tool for any URI.
 .BR man2html (1),
 .BR mailaddr (7),
 .BR utf-8 (7),
-.UR http://www.ietf.org/rfc/rfc2255.txt
+.UR http://www.ietf.org\:/rfc\:/rfc2255.txt
 IETF RFC\ 2255
 .UE
diff --git a/man7/x25.7 b/man7/x25.7
index 6baca72f7c..acf2478c0a 100644
--- a/man7/x25.7
+++ b/man7/x25.7
@@ -4,7 +4,7 @@
 .\" and in case of nontrivial modification author and date
 .\" of the modification is added to the header.
 .\" $Id: x25.7,v 1.4 1999/05/18 10:35:12 freitag Exp $
-.TH X25 7 2012-05-10 "Linux" "Linux Programmer's Manual"
+.TH X25 7 2012-08-05 "Linux" "Linux Programmer's Manual"
 .SH NAME
 x25 \- ITU-T X.25 / ISO-8208 protocol interface.
 .SH SYNOPSIS
@@ -118,5 +118,6 @@ Jonathan Simon Naylor:
 \(lqThe Re-Analysis and Re-Implementation of X.25.\(rq
 The URL is
 .RS
-.I ftp://ftp.pspt.fi/pub/ham/linux/ax25/x25doc.tgz
+.UR ftp://ftp.pspt.fi\:/pub\:/ham\:/linux\:/ax25\:/x25doc.tgz
+.UE
 .RE