diff --git a/doc/admin-guide-cloud/compute/section_compute-system-admin.xml b/doc/admin-guide-cloud/compute/section_compute-system-admin.xml index e8f4d85565..082c9d9448 100644 --- a/doc/admin-guide-cloud/compute/section_compute-system-admin.xml +++ b/doc/admin-guide-cloud/compute/section_compute-system-admin.xml @@ -117,7 +117,7 @@ Password injection on libvirt-based hypervisors - For hypervisors that use the libvirt backend (such as KVM, QEMU, + For hypervisors that use the libvirt back end (such as KVM, QEMU, and LXC), admin password injection is disabled by default. To enable it, set this option in /etc/nova/nova.conf: [libvirt] @@ -137,7 +137,7 @@ inject_password=true Password injection and XenAPI (XenServer/XCP) - when using the XenAPI hypervisor backend, Compute uses the XenAPI + when using the XenAPI hypervisor back end, Compute uses the XenAPI agent to inject passwords into guests. The virtual machine image must be configured with the agent for password injection to work. diff --git a/doc/admin-guide-cloud/identity/section_caching-layer.xml b/doc/admin-guide-cloud/identity/section_caching-layer.xml index fb9f4c6513..79550ad326 100644 --- a/doc/admin-guide-cloud/identity/section_caching-layer.xml +++ b/doc/admin-guide-cloud/identity/section_caching-layer.xml @@ -10,11 +10,11 @@ configurable subsystems (for example, token, assignment). OpenStack Identity uses the dogpile.cache library which allows flexible - cache backends. The majority of the caching configuration options are set in + cache back ends. The majority of the caching configuration options are set in the [cache] section of the keystone.conf file. However, each section that has the capability to be cached usually has a caching boolean value that toggles caching. - So to enable only the token backend caching, set the values as follows: + So to enable only the token back end caching, set the values as follows: [cache] enabled=true @@ -83,20 +83,20 @@ caching=true the [assignment] section of the configuration file) or the global expiration_time (set in the [cache] section of the configuration file) before it is reflected. If this type - of delay (when using a read-only assignment backend) + of delay (when using a read-only assignment back end) is an issue, it is recommended that caching be disabled on assignment. To disable caching specifically on assignment, in the [assignment] section of the configuration set caching to False. - For more information about the different backends (and configuration options), see: + For more information about the different back ends (and configuration options), see: dogpile.cache.backends.memory dogpile.cache.backends.memcached - The memory backend is not suitable for use in a production environment. + The memory back end is not suitable for use in a production environment. dogpile.cache.backends.redis @@ -104,8 +104,8 @@ caching=true keystone.common.cache.backends.mongo - Configure the Memcached backend - The following example shows how to configure the memcached backend: + Configure the Memcached back end + The following example shows how to configure the memcached back end: [cache] enabled = true