diff --git a/doc/source/devref/api.apache.rst b/doc/source/devref/api.apache.rst index e83bae6713b..57145f4dccc 100644 --- a/doc/source/devref/api.apache.rst +++ b/doc/source/devref/api.apache.rst @@ -34,4 +34,5 @@ Cinder's primary configuration file (etc/cinder.conf) and the PasteDeploy config Access Control -------------- -If you are running with Linux kernel security module enabled (for example SELinux or AppArmor), make sure that the configuration file has the appropriate context to access the linked file. \ No newline at end of file +If you are running with Linux kernel security module enabled (for example SELinux or AppArmor), make sure that the configuration file has the appropriate context to access the linked file. + diff --git a/doc/source/devref/attach_detach_conventions.rst b/doc/source/devref/attach_detach_conventions.rst index b894c9a9ff7..480d12b60d6 100644 --- a/doc/source/devref/attach_detach_conventions.rst +++ b/doc/source/devref/attach_detach_conventions.rst @@ -100,7 +100,7 @@ We call this infor the model_update and it's used to update vital target information associated with the volume in the Cinder database. driver.initialize_connection -*************************** +**************************** Now that we've actually built a target and persisted the important bits of information associated with it, we're ready to actually assign diff --git a/doc/source/devref/auth.rst b/doc/source/devref/auth.rst index 99993ecf867..166a8bfd022 100644 --- a/doc/source/devref/auth.rst +++ b/doc/source/devref/auth.rst @@ -96,9 +96,9 @@ Relationship of US eAuth to RBAC Typical implementations of US eAuth authentication systems are structured as follows:: [ MS Active Directory or other federated LDAP user store ] - --> backends to… + --> backends to… [ SUN Identity Manager or other SAML Policy Controller ] - --> maps URLs to groups… + --> maps URLs to groups… [ Apache Policy Agent in front of eAuth-secured Web Application ] In more ideal implementations, the remainder of the application-specific account information is stored either in extended schema on the LDAP server itself, via the use of a translucent LDAP proxy, or in an independent datastore keyed off of the UID provided via SAML assertion. diff --git a/doc/source/devref/cinder.rst b/doc/source/devref/cinder.rst index c820b4f6912..fe791bbf0da 100644 --- a/doc/source/devref/cinder.rst +++ b/doc/source/devref/cinder.rst @@ -1,6 +1,6 @@ .. Copyright 2010-2011 United States Government as represented by the - Administrator of the National Aeronautics and Space Administration. + Administrator of the National Aeronautics and Space Administration. All Rights Reserved. Licensed under the Apache License, Version 2.0 (the "License"); you may @@ -69,7 +69,7 @@ The :mod:`cinder.test` Module :noindex: :members: :undoc-members: - :show-inheritance: + :show-inheritance: The :mod:`cinder.utils` Module diff --git a/doc/source/devref/fakes.rst b/doc/source/devref/fakes.rst index b225ff2ace3..741bc7b03aa 100644 --- a/doc/source/devref/fakes.rst +++ b/doc/source/devref/fakes.rst @@ -1,6 +1,6 @@ .. Copyright 2010-2011 United States Government as represented by the - Administrator of the National Aeronautics and Space Administration. + Administrator of the National Aeronautics and Space Administration. All Rights Reserved. Licensed under the Apache License, Version 2.0 (the "License"); you may diff --git a/doc/source/devref/migration.rst b/doc/source/devref/migration.rst index 52dfb8c2370..b295c5c1191 100644 --- a/doc/source/devref/migration.rst +++ b/doc/source/devref/migration.rst @@ -54,7 +54,7 @@ the CLI:: cinder migrate [--force-host-copy []] [--lock-volume []] - + Mandatory arguments: ID of volume to migrate. Destination host. The format of host is @@ -65,7 +65,7 @@ the CLI:: back-end. If the back-end does not have specified pools, 'POOL' needs to be set with the same name as 'backend'. - + Optional arguments: --force-host-copy [] Enables or disables generic host-based force- diff --git a/doc/source/devref/threading.rst b/doc/source/devref/threading.rst index c48d353e06e..9476c354595 100644 --- a/doc/source/devref/threading.rst +++ b/doc/source/devref/threading.rst @@ -28,9 +28,9 @@ in the long-running code path. The sleep call will trigger a context switch if there are pending threads, and using an argument of 0 will avoid introducing delays in the case that there is only a single green thread:: - from eventlet import greenthread - ... - greenthread.sleep(0) + from eventlet import greenthread + ... + greenthread.sleep(0) MySQL access and eventlet