From fe152499dea3319d98e0ebfc25723339331dda6b Mon Sep 17 00:00:00 2001

Message-Id: <fe152499dea3319d98e0ebfc25723339331dda6b@dist-git>

From: Yuri Chornoivan <yurchor@ukr.net>

Date: Tue, 18 Feb 2014 15:45:26 -0700

Subject: [PATCH] Fix minor typos in messages and docs

https://bugzilla.redhat.com/show_bug.cgi?id=1045643

prereq of CVE-2013-6456

Signed-off-by: Eric Blake <eblake@redhat.com>

(cherry picked from commit 5b4c035b08c122c3ae15aee7c13ce0f480586502)

Signed-off-by: Jiri Denemark <jdenemar@redhat.com>

---

 HACKING                   |  2 +-

 docs/apibuild.py          |  2 +-

 docs/formatdomain.html.in |  6 ++---

 docs/hacking.html.in      |  2 +-

 docs/migration.html.in    |  4 ++--

 docs/news.html.in         | 60 +++++++++++++++++++++++------------------------

 src/esx/esx_vi.c          |  2 +-

 src/lxc/lxc_driver.c      |  4 ++--

 8 files changed, 41 insertions(+), 41 deletions(-)

diff --git a/docs/apibuild.py b/docs/apibuild.py

index e65c559..5c55d79 100755

--- a/docs/apibuild.py

+++ b/docs/apibuild.py

@@ -919,7 +919,7 @@ class CParser:

             l = lines[0]

             i = 0

             # Remove all leading '*', followed by at most one ' ' character

-            # since we need to preserve correct identation of code examples

+            # since we need to preserve correct indentation of code examples

             while i < len(l) and l[i] == '*':

                 i = i + 1

             if i > 0:

diff --git a/docs/formatdomain.html.in b/docs/formatdomain.html.in

index 28cee29..ecf6adf 100644

--- a/docs/formatdomain.html.in

+++ b/docs/formatdomain.html.in

@@ -1018,7 +1018,7 @@

-      Guest NUMA topology can be specifed using the numa element.

+      Guest NUMA topology can be specified using the numa element.

       Since 0.9.8

@@ -3213,7 +3213,7 @@

       Provides direct attachment of the virtual machine's NIC to the given

-      physial interface of the host.

+      physical interface of the host.

       Since 0.7.7 (QEMU and KVM only)

       This setup requires the Linux macvtap

       driver to be available. (Since Linux 2.6.34.)

@@ -3618,7 +3618,7 @@ qemu-kvm -net nic,model=? /dev/null

       If no target is specified, certain hypervisors will

       automatically generate a name for the created tun device. This

-      name can be manually specifed, however the name must not

+      name can be manually specified, however the name must not

       start with either 'vnet' or 'vif', which are prefixes

       reserved by libvirt and certain hypervisors. Manually specified

       targets using these prefixes will be ignored.

diff --git a/docs/hacking.html.in b/docs/hacking.html.in

index 700eb3a..8120b19 100644

--- a/docs/hacking.html.in

+++ b/docs/hacking.html.in

@@ -207,7 +207,7 @@

 ==4643==    by 0x34D8C01569: ??? (in /usr/lib64/ld-2.15.so)

-        
In this instance, it is acceptible to modify the

+        
In this instance, it is acceptable to modify the

            tests/.valgrind.supp file in order to add a

            suppression filter. The filter should be unique enough to

            not suppress real leaks, but it should be generic enough to

diff --git a/docs/migration.html.in b/docs/migration.html.in

index 2ea0969..6986cc0 100644

--- a/docs/migration.html.in

+++ b/docs/migration.html.in

@@ -9,7 +9,7 @@

       Migration of guests between hosts is a complicated problem with many possible

       solutions, each with their own positive and negative points. For maximum

-      flexibility of both hypervisor integration, and adminsitrator deployment,

+      flexibility of both hypervisor integration, and administrator deployment,

       libvirt implements several options for migration.

@@ -187,7 +187,7 @@

         URI. In this case the management application should specify the

         hypervisor specific URI explicitly, using an IP address, or a

         correct hostname.

