diff --git a/README.rst b/README.rst index a9b508ae0..54fa62c09 100644 --- a/README.rst +++ b/README.rst @@ -2,14 +2,14 @@ Welcome to Congress =================== -Congress is an open policy framework for the cloud. With Congress, a +Congress is an open policy framework for the cloud. With Congress, a cloud operator can declare, monitor, enforce, and audit "policy" in a -heterogeneous cloud environment. Congress gets inputs from a cloud's +heterogeneous cloud environment. Congress gets inputs from a cloud's various cloud services; for example in OpenStack, Congress fetches information about VMs from Nova, and network state from Neutron, etc. Congress then feeds input data from those services into its policy engine where Congress verifies that the cloud's actual state abides by the cloud -operator's policies. Congress is designed to work with **any policy** and +operator's policies. Congress is designed to work with **any policy** and **any cloud service**. * Free software: Apache license @@ -27,4 +27,3 @@ Installing Congress Please refer to the `installation guide `_ ->>>>>>> Add wiki Source Bugs and Blueprints notes link to README.rst diff --git a/doc/requirements.txt b/doc/requirements.txt index c75ec85fc..543461878 100644 --- a/doc/requirements.txt +++ b/doc/requirements.txt @@ -4,5 +4,6 @@ openstackdocstheme>=1.18.1 # Apache-2.0 reno>=2.5.0 # Apache-2.0 -sphinx>=1.7.3 # BSD +sphinx!=1.6.6,!=1.6.7,>=1.6.2,<2.0.0;python_version=='2.7' # BSD +sphinx!=1.6.6,!=1.6.7,>=1.6.2;python_version>='3.4' # BSD sphinxcontrib-apidoc>=0.2.0 # BSD