[svn-r19050] Description:

	Bring r18704:19049 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/default API=1.8.x,
                w/C++ & FORTRAN, w/threadsafe, in debug mode
        Linux/64-amd64 2.6 (amani) 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-amd64 2.6 (abe) w/parallel, w/FORTRAN, in debug mode
        Mac OS X/32 10.6.3 (amazon) in debug mode
        Mac OS X/32 10.6.3 (amazon) w/C++ & FORTRAN, w/threadsafe,
                in production mode

13 files changed, 71 insertions, 51 deletions

diff --git a/tools/h5diff/testfiles/h5diff_10.txt b/tools/h5diff/testfiles/h5diff_10.txt
index aeba845..d3ee9a6 100644
--- a/tools/h5diff/testfiles/h5diff_10.txt
+++ b/tools/h5diff/testfiles/h5diff_10.txt
@@ -10,7 +10,7 @@ usage: h5diff [OPTIONS] file1 file2 [obj1[obj2]]
    -r, --report            Report mode. Print differences.
    -v, --verbose           Verbose mode. Print differences, list of objects.
    -q, --quiet             Quiet mode. Do not produce output.
-   --follow-links          Follow symbolic links (soft links and external links)
+   --follow-symlinks       Follow symbolic links (soft links and external links)
                            and compare the links' target objects.
                            If symbolic link(s) with the same name exist in the
                            files being compared, then determine whether the 
@@ -21,13 +21,13 @@ usage: h5diff [OPTIONS] file1 file2 [obj1[obj2]]
                            - If both symbolic links are dangling links, they
                              are treated as being the same; by default, h5diff
                              returns an exit code of 0. If, however, 
-                             --no-dangling-links is used with --follow-links, 
+                             --no-dangling-links is used with --follow-symlinks,
                              this situation is treated as an error and h5diff 
                              returns an exit code of 2.
                            - If only one of the two links is a dangling link,
                              they are treated as being different and h5diff 
                              returns an exit code of 1. If, however, 
-                             --no-dangling-links is used with --follow-links, 
+                             --no-dangling-links is used with --follow-symlinks,
                              this situation is treated as an error and h5diff 
                              returns an exit code of 2.
                            - If both symbolic links point to existing objects,
@@ -35,7 +35,7 @@ usage: h5diff [OPTIONS] file1 file2 [obj1[obj2]]
                            If any symbolic link specified in the call to h5diff
                            does not exist, h5diff treats it as an error and
                            returns an exit code of 2.
-   --no-dangling-links     Must be used with --follow-links option;
+   --no-dangling-links     Must be used with --follow-symlinks option;
                            otherwise, h5diff shows error message and returns
                            an exit code of 2.
                            Check for any symbolic links (soft links or external
@@ -78,7 +78,7 @@ usage: h5diff [OPTIONS] file1 file2 [obj1[obj2]]
   2) groups: name string difference
   3) datatypes: the return value of H5Tequal
   4) links: name string difference of the linked value as default
-            (refer to --follow-links option).
+            (refer to --follow-symlinks option).
 
  Exit code:
   0 if no differences, 1 if differences found, 2 if error
diff --git a/tools/h5diff/testfiles/h5diff_101w.txt b/tools/h5diff/testfiles/h5diff_101w.txt
new file mode 100755
index 0000000..59176a2
--- /dev/null
+++ b/tools/h5diff/testfiles/h5diff_101w.txt
@@ -0,0 +1,10 @@
+dataset: </g1/d1> and </g1/d2>

+size:           [3x2]           [3x2]

+position        d1              d2              difference          

+------------------------------------------------------------

+[ 0 1 ]          1e-009          2e-009          1e-009         

+[ 1 0 ]          1e-009          9e-010          1e-010         

+[ 1 1 ]          0               1e-009          1e-009         

+[ 2 0 ]          1e-009          0               1e-009         

+4 differences found

+EXIT CODE: 1

