diff options
| -rw-r--r-- | doc/manpages/swift.1 | 2 | ||||
| -rw-r--r-- | doc/source/client-api.rst | 2 | ||||
| -rw-r--r-- | doc/source/service-api.rst | 2 | ||||
| -rw-r--r-- | setup.py | 6 |
4 files changed, 8 insertions, 4 deletions
diff --git a/doc/manpages/swift.1 b/doc/manpages/swift.1 index 575adbe..beefb81 100644 --- a/doc/manpages/swift.1 +++ b/doc/manpages/swift.1 @@ -103,7 +103,7 @@ For more details and options see swift delete \-\-help. \fBcapabilities\fR [\fIproxy-url\fR] .RS 4 Displays cluster capabilities. The output includes the list of the activated -Swift middlewares as well as relevant options for each ones. Addtionaly the +Swift middlewares as well as relevant options for each one. Additionally the command displays relevant options for the Swift core. If the proxy-url option is not provided the storage-url retrieved after authentication is used as proxy-url. diff --git a/doc/source/client-api.rst b/doc/source/client-api.rst index 5677f70..b0bb637 100644 --- a/doc/source/client-api.rst +++ b/doc/source/client-api.rst @@ -12,7 +12,7 @@ Authentication -------------- This section covers the various combinations of kwargs required when creating -and instance of the ``Connection`` object for communicating with a swift +an instance of the ``Connection`` object for communicating with a swift object store. The combinations of options required for each authentication version are detailed below, but are just a subset of those that can be used to successfully authenticate. These diff --git a/doc/source/service-api.rst b/doc/source/service-api.rst index d165e5e..6610743 100644 --- a/doc/source/service-api.rst +++ b/doc/source/service-api.rst @@ -208,7 +208,7 @@ Options when the source of an upload is ``None``. ``checksum``: ``True`` - Affects uploads and downloads, and means if check md5 for downloads/uploads. + Affects uploads and downloads. If set check md5 sum for the transfer. ``shuffle``: ``False`` When downloading objects, the default behaviour of the CLI is to shuffle @@ -15,7 +15,11 @@ # limitations under the License. # THIS FILE IS MANAGED BY THE GLOBAL REQUIREMENTS REPO - DO NOT EDIT -import setuptools +import setuptools, sys + +if sys.version_info < (2, 7): + sys.exit('Sorry, Python < 2.7 is not supported for' + ' python-swiftclient>=3.0') setuptools.setup( setup_requires=['pbr'], |