[svn-r22632] Merge from trunk revision 22631

tested: local linux

1 files changed, 20 insertions, 6 deletions

diff --git a/tools/testfiles/tpbitsLengthPositive.ddl b/tools/testfiles/tpbitsLengthPositive.ddl
index 2140ab7..39cef23 100644
--- a/tools/testfiles/tpbitsLengthPositive.ddl
+++ b/tools/testfiles/tpbitsLengthPositive.ddl
@@ -62,10 +62,20 @@ usage: h5dump [OPTIONS] files
         number of dimensions in the dataspace being queried
 
   D - is the file driver to use in opening the file. Acceptable values
-        are "sec2", "family", "split", "multi", "direct", and "stream". Without
-        the file driver flag, the file will be opened with each driver in
-        turn and in the order specified above until one driver succeeds
-        in opening the file.
+      are "sec2", "family", "split", "multi", "direct", and "stream". Without
+      the file driver flag, the file will be opened with each driver in
+      turn and in the order specified above until one driver succeeds
+      in opening the file.
+      These are the letters that are appended to the file name(without .h5) when opening
+      names for the split(m,r) and multi(s,b,r,g,l,o) drivers. They are:
+         m: All meta data when using the split driver.
+         s: The userblock, superblock, and driver info block
+         b: B-tree nodes
+         r: Dataset raw data
+         g: Global heap
+         l: local heap (object names)
+         o: object headers
+
   F - is a filename.
   P - is the full path from the root group to the object.
   N - is an integer greater than 1.
@@ -102,8 +112,12 @@ usage: h5dump [OPTIONS] files
 
       h5dump -d /dset -M 0,1,4,3 quux.h5
 
-  5) Dataset foo in files multi1.h5 multi2.h5 multi3.h5
+  5) Dataset foo in files file1.h5 file2.h5 file3.h5
+
+      h5dump -d /foo file1.h5 file2.h5 file3.h5
+
+  6) Dataset foo in split files splitfile-m.h5 splitfile-r.h5
 
-      h5dump -d /foo multi1.h5 multi2.h5 multi3.h5
+      h5dump -d /foo -f split splitfile
 
 h5dump error: Packed Bit length value(0) must be positive.