diff --git a/doc/cli-reference/source/common b/doc/cli-reference/source/common
deleted file mode 120000
index dc879abe93..0000000000
--- a/doc/cli-reference/source/common
+++ /dev/null
@@ -1 +0,0 @@
-../../common
\ No newline at end of file
diff --git a/doc/cli-reference/source/conf.py b/doc/cli-reference/source/conf.py
index f3c90f0f15..b25de78189 100644
--- a/doc/cli-reference/source/conf.py
+++ b/doc/cli-reference/source/conf.py
@@ -95,9 +95,7 @@ html_context = {"gitsha": gitsha, "bug_tag": bug_tag,
 
 # List of patterns, relative to source directory, that match files and
 # directories to ignore when looking for source files.
-exclude_patterns = ['common/cli-manage*', 'common/nova*',
-                    'common/get-started-*',
-                    'common/dashboard-customizing.rst']
+exclude_patterns = []
 
 # The reST default role (used for this markup: `text`) to use for all
 # documents.
diff --git a/doc/cli-reference/source/index.rst b/doc/cli-reference/source/index.rst
index 60e380813e..e635cdb65a 100644
--- a/doc/cli-reference/source/index.rst
+++ b/doc/cli-reference/source/index.rst
@@ -5,7 +5,11 @@ OpenStack Command-Line Interface Reference
 Abstract
 ~~~~~~~~
 
-This guide documents the OpenStack command-line clients.
+This guide provides information about OpenStack command-line client commands.
+For more information about installing and using command-line clients,
+see the `OpenStack command-line clients
+<http://docs.openstack.org/user-guide/cli.html>`_
+in the OpenStack End User Guide.
 
 Contents
 ~~~~~~~~
@@ -15,8 +19,6 @@ Contents
 .. toctree::
    :maxdepth: 1
 
-   common/conventions
-   overview
    openstack
 
    murano
@@ -44,22 +46,6 @@ Contents
    gnocchi
    mistral
 
-Appendix
-~~~~~~~~
-
-.. toctree::
-   :maxdepth: 1
-
-   common/app-support
-
-Glossary
-~~~~~~~~
-
-.. toctree::
-   :maxdepth: 1
-
-   common/glossary
-
 Search in this guide
 ~~~~~~~~~~~~~~~~~~~~
 
diff --git a/doc/cli-reference/source/overview.rst b/doc/cli-reference/source/overview.rst
deleted file mode 100644
index 1d250a43ca..0000000000
--- a/doc/cli-reference/source/overview.rst
+++ /dev/null
@@ -1,11 +0,0 @@
-=======================================
-OpenStack command-line clients overview
-=======================================
-
-.. toctree::
-   :maxdepth: 2
-
-   common/cli-overview
-   common/cli-install-openstack-command-line-clients
-   common/cli-discover-version-number-for-a-client
-   common/cli-set-environment-variables-using-openstack-rc