summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTim Burke <tim.burke@gmail.com>2017-07-06 19:07:14 -0700
committerTim Burke <tim.burke@gmail.com>2017-07-11 18:38:43 -0700
commit63c4215994dec4f3f819357401263cd34e12b448 (patch)
treebebe0c0730975d6d33f6d19b4a89497ef7232949
parent5cb1303d5baed0a5beab7cf6de8e2ec88f8ab49f (diff)
downloadswift-63c4215994dec4f3f819357401263cd34e12b448.tar.gz
Fix rst for link
Change-Id: I2f63ce16ae67277504a47e68c7dca3c3412fe92c
-rw-r--r--doc/source/api/object_api_v1_overview.rst4
-rw-r--r--swift/proxy/controllers/obj.py3
2 files changed, 3 insertions, 4 deletions
diff --git a/doc/source/api/object_api_v1_overview.rst b/doc/source/api/object_api_v1_overview.rst
index 2d2c24790..30d3f04f2 100644
--- a/doc/source/api/object_api_v1_overview.rst
+++ b/doc/source/api/object_api_v1_overview.rst
@@ -6,9 +6,7 @@ consistent object/blob store. You create, modify, and get objects and
metadata by using the Object Storage API, which is implemented as a set
of Representational State Transfer (REST) web services.
-For an introduction to OpenStack Object Storage, see `Object
-Storage <http://docs.openstack.org/admin-guide/objectstorage.html>`
-in the *OpenStack Administrator Guide*.
+For an introduction to OpenStack Object Storage, see the :doc:`/admin/index`.
You use the HTTPS (SSL) protocol to interact with Object Storage, and
you use standard HTTP calls to perform API operations. You can also use
diff --git a/swift/proxy/controllers/obj.py b/swift/proxy/controllers/obj.py
index 9f6cf37ec..374676496 100644
--- a/swift/proxy/controllers/obj.py
+++ b/swift/proxy/controllers/obj.py
@@ -142,7 +142,8 @@ class BaseObjectController(Controller):
:param ring: ring to get nodes from
:param partition: ring partition to yield nodes for
- :param policy: optional, an instance of :class:`BaseStoragePolicy
+ :param policy: optional, an instance of
+ :class:`~swift.common.storage_policy.BaseStoragePolicy`
:param local_handoffs_first: optional, if True prefer primaries and
local handoff nodes first before looking elsewhere.
"""