@@ -1473,7 +1473,7 @@ def main():

     optparser.set_defaults(config = config_file)

     optparser.set_defaults(verbosity = default_verbosity)

-    optparser.add_option(      "--configure", dest="run_configure", action="store_true", help="Invoke interactive (re)configuration tool.")

+    optparser.add_option(      "--configure", dest="run_configure", action="store_true", help="Invoke interactive (re)configuration tool. Optionally use as '--configure s3://come-bucket' to test access to a specific bucket instead of attempting to list them all.")

     optparser.add_option("-c", "--config", dest="config", metavar="FILE", help="Config file name. Defaults to %default")

     optparser.add_option(      "--dump-config", dest="dump_config", action="store_true", help="Dump current configuration after parsing config files and command line options and exit.")

@@ -1697,6 +1697,7 @@ def main():

         sys.exit(0)

     if options.run_configure:

+        # 'args' may contain the test-bucket URI

         run_configure(options.config, args)

         sys.exit(0)

@@ -102,7 +102,10 @@ changes you like.

 show this help message and exit

 .TP

 \fB\-\-configure\fR

-Invoke interactive (re)configuration tool.

+Invoke interactive (re)configuration tool. Optionally

+use as '--configure s3://come-bucket' to test access

+to a specific bucket instead of attempting to list

+them all.

 .TP

 \fB\-c\fR FILE, \fB\-\-config\fR=FILE

 Config file name. Defaults to /home/mludvig/.s3cfg