Start of man-pages-5.02: updating .Announce and .lsm files

[thirdparty/man-pages.git] / man7 / uri.7

diff --git a/man7/uri.7 b/man7/uri.7
index 4e4882560adbad4e282e294c92ee0f97b2d127d2..cadfad0c77f5c25ee60215987f2d5e64043798db 100644 (file)
--- a/man7/uri.7
+++ b/man7/uri.7
@@ -45,7 +45,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 2013-05-18 "Linux" "Linux Programmer's Manual"
+.TH URI 7 2017-09-15 "Linux" "Linux Programmer's Manual"
 .SH NAME
 uri, url, urn \- uniform resource identifier (URI), including a URL or URN
 .SH SYNOPSIS
@@ -82,7 +82,7 @@ the resource ceases to exist or becomes unavailable.
 .PP
 URIs are the standard way to name hypertext link destinations
 for tools such as web browsers.
-The string "http://www.kernelnotes.org" is a URL (and thus it
+The string "http://www.kernel.org" is a URL (and thus it
 is also a URI).
 Many people use the term URL loosely as a synonym for URI
 (though technically URLs are a subset of URIs).
@@ -124,8 +124,8 @@ The
 is the name of the host computer, either its name as determined by DNS
 or an IP address (numbers separated by periods).
 Thus the URI
-<http://fred:fredpassword@xyz.com:8080/>
-logs into a web server on host xyz.com
+<http://fred:fredpassword@example.com:8080/>
+logs into a web server on host example.com
 as fred (using fredpassword) using port 8080.
 Avoid including a password in a URI if possible because of the many
 security risks of having a password written down.
@@ -499,7 +499,7 @@ URI but their use is limited to their reserved purpose
 .PP
 Unreserved characters may be included in a URI.
 Unreserved characters
-include upper and lower case English letters,
+include uppercase and lowercase English letters,
 decimal digits, and the following
 limited set of punctuation marks and symbols:
 .IP
@@ -508,7 +508,7 @@ limited set of punctuation marks and symbols:
 All other characters must be escaped.
 An escaped octet is encoded as a character triplet, consisting of the
 percent character "%" followed by the two hexadecimal digits
-representing the octet code (you can use upper or lower case letters
+representing the octet code (you can use uppercase or lowercase letters
 for the hexadecimal digits).
 For example, a blank space must be escaped
 as "%20", a tab character as "%09", and the "&" as "%26".
@@ -538,7 +538,7 @@ use the URI escaping mechanism, that is,
 use the %HH encoding for unsafe octets.
 .SS Writing a URI
 When written, URIs should be placed inside double quotes
-(e.g., "http://www.kernelnotes.org"),
+(e.g., "http://www.kernel.org"),
 enclosed in angle brackets (e.g., <http://lwn.net>),
 or placed on a line by themselves.
 A warning for those who use double-quotes:
@@ -586,7 +586,7 @@ use the standard format as described here.
 .UR http://www.ietf.org\:/rfc\:/rfc2396.txt
 (IETF RFC\ 2396)
 .UE ,
-.UR http://www.w3.org\:/TR\:/REC-html40
+.UR http://www.w3.org\:/TR\:/REC\-html40
 (HTML 4.0)
 .UE .
 .SH NOTES
@@ -685,11 +685,11 @@ Also, the directory ZZZ usually changes when a version changes
 (though filename globbing could partially overcome this).
 Finally, using the file: scheme doesn't easily support people
 who dynamically load documentation from the Internet (instead of
-loading the files onto a local file system).
+loading the files onto a local filesystem).
 A future URI scheme may be added (e.g., "userdoc:") to permit
 programs to include cross-references to more detailed documentation
 without having to know the exact location of that documentation.
-Alternatively, a future version of the file-system specification may
+Alternatively, a future version of the filesystem specification may
 specify file locations sufficiently so that the file: scheme will
 be able to locate documentation.
 .PP
@@ -708,7 +708,7 @@ tools) and invokes the right tool for any URI.
 .BR man2html (1),
 .BR mailaddr (7),
 .BR utf-8 (7)
-
+.PP
 .UR http://www.ietf.org\:/rfc\:/rfc2255.txt
 IETF RFC\ 2255
 .UE