fix some typos in our doc, comments and releasenotes

Change-Id: Ibaf3bb7af28a5be62eb97b6a423ed6acbcc4c651

ceilometer/notification.py

@@ -329,12 +329,12 @@ class NotificationService(service_base.PipelineBasedService):
             self.event_pipe_manager = self._get_event_pipeline_manager(
                 self.transport)
 
-        # re-start the main queue listeners.
+        # restart the main queue listeners.
         utils.kill_listeners(self.listeners)
         self._configure_main_queue_listeners(
             self.pipe_manager, self.event_pipe_manager)
 
-        # re-start the pipeline listeners if workload partitioning
+        # restart the pipeline listeners if workload partitioning
         # is enabled.
         if cfg.CONF.notification.workload_partitioning:
             self._configure_pipeline_listener()

ceilometer/storage/hbase/utils.py

@@ -315,7 +315,7 @@ def make_general_rowkey_scan(rts_start=None, rts_end=None, some_id=None):
     if not rts_start:
         # NOTE(idegtiarov): Here we could not use chr > 122 because chr >= 123
         # will be quoted and character will be turn in a composition that is
-        # started with '%' (chr(37)) that lexicographically is less then chr
+        # started with '%' (chr(37)) that lexicographically is less than chr
         # of number
         rts_start = chr(122)
     end_row = prepare_key(some_id, rts_start)

ceilometer/storage/sqlalchemy/models.py

@@ -169,7 +169,7 @@ class Resource(Base):
     __table_args__ = (
         # TODO(gordc): this should exist but the attribute values we set
         #              for user/project/source/resource id's are too large
-        #              for a uuid.
+        #              for an uuid.
         # UniqueConstraint('resource_id', 'user_id', 'project_id',
         #                  'source_id', 'metadata_hash',
         #                  name='res_def_unique'),

ceilometer/storage/sqlalchemy/utils.py

@@ -47,7 +47,7 @@ class QueryTransformer(object):
                  "in": lambda field_name, values: field_name.in_(values),
                  "=~": lambda field, value: field.op("regexp")(value)}
 
-    # operators which are differs for different dialects
+    # operators which are different for different dialects
     dialect_operators = {'postgresql': {'=~': (lambda field, value:
                                                field.op("~")(value))}}
 

ceilometer/tests/functional/gabbi/gabbi_paste.ini

@@ -4,7 +4,7 @@
 # used for processing samples
 #
 # This version is specific for gabbi. It removes support for keystone while
-# keeping suport for CORS.
+# keeping support for CORS.
 
 # Remove authtoken from the pipeline if you don't want to use keystone authentication
 [pipeline:main]

ceilometer/tests/functional/gabbi/gabbi_pipeline.yaml

@@ -1,5 +1,5 @@
 # A limited pipeline for use with the Gabbi spike.
-# direct writes to the the metering database without using an
+# direct writes to the metering database without using an
 # intermediary dispatcher.
 #
 # This is one of several things that will need some extensive

ceilometer/tests/functional/gabbi/gabbits/api_events_with_data.yaml

@@ -215,7 +215,7 @@ tests:
       $.[0].name: ate
       $.[0].value: '0'
 
-# Get all traits of type ate for a invalid event type should return an empty
+# Get all traits of type ate for an invalid event type should return an empty
 # list
 - name: get all traits of type for event type bad event type
   url: /v2/event_types/bad_event_type/traits/ate

ceilometer/tests/functional/test_notification.py

@@ -296,7 +296,7 @@ class TestRealNotificationReloadablePipeline(BaseRealNotification):
         # Modify the collection targets
         updated_pipeline_cfg_file = self.setup_pipeline(['vcpus',
                                                          'disk.root.size'])
-        # Move/re-name the updated pipeline file to the original pipeline
+        # Move/rename the updated pipeline file to the original pipeline
         # file path as recorded in oslo config
         shutil.move(updated_pipeline_cfg_file, pipeline_cfg_file)
         self.srv.refresh_pipeline()
@@ -319,7 +319,7 @@ class TestRealNotificationReloadablePipeline(BaseRealNotification):
         updated_ev_pipeline_cfg_file = self.setup_event_pipeline(
             ['compute.instance.*'])
 