diff --git a/tools/h5diff/testfiles/h5diff_102w.txt b/tools/h5diff/testfiles/h5diff_102w.txt
new file mode 100755
index 0000000..36a254e
--- /dev/null
+++ b/tools/h5diff/testfiles/h5diff_102w.txt
@@ -0,0 +1,10 @@
+dataset: </g1/fp1> and </g1/fp2>

+size:           [3x2]           [3x2]

+position        fp1             fp2             difference          

+------------------------------------------------------------

+[ 0 1 ]          1e-005          2e-005          1e-005         

+[ 1 0 ]          1e-005          9e-006          9.99999e-007   

+[ 1 1 ]          0               1e-005          1e-005         

+[ 2 0 ]          1e-005          0               1e-005         

+4 differences found

+EXIT CODE: 1

diff --git a/tools/h5diff/testfiles/h5diff_452.txt b/tools/h5diff/testfiles/h5diff_452.txt
index 76e4457..05403af 100644
--- a/tools/h5diff/testfiles/h5diff_452.txt
+++ b/tools/h5diff/testfiles/h5diff_452.txt
@@ -1,2 +1,2 @@
-Error: --no-dangling-links must be used along with --follow-links option.
+Error: --no-dangling-links must be used along with --follow-symlinks option.
 EXIT CODE: 2
diff --git a/tools/h5diff/testfiles/h5diff_600.txt b/tools/h5diff/testfiles/h5diff_600.txt
index f76d4d5..cf540ab 100644
--- a/tools/h5diff/testfiles/h5diff_600.txt
+++ b/tools/h5diff/testfiles/h5diff_600.txt
@@ -10,7 +10,7 @@ usage: h5diff [OPTIONS] file1 file2 [obj1[obj2]]
    -r, --report            Report mode. Print differences.
    -v, --verbose           Verbose mode. Print differences, list of objects.
    -q, --quiet             Quiet mode. Do not produce output.
-   --follow-links          Follow symbolic links (soft links and external links)
+   --follow-symlinks       Follow symbolic links (soft links and external links)
                            and compare the links' target objects.
                            If symbolic link(s) with the same name exist in the
                            files being compared, then determine whether the 
@@ -21,13 +21,13 @@ usage: h5diff [OPTIONS] file1 file2 [obj1[obj2]]
                            - If both symbolic links are dangling links, they
                              are treated as being the same; by default, h5diff
                              returns an exit code of 0. If, however, 
-                             --no-dangling-links is used with --follow-links, 
+                             --no-dangling-links is used with --follow-symlinks,
                              this situation is treated as an error and h5diff 
                              returns an exit code of 2.
                            - If only one of the two links is a dangling link,
                              they are treated as being different and h5diff 
                              returns an exit code of 1. If, however, 
-                             --no-dangling-links is used with --follow-links, 
+                             --no-dangling-links is used with --follow-symlinks,
                              this situation is treated as an error and h5diff 
                              returns an exit code of 2.
                            - If both symbolic links point to existing objects,
@@ -35,7 +35,7 @@ usage: h5diff [OPTIONS] file1 file2 [obj1[obj2]]
                            If any symbolic link specified in the call to h5diff
                            does not exist, h5diff treats it as an error and
                            returns an exit code of 2.
-   --no-dangling-links     Must be used with --follow-links option;
+   --no-dangling-links     Must be used with --follow-symlinks option;
                            otherwise, h5diff shows error message and returns
                            an exit code of 2.
                            Check for any symbolic links (soft links or external
@@ -78,7 +78,7 @@ usage: h5diff [OPTIONS] file1 file2 [obj1[obj2]]
   2) groups: name string difference
   3) datatypes: the return value of H5Tequal
   4) links: name string difference of the linked value as default
-            (refer to --follow-links option).
+            (refer to --follow-symlinks option).
 
  Exit code:
   0 if no differences, 1 if differences found, 2 if error
diff --git a/tools/h5diff/testfiles/h5diff_603.txt b/tools/h5diff/testfiles/h5diff_603.txt
index a5286df..2f2e93f 100644
--- a/tools/h5diff/testfiles/h5diff_603.txt
+++ b/tools/h5diff/testfiles/h5diff_603.txt
@@ -11,7 +11,7 @@ usage: h5diff [OPTIONS] file1 file2 [obj1[obj2]]
    -r, --report            Report mode. Print differences.
    -v, --verbose           Verbose mode. Print differences, list of objects.
    -q, --quiet             Quiet mode. Do not produce output.
