Merge "move configuration option list to the configuration guide"

2018-07-10 06:29:12 +00:00 · 2018-07-10 06:29:12 +00:00 · f534a5e2ec
parent df0a57438f 6a94cbc6a2
commit f534a5e2ec
4 changed files with 8 additions and 8 deletions
--- a/doc/source/configuration/index.rst
+++ b/doc/source/configuration/index.rst
@ -7,5 +7,4 @@

   format
   mutable
-
-
+   options
--- a/doc/source/configuration/options.rst
+++ b/doc/source/configuration/options.rst
@ -0,0 +1,7 @@
+========================================
+ Configuration Options from oslo.config
+========================================
+
+.. show-options::
+
+   oslo.config
--- a/doc/source/reference/builtins.rst
+++ b/doc/source/reference/builtins.rst
@ -1,5 +0,0 @@
-==================
- Built-in Options
-==================
-
-.. show-options:: oslo.config
--- a/doc/source/reference/index.rst
+++ b/doc/source/reference/index.rst
@ -18,7 +18,6 @@
   styleguide
   mutable
   locations
-   builtins
   sphinxext
   sphinxconfiggen
   faq