[svn-r23991] Reorder grouping

9 files changed, 207 insertions, 207 deletions

diff --git a/tools/h5dump/h5dump.c b/tools/h5dump/h5dump.c
index 6218631..be6ee7f 100644
--- a/tools/h5dump/h5dump.c
+++ b/tools/h5dump/h5dump.c
@@ -231,20 +231,6 @@ usage(const char *prog)
     PRINTVALSTREAM(rawoutstream, "  OPTIONS\n");
     PRINTVALSTREAM(rawoutstream, "     -h,   --help         Print a usage message and exit\n");
     PRINTVALSTREAM(rawoutstream, "     -V,   --version      Print version number and exit\n");
-    PRINTVALSTREAM(rawoutstream, "--------------- Formatting Options ---------------\n");
-    PRINTVALSTREAM(rawoutstream, "     -e,   --escape       Escape non printing characters\n");
-    PRINTVALSTREAM(rawoutstream, "     -r,   --string       Print 1-byte integer datasets as ASCII\n");
-    PRINTVALSTREAM(rawoutstream, "     -y,   --noindex      Do not print array indices with the data\n");
-    PRINTVALSTREAM(rawoutstream, "     -m T, --format=T     Set the floating point output format\n");
-    PRINTVALSTREAM(rawoutstream, "     -q Q, --sort_by=Q    Sort groups and attributes by index Q\n");
-    PRINTVALSTREAM(rawoutstream, "     -z Z, --sort_order=Z Sort groups and attributes by order Z\n");
-    PRINTVALSTREAM(rawoutstream, "     --enable-error-stack Prints messages from the HDF5 error stack as they\n");
-    PRINTVALSTREAM(rawoutstream, "                          occur.\n");
-    PRINTVALSTREAM(rawoutstream, "     --no-compact-subset  Disable compact form of subsetting and allow the use\n");
-    PRINTVALSTREAM(rawoutstream, "                          of \"[\" in dataset names.\n");
-    PRINTVALSTREAM(rawoutstream, "     -w N, --width=N      Set the number of columns of output. A value of 0 (zero)\n");
-    PRINTVALSTREAM(rawoutstream, "                          sets the number of columns to the maximum (65535).\n");
-    PRINTVALSTREAM(rawoutstream, "                          Default width is 80 columns.\n");
     PRINTVALSTREAM(rawoutstream, "--------------- File Options ---------------\n");
     PRINTVALSTREAM(rawoutstream, "     -n,   --contents     Print a list of the file contents and exit\n");
     PRINTVALSTREAM(rawoutstream, "                          Optional value 1 also prints attributes.\n");
@@ -276,6 +262,20 @@ usage(const char *prog)
     PRINTVALSTREAM(rawoutstream, "                          the data value and length is the number of bits of\n");
     PRINTVALSTREAM(rawoutstream, "                          the mask.\n");
     PRINTVALSTREAM(rawoutstream, "     -R,   --region       Print dataset pointed by region references\n");
+    PRINTVALSTREAM(rawoutstream, "--------------- Formatting Options ---------------\n");
+    PRINTVALSTREAM(rawoutstream, "     -e,   --escape       Escape non printing characters\n");
+    PRINTVALSTREAM(rawoutstream, "     -r,   --string       Print 1-byte integer datasets as ASCII\n");
+    PRINTVALSTREAM(rawoutstream, "     -y,   --noindex      Do not print array indices with the data\n");
+    PRINTVALSTREAM(rawoutstream, "     -m T, --format=T     Set the floating point output format\n");
+    PRINTVALSTREAM(rawoutstream, "     -q Q, --sort_by=Q    Sort groups and attributes by index Q\n");
+    PRINTVALSTREAM(rawoutstream, "     -z Z, --sort_order=Z Sort groups and attributes by order Z\n");
+    PRINTVALSTREAM(rawoutstream, "     --enable-error-stack Prints messages from the HDF5 error stack as they\n");
+    PRINTVALSTREAM(rawoutstream, "                          occur.\n");
+    PRINTVALSTREAM(rawoutstream, "     --no-compact-subset  Disable compact form of subsetting and allow the use\n");
+    PRINTVALSTREAM(rawoutstream, "                          of \"[\" in dataset names.\n");
+    PRINTVALSTREAM(rawoutstream, "     -w N, --width=N      Set the number of columns of output. A value of 0 (zero)\n");
+    PRINTVALSTREAM(rawoutstream, "                          sets the number of columns to the maximum (65535).\n");
+    PRINTVALSTREAM(rawoutstream, "                          Default width is 80 columns.\n");
     PRINTVALSTREAM(rawoutstream, "--------------- XML Options ---------------\n");
     PRINTVALSTREAM(rawoutstream, "     -x,   --xml          Output in XML using Schema\n");
     PRINTVALSTREAM(rawoutstream, "     -u,   --use-dtd      Output in XML using DTD\n");
