Fix typos

8 files changed, 15 insertions, 15 deletions

diff --git a/dns/edns.py b/dns/edns.py
index c6102fd..8ac676b 100644
--- a/dns/edns.py
+++ b/dns/edns.py
@@ -43,7 +43,7 @@ class Option(object):
         @type otype: int
         @param wire: The wire-format message
         @type wire: string
-        @param current: The offet in wire of the beginning of the rdata.
+        @param current: The offset in wire of the beginning of the rdata.
         @type current: int
         @param olen: The length of the wire-format option data
         @type olen: int
@@ -140,7 +140,7 @@ def option_from_wire(otype, wire, current, olen):
     @type otype: int
     @param wire: The wire-format message
     @type wire: string
-    @param current: The offet in wire of the beginning of the rdata.
+    @param current: The offset in wire of the beginning of the rdata.
     @type current: int
     @param olen: The length of the wire-format option data
     @type olen: int
diff --git a/dns/exception.py b/dns/exception.py
index 799d53a..62fbe2c 100644
--- a/dns/exception.py
+++ b/dns/exception.py
@@ -34,7 +34,7 @@ class DNSException(Exception):
     In the new mode *args has to be empty and all kwargs has to exactly match
     set in class variable self.supp_kwargs. All kwargs are stored inside
     self.kwargs and used in new __str__ implementation to construct
-    formated message based on self.fmt string.
+    formatted message based on self.fmt string.
 
     In the simplest case it is enough to override supp_kwargs and fmt
     class variables to get nice parametrized messages.
diff --git a/dns/message.py b/dns/message.py
index 184100d..9b8dcd0 100644
--- a/dns/message.py
+++ b/dns/message.py
@@ -58,13 +58,13 @@ class UnknownHeaderField(dns.exception.DNSException):
 
 class BadEDNS(dns.exception.FormError):
 
-    """OPT record occured somewhere other than the start of
+    """OPT record occurred somewhere other than the start of
     the additional data section."""
 
 
 class BadTSIG(dns.exception.FormError):
 
-    """A TSIG record occured somewhere other than the end of
+    """A TSIG record occurred somewhere other than the end of
     the additional data section."""
 
 
@@ -1050,7 +1050,7 @@ def make_query(qname, rdtype, rdclass=dns.rdataclass.IN, use_edns=None,
     The query name, type, and class may all be specified either
     as objects of the appropriate type, or as strings.
 
-    The query will have a randomly choosen query id, and its DNS flags
+    The query will have a randomly chosen query id, and its DNS flags
     will be set to dns.flags.RD.
 
     @param qname: The query name.
diff --git a/dns/name.py b/dns/name.py
index e5b0107..2a74694 100644
--- a/dns/name.py
+++ b/dns/name.py
@@ -226,7 +226,7 @@ class Name(object):
     def fullcompare(self, other):
         """Compare two names, returning a 3-tuple (relation, order, nlabels).
 
-        I{relation} describes the relation ship beween the names,
+        I{relation} describes the relation ship between the names,
         and is one of: dns.name.NAMERELN_NONE,
         dns.name.NAMERELN_SUPERDOMAIN, dns.name.NAMERELN_SUBDOMAIN,
         dns.name.NAMERELN_EQUAL, or dns.name.NAMERELN_COMMONANCESTOR
@@ -379,7 +379,7 @@ class Name(object):
     def to_unicode(self, omit_final_dot=False):
         """Convert name to Unicode text format.
 
-        IDN ACE lables are converted to Unicode.
+        IDN ACE labels are converted to Unicode.
 
         @param omit_final_dot: If True, don't emit the final dot (denoting the
         root label) for absolute names.  The default is False.
@@ -587,7 +587,7 @@ empty = Name([])
 def from_unicode(text, origin=root):
     """Convert unicode text into a Name object.
 
-    Lables are encoded in IDN ACE form.
+    Labels are encoded in IDN ACE form.
 
     @rtype: dns.name.Name object
     """
diff --git a/dns/rcode.py b/dns/rcode.py
index 698ad25..314815f 100644
--- a/dns/rcode.py
+++ b/dns/rcode.py
@@ -62,7 +62,7 @@ class UnknownRcode(dns.exception.DNSException):
 def from_text(text):
     """Convert text into an rcode.
 
-    @param text: the texual rcode
+    @param text: the textual rcode
     @type text: string
     @raises UnknownRcode: the rcode is unknown
     @rtype: int
diff --git a/dns/rdata.py b/dns/rdata.py
index cb8c274..824731c 100644
--- a/dns/rdata.py
+++ b/dns/rdata.py
@@ -286,7 +286,7 @@ class Rdata(object):
         @type rdtype: int
         @param wire: The wire-format message
         @type wire: string
-        @param current: The offet in wire of the beginning of the rdata.
+        @param current: The offset in wire of the beginning of the rdata.
         @type current: int
         @param rdlen: The length of the wire-format rdata
         @type rdlen: int
@@ -451,7 +451,7 @@ def from_wire(rdclass, rdtype, wire, current, rdlen, origin=None):
     @type rdtype: int
     @param wire: The wire-format message
     @type wire: string
-    @param current: The offet in wire of the beginning of the rdata.
+    @param current: The offset in wire of the beginning of the rdata.
     @type current: int
     @param rdlen: The length of the wire-format rdata
     @type rdlen: int
diff --git a/dns/renderer.py b/dns/renderer.py
index ed3ec66..ddc277c 100644
--- a/dns/renderer.py
+++ b/dns/renderer.py
@@ -88,7 +88,7 @@ class Renderer(object):
         then L{dns.exception.TooBig} will be raised.
         @type max_size: int
         @param origin: the origin to use when rendering relative names
-        @type origin: dns.name.Namem or None.
+        @type origin: dns.name.Name or None.
         """
 
         self.output = BytesIO()
diff --git a/dns/zone.py b/dns/zone.py
index 81e0fcf..ae099bd 100644
--- a/dns/zone.py
+++ b/dns/zone.py
@@ -94,7 +94,7 @@ class Zone(object):
             if isinstance(origin, string_types):
                 origin = dns.name.from_text(origin)
             elif not isinstance(origin, dns.name.Name):
-                raise ValueError("origin parameter must be convertable to a "
+                raise ValueError("origin parameter must be convertible to a "
                                  "DNS name")
             if not origin.is_absolute():
                 raise ValueError("origin parameter must be an absolute name")
@@ -128,7 +128,7 @@ class Zone(object):
         if isinstance(name, string_types):
             name = dns.name.from_text(name, None)
         elif not isinstance(name, dns.name.Name):
-            raise KeyError("name parameter must be convertable to a DNS name")
+            raise KeyError("name parameter must be convertible to a DNS name")
         if name.is_absolute():
             if not name.is_subdomain(self.origin):
                 raise KeyError(