diff options
| -rw-r--r-- | doc/requirements.txt | 2 | ||||
| -rw-r--r-- | doc/source/cli/index.rst | 2 | ||||
| -rw-r--r-- | doc/source/conf.py | 9 | ||||
| -rw-r--r-- | lower-constraints.txt | 2 | ||||
| -rw-r--r-- | releasenotes/source/conf.py | 12 | ||||
| -rwxr-xr-x | swiftclient/shell.py | 2 |
6 files changed, 4 insertions, 25 deletions
diff --git a/doc/requirements.txt b/doc/requirements.txt index d8f432e..6cdad2a 100644 --- a/doc/requirements.txt +++ b/doc/requirements.txt @@ -2,4 +2,4 @@ keystoneauth1>=3.4.0 # Apache-2.0 sphinx!=1.6.6,!=1.6.7,<2.0.0,>=1.6.2;python_version=='2.7' # BSD sphinx!=1.6.6,!=1.6.7,!=2.1.0,>=1.6.2;python_version>='3.4' # BSD reno>=2.5.0 # Apache-2.0 -openstackdocstheme>=1.18.1 # Apache-2.0 +openstackdocstheme>=1.20.0 # Apache-2.0 diff --git a/doc/source/cli/index.rst b/doc/source/cli/index.rst index d6841d5..1762989 100644 --- a/doc/source/cli/index.rst +++ b/doc/source/cli/index.rst @@ -443,7 +443,7 @@ swift post .. code-block:: console - Usage: swift post [--read-acl <acl>] [--write-acl <acl>] [--sync-to] + Usage: swift post [--read-acl <acl>] [--write-acl <acl>] [--sync-to <sync-to>] [--sync-key <sync-key>] [--meta <name:value>] [--header <header>] [<container> [<object>]] diff --git a/doc/source/conf.py b/doc/source/conf.py index f56b643..85dd81e 100644 --- a/doc/source/conf.py +++ b/doc/source/conf.py @@ -53,17 +53,8 @@ source_suffix = '.rst' master_doc = 'index' # General information about the project. -project = u'Swiftclient' copyright = u'2013-2016 OpenStack, LLC.' -# The version info for the project you're documenting, acts as replacement for -# |version| and |release|, also used in various other places throughout the -# built documents. -# -import swiftclient.version -release = swiftclient.version.version_string -version = swiftclient.version.version_string - # The language for content autogenerated by Sphinx. Refer to documentation # for a list of supported languages. # language = None diff --git a/lower-constraints.txt b/lower-constraints.txt index ab45e39..ae61948 100644 --- a/lower-constraints.txt +++ b/lower-constraints.txt @@ -20,7 +20,7 @@ MarkupSafe==1.0 mccabe==0.2.1 mock==1.2.0 netaddr==0.7.10 -openstackdocstheme==1.18.1 +openstackdocstheme==1.20.0 oslo.config==1.2.0 pbr==2.0.0 pep8==1.5.7 diff --git a/releasenotes/source/conf.py b/releasenotes/source/conf.py index b27aa96..c71f41d 100644 --- a/releasenotes/source/conf.py +++ b/releasenotes/source/conf.py @@ -65,15 +65,8 @@ source_suffix = '.rst' master_doc = 'index' # General information about the project. -project = u'Swift Client Release Notes' copyright = u'%d, OpenStack Foundation' % datetime.datetime.now().year -# Release notes are version independent. -# The short X.Y version. -version = '' -# The full version, including alpha/beta/rc tags. -release = '' - # The language for content autogenerated by Sphinx. Refer to documentation # for a list of supported languages. # @@ -173,11 +166,6 @@ html_theme = 'openstackdocs' # # html_extra_path = [] -# If not '', a 'Last updated on:' timestamp is inserted at every page bottom, -# using the given strftime format. -# html_last_updated_fmt = '%b %d, %Y' -html_last_updated_fmt = '%Y-%m-%d %H:%M' - # If true, SmartyPants will be used to convert quotes and dashes to # typographically correct entities. # diff --git a/swiftclient/shell.py b/swiftclient/shell.py index 2be85af..cc4f325 100755 --- a/swiftclient/shell.py +++ b/swiftclient/shell.py @@ -726,7 +726,7 @@ def st_stat(parser, args, output_manager, return_parser=False): output_manager.error(e.value) -st_post_options = '''[--read-acl <acl>] [--write-acl <acl>] [--sync-to] +st_post_options = '''[--read-acl <acl>] [--write-acl <acl>] [--sync-to <sync-to>] [--sync-key <sync-key>] [--meta <name:value>] [--header <header>] [<container> [<object>]] |