[svn-r16437] merge from trunk

bug fix: typo in usage message
tested: linux

15 files changed, 15 insertions, 15 deletions

diff --git a/tools/h5diff/h5diff_common.c b/tools/h5diff/h5diff_common.c
index 3f2b8cf..547d910 100644
--- a/tools/h5diff/h5diff_common.c
+++ b/tools/h5diff/h5diff_common.c
@@ -372,7 +372,7 @@ void usage(void)
 
  printf(" The compare criteria is:\n");
  printf("   1) datasets: numerical array differences 2) groups: name string difference\n");
- printf("   3) datatypes: the return value of H5Tequal 2) links: name string difference\n");
+ printf("   3) datatypes: the return value of H5Tequal 4) links: name string difference\n");
  printf("   of the linked value\n");
 
  printf("\n");
diff --git a/tools/h5diff/testfiles/h5diff_10.txt b/tools/h5diff/testfiles/h5diff_10.txt
index 316f06c..38246d9 100644
--- a/tools/h5diff/testfiles/h5diff_10.txt
+++ b/tools/h5diff/testfiles/h5diff_10.txt
@@ -33,7 +33,7 @@ usage: h5diff [OPTIONS] file1 file2 [obj1[obj2]]
 
  The compare criteria is:
    1) datasets: numerical array differences 2) groups: name string difference
-   3) datatypes: the return value of H5Tequal 2) links: name string difference
+   3) datatypes: the return value of H5Tequal 4) links: name string difference
    of the linked value
 
  Return exit code:
diff --git a/tools/h5diff/testfiles/h5diff_600.txt b/tools/h5diff/testfiles/h5diff_600.txt
index f6492cd..17af208 100644
--- a/tools/h5diff/testfiles/h5diff_600.txt
+++ b/tools/h5diff/testfiles/h5diff_600.txt
@@ -33,7 +33,7 @@ usage: h5diff [OPTIONS] file1 file2 [obj1[obj2]]
 
  The compare criteria is:
    1) datasets: numerical array differences 2) groups: name string difference
-   3) datatypes: the return value of H5Tequal 2) links: name string difference
+   3) datatypes: the return value of H5Tequal 4) links: name string difference
    of the linked value
 
  Return exit code:
diff --git a/tools/h5diff/testfiles/h5diff_603.txt b/tools/h5diff/testfiles/h5diff_603.txt
index b3a2d91..30fe246 100644
--- a/tools/h5diff/testfiles/h5diff_603.txt
+++ b/tools/h5diff/testfiles/h5diff_603.txt
@@ -34,7 +34,7 @@ usage: h5diff [OPTIONS] file1 file2 [obj1[obj2]]
 
  The compare criteria is:
    1) datasets: numerical array differences 2) groups: name string difference
-   3) datatypes: the return value of H5Tequal 2) links: name string difference
+   3) datatypes: the return value of H5Tequal 4) links: name string difference
    of the linked value
 
  Return exit code:
diff --git a/tools/h5diff/testfiles/h5diff_604.txt b/tools/h5diff/testfiles/h5diff_604.txt
index f76be67..9357b26 100644
--- a/tools/h5diff/testfiles/h5diff_604.txt
+++ b/tools/h5diff/testfiles/h5diff_604.txt
@@ -34,7 +34,7 @@ usage: h5diff [OPTIONS] file1 file2 [obj1[obj2]]
 
  The compare criteria is:
    1) datasets: numerical array differences 2) groups: name string difference
-   3) datatypes: the return value of H5Tequal 2) links: name string difference
+   3) datatypes: the return value of H5Tequal 4) links: name string difference
    of the linked value
 
  Return exit code:
diff --git a/tools/h5diff/testfiles/h5diff_605.txt b/tools/h5diff/testfiles/h5diff_605.txt
index 6a5d5cb..1c99713 100644
--- a/tools/h5diff/testfiles/h5diff_605.txt
+++ b/tools/h5diff/testfiles/h5diff_605.txt
@@ -34,7 +34,7 @@ usage: h5diff [OPTIONS] file1 file2 [obj1[obj2]]
 
  The compare criteria is:
    1) datasets: numerical array differences 2) groups: name string difference
-   3) datatypes: the return value of H5Tequal 2) links: name string difference
+   3) datatypes: the return value of H5Tequal 4) links: name string difference
    of the linked value
 
  Return exit code:
diff --git a/tools/h5diff/testfiles/h5diff_606.txt b/tools/h5diff/testfiles/h5diff_606.txt
index 8338959..0567106 100644
--- a/tools/h5diff/testfiles/h5diff_606.txt
+++ b/tools/h5diff/testfiles/h5diff_606.txt
@@ -34,7 +34,7 @@ usage: h5diff [OPTIONS] file1 file2 [obj1[obj2]]
 
  The compare criteria is:
    1) datasets: numerical array differences 2) groups: name string difference
-   3) datatypes: the return value of H5Tequal 2) links: name string difference
+   3) datatypes: the return value of H5Tequal 4) links: name string difference
    of the linked value
 
  Return exit code:
diff --git a/tools/h5diff/testfiles/h5diff_612.txt b/tools/h5diff/testfiles/h5diff_612.txt
index ae42501..505705b 100644
--- a/tools/h5diff/testfiles/h5diff_612.txt
+++ b/tools/h5diff/testfiles/h5diff_612.txt
@@ -34,7 +34,7 @@ usage: h5diff [OPTIONS] file1 file2 [obj1[obj2]]
 
  The compare criteria is:
    1) datasets: numerical array differences 2) groups: name string difference