-   --follow-links          Follow symbolic links (soft links and external links)
+   --follow-symlinks       Follow symbolic links (soft links and external links)
                            and compare the links' target objects.
                            If symbolic link(s) with the same name exist in the
                            files being compared, then determine whether the 
@@ -22,13 +22,13 @@ usage: h5diff [OPTIONS] file1 file2 [obj1[obj2]]
                            - If both symbolic links are dangling links, they
                              are treated as being the same; by default, h5diff
                              returns an exit code of 0. If, however, 
-                             --no-dangling-links is used with --follow-links, 
+                             --no-dangling-links is used with --follow-symlinks,
                              this situation is treated as an error and h5diff 
                              returns an exit code of 2.
                            - If only one of the two links is a dangling link,
                              they are treated as being different and h5diff 
                              returns an exit code of 1. If, however, 
-                             --no-dangling-links is used with --follow-links, 
+                             --no-dangling-links is used with --follow-symlinks,
                              this situation is treated as an error and h5diff 
                              returns an exit code of 2.
                            - If both symbolic links point to existing objects,
@@ -36,7 +36,7 @@ usage: h5diff [OPTIONS] file1 file2 [obj1[obj2]]
                            If any symbolic link specified in the call to h5diff
                            does not exist, h5diff treats it as an error and
                            returns an exit code of 2.
-   --no-dangling-links     Must be used with --follow-links option;
+   --no-dangling-links     Must be used with --follow-symlinks option;
                            otherwise, h5diff shows error message and returns
                            an exit code of 2.
                            Check for any symbolic links (soft links or external
@@ -79,7 +79,7 @@ usage: h5diff [OPTIONS] file1 file2 [obj1[obj2]]
   2) groups: name string difference
   3) datatypes: the return value of H5Tequal
   4) links: name string difference of the linked value as default
-            (refer to --follow-links option).
+            (refer to --follow-symlinks option).
 
  Exit code:
   0 if no differences, 1 if differences found, 2 if error
diff --git a/tools/h5diff/testfiles/h5diff_606.txt b/tools/h5diff/testfiles/h5diff_606.txt
index ab8039e..3381406 100644
--- a/tools/h5diff/testfiles/h5diff_606.txt
+++ b/tools/h5diff/testfiles/h5diff_606.txt
@@ -11,7 +11,7 @@ usage: h5diff [OPTIONS] file1 file2 [obj1[obj2]]
    -r, --report            Report mode. Print differences.
    -v, --verbose           Verbose mode. Print differences, list of objects.
    -q, --quiet             Quiet mode. Do not produce output.
-   --follow-links          Follow symbolic links (soft links and external links)
+   --follow-symlinks       Follow symbolic links (soft links and external links)
                            and compare the links' target objects.
                            If symbolic link(s) with the same name exist in the
                            files being compared, then determine whether the 
@@ -22,13 +22,13 @@ usage: h5diff [OPTIONS] file1 file2 [obj1[obj2]]
                            - If both symbolic links are dangling links, they
                              are treated as being the same; by default, h5diff
                              returns an exit code of 0. If, however, 
-                             --no-dangling-links is used with --follow-links, 
+                             --no-dangling-links is used with --follow-symlinks,
                              this situation is treated as an error and h5diff 
                              returns an exit code of 2.
                            - If only one of the two links is a dangling link,
                              they are treated as being different and h5diff 
                              returns an exit code of 1. If, however, 
-                             --no-dangling-links is used with --follow-links, 
+                             --no-dangling-links is used with --follow-symlinks,
                              this situation is treated as an error and h5diff 
                              returns an exit code of 2.
                            - If both symbolic links point to existing objects,
@@ -36,7 +36,7 @@ usage: h5diff [OPTIONS] file1 file2 [obj1[obj2]]
                            If any symbolic link specified in the call to h5diff
                            does not exist, h5diff treats it as an error and
                            returns an exit code of 2.