-      
The host has multiple network interaces. If a host has multiple

+      
The host has multiple network interfaces. If a host has multiple

         network interfaces, it might be desirable for the migration data

         stream to be sent over a specific interface for either security

         or performance reasons. In this case the management application

diff --git a/docs/news.html.in b/docs/news.html.in

index d453be7..89b087b 100644

--- a/docs/news.html.in

+++ b/docs/news.html.in

@@ -872,7 +872,7 @@ and check the GIT log

       Add libvirt-daemon-vbox & libvirt-daemon-driver-vbox RPMs (Daniel P. Berrange),

       Include GNULIB mkdtemp module (Daniel P. Berrange),

       Set PKG_CONFIG_LIBDIR in autobuild.sh (Daniel P. Berrange),

-      qemu: report useful error failling to destroy domain gracefully (Guannan Ren),

+      qemu: report useful error failing to destroy domain gracefully (Guannan Ren),

       qemu: Check conflicts for shared scsi host device (Osier Yang),

       Re-add selinux/selinux.h to lxc_container.c (Daniel P. Berrange),

       schema: make source optional in volume XML (Ján Tomko),

@@ -1634,7 +1634,7 @@ and check the GIT log

       S390: Documentation for CCW address type (Viktor Mihajlovski),

       Use separate symbol file for GNUTLS symbols (Daniel P. Berrange),

       Apply security label when entering LXC namespaces (Daniel P. Berrange),

-      virCaps: conf: start splitting out irrelevat data (Peter Krempa),

+      virCaps: conf: start splitting out irrelevant data (Peter Krempa),

       Remove hack using existance of an 'identity' string to disable auth (Daniel P. Berrange),

       Convert HAVE_SELINUX to WITH_SELINUX (Guido Günther),

       capabilities: add NUMA memory information (Dusty Mabe),

@@ -1888,7 +1888,7 @@ and check the GIT log

       qemu: Merge qemuCheckSharedDisk into qemuAddSharedDisk (Osier Yang),

       qemu: Add checking in helpers for sgio setting (Osier Yang),

       maint: enforce private symbol section sorting (Eric Blake),

-      qemu: switch PCI address alocation to use virDevicePCIAddress (Ján Tomko),

+      qemu: switch PCI address allocation to use virDevicePCIAddress (Ján Tomko),

       virsh: distinguish errors between missing argument and wrong option (Guannan Ren),

       maint: sort private syms to reflect recent header renames (Eric Blake),

       maint: fix header file owners of private symbols (Eric Blake),

@@ -2144,7 +2144,7 @@ and check the GIT log

       selinux: Resolve resource leak using the default disk label (John Ferlan),

       util: Need to check child JSON allocation before use (John Ferlan),

       parallels: Need to handle virJSONValueObjectGetString error (John Ferlan),

-      qemu: Reject attempts to create snapshots with names containig '/' (Peter Krempa),

+      qemu: Reject attempts to create snapshots with names containing '/' (Peter Krempa),

       qemu: Don't return success if creation of snapshot save file fails (Peter Krempa),

       Fix race condition when destroying guests (Daniel P. Berrange),

       storage: Fix lvcreate parameter for backingStore. (Atsushi Kumagai),

@@ -3073,7 +3073,7 @@ and check the GIT log

       bitmap: add virBitmapCountBits (Eric Blake),

       esx: Update version checks for vSphere 5.1 (Matthias Bolte),

       cpu: Add recently added cpu feature flags. (Peter Krempa),

-      qemu: Prohibit chaning affinity of domain process if placement is 'auto' (Osier Yang),

+      qemu: Prohibit changing affinity of domain process if placement is 'auto' (Osier Yang),

       qemu: Keep the affinity when creating cgroup for emulator thread (Osier Yang),

       qemu: Add helper to prepare cpumap for affinity setting (Osier Yang),

       virNodeGetCPUMap: Implement virsh support. (Viktor Mihajlovski),

