10 files changed, 40 insertions, 30 deletions
diff --git a/tools/test/h5diff/testfiles/h5diff_10.txt b/tools/test/h5diff/testfiles/h5diff_10.txt
index 5804ac3..2f2f21e 100644
--- a/tools/test/h5diff/testfiles/h5diff_10.txt
+++ b/tools/test/h5diff/testfiles/h5diff_10.txt
@@ -4,6 +4,9 @@ usage: h5diff [OPTIONS] file1 file2 [obj1[ obj2]]
   [obj1]            Name of an HDF5 object, in absolute path
   [obj2]            Name of an HDF5 object, in absolute path
 
+  ERROR
+   --enable-error-stack Prints messages from the HDF5 error stack as they occur.
+                        Optional value 2 also prints file open errors.
   OPTIONS
    -h, --help
          Print a usage message and exit.
@@ -22,8 +25,6 @@ usage: h5diff [OPTIONS] file1 file2 [obj1[ obj2]]
           3 : All level 2 information plus file names.
    -q, --quiet
          Quiet mode. Do not produce output.
-   --enable-error-stack
-                   Prints messages from the HDF5 error stack as they occur.
    --follow-symlinks
          Follow symbolic links (soft links and external links and compare the)
          links' target objects.
@@ -105,7 +106,7 @@ usage: h5diff [OPTIONS] file1 file2 [obj1[ obj2]]
          This option can be used repeatedly to exclude multiple paths.
 
  Modes of output:
-  Default mode: print the number of differences found and where they occured
+  Default mode: print the number of differences found and where they occurred
   -r Report mode: print the above plus the differences
   -v Verbose mode: print the above plus a list of objects and warnings
   -q Quiet mode: do not print output
diff --git a/tools/test/h5diff/testfiles/h5diff_600.txt b/tools/test/h5diff/testfiles/h5diff_600.txt
index fa7447b..385af242 100644
--- a/tools/test/h5diff/testfiles/h5diff_600.txt
+++ b/tools/test/h5diff/testfiles/h5diff_600.txt
@@ -4,6 +4,9 @@ usage: h5diff [OPTIONS] file1 file2 [obj1[ obj2]]
   [obj1]            Name of an HDF5 object, in absolute path
   [obj2]            Name of an HDF5 object, in absolute path
 
+  ERROR
+   --enable-error-stack Prints messages from the HDF5 error stack as they occur.
+                        Optional value 2 also prints file open errors.
   OPTIONS
    -h, --help
          Print a usage message and exit.
@@ -22,8 +25,6 @@ usage: h5diff [OPTIONS] file1 file2 [obj1[ obj2]]
           3 : All level 2 information plus file names.
    -q, --quiet
          Quiet mode. Do not produce output.
-   --enable-error-stack
-                   Prints messages from the HDF5 error stack as they occur.
    --follow-symlinks
          Follow symbolic links (soft links and external links and compare the)
          links' target objects.
@@ -105,7 +106,7 @@ usage: h5diff [OPTIONS] file1 file2 [obj1[ obj2]]
          This option can be used repeatedly to exclude multiple paths.
 
  Modes of output:
-  Default mode: print the number of differences found and where they occured
+  Default mode: print the number of differences found and where they occurred
   -r Report mode: print the above plus the differences
   -v Verbose mode: print the above plus a list of objects and warnings
   -q Quiet mode: do not print output
diff --git a/tools/test/h5diff/testfiles/h5diff_603.txt b/tools/test/h5diff/testfiles/h5diff_603.txt
index 9e1dc89..d5dc978 100644
--- a/tools/test/h5diff/testfiles/h5diff_603.txt
+++ b/tools/test/h5diff/testfiles/h5diff_603.txt
@@ -5,6 +5,9 @@ usage: h5diff [OPTIONS] file1 file2 [obj1[ obj2]]
   [obj1]            Name of an HDF5 object, in absolute path
   [obj2]            Name of an HDF5 object, in absolute path
 
+  ERROR
+   --enable-error-stack Prints messages from the HDF5 error stack as they occur.
+                        Optional value 2 also prints file open errors.
   OPTIONS
    -h, --help
          Print a usage message and exit.
