diff --git a/TESTING.rst b/TESTING.rst index c489089880c..e7d424096ee 100644 --- a/TESTING.rst +++ b/TESTING.rst @@ -311,8 +311,8 @@ API tests that belong to Tempest deal with a subset of Neutron's resources: * Router * Floating IP -These resources were chosen for their ubiquitously. They are found in most -Neutron depoloyments regardless of plugin, and are directly involved in the +These resources were chosen for their ubiquity. They are found in most +Neutron deployments regardless of plugin, and are directly involved in the networking and security of an instance. Together, they form the bare minimum needed by Neutron. diff --git a/doc/source/devref/address_scopes.rst b/doc/source/devref/address_scopes.rst index e5824f1408b..8a2a08b777a 100644 --- a/doc/source/devref/address_scopes.rst +++ b/doc/source/devref/address_scopes.rst @@ -138,7 +138,7 @@ Here is an example of how the json will look in the context of a router port:: To implement floating IPs crossing scope boundaries, the L3 agent needs to know the target scope of the floating ip. The fixed address is not enough to -disambiguate because, theoritically, there could be overlapping addresses from +disambiguate because, theoretically, there could be overlapping addresses from different scopes. The scope is computed [#]_ from the floating ip fixed port and attached to the floating ip dict under the 'fixed_ip_address_scope' attribute. Here's what the json looks like (trimmed):: diff --git a/doc/source/devref/callbacks.rst b/doc/source/devref/callbacks.rst index 89ff2eb1d3e..cb8bab51061 100644 --- a/doc/source/devref/callbacks.rst +++ b/doc/source/devref/callbacks.rst @@ -384,8 +384,8 @@ What kind of operation I can add into callback? For callback function of PRECOMMIT_XXX events, we can't use blocking functions or a function that would take a long time, like communicating to SDN controller over network. - Callbacks for PRECOMMIT events are meant to execute DB operations in a transaction context, the - errors occured will be taken care by the context manager. + Callbacks for PRECOMMIT events are meant to execute DB operations in a transaction context. The + errors that occur will be taken care by the context manager. What kind of function can be a callback? diff --git a/doc/source/devref/effective_neutron.rst b/doc/source/devref/effective_neutron.rst index ed9fb8ed0e7..2ea2c925547 100644 --- a/doc/source/devref/effective_neutron.rst +++ b/doc/source/devref/effective_neutron.rst @@ -164,7 +164,7 @@ Document common pitfalls as well as good practices done during database developm .. code:: python - _safe_creation(context, create_something, delete_someting, + _safe_creation(context, create_something, delete_something, _do_other_thing_with_created_object) Where nested transaction is used in _do_other_thing_with_created_object