@@ -3447,7 +3447,7 @@ and check the GIT log

       list: Implement listAllNWFilters (Osier Yang),

       list: Implement RPC calls for virConnectListAllNWFilters (Osier Yang),

       list: Use virConnectListAllNodeDevices in virsh (Osier Yang),

-      virsh: Don't motify the const string (Osier Yang),

+      virsh: Don't modify the const string (Osier Yang),

       list: Expose virConnectListAllNodeDevices to Python binding (Osier Yang),

       list: Implement listAllNodeDevices (Osier Yang),

       list: Add helpers for listing node devices (Osier Yang),

@@ -4138,7 +4138,7 @@ and check the GIT log

       conf: Remove dead code from virConsoleOpen() (Peter Krempa),

       python: Don't generate bodies for close callback functions (Peter Krempa),

       maint: regenerate bootstrap (Eric Blake),

-      Remove accidentally commited virNetClientSetEOFNotify symbol (Daniel P. Berrange),

+      Remove accidentally committed virNetClientSetEOFNotify symbol (Daniel P. Berrange),

       Remove two non-existant NWFilter driver symbols from .syms (Daniel P. Berrange),

       tests: reduce length of nodeinfodata test names (Eric Blake),

       rpc: remove trailing whitespace character in error string (Guannan Ren),

@@ -4617,7 +4617,7 @@ and check the GIT log

       util: remove error log from stubs of virNetlinkEventServiceStart|Stop (Laine Stump),

       openvz: read vmguarpages/privvmpages to set memory tunables (Guido Günther),

       build: support libnl-3 (Serge Hallyn),

-      util: add functions for interating over json object (Dmitry Guryanov),

+      util: add functions for iterating over json object (Dmitry Guryanov),

       build: update pid_t type static check (Marc-André Lureau),

       build: fix output of pid values (Marc-André Lureau),

       virsh: output scaled values with correct units (Eric Blake),

@@ -5420,8 +5420,8 @@ and check the GIT log

       threadpool: Don't wait on condition if pool has no workers (Michal Privoznik),

       bridge: Fix forward delay APIs (Jiri Denemark),

       virsh: return correct value from cmdDomIfGetLink (Peter Krempa),

-      virsh: plug memory leak on cmdDomIfGetLink() sucessful path (Alex Jia),

-      virsh: plug memory leak on cmdBlkdeviotune() sucessful path (Alex Jia),

+      virsh: plug memory leak on cmdDomIfGetLink() successful path (Alex Jia),

+      virsh: plug memory leak on cmdBlkdeviotune() successful path (Alex Jia),

       test: fix potential lock corruption in test driver (Laine Stump),

       spec: fix logic bug in deciding to turn on cgconfig (Eric Blake),

       When checking nttyFDs to see if it is != 1, be sure to use '1' and not '-1' (Daniel P. Berrange),

@@ -5557,10 +5557,10 @@ and check the GIT log

       Avoid crash in shunloadtest (Daniel P. Berrange),

       Fix a logic error for setting block I/O (Lei Li),

       virsh: Allow other escape characters for console (Michal Privoznik),

-      bridge_driver: Don't define network if XML contains more IPv4 adreses. (Peter Krempa),

+      bridge_driver: Don't define network if XML contains more IPv4 addresses. (Peter Krempa),

       virsh: Fix possible deadlock when virsh is about to exit (Jiri Denemark),

       util: Plug memory leak on virNetDevMacVLanCreateWithVPortProfile() error path (Alex Jia),

-      util: Plug memory leak on virNetDevBridgeGet() sucessful path (Alex Jia),

+      util: Plug memory leak on virNetDevBridgeGet() successful path (Alex Jia),

       uml: Plug memory leak on umlStartVMDaemon() error path (Alex Jia),

       rpc: Plug memory leak on virNetClientSendInternal() error path (Alex Jia),

       conf: Plug memory leak on virDomainDefParseXML() error path (Alex Jia),

