Merge branch 'document-s3-output' into develop

* document-s3-output: Add note about --output not being used in s3 ls
johnboxall · Mar 21, 2014 · aeb6004 · aeb6004
2 parents e2a358b + 0b41888
commit aeb6004
Showing 1 changed file with 3 additions and 1 deletion.
diff --git a/awscli/customizations/s3/description.py b/awscli/customizations/s3/description.py
@@ -35,7 +35,9 @@ def add_command_descriptions(cmd_dict):
                                 "<LocalPath> or <S3Path> <S3Path>"
 
     cmd_dict['ls']['description'] = "List S3 objects and common prefixes " \
-                                    "under a prefix or all S3 buckets."
+                                    "under a prefix or all S3 buckets. " \
+                                    "Note that the --output argument " \
+                                    "is ignored for this command."
     cmd_dict['ls']['usage'] = "<S3Path> or NONE"
 
     cmd_dict['mb']['description'] = "Creates an S3 bucket."