diff --git a/doc/source/contributors/index.rst b/doc/source/contributors/index.rst
index 2c41389a..dacc75f0 100644
--- a/doc/source/contributors/index.rst
+++ b/doc/source/contributors/index.rst
@@ -38,7 +38,7 @@ Development Environment
 
 The first step towards contributing code and documentation is to setup your
 development environment. We use a pretty standard setup, but it is fully
-documented in our `setup <setup.html>`_ section.
+documented in our :doc:`setup <setup>` section.
 
 .. toctree::
    :maxdepth: 2
diff --git a/doc/source/index.rst b/doc/source/index.rst
index 40f1da8f..e2c2bb52 100644
--- a/doc/source/index.rst
+++ b/doc/source/index.rst
@@ -2,9 +2,9 @@ Welcome to the OpenStack SDK!
 =============================
 
 This documentation is split into two sections: one for
-`users <users/index.html>`_ looking to build applications which make use of
+:doc:`users <users/index>` looking to build applications which make use of
 OpenStack, and another for those looking to
-`contribute <contributors/index.html>`_ to this project.
+:doc:`contribute <contributors/index>` to this project.
 
 For Users
 ---------
diff --git a/doc/source/users/index.rst b/doc/source/users/index.rst
index f22a2d31..e3663c30 100644
--- a/doc/source/users/index.rst
+++ b/doc/source/users/index.rst
@@ -2,7 +2,7 @@ Getting started with the OpenStack SDK
 ======================================
 
 For a listing of terms used throughout the SDK, including the names of
-projects and services supported by it, see the `Glossary <../glossary.html>`_.
+projects and services supported by it, see the :doc:`glossary <../glossary>`.
 
 Installation
 ------------
@@ -38,7 +38,7 @@ approach, this is where you'll want to begin.
    Orchestration <userguides/orchestration>
    Telemetry <userguides/telemetry>
 
-It may also be useful to try out some working code `examples <examples.html>`_.
+It may also be useful to try out some working code :doc:`examples <examples>`.
 
 API Documentation
 -----------------