From 4818f7e64900fe2c70564bb8fd5187cf3e25c261 Mon Sep 17 00:00:00 2001 From: Lianhao Lu Date: Wed, 1 Jul 2015 10:36:17 +0800 Subject: [PATCH] Fixed some misspellings Change-Id: I2e5cc0551066fccee57f0dae90d9a131be0d8b44 --- congress/datalog/base.py | 2 +- congress/datasources/murano_driver.py | 2 +- congress/datasources/plexxi_driver.py | 4 ++-- congress/datasources/vCenter_driver.py | 4 ++-- doc/source/enforcement.rst | 2 +- future-features.txt | 2 +- 6 files changed, 8 insertions(+), 8 deletions(-) diff --git a/congress/datalog/base.py b/congress/datalog/base.py index e899d9cba..e394740fc 100644 --- a/congress/datalog/base.py +++ b/congress/datalog/base.py @@ -67,7 +67,7 @@ class Proof(object): """A single proof. Differs semantically from Database's - Proof in that this verison represents a proof that spans rules, + Proof in that this version represents a proof that spans rules, instead of just a proof for a single rule. """ def __init__(self, root, children): diff --git a/congress/datasources/murano_driver.py b/congress/datasources/murano_driver.py index 9396770d2..0e33eb25d 100755 --- a/congress/datasources/murano_driver.py +++ b/congress/datasources/murano_driver.py @@ -454,7 +454,7 @@ class MuranoDriver(datasource_driver.DataSourceDriver, def _get_parent_types(self, obj_type): """Get class types of all OBJ_TYPE's parents including itself. - Look up the hierachy of OBJ_TYPE and return types of all its + Look up the hierarchy of OBJ_TYPE and return types of all its ancestor including its own type. :param obj_type: """ diff --git a/congress/datasources/plexxi_driver.py b/congress/datasources/plexxi_driver.py index e6f42bde9..ef98b1735 100644 --- a/congress/datasources/plexxi_driver.py +++ b/congress/datasources/plexxi_driver.py @@ -510,7 +510,7 @@ class PlexxiDriver(datasource_driver.DataSourceDriver): raise Exception(requests.exceptions.ConnectionError(msg)) def keystoneauth(self): - """Aquire a keystone auth token for API calls + """Acquire a keystone auth token for API calls Called when congress is running with keystone as the authentication method.This provides the driver a keystone token that is then placed @@ -556,7 +556,7 @@ class PlexxiDriver(datasource_driver.DataSourceDriver): return False return True except Exception: - LOG.exception("An error has occured when accessing the " + + LOG.exception("An error has occurred when accessing the " + "Congress API.All automated API calls have been " + "disabled.") self.unique_names = False diff --git a/congress/datasources/vCenter_driver.py b/congress/datasources/vCenter_driver.py index 66cd729ca..a41a9c607 100644 --- a/congress/datasources/vCenter_driver.py +++ b/congress/datasources/vCenter_driver.py @@ -173,7 +173,7 @@ class VCenterDriver(DataSourceDriver): def _translate_hosts(self, rawhosts): """Translate the host data from vCenter - First the raw host data aquired from vCenter is parsed and organized + First the raw host data acquired from vCenter is parsed and organized into a simple format that can be read by congress translators. This creates three lists, hosts, pnics and vnics. These lists are then parsed by congress translators to create tables. @@ -248,7 +248,7 @@ class VCenterDriver(DataSourceDriver): def _translate_vms(self, rawvms): """Translate the VM data from vCenter - First the raw VM data aquired from vCenter is parsed and organized + First the raw VM data acquired from vCenter is parsed and organized into a simple format that can be read by congress translators. This is a single list named vms that is then parsed by a congress translator to create the vms table. diff --git a/doc/source/enforcement.rst b/doc/source/enforcement.rst index 1612836a9..930c40668 100644 --- a/doc/source/enforcement.rst +++ b/doc/source/enforcement.rst @@ -104,7 +104,7 @@ To do a simulation from the command line, you use the following command:: * : a string codifying a sequence of insertions and deletions of data and rules. Insertions are denoted by '+' and deletions by '-' * : the name of another policy of type 'action' describing - the effects of any actions occuring in . Actions are not + the effects of any actions occurring in . Actions are not necessary and are explained later. Without actions, this argument can be anything (and will in the future be optional). diff --git a/future-features.txt b/future-features.txt index f89cf37af..9ef921771 100644 --- a/future-features.txt +++ b/future-features.txt @@ -36,7 +36,7 @@ * Dashboard ** IDE for policy (different levels: raw-Datalog, AD, checkbox-based) ** List violations -** Explain violations (step-by-step tracing thru policy) +** Explain violations (step-by-step tracing through policy) ** Simulate state change and action execution ** Enumerate remediations for a given violation