[svn-r29291] Merge of r29226-29259 from trunk.

Mostly java JNI + a few smaller merges.

Tested on: h5committest.new
           jam w/ java

7 files changed, 7 insertions, 7 deletions

diff --git a/tools/testfiles/pbits/tnofilename-with-packed-bits.ddl b/tools/testfiles/pbits/tnofilename-with-packed-bits.ddl
index 1a1b7e8..767cbbf 100644
--- a/tools/testfiles/pbits/tnofilename-with-packed-bits.ddl
+++ b/tools/testfiles/pbits/tnofilename-with-packed-bits.ddl
@@ -11,7 +11,7 @@ usage: h5dump [OPTIONS] files
      -o F, --output=F     Output raw data into file F
      -b B, --binary=B     Binary file output, of form B
      -O F, --ddl=F        Output ddl text into file F
-                          Do not use filename F to suppress ddl display
+                          Use blank(empty) filename F to suppress ddl display
 --------------- Object Options ---------------
      -a P, --attribute=P  Print the specified attribute
                           If an attribute name contains a slash (/), escape the
diff --git a/tools/testfiles/pbits/tpbitsIncomplete.ddl b/tools/testfiles/pbits/tpbitsIncomplete.ddl
index 2a2778a..d791b41 100644
--- a/tools/testfiles/pbits/tpbitsIncomplete.ddl
+++ b/tools/testfiles/pbits/tpbitsIncomplete.ddl
@@ -11,7 +11,7 @@ usage: h5dump [OPTIONS] files
      -o F, --output=F     Output raw data into file F
      -b B, --binary=B     Binary file output, of form B
      -O F, --ddl=F        Output ddl text into file F
-                          Do not use filename F to suppress ddl display
+                          Use blank(empty) filename F to suppress ddl display
 --------------- Object Options ---------------
      -a P, --attribute=P  Print the specified attribute
                           If an attribute name contains a slash (/), escape the
diff --git a/tools/testfiles/pbits/tpbitsLengthExceeded.ddl b/tools/testfiles/pbits/tpbitsLengthExceeded.ddl
index 5e00073..5235aa7 100644
--- a/tools/testfiles/pbits/tpbitsLengthExceeded.ddl
+++ b/tools/testfiles/pbits/tpbitsLengthExceeded.ddl
@@ -11,7 +11,7 @@ usage: h5dump [OPTIONS] files
      -o F, --output=F     Output raw data into file F
      -b B, --binary=B     Binary file output, of form B
      -O F, --ddl=F        Output ddl text into file F
-                          Do not use filename F to suppress ddl display
+                          Use blank(empty) filename F to suppress ddl display
 --------------- Object Options ---------------
      -a P, --attribute=P  Print the specified attribute
                           If an attribute name contains a slash (/), escape the
diff --git a/tools/testfiles/pbits/tpbitsLengthPositive.ddl b/tools/testfiles/pbits/tpbitsLengthPositive.ddl
index f2574d4..697bff8 100644
--- a/tools/testfiles/pbits/tpbitsLengthPositive.ddl
+++ b/tools/testfiles/pbits/tpbitsLengthPositive.ddl
@@ -11,7 +11,7 @@ usage: h5dump [OPTIONS] files
      -o F, --output=F     Output raw data into file F
      -b B, --binary=B     Binary file output, of form B
      -O F, --ddl=F        Output ddl text into file F
-                          Do not use filename F to suppress ddl display
+                          Use blank(empty) filename F to suppress ddl display
 --------------- Object Options ---------------
      -a P, --attribute=P  Print the specified attribute
                           If an attribute name contains a slash (/), escape the
diff --git a/tools/testfiles/pbits/tpbitsMaxExceeded.ddl b/tools/testfiles/pbits/tpbitsMaxExceeded.ddl
index 15c0abc..900c0b5 100644
--- a/tools/testfiles/pbits/tpbitsMaxExceeded.ddl
+++ b/tools/testfiles/pbits/tpbitsMaxExceeded.ddl
@@ -11,7 +11,7 @@ usage: h5dump [OPTIONS] files
      -o F, --output=F     Output raw data into file F
      -b B, --binary=B     Binary file output, of form B
      -O F, --ddl=F        Output ddl text into file F
-                          Do not use filename F to suppress ddl display
+                          Use blank(empty) filename F to suppress ddl display
 --------------- Object Options ---------------
      -a P, --attribute=P  Print the specified attribute
                           If an attribute name contains a slash (/), escape the
diff --git a/tools/testfiles/pbits/tpbitsOffsetExceeded.ddl b/tools/testfiles/pbits/tpbitsOffsetExceeded.ddl
index c62e290..65123d0 100644
--- a/tools/testfiles/pbits/tpbitsOffsetExceeded.ddl
+++ b/tools/testfiles/pbits/tpbitsOffsetExceeded.ddl
@@ -11,7 +11,7 @@ usage: h5dump [OPTIONS] files
      -o F, --output=F     Output raw data into file F
      -b B, --binary=B     Binary file output, of form B
      -O F, --ddl=F        Output ddl text into file F
-                          Do not use filename F to suppress ddl display
+                          Use blank(empty) filename F to suppress ddl display
 --------------- Object Options ---------------
      -a P, --attribute=P  Print the specified attribute
                           If an attribute name contains a slash (/), escape the
diff --git a/tools/testfiles/pbits/tpbitsOffsetNegative.ddl b/tools/testfiles/pbits/tpbitsOffsetNegative.ddl
index 5621a60..d352e34 100644
--- a/tools/testfiles/pbits/tpbitsOffsetNegative.ddl
+++ b/tools/testfiles/pbits/tpbitsOffsetNegative.ddl
@@ -11,7 +11,7 @@ usage: h5dump [OPTIONS] files
      -o F, --output=F     Output raw data into file F
      -b B, --binary=B     Binary file output, of form B
      -O F, --ddl=F        Output ddl text into file F
-                          Do not use filename F to suppress ddl display
+                          Use blank(empty) filename F to suppress ddl display
 --------------- Object Options ---------------
      -a P, --attribute=P  Print the specified attribute
                           If an attribute name contains a slash (/), escape the