@@ -306,15 +306,7 @@ usage(const char *prog)
     PRINTVALSTREAM(rawoutstream, "      the file driver flag, the file will be opened with each driver in\n");
     PRINTVALSTREAM(rawoutstream, "      turn and in the order specified above until one driver succeeds\n");
     PRINTVALSTREAM(rawoutstream, "      in opening the file.\n");
-    PRINTVALSTREAM(rawoutstream, "      These are the letters that are appended to the file name(without .h5) when opening\n");
-    PRINTVALSTREAM(rawoutstream, "      names for the split(m,r) and multi(s,b,r,g,l,o) drivers. They are:\n");
-    PRINTVALSTREAM(rawoutstream, "         m: All meta data when using the split driver.\n");
-    PRINTVALSTREAM(rawoutstream, "         s: The userblock, superblock, and driver info block\n");
-    PRINTVALSTREAM(rawoutstream, "         b: B-tree nodes\n");
-    PRINTVALSTREAM(rawoutstream, "         r: Dataset raw data\n");
-    PRINTVALSTREAM(rawoutstream, "         g: Global heap\n");
-    PRINTVALSTREAM(rawoutstream, "         l: local heap (object names)\n");
-    PRINTVALSTREAM(rawoutstream, "         o: object headers\n");
+    PRINTVALSTREAM(rawoutstream, "      See examples below for family, split, and multi driver special file name usage.\n");
     PRINTVALSTREAM(rawoutstream, "\n");
     PRINTVALSTREAM(rawoutstream, "  F - is a filename.\n");
     PRINTVALSTREAM(rawoutstream, "  P - is the full path from the root group to the object.\n");
@@ -360,6 +352,14 @@ usage(const char *prog)
     PRINTVALSTREAM(rawoutstream, "\n");
     PRINTVALSTREAM(rawoutstream, "      h5dump -d /foo -f split splitfile\n");
     PRINTVALSTREAM(rawoutstream, "\n");
+    PRINTVALSTREAM(rawoutstream, "  7) Dataset foo in multi files mf-s.h5, mf-b.h5, mf-r.h5, mf-g.h5, mf-l.h5 and mf-o.h5\n");
+    PRINTVALSTREAM(rawoutstream, "\n");
+    PRINTVALSTREAM(rawoutstream, "      h5dump -d /foo -f multi mf\n");
+    PRINTVALSTREAM(rawoutstream, "\n");
+    PRINTVALSTREAM(rawoutstream, "  8) Dataset foo in family files fam00000.h5 fam00001.h5 and fam00002.h5\n");
+    PRINTVALSTREAM(rawoutstream, "\n");
+    PRINTVALSTREAM(rawoutstream, "      h5dump -d /foo -f family fam%05d.h5\n");
+    PRINTVALSTREAM(rawoutstream, "\n");
 }
 
 
diff --git a/tools/testfiles/h5dump-help.txt b/tools/testfiles/h5dump-help.txt
index 3a4864e..82b7323 100644
--- a/tools/testfiles/h5dump-help.txt
+++ b/tools/testfiles/h5dump-help.txt
@@ -2,20 +2,6 @@ usage: h5dump [OPTIONS] files
   OPTIONS
      -h,   --help         Print a usage message and exit
      -V,   --version      Print version number and exit
