Merge "Trivial fix typos in documents"

doc/source/api/octaviaapi.rst

@@ -2262,7 +2262,7 @@ Modify a project's quotas.
 Delete Quota
 ************
 
-Delete a project's quota, reseting it to the configured default quotas.
+Delete a project's quota, resetting it to the configured default quotas.
 
 +----------------+-----------------------------------------------------------+
 | Request Type   | ``DELETE``                                                |

doc/source/design/version0.5/component-design.rst

@@ -161,7 +161,7 @@ driver.
 
 It should be noted that in later releases of Octavia, the controller functions
 will be split across several components. At this stage we are less concerned
-with how this internal communcation will happen, and are most concerned with
+with how this internal communication will happen, and are most concerned with
 ensuring communication with amphorae, the amphora LB driver, and the Network
 driver are all made as perfect as possible.
 
@@ -404,7 +404,7 @@ Option 2: "True Active / Standby"
 
 * In this topology, both amphorae need to be colocated on the same subnet.
   As such a "spares pool" doesn't make sense for this type of layout, unless
-  all spares are on the same mamangement network with the active nodes.
+  all spares are on the same management network with the active nodes.
 
 We considered also supporting "Single node" topology, but this turns out to be
 the same thing as option 1 above with a spares pool size of zero.

doc/source/guides/dev-quick-start.rst

@@ -138,7 +138,7 @@ Production Deployment Walkthrough
 Create Octavia User
 ___________________
 By default Octavia will use the 'neutron' user for keystone authentication, and
-the admin user for interactions with all other serivces. However, it doesn't
+the admin user for interactions with all other services. However, it doesn't
 actually share neutron's database or otherwise access Neutron outside of
 Neutron's API, so a dedicated 'octavia' keystone user should generally be
 created for Octavia to use.
@@ -272,7 +272,7 @@ bi-directional certificate-based authentication in order to authenticate and
 encrypt communication. You must therefore create appropriate TLS certificates
 which will be used for key signing, authentication, and encryption. There is a
 helper script to do this in this repository under:
-``bin/create_certficiates.sh``
+``bin/create_certificates.sh``
 
 Please note that certificates created with this helper script may not meet your
 organization's security policies, since they are self-signed certificates with

doc/source/guides/l7-cookbook.rst

@@ -22,12 +22,13 @@ Introduction
 This document gives several examples of common L7 load balancer usage. For a
 description of L7 load balancing see: :doc:`l7`
 
-For the puposes of this guide we assume that the neutron command-line interface
+For the purposes of this guide we assume that the neutron command-line
-is going to be used to configure all features of Neutron LBaaS with an Octavia
+interface is going to be used to configure all features of Neutron LBaaS with
-back-end. Also, in order to keep these examples short, we assume that many
+an Octavia back-end. Also, in order to keep these examples short, we assume
-non-L7 configuration tasks (such as deploying loadbalancers, listeners, pools,
+that many non-L7 configuration tasks (such as deploying loadbalancers,
-members, healthmonitors, etc.) have already been accomplished. A description
+listeners, pools, members, healthmonitors, etc.) have already been
-of the starting conditions is given in each example below.
+accomplished. A description of the starting conditions is given in each example
+below.
 
 
 Examples

doc/source/guides/operator-maintenance.rst

@@ -14,7 +14,7 @@
       under the License.
 
 ======================================
-Operator Maintenace  Guide
+Operator Maintenance  Guide
 ======================================
 This document is intended for operators. For a developer guide see the
 :doc:`dev-quick-start` in this documentation repository. For an end-user
@@ -25,7 +25,7 @@ Monitoring
 ==========
 
 
-Montioring Load Balancer Amphora
+Monitoring Load Balancer Amphora
 --------------------------------
 Octavia will monitor the load balancing amphorae itself and initiate failovers
 and/or replacements if they malfunction. Therefore, most installations won't
@@ -211,11 +211,11 @@ Best Practices/Optimizations
 ----------------------------
 
 To speed up the failovers, the spare pool can be temporarily increased to
-accomodate the rapid failover of the amphora. In this case after the
+accommodate the rapid failover of the amphora. In this case after the
 new image has been loaded into glance, shut down or initiate a failover of the
 amphora in the spare pool. They can be found, for instance, by looking for the
-servers in ``openstack server list --all`` who only have an ip on the mangement
+servers in ``openstack server list --all`` who only have an ip on the
-network assigned but not any tenant network. Alternatively, use this
+management network assigned but not any tenant network. Alternatively, use this
 database query:
 
 
