[svn-r24031] Bring revisions #23950 - 23977 from trunk to revise_chunks.

h5committested.

57 files changed, 1370 insertions, 415 deletions

diff --git a/MANIFEST b/MANIFEST
index c75a486..7bcd29a 100644
--- a/MANIFEST
+++ b/MANIFEST
@@ -1365,6 +1365,12 @@
 # h5stat test files
 ./tools/h5stat/h5stat_gentest.c
 ./tools/h5stat/testh5stat.sh.in
+./tools/h5stat/testfiles/h5stat_dims1.ddl
+./tools/h5stat/testfiles/h5stat_dims2.ddl
+./tools/h5stat/testfiles/h5stat_err1_dims.ddl
+./tools/h5stat/testfiles/h5stat_err1_links.ddl
+./tools/h5stat/testfiles/h5stat_err1_numattrs.ddl
+./tools/h5stat/testfiles/h5stat_err2_numattrs.ddl
 ./tools/h5stat/testfiles/h5stat_filters.ddl
 ./tools/h5stat/testfiles/h5stat_filters-d.ddl
 ./tools/h5stat/testfiles/h5stat_filters-dT.ddl
@@ -1378,11 +1384,22 @@
 ./tools/h5stat/testfiles/h5stat_help2.ddl
 ./tools/h5stat/testfiles/h5stat_idx.h5
 ./tools/h5stat/testfiles/h5stat_idx.ddl
+./tools/h5stat/testfiles/h5stat_links1.ddl
+./tools/h5stat/testfiles/h5stat_links2.ddl
+./tools/h5stat/testfiles/h5stat_links3.ddl
+./tools/h5stat/testfiles/h5stat_links4.ddl
+./tools/h5stat/testfiles/h5stat_links5.ddl
 ./tools/h5stat/testfiles/h5stat_newgrat.ddl
 ./tools/h5stat/testfiles/h5stat_newgrat-UA.ddl
 ./tools/h5stat/testfiles/h5stat_newgrat-UG.ddl
 ./tools/h5stat/testfiles/h5stat_newgrat.h5
+./tools/h5stat/testfiles/h5stat_nofile.ddl
 ./tools/h5stat/testfiles/h5stat_notexist.ddl
+./tools/h5stat/testfiles/h5stat_numattrs1.ddl
+./tools/h5stat/testfiles/h5stat_numattrs2.ddl
+./tools/h5stat/testfiles/h5stat_numattrs3.ddl
+./tools/h5stat/testfiles/h5stat_numattrs4.ddl
+./tools/h5stat/testfiles/h5stat_threshold.h5
 ./tools/h5stat/testfiles/h5stat_tsohm.ddl
 ./tools/h5stat/testfiles/h5stat_tsohm.h5
 
diff --git a/README.txt b/README.txt
index a185e73..d1f4550 100644
--- a/README.txt
+++ b/README.txt
@@ -1,4 +1,4 @@
-HDF5 version 1.9.160-FA_a5 currently under development
+HDF5 version 1.9.161-FA_a5 currently under development
 Please refer to the release_docs/INSTALL file for installation instructions.
 ------------------------------------------------------------------------------
 
diff --git a/c++/src/Makefile.in b/c++/src/Makefile.in
index 4793093..6e88509 100644
--- a/c++/src/Makefile.in
+++ b/c++/src/Makefile.in
@@ -467,7 +467,7 @@ CHECK_CLEANFILES = *.chkexe *.chklog *.clog
 # Add libtool shared library version numbers to the HDF5 library
 # See libtool versioning documentation online.
 LT_VERS_INTERFACE = 6
-LT_VERS_REVISION = 150
+LT_VERS_REVISION = 151
 LT_VERS_AGE = 0
 
 # Include src directory
diff --git a/config/lt_vers.am b/config/lt_vers.am
index 43ee967..e9ee77d 100644
--- a/config/lt_vers.am
+++ b/config/lt_vers.am
@@ -17,7 +17,7 @@
 # Add libtool shared library version numbers to the HDF5 library
 # See libtool versioning documentation online.
 LT_VERS_INTERFACE = 6
-LT_VERS_REVISION = 150
+LT_VERS_REVISION = 151
 LT_VERS_AGE = 0
 
 ## If the API changes *at all*, increment LT_VERS_INTERFACE and
diff --git a/configure b/configure
index 7f71e55..352955f 100755
--- a/configure
+++ b/configure
@@ -1,7 +1,7 @@
 #! /bin/sh
 # From configure.ac Id: configure.ac 22697 2012-08-19 14:35:47Z hdftest .
 # Guess values for system-dependent variables and create Makefiles.
-# Generated by GNU Autoconf 2.69 for HDF5 1.9.160-FA_a5.
+# Generated by GNU Autoconf 2.69 for HDF5 1.9.161-FA_a5.
 #
 # Report bugs to <help@hdfgroup.org>.
 #
@@ -591,8 +591,8 @@ MAKEFLAGS=
 # Identity of this package.
 PACKAGE_NAME='HDF5'
 PACKAGE_TARNAME='hdf5'
-PACKAGE_VERSION='1.9.160-FA_a5'
-PACKAGE_STRING='HDF5 1.9.160-FA_a5'
+PACKAGE_VERSION='1.9.161-FA_a5'
+PACKAGE_STRING='HDF5 1.9.161-FA_a5'
 PACKAGE_BUGREPORT='help@hdfgroup.org'
 PACKAGE_URL=''
 
@@ -1486,7 +1486,7 @@ if test "$ac_init_help" = "long"; then
   # Omit some internal or obsolete options to make the list less imposing.
   # This message is too long to be a string in the A/UX 3.1 sh.
   cat <<_ACEOF
-\`configure' configures HDF5 1.9.160-FA_a5 to adapt to many kinds of systems.
+\`configure' configures HDF5 1.9.161-FA_a5 to adapt to many kinds of systems.
 
 Usage: $0 [OPTION]... [VAR=VALUE]...
 
@@ -1556,7 +1556,7 @@ fi
 
 if test -n "$ac_init_help"; then
   case $ac_init_help in
-     short | recursive ) echo "Configuration of HDF5 1.9.160-FA_a5:";;
+     short | recursive ) echo "Configuration of HDF5 1.9.161-FA_a5:";;
    esac
   cat <<\_ACEOF
 
@@ -1752,7 +1752,7 @@ fi
 test -n "$ac_init_help" && exit $ac_status
 if $ac_init_version; then
   cat <<\_ACEOF
-HDF5 configure 1.9.160-FA_a5
+HDF5 configure 1.9.161-FA_a5
 generated by GNU Autoconf 2.69
 
 Copyright (C) 2012 Free Software Foundation, Inc.
@@ -2846,7 +2846,7 @@ cat >config.log <<_ACEOF
 This file contains any messages produced by compilers while
 running configure, to aid debugging if configure makes a mistake.
 
-It was created by HDF5 $as_me 1.9.160-FA_a5, which was
+It was created by HDF5 $as_me 1.9.161-FA_a5, which was
 generated by GNU Autoconf 2.69.  Invocation command line was
 
   $ $0 $@
@@ -3678,7 +3678,7 @@ fi
 
 # Define the identity of the package.
  PACKAGE='hdf5'
- VERSION='1.9.160-FA_a5'
+ VERSION='1.9.161-FA_a5'
 
 
 cat >>confdefs.h <<_ACEOF
@@ -31632,7 +31632,7 @@ Usage: $0 [OPTIONS]
 Report bugs to <bug-libtool@gnu.org>."
 
 lt_cl_version="\
-HDF5 config.lt 1.9.160-FA_a5
+HDF5 config.lt 1.9.161-FA_a5
 configured by $0, generated by GNU Autoconf 2.69.
 
 Copyright (C) 2011 Free Software Foundation, Inc.
@@ -33762,7 +33762,7 @@ cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
 # report actual input values of CONFIG_FILES etc. instead of their
 # values after options handling.
 ac_log="
-This file was extended by HDF5 $as_me 1.9.160-FA_a5, which was
+This file was extended by HDF5 $as_me 1.9.161-FA_a5, which was
 generated by GNU Autoconf 2.69.  Invocation command line was
 
   CONFIG_FILES    = $CONFIG_FILES
@@ -33828,7 +33828,7 @@ _ACEOF
 cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
 ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`"
 ac_cs_version="\\
-HDF5 config.status 1.9.160-FA_a5
+HDF5 config.status 1.9.161-FA_a5
 configured by $0, generated by GNU Autoconf 2.69,
   with options \\"\$ac_cs_config\\"
 
diff --git a/configure.ac b/configure.ac
index 87d650c..8c110f8 100644
--- a/configure.ac
+++ b/configure.ac
@@ -26,7 +26,7 @@ AC_PREREQ([2.69])
 ## NOTE: Do not forget to change the version number here when we do a
 ## release!!!
 ##
-AC_INIT([HDF5], [1.9.160-FA_a5], [help@hdfgroup.org])
+AC_INIT([HDF5], [1.9.161-FA_a5], [help@hdfgroup.org])
 AC_CONFIG_SRCDIR([src/H5.c])
 AC_CONFIG_HEADER([src/H5config.h])
 
diff --git a/fortran/src/Makefile.in b/fortran/src/Makefile.in
index 94b43ed..31d9871 100644
--- a/fortran/src/Makefile.in
+++ b/fortran/src/Makefile.in
@@ -518,7 +518,7 @@ CHECK_CLEANFILES = *.chkexe *.chklog *.clog
 # Add libtool shared library version numbers to the HDF5 library
 # See libtool versioning documentation online.
 LT_VERS_INTERFACE = 6
-LT_VERS_REVISION = 150
+LT_VERS_REVISION = 151
 LT_VERS_AGE = 0
 
 # Include src directory in both Fortran and C flags (C compiler is used
diff --git a/hl/c++/src/Makefile.in b/hl/c++/src/Makefile.in
index 9ad806f..d805db3 100644
--- a/hl/c++/src/Makefile.in
+++ b/hl/c++/src/Makefile.in
@@ -458,7 +458,7 @@ CHECK_CLEANFILES = *.chkexe *.chklog *.clog
 # Add libtool shared library version numbers to the HDF5 library
 # See libtool versioning documentation online.
 LT_VERS_INTERFACE = 6
-LT_VERS_REVISION = 150
+LT_VERS_REVISION = 151
 LT_VERS_AGE = 0
 
 # Include src directory
diff --git a/hl/fortran/src/Makefile.in b/hl/fortran/src/Makefile.in
index c850c03..353b844 100644
--- a/hl/fortran/src/Makefile.in
+++ b/hl/fortran/src/Makefile.in
@@ -474,7 +474,7 @@ CHECK_CLEANFILES = *.chkexe *.chklog *.clog
 # Add libtool shared library version numbers to the HDF5 library
 # See libtool versioning documentation online.
 LT_VERS_INTERFACE = 6
-LT_VERS_REVISION = 150
+LT_VERS_REVISION = 151
 LT_VERS_AGE = 0
 INCLUDES = -I$(top_srcdir)/src -I$(top_srcdir)/hl/src -I$(top_builddir)/hl/src \
          -I$(top_srcdir)/fortran/src -I$(top_builddir)/fortran/src
diff --git a/hl/src/Makefile.in b/hl/src/Makefile.in
index d053903..7c7b708 100644
--- a/hl/src/Makefile.in
+++ b/hl/src/Makefile.in
@@ -457,7 +457,7 @@ CHECK_CLEANFILES = *.chkexe *.chklog *.clog
 # Add libtool shared library version numbers to the HDF5 library
 # See libtool versioning documentation online.
 LT_VERS_INTERFACE = 6
-LT_VERS_REVISION = 150
+LT_VERS_REVISION = 151
 LT_VERS_AGE = 0
 
 # This library is our main target.
diff --git a/release_docs/RELEASE.txt b/release_docs/RELEASE.txt
index 6f23def..359580d 100644
--- a/release_docs/RELEASE.txt
+++ b/release_docs/RELEASE.txt
@@ -1,4 +1,4 @@
-HDF5 version 1.9.160-FA_a5 currently under development
+HDF5 version 1.9.161-FA_a5 currently under development
 
 
 INTRODUCTION
diff --git a/src/H5public.h b/src/H5public.h
index ce37b87..9af8296 100644
--- a/src/H5public.h
+++ b/src/H5public.h
@@ -75,10 +75,10 @@ extern "C" {
 /* Version numbers */
 #define H5_VERS_MAJOR	1	/* For major interface/format changes  	     */
 #define H5_VERS_MINOR	9	/* For minor interface/format changes  	     */
-#define H5_VERS_RELEASE	160	/* For tweaks, bug-fixes, or development     */
+#define H5_VERS_RELEASE	161	/* For tweaks, bug-fixes, or development     */
 #define H5_VERS_SUBRELEASE "FA_a5"	/* For pre-releases like snap0       */
 				/* Empty string for real releases.           */
-#define H5_VERS_INFO    "HDF5 library version: 1.9.160-FA_a5"      /* Full version string */
+#define H5_VERS_INFO    "HDF5 library version: 1.9.161-FA_a5"      /* Full version string */
 
 #define H5check()	H5check_version(H5_VERS_MAJOR,H5_VERS_MINOR,	      \
 				        H5_VERS_RELEASE)
diff --git a/src/Makefile.in b/src/Makefile.in
index 2b7dd35..033180a 100644
--- a/src/Makefile.in
+++ b/src/Makefile.in
@@ -525,7 +525,7 @@ CHECK_CLEANFILES = *.chkexe *.chklog *.clog
 # Add libtool shared library version numbers to the HDF5 library
 # See libtool versioning documentation online.
 LT_VERS_INTERFACE = 6
-LT_VERS_REVISION = 150
+LT_VERS_REVISION = 151
 LT_VERS_AGE = 0
 H5detect_CFLAGS = -g $(AM_CFLAGS)
 