-   --no-dangling-links     Must be used with --follow-links option;
+   --no-dangling-links     Must be used with --follow-symlinks option;
                            otherwise, h5diff shows error message and returns
                            an exit code of 2.
                            Check for any symbolic links (soft links or external
@@ -79,7 +79,7 @@ usage: h5diff [OPTIONS] file1 file2 [obj1[obj2]]
   2) groups: name string difference
   3) datatypes: the return value of H5Tequal
   4) links: name string difference of the linked value as default
-            (refer to --follow-links option).
+            (refer to --follow-symlinks option).
 
  Exit code:
   0 if no differences, 1 if differences found, 2 if error
diff --git a/tools/h5diff/testfiles/h5diff_612.txt b/tools/h5diff/testfiles/h5diff_612.txt
index 686ff15..8c6051e 100644
--- a/tools/h5diff/testfiles/h5diff_612.txt
+++ b/tools/h5diff/testfiles/h5diff_612.txt
@@ -11,7 +11,7 @@ usage: h5diff [OPTIONS] file1 file2 [obj1[obj2]]
    -r, --report            Report mode. Print differences.
    -v, --verbose           Verbose mode. Print differences, list of objects.
    -q, --quiet             Quiet mode. Do not produce output.
-   --follow-links          Follow symbolic links (soft links and external links)
+   --follow-symlinks       Follow symbolic links (soft links and external links)
                            and compare the links' target objects.
                            If symbolic link(s) with the same name exist in the
                            files being compared, then determine whether the 
@@ -22,13 +22,13 @@ usage: h5diff [OPTIONS] file1 file2 [obj1[obj2]]
                            - If both symbolic links are dangling links, they
                              are treated as being the same; by default, h5diff
                              returns an exit code of 0. If, however, 
-                             --no-dangling-links is used with --follow-links, 
+                             --no-dangling-links is used with --follow-symlinks,
                              this situation is treated as an error and h5diff 
                              returns an exit code of 2.
                            - If only one of the two links is a dangling link,
                              they are treated as being different and h5diff 
                              returns an exit code of 1. If, however, 
-                             --no-dangling-links is used with --follow-links, 
+                             --no-dangling-links is used with --follow-symlinks,
                              this situation is treated as an error and h5diff 
                              returns an exit code of 2.
                            - If both symbolic links point to existing objects,
@@ -36,7 +36,7 @@ usage: h5diff [OPTIONS] file1 file2 [obj1[obj2]]
                            If any symbolic link specified in the call to h5diff
                            does not exist, h5diff treats it as an error and
                            returns an exit code of 2.
-   --no-dangling-links     Must be used with --follow-links option;
+   --no-dangling-links     Must be used with --follow-symlinks option;
                            otherwise, h5diff shows error message and returns
                            an exit code of 2.
                            Check for any symbolic links (soft links or external
@@ -79,7 +79,7 @@ usage: h5diff [OPTIONS] file1 file2 [obj1[obj2]]
   2) groups: name string difference
   3) datatypes: the return value of H5Tequal
   4) links: name string difference of the linked value as default
-            (refer to --follow-links option).
+            (refer to --follow-symlinks option).
 
  Exit code:
   0 if no differences, 1 if differences found, 2 if error
diff --git a/tools/h5diff/testfiles/h5diff_615.txt b/tools/h5diff/testfiles/h5diff_615.txt
index cf779c5..b713c7b 100644
--- a/tools/h5diff/testfiles/h5diff_615.txt
+++ b/tools/h5diff/testfiles/h5diff_615.txt
@@ -11,7 +11,7 @@ usage: h5diff [OPTIONS] file1 file2 [obj1[obj2]]
    -r, --report            Report mode. Print differences.
    -v, --verbose           Verbose mode. Print differences, list of objects.
    -q, --quiet             Quiet mode. Do not produce output.
