Fix typos found in the rest of the hdf5 code-base (#1985)

* Fix typos found in the rest of the hdf5 code-base

* Typo in tool.cmake

* Revert "Typo in tool.cmake"

This reverts commit 06b8403d99757c7d20f1eed530cf317c3d84de4b.

* Fix clang-format styling

68 files changed, 149 insertions, 150 deletions

diff --git a/bin/genparser b/bin/genparser
index 73a0e8a..29bdb80 100755
--- a/bin/genparser
+++ b/bin/genparser
@@ -21,7 +21,7 @@
 #
 # There is NO dependency in either the autotools or CMake to regenerate
 # the parser code. If you modify H5LT analyze.l or H5LTparse.y, you
-# will need to run this scrpit manually on a system with a suitable
+# will need to run this script manually on a system with a suitable
 # lexer and parser generator.
 #
 # IMPORTANT OS X NOTE
diff --git a/bin/warnhist b/bin/warnhist
index 6146f1e..9453b43 100755
--- a/bin/warnhist
+++ b/bin/warnhist
@@ -385,7 +385,7 @@ while (<>) {
 	    $warning =~ s/"[A-Za-z_0-9]*"/"-"/g;
 	}
 
-	# Genericize [GCC?] C/C++ warning text about suggessted attribute
+	# Genericize [GCC?] C/C++ warning text about suggested attribute
 	if($warning =~ /attribute=[A-Za-z_0-9]*\]/) {
 	    $warning =~ s/=[A-Za-z_0-9]*\]/=-\]/g;
 	}
diff --git a/c++/src/H5IntType.h b/c++/src/H5IntType.h
index ec3dd19..d6d4c44 100644
--- a/c++/src/H5IntType.h
+++ b/c++/src/H5IntType.h
@@ -41,7 +41,7 @@ class H5_DLLCPP IntType : public AtomType {
     // Retrieves the sign type for an integer type
     H5T_sign_t getSign() const;
 
-    // Sets the sign proprety for an integer type.
+    // Sets the sign property for an integer type.
     void setSign(H5T_sign_t sign) const;
 
     ///\brief Returns this class name.
diff --git a/c++/test/trefer.cpp b/c++/test/trefer.cpp
index 2a0fe1e..61c5b14 100644
--- a/c++/test/trefer.cpp
+++ b/c++/test/trefer.cpp
@@ -449,7 +449,7 @@ test_reference_group()
         file1->close();
 
         /*
-         * Re-open the file and test deferencing group
+         * Re-open the file and test dereferencing group
          */
 
         // Re-open file
diff --git a/config/ibm-aix b/config/ibm-aix
index 9f261e3..d4b9c98 100644
--- a/config/ibm-aix
+++ b/config/ibm-aix
@@ -58,7 +58,7 @@ if test "X-" = "X-$f9x_flags_set"; then
   H5_FCFLAGS="$H5_FCFLAGS ${F9XSUFFIXFLAG}"
   FSEARCH_DIRS="-I./ -I../src"
 
-  # Produciton
+  # Production
   PROD_FCFLAGS=
 
   # Debug
@@ -109,7 +109,7 @@ case $CC_BASENAME in
     # Use very generic flags
     H5_CFLAGS="$H5_CFLAGS -ansi"
 
-    # Produciton
+    # Production
     PROD_CFLAGS=
 
     # Debug
diff --git a/config/ibm-flags b/config/ibm-flags
index ab4b8ff..f3f247c 100644
--- a/config/ibm-flags
+++ b/config/ibm-flags
@@ -62,7 +62,7 @@ if test "XL" = "$cc_vendor"; then
     # concerning the portability of __inline__.
     H5_CFLAGS="-qlanglvl=stdc99 -qflag=w:w $H5_CFLAGS"
 
-    # Produciton
+    # Production
     PROD_CFLAGS=
 
     # Debug
diff --git a/doxygen/dox/MetadataCachingInHDF5.dox b/doxygen/dox/MetadataCachingInHDF5.dox
index b84ddea..ce7f0df 100644
--- a/doxygen/dox/MetadataCachingInHDF5.dox
+++ b/doxygen/dox/MetadataCachingInHDF5.dox
@@ -724,7 +724,7 @@ is allowed to write to file, and then only after entering a sync point with the
 other caches. After it writes entries to file, it sends the base addresses of
 the now clean entries to the other caches, so they can mark these entries clean
 as well, and then leaves the sync point. The other caches mark the specified
-entries as clean before they leave the synch point as well. (Observe, that since
+entries as clean before they leave the sync point as well. (Observe, that since
 all caches see the same stream of dirty metadata, they will all have the same
 set of dirty entries upon sync point entry and exit.)
 
diff --git a/doxygen/dox/rm-template.dox b/doxygen/dox/rm-template.dox
index ebf8aed..bd81f64 100644
--- a/doxygen/dox/rm-template.dox
+++ b/doxygen/dox/rm-template.dox
@@ -46,7 +46,7 @@ the <a href="https://www.oreilly.com/library/view/97-things-every/9780596809515/
 4. Preconditions
    - A set of preconditions that must be met.
      \verbatim
-     * \pre The argmument supplied in parameter \p name2 must be even.
+     * \pre The argument supplied in parameter \p name2 must be even.
      \endverbatim
 5. Invariants
    - A set of invariants.
diff --git a/doxygen/examples/Filters.html b/doxygen/examples/Filters.html
index 7054a3b..9f34be5 100644
--- a/doxygen/examples/Filters.html
+++ b/doxygen/examples/Filters.html
@@ -408,7 +408,7 @@
 	          Since elapsed time is subject to system load the
 	          bandwidth numbers cannot always be trusted.
 	          Furthermore, the bandwidth includes bytes attributed to
-	          errors which may significanly taint the value if the
+	          errors which may significantly taint the value if the
 	          function is able to detect errors without much
 	          expense.</td>
 	      </tr>
diff --git a/doxygen/examples/H5.format.2.0.html b/doxygen/examples/H5.format.2.0.html
index 4a5fe37..c16a3cc 100644
--- a/doxygen/examples/H5.format.2.0.html
+++ b/doxygen/examples/H5.format.2.0.html
@@ -6610,7 +6610,7 @@ III.H. Disk Format: Level 1H - Shared Object Header Message Table</a></h3>
 	<tr>
 	  <td><p>v2 B-tree Cutoff for index #N</p></td>
 	  <td>
-            <p>This is is the cutoff value for the indexing of messages to
+            <p>This is the cutoff value for the indexing of messages to
 		switch from a v2 B-tree back to a list.  If the number of
                 messages is less than this value, the index should be a list.
             </p>
diff --git a/doxygen/examples/H5.format.html b/doxygen/examples/H5.format.html
index cbcb387..47e19bf 100644
--- a/doxygen/examples/H5.format.html
+++ b/doxygen/examples/H5.format.html
@@ -19601,7 +19601,7 @@ disk address for the chunk.</p>
               </tr>
               <tr>
                 <td align="center"><code>0</code></td>
-                <td>If set, it a a regular hyperslab, otherwise, irregular.
+                <td>If set, it is a regular hyperslab, otherwise, irregular.
                 </td>
               </tr>
 
diff --git a/examples/h5_vds-eiger.c b/examples/h5_vds-eiger.c
index 9608319..fcde490 100644
--- a/examples/h5_vds-eiger.c
+++ b/examples/h5_vds-eiger.c
@@ -128,7 +128,7 @@ main(void)
     for (i = 0; i < (int)num_map; i++) {
         printf(" Mapping %d \n", i);
         printf("         Selection in the virtual dataset \n");
-        /* Get selection in the virttual  dataset */
+        /* Get selection in the virtual dataset */
         vspace = H5Pget_virtual_vspace(dcpl, (size_t)i);
         if (H5Sget_select_type(vspace) == H5S_SEL_HYPERSLABS) {
             if (H5Sis_regular_hyperslab(vspace)) {
diff --git a/examples/h5_vds-exc.c b/examples/h5_vds-exc.c
index e03ffd8..fa6b720 100644
--- a/examples/h5_vds-exc.c
+++ b/examples/h5_vds-exc.c
@@ -156,7 +156,7 @@ main(void)
     for (i = 0; i < (int)num_map; i++) {
         printf(" Mapping %d \n", i);
         printf("         Selection in the virtual dataset \n");
-        /* Get selection in the virttual  dataset */
+        /* Get selection in the virtual dataset */
         vspace = H5Pget_virtual_vspace(dcpl, (size_t)i);
         if (H5Sget_select_type(vspace) == H5S_SEL_HYPERSLABS) {
             if (H5Sis_regular_hyperslab(vspace)) {
diff --git a/examples/h5_vds-exclim.c b/examples/h5_vds-exclim.c
index f7b3fdd..58ed1f8 100644
--- a/examples/h5_vds-exclim.c
+++ b/examples/h5_vds-exclim.c
@@ -153,7 +153,7 @@ main(void)
     for (i = 0; i < (int)num_map; i++) {
         printf(" Mapping %d \n", i);
         printf("         Selection in the virtual dataset \n");
-        /* Get selection in the virttual  dataset */
+        /* Get selection in the virtual dataset */
         vspace = H5Pget_virtual_vspace(dcpl, (size_t)i);
         if (H5Sget_select_type(vspace) == H5S_SEL_HYPERSLABS) {
             if (H5Sis_regular_hyperslab(vspace)) {
diff --git a/examples/h5_vds-percival-unlim-maxmin.c b/examples/h5_vds-percival-unlim-maxmin.c
index 507f088..9ef514d 100644
--- a/examples/h5_vds-percival-unlim-maxmin.c
+++ b/examples/h5_vds-percival-unlim-maxmin.c
@@ -246,7 +246,7 @@ main(void)
     for (i = 0; i < (int)num_map; i++) {
         printf(" Mapping %d \n", i);
         printf("         Selection in the virtual dataset \n");
-        /* Get selection in the virttual  dataset */
+        /* Get selection in the virtual dataset */
         vspace = H5Pget_virtual_vspace(dcpl, (size_t)i);
         if (H5Sget_select_type(vspace) == H5S_SEL_HYPERSLABS) {
             if (H5Sis_regular_hyperslab(vspace)) {
diff --git a/examples/h5_vds-percival-unlim.c b/examples/h5_vds-percival-unlim.c
index badead3..ddbcdec 100644
--- a/examples/h5_vds-percival-unlim.c
+++ b/examples/h5_vds-percival-unlim.c
@@ -223,7 +223,7 @@ main(void)
     for (i = 0; i < (int)num_map; i++) {
         printf(" Mapping %d \n", i);
         printf("         Selection in the virtual dataset \n");
-        /* Get selection in the virttual  dataset */
+        /* Get selection in the virtual dataset */
         vspace = H5Pget_virtual_vspace(dcpl, (size_t)i);
         if (H5Sget_select_type(vspace) == H5S_SEL_HYPERSLABS) {
             if (H5Sis_regular_hyperslab(vspace)) {
diff --git a/examples/h5_vds-percival.c b/examples/h5_vds-percival.c
index 9507931..82c8ef4 100644
--- a/examples/h5_vds-percival.c
+++ b/examples/h5_vds-percival.c
@@ -183,7 +183,7 @@ main(void)
     for (i = 0; i < (int)num_map; i++) {
         printf(" Mapping %d \n", i);
         printf("         Selection in the virtual dataset \n");
-        /* Get selection in the virttual  dataset */
+        /* Get selection in the virtual dataset */
         vspace = H5Pget_virtual_vspace(dcpl, (size_t)i);
         if (H5Sget_select_type(vspace) == H5S_SEL_HYPERSLABS) {
             if (H5Sis_regular_hyperslab(vspace)) {
diff --git a/examples/h5_vds-simpleIO.c b/examples/h5_vds-simpleIO.c
index cb69645..f516af9 100644
--- a/examples/h5_vds-simpleIO.c
+++ b/examples/h5_vds-simpleIO.c
@@ -132,7 +132,7 @@ main(void)
     for (i = 0; i < (int)num_map; i++) {
         printf(" Mapping %d \n", i);
         printf("         Selection in the virtual dataset ");
-        /* Get selection in the virttual  dataset */
+        /* Get selection in the virtual dataset */
         vspace = H5Pget_virtual_vspace(dcpl, (size_t)i);
 
         /* Make sure it is ALL selection and then print selection. */
diff --git a/examples/h5_vds.c b/examples/h5_vds.c
index 48c6d7d..e02d246 100644
--- a/examples/h5_vds.c
+++ b/examples/h5_vds.c
@@ -169,7 +169,7 @@ main(void)
     for (i = 0; i < (int)num_map; i++) {
         printf(" Mapping %d \n", i);
         printf("         Selection in the virtual dataset ");
-        /* Get selection in the virttual  dataset */
+        /* Get selection in the virtual dataset */
         vspace = H5Pget_virtual_vspace(dcpl, (size_t)i);
 
         /* Make sure that this is a hyperslab selection and then print information. */
diff --git a/fortran/examples/refobjexample.f90 b/fortran/examples/refobjexample.f90
index 873b420..0d6595c 100644
--- a/fortran/examples/refobjexample.f90
+++ b/fortran/examples/refobjexample.f90
@@ -65,7 +65,7 @@
      !
      CALL h5gcreate_f(file_id, groupname1, grp1_id, error)
      !
-     ! Create a group inside the created gorup
+     ! Create a group inside the created group
      !
      CALL h5gcreate_f(grp1_id, groupname2, grp2_id, error)
      !
diff --git a/fortran/src/H5Dff.F90 b/fortran/src/H5Dff.F90
index 6b77a8c..216b005 100644
--- a/fortran/src/H5Dff.F90
+++ b/fortran/src/H5Dff.F90
@@ -746,8 +746,8 @@ CONTAINS
                                                      ! element
     INTEGER, INTENT(IN), DIMENSION(dims(1),dims(2)), TARGET :: buf   ! Data buffer
     INTEGER, INTENT(OUT) :: hdferr      ! Error code
-    INTEGER(HID_T), OPTIONAL, INTENT(IN) :: mem_space_id  ! Memory dataspace identfier
-    INTEGER(HID_T), OPTIONAL, INTENT(IN) :: file_space_id ! File dataspace identfier
+    INTEGER(HID_T), OPTIONAL, INTENT(IN) :: mem_space_id  ! Memory dataspace identifier
+    INTEGER(HID_T), OPTIONAL, INTENT(IN) :: file_space_id ! File dataspace identifier
     INTEGER(HID_T), OPTIONAL, INTENT(IN) :: xfer_prp      ! Transfer property list identifier
     INTEGER(HID_T) :: xfer_prp_default
     INTEGER(HID_T) :: mem_space_id_default
@@ -800,8 +800,8 @@ CONTAINS
          DIMENSION(dims(1),dims(2)), TARGET :: buf   ! Data buffer
     INTEGER, INTENT(OUT) :: hdferr ! Error code
                                    ! -1 if failed, 0 otherwise
-    INTEGER(HID_T), OPTIONAL, INTENT(IN) :: mem_space_id  ! Memory dataspace identfier
-    INTEGER(HID_T), OPTIONAL, INTENT(IN) :: file_space_id ! File dataspace identfier
+    INTEGER(HID_T), OPTIONAL, INTENT(IN) :: mem_space_id  ! Memory dataspace identifier
+    INTEGER(HID_T), OPTIONAL, INTENT(IN) :: file_space_id ! File dataspace identifier
     INTEGER(HID_T), OPTIONAL, INTENT(IN) :: xfer_prp      ! Transfer property list identifier
     INTEGER(HID_T) :: xfer_prp_default
     INTEGER(HID_T)  :: mem_space_id_default
@@ -856,8 +856,8 @@ CONTAINS
     REAL, INTENT(IN), &
          DIMENSION(dims(1),dims(2)) :: buf ! Data buffer
     INTEGER, INTENT(OUT) :: hdferr         ! Error code
-    INTEGER(HID_T), OPTIONAL, INTENT(IN) :: mem_space_id  ! Memory dataspace identfier
-    INTEGER(HID_T), OPTIONAL, INTENT(IN) :: file_space_id ! File dataspace identfier
+    INTEGER(HID_T), OPTIONAL, INTENT(IN) :: mem_space_id  ! Memory dataspace identifier
+    INTEGER(HID_T), OPTIONAL, INTENT(IN) :: file_space_id ! File dataspace identifier
     INTEGER(HID_T), OPTIONAL, INTENT(IN) :: xfer_prp      ! Transfer property list identifier
 
     INTEGER(HID_T) :: xfer_prp_default
@@ -911,8 +911,8 @@ CONTAINS
          DIMENSION(dims(1),dims(2)) :: buf ! Data buffer
     INTEGER, INTENT(OUT) :: hdferr         ! Error code
                                            ! -1 if failed, 0 otherwise
-    INTEGER(HID_T), OPTIONAL, INTENT(IN) :: mem_space_id  ! Memory dataspace identfier
-    INTEGER(HID_T), OPTIONAL, INTENT(IN) :: file_space_id ! File dataspace identfier
+    INTEGER(HID_T), OPTIONAL, INTENT(IN) :: mem_space_id  ! Memory dataspace identifier
+    INTEGER(HID_T), OPTIONAL, INTENT(IN) :: file_space_id ! File dataspace identifier
     INTEGER(HID_T), OPTIONAL, INTENT(IN) :: xfer_prp      ! Transfer property list identifier
 
     INTEGER(HID_T) :: xfer_prp_default
@@ -967,8 +967,8 @@ CONTAINS
     INTEGER(SIZE_T), INTENT(IN), DIMENSION(*) :: str_len ! Array to store the length of each element
     CHARACTER(LEN=*), INTENT(IN), DIMENSION(dims(2)) :: buf  ! Data buffer
     INTEGER, INTENT(OUT) :: hdferr  ! Error code
-    INTEGER(HID_T), OPTIONAL, INTENT(IN) :: mem_space_id  ! Memory dataspace identfier
-    INTEGER(HID_T), OPTIONAL, INTENT(IN) :: file_space_id ! File dataspace identfier
+    INTEGER(HID_T), OPTIONAL, INTENT(IN) :: mem_space_id  ! Memory dataspace identifier
+    INTEGER(HID_T), OPTIONAL, INTENT(IN) :: file_space_id ! File dataspace identifier
     INTEGER(HID_T), OPTIONAL, INTENT(IN) :: xfer_prp      ! Transfer property list identifier
 
     INTEGER(HID_T) :: xfer_prp_default
@@ -1023,8 +1023,8 @@ CONTAINS
     CHARACTER(LEN=*), INTENT(OUT), &
          DIMENSION(dims(2)) :: buf      ! Data buffer
     INTEGER, INTENT(OUT) :: hdferr      ! Error code
-    INTEGER(HID_T), OPTIONAL, INTENT(IN) :: mem_space_id  ! Memory dataspace identfier
-    INTEGER(HID_T), OPTIONAL, INTENT(IN) :: file_space_id ! File dataspace identfier
+    INTEGER(HID_T), OPTIONAL, INTENT(IN) :: mem_space_id  ! Memory dataspace identifier
+    INTEGER(HID_T), OPTIONAL, INTENT(IN) :: file_space_id ! File dataspace identifier
     INTEGER(HID_T), OPTIONAL, INTENT(IN) :: xfer_prp      ! Transfer property list identifier
 
     INTEGER(HID_T) :: xfer_prp_default
@@ -1198,8 +1198,8 @@ CONTAINS
     INTEGER(HSIZE_T), DIMENSION(*), INTENT(IN) :: dims ! size of the buffer buf
     TYPE(hobj_ref_t_f), DIMENSION(dims(1)), INTENT(IN), TARGET :: buf ! Data buffer
     INTEGER, INTENT(OUT) :: hdferr      ! Error code
-    INTEGER(HID_T), OPTIONAL, INTENT(IN) :: mem_space_id  ! Memory dataspace identfier
-    INTEGER(HID_T), OPTIONAL, INTENT(IN) :: file_space_id ! File dataspace identfier
+    INTEGER(HID_T), OPTIONAL, INTENT(IN) :: mem_space_id  ! Memory dataspace identifier
+    INTEGER(HID_T), OPTIONAL, INTENT(IN) :: file_space_id ! File dataspace identifier
     INTEGER(HID_T), OPTIONAL, INTENT(IN) :: xfer_prp      ! Transfer property list identifier
 
     INTEGER(HID_T) :: xfer_prp_default
@@ -1230,8 +1230,8 @@ CONTAINS
     INTEGER(HSIZE_T), DIMENSION(*), INTENT(IN) :: dims ! size of the buffer buf
     TYPE(hdset_reg_ref_t_f), DIMENSION(dims(1)), INTENT(IN), TARGET :: buf ! Data buffer
     INTEGER, INTENT(OUT) :: hdferr      ! Error code
-    INTEGER(HID_T), OPTIONAL, INTENT(IN) :: mem_space_id  ! Memory dataspace identfier
-    INTEGER(HID_T), OPTIONAL, INTENT(IN) :: file_space_id ! File dataspace identfier
+    INTEGER(HID_T), OPTIONAL, INTENT(IN) :: mem_space_id  ! Memory dataspace identifier
+    INTEGER(HID_T), OPTIONAL, INTENT(IN) :: file_space_id ! File dataspace identifier
     INTEGER(HID_T), OPTIONAL, INTENT(IN) :: xfer_prp      ! Transfer property list identifier
 
     INTEGER(HID_T) :: xfer_prp_default
@@ -1292,8 +1292,8 @@ CONTAINS
     INTEGER(HSIZE_T), INTENT(IN), DIMENSION(*) :: dims
     CHARACTER(*), INTENT(IN), TARGET :: buf ! Data buffer
     INTEGER, INTENT(OUT) :: hdferr          ! Error code
-    INTEGER(HID_T), OPTIONAL, INTENT(IN) :: mem_space_id  ! Memory dataspace identfier
-    INTEGER(HID_T), OPTIONAL, INTENT(IN) :: file_space_id ! File dataspace identfier
+    INTEGER(HID_T), OPTIONAL, INTENT(IN) :: mem_space_id  ! Memory dataspace identifier
+    INTEGER(HID_T), OPTIONAL, INTENT(IN) :: file_space_id ! File dataspace identifier
     INTEGER(HID_T), OPTIONAL, INTENT(IN) :: xfer_prp      ! Transfer property list identifier
 
     CALL h5dwrite_char_scalar_fix(dset_id, mem_type_id, buf, LEN(buf), dims, hdferr, &
@@ -1311,8 +1311,8 @@ CONTAINS
     INTEGER, INTENT(IN) :: buf_len
     CHARACTER(LEN=buf_len), INTENT(IN), TARGET :: buf ! Data buffer
     INTEGER, INTENT(OUT) :: hdferr          ! Error code
-    INTEGER(HID_T), OPTIONAL, INTENT(IN) :: mem_space_id  ! Memory dataspace identfier
-    INTEGER(HID_T), OPTIONAL, INTENT(IN) :: file_space_id ! File dataspace identfier
+    INTEGER(HID_T), OPTIONAL, INTENT(IN) :: mem_space_id  ! Memory dataspace identifier
+    INTEGER(HID_T), OPTIONAL, INTENT(IN) :: file_space_id ! File dataspace identifier
     INTEGER(HID_T), OPTIONAL, INTENT(IN) :: xfer_prp      ! Transfer property list identifier
     INTEGER(HID_T) :: xfer_prp_default
     INTEGER(HID_T) :: mem_space_id_default
@@ -1344,8 +1344,8 @@ CONTAINS
     TYPE(hobj_ref_t_f), INTENT(INOUT) , &
          DIMENSION(dims(1)), TARGET :: buf
     INTEGER, INTENT(OUT) :: hdferr      ! Error code
-    INTEGER(HID_T), OPTIONAL, INTENT(IN) :: mem_space_id  ! Memory dataspace identfier
-    INTEGER(HID_T), OPTIONAL, INTENT(IN) :: file_space_id ! File dataspace identfier
+    INTEGER(HID_T), OPTIONAL, INTENT(IN) :: mem_space_id  ! Memory dataspace identifier
+    INTEGER(HID_T), OPTIONAL, INTENT(IN) :: file_space_id ! File dataspace identifier
     INTEGER(HID_T), OPTIONAL, INTENT(IN) :: xfer_prp      ! Transfer property list identifier
 
     INTEGER(HID_T) :: xfer_prp_default
@@ -1376,8 +1376,8 @@ CONTAINS
     TYPE(hdset_reg_ref_t_f), INTENT(INOUT), &
          DIMENSION(dims(1)), TARGET :: buf
     INTEGER, INTENT(OUT) :: hdferr      ! Error code
-    INTEGER(HID_T), OPTIONAL, INTENT(IN) :: mem_space_id  ! Memory dataspace identfier
-    INTEGER(HID_T), OPTIONAL, INTENT(IN) :: file_space_id ! File dataspace identfier
+    INTEGER(HID_T), OPTIONAL, INTENT(IN) :: mem_space_id  ! Memory dataspace identifier
+    INTEGER(HID_T), OPTIONAL, INTENT(IN) :: file_space_id ! File dataspace identifier
     INTEGER(HID_T), OPTIONAL, INTENT(IN) :: xfer_prp      ! Transfer property list identifier
     INTEGER(HID_T) :: xfer_prp_default
     INTEGER(HID_T) :: mem_space_id_default
@@ -1438,8 +1438,8 @@ CONTAINS
     INTEGER(HSIZE_T), INTENT(IN), DIMENSION(*) :: dims
     CHARACTER(LEN=*), INTENT(INOUT) :: buf     ! Data buffer
     INTEGER, INTENT(OUT) :: hdferr             ! Error code
-    INTEGER(HID_T), OPTIONAL, INTENT(IN) :: mem_space_id  ! Memory dataspace identfier
-    INTEGER(HID_T), OPTIONAL, INTENT(IN) :: file_space_id ! File dataspace identfier
+    INTEGER(HID_T), OPTIONAL, INTENT(IN) :: mem_space_id  ! Memory dataspace identifier
+    INTEGER(HID_T), OPTIONAL, INTENT(IN) :: file_space_id ! File dataspace identifier
     INTEGER(HID_T), OPTIONAL, INTENT(IN) :: xfer_prp      ! Transfer property list identifier
 
     INTEGER(HID_T) :: xfer_prp_default
@@ -1468,8 +1468,8 @@ CONTAINS
     INTEGER, INTENT(IN)  :: buf_len
     CHARACTER(LEN=buf_len), INTENT(INOUT), TARGET :: buf ! Data buffer
     INTEGER, INTENT(OUT) :: hdferr      ! Error code
-    INTEGER(HID_T), OPTIONAL, INTENT(IN) :: mem_space_id  ! Memory dataspace identfier
-    INTEGER(HID_T), OPTIONAL, INTENT(IN) :: file_space_id ! File dataspace identfier
+    INTEGER(HID_T), OPTIONAL, INTENT(IN) :: mem_space_id  ! Memory dataspace identifier
+    INTEGER(HID_T), OPTIONAL, INTENT(IN) :: file_space_id ! File dataspace identifier
     INTEGER(HID_T), OPTIONAL, INTENT(IN) :: xfer_prp      ! Transfer property list identifier
 
     TYPE(C_PTR) :: f_ptr
@@ -1525,8 +1525,8 @@ CONTAINS
     INTEGER(HID_T), INTENT(IN) :: mem_type_id ! Memory datatype identifier
     TYPE(C_PTR), INTENT(IN) :: buf
     INTEGER, INTENT(OUT) :: hdferr      ! Error code
-    INTEGER(HID_T), OPTIONAL, INTENT(IN) :: mem_space_id  ! Memory dataspace identfier
-    INTEGER(HID_T), OPTIONAL, INTENT(IN) :: file_space_id ! File dataspace identfier
+    INTEGER(HID_T), OPTIONAL, INTENT(IN) :: mem_space_id  ! Memory dataspace identifier
+    INTEGER(HID_T), OPTIONAL, INTENT(IN) :: file_space_id ! File dataspace identifier
     INTEGER(HID_T), OPTIONAL, INTENT(IN) :: xfer_prp      ! Transfer property list identifier
 
     INTEGER(HID_T) :: xfer_prp_default
@@ -1590,8 +1590,8 @@ CONTAINS
     INTEGER(HID_T), INTENT(IN) :: mem_type_id ! Memory datatype identifier
     TYPE(C_PTR), INTENT(INOUT) :: buf
     INTEGER, INTENT(OUT) :: hdferr      ! Error code
-    INTEGER(HID_T), OPTIONAL, INTENT(IN) :: mem_space_id  ! Memory dataspace identfier
-    INTEGER(HID_T), OPTIONAL, INTENT(IN) :: file_space_id ! File dataspace identfier
+    INTEGER(HID_T), OPTIONAL, INTENT(IN) :: mem_space_id  ! Memory dataspace identifier
+    INTEGER(HID_T), OPTIONAL, INTENT(IN) :: file_space_id ! File dataspace identifier
     INTEGER(HID_T), OPTIONAL, INTENT(IN) :: xfer_prp      ! Transfer property list identifier
 
     INTEGER(HID_T) :: xfer_prp_default
diff --git a/fortran/src/H5Iff.F90 b/fortran/src/H5Iff.F90
index 07bcb20..cda26ed 100644
--- a/fortran/src/H5Iff.F90
+++ b/fortran/src/H5Iff.F90
@@ -108,7 +108,7 @@ CONTAINS
 !  h5iget_name_f
 !
 ! PURPOSE
-!  Gets a name of an object specified by its idetifier.
+!  Gets a name of an object specified by its identifier.
 !
 ! INPUTS
 !  obj_id    - attribute identifier
diff --git a/fortran/src/H5Pff.F90 b/fortran/src/H5Pff.F90
index c55b7d9..96080ce 100644
--- a/fortran/src/H5Pff.F90
+++ b/fortran/src/H5Pff.F90
@@ -3564,7 +3564,7 @@ CONTAINS
   SUBROUTINE h5pget_class_name_f(prp_id, name, size, hdferr)
     IMPLICIT NONE
     INTEGER(HID_T), INTENT(IN) :: prp_id  ! Property list identifier
-    CHARACTER(LEN=*), INTENT(OUT) :: name ! Buffer to retireve class name
+    CHARACTER(LEN=*), INTENT(OUT) :: name ! Buffer to retrieve class name
     INTEGER, INTENT(OUT) :: size          ! Actual length of the class name
     INTEGER, INTENT(OUT) :: hdferr        ! Error code
                                           ! 0 on success and -1 on failure
diff --git a/fortran/src/H5Tf.c b/fortran/src/H5Tf.c
index d9f75d9..eee0020 100644
--- a/fortran/src/H5Tf.c
+++ b/fortran/src/H5Tf.c
@@ -887,7 +887,7 @@ h5tget_ebias_c(hid_t_f *type_id, size_t_f *ebias)
  *  floating-point type of the datatype
  * INPUTS
  *  type_id - identifier of the dataspace
- *  ebias - exponent bias of a floating-point type of the datatyp
+ *  ebias - exponent bias of a floating-point type of the datatype
  * RETURNS
  *  0 on success, -1 on failure
  * AUTHOR
diff --git a/fortran/src/H5Tff.F90 b/fortran/src/H5Tff.F90
index 7582dab..0a11976 100644
--- a/fortran/src/H5Tff.F90
+++ b/fortran/src/H5Tff.F90
@@ -901,7 +901,7 @@ CONTAINS
 !  h5tset_sign_f
 !
 ! PURPOSE
-!  Sets the sign proprety for an integer type.
+!  Sets the sign property for an integer type.
 !
 ! INPUTS
 !  type_id 	 - datatype identifier
diff --git a/fortran/test/tH5A.F90 b/fortran/test/tH5A.F90
index 115ce70..f846128 100644
--- a/fortran/test/tH5A.F90
+++ b/fortran/test/tH5A.F90
@@ -383,41 +383,41 @@ CONTAINS
      CALL h5dopen_f(file_id, dsetname, dset_id, error)
      CALL check("h5dopen_f",error,total_error)
      !
-     !open the String attrbute by name
+     !open the String attribute by name
      !
      CALL h5aopen_name_f(dset_id, aname, attr_id, error)
      CALL check("h5aopen_name_f",error,total_error)
 
      !
-     !open the CHARACTER attrbute by name
+     !open the CHARACTER attribute by name
      !
      CALL h5aopen_name_f(dset_id, aname2, attr2_id, error)
      CALL check("h5aopen_name_f",error,total_error)
       !
-     !open the DOUBLE attrbute by name
+     !open the DOUBLE attribute by name
      !
      CALL h5aopen_name_f(dset_id, aname3, attr3_id, error)
      CALL check("h5aopen_name_f",error,total_error)
      !
-     !open the REAL attrbute by name
+     !open the REAL attribute by name
      !
      CALL h5aopen_name_f(dset_id, aname4, attr4_id, error)
      CALL check("h5aopen_name_f",error,total_error)
 
      !
-     !open the INTEGER attrbute by name
+     !open the INTEGER attribute by name
      !
      CALL h5aopen_name_f(dset_id, aname5, attr5_id, error)
      CALL check("h5aopen_name_f",error,total_error)
 
      !
-     !open the NULL attrbute by name
+     !open the NULL attribute by name
      !
      CALL h5aopen_name_f(dset_id, aname6, attr6_id, error)
      CALL check("h5aopen_name_f",error,total_error)
 
      !
-     !get the attrbute name
+     !get the attribute name
      !
      CALL h5aget_name_f(attr5_id, name_size, attr_name, error)
      CALL check("h5aget_name_f",error,total_error)
@@ -429,44 +429,44 @@ CONTAINS
      END IF
 
      !
-     !get the STRING attrbute space
+     !get the STRING attribute space
      !
      CALL h5aget_space_f(attr_id, attr_space, error)
      CALL check("h5aget_space_f",error,total_error)
      !
-     !get other attrbute space
+     !get other attribute space
      !
      CALL h5aget_space_f(attr2_id, attr2_space, error)
      CALL check("h5aget_space_f",error,total_error)
      !
-     !get the string attrbute datatype
+     !get the string attribute datatype
      !
      CALL h5aget_type_f(attr_id, attr_type, error)
      CALL check("h5aget_type_f",error,total_error)
      !
-     !get the character attrbute datatype
+     !get the character attribute datatype
      !
      CALL h5aget_type_f(attr2_id, attr2_type, error)
      CALL check("h5aget_type_f",error,total_error)
      !
-     !get the double attrbute datatype
+     !get the double attribute datatype
      !
      CALL h5aget_type_f(attr3_id, attr3_type, error)
      CALL check("h5aget_type_f",error,total_error)
      !
-     !get the real attrbute datatype
+     !get the real attribute datatype
      !
      CALL h5aget_type_f(attr4_id, attr4_type, error)
      CALL check("h5aget_type_f",error,total_error)
 
      !
-     !get the integer attrbute datatype
+     !get the integer attribute datatype
      !
      CALL h5aget_type_f(attr5_id, attr5_type, error)
      CALL check("h5aget_type_f",error,total_error)
 
      !
-     !get the null attrbute datatype
+     !get the null attribute datatype
      !
      CALL h5aget_type_f(attr6_id, attr6_type, error)
      CALL check("h5aget_type_f",error,total_error)
@@ -497,7 +497,7 @@ CONTAINS
      CALL check("h5aread_f",error,total_error)
 
      IF ( (aread_data(1) .NE. attr_data(1)) .OR. (aread_data(2) .NE. attr_data(2)) ) THEN
-         WRITE(*,*) "Read back string attrbute is wrong", aread_data(1), aread_data(2)
+         WRITE(*,*) "Read back string attribute is wrong", aread_data(1), aread_data(2)
          total_error = total_error + 1
      END IF
 
@@ -507,7 +507,7 @@ CONTAINS
      CALL h5aread_f(attr2_id, H5T_NATIVE_CHARACTER, aread_character_data, data_dims, error)
      CALL check("h5aread_f",error,total_error)
      IF (aread_character_data .NE. 'A' ) THEN
-         WRITE(*,*) "Read back character attrbute is wrong ",aread_character_data
+         WRITE(*,*) "Read back character attribute is wrong ",aread_character_data
          total_error = total_error + 1
      END IF
      !
@@ -516,7 +516,7 @@ CONTAINS
      data_dims(1) = 1
      CALL h5aread_f(attr3_id, H5T_NATIVE_DOUBLE, aread_double_data, data_dims, error)
      CALL check("h5aread_f",error,total_error)
-     CALL VERIFY("Read back double attrbute is wrong", aread_double_data(1),3.459_Fortran_DOUBLE,total_error)
+     CALL VERIFY("Read back double attribute is wrong", aread_double_data(1),3.459_Fortran_DOUBLE,total_error)
 
      !
      !read the real attribute data back to memory
@@ -524,7 +524,7 @@ CONTAINS
      data_dims(1) = 1
      CALL h5aread_f(attr4_id, H5T_NATIVE_REAL, aread_real_data, data_dims, error)
      CALL check("h5aread_f",error,total_error)
-     CALL VERIFY("Read back real attrbute is wrong", aread_real_data(1),4.0,total_error)
+     CALL VERIFY("Read back real attribute is wrong", aread_real_data(1),4.0,total_error)
      !
      !read the Integer attribute data back to memory
      !
@@ -532,7 +532,7 @@ CONTAINS
      CALL h5aread_f(attr5_id, H5T_NATIVE_INTEGER, aread_integer_data, data_dims, error)
      CALL check("h5aread_f",error,total_error)
      IF (aread_integer_data(1) .NE. 5 ) THEN
-         WRITE(*,*) "Read back integer attrbute is wrong ", aread_integer_data
+         WRITE(*,*) "Read back integer attribute is wrong ", aread_integer_data
          total_error = total_error + 1
      END IF
      !
@@ -542,7 +542,7 @@ CONTAINS
      CALL h5aread_f(attr6_id, H5T_NATIVE_INTEGER, aread_null_data, data_dims, error)
      CALL check("h5aread_f",error,total_error)
      IF (aread_null_data(1) .NE. 7 ) THEN
-         WRITE(*,*) "Read back null attrbute is wrong ", aread_null_data
+         WRITE(*,*) "Read back null attribute is wrong ", aread_null_data
          total_error = total_error + 1
      END IF
 
diff --git a/fortran/test/tH5T.F90 b/fortran/test/tH5T.F90
index d24ac89..7673993 100644
--- a/fortran/test/tH5T.F90
+++ b/fortran/test/tH5T.F90
@@ -862,7 +862,7 @@ CONTAINS
     CALL h5fcreate_f(fix_filename,H5F_ACC_TRUNC_F,file_id,error)
     CALL check("h5fcreate_f", error, total_error)
     !
-    ! Create enumeration datatype with tow values
+    ! Create enumeration datatype with two values
     !
     CALL h5tenum_create_f(H5T_NATIVE_INTEGER,dtype_id,error)
     CALL check("h5tenum_create_f", error, total_error)
@@ -871,7 +871,7 @@ CONTAINS
     CALL h5tenum_insert_f(dtype_id,false,DATA(2),error)
     CALL check("h5tenum_insert_f", error, total_error)
     !
-    ! Create write  and close a dataset with enum datatype
+    ! Create write and close a dataset with enum datatype
     !
     CALL h5screate_simple_f(1,dsize,dspace_id,error)
     CALL check("h5screate_simple_f", error, total_error)
diff --git a/hl/src/H5LDpublic.h b/hl/src/H5LDpublic.h
index e42c8d8..fed0c1c 100644
--- a/hl/src/H5LDpublic.h
+++ b/hl/src/H5LDpublic.h
@@ -107,7 +107,7 @@ H5_HLDLL size_t H5LDget_dset_type_size(hid_t did, const char *fields);
  *          selected from the dataset. Note that \p cur_dims must have
  *          at least one dimension whose size is greater than the
  *          corresponding dimension in \p prev_dims. Users can
- *          determine the size of buf by multipling the datatype
+ *          determine the size of buf by multiplying the datatype
  *          size of the dataset by the number of selected elements.
  *
  *          If the parameter \p fields is NULL, this routine returns
diff --git a/hl/src/H5LTanalyze.c b/hl/src/H5LTanalyze.c
index aaa5db8..e14e9dc 100644
--- a/hl/src/H5LTanalyze.c
+++ b/hl/src/H5LTanalyze.c
@@ -30,7 +30,7 @@
 #pragma warning(push, 1)                                          
 #endif                                                            
 #line 2 "hl/src//H5LTanalyze.c"
-/* Quiet warnings about integer type macro redifinitions on Visual Studio
+/* Quiet warnings about integer type macro redefinitions on Visual Studio
  * (MSVC doesn't define STDC_VERSION, but has inttypes.h). This is an
  * issue that is apparently fixed in flex 2.6.5.
  */
diff --git a/hl/src/H5LTanalyze.l b/hl/src/H5LTanalyze.l
index fd014a4..84a2562 100644
--- a/hl/src/H5LTanalyze.l
+++ b/hl/src/H5LTanalyze.l
@@ -18,7 +18,7 @@
  */
 
 %top{
-/* Quiet warnings about integer type macro redifinitions on Visual Studio
+/* Quiet warnings about integer type macro redefinitions on Visual Studio
  * (MSVC doesn't define STDC_VERSION, but has inttypes.h). This is an
  * issue that is apparently fixed in flex 2.6.5.
  */
diff --git a/java/src/hdf/hdf5lib/H5.java b/java/src/hdf/hdf5lib/H5.java
index ecf5eff..56e2170 100644
--- a/java/src/hdf/hdf5lib/H5.java
+++ b/java/src/hdf/hdf5lib/H5.java
@@ -2269,7 +2269,7 @@ public class H5 implements java.io.Serializable {
      * @param src_did
      *            the identifier of the source dataset
      * @param dst_did
-     *            the identifier of the destinaiton dataset
+     *            the identifier of the destination dataset
      *
      * @return a non-negative value if successful
      *
@@ -9788,7 +9788,7 @@ public class H5 implements java.io.Serializable {
      * @param expression
      *            IN: Pointer to the null-terminated data transform expression
      *
-     * @return a non-negative valule if successful; otherwise returns a negative value.
+     * @return a non-negative value if successful; otherwise returns a negative value.
      *
      * @exception HDF5LibraryException
      *            Error from the HDF-5 Library.
@@ -10007,7 +10007,7 @@ public class H5 implements java.io.Serializable {
      * @param crt_intermed_group
      *            IN: Flag specifying whether to create intermediate groups upon the creation of an object
      *
-     * @return a non-negative valule if successful; otherwise returns a negative value.
+     * @return a non-negative value if successful; otherwise returns a negative value.
      *
      * @exception HDF5LibraryException
      *            Error from the HDF-5 Library.
@@ -13654,7 +13654,7 @@ public class H5 implements java.io.Serializable {
     public synchronized static native int H5Tget_sign(long type_id) throws HDF5LibraryException;
 
     /**
-     * H5Tset_sign sets the sign proprety for an integer type.
+     * H5Tset_sign sets the sign property for an integer type.
      *
      * @param type_id
      *            IN: Identifier of datatype to set.
diff --git a/java/src/hdf/hdf5lib/exceptions/HDF5LibraryException.java b/java/src/hdf/hdf5lib/exceptions/HDF5LibraryException.java
index 2a4c8c7..7c9773f 100644
--- a/java/src/hdf/hdf5lib/exceptions/HDF5LibraryException.java
+++ b/java/src/hdf/hdf5lib/exceptions/HDF5LibraryException.java
@@ -350,7 +350,7 @@ public class HDF5LibraryException extends HDF5Exception {
 
     /**
      * Prints this <code>HDF5LibraryException</code>, the HDF-5 Library error
-     * stack, and and the Java stack trace to the standard error stream.
+     * stack, and the Java stack trace to the standard error stream.
      */
     @Override
     public void printStackTrace()
@@ -362,7 +362,7 @@ public class HDF5LibraryException extends HDF5Exception {
 
     /**
      * Prints this <code>HDF5LibraryException</code> the HDF-5 Library error
-     * stack, and and the Java stack trace to the specified print stream.
+     * stack, and the Java stack trace to the specified print stream.
      *
      * @param f
      *            the file print stream.
diff --git a/test/cache.c b/test/cache.c
index 3c6c818..e564289 100644
--- a/test/cache.c
+++ b/test/cache.c
@@ -9861,7 +9861,7 @@ check_flush_cache__flush_op_eviction_test(H5F_t *file_ptr)
  *         Added tests for pinned entries.
  *
  *         JRM -- 5/17/06
- *         Complete reqrite of pinned entry tests to accommodate
+ *         Complete rewrite of pinned entry tests to accommodate
  *         the new H5C_mark_entry_dirty() call.
  *
  *-------------------------------------------------------------------------
@@ -33494,7 +33494,7 @@ cedds__H5C_flush_invalidate_cache__bucket_scan(H5F_t *file_ptr)
 
     if (pass) {
 
-        /* load the entry that will have a flush dependencey with (MET, 0),
+        /* load the entry that will have a flush dependency with (MET, 0),
          * thus preventing it from being flushed on the first pass through
          * the skip list.
          */
diff --git a/test/cache_common.c b/test/cache_common.c
index 5146073..8a56027 100644
--- a/test/cache_common.c
+++ b/test/cache_common.c
@@ -922,7 +922,7 @@ notify_image_len(const void *thing, size_t *image_length)
 /*-------------------------------------------------------------------------
  * Function:    pre_serialize & friends
  *
- * Purpose:    Pre_serialize the supplied entry.  For now this consistes of
+ * Purpose:    Pre_serialize the supplied entry.  For now this consists of
  *         executing any flush operations and loading the appropriate
  *        values into *new_addr_ptr, *new_len_ptr, and *flags_ptr.
  *
@@ -1086,7 +1086,7 @@ notify_pre_serialize(H5F_t *f, void *thing, haddr_t addr, size_t len, haddr_t *n
 /*-------------------------------------------------------------------------
  * Function:    serialize & friends
  *
- * Purpose:    Serialize the supplied entry.  For now this consistes of
+ * Purpose:    Serialize the supplied entry.  For now this consists of
  *         loading the type and index of the entry into the first
  *         three bytes of the image (if it is long enough -- if not
  *         just load the low order byte of the index into the first
diff --git a/test/cache_common.h b/test/cache_common.h
index acc05f0..24ce509 100644
--- a/test/cache_common.h
+++ b/test/cache_common.h
@@ -253,7 +253,7 @@ typedef struct flush_op {
 
 typedef enum test_entry_action_t {
     TEST_ENTRY_ACTION_NUL = 0, /* No action on entry */
-    TEST_ENTRY_ACTION_MOVE     /* Entry is beging moved */
+    TEST_ENTRY_ACTION_MOVE     /* Entry is being moved */
 } test_entry_action_t;
 
 typedef struct test_entry_t {
@@ -372,7 +372,7 @@ typedef struct test_entry_t {
                                                       * been resized by a resize flush
                                                       * op, and the flush function has
                                                       * not yet returned,  This field is
-                                                      * used to turn off overactive santity
+                                                      * used to turn off overactive sanity
                                                       * checking code that would otherwise
                                                       * cause a false test failure.
                                                       */
diff --git a/test/chunk_info.c b/test/chunk_info.c
index 3fdc77d..877a182 100644
--- a/test/chunk_info.c
+++ b/test/chunk_info.c
@@ -922,7 +922,7 @@ test_chunk_info_single_chunk(const char *filename, hid_t fapl)
     if (ret != FAIL)
         TEST_ERROR;
 
-    /* Release resourse */
+    /* Release resource */
     if (H5Dclose(dset) < 0)
         TEST_ERROR;
     if (H5Sclose(dspace) < 0)
@@ -1039,7 +1039,7 @@ test_chunk_info_implicit(char *filename, hid_t fapl)
                 FAIL_PUTS_ERROR("Verification of H5Dget_chunk_info_by_coord failed\n");
         }
 
-    /* Release resourse */
+    /* Release resource */
     if (H5Dclose(dset) < 0)
         TEST_ERROR;
     if (H5Sclose(dspace) < 0)
@@ -1184,7 +1184,7 @@ test_chunk_info_fixed_array(const char *filename, hid_t fapl)
     /* Read and verify values of selected chunks */
     if (verify_selected_chunks(dset, H5P_DEFAULT, start, end) < 0)
 
-        /* Release resourse */
+        /* Release resource */
         if (H5Dclose(dset) < 0)
             TEST_ERROR;
     if (H5Sclose(dspace) < 0)
@@ -1333,7 +1333,7 @@ test_chunk_info_extensible_array(const char *filename, hid_t fapl)
     /* Read and verify values of selected chunks */
     if (verify_selected_chunks(dset, H5P_DEFAULT, start, end) < 0)
 
-        /* Release resourse */
+        /* Release resource */
         if (H5Dclose(dset) < 0)
             TEST_ERROR;
     if (H5Sclose(dspace) < 0)
@@ -1482,7 +1482,7 @@ test_chunk_info_version2_btrees(const char *filename, hid_t fapl)
     /* Read and verify values of selected chunks */
     if (verify_selected_chunks(dset, H5P_DEFAULT, start, end) < 0)
 
-        /* Release resourse */
+        /* Release resource */
         if (H5Dclose(dset) < 0)
             TEST_ERROR;
     if (H5Sclose(dspace) < 0)
@@ -1746,7 +1746,7 @@ test_basic_query(hid_t fapl)
     if (cptr != &(chunk_infos[1]))
         FAIL_PUTS_ERROR("Verification of halted iterator failed");
 
-    /* Release resourse */
+    /* Release resource */
     if (H5Dclose(dset) < 0)
         TEST_ERROR;
     if (H5Sclose(dspace) < 0)
@@ -1875,7 +1875,7 @@ test_failed_attempts(const char *filename, hid_t fapl)
     if (ret != FAIL)
         FAIL_PUTS_ERROR("    Attempt a chunk query function on a contiguous dataset.");
 
-    /* Release resourse */
+    /* Release resource */
     if (H5Dclose(dset) < 0)
         TEST_ERROR;
     if (H5Sclose(dspace) < 0)
@@ -2151,7 +2151,7 @@ test_flt_msk_with_skip_compress(hid_t fapl)
     if (verify_get_chunk_info_by_coord(dset, offset, CHK_SIZE, flt_msk) == FAIL)
         FAIL_PUTS_ERROR("Verification of H5Dget_chunk_info_by_coord failed\n");
 
-    /* Release resourse */
+    /* Release resource */
     if (H5Dclose(dset) < 0)
         TEST_ERROR;
     if (H5Sclose(mem_space) < 0)
diff --git a/test/dsets.c b/test/dsets.c
index 6397d3d..d26e2c7 100644
--- a/test/dsets.c
+++ b/test/dsets.c
@@ -1827,7 +1827,7 @@ filter_corrupt(unsigned int flags, size_t cd_nelmts, const unsigned int *cd_valu
         TEST_ERROR;
     HDmemset(data, (int)value, (size_t)length);
 
-    if (flags & H5Z_FLAG_REVERSE) { /* Varify data is actually corrupted during read */
+    if (flags & H5Z_FLAG_REVERSE) { /* Verify data is actually corrupted during read */
         dst += offset;
         if (HDmemcmp(data, dst, (size_t)length) != 0)
             TEST_ERROR;
@@ -7722,7 +7722,7 @@ test_missing_chunk(hid_t file)
     if (H5Dread(did2, H5T_NATIVE_INT, H5S_ALL, H5S_ALL, H5P_DEFAULT, rdata2_bytes) < 0)
         TEST_ERROR;
 
-    /* Validata values read for the 1-D dataset */
+    /* Validate values read for the 1-D dataset */
     for (u = 0; u < MISSING_CHUNK_DIM; u++) {
         if ((u % 10) >= 5) {
             if (rdata[u] != 911) {
@@ -7739,7 +7739,7 @@ test_missing_chunk(hid_t file)
         }     /* end else */
     }         /* end for */
 
-    /* Validata values read for the 2-D dataset */
+    /* Validate values read for the 2-D dataset */
     for (i = 0; i < MISSING_CHUNK_DIM; i++) {
         for (j = 0; j < MISSING_CHUNK_DIM; j++) {
 
diff --git a/test/file_image.c b/test/file_image.c
index d25f131..a36892a 100644
--- a/test/file_image.c
+++ b/test/file_image.c
@@ -610,7 +610,7 @@ test_core(void)
     VERIFY((udata->used_callbacks == MALLOC) || (udata->used_callbacks == (MALLOC | UDATA_COPY | UDATA_FREE)),
            "opening a core file used the wrong callbacks");
     VERIFY(udata->malloc_src == H5FD_FILE_IMAGE_OP_FILE_OPEN,
-           "Malloc callback came from wrong sourc in core open");
+           "Malloc callback came from wrong source in core open");
 
     /* Close file */
     reset_udata(udata);
@@ -618,7 +618,7 @@ test_core(void)
     VERIFY(ret >= 0, "H5Fclose failed");
     VERIFY(udata->used_callbacks == FREE, "Closing a core file used the wrong callbacks");
     VERIFY(udata->free_src == H5FD_FILE_IMAGE_OP_FILE_CLOSE,
-           "Free callback came from wrong sourc in core close");
+           "Free callback came from wrong source in core close");
 
     /* Reopen file */
     file = H5Fopen(copied_filename, H5F_ACC_RDWR, fapl);
@@ -654,7 +654,7 @@ test_core(void)
     VERIFY(ret >= 0, "H5Fclose failed");
     VERIFY(udata->used_callbacks == (FREE), "Closing a core file used the wrong callbacks");
     VERIFY(udata->free_src == H5FD_FILE_IMAGE_OP_FILE_CLOSE,
-           "Free callback came from wrong sourc in core close");
+           "Free callback came from wrong source in core close");
 
     /* Create file image buffer */
     fd = HDopen(copied_filename, O_RDONLY);
diff --git a/test/h5test.c b/test/h5test.c
index 3df2807..87758f6 100644
--- a/test/h5test.c
+++ b/test/h5test.c
@@ -1386,7 +1386,7 @@ h5_szip_can_encode(void)
  *     further calls to getenv_all take place.
  *
  * Return:  pointer to a string containing the value of the environment variable
- *     NULL if the varialbe doesn't exist in task 'root's environment.
+ *     NULL if the variable doesn't exist in task 'root's environment.
  *
  * Programmer:  Leon Arber
  *              4/4/05
diff --git a/test/hdfs.c b/test/hdfs.c
index f114ed1..06cd7cc 100644
--- a/test/hdfs.c
+++ b/test/hdfs.c
@@ -52,7 +52,7 @@
  *     4) Configurable expected-actual order in generated comparison strings.
  *        Some prefer `VERIFY(expected, actual)`, others
  *        `VERIFY(actual, expected)`. Provide preprocessor ifdef switch
- *        to satifsy both parties, assuming one paradigm per test file.
+ *        to satisfy both parties, assuming one paradigm per test file.
  *        (One could #undef and redefine the flag through the file as desired,
  *         but _why_.)
  *
diff --git a/test/objcopy.c b/test/objcopy.c
index beb272b..72ebbcc 100644
--- a/test/objcopy.c
+++ b/test/objcopy.c
@@ -3998,7 +3998,7 @@ test_copy_dataset_chunked_empty(hid_t fcpl_src, hid_t fcpl_dst, hid_t src_fapl,
     if ((did = H5Dopen2(fid_src, NAME_DATASET_CHUNKED3, H5P_DEFAULT)) < 0)
         TEST_ERROR;
 
-    /* open the copied dataset NAME_DATASET_CHUNKED3 at destinaion */
+    /* open the copied dataset NAME_DATASET_CHUNKED3 at destination */
     if ((did2 = H5Dopen2(fid_dst, NAME_DATASET_CHUNKED3, H5P_DEFAULT)) < 0)
         TEST_ERROR;
 
@@ -11069,7 +11069,7 @@ typedef struct cmpd_vl_t {
  *              Failure:        number of errors
  *
  * Programmer:  Neil Fortner
- *              Tuseday, September 29, 2009
+ *              Tuesday, September 29, 2009
  *
  *-------------------------------------------------------------------------
  */
diff --git a/test/onion.c b/test/onion.c
index 96a4970..e731b6f 100644
--- a/test/onion.c
+++ b/test/onion.c
@@ -2120,7 +2120,7 @@ test_create_oniontarget(hbool_t truncate_canonical, hbool_t with_initial_data)
         TEST_ERROR;
     vfile_raw = NULL;
 
-    /* R/O open the file with Onion VFD; inspect logial file */
+    /* R/O open the file with Onion VFD; inspect logical file */
 
     vfile_ro = H5FDopen(paths->canon, H5F_ACC_RDONLY, fapl_id, HADDR_UNDEF);
     if (NULL == vfile_ro)
diff --git a/test/reserved.c b/test/reserved.c
index 08e747e..22f1764 100644
--- a/test/reserved.c
+++ b/test/reserved.c
@@ -509,8 +509,7 @@ main(void)
         return num_errs;
     }
     else {
-        HDputs(
-            "All address space reservation tests skippped - Incompatible with current Virtual File Driver");
+        HDputs("All address space reservation tests skipped - Incompatible with current Virtual File Driver");
     }
 #endif /* BROKEN */
 
diff --git a/test/ros3.c b/test/ros3.c
index 2bfca96..bc9eb86 100644
--- a/test/ros3.c
+++ b/test/ros3.c
@@ -56,7 +56,7 @@
  *     4) Configurable expected-actual order in generated comparison strings.
  *        Some prefer `VERIFY(expected, actual)`, others
  *        `VERIFY(actual, expected)`. Provide preprocessor ifdef switch
- *        to satifsy both parties, assuming one paradigm per test file.
+ *        to satisfy both parties, assuming one paradigm per test file.
  *        (One could #undef and redefine the flag through the file as desired,
  *         but _why_.)
  *
diff --git a/test/s3comms.c b/test/s3comms.c
index d3998f3..d68cc84 100644
--- a/test/s3comms.c
+++ b/test/s3comms.c
@@ -47,7 +47,7 @@
  *     4) Configurable expected-actual order in generated comparison strings.
  *        Some prefer `VERIFY(expected, actual)`, others
  *        `VERIFY(actual, expected)`. Provide preprocessor ifdef switch
- *        to satifsy both parties, assuming one paradigm per test file.
+ *        to satisfy both parties, assuming one paradigm per test file.
  *        (One could #undef and redefine the flag through the file as desired,
  *         but _why_.)
  *        Provided as courtesy, per consideration for inclusion in the library
@@ -1374,7 +1374,7 @@ test_nlowercase(void)
         HDfree(dest);
     } /* end for each testcase */
 
-    JSVERIFY(FAIL, H5FD_s3comms_nlowercase(NULL, cases[0].in, cases[0].len), "null distination should fail")
+    JSVERIFY(FAIL, H5FD_s3comms_nlowercase(NULL, cases[0].in, cases[0].len), "null destination should fail")
 
     PASSED();
     return 0;
diff --git a/test/swmr_common.c b/test/swmr_common.c
index 9063ddd..159f068 100644
--- a/test/swmr_common.c
+++ b/test/swmr_common.c
@@ -190,7 +190,7 @@ generate_name(char *name_buf, size_t name_buf_length, unsigned level, unsigned c
 /*-------------------------------------------------------------------------
  * Function:    generate_symbols
  *
- * Purpose:     Initializes the global dataset infomration arrays.
+ * Purpose:     Initializes the global dataset information arrays.
  *
  * Parameters:  N/A
  *
diff --git a/test/swmr_sparse_writer.c b/test/swmr_sparse_writer.c
index 96eff6c..0c8e391 100644
--- a/test/swmr_sparse_writer.c
+++ b/test/swmr_sparse_writer.c
@@ -149,7 +149,7 @@ add_records(hid_t fid, unsigned verbose, unsigned long nrecords, unsigned long f
     symbol_t      record;            /* The record to add to the dataset */
     unsigned long rec_to_flush;      /* # of records left to write before flush */
 #ifdef OUT
-    volatile int dummy;            /* Dummy varialbe for busy sleep */
+    volatile int dummy;            /* Dummy variable for busy sleep */
 #endif                             /* OUT */
     hsize_t       dim[2] = {1, 0}; /* Dataspace dimensions */
     unsigned long u, v;            /* Local index variables */
diff --git a/test/tfile.c b/test/tfile.c
index f8e0a0a..f122f68 100644
--- a/test/tfile.c
+++ b/test/tfile.c
@@ -1153,7 +1153,7 @@ test_get_obj_ids(void)
     CHECK(oid_count, FAIL, "H5Fget_obj_count");
     VERIFY(oid_count, NGROUPS + 2, "H5Fget_obj_count");
 
-    /* Get the IDs of the left opend objects */
+    /* Get the IDs of the left opened objects */
     ret_count = H5Fget_obj_ids(fid, H5F_OBJ_ALL, (size_t)oid_list_size, oid_list);
     CHECK(ret_count, FAIL, "H5Fget_obj_ids");
     VERIFY(ret_count, oid_list_size, "H5Fget_obj_count");
diff --git a/test/tselect.c b/test/tselect.c
index cc5f96d..c402f3f 100644
--- a/test/tselect.c
+++ b/test/tselect.c
@@ -6785,7 +6785,7 @@ test_select_point_chunk(void)
 
     /* Verify data (later) */
 
-    /* Close everything (inclusing selections) */
+    /* Close everything (including selections) */
     ret = H5Sclose(pnt1_space);
     CHECK(ret, FAIL, "H5Sclose");
     ret = H5Sclose(pnt2_space);
@@ -10957,7 +10957,7 @@ test_shape_same_dr__full_space_vs_slice(int test_num, int small_rank, int large_
 **         m-cube (m >= n).
 **
 **    2) The dimensions selected in the slice through the m-cube
-**       are the dimesnions with the most quickly changing
+**       are the dimensions with the most quickly changing
 **       indices.
 **
 ****************************************************************/
diff --git a/test/twriteorder.c b/test/twriteorder.c
index c58b030..c7984e7 100644
--- a/test/twriteorder.c
+++ b/test/twriteorder.c
@@ -294,7 +294,7 @@ write_wo_file(void)
         return -1;
     }
 
-    /* all writes done. return succeess. */
+    /* all writes done. return success. */
 #ifdef DEBUG
     HDprintf("wrote %d blocks\n", nlinkedblock_g);
 #endif
diff --git a/testpar/t_2Gio.c b/testpar/t_2Gio.c
index 2f50e5f..5a96fa10 100644
--- a/testpar/t_2Gio.c
+++ b/testpar/t_2Gio.c
@@ -3493,7 +3493,7 @@ test_actual_io_mode(int selection_mode)
              * process. To get mixed I/O, have the root select all chunks and each
              * subsequent process select the first and nth chunk. The first chunk,
              * accessed by all, will be assigned collective I/O while each other chunk
-             * will be accessed only by the root and the nth procecess and will be
+             * will be accessed only by the root and the nth process and will be
              * assigned independent I/O. Each process will access one chunk collectively
              * and at least one chunk independently, reporting mixed I/O.
              */
diff --git a/testpar/t_bigio.c b/testpar/t_bigio.c
index 68e828d..2bd4006 100644
--- a/testpar/t_bigio.c
+++ b/testpar/t_bigio.c
@@ -1250,7 +1250,7 @@ create_faccess_plist(MPI_Comm comm, MPI_Info info, int l_facc_type)
  */
 
 /* ------------------------------------------------------------------------
- *  Descriptions for the selection: One big singluar selection inside one chunk
+ *  Descriptions for the selection: One big singular selection inside one chunk
  *  Two dimensions,
  *
  *  dim1       = space_dim1(5760)*mpi_size
diff --git a/testpar/t_cache.c b/testpar/t_cache.c
index d940fb2..f665578 100644
--- a/testpar/t_cache.c
+++ b/testpar/t_cache.c
@@ -248,7 +248,7 @@ int *data_index = NULL;
  * in which no acks are sent after writes.  Instead, the metadata cache is
  * provided with a callback function to call after each sequence of writes.
  * This callback simply causes the client to send the server process a
- * "sync" message and and await an ack in reply.
+ * "sync" message and await an ack in reply.
  *
  * Strangely, at least on Phoenix, the first solution runs faster by a
  * rather large margin.  However, I can imagine this changing with
diff --git a/testpar/t_cache_image.c b/testpar/t_cache_image.c
index c9aa080..762146f 100644
--- a/testpar/t_cache_image.c
+++ b/testpar/t_cache_image.c
@@ -3600,7 +3600,7 @@ smoke_check_1(MPI_Comm mpi_comm, MPI_Info mpi_info, int mpi_rank, int mpi_size)
  * Purpose:     Run parallel tests on the cache image feature.
  *
  *              At present, cache image is disabled in parallel, and
- *              thus these tests are restructed to verifying that a
+ *              thus these tests are restricted to verifying that a
  *              file with a cache image can be opened in the parallel
  *              case, and verifying that instructions to create a
  *              cache image are ignored in the parallel case.
diff --git a/testpar/t_coll_chunk.c b/testpar/t_coll_chunk.c
index f711601..87e3b6a 100644
--- a/testpar/t_coll_chunk.c
+++ b/testpar/t_coll_chunk.c
@@ -53,7 +53,7 @@ static void coll_chunktest(const char *filename, int chunk_factor, int select_fa
  */
 
 /* ------------------------------------------------------------------------
- *  Descriptions for the selection: One big singluar selection inside one chunk
+ *  Descriptions for the selection: One big singular selection inside one chunk
  *  Two dimensions,
  *
  *  dim1       = SPACE_DIM1(5760)*mpi_size
diff --git a/testpar/t_dset.c b/testpar/t_dset.c
index 1504791..c9cade7 100644
--- a/testpar/t_dset.c
+++ b/testpar/t_dset.c
@@ -3051,7 +3051,7 @@ test_actual_io_mode(int selection_mode)
              * process. To get mixed I/O, have the root select all chunks and each
              * subsequent process select the first and nth chunk. The first chunk,
              * accessed by all, will be assigned collective I/O while each other chunk
-             * will be accessed only by the root and the nth procecess and will be
+             * will be accessed only by the root and the nth process and will be
              * assigned independent I/O. Each process will access one chunk collectively
              * and at least one chunk independently, reporting mixed I/O.
              */
diff --git a/testpar/t_ph5basic.c b/testpar/t_ph5basic.c
index 59f14cb..f8d4129 100644
--- a/testpar/t_ph5basic.c
+++ b/testpar/t_ph5basic.c
@@ -141,7 +141,7 @@ test_fapl_mpio_dup(void)
     VRFY((ret >= 0), "H5Pget_fapl_mpio neither");
 
     /* now get both and check validity too. */
-    /* Donot free the returned objects which are used in the next case. */
+    /* Do not free the returned objects which are used in the next case. */
     ret = H5Pget_fapl_mpio(acc_pl, &comm_tmp, &info_tmp);
     VRFY((ret >= 0), "H5Pget_fapl_mpio");
     MPI_Comm_size(comm_tmp, &mpi_size_tmp);
diff --git a/testpar/t_shapesame.c b/testpar/t_shapesame.c
index 201f331..cbae5e1 100644
--- a/testpar/t_shapesame.c
+++ b/testpar/t_shapesame.c
@@ -736,7 +736,7 @@ contig_hs_dr_pio_test__d2m_l2s(struct hs_dr_pio_test_vars_t *tv_ptr)
      * of the large data set.  However, in the parallel version, each
      * process only works with that slice of the large cube indicated
      * by its rank -- hence we set the most slowly changing index to
-     * mpi_rank, and don't itterate over it.
+     * mpi_rank, and don't iterate over it.
      */
 
     if (PAR_SS_DR_MAX_RANK - tv_ptr->large_rank == 0) {
@@ -966,7 +966,7 @@ contig_hs_dr_pio_test__d2m_s2l(struct hs_dr_pio_test_vars_t *tv_ptr)
      *
      * However, in the parallel version, each process only works with that
      * slice of the large (and small) data set indicated by its rank -- hence
-     * we set the most slowly changing index to mpi_rank, and don't itterate
+     * we set the most slowly changing index to mpi_rank, and don't iterate
      * over it.
      */
 
@@ -1223,7 +1223,7 @@ contig_hs_dr_pio_test__m2d_l2s(struct hs_dr_pio_test_vars_t *tv_ptr)
      *
      * However, in the parallel version, each process only works with that
      * slice of the large (and small) data set indicated by its rank -- hence
-     * we set the most slowly changing index to mpi_rank, and don't itterate
+     * we set the most slowly changing index to mpi_rank, and don't iterate
      * over it.
      */
 
@@ -2607,7 +2607,7 @@ ckrbrd_hs_dr_pio_test__d2m_l2s(struct hs_dr_pio_test_vars_t *tv_ptr)
      * of the large data set.  However, in the parallel version, each
      * process only works with that slice of the large cube indicated
      * by its rank -- hence we set the most slowly changing index to
-     * mpi_rank, and don't itterate over it.
+     * mpi_rank, and don't iterate over it.
      */
 
     if (PAR_SS_DR_MAX_RANK - tv_ptr->large_rank == 0) {
@@ -2830,7 +2830,7 @@ ckrbrd_hs_dr_pio_test__d2m_s2l(struct hs_dr_pio_test_vars_t *tv_ptr)
      *
      * However, in the parallel version, each process only works with that
      * slice of the large (and small) data set indicated by its rank -- hence
-     * we set the most slowly changing index to mpi_rank, and don't itterate
+     * we set the most slowly changing index to mpi_rank, and don't iterate
      * over it.
      */
 
@@ -3142,7 +3142,7 @@ ckrbrd_hs_dr_pio_test__m2d_l2s(struct hs_dr_pio_test_vars_t *tv_ptr)
      *
      * However, in the parallel version, each process only works with that
      * slice of the large (and small) data set indicated by its rank -- hence
-     * we set the most slowly changing index to mpi_rank, and don't itterate
+     * we set the most slowly changing index to mpi_rank, and don't iterate
      * over it.
      */
 
diff --git a/tools/lib/h5diff.c b/tools/lib/h5diff.c
index 0bad3fe..5312668 100644
--- a/tools/lib/h5diff.c
+++ b/tools/lib/h5diff.c
@@ -182,7 +182,7 @@ is_exclude_path(char *path, h5trav_type_t type, diff_opt_t *opts)
 
     /* search objects in exclude list */
     while (NULL != exclude_path_ptr) {
-        /* if exclude path is is group, exclude its members as well */
+        /* if exclude path is in group, exclude its members as well */
         if (exclude_path_ptr->obj_type == H5TRAV_TYPE_GROUP) {
             ret_cmp = HDstrncmp(exclude_path_ptr->obj_path, path, HDstrlen(exclude_path_ptr->obj_path));
             if (ret_cmp == 0) { /* found matching members */
@@ -246,7 +246,7 @@ is_exclude_attr(const char *path, h5trav_type_t type, diff_opt_t *opts)
 
     /* search objects in exclude list */
     while (NULL != exclude_ptr) {
-        /* if exclude path is is group, exclude its members as well */
+        /* if exclude path is in group, exclude its members as well */
         if (exclude_ptr->obj_type == H5TRAV_TYPE_GROUP) {
             ret_cmp = HDstrncmp(exclude_ptr->obj_path, path, HDstrlen(exclude_ptr->obj_path));
             if (ret_cmp == 0) { /* found matching members */
diff --git a/tools/lib/h5tools_utils.c b/tools/lib/h5tools_utils.c
index f92f8a7..9fbb20b 100644
--- a/tools/lib/h5tools_utils.c
+++ b/tools/lib/h5tools_utils.c
@@ -697,7 +697,7 @@ tmpfile(void)
  * Purpose: Get symbolic link (soft, external) info and its target object type
             (dataset, group, named datatype) and path, if exist
  *
- * Patameters:
+ * Parameters:
  *  - [IN]  fileid : link file id
  *  - [IN]  linkpath : link path
  *  - [OUT] link_info: returning target object info (h5tool_link_info_t)
diff --git a/tools/libtest/h5tools_test_utils.c b/tools/libtest/h5tools_test_utils.c
index 27780a8..9bc3f76 100644
--- a/tools/libtest/h5tools_test_utils.c
+++ b/tools/libtest/h5tools_test_utils.c
@@ -48,7 +48,7 @@
  *     4. Configurable expected-actual order in generated comparison strings.
  *        Some prefer `VERIFY(expected, actual)`, others
  *        `VERIFY(actual, expected)`. Provide preprocessor ifdef switch
- *        to satifsy both parties, assuming one paradigm per test file.
+ *        to satisfy both parties, assuming one paradigm per test file.
  *        (One could #undef and redefine the flag through the file as desired,
  *         but _why_.)
  *
diff --git a/tools/src/h5perf/pio_perf.c b/tools/src/h5perf/pio_perf.c
index 3c54214..1460772 100644
--- a/tools/src/h5perf/pio_perf.c
+++ b/tools/src/h5perf/pio_perf.c
@@ -1688,7 +1688,7 @@ usage(const char *prog)
         HDprintf("  Environment variables:\n");
         HDprintf("  HDF5_NOCLEANUP   Do not remove data files if set [default remove]\n");
         HDprintf("  HDF5_MPI_INFO    MPI INFO object key=value separated by ;\n");
-        HDprintf("  HDF5_PARAPREFIX  Paralllel data files prefix\n");
+        HDprintf("  HDF5_PARAPREFIX  Parallel data files prefix\n");
         fflush(stdout);
     } /* end if */
 } /* end usage() */
diff --git a/tools/src/h5repack/h5repack_copy.c b/tools/src/h5repack/h5repack_copy.c
index 08d7127..924ac1a 100644
--- a/tools/src/h5repack/h5repack_copy.c
+++ b/tools/src/h5repack/h5repack_copy.c
@@ -441,7 +441,7 @@ get_hyperslab(hid_t dcpl_id, int rank_dset, const hsize_t dims_dset[], size_t si
     hsize_t      dims_chunk[H5S_MAX_RANK];
     hsize_t      size_chunk = 1;
     hsize_t      nchunk_fit; /* number of chunks that fits in hyperslab buffer (H5TOOLS_BUFSIZE) */
-    hsize_t      ndatum_fit; /* number of dataum that fits in hyperslab buffer (H5TOOLS_BUFSIZE) */
+    hsize_t      ndatum_fit; /* number of datum that fits in hyperslab buffer (H5TOOLS_BUFSIZE) */
     hsize_t      chunk_dims_map[H5S_MAX_RANK]; /* mapped chunk dimensions */
     hsize_t      hs_dims_map[H5S_MAX_RANK];    /* mapped hyperslab dimensions */
     hsize_t      hslab_nbytes;                 /* size of hyperslab in byte */
diff --git a/tools/test/h5diff/h5diffgentest.c b/tools/test/h5diff/h5diffgentest.c
index a66a7b8..c9a2ad6 100644
--- a/tools/test/h5diff/h5diffgentest.c
+++ b/tools/test/h5diff/h5diffgentest.c
@@ -2752,7 +2752,7 @@ gen_dataset_idx(const char *file, int format)
     hid_t did2 = H5I_INVALID_HID; /* dataset id */
 #endif
 
-    /* Get a copy of the file aaccess property */
+    /* Get a copy of the file access property */
     fapl = H5Pcreate(H5P_FILE_ACCESS);
 
     /* Set the "use the latest format" bounds for creating objects in the file */
diff --git a/tools/test/h5dump/h5dumpgentest.c b/tools/test/h5dump/h5dumpgentest.c
index 08f241c..04c01c6 100644
--- a/tools/test/h5dump/h5dumpgentest.c
+++ b/tools/test/h5dump/h5dumpgentest.c
@@ -7191,7 +7191,7 @@ gent_dataset_idx(void)
     int                       i, j;
     int H5_ATTR_NDEBUG_UNUSED ret;
 
-    /* Get a copy of the file aaccess property */
+    /* Get a copy of the file access property */
     fapl = H5Pcreate(H5P_FILE_ACCESS);
 
     /* Set the "use the latest version of the format" bounds for creating objects in the file */
diff --git a/tools/test/h5format_convert/h5fc_gentest.c b/tools/test/h5format_convert/h5fc_gentest.c
index ccb64b5..5060432 100644
--- a/tools/test/h5format_convert/h5fc_gentest.c
+++ b/tools/test/h5format_convert/h5fc_gentest.c
@@ -63,7 +63,7 @@ const char *FILENAME[] = {"h5fc_ext1_i.h5",   /* 0 */
 /*
  * Function: gen_non()
  *
- * Create a file with SWMR write+non-latest-format--this will result in v3 superbock+latest version support:
+ * Create a file with SWMR write+non-latest-format--this will result in v3 superblock+latest version support:
  *    1) 1 chunked dataset with extensible array chunk indexing type (without data)
  *    2) 1 chunked dataset with version 2 B-tree chunk indexing type (with data)
  * Re-open the file with write+non-latest-format and create:
diff --git a/tools/test/perform/gen_report.pl b/tools/test/perform/gen_report.pl
index a1fbeb0..c853b70 100644
--- a/tools/test/perform/gen_report.pl
+++ b/tools/test/perform/gen_report.pl
@@ -391,7 +391,7 @@ sub plot_default_graph1 {
 	print GNUPLOT_PIPE  "set term x11 1\n";
 	print GNUPLOT_PIPE  "set xlabel \"Number of Processors\"\n";
 	print GNUPLOT_PIPE  "set title \"" . $data_type . " Performance (Speed vs. Num. Procs)\"\n";
-	print GNUPLOT_PIPE  "set ylabel \"Bandwdith (MB/s)\"\n";
+	print GNUPLOT_PIPE  "set ylabel \"Bandwidth (MB/s)\"\n";
 	print GNUPLOT_PIPE  "set label 1 \"Transfer buffer size: " . $transfer_buffer_size . "K\" at graph 0.7, graph 0.7 left \n";
 
 #the next line attempts to hack gnuplot to get around it's inability to linearly scale, but logarithmically label an axis
@@ -435,7 +435,7 @@ sub plot_default_graph2 {
 	print GNUPLOT_PIPE  "set term x11 2\n";
 	print GNUPLOT_PIPE  "set xlabel \"Transfer Buffer Size (in bytes)\"\n";
 	print GNUPLOT_PIPE  "set title \"" . $data_type . " Performance (Speed vs. Transfer Buffer Size)\"\n";
-	print GNUPLOT_PIPE  "set ylabel \"Bandwdith (MB/s)\"\n";
+	print GNUPLOT_PIPE  "set ylabel \"Bandwidth (MB/s)\"\n";
 	print GNUPLOT_PIPE  "set label 1 \"Procs: " . $num_procs_graph . "\" at graph 0.7, graph 0.7 left \n";
 
 #the next line attempts to hack gnuplot to get around it's inability to linearly scale, but logarithmically label an axis
diff --git a/utils/mirror_vfd/mirror_writer.c b/utils/mirror_vfd/mirror_writer.c
index 0fec441..ad7cd91 100644
--- a/utils/mirror_vfd/mirror_writer.c
+++ b/utils/mirror_vfd/mirror_writer.c
@@ -291,7 +291,7 @@ session_start(int socketfd, const H5FD_mirror_xmit_open_t *xmit_open)
 {
     struct mirror_session    *session = NULL;
     struct mirror_writer_opts opts;
-#if 0 /* TODO: behaviro option */
+#if 0 /* TODO: behavior option */
     char logpath[H5FD_MIRROR_XMIT_FILEPATH_MAX] = "";
 #endif