Many of these were mentioned by Yuri Chornoivan in: https://bugzilla.redhat.com/show_bug.cgi?id=669506 * src/esx/esx_vi.c (esxVI_WaitForTaskCompletion): Fix spelling. * src/conf/netdev_vport_profile_conf.c (virNetDevVPortProfileParse): Likewise. * src/xen/xend_internal.c (xenDaemonDomainSetVcpusFlags): Likewise. * src/xen/xm_internal.c (xenXMDomainSetVcpusFlags): Likewise. * src/esx/esx_util.c (esxUtil_ResolveHostname): Likewise. * src/storage/storage_backend_fs.c (virStorageBackendFileSystemBuild): Likewise. * daemon/libvirtd.conf: Likewise. * src/util/logging.c (virLogMessage): Likewise. * src/uml/uml_conf.c (umlBuildCommandLineNet): Likewise. * src/vmx/vmx.c (virVMXFormatEthernet): Likewise. --- Pushing under the trivial rule. daemon/libvirtd.conf | 4 ++-- src/conf/netdev_vport_profile_conf.c | 2 +- src/esx/esx_util.c | 4 ++-- src/esx/esx_vi.c | 2 +- src/storage/storage_backend_fs.c | 2 +- src/uml/uml_conf.c | 4 ++-- src/util/logging.c | 2 +- src/vmx/vmx.c | 2 +- src/xen/xend_internal.c | 2 +- src/xen/xm_internal.c | 2 +- 10 files changed, 13 insertions(+), 13 deletions(-) diff --git a/daemon/libvirtd.conf b/daemon/libvirtd.conf index f218454..3eab2be 100644 --- a/daemon/libvirtd.conf +++ b/daemon/libvirtd.conf @@ -284,7 +284,7 @@ # Logging controls # -# Logging level: 4 errors, 3 warnings, 2 informations, 1 debug +# Logging level: 4 errors, 3 warnings, 2 information, 1 debug # basically 1 will log everything possible #log_level = 3 @@ -309,7 +309,7 @@ # the event layer. # Logging outputs: -# An output is one of the places to save logging informations +# An output is one of the places to save logging information # The format for an output can be: # x:stderr # output goes to stderr diff --git a/src/conf/netdev_vport_profile_conf.c b/src/conf/netdev_vport_profile_conf.c index 861ad34..b48b2cb 100644 --- a/src/conf/netdev_vport_profile_conf.c +++ b/src/conf/netdev_vport_profile_conf.c @@ -167,7 +167,7 @@ virNetDevVPortProfileParse(xmlNodePtr node) } } else { virNetDevError(VIR_ERR_XML_ERROR, "%s", - _("profileid parameter is missing for 802.1Qbh descripion")); + _("profileid parameter is missing for 802.1Qbh description")); goto error; } break; diff --git a/src/esx/esx_util.c b/src/esx/esx_util.c index 1925802..2c5ac1a 100644 --- a/src/esx/esx_util.c +++ b/src/esx/esx_util.c @@ -2,7 +2,7 @@ /* * esx_util.c: utility functions for the VMware ESX driver * - * Copyright (C) 2010 Red Hat, Inc. + * Copyright (C) 2010-2011 Red Hat, Inc. * Copyright (C) 2009-2011 Matthias Bolte <matthias.bolte(a)googlemail.com&gt; * Copyright (C) 2009 Maximilian Wilhelm <max(a)rfc2324.org&gt; * @@ -384,7 +384,7 @@ esxUtil_ResolveHostname(const char *hostname, if (errcode != 0) { ESX_ERROR(VIR_ERR_INTERNAL_ERROR, - _("Formating IP address for host '%s' failed: %s"), hostname, + _("Formatting IP address for host '%s' failed: %s"), hostname, gai_strerror(errcode)); freeaddrinfo(result); return -1; diff --git a/src/esx/esx_vi.c b/src/esx/esx_vi.c index 21892a0..80f337b 100644 --- a/src/esx/esx_vi.c +++ b/src/esx/esx_vi.c @@ -3955,7 +3955,7 @@ esxVI_WaitForTaskCompletion(esxVI_Context *ctx, if (taskInfo->cancelable == esxVI_Boolean_True) { if (esxVI_CancelTask(ctx, task) < 0 && blocked) { VIR_ERROR(_("Cancelable task is blocked by an " - "unanswered question but cancelation " + "unanswered question but cancellation " "failed")); } } else if (blocked) { diff --git a/src/storage/storage_backend_fs.c b/src/storage/storage_backend_fs.c index 3473435..b5acd20 100644 --- a/src/storage/storage_backend_fs.c +++ b/src/storage/storage_backend_fs.c @@ -706,7 +706,7 @@ error: /** * @conn connection to report errors against * @pool storage pool to build - * @flags controls the pool formating behaviour + * @flags controls the pool formatting behaviour * * Build a directory or FS based storage pool. * diff --git a/src/uml/uml_conf.c b/src/uml/uml_conf.c index a576047..b878622 100644 --- a/src/uml/uml_conf.c +++ b/src/uml/uml_conf.c @@ -188,12 +188,12 @@ umlBuildCommandLineNet(virConnectPtr conn, } if (def->data.ethernet.ipaddr) { umlReportError(VIR_ERR_INTERNAL_ERROR, "%s", - _("IP address not supported for ethernet inteface")); + _("IP address not supported for ethernet interface")); goto error; } if (def->data.ethernet.script) { umlReportError(VIR_ERR_INTERNAL_ERROR, "%s", - _("script execution not supported for ethernet inteface")); + _("script execution not supported for ethernet interface")); goto error; } break; diff --git a/src/util/logging.c b/src/util/logging.c index f550503..8d60280 100644 --- a/src/util/logging.c +++ b/src/util/logging.c @@ -677,7 +677,7 @@ virLogVersionString(char **msg) * @fmt: the string format * @...: the arguments * - * Call the libvirt logger with some informations. Based on the configuration + * Call the libvirt logger with some information. Based on the configuration * the message may be stored, sent to output or just discarded */ void virLogMessage(const char *category, int priority, const char *funcname, diff --git a/src/vmx/vmx.c b/src/vmx/vmx.c index 9ba06e5..c250aee 100644 --- a/src/vmx/vmx.c +++ b/src/vmx/vmx.c @@ -3513,7 +3513,7 @@ virVMXFormatEthernet(virDomainNetDefPtr def, int controller, STRCASENEQ(def->model, "vmxnet3") && STRCASENEQ(def->model, "e1000")) { VMX_ERROR(VIR_ERR_INTERNAL_ERROR, - _("Expecting domain XML entry 'devices/interfase/model' " + _("Expecting domain XML entry 'devices/interface/model' " "to be 'vlance' or 'vmxnet' or 'vmxnet2' or 'vmxnet3' " "or 'e1000' but found '%s'"), def->model); return -1; diff --git a/src/xen/xend_internal.c b/src/xen/xend_internal.c index 2318565..16165fe 100644 --- a/src/xen/xend_internal.c +++ b/src/xen/xend_internal.c @@ -2217,7 +2217,7 @@ xenDaemonDomainSetVcpusFlags(virDomainPtr domain, unsigned int vcpus, flags |= VIR_DOMAIN_VCPU_MAXIMUM; if ((max = xenDaemonDomainGetVcpusFlags(domain, flags)) < 0) { virXendError(VIR_ERR_OPERATION_INVALID, "%s", - _("could not determin max vcpus for the domain")); + _("could not determine max vcpus for the domain")); return -1; } if (vcpus > max) { diff --git a/src/xen/xm_internal.c b/src/xen/xm_internal.c index a250b6f..9c376fb 100644 --- a/src/xen/xm_internal.c +++ b/src/xen/xm_internal.c @@ -728,7 +728,7 @@ xenXMDomainSetVcpusFlags(virDomainPtr domain, unsigned int vcpus, /* Hypervisor maximum. */ if ((max = xenUnifiedGetMaxVcpus(domain->conn, NULL)) < 0) { xenXMError(VIR_ERR_INTERNAL_ERROR, "%s", - _("could not determin max vcpus for the domain")); + _("could not determine max vcpus for the domain")); goto cleanup; } /* Can't specify a current larger than stored maximum; but -- 1.7.7.3