Merge pull request #1106 in HDFFV/hdf5 from ~LRKNOX/hdf5_lrk:1.8/master to 1.8/masterhdf5-1_8_21

* commit '664186b91d9198915baca4c6dca3f7b03695d316': (124 commits)
  Commit HDF5 1.8.21 release version strings.
  Update INSTALL and INSTALL_parallel files to remove references to ancient systems and add generic steps for building HDF5 on HPC clusters.
  Update various INSTALL files for 1.8.21 release.
  Add missing space and correct typo.
  Modified a section for newly supported systems and compilers (vs. 1.8.20 release); Brought edits for tools bug fixes from 1.10.2 RELEASE.txt as we agreed with Allen.
  It is my test under Larry's guidance.
  Remove build directory which was unintentionally committed.
  Updated MANIFEST
  Switch default build mode to production. Update version to 1.8.21 in anticipation of release.
  Fixed EED-319 Description:     Added an html version for the C++ function mapping table and removed     the single web page version.     Updated cpp_doc_config to use the html file.     Fixed some typos.     Running "doxygen cpp_doc_config" successfully.
  HDFFV-10473 fix HDFFV-10398 attribute location
  Add missing C++ entries to RELEASE.txt.
  pre1 release.
  Add missing RELEASE.txt entries for C++.
  Update Windows test machines
  Fix soversion naming and update cmake scripts
  Update version in RELEASE.txt. Correct merge errors from hdf5_1_8.
  Fixed typos
  Fixed typos
  Fixed typos
  ...

1 files changed, 5 insertions, 5 deletions

diff --git a/src/H5C.c b/src/H5C.c
index e03a0c8..b3f76dc 100644
--- a/src/H5C.c
+++ b/src/H5C.c
@@ -5258,7 +5258,7 @@ H5C_unprotect(H5F_t *		  f,
          *
          * All this is a bit awkward, but until the metadata cache entries
          * are contiguous, with only one dirty flag, we have to let the supplied
-         * functions deal with the reseting the is_dirty flag.
+         * functions deal with the resetting the is_dirty flag.
          */
         if ( entry_ptr->clear_on_unprotect ) {
 
@@ -6912,7 +6912,7 @@ H5C__flash_increase_cache_size(H5C_t * cache_ptr,
         if ( (cache_ptr->resize_ctl).rpt_fcn != NULL ) {
 
             /* get the hit rate for the reporting function.  Should still
-             * be good as we havent reset the hit rate statistics.
+             * be good as we haven't reset the hit rate statistics.
              */
             if ( H5C_get_cache_hit_rate(cache_ptr, &hit_rate) != SUCCEED ) {
 
@@ -7032,7 +7032,7 @@ H5C_flush_invalidate_cache(H5F_t * f,
         }
     }
 
-    /* The flush proceedure here is a bit strange.
+    /* The flush procedure here is a bit strange.
      *
      * In the outer while loop we make at least one pass through the
      * cache, and then repeat until either all the pinned entries
@@ -7210,7 +7210,7 @@ H5C_flush_invalidate_cache(H5F_t * f,
              *
              * While this optimization used to be easy, with the possibility
              * of new entries being added to the slist in the midst of the
-             * flush, we must keep the slist in cannonical form at all
+             * flush, we must keep the slist in canonical form at all
              * times.
              */
 
@@ -7783,7 +7783,7 @@ H5C_flush_single_entry(H5F_t *	   	   f,
 		if ( cache_ptr->aux_ptr != NULL ) {
 
                     HGOTO_ERROR(H5E_CACHE, H5E_SYSTEM, FAIL, \
-		        "resize/move in serialize occured in parallel case.")
+		        "resize/move in serialize occurred in parallel case.")
 
 		}
 	    }