Fix some typos.

diff --git a/bin/glsa-check b/bin/glsa-check
index d8745b062938d8fa60616f5d93c35a87b7dc9d86..2f2d55523d9fabe6954f788dbd25ae2527d3e502 100755 (executable)
--- a/bin/glsa-check
+++ b/bin/glsa-check
@@ -1,5 +1,5 @@
 #!/usr/bin/python
-# Copyright 2008-2009 Gentoo Foundation
+# Copyright 2008-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 from __future__ import print_function
@@ -94,7 +94,7 @@ elif mode != "list" and not params:
        parser.print_help()
        sys.exit(1)
 elif mode in ["fix", "inject"] and os.geteuid() != 0:
-       # we need root priviledges for write access
+       # we need root privileges for write access
        sys.stderr.write("\nThis tool needs root access to "+options.mode+" this GLSA\n\n")
        sys.exit(2)
 elif mode == "list" and not params:

diff --git a/cnf/make.conf.sparc.diff b/cnf/make.conf.sparc.diff
index e73357b0831a2ac1b4754f6a7758a9cb7aa39b40..e016a0b1e7599a6620b9de2e666f2ab476b01c48 100644 (file)
--- a/cnf/make.conf.sparc.diff
+++ b/cnf/make.conf.sparc.diff
@@ -8,7 +8,7 @@
 +# ============
 +# This should be left to the default value of sparc-unknown-linux-gnu unless
 +# you are absolutely certain of the consequences.  In addition to potentially
-+# destroying your system, you will recieve no support and your bugs will be 
++# destroying your system, you will receive no support and your bugs will be 
 +# marked INVALID if you change this.
 +#
 +# CHOST="sparc-unknown-linux-gnu"

diff --git a/doc/package/ebuild/eapi/4.docbook b/doc/package/ebuild/eapi/4.docbook
index 83ba0dda5e97ef0f8441dd75266947cd19b3e574..8dd0f1487b41eb1b98d48d1df16e548f45ea04c5 100644 (file)
--- a/doc/package/ebuild/eapi/4.docbook
+++ b/doc/package/ebuild/eapi/4.docbook
@@ -150,7 +150,7 @@ This new REQUIRED_USE metadata key is used to specify what USE flag combinations
 <section id='package-ebuild-eapi-4-metadata-required-use-motivation'>
 <title>Motivation</title>
 <para>
-It's a semi common occurence that an ebuild may need to state that they disallow USE flags in specific combinations- either mysql or sqlite for example, but not both.
+It's a semi common occurrence that an ebuild may need to state that they disallow USE flags in specific combinations- either mysql or sqlite for example, but not both.
 </para>
 <para>
 Existing solutions rely on checking the the USE configuration in pkg_setup which is non-optimal due to pkg_setup being ran potentially hours after the initial emerge -p invocation.
@@ -166,7 +166,7 @@ The only way to find out if the USE state is disallowed is to run the code
 </listitem>
 <listitem>
 <para>
-The common implementation of this can result in an iterative process where the user hits a USE constraint, fixs it, reruns the emerge invocation only to find that there is another constraint still violated for the ebuild, thus requiring them to fix it, rerun emerge, etc.
+The common implementation of this can result in an iterative process where the user hits a USE constraint, fixes it, reruns the emerge invocation only to find that there is another constraint still violated for the ebuild, thus requiring them to fix it, rerun emerge, etc.
 </para>
 </listitem>
 <listitem>

diff --git a/make.conf.txt b/make.conf.txt
index 5bbb6e346c825c4637d5ba38eb37dc249083d5fd..beb4b0c5cf4380b0af63ad4e2bc926479e71424f 100644 (file)
--- a/make.conf.txt
+++ b/make.conf.txt
@@ -316,7 +316,7 @@ GENTOO_MIRRORS
 :default: http://distfiles.gentoo.org http://distro.ibiblio.org/pub/linux/distributions/gentoo
 :valdesc: space separated list of mirror locations
 
-Insert your space-seperated list of local mirrors here. These locations are 
+Insert your space-separated list of local mirrors here. These locations are 
 used to download files before the ones listed in the ebuild scripts. Merging 
 'app-portage/mirrorselect' can help to select an appropriate mirror.
 

diff --git a/man/ebuild.5 b/man/ebuild.5
index 1067f82eece5ee29f5533b3b43d99101f91e11db..87f658d06a13b5acd6c3cffb7688c97c1b028751 100644 (file)
--- a/man/ebuild.5
+++ b/man/ebuild.5
@@ -1,4 +1,4 @@
-.TH "EBUILD" "5" "Feb 2011" "Portage VERSION" "Portage"
+.TH "EBUILD" "5" "May 2011" "Portage VERSION" "Portage"
 .SH "NAME"
 ebuild \- the internal format, variables, and functions in an ebuild script
 .SH "DESCRIPTION"
