From d6165440779f3ffda20bedae387a990077f08dcf Mon Sep 17 00:00:00 2001
From: =?utf8?q?J=C3=A1n=20Tomko?= <jtomko@redhat.com>
Date: Mon, 15 Feb 2016 15:34:24 +0100
Subject: [PATCH] Spell VMware with a lowercase w

Replace all occurrences of VMWare outside the news.
---
 docs/formatdomain.html.in | 2 +-
 docs/migration.html.in    | 2 +-
 docs/storage.html.in      | 2 +-
 libvirt.spec.in           | 2 +-
 src/util/virerror.c       | 2 +-
 src/util/virstoragefile.c | 2 +-
 tools/virsh.c             | 2 +-
 7 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/docs/formatdomain.html.in b/docs/formatdomain.html.in
index b3187bb0a7..e96798f86a 100644
--- a/docs/formatdomain.html.in
+++ b/docs/formatdomain.html.in
@@ -1569,7 +1569,7 @@
       <dt><code>vmport</code></dt>
       <dd>Depending on the <code>state</code> attribute (values <code>on</code>,
         <code>off</code>, default <code>on</code>) enable or disable
-        the emulation of VMWare IO port, for vmmouse etc.
+        the emulation of VMware IO port, for vmmouse etc.
         <span class="since">Since 1.2.16</span>
       </dd>
       <dt><code>gic</code></dt>
diff --git a/docs/migration.html.in b/docs/migration.html.in
index 6986cc0193..8efdd7f549 100644
--- a/docs/migration.html.in
+++ b/docs/migration.html.in
@@ -475,7 +475,7 @@
     </pre>
 
     <p>
-      Supported by Xen, QEMU, VMWare and VirtualBox drivers
+      Supported by Xen, QEMU, VMware and VirtualBox drivers
     </p>
 
     <h3><a name="scenarionativepeer2peer">Native migration, client to and peer2peer between, two libvirtd servers</a></h3>
diff --git a/docs/storage.html.in b/docs/storage.html.in
index 1f01330356..b0efe69d6d 100644
--- a/docs/storage.html.in
+++ b/docs/storage.html.in
@@ -161,7 +161,7 @@
       <li><code>qcow</code>: QEMU v1 disk image format</li>
       <li><code>qcow2</code>: QEMU v2 disk image format</li>
       <li><code>qed</code>: QEMU Enhanced Disk image format</li>
-      <li><code>vmdk</code>: VMWare disk image format</li>
+      <li><code>vmdk</code>: VMware disk image format</li>
       <li><code>vpc</code>: VirtualPC disk image format</li>
     </ul>
     <p>
diff --git a/libvirt.spec.in b/libvirt.spec.in
index dd54dfcffa..fc2e2cf46d 100644
--- a/libvirt.spec.in
+++ b/libvirt.spec.in
@@ -190,7 +190,7 @@
 %endif
 
 # RHEL doesn't ship OpenVZ, VBox, UML, PowerHypervisor,
-# VMWare, libxenserver (xenapi), libxenlight (Xen 4.1 and newer),
+# VMware, libxenserver (xenapi), libxenlight (Xen 4.1 and newer),
 # or HyperV.
 %if 0%{?rhel}
     %define with_openvz 0
diff --git a/src/util/virerror.c b/src/util/virerror.c
index 3a3ddeff09..e1bcf52e07 100644
--- a/src/util/virerror.c
+++ b/src/util/virerror.c
@@ -105,7 +105,7 @@ VIR_ENUM_IMPL(virErrorDomain, VIR_ERR_DOMAIN_LAST,
               "Audit Utils",
               "Sysinfo Utils",
               "I/O Stream Utils",
-              "VMWare Driver",
+              "VMware Driver",
 
               "Event Loop", /* 40 */
               "Xen Light Driver",
diff --git a/src/util/virstoragefile.c b/src/util/virstoragefile.c
index 3e79ae1396..49b174588a 100644
--- a/src/util/virstoragefile.c
+++ b/src/util/virstoragefile.c
@@ -490,7 +490,7 @@ vmdk4GetBackingStore(char **res,
     *res = NULL;
     /*
      * Technically this should have been VMDK, since
-     * VMDK spec / VMWare impl only support VMDK backed
+     * VMDK spec / VMware impl only support VMDK backed
      * by VMDK. QEMU isn't following this though and
      * does probing on VMDK backing files, hence we set
      * AUTO
diff --git a/tools/virsh.c b/tools/virsh.c
index b96dbda59c..eb84dd06de 100644
--- a/tools/virsh.c
+++ b/tools/virsh.c
@@ -550,7 +550,7 @@ virshShowVersion(vshControl *ctl ATTRIBUTE_UNUSED)
     vshPrint(ctl, " OpenVZ");
 #endif
 #ifdef WITH_VMWARE
-    vshPrint(ctl, " VMWare");
+    vshPrint(ctl, " VMware");
 #endif
 #ifdef WITH_PHYP
     vshPrint(ctl, " PHYP");
-- 
2.39.5