-   --follow-links          Follow symbolic links (soft links and external links)
+   --follow-symlinks       Follow symbolic links (soft links and external links)
                            and compare the links' target objects.
                            If symbolic link(s) with the same name exist in the
                            files being compared, then determine whether the 
@@ -22,13 +22,13 @@ usage: h5diff [OPTIONS] file1 file2 [obj1[obj2]]
                            - If both symbolic links are dangling links, they
                              are treated as being the same; by default, h5diff
                              returns an exit code of 0. If, however, 
-                             --no-dangling-links is used with --follow-links, 
+                             --no-dangling-links is used with --follow-symlinks,
                              this situation is treated as an error and h5diff 
                              returns an exit code of 2.
                            - If only one of the two links is a dangling link,
                              they are treated as being different and h5diff 
                              returns an exit code of 1. If, however, 
-                             --no-dangling-links is used with --follow-links, 
+                             --no-dangling-links is used with --follow-symlinks,
                              this situation is treated as an error and h5diff 
                              returns an exit code of 2.
                            - If both symbolic links point to existing objects,
@@ -36,7 +36,7 @@ usage: h5diff [OPTIONS] file1 file2 [obj1[obj2]]
                            If any symbolic link specified in the call to h5diff
                            does not exist, h5diff treats it as an error and
                            returns an exit code of 2.
-   --no-dangling-links     Must be used with --follow-links option;
+   --no-dangling-links     Must be used with --follow-symlinks option;
                            otherwise, h5diff shows error message and returns
                            an exit code of 2.
                            Check for any symbolic links (soft links or external
@@ -79,7 +79,7 @@ usage: h5diff [OPTIONS] file1 file2 [obj1[obj2]]
   2) groups: name string difference
   3) datatypes: the return value of H5Tequal
   4) links: name string difference of the linked value as default
-            (refer to --follow-links option).
+            (refer to --follow-symlinks option).
 
  Exit code:
   0 if no differences, 1 if differences found, 2 if error
diff --git a/tools/h5diff/testfiles/h5diff_621.txt b/tools/h5diff/testfiles/h5diff_621.txt
index 041bb7b..ee23b90 100644
--- a/tools/h5diff/testfiles/h5diff_621.txt
+++ b/tools/h5diff/testfiles/h5diff_621.txt
@@ -11,7 +11,7 @@ usage: h5diff [OPTIONS] file1 file2 [obj1[obj2]]
    -r, --report            Report mode. Print differences.
    -v, --verbose           Verbose mode. Print differences, list of objects.
    -q, --quiet             Quiet mode. Do not produce output.
-   --follow-links          Follow symbolic links (soft links and external links)
+   --follow-symlinks       Follow symbolic links (soft links and external links)
                            and compare the links' target objects.
                            If symbolic link(s) with the same name exist in the
                            files being compared, then determine whether the 
@@ -22,13 +22,13 @@ usage: h5diff [OPTIONS] file1 file2 [obj1[obj2]]
                            - If both symbolic links are dangling links, they
                              are treated as being the same; by default, h5diff
                              returns an exit code of 0. If, however, 
-                             --no-dangling-links is used with --follow-links, 
+                             --no-dangling-links is used with --follow-symlinks,
                              this situation is treated as an error and h5diff 
                              returns an exit code of 2.
                            - If only one of the two links is a dangling link,
                              they are treated as being different and h5diff 
                              returns an exit code of 1. If, however, 
-                             --no-dangling-links is used with --follow-links, 
+                             --no-dangling-links is used with --follow-symlinks,
                              this situation is treated as an error and h5diff 
                              returns an exit code of 2.
                            - If both symbolic links point to existing objects,
@@ -36,7 +36,7 @@ usage: h5diff [OPTIONS] file1 file2 [obj1[obj2]]
                            If any symbolic link specified in the call to h5diff
                            does not exist, h5diff treats it as an error and
                            returns an exit code of 2.
-   --no-dangling-links     Must be used with --follow-links option;
+   --no-dangling-links     Must be used with --follow-symlinks option;
                            otherwise, h5diff shows error message and returns
                            an exit code of 2.
                            Check for any symbolic links (soft links or external
@@ -79,7 +79,7 @@ usage: h5diff [OPTIONS] file1 file2 [obj1[obj2]]
   2) groups: name string difference
   3) datatypes: the return value of H5Tequal
   4) links: name string difference of the linked value as default
