@@ -34,12 +34,13 @@ on Python or some libraries. Please consult your

 distribution documentation on ways to solve the problem.

-Installation from source .tar.gz package

+Installation from zip file 

+--------------------------

 There are three options to run s3cmd from source tarball:

-1) The S3cmd program, as distributed in s3cmd-X.Y.Z.tar.gz,

-   can be run directly from where you unzipped the package.

+1) The S3cmd program, as distributed in s3cmd-X.Y.Z.tar.gz

+   on SourceForge or in master.zip on GitHub, can be run directly 

+   from where you unzipped the package.

 2) Or you may want to move "s3cmd" file and "S3" subdirectory

    to some other path. Make sure that "S3" subdirectory ends up

@@ -49,7 +50,8 @@ There are three options to run s3cmd from source tarball:

    you will have $HOME/bin/s3cmd file and $HOME/bin/S3 directory 

    with a number of support files.

-3) The cleanest and most recommended approach is to just run:

+3) The cleanest and most recommended approach is to unzip the 

+   package and then just run:

 	python setup.py install

@@ -63,6 +65,13 @@ There are three options to run s3cmd from source tarball:

    Again, consult your distribution documentation on how to 

    find out the actual package name and how to install it then.

+   Note that on Linux, if you are not "root" already, you may 

+   need to run:

+       

+        sudo python setup.py install

+

+   instead.

+

 Note to distributions package maintainers

 ----------------------------------------

@@ -84,5 +93,6 @@ get back to us via mailing list:

 	s3tools-general@lists.sourceforge.net

-For more information refer to:

-* S3cmd / S3tools homepage at http://s3tools.org

+or visit the S3cmd / S3tools homepage at: 

+

+        http://s3tools.org

@@ -183,28 +183,39 @@ To exclude local directory 'somedir', be sure to use a trailing forward slash, a

 .PP

 .SH SEE ALSO

-For the most up to date list of options run 

+For the most up to date list of options run: 

 .B s3cmd \\-\\-help

 .br

-For more info about usage, examples and other related info visit project homepage at

-.br

+For more info about usage, examples and other related info visit project homepage at:

 .B http://s3tools.org

 .SH DONATIONS

 Please consider a donation if you have found s3cmd useful:

 .br

 .B http://s3tools.org/donate

 .SH AUTHOR

-Written by Michal Ludvig <mludvig\@logix.net.nz> and 15+ contributors

+Written by Michal Ludvig and contributors

 .SH CONTACT, SUPPORT

 Preferred way to get support is our mailing list:

+.br

 .I s3tools\\-general\@lists.sourceforge.net

+.br

+or visit the project homepage:

+.br

+.B http://s3tools.org

 .SH REPORTING BUGS

 Report bugs to 

 .I s3tools\\-bugs\@lists.sourceforge.net

 .SH COPYRIGHT

