diff --git a/doc/source/api/object_api_v1_overview.rst b/doc/source/api/object_api_v1_overview.rst
index 2d2c247907..30d3f04f2c 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 9f6cf37ecd..3746764966 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.
         """