-            (refer to --follow-links option).
+            (refer to --follow-symlinks option).
 
  Exit code:
   0 if no differences, 1 if differences found, 2 if error
diff --git a/tools/h5diff/testfiles/h5diff_622.txt b/tools/h5diff/testfiles/h5diff_622.txt
index 923bab5..11e2ce1 100644
--- a/tools/h5diff/testfiles/h5diff_622.txt
+++ b/tools/h5diff/testfiles/h5diff_622.txt
@@ -11,7 +11,7 @@ usage: h5diff [OPTIONS] file1 file2 [obj1[obj2]]
    -r, --report            Report mode. Print differences.
    -v, --verbose           Verbose mode. Print differences, list of objects.
    -q, --quiet             Quiet mode. Do not produce output.
-   --follow-links          Follow symbolic links (soft links and external links)
+   --follow-symlinks       Follow symbolic links (soft links and external links)
                            and compare the links' target objects.
                            If symbolic link(s) with the same name exist in the
                            files being compared, then determine whether the 
@@ -22,13 +22,13 @@ usage: h5diff [OPTIONS] file1 file2 [obj1[obj2]]
                            - If both symbolic links are dangling links, they
                              are treated as being the same; by default, h5diff
                              returns an exit code of 0. If, however, 
-                             --no-dangling-links is used with --follow-links, 
+                             --no-dangling-links is used with --follow-symlinks,
                              this situation is treated as an error and h5diff 
                              returns an exit code of 2.
                            - If only one of the two links is a dangling link,
                              they are treated as being different and h5diff 
                              returns an exit code of 1. If, however, 
-                             --no-dangling-links is used with --follow-links, 
+                             --no-dangling-links is used with --follow-symlinks,
                              this situation is treated as an error and h5diff 
                              returns an exit code of 2.
                            - If both symbolic links point to existing objects,
@@ -36,7 +36,7 @@ usage: h5diff [OPTIONS] file1 file2 [obj1[obj2]]
                            If any symbolic link specified in the call to h5diff
                            does not exist, h5diff treats it as an error and
                            returns an exit code of 2.
-   --no-dangling-links     Must be used with --follow-links option;
+   --no-dangling-links     Must be used with --follow-symlinks option;
                            otherwise, h5diff shows error message and returns
                            an exit code of 2.
                            Check for any symbolic links (soft links or external
@@ -79,7 +79,7 @@ usage: h5diff [OPTIONS] file1 file2 [obj1[obj2]]
   2) groups: name string difference
   3) datatypes: the return value of H5Tequal
   4) links: name string difference of the linked value as default
-            (refer to --follow-links option).
+            (refer to --follow-symlinks option).
 
  Exit code:
   0 if no differences, 1 if differences found, 2 if error
diff --git a/tools/h5diff/testfiles/h5diff_623.txt b/tools/h5diff/testfiles/h5diff_623.txt
index 405a211..f87d6db 100644
--- a/tools/h5diff/testfiles/h5diff_623.txt
+++ b/tools/h5diff/testfiles/h5diff_623.txt
@@ -11,7 +11,7 @@ usage: h5diff [OPTIONS] file1 file2 [obj1[obj2]]
    -r, --report            Report mode. Print differences.
    -v, --verbose           Verbose mode. Print differences, list of objects.
    -q, --quiet             Quiet mode. Do not produce output.
-   --follow-links          Follow symbolic links (soft links and external links)
+   --follow-symlinks       Follow symbolic links (soft links and external links)
                            and compare the links' target objects.
                            If symbolic link(s) with the same name exist in the
                            files being compared, then determine whether the 
@@ -22,13 +22,13 @@ usage: h5diff [OPTIONS] file1 file2 [obj1[obj2]]
                            - If both symbolic links are dangling links, they
                              are treated as being the same; by default, h5diff
                              returns an exit code of 0. If, however, 
