[svn-r19110] Description:

	Bring r19049:19109 from trunk to revise_chunks branch

Tested on:
        FreeBSD/32 6.3 (duty) in debug mode
        FreeBSD/64 6.3 (liberty) w/C++ & FORTRAN, in debug mode
        Linux/32 2.6 (jam) w/PGI compilers, w/default API=1.8.x,
                w/C++ & FORTRAN, w/threadsafe, in debug mode
        Linux/64-amd64 2.6 (amani) w/Intel compilers, w/default API=1.6.x,
                w/C++ & FORTRAN, in production mode
        Solaris/32 2.10 (linew) w/deprecated symbols disabled, w/C++ & FORTRAN,
                w/szip filter, w/threadsafe, in production mode
        Linux/PPC 2.6 (heiwa) w/C++ & FORTRAN, w/threadsafe, in debug mode
        Linux/64-ia64 2.6 (cobalt) w/Intel compilers, w/C++ & FORTRAN,
                in production mode
        Linux/64-amd64 2.6 (abe) w/parallel, w/FORTRAN, in debug mode
        Mac OS X/32 10.6.4 (amazon) in debug mode
        Mac OS X/32 10.6.4 (amazon) w/C++ & FORTRAN, w/threadsafe,
                in production mode
        Mac OS X/32 10.6.4 (amazon) w/parallel, in debug mode

1 files changed, 32 insertions, 22 deletions

diff --git a/tools/testfiles/help-3.ls b/tools/testfiles/help-3.ls
index 939c8eb..7199815 100644
--- a/tools/testfiles/help-3.ls
+++ b/tools/testfiles/help-3.ls
@@ -3,28 +3,38 @@
 #############################
 usage: h5ls [OPTIONS] [OBJECTS...]
   OPTIONS
-   -h, -?, --help     Print a usage message and exit
-   -a, --address      Print addresses for raw data
-   -d, --data         Print the values of datasets
-   -e, --errors       Show all HDF5 error reporting
-   --follow-symlinks  Follow symbolic links (soft links and external links)
-                      to display target object information.
-                      Without this option, h5ls identifies a symbolic link
-                      as a soft link or external link and prints the value
-                      assigned to the symbolic link; it does not provide any
-                      information regarding the target object or determine
-                      whether the link is a dangling link.
-   -f, --full         Print full path names instead of base names
-   -g, --group        Show information about a group, not its contents
-   -l, --label        Label members of compound datasets
-   -r, --recursive    List all groups recursively, avoiding cycles
-   -s, --string       Print 1-byte integer datasets as ASCII
-   -S, --simple       Use a machine-readable output format
-   -wN, --width=N     Set the number of columns of output
-   -v, --verbose      Generate more verbose output
-   -V, --version      Print version number and exit
-   --vfd=DRIVER       Use the specified virtual file driver
-   -x, --hexdump      Show raw data in hexadecimal format
+   -h, -?, --help  Print a usage message and exit
+   -a, --address   Print addresses for raw data
+   -d, --data      Print the values of datasets
+   -e, --errors    Show all HDF5 error reporting
+   --follow-symlinks
+                   Follow symbolic links (soft links and external links)
+                   to display target object information.
+                   Without this option, h5ls identifies a symbolic link
+                   as a soft link or external link and prints the value
+                   assigned to the symbolic link; it does not provide any
+                   information regarding the target object or determine
+                   whether the link is a dangling link.
+   --no-dangling-links
+                   Must be used with --follow-symlinks option;
+                   otherwise, h5ls shows error message and returns an exit
+                   code of 1. 
+                   Check for any symbolic links (soft links or external links)
+                   that do not resolve to an existing object (dataset, group,
+                   or named datatype).
+                   If any dangling link is found, this situation is treated
+                   as an error and h5ls returns an exit code of 1.
+   -f, --full      Print full path names instead of base names
+   -g, --group     Show information about a group, not its contents
+   -l, --label     Label members of compound datasets
+   -r, --recursive List all groups recursively, avoiding cycles
+   -s, --string    Print 1-byte integer datasets as ASCII
+   -S, --simple    Use a machine-readable output format
+   -wN, --width=N  Set the number of columns of output
+   -v, --verbose   Generate more verbose output
+   -V, --version   Print version number and exit
+   --vfd=DRIVER    Use the specified virtual file driver
+   -x, --hexdump   Show raw data in hexadecimal format
 
   OBJECTS
     Each object consists of an HDF5 file name optionally followed by a