diff --git a/tools/h5dump/h5dump.c b/tools/h5dump/h5dump.c
index 36192e0..6218631 100644
--- a/tools/h5dump/h5dump.c
+++ b/tools/h5dump/h5dump.c
@@ -230,57 +230,61 @@ usage(const char *prog)
     PRINTSTREAM(rawoutstream, "usage: %s [OPTIONS] files\n", 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");
     PRINTVALSTREAM(rawoutstream, "     -B,   --superblock   Print the content of the super block\n");
     PRINTVALSTREAM(rawoutstream, "     -H,   --header       Print the header only; no data is displayed\n");
-    PRINTVALSTREAM(rawoutstream, "     -A,   --onlyattr     Print the header and value of attributes\n");
-    PRINTVALSTREAM(rawoutstream, "                          Optional value 0 suppresses printing attributes.\n");
-    PRINTVALSTREAM(rawoutstream, "     -i,   --object-ids   Print the object ids\n");
-    PRINTVALSTREAM(rawoutstream, "     -r,   --string       Print 1-byte integer datasets as ASCII\n");
-    PRINTVALSTREAM(rawoutstream, "     -e,   --escape       Escape non printing characters\n");
-    PRINTVALSTREAM(rawoutstream, "     -V,   --version      Print version number and exit\n");
+    PRINTVALSTREAM(rawoutstream, "     -f D, --filedriver=D Specify which driver to open the file with\n");
+    PRINTVALSTREAM(rawoutstream, "     -o F, --output=F     Output raw data into file F\n");
+    PRINTVALSTREAM(rawoutstream, "     -b B, --binary=B     Binary file output, of form B\n");
+    PRINTVALSTREAM(rawoutstream, "     -O F, --ddl=F        Output ddl text into file F\n");
+    PRINTVALSTREAM(rawoutstream, "                          Do not use filename F to suppress ddl display\n");
+    PRINTVALSTREAM(rawoutstream, "--------------- Object Options ---------------\n");
     PRINTVALSTREAM(rawoutstream, "     -a P, --attribute=P  Print the specified attribute\n");
     PRINTVALSTREAM(rawoutstream, "                          If an attribute name contains a slash (/), escape the\n");
     PRINTVALSTREAM(rawoutstream, "                          slash with a preceding backslash (\\).\n");
     PRINTVALSTREAM(rawoutstream, "                          (See example section below.)\n");
     PRINTVALSTREAM(rawoutstream, "     -d P, --dataset=P    Print the specified dataset\n");
-    PRINTVALSTREAM(rawoutstream, "     -y,   --noindex      Do not print array indices with the data\n");
-    PRINTVALSTREAM(rawoutstream, "     -p,   --properties   Print dataset filters, storage layout and fill value\n");
-    PRINTVALSTREAM(rawoutstream, "     -f D, --filedriver=D Specify which driver to open the file with\n");
     PRINTVALSTREAM(rawoutstream, "     -g P, --group=P      Print the specified group and all members\n");
     PRINTVALSTREAM(rawoutstream, "     -l P, --soft-link=P  Print the value(s) of the specified soft link\n");
-    PRINTVALSTREAM(rawoutstream, "     -o F, --output=F     Output raw data into file F\n");
-    PRINTVALSTREAM(rawoutstream, "     -b B, --binary=B     Binary file output, of form B\n");
     PRINTVALSTREAM(rawoutstream, "     -t P, --datatype=P   Print the specified named datatype\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, "     -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,
-  "     -M L, --packedbits=L Print packed bits as unsigned integers, using mask\n"
-  "                          format L for an integer dataset specified with\n"
-  "                          option -d. L is a list of offset,length values,\n"
-  "                          separated by commas. Offset is the beginning bit in\n"
-  "                          the data value and length is the number of bits of\n"
-  "                          the mask.\n"
-  );
+    PRINTVALSTREAM(rawoutstream, "     -A,   --onlyattr     Print the header and value of attributes\n");
+    PRINTVALSTREAM(rawoutstream, "                          Optional value 0 suppresses printing attributes.\n");
+    PRINTVALSTREAM(rawoutstream, "--------------- Object Property Options ---------------\n");
+    PRINTVALSTREAM(rawoutstream, "     -i,   --object-ids   Print the object ids\n");
+    PRINTVALSTREAM(rawoutstream, "     -p,   --properties   Print dataset filters, storage layout and fill value\n");
+    PRINTVALSTREAM(rawoutstream, "     -M L, --packedbits=L Print packed bits as unsigned integers, using mask\n");
+    PRINTVALSTREAM(rawoutstream, "                          format L for an integer dataset specified with\n");
+    PRINTVALSTREAM(rawoutstream, "                          option -d. L is a list of offset,length values,\n");
+    PRINTVALSTREAM(rawoutstream, "                          separated by commas. Offset is the beginning bit in\n");
+    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, "--------------- XML Options ---------------\n");
     PRINTVALSTREAM(rawoutstream, "     -x,   --xml          Output in XML using Schema\n");
     PRINTVALSTREAM(rawoutstream, "     -u,   --use-dtd      Output in XML using DTD\n");
     PRINTVALSTREAM(rawoutstream, "     -D U, --xml-dtd=U    Use the DTD or schema at U\n");
     PRINTVALSTREAM(rawoutstream, "     -X S, --xml-ns=S     (XML Schema) Use qualified names n the XML\n");
     PRINTVALSTREAM(rawoutstream, "                          \":\": no namespace, default: \"hdf5:\"\n");
     PRINTVALSTREAM(rawoutstream, "                          E.g., to dump a file called `-f', use h5dump -- -f\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, "     -O F, --ddl=F        Output ddl text into file F\n");
-    PRINTVALSTREAM(rawoutstream, "                          Do not use filename F to suppress ddl display\n");
     PRINTVALSTREAM(rawoutstream, "\n");
+    PRINTVALSTREAM(rawoutstream, "--------------- Subsetting Options ---------------\n");
     PRINTVALSTREAM(rawoutstream, " Subsetting is available by using the following options with a dataset\n");
     PRINTVALSTREAM(rawoutstream, " attribute. Subsetting is done by selecting a hyperslab from the data.\n");
     PRINTVALSTREAM(rawoutstream, " Thus, the options mirror those for performing a hyperslab selection.\n");
@@ -296,6 +300,7 @@ usage(const char *prog)
     PRINTVALSTREAM(rawoutstream, "      number of dimensions in the dataspace being queried\n");
     PRINTVALSTREAM(rawoutstream, "      (Alternate compact form of subsetting is described in the Reference Manual)\n");
     PRINTVALSTREAM(rawoutstream, "\n");
+    PRINTVALSTREAM(rawoutstream, "--------------- Option Argument Conventions ---------------\n");
     PRINTVALSTREAM(rawoutstream, "  D - is the file driver to use in opening the file. Acceptable values\n");
     PRINTVALSTREAM(rawoutstream, "      are \"sec2\", \"family\", \"split\", \"multi\", \"direct\", and \"stream\". Without\n");
     PRINTVALSTREAM(rawoutstream, "      the file driver flag, the file will be opened with each driver in\n");
@@ -324,7 +329,7 @@ usage(const char *prog)
     PRINTVALSTREAM(rawoutstream, "  Q - is the sort index type. It can be \"creation_order\" or \"name\" (default)\n");
     PRINTVALSTREAM(rawoutstream, "  Z - is the sort order type. It can be \"descending\" or \"ascending\" (default)\n");
     PRINTVALSTREAM(rawoutstream, "\n");
-    PRINTVALSTREAM(rawoutstream, "  Examples:\n");
+    PRINTVALSTREAM(rawoutstream, "--------------- Examples ---------------\n");
     PRINTVALSTREAM(rawoutstream, "\n");
     PRINTVALSTREAM(rawoutstream, "  1) Attribute foo of the group /bar_none in file quux.h5\n");
     PRINTVALSTREAM(rawoutstream, "\n");
diff --git a/tools/h5repack/h5repack_main.c b/tools/h5repack/h5repack_main.c
index bfa8e96..51276ea 100644
--- a/tools/h5repack/h5repack_main.c
+++ b/tools/h5repack/h5repack_main.c
@@ -241,7 +241,7 @@ static void usage(const char *prog)
  printf("      <layout type> can be:\n");
  printf("        CHUNK, to apply chunking layout\n");
  printf("        COMPA, to apply compact layout\n");
- printf("        CONTI, to apply continuous layout\n");
+ printf("        CONTI, to apply contiguous layout\n");
  printf("      <layout parameters> is optional layout information\n");
  printf("        CHUNK=DIM[xDIM...xDIM], the chunk size of each dimension\n");
  printf("        COMPA (no parameter)\n");
diff --git a/tools/h5repack/h5repack_parse.c b/tools/h5repack/h5repack_parse.c
index 70eadd2..9f798e9 100644
--- a/tools/h5repack/h5repack_parse.c
+++ b/tools/h5repack/h5repack_parse.c
@@ -460,7 +460,7 @@ obj_list_t* parse_filter(const char *str,
  *  chunked. NULL, on error
  * the layout type can be:
  *  CHUNK, to apply chunking layout
- *  CONTI, to apply continuous layout
+ *  CONTI, to apply contiguous layout
  *  COMPA, to apply compact layout
  *
  * Example:
diff --git a/tools/h5stat/h5stat.c b/tools/h5stat/h5stat.c
index dcc2c08..6fc1dc4 100644
--- a/tools/h5stat/h5stat.c
+++ b/tools/h5stat/h5stat.c
@@ -26,10 +26,13 @@
 #define PROGRAMNAME "h5stat"
 
 /* Parameters to control statistics gathered */
-#define SIZE_SMALL_GROUPS       10
-#define SIZE_SMALL_ATTRS  10
-#define SIZE_SMALL_DSETS        10
-#define SIZE_SMALL_SECTS        10
+
+/* Default threshold for small groups/datasets/attributes */
+#define DEF_SIZE_SMALL_GROUPS       	10
+#define DEF_SIZE_SMALL_DSETS        	10
+#define DEF_SIZE_SMALL_ATTRS  		10
+
+#define SIZE_SMALL_SECTS        	10
 
 #define  H5_NFILTERS_IMPL        8     /* Number of currently implemented filters + one to
                                           accommodate for user-define filters + one
@@ -69,22 +72,22 @@ typedef struct iter_t {
 
     unsigned long max_links;            /* Maximum # of links to an object */
     hsize_t max_fanout;                 /* Maximum fanout from a group */
-    unsigned long num_small_groups[SIZE_SMALL_GROUPS];     /* Size of small groups tracked */
+    unsigned long *num_small_groups;    /* Size of small groups tracked */
     unsigned group_nbins;               /* Number of bins for group counts */
     unsigned long *group_bins;          /* Pointer to array of bins for group counts */
     ohdr_info_t group_ohdr_info;        /* Object header information for groups */
 
-    hsize_t  max_attrs;                     /* Maximum attributes from a group */
-    unsigned long num_small_attrs[SIZE_SMALL_ATTRS];    /* Size of small attributes tracked */
+    hsize_t  max_attrs;                 /* Maximum attributes from a group */
+    unsigned long *num_small_attrs;    	/* Size of small attributes tracked */
     unsigned attr_nbins;                /* Number of bins for attribute counts */
     unsigned long *attr_bins;           /* Pointer to array of bins for attribute counts */
 
     unsigned max_dset_rank;             /* Maximum rank of dataset */
     unsigned long dset_rank_count[H5S_MAX_RANK];   /* Number of datasets of each rank */
     hsize_t max_dset_dims;              /* Maximum dimension size of dataset */
-    unsigned long small_dset_dims[SIZE_SMALL_DSETS];    /* Size of dimensions of small datasets tracked */
+    unsigned long *small_dset_dims;    /* Size of dimensions of small datasets tracked */
     unsigned long dset_layouts[H5D_NLAYOUTS];           /* Type of storage for each dataset */
-    unsigned long dset_comptype[H5_NFILTERS_IMPL]; /* Number of currently implemented filters */
+    unsigned long dset_comptype[H5_NFILTERS_IMPL]; 	/* Number of currently implemented filters */
     unsigned long dset_ntypes;          /* Number of diff. dataset datatypes found */
     dtype_info_t *dset_type_info;       /* Pointer to dataset datatype information found */
     unsigned dset_dim_nbins;            /* Number of bins for dataset dimensions */
@@ -134,15 +137,19 @@ static int        display_dset_metadata = FALSE;    /* display file space info f
 
 static int        display_object = FALSE;  /* not implemented yet */
 
+/* Initialize threshold for small groups/datasets/attributes */
+static int	  sgroups_threshold = DEF_SIZE_SMALL_GROUPS;
+static int	  sdsets_threshold = DEF_SIZE_SMALL_DSETS;
+static int	  sattrs_threshold = DEF_SIZE_SMALL_ATTRS;
+
 /* a structure for handling the order command-line parameters come in */
 struct handler_t {
     size_t obj_count;
     char **obj;
 };
 
-
-static const char *s_opts ="ADdFfhGgsSTO:V";
-/* e.g. "filemetadata" has to precedue "file"; "groupmetadata" has to precede "group" etc. */
+static const char *s_opts ="Aa:Ddm:FfhGgl:sSTO:V";
+/* e.g. "filemetadata" has to precede "file"; "groupmetadata" has to precede "group" etc. */
 static struct long_options l_opts[] = {
     {"help", no_arg, 'h'},
     {"hel", no_arg, 'h'},
@@ -170,6 +177,10 @@ static struct long_options l_opts[] = {
     {"grou", no_arg, 'g'},
     {"gro", no_arg, 'g'},
     {"gr", no_arg, 'g'},
+    { "links", require_arg, 'l' },
+    { "link", require_arg, 'l' },
+    { "lin", require_arg, 'l' },
+    { "li", require_arg, 'l' },
     {"dsetmetadata", no_arg, 'D'},
     {"dsetmetadat", no_arg, 'D'},
     {"dsetmetada", no_arg, 'D'},
@@ -181,6 +192,9 @@ static struct long_options l_opts[] = {
     {"dset", no_arg, 'd'},
     {"dse", no_arg, 'd'},
     {"ds", no_arg, 'd'},
+    {"dims", require_arg, 'm'},
+    {"dim", require_arg, 'm'},
+    {"di", require_arg, 'm'},
     {"dtypemetadata", no_arg, 'T'},
     {"dtypemetadat", no_arg, 'T'},
     {"dtypemetada", no_arg, 'T'},
@@ -212,6 +226,13 @@ static struct long_options l_opts[] = {
     { "attr", no_arg, 'A' },
     { "att", no_arg, 'A' },
     { "at", no_arg, 'A' },
+    { "numattrs", require_arg, 'a' },
+    { "numattr", require_arg, 'a' },
+    { "numatt", require_arg, 'a' },
+    { "numat", require_arg, 'a' },
+    { "numa", require_arg, 'a' },
+    { "num", require_arg, 'a' },
+    { "nu", require_arg, 'a' },
     { "freespace", no_arg, 's' },
     { "freespac", no_arg, 's' },
     { "freespa", no_arg, 's' },
@@ -237,6 +258,16 @@ leave(int ret)
 }
 
 
+
+/*-------------------------------------------------------------------------
+ * Function: usage
+ *
+ * Purpose: Compute the ceiling of log_10(x)
+ *
+ * Return: >0 on success, 0 on failure
+ *
+ *-------------------------------------------------------------------------
+ */
 static void usage(const char *prog)
 {
      HDfflush(stdout);
@@ -248,11 +279,20 @@ static void usage(const char *prog)
      HDfprintf(stdout, "     -f, --file            Print file information\n");
      HDfprintf(stdout, "     -F, --filemetadata    Print file space information for file's metadata\n");
      HDfprintf(stdout, "     -g, --group           Print group information\n");
+     HDfprintf(stdout, "     -l N, --links=N       Set the threshold for the # of links when printing\n");
+     HDfprintf(stdout, "                           information for small groups.  N is an integer greater\n");
+     HDfprintf(stdout, "                           than 0.  The default threshold is 10.\n");
      HDfprintf(stdout, "     -G, --groupmetadata   Print file space information for groups' metadata\n");
      HDfprintf(stdout, "     -d, --dset            Print dataset information\n");
+     HDfprintf(stdout, "     -m N, --dims=N        Set the threshold for the dimension sizes when printing\n");
+     HDfprintf(stdout, "                           information for small datasets.  N is an integer greater\n");
+     HDfprintf(stdout, "                           than 0.  The default threshold is 10.\n");
      HDfprintf(stdout, "     -D, --dsetmetadata    Print file space information for datasets' metadata\n");
      HDfprintf(stdout, "     -T, --dtypemetadata   Print datasets' datatype information\n");
      HDfprintf(stdout, "     -A, --attribute       Print attribute information\n");
+     HDfprintf(stdout, "     -a N, --numattrs=N    Set the threshold for the # of attributes when printing\n");
+     HDfprintf(stdout, "                           information for small # of attributes.  N is an integer greater\n");
+     HDfprintf(stdout, "                           than 0.  The default threshold is 10.\n");
      HDfprintf(stdout, "     -s, --freespace       Print free space information\n");
      HDfprintf(stdout, "     -S, --summary         Print summary of file space information\n");
 }
@@ -268,8 +308,6 @@ static void usage(const char *prog)
  * Programmer: Quincey Koziol
  *              Monday, August 22, 2005
  *
- * Modifications:
- *
  *-------------------------------------------------------------------------
  */
 static unsigned
@@ -311,7 +349,7 @@ attribute_stats(iter_t *iter, const H5O_info_t *oi)
     iter->attrs_heap_storage_size += oi->meta_size.attr.heap_size;
 
     /* Update small # of attribute count & limits */
-    if(oi->num_attrs < SIZE_SMALL_ATTRS)
+    if(oi->num_attrs <= (hsize_t)sattrs_threshold)
         (iter->num_small_attrs[(size_t)oi->num_attrs])++;
     if(oi->num_attrs > iter->max_attrs)
         iter->max_attrs = oi->num_attrs;
@@ -382,8 +420,10 @@ group_stats(iter_t *iter, const char *name, const H5O_info_t *oi)
     HDassert(ret >= 0);
 
     /* Update link stats */
-    if(ginfo.nlinks < SIZE_SMALL_GROUPS)
+    /* Collect statistics for small groups */
+    if(ginfo.nlinks < (hsize_t)sgroups_threshold)
         (iter->num_small_groups[(size_t)ginfo.nlinks])++;
+    /* Determine maximum link count */
     if(ginfo.nlinks > iter->max_fanout)
         iter->max_fanout = ginfo.nlinks;
 
@@ -514,8 +554,11 @@ dataset_stats(iter_t *iter, const char *name, const H5O_info_t *oi)
 
     /* Only gather dim size statistics on 1-D datasets */
     if(ndims == 1) {
-       iter->max_dset_dims = dims[0];
-       if(dims[0] < SIZE_SMALL_DSETS)
+	/* Determine maximum dimension size */
+	if(dims[0] > iter->max_dset_dims)
+	    iter->max_dset_dims = dims[0];
+	/* Collect statistics for small datasets */
+       if(dims[0] < (hsize_t)sdsets_threshold)
            (iter->small_dset_dims[(size_t)dims[0]])++;
 
        /* Add dim count to proper bin */
@@ -871,6 +914,15 @@ parse_command_line(int argc, const char *argv[], struct handler_t **hand_ret)
                 display_group = TRUE;
                 break;
 
+            case 'l':
+		sgroups_threshold = HDatoi(opt_arg);
+		if(sgroups_threshold < 1) {
+		    error_msg("Invalid threshold for small groups\n");
+		    goto error;
+		} /* end if */
+
+                break;
+
             case 'D':
                 display_all = FALSE;
                 display_dset_metadata = TRUE;
@@ -881,6 +933,15 @@ parse_command_line(int argc, const char *argv[], struct handler_t **hand_ret)
                 display_dset = TRUE;
                 break;
 
+            case 'm':
+		sdsets_threshold = HDatoi(opt_arg);
+		if(sdsets_threshold < 1) {
+		    error_msg("Invalid threshold for small datasets\n");
+		    goto error;
+		} /* end if */
+
+                break;
+
             case 'T':
                 display_all = FALSE;
                 display_dset_dtype_meta = TRUE;
@@ -891,6 +952,15 @@ parse_command_line(int argc, const char *argv[], struct handler_t **hand_ret)
                 display_attr = TRUE;
                 break;
 
+            case 'a':
+		sattrs_threshold = HDatoi(opt_arg);
+		if(sattrs_threshold < 1) {
+		    error_msg("Invalid threshold for small # of attributes\n");
+		    goto error;
+		} /* end if */
+
+                break;
+
             case 's':
                 display_all = FALSE;
                 display_free_sections = TRUE;
@@ -967,18 +1037,31 @@ error:
 static void
 iter_free(iter_t *iter)
 {
+
     /* Clear array of bins for group counts */
     if(iter->group_bins) {
         HDfree(iter->group_bins);
         iter->group_bins = NULL;
     } /* end if */
 
+    /* Clear array for tracking small groups */
+    if(iter->num_small_groups) {
+        HDfree(iter->num_small_groups);
+        iter->num_small_groups = NULL;
+    } /* end if */
+
     /* Clear array of bins for attribute counts */
     if(iter->attr_bins) {
         HDfree(iter->attr_bins);
         iter->attr_bins = NULL;
     } /* end if */
 
+    /* Clear array for tracking small attributes */
+    if(iter->num_small_attrs) {
+        HDfree(iter->num_small_attrs);
+        iter->num_small_attrs= NULL;
+    } /* end if */
+
     /* Clear dataset datatype information found */
     if(iter->dset_type_info) {
         HDfree(iter->dset_type_info);
@@ -991,6 +1074,12 @@ iter_free(iter_t *iter)
         iter->dset_dim_bins = NULL;
     } /* end if */
 
+    /* Clear array of tracking 1-D small datasets */
+    if(iter->small_dset_dims) {
+        HDfree(iter->small_dset_dims);
+        iter->small_dset_dims = NULL;
+    } /* end if */
+
     /* Clear array of bins for free-space section sizes */
     if(iter->sect_bins) {
         HDfree(iter->sect_bins);
@@ -1117,11 +1206,11 @@ print_group_info(const iter_t *iter)
     unsigned long total;        /* Total count for various statistics */
     unsigned u;                 /* Local index variable */
 
-    printf("Small groups:\n");
+    printf("Small groups (with 0 to %u links):\n", sgroups_threshold-1);
     total = 0;
-    for(u = 0; u < SIZE_SMALL_GROUPS; u++) {
+    for(u = 0; u < (unsigned)sgroups_threshold; u++) {
         if(iter->num_small_groups[u] > 0) {
-            printf("\t# of groups of size %u: %lu\n", u, iter->num_small_groups[u]);
+            printf("\t# of groups with %u link(s): %lu\n", u, iter->num_small_groups[u]);
             total += iter->num_small_groups[u];
         } /* end if */
     } /* end for */
@@ -1130,13 +1219,13 @@ print_group_info(const iter_t *iter)
     printf("Group bins:\n");
     total = 0;
     if((iter->group_nbins > 0) && (iter->group_bins[0] > 0)) {
-       printf("\t# of groups of size 0: %lu\n", iter->group_bins[0]);
+       printf("\t# of groups with 0 link: %lu\n", iter->group_bins[0]);
        total = iter->group_bins[0];
     } /* end if */
     power = 1;
     for(u = 1; u < iter->group_nbins; u++) {
         if(iter->group_bins[u] > 0) {
-           printf("\t# of groups of size %lu - %lu: %lu\n", power, (power * 10) - 1,
+           printf("\t# of groups with %lu - %lu links: %lu\n", power, (power * 10) - 1,
                     iter->group_bins[u]);
            total += iter->group_bins[u];
         } /* end if */
@@ -1207,29 +1296,29 @@ print_dataset_info(const iter_t *iter)
 
         printf("1-D Dataset information:\n");
         HDfprintf(stdout, "\tMax. dimension size of 1-D datasets: %Hu\n", iter->max_dset_dims);
-        printf("\tSmall 1-D datasets:\n");
+        printf("\tSmall 1-D datasets (with dimension sizes 0 to %u):\n", sdsets_threshold - 1);
         total = 0;
-        for(u = 0; u < SIZE_SMALL_DSETS; u++) {
+        for(u = 0; u < (unsigned)sdsets_threshold; u++) {
             if(iter->small_dset_dims[u] > 0) {
-                printf("\t\t# of dataset dimensions of size %u: %lu\n", u,
+                printf("\t\t# of datasets with dimension sizes %u: %lu\n", u,
                          iter->small_dset_dims[u]);
                 total += iter->small_dset_dims[u];
             } /* end if */
         } /* end for */
-        printf("\t\tTotal small datasets: %lu\n", total);
+        printf("\t\tTotal # of small datasets: %lu\n", total);
 
         /* Protect against no datasets in file */
         if(iter->dset_dim_nbins > 0) {
             printf("\t1-D Dataset dimension bins:\n");
             total = 0;
             if(iter->dset_dim_bins[0] > 0) {
-                printf("\t\t# of datasets of size 0: %lu\n", iter->dset_dim_bins[0]);
+                printf("\t\t# of datasets with dimension size 0: %lu\n", iter->dset_dim_bins[0]);
                 total = iter->dset_dim_bins[0];
             } /* end if */
             power = 1;
             for(u = 1; u < iter->dset_dim_nbins; u++) {
                 if(iter->dset_dim_bins[u] > 0) {
-                    printf("\t\t# of datasets of size %lu - %lu: %lu\n", power, (power * 10) - 1,
+                    printf("\t\t# of datasets with dimension size %lu - %lu: %lu\n", power, (power * 10) - 1,
                              iter->dset_dim_bins[u]);
                     total += iter->dset_dim_bins[u];
                 } /* end if */
@@ -1346,8 +1435,6 @@ print_dset_dtype_meta(const iter_t *iter)
  * Programmer: Vailin Choi
  *             July 12, 2007
  *
- * Modifications:
- *
  *-------------------------------------------------------------------------
  */
 static herr_t
@@ -1357,9 +1444,9 @@ print_attr_info(const iter_t *iter)
     unsigned long total;        /* Total count for various statistics */
     unsigned u;                 /* Local index variable */
 
-    printf("Small # of attributes:\n");
+    printf("Small # of attributes (objects with 1 to %u attributes):\n", sattrs_threshold);
     total = 0;
-    for(u = 1; u < SIZE_SMALL_ATTRS; u++) {
+    for(u = 1; u <= (unsigned)sattrs_threshold; u++) {
         if(iter->num_small_attrs[u] > 0) {
             printf("\t# of objects with %u attributes: %lu\n", u, iter->num_small_attrs[u]);
             total += iter->num_small_attrs[u];
@@ -1660,6 +1747,16 @@ main(int argc, const char *argv[])
             iter.free_hdr = finfo.free.meta_size;
         } /* end else */
 
+	iter.num_small_groups = (unsigned long *)calloc((size_t)sgroups_threshold, sizeof(unsigned long));
+	iter.num_small_attrs = (unsigned long *)calloc((size_t)(sattrs_threshold+1), sizeof(unsigned long));
+	iter.small_dset_dims = (unsigned long *)calloc((size_t)sdsets_threshold, sizeof(unsigned long));
+
+	if(iter.num_small_groups == NULL || iter.num_small_attrs == NULL || iter.small_dset_dims == NULL) {
+	    error_msg("Unable to allocate memory for tracking small groups/datasets/attributes\n");
+            h5tools_setstatus(EXIT_FAILURE);
+	    goto done;
+	}
+
         if((fcpl = H5Fget_create_plist(fid)) < 0)
             warn_msg("Unable to retrieve file creation property\n");
 
diff --git a/tools/h5stat/h5stat_gentest.c b/tools/h5stat/h5stat_gentest.c
index 20e78ff..3096f78 100644
--- a/tools/h5stat/h5stat_gentest.c
+++ b/tools/h5stat/h5stat_gentest.c
@@ -16,17 +16,16 @@
 /*
  * Generate the binary hdf5 files for the h5stat tests.
  * Usage: just execute the program without any arguments will
- * generate all the binary hdf5 files in the ./testfiles directory.
+ * generate all the binary hdf5 files 
  *
  * If you regenerate the test files (e.g., changing some code,
  * trying it on a new platform, ...), you need to verify the correctness
  * of the expected output and update the corresponding *.ddl files.
  */
-
-#include <assert.h>
 #include "hdf5.h"
 
-#define FILE 		"h5stat_newgrat.h5"
+/* For gen_newgrat_file() */
+#define NEWGRAT_FILE 	"h5stat_newgrat.h5"
 #define DATASET_NAME	"DATASET_NAME"
 #define GROUP_NAME	"GROUP"
 #define ATTR_NAME	"ATTR"
@@ -34,72 +33,313 @@
 #define NUM_ATTRS	100
 
 /* Declarations for gen_idx_file() */
-#define FILE_IDX 	"h5stat_idx.h5"
+#define IDX_FILE 	"h5stat_idx.h5"
 #define DSET		"dset"
 #define DSET_FILTER	"dset_filter"
 
+/* For gen_threshold_file() */
+#define THRESHOLD_FILE 		"h5stat_threshold.h5"
+#define THRES_ATTR_NAME		"attr"
+#define THRES_ATTR_GRP_NAME	"grp_attr"
+#define THRES_DSET_NAME 	"dset"
+#define THRES_NUM		10
+#define THRES_NUM_25		25
+
 /*
- * Generate 1.8 HDF5 file
- * with NUM_GRPS groups
- * with NUM_ATTRS attributes on the dataset
+ * Generate HDF5 file with latest format with
+ * NUM_GRPS groups and NUM_ATTRS attributes for the dataset
  */
-static void gen_file(void)
+static void 
+gen_newgrat_file(const char *fname)
 {
-    hid_t	fcpl; 	/* File creation property */
-    hid_t	fapl; 	/* File access property */
-    hid_t   file;	/* File id */
-    hid_t	gid;	/* Group id */
-    hid_t	type_id;	/* Datatype id */
-    hid_t	space_id; 	/* Dataspace id */
-    hid_t	attr_id; 	/* Attribute id */
-    hid_t	dset_id;	/* Dataset id */
-    char	name[30];	/* Group name */
-    char	attrname[30];	/* Attribute name */
-    int     ret;	/* Return value */
-    int 	i;	/* Local index variable */
-
-    fapl = H5Pcreate(H5P_FILE_ACCESS);
-    ret = H5Pset_libver_bounds(fapl, H5F_LIBVER_LATEST, H5F_LIBVER_LATEST);
-    assert(ret >= 0);
+    hid_t fcpl; 	/* File creation property */
+    hid_t fapl; 	/* File access property */
+    hid_t fid;		/* File id */
+    hid_t gid;		/* Group id */
+    hid_t tid;		/* Datatype id */
+    hid_t sid; 		/* Dataspace id */
+    hid_t attr_id; 	/* Attribute id */
+    hid_t did;		/* Dataset id */
+    char name[30];	/* Group name */
+    char attrname[30];	/* Attribute name */
+    int  i;		/* Local index variable */
+
+    /* Get a copy file access property list */
+    if((fapl = H5Pcreate(H5P_FILE_ACCESS)) < 0)
+	goto error;
+
+    /* Set to use latest library format */
+    if(H5Pset_libver_bounds(fapl, H5F_LIBVER_LATEST, H5F_LIBVER_LATEST) < 0)
+	goto error;
+
+    /* Get a copy of file creation property list */
+    if((fcpl = H5Pcreate(H5P_FILE_CREATE)) < 0)
+	goto error;
 
     /* Set file space handling strategy */
-    fcpl = H5Pcreate(H5P_FILE_CREATE);
-    ret = H5Pset_file_space(fcpl, H5F_FILE_SPACE_ALL_PERSIST, (hsize_t)0);
-    assert(ret >= 0);
+    if(H5Pset_file_space(fcpl, H5F_FILE_SPACE_ALL_PERSIST, (hsize_t)0) < 0)
+	goto error;
+
+     /* Create file */
+    if((fid = H5Fcreate(fname, H5F_ACC_TRUNC, fcpl, fapl)) < 0)
+	goto error;
 
-     /* Create dataset */
-    file = H5Fcreate(FILE, H5F_ACC_TRUNC, fcpl, fapl);
+    /* Create NUM_GRPS groups in the root group */
     for(i = 1; i <= NUM_GRPS; i++) {
         sprintf(name, "%s%d", GROUP_NAME,i);
-        gid = H5Gcreate2(file, name, H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT);
-        H5Gclose(gid);
+        if((gid = H5Gcreate2(fid, name, H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT)) < 0)
+	    goto error;
+        if(H5Gclose(gid) < 0)
+	    goto error;
     } /* end for */
 
     /* Create a datatype to commit and use */
-    type_id = H5Tcopy(H5T_NATIVE_INT);
+    if((tid = H5Tcopy(H5T_NATIVE_INT)) < 0)
+	goto error;
 
     /* Create dataspace for dataset */
-    space_id = H5Screate(H5S_SCALAR);
+    if((sid = H5Screate(H5S_SCALAR)) < 0)
+	goto error;
+
+    /* Create dataset */
+    if((did = H5Dcreate2(fid, DATASET_NAME, tid, sid, H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT)) < 0)
+	goto error;
 
-     /* Create dataset */
-    dset_id = H5Dcreate2(file, DATASET_NAME, type_id, space_id, H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT);
+    /* Create NUM_ATTRS for the dataset */
     for(i = 1; i <= NUM_ATTRS; i++) {
         sprintf(attrname, "%s%d", ATTR_NAME,i);
-        attr_id = H5Acreate2(dset_id, attrname, type_id, space_id, H5P_DEFAULT, H5P_DEFAULT);
-        ret = H5Aclose(attr_id);
-        assert(ret >= 0);
+        if((attr_id = H5Acreate2(did, attrname, tid, sid, H5P_DEFAULT, H5P_DEFAULT)) < 0)
+	    goto error;
+        if(H5Aclose(attr_id) < 0)
+	    goto error;
     } /* end for */
 
-    ret = H5Dclose(dset_id);
-    assert(ret >= 0);
-    ret = H5Sclose(space_id);
-    assert(ret >= 0);
-    ret = H5Tclose(type_id);
-    assert(ret >= 0);
-    ret = H5Fclose(file);
-    assert(ret >= 0);
+    /* Close dataset, dataspace, datatype, file */
+    if(H5Pclose(fapl) < 0)
+	goto error;
+    if(H5Pclose(fcpl) < 0)
+	goto error;
+    if(H5Dclose(did) < 0)
+	goto error;
+    if(H5Tclose(tid) < 0)
+	goto error;
+    if(H5Sclose(sid) < 0)
+	goto error;
+    if(H5Fclose(fid) < 0)
+	goto error;
+
+error:
+    H5E_BEGIN_TRY {
+	H5Pclose(fapl);
+	H5Pclose(fcpl);
+	H5Aclose(attr_id);
+        H5Tclose(tid);
+        H5Sclose(sid);
+        H5Gclose(gid);
+        H5Dclose(did);
+        H5Fclose(fid);
+    } H5E_END_TRY;
+} /* gen_newgrat_file() */
 
-} /* gen_file() */
+
+/*
+ * Generate an HDF5 file with groups, datasets, attributes for testing the options:
+ *	-l N (--links=N): Set the threshold for # of links when printing information for small groups.
+ *	-m N (--dims=N): Set the threshold for the # of dimension sizes when printing information for small datasets.
+ *	-a N (--numattrs=N): Set the threshold for the # of attributes when printing information for small # of attributes.
+ */
+static void
+gen_threshold_file(const char *fname)
+{
+    hid_t fid;				/* File ID */
+    hid_t sid0, sid1, sid2, sid3, sid4;	/* Dataspace IDs */
+    hid_t did;				/* Dataset ID */
+    hid_t attr_id;			/* Attribute ID */
+    hid_t gid;				/* Group ID */
+    hsize_t two_dims[] = {2, 5};	/* Dimension array */
+    hsize_t one_dims[] = {6};		/* Dimension array */
+    hsize_t zero_dims[] = {0};		/* Dimension array */
+    char name[30];			/* Name */
+    unsigned i;				/* Local index variable */
+
+    /* Create file */
+    if((fid = H5Fcreate(fname, H5F_ACC_TRUNC, H5P_DEFAULT, H5P_DEFAULT)) < 0)
+	goto error;
+
+    /* Create 1-D dataspace with zero dimension size */
+    if((sid0 = H5Screate_simple(1, zero_dims, NULL)) < 0)
+	goto error;
+
+    /* Create 1-D dataspace with non-zero dimension size*/
+    if((sid1 = H5Screate_simple(1, one_dims, NULL)) < 0)
+	goto error;
+
+    /* Create 2-D dataspace */
+    if((sid2 = H5Screate_simple(2, two_dims, NULL)) < 0)
+	goto error;
+
+    /* Create scalar dataspace */
+    if((sid3 = H5Screate(H5S_SCALAR)) < 0)
+	goto error;
+
+    /* Create null dataspace */
+    if((sid4 = H5Screate(H5S_NULL)) < 0)
+	goto error;
+
+    /* Create an attribute for the root group */
+    if((attr_id = H5Acreate2(fid, "attr", H5T_NATIVE_INT, sid1, H5P_DEFAULT, H5P_DEFAULT)) < 0)
+	goto error;
+    if(H5Aclose(attr_id) < 0)
+	goto error;
+
+    /* Create 1-D dataset with zero dimension size for the root group */
+    if((did = H5Dcreate2(fid, "zero_dset", H5T_NATIVE_UCHAR, sid0, H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT)) < 0)
+	goto error;
+
+    /* Create 11 attributes for the dataset */
+    for(i = 1; i <= (THRES_NUM+1); i++) {
+        sprintf(name, "%s%d", THRES_ATTR_NAME,i);
+        if((attr_id = H5Acreate2(did, name, H5T_NATIVE_INT, sid1, H5P_DEFAULT, H5P_DEFAULT)) < 0)
+	    goto error;
+        if(H5Aclose(attr_id) < 0)
+	    goto error;
+    }
+    if(H5Dclose(did) < 0)
+	goto error;
+
+    /* Create dataset with scalar dataspace for the root group */
+    if((did = H5Dcreate2(fid, "scalar_dset", H5T_NATIVE_UCHAR, sid3, H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT)) < 0)
+	goto error;
+    if(H5Dclose(did) < 0)
+	goto error;
+
+    /* Create dataset with null dataspace for the root group */
+    if((did = H5Dcreate2(fid, "null_dset", H5T_NATIVE_UCHAR, sid4, H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT)) < 0)
+	goto error;
+    if(H5Dclose(did) < 0)
+	goto error;
+
+    /* Create 2-D dataset for the root group */
+    if((did = H5Dcreate2(fid, "dset", H5T_NATIVE_UCHAR, sid2, H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT)) < 0)
+	goto error;
+
+    /* Create 10 attributes for the 2-D dataset */
+    for(i = 1; i <= THRES_NUM; i++) {
+        sprintf(name, "%s%d", THRES_ATTR_NAME,i);
+        if((attr_id = H5Acreate2(did, name, H5T_NATIVE_INT, sid1, H5P_DEFAULT, H5P_DEFAULT)) < 0)
+	    goto error;
+        if(H5Aclose(attr_id) < 0)
+	    goto error;
+    }
+    if(H5Dclose(did) < 0)
+	goto error;
+
+    /* Create first group */
+    if((gid = H5Gcreate2(fid, "group1", H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT)) < 0)
+	goto error;
+
+    /* Create an attribute for the group */
+    if((attr_id = H5Acreate2(gid, "ATTR", H5T_NATIVE_INT, sid3, H5P_DEFAULT, H5P_DEFAULT)) < 0)
+	goto error;
+
+    /* Close attribute */
+    if(H5Aclose(attr_id) < 0)
+	goto error;
+
+    /* Create 10 1-D datasets with non-zero dimension size for the group */
+    for(i = 1; i <= THRES_NUM; i++) {
+	/* set up dataset name */
+        sprintf(name, "%s%d", THRES_DSET_NAME,i);
+
+	/* Create the dataset */
+	if((did = H5Dcreate2(gid, name, H5T_NATIVE_UCHAR, sid1, H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT)) < 0)
+	    goto error;
+
+	/* Close the dataset */
+        if(H5Dclose(did) < 0)
+	    goto error;
+    }
+
+    /* Close the group */
+    if(H5Gclose(gid) < 0)
+	goto error;
+
+
+    /* Create second group */
+    if((gid = H5Gcreate2(fid, "group2", H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT)) < 0)
+	goto error;
+
+    /* Create 25 attributes for the group */
+    for(i = 1; i <= THRES_NUM_25; i++) {
+	/* Set up attribute name */
+        sprintf(name, "%s%d", THRES_ATTR_GRP_NAME,i);
+
+	/* Create the attribute */
+        if((attr_id = H5Acreate2(gid, name, H5T_NATIVE_INT, sid2, H5P_DEFAULT, H5P_DEFAULT)) < 0)
+	    goto error;
+
+	/* Close the attribute */
+        if(H5Aclose(attr_id) < 0)
+	    goto error;
+    }
+
+    /* Close the group */
+    if(H5Gclose(gid) < 0)
+	goto error;
+
+    /* Create third group */
+    if((gid = H5Gcreate2(fid, "group3", H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT)) < 0)
+	goto error;
+
+    /* Create 9 1-D datasets with non-zero dimension size for the group */
+    for(i = 1; i < THRES_NUM; i++) {
+	/* set up dataset name */
+        sprintf(name, "%s%d", THRES_DSET_NAME,i);
+
+	/* Create the dataset */
+	if((did = H5Dcreate2(gid, name, H5T_NATIVE_UCHAR, sid1, H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT)) < 0)
+	    goto error;
+
+	/* Close the dataset */
+        if(H5Dclose(did) < 0)
+	    goto error;
+    }
+
+    /* Close the group */
+    if(H5Gclose(gid) < 0)
+	goto error;
+
+
+    /* Close dataspaces */
+    if(H5Sclose(sid0) < 0)
+	goto error;
+    if(H5Sclose(sid1) < 0)
+	goto error;
+    if(H5Sclose(sid2) < 0)
+	goto error;
+    if(H5Sclose(sid3) < 0)
+	goto error;
+    if(H5Sclose(sid4) < 0)
+	goto error;
+
+    /* Close file */
+    if(H5Fclose(fid) < 0)
+	goto error;
+
+error:
+    H5E_BEGIN_TRY {
+        H5Gclose(gid);
+	H5Aclose(attr_id);
+        H5Dclose(did);
+        H5Sclose(sid0);
+        H5Sclose(sid1);
+        H5Sclose(sid2);
+        H5Sclose(sid3);
+        H5Sclose(sid4);
+        H5Fclose(fid);
+    } H5E_END_TRY;
+
+} /* gen_threshold_file() */
 
 /*
  * Function: gen_idx_file
@@ -109,7 +349,8 @@ static void gen_file(void)
  *     	one dataset: fixed dimension, chunked layout, w/ filters
  *
  */
-static void gen_idx_file(void)
+static void 
+gen_idx_file(const char *fname)
 {
     hid_t	fapl;		    /* file access property id */
     hid_t	fid;	            /* file id */
@@ -122,66 +363,88 @@ static void gen_idx_file(void)
     int		i;		    /* local index variable */
     int     	buf[10];            /* data buffer */
 
-
-    /* Get a copy of the file aaccess property */
-    fapl = H5Pcreate(H5P_FILE_ACCESS);
+    /* Get a copy of the file access property */
+    if((fapl = H5Pcreate(H5P_FILE_ACCESS)) < 0)
+	goto error;
 
     /* Set the "use the latest format" bounds for creating objects in the file */
-    status  = H5Pset_libver_bounds(fapl, H5F_LIBVER_LATEST, H5F_LIBVER_LATEST);
-    assert(status >= 0);
+    if(H5Pset_libver_bounds(fapl, H5F_LIBVER_LATEST, H5F_LIBVER_LATEST) < 0)
+	goto error;
 
-     /* Create dataset */
-    fid = H5Fcreate(FILE_IDX, H5F_ACC_TRUNC, H5P_DEFAULT, fapl);
+    /* Create file */
+    if((fid = H5Fcreate(fname, H5F_ACC_TRUNC, H5P_DEFAULT, fapl)) < 0)
+	goto error;
 
     /* Create data */
     for(i = 0; i < 10; i++)
 	buf[i] = i;
 
     /* Set chunk */
-    dcpl = H5Pcreate(H5P_DATASET_CREATE);
-    status = H5Pset_chunk(dcpl, 1, c_dims);
-    assert(status >= 0);
+    if((dcpl = H5Pcreate(H5P_DATASET_CREATE)) < 0)
+	goto error;
+
+    if(H5Pset_chunk(dcpl, 1, c_dims) < 0)
+	goto error;
 
     /* Create a 1D dataset */
-    sid = H5Screate_simple(1, dims, NULL);
-    did  = H5Dcreate2(fid, DSET, H5T_NATIVE_INT, sid, H5P_DEFAULT, dcpl, H5P_DEFAULT);
+    if((sid = H5Screate_simple(1, dims, NULL)) < 0)
+	goto error;
+    if((did  = H5Dcreate2(fid, DSET, H5T_NATIVE_INT, sid, H5P_DEFAULT, dcpl, H5P_DEFAULT)) < 0)
+	goto error;
     
     /* Write to the dataset */
-    status = H5Dwrite(did, H5T_NATIVE_INT, H5S_ALL, H5S_ALL, H5P_DEFAULT, buf);
-    assert(status >= 0);
+    if(H5Dwrite(did, H5T_NATIVE_INT, H5S_ALL, H5S_ALL, H5P_DEFAULT, buf) < 0)
+	goto error;
 
 #if defined (H5_HAVE_FILTER_DEFLATE)
     /* set deflate data */
-    status = H5Pset_deflate(dcpl, 9);
-    assert(status >= 0);
+    if(H5Pset_deflate(dcpl, 9) < 0)
+	goto error;
 
     /* Create and write the dataset */
-    did2  = H5Dcreate2(fid, DSET_FILTER, H5T_NATIVE_INT, sid, H5P_DEFAULT, dcpl, H5P_DEFAULT);
-    status = H5Dwrite(did2, H5T_NATIVE_INT, H5S_ALL, H5S_ALL, H5P_DEFAULT, buf);
-    assert(status >= 0);
+    if((did2  = H5Dcreate2(fid, DSET_FILTER, H5T_NATIVE_INT, sid, H5P_DEFAULT, dcpl, H5P_DEFAULT)) < 0)
+	goto error;
+    if(H5Dwrite(did2, H5T_NATIVE_INT, H5S_ALL, H5S_ALL, H5P_DEFAULT, buf) < 0)
+	goto error;
 
     /* Close the dataset */
-    status = H5Dclose(did2);
-    assert(status >= 0);
-
+    if(H5Dclose(did2) < 0)
+	goto error;
 #endif
 
     /* closing: dataspace, dataset, file */
-    status = H5Sclose(sid);
-    assert(status >= 0);
-    status = H5Dclose(did);
-    assert(status >= 0);
-    status = H5Fclose(fid);
-    assert(status >= 0);
+    if(H5Pclose(fapl) < 0)
+	goto error;
+    if(H5Pclose(dcpl) < 0)
+	goto error;
+    if(H5Sclose(sid) < 0)
+	goto error;
+    if(H5Dclose(did) < 0)
+	goto error;
+    if(H5Fclose(fid) < 0)
+	goto error;
+
+error:
+    H5E_BEGIN_TRY {
+        H5Pclose(fapl);
+        H5Pclose(dcpl);
+        H5Sclose(sid);
+        H5Dclose(did);
+        H5Fclose(fid);
+#if defined (H5_HAVE_FILTER_DEFLATE)
+        H5Dclose(did2);
+#endif
+    } H5E_END_TRY;
 
 } /* gen_idx_file() */
 
 int main(void)
 {
-    gen_file();
+    gen_newgrat_file(NEWGRAT_FILE);
+    gen_threshold_file(THRESHOLD_FILE);
 
     /* Generate an HDF file to test for datasets with Fixed Array indexing */
-    gen_idx_file();
+    gen_idx_file(IDX_FILE);
 
     return 0;
 }
diff --git a/tools/h5stat/testfiles/h5stat_dims1.ddl b/tools/h5stat/testfiles/h5stat_dims1.ddl
new file mode 100644
index 0000000..182d31a
--- /dev/null
+++ b/tools/h5stat/testfiles/h5stat_dims1.ddl
@@ -0,0 +1,47 @@
+#############################
+Expected output for 'h5stat -gd -m 5 h5stat_threshold.h5'
+#############################
+Filename: h5stat_threshold.h5
+Small groups (with 0 to 9 links):
+	# of groups with 0 link(s): 1
+	# of groups with 7 link(s): 1
+	# of groups with 9 link(s): 1
+	Total # of small groups: 3
+Group bins:
+	# of groups with 0 link: 1
+	# of groups with 1 - 9 links: 2
+	# of groups with 10 - 99 links: 1
+	Total # of groups: 4
+Dataset dimension information:
+	Max. rank of datasets: 2
+	Dataset ranks:
+		# of dataset with rank 0: 2
+		# of dataset with rank 1: 20
+		# of dataset with rank 2: 1
+1-D Dataset information:
+	Max. dimension size of 1-D datasets: 6
+	Small 1-D datasets (with dimension sizes 0 to 4):
+		# of datasets with dimension sizes 0: 1
+		Total # of small datasets: 1
+	1-D Dataset dimension bins:
+		# of datasets with dimension size 0: 1
+		# of datasets with dimension size 1 - 9: 19
+		Total # of datasets: 20
+Dataset storage information:
+	Total raw data size: 0
+	Total external raw data size: 0
+Dataset layout information:
+	Dataset layout counts[COMPACT]: 0
+	Dataset layout counts[CONTIG]: 23
+	Dataset layout counts[CHUNKED]: 0
+	Number of external files : 0
+Dataset filters information:
+	Number of datasets with:
+		NO filter: 23
+		GZIP filter: 0
+		SHUFFLE filter: 0
+		FLETCHER32 filter: 0
+		SZIP filter: 0
+		NBIT filter: 0
+		SCALEOFFSET filter: 0
+		USER-DEFINED filter: 0
diff --git a/tools/h5stat/testfiles/h5stat_dims2.ddl b/tools/h5stat/testfiles/h5stat_dims2.ddl
new file mode 100644
index 0000000..abf3f61
--- /dev/null
+++ b/tools/h5stat/testfiles/h5stat_dims2.ddl
@@ -0,0 +1,38 @@
+#############################
+Expected output for 'h5stat -d --di=15 h5stat_threshold.h5'
+#############################
+Filename: h5stat_threshold.h5
+Dataset dimension information:
+	Max. rank of datasets: 2
+	Dataset ranks:
+		# of dataset with rank 0: 2
+		# of dataset with rank 1: 20
+		# of dataset with rank 2: 1
+1-D Dataset information:
+	Max. dimension size of 1-D datasets: 6
+	Small 1-D datasets (with dimension sizes 0 to 14):
+		# of datasets with dimension sizes 0: 1
+		# of datasets with dimension sizes 6: 19
+		Total # of small datasets: 20
+	1-D Dataset dimension bins:
+		# of datasets with dimension size 0: 1
+		# of datasets with dimension size 1 - 9: 19
+		Total # of datasets: 20
+Dataset storage information:
+	Total raw data size: 0
+	Total external raw data size: 0
+Dataset layout information:
+	Dataset layout counts[COMPACT]: 0
+	Dataset layout counts[CONTIG]: 23
+	Dataset layout counts[CHUNKED]: 0
+	Number of external files : 0
+Dataset filters information:
+	Number of datasets with:
+		NO filter: 23
+		GZIP filter: 0
+		SHUFFLE filter: 0
+		FLETCHER32 filter: 0
+		SZIP filter: 0
+		NBIT filter: 0
+		SCALEOFFSET filter: 0
+		USER-DEFINED filter: 0
diff --git a/tools/h5stat/testfiles/h5stat_err1_dims.ddl b/tools/h5stat/testfiles/h5stat_err1_dims.ddl
new file mode 100644
index 0000000..8f0686f
--- /dev/null
+++ b/tools/h5stat/testfiles/h5stat_err1_dims.ddl
@@ -0,0 +1,4 @@
+#############################
+Expected output for 'h5stat -d --dims=-1 h5stat_threshold.h5'
+#############################
+h5stat error: Invalid threshold for small datasets
diff --git a/tools/h5stat/testfiles/h5stat_err1_links.ddl b/tools/h5stat/testfiles/h5stat_err1_links.ddl
new file mode 100644
index 0000000..07987a2
--- /dev/null
+++ b/tools/h5stat/testfiles/h5stat_err1_links.ddl
@@ -0,0 +1,4 @@
+#############################
+Expected output for 'h5stat -l 0 h5stat_threshold.h5'
+#############################
+h5stat error: Invalid threshold for small groups
diff --git a/tools/h5stat/testfiles/h5stat_err1_numattrs.ddl b/tools/h5stat/testfiles/h5stat_err1_numattrs.ddl
new file mode 100644
index 0000000..8eea546
--- /dev/null
+++ b/tools/h5stat/testfiles/h5stat_err1_numattrs.ddl
@@ -0,0 +1,4 @@
+#############################
+Expected output for 'h5stat -a -2 h5stat_threshold.h5'
+#############################
+h5stat error: Invalid threshold for small # of attributes
diff --git a/tools/h5stat/testfiles/h5stat_err2_numattrs.ddl b/tools/h5stat/testfiles/h5stat_err2_numattrs.ddl
new file mode 100644
index 0000000..a1ecb31
--- /dev/null
+++ b/tools/h5stat/testfiles/h5stat_err2_numattrs.ddl
@@ -0,0 +1,4 @@
+#############################
+Expected output for 'h5stat --numattrs h5stat_threshold.h5'
+#############################
+h5stat error: Invalid threshold for small # of attributes
diff --git a/tools/h5stat/testfiles/h5stat_filters-d.ddl b/tools/h5stat/testfiles/h5stat_filters-d.ddl
index 3cc9071..dae1f06 100644
--- a/tools/h5stat/testfiles/h5stat_filters-d.ddl
+++ b/tools/h5stat/testfiles/h5stat_filters-d.ddl
@@ -9,10 +9,10 @@ Dataset dimension information:
 		# of dataset with rank 2: 14
 1-D Dataset information:
 	Max. dimension size of 1-D datasets: 100
-	Small 1-D datasets:
-		Total small datasets: 0
+	Small 1-D datasets (with dimension sizes 0 to 9):
+		Total # of small datasets: 0
 	1-D Dataset dimension bins:
-		# of datasets of size 100 - 999: 1
+		# of datasets with dimension size 100 - 999: 1
 		Total # of datasets: 1
 Dataset storage information:
 	Total raw data size: 8659
diff --git a/tools/h5stat/testfiles/h5stat_filters-dT.ddl b/tools/h5stat/testfiles/h5stat_filters-dT.ddl
index ae9121d..5c7a4ab 100644
--- a/tools/h5stat/testfiles/h5stat_filters-dT.ddl
+++ b/tools/h5stat/testfiles/h5stat_filters-dT.ddl
@@ -9,10 +9,10 @@ Dataset dimension information:
 		# of dataset with rank 2: 14
 1-D Dataset information:
 	Max. dimension size of 1-D datasets: 100
-	Small 1-D datasets:
-		Total small datasets: 0
+	Small 1-D datasets (with dimension sizes 0 to 9):
+		Total # of small datasets: 0
 	1-D Dataset dimension bins:
-		# of datasets of size 100 - 999: 1
+		# of datasets with dimension size 100 - 999: 1
 		Total # of datasets: 1
 Dataset storage information:
 	Total raw data size: 8659
diff --git a/tools/h5stat/testfiles/h5stat_filters-g.ddl b/tools/h5stat/testfiles/h5stat_filters-g.ddl
index d488b8f..6cb791c 100644
--- a/tools/h5stat/testfiles/h5stat_filters-g.ddl
+++ b/tools/h5stat/testfiles/h5stat_filters-g.ddl
@@ -2,8 +2,8 @@
 Expected output for 'h5stat -g h5stat_filters.h5'
 #############################
 Filename: h5stat_filters.h5
-Small groups:
+Small groups (with 0 to 9 links):
 	Total # of small groups: 0
 Group bins:
-	# of groups of size 10 - 99: 1
+	# of groups with 10 - 99 links: 1
 	Total # of groups: 1
diff --git a/tools/h5stat/testfiles/h5stat_filters.ddl b/tools/h5stat/testfiles/h5stat_filters.ddl
index ddafd81..0a6733d 100644
--- a/tools/h5stat/testfiles/h5stat_filters.ddl
+++ b/tools/h5stat/testfiles/h5stat_filters.ddl
@@ -35,10 +35,10 @@ File space information for file metadata (in bytes):
 	Free-space managers:
 		Header: 0
 		Amount of free space: 0
-Small groups:
+Small groups (with 0 to 9 links):
 	Total # of small groups: 0
 Group bins:
-	# of groups of size 10 - 99: 1
+	# of groups with 10 - 99 links: 1
 	Total # of groups: 1
 Dataset dimension information:
 	Max. rank of datasets: 2
@@ -47,10 +47,10 @@ Dataset dimension information:
 		# of dataset with rank 2: 14
 1-D Dataset information:
 	Max. dimension size of 1-D datasets: 100
-	Small 1-D datasets:
-		Total small datasets: 0
+	Small 1-D datasets (with dimension sizes 0 to 9):
+		Total # of small datasets: 0
 	1-D Dataset dimension bins:
-		# of datasets of size 100 - 999: 1
+		# of datasets with dimension size 100 - 999: 1
 		Total # of datasets: 1
 Dataset storage information:
 	Total raw data size: 8659
@@ -79,7 +79,7 @@ Dataset datatype information:
 		Count (total/named) = (1/0)
 		Size (desc./elmt) = (14/4)
 	Total dataset datatype count: 15
-Small # of attributes:
+Small # of attributes (objects with 1 to 10 attributes):
 	Total # of objects with small # of attributes: 0
 Attribute bins:
 	Total # of objects with attributes: 0
diff --git a/tools/h5stat/testfiles/h5stat_help1.ddl b/tools/h5stat/testfiles/h5stat_help1.ddl
index 5665b35..d79c99f 100644
--- a/tools/h5stat/testfiles/h5stat_help1.ddl
+++ b/tools/h5stat/testfiles/h5stat_help1.ddl
@@ -9,10 +9,19 @@ Usage: h5stat [OPTIONS] file
      -f, --file            Print file information
      -F, --filemetadata    Print file space information for file's metadata
      -g, --group           Print group information
+     -l N, --links=N       Set the threshold for the # of links when printing
+                           information for small groups.  N is an integer greater
+                           than 0.  The default threshold is 10.
      -G, --groupmetadata   Print file space information for groups' metadata
      -d, --dset            Print dataset information
+     -m N, --dims=N        Set the threshold for the dimension sizes when printing
+                           information for small datasets.  N is an integer greater
+                           than 0.  The default threshold is 10.
      -D, --dsetmetadata    Print file space information for datasets' metadata
      -T, --dtypemetadata   Print datasets' datatype information
      -A, --attribute       Print attribute information
+     -a N, --numattrs=N    Set the threshold for the # of attributes when printing
+                           information for small # of attributes.  N is an integer greater
+                           than 0.  The default threshold is 10.
      -s, --freespace       Print free space information
      -S, --summary         Print summary of file space information
diff --git a/tools/h5stat/testfiles/h5stat_help2.ddl b/tools/h5stat/testfiles/h5stat_help2.ddl
index 3fb303a..af48e3a 100644
--- a/tools/h5stat/testfiles/h5stat_help2.ddl
+++ b/tools/h5stat/testfiles/h5stat_help2.ddl
@@ -9,10 +9,19 @@ Usage: h5stat [OPTIONS] file
      -f, --file            Print file information
      -F, --filemetadata    Print file space information for file's metadata
      -g, --group           Print group information
+     -l N, --links=N       Set the threshold for the # of links when printing
+                           information for small groups.  N is an integer greater
+                           than 0.  The default threshold is 10.
      -G, --groupmetadata   Print file space information for groups' metadata
      -d, --dset            Print dataset information
+     -m N, --dims=N        Set the threshold for the dimension sizes when printing
+                           information for small datasets.  N is an integer greater
+                           than 0.  The default threshold is 10.
      -D, --dsetmetadata    Print file space information for datasets' metadata
      -T, --dtypemetadata   Print datasets' datatype information
      -A, --attribute       Print attribute information
+     -a N, --numattrs=N    Set the threshold for the # of attributes when printing
+                           information for small # of attributes.  N is an integer greater
+                           than 0.  The default threshold is 10.
      -s, --freespace       Print free space information
      -S, --summary         Print summary of file space information
diff --git a/tools/h5stat/testfiles/h5stat_idx.ddl b/tools/h5stat/testfiles/h5stat_idx.ddl
index 2de3d96..f604a05 100644
--- a/tools/h5stat/testfiles/h5stat_idx.ddl
+++ b/tools/h5stat/testfiles/h5stat_idx.ddl
@@ -16,7 +16,7 @@ File space information for file metadata (in bytes):
 	User block: 0
 	Object headers: (total/unused)
 		Groups: 147/47
-		Datasets(exclude compact data): 568/362
+		Datasets(exclude compact data): 568/346
 		Datatypes: 0/0
 	Groups:
 		B-tree/List: 0
@@ -35,11 +35,11 @@ File space information for file metadata (in bytes):
 	Free-space managers:
 		Header: 0
 		Amount of free space: 0
-Small groups:
-	# of groups of size 2: 1
+Small groups (with 0 to 9 links):
+	# of groups with 2 link(s): 1
 	Total # of small groups: 1
 Group bins:
-	# of groups of size 1 - 9: 1
+	# of groups with 1 - 9 links: 1
 	Total # of groups: 1
 Dataset dimension information:
 	Max. rank of datasets: 1
@@ -47,10 +47,10 @@ Dataset dimension information:
 		# of dataset with rank 1: 2
 1-D Dataset information:
 	Max. dimension size of 1-D datasets: 10
-	Small 1-D datasets:
-		Total small datasets: 0
+	Small 1-D datasets (with dimension sizes 0 to 9):
+		Total # of small datasets: 0
 	1-D Dataset dimension bins:
-		# of datasets of size 10 - 99: 2
+		# of datasets with dimension size 10 - 99: 2
 		Total # of datasets: 2
 Dataset storage information:
 	Total raw data size: 110
@@ -76,7 +76,7 @@ Dataset datatype information:
 		Count (total/named) = (2/0)
 		Size (desc./elmt) = (14/4)
 	Total dataset datatype count: 2
-Small # of attributes:
+Small # of attributes (objects with 1 to 10 attributes):
 	Total # of objects with small # of attributes: 0
 Attribute bins:
 	Total # of objects with attributes: 0
diff --git a/tools/h5stat/testfiles/h5stat_idx.h5 b/tools/h5stat/testfiles/h5stat_idx.h5
index c6c8006..f667a6f 100644
--- a/tools/h5stat/testfiles/h5stat_idx.h5
+++ b/tools/h5stat/testfiles/h5stat_idx.h5
diff --git a/tools/h5stat/testfiles/h5stat_links1.ddl b/tools/h5stat/testfiles/h5stat_links1.ddl
new file mode 100644
index 0000000..e77a788
--- /dev/null
+++ b/tools/h5stat/testfiles/h5stat_links1.ddl
@@ -0,0 +1,13 @@
+#############################
+Expected output for 'h5stat -g -l 8 h5stat_threshold.h5'
+#############################
+Filename: h5stat_threshold.h5
+Small groups (with 0 to 7 links):
+	# of groups with 0 link(s): 1
+	# of groups with 7 link(s): 1
+	Total # of small groups: 2
+Group bins:
+	# of groups with 0 link: 1
+	# of groups with 1 - 9 links: 2
+	# of groups with 10 - 99 links: 1
+	Total # of groups: 4
diff --git a/tools/h5stat/testfiles/h5stat_links2.ddl b/tools/h5stat/testfiles/h5stat_links2.ddl
new file mode 100644
index 0000000..5207343
--- /dev/null
+++ b/tools/h5stat/testfiles/h5stat_links2.ddl
@@ -0,0 +1,107 @@
+#############################
+Expected output for 'h5stat --links=8 h5stat_threshold.h5'
+#############################
+Filename: h5stat_threshold.h5
+File information
+	# of unique groups: 4
+	# of unique datasets: 23
+	# of unique named datatypes: 0
+	# of unique links: 0
+	# of unique other: 0
+	Max. # of links to object: 1
+	Max. # of objects in group: 10
+File space information for file metadata (in bytes):
+	Superblock: 96
+	Superblock extension: 0
+	User block: 0
+	Object headers: (total/unused)
+		Groups: 3576/0
+		Datasets(exclude compact data): 7896/2912
+		Datatypes: 0/0
+	Groups:
+		B-tree/List: 3816
+		Heap: 744
+	Attributes:
+		B-tree/List: 0
+		Heap: 0
+	Chunked datasets:
+		Index: 0
+	Datasets:
+		Heap: 0
+	Shared Messages:
+		Header: 0
+		B-tree/List: 0
+		Heap: 0
+	Free-space managers:
+		Header: 0
+		Amount of free space: 0
+Small groups (with 0 to 7 links):
+	# of groups with 0 link(s): 1
+	# of groups with 7 link(s): 1
+	Total # of small groups: 2
+Group bins:
+	# of groups with 0 link: 1
+	# of groups with 1 - 9 links: 2
+	# of groups with 10 - 99 links: 1
+	Total # of groups: 4
+Dataset dimension information:
+	Max. rank of datasets: 2
+	Dataset ranks:
+		# of dataset with rank 0: 2
+		# of dataset with rank 1: 20
+		# of dataset with rank 2: 1
+1-D Dataset information:
+	Max. dimension size of 1-D datasets: 6
+	Small 1-D datasets (with dimension sizes 0 to 9):
+		# of datasets with dimension sizes 0: 1
+		# of datasets with dimension sizes 6: 19
+		Total # of small datasets: 20
+	1-D Dataset dimension bins:
+		# of datasets with dimension size 0: 1
+		# of datasets with dimension size 1 - 9: 19
+		Total # of datasets: 20
+Dataset storage information:
+	Total raw data size: 0
+	Total external raw data size: 0
+Dataset layout information:
+	Dataset layout counts[COMPACT]: 0
+	Dataset layout counts[CONTIG]: 23
+	Dataset layout counts[CHUNKED]: 0
+	Number of external files : 0
+Dataset filters information:
+	Number of datasets with:
+		NO filter: 23
+		GZIP filter: 0
+		SHUFFLE filter: 0
+		FLETCHER32 filter: 0
+		SZIP filter: 0
+		NBIT filter: 0
+		SCALEOFFSET filter: 0
+		USER-DEFINED filter: 0
+Dataset datatype information:
+	# of unique datatypes used by datasets: 1
+	Dataset datatype #0:
+		Count (total/named) = (23/0)
+		Size (desc./elmt) = (14/1)
+	Total dataset datatype count: 23
+Small # of attributes (objects with 1 to 10 attributes):
+	# of objects with 1 attributes: 2
+	# of objects with 10 attributes: 1
+	Total # of objects with small # of attributes: 3
+Attribute bins:
+	# of objects with 1 - 9 attributes: 2
+	# of objects with 10 - 99 attributes: 3
+	Total # of objects with attributes: 5
+	Max. # of attributes to objects: 25
+Free-space section threshold: 1 bytes
+Small size free-space sections (< 10 bytes):
+	Total # of small size sections: 0
+Free-space section bins:
+	Total # of sections: 0
+File space management strategy: H5F_FILE_SPACE_ALL
+Summary of file space information:
+  File metadata: 16128 bytes
+  Raw data: 0 bytes
+  Amount/Percent of tracked free space: 0 bytes/0.0%
+  Unaccounted space: 184 bytes
+Total space: 16312 bytes
diff --git a/tools/h5stat/testfiles/h5stat_links3.ddl b/tools/h5stat/testfiles/h5stat_links3.ddl
new file mode 100644
index 0000000..d0071d7
--- /dev/null
+++ b/tools/h5stat/testfiles/h5stat_links3.ddl
@@ -0,0 +1,15 @@
+#############################
+Expected output for 'h5stat --links=20 -g h5stat_threshold.h5'
+#############################
+Filename: h5stat_threshold.h5
+Small groups (with 0 to 19 links):
+	# of groups with 0 link(s): 1
+	# of groups with 7 link(s): 1
+	# of groups with 9 link(s): 1
+	# of groups with 10 link(s): 1
+	Total # of small groups: 4
+Group bins:
+	# of groups with 0 link: 1
+	# of groups with 1 - 9 links: 2
+	# of groups with 10 - 99 links: 1
+	Total # of groups: 4
diff --git a/tools/h5stat/testfiles/h5stat_links4.ddl b/tools/h5stat/testfiles/h5stat_links4.ddl
new file mode 100644
index 0000000..ca3911c
--- /dev/null
+++ b/tools/h5stat/testfiles/h5stat_links4.ddl
@@ -0,0 +1,11 @@
+#############################
+Expected output for 'h5stat -g h5stat_newgrat.h5'
+#############################
+Filename: h5stat_newgrat.h5
+Small groups (with 0 to 9 links):
+	# of groups with 0 link(s): 35000
+	Total # of small groups: 35000
+Group bins:
+	# of groups with 0 link: 35000
+	# of groups with 10000 - 99999 links: 1
+	Total # of groups: 35001
diff --git a/tools/h5stat/testfiles/h5stat_links5.ddl b/tools/h5stat/testfiles/h5stat_links5.ddl
new file mode 100644
index 0000000..44ec161
--- /dev/null
+++ b/tools/h5stat/testfiles/h5stat_links5.ddl
@@ -0,0 +1,12 @@
+#############################
+Expected output for 'h5stat -g -l 40000 h5stat_newgrat.h5'
+#############################
+Filename: h5stat_newgrat.h5
+Small groups (with 0 to 39999 links):
+	# of groups with 0 link(s): 35000
+	# of groups with 35001 link(s): 1
+	Total # of small groups: 35001
+Group bins:
+	# of groups with 0 link: 35000
+	# of groups with 10000 - 99999 links: 1
+	Total # of groups: 35001
diff --git a/tools/h5stat/testfiles/h5stat_newgrat-UA.ddl b/tools/h5stat/testfiles/h5stat_newgrat-UA.ddl
index 70f9a82..18f91f3 100644
--- a/tools/h5stat/testfiles/h5stat_newgrat-UA.ddl
+++ b/tools/h5stat/testfiles/h5stat_newgrat-UA.ddl
@@ -2,7 +2,7 @@
 Expected output for 'h5stat -A h5stat_newgrat.h5'
 #############################
 Filename: h5stat_newgrat.h5
-Small # of attributes:
+Small # of attributes (objects with 1 to 10 attributes):
 	Total # of objects with small # of attributes: 0
 Attribute bins:
 	# of objects with 100 - 999 attributes: 1
diff --git a/tools/h5stat/testfiles/h5stat_newgrat.ddl b/tools/h5stat/testfiles/h5stat_newgrat.ddl
index b93fa17..7d4ef91 100644
--- a/tools/h5stat/testfiles/h5stat_newgrat.ddl
+++ b/tools/h5stat/testfiles/h5stat_newgrat.ddl
@@ -33,14 +33,14 @@ File space information for file metadata (in bytes):
 		B-tree/List: 0
 		Heap: 0
 	Free-space managers:
-		Header: 1584
-		Amount of free space: 6042
-Small groups:
-	# of groups of size 0: 35000
+		Header: 180
+		Amount of free space: 132
+Small groups (with 0 to 9 links):
+	# of groups with 0 link(s): 35000
 	Total # of small groups: 35000
 Group bins:
-	# of groups of size 0: 35000
-	# of groups of size 10000 - 99999: 1
+	# of groups with 0 link: 35000
+	# of groups with 10000 - 99999 links: 1
 	Total # of groups: 35001
 Dataset dimension information:
 	Max. rank of datasets: 0
@@ -48,8 +48,8 @@ Dataset dimension information:
 		# of dataset with rank 0: 1
 1-D Dataset information:
 	Max. dimension size of 1-D datasets: 0
-	Small 1-D datasets:
-		Total small datasets: 0
+	Small 1-D datasets (with dimension sizes 0 to 9):
+		Total # of small datasets: 0
 Dataset storage information:
 	Total raw data size: 0
 	Total external raw data size: 0
@@ -74,7 +74,7 @@ Dataset datatype information:
 		Count (total/named) = (1/0)
 		Size (desc./elmt) = (14/4)
 	Total dataset datatype count: 1
-Small # of attributes:
+Small # of attributes (objects with 1 to 10 attributes):
 	Total # of objects with small # of attributes: 0
 Attribute bins:
 	# of objects with 100 - 999 attributes: 1
@@ -83,20 +83,15 @@ Attribute bins:
 Free-space section threshold: 1 bytes
 Small size free-space sections (< 10 bytes):
 	# of sections of size 1: 1
-	# of sections of size 2: 12
-	# of sections of size 3: 1
-	# of sections of size 7: 1
-	# of sections of size 8: 2
-	Total # of small size sections: 17
+	Total # of small size sections: 1
 Free-space section bins:
-	# of sections of size 1 - 9: 17
-	# of sections of size 10 - 99: 49
-	# of sections of size 100 - 999: 27
-	Total # of sections: 93
+	# of sections of size 1 - 9: 1
+	# of sections of size 10 - 99: 4
+	Total # of sections: 5
 File space management strategy: H5F_FILE_SPACE_ALL_PERSIST
 Summary of file space information:
-  File metadata: 6363440 bytes
+  File metadata: 6362036 bytes
   Raw data: 0 bytes
-  Amount/Percent of tracked free space: 6042 bytes/0.1%
+  Amount/Percent of tracked free space: 132 bytes/0.0%
   Unaccounted space: 0 bytes
-Total space: 6369482 bytes
+Total space: 6362168 bytes
diff --git a/tools/h5stat/testfiles/h5stat_newgrat.h5 b/tools/h5stat/testfiles/h5stat_newgrat.h5
index cb5f47f..c919b71 100644
--- a/tools/h5stat/testfiles/h5stat_newgrat.h5
+++ b/tools/h5stat/testfiles/h5stat_newgrat.h5
diff --git a/tools/h5stat/testfiles/h5stat_nofile.ddl b/tools/h5stat/testfiles/h5stat_nofile.ddl
new file mode 100644
index 0000000..cf20995
--- /dev/null
+++ b/tools/h5stat/testfiles/h5stat_nofile.ddl
@@ -0,0 +1,28 @@
+#############################
+Expected output for 'h5stat '
+#############################
+Usage: h5stat [OPTIONS] file
+
+      OPTIONS
+     -h, --help            Print a usage message and exit
+     -V, --version         Print version number and exit
+     -f, --file            Print file information
+     -F, --filemetadata    Print file space information for file's metadata
+     -g, --group           Print group information
+     -l N, --links=N       Set the threshold for the # of links when printing
+                           information for small groups.  N is an integer greater
+                           than 0.  The default threshold is 10.
+     -G, --groupmetadata   Print file space information for groups' metadata
+     -d, --dset            Print dataset information
+     -m N, --dims=N        Set the threshold for the dimension sizes when printing
+                           information for small datasets.  N is an integer greater
+                           than 0.  The default threshold is 10.
+     -D, --dsetmetadata    Print file space information for datasets' metadata
+     -T, --dtypemetadata   Print datasets' datatype information
+     -A, --attribute       Print attribute information
+     -a N, --numattrs=N    Set the threshold for the # of attributes when printing
+                           information for small # of attributes.  N is an integer greater
+                           than 0.  The default threshold is 10.
+     -s, --freespace       Print free space information
+     -S, --summary         Print summary of file space information
+h5stat error: missing file name
diff --git a/tools/h5stat/testfiles/h5stat_numattrs1.ddl b/tools/h5stat/testfiles/h5stat_numattrs1.ddl
new file mode 100644
index 0000000..86cfcb0
--- /dev/null
+++ b/tools/h5stat/testfiles/h5stat_numattrs1.ddl
@@ -0,0 +1,20 @@
+#############################
+Expected output for 'h5stat -AS -a 10 h5stat_threshold.h5'
+#############################
+Filename: h5stat_threshold.h5
+Small # of attributes (objects with 1 to 10 attributes):
+	# of objects with 1 attributes: 2
+	# of objects with 10 attributes: 1
+	Total # of objects with small # of attributes: 3
+Attribute bins:
+	# of objects with 1 - 9 attributes: 2
+	# of objects with 10 - 99 attributes: 3
+	Total # of objects with attributes: 5
+	Max. # of attributes to objects: 25
+File space management strategy: H5F_FILE_SPACE_ALL
+Summary of file space information:
+  File metadata: 16128 bytes
+  Raw data: 0 bytes
+  Amount/Percent of tracked free space: 0 bytes/0.0%
+  Unaccounted space: 184 bytes
+Total space: 16312 bytes
diff --git a/tools/h5stat/testfiles/h5stat_numattrs2.ddl b/tools/h5stat/testfiles/h5stat_numattrs2.ddl
new file mode 100644
index 0000000..5ee3adf
--- /dev/null
+++ b/tools/h5stat/testfiles/h5stat_numattrs2.ddl
@@ -0,0 +1,107 @@
+#############################
+Expected output for 'h5stat -a 1 h5stat_threshold.h5'
+#############################
+Filename: h5stat_threshold.h5
+File information
+	# of unique groups: 4
+	# of unique datasets: 23
+	# of unique named datatypes: 0
+	# of unique links: 0
+	# of unique other: 0
+	Max. # of links to object: 1
+	Max. # of objects in group: 10
+File space information for file metadata (in bytes):
+	Superblock: 96
+	Superblock extension: 0
+	User block: 0
+	Object headers: (total/unused)
+		Groups: 3576/0
+		Datasets(exclude compact data): 7896/2912
+		Datatypes: 0/0
+	Groups:
+		B-tree/List: 3816
+		Heap: 744
+	Attributes:
+		B-tree/List: 0
+		Heap: 0
+	Chunked datasets:
+		Index: 0
+	Datasets:
+		Heap: 0
+	Shared Messages:
+		Header: 0
+		B-tree/List: 0
+		Heap: 0
+	Free-space managers:
+		Header: 0
+		Amount of free space: 0
+Small groups (with 0 to 9 links):
+	# of groups with 0 link(s): 1
+	# of groups with 7 link(s): 1
+	# of groups with 9 link(s): 1
+	Total # of small groups: 3
+Group bins:
+	# of groups with 0 link: 1
+	# of groups with 1 - 9 links: 2
+	# of groups with 10 - 99 links: 1
+	Total # of groups: 4
+Dataset dimension information:
+	Max. rank of datasets: 2
+	Dataset ranks:
+		# of dataset with rank 0: 2
+		# of dataset with rank 1: 20
+		# of dataset with rank 2: 1
+1-D Dataset information:
+	Max. dimension size of 1-D datasets: 6
+	Small 1-D datasets (with dimension sizes 0 to 9):
+		# of datasets with dimension sizes 0: 1
+		# of datasets with dimension sizes 6: 19
+		Total # of small datasets: 20
+	1-D Dataset dimension bins:
+		# of datasets with dimension size 0: 1
+		# of datasets with dimension size 1 - 9: 19
+		Total # of datasets: 20
+Dataset storage information:
+	Total raw data size: 0
+	Total external raw data size: 0
+Dataset layout information:
+	Dataset layout counts[COMPACT]: 0
+	Dataset layout counts[CONTIG]: 23
+	Dataset layout counts[CHUNKED]: 0
+	Number of external files : 0
+Dataset filters information:
+	Number of datasets with:
+		NO filter: 23
+		GZIP filter: 0
+		SHUFFLE filter: 0
+		FLETCHER32 filter: 0
+		SZIP filter: 0
+		NBIT filter: 0
+		SCALEOFFSET filter: 0
+		USER-DEFINED filter: 0
+Dataset datatype information:
+	# of unique datatypes used by datasets: 1
+	Dataset datatype #0:
+		Count (total/named) = (23/0)
+		Size (desc./elmt) = (14/1)
+	Total dataset datatype count: 23
+Small # of attributes (objects with 1 to 1 attributes):
+	# of objects with 1 attributes: 2
+	Total # of objects with small # of attributes: 2
+Attribute bins:
+	# of objects with 1 - 9 attributes: 2
+	# of objects with 10 - 99 attributes: 3
+	Total # of objects with attributes: 5
+	Max. # of attributes to objects: 25
+Free-space section threshold: 1 bytes
+Small size free-space sections (< 10 bytes):
+	Total # of small size sections: 0
+Free-space section bins:
+	Total # of sections: 0
+File space management strategy: H5F_FILE_SPACE_ALL
+Summary of file space information:
+  File metadata: 16128 bytes
+  Raw data: 0 bytes
+  Amount/Percent of tracked free space: 0 bytes/0.0%
+  Unaccounted space: 184 bytes
+Total space: 16312 bytes
diff --git a/tools/h5stat/testfiles/h5stat_numattrs3.ddl b/tools/h5stat/testfiles/h5stat_numattrs3.ddl
new file mode 100644
index 0000000..515b76c
--- /dev/null
+++ b/tools/h5stat/testfiles/h5stat_numattrs3.ddl
@@ -0,0 +1,15 @@
+#############################
+Expected output for 'h5stat -A --numattrs=25 h5stat_threshold.h5'
+#############################
+Filename: h5stat_threshold.h5
+Small # of attributes (objects with 1 to 25 attributes):
+	# of objects with 1 attributes: 2
+	# of objects with 10 attributes: 1
+	# of objects with 11 attributes: 1
+	# of objects with 25 attributes: 1
+	Total # of objects with small # of attributes: 5
+Attribute bins:
+	# of objects with 1 - 9 attributes: 2
+	# of objects with 10 - 99 attributes: 3
+	Total # of objects with attributes: 5
+	Max. # of attributes to objects: 25
diff --git a/tools/h5stat/testfiles/h5stat_numattrs4.ddl b/tools/h5stat/testfiles/h5stat_numattrs4.ddl
new file mode 100644
index 0000000..515a4a9
--- /dev/null
+++ b/tools/h5stat/testfiles/h5stat_numattrs4.ddl
@@ -0,0 +1,11 @@
+#############################
+Expected output for 'h5stat -A -a 100 h5stat_newgrat.h5'
+#############################
+Filename: h5stat_newgrat.h5
+Small # of attributes (objects with 1 to 100 attributes):
+	# of objects with 100 attributes: 1
+	Total # of objects with small # of attributes: 1
+Attribute bins:
+	# of objects with 100 - 999 attributes: 1
+	Total # of objects with attributes: 1
+	Max. # of attributes to objects: 100
diff --git a/tools/h5stat/testfiles/h5stat_threshold.h5 b/tools/h5stat/testfiles/h5stat_threshold.h5
new file mode 100644
index 0000000..9f7c8c8
--- /dev/null
+++ b/tools/h5stat/testfiles/h5stat_threshold.h5
diff --git a/tools/h5stat/testfiles/h5stat_tsohm.ddl b/tools/h5stat/testfiles/h5stat_tsohm.ddl
index 6ee8aa8..788421b 100644
--- a/tools/h5stat/testfiles/h5stat_tsohm.ddl
+++ b/tools/h5stat/testfiles/h5stat_tsohm.ddl
@@ -35,11 +35,11 @@ File space information for file metadata (in bytes):
 	Free-space managers:
 		Header: 0
 		Amount of free space: 0
-Small groups:
-	# of groups of size 3: 1
+Small groups (with 0 to 9 links):
+	# of groups with 3 link(s): 1
 	Total # of small groups: 1
 Group bins:
-	# of groups of size 1 - 9: 1
+	# of groups with 1 - 9 links: 1
 	Total # of groups: 1
 Dataset dimension information:
 	Max. rank of datasets: 2
@@ -47,8 +47,8 @@ Dataset dimension information:
 		# of dataset with rank 2: 3
 1-D Dataset information:
 	Max. dimension size of 1-D datasets: 0
-	Small 1-D datasets:
-		Total small datasets: 0
+	Small 1-D datasets (with dimension sizes 0 to 9):
+		Total # of small datasets: 0
 Dataset storage information:
 	Total raw data size: 0
 	Total external raw data size: 0
@@ -73,7 +73,7 @@ Dataset datatype information:
 		Count (total/named) = (3/0)
 		Size (desc./elmt) = (14/8)
 	Total dataset datatype count: 3
-Small # of attributes:
+Small # of attributes (objects with 1 to 10 attributes):
 	Total # of objects with small # of attributes: 0
 Attribute bins:
 	Total # of objects with attributes: 0
diff --git a/tools/h5stat/testh5stat.sh.in b/tools/h5stat/testh5stat.sh.in
index 8a3e8a2..91b9c3d 100644
--- a/tools/h5stat/testh5stat.sh.in
+++ b/tools/h5stat/testh5stat.sh.in
@@ -13,7 +13,12 @@
 # http://hdfgroup.org/HDF5/doc/Copyright.html.  If you do not have
 # access to either file, you may request a copy from help@hdfgroup.org.
 #
-# Tests for the h5dump tool
+# Tests for the h5stat tool
+#
+# Modifcations:
+# 	Vailin Choi; July 2013
+# 	Add tests for -l, -m, -a options
+#
 
 srcdir=@srcdir@
 
@@ -73,12 +78,14 @@ $SRC_H5STAT_TESTFILES/h5stat_filters.h5
 $SRC_H5STAT_TESTFILES/h5stat_tsohm.h5
 $SRC_H5STAT_TESTFILES/h5stat_newgrat.h5
 $SRC_H5STAT_TESTFILES/h5stat_idx.h5
+$SRC_H5STAT_TESTFILES/h5stat_threshold.h5
 "
 
 LIST_OTHER_TEST_FILES="
 $SRC_H5STAT_TESTFILES/h5stat_help1.ddl
 $SRC_H5STAT_TESTFILES/h5stat_help2.ddl
 $SRC_H5STAT_TESTFILES/h5stat_notexist.ddl
+$SRC_H5STAT_TESTFILES/h5stat_nofile.ddl
 $SRC_H5STAT_TESTFILES/h5stat_filters.ddl
 $SRC_H5STAT_TESTFILES/h5stat_filters-file.ddl
 $SRC_H5STAT_TESTFILES/h5stat_filters-F.ddl
@@ -92,6 +99,21 @@ $SRC_H5STAT_TESTFILES/h5stat_newgrat.ddl
 $SRC_H5STAT_TESTFILES/h5stat_newgrat-UG.ddl
 $SRC_H5STAT_TESTFILES/h5stat_newgrat-UA.ddl
 $SRC_H5STAT_TESTFILES/h5stat_idx.ddl
+$SRC_H5STAT_TESTFILES/h5stat_err1_links.ddl
+$SRC_H5STAT_TESTFILES/h5stat_links1.ddl
+$SRC_H5STAT_TESTFILES/h5stat_links2.ddl
+$SRC_H5STAT_TESTFILES/h5stat_links3.ddl
+$SRC_H5STAT_TESTFILES/h5stat_links4.ddl
+$SRC_H5STAT_TESTFILES/h5stat_links5.ddl
+$SRC_H5STAT_TESTFILES/h5stat_err1_dims.ddl
+$SRC_H5STAT_TESTFILES/h5stat_dims1.ddl
+$SRC_H5STAT_TESTFILES/h5stat_dims2.ddl
+$SRC_H5STAT_TESTFILES/h5stat_err1_numattrs.ddl
+$SRC_H5STAT_TESTFILES/h5stat_err2_numattrs.ddl
+$SRC_H5STAT_TESTFILES/h5stat_numattrs1.ddl
+$SRC_H5STAT_TESTFILES/h5stat_numattrs2.ddl
+$SRC_H5STAT_TESTFILES/h5stat_numattrs3.ddl
+$SRC_H5STAT_TESTFILES/h5stat_numattrs4.ddl
 "
 
 #
@@ -212,6 +234,7 @@ TOOLTEST h5stat_help1.ddl -h
 TOOLTEST h5stat_help2.ddl --help
 # Test when h5stat a file that does not exist
 TOOLTEST h5stat_notexist.ddl notexist.h5
+TOOLTEST h5stat_nofile.ddl ''
 
 # Test file with groups, compressed datasets, user-applied fileters, etc.
 # h5stat_filters.h5 is a copy of ../../testfiles/tfilters.h5 as of release 1.8.0-alpha4
@@ -233,6 +256,47 @@ TOOLTEST h5stat_newgrat-UG.ddl -G h5stat_newgrat.h5
 TOOLTEST h5stat_newgrat-UA.ddl -A h5stat_newgrat.h5
 # h5stat_idx.h5 is generated by h5stat_gentest.c
 TOOLTEST h5stat_idx.ddl h5stat_idx.h5
+#
+# Tests for -l (--links) option on h5stat_threshold.h5: 
+# 	-l 0 (incorrect threshold value)
+# 	-g -l 8
+# 	--links=8
+# 	--links=20 -g
+TOOLTEST h5stat_err1_links.ddl -l 0 h5stat_threshold.h5
+TOOLTEST h5stat_links1.ddl -g -l 8 h5stat_threshold.h5
+TOOLTEST h5stat_links2.ddl --links=8 h5stat_threshold.h5
+TOOLTEST h5stat_links3.ddl --links=20 -g h5stat_threshold.h5
+#
+# Tests for -l (--links) option on h5stat_newgrat.h5: 
+# 	-g
+# 	-g -l 40000
+TOOLTEST h5stat_links4.ddl -g h5stat_newgrat.h5
+TOOLTEST h5stat_links5.ddl -g -l 40000 h5stat_newgrat.h5
+#
+# Tests for -m (--dims) option on h5stat_threshold.h5
+# 	-d --dims=-1 (incorrect threshold value)
+# 	-gd -m 5
+# 	-d --di=15
+TOOLTEST h5stat_err1_dims.ddl -d --dims=-1 h5stat_threshold.h5
+TOOLTEST h5stat_dims1.ddl -gd -m 5 h5stat_threshold.h5
+TOOLTEST h5stat_dims2.ddl -d --di=15 h5stat_threshold.h5
+#
+# Tests for -a option on h5stat_threshold.h5
+# 	-a -2 (incorrect threshold value)
+#	--numattrs (without threshold value)
+#	-AS -a 10
+#	-a 1
+#	-A --numattrs=25
+TOOLTEST h5stat_err1_numattrs.ddl -a -2 h5stat_threshold.h5
+TOOLTEST h5stat_err2_numattrs.ddl --numattrs h5stat_threshold.h5
+TOOLTEST h5stat_numattrs1.ddl -AS -a 10 h5stat_threshold.h5
+TOOLTEST h5stat_numattrs2.ddl -a 1 h5stat_threshold.h5
+TOOLTEST h5stat_numattrs3.ddl -A --numattrs=25 h5stat_threshold.h5
+#
+# Tests for -a option on h5stat_newgrat.h5
+#	-A -a 100
+TOOLTEST h5stat_numattrs4.ddl -A -a 100 h5stat_newgrat.h5
+#
 
 if test $nerrors -eq 0 ; then
     echo "All $TESTNAME tests passed."
diff --git a/tools/testfiles/h5dump-help.txt b/tools/testfiles/h5dump-help.txt
index b735b18..3a4864e 100644
--- a/tools/testfiles/h5dump-help.txt
+++ b/tools/testfiles/h5dump-help.txt
@@ -1,35 +1,45 @@
 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.
      -B,   --superblock   Print the content of the super block
      -H,   --header       Print the header only; no data is displayed
-     -A,   --onlyattr     Print the header and value of attributes
-                          Optional value 0 suppresses printing attributes.
-     -i,   --object-ids   Print the object ids
-     -r,   --string       Print 1-byte integer datasets as ASCII
-     -e,   --escape       Escape non printing characters
-     -V,   --version      Print version number and exit
+     -f D, --filedriver=D Specify which driver to open the file with
+     -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
+--------------- Object Options ---------------
      -a P, --attribute=P  Print the specified attribute
                           If an attribute name contains a slash (/), escape the
                           slash with a preceding backslash (\).
                           (See example section below.)
      -d P, --dataset=P    Print the specified dataset
-     -y,   --noindex      Do not print array indices with the data
-     -p,   --properties   Print dataset filters, storage layout and fill value
-     -f D, --filedriver=D Specify which driver to open the file with
      -g P, --group=P      Print the specified group and all members
      -l P, --soft-link=P  Print the value(s) of the specified soft link
-     -o F, --output=F     Output raw data into file F
-     -b B, --binary=B     Binary file output, of form B
      -t P, --datatype=P   Print the specified named datatype
-     -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.
-     -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
+     -A,   --onlyattr     Print the header and value of attributes
+                          Optional value 0 suppresses printing attributes.
+--------------- Object Property Options ---------------
+     -i,   --object-ids   Print the object ids
+     -p,   --properties   Print dataset filters, storage layout and fill value
      -M L, --packedbits=L Print packed bits as unsigned integers, using mask
                           format L for an integer dataset specified with
                           option -d. L is a list of offset,length values,
@@ -37,19 +47,15 @@ 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
+--------------- XML Options ---------------
      -x,   --xml          Output in XML using Schema
      -u,   --use-dtd      Output in XML using DTD
      -D U, --xml-dtd=U    Use the DTD or schema at U
      -X S, --xml-ns=S     (XML Schema) Use qualified names n the XML
                           ":": no namespace, default: "hdf5:"
                           E.g., to dump a file called `-f', use h5dump -- -f
-     --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.
-     -O F, --ddl=F        Output ddl text into file F
-                          Do not use filename F to suppress ddl display
 
+--------------- Subsetting Options ---------------
  Subsetting is available by using the following options with a dataset
  attribute. Subsetting is done by selecting a hyperslab from the data.
  Thus, the options mirror those for performing a hyperslab selection.
@@ -65,6 +71,7 @@ usage: h5dump [OPTIONS] files
       number of dimensions in the dataspace being queried
       (Alternate compact form of subsetting is described in the Reference Manual)
 
+--------------- Option Argument Conventions ---------------
   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
@@ -93,7 +100,7 @@ usage: h5dump [OPTIONS] files
   Q - is the sort index type. It can be "creation_order" or "name" (default)
   Z - is the sort order type. It can be "descending" or "ascending" (default)
 
-  Examples:
+--------------- Examples ---------------
 
   1) Attribute foo of the group /bar_none in file quux.h5
 
diff --git a/tools/testfiles/tnofilename-with-packed-bits.ddl b/tools/testfiles/tnofilename-with-packed-bits.ddl
index e8d6d84..e8df31c 100644
--- a/tools/testfiles/tnofilename-with-packed-bits.ddl
+++ b/tools/testfiles/tnofilename-with-packed-bits.ddl
@@ -1,35 +1,45 @@
 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.
      -B,   --superblock   Print the content of the super block
      -H,   --header       Print the header only; no data is displayed
-     -A,   --onlyattr     Print the header and value of attributes
-                          Optional value 0 suppresses printing attributes.
-     -i,   --object-ids   Print the object ids
-     -r,   --string       Print 1-byte integer datasets as ASCII
-     -e,   --escape       Escape non printing characters
-     -V,   --version      Print version number and exit
+     -f D, --filedriver=D Specify which driver to open the file with
+     -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
+--------------- Object Options ---------------
      -a P, --attribute=P  Print the specified attribute
                           If an attribute name contains a slash (/), escape the
                           slash with a preceding backslash (\).
                           (See example section below.)
      -d P, --dataset=P    Print the specified dataset
-     -y,   --noindex      Do not print array indices with the data
-     -p,   --properties   Print dataset filters, storage layout and fill value
-     -f D, --filedriver=D Specify which driver to open the file with
      -g P, --group=P      Print the specified group and all members
      -l P, --soft-link=P  Print the value(s) of the specified soft link
-     -o F, --output=F     Output raw data into file F
-     -b B, --binary=B     Binary file output, of form B
      -t P, --datatype=P   Print the specified named datatype
-     -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.
-     -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
+     -A,   --onlyattr     Print the header and value of attributes
+                          Optional value 0 suppresses printing attributes.
+--------------- Object Property Options ---------------
+     -i,   --object-ids   Print the object ids
+     -p,   --properties   Print dataset filters, storage layout and fill value
      -M L, --packedbits=L Print packed bits as unsigned integers, using mask
                           format L for an integer dataset specified with
                           option -d. L is a list of offset,length values,
@@ -37,19 +47,15 @@ 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
+--------------- XML Options ---------------
      -x,   --xml          Output in XML using Schema
      -u,   --use-dtd      Output in XML using DTD
      -D U, --xml-dtd=U    Use the DTD or schema at U
      -X S, --xml-ns=S     (XML Schema) Use qualified names n the XML
                           ":": no namespace, default: "hdf5:"
                           E.g., to dump a file called `-f', use h5dump -- -f
-     --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.
-     -O F, --ddl=F        Output ddl text into file F
-                          Do not use filename F to suppress ddl display
 
+--------------- Subsetting Options ---------------
  Subsetting is available by using the following options with a dataset
  attribute. Subsetting is done by selecting a hyperslab from the data.
  Thus, the options mirror those for performing a hyperslab selection.
@@ -65,6 +71,7 @@ usage: h5dump [OPTIONS] files
       number of dimensions in the dataspace being queried
       (Alternate compact form of subsetting is described in the Reference Manual)
 
+--------------- Option Argument Conventions ---------------
   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
@@ -93,7 +100,7 @@ usage: h5dump [OPTIONS] files
   Q - is the sort index type. It can be "creation_order" or "name" (default)
   Z - is the sort order type. It can be "descending" or "ascending" (default)
 
-  Examples:
+--------------- Examples ---------------
 
   1) Attribute foo of the group /bar_none in file quux.h5
 
diff --git a/tools/testfiles/tpbitsIncomplete.ddl b/tools/testfiles/tpbitsIncomplete.ddl
index 06c5613..c27e0ce 100644
--- a/tools/testfiles/tpbitsIncomplete.ddl
+++ b/tools/testfiles/tpbitsIncomplete.ddl
@@ -1,35 +1,45 @@
 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.
      -B,   --superblock   Print the content of the super block
      -H,   --header       Print the header only; no data is displayed
-     -A,   --onlyattr     Print the header and value of attributes
-                          Optional value 0 suppresses printing attributes.
-     -i,   --object-ids   Print the object ids
-     -r,   --string       Print 1-byte integer datasets as ASCII
-     -e,   --escape       Escape non printing characters
-     -V,   --version      Print version number and exit
+     -f D, --filedriver=D Specify which driver to open the file with
+     -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
+--------------- Object Options ---------------
      -a P, --attribute=P  Print the specified attribute
                           If an attribute name contains a slash (/), escape the
                           slash with a preceding backslash (\).
                           (See example section below.)
      -d P, --dataset=P    Print the specified dataset
-     -y,   --noindex      Do not print array indices with the data
-     -p,   --properties   Print dataset filters, storage layout and fill value
-     -f D, --filedriver=D Specify which driver to open the file with
      -g P, --group=P      Print the specified group and all members
      -l P, --soft-link=P  Print the value(s) of the specified soft link
-     -o F, --output=F     Output raw data into file F
-     -b B, --binary=B     Binary file output, of form B
      -t P, --datatype=P   Print the specified named datatype
-     -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.
-     -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
+     -A,   --onlyattr     Print the header and value of attributes
+                          Optional value 0 suppresses printing attributes.
+--------------- Object Property Options ---------------
+     -i,   --object-ids   Print the object ids
+     -p,   --properties   Print dataset filters, storage layout and fill value
      -M L, --packedbits=L Print packed bits as unsigned integers, using mask
                           format L for an integer dataset specified with
                           option -d. L is a list of offset,length values,
@@ -37,19 +47,15 @@ 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
+--------------- XML Options ---------------
      -x,   --xml          Output in XML using Schema
      -u,   --use-dtd      Output in XML using DTD
      -D U, --xml-dtd=U    Use the DTD or schema at U
      -X S, --xml-ns=S     (XML Schema) Use qualified names n the XML
                           ":": no namespace, default: "hdf5:"
                           E.g., to dump a file called `-f', use h5dump -- -f
-     --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.
-     -O F, --ddl=F        Output ddl text into file F
-                          Do not use filename F to suppress ddl display
 
+--------------- Subsetting Options ---------------
  Subsetting is available by using the following options with a dataset
  attribute. Subsetting is done by selecting a hyperslab from the data.
  Thus, the options mirror those for performing a hyperslab selection.
@@ -65,6 +71,7 @@ usage: h5dump [OPTIONS] files
       number of dimensions in the dataspace being queried
       (Alternate compact form of subsetting is described in the Reference Manual)
 
+--------------- Option Argument Conventions ---------------
   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
@@ -93,7 +100,7 @@ usage: h5dump [OPTIONS] files
   Q - is the sort index type. It can be "creation_order" or "name" (default)
   Z - is the sort order type. It can be "descending" or "ascending" (default)
 
-  Examples:
+--------------- Examples ---------------
 
   1) Attribute foo of the group /bar_none in file quux.h5
 
diff --git a/tools/testfiles/tpbitsLengthExceeded.ddl b/tools/testfiles/tpbitsLengthExceeded.ddl
index ffd9910..58c0e05 100644
--- a/tools/testfiles/tpbitsLengthExceeded.ddl
+++ b/tools/testfiles/tpbitsLengthExceeded.ddl
@@ -1,35 +1,45 @@
 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.
      -B,   --superblock   Print the content of the super block
      -H,   --header       Print the header only; no data is displayed
-     -A,   --onlyattr     Print the header and value of attributes
-                          Optional value 0 suppresses printing attributes.
-     -i,   --object-ids   Print the object ids
-     -r,   --string       Print 1-byte integer datasets as ASCII
-     -e,   --escape       Escape non printing characters
-     -V,   --version      Print version number and exit
+     -f D, --filedriver=D Specify which driver to open the file with
+     -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
+--------------- Object Options ---------------
      -a P, --attribute=P  Print the specified attribute
                           If an attribute name contains a slash (/), escape the
                           slash with a preceding backslash (\).
                           (See example section below.)
      -d P, --dataset=P    Print the specified dataset
-     -y,   --noindex      Do not print array indices with the data
-     -p,   --properties   Print dataset filters, storage layout and fill value
-     -f D, --filedriver=D Specify which driver to open the file with
      -g P, --group=P      Print the specified group and all members
      -l P, --soft-link=P  Print the value(s) of the specified soft link
-     -o F, --output=F     Output raw data into file F
-     -b B, --binary=B     Binary file output, of form B
      -t P, --datatype=P   Print the specified named datatype
-     -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.
-     -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
+     -A,   --onlyattr     Print the header and value of attributes
+                          Optional value 0 suppresses printing attributes.
+--------------- Object Property Options ---------------
+     -i,   --object-ids   Print the object ids
+     -p,   --properties   Print dataset filters, storage layout and fill value
      -M L, --packedbits=L Print packed bits as unsigned integers, using mask
                           format L for an integer dataset specified with
                           option -d. L is a list of offset,length values,
@@ -37,19 +47,15 @@ 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
+--------------- XML Options ---------------
      -x,   --xml          Output in XML using Schema
      -u,   --use-dtd      Output in XML using DTD
      -D U, --xml-dtd=U    Use the DTD or schema at U
      -X S, --xml-ns=S     (XML Schema) Use qualified names n the XML
                           ":": no namespace, default: "hdf5:"
                           E.g., to dump a file called `-f', use h5dump -- -f
-     --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.
-     -O F, --ddl=F        Output ddl text into file F
-                          Do not use filename F to suppress ddl display
 
+--------------- Subsetting Options ---------------
  Subsetting is available by using the following options with a dataset
  attribute. Subsetting is done by selecting a hyperslab from the data.
  Thus, the options mirror those for performing a hyperslab selection.
@@ -65,6 +71,7 @@ usage: h5dump [OPTIONS] files
       number of dimensions in the dataspace being queried
       (Alternate compact form of subsetting is described in the Reference Manual)
 
+--------------- Option Argument Conventions ---------------
   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
@@ -93,7 +100,7 @@ usage: h5dump [OPTIONS] files
   Q - is the sort index type. It can be "creation_order" or "name" (default)
   Z - is the sort order type. It can be "descending" or "ascending" (default)
 
-  Examples:
+--------------- Examples ---------------
 
   1) Attribute foo of the group /bar_none in file quux.h5
 
diff --git a/tools/testfiles/tpbitsLengthPositive.ddl b/tools/testfiles/tpbitsLengthPositive.ddl
index a54812b..8a93cbc 100644
--- a/tools/testfiles/tpbitsLengthPositive.ddl
+++ b/tools/testfiles/tpbitsLengthPositive.ddl
@@ -1,35 +1,45 @@
 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.
      -B,   --superblock   Print the content of the super block
      -H,   --header       Print the header only; no data is displayed
-     -A,   --onlyattr     Print the header and value of attributes
-                          Optional value 0 suppresses printing attributes.
-     -i,   --object-ids   Print the object ids
-     -r,   --string       Print 1-byte integer datasets as ASCII
-     -e,   --escape       Escape non printing characters
-     -V,   --version      Print version number and exit
+     -f D, --filedriver=D Specify which driver to open the file with
+     -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
+--------------- Object Options ---------------
      -a P, --attribute=P  Print the specified attribute
                           If an attribute name contains a slash (/), escape the
                           slash with a preceding backslash (\).
                           (See example section below.)
      -d P, --dataset=P    Print the specified dataset
-     -y,   --noindex      Do not print array indices with the data
-     -p,   --properties   Print dataset filters, storage layout and fill value
-     -f D, --filedriver=D Specify which driver to open the file with
      -g P, --group=P      Print the specified group and all members
      -l P, --soft-link=P  Print the value(s) of the specified soft link
-     -o F, --output=F     Output raw data into file F
-     -b B, --binary=B     Binary file output, of form B
      -t P, --datatype=P   Print the specified named datatype
-     -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.
-     -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
+     -A,   --onlyattr     Print the header and value of attributes
+                          Optional value 0 suppresses printing attributes.
+--------------- Object Property Options ---------------
+     -i,   --object-ids   Print the object ids
+     -p,   --properties   Print dataset filters, storage layout and fill value
      -M L, --packedbits=L Print packed bits as unsigned integers, using mask
                           format L for an integer dataset specified with
                           option -d. L is a list of offset,length values,
@@ -37,19 +47,15 @@ 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
+--------------- XML Options ---------------
      -x,   --xml          Output in XML using Schema
      -u,   --use-dtd      Output in XML using DTD
      -D U, --xml-dtd=U    Use the DTD or schema at U
      -X S, --xml-ns=S     (XML Schema) Use qualified names n the XML
                           ":": no namespace, default: "hdf5:"
                           E.g., to dump a file called `-f', use h5dump -- -f
-     --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.
-     -O F, --ddl=F        Output ddl text into file F
-                          Do not use filename F to suppress ddl display
 
+--------------- Subsetting Options ---------------
  Subsetting is available by using the following options with a dataset
  attribute. Subsetting is done by selecting a hyperslab from the data.
  Thus, the options mirror those for performing a hyperslab selection.
@@ -65,6 +71,7 @@ usage: h5dump [OPTIONS] files
       number of dimensions in the dataspace being queried
       (Alternate compact form of subsetting is described in the Reference Manual)
 
+--------------- Option Argument Conventions ---------------
   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
@@ -93,7 +100,7 @@ usage: h5dump [OPTIONS] files
   Q - is the sort index type. It can be "creation_order" or "name" (default)
   Z - is the sort order type. It can be "descending" or "ascending" (default)
 
-  Examples:
+--------------- Examples ---------------
 
   1) Attribute foo of the group /bar_none in file quux.h5
 
diff --git a/tools/testfiles/tpbitsMaxExceeded.ddl b/tools/testfiles/tpbitsMaxExceeded.ddl
index 1a8dd11..21c5af4 100644
--- a/tools/testfiles/tpbitsMaxExceeded.ddl
+++ b/tools/testfiles/tpbitsMaxExceeded.ddl
@@ -1,35 +1,45 @@
 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.
      -B,   --superblock   Print the content of the super block
      -H,   --header       Print the header only; no data is displayed
-     -A,   --onlyattr     Print the header and value of attributes
-                          Optional value 0 suppresses printing attributes.
-     -i,   --object-ids   Print the object ids
-     -r,   --string       Print 1-byte integer datasets as ASCII
-     -e,   --escape       Escape non printing characters
-     -V,   --version      Print version number and exit
+     -f D, --filedriver=D Specify which driver to open the file with
+     -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
+--------------- Object Options ---------------
      -a P, --attribute=P  Print the specified attribute
                           If an attribute name contains a slash (/), escape the
                           slash with a preceding backslash (\).
                           (See example section below.)
      -d P, --dataset=P    Print the specified dataset
-     -y,   --noindex      Do not print array indices with the data
-     -p,   --properties   Print dataset filters, storage layout and fill value
-     -f D, --filedriver=D Specify which driver to open the file with
      -g P, --group=P      Print the specified group and all members
      -l P, --soft-link=P  Print the value(s) of the specified soft link
-     -o F, --output=F     Output raw data into file F
-     -b B, --binary=B     Binary file output, of form B
      -t P, --datatype=P   Print the specified named datatype
-     -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.
-     -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
+     -A,   --onlyattr     Print the header and value of attributes
+                          Optional value 0 suppresses printing attributes.
+--------------- Object Property Options ---------------
+     -i,   --object-ids   Print the object ids
+     -p,   --properties   Print dataset filters, storage layout and fill value
      -M L, --packedbits=L Print packed bits as unsigned integers, using mask
                           format L for an integer dataset specified with
                           option -d. L is a list of offset,length values,
@@ -37,19 +47,15 @@ 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
+--------------- XML Options ---------------
      -x,   --xml          Output in XML using Schema
      -u,   --use-dtd      Output in XML using DTD
      -D U, --xml-dtd=U    Use the DTD or schema at U
      -X S, --xml-ns=S     (XML Schema) Use qualified names n the XML
                           ":": no namespace, default: "hdf5:"
                           E.g., to dump a file called `-f', use h5dump -- -f
-     --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.
-     -O F, --ddl=F        Output ddl text into file F
-                          Do not use filename F to suppress ddl display
 
+--------------- Subsetting Options ---------------
  Subsetting is available by using the following options with a dataset
  attribute. Subsetting is done by selecting a hyperslab from the data.
  Thus, the options mirror those for performing a hyperslab selection.
@@ -65,6 +71,7 @@ usage: h5dump [OPTIONS] files
       number of dimensions in the dataspace being queried
       (Alternate compact form of subsetting is described in the Reference Manual)
 
+--------------- Option Argument Conventions ---------------
   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
@@ -93,7 +100,7 @@ usage: h5dump [OPTIONS] files
   Q - is the sort index type. It can be "creation_order" or "name" (default)
   Z - is the sort order type. It can be "descending" or "ascending" (default)
 
-  Examples:
+--------------- Examples ---------------
 
   1) Attribute foo of the group /bar_none in file quux.h5
 
diff --git a/tools/testfiles/tpbitsOffsetExceeded.ddl b/tools/testfiles/tpbitsOffsetExceeded.ddl
index 7527131..52d901d 100644
--- a/tools/testfiles/tpbitsOffsetExceeded.ddl
+++ b/tools/testfiles/tpbitsOffsetExceeded.ddl
@@ -1,35 +1,45 @@
 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.
      -B,   --superblock   Print the content of the super block
      -H,   --header       Print the header only; no data is displayed
-     -A,   --onlyattr     Print the header and value of attributes
-                          Optional value 0 suppresses printing attributes.
-     -i,   --object-ids   Print the object ids
-     -r,   --string       Print 1-byte integer datasets as ASCII
-     -e,   --escape       Escape non printing characters
-     -V,   --version      Print version number and exit
+     -f D, --filedriver=D Specify which driver to open the file with
+     -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
+--------------- Object Options ---------------
      -a P, --attribute=P  Print the specified attribute
                           If an attribute name contains a slash (/), escape the
                           slash with a preceding backslash (\).
                           (See example section below.)
      -d P, --dataset=P    Print the specified dataset
-     -y,   --noindex      Do not print array indices with the data
-     -p,   --properties   Print dataset filters, storage layout and fill value
-     -f D, --filedriver=D Specify which driver to open the file with
      -g P, --group=P      Print the specified group and all members
      -l P, --soft-link=P  Print the value(s) of the specified soft link
-     -o F, --output=F     Output raw data into file F
-     -b B, --binary=B     Binary file output, of form B
      -t P, --datatype=P   Print the specified named datatype
-     -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.
-     -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
+     -A,   --onlyattr     Print the header and value of attributes
+                          Optional value 0 suppresses printing attributes.
+--------------- Object Property Options ---------------
+     -i,   --object-ids   Print the object ids
+     -p,   --properties   Print dataset filters, storage layout and fill value
      -M L, --packedbits=L Print packed bits as unsigned integers, using mask
                           format L for an integer dataset specified with
                           option -d. L is a list of offset,length values,
@@ -37,19 +47,15 @@ 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
+--------------- XML Options ---------------
      -x,   --xml          Output in XML using Schema
      -u,   --use-dtd      Output in XML using DTD
      -D U, --xml-dtd=U    Use the DTD or schema at U
      -X S, --xml-ns=S     (XML Schema) Use qualified names n the XML
                           ":": no namespace, default: "hdf5:"
                           E.g., to dump a file called `-f', use h5dump -- -f
-     --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.
-     -O F, --ddl=F        Output ddl text into file F
-                          Do not use filename F to suppress ddl display
 
+--------------- Subsetting Options ---------------
  Subsetting is available by using the following options with a dataset
  attribute. Subsetting is done by selecting a hyperslab from the data.
  Thus, the options mirror those for performing a hyperslab selection.
@@ -65,6 +71,7 @@ usage: h5dump [OPTIONS] files
       number of dimensions in the dataspace being queried
       (Alternate compact form of subsetting is described in the Reference Manual)
 
+--------------- Option Argument Conventions ---------------
   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
@@ -93,7 +100,7 @@ usage: h5dump [OPTIONS] files
   Q - is the sort index type. It can be "creation_order" or "name" (default)
   Z - is the sort order type. It can be "descending" or "ascending" (default)
 
-  Examples:
+--------------- Examples ---------------
 
   1) Attribute foo of the group /bar_none in file quux.h5
 
diff --git a/tools/testfiles/tpbitsOffsetNegative.ddl b/tools/testfiles/tpbitsOffsetNegative.ddl
index 21b573d..82b6c88 100644
--- a/tools/testfiles/tpbitsOffsetNegative.ddl
+++ b/tools/testfiles/tpbitsOffsetNegative.ddl
@@ -1,35 +1,45 @@
 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.
      -B,   --superblock   Print the content of the super block
      -H,   --header       Print the header only; no data is displayed
-     -A,   --onlyattr     Print the header and value of attributes
-                          Optional value 0 suppresses printing attributes.
-     -i,   --object-ids   Print the object ids
-     -r,   --string       Print 1-byte integer datasets as ASCII
-     -e,   --escape       Escape non printing characters
-     -V,   --version      Print version number and exit
+     -f D, --filedriver=D Specify which driver to open the file with
+     -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
+--------------- Object Options ---------------
      -a P, --attribute=P  Print the specified attribute
                           If an attribute name contains a slash (/), escape the
                           slash with a preceding backslash (\).
                           (See example section below.)
      -d P, --dataset=P    Print the specified dataset
-     -y,   --noindex      Do not print array indices with the data
-     -p,   --properties   Print dataset filters, storage layout and fill value
-     -f D, --filedriver=D Specify which driver to open the file with
      -g P, --group=P      Print the specified group and all members
      -l P, --soft-link=P  Print the value(s) of the specified soft link
-     -o F, --output=F     Output raw data into file F
-     -b B, --binary=B     Binary file output, of form B
      -t P, --datatype=P   Print the specified named datatype
-     -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.
-     -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
+     -A,   --onlyattr     Print the header and value of attributes
+                          Optional value 0 suppresses printing attributes.
+--------------- Object Property Options ---------------
+     -i,   --object-ids   Print the object ids
+     -p,   --properties   Print dataset filters, storage layout and fill value
      -M L, --packedbits=L Print packed bits as unsigned integers, using mask
                           format L for an integer dataset specified with
                           option -d. L is a list of offset,length values,
@@ -37,19 +47,15 @@ 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
+--------------- XML Options ---------------
      -x,   --xml          Output in XML using Schema
      -u,   --use-dtd      Output in XML using DTD
      -D U, --xml-dtd=U    Use the DTD or schema at U
      -X S, --xml-ns=S     (XML Schema) Use qualified names n the XML
                           ":": no namespace, default: "hdf5:"
                           E.g., to dump a file called `-f', use h5dump -- -f
-     --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.
-     -O F, --ddl=F        Output ddl text into file F
-                          Do not use filename F to suppress ddl display
 
+--------------- Subsetting Options ---------------
  Subsetting is available by using the following options with a dataset
  attribute. Subsetting is done by selecting a hyperslab from the data.
  Thus, the options mirror those for performing a hyperslab selection.
@@ -65,6 +71,7 @@ usage: h5dump [OPTIONS] files
       number of dimensions in the dataspace being queried
       (Alternate compact form of subsetting is described in the Reference Manual)
 
+--------------- Option Argument Conventions ---------------
   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
@@ -93,7 +100,7 @@ usage: h5dump [OPTIONS] files
   Q - is the sort index type. It can be "creation_order" or "name" (default)
   Z - is the sort order type. It can be "descending" or "ascending" (default)
 
-  Examples:
+--------------- Examples ---------------
 
   1) Attribute foo of the group /bar_none in file quux.h5
 
diff --git a/vms/src/h5pubconf.h b/vms/src/h5pubconf.h
index ec584b7..800bf6f 100644
--- a/vms/src/h5pubconf.h
+++ b/vms/src/h5pubconf.h
@@ -511,7 +511,7 @@
 #define H5_PACKAGE_NAME "HDF5"
 
 /* Define to the full name and version of this package. */
-#define H5_PACKAGE_STRING "HDF5 1.9.160-FA_a5"
+#define H5_PACKAGE_STRING "HDF5 1.9.161-FA_a5"
 
 /* Define to the one symbol short name of this package. */
 #define H5_PACKAGE_TARNAME "hdf5"
@@ -520,7 +520,7 @@
 #define H5_PACKAGE_URL ""
 
 /* Define to the version of this package. */
-#define H5_PACKAGE_VERSION "1.9.160-FA_a5"
+#define H5_PACKAGE_VERSION "1.9.161-FA_a5"
 
 /* Width for printf() for type `long long' or `__int64', use `ll' */
 #define H5_PRINTF_LL_WIDTH "ll"
@@ -683,7 +683,7 @@
 /* #undef H5_USING_MEMCHECKER */
 
 /* Version number of package */
-#define H5_VERSION "1.9.160-FA_a5"
+#define H5_VERSION "1.9.161-FA_a5"
 
 /* Define if vsnprintf() returns the correct value for formatted strings that
    don't fit into size allowed */