diff --git a/doc/user-guides/source/conf.py b/doc/user-guides/source/conf.py index 23a46773e0..a868396280 100644 --- a/doc/user-guides/source/conf.py +++ b/doc/user-guides/source/conf.py @@ -46,7 +46,7 @@ sys.path.append(os.path.abspath('../sphinx-ext/')) # Add any Sphinx extension module names here, as strings. They can be # extensions coming with Sphinx (named 'sphinx.ext.*') or your custom # ones. -extensions = ['sphinx.ext.ifconfig', 'os_doc_tools.sphinx.hotref', 'scope'] +extensions = ['os_doc_tools.sphinx.hotref', 'scope'] # Add any paths that contain templates here, relative to this directory. # templates_path = ['_templates'] diff --git a/doc/user-guides/source/dashboard.rst b/doc/user-guides/source/dashboard.rst index 2625b37cb8..425af82665 100644 --- a/doc/user-guides/source/dashboard.rst +++ b/doc/user-guides/source/dashboard.rst @@ -2,10 +2,21 @@ OpenStack dashboard =================== -As a cloud end user, you can use the OpenStack dashboard to provision -your own resources within the limits set by administrators. You can -modify the examples provided in this section to create other types and -sizes of server instances. +.. only:: admin_only + + As a cloud administrative user, the OpenStack dashboard lets you + create and manage projects, users, images, and flavors. You can + also set quotas and create and manage services. For information + about using the dashboard to perform end user tasks, see the + `OpenStack End User Guide `__. + +.. only:: user_only + + As a cloud end user, you can use the OpenStack dashboard to provision + your own resources within the limits set by administrators. You can + modify the examples provided in this section to create other types and + sizes of server instances. + .. Files should be in order of current User Guides and then as following: Files currently in End User Guide