-                             --no-dangling-links is used with --follow-links, 
+                             --no-dangling-links is used with --follow-symlinks,
                              this situation is treated as an error and h5diff 
                              returns an exit code of 2.
                            - If only one of the two links is a dangling link,
                              they are treated as being different and h5diff 
                              returns an exit code of 1. If, however, 
-                             --no-dangling-links is used with --follow-links, 
+                             --no-dangling-links is used with --follow-symlinks,
                              this situation is treated as an error and h5diff 
                              returns an exit code of 2.
                            - If both symbolic links point to existing objects,
@@ -36,7 +36,7 @@ usage: h5diff [OPTIONS] file1 file2 [obj1[obj2]]
                            If any symbolic link specified in the call to h5diff
                            does not exist, h5diff treats it as an error and
                            returns an exit code of 2.
-   --no-dangling-links     Must be used with --follow-links option;
+   --no-dangling-links     Must be used with --follow-symlinks option;
                            otherwise, h5diff shows error message and returns
                            an exit code of 2.
                            Check for any symbolic links (soft links or external
@@ -79,7 +79,7 @@ usage: h5diff [OPTIONS] file1 file2 [obj1[obj2]]
   2) groups: name string difference
   3) datatypes: the return value of H5Tequal
   4) links: name string difference of the linked value as default
-            (refer to --follow-links option).
+            (refer to --follow-symlinks option).
 
  Exit code:
   0 if no differences, 1 if differences found, 2 if error
diff --git a/tools/h5diff/testfiles/h5diff_624.txt b/tools/h5diff/testfiles/h5diff_624.txt
index dc7c83b..4c9da26 100644
--- a/tools/h5diff/testfiles/h5diff_624.txt
+++ b/tools/h5diff/testfiles/h5diff_624.txt
@@ -11,7 +11,7 @@ usage: h5diff [OPTIONS] file1 file2 [obj1[obj2]]
    -r, --report            Report mode. Print differences.
    -v, --verbose           Verbose mode. Print differences, list of objects.
    -q, --quiet             Quiet mode. Do not produce output.
-   --follow-links          Follow symbolic links (soft links and external links)
+   --follow-symlinks       Follow symbolic links (soft links and external links)
                            and compare the links' target objects.
                            If symbolic link(s) with the same name exist in the
                            files being compared, then determine whether the 
@@ -22,13 +22,13 @@ usage: h5diff [OPTIONS] file1 file2 [obj1[obj2]]
                            - If both symbolic links are dangling links, they
                              are treated as being the same; by default, h5diff
                              returns an exit code of 0. If, however, 
-                             --no-dangling-links is used with --follow-links, 
+                             --no-dangling-links is used with --follow-symlinks,
                              this situation is treated as an error and h5diff 
                              returns an exit code of 2.
                            - If only one of the two links is a dangling link,
                              they are treated as being different and h5diff 
                              returns an exit code of 1. If, however, 
-                             --no-dangling-links is used with --follow-links, 
+                             --no-dangling-links is used with --follow-symlinks,
                              this situation is treated as an error and h5diff 
                              returns an exit code of 2.
                            - If both symbolic links point to existing objects,
@@ -36,7 +36,7 @@ usage: h5diff [OPTIONS] file1 file2 [obj1[obj2]]
                            If any symbolic link specified in the call to h5diff
                            does not exist, h5diff treats it as an error and
                            returns an exit code of 2.
-   --no-dangling-links     Must be used with --follow-links option;
+   --no-dangling-links     Must be used with --follow-symlinks option;
                            otherwise, h5diff shows error message and returns
                            an exit code of 2.
                            Check for any symbolic links (soft links or external
@@ -79,7 +79,7 @@ usage: h5diff [OPTIONS] file1 file2 [obj1[obj2]]
   2) groups: name string difference
   3) datatypes: the return value of H5Tequal
   4) links: name string difference of the linked value as default
-            (refer to --follow-links option).
+            (refer to --follow-symlinks option).
 
  Exit code:
   0 if no differences, 1 if differences found, 2 if error