Fix several spelling/grammar issues (#3621) (#3632)

67 files changed, 102 insertions, 102 deletions

diff --git a/CMakeInstallation.cmake b/CMakeInstallation.cmake
index 51c9c83..d42142a 100644
--- a/CMakeInstallation.cmake
+++ b/CMakeInstallation.cmake
@@ -335,7 +335,7 @@ if (NOT HDF5_EXTERNALLY_CONFIGURED AND NOT HDF5_NO_PACKAGES)
       set (CPACK_NSIS_INSTALL_ROOT "$PROGRAMFILES")
       set (CPACK_PACKAGE_INSTALL_REGISTRY_KEY "${CPACK_PACKAGE_NAME}-${CPACK_PACKAGE_VERSION}")
     endif ()
-    # set the install/unistall icon used for the installer itself
+    # set the install/uninstall icon used for the installer itself
     # There is a bug in NSI that does not handle full unix paths properly.
     set (CPACK_NSIS_MUI_ICON "${HDF_RESOURCES_DIR}\\\\hdf.ico")
     set (CPACK_NSIS_MUI_UNIICON "${HDF_RESOURCES_DIR}\\\\hdf.ico")
diff --git a/config/cmake/UseJava.cmake b/config/cmake/UseJava.cmake
index 1de08db..2783cb6 100644
--- a/config/cmake/UseJava.cmake
+++ b/config/cmake/UseJava.cmake
@@ -1474,7 +1474,7 @@ function (create_javah)
       "CLASSES;CLASSPATH;DEPENDS"
       ${ARGN})
 
-    # ckeck parameters
+    # check parameters
     if (NOT _create_javah_TARGET AND NOT _create_javah_GENERATED_FILES)
       message (FATAL_ERROR "create_javah: TARGET or GENERATED_FILES must be specified.")
     endif()
diff --git a/doc/getting-started-with-hdf5-development.md b/doc/getting-started-with-hdf5-development.md
index 3754df7..b6771dc 100644
--- a/doc/getting-started-with-hdf5-development.md
+++ b/doc/getting-started-with-hdf5-development.md
@@ -496,7 +496,7 @@ files at configure time by the `bin/make_err` script. The original intent was fo
 codes to be strongly associated. i.e., a given minor code would *only* be used
 with its associated major code. Unfortunately, this has not been the case in
 practice, and the emitted text can appear nonsensical in error
-stack dumps. Even worse, the major and minor error codes are used inconsitently
+stack dumps. Even worse, the major and minor error codes are used inconsistently
 throughout the library, making interpreting them almost impossible for
 external users. We hope to address this deficiency in the near future.
 
@@ -556,7 +556,7 @@ configure/CMake options, but it's normally easier to use external tools like
 valgrind or the compiler's memory debugging options.
 
 `H5FL` provides memory pools (*Free Lists*) that create a set of fixed-size allocations
-of a certain type that the library will re-use as needed. They use `H5MM` calls
+of a certain type that the library will reuse as needed. They use `H5MM` calls
 under the hood and can be useful when the library creates and frees a lot of
 objects of that type. It's difficult to give a good guideline as to when to use
 the `H5FL` calls and when to use the `H5MM` calls, but it's probably best to
diff --git a/doxygen/examples/H5.format.1.0.html b/doxygen/examples/H5.format.1.0.html
index 26d0421..5002695 100644
--- a/doxygen/examples/H5.format.1.0.html
+++ b/doxygen/examples/H5.format.1.0.html
@@ -2020,7 +2020,7 @@ Elena>               "Free-space object"
 	<dl>
 	  <dt>Mesh Type: (unsigned 32-bit integer)
 	  <dd>This value indicates whether the grid is
-	    polar/spherical/cartesion,
+	    polar/spherical/cartesian,
 	    structured/unstructured and regular/irregular. <br>
 	    The mesh type value is broken up as follows: <br>
 
diff --git a/doxygen/examples/H5.format.1.1.html b/doxygen/examples/H5.format.1.1.html
index 3af50d6..f5e4c4e 100644
--- a/doxygen/examples/H5.format.1.1.html
+++ b/doxygen/examples/H5.format.1.1.html
@@ -2596,7 +2596,7 @@ TABLE.list TD { border:none; }
 	<dl>
 	  <dt>Mesh Type: (unsigned 32-bit integer)
 	  <dd>This value indicates whether the grid is
-	    polar/spherical/cartesion,
+	    polar/spherical/cartesian,
 	    structured/unstructured and regular/irregular. <br>
 	    The mesh type value is broken up as follows: <br>
 
diff --git a/doxygen/examples/H5.format.2.0.html b/doxygen/examples/H5.format.2.0.html
index d2979e1..bde030f 100644
--- a/doxygen/examples/H5.format.2.0.html
+++ b/doxygen/examples/H5.format.2.0.html
@@ -8458,7 +8458,7 @@ The range of values represented by child[
     <dl>
       <dt>Mesh Type: (unsigned 32-bit integer)
       <dd>This value indicates whether the grid is
-        polar/spherical/cartesion,
+        polar/spherical/cartesian,
         structured/unstructured and regular/irregular. <br />
         The mesh type value is broken up as follows: <br />
 
diff --git a/doxygen/examples/H5.format.html b/doxygen/examples/H5.format.html
index c52e8ea..832e3fc 100644
--- a/doxygen/examples/H5.format.html
+++ b/doxygen/examples/H5.format.html
@@ -9123,7 +9123,7 @@ is located within.
 	  <dl>
 	    <dt>Mesh Type: (unsigned 32-bit integer)
 	      <dd>This value indicates whether the grid is
-	        polar/spherical/cartesion,
+	        polar/spherical/cartesian,
 	        structured/unstructured and regular/irregular. <br />
 	        The mesh type value is broken up as follows: <br />
 
diff --git a/fortran/src/H5Pff.F90 b/fortran/src/H5Pff.F90
index 5f76b6c..da7cba2 100644
--- a/fortran/src/H5Pff.F90
+++ b/fortran/src/H5Pff.F90
@@ -514,7 +514,7 @@ CONTAINS
 !!
 !! \brief Retrieves the version information of various objects for a file creation property list.
 !!
-!! \param prp_id   File createion property list identifier.
+!! \param prp_id   File creation property list identifier.
 !! \param boot     Super block version number.
 !! \param freelist Global freelist version number.
 !! \param stab     Symbol table version number.
diff --git a/hl/fortran/src/H5IMff.F90 b/hl/fortran/src/H5IMff.F90
index a1be745..5354dd0 100644
--- a/hl/fortran/src/H5IMff.F90
+++ b/hl/fortran/src/H5IMff.F90
@@ -380,7 +380,7 @@ CONTAINS
 !>
 !! \ingroup FH5IM
 !!
-!! \brief This function dettaches a palette to an existing image dataset.
+!! \brief This function detaches a palette to an existing image dataset.
 !!
 !! \param loc_id     Location identifier. The identifier may be that of a file or group.
 !! \param image_name The name of the image dataset.
diff --git a/hl/src/H5IM.c b/hl/src/H5IM.c
index 42a5feb..b5476c6 100644
--- a/hl/src/H5IM.c
+++ b/hl/src/H5IM.c
@@ -600,7 +600,7 @@ out:
 /*-------------------------------------------------------------------------
  * Function: H5IMunlink_palette
  *
- * Purpose: This function dettaches a palette from an existing image dataset
+ * Purpose: This function detaches a palette from an existing image dataset
  *
  * Return: Success: 0, Failure: -1
  *
diff --git a/hl/src/H5IMpublic.h b/hl/src/H5IMpublic.h
index 81dbb62..0ba9d64 100644
--- a/hl/src/H5IMpublic.h
+++ b/hl/src/H5IMpublic.h
@@ -66,7 +66,7 @@ extern "C" {
  * - \ref H5IMread_image
  *   \n Reads image data from disk.
  * - \ref H5IMunlink_palette
- *   \n Dettaches a palette from an image.
+ *   \n Detaches a palette from an image.
  *
  */
 
@@ -229,7 +229,7 @@ H5_HLDLL herr_t H5IMlink_palette(hid_t loc_id, const char *image_name, const cha
  * --------------------------------------------------------------------------
  * \ingroup H5IM
  *
- * \brief Dettaches a palette from an image.
+ * \brief Detaches a palette from an image.
  *
  * \fg_loc_id
  * \param[in] image_name    The name of the image dataset
@@ -237,7 +237,7 @@ H5_HLDLL herr_t H5IMlink_palette(hid_t loc_id, const char *image_name, const cha
  *
  * \return \herr_t
  *
- * \details H5IMunlink_palette() dettaches a palette from an image
+ * \details H5IMunlink_palette() detaches a palette from an image
  *          specified by \p image_name.
  *
  */
diff --git a/java/src/hdf/hdf5lib/H5.java b/java/src/hdf/hdf5lib/H5.java
index dd47fd4..b48c72a 100644
--- a/java/src/hdf/hdf5lib/H5.java
+++ b/java/src/hdf/hdf5lib/H5.java
@@ -9434,10 +9434,10 @@ public class H5 implements java.io.Serializable {
     /**
      * @ingroup JH5P
      *
-     * H5Pset_sieve_buf_size Sets the maximum size of the data seive buffer used for file
+     * H5Pset_sieve_buf_size Sets the maximum size of the data sieve buffer used for file
      *      drivers which are capable of using data sieving.  The data sieve
      *      buffer is used when performing I/O on datasets in the file.  Using a
-     *      buffer which is large anough to hold several pieces of the dataset
+     *      buffer which is large enough to hold several pieces of the dataset
      *      being read in for hyperslab selections boosts performance by quite a
      *      bit.
      * <p>
@@ -9448,7 +9448,7 @@ public class H5 implements java.io.Serializable {
      * @param fapl_id
      *            IN: Identifier of property list to modify.
      * @param size
-     *            IN: maximum size of the data seive buffer.
+     *            IN: maximum size of the data sieve buffer.
      *
      * @exception HDF5LibraryException
      *            Error from the HDF5 Library.
diff --git a/release_docs/HISTORY-1_0-1_8_0.txt b/release_docs/HISTORY-1_0-1_8_0.txt
index 6d9148d..afe200b 100644
--- a/release_docs/HISTORY-1_0-1_8_0.txt
+++ b/release_docs/HISTORY-1_0-1_8_0.txt
@@ -1443,7 +1443,7 @@ Known Problems
   filter script.
 
 * H5Ocopy() does not copy reg_ref attributes correctly when shared-message
-  is turn on. The value of the reference in the destination attriubte is
+  is turn on. The value of the reference in the destination attribute is
   wrong. This H5Ocopy problem will affect h5copy tool
 
 %%%%1.6.7%%%%   Release Information for hdf5-1.6.7 (31/January/08)
diff --git a/release_docs/HISTORY-1_10_0-1_12_0.txt b/release_docs/HISTORY-1_10_0-1_12_0.txt
index a83e58d..4649a31 100644
--- a/release_docs/HISTORY-1_10_0-1_12_0.txt
+++ b/release_docs/HISTORY-1_10_0-1_12_0.txt
@@ -409,7 +409,7 @@ Bug Fixes since HDF5-1.10.3 release
     - Fixed a bug caused by bad tag value when condensing object header
       messages
 
-      There was an assertion failure when moving meessages from running a
+      There was an assertion failure when moving messages from running a
       user test program with library release hdf5.1.10.4. It was because
       the tag value (object header's address) was not set up when entering
       the library routine H5O__chunk_update_idx(), which will eventually
diff --git a/release_docs/HISTORY-1_14.txt b/release_docs/HISTORY-1_14.txt
index a00b382..9f60f99 100644
--- a/release_docs/HISTORY-1_14.txt
+++ b/release_docs/HISTORY-1_14.txt
@@ -2448,7 +2448,7 @@ New Features
 
       Some of the tools accepted shortened versions of the long options
       (ex: --datas instead of --dataset). These were implemented inconsistently,
-      are difficult to maintian, and occasionally block useful long option
+      are difficult to maintain, and occasionally block useful long option
       names. These partial long options have been removed from all the tools.
 
       (DER - 2021/08/03)
diff --git a/release_docs/HISTORY-1_8_0-1_10_0.txt b/release_docs/HISTORY-1_8_0-1_10_0.txt
index cc42d3b..255ccca 100644
--- a/release_docs/HISTORY-1_8_0-1_10_0.txt
+++ b/release_docs/HISTORY-1_8_0-1_10_0.txt
@@ -837,7 +837,7 @@ Bug Fixes since HDF5-1.8.0 release
     - Support for TFLOPS, config/intel-osf1, is removed since the TFLOPS
       machine has long retired. AKC - 2009/10/06.
     - Added $(EXEEXT) extension to H5detect when it's executed in the
-      src/Makfile to generate H5Tinit.c so it works correctly on platforms
+      src/Makefile to generate H5Tinit.c so it works correctly on platforms
       that require the full extension when running executables.
       MAM - 2009/10/01 - BZ #1613
     - Configure will now set FC and CXX to "no" when fortran and c++
@@ -1734,6 +1734,6 @@ Known Problems
   filter script.
 
 * H5Ocopy() does not copy reg_ref attributes correctly when shared-message
-  is turn on. The value of the reference in the destination attriubte is
+  is turn on. The value of the reference in the destination attribute is
   wrong. This H5Ocopy problem will affect h5copy tool
 
diff --git a/src/H5ACmpio.c b/src/H5ACmpio.c
index 0a634c0..d3d5f9f 100644
--- a/src/H5ACmpio.c
+++ b/src/H5ACmpio.c
@@ -971,7 +971,7 @@ done:
  *		dirty bytes count.
  *
  *		The rank 0 process then removes any references to the
- *		entry under its old address from the cleands and dirtied
+ *		entry under its old address from the clean and dirtied
  *		lists, and inserts an entry in the dirtied list under the
  *		new address.
  *
diff --git a/src/H5ACprivate.h b/src/H5ACprivate.h
index 5ea159e..5291e77 100644
--- a/src/H5ACprivate.h
+++ b/src/H5ACprivate.h
@@ -25,7 +25,7 @@
 
 #include "H5ACpublic.h" /*public prototypes            */
 
-/* Pivate headers needed by this header */
+/* Private headers needed by this header */
 #include "H5private.h"   /* Generic Functions            */
 #include "H5Cprivate.h"  /* Cache                */
 #include "H5Fprivate.h"  /* File access                */
diff --git a/src/H5Centry.c b/src/H5Centry.c
index 9b93a96..5a20155 100644
--- a/src/H5Centry.c
+++ b/src/H5Centry.c
@@ -1738,7 +1738,7 @@ done:
  *              deserialized entry after it is inserted in the cache.
  *
  *              Since deserializing a prefetched entry is semantically
- *              equivalent to a load, issue an entry loaded nofification
+ *              equivalent to a load, issue an entry loaded notification
  *              if the notify callback is defined.
  *
  * Return:      SUCCEED on success, and FAIL on failure.
diff --git a/src/H5Cprivate.h b/src/H5Cprivate.h
index 2e818d2..3bdffeb 100644
--- a/src/H5Cprivate.h
+++ b/src/H5Cprivate.h
@@ -537,7 +537,7 @@ typedef struct H5C_t H5C_t;
  *    ensure that the entry is ready to be flushed -- in particular,
  *    if the entry contains references to other entries that are in
  *    temporary file space, the pre-serialize callback must move those
- *    entries into real file space so that the serialzed entry will
+ *    entries into real file space so that the serialized entry will
  *    contain no invalid data.
  *
  *    One would think that the base address and length of
diff --git a/src/H5Dscatgath.c b/src/H5Dscatgath.c
index 4516f1f..4bcdaaf 100644
--- a/src/H5Dscatgath.c
+++ b/src/H5Dscatgath.c
@@ -1335,7 +1335,7 @@ done:
         write_mem_spaces = NULL;
     }
 
-    /* Free bakcground buffer parameter arrays */
+    /* Free background buffer parameter arrays */
     H5MM_free(bkg_mem_spaces);
     bkg_mem_spaces = NULL;
     H5MM_free(bkg_file_spaces);
diff --git a/src/H5FDhdfs.c b/src/H5FDhdfs.c
index 7dcd194..8282ad9 100644
--- a/src/H5FDhdfs.c
+++ b/src/H5FDhdfs.c
@@ -926,7 +926,7 @@ hdfs__fprint_stats(FILE *stream, const H5FD_hdfs_t *file)
     unsigned long long max_raw      = 0;
     unsigned long long bytes_raw    = 0;
     unsigned long long bytes_meta   = 0;
-    double             re_dub       = 0.0; /* re-usable double variable */
+    double             re_dub       = 0.0; /* reusable double variable */
     unsigned           suffix_i     = 0;
     const char         suffixes[]   = {' ', 'K', 'M', 'G', 'T', 'P'};
 
diff --git a/src/H5FDmpio.c b/src/H5FDmpio.c
index aa83be4..74137e4 100644
--- a/src/H5FDmpio.c
+++ b/src/H5FDmpio.c
@@ -3743,7 +3743,7 @@ H5FD__mpio_truncate(H5FD_t *_file, hid_t H5_ATTR_UNUSED dxpl_id, hbool_t H5_ATTR
 
         /* In principle, it is possible for the size returned by the
          * call to MPI_File_get_size() to depend on whether writes from
-         * all proceeses have completed at the time process 0 makes the
+         * all processes have completed at the time process 0 makes the
          * call.
          *
          * In practice, most (all?) truncate calls will come after a barrier
diff --git a/src/H5FDonion.c b/src/H5FDonion.c
index dcec221..5728c7d 100644
--- a/src/H5FDonion.c
+++ b/src/H5FDonion.c
@@ -492,7 +492,7 @@ H5FD__onion_commit_new_revision_record(H5FD_onion_t *file)
     /* Update history info to accommodate new revision */
 
     if (history->n_revisions == 0) {
-        unsigned char *ptr = buf; /* re-use buffer space to compute checksum */
+        unsigned char *ptr = buf; /* reuse buffer space to compute checksum */
 
         assert(history->record_locs == NULL);
         history->n_revisions = 1;
@@ -508,7 +508,7 @@ H5FD__onion_commit_new_revision_record(H5FD_onion_t *file)
         file->header.history_size += H5FD_ONION_ENCODED_SIZE_RECORD_POINTER;
     } /* end if no extant revisions in history */
     else {
-        unsigned char *ptr = buf; /* re-use buffer space to compute checksum */
+        unsigned char *ptr = buf; /* reuse buffer space to compute checksum */
 
         assert(history->record_locs != NULL);
 
diff --git a/src/H5FDpublic.h b/src/H5FDpublic.h
index 0eceb2f..5f40bff 100644
--- a/src/H5FDpublic.h
+++ b/src/H5FDpublic.h
@@ -76,7 +76,7 @@
 /*
  * Defining H5FD_FEAT_DATA_SIEVE for a VFL driver means that
  * the library will attempt to cache raw data as it is read from/written to
- * a file in a "data seive" buffer.  See Rajeev Thakur's papers:
+ * a file in a "data sieve" buffer.  See Rajeev Thakur's papers:
  *  http://www.mcs.anl.gov/~thakur/papers/romio-coll.ps.gz
  *  http://www.mcs.anl.gov/~thakur/papers/mpio-high-perf.ps.gz
  */
diff --git a/src/H5FDros3.c b/src/H5FDros3.c
index c6414af..6c953fc 100644
--- a/src/H5FDros3.c
+++ b/src/H5FDros3.c
@@ -960,7 +960,7 @@ H5FD__ros3_open(const char *url, unsigned flags, hid_t fapl_id, haddr_t maxaddr)
     if (fa.authenticate == TRUE) {
         /* compute signing key (part of AWS/S3 REST API)
          * can be re-used by user/key for 7 days after creation.
-         * find way to re-use/share
+         * find way to reuse/share
          */
         now = gmnow();
         assert(now != NULL);
@@ -1084,7 +1084,7 @@ ros3_fprint_stats(FILE *stream, const H5FD_ros3_t *file)
     unsigned long long max_raw      = 0;
     unsigned long long bytes_raw    = 0;
     unsigned long long bytes_meta   = 0;
-    double             re_dub       = 0.0; /* re-usable double variable */
+    double             re_dub       = 0.0; /* reusable double variable */
     unsigned           suffix_i     = 0;
     const char         suffixes[]   = {' ', 'K', 'M', 'G', 'T', 'P'};
 
diff --git a/src/H5FDs3comms.c b/src/H5FDs3comms.c
index 8a433d5..c3bf726 100644
--- a/src/H5FDs3comms.c
+++ b/src/H5FDs3comms.c
@@ -571,7 +571,7 @@ done:
  *
  *    Headers list at `first_header` is not touched.
  *
- *    - Programmer should re-use or destroy `first_header` pointer
+ *    - Programmer should reuse or destroy `first_header` pointer
  *      (hrb_node_t *) as suits their purposes.
  *    - Recommend fetching prior to destroy()
  *      e.g., `reuse_node = hrb_to_die->first_header; destroy(hrb_to_die);`
@@ -2531,7 +2531,7 @@ done:
  *     Create AWS4 "Signing Key" from secret key, AWS region, and timestamp.
  *
  *     Sequentially runs HMAC_SHA256 on strings in specified order,
- *     generating re-usable checksum (according to documentation, valid for
+ *     generating reusable checksum (according to documentation, valid for
  *     7 days from time given).
  *
  *     `secret` is `access key id` for targeted service/bucket/resource.
diff --git a/src/H5FDs3comms.h b/src/H5FDs3comms.h
index 47857f6..49adad9 100644
--- a/src/H5FDs3comms.h
+++ b/src/H5FDs3comms.h
@@ -211,7 +211,7 @@
  *
  * `magic` (unsigned long)
  *
- *     "unique" idenfier number for the structure type
+ *     "unique" identifier number for the structure type
  *
  * `name` (char *)
  *
@@ -458,7 +458,7 @@ typedef struct {
  *
  * `signing_key` (unsigned char *)
  *
- *     Pointer to `SHA256_DIGEST_LENGTH`-long string for "re-usable" signing
+ *     Pointer to `SHA256_DIGEST_LENGTH`-long string for "reusable" signing
  *     key, generated via
  *     `HMAC-SHA256(HMAC-SHA256(HMAC-SHA256(HMAC-SHA256("AWS4<secret_key>",
  *         "<yyyyMMDD"), "<aws-region>"), "<aws-service>"), "aws4_request")`
diff --git a/src/H5FDsubfiling/H5FDsubfiling.c b/src/H5FDsubfiling/H5FDsubfiling.c
index 6a04f68..46f280b 100644
--- a/src/H5FDsubfiling/H5FDsubfiling.c
+++ b/src/H5FDsubfiling/H5FDsubfiling.c
@@ -2031,7 +2031,7 @@ done:
  *                          The contents of supplied buffers are undefined.
  *
  * Notes:       Thus function doesn't actually implement vector read.
- *              Instead, it comverts the vector read call into a series
+ *              Instead, it converts the vector read call into a series
  *              of scalar read calls.  Fix this when time permits.
  *
  *              Also, it didn't support the sizes and types optimization.
@@ -2191,7 +2191,7 @@ done:
  *                          subfiling writes have failed for some reason.
  *
  * Notes:       Thus function doesn't actually implement vector write.
- *              Instead, it comverts the vector write call into a series
+ *              Instead, it converts the vector write call into a series
  *              of scalar read calls.  Fix this when time permits.
  *
  *              Also, it didn't support the sizes and types optimization.
diff --git a/src/H5FDsubfiling/H5subfiling_common.c b/src/H5FDsubfiling/H5subfiling_common.c
index 34aaa93..63a63c5 100644
--- a/src/H5FDsubfiling/H5subfiling_common.c
+++ b/src/H5FDsubfiling/H5subfiling_common.c
@@ -618,7 +618,7 @@ done:
  *              new MPI communicators that facilitate messaging between
  *              HDF5 clients and the IOCs.
  *
- * Return:      Success (0) or Faiure (non-zero)
+ * Return:      Success (0) or Failure (non-zero)
  * Errors:      If MPI operations fail for some reason.
  *
  *-------------------------------------------------------------------------
@@ -1950,7 +1950,7 @@ done:
  *              discovery.  The number and mapping of IOC to MPI_rank
  *              is part of the sf_context->topology structure.
  *
- * Return:      Success (0) or Faiure (non-zero)
+ * Return:      Success (0) or Failure (non-zero)
  * Errors:      If MPI operations fail for some reason.
  *
  *-------------------------------------------------------------------------
@@ -2685,7 +2685,7 @@ done:
  *              which actually manages all subfile closing via commands
  *              to the set of IO Concentrators.
  *
- * Return:      Success (0) or Faiure (non-zero)
+ * Return:      Success (0) or Failure (non-zero)
  * Errors:      If MPI operations fail for some reason.
  *
  *-------------------------------------------------------------------------
@@ -2706,7 +2706,7 @@ done:
  *              Once the subfiles are closed, we initiate a teardown of
  *              the IOC and associated thread_pool threads.
  *
- * Return:      Success (0) or Faiure (non-zero)
+ * Return:      Success (0) or Failure (non-zero)
  * Errors:      If MPI operations fail for some reason.
  *
  *-------------------------------------------------------------------------
diff --git a/src/H5FLprivate.h b/src/H5FLprivate.h
index 45ca751..07ced74 100644
--- a/src/H5FLprivate.h
+++ b/src/H5FLprivate.h
@@ -201,7 +201,7 @@ typedef struct H5FL_blk_head_t {
 #define H5FL_BLK_REALLOC(t, blk, new_size)                                                                   \
     (uint8_t *)H5FL_blk_realloc(&(H5FL_BLK_NAME(t)), blk, new_size H5FL_TRACK_INFO)
 
-/* Check if there is a free block available to re-use */
+/* Check if there is a free block available to reuse */
 #define H5FL_BLK_AVAIL(t, size) H5FL_blk_free_block_avail(&(H5FL_BLK_NAME(t)), size)
 
 #else /* H5_NO_BLK_FREE_LISTS */
diff --git a/src/H5Gpublic.h b/src/H5Gpublic.h
index a21ffa2..cc04680 100644
--- a/src/H5Gpublic.h
+++ b/src/H5Gpublic.h
@@ -809,7 +809,7 @@ H5_DLL herr_t H5Gmove2(hid_t src_loc_id, const char *src_name, hid_t dst_loc_id,
  *          any object identifier is open for the object, the space will not be
  *          released until after the object identifier is closed.
  *
- *          Note that space identified as freespace is available for re-use only
+ *          Note that space identified as freespace is available for reuse only
  *          as long as the file remains open; once a file has been closed, the
  *          HDF5 library loses track of freespace. See “Freespace Management” in
  *          the \ref UG for further details.
diff --git a/src/H5HFcache.c b/src/H5HFcache.c
index c34a374..71054f8 100644
--- a/src/H5HFcache.c
+++ b/src/H5HFcache.c
@@ -2521,7 +2521,7 @@ H5HF__cache_dblock_fsf_size(const void *_thing, hsize_t *fsf_size)
  *		Further, metadata cache entries are now allowed to have
  *		multiple flush dependency parents.
  *
- *		This means that the fractal heap is no longer ncessarily
+ *		This means that the fractal heap is no longer necessarily
  *		flushed from the bottom up.
  *
  *		For example, it is now possible for a dirty fractal heap
@@ -2881,7 +2881,7 @@ done:
  *		Further, metadata cache entries are now allowed to have
  *		multiple flush dependency parents.
  *
- *		This means that the fractal heap is no longer ncessarily
+ *		This means that the fractal heap is no longer necessarily
  *		flushed from the bottom up.
  *
  *		For example, it is now possible for a dirty fractal heap
@@ -2994,7 +2994,7 @@ done:
  *		Further, metadata cache entries are now allowed to have
  *		multiple flush dependency parents.
  *
- *		This means that the fractal heap is no longer ncessarily
+ *		This means that the fractal heap is no longer necessarily
  *		flushed from the bottom up.
  *
  *		For example, it is now possible for a dirty fractal heap
@@ -3153,7 +3153,7 @@ done:
  *		Further, metadata cache entries are now allowed to have
  *		multiple flush dependency parents.
  *
- *		This means that the fractal heap is no longer ncessarily
+ *		This means that the fractal heap is no longer necessarily
  *		flushed from the bottom up.
  *
  *		For example, it is now possible for a dirty fractal heap
diff --git a/src/H5Iint.c b/src/H5Iint.c
index 462dc71..b7b1da2 100644
--- a/src/H5Iint.c
+++ b/src/H5Iint.c
@@ -1149,7 +1149,7 @@ H5I_dec_app_ref_async(hid_t id, void **token)
     /* Sanity check */
     assert(id >= 0);
 
-    /* [Possibly] aynchronously decrement refcount on ID */
+    /* [Possibly] asynchronously decrement refcount on ID */
     if ((ret_value = H5I__dec_app_ref(id, token)) < 0)
         HGOTO_ERROR(H5E_ID, H5E_CANTDEC, (-1), "can't asynchronously decrement ID ref count");
 
@@ -1254,7 +1254,7 @@ H5I_dec_app_ref_always_close_async(hid_t id, void **token)
     /* Sanity check */
     assert(id >= 0);
 
-    /* [Possibly] aynchronously decrement refcount on ID */
+    /* [Possibly] asynchronously decrement refcount on ID */
     if ((ret_value = H5I__dec_app_ref_always_close(id, token)) < 0)
         HGOTO_ERROR(H5E_ID, H5E_CANTDEC, (-1), "can't asynchronously decrement ID ref count");
 
diff --git a/src/H5MFaggr.c b/src/H5MFaggr.c
index 5464b8a..24b1c5f 100644
--- a/src/H5MFaggr.c
+++ b/src/H5MFaggr.c
@@ -182,7 +182,7 @@ H5MF__aggr_alloc(H5F_t *f, H5F_blk_aggr_t *aggr, H5F_blk_aggr_t *other_aggr, H5F
         if ((f->shared->feature_flags & aggr->feature_flag) &&
             f->shared->fs_strategy != H5F_FSPACE_STRATEGY_NONE && !f->shared->closing) {
 #endif
-            haddr_t    aggr_frag_addr = HADDR_UNDEF; /* Address of aggregrator fragment */
+            haddr_t    aggr_frag_addr = HADDR_UNDEF; /* Address of aggregator fragment */
             hsize_t    aggr_frag_size = 0;           /* Size of aggregator fragment */
             hsize_t    alignment;                    /* Alignment of this section */
             hsize_t    aggr_mis_align = 0;           /* Misalignment of aggregator */
@@ -472,7 +472,7 @@ done:
                     }     /* end else */
                 }         /* end if */
                 else {
-                    /* The aggreator is not at end of file */
+                    /* The aggregator is not at end of file */
                     /* Check if aggregator has enough internal space to satisfy the extension. */
                     if (aggr->size >= extra_requested) {
                         /* Extend block into aggregator */
diff --git a/src/H5Oalloc.c b/src/H5Oalloc.c
index 16bbab8..37e8818 100644
--- a/src/H5Oalloc.c
+++ b/src/H5Oalloc.c
@@ -1807,7 +1807,7 @@ H5O__move_msgs_forward(H5F_t *f, H5O_t *oh)
                                                  null_msg->raw + null_msg->raw_size, gap_size) < 0)
                                     HGOTO_ERROR(H5E_OHDR, H5E_CANTINSERT, FAIL, "can't insert gap in chunk");
 
-                                /* Re-use message # for new null message taking place of non-null message */
+                                /* Reuse message # for new null message taking place of non-null message */
                                 new_null_msg = v;
                             } /* end if */
                             else {
diff --git a/src/H5Oefl.c b/src/H5Oefl.c
index 5e8c4df..17cdf00 100644
--- a/src/H5Oefl.c
+++ b/src/H5Oefl.c
@@ -346,7 +346,7 @@ H5O__efl_size(const H5F_t *f, hbool_t H5_ATTR_UNUSED disable_shared, const void
  * Function:	H5O__efl_reset
  *
  * Purpose:	Frees internal pointers and resets the message to an
- *		initialial state.
+ *		initial state.
  *
  * Return:	Non-negative on success/Negative on failure
  *
diff --git a/src/H5Pfapl.c b/src/H5Pfapl.c
index 0aca611..4ec73e3 100644
--- a/src/H5Pfapl.c
+++ b/src/H5Pfapl.c
@@ -2597,10 +2597,10 @@ done:
 /*-------------------------------------------------------------------------
  * Function:    H5Pset_sieve_buf_size
  *
- * Purpose:    Sets the maximum size of the data seive buffer used for file
+ * Purpose:    Sets the maximum size of the data sieve buffer used for file
  *      drivers which are capable of using data sieving.  The data sieve
  *      buffer is used when performing I/O on datasets in the file.  Using a
- *      buffer which is large anough to hold several pieces of the dataset
+ *      buffer which is large enough to hold several pieces of the dataset
  *      being read in for hyperslab selections boosts performance by quite a
  *      bit.
  *
diff --git a/src/H5Tcommit.c b/src/H5Tcommit.c
index 2973f5e..a812dd7 100644
--- a/src/H5Tcommit.c
+++ b/src/H5Tcommit.c
@@ -1296,7 +1296,7 @@ H5T_get_actual_type(H5T_t *dt)
 /*-------------------------------------------------------------------------
  * Function:    H5T_save_refresh_state
  *
- * Purpose:     Save state for datatype reconstuction after a refresh.
+ * Purpose:     Save state for datatype reconstruction after a refresh.
  *
  * Return:      SUCCEED/FAIL
  *
@@ -1336,7 +1336,7 @@ done:
 /*-------------------------------------------------------------------------
  * Function:    H5T_restore_refresh_state
  *
- * Purpose:     Restore state for datatype reconstuction after a refresh.
+ * Purpose:     Restore state for datatype reconstruction after a refresh.
  *
  * Return:      SUCCEED/FAIL
  *
diff --git a/src/H5Tnative.c b/src/H5Tnative.c
index 76ef403..989efaa 100644
--- a/src/H5Tnative.c
+++ b/src/H5Tnative.c
@@ -579,7 +579,7 @@ H5T__get_native_integer(size_t prec, H5T_sign_t sign, H5T_direction_t direction,
             match       = H5T_NATIVE_INT_MATCH_LLONG;
             native_size = sizeof(long long);
         }
-        else { /* If no native type matches the querried datatype, simply choose the type of biggest size. */
+        else { /* If no native type matches the queried datatype, simply choose the type of biggest size. */
             match       = H5T_NATIVE_INT_MATCH_LLONG;
             native_size = sizeof(long long);
         }
@@ -838,7 +838,7 @@ H5T__get_native_bitfield(size_t prec, H5T_direction_t direction, size_t *struct_
             native_size = 8;
             align       = H5T_NATIVE_UINT64_ALIGN_g;
         }
-        else { /* If no native type matches the querried datatype, simply choose the type of biggest size. */
+        else { /* If no native type matches the queried datatype, simply choose the type of biggest size. */
             tid         = H5T_NATIVE_B64;
             native_size = 8;
             align       = H5T_NATIVE_UINT64_ALIGN_g;
diff --git a/src/H5WB.c b/src/H5WB.c
index 7be258d..d9b9c5e 100644
--- a/src/H5WB.c
+++ b/src/H5WB.c
@@ -153,10 +153,10 @@ H5WB_actual(H5WB_t *wb, size_t need)
         /* Sanity check */
         assert(wb->actual_size > wb->wrapped_size);
 
-        /* Check if we can re-use existing buffer */
+        /* Check if we can reuse existing buffer */
         if (need <= wb->alloc_size)
             HGOTO_DONE(wb->actual_buf);
-        /* Can't re-use existing buffer, free it and proceed */
+        /* Can't reuse existing buffer, free it and proceed */
         else
             wb->actual_buf = H5FL_BLK_FREE(extra_buf, wb->actual_buf);
     } /* end if */
diff --git a/src/H5Zfletcher32.c b/src/H5Zfletcher32.c
index e5b98be..37f1381 100644
--- a/src/H5Zfletcher32.c
+++ b/src/H5Zfletcher32.c
@@ -104,7 +104,7 @@ H5Z__filter_fletcher32(unsigned flags, size_t H5_ATTR_UNUSED cd_nelmts,
         }
 
         /* Set return values */
-        /* (Re-use the input buffer, just note that the size is smaller by the size of the checksum) */
+        /* (Reuse the input buffer, just note that the size is smaller by the size of the checksum) */
         ret_value = nbytes - FLETCHER_LEN;
     }
     else {                  /* Write */
diff --git a/src/H5private.h b/src/H5private.h
index b154ad8..b1a253e 100644
--- a/src/H5private.h
+++ b/src/H5private.h
@@ -1771,7 +1771,7 @@ H5_DLL herr_t H5CX_pop(hbool_t update_dxpl_props);
         H5_PUSH_FUNC                                                                                         \
         {
 
-/* Use this macro for package-level functions which propgate errors, but don't issue them */
+/* Use this macro for package-level functions which propagate errors, but don't issue them */
 #define FUNC_ENTER_PACKAGE_NOERR                                                                             \
     {                                                                                                        \
         FUNC_ENTER_COMMON_NOERR(H5_IS_PKG(__func__));                                                        \
@@ -1789,7 +1789,7 @@ H5_DLL herr_t H5CX_pop(hbool_t update_dxpl_props);
         H5_PUSH_FUNC                                                                                         \
         {
 
-/* Use this macro for staticly-scoped functions which propgate errors, but don't issue them */
+/* Use this macro for staticly-scoped functions which propagate errors, but don't issue them */
 /* And that shouldn't push their name on the function stack */
 #define FUNC_ENTER_PACKAGE_NOERR_NOFS                                                                        \
     {                                                                                                        \
diff --git a/test/API/tfile.c b/test/API/tfile.c
index 1915749..16429c7 100644
--- a/test/API/tfile.c
+++ b/test/API/tfile.c
@@ -2657,7 +2657,7 @@ test_file_double_file_dataset_open(hbool_t new_format)
     hsize_t e_ext_dims[1] = {7};              /* Expanded dimension sizes */
     hsize_t s_ext_dims[1] = {3};              /* Shrunk dimension sizes */
     hsize_t max_dims0[1]  = {8};              /* Maximum dimension sizes */
-    hsize_t max_dims1[1]  = {H5S_UNLIMITED};  /* Maximum dimesion sizes for extensible array index */
+    hsize_t max_dims1[1]  = {H5S_UNLIMITED};  /* Maximum dimension sizes for extensible array index */
     hsize_t max_dims2[2]  = {H5S_UNLIMITED, H5S_UNLIMITED}; /* Maximum dimension sizes for v2 B-tree index */
     hsize_t chunks[1] = {2}, chunks2[2] = {4, 5};           /* Chunk dimension sizes */
 #if 0
diff --git a/test/API/tselect.c b/test/API/tselect.c
index 49215c2..b0a3626 100644
--- a/test/API/tselect.c
+++ b/test/API/tselect.c
@@ -11336,7 +11336,7 @@ test_shape_same_dr__checkerboard(int test_num, int small_rank, int large_rank, i
     /* Now select the checkerboard selection in the (possibly larger) n-cube.
      *
      * Since we have already calculated the base start, stride, count,
-     * and block, re-use the values in setting up start, stride, count,
+     * and block, reuse the values in setting up start, stride, count,
      * and block.
      */
     for (i = 0; i < SS_DR_MAX_RANK; i++) {
@@ -12793,7 +12793,7 @@ test_space_update_diminfo(void)
     hid_t space_id; /* Dataspace id */
 #if 0
     H5S_diminfo_valid_t diminfo_valid;  /* Diminfo status */
-    H5S_diminfo_valid_t rebuild_status; /* Diminfo status after rebuid */
+    H5S_diminfo_valid_t rebuild_status; /* Diminfo status after rebuild */
 #endif
     H5S_sel_type sel_type; /* Selection type */
     herr_t       ret;      /* Return value */
diff --git a/test/cache_api.c b/test/cache_api.c
index 1752a43..0f5a5dd 100644
--- a/test/cache_api.c
+++ b/test/cache_api.c
@@ -243,7 +243,7 @@ check_fapl_mdc_api_calls(unsigned paged, hid_t fcpl_id)
         }
     }
 
-    /* conpare the cache's internal configuration with the expected value */
+    /* compare the cache's internal configuration with the expected value */
     if (pass) {
 
         if (!resize_configs_are_equal(&default_auto_size_ctl, &cache_ptr->resize_ctl, TRUE)) {
@@ -386,7 +386,7 @@ check_fapl_mdc_api_calls(unsigned paged, hid_t fcpl_id)
         }
     }
 
-    /* conpare the cache's internal configuration with the expected value */
+    /* compare the cache's internal configuration with the expected value */
     if (pass) {
 
         if (!resize_configs_are_equal(&mod_auto_size_ctl, &cache_ptr->resize_ctl, TRUE)) {
diff --git a/test/direct_chunk.c b/test/direct_chunk.c
index 078349c..89eb90c 100644
--- a/test/direct_chunk.c
+++ b/test/direct_chunk.c
@@ -407,7 +407,7 @@ test_direct_chunk_overwrite_data(hid_t fid)
     if ((sid = H5Screate_simple(OVERWRITE_NDIMS, dset_dims, dset_max_dims)) < 0)
         FAIL_STACK_ERROR;
 
-    /* Set chunk size and filll value */
+    /* Set chunk size and fill value */
     if ((dcpl_id = H5Pcreate(H5P_DATASET_CREATE)) < 0)
         FAIL_STACK_ERROR;
     if (H5Pset_fill_value(dcpl_id, tid, &fill_value) < 0)
diff --git a/test/external.c b/test/external.c
index cc0d262..aad2d7c 100644
--- a/test/external.c
+++ b/test/external.c
@@ -513,7 +513,7 @@ test_multiple_files(hid_t file)
         FAIL_STACK_ERROR;
     if (H5Pclose(dcpl) < 0)
         FAIL_STACK_ERROR;
-    /* Re-use space below */
+    /* Reuse space below */
 
     /* ----------------------------------------------
      * Verify that too-small external files will fail
diff --git a/test/mf.c b/test/mf.c
index c224119..bc01c38 100644
--- a/test/mf.c
+++ b/test/mf.c
@@ -1979,7 +1979,7 @@ error:
  *-------------------------------------------------------------------------
  * To verify that an aggregator is absorbed into a section.
  *
- *    Test 1: To aborb the aggregator onto the beginning of the section
+ *    Test 1: To absorb the aggregator onto the beginning of the section
  *        Allocate block A from meta_aggr
  *        Create a free-space section node with an address that adjoins
  *            the end of meta_aggr and a size to make the aggregator
diff --git a/test/onion.c b/test/onion.c
index eb44a4f..51e5d24 100644
--- a/test/onion.c
+++ b/test/onion.c
@@ -1678,7 +1678,7 @@ verify_history_as_expected_onion(H5FD_t *raw_file, struct expected_history *filt
     if (H5FD__onion_history_decode(buf, &history_out) != readsize)
         TEST_ERROR;
 
-    /* Re-use buffer space to sanity-check checksum for record pointer(s). */
+    /* Reuse buffer space to sanity-check checksum for record pointer(s). */
     assert(readsize >= sizeof(H5FD_onion_record_loc_t));
     for (size_t i = 0; i < history_out.n_revisions; i++) {
 
diff --git a/test/swmr.c b/test/swmr.c
index 0354744..d91d273 100644
--- a/test/swmr.c
+++ b/test/swmr.c
@@ -4054,7 +4054,7 @@ test_append_flush_dataset_chunked(hid_t in_fapl)
 
     hsize_t dims[2]       = {100, 0};             /* The dataset dimension sizes */
     hsize_t maxdims[2]    = {100, H5S_UNLIMITED}; /* The dataset maximum dimension sizes */
-    hsize_t chunk_dims[2] = {5, 2};               /* The chunk dimesion sizes */
+    hsize_t chunk_dims[2] = {5, 2};               /* The chunk dimension sizes */
 
     TESTING("H5Fget/set_append_flush() for a chunked dataset's access property list");
 
@@ -4498,7 +4498,7 @@ test_append_flush_dataset_multiple(hid_t in_fapl)
 
     hsize_t dims[2]       = {0, 0};                         /* The dataset dimension sizes */
     hsize_t maxdims[2]    = {H5S_UNLIMITED, H5S_UNLIMITED}; /* The dataset maximum dimension sizes */
-    hsize_t chunk_dims[2] = {5, 2};                         /* The chunk dimesion sizes */
+    hsize_t chunk_dims[2] = {5, 2};                         /* The chunk dimension sizes */
 
     TESTING("H5Fget/set_append_flush() for multiple opens of a chunked dataset");
 
diff --git a/test/tfile.c b/test/tfile.c
index 8c1ea8d..7eed105 100644
--- a/test/tfile.c
+++ b/test/tfile.c
@@ -2602,7 +2602,7 @@ test_file_double_file_dataset_open(hbool_t new_format)
     hsize_t e_ext_dims[1] = {7};              /* Expanded dimension sizes */
     hsize_t s_ext_dims[1] = {3};              /* Shrunk dimension sizes */
     hsize_t max_dims0[1]  = {8};              /* Maximum dimension sizes */
-    hsize_t max_dims1[1]  = {H5S_UNLIMITED};  /* Maximum dimesion sizes for extensible array index */
+    hsize_t max_dims1[1]  = {H5S_UNLIMITED};  /* Maximum dimension sizes for extensible array index */
     hsize_t max_dims2[2]  = {H5S_UNLIMITED, H5S_UNLIMITED}; /* Maximum dimension sizes for v2 B-tree index */
     hsize_t chunks[1] = {2}, chunks2[2] = {4, 5};           /* Chunk dimension sizes */
     hsize_t size;                                           /* File size */
diff --git a/test/tselect.c b/test/tselect.c
index a7d9f8e..3c6f4bb 100644
--- a/test/tselect.c
+++ b/test/tselect.c
@@ -11325,7 +11325,7 @@ test_shape_same_dr__checkerboard(int test_num, int small_rank, int large_rank, i
     /* Now select the checkerboard selection in the (possibly larger) n-cube.
      *
      * Since we have already calculated the base start, stride, count,
-     * and block, re-use the values in setting up start, stride, count,
+     * and block, reuse the values in setting up start, stride, count,
      * and block.
      */
     for (i = 0; i < SS_DR_MAX_RANK; i++) {
@@ -12766,7 +12766,7 @@ test_space_update_diminfo(void)
 {
     hid_t               space_id;       /* Dataspace id */
     H5S_diminfo_valid_t diminfo_valid;  /* Diminfo status */
-    H5S_diminfo_valid_t rebuild_status; /* Diminfo status after rebuid */
+    H5S_diminfo_valid_t rebuild_status; /* Diminfo status after rebuild */
     H5S_sel_type        sel_type;       /* Selection type */
     herr_t              ret;            /* Return value */
 
diff --git a/testpar/API/t_dset.c b/testpar/API/t_dset.c
index 14f9233..228cadc 100644
--- a/testpar/API/t_dset.c
+++ b/testpar/API/t_dset.c
@@ -3020,7 +3020,7 @@ none_selection_chunk(void)
  *
  *              TEST_ACTUAL_IO_RESET:
  *                  Performs collective and then independent I/O with hthe same dxpl to
- *                  make sure the peroperty is correctly reset to the default on each use.
+ *                  make sure the property is correctly reset to the default on each use.
  *                  Specifically, this test runs TEST_ACTUAL_IO_MULTI_CHUNK_NO_OPT_MIX_DISAGREE
  *                  (The most complex case that works on all builds) and then performs
  *                  an independent read and write with the same dxpls.
diff --git a/testpar/API/t_shapesame.c b/testpar/API/t_shapesame.c
index 9d48827..06bb4ff 100644
--- a/testpar/API/t_shapesame.c
+++ b/testpar/API/t_shapesame.c
@@ -2479,14 +2479,14 @@ do {
                             good_data = FALSE;
                         }
 
-                        /* zero out buffer for re-use */
+                        /* zero out buffer for reuse */
                         *val_ptr = 0;
                     }
                     else if (*val_ptr != 0) {
 
                         good_data = FALSE;
 
-                        /* zero out buffer for re-use */
+                        /* zero out buffer for reuse */
                         *val_ptr = 0;
                     }
 
diff --git a/testpar/API/t_span_tree.c b/testpar/API/t_span_tree.c
index b66b72c..40ccb8f 100644
--- a/testpar/API/t_span_tree.c
+++ b/testpar/API/t_span_tree.c
@@ -1453,14 +1453,14 @@ lower_dim_size_comp_test__verify_data(uint32_t *buf_ptr,
                                 good_data = FALSE;
                             }
 
-                            /* zero out buffer for re-use */
+                            /* zero out buffer for reuse */
                             *val_ptr = 0;
                         }
                         else if (*val_ptr != 0) {
 
                             good_data = FALSE;
 
-                            /* zero out buffer for re-use */
+                            /* zero out buffer for reuse */
                             *val_ptr = 0;
                         }
 
@@ -2401,7 +2401,7 @@ lower_dim_size_comp_test(void)
  *        2) Has no in memory buffer for any other chunk.
  *
  *        The test differers from Rob Latham's bug report in
- *        that is runs with an arbitrary number of proceeses,
+ *        that is runs with an arbitrary number of processes,
  *        and uses a 1 dimensional dataset.
  *
  * Return:    void
diff --git a/testpar/t_2Gio.c b/testpar/t_2Gio.c
index 1edec56..24eb3ba 100644
--- a/testpar/t_2Gio.c
+++ b/testpar/t_2Gio.c
@@ -3323,7 +3323,7 @@ none_selection_chunk(void)
  *
  *              TEST_ACTUAL_IO_RESET:
  *                  Performs collective and then independent I/O with the same dxpl to
- *                  make sure the peroperty is correctly reset to the default on each use.
+ *                  make sure the property is correctly reset to the default on each use.
  *                  Specifically, this test runs TEST_ACTUAL_IO_MULTI_CHUNK_NO_OPT_MIX_DISAGREE
  *                  (The most complex case that works on all builds) and then performs
  *                  an independent read and write with the same dxpls.
diff --git a/testpar/t_cache_image.c b/testpar/t_cache_image.c
index f1f6f5d..49d1017 100644
--- a/testpar/t_cache_image.c
+++ b/testpar/t_cache_image.c
@@ -1997,7 +1997,7 @@ par_verify_dataset(int dset_num, hid_t file_id, int mpi_rank)
  *              On failure, print an appropriate error message and
  *              return FALSE.
  *
- * Return:      TRUE if succussful, FALSE otherwise.
+ * Return:      TRUE if successful, FALSE otherwise.
  *
  *-------------------------------------------------------------------------
  */
diff --git a/testpar/t_dset.c b/testpar/t_dset.c
index dfa9a33..f82410f 100644
--- a/testpar/t_dset.c
+++ b/testpar/t_dset.c
@@ -2881,7 +2881,7 @@ none_selection_chunk(void)
  *
  *              TEST_ACTUAL_IO_RESET:
  *                  Performs collective and then independent I/O with hthe same dxpl to
- *                  make sure the peroperty is correctly reset to the default on each use.
+ *                  make sure the property is correctly reset to the default on each use.
  *                  Specifically, this test runs TEST_ACTUAL_IO_MULTI_CHUNK_NO_OPT_MIX_DISAGREE
  *                  (The most complex case that works on all builds) and then performs
  *                  an independent read and write with the same dxpls.
diff --git a/testpar/t_shapesame.c b/testpar/t_shapesame.c
index d9cd20c..55e7328 100644
--- a/testpar/t_shapesame.c
+++ b/testpar/t_shapesame.c
@@ -2452,14 +2452,14 @@ do {
                             good_data = FALSE;
                         }
 
-                        /* zero out buffer for re-use */
+                        /* zero out buffer for reuse */
                         *val_ptr = 0;
                     }
                     else if (*val_ptr != 0) {
 
                         good_data = FALSE;
 
-                        /* zero out buffer for re-use */
+                        /* zero out buffer for reuse */
                         *val_ptr = 0;
                     }
 
diff --git a/testpar/t_span_tree.c b/testpar/t_span_tree.c
index 4950bc8..7614165 100644
--- a/testpar/t_span_tree.c
+++ b/testpar/t_span_tree.c
@@ -1354,14 +1354,14 @@ lower_dim_size_comp_test__verify_data(uint32_t *buf_ptr,
                                 good_data = FALSE;
                             }
 
-                            /* zero out buffer for re-use */
+                            /* zero out buffer for reuse */
                             *val_ptr = 0;
                         }
                         else if (*val_ptr != 0) {
 
                             good_data = FALSE;
 
-                            /* zero out buffer for re-use */
+                            /* zero out buffer for reuse */
                             *val_ptr = 0;
                         }
 
@@ -2286,7 +2286,7 @@ lower_dim_size_comp_test(void)
  *        2) Has no in memory buffer for any other chunk.
  *
  *        The test differers from Rob Latham's bug report in
- *        that is runs with an arbitrary number of proceeses,
+ *        that is runs with an arbitrary number of processes,
  *        and uses a 1 dimensional dataset.
  *
  * Return:    void
diff --git a/tools/src/h5repack/h5repack_copy.c b/tools/src/h5repack/h5repack_copy.c
index 2d0819b..dd32a3c 100644
--- a/tools/src/h5repack/h5repack_copy.c
+++ b/tools/src/h5repack/h5repack_copy.c
@@ -416,7 +416,7 @@ done:
  *   * hslab_nbytes_p : [OUT] total byte of the hyperslab
  *
  * Update:
- *   The hyperslab calucation would be depend on if the dataset is chunked
+ *   The hyperslab calculation would depend on if the dataset is chunked
  *   or not.
  *
  *   There care 3 conditions to cover:
diff --git a/tools/test/h5dump/h5dumpgentest.c b/tools/test/h5dump/h5dumpgentest.c
index aad1b8d..e77eaf2 100644
--- a/tools/test/h5dump/h5dumpgentest.c
+++ b/tools/test/h5dump/h5dumpgentest.c
@@ -11262,7 +11262,7 @@ gent_err_attr_dspace(void)
     hid_t   fcpl     = H5I_INVALID_HID; /* File access property list */
     hid_t   sid      = H5I_INVALID_HID; /* Dataspace identifier */
     hid_t   aid      = H5I_INVALID_HID; /* Attribute identifier */
-    hsize_t dims     = 2;               /* Dimensino size */
+    hsize_t dims     = 2;               /* Dimension size */
     int     wdata[2] = {7, 42};         /* The buffer to write */
     int     fd       = -1;              /* The file descriptor */
     char    val      = 6;               /* An invalid version */
diff --git a/tools/test/h5repack/h5repackgentest.c b/tools/test/h5repack/h5repackgentest.c
index 8910abb..7c73e91 100644
--- a/tools/test/h5repack/h5repackgentest.c
+++ b/tools/test/h5repack/h5repackgentest.c
@@ -16,7 +16,7 @@
  * + h5repack_<NAME>.h5
  * + h5repack_<NAME>_ex.h5
  * + h5repack_<NAME>_ex-<N>.dat
- * ...where NAME idenfities the type, and N is a positive decimal number;
+ * ...where NAME identifies the type, and N is a positive decimal number;
  * multiple external files (*.dat) are allowed per file, but they must
  * follow the pattern and be in contiguous numerical sequence starting at 0.
  *
diff --git a/tools/test/h5stat/CMakeTests.cmake b/tools/test/h5stat/CMakeTests.cmake
index 14bb5ea..8802d0d 100644
--- a/tools/test/h5stat/CMakeTests.cmake
+++ b/tools/test/h5stat/CMakeTests.cmake
@@ -160,7 +160,7 @@
   ADD_H5_TEST (h5stat_notexist 1 notexist.h5)
   ADD_H5_TEST (h5stat_nofile 1 '')
 
-# Test file with groups, compressed datasets, user-applied fileters, etc.
+# Test file with groups, compressed datasets, user-applied filters, etc.
 # h5stat_filters.h5 is a copy of ../../testfiles/tfilters.h5 as of release 1.8.0-alpha4
   ADD_H5_TEST (h5stat_filters 0 h5stat_filters.h5)
   ADD_H5_TEST (h5stat_filters-file 0 -f h5stat_filters.h5)
diff --git a/tools/test/h5stat/testh5stat.sh.in b/tools/test/h5stat/testh5stat.sh.in
index 65e40c4..9ea6adc 100644
--- a/tools/test/h5stat/testh5stat.sh.in
+++ b/tools/test/h5stat/testh5stat.sh.in
@@ -256,7 +256,7 @@ TOOLTEST h5stat_help2.ddl --help
 TOOLTEST h5stat_notexist.ddl notexist.h5
 TOOLTEST h5stat_nofile.ddl ''
 
-# Test file with groups, compressed datasets, user-applied fileters, etc.
+# Test file with groups, compressed datasets, user-applied filters, etc.
 # h5stat_filters.h5 is a copy of ../../testfiles/tfilters.h5 as of release 1.8.0-alpha4
 TOOLTEST h5stat_filters.ddl h5stat_filters.h5
 TOOLTEST h5stat_filters-file.ddl  -f   h5stat_filters.h5
diff --git a/utils/mirror_vfd/mirror_writer.c b/utils/mirror_vfd/mirror_writer.c
index 2acc166..24fbc77 100644
--- a/utils/mirror_vfd/mirror_writer.c
+++ b/utils/mirror_vfd/mirror_writer.c
@@ -57,7 +57,7 @@
  *      guard against commands from the wrong entity.
  *
  * xmit_count (uint32_t)
- *      Record of trasmissions received from the Driver. While the transmission
+ *      Record of transmissions received from the Driver. While the transmission
  *      protocol should be trustworthy, this serves as an additional guard.
  *      Starts a 0 and should be incremented for each one-way transmission.
  *
@@ -728,7 +728,7 @@ do_write(struct mirror_session *session, const unsigned char *xmit_buf)
     addr = (haddr_t)xmit_write.offset;
     type = (H5FD_mem_t)xmit_write.type;
 
-    /* Allocate the buffer once -- re-use between loops.
+    /* Allocate the buffer once -- reuse between loops.
      */
     buf = (char *)malloc(sizeof(char) * H5FD_MIRROR_DATA_BUFFER_MAX);
     if (NULL == buf) {