---------------- Formatting Options ---------------
-     -e,   --escape       Escape non printing characters
-     -r,   --string       Print 1-byte integer datasets as ASCII
-     -y,   --noindex      Do not print array indices with the data
-     -m T, --format=T     Set the floating point output format
-     -q Q, --sort_by=Q    Sort groups and attributes by index Q
-     -z Z, --sort_order=Z Sort groups and attributes by order Z
-     --enable-error-stack Prints messages from the HDF5 error stack as they
-                          occur.
-     --no-compact-subset  Disable compact form of subsetting and allow the use
-                          of "[" in dataset names.
-     -w N, --width=N      Set the number of columns of output. A value of 0 (zero)
-                          sets the number of columns to the maximum (65535).
-                          Default width is 80 columns.
 --------------- File Options ---------------
      -n,   --contents     Print a list of the file contents and exit
                           Optional value 1 also prints attributes.
@@ -47,6 +33,20 @@ usage: h5dump [OPTIONS] files
                           the data value and length is the number of bits of
                           the mask.
      -R,   --region       Print dataset pointed by region references
+--------------- Formatting Options ---------------
+     -e,   --escape       Escape non printing characters
+     -r,   --string       Print 1-byte integer datasets as ASCII
+     -y,   --noindex      Do not print array indices with the data
+     -m T, --format=T     Set the floating point output format
+     -q Q, --sort_by=Q    Sort groups and attributes by index Q
+     -z Z, --sort_order=Z Sort groups and attributes by order Z
+     --enable-error-stack Prints messages from the HDF5 error stack as they
+                          occur.
+     --no-compact-subset  Disable compact form of subsetting and allow the use
+                          of "[" in dataset names.
+     -w N, --width=N      Set the number of columns of output. A value of 0 (zero)
+                          sets the number of columns to the maximum (65535).
+                          Default width is 80 columns.
 --------------- XML Options ---------------
      -x,   --xml          Output in XML using Schema
      -u,   --use-dtd      Output in XML using DTD
@@ -77,15 +77,7 @@ usage: h5dump [OPTIONS] files
       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
+      See examples below for family, split, and multi driver special file name usage.
 
   F - is a filename.
   P - is the full path from the root group to the object.
@@ -131,3 +123,11 @@ usage: h5dump [OPTIONS] files
 
       h5dump -d /foo -f split splitfile
 
+  7) Dataset foo in multi files mf-s.h5, mf-b.h5, mf-r.h5, mf-g.h5, mf-l.h5 and mf-o.h5
+
+      h5dump -d /foo -f multi mf
+
+  8) Dataset foo in family files fam00000.h5 fam00001.h5 and fam00002.h5
+
+      h5dump -d /foo -f family fam-574932464.h5
+
diff --git a/tools/testfiles/tnofilename-with-packed-bits.ddl b/tools/testfiles/tnofilename-with-packed-bits.ddl
index e8df31c..bb0a876 100644
--- a/tools/testfiles/tnofilename-with-packed-bits.ddl
+++ b/tools/testfiles/tnofilename-with-packed-bits.ddl
@@ -2,20 +2,6 @@ usage: h5dump [OPTIONS] files
   OPTIONS
      -h,   --help         Print a usage message and exit
      -V,   --version      Print version number and exit
---------------- Formatting Options ---------------
-     -e,   --escape       Escape non printing characters
-     -r,   --string       Print 1-byte integer datasets as ASCII
-     -y,   --noindex      Do not print array indices with the data
-     -m T, --format=T     Set the floating point output format
-     -q Q, --sort_by=Q    Sort groups and attributes by index Q
-     -z Z, --sort_order=Z Sort groups and attributes by order Z
-     --enable-error-stack Prints messages from the HDF5 error stack as they
-                          occur.
-     --no-compact-subset  Disable compact form of subsetting and allow the use
-                          of "[" in dataset names.
-     -w N, --width=N      Set the number of columns of output. A value of 0 (zero)
-                          sets the number of columns to the maximum (65535).
-                          Default width is 80 columns.
 --------------- File Options ---------------
      -n,   --contents     Print a list of the file contents and exit
                           Optional value 1 also prints attributes.
@@ -47,6 +33,20 @@ usage: h5dump [OPTIONS] files
                           the data value and length is the number of bits of
                           the mask.
      -R,   --region       Print dataset pointed by region references
