Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP
Browse files

Released version 1.1.0-beta2

* S3/PkgInfo.py: Updated to 1.1.0-beta2
* NEWS: Updated.
* s3cmd.1: Regenerated.
  • Loading branch information...
commit 6063e01c9fe8fbe4b9c6d6437d1a44b5031ee0de 1 parent d9c7251
@mludvig mludvig authored
Showing with 29 additions and 13 deletions.
  1. +2 −0  NEWS
  2. +1 −1  S3/PkgInfo.py
  3. +26 −12 s3cmd.1
View
2  NEWS
@@ -8,6 +8,8 @@ s3cmd 1.1.0 - ???
is now on by default, -M is no longer shorthand for --guess-mime-type
* Allow parameters in MIME types, for example:
--mime-type="text/plain; charset=utf-8"
+* MIME type can be guessed by python-magic which is a lot better than
+ relying on the extension. Contributed by Karsten Sperling.
* Support for environment variables as config values. For instance
in ~/.s3cmd put "access_key=$S3_ACCESS_KEY". Contributed by Ori Bar.
* Support for --configure checking access to a specific bucket instead
View
2  S3/PkgInfo.py
@@ -1,5 +1,5 @@
package = "s3cmd"
-version = "1.1.0-beta1"
+version = "1.1.0-beta2"
url = "http://s3tools.org"
license = "GPL version 2"
short_description = "Command line tool for managing Amazon S3 and CloudFront services"
View
38 s3cmd.1
@@ -65,6 +65,10 @@ Sign arbitrary string using the secret key
.TP
s3cmd \fBfixbucket\fR \fIs3://BUCKET[/PREFIX]\fR
Fix invalid file names in a bucket
+
+
+.PP
+Commands for static WebSites configuration
.TP
s3cmd \fBws-create\fR \fIs3://BUCKET\fR
Create Website from bucket
@@ -112,7 +116,7 @@ show this help message and exit
.TP
\fB\-\-configure\fR
Invoke interactive (re)configuration tool. Optionally
-use as '--configure s3://come-bucket' to test access
+use as '\fB--configure\fR s3://come-bucket' to test access
to a specific bucket instead of attempting to list
them all.
.TP
@@ -206,8 +210,7 @@ Read --rexclude REGEXPs from FILE
\fB\-\-include\fR=GLOB
Filenames and paths matching GLOB will be included
even if previously excluded by one of
-.TP
-\fB\-\-(r)exclude(\-from)\fR patterns
+\fB--(r)exclude(-from)\fR patterns
.TP
\fB\-\-include\-from\fR=FILE
Read --include GLOBs from FILE
@@ -240,19 +243,18 @@ commands)
Default MIME-type for stored objects. Application
default is binary/octet-stream.
.TP
-\fB\-M\fR, \fB\-\-guess\-mime\-type\fR
-Guess MIME-type of files by their extension. Fall back
-to default MIME-Type as specified by --default-mime-
-type option
+\fB\-\-guess\-mime\-type\fR
+Guess MIME-type of files by their extension or mime
+magic. Fall back to default MIME-Type as specified by
+\fB--default-mime-type\fR option
.TP
\fB\-\-no\-guess\-mime\-type\fR
Don't guess MIME-type and use the default type
instead.
.TP
\fB\-m\fR MIME/TYPE, \fB\-\-mime\-type\fR=MIME/TYPE
-Force MIME-type. Override both --default-mime-type and
-.TP
-\fB\-\-guess\-mime\-type.\fR
+Force MIME-type. Override both \fB--default-mime-type\fR and
+\fB--guess-mime-type\fR.
.TP
\fB\-\-add\-header\fR=NAME:VALUE
Add a given HTTP header to the upload request. Can be
@@ -268,6 +270,18 @@ Override autodetected terminal and filesystem encoding
Use the S3 name as given on the command line. No pre-
processing, encoding, etc. Use with caution!
.TP
+\fB\-\-disable\-multipart\fR
+Disable multipart upload on files bigger than
+\fB--multipart-chunk-size-mb\fR
+.TP
+\fB\-\-multipart\-chunk\-size\-mb\fR=SIZE
+Size of each chunk of a multipart upload. Files bigger
+than SIZE are automatically uploaded as multithreaded-
+multipart, smaller files are uploaded using the
+traditional method. SIZE is in Mega-Bytes, default
+chunk size is noneMB, minimum allowed chunk size is
+5MB, maximum is 5GB.
+.TP
\fB\-\-list\-md5\fR
Include MD5 sums in bucket listings (only for 'ls'
command).
@@ -326,7 +340,7 @@ Enable verbose output.
Enable debug output.
.TP
\fB\-\-version\fR
-Show s3cmd version (1.1.0-beta1) and exit.
+Show s3cmd version (1.1.0-beta2) and exit.
.TP
\fB\-F\fR, \fB\-\-follow\-symlinks\fR
Follow symbolic links as if they are regular files
@@ -427,7 +441,7 @@ Prefered way to get support is our mailing list:
Report bugs to
.I s3tools\-bugs@lists.sourceforge.net
.SH COPYRIGHT
-Copyright \(co 2007,2008,2009,2010,2011 Michal Ludvig <http://www.logix.cz/michal>
+Copyright \(co 2007,2008,2009,2010,2011,2012 Michal Ludvig <http://www.logix.cz/michal>
.br
This is free software. You may redistribute copies of it under the terms of
the GNU General Public License version 2 <http://www.gnu.org/licenses/gpl.html>.
Please sign in to comment.
Something went wrong with that request. Please try again.