summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorZac Medico <zmedico@gentoo.org>2009-10-09 22:13:04 +0000
committerZac Medico <zmedico@gentoo.org>2009-10-09 22:13:04 +0000
commit6430efa0bcf9379b50ccaea0e1c2b2ea347ea212 (patch)
treeb440d25866e44eb185b9060418a4f25d95b314c7
parentForce consistent color output, in case we are capturing fetch (diff)
downloadportage-idfetch-6430efa0bcf9379b50ccaea0e1c2b2ea347ea212.tar.gz
portage-idfetch-6430efa0bcf9379b50ccaea0e1c2b2ea347ea212.tar.bz2
portage-idfetch-6430efa0bcf9379b50ccaea0e1c2b2ea347ea212.zip
Bug #274497 - Misc spelling, grammar, and terminology fixes, including
URL -> URI and FOO's -> FOOs. svn path=/main/trunk/; revision=14531
-rwxr-xr-xbin/misc-functions.sh6
-rw-r--r--cnf/make.conf.amd64-fbsd.diff2
-rw-r--r--cnf/make.conf.amd64.diff2
-rw-r--r--cnf/make.conf.x86-fbsd.diff2
-rw-r--r--cnf/make.conf.x86.diff2
-rw-r--r--doc/qa.docbook2
-rw-r--r--man/ebuild.58
-rw-r--r--man/make.conf.52
-rw-r--r--man/portage.54
-rw-r--r--pym/portage/__init__.py2
-rw-r--r--pym/portage/dbapi/porttree.py2
-rw-r--r--pym/portage/getbinpkg.py10
12 files changed, 22 insertions, 22 deletions
diff --git a/bin/misc-functions.sh b/bin/misc-functions.sh
index 0249063c..174f28c0 100755
--- a/bin/misc-functions.sh
+++ b/bin/misc-functions.sh
@@ -68,7 +68,7 @@ install_qa_check() {
unset PORTAGE_QUIET
fi
- # Make sure we disallow insecure RUNPATH/RPATH's
+ # Make sure we disallow insecure RUNPATH/RPATHs
# Don't want paths that point to the tree where the package was built
# (older, broken libtools would do this). Also check for null paths
# because the loader will search $PWD when it finds null paths.
@@ -80,7 +80,7 @@ install_qa_check() {
)
if [[ -n ${f}${x} ]] ; then
vecho -ne '\a\n'
- eqawarn "QA Notice: The following files contain insecure RUNPATH's"
+ eqawarn "QA Notice: The following files contain insecure RUNPATHs"
eqawarn " Please file a bug about this at http://bugs.gentoo.org/"
eqawarn " with the maintaining herd of the package."
eqawarn "${f}${f:+${x:+\n}}${x}"
@@ -93,7 +93,7 @@ install_qa_check() {
fi
fi
- # TEXTREL's are baaaaaaaad
+ # TEXTRELs are baaaaaaaad
# Allow devs to mark things as ignorable ... e.g. things that are
# binary-only and upstream isn't cooperating (nvidia-glx) ... we
# allow ebuild authors to set QA_TEXTRELS_arch and QA_TEXTRELS ...
diff --git a/cnf/make.conf.amd64-fbsd.diff b/cnf/make.conf.amd64-fbsd.diff
index 1ad4854f..aa07d065 100644
--- a/cnf/make.conf.amd64-fbsd.diff
+++ b/cnf/make.conf.amd64-fbsd.diff
@@ -37,7 +37,7 @@
+#
+# CRITICAL WARNINGS: ****************************************************** #
+# K6 markings are deceptive. Avoid setting -march for them. See Bug #24379. #
-+# Pentium-M CPU's should not enable sse2 until at least gcc-3.4. Bug 50616. #
++# Pentium-M CPUs should not enable sse2 until at least gcc-3.4. Bug 50616. #
+# GCC 3.3 doesnt support an amd64 specific -march setting, use 3.4. #
+# ************************************************************************* #
#
diff --git a/cnf/make.conf.amd64.diff b/cnf/make.conf.amd64.diff
index 397e8cb3..b4a93fe2 100644
--- a/cnf/make.conf.amd64.diff
+++ b/cnf/make.conf.amd64.diff
@@ -37,7 +37,7 @@
+#
+# CRITICAL WARNINGS: ****************************************************** #
+# K6 markings are deceptive. Avoid setting -march for them. See Bug #24379. #
-+# Pentium-M CPU's should not enable sse2 until at least gcc-3.4. Bug 50616. #
++# Pentium-M CPUs should not enable sse2 until at least gcc-3.4. Bug 50616. #
+# GCC 3.3 doesnt support an amd64 specific -march setting, use 3.4. #
+# ************************************************************************* #
#
diff --git a/cnf/make.conf.x86-fbsd.diff b/cnf/make.conf.x86-fbsd.diff
index 1a49edc6..9fec4f17 100644
--- a/cnf/make.conf.x86-fbsd.diff
+++ b/cnf/make.conf.x86-fbsd.diff
@@ -43,7 +43,7 @@
+#
+# CRITICAL WARNINGS: ****************************************************** #
+# K6 markings are deceptive. Avoid setting -march for them. See Bug #24379. #
-+# Pentium-M CPU's should not enable sse2 until at least gcc-3.4. Bug 50616. #
++# Pentium-M CPUs should not enable sse2 until at least gcc-3.4. Bug 50616. #
+# ************************************************************************* #
#
+# Decent examples:
diff --git a/cnf/make.conf.x86.diff b/cnf/make.conf.x86.diff
index 3e9594ab..f9084511 100644
--- a/cnf/make.conf.x86.diff
+++ b/cnf/make.conf.x86.diff
@@ -73,7 +73,7 @@
+#
+# CRITICAL WARNINGS: ****************************************************** #
+# K6 markings are deceptive. Avoid setting -march for them. See Bug #24379. #
-+# Pentium-M CPU's should not enable sse2 until at least gcc-3.4. Bug 50616. #
++# Pentium-M CPUs should not enable sse2 until at least gcc-3.4. Bug 50616. #
+# ************************************************************************* #
+#
+# NOTE: the -On optimization levels are set with the letter O, not -0 (zero).
diff --git a/doc/qa.docbook b/doc/qa.docbook
index e121e6a9..b9ec375e 100644
--- a/doc/qa.docbook
+++ b/doc/qa.docbook
@@ -17,7 +17,7 @@
<title>Scanelf: Insecure RUNPATHs</title>
<para>
<programlisting>
- QA Notice: The following files contain insecure RUNPATH's
+ QA Notice: The following files contain insecure RUNPATHs
</programlisting>
</para>
<para>
diff --git a/man/ebuild.5 b/man/ebuild.5
index 1ee42ff6..18db8e8a 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 d16f5a11..a2d41ef9 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 36805f81..50e7e98e 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:
diff --git a/pym/portage/__init__.py b/pym/portage/__init__.py
index a0c9277a..9224b713 100644
--- a/pym/portage/__init__.py
+++ b/pym/portage/__init__.py
@@ -6578,7 +6578,7 @@ def doebuild(myebuild, mydo, myroot, mysettings, debug=0, listonly=0,
@type dbkey: Dict or String
@param use_cache: Enables the cache
@type use_cache: Boolean
- @param fetchall: Used to wrap fetch(), fetches all URI's (even ones invalid due to USE conditionals)
+ @param fetchall: Used to wrap fetch(), fetches all URIs (even ones invalid due to USE conditionals)
@type fetchall: Boolean
@param tree: Which tree to use ('vartree','porttree','bintree', etc..), defaults to 'porttree'
@type tree: String
diff --git a/pym/portage/dbapi/porttree.py b/pym/portage/dbapi/porttree.py
index ef0b8a69..e955a6a5 100644
--- a/pym/portage/dbapi/porttree.py
+++ b/pym/portage/dbapi/porttree.py
@@ -433,7 +433,7 @@ class portdbapi(dbapi):
def getRepositories(self):
"""
This function is required for GLEP 42 compliance; it will return a list of
- repository ID's
+ repository IDs
TreeMap = {id: path}
"""
return [k for k in self.treemap if k]
diff --git a/pym/portage/getbinpkg.py b/pym/portage/getbinpkg.py
index 69ae56fa..42938de9 100644
--- a/pym/portage/getbinpkg.py
+++ b/pym/portage/getbinpkg.py
@@ -107,7 +107,7 @@ def create_conn(baseurl,conn=None):
parts = baseurl.split("://",1)
if len(parts) != 2:
- raise ValueError(_("Provided URL does not "
+ raise ValueError(_("Provided URI does not "
"contain protocol identifier. '%s'") % baseurl)
protocol,url_parts = parts
del parts
@@ -315,7 +315,7 @@ def match_in_array(array, prefix="", suffix="", match_both=1, allow_overlap=0):
def dir_get_list(baseurl,conn=None):
"""(baseurl[,connection]) -- Takes a base url to connect to and read from.
- URL should be in the for <proto>://<site>[:port]<path>
+ URI should be in the form <proto>://<site>[:port]<path>
Connection is used for persistent connection instances."""
if not conn:
@@ -363,7 +363,7 @@ def dir_get_list(baseurl,conn=None):
def file_get_metadata(baseurl,conn=None, chunk_size=3000):
"""(baseurl[,connection]) -- Takes a base url to connect to and read from.
- URL should be in the for <proto>://<site>[:port]<path>
+ URI should be in the form <proto>://<site>[:port]<path>
Connection is used for persistent connection instances."""
if not conn:
@@ -414,7 +414,7 @@ def file_get_metadata(baseurl,conn=None, chunk_size=3000):
def file_get(baseurl,dest,conn=None,fcmd=None):
"""(baseurl,dest,fcmd=) -- Takes a base url to connect to and read from.
- URL should be in the for <proto>://[user[:pass]@]<site>[:port]<path>"""
+ URI should be in the form <proto>://[user[:pass]@]<site>[:port]<path>"""
if not fcmd:
return file_get_lib(baseurl,dest,conn)
@@ -442,7 +442,7 @@ def file_get(baseurl,dest,conn=None,fcmd=None):
def file_get_lib(baseurl,dest,conn=None):
"""(baseurl[,connection]) -- Takes a base url to connect to and read from.
- URL should be in the for <proto>://<site>[:port]<path>
+ URI should be in the form <proto>://<site>[:port]<path>
Connection is used for persistent connection instances."""
if not conn: