diff --git a/doc/source/authentication.rst b/doc/source/authentication.rst
index 71120c5538..327b7a8f0f 100644
--- a/doc/source/authentication.rst
+++ b/doc/source/authentication.rst
@@ -14,8 +14,8 @@
       License for the specific language governing permissions and limitations
       under the License.
 
-Glance Authentication With Keystone
-===================================
+Authentication With Keystone
+============================
 
 Glance may optionally be integrated with Keystone.  Setting this up is
 relatively straightforward, as the Keystone distribution includes the
diff --git a/doc/source/configuring.rst b/doc/source/configuring.rst
index b878f623ca..714926b9b3 100644
--- a/doc/source/configuring.rst
+++ b/doc/source/configuring.rst
@@ -14,8 +14,8 @@
       License for the specific language governing permissions and limitations
       under the License.
 
-Configuring Glance
-==================
+Basic Configuration
+===================
 
 Glance has a number of options that you can use to configure the Glance API
 server, the Glance Registry server, and the various storage backends that
diff --git a/doc/source/index.rst b/doc/source/index.rst
index defba42d8b..9b2bace101 100644
--- a/doc/source/index.rst
+++ b/doc/source/index.rst
@@ -50,19 +50,26 @@ Concepts
    statuses
    formats
 
-Managing Glance
-===============
+Installing/Configuring Glance
+=============================
 
 .. toctree::
    :maxdepth: 1
 
    installing
-   controllingservers
    configuring
-   db
-   policies
-   cache
    authentication
+   policies
+
+Operating Glance
+================
+
+.. toctree::
+   :maxdepth: 1
+
+   controllingservers
+   db
+   cache
    notifications
 
 Using Glance
diff --git a/doc/source/installing.rst b/doc/source/installing.rst
index ddf1e1b9dd..9bd104bd2b 100644
--- a/doc/source/installing.rst
+++ b/doc/source/installing.rst
@@ -14,8 +14,8 @@
       License for the specific language governing permissions and limitations
       under the License.
 
-Installing Glance
-=================
+Installation
+============
 
 Installing from packages
 ~~~~~~~~~~~~~~~~~~~~~~~~