+--------------- Formatting Options ---------------
+     -e,   --escape       Escape non printing characters
+     -r,   --string       Print 1-byte integer datasets as ASCII
+     -y,   --noindex      Do not print array indices with the data
+     -m T, --format=T     Set the floating point output format
+     -q Q, --sort_by=Q    Sort groups and attributes by index Q
+     -z Z, --sort_order=Z Sort groups and attributes by order Z
+     --enable-error-stack Prints messages from the HDF5 error stack as they
+                          occur.
+     --no-compact-subset  Disable compact form of subsetting and allow the use
+                          of "[" in dataset names.
+     -w N, --width=N      Set the number of columns of output. A value of 0 (zero)
+                          sets the number of columns to the maximum (65535).
+                          Default width is 80 columns.
 --------------- XML Options ---------------
      -x,   --xml          Output in XML using Schema
      -u,   --use-dtd      Output in XML using DTD
@@ -77,15 +77,7 @@ usage: h5dump [OPTIONS] files
       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
+      See examples below for family, split, and multi driver special file name usage.
 
   F - is a filename.
   P - is the full path from the root group to the object.
@@ -131,4 +123,12 @@ usage: h5dump [OPTIONS] files
 
       h5dump -d /foo -f split splitfile
 
+  7) Dataset foo in multi files mf-s.h5, mf-b.h5, mf-r.h5, mf-g.h5, mf-l.h5 and mf-o.h5
+
+      h5dump -d /foo -f multi mf
+
+  8) Dataset foo in family files fam00000.h5 fam00001.h5 and fam00002.h5
+
+      h5dump -d /foo -f family fam-574932464.h5
+
 h5dump error: missing file name
diff --git a/tools/testfiles/tpbitsIncomplete.ddl b/tools/testfiles/tpbitsIncomplete.ddl
index c27e0ce..1292049 100644
--- a/tools/testfiles/tpbitsIncomplete.ddl
+++ b/tools/testfiles/tpbitsIncomplete.ddl
@@ -2,20 +2,6 @@ usage: h5dump [OPTIONS] files
   OPTIONS
      -h,   --help         Print a usage message and exit
      -V,   --version      Print version number and exit
---------------- Formatting Options ---------------
-     -e,   --escape       Escape non printing characters
-     -r,   --string       Print 1-byte integer datasets as ASCII
-     -y,   --noindex      Do not print array indices with the data
-     -m T, --format=T     Set the floating point output format
-     -q Q, --sort_by=Q    Sort groups and attributes by index Q
-     -z Z, --sort_order=Z Sort groups and attributes by order Z
-     --enable-error-stack Prints messages from the HDF5 error stack as they
-                          occur.
-     --no-compact-subset  Disable compact form of subsetting and allow the use
-                          of "[" in dataset names.
-     -w N, --width=N      Set the number of columns of output. A value of 0 (zero)
-                          sets the number of columns to the maximum (65535).
-                          Default width is 80 columns.
 --------------- File Options ---------------
      -n,   --contents     Print a list of the file contents and exit
                           Optional value 1 also prints attributes.
@@ -47,6 +33,20 @@ usage: h5dump [OPTIONS] files
                           the data value and length is the number of bits of
                           the mask.
      -R,   --region       Print dataset pointed by region references
+--------------- Formatting Options ---------------
+     -e,   --escape       Escape non printing characters
+     -r,   --string       Print 1-byte integer datasets as ASCII
+     -y,   --noindex      Do not print array indices with the data
+     -m T, --format=T     Set the floating point output format
+     -q Q, --sort_by=Q    Sort groups and attributes by index Q
+     -z Z, --sort_order=Z Sort groups and attributes by order Z
+     --enable-error-stack Prints messages from the HDF5 error stack as they
+                          occur.
+     --no-compact-subset  Disable compact form of subsetting and allow the use
+                          of "[" in dataset names.
+     -w N, --width=N      Set the number of columns of output. A value of 0 (zero)
+                          sets the number of columns to the maximum (65535).
+                          Default width is 80 columns.
 --------------- XML Options ---------------
      -x,   --xml          Output in XML using Schema
      -u,   --use-dtd      Output in XML using DTD
@@ -77,15 +77,7 @@ usage: h5dump [OPTIONS] files
       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
+      See examples below for family, split, and multi driver special file name usage.
 
   F - is a filename.
   P - is the full path from the root group to the object.
@@ -131,4 +123,12 @@ usage: h5dump [OPTIONS] files
 
       h5dump -d /foo -f split splitfile
 
