From b2f15f6d5138fab56959a6a2f318de18df5daa28 Mon Sep 17 00:00:00 2001 From: Zhao Lei Date: Thu, 24 Sep 2015 20:52:44 +0800 Subject: [PATCH] Fix some spelling typo in manual compability -> compatibility acknowledgement -> acknowledgment Plus a small fix for config's note. Change-Id: I0a02c5ac034470179c90af71748eb980fe8f7495 Signed-off-by: Zhao Lei --- doc/source/api_microversion_dev.rst | 2 +- doc/source/rpc.rst | 4 ++-- etc/nova/rootwrap.conf | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/doc/source/api_microversion_dev.rst b/doc/source/api_microversion_dev.rst index 6816a7555504..dd8de8687864 100644 --- a/doc/source/api_microversion_dev.rst +++ b/doc/source/api_microversion_dev.rst @@ -24,7 +24,7 @@ responses from the server. .. warning:: The ``latest`` value is mostly meant for integration testing and would be dangerous to rely on in client code since Nova microversions are not - following semver and therefore backward compability is not guaranteed. + following semver and therefore backward compatibility is not guaranteed. Clients, like python-novaclient, should always require a specific microversion but limit what is acceptable to the version range that it understands at the time. diff --git a/doc/source/rpc.rst b/doc/source/rpc.rst index 94eadb21e299..7027f81a10f2 100644 --- a/doc/source/rpc.rst +++ b/doc/source/rpc.rst @@ -137,8 +137,8 @@ More precisely Consumers need the following parameters: * Auto_delete: if set, the exchange is deleted when all queues have finished using it. Default is False. * Exclusive: exclusive queues (such as non-shared) may only be consumed from by the current connection. When exclusive is on, this also implies auto_delete. Default is False. * Exchange_type: AMQP defines several default exchange types (routing algorithms) that covers most of the common messaging use cases. - * Auto_ack: acknowledgement is handled automatically once messages are received. By default auto_ack is set to False, and the receiver is required to manually handle acknowledgment. - * No_ack: it disable acknowledgement on the server-side. This is different from auto_ack in that acknowledgement is turned off altogether. This functionality increases performance but at the cost of reliability. Messages can get lost if a client dies before it can deliver them to the application. + * Auto_ack: acknowledgment is handled automatically once messages are received. By default auto_ack is set to False, and the receiver is required to manually handle acknowledgment. + * No_ack: it disable acknowledgment on the server-side. This is different from auto_ack in that acknowledgment is turned off altogether. This functionality increases performance but at the cost of reliability. Messages can get lost if a client dies before it can deliver them to the application. * Auto_declare: if this is True and the exchange name is set, the exchange will be automatically declared at instantiation. Auto declare is on by default. Publishers specify most the parameters of Consumers (such as they do not specify a queue name), but they can also specify the following: * Delivery_mode: the default delivery mode used for messages. The value is an integer. The following delivery modes are supported by RabbitMQ: diff --git a/etc/nova/rootwrap.conf b/etc/nova/rootwrap.conf index aa466c5d5024..5dc07891e0f4 100644 --- a/etc/nova/rootwrap.conf +++ b/etc/nova/rootwrap.conf @@ -7,7 +7,7 @@ filters_path=/etc/nova/rootwrap.d,/usr/share/nova/rootwrap # List of directories to search executables in, in case filters do not -# explicitely specify a full path (separated by ',') +# explicitly specify a full path (separated by ',') # If not specified, defaults to system PATH environment variable. # These directories MUST all be only writeable by root ! exec_dirs=/sbin,/usr/sbin,/bin,/usr/bin