Merge "[trivial fix]fix typos in neutron"

neutron/agent/linux/openvswitch_firewall/firewall.py

@@ -207,7 +207,7 @@ class SGPortMap(object):
 
 
 class ConjIdMap(object):
-    """Handle conjuction ID allocations and deallocations."""
+    """Handle conjunction ID allocations and deallocations."""
 
     def __init__(self):
         self.id_map = collections.defaultdict(self._conj_id_factory)

neutron/db/quota/driver.py

@@ -82,7 +82,7 @@ class DbQuotaDriver(object):
         the detailed quotas (limit, used, reserved).
         :param context: The request context, for access checks.
         :param resources: A dictionary of the registered resource keys.
-        :return dict: mapping resource name in dict to its correponding limit
+        :return dict: mapping resource name in dict to its corresponding limit
             used and reserved. Reserved currently returns default value of 0
         """
         res_reserve_info = quota_api.get_reservations_for_resources(

neutron/objects/qos/policy.py

@@ -313,7 +313,7 @@ class QosPolicy(rbac_db.NeutronRbacObject):
     def get_bound_tenant_ids(cls, context, policy_id):
         """Implements RbacNeutronObject.get_bound_tenant_ids.
 
-        :returns: set -- a set of tenants' ids dependant on QosPolicy.
+        :returns: set -- a set of tenants' ids dependent on QosPolicy.
         """
         net = models_v2.Network
         qosnet = qos_db_model.QosNetworkPolicyBinding