+  7) Dataset foo in multi files mf-s.h5, mf-b.h5, mf-r.h5, mf-g.h5, mf-l.h5 and mf-o.h5
+
+      h5dump -d /foo -f multi mf
+
+  8) Dataset foo in family files fam00000.h5 fam00001.h5 and fam00002.h5
+
+      h5dump -d /foo -f family fam-574932464.h5
+
 h5dump error: Bad mask list(0,2,2,1,0,2,2,)
diff --git a/tools/testfiles/tpbitsLengthExceeded.ddl b/tools/testfiles/tpbitsLengthExceeded.ddl
index 58c0e05..12f2f2a 100644
--- a/tools/testfiles/tpbitsLengthExceeded.ddl
+++ b/tools/testfiles/tpbitsLengthExceeded.ddl
@@ -2,20 +2,6 @@ usage: h5dump [OPTIONS] files
   OPTIONS
      -h,   --help         Print a usage message and exit
      -V,   --version      Print version number and exit
---------------- Formatting Options ---------------
-     -e,   --escape       Escape non printing characters
-     -r,   --string       Print 1-byte integer datasets as ASCII
-     -y,   --noindex      Do not print array indices with the data
-     -m T, --format=T     Set the floating point output format
-     -q Q, --sort_by=Q    Sort groups and attributes by index Q
-     -z Z, --sort_order=Z Sort groups and attributes by order Z
-     --enable-error-stack Prints messages from the HDF5 error stack as they
-                          occur.
-     --no-compact-subset  Disable compact form of subsetting and allow the use
-                          of "[" in dataset names.
-     -w N, --width=N      Set the number of columns of output. A value of 0 (zero)
-                          sets the number of columns to the maximum (65535).
-                          Default width is 80 columns.
 --------------- File Options ---------------
      -n,   --contents     Print a list of the file contents and exit
                           Optional value 1 also prints attributes.
@@ -47,6 +33,20 @@ usage: h5dump [OPTIONS] files
                           the data value and length is the number of bits of
                           the mask.
      -R,   --region       Print dataset pointed by region references
+--------------- Formatting Options ---------------
+     -e,   --escape       Escape non printing characters
+     -r,   --string       Print 1-byte integer datasets as ASCII
+     -y,   --noindex      Do not print array indices with the data
+     -m T, --format=T     Set the floating point output format
+     -q Q, --sort_by=Q    Sort groups and attributes by index Q
+     -z Z, --sort_order=Z Sort groups and attributes by order Z
+     --enable-error-stack Prints messages from the HDF5 error stack as they
+                          occur.
+     --no-compact-subset  Disable compact form of subsetting and allow the use
+                          of "[" in dataset names.
+     -w N, --width=N      Set the number of columns of output. A value of 0 (zero)
+                          sets the number of columns to the maximum (65535).
+                          Default width is 80 columns.
 --------------- XML Options ---------------
      -x,   --xml          Output in XML using Schema
      -u,   --use-dtd      Output in XML using DTD
@@ -77,15 +77,7 @@ usage: h5dump [OPTIONS] files
       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
+      See examples below for family, split, and multi driver special file name usage.
 
   F - is a filename.
   P - is the full path from the root group to the object.
@@ -131,4 +123,12 @@ usage: h5dump [OPTIONS] files
 
       h5dump -d /foo -f split splitfile
 
+  7) Dataset foo in multi files mf-s.h5, mf-b.h5, mf-r.h5, mf-g.h5, mf-l.h5 and mf-o.h5
+
+      h5dump -d /foo -f multi mf
+
+  8) Dataset foo in family files fam00000.h5 fam00001.h5 and fam00002.h5
+
+      h5dump -d /foo -f family fam-574932464.h5
+
 h5dump error: Packed Bit offset+length value(65) too large. Max is 64
diff --git a/tools/testfiles/tpbitsLengthPositive.ddl b/tools/testfiles/tpbitsLengthPositive.ddl
index 8a93cbc..c98ce67 100644
--- a/tools/testfiles/tpbitsLengthPositive.ddl
+++ b/tools/testfiles/tpbitsLengthPositive.ddl
@@ -2,20 +2,6 @@ usage: h5dump [OPTIONS] files
   OPTIONS
      -h,   --help         Print a usage message and exit
      -V,   --version      Print version number and exit
---------------- Formatting Options ---------------
-     -e,   --escape       Escape non printing characters
-     -r,   --string       Print 1-byte integer datasets as ASCII
-     -y,   --noindex      Do not print array indices with the data
-     -m T, --format=T     Set the floating point output format
-     -q Q, --sort_by=Q    Sort groups and attributes by index Q
-     -z Z, --sort_order=Z Sort groups and attributes by order Z
-     --enable-error-stack Prints messages from the HDF5 error stack as they
-                          occur.
-     --no-compact-subset  Disable compact form of subsetting and allow the use
-                          of "[" in dataset names.
-     -w N, --width=N      Set the number of columns of output. A value of 0 (zero)
-                          sets the number of columns to the maximum (65535).
-                          Default width is 80 columns.
 --------------- File Options ---------------
      -n,   --contents     Print a list of the file contents and exit
                           Optional value 1 also prints attributes.
@@ -47,6 +33,20 @@ usage: h5dump [OPTIONS] files
                           the data value and length is the number of bits of
                           the mask.
      -R,   --region       Print dataset pointed by region references
+--------------- Formatting Options ---------------
+     -e,   --escape       Escape non printing characters
+     -r,   --string       Print 1-byte integer datasets as ASCII
+     -y,   --noindex      Do not print array indices with the data
+     -m T, --format=T     Set the floating point output format
+     -q Q, --sort_by=Q    Sort groups and attributes by index Q
+     -z Z, --sort_order=Z Sort groups and attributes by order Z
+     --enable-error-stack Prints messages from the HDF5 error stack as they
+                          occur.
+     --no-compact-subset  Disable compact form of subsetting and allow the use
+                          of "[" in dataset names.
+     -w N, --width=N      Set the number of columns of output. A value of 0 (zero)
+                          sets the number of columns to the maximum (65535).
+                          Default width is 80 columns.
 --------------- XML Options ---------------
      -x,   --xml          Output in XML using Schema
      -u,   --use-dtd      Output in XML using DTD
@@ -77,15 +77,7 @@ usage: h5dump [OPTIONS] files
       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
+      See examples below for family, split, and multi driver special file name usage.
 
   F - is a filename.
   P - is the full path from the root group to the object.
@@ -131,4 +123,12 @@ usage: h5dump [OPTIONS] files
 
       h5dump -d /foo -f split splitfile
 
+  7) Dataset foo in multi files mf-s.h5, mf-b.h5, mf-r.h5, mf-g.h5, mf-l.h5 and mf-o.h5
+
+      h5dump -d /foo -f multi mf
+
+  8) Dataset foo in family files fam00000.h5 fam00001.h5 and fam00002.h5
+
+      h5dump -d /foo -f family fam-574932464.h5
+
 h5dump error: Packed Bit length value(0) must be positive.
diff --git a/tools/testfiles/tpbitsMaxExceeded.ddl b/tools/testfiles/tpbitsMaxExceeded.ddl
index 21c5af4..46319d1 100644
--- a/tools/testfiles/tpbitsMaxExceeded.ddl
+++ b/tools/testfiles/tpbitsMaxExceeded.ddl
@@ -2,20 +2,6 @@ usage: h5dump [OPTIONS] files
   OPTIONS
      -h,   --help         Print a usage message and exit
      -V,   --version      Print version number and exit
---------------- Formatting Options ---------------
-     -e,   --escape       Escape non printing characters
-     -r,   --string       Print 1-byte integer datasets as ASCII
-     -y,   --noindex      Do not print array indices with the data
-     -m T, --format=T     Set the floating point output format
-     -q Q, --sort_by=Q    Sort groups and attributes by index Q
-     -z Z, --sort_order=Z Sort groups and attributes by order Z
-     --enable-error-stack Prints messages from the HDF5 error stack as they
-                          occur.
-     --no-compact-subset  Disable compact form of subsetting and allow the use
-                          of "[" in dataset names.
-     -w N, --width=N      Set the number of columns of output. A value of 0 (zero)
-                          sets the number of columns to the maximum (65535).
-                          Default width is 80 columns.
 --------------- File Options ---------------
      -n,   --contents     Print a list of the file contents and exit
                           Optional value 1 also prints attributes.
