diff options
author | Tim Burke <tim.burke@gmail.com> | 2019-03-29 16:06:31 -0700 |
---|---|---|
committer | Tim Burke <tim.burke@gmail.com> | 2019-03-29 16:07:59 -0700 |
commit | ffe51501c21c33d65907178511e8d8a747fd442d (patch) | |
tree | 974e2d2c19cd736dc55fa04706ec57a5413ad10a /api-ref | |
parent | d01669387585ca889aecc2c880412668673ae8ed (diff) | |
download | swift-ffe51501c21c33d65907178511e8d8a747fd442d.tar.gz |
api-ref: add link to SLO docs from multipart-manifest=put param
Drive-by: run api-ref tox env under py3.
Change-Id: Iebce47eabcb3b198d4aa7c1b8cfaf8f53300f7f9
Diffstat (limited to 'api-ref')
-rw-r--r-- | api-ref/source/conf.py | 5 | ||||
-rw-r--r-- | api-ref/source/parameters.yaml | 2 |
2 files changed, 7 insertions, 0 deletions
diff --git a/api-ref/source/conf.py b/api-ref/source/conf.py index 9c30acbb3..5d7f7f3ed 100644 --- a/api-ref/source/conf.py +++ b/api-ref/source/conf.py @@ -162,6 +162,11 @@ try: except OSError: warnings.warn('Cannot get last updated time from git repository. ' 'Not setting "html_last_updated_fmt".') +else: + if not isinstance(html_last_updated_fmt, str): + # for py3 + html_last_updated_fmt = html_last_updated_fmt.decode('ascii') + # If true, SmartyPants will be used to convert quotes and dashes to # typographically correct entities. diff --git a/api-ref/source/parameters.yaml b/api-ref/source/parameters.yaml index bc5ed086f..3950dcfc8 100644 --- a/api-ref/source/parameters.yaml +++ b/api-ref/source/parameters.yaml @@ -1109,6 +1109,8 @@ multipart-manifest_put: description: | If you include the ``multipart-manifest=put`` query parameter, the object is a static large object manifest and the body contains the manifest. + See `Static large objects <https://docs.openstack.org/swift/latest + /api/large_objects.html#static-large-objects>`_ for more information. in: query required: false type: string |