diff --git a/docs/index.md b/docs/index.md
index 4ac0982ae54f1..7fe6b43d32af7 100644
--- a/docs/index.md
+++ b/docs/index.md
@@ -103,6 +103,8 @@ options for deployment:
 * [Security](security.html): Spark security support
 * [Hardware Provisioning](hardware-provisioning.html): recommendations for cluster hardware
 * [3<sup>rd</sup> Party Hadoop Distributions](hadoop-third-party-distributions.html): using common Hadoop distributions
+* Integration with other storage systems:
+  * [OpenStack Swift](storage-openstack-swift.html)
 * [Building Spark with Maven](building-with-maven.html): build Spark using the Maven system
 * [Contributing to Spark](https://cwiki.apache.org/confluence/display/SPARK/Contributing+to+Spark)
 
diff --git a/docs/openstack-integration.md b/docs/storage-openstack-swift.md
similarity index 96%
rename from docs/openstack-integration.md
rename to docs/storage-openstack-swift.md
index ff3cf95ac2f0b..931e995e0f014 100644
--- a/docs/openstack-integration.md
+++ b/docs/storage-openstack-swift.md
@@ -1,14 +1,8 @@
 ---
 layout: global
-title: OpenStack Swift Integration
+title: Accessing OpenStack Swift from Spark
 ---
 
-* This will become a table of contents (this text will be scraped).
-{:toc}
-
-
-# Accessing OpenStack Swift from Spark
-
 Spark's support for Hadoop InputFormat allows it to process data in OpenStack Swift using the
 same URI formats as in Hadoop. You can specify a path in Swift as input through a 
 URI of the form <code>swift://container.PROVIDER/path</code>. You will also need to set your