@@ -47,6 +33,20 @@ usage: h5dump [OPTIONS] files
                           the data value and length is the number of bits of
                           the mask.
      -R,   --region       Print dataset pointed by region references
+--------------- Formatting Options ---------------
+     -e,   --escape       Escape non printing characters
+     -r,   --string       Print 1-byte integer datasets as ASCII
+     -y,   --noindex      Do not print array indices with the data
+     -m T, --format=T     Set the floating point output format
+     -q Q, --sort_by=Q    Sort groups and attributes by index Q
+     -z Z, --sort_order=Z Sort groups and attributes by order Z
+     --enable-error-stack Prints messages from the HDF5 error stack as they
+                          occur.
+     --no-compact-subset  Disable compact form of subsetting and allow the use
+                          of "[" in dataset names.
+     -w N, --width=N      Set the number of columns of output. A value of 0 (zero)
+                          sets the number of columns to the maximum (65535).
+                          Default width is 80 columns.
 --------------- XML Options ---------------
      -x,   --xml          Output in XML using Schema
      -u,   --use-dtd      Output in XML using DTD
@@ -77,15 +77,7 @@ usage: h5dump [OPTIONS] files
       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
+      See examples below for family, split, and multi driver special file name usage.
 
   F - is a filename.
   P - is the full path from the root group to the object.
@@ -131,4 +123,12 @@ usage: h5dump [OPTIONS] files
 
       h5dump -d /foo -f split splitfile
 
+  7) Dataset foo in multi files mf-s.h5, mf-b.h5, mf-r.h5, mf-g.h5, mf-l.h5 and mf-o.h5
+
+      h5dump -d /foo -f multi mf
+
+  8) Dataset foo in family files fam00000.h5 fam00001.h5 and fam00002.h5
+
+      h5dump -d /foo -f family fam-574932464.h5
+
 h5dump error: Too many masks requested (max. 8). Mask list(0,1,0,1,1,1,2,1,3,1,4,1,5,1,6,1,7,1)
diff --git a/tools/testfiles/tpbitsOffsetExceeded.ddl b/tools/testfiles/tpbitsOffsetExceeded.ddl
index 52d901d..8f240c5 100644
--- a/tools/testfiles/tpbitsOffsetExceeded.ddl
+++ b/tools/testfiles/tpbitsOffsetExceeded.ddl
@@ -2,20 +2,6 @@ usage: h5dump [OPTIONS] files
   OPTIONS
      -h,   --help         Print a usage message and exit
      -V,   --version      Print version number and exit
---------------- Formatting Options ---------------
-     -e,   --escape       Escape non printing characters
-     -r,   --string       Print 1-byte integer datasets as ASCII
-     -y,   --noindex      Do not print array indices with the data
-     -m T, --format=T     Set the floating point output format
-     -q Q, --sort_by=Q    Sort groups and attributes by index Q
-     -z Z, --sort_order=Z Sort groups and attributes by order Z
-     --enable-error-stack Prints messages from the HDF5 error stack as they
-                          occur.
-     --no-compact-subset  Disable compact form of subsetting and allow the use
-                          of "[" in dataset names.
-     -w N, --width=N      Set the number of columns of output. A value of 0 (zero)
-                          sets the number of columns to the maximum (65535).
-                          Default width is 80 columns.
 --------------- File Options ---------------
      -n,   --contents     Print a list of the file contents and exit
                           Optional value 1 also prints attributes.
@@ -47,6 +33,20 @@ usage: h5dump [OPTIONS] files
                           the data value and length is the number of bits of
                           the mask.
      -R,   --region       Print dataset pointed by region references
+--------------- Formatting Options ---------------
+     -e,   --escape       Escape non printing characters
+     -r,   --string       Print 1-byte integer datasets as ASCII
+     -y,   --noindex      Do not print array indices with the data
+     -m T, --format=T     Set the floating point output format
+     -q Q, --sort_by=Q    Sort groups and attributes by index Q
+     -z Z, --sort_order=Z Sort groups and attributes by order Z
+     --enable-error-stack Prints messages from the HDF5 error stack as they
+                          occur.
+     --no-compact-subset  Disable compact form of subsetting and allow the use
+                          of "[" in dataset names.
+     -w N, --width=N      Set the number of columns of output. A value of 0 (zero)
+                          sets the number of columns to the maximum (65535).
+                          Default width is 80 columns.
 --------------- XML Options ---------------
      -x,   --xml          Output in XML using Schema
      -u,   --use-dtd      Output in XML using DTD
