diff --git a/HACKING.rst b/HACKING.rst index bf0befca41..e61d0cab6d 100644 --- a/HACKING.rst +++ b/HACKING.rst @@ -238,16 +238,16 @@ For more information on creating unit tests and utilizing the testing infrastructure in OpenStack Nova, please read nova/testing/README.rst. -openstack-common +oslo-incubator ---------------- -A number of modules from openstack-common are imported into the project. +A number of modules from oslo-incubator are imported into the project. -These modules are "incubating" in openstack-common and are kept in sync -with the help of openstack-common's update.py script. See: +These modules are "incubating" in oslo-incubator and are kept in sync +with the help of oslo's update.py script. See: - http://wiki.openstack.org/CommonLibrary#Incubation + https://wiki.openstack.org/wiki/Oslo#Incubation The copy of the code should never be directly modified here. Please -always update openstack-common first and then run the script to copy +always update oslo-incubator first and then run the script to copy the changes across. diff --git a/doc/source/middlewarearchitecture.rst b/doc/source/middlewarearchitecture.rst index e7704be500..8cd4729ba5 100644 --- a/doc/source/middlewarearchitecture.rst +++ b/doc/source/middlewarearchitecture.rst @@ -102,7 +102,7 @@ Deployment Strategy =================== The middleware is intended to be used inline with OpenStack wsgi components, -based on the openstack-common WSGI middleware class. It is typically deployed +based on the oslo WSGI middleware class. It is typically deployed as a configuration element in a paste configuration pipeline of other middleware components, with the pipeline terminating in the service application. The middleware conforms to the python WSGI standard [PEP-333]_.