@@ -7023,7 +7023,7 @@ and check the GIT log

       Fix leak of virStreamPtr object with callback added in fdstream impl (Daniel P. Berrange),

       Fix leak of mdnsGroupName in virNetServer object (Daniel P. Berrange),

       Fix release of filtered stream messages (Daniel P. Berrange),

-      save domain status after modifing vcpupin (Wen Congyang),

+      save domain status after modifying vcpupin (Wen Congyang),

       Fix memory leak in virDomainVcpuPinDel() (Wen Congyang),

       sysinfo: fix illegal NULL return (Minoru Usui),

       Fix locking wrt virNetClientStreamPtr object (Daniel P. Berrange),

@@ -7219,7 +7219,7 @@ and check the GIT log

       command: reduce duplicated debug messages (Eric Blake),

       qemu: Scrape stdout for virtio console pty (Cole Robinson),

       virsh: Add daemon version reporting (Michal Privoznik),

-      nodeinfo: remove superflous braces (Guido Günther),

+      nodeinfo: remove superfluous braces (Guido Günther),

       util: Cleanup indention problem in virterror.c (Osier Yang),

       qemu: Parse current balloon value returned by query_balloon (Osier Yang),

       Deprecate several CURRENT/LIVE/CONFIG enums (Hu Tao),

@@ -7624,7 +7624,7 @@ and check the GIT log

       Pull in gnulib fnmatch module (Daniel P. Berrange),

       json: Fix *GetBoolean functions (Jiri Denemark),

       build: rebuild generated files after rpcgen_fix.pl tweak (Eric Blake),

-      Re-add libvirt.spec to tarball to allwo "make rpm" (Daniel Veillard),

+      Re-add libvirt.spec to tarball to allow "make rpm" (Daniel Veillard),

       build: Remove all generated RPC files from GIT (Daniel P. Berrange),

       build: refactor generated RPC files (Daniel P. Berrange),

       build: rename generated files to .h, for automake's sake (Eric Blake),

@@ -8185,7 +8185,7 @@ and check the GIT log

       Remove deallocator parameter from hash functions (Daniel P. Berrange),

       Make commandtest more robust wrt its execution environment (Daniel P. Berrange),

       audit: audit qemu pci and usb device passthrough (Eric Blake),

-      audit: audit qemu memory and vcpu adjusments (Eric Blake),

+      audit: audit qemu memory and vcpu adjustments (Eric Blake),

       audit: add qemu hooks for auditing cgroup events (Eric Blake),

       audit: prepare qemu for listing vm in cgroup audits (Eric Blake),

       cgroup: determine when skipping non-devices (Eric Blake),

@@ -8260,7 +8260,7 @@ and check the GIT log

       don't check for NULL before calling virHashFree (Christophe Fergeau),

       remove no longer needed calls to virReportOOMError (Christophe Fergeau),

       Move all the QEMU migration code to a new file (Daniel P. Berrange),

-      Split all QEMU process mangement code into separate file (Daniel P. Berrange)

+      Split all QEMU process management code into separate file (Daniel P. Berrange)

@@ -9120,7 +9120,7 @@ and check the GIT log

       virsh: add tests for recent cli improvements (Eric Blake),

       virsh: new echo command (Eric Blake),

       virsh: add support for accepting arbitrary argv (Eric Blake),

-      esx: Explictly declare VMX file content as UTF-8 (Matthias Bolte),

+      esx: Explicitly declare VMX file content as UTF-8 (Matthias Bolte),

       esx: Handle name escaping properly (Matthias Bolte),

       nwfilter: prevent filters with different name but same UUID (Stefan Berger),

       new attribute accessmode to filesystem element (Harsh Prateek Bora),

@@ -9970,7 +9970,7 @@ and check the GIT log

       Prevent updates while IP address learn thread is running (Stefan Berger),

       Syncronize the teardown of rules with the thread (Stefan Berger),

       Clean all tables before applying 'basic' rules (Stefan Berger),

-      MAke virFileHasSuffix case insensitive (Paul Dorman),

+      Make virFileHasSuffix case insensitive (Paul Dorman),

       nwfilter: Also pick IP address from a DHCP ACK message (Stefan Berger),

       Implement python binding for virDomainGetBlockInfo (Daniel P. Berrange),

       Add new domblkinfo command to virsh (Daniel P. Berrange),

@@ -10036,7 +10036,7 @@ and check the GIT log

       Fix indentation for storage conf XML (David Allan),

       Make virDomainSnapshotObjListDeinit static. (Chris Lalancette),

       Some NWFilter symbols are conditional and have to be exported conditional (Matthias Bolte),

-      xen: Fix inside_daemon beeing unused when libvirtd is disabled (Matthias Bolte),

+      xen: Fix inside_daemon being unused when libvirtd is disabled (Matthias Bolte),

       maint: update AUTHORS (Marco Bozzolan),

       maint: update AUTHORS with recent contributors (Eric Blake),

       maint: enforce whitespace on shell scripts (Eric Blake),

@@ -10686,7 +10686,7 @@ and check the GIT log

       
Features:

       Implement support for multi IQN (David Allan),

       Implement CPU topology support for QEMU driver (Jiri Denemark),

-      Use QEmu new device adressing when possible (Daniel P. Berrange),

+      Use QEmu new device addressing when possible (Daniel P. Berrange),

       Implement SCSI controller hotplug/unplug for QEMU (Wolfgang Mauerer)

@@ -11011,7 +11011,7 @@ and check the GIT log

       Fix some locking issues (Matthias Bolte),

       Fix event test timer checks on kernels with HZ=100 (Daniel P. Berrange),

       Fix threading problems in python bindings (Daniel P. Berrange),

-      Supress annoying libcap-ng errors from valgrind (Daniel P. Berrange),

+      Suppress annoying libcap-ng errors from valgrind (Daniel P. Berrange),

       Fix two leaks in test driver (Daniel P. Berrange),

       Free cgroup device ACL list on driver shutdown (Daniel P. Berrange),

       xen: Fix unconditional freeing in xenDaemonListDefinedDomains() (Matthias Bolte),

@@ -11079,7 +11079,7 @@ and check the GIT log

       maint: remove from VC two gnulib-provided files (Jim Meyering),

       xm_internal.c: remove misleading dead code (Jim Meyering),

       Cleanup temporary #define after use (Matthew Booth),

-      Suppress cgroup error message on sucess startup (Ryota Ozaki),

+      Suppress cgroup error message on success startup (Ryota Ozaki),

       Small change of RNG syntax for domain (Diego Elio Pettenò),

       remove iptablesReloadRules() and related code (Mark McLoughlin),

       remove all traces of lokkit support (Mark McLoughlin),

@@ -11404,7 +11404,7 @@ and check the GIT log

         
Improvements:

         schema: Update storage pool schema. (Cole Robinson),

         test: Activate interfaces specified through driver config file. (Cole Robinson),

-        Rewrite example domain events programm for python (Daniel P. Berrange),

+        Rewrite example domain events program for python (Daniel P. Berrange),

         Support a new peer-to-peer migration mode & public API (Daniel P. Berrange),

         LXC add augeas support for config file (Amy Griffis),

         LXC add driver config file lxc.conf (Amy Griffis),

@@ -11417,7 +11417,7 @@ and check the GIT log

         Add a domain argument to SVirt *RestoreImageLabel (Jamie Strandboge),

         test: Support loading node device info from file/XML (Cole Robinson),

         test: Implement node device driver. (Cole Robinson),

-        configure: Add explict --with-python option. (Cole Robinson),

+        configure: Add explicit --with-python option. (Cole Robinson),

         Tunnelled migration. (Chris Lalancette),

         Various monitor improvements for migration. (Chris Lalancette),

         523639 Allows a <description> tag for domains (Daniel Veillard),

@@ -12063,7 +12063,7 @@ and check the GIT log

           in device XML (Daniel Berrange), fix qemu command flags fetching

           (Cole Robinson), check that qemu support -drive format= (Cole

           Robinson), improve emulator detection (Cole Robinson), changes

-          to config parser to accomodate VMX syntax (Matthias Bolte),