@@ -77,15 +77,7 @@ usage: h5dump [OPTIONS] files
       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
+      See examples below for family, split, and multi driver special file name usage.
 
   F - is a filename.
   P - is the full path from the root group to the object.
@@ -131,4 +123,12 @@ usage: h5dump [OPTIONS] files
 
       h5dump -d /foo -f split splitfile
 
+  7) Dataset foo in multi files mf-s.h5, mf-b.h5, mf-r.h5, mf-g.h5, mf-l.h5 and mf-o.h5
+
+      h5dump -d /foo -f multi mf
+
+  8) Dataset foo in family files fam00000.h5 fam00001.h5 and fam00002.h5
+
+      h5dump -d /foo -f family fam-574932464.h5
+
 h5dump error: Packed Bit offset value(64) must be between 0 and 63
diff --git a/tools/testfiles/tpbitsOffsetNegative.ddl b/tools/testfiles/tpbitsOffsetNegative.ddl
index 82b6c88..593d980 100644
--- a/tools/testfiles/tpbitsOffsetNegative.ddl
+++ b/tools/testfiles/tpbitsOffsetNegative.ddl
@@ -2,20 +2,6 @@ usage: h5dump [OPTIONS] files
   OPTIONS
      -h,   --help         Print a usage message and exit
      -V,   --version      Print version number and exit
---------------- Formatting Options ---------------
-     -e,   --escape       Escape non printing characters
-     -r,   --string       Print 1-byte integer datasets as ASCII
-     -y,   --noindex      Do not print array indices with the data
-     -m T, --format=T     Set the floating point output format
-     -q Q, --sort_by=Q    Sort groups and attributes by index Q
-     -z Z, --sort_order=Z Sort groups and attributes by order Z
-     --enable-error-stack Prints messages from the HDF5 error stack as they
-                          occur.
-     --no-compact-subset  Disable compact form of subsetting and allow the use
-                          of "[" in dataset names.
-     -w N, --width=N      Set the number of columns of output. A value of 0 (zero)
-                          sets the number of columns to the maximum (65535).
-                          Default width is 80 columns.
 --------------- File Options ---------------
      -n,   --contents     Print a list of the file contents and exit
                           Optional value 1 also prints attributes.
@@ -47,6 +33,20 @@ usage: h5dump [OPTIONS] files
                           the data value and length is the number of bits of
                           the mask.
      -R,   --region       Print dataset pointed by region references
+--------------- Formatting Options ---------------
+     -e,   --escape       Escape non printing characters
+     -r,   --string       Print 1-byte integer datasets as ASCII
+     -y,   --noindex      Do not print array indices with the data
+     -m T, --format=T     Set the floating point output format
+     -q Q, --sort_by=Q    Sort groups and attributes by index Q
+     -z Z, --sort_order=Z Sort groups and attributes by order Z
+     --enable-error-stack Prints messages from the HDF5 error stack as they
+                          occur.
+     --no-compact-subset  Disable compact form of subsetting and allow the use
+                          of "[" in dataset names.
+     -w N, --width=N      Set the number of columns of output. A value of 0 (zero)
+                          sets the number of columns to the maximum (65535).
+                          Default width is 80 columns.
 --------------- XML Options ---------------
      -x,   --xml          Output in XML using Schema
      -u,   --use-dtd      Output in XML using DTD
@@ -77,15 +77,7 @@ usage: h5dump [OPTIONS] files
       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
+      See examples below for family, split, and multi driver special file name usage.
 
   F - is a filename.
   P - is the full path from the root group to the object.
@@ -131,4 +123,12 @@ usage: h5dump [OPTIONS] files
 
       h5dump -d /foo -f split splitfile
 
+  7) Dataset foo in multi files mf-s.h5, mf-b.h5, mf-r.h5, mf-g.h5, mf-l.h5 and mf-o.h5
+
+      h5dump -d /foo -f multi mf
+
+  8) Dataset foo in family files fam00000.h5 fam00001.h5 and fam00002.h5
+
+      h5dump -d /foo -f family fam-574932464.h5
+
 h5dump error: Bad mask list(-1,1)