-Copyright \\(co 2007,2008,2009,2010,2011,2012 Michal Ludvig <http://www.logix.cz/michal>

+Copyright \\(co 2007-2014 TGRMN Software - http://www.tgrmn.com - and contributors

+.br

+.SH LICENSE

+This program is free software; you can redistribute it and/or modify

+it under the terms of the GNU General Public License as published by

+the Free Software Foundation; either version 2 of the License, or

+(at your option) any later version.

+This program is distributed in the hope that it will be useful,

+but WITHOUT ANY WARRANTY; without even the implied warranty of

+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the

+GNU General Public License for more details.

 .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>.

-There is NO WARRANTY, to the extent permitted by law.

 ";

@@ -1,10 +1,22 @@

 #!/usr/bin/env python

-## Amazon S3 manager

-## Author: Michal Ludvig <michal@logix.cz>

-##         http://www.logix.cz/michal

-## License: GPL Version 2

-## Copyright: TGRMN Software and contributors

+## --------------------------------------------------------------------

+## s3cmd - S3 client

+##

+## Authors   : Michal Ludvig and contributors

+## Copyright : TGRMN Software - http://www.tgrmn.com - and contributors

+## Website   : http://s3tools.org

+## License   : GPL Version 2

+## --------------------------------------------------------------------

+## This program is free software; you can redistribute it and/or modify

+## it under the terms of the GNU General Public License as published by

+## the Free Software Foundation; either version 2 of the License, or

+## (at your option) any later version.

+## This program is distributed in the hope that it will be useful,

+## but WITHOUT ANY WARRANTY; without even the implied warranty of

+## MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the

+## GNU General Public License for more details.

+## --------------------------------------------------------------------

 import sys

@@ -2088,7 +2100,7 @@ def main():

     optparser.add_option(      "--no-mime-magic", dest="use_mime_magic", action="store_false", help="Don't use mime magic when guessing MIME-type.")

     optparser.add_option("-m", "--mime-type", dest="mime_type", type="mimetype", metavar="MIME/TYPE", help="Force MIME-type. Override both --default-mime-type and --guess-mime-type.")

-    optparser.add_option(      "--add-header", dest="add_header", action="append", metavar="NAME:VALUE", help="Add a given HTTP header to the upload request. Can be used multiple times. For instance set 'Expires' or 'Cache-Control' headers (or both) using this options if you like.")

+    optparser.add_option(      "--add-header", dest="add_header", action="append", metavar="NAME:VALUE", help="Add a given HTTP header to the upload request. Can be used multiple times. For instance set 'Expires' or 'Cache-Control' headers (or both) using this option.")

     optparser.add_option(      "--server-side-encryption", dest="server_side_encryption", action="store_true", help="Specifies that server-side encryption will be used when putting objects.")

@@ -2097,7 +2109,7 @@ def main():

     optparser.add_option(      "--verbatim", dest="urlencoding_mode", action="store_const", const="verbatim", help="Use the S3 name as given on the command line. No pre-processing, encoding, etc. Use with caution!")

     optparser.add_option(      "--disable-multipart", dest="enable_multipart", action="store_false", help="Disable multipart upload on files bigger than --multipart-chunk-size-mb")

-    optparser.add_option(      "--multipart-chunk-size-mb", dest="multipart_chunk_size_mb", type="int", action="store", metavar="SIZE", help="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 %defaultMB, minimum allowed chunk size is 5MB, maximum is 5GB.")

+    optparser.add_option(      "--multipart-chunk-size-mb", dest="multipart_chunk_size_mb", type="int", action="store", metavar="SIZE", help="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 15MB, minimum allowed chunk size is 5MB, maximum is 5GB.")

     optparser.add_option(      "--list-md5", dest="list_md5", action="store_true", help="Include MD5 sums in bucket listings (only for 'ls' command).")

     optparser.add_option("-H", "--human-readable-sizes", dest="human_readable_sizes", action="store_true", help="Print sizes in human readable form (eg 1kB instead of 1234).")

@@ -2105,8 +2117,8 @@ def main():

     optparser.add_option(      "--ws-index", dest="website_index", action="store", help="Name of index-document (only for [ws-create] command)")

     optparser.add_option(      "--ws-error", dest="website_error", action="store", help="Name of error-document (only for [ws-create] command)")

-    optparser.add_option(      "--expiry-date", dest="expiry_date", action="store", help="Indicates when the expiration rule take effect. (only for [expire] comman)")

-    optparser.add_option(      "--expiry-days", dest="expiry_days", action="store", help="Indicates the number of days after object creation the expiration rule take effect. (only for [expire] command)")

+    optparser.add_option(      "--expiry-date", dest="expiry_date", action="store", help="Indicates when the expiration rule takes effect. (only for [expire] command)")

+    optparser.add_option(      "--expiry-days", dest="expiry_days", action="store", help="Indicates the number of days after object creation the expiration rule takes effect. (only for [expire] command)")

     optparser.add_option(      "--expiry-prefix", dest="expiry_prefix", action="store", help="Identifying one or more objects with the prefix to which the expiration rule applies. (only for [expire] command)")

     optparser.add_option(      "--progress", dest="progress_meter", action="store_true", help="Display progress meter (default on TTY).")

@@ -2135,7 +2147,7 @@ def main():

         '"buckets" and uploading, downloading and removing '+

         '"objects" from these buckets.')

     optparser.epilog = format_commands(optparser.get_prog_name(), commands_list)

-    optparser.epilog += ("\nFor more information see the project homepage:\n%s\n" % PkgInfo.url)

+    optparser.epilog += ("\nFor more information, updates and news, visit the s3cmd website:\n%s\n" % PkgInfo.url)

     optparser.epilog += ("\nConsider a donation if you have found s3cmd useful:\n%s/donate\n" % PkgInfo.url)

     (options, args) = optparser.parse_args()

@@ -58,6 +58,9 @@ Get various information about Buckets or Files

 s3cmd \fBcp\fR \fIs3://BUCKET1/OBJECT1 s3://BUCKET2[/OBJECT2]\fR

 Copy object

 .TP

+s3cmd \fBmodify\fR \fIs3://BUCKET1/OBJECT\fR

+Modify object metadata

+.TP

 s3cmd \fBmv\fR \fIs3://BUCKET1/OBJECT1 s3://BUCKET2[/OBJECT2]\fR

 Move object

 .TP

@@ -149,7 +152,7 @@ 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/mdomsch/.s3cfg

+Config file name. Defaults to /home/user/.s3cfg

 .TP

 \fB\-\-dump\-config\fR

 Dump current configuration after parsing config files

@@ -338,8 +341,8 @@ Force MIME-type. Override both \fB--default-mime-type\fR and

 .TP

 \fB\-\-add\-header\fR=NAME:VALUE

 Add a given HTTP header to the upload request. Can be

-used multiple times. For instance set 'Expires' or 'Cache-Control' headers (or both) using this options

-if you like.

+used multiple times. For instance set 'Expires' or

+'Cache-Control' headers (or both) using this option.

 .TP

 \fB\-\-server\-side\-encryption\fR

 Specifies that server-side encryption will be used

@@ -366,8 +369,8 @@ 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.

+chunk size is 15MB, minimum allowed chunk size is 5MB,

+maximum is 5GB.

 .TP

 \fB\-\-list\-md5\fR

 Include MD5 sums in bucket listings (only for 'ls'

@@ -384,12 +387,12 @@ Name of index-document (only for [ws-create] command)

 Name of error-document (only for [ws-create] command)

 .TP

 \fB\-\-expiry\-date\fR=EXPIRY_DATE

-Indicates when the expiration rule take effect. (only

+Indicates when the expiration rule takes effect. (only

 for [expire] command)

 .TP

 \fB\-\-expiry\-days\fR=EXPIRY_DAYS

 Indicates the number of days after object creation the

-expiration rule take effect. (only for [expire]

+expiration rule takes effect. (only for [expire]

 command)

 .TP

 \fB\-\-expiry\-prefix\fR=EXPIRY_PREFIX

@@ -547,27 +550,38 @@ To exclude local directory 'somedir', be sure to use a trailing forward slash, a

 .PP

 .SH SEE ALSO

-For the most up to date list of options run 

+For the most up to date list of options run: 

 .B s3cmd \-\-help

 .br

-For more info about usage, examples and other related info visit project homepage at

-.br

+For more info about usage, examples and other related info visit project homepage at:

 .B http://s3tools.org

 .SH DONATIONS

 Please consider a donation if you have found s3cmd useful:

 .br

 .B http://s3tools.org/donate

 .SH AUTHOR

-Written by Michal Ludvig <mludvig@logix.net.nz> and 15+ contributors

+Written by Michal Ludvig and contributors

 .SH CONTACT, SUPPORT

 Preferred way to get support is our mailing list:

+.br

 .I s3tools\-general@lists.sourceforge.net

+.br

+or visit the project homepage:

+.br

+.B http://s3tools.org

 .SH REPORTING BUGS

 Report bugs to 

 .I s3tools\-bugs@lists.sourceforge.net

 .SH COPYRIGHT

-Copyright \(co 2007,2008,2009,2010,2011,2012 Michal Ludvig <http://www.logix.cz/michal>

+Copyright \(co 2007-2014 TGRMN Software - http://www.tgrmn.com - and contributors

+.br

+.SH LICENSE

+This program is free software; you can redistribute it and/or modify

+it under the terms of the GNU General Public License as published by

+the Free Software Foundation; either version 2 of the License, or

+(at your option) any later version.

+This program is distributed in the hope that it will be useful,

+but WITHOUT ANY WARRANTY; without even the implied warranty of

+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the

+GNU General Public License for more details.

 .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>.

-There is NO WARRANTY, to the extent permitted by law.