Fix typos, change prefered to preferred

diff --git a/qa/workunits/ceph-disk/ceph-disk-no-lockbox b/qa/workunits/ceph-disk/ceph-disk-no-lockbox
index a9adc3195e5cad2053f5930a9adc45a4ea35cfd3..aa730200edca33d54acfd115182d043852f99b14 100755 (executable)
--- a/qa/workunits/ceph-disk/ceph-disk-no-lockbox
+++ b/qa/workunits/ceph-disk/ceph-disk-no-lockbox
@@ -395,7 +395,7 @@ def command(arguments, **kwargs):
     executable exists and raising a helpful error message
     if it does not.
 
-    .. note:: This should be the prefered way of calling ``subprocess.Popen``
+    .. note:: This should be the preferred way of calling ``subprocess.Popen``
     since it provides the caller with the safety net of making sure that
     executables *will* be found and will error nicely otherwise.
 
@@ -418,7 +418,7 @@ def command_check_call(arguments):
     Safely execute a ``subprocess.check_call`` call making sure that the
     executable exists and raising a helpful error message if it does not.
 
-    .. note:: This should be the prefered way of calling
+    .. note:: This should be the preferred way of calling
     ``subprocess.check_call`` since it provides the caller with the safety net
     of making sure that executables *will* be found and will error nicely
     otherwise.

diff --git a/qa/workunits/ceph-helpers.sh b/qa/workunits/ceph-helpers.sh
index 0eeb2406876dc7f8314dac0913dd680fc7290571..62428d221217345da8010300a0eb9ba5eb387a46 100755 (executable)
--- a/qa/workunits/ceph-helpers.sh
+++ b/qa/workunits/ceph-helpers.sh
@@ -1446,8 +1446,8 @@ function main() {
     shopt -s -o xtrace
     PS4='${BASH_SOURCE[0]}:$LINENO: ${FUNCNAME[0]}:  '
 
-    export PATH=${CEPH_BUILD_VIRTUALENV}/ceph-disk-virtualenv/bin:${CEPH_BUILD_VIRTUALENV}/ceph-detect-init-virtualenv/bin:.:$PATH # make sure program from sources are prefered
-    #export PATH=$CEPH_ROOT/src/ceph-disk/virtualenv/bin:$CEPH_ROOT/src/ceph-detect-init/virtualenv/bin:.:$PATH # make sure program from sources are prefered
+    export PATH=${CEPH_BUILD_VIRTUALENV}/ceph-disk-virtualenv/bin:${CEPH_BUILD_VIRTUALENV}/ceph-detect-init-virtualenv/bin:.:$PATH # make sure program from sources are preferred
+    #export PATH=$CEPH_ROOT/src/ceph-disk/virtualenv/bin:$CEPH_ROOT/src/ceph-detect-init/virtualenv/bin:.:$PATH # make sure program from sources are preferred
 
     export CEPH_CONF=/dev/null
     unset CEPH_ARGS
@@ -1469,8 +1469,8 @@ function run_tests() {
     shopt -s -o xtrace
     PS4='${BASH_SOURCE[0]}:$LINENO: ${FUNCNAME[0]}:  '
 
-    export PATH=${CEPH_BUILD_VIRTUALENV}/ceph-disk-virtualenv/bin:${CEPH_BUILD_VIRTUALENV}/ceph-detect-init-virtualenv/bin:.:$PATH # make sure program from sources are prefered
-    #export PATH=$CEPH_ROOT/src/ceph-disk/virtualenv/bin:$CEPH_ROOT/src/ceph-detect-init/virtualenv/bin:.:$PATH # make sure program from sources are prefered
+    export PATH=${CEPH_BUILD_VIRTUALENV}/ceph-disk-virtualenv/bin:${CEPH_BUILD_VIRTUALENV}/ceph-detect-init-virtualenv/bin:.:$PATH # make sure program from sources are preferred
+    #export PATH=$CEPH_ROOT/src/ceph-disk/virtualenv/bin:$CEPH_ROOT/src/ceph-detect-init/virtualenv/bin:.:$PATH # make sure program from sources are preferred
 
     export CEPH_MON="127.0.0.1:7109" # git grep '\<7109\>' : there must be only one
     export CEPH_ARGS

diff --git a/src/ceph-disk/ceph_disk/main.py b/src/ceph-disk/ceph_disk/main.py
index 45e9bb2163a37117278ddf4902d6eee0dae6efdb..777014f844482989d96ebc56916ddcdd7a683486 100755 (executable)
--- a/src/ceph-disk/ceph_disk/main.py
+++ b/src/ceph-disk/ceph_disk/main.py
@@ -406,7 +406,7 @@ def command(arguments, **kwargs):
     executable exists and raising a helpful error message
     if it does not.
 
-    .. note:: This should be the prefered way of calling ``subprocess.Popen``
+    .. note:: This should be the preferred way of calling ``subprocess.Popen``
     since it provides the caller with the safety net of making sure that
     executables *will* be found and will error nicely otherwise.
 
@@ -429,7 +429,7 @@ def command_check_call(arguments):
     Safely execute a ``subprocess.check_call`` call making sure that the
     executable exists and raising a helpful error message if it does not.
 
-    .. note:: This should be the prefered way of calling
+    .. note:: This should be the preferred way of calling
     ``subprocess.check_call`` since it provides the caller with the safety net
     of making sure that executables *will* be found and will error nicely
     otherwise.

diff --git a/src/ceph-disk/tests/ceph-disk.sh b/src/ceph-disk/tests/ceph-disk.sh
index 479e319b387f25468bc1698c4b532f34e21bd55f..b507a5930392800ee580c057fbd61d9a94f5dacd 100644 (file)
--- a/src/ceph-disk/tests/ceph-disk.sh
+++ b/src/ceph-disk/tests/ceph-disk.sh
@@ -35,7 +35,7 @@ function teardown_btrfs() {
 
 PS4='${BASH_SOURCE[0]}:$LINENO: ${FUNCNAME[0]}:  '
 
-export PATH=..:.:$PATH # make sure program from sources are prefered
+export PATH=..:.:$PATH # make sure program from sources are preferred
 export PATH=../ceph-detect-init/virtualenv/bin:$PATH
 export PATH=virtualenv/bin:$PATH
 DIR=test-ceph-disk