mongodb · bgrabar · Apr 15, 2013 · tychoish · Apr 15, 2013 · tychoish
diff --git a/source/administration.txt b/source/administration.txt
@@ -3,10 +3,7 @@ Administration
 ==============
 
 The documentation in this section outlines core administrative tasks
-and practices that operators of MongoDB will want to consider. In
-addition to the core topics that follow, also consider the relevant
-documentation in other sections including: :doc:`/sharding`,
-:doc:`/replication`, and :doc:`/indexes`.
+and practices that operators of MongoDB will want to consider.
 
 .. toctree::
    :maxdepth: 1
@@ -26,11 +23,6 @@ documentation in other sections including: :doc:`/sharding`,
 
 .. seealso:: 
 
-   - :doc:`/administration/replica-sets`
    - :doc:`/administration/sharded-clusters`
+   - :doc:`/administration/replica-sets`
    - :doc:`/administration/indexes`
-
-   Additionally, Consider the :doc:`/tutorial` page that
-   contains a full index of all tutorials available in the MongoDB
-   manual. These documents provide pragmatic instructions for common
-   operational practices and administrative tasks.
diff --git a/source/administration/configuration.txt b/source/administration/configuration.txt
@@ -36,8 +36,8 @@ control the configuration of your database instance.
 
 .. _base-config:
 
-Starting, Stopping, and Running the Database
---------------------------------------------
+Configure the Database
+----------------------
 
 Consider the following basic configuration:
 
@@ -255,8 +255,8 @@ among all :program:`mongos` instances.
 .. seealso:: The ":doc:`/sharding`" section of the manual for more
    information on sharding and cluster configuration.
 
-Running Multiple Database Instances on the Same System
-------------------------------------------------------
+Run Multiple Database Instances on the Same System
+--------------------------------------------------
 
 In many cases running multiple instances of :program:`mongod` on a
 single system is not recommended. On some types of deployments

diff --git a/source/administration/monitoring.txt b/source/administration/monitoring.txt
@@ -1,6 +1,6 @@
-===========================
-Monitoring Database Systems
-===========================
+========================
+Monitor Database Systems
+========================
 
 .. default-domain:: mongodb
 

diff --git a/source/administration/production-notes.txt b/source/administration/production-notes.txt
@@ -4,9 +4,6 @@ Production Notes
 
 .. default-domain:: mongodb
 
-Overview
---------
-
 This page details system configurations that affect MongoDB,
 especially in production.
 

diff --git a/source/contents.txt b/source/contents.txt
@@ -3,7 +3,7 @@ MongoDB Manual Contents
 =======================
 
 .. toctree::
-   :maxdepth: 3
+   :titlesonly:
 
    installation
    administration
@@ -18,6 +18,11 @@ MongoDB Manual Contents
    mongo
    use-cases
    faq
+
+.. toctree::
+   :titlesonly:
+   :maxdepth: 2
+
    reference
    release-notes
    about
diff --git a/source/core/import-export.txt b/source/core/import-export.txt
@@ -1,21 +1,18 @@
-====================================
-Importing and Exporting MongoDB Data
-====================================
+==============================
+Import and Export MongoDB Data
+==============================
 
 .. default-domain:: mongodb
 
-Full :doc:`database instance backups </core/backups>` are
-useful for disaster recovery protection and routine database backup
-operation; however, some cases require additional import and export
-functionality.
-
 This document provides an overview of the import and export programs
 included in the MongoDB distribution. These tools are useful when you
 want to backup or export a portion of your data without capturing the
 state of the entire database, or for simple data ingestion cases. For
 more complex data migration tasks, you may want to write your own
 import and export scripts using a client :term:`driver` to interact
-with the database itself.
+with the database itself. For disaster recovery protection and routine
+database backup operation, use full :doc:`database instance backups
+</core/backups>`.
 
 .. warning::
 

diff --git a/source/installation.txt b/source/installation.txt
@@ -1,6 +1,6 @@
-==================
-Installing MongoDB
-==================
+===============
+Install MongoDB
+===============
 
 .. index:: tutorials; installation
 .. index:: installation tutorials

diff --git a/source/mongo.txt b/source/mongo.txt
@@ -1,6 +1,6 @@
-=========================
-Using the ``mongo`` Shell
-=========================
+===================
+The ``mongo`` Shell
+===================
 
 .. default-domain:: mongodb
 