@@ -23,8 +26,6 @@ usage: h5diff [OPTIONS] file1 file2 [obj1[ obj2]]
           3 : All level 2 information plus file names.
    -q, --quiet
          Quiet mode. Do not produce output.
-   --enable-error-stack
-                   Prints messages from the HDF5 error stack as they occur.
    --follow-symlinks
          Follow symbolic links (soft links and external links and compare the)
          links' target objects.
@@ -106,7 +107,7 @@ usage: h5diff [OPTIONS] file1 file2 [obj1[ obj2]]
          This option can be used repeatedly to exclude multiple paths.
 
  Modes of output:
-  Default mode: print the number of differences found and where they occured
+  Default mode: print the number of differences found and where they occurred
   -r Report mode: print the above plus the differences
   -v Verbose mode: print the above plus a list of objects and warnings
   -q Quiet mode: do not print output
diff --git a/tools/test/h5diff/testfiles/h5diff_606.txt b/tools/test/h5diff/testfiles/h5diff_606.txt
index 146b944..60181dd 100644
--- a/tools/test/h5diff/testfiles/h5diff_606.txt
+++ b/tools/test/h5diff/testfiles/h5diff_606.txt
@@ -5,6 +5,9 @@ usage: h5diff [OPTIONS] file1 file2 [obj1[ obj2]]
   [obj1]            Name of an HDF5 object, in absolute path
   [obj2]            Name of an HDF5 object, in absolute path
 
+  ERROR
+   --enable-error-stack Prints messages from the HDF5 error stack as they occur.
+                        Optional value 2 also prints file open errors.
   OPTIONS
    -h, --help
          Print a usage message and exit.
@@ -23,8 +26,6 @@ usage: h5diff [OPTIONS] file1 file2 [obj1[ obj2]]
           3 : All level 2 information plus file names.
    -q, --quiet
          Quiet mode. Do not produce output.
-   --enable-error-stack
-                   Prints messages from the HDF5 error stack as they occur.
    --follow-symlinks
          Follow symbolic links (soft links and external links and compare the)
          links' target objects.
@@ -106,7 +107,7 @@ usage: h5diff [OPTIONS] file1 file2 [obj1[ obj2]]
          This option can be used repeatedly to exclude multiple paths.
 
  Modes of output:
-  Default mode: print the number of differences found and where they occured
+  Default mode: print the number of differences found and where they occurred
   -r Report mode: print the above plus the differences
   -v Verbose mode: print the above plus a list of objects and warnings
   -q Quiet mode: do not print output
diff --git a/tools/test/h5diff/testfiles/h5diff_612.txt b/tools/test/h5diff/testfiles/h5diff_612.txt
index 511e693..c027655 100644
--- a/tools/test/h5diff/testfiles/h5diff_612.txt
+++ b/tools/test/h5diff/testfiles/h5diff_612.txt
@@ -5,6 +5,9 @@ usage: h5diff [OPTIONS] file1 file2 [obj1[ obj2]]
   [obj1]            Name of an HDF5 object, in absolute path
   [obj2]            Name of an HDF5 object, in absolute path
 
+  ERROR
+   --enable-error-stack Prints messages from the HDF5 error stack as they occur.
+                        Optional value 2 also prints file open errors.
   OPTIONS
    -h, --help
          Print a usage message and exit.
@@ -23,8 +26,6 @@ usage: h5diff [OPTIONS] file1 file2 [obj1[ obj2]]
           3 : All level 2 information plus file names.
    -q, --quiet
          Quiet mode. Do not produce output.
-   --enable-error-stack
-                   Prints messages from the HDF5 error stack as they occur.
    --follow-symlinks
          Follow symbolic links (soft links and external links and compare the)
          links' target objects.
@@ -106,7 +107,7 @@ usage: h5diff [OPTIONS] file1 file2 [obj1[ obj2]]
          This option can be used repeatedly to exclude multiple paths.
 
  Modes of output:
-  Default mode: print the number of differences found and where they occured
+  Default mode: print the number of differences found and where they occurred
   -r Report mode: print the above plus the differences
   -v Verbose mode: print the above plus a list of objects and warnings
   -q Quiet mode: do not print output
diff --git a/tools/test/h5diff/testfiles/h5diff_615.txt b/tools/test/h5diff/testfiles/h5diff_615.txt
index c4b41f9..792741c 100644
--- a/tools/test/h5diff/testfiles/h5diff_615.txt
+++ b/tools/test/h5diff/testfiles/h5diff_615.txt
@@ -5,6 +5,9 @@ usage: h5diff [OPTIONS] file1 file2 [obj1[ obj2]]
   [obj1]            Name of an HDF5 object, in absolute path
   [obj2]            Name of an HDF5 object, in absolute path
 
+  ERROR
+   --enable-error-stack Prints messages from the HDF5 error stack as they occur.
+                        Optional value 2 also prints file open errors.
   OPTIONS
    -h, --help
          Print a usage message and exit.
@@ -23,8 +26,6 @@ usage: h5diff [OPTIONS] file1 file2 [obj1[ obj2]]
           3 : All level 2 information plus file names.
    -q, --quiet
          Quiet mode. Do not produce output.
-   --enable-error-stack
-                   Prints messages from the HDF5 error stack as they occur.
    --follow-symlinks
          Follow symbolic links (soft links and external links and compare the)
          links' target objects.
@@ -106,7 +107,7 @@ usage: h5diff [OPTIONS] file1 file2 [obj1[ obj2]]
          This option can be used repeatedly to exclude multiple paths.
 
  Modes of output:
-  Default mode: print the number of differences found and where they occured
+  Default mode: print the number of differences found and where they occurred
   -r Report mode: print the above plus the differences
   -v Verbose mode: print the above plus a list of objects and warnings
   -q Quiet mode: do not print output
diff --git a/tools/test/h5diff/testfiles/h5diff_621.txt b/tools/test/h5diff/testfiles/h5diff_621.txt
index 9dd312d..27d9f09 100644
--- a/tools/test/h5diff/testfiles/h5diff_621.txt
+++ b/tools/test/h5diff/testfiles/h5diff_621.txt
@@ -5,6 +5,9 @@ usage: h5diff [OPTIONS] file1 file2 [obj1[ obj2]]
   [obj1]            Name of an HDF5 object, in absolute path
   [obj2]            Name of an HDF5 object, in absolute path
 
+  ERROR
+   --enable-error-stack Prints messages from the HDF5 error stack as they occur.
+                        Optional value 2 also prints file open errors.
   OPTIONS
    -h, --help
          Print a usage message and exit.
@@ -23,8 +26,6 @@ usage: h5diff [OPTIONS] file1 file2 [obj1[ obj2]]
           3 : All level 2 information plus file names.
    -q, --quiet
          Quiet mode. Do not produce output.
-   --enable-error-stack
-                   Prints messages from the HDF5 error stack as they occur.
    --follow-symlinks
          Follow symbolic links (soft links and external links and compare the)
          links' target objects.
@@ -106,7 +107,7 @@ usage: h5diff [OPTIONS] file1 file2 [obj1[ obj2]]
          This option can be used repeatedly to exclude multiple paths.
 
  Modes of output:
-  Default mode: print the number of differences found and where they occured
+  Default mode: print the number of differences found and where they occurred
   -r Report mode: print the above plus the differences
   -v Verbose mode: print the above plus a list of objects and warnings
   -q Quiet mode: do not print output
diff --git a/tools/test/h5diff/testfiles/h5diff_622.txt b/tools/test/h5diff/testfiles/h5diff_622.txt
index 0f7c4af..2c0395d 100644
--- a/tools/test/h5diff/testfiles/h5diff_622.txt
+++ b/tools/test/h5diff/testfiles/h5diff_622.txt
@@ -5,6 +5,9 @@ usage: h5diff [OPTIONS] file1 file2 [obj1[ obj2]]
   [obj1]            Name of an HDF5 object, in absolute path
   [obj2]            Name of an HDF5 object, in absolute path
 
+  ERROR
+   --enable-error-stack Prints messages from the HDF5 error stack as they occur.
+                        Optional value 2 also prints file open errors.
   OPTIONS
    -h, --help
          Print a usage message and exit.
@@ -23,8 +26,6 @@ usage: h5diff [OPTIONS] file1 file2 [obj1[ obj2]]
           3 : All level 2 information plus file names.
    -q, --quiet
          Quiet mode. Do not produce output.
-   --enable-error-stack
-                   Prints messages from the HDF5 error stack as they occur.
    --follow-symlinks
          Follow symbolic links (soft links and external links and compare the)
          links' target objects.
@@ -106,7 +107,7 @@ usage: h5diff [OPTIONS] file1 file2 [obj1[ obj2]]
          This option can be used repeatedly to exclude multiple paths.
 
  Modes of output:
-  Default mode: print the number of differences found and where they occured
+  Default mode: print the number of differences found and where they occurred
   -r Report mode: print the above plus the differences
   -v Verbose mode: print the above plus a list of objects and warnings
   -q Quiet mode: do not print output
diff --git a/tools/test/h5diff/testfiles/h5diff_623.txt b/tools/test/h5diff/testfiles/h5diff_623.txt
index 3e1b5f3..ddf110c 100644
--- a/tools/test/h5diff/testfiles/h5diff_623.txt
+++ b/tools/test/h5diff/testfiles/h5diff_623.txt
@@ -5,6 +5,9 @@ usage: h5diff [OPTIONS] file1 file2 [obj1[ obj2]]
   [obj1]            Name of an HDF5 object, in absolute path
   [obj2]            Name of an HDF5 object, in absolute path
 
+  ERROR
+   --enable-error-stack Prints messages from the HDF5 error stack as they occur.
+                        Optional value 2 also prints file open errors.
   OPTIONS
    -h, --help
          Print a usage message and exit.
@@ -23,8 +26,6 @@ usage: h5diff [OPTIONS] file1 file2 [obj1[ obj2]]
           3 : All level 2 information plus file names.
    -q, --quiet
          Quiet mode. Do not produce output.
-   --enable-error-stack
-                   Prints messages from the HDF5 error stack as they occur.
    --follow-symlinks
          Follow symbolic links (soft links and external links and compare the)
          links' target objects.
@@ -106,7 +107,7 @@ usage: h5diff [OPTIONS] file1 file2 [obj1[ obj2]]
          This option can be used repeatedly to exclude multiple paths.
 
  Modes of output:
-  Default mode: print the number of differences found and where they occured
+  Default mode: print the number of differences found and where they occurred
   -r Report mode: print the above plus the differences
   -v Verbose mode: print the above plus a list of objects and warnings
   -q Quiet mode: do not print output
diff --git a/tools/test/h5diff/testfiles/h5diff_624.txt b/tools/test/h5diff/testfiles/h5diff_624.txt
index 0645961..d9534ae 100644
--- a/tools/test/h5diff/testfiles/h5diff_624.txt
+++ b/tools/test/h5diff/testfiles/h5diff_624.txt
@@ -5,6 +5,9 @@ usage: h5diff [OPTIONS] file1 file2 [obj1[ obj2]]
   [obj1]            Name of an HDF5 object, in absolute path
   [obj2]            Name of an HDF5 object, in absolute path
 
+  ERROR
+   --enable-error-stack Prints messages from the HDF5 error stack as they occur.
+                        Optional value 2 also prints file open errors.
   OPTIONS
    -h, --help
          Print a usage message and exit.
@@ -23,8 +26,6 @@ usage: h5diff [OPTIONS] file1 file2 [obj1[ obj2]]
           3 : All level 2 information plus file names.
    -q, --quiet
          Quiet mode. Do not produce output.
-   --enable-error-stack
-                   Prints messages from the HDF5 error stack as they occur.
    --follow-symlinks
          Follow symbolic links (soft links and external links and compare the)
          links' target objects.
@@ -106,7 +107,7 @@ usage: h5diff [OPTIONS] file1 file2 [obj1[ obj2]]
          This option can be used repeatedly to exclude multiple paths.
 
  Modes of output:
-  Default mode: print the number of differences found and where they occured
+  Default mode: print the number of differences found and where they occurred
   -r Report mode: print the above plus the differences
   -v Verbose mode: print the above plus a list of objects and warnings
   -q Quiet mode: do not print output