From 94951504a12735309e84f643d6d685a77bbd8f5a Mon Sep 17 00:00:00 2001
From: Martin Kletzander <mkletzan@redhat.com>
Date: Thu, 19 Mar 2015 17:25:57 +0100
Subject: [PATCH] Fix common misspellings

Wikipedia's list of common misspellings [1] has a machine-readable
version.  This patch fixes those misspellings mentioned in the list
which don't have multiple right variants (as e.g. "accension", which can
be both "accession" and "ascension"), such misspellings are left
untouched.  The list of changes was manually re-checked for false
positives.

[1] https://en.wikipedia.org/wiki/Wikipedia:Lists_of_common_misspellings/For_machines

Partial-Bug: #1390035
Change-Id: Ie5d86247cc4f50b6578a9b76c9c8cade35128d5a
Signed-off-by: Martin Kletzander <mkletzan@redhat.com>
---
 doc/source/docbkx/quantum-api-1.0/common.ent  | 20 +++++++++----------
 .../docbkx/quantum-api-1.0/xsd/actions.xsd    |  2 +-
 .../docbkx/quantum-api-1.0/xsd/common.xsd     |  2 +-
 .../docbkx/quantum-api-1.0/xsd/server.xsd     |  2 +-
 neutron/agent/l3/namespace_manager.py         |  2 +-
 neutron/agent/linux/iptables_firewall.py      |  4 ++--
 neutron/tests/tools.py                        |  2 +-
 7 files changed, 17 insertions(+), 17 deletions(-)

diff --git a/doc/source/docbkx/quantum-api-1.0/common.ent b/doc/source/docbkx/quantum-api-1.0/common.ent
index 19acc7e9f..67e512af5 100644
--- a/doc/source/docbkx/quantum-api-1.0/common.ent
+++ b/doc/source/docbkx/quantum-api-1.0/common.ent
@@ -11,27 +11,27 @@
         </response>
         <response status="503" xmlns="http://wadl.dev.java.net/2009/02">
             <representation mediaType="application/xml" element="osapi:serviceUnavailable"/>
-            <representation mediaType="applicaiton/json"/>
+            <representation mediaType="application/json"/>
         </response>
         <response status="401" xmlns="http://wadl.dev.java.net/2009/02">
             <representation mediaType="application/xml" element="osapi:unauthorized"/>
-            <representation mediaType="applicaiton/json"/>
+            <representation mediaType="application/json"/>
         </response>
         <response status="403" xmlns="http://wadl.dev.java.net/2009/02">
             <representation mediaType="application/xml" element="osapi:forbidden"/>
-            <representation mediaType="applicaiton/json"/>
+            <representation mediaType="application/json"/>
         </response>
         <response status="400" xmlns="http://wadl.dev.java.net/2009/02">
             <representation mediaType="application/xml" element="osapi:badRequest"/>
-            <representation mediaType="applicaiton/json"/>
+            <representation mediaType="application/json"/>
         </response>
         <response status="405" xmlns="http://wadl.dev.java.net/2009/02">
             <representation mediaType="application/xml" element="osapi:badMethod"/>
-            <representation mediaType="applicaiton/json"/>
+            <representation mediaType="application/json"/>
         </response>
         <response status="413" xmlns="http://wadl.dev.java.net/2009/02">
             <representation mediaType="application/xml" element="osapi:overLimit"/>
-            <representation mediaType="applicaiton/json"/>
+            <representation mediaType="application/json"/>
         </response>
            '>
       <!--
@@ -41,7 +41,7 @@
            '
         <response status="404" xmlns="http://wadl.dev.java.net/2009/02">
             <representation mediaType="application/xml" element="osapi:itemNotFound"/>
-            <representation mediaType="applicaiton/json"/>
+            <representation mediaType="application/json"/>
         </response>
            '>
       <!--
@@ -51,7 +51,7 @@
            '
         <response status="415" xmlns="http://wadl.dev.java.net/2009/02">
             <representation mediaType="application/xml" element="osapi:badMediaType"/>
-            <representation mediaType="applicaiton/json"/>
+            <representation mediaType="application/json"/>
         </response>
            '>
       <!--
@@ -61,7 +61,7 @@
            '
         <response status="503" xmlns="http://wadl.dev.java.net/2009/02">
             <representation mediaType="application/xml" element="osapi:serverCapacityUnavailable"/>
-            <representation mediaType="applicaiton/json"/>
+            <representation mediaType="application/json"/>
         </response>
            '>
       <!--
@@ -72,7 +72,7 @@
            '
         <response status="409" xmlns="http://wadl.dev.java.net/2009/02">
             <representation mediaType="application/xml" element="osapi:buildInProgress"/>
