diff -r 85ef9b73028a -r 129b16fdb811 openpkg/openpkg.boot
--- a/openpkg/openpkg.boot	Thu Aug 02 01:32:22 2012 +0200
+++ b/openpkg/openpkg.boot	Thu Aug 02 01:36:44 2012 +0200
@@ -32,7 +32,7 @@
 #   Also keep in mind that lots of tricks are played here in order to
 #   perform all the steps without having to touch the real installation
 #   location. That is the whole procedure can (and should) be performed
-#   by a non-privileged user and no access to the real installation
+#   by a nonprivileged user and no access to the real installation
 #   location filesystem location.
 
 me="openpkg.boot"
@@ -257,7 +257,7 @@
 sh ./etc.prereq.sh source || exit $?
 
 ##
-##  find reasonable run-time paths and tools
+##  find reasonable runtime paths and tools
 ##
 
 #   find reasonable temporary directory
@@ -343,7 +343,7 @@
 ) | sed -e 's;%{\([^}]*\)};${\1};g' >$prolog
 
 #   install package via RPM spec file by faking a
-#   sufficiently enough RPM run-time environment
+#   sufficiently enough RPM runtime environment
 runscript () {
     step=$1
     script="$tmpdir/openpkg.boot.$step.sh"
@@ -361,7 +361,7 @@
     sh $script
     if [ $? -ne 0 ]; then
         rm -f $script
-        echo "$0:ERROR: script returned non-null value"
+        echo "$0:ERROR: script returned nonnull value"
         exit 1
     fi
     rm -f $script
@@ -478,11 +478,11 @@
     --build --quiet
 
 ##
-##   now turn over and re-iterate over the RPM spec, but this time
+##   now turn over and reiterate over the RPM spec, but this time
 ##   with the real RPM tool.
 ##
 
-echo "++ re-iterating over RPM specification procedures"
+echo "++ reiterating over RPM specification procedures"
 $tmpdir/rpm -bb $spec
 
 ##
@@ -494,7 +494,7 @@
 ##   would create an incorrect filelist for "rpm" in the database.
 ##   Instead we use the --justdb option which means "rpm" behaves as it
 ##   would install into the real location, but does not actually install
-##   anything. But as a side-effect, the database is now correct.
+##   anything. But as a side effect, the database is now correct.
 ##
 
 echo "++ overwriting RPM installation by installing via RPM itself"
@@ -518,18 +518,18 @@
    pkgdir=..
 fi
 
-#   create Source-RPM file
+#   create Source RPM file
 echo "++ creating bootstrap source RPM file"
 $tmpdir/rpm -bs --nodeps --define "_srcrpmdir $pkgdir" $spec
 
-#   create Binary-RPM file
+#   create Binary RPM file
 #   (notice that there might be a discrepancy in the platform
 #   identification, so we have to copy the source via wildcard)
 echo "++ creating bootstrap binary RPM file"
 cp $RPM_BUILD_ROOT$prefix/RPM/PKG/openpkg-*.rpm $pkgdir/openpkg-$v.$t.rpm
 rm -f $RPM_BUILD_ROOT$prefix/RPM/PKG/openpkg-*.rpm
 
-#   create Binary-Bootstrap file
+#   create binary bootstrap file
 echo "++ creating bootstrap binary shell script"
 files=`cat $spec |\
        sed -e '1,/%files/d' -e '/%clean/,$d' |\