summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorThomas Bechtold <thomasbechtold@jpberlin.de>2013-06-10 13:45:46 +0200
committerThomas Bechtold <thomasbechtold@jpberlin.de>2013-06-10 17:56:55 +0200
commita56b82b0aa3a23ff076914b97a382efe98cd0de5 (patch)
tree6170ba6d4427f3143597eaee94f69733763ccfcb
parent22d96b270b6794f15471761073a4d5e1065f35b0 (diff)
downloadkeystone-a56b82b0aa3a23ff076914b97a382efe98cd0de5.tar.gz
keystone-a56b82b0aa3a23ff076914b97a382efe98cd0de5.tar.xz
keystone-a56b82b0aa3a23ff076914b97a382efe98cd0de5.zip
Replace openstack-common with oslo in docs
Change-Id: Id4a8f285b380478705e5518440b7ed602e7757d4
-rw-r--r--HACKING.rst12
-rw-r--r--doc/source/middlewarearchitecture.rst2
2 files changed, 7 insertions, 7 deletions
diff --git a/HACKING.rst b/HACKING.rst
index bf0befca..e61d0cab 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 b7c5977a..4833a466 100644
--- a/doc/source/middlewarearchitecture.rst
+++ b/doc/source/middlewarearchitecture.rst
@@ -103,7 +103,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]_.