diff --git a/doc/source/faq.rst b/doc/source/faq.rst index 26836ef665..2a511c1db9 100644 --- a/doc/source/faq.rst +++ b/doc/source/faq.rst @@ -25,7 +25,7 @@ Could I hook an external service into a panel using, for example, an iFrame? Panels are just entry-points to hook views into the larger dashboard navigational structure and enforce common attributes like RBAC. The - view and corresponding templates can contain anything you would like, + views and corresponding templates can contain anything you would like, including iFrames. What does this mean for visual design? diff --git a/doc/source/testing.rst b/doc/source/testing.rst index d56a3c1a7f..a5ee375ee2 100644 --- a/doc/source/testing.rst +++ b/doc/source/testing.rst @@ -11,7 +11,7 @@ tests. While they can be run individually without problem, there is an easier way: Included at the root of the repository is the ``tox.ini`` config -which invokes both sets of tests, and optionally generates analyses on both +which invokes both sets of tests, and optionally generates analyses on both components in the process. ``tox`` is what Jenkins uses to verify the stability of the project, so you should make sure you run it and it passes before you submit any pull requests/patches. @@ -54,7 +54,7 @@ If you need to install PhantomJS, you may do so with `npm` like this:: $ npm -g install phantomjs -Alternatively, many distributions have system packages for phantomjs, or +Alternatively, many distributions have system packages for PhantomJS, or it can be downloaded from http://phantomjs.org/download.html. tox Test Environments diff --git a/horizon/test/tests/exceptions.py b/horizon/test/tests/exceptions.py index 31c12ff129..ed6458ed59 100644 --- a/horizon/test/tests/exceptions.py +++ b/horizon/test/tests/exceptions.py @@ -35,7 +35,7 @@ class HandleTests(test.TestCase): exceptions.handle(req) # The real test here is to make sure the handle method doesn't throw a - # UnicodeEncodeError, but making sure the message is correct could be + # UnicodeEncodeError, but making sure the message is correct and # useful as well. self.assertItemsEqual(req.horizon['async_messages'], [expected]) @@ -57,6 +57,6 @@ class HandleTests(test.TestCase): # message part of the first message. There should be only one message # in this test case. self.assertIn(message, req.horizon['async_messages'][0][1]) - # verifying that the exec message which in this case is not trusted - # is not in the message content + # verifies that the exec message which in this case is not trusted + # is not in the message content. self.assertNotIn(exc_msg, req.horizon['async_messages'][0][1]) diff --git a/horizon/utils/functions.py b/horizon/utils/functions.py index 962756b5a4..e49283fbe4 100644 --- a/horizon/utils/functions.py +++ b/horizon/utils/functions.py @@ -108,8 +108,8 @@ def get_log_length(request): def get_timezone(request): # Session and cookie store timezone as django_timezone. - # In case there is no timezone neither in session nor cookie - # use default value from settings file where it's called TIME_ZONE + # In case there is no timezone neither in session nor in cookie, + # use default value from settings file where it's called TIME_ZONE. return get_config_value(request, 'django_timezone', getattr(settings, 'TIME_ZONE', 'UTC')) @@ -133,7 +133,7 @@ def get_keys(tuple_of_tuples): def value_for_key(tuple_of_tuples, key): """Processes a tuple of 2-element tuples and returns the value - corresponding to the given key. If not value is found, the key is returned. + corresponding to the given key. If no value is found, the key is returned. """ for t in tuple_of_tuples: if t[0] == key: