[svn-r17505] Description:

	Bring r17416:17496 from trunk to revise_chunks branch

Tested on:
        FreeBSD/32 6.3 (duty) in debug mode
        FreeBSD/64 6.3 (liberty) w/C++ & FORTRAN, in debug mode
        Linux/32 2.6 (jam) w/PGI compilers, w/C++ & FORTRAN, w/threadsafe,
                                in debug mode
        Linux/64-amd64 2.6 (smirom) w/Intel compilers w/default API=1.6.x,
                                w/C++ & FORTRAN, in production mode
        Solaris/32 2.10 (linew) w/deprecated symbols disabled, w/C++ & FORTRAN,
                                w/szip filter, in production mode
        Linux/64-ia64 2.6 (cobalt) w/Intel compilers, w/C++ & FORTRAN,
                                in production mode
        Linux/64-ia64 2.4 (tg-login3) w/parallel, w/FORTRAN, in debug mode
        Linux/64-amd64 2.6 (abe) w/parallel, w/FORTRAN, in production mode
        Mac OS X/32 10.5.8 (amazon) in debug mode
        Mac OS X/32 10.5.8 (amazon) w/C++ & FORTRAN, w/threadsafe,
                                in production mode
	

1 files changed, 10 insertions, 7 deletions

diff --git a/tools/h5diff/testfiles/h5diff_621.txt b/tools/h5diff/testfiles/h5diff_621.txt
index 96d6c3f..79eebed 100644
--- a/tools/h5diff/testfiles/h5diff_621.txt
+++ b/tools/h5diff/testfiles/h5diff_621.txt
@@ -12,13 +12,16 @@ usage: h5diff [OPTIONS] file1 file2 [obj1[obj2]]
    -q, --quiet             Quiet mode. Do not do output
    -c, --compare           List objects that are not comparable
    -N, --nan               Avoid NaNs detection
-   -n C, --count=C         Print differences up to C number
-   -d D, --delta=D         Print difference when greater than limit D
-   -p R, --relative=R      Print difference when greater than relative limit R
-
-  C - is a positive integer
-  D - is a positive number. Compare criteria is |a - b| > D
-  R - is a positive number. Compare criteria is |(b-a)/a| > R
+   -n C, --count=C         Print differences up to C number, C is a positive integer.
+   -d D, --delta=D         Print difference if (|a-b| > D), D is a positive number.
+   -p R, --relative=R      Print difference if (|(a-b)/b| > R), R is a positive number.
+   --use-system-epsilon    Print difference if (|a-b| > EPSILON),
+                           where EPSILON (FLT_EPSILON or FLT_EPSILON) is the system epsilon value. 
+                           If the system epsilon is not defined, use the value below:
+                               FLT_EPSILON = 1.19209E-07 for float
+                               DBL_EPSILON = 2.22045E-16 for double
+                           -d, -p, and --use-system-epsilon options are used for comparing floating point values.
+                           By default, strict equality is used. Use -p or -d to set specific tolerance.
 
  Modes of output: