Bug #274497 - Misc spelling, grammar, and terminology fixes, including

URL -> URI and FOO's -> FOOs.

svn path=/main/trunk/; revision=14531

3 files changed, 7 insertions, 7 deletions

diff --git a/man/ebuild.5 b/man/ebuild.5
index 1ee42ff67..18db8e8a2 100644
--- a/man/ebuild.5
+++ b/man/ebuild.5
@@ -140,8 +140,8 @@ package will be required to have a version of portage that recognizes
 the EAPI to which this package conforms.
 .TP
 \fBSRC_URI\fR = \fI"http://happy.com/little/${P}.tar.gz"\fR
-Contains a list of URI's for the required source files.  It can contain
-multiple URI's for a single source file.  The list is processed in order
+Contains a list of URIs for the required source files.  It can contain
+multiple URIs for a single source file.  The list is processed in order
 if the file was not found on any of the \fIGENTOO_MIRRORS\fR.
 Beginning with \fBEAPI 2\fR, the output file name of a given URI may be
 customized with a "->" operator on the right hand side, followed by the
@@ -149,7 +149,7 @@ desired output file name. All tokens, including the operator and output
 file name, should be separated by whitespace.
 .TP
 \fBHOMEPAGE\fR = \fI"http://happy.com/"\fR
-Should contain a list of URL's for the sources main sites and other further
+Should contain a list of URIs for the sources main sites and other further
 package dependent information.
 .TP
 \fBKEYWORDS\fR = \fI[\-~][x86,ppc,sparc,mips,alpha,arm,hppa]\fR
@@ -421,7 +421,7 @@ binaries that are not compatible with debugedit.
 files in \fBSRC_URI\fR will not be downloaded from the \fBGENTOO_MIRRORS\fR.
 .TP
 .I primaryuri
-fetch from URL's in \fBSRC_URI\fR before \fBGENTOO_MIRRORS\fR.
+fetch from URIs in \fBSRC_URI\fR before \fBGENTOO_MIRRORS\fR.
 .TP
 .I strip
 final binaries/libraries will not be stripped of debug symbols.
diff --git a/man/make.conf.5 b/man/make.conf.5
index d16f5a113..a2d41ef90 100644
--- a/man/make.conf.5
+++ b/man/make.conf.5
@@ -432,7 +432,7 @@ place\-holders \\${DISTDIR}, \\${FILE} and \\${URI}.  The command should be
 written to place the fetched file at \\${DISTDIR}/\\${FILE}.
 Also see \fBRESUMECOMMAND\fR.
 .TP
-\fBGENTOO_MIRRORS\fR = \fI[URLs]\fR
+\fBGENTOO_MIRRORS\fR = \fI[URIs]\fR
 Insert your space\-seperated list of local mirrors here.  These
 locations are used to download files before the ones listed in
 the \fIebuild scripts\fR. Merging 'mirrorselect' can help.  Entries in this
diff --git a/man/portage.5 b/man/portage.5
index 36805f815..50e7e98e5 100644
--- a/man/portage.5
+++ b/man/portage.5
@@ -427,7 +427,7 @@ media\-other
 Contains variables customizing colors. See \fBcolor.map\fR(5).
 .TP
 .BR mirrors
-Whenever portage encounters a mirror:// style URL it will look up the actual 
+Whenever portage encounters a mirror:// style URI it will look up the actual 
 hosts here.  If the mirror set is not found here, it will check the global 
 mirrors file at /usr/portage/profiles/thirdpartymirrors.  You may also set a 
 special mirror type called "local".  This list of mirrors will be checked 
@@ -755,7 +755,7 @@ may contain any of the characters [A\-Za\-z0\-9_\-]. It must not begin with a
 hyphen.
 .TP
 .BR thirdpartymirrors
-Controls the mapping of mirror:// style URLs to actual lists of 
+Controls the mapping of mirror:// style URIs to actual lists of 
 mirrors.  Keeps us from overloading a single server.
 
 .I Format: