network: match xml warning message

I noticed that /var/lib/libvirt/dnsmasq/*.conf used the wrong word;
it was intended to match the wording in src/util/xml.c.

* src/network/bridge_driver.c (networkDnsmasqConfContents): Fix typo.
* tests/networkxml2confdata/*.conf: Update accordingly.

diff --git a/src/network/bridge_driver.c b/src/network/bridge_driver.c
index 3dd98ad5f600b83595ee1c566d1868dd505dece7..4e1958d0fd5e305b7ed7d5ecf711e9228f25da6c 100644 (file)
--- a/src/network/bridge_driver.c
+++ b/src/network/bridge_driver.c
@@ -669,7 +669,7 @@ networkDnsmasqConfContents(virNetworkObjPtr network,
                               "##OVERWRITTEN AND LOST.  Changes to this "
                               "configuration should be made using:\n"
                               "##    virsh net-edit %s\n"
-                              "## of other applications using the libvirt API.\n"
+                              "## or other application using the libvirt API.\n"
                               "##\n## dnsmasq conf file created by libvirt\n"
                               "strict-order\n"
                               "domain-needed\n",

diff --git a/tests/networkxml2confdata/dhcp6-nat-network.conf b/tests/networkxml2confdata/dhcp6-nat-network.conf
index 3fa358a75fcb7937668c3d59b8a2b2bd9d276399..d4889007a8bf54c01fde3234ced11579618d40fa 100644 (file)
--- a/tests/networkxml2confdata/dhcp6-nat-network.conf
+++ b/tests/networkxml2confdata/dhcp6-nat-network.conf
@@ -1,7 +1,7 @@
 ##WARNING:  THIS IS AN AUTO-GENERATED FILE. CHANGES TO IT ARE LIKELY TO BE
 ##OVERWRITTEN AND LOST.  Changes to this configuration should be made using:
 ##    virsh net-edit default
-## of other applications using the libvirt API.
+## or other application using the libvirt API.
 ##
 ## dnsmasq conf file created by libvirt
 strict-order

diff --git a/tests/networkxml2confdata/dhcp6-network.conf b/tests/networkxml2confdata/dhcp6-network.conf
index e3b2f8c9bcea98a52a534c854be5a6e3c6781027..5c1030c708ac70fb1e8e33838339bca0bb141017 100644 (file)
--- a/tests/networkxml2confdata/dhcp6-network.conf
+++ b/tests/networkxml2confdata/dhcp6-network.conf
@@ -1,7 +1,7 @@
 ##WARNING:  THIS IS AN AUTO-GENERATED FILE. CHANGES TO IT ARE LIKELY TO BE
 ##OVERWRITTEN AND LOST.  Changes to this configuration should be made using:
 ##    virsh net-edit default
-## of other applications using the libvirt API.
+## or other application using the libvirt API.
 ##
 ## dnsmasq conf file created by libvirt
 strict-order

diff --git a/tests/networkxml2confdata/dhcp6host-routed-network.conf b/tests/networkxml2confdata/dhcp6host-routed-network.conf
index 4702cea5edef381292aee7c801784e56bec9693d..cb4d0cc41dc815192713502d3e96fe8989eb35e2 100644 (file)
--- a/tests/networkxml2confdata/dhcp6host-routed-network.conf
+++ b/tests/networkxml2confdata/dhcp6host-routed-network.conf
@@ -1,7 +1,7 @@
 ##WARNING:  THIS IS AN AUTO-GENERATED FILE. CHANGES TO IT ARE LIKELY TO BE
 ##OVERWRITTEN AND LOST.  Changes to this configuration should be made using:
 ##    virsh net-edit local
-## of other applications using the libvirt API.
+## or other application using the libvirt API.
 ##
 ## dnsmasq conf file created by libvirt
 strict-order

diff --git a/tests/networkxml2confdata/isolated-network.conf b/tests/networkxml2confdata/isolated-network.conf
index 6e4b2691a2bd487f205672d5a090fe39ab77107c..55a44d32a4743f9367a0084e02742b05f2ca2a63 100644 (file)
--- a/tests/networkxml2confdata/isolated-network.conf
+++ b/tests/networkxml2confdata/isolated-network.conf
@@ -1,7 +1,7 @@
 ##WARNING:  THIS IS AN AUTO-GENERATED FILE. CHANGES TO IT ARE LIKELY TO BE
 ##OVERWRITTEN AND LOST.  Changes to this configuration should be made using:
 ##    virsh net-edit private
-## of other applications using the libvirt API.
+## or other application using the libvirt API.
 ##
 ## dnsmasq conf file created by libvirt
 strict-order

diff --git a/tests/networkxml2confdata/nat-network-dns-hosts.conf b/tests/networkxml2confdata/nat-network-dns-hosts.conf
index c50acd21e4c0ae5a47769bdf2dede63eaed154e1..ae8f8c5abbfe963481b84f42e02b34749f408c3b 100644 (file)
--- a/tests/networkxml2confdata/nat-network-dns-hosts.conf
+++ b/tests/networkxml2confdata/nat-network-dns-hosts.conf
@@ -1,7 +1,7 @@
 ##WARNING:  THIS IS AN AUTO-GENERATED FILE. CHANGES TO IT ARE LIKELY TO BE
 ##OVERWRITTEN AND LOST.  Changes to this configuration should be made using:
 ##    virsh net-edit default
-## of other applications using the libvirt API.
+## or other application using the libvirt API.
 ##
 ## dnsmasq conf file created by libvirt
 strict-order

diff --git a/tests/networkxml2confdata/nat-network-dns-srv-record-minimal.conf b/tests/networkxml2confdata/nat-network-dns-srv-record-minimal.conf
index 25af9c624d1509db05d1c3d3ad83217c0653b58f..faa36e697d13949d39209d28fccaa583da16a87c 100644 (file)
--- a/tests/networkxml2confdata/nat-network-dns-srv-record-minimal.conf
+++ b/tests/networkxml2confdata/nat-network-dns-srv-record-minimal.conf
@@ -1,7 +1,7 @@
 ##WARNING:  THIS IS AN AUTO-GENERATED FILE. CHANGES TO IT ARE LIKELY TO BE
 ##OVERWRITTEN AND LOST.  Changes to this configuration should be made using:
 ##    virsh net-edit default
-## of other applications using the libvirt API.
+## or other application using the libvirt API.
 ##
 ## dnsmasq conf file created by libvirt
 strict-order

diff --git a/tests/networkxml2confdata/nat-network-dns-srv-record.conf b/tests/networkxml2confdata/nat-network-dns-srv-record.conf
index 777f03d88080f5c7e33bebd9ca42b7095ee7f6f4..60799121fed43301188f440f25339c7a127f5613 100644 (file)
--- a/tests/networkxml2confdata/nat-network-dns-srv-record.conf
+++ b/tests/networkxml2confdata/nat-network-dns-srv-record.conf
@@ -1,7 +1,7 @@
 ##WARNING:  THIS IS AN AUTO-GENERATED FILE. CHANGES TO IT ARE LIKELY TO BE
 ##OVERWRITTEN AND LOST.  Changes to this configuration should be made using:
 ##    virsh net-edit default
-## of other applications using the libvirt API.
+## or other application using the libvirt API.
 ##
 ## dnsmasq conf file created by libvirt
 strict-order

diff --git a/tests/networkxml2confdata/nat-network-dns-txt-record.conf b/tests/networkxml2confdata/nat-network-dns-txt-record.conf
index 75ed546ef6724fa92165d1f96a1933d8bf4fb391..c448bdc1bcd30a154871b297c777b3b11d92dbd9 100644 (file)
--- a/tests/networkxml2confdata/nat-network-dns-txt-record.conf
+++ b/tests/networkxml2confdata/nat-network-dns-txt-record.conf
@@ -1,7 +1,7 @@
 ##WARNING:  THIS IS AN AUTO-GENERATED FILE. CHANGES TO IT ARE LIKELY TO BE
 ##OVERWRITTEN AND LOST.  Changes to this configuration should be made using:
 ##    virsh net-edit default
-## of other applications using the libvirt API.
+## or other application using the libvirt API.
 ##
 ## dnsmasq conf file created by libvirt
 strict-order

diff --git a/tests/networkxml2confdata/nat-network.conf b/tests/networkxml2confdata/nat-network.conf
index f07456fc345a0faee1f310d4c59c63babe57d63a..8f28fef0791adb4bc59119599ad08648584d0e84 100644 (file)
--- a/tests/networkxml2confdata/nat-network.conf
+++ b/tests/networkxml2confdata/nat-network.conf
@@ -1,7 +1,7 @@
 ##WARNING:  THIS IS AN AUTO-GENERATED FILE. CHANGES TO IT ARE LIKELY TO BE
 ##OVERWRITTEN AND LOST.  Changes to this configuration should be made using:
 ##    virsh net-edit default
-## of other applications using the libvirt API.
+## or other application using the libvirt API.
 ##
 ## dnsmasq conf file created by libvirt
 strict-order

diff --git a/tests/networkxml2confdata/netboot-network.conf b/tests/networkxml2confdata/netboot-network.conf
index bda7e2d5cd990c35068904fcdea33268aa77f521..83dd2b3eb3323aab502cf6a371e9c60d8aeef583 100644 (file)
--- a/tests/networkxml2confdata/netboot-network.conf
+++ b/tests/networkxml2confdata/netboot-network.conf
@@ -1,7 +1,7 @@
 ##WARNING:  THIS IS AN AUTO-GENERATED FILE. CHANGES TO IT ARE LIKELY TO BE
 ##OVERWRITTEN AND LOST.  Changes to this configuration should be made using:
 ##    virsh net-edit netboot
-## of other applications using the libvirt API.
+## or other application using the libvirt API.
 ##
 ## dnsmasq conf file created by libvirt
 strict-order

diff --git a/tests/networkxml2confdata/netboot-proxy-network.conf b/tests/networkxml2confdata/netboot-proxy-network.conf
index 42b8dfaed96caf6917de77aa171b25b625f21313..b266d81ab8aaea3404f050f7166702f9862d63b0 100644 (file)
--- a/tests/networkxml2confdata/netboot-proxy-network.conf
+++ b/tests/networkxml2confdata/netboot-proxy-network.conf
@@ -1,7 +1,7 @@
 ##WARNING:  THIS IS AN AUTO-GENERATED FILE. CHANGES TO IT ARE LIKELY TO BE
 ##OVERWRITTEN AND LOST.  Changes to this configuration should be made using:
 ##    virsh net-edit netboot
-## of other applications using the libvirt API.
+## or other application using the libvirt API.
 ##
 ## dnsmasq conf file created by libvirt
 strict-order

diff --git a/tests/networkxml2confdata/routed-network.conf b/tests/networkxml2confdata/routed-network.conf
index f5f968002780dd66f118cb5f34a17e58da1b065b..dc53a4e1c8c308d077fb35102af9a8057de22952 100644 (file)
--- a/tests/networkxml2confdata/routed-network.conf
+++ b/tests/networkxml2confdata/routed-network.conf
@@ -1,7 +1,7 @@
 ##WARNING:  THIS IS AN AUTO-GENERATED FILE. CHANGES TO IT ARE LIKELY TO BE
 ##OVERWRITTEN AND LOST.  Changes to this configuration should be made using:
 ##    virsh net-edit local
-## of other applications using the libvirt API.
+## or other application using the libvirt API.
 ##
 ## dnsmasq conf file created by libvirt
 strict-order