-        # Move/re-name the updated pipeline file to the original pipeline
+        # Move/rename the updated pipeline file to the original pipeline
         # file path as recorded in oslo config
         shutil.move(updated_ev_pipeline_cfg_file, ev_pipeline_cfg_file)
         self.srv.refresh_pipeline()

ceilometer/tests/unit/agent/test_manager.py

@@ -484,7 +484,7 @@ class TestRunTasks(agentbase.BaseAgentManagerTestCase):
 
         updated_pipeline_cfg_file = self.setup_pipeline_file(pipeline)
 
-        # Move/re-name the updated pipeline file to the original pipeline
+        # Move/rename the updated pipeline file to the original pipeline
         # file path as recorded in oslo config
         shutil.move(updated_pipeline_cfg_file, pipeline_cfg_file)
 

ceilometer/transformer/conversions.py

@@ -171,7 +171,7 @@ class ScalingTransformer(BaseConversionTransformer):
 class RateOfChangeTransformer(ScalingTransformer):
     """Transformer based on the rate of change of a sample volume.
 
-    For example taking the current and previous volumes of a cumulative sample
+    For example, taking the current and previous volumes of a cumulative sample
     and producing a gauge value based on the proportion of some maximum used.
     """
 

doc/source/install/mod_wsgi.rst

@@ -40,7 +40,7 @@ work with a copy of ceilometer installed via devstack.
    ``/etc/httpd/conf.d``.
 
 2. Modify the ``WSGIDaemonProcess`` directive to set the ``user`` and
-   ``group`` values to a appropriate user on your server. In many
+   ``group`` values to an appropriate user on your server. In many
    installations ``ceilometer`` will be correct.
 
 3. Enable the ceilometer site. On deb-based systems::

doc/source/install/upgrade.rst

@@ -89,7 +89,7 @@ version in time.
 4. Upgrade the polling agent(s)
 
    The new polling agent can be started alongside the old agent only if no new
-   pollsters were added. If not, new polling agents must start only in it's
+   pollsters were added. If not, new polling agents must start only in its
    own partitioning group and poll only the new pollsters. After all old agents
    are upgraded, the polling agents can be changed to poll both new pollsters
    AND the old ones.

doc/source/new_meters.rst

@@ -85,7 +85,7 @@ If you plan on adding meters, please follow the convention below:
    For example, do not use ephemeral_disk_size but disk.ephemeral.size
 
 2. When a part of the name is a variable, it should always be at the end and start with a ':'.
-   For example do not use <type>.image but image:<type>, where type is your variable name.
+   For example, do not use <type>.image but image:<type>, where type is your variable name.
 
 3. If you have any hesitation, come and ask in #openstack-ceilometer
 

doc/source/webapi/v2.rst

@@ -177,11 +177,11 @@ against the database models. See :ref:`api-queries` for how to query the API.
 
    The *not* operator has different meaning in MongoDB and in SQL DB engine.
    If the *not* operator is applied on a non existent metadata field then
-   the result depends on the DB engine. For example if
+   the result depends on the DB engine. For example, if
    {"not": {"metadata.nonexistent_field" : "some value"}} filter is used in a query
    the MongoDB will return every Sample object as *not* operator evaluated true
    for every Sample where the given field does not exists. See more in the MongoDB doc.
-   On the other hand SQL based DB engine will return empty result as the join operation
+   On the other hand, SQL based DB engine will return empty result as the join operation
    on the metadata table will return zero rows as the on clause of the join which
    tries to match on the metadata field name is never fulfilled.
 

releasenotes/notes/configurable-data-collector-e247aadbffb85243.yaml

@@ -2,7 +2,7 @@
 features:
   - >
     [`bug 1480333 <https://bugs.launchpad.net/ceilometer/+bug/1480333>`_]
-    Support ability to configure collector to capture events or meters mutally
+    Support ability to configure collector to capture events or meters mutually
     exclusively, rather than capturing both always.
 other:
   - >

releasenotes/notes/skip-duplicate-meter-def-0420164f6a95c50c.yaml

@@ -6,5 +6,5 @@ fixes:
     [`bug 1536498 <https://bugs.launchpad.net/ceilometer/+bug/1536498>`_]
     Patch to fix duplicate meter definitions causing duplicate samples.
     If a duplicate is found, log a warning and skip the meter definition.
-    Note that the first occurance of a meter will be used and any following
+    Note that the first occurrence of a meter will be used and any following
     duplicates will be skipped from processing.