Merge branch 'trunk' into 8852-dist3-rm

zmyer · Oct 8, 2016 · 012617d · 012617d
2 parents 9796113 + 49365f5
commit 012617d
Show file tree

Hide file tree

Showing 22 changed files with 31 additions and 31 deletions.
diff --git a/NEWS b/NEWS
@@ -1677,7 +1677,7 @@ Improved Documentation
  - Twisted Trial's how-to documentation now has a link to Twisted's
    contribution guidelines and has been reformatted. (#7475)
  - Fixed a path error in the make.bat file for building Sphinx
-   documentation, so that it is now possible to build the documenation
+   documentation, so that it is now possible to build the documentation
    using make.bat on Windows. (#7542)
 
 Deprecations and Removals
@@ -4095,7 +4095,7 @@ Bugfixes
    --inplace' will compile the extension and cause the test to both
    run and pass. (#4331)
  - twisted.python.logfile.LogFile now raises a descriptive exception
-   when passed a log  directoy which does not exist. (#4701)
+   when passed a log  directory which does not exist. (#4701)
  - Fixed a bug where Inotify will fail to add a filepatch to watchlist
    after it has been added/ignored previously. (#4708)
  - IPv4Address and UNIXAddress object comparison operators fixed
@@ -4189,7 +4189,7 @@ Bugfixes
 Improved Documentation
 ----------------------
  - Changed the man page for ckeygen to accurately reflect what it
-   does, and corrected its synposis so that a second "ckeygen" is not
+   does, and corrected its synopsis so that a second "ckeygen" is not
    a required part of the ckeygen command line.  (#4738)
 
 Other
@@ -4824,7 +4824,7 @@ Twisted Conch 10.1.0 (2010-06-27)
 Features
 --------
  - twisted.conch.ssh.transport.SSHTransportBase now allows supported
-   ssh protocol versions to be overriden. (#4428)
+   ssh protocol versions to be overridden. (#4428)
 
 Bugfixes
 --------
@@ -4998,7 +4998,7 @@ Features
    zombie processes in this case. (#2078)
 
  - High-throughput applications based on Perspective Broker should now
-   run noticably faster thanks to the use of a more efficient decoding
+   run noticeably faster thanks to the use of a more efficient decoding
    function in Twisted Spread. (#2310)
 
  - Documentation for trac-post-commit-hook functionality in svn-dev
@@ -6368,9 +6368,9 @@ Features
 Fixes
 -----
  - Handle empty passwords in SMTP auth. (#2521)
- - Fix IMAP4Client's parsing of literals which are not preceeded by whitespace.
+ - Fix IMAP4Client's parsing of literals which are not preceded by whitespace.
    (#2700)
- - Handle MX lookup suceeding without answers. (#2807)
+ - Handle MX lookup succeeding without answers. (#2807)
  - Fix issues with aliases(5) process support. (#2729)
 
 Misc

diff --git a/docs/words/examples/minchat.py b/docs/words/examples/minchat.py
@@ -78,7 +78,7 @@ class MinGroupConversation(basechat.GroupConversation):
     """
     This class is a minimal implementation of the abstract GroupConversation class.
 
-    This is all you need to override to listen in on a group conversaion.
+    This is all you need to override to listen in on a group conversation.
     """
     def show(self):
         """

diff --git a/src/twisted/internet/utils.py b/src/twisted/internet/utils.py
@@ -108,7 +108,7 @@ def getProcessOutput(executable, args=(), env={}, path=None, reactor=None,
                  sequence of strings. The first string should B{NOT} be the
                  executable's name.
 
-    @param env: the environment variables to pass to the processs; a
+    @param env: the environment variables to pass to the process; a
                 dictionary of strings.
 
     @param path: the path to run the subprocess in - defaults to the

diff --git a/src/twisted/logger/_stdlib.py b/src/twisted/logger/_stdlib.py
@@ -29,7 +29,7 @@
 def _reverseLogLevelMapping():
     """
     Reverse the above mapping, adding both the numerical keys used above and
-    the cooresponding string keys also used by python logging.
+    the corresponding string keys also used by python logging.
     @return: the reversed mapping
     """
     mapping = {}

diff --git a/src/twisted/mail/test/test_imap.py b/src/twisted/mail/test/test_imap.py
@@ -1098,7 +1098,7 @@ def __init__(self, *args, **kw):
 
     def lineReceived(self, line):
         if self.timeoutTest:
-            #Do not send a respones
+            #Do not send a response
             return
 
         imap4.IMAP4Server.lineReceived(self, line)

diff --git a/src/twisted/mail/topfiles/NEWS b/src/twisted/mail/topfiles/NEWS
@@ -487,7 +487,7 @@ Fixes
 -----
   - Quote usernames and passwords automatically in the IMAP client (#1411).
   - Improved parsing of literals in IMAP4 client and server (#1417).
-  - Recognize unsolicted FLAGS response in IMAP4 client (#1105).
+  - Recognize unsolicited FLAGS response in IMAP4 client (#1105).
   - Parse and respond to requests with multiple BODY arguments in IMAP4
     server (#1307).
   - Misc: #1356, #1290, #1602

diff --git a/src/twisted/names/test/test_client.py b/src/twisted/names/test/test_client.py
@@ -53,8 +53,8 @@ def _lookup(self, name, cls, qtype, timeout):
 
         results = [rr]
         authority = []
-        addtional = []
-        return defer.succeed((results, authority, addtional))
+        additional = []
+        return defer.succeed((results, authority, additional))
 
 
 

diff --git a/src/twisted/python/_shellcomp.py b/src/twisted/python/_shellcomp.py
@@ -428,7 +428,7 @@ def excludeStr(self, longname, buildShort=False):
 
         @type buildShort: C{bool}
         @param buildShort: May be True to indicate we're building an excludes
-            string for the short option that correspondes to the given long opt.
+            string for the short option that corresponds to the given long opt.
 
         @return: The generated C{str}
         """

diff --git a/src/twisted/python/test/test_constants.py b/src/twisted/python/test/test_constants.py
@@ -1108,7 +1108,7 @@ class MoreNamedLetters(Names):
 
 class ValuedLetters(Values):
     """
-    Some more letters, with cooresponding unicode values.
+    Some more letters, with corresponding unicode values.
     """
     # Note u'\u0391' < u'\u03dc' > u'\u0396'.  We are ensuring here that the
     # definition is order different from the order of the values, which lets us

diff --git a/src/twisted/python/test/test_url.py b/src/twisted/python/test/test_url.py
@@ -170,7 +170,7 @@ def test_initPercent(self):
 
     def test_repr(self):
         """
-        L{URL.__repr__} will display the canoncial form of the URL, wrapped in
+        L{URL.__repr__} will display the canonical form of the URL, wrapped in
         a L{URL.fromText} invocation, so that it is C{eval}-able but still easy
         to read.
         """

diff --git a/src/twisted/scripts/trial.py b/src/twisted/scripts/trial.py
@@ -398,7 +398,7 @@ class Options(_BasicOptions, usage.Options, app.ReactorSelectionMixin):
     @type _workerFlags: C{list}
 
     @ivar _workerParameters: List of parameter which are accepted by trial
-        distrubuted workers. This is used by C{_getWorkerArguments} to build
+        distributed workers. This is used by C{_getWorkerArguments} to build
         the command line arguments.
     @type _workerParameters: C{list}
     """

diff --git a/src/twisted/test/test_reflect.py b/src/twisted/test/test_reflect.py
@@ -757,7 +757,7 @@ class ObjectGrepTests(unittest.TestCase):
 
     def test_dictionary(self):
         """
-        Test references search through a dictionnary, as a key or as a value.
+        Test references search through a dictionary, as a key or as a value.
         """
         o = object()
         d1 = {None: o}

diff --git a/src/twisted/test/test_usage.py b/src/twisted/test/test_usage.py
@@ -638,7 +638,7 @@ def noArg(self):
 
         def manyArgs(self, a, b, c):
             """
-            A multipe arguments method to be tested by L{usage.flagFunction}.
+            A multiple arguments method to be tested by L{usage.flagFunction}.
 
             @param a: a useless argument to satisfy the function's signature.
             @param b: a useless argument to satisfy the function's signature.

diff --git a/src/twisted/topfiles/8845.misc b/src/twisted/topfiles/8845.misc
diff --git a/src/twisted/topfiles/NEWS b/src/twisted/topfiles/NEWS
@@ -641,7 +641,7 @@ Improved Documentation
  - Twisted Trial's how-to documentation now has a link to Twisted's
    contribution guidelines and has been reformatted. (#7475)
  - Fixed a path error in the make.bat file for building Sphinx
-   documentation, so that it is now possible to build the documenation
+   documentation, so that it is now possible to build the documentation
    using make.bat on Windows. (#7542)
 
 Deprecations and Removals
@@ -1592,7 +1592,7 @@ Bugfixes
    --inplace' will compile the extension and cause the test to both
    run and pass. (#4331)
  - twisted.python.logfile.LogFile now raises a descriptive exception
-   when passed a log  directoy which does not exist. (#4701)
+   when passed a log  directory which does not exist. (#4701)
  - Fixed a bug where Inotify will fail to add a filepatch to watchlist
    after it has been added/ignored previously. (#4708)
  - IPv4Address and UNIXAddress object comparison operators fixed

diff --git a/src/twisted/trial/_dist/disttrial.py b/src/twisted/trial/_dist/disttrial.py
@@ -3,7 +3,7 @@
 # See LICENSE for details.
 
 """
-This module containts the trial distributed runner, the management class
+This module contains the trial distributed runner, the management class
 responsible for coordinating all of trial's behavior at the highest level.
 
 @since: 12.3

diff --git a/src/twisted/trial/test/test_assertions.py b/src/twisted/trial/test/test_assertions.py
@@ -896,7 +896,7 @@ def __call__(self, a):
 
     def test_assertWarnsFilter(self):
         """
-        Test assertWarns on a warning filterd by default.
+        Test assertWarns on a warning filtered by default.
         """
         def deprecated(a):
             warnings.warn("Woo deprecated", category=PendingDeprecationWarning)

diff --git a/src/twisted/web/test/test_static.py b/src/twisted/web/test/test_static.py
@@ -1220,7 +1220,7 @@ def parseMultipartBody(self, body, boundary):
 
     def test_multipleRangeRequest(self):
         """
-        The response to a request for multipe bytes ranges is a MIME-ish
+        The response to a request for multiple bytes ranges is a MIME-ish
         multipart response.
         """
         startEnds = [(0, 2), (20, 30), (40, 50)]
@@ -1246,7 +1246,7 @@ def test_multipleRangeRequest(self):
 
     def test_multipleRangeRequestWithRangeOverlappingEnd(self):
         """
-        The response to a request for multipe bytes ranges is a MIME-ish
+        The response to a request for multiple bytes ranges is a MIME-ish
         multipart response, even when one of the ranged falls off the end of
         the resource.
         """

diff --git a/src/twisted/web/test/test_xmlrpc.py b/src/twisted/web/test/test_xmlrpc.py
@@ -641,7 +641,7 @@ class XMLRPCUseDateTimeTests(SerializationConfigMixin, unittest.TestCase):
 
 class XMLRPCAuthenticatedTests(XMLRPCTests):
     """
-    Test with authenticated proxy. We run this with the same inout/ouput as
+    Test with authenticated proxy. We run this with the same input/output as
     above.
     """
     user = b"username"

diff --git a/src/twisted/web/twcgi.py b/src/twisted/web/twcgi.py
@@ -133,7 +133,7 @@ def runProcess(self, env, request, qargs=[]):
         Run the cgi script.
 
         @type env: A C{dict} of C{str}, or L{None}
-        @param env: The environment variables to pass to the processs that will
+        @param env: The environment variables to pass to the process that will
             get spawned. See
             L{twisted.internet.interfaces.IReactorProcess.spawnProcess} for more
             information about environments and process creation.
@@ -175,7 +175,7 @@ def runProcess(self, env, request, qargs=[]):
         Run a script through the C{filter} executable.
 
         @type env: A C{dict} of C{str}, or L{None}
-        @param env: The environment variables to pass to the processs that will
+        @param env: The environment variables to pass to the process that will
             get spawned. See
             L{twisted.internet.interfaces.IReactorProcess.spawnProcess} for more
             information about environments and process creation.

diff --git a/src/twisted/words/protocols/irc.py b/src/twisted/words/protocols/irc.py
@@ -2611,7 +2611,7 @@ def quirkyMessage(self, s):
         """
         log.msg(s + '\n')
 
-    ### Protocool methods
+    ### Protocol methods
 
     def connectionMade(self):
         self.supported = ServerSupportedFeatures()

diff --git a/src/twisted/words/test/test_xishutil.py b/src/twisted/words/test/test_xishutil.py
@@ -102,7 +102,7 @@ def test_addObserverTwice(self):
         """
         Test adding two observers for the same query.
 
-        When the event is dispath both of the observers need to be called.
+        When the event is dispatched both of the observers need to be called.
         """
         d = EventDispatcher()
         cb1 = CallbackTracker()