[Ovirt-devel] [PATCH node] Updating menu labels

[Christopher Curran]

Christopher Curran wrote:
> Can we use the word 'stand-alone' over 'standalone'. I know google 
> will disagree with me but style guides and dictionaries support the 
> stand-alone spelling. This is mainly to make my life easier by 
> sticking to one consistent style. Here is a patch to fix it.
>
>
Stupid email clients... This one should work

---
 ovirt-node.spec.in         |    2 +-
 scripts/ovirt-config-setup |    4 ++--
 scripts/ovirt-early        |    2 +-
 scripts/ovirt-firstboot    |    2 +-
 scripts/ovirt-functions    |    6 +++---
 5 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/ovirt-node.spec.in b/ovirt-node.spec.in
index 8133076..668d86e 100644
--- a/ovirt-node.spec.in
+++ b/ovirt-node.spec.in
@@ -281,7 +281,7 @@ fi
 * Thu Dec 11 2008 Perry Myers <pmyers at redhat.com> - 0.96
 - Subpackage stateful/stateless to separate out functionality for
   embedded Node and Node running as part of already installed OS
-- ovirt-config-* setup scripts for standalone mode
+- ovirt-config-* setup scripts for stand-alone mode
 
 * Thu Sep 11 2008 Chris Lalancette <clalance at redhat.com> - 0.92 0.7
 - Add the ovirt-install- and ovirt-uninstall-node scripts, and refactor
diff --git a/scripts/ovirt-config-setup b/scripts/ovirt-config-setup
index 20dd5ae..a9d7893 100755
--- a/scripts/ovirt-config-setup
+++ b/scripts/ovirt-config-setup
@@ -1,6 +1,6 @@
 #!/bin/bash
 #
-# Entry point for configuring an oVirt node when running in standalone 
mode.
+# Entry point for configuring an oVirt node when running in stand-alone 
mode.
 
 NETWORK="Networking Setup"
 STORAGE="Disk Partitioning"
@@ -22,7 +22,7 @@ reset > /dev/null
 clear
 
 while true; do
-    printf "\n oVirt Node Standalone Configuration\n\n"
+    printf "\n oVirt Node stand-alone mode configuration menu\n\n"
 
     PS3="Please select an option: "
 
diff --git a/scripts/ovirt-early b/scripts/ovirt-early
index 8bf8928..21f98a4 100755
--- a/scripts/ovirt-early
+++ b/scripts/ovirt-early
@@ -166,7 +166,7 @@ start() {
     local_boot=0
 
     #   ovirt_standalone
-    # force oVirt Node standalone mode
+    # force oVirt Node stand-alone mode
     standalone=0
 
     #   pxelinux format: ip=<client-ip>:<boot-server-ip>:<gw-ip>:<netmask>
diff --git a/scripts/ovirt-firstboot b/scripts/ovirt-firstboot
index da03b98..509ed08 100755
--- a/scripts/ovirt-firstboot
+++ b/scripts/ovirt-firstboot
@@ -60,7 +60,7 @@ start ()
     fi
     disable_firstboot
 
-    # persist config for standalone
+    # persist config for stand-alone mode
     ovirt_store_config \
         /etc/sysconfig/network-scripts/ifcfg-* \
         /etc/rsyslog.conf \
diff --git a/scripts/ovirt-functions b/scripts/ovirt-functions
index e20bab9..1f440c4 100644
--- a/scripts/ovirt-functions
+++ b/scripts/ovirt-functions
@@ -14,13 +14,13 @@ OVIRT_STANDALONE=${OVIRT_STANDALONE:-0}
 
 OVIRT_BACKUP_DIR=/var/lib/ovirt-backup
 
-# return 1 if oVirt Node is running in standalone mode
+# return 1 if oVirt Node is running in stand-alone mode
 # return 0 if oVirt Node is managed by the oVirt Server
 is_managed() {
     return $OVIRT_STANDALONE
 }
 
-# oVirt Node in standalone mode does not try to contact the oVirt Server
+# oVirt Node in stand-alone mode does not try to contact the oVirt Server
 is_standalone() {
     if is_managed; then return 1; else return 0; fi
 }
@@ -58,7 +58,7 @@ is_firstboot() {
 # if [ -n "$SRV_HOST" -a -n "$SRV_PORT" ]; then
 #   echo "oVirt Server found"
 # else
-#   echo "no oVirt Server available, running standalone"
+#   echo "no oVirt Server available, running in stand-alone mode"
 # fi
 find_srv()
 {
-- 
1.6.0.6