diff --git a/doc/admin-guide-cloud/source/blockstorage_over_subscription.rst b/doc/admin-guide-cloud/source/blockstorage_over_subscription.rst index 4a631a1ea3..6329e683a7 100644 --- a/doc/admin-guide-cloud/source/blockstorage_over_subscription.rst +++ b/doc/admin-guide-cloud/source/blockstorage_over_subscription.rst @@ -109,7 +109,7 @@ Each volume created with the replication capability set to `True` generates a copy of the volume on a storage back end. One use case for replication involves an OpenStack cloud environment -installed accross two data centers located nearby each other. The +installed across two data centers located nearby each other. The distance between the two data centers in this use case is the length of a city. diff --git a/doc/admin-guide-cloud/source/conf.py b/doc/admin-guide-cloud/source/conf.py index 0d4950d227..c5b6888c16 100644 --- a/doc/admin-guide-cloud/source/conf.py +++ b/doc/admin-guide-cloud/source/conf.py @@ -299,6 +299,6 @@ locale_dirs = ['locale/'] # -- Options for PDF output -------------------------------------------------- pdf_documents = [ - ('index', u'CloudAdminGuide', u'Cloud Adminstrator Guide', + ('index', u'CloudAdminGuide', u'Cloud Administrator Guide', u'OpenStack contributors') ] diff --git a/doc/admin-guide-cloud/source/keystone_secure_identity_to_ldap_backend.rst b/doc/admin-guide-cloud/source/keystone_secure_identity_to_ldap_backend.rst index 5e8bcc0a4d..b26e259621 100644 --- a/doc/admin-guide-cloud/source/keystone_secure_identity_to_ldap_backend.rst +++ b/doc/admin-guide-cloud/source/keystone_secure_identity_to_ldap_backend.rst @@ -37,11 +37,11 @@ Once you verify the location of your certificate authority file: .. hlist:: :columns: 1 - * ``demand`` - The LDAP server always recieves certificate + * ``demand`` - The LDAP server always receives certificate requests. The session terminates if no certificate is provided, or if the certificate provided cannot be verified against the existing certificate authorities file. - * ``allow`` - The LDAP server always recieves certificate + * ``allow`` - The LDAP server always receives certificate requests. The session will proceed as normal even if a certificate is not provided. If a certificate is provided but it cannot be verified against the existing certificate authorities file, the diff --git a/doc/admin-guide-cloud/source/telemetry-data-collection.rst b/doc/admin-guide-cloud/source/telemetry-data-collection.rst index 703ddbccf0..47a8d89259 100644 --- a/doc/admin-guide-cloud/source/telemetry-data-collection.rst +++ b/doc/admin-guide-cloud/source/telemetry-data-collection.rst @@ -406,7 +406,7 @@ Additionally, ``workload_partitioning`` should be enabled in the .. note:: In Liberty, the notification agent creates multiple queues to divide the - workload across all active agents. The number of queues can be controled by + workload across all active agents. The number of queues can be controlled by the ``pipeline_processing_queues`` option in the :file:`ceilometer.conf` configuration file. A larger value will result in better distribution of tasks but will also require more memory and longer startup time. It is diff --git a/doc/arch-design/storage_focus/section_operational_considerations_storage_focus.xml b/doc/arch-design/storage_focus/section_operational_considerations_storage_focus.xml index 8838f8a69f..ec0cfa86a0 100644 --- a/doc/arch-design/storage_focus/section_operational_considerations_storage_focus.xml +++ b/doc/arch-design/storage_focus/section_operational_considerations_storage_focus.xml @@ -33,7 +33,7 @@ Organizations need to have the flexibility to choose between off-premise and on-premise cloud storage options. This relies - on relevant decision criterias with potential cost savings. + on relevant decision criteria with potential cost savings. For example, continuity of operations, disaster recovery, security, records retention laws, regulations, and policies. diff --git a/www/draft/draft-index.html b/www/draft/draft-index.html index 6f9c52aa18..e9c545e0bb 100644 --- a/www/draft/draft-index.html +++ b/www/draft/draft-index.html @@ -90,14 +90,14 @@