+          to config parser to accommodate VMX syntax (Matthias Bolte),

           update network schemas and driver for missing elements (Satoru SATOH),

           avoid changing file context if not needed (Tim Waugh),

           skip labelling if no src path (Cole Robinson), add arm emulation

@@ -12481,7 +12481,7 @@ and check the GIT log

           rewrite (Jim Meyering), cleanup of the conditional compilation

           of C files (Daniel Berrange), shell quoting fixes (Jim Meyering),

           parallel build support (James Morris and Jim Meyering), new

-          convenenience virFileReadLimFD function (Jim Meyering).  

+          convenience virFileReadLimFD function (Jim Meyering).  

     
0.4.4: Jun 25 2008

@@ -12492,7 +12492,7 @@ and check the GIT log

       
Improvements: add autogen to tarballs, improve iSCSI support

           (Chris Lalancette), localization updates 

       
Cleanups: const-ness fixed (Daniel P. Berrange), string helpers

-          for enumeations (Daniel P. Berrange)

+          for enumerations (Daniel P. Berrange)

     
0.4.3: Jun 12 2008

@@ -12882,7 +12882,7 @@ and check the GIT log

       
Documentation: fix errors due to Amaya (with Simon Hernandez),

       virsh uses kB not bytes (Atsushi SAKAI), add command line help to

       qemud (Richard Jones), xenUnifiedRegister docs (Atsushi SAKAI),

-      strings typos (Nikolay Sivov), ilocalization probalem raised by

+      strings typos (Nikolay Sivov), ilocalization problem raised by

       Thomas Canniot

       
Bug fixes: virsh memory values test (Masayuki Sunou), operations without

       libvirt_qemud (Atsushi SAKAI), fix spec file (Florian La Roche, Jeremy

@@ -13048,7 +13048,7 @@ and check the GIT log

     cleanup, virtual CPU and affinity support + virsh support (Michel

     Ponceau, Philippe Berthault, Daniel Berrange), port and tty information

     for console in XML (Daniel Berrange), added XML dump to driver and proxy

-    support (Daniel Berrange), extention of boot options with support for

+    support (Daniel Berrange), extension of boot options with support for

     floppy and cdrom (Daniel Berrange), features block in XML to report/ask

     PAE, ACPI, APIC for HVM domains (Daniel Berrange), fail saide-effect

     operations when using read-only connection, large improvements to test

diff --git a/src/esx/esx_vi.c b/src/esx/esx_vi.c

index 77b8ae3..1187bf3 100644

--- a/src/esx/esx_vi.c

+++ b/src/esx/esx_vi.c

@@ -3715,7 +3715,7 @@ esxVI_LookupDatastoreContentByDatastoreName

     if (taskInfoState != esxVI_TaskInfoState_Success) {

         virReportError(VIR_ERR_INTERNAL_ERROR,

-                       _("Could not serach in datastore '%s': %s"),

+                       _("Could not search in datastore '%s': %s"),

                        datastoreName, taskInfoErrorMessage);

         goto cleanup;

     }

diff --git a/src/lxc/lxc_driver.c b/src/lxc/lxc_driver.c

index cbac135..d37962d 100644

--- a/src/lxc/lxc_driver.c

+++ b/src/lxc/lxc_driver.c

@@ -3475,7 +3475,7 @@ lxcDomainAttachDeviceHostdevStorageLive(virLXCDriverPtr driver,

     if (lxcContainerSetupHostdevCapsMakePath(dst) < 0) {

         virReportSystemError(errno,

-                             _("Unable to create directroy for device %s"),

+                             _("Unable to create directory for device %s"),

                              dst);

         goto cleanup;

     }

@@ -3583,7 +3583,7 @@ lxcDomainAttachDeviceHostdevMiscLive(virLXCDriverPtr driver,

     if (lxcContainerSetupHostdevCapsMakePath(dst) < 0) {

         virReportSystemError(errno,

-                             _("Unable to create directroy for device %s"),

+                             _("Unable to create directory for device %s"),

                              dst);

         goto cleanup;

     }

-- 

1.9.0