-   3) datatypes: the return value of H5Tequal 2) links: name string difference
+   3) datatypes: the return value of H5Tequal 4) links: name string difference
    of the linked value
 
  Return exit code:
diff --git a/tools/h5diff/testfiles/h5diff_613.txt b/tools/h5diff/testfiles/h5diff_613.txt
index a5fbeff..1a89746 100644
--- a/tools/h5diff/testfiles/h5diff_613.txt
+++ b/tools/h5diff/testfiles/h5diff_613.txt
@@ -34,7 +34,7 @@ usage: h5diff [OPTIONS] file1 file2 [obj1[obj2]]
 
  The compare criteria is:
    1) datasets: numerical array differences 2) groups: name string difference
-   3) datatypes: the return value of H5Tequal 2) links: name string difference
+   3) datatypes: the return value of H5Tequal 4) links: name string difference
    of the linked value
 
  Return exit code:
diff --git a/tools/h5diff/testfiles/h5diff_614.txt b/tools/h5diff/testfiles/h5diff_614.txt
index d5716f6..ec12818 100644
--- a/tools/h5diff/testfiles/h5diff_614.txt
+++ b/tools/h5diff/testfiles/h5diff_614.txt
@@ -34,7 +34,7 @@ usage: h5diff [OPTIONS] file1 file2 [obj1[obj2]]
 
  The compare criteria is:
    1) datasets: numerical array differences 2) groups: name string difference
-   3) datatypes: the return value of H5Tequal 2) links: name string difference
+   3) datatypes: the return value of H5Tequal 4) links: name string difference
    of the linked value
 
  Return exit code:
diff --git a/tools/h5diff/testfiles/h5diff_615.txt b/tools/h5diff/testfiles/h5diff_615.txt
index be344bb..8528c0e 100644
--- a/tools/h5diff/testfiles/h5diff_615.txt
+++ b/tools/h5diff/testfiles/h5diff_615.txt
@@ -34,7 +34,7 @@ usage: h5diff [OPTIONS] file1 file2 [obj1[obj2]]
 
  The compare criteria is:
    1) datasets: numerical array differences 2) groups: name string difference
-   3) datatypes: the return value of H5Tequal 2) links: name string difference
+   3) datatypes: the return value of H5Tequal 4) links: name string difference
    of the linked value
 
  Return exit code:
diff --git a/tools/h5diff/testfiles/h5diff_621.txt b/tools/h5diff/testfiles/h5diff_621.txt
index 082598e..96d6c3f 100644
--- a/tools/h5diff/testfiles/h5diff_621.txt
+++ b/tools/h5diff/testfiles/h5diff_621.txt
@@ -34,7 +34,7 @@ usage: h5diff [OPTIONS] file1 file2 [obj1[obj2]]
 
  The compare criteria is:
    1) datasets: numerical array differences 2) groups: name string difference
-   3) datatypes: the return value of H5Tequal 2) links: name string difference
+   3) datatypes: the return value of H5Tequal 4) links: name string difference
    of the linked value
 
  Return exit code:
diff --git a/tools/h5diff/testfiles/h5diff_622.txt b/tools/h5diff/testfiles/h5diff_622.txt
index 986b196..9dc3751 100644
--- a/tools/h5diff/testfiles/h5diff_622.txt
+++ b/tools/h5diff/testfiles/h5diff_622.txt
@@ -34,7 +34,7 @@ usage: h5diff [OPTIONS] file1 file2 [obj1[obj2]]
 
  The compare criteria is:
    1) datasets: numerical array differences 2) groups: name string difference
-   3) datatypes: the return value of H5Tequal 2) links: name string difference
+   3) datatypes: the return value of H5Tequal 4) links: name string difference
    of the linked value
 
  Return exit code:
diff --git a/tools/h5diff/testfiles/h5diff_623.txt b/tools/h5diff/testfiles/h5diff_623.txt
index cba630e..a02f5ea 100644
--- a/tools/h5diff/testfiles/h5diff_623.txt
+++ b/tools/h5diff/testfiles/h5diff_623.txt
@@ -34,7 +34,7 @@ usage: h5diff [OPTIONS] file1 file2 [obj1[obj2]]
 
  The compare criteria is:
    1) datasets: numerical array differences 2) groups: name string difference
-   3) datatypes: the return value of H5Tequal 2) links: name string difference
+   3) datatypes: the return value of H5Tequal 4) links: name string difference
    of the linked value
 
  Return exit code:
diff --git a/tools/h5diff/testfiles/h5diff_624.txt b/tools/h5diff/testfiles/h5diff_624.txt
index 3a5554f..396a007 100644
--- a/tools/h5diff/testfiles/h5diff_624.txt
+++ b/tools/h5diff/testfiles/h5diff_624.txt
@@ -34,7 +34,7 @@ usage: h5diff [OPTIONS] file1 file2 [obj1[obj2]]
 
  The compare criteria is:
    1) datasets: numerical array differences 2) groups: name string difference
-   3) datatypes: the return value of H5Tequal 2) links: name string difference
+   3) datatypes: the return value of H5Tequal 4) links: name string difference
    of the linked value
 
  Return exit code: