openstack/openstack-manuals
Code Issues Proposed changes

Merge "Use separate toctree directives for user vs admin"

Browse Source
This commit is contained in:
Jenkins 2015-04-30 07:03:01 +00:00 committed by Gerrit Code Review
commit fcf02f2505
2 changed files with 71 additions and 58 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

33
doc/user-guides/source/cli.rst
View File

@ -2,16 +2,13 @@
OpenStack command-line clients
==============================
.. Files should be in order of current User Guides and then as following:
Files currently in End User Guide
Files currently only in Admin User Guide, marked with admin_only
.. We need separate toc trees for End User Guide and Admin User Guide
to not run into a bug where the next/previous pages do not work due
to this guide including some files conditionally.
Since Sphinx does not allow comments below, empty lines are used
for the three blocks
.. only:: admin_guide
TODO(ajaeger): Review TOC and consider different options
.. toctree::
.. toctree::
:maxdepth: 2
common/cli_overview.rst
@ -23,6 +20,22 @@ OpenStack command-line clients
adminuser/cli_manage_services.rst
common/cli_manage_images.rst
common/cli_manage_volumes.rst
adminuser/cli_manage_flavors.rst
adminuser/cli_admin_manage_environment.rst
adminuser/cli_set_quotas.rst
adminuser/analyzing-log-files-with-swift-cli.rst
.. only:: user_guide
.. toctree::
:maxdepth: 2
common/cli_overview.rst
common/cli_install_openstack_command_line_clients.rst
common/cli_discover_version_number_for_a_client.rst
common/cli_set_environment_variables_using_openstack_rc.rst
common/cli_manage_images.rst
common/cli_manage_volumes.rst
enduser/cli_nova_configure_access_security_for_instances.rst
enduser/cli_launch_instances.rst
enduser/cli_manage_instances_hosts.rst
@ -34,7 +47,3 @@ OpenStack command-line clients
enduser/cli_create_and_manage_stacks.rst
enduser/cli_ceilometer.rst
enduser/trove-manage-db.rst
adminuser/cli_manage_flavors.rst
adminuser/cli_admin_manage_environment.rst
adminuser/cli_set_quotas.rst
adminuser/analyzing-log-files-with-swift-cli.rst

36
doc/user-guides/source/dashboard.rst
View File

@ -18,17 +18,30 @@ OpenStack dashboard
sizes of server instances.
.. Files should be in order of current User Guides and then as following:
Files currently in End User Guide
Files currently only in Admn User Guide, marked with admin_only
.. We need separate toc trees for End User Guide and Admin User Guide
to not run into a bug where the next/previous pages do not work due
to this guide including some files conditionally.
Since Sphinx does not allow comments below, empty lines are used
as separators.
.. only:: admin_guide
TODO(ajaeger): Review TOC and consider different options
.. toctree::
:maxdepth: 2
common/log_in_dashboard.rst
.. toctree::
adminuser/dashboard_manage_images.rst
adminuser/dashboard_admin_manage_roles.rst
adminuser/dashboard_manage_instances.rst
adminuser/dashboard_manage_flavors.rst
adminuser/dashboard_manage_volumes.rst
adminuser/dashboard_set_quotas
adminuser/dashboard_manage_resources.rst
adminuser/dashboard_manage_host_aggregates.rst
adminuser/dashboard_admin_manage_stacks.rst
.. only:: user_guide
.. toctree::
:maxdepth: 2
common/log_in_dashboard.rst
@ -41,12 +54,3 @@ OpenStack dashboard
enduser/dashboard_stacks.rst
enduser/dashboard_databases.rst
adminuser/dashboard_manage_images.rst
adminuser/dashboard_admin_manage_roles.rst
adminuser/dashboard_manage_instances.rst
adminuser/dashboard_manage_volumes.rst
adminuser/dashboard_manage_flavors.rst
adminuser/dashboard_set_quotas
adminuser/dashboard_manage_resources.rst
adminuser/dashboard_manage_host_aggregates.rst
adminuser/dashboard_admin_manage_stacks.rst