diff --git a/doc/source/admin/objectstorage-admin.rst b/doc/source/admin/objectstorage-admin.rst
index f0323e495d..b51ff73714 100644
--- a/doc/source/admin/objectstorage-admin.rst
+++ b/doc/source/admin/objectstorage-admin.rst
@@ -4,8 +4,7 @@ System administration for Object Storage
 
 By understanding Object Storage concepts, you can better monitor and
 administer your storage solution. The majority of the administration
-information is maintained in developer documentation at
-`docs.openstack.org/developer/swift/ <https://docs.openstack.org/developer/swift/>`__.
+information is maintained in the :doc:`developer documentation </index>`.
 
 See the `OpenStack Configuration Reference <https://docs.openstack.org/ocata/config-reference/object-storage.html>`__
 for a list of configuration options for Object Storage.
diff --git a/doc/source/admin/objectstorage-components.rst b/doc/source/admin/objectstorage-components.rst
index 616ca505b9..d784e07599 100644
--- a/doc/source/admin/objectstorage-components.rst
+++ b/doc/source/admin/objectstorage-components.rst
@@ -47,10 +47,6 @@ needed based on projected workloads. A minimum of two proxy servers
 should be deployed behind a separately-managed load balancer. If one
 proxy server fails, the others take over.
 
-For more information concerning proxy server configuration, see
-`Configuration Reference
-<https://docs.openstack.org/ocata/config-reference/object-storage/proxy-server.html>`_.
-
 Rings
 -----
 
diff --git a/doc/source/admin/objectstorage-large-objects.rst b/doc/source/admin/objectstorage-large-objects.rst
index 5873573c4f..e4b0490314 100644
--- a/doc/source/admin/objectstorage-large-objects.rst
+++ b/doc/source/admin/objectstorage-large-objects.rst
@@ -28,7 +28,5 @@ The large object is comprised of two types of objects:
    - **Static large objects**
    - **Dynamic large objects**
 
-To find out more information on large object support, see `Large objects
-<https://docs.openstack.org/user-guide/cli-swift-large-object-creation.html>`_
-in the OpenStack End User Guide, or :doc:`/overview_large_objects`
-in the developer documentation.
+To find out more information on large object support,
+see :doc:`/overview_large_objects` in the developer documentation.
diff --git a/etc/swift.conf-sample b/etc/swift.conf-sample
index 8edb06344c..7b51f1a1d7 100644
--- a/etc/swift.conf-sample
+++ b/etc/swift.conf-sample
@@ -68,7 +68,7 @@ aliases = yellow, orange
 # data that will be buffered up before feeding a segment into the
 # encoder/decoder.  More information about these configuration options and
 # supported 'ec_type' schemes is available in the Swift documentation.  See
-# https://docs.openstack.org/developer/swift/overview_erasure_code.html
+# https://docs.openstack.org/swift/latest/overview_erasure_code.html
 # for more information on how to configure EC policies.
 #
 # The example 'deepfreeze10-4' policy defined below is a _sample_