@@ -1012,7 +1012,7 @@ Strips all executable files of debugging symboles.  This includes libraries.
 .TP
 \fBprepstrip\fR \fI[dir]\fR
 .PD 1
-Similiar to the \fBprepall\fR functions, these are subtle in their differences.
+Similar to the \fBprepall\fR functions, these are subtle in their differences.
 .RS
 .PD 0
 .TP

diff --git a/man/make.conf.5 b/man/make.conf.5
index b894cdd809500bc47d8c7808c3e6f9b83cd720a1..bec815850d6a626360844c498e32ddf7818d5eac 100644 (file)
--- a/man/make.conf.5
+++ b/man/make.conf.5
@@ -533,7 +533,7 @@ For more information, see the \fIInvoking GCC\fR section of the gcc manual:
 http://gcc.gnu.org/onlinedocs/
 .TP
 \fBGENTOO_MIRRORS\fR = \fI[URIs]\fR
-Insert your space\-seperated list of local mirrors here.  These
+Insert your space\-separated 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
 variable that have no protocol and simply start with a '/' path separator may

diff --git a/pym/_emerge/depgraph.py b/pym/_emerge/depgraph.py
index 80e35c4b57ef71aade5718450ed6e2120f174b67..5004e6c4598be798f575a1b57ae5258abc3e0ff1 100644 (file)
--- a/pym/_emerge/depgraph.py
+++ b/pym/_emerge/depgraph.py
@@ -5532,7 +5532,7 @@ class depgraph(object):
 
        def _display_autounmask(self):
                """
-               Display --autounmask message and optionally write them to config files
+               Display --autounmask message and optionally write it to config files
                (using CONFIG_PROTECT). The message includes the comments and the changes.
                """
 
@@ -5658,12 +5658,12 @@ class depgraph(object):
 
                def find_config_file(abs_user_config, file_name):
                        """
-                       Searches /etc/portage for an appropiate file to append changes to.
-                       If the file_name is a file it is returned, if it is a directoy, the
+                       Searches /etc/portage for an appropriate file to append changes to.
+                       If the file_name is a file it is returned, if it is a directory, the
                        last file in it is returned.
 
-                       file_name - String containg a file name like "package.use"
-                       return value - String. Absolte path of file to write to. None if
+                       file_name - String containing a file name like "package.use"
+                       return value - String. Absolute path of file to write to. None if
                        no suitable file exists.
                        """
                        file_path = os.path.join(abs_user_config, file_name)
@@ -5675,7 +5675,7 @@ class depgraph(object):
                                                files = sorted(f for f in os.listdir(file_path) \
                                                        if os.path.isfile(os.path.join(file_path, f)))
                                                if len(files) != 0:
-                                                       return  os.path.join(file_path, files[-1])
+                                                       return os.path.join(file_path, files[-1])
                                        except OSError:
                                                pass
 
@@ -5763,11 +5763,11 @@ class depgraph(object):
                                        file_to_write_to.get((abs_user_config, "package.license")))
 
                if problems:
-                       writemsg_stdout("\nThe following problems occured while writing autounmask changes:\n", \
+                       writemsg_stdout("\nThe following problems occurred while writing autounmask changes:\n", \
                                noiselevel=-1)
                        writemsg_stdout("".join(problems), noiselevel=-1)
                elif write_to_file and roots:
-                       writemsg_stdout("\nAutounmask changes successfully written. Remeber to run etc-update.\n", \
+                       writemsg_stdout("\nAutounmask changes successfully written. Remember to run etc-update.\n", \
                                noiselevel=-1)
                elif not pretend and not autounmask_write and roots:
                        writemsg_stdout("\nUse --autounmask-write to write changes to config files (honoring CONFIG_PROTECT).\n", \
@@ -5786,7 +5786,7 @@ class depgraph(object):
                go to stdout for parsing by programs such as autounmask.
                """
 
-               # Note that show_masked_packages() sends it's output to
+               # Note that show_masked_packages() sends its output to
                # stdout, and some programs such as autounmask parse the
                # output in cases when emerge bails out. However, when
                # show_masked_packages() is called for installed packages

diff --git a/pym/_emerge/main.py b/pym/_emerge/main.py
index 7921d7d1ce694b9ca9a119c2b33f55db103f29d1..11d8ca1cc5b77d1e58fdc9faf6d3fa070bc68c1e 100644 (file)
--- a/pym/_emerge/main.py
+++ b/pym/_emerge/main.py
@@ -1349,7 +1349,7 @@ def expand_set_arguments(myfiles, myaction, root_config):
 
        sets = setconfig.getSets()
 
-       # display errors that occured while loading the SetConfig instance
+       # display errors that occurred while loading the SetConfig instance
        for e in setconfig.errors:
                print(colorize("BAD", "Error during set creation: %s" % e))
 

diff --git a/pym/_emerge/resolver/output_helpers.py b/pym/_emerge/resolver/output_helpers.py
index ff6327f4a9829107485e0bb3380a6f5d9ecc31dd..874660f69dffa76d1b8be39eda7e86db82ca655b 100644 (file)
--- a/pym/_emerge/resolver/output_helpers.py
+++ b/pym/_emerge/resolver/output_helpers.py
@@ -1,7 +1,7 @@
-# Copyright 2010 Gentoo Foundation
+# Copyright 2010-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
-"""Contains private suport functions for the Display class
+"""Contains private support functions for the Display class
 in output.py
 """
 __all__ = (

diff --git a/pym/portage/cvstree.py b/pym/portage/cvstree.py
index f36e9230c73fb346d68c191f82be8f968c48f599..de580f57e55e25f36704d5a1c69f9ada77bb22b1 100644 (file)
--- a/pym/portage/cvstree.py
+++ b/pym/portage/cvstree.py
@@ -1,5 +1,5 @@
 # cvstree.py -- cvs tree utilities
-# Copyright 1998-2004 Gentoo Foundation
+# Copyright 1998-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 from __future__ import print_function
@@ -199,8 +199,8 @@ def apply_cvsignore_filter(list):
        
 def getentries(mydir,recursive=0):
        """(basedir,recursive=0)
-       Scans the given directory and returns an datadict of all the entries in
-       the directory seperated as a dirs dict and a files dict."""
+       Scans the given directory and returns a datadict of all the entries in
+       the directory separated as a dirs dict and a files dict."""
        myfn=mydir+"/CVS/Entries"
        # entries=[dirs, files]
        entries={"dirs":{},"files":{}}

diff --git a/pym/portage/mail.py b/pym/portage/mail.py
index aa41854c311aee5563f9637fbecce9f4b5dff319..688b5181dc0eb3108d96404e1e86c72bcf4005d7 100644 (file)
--- a/pym/portage/mail.py
+++ b/pym/portage/mail.py
@@ -107,8 +107,8 @@ def send_mail(mysettings, message):
        myrecipient = "root@localhost"
        
        # Syntax for PORTAGE_ELOG_MAILURI (if defined):
-       # adress [[user:passwd@]mailserver[:port]]
-       # where adress:     recipient adress
+       # address [[user:passwd@]mailserver[:port]]
+       # where address:    recipient address
        #       user:       username for smtp auth (defaults to none)
        #       passwd:     password for smtp auth (defaults to none)
        #       mailserver: smtp server that should be used to deliver the mail (defaults to localhost)
@@ -159,7 +159,7 @@ def send_mail(mysettings, message):
                                myconn = smtplib.SMTP(mymailhost, int(mymailport) - 100000)
                                myconn.ehlo()
                                if not myconn.has_extn("STARTTLS"):
-                                       raise portage.exception.PortageException(_("!!! TLS support requested for logmail but not suported by server"))
+                                       raise portage.exception.PortageException(_("!!! TLS support requested for logmail but not supported by server"))
                                myconn.starttls()
                                myconn.ehlo()
                        else:
@@ -171,8 +171,8 @@ def send_mail(mysettings, message):
                        myconn.sendmail(myfrom, myrecipient, message_str)
                        myconn.quit()
                except smtplib.SMTPException as e:
-                       raise portage.exception.PortageException(_("!!! An error occured while trying to send logmail:\n")+str(e))
+                       raise portage.exception.PortageException(_("!!! An error occurred while trying to send logmail:\n")+str(e))
                except socket.error as e:
-                       raise portage.exception.PortageException(_("!!! A network error occured while trying to send logmail:\n%s\nSure you configured PORTAGE_ELOG_MAILURI correctly?") % str(e))
+                       raise portage.exception.PortageException(_("!!! A network error occurred while trying to send logmail:\n%s\nSure you configured PORTAGE_ELOG_MAILURI correctly?") % str(e))
        return
        

diff --git a/pym/portage/output.py b/pym/portage/output.py
index 5e8b89e0ed76bfc950e1a667a36f8ac08d1a4d77..a0846b3921bad2d738bbe813c137bd3211169780 100644 (file)
--- a/pym/portage/output.py
+++ b/pym/portage/output.py
@@ -1,4 +1,4 @@
-# Copyright 1998-2009 Gentoo Foundation
+# Copyright 1998-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 __docformat__ = "epytext"
@@ -181,7 +181,7 @@ def _parse_color_map(config_root='/', onerror=None):
                        
                        split_line = line.split("=")
                        if len(split_line) != 2:
-                               e = ParseError(_("'%s', line %s: expected exactly one occurence of '=' operator") % \
+                               e = ParseError(_("'%s', line %s: expected exactly one occurrence of '=' operator") % \
                                        (myfile, lineno))
                                raise e
                                if onerror:

diff --git a/pym/portage/tests/resolver/ResolverPlayground.py b/pym/portage/tests/resolver/ResolverPlayground.py
index f5bd77ff2b91e5dafffc4f872d14809abc0ce952..2020cf3702c5b443489dd21c9dd42632229173fb 100644 (file)
--- a/pym/portage/tests/resolver/ResolverPlayground.py
+++ b/pym/portage/tests/resolver/ResolverPlayground.py
@@ -26,9 +26,9 @@ from _emerge.RootConfig import RootConfig
 
 class ResolverPlayground(object):
        """
-       This class help to create the necessary files on disk and
+       This class helps to create the necessary files on disk and
        the needed settings instances, etc. for the resolver to do
-       it's work.
+       its work.
        """
 
        config_files = frozenset(("package.use", "package.mask", "package.keywords", \
@@ -37,7 +37,7 @@ class ResolverPlayground(object):
        def __init__(self, ebuilds={}, installed={}, profile={}, repo_configs={}, \
                user_config={}, sets={}, world=[], debug=False):
                """
-               ebuilds: cpv -> metadata mapping simulating avaiable ebuilds. 
+               ebuilds: cpv -> metadata mapping simulating available ebuilds. 
                installed: cpv -> metadata mapping simulating installed packages.
                        If a metadata key is missing, it gets a default value.
                profile: settings defined by the profile.
@@ -487,7 +487,7 @@ class ResolverPlaygroundTestCase(object):
                checks = dict.fromkeys(result.checks)
                for key, value in self._checks.items():
                        if not key in checks:
-                               raise KeyError("Not an avaiable check: '%s'" % key)
+                               raise KeyError("Not an available check: '%s'" % key)
                        checks[key] = value
 
                fail_msgs = []

diff --git a/pym/portage/update.py b/pym/portage/update.py
index bac09c2acfaf0fe04cf75f25381dbeb29e570013..4e5e78e5beda975a4f0f9f41e4fdef6c2b046664 100644 (file)
--- a/pym/portage/update.py
+++ b/pym/portage/update.py
@@ -1,4 +1,4 @@
-# Copyright 1999-2010 Gentoo Foundation
+# Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 import codecs
@@ -310,7 +310,7 @@ def update_config_files(config_root, protect, protect_mask, update_iter, match_c
                        write_atomic(updating_file, "".join(file_contents[x]))
                except PortageException as e:
                        writemsg("\n!!! %s\n" % str(e), noiselevel=-1)
-                       writemsg(_("!!! An error occured while updating a config file:") + \
+                       writemsg(_("!!! An error occurred while updating a config file:") + \
                                " '%s'\n" % updating_file, noiselevel=-1)
                        continue
 

diff --git a/pym/portage/xml/metadata.py b/pym/portage/xml/metadata.py
index 21e9a5d6b7e40f813f6c2029ddd5f40021cf26ab..7acc1f3d6bcb4a709ae4b58303dca40d38007cca 100644 (file)
--- a/pym/portage/xml/metadata.py
+++ b/pym/portage/xml/metadata.py
@@ -1,4 +1,4 @@
-# Copyright 2010 Gentoo Foundation
+# Copyright 2010-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 """Provides an easy-to-use python interface to Gentoo's metadata.xml file.
@@ -79,7 +79,7 @@ class _Useflag(object):
        @type name: str or None
        @ivar name: USE flag
        @type restrict: str or None
-       @ivar restrict: e.g. >=portage-2.2 means flag is only avaiable in
+       @ivar restrict: e.g. >=portage-2.2 means flag is only available in
                versions greater than 2.2
        @type description: str
        @ivar description: description of the USE flag