VFD SWMR: normalization with develop (#1472)

Much normalization with develop. Still needs tools changes wrt VFD plugins.

12 files changed, 35 insertions, 35 deletions

diff --git a/bin/bbrelease b/bin/bbrelease
index 388b9e4..a45be2e 100755
--- a/bin/bbrelease
+++ b/bin/bbrelease
@@ -48,7 +48,7 @@ USAGE()
 {
 cat << EOF
 Usage: $0 -d <dir> [--docver BRANCHNAME] [-h] [--nocheck] [--private] <methods> ...
-   -d DIR	The name of the directory where the releas(es) should be
+   -d DIR	The name of the directory where the release(s) should be
                 placed.
    --docver BRANCHNAME  This is added for 1.8 and beyond to get the correct
                         version of documentation files from the hdf5docs
@@ -103,7 +103,7 @@ EOF
 # Modifications
 #
 # Steps:
-# 1. untar the tarball in a temporay directory;
+# 1. untar the tarball in a temporary directory;
 #    Note: do this in a temporary directory to avoid changing
 #    the original source directory which maybe around.
 # 2. convert all its text files to DOS (LF-CR) style;
@@ -246,7 +246,7 @@ if [ "X$methods" = "X" ]; then
     methods="tar"
 fi
 
-# Create the temporay work directory.
+# Create the temporary work directory.
 if mkdir $tmpdir; then
     echo "temporary work directory for release.  "\
          "Can be deleted after release completes." > $tmpdir/README
@@ -320,9 +320,9 @@ ln -s `pwd` $tmpdir/$HDF5_IN_VERS || exit 1
 test -f Makefile && mv Makefile $tmpdir/Makefile.x
 cp -p Makefile.dist Makefile
 
-# Update README.txt and release_docs/RELEASE.txt with release information in
+# Update README.md and release_docs/RELEASE.txt with release information in
 # line 1.
-for f in README.txt release_docs/RELEASE.txt; do
+for f in README.md release_docs/RELEASE.txt; do
     echo "HDF5 version $VERS released on $release_date" >$f.x
     sed -e 1d $f >>$f.x
     mv $f.x $f
diff --git a/bin/buildhdf5 b/bin/buildhdf5
index 113a278..786c35d 100755
--- a/bin/buildhdf5
+++ b/bin/buildhdf5
@@ -178,7 +178,7 @@ LOCATE_SZLIB()
 	    esac
 	    ;;	# end of case ncsa
 	unknown)
-	    # Unknow domain. Give a shot at the some standard places.
+	    # Unknown domain. Give a shot at the some standard places.
 	    szlibpaths="/usr/local"
 	    ;;
     esac	# end of case $mydomain
diff --git a/bin/cmakehdf5 b/bin/cmakehdf5
index da1aef8..e59c772 100755
--- a/bin/cmakehdf5
+++ b/bin/cmakehdf5
@@ -199,7 +199,7 @@ DUMP_LOGFILE()
 # Show a start time stamp
 TIMESTAMP
 
-# Initialize njobs if $AMKE is defined
+# Initialize njobs if $MAKE is defined
 if [ -n "$MAKE" ]; then
     # assume all arguments are for --jobs
     njobs=`echo $MAKE | cut -s -d' ' -f2-`
@@ -365,7 +365,7 @@ STEP "Test the library and tools..." "ctest . -C Release $njobs" $testlog
 #      7. Create an install image with this command:
 STEP "Create an install image..." "cpack -C Release CPackConfig.cmake" $packlog
 
-# The implementation of installation is imcomplete (only works for linux).
+# The implementation of installation is incomplete (only works for linux).
 # Screen it out for now till it is completed.
 if false; then
 #      8. Install with this command:
diff --git a/bin/genparser b/bin/genparser
index 462c2c2..9ea3152 100755
--- a/bin/genparser
+++ b/bin/genparser
@@ -27,7 +27,7 @@
 # IMPORTANT OS X NOTE
 #
 # If you are using OS X, you will probably not have flex or bison
-# installed. In addtion, even if you do have bison installed, the bison
+# installed. In addition, even if you do have bison installed, the bison
 # version you have installed may also have a bug that makes it unable to
 # process our input files.
 #
diff --git a/bin/h5cc.in b/bin/h5cc.in
index 6024b4d..6835b79 100644
--- a/bin/h5cc.in
+++ b/bin/h5cc.in
@@ -40,7 +40,7 @@ HL="@HL@"
 ##    $CLINKER $H5BLD_CPPFLAGS $CPPFLAGS $H5BLD_CFLAGS $CFLAGS $LDFLAGS   ##
 ##    $LIBS $clibpath $link_objs $link_args $shared_link                  ##
 ##                                                                        ##
-## These settings can be overriden by setting HDF5_CFLAGS,                ##
+## These settings can be overridden by setting HDF5_CFLAGS,                ##
 ## HDF5_CPPFLAGS, HDF5_LDFLAGS, or HDF5_LIBS in the environment.          ##
 ##                                                                        ##
 ############################################################################
@@ -144,7 +144,7 @@ usage() {
   echo "                                           shared libraries]"
   echo " "
   echo " You can also add or change paths and flags to the compile line using"
-  echo " the following environment varibles or by assigning them to their counterparts"
+  echo " the following environment variables or by assigning them to their counterparts"
   echo " in the 'Things You Can Modify to Override...'" section of $prog_name
   echo " "
   echo "  Variable              Current value to be replaced"
@@ -318,7 +318,7 @@ fi
 
 if test "x$do_link" = "xyes"; then
   shared_link=""
-# conditionnaly link with the hl library
+# conditionally link with the hl library
   if test "X$HL" = "Xhl"; then
    libraries=" $libraries -lhdf5_hl -lhdf5 "
   else
diff --git a/bin/h5vers b/bin/h5vers
index 8f75df1..04d5d03 100755
--- a/bin/h5vers
+++ b/bin/h5vers
@@ -66,7 +66,7 @@ use strict;
 # ./H5public.h or ./src/H5public.h.
 #
 # If the version number is changed (either `-s' or `-i' was used on
-# the command line) then the first line of the README.txt and RELEASE.txt files
+# the command line) then the version line of the README.md and RELEASE.txt files
 # one directory above the H5public.h file is also modified so it looks
 # something like: This is hdf5-1.2.3-pre1 currently under development.
 # The AC_INIT macro in configure.ac will also change in this case to be
@@ -156,10 +156,10 @@ while ($_ = shift) {
 }
 die "mutually exclusive options given\n" if $set && $inc;
 
-# Determine file to use as H5public.h, README.txt,
+# Determine file to use as H5public.h, README.md,
 # release_docs/RELEASE.txt, configure.ac, windows/src/H5pubconf.h
 # config/lt_vers.am and config/cmake/scripts/HDF5config.cmake. 
-# The README.txt, release_docs/RELEASE.txt, configure.ac, 
+# The README.md, release_docs/RELEASE.txt, configure.ac, 
 # windows/src/H5pubconf.h, config/lt_vers.am and
 # config/cmake/scripts/HDF5config.cmake
 # files are always in the directory above H5public.h
@@ -178,9 +178,9 @@ die "unable to read file: $LT_VERS\n" unless -r $file;
 my $HDF5CONFIGCMAKE = $file;
 $HDF5CONFIGCMAKE =~ s/[^\/]*$/..\/config\/cmake\/scripts\/HDF5config.cmake/;
 die "unable to read file: $HDF5CONFIGCMAKE\n" unless -r $file;
-# README.txt
+# README.md
 my $README = $file;
-$README =~ s/[^\/]*$/..\/README.txt/;
+$README =~ s/[^\/]*$/..\/README.md/;
 die "unable to read file: $README\n" unless -r $file;
 # release_docs/RELEASE.txt
 my $RELEASE = $file;
@@ -303,7 +303,7 @@ if ($LT_VERS && $version_increased) {
 #  close FILE;
 }
 
-# Update the README.txt file
+# Update the README.md file
 if ($README) {
   open FILE, $README or die "$README: $!\n";
   my @contents = <FILE>;
diff --git a/bin/newer b/bin/newer
index e60ec45..5f0fdca 100755
--- a/bin/newer
+++ b/bin/newer
@@ -19,7 +19,7 @@
 # Created Date: 2005/07/06
 # Modification:
 #    Albert Cheng 2005/8/30
-#    Changed from two arguments to mulitple arguments.
+#    Changed from two arguments to multiple arguments.
 
 if test $# -lt 2; then
     exit 1
diff --git a/bin/release b/bin/release
index 8774851..e71a38e 100755
--- a/bin/release
+++ b/bin/release
@@ -39,7 +39,7 @@ USAGE()
 {
 cat << EOF
 Usage: $0 -d <dir> [--docver BRANCHNAME] [-h] [--nocheck] [--private] <methods> ...
-   -d DIR   The name of the directory where the releas(es) should be
+   -d DIR   The name of the directory where the release(es) should be
                 placed.
    --docver BRANCHNAME  This is added for 1.8 and beyond to get the correct
                         version of documentation files from the hdf5docs
@@ -60,7 +60,7 @@ for compressing the resulting tar archive (if none are given then
     cmake-tgz   -- create a tar file using the gzip default level with a build-unix.sh
                    command file and all other CMake files needed to build HDF5 source
                    using CMake on unix machines.
-    cmake-zip   -- convert all text files to DOS style and create a zip file inluding cmake
+    cmake-zip   -- convert all text files to DOS style and create a zip file including cmake
                    scripts and .bat files to build HDF5 source using CMake on Windows.
     hpc-cmake-tgz
                 -- create a tar file using the gzip default level with a build-unix.sh
@@ -512,7 +512,7 @@ if [ "X$methods" = "X" ]; then
     methods="tar"
 fi
 
-# Create the temporay work directory.
+# Create the temporary work directory.
 if mkdir $tmpdir; then
     echo "temporary work directory for release.  "\
          "Can be deleted after release completes." > $tmpdir/README
@@ -572,9 +572,9 @@ ln -s `pwd` $tmpdir/$HDF5_VERS || exit 1
 test -f Makefile && mv Makefile $tmpdir/Makefile.x
 cp -p Makefile.dist Makefile
 
-# Update README.txt and release_docs/RELEASE.txt with release information in
+# Update README.md and release_docs/RELEASE.txt with release information in
 # line 1.
-for f in README.txt release_docs/RELEASE.txt; do
+for f in README.md release_docs/RELEASE.txt; do
     echo "HDF5 version $VERS released on $release_date" >$f.x
     sed -e 1d $f >>$f.x
     mv $f.x $f
diff --git a/bin/runtest b/bin/runtest
index 50acb76..5e05abb 100755
--- a/bin/runtest
+++ b/bin/runtest
@@ -630,7 +630,7 @@ while [ $# -gt 0 ]; do
 	    # setup the directory structure for snapshot test.
 	    CMD=setup
 	    ;;
-	-*) # Unknow option
+	-*) # Unknown option
 	    PRINT "Unknown option ($1)"
 	    USAGE
 	    exit 1
@@ -830,7 +830,7 @@ if [ -z "$NOCVS" ]; then
 else
     # make sure the cvs update, if done by another host, has completed.
     # First wait for the presence of $CVSLOG which signals some host
-    # has started the cvs update.  Then wait for the absense of $CVSLOG_LOCK
+    # has started the cvs update.  Then wait for the absence of $CVSLOG_LOCK
     # which signals the host has completed the cvs update.
     WAITFOR $CVSLOG 90
     if [ $WAIT_STATUS -ne 0 ]; then
@@ -911,7 +911,7 @@ if [ -n "$TESTHOST" -a $HOSTNAME != "$TESTHOST" ]; then
 		PRINT $h is not reachable  "(`date`)"
 		;;
 	    *)
-		PRINT "CHECK_RSH for $h returned unknow result ($RSH)"
+		PRINT "CHECK_RSH for $h returned unknown result ($RSH)"
 		;;
 	esac >> $TMP_OUTPUT 2>&1
     done
diff --git a/bin/snapshot b/bin/snapshot
index 20c73cd..7fcf3ab 100755
--- a/bin/snapshot
+++ b/bin/snapshot
@@ -156,7 +156,7 @@ Usage: $PROGNAME [all] [checkout] [ftp <URL> [diff] [test] [srcdir] [release] [h
               "snapshot srcdir" is equivalent to "snapshot srcdir all"
               "snapshot srcdir checkout" is equivalent to "snapshot checkout"
     srcdirname <dir>:
-              Use <dir> as the srcdir testing directory if srcdir is choosen.
+              Use <dir> as the srcdir testing directory if srcdir is chosen.
               If <dir> starts with '-', it is append to the default name
               E.g., "snapshot srcdir srcdirname -xx" uses hostname-xx
               [Default is hostname]
@@ -422,7 +422,7 @@ while [ $# -gt 0 ] ; do
 	    fi
 	    cmd=""
             EXEC_CMD_ARG="$@"
-	    # exit the parsing while loop since all arguments have been consummed.
+	    # exit the parsing while loop since all arguments have been consumed.
 	    break
             ;;
 	check-vfd)
@@ -455,7 +455,7 @@ while [ $# -gt 0 ] ; do
 	    OP_CONFIGURE="$OP_CONFIGURE $1"
 	    ;;
 	*)
-	    echo "Unkown option $1"
+	    echo "Unknown option $1"
 	    errcode=1
 	    cmd="help"
 	    break
@@ -623,7 +623,7 @@ if [ "$cmd" = "all" -o -n "$cmdtest" -o -n "$cmddiff" ]; then
 	fi
     fi
 
-    # if diff is choosen, exit 0 if no significant differences are found.
+    # if diff is chosen, exit 0 if no significant differences are found.
     # otherwise, exit 1.  This includes cases of other failures.
     if [ -n "$cmddiff" ]; then
 	if [ $snapshot = no ]; then
@@ -799,7 +799,7 @@ if [ "$cmd" = "all" -o -n "$cmdrel" ]; then
     # Replace the previous version with the current version.
     # Should check if the errcode of the release process but there
     # are other failures after release was done (e.g. h5vers or git failures)
-    # that should allow the replacement to occure.
+    # that should allow the replacement to occur.
     rm -rf ${PREVIOUS}
     mv ${CURRENT} ${PREVIOUS}
 fi #Release snapshot
diff --git a/bin/trace b/bin/trace
index 7afc3e7..169719c 100755
--- a/bin/trace
+++ b/bin/trace
@@ -381,9 +381,9 @@ sub rewrite_func ($$$$$) {
 
       # Wrap lines that will be longer than the limit
       if ($len_if_added > $max_trace_macro_line_len) {
-        # Wrap line, with indention
+        # Wrap line, with indentation
         $trace .= ",\n             ";
-        $len = 13;              # Set to 13, for indention
+        $len = 13;              # Set to 13, for indentation
 
         # Indent an extra space to account for extra digit in 'H5TRACE' macro
         if (scalar(@arg_str) >= 10) {
diff --git a/bin/warnhist b/bin/warnhist
index 742a6b5..0150138 100755
--- a/bin/warnhist
+++ b/bin/warnhist
@@ -78,7 +78,7 @@ sub do_help {
     print "\t-S <file string list>\tDisplay warnings for files which contain a string, <file string list>\n";
     print "\t\t<file string list> is a comma separated list, with no spaces\n";
     print "\t\tFor example: 'H5Fint' or 'H5Fint,H5Gnode'\n";
-    print "\t-l\tDisplay line nunbers for file/warning\n";
+    print "\t-l\tDisplay line numbers for file/warning\n";
     print "\t-u\tLeave 'unique' types in warnings, instead of genericizing them\n";
     print "\t-i <name list>\tIgnore named files, <name list>\n";
     print "\t\t<name list> is a comma separated list, with no spaces\n";