diff --git a/HACKING.rst b/HACKING.rst index 4fab467827..2f583af673 100644 --- a/HACKING.rst +++ b/HACKING.rst @@ -119,8 +119,8 @@ need with:: apt-get install texlive-full imagemagick -Then you can then use the ``build_latex_pdf.sh`` script in tools/ to take care -of both the the sphinx latex generation and the latex compilation. For example:: +Then you can use the ``build_latex_pdf.sh`` script in tools/ to take care +of both the sphinx latex generation and the latex compilation. For example:: tools/build_latex_pdf.sh diff --git a/api-guide/source/general_info.rst b/api-guide/source/general_info.rst index 9f25030abf..bae13c51eb 100644 --- a/api-guide/source/general_info.rst +++ b/api-guide/source/general_info.rst @@ -133,7 +133,7 @@ on compute hosts rather than servers. Services are provided by Nova components. Normally, the Nova component runs as a process on the controller/compute node to provide the service. These - services may be end-user facing, such as the the OpenStack Compute REST API + services may be end-user facing, such as the OpenStack Compute REST API service, but most just work with other Nova services. The status of each service is monitored by Nova, and if it is not responding normally, Nova will update its status so that requests are not sent to that service diff --git a/nova/api/openstack/compute/instance_usage_audit_log.py b/nova/api/openstack/compute/instance_usage_audit_log.py index 130f046623..23acdc1280 100644 --- a/nova/api/openstack/compute/instance_usage_audit_log.py +++ b/nova/api/openstack/compute/instance_usage_audit_log.py @@ -85,7 +85,7 @@ class InstanceUsageAuditLogController(wsgi.Controller): task_logs = self.host_api.task_log_get_all(context, "instance_usage_audit", begin, end) - # We do this this way to include disabled compute services, + # We do this in this way to include disabled compute services, # which can have instances on them. (mdragon) filters = {'topic': CONF.compute_topic} services = self.host_api.service_get_all(context, filters=filters) diff --git a/nova/api/openstack/compute/legacy_v2/contrib/instance_usage_audit_log.py b/nova/api/openstack/compute/legacy_v2/contrib/instance_usage_audit_log.py index bbf154b3f6..cccb15432b 100644 --- a/nova/api/openstack/compute/legacy_v2/contrib/instance_usage_audit_log.py +++ b/nova/api/openstack/compute/legacy_v2/contrib/instance_usage_audit_log.py @@ -86,7 +86,7 @@ class InstanceUsageAuditLogController(object): task_logs = self.host_api.task_log_get_all(context, "instance_usage_audit", begin, end) - # We do this this way to include disabled compute services, + # We do this in this way to include disabled compute services, # which can have instances on them. (mdragon) filters = {'topic': CONF.compute_topic} services = self.host_api.service_get_all(context, filters=filters)