Merge remote-tracking branch 'origin/master'

Kenneth Reitz · Kenneth Reitz · commit e818b632b16a · 2014-04-02T11:30:10.000-04:00
diff --git a/bob/cli.py b/bob/cli.py
@@ -10,7 +10,7 @@
     --overwrite  allow overwriting of deployed archives.
 
 Configuration:
-    Environment Variables: AWS_ACCESS_KEY_ID, AWS_SECRET_ACCESS_KEY, AWS_BUCKET
+    Environment Variables: AWS_ACCESS_KEY_ID, AWS_SECRET_ACCESS_KEY, S3_BUCKET, S3_PREFIX (optional)
 """
 import os
 
@@ -71,4 +71,4 @@ def dispatch():
     try:
         main()
     except KeyboardInterrupt:
-        print 'ool.'
+        print 'ool.'
