Merge "move doc/source/webapi content to doc/source/api"

.gitignore

@@ -42,9 +42,11 @@ output/*/index.html
 
 # Sphinx
 doc/build
-doc/source/api
+doc/source/api/*
 doc/source/samples
 doc/source/watcher.conf.sample
+!doc/source/api/index.rst
+!doc/source/api/v1.rst
 
 # pbr generates these
 AUTHORS

doc/source/index.rst

@@ -54,20 +54,13 @@ Getting Started
 
   contributor/index
 
-Installation
-------------
-.. toctree::
-  :maxdepth: 2
-
-  install/index
-
 API References
 --------------
 
 .. toctree::
   :maxdepth: 1
 
-  webapi/index
+  api/index
 
 Plugins
 -------
@@ -77,6 +70,13 @@ Plugins
 
   contributor/plugin/index
 
+Installation
+============
+.. toctree::
+  :maxdepth: 2
+
+  install/index
+
 Admin Guide
 ===========