@@ -249,7 +249,7 @@ initiated this might crowd out other operations.
     In Pike a failover command is being added to the API which allows to failover
     a load balancer's amphora while taking care of the intricacies of different
     topologies and prioritizes administrative failovers behind other operations.
-    This function should be used instead of the ones descrived above once it
+    This function should be used instead of the ones described above once it
     becomes available.
 
 Rotating Cryptographic Certificates

doc/source/main/glossary.rst

@@ -77,7 +77,7 @@ description of these terms.
     Layer 7 Rule
         Single logical expression used to match a condition present in a given
         HTTP or terminated HTTPS request. L7 rules typically match against
-        a specific header or part of the URI and are used in conjuncion with
+        a specific header or part of the URI and are used in conjunction with
         L7 policies to accomplish L7 switching. An L7 rule is associated with
         exactly one L7 policy.
 

doc/source/main/gmr.rst

@@ -40,7 +40,7 @@ own sections.  However, the base *GMR* consists of several sections:
 
 Package
   Shows information about the package to which this process belongs, including
-  version informations.
+  version information.
 
 Threads
   Shows stack traces and thread ids for each of the threads within this

specs/template.rst

@@ -283,7 +283,7 @@ Note that the schema should be defined as restrictively as
 possible. Parameters which are required should be marked as such and
 only under exceptional circumstances should additional parameters
 which are not defined in the schema be permitted (eg
-additionaProperties should be False).
+additionalProperties should be False).
 
 Reuse of existing predefined parameter types such as regexps for
 passwords and user defined names is highly encouraged.

specs/version0.5/amphora-manager-interface.rst

@@ -53,7 +53,7 @@ Establish an abstract base class to model the desired functionality:
             groups
             :param network_ids: A list of network_ids to attach to
             the amphora
-            :config_drive_files:  A dict of files to overrwrite on
+            :config_drive_files: A dict of files to overwrite on
             the server upon boot. Keys are file names (i.e. /etc/passwd)
             and values are the file contents (either as a string or as
             a file-like object). A maximum of five entries is allowed,

specs/version0.5/controller-worker.rst

@@ -38,7 +38,7 @@ facilitate the create/update/delete actions.  This class will be responsible
 for managing the number of simultaneous operations being executed by
 coordinating through the Octavia database.
 
-The Controller Worker will provide a base class that sets up and initilizes
+The Controller Worker will provide a base class that sets up and initializes
 the TaskFlow engines required to complete the action.  Users of the library
 will then call the appropriate method for the action.  These methods setup
 and launch the appropriate flow.  Each flow will be contained in a separate

specs/version0.5/housekeeping-manager-interface.rst

@@ -152,7 +152,7 @@ Performance Impact
 ------------------
 
 The housekeeping_interval and spare_pool_size parameters will be
-adjustible by the operator in order to balance resource usage against
+adjustable by the operator in order to balance resource usage against
 performance.
 
 
@@ -160,7 +160,7 @@ Developer impact
 ----------------
 
 Developers of other modules need to be aware that amphorae may be
-created, deleted, or saved for diagonsis by this daemon.
+created, deleted, or saved for diagnosis by this daemon.
 
 
 Implementation

specs/version1/vip-qos-policy-application.rst

@@ -12,14 +12,14 @@ Vip QoS Policy Application
 Problem description
 ===================
 For real cases, the bandwidth of vip should be limited, because the upstream
-network resource is provided by the ISP or other orgnizations. That means it is
+network resource is provided by the ISP or other organizations. That means it
-not free. The openstack provider or users should pay for the limited bandwidth,
+is not free. The openstack provider or users should pay for the limited
-for example, users buy the 50M bandwidth from ISP for openstack environment to
+bandwidth, for example, users buy the 50M bandwidth from ISP for openstack
-access Internet, also it will be used for the connection outside of openstack
+environment to access Internet, also it will be used for the connection outside
-to access the servers in openstack. And the servers are behind LoadBalance VIP.
+of openstack to access the servers in openstack. And the servers are behind
-We cannot offer the whole bandwidth to the servers, as maybe there also are the
+LoadBalance VIP. We cannot offer the whole bandwidth to the servers, as maybe
-VMs want to access the external network. So we should take a bandwidth
+there also are the VMs want to access the external network. So we should take a
-limitation towards vip port.
+bandwidth limitation towards vip port.
 
 Also, if the upstream network resource had been used up mostly, we still want
 the backend servers behind loadbalancer are accessible and stable. The min