1 12 Merge SZ plugin changes from develop (#1455)

* Merge SZ plugin changes from develop

* Update examples version

* Update examples version

4 files changed, 24 insertions, 22 deletions

diff --git a/release_docs/README_HDF5_CMake b/release_docs/README_HDF5_CMake
index e12ae3b..d5ef7bf 100644
--- a/release_docs/README_HDF5_CMake
+++ b/release_docs/README_HDF5_CMake
@@ -10,7 +10,7 @@ This tar file contains
     LIBAEC.tar.gz       source for building SZIP replacement
     ZLib.tar.gz         source for building ZLIB
     hdf5_plugins.tar.gz source for building compression plugins
-    HDF5Examples-1.12.9-Source.tar.gz  source for building examples
+    HDF5Examples-1.12.1-Source.tar.gz  source for building examples
 
 For more information about building HDF5 with CMake, see USING_HDF5_CMake.txt in
 hdf5-1.12.2/release_docs, or
diff --git a/release_docs/RELEASE.txt b/release_docs/RELEASE.txt
index 55b6d11..434a704 100644
--- a/release_docs/RELEASE.txt
+++ b/release_docs/RELEASE.txt
@@ -115,7 +115,7 @@ New Features
       which case the release part of version, in major.minor.release, must
       be exact. An environment variable still controls the logic.
 
-        (ADB - 2021/07/27)
+      (ADB - 2021/07/27)
 
     - H5Gcreate1() now rejects size_hint parameters larger than UINT32_MAX
 
@@ -132,7 +132,7 @@ New Features
       The Doxygen documentation has been updated and passing values larger
       than UINT32_MAX for size_hint will now produce a normal HDF5 error.
 
-        (DER - 2021/04/29, HDFFV-11241)
+      (DER - 2021/04/29, HDFFV-11241)
 
 
     - H5Pset_fapl_log() no longer crashes when passed an invalid fapl ID
@@ -146,7 +146,7 @@ New Features
       The pointer is now correctly initialized and the API call now
       produces a normal HDF5 error when fed an invalid fapl ID.
 
-        (DER - 2021/04/28, HDFFV-11240)
+      (DER - 2021/04/28, HDFFV-11240)
 
     - Fixes a segfault when H5Pset_mdc_log_options() is called multiple times
 
@@ -158,7 +158,7 @@ New Features
 
       The string is now handled properly and the segfault no longer occurs.
 
-        (DER - 2021/04/27, HDFFV-11239)
+      (DER - 2021/04/27, HDFFV-11239)
 
 
     Parallel Library:
@@ -307,7 +307,7 @@ Bug Fixes since HDF5-1.12.1 release
 
     - Fixed CMake C++ compiler flags
 
-      A recent refactoring of the C++ configure files accidently removed the
+      A recent refactoring of the C++ configure files accidentally removed the
       file that executed the enable_language command for C++ needed by the
       HDFCXXCompilerFlags.cmake file. Also updated the intel warnings files,
       including adding support for windows platforms.
@@ -341,7 +341,7 @@ Bug Fixes since HDF5-1.12.1 release
 
       Incorrect length assignment.
 
-        (ADB - 2021/10/14)
+      (ADB - 2021/10/14)
 
 
     Fortran High-Level APIs
@@ -363,10 +363,10 @@ Bug Fixes since HDF5-1.12.1 release
     --------
     - Added DataSet::operator=
 
-        Some compilers complain if the copy constructor is given explicitly
-        but the assignment operator is implicitly set to default.
+      Some compilers complain if the copy constructor is given explicitly
+      but the assignment operator is implicitly set to default.
 
-        (2021/05/19)
+      (2021/05/19)
 
 
     Testing
diff --git a/release_docs/USING_CMake_Examples.txt b/release_docs/USING_CMake_Examples.txt
index 108be5e..bed27fb 100644
--- a/release_docs/USING_CMake_Examples.txt
+++ b/release_docs/USING_CMake_Examples.txt
@@ -20,15 +20,14 @@ Notes: This short instruction is written for users who want to quickly
 I. Preconditions
 ========================================================================
 
-   1. We suggest you obtain the latest CMake for windows from the Kitware
+   1. We suggest you obtain the latest CMake for your platform from the Kitware
       web site. The HDF5 1.12.x product requires a minimum CMake version
       of 3.12. If you are using VS2019, the minimum version is 3.15.
 
    2. You have installed the HDF5 library built with CMake, by executing
       the HDF Install Utility (the *.msi file in the binary package for
-      Windows or the *.sh on Linux). If you are using a Windows platform,
-      you can obtain a pre-built Windows binary from The HDF Group's website
-      at www.hdfgroup.org.
+      Windows or the *.sh on Linux). You can obtain pre-built binaries
+      from The HDF Group's website at www.hdfgroup.org.
 
 
 
diff --git a/release_docs/USING_HDF5_CMake.txt b/release_docs/USING_HDF5_CMake.txt
index 08a491d..5657d52 100644
--- a/release_docs/USING_HDF5_CMake.txt
+++ b/release_docs/USING_HDF5_CMake.txt
@@ -29,27 +29,30 @@ Notes: This short instruction is written for users who want to quickly
             of using a ctest script for building and testing. See
             INSTALL_CMake.txt for more information.
 
+         4. See https://cmake.org/cmake/help/latest/command/find_package.html
+            for more information on the CMake "Config Mode Search Procedure".
 
 
 ========================================================================
 I. Preconditions
 ========================================================================
 
-   1. We suggest you obtain the latest CMake for windows from the Kitware
+   1. We suggest you obtain the latest CMake for your platform from the Kitware
       web site. The HDF5 1.12.x product requires a minimum CMake version
-      of 3.12.
+      of 3.12. If you are using VS2019, the minimum version is 3.15.
 
    2. You have installed the HDF5 library built with CMake, by executing
       the HDF Install Utility (the *.msi file in the binary package for
-      Windows). You can obtain pre-built binaries from The HDF Group's website at
-      www.hdfgroup.org.
+      Windows or the *.sh on Linux). You can obtain pre-built binaries
+      from The HDF Group's website at www.hdfgroup.org.
 
-   3. Set the environment variable HDF5_DIR to the installed location of
-      the config files for HDF5.
+   3. Set the HDF5_ROOT CMake variable, -DHDF5_ROOT=<install_path>
+      or environment variable, set(ENV{HDF5_ROOT} "<install_path>")
+      to the installed location of HDF5.
          On Windows:
-            HDF5_DIR=C:/Program Files/HDF_Group/HDF5/1.12.x/cmake
+            HDF5_ROOT=C:/Program Files/HDF_Group/HDF5/1.12.x/cmake
          On unix:
-            HDF5_DIR=<install root folder>/HDF_Group/HDF5/1.12.x/cmake
+            HDF5_ROOT=<install root folder>/HDF_Group/HDF5/1.12.x/cmake
 
       If you are using shared libraries, you may need to add to the path
       environment variable. Set the path environment variable to the