diff --git a/source/security.txt b/source/security.txt
@@ -7,7 +7,7 @@ risk management strategies. Additionally, this section includes
 :ref:`tutorials` that outline basic network filter and firewall rules
 to configure trusted environments for MongoDB.
 
-Additionally, these documents describe the MongoDB role-based
+This section also describes the MongoDB role-based
 access-control model. MongoDB provides user roles that authorize users
 for different levels of access to databases and database
 operations. For more information, see the reference pages listed at

diff --git a/source/tutorial.txt b/source/tutorial.txt
@@ -6,7 +6,7 @@
 MongoDB Tutorials
 =================
 
-This index page provides a complete listing of all tutorials available
+This page lists the tutorials available
 as part of the :doc:`MongoDB Manual <contents>`. In addition to these
 documents, you can refer to the introductory :doc:`MongoDB Tutorial
 </tutorial/getting-started>`. If there is a process or pattern that you

diff --git a/source/tutorial/configure-ssl.txt b/source/tutorial/configure-ssl.txt
@@ -1,6 +1,6 @@
-================================
-Use MongoDB with SSL Connections
-================================
+=====================
+Authenticate with SSL
+=====================
 
 .. default-domain:: mongodb
 

diff --git a/source/tutorial/getting-started.txt b/source/tutorial/getting-started.txt
@@ -1,6 +1,6 @@
-========================================
-Getting Started with MongoDB Development
-========================================
+============================
+Getting Started with MongoDB
+============================
 
 .. default-domain:: mongodb
 

diff --git a/source/tutorial/install-mongodb-on-debian.txt b/source/tutorial/install-mongodb-on-debian.txt
@@ -50,8 +50,8 @@ which contains the latest **stable** release. Additionally you can
 You cannot install this package concurrently with the ``mongodb`` package that 
 your release of Debian may include.
 
-Installing MongoDB
-------------------
+Install MongoDB
+---------------
 
 Configure Package Management System (APT)
 ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~

diff --git a/source/tutorial/install-mongodb-on-os-x.txt b/source/tutorial/install-mongodb-on-os-x.txt
@@ -33,8 +33,8 @@ provided by 10gen.
    .. - :doc:`/getting-started`
    .. STUB - :doc:`/tutorial/insert-test-data-into-a-mongodb-database`
 
-Installing with Package Management
-----------------------------------
+Install with Package Management
+-------------------------------
 
 Both community package management tools: `Homebrew
 <http://mxcl.github.com/homebrew/>`_ and `MacPorts
@@ -121,8 +121,8 @@ commands to insert a record in the "test" :term:`collection` of the
 
 .. seealso:: ":program:`mongo`" and ":doc:`/reference/javascript`"
 
-Installing from 10gen Builds
-----------------------------
+Install from 10gen Builds
+-------------------------
 
 10gen provides compiled binaries of all MongoDB software compiled for
 OS X, which may provide a more straightforward installation process.

diff --git a/source/tutorial/install-mongodb-on-red-hat-centos-or-fedora-linux.txt b/source/tutorial/install-mongodb-on-red-hat-centos-or-fedora-linux.txt
@@ -58,8 +58,8 @@ The 10gen repository contains two packages:
   MongoDB systems.
 
 
-Installing MongoDB
-------------------
+Install MongoDB
+---------------
 
 Configure Package Management System (YUM)
 ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
@@ -89,8 +89,8 @@ production deployments, place the following configuration in
    gpgcheck=0
    enabled=1
 
-Installing Packages
-~~~~~~~~~~~~~~~~~~~
+Install Packages
+~~~~~~~~~~~~~~~~
 
 Issue the following command (as ``root`` or with ``sudo``) to install
 the latest stable version of MongoDB and the associated tools:

diff --git a/source/tutorial/install-mongodb-on-ubuntu.txt b/source/tutorial/install-mongodb-on-ubuntu.txt
@@ -49,8 +49,8 @@ which contains the latest **stable** release. Additionally you can
 You cannot install this package concurrently with the ``mongodb`` package
 provided by Ubuntu.
 
-Installing MongoDB
-------------------
+Install MongoDB
+---------------
 
 Configure Package Management System (APT)
 ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~

diff --git a/source/tutorial/monitor-with-snmp.txt b/source/tutorial/monitor-with-snmp.txt
@@ -1,6 +1,6 @@
-================================
-Use MongoDB with SNMP Monitoring
-================================
+=================
+Monitor with SNMP
+=================
 
 .. versionadded:: 2.2