-            <representation mediaType="applicaiton/json"/>
+            <representation mediaType="application/json"/>
         </response>
            '>
 
diff --git a/doc/source/docbkx/quantum-api-1.0/xsd/actions.xsd b/doc/source/docbkx/quantum-api-1.0/xsd/actions.xsd
index 41545111d..c156f1665 100644
--- a/doc/source/docbkx/quantum-api-1.0/xsd/actions.xsd
+++ b/doc/source/docbkx/quantum-api-1.0/xsd/actions.xsd
@@ -297,7 +297,7 @@
                       <p>
                           A reference to an image to use for the
                           rebuild.  A local image need contain only an
-                          Image ID. External images must contian a
+                          Image ID. External images must contain a
                           link that provides the full path to the
                           image resource.  You must supply an image
                           when rebuilding.
diff --git a/doc/source/docbkx/quantum-api-1.0/xsd/common.xsd b/doc/source/docbkx/quantum-api-1.0/xsd/common.xsd
index f60999ebd..703ef24dc 100644
--- a/doc/source/docbkx/quantum-api-1.0/xsd/common.xsd
+++ b/doc/source/docbkx/quantum-api-1.0/xsd/common.xsd
@@ -132,7 +132,7 @@
               xml:lang="EN"
               xmlns="http://www.w3.org/1999/xhtml">
               <p>
-                  An extended status must contian a prefix.
+                  An extended status must contain a prefix.
               </p>
           </xsd:documentation>
       </annotation>
diff --git a/doc/source/docbkx/quantum-api-1.0/xsd/server.xsd b/doc/source/docbkx/quantum-api-1.0/xsd/server.xsd
index 035d9f324..fb89fd9fe 100644
--- a/doc/source/docbkx/quantum-api-1.0/xsd/server.xsd
+++ b/doc/source/docbkx/quantum-api-1.0/xsd/server.xsd
@@ -255,7 +255,7 @@
                   xmlns="http://www.w3.org/1999/xhtml">
                   <p>
                       A reference to an image used to create the
-                      server. External images must contian a link that
+                      server. External images must contain a link that
                       provides the full path to the image resource.
                   </p>
               </xsd:documentation>
diff --git a/neutron/agent/l3/namespace_manager.py b/neutron/agent/l3/namespace_manager.py
index 52333f0c2..0f552d78c 100644
--- a/neutron/agent/l3/namespace_manager.py
+++ b/neutron/agent/l3/namespace_manager.py
@@ -63,7 +63,7 @@ class NamespaceManager(object):
         # TODO(carl) Preserves old behavior of L3 agent where cleaning
         # namespaces was only done once after restart.  Still a good idea?
         if exc_type:
-            # An exception occured in the caller's with statement
+            # An exception occurred in the caller's with statement
             return False
         if not self._clean_stale:
             # No need to cleanup
diff --git a/neutron/agent/linux/iptables_firewall.py b/neutron/agent/linux/iptables_firewall.py
index 0fa77b8a6..613c49fd6 100644
--- a/neutron/agent/linux/iptables_firewall.py
+++ b/neutron/agent/linux/iptables_firewall.py
@@ -567,7 +567,7 @@ class IptablesFirewallDriver(firewall.FirewallDriver):
             self._defer_apply = True
 
     def _remove_unused_security_group_info(self):
-        """Remove any unnecesary local security group info or unused ipsets.
+        """Remove any unnecessary local security group info or unused ipsets.
 
         This function has to be called after applying the last iptables
         rules, so we're in a point where no iptable rule depends
@@ -618,7 +618,7 @@ class IptablesFirewallDriver(firewall.FirewallDriver):
     def _determine_sg_rules_to_remove(self, filtered_ports):
         """Calculate which security groups need to be removed.
 
-        We find out by substracting our previous sg group ids,
+        We find out by subtracting our previous sg group ids,
         with the security groups associated to a set of ports.
         """
         port_group_ids = self._get_sg_ids_set_for_ports(filtered_ports)
diff --git a/neutron/tests/tools.py b/neutron/tests/tools.py
index 59381ea73..16aa49680 100644
--- a/neutron/tests/tools.py
+++ b/neutron/tests/tools.py
@@ -49,7 +49,7 @@ def verify_mock_calls(mocked_call, expected_calls_and_values,
 
 
 def fail(msg=None):
-    """Fail immediatly, with the given message.
+    """Fail immediately, with the given message.
 
     This method is equivalent to TestCase.fail without requiring a
     testcase instance (usefully for reducing coupling).
-- 
2.45.2