From 7857fb97005594c3b8c6104ab0bfe78311f92e94 Mon Sep 17 00:00:00 2001
From: Ruby Loo <rloo@yahoo-inc.com>
Date: Wed, 7 Oct 2015 18:16:17 +0000
Subject: [PATCH] Remove placeholders from being displayed

This removes the Placeholders section from the main specs page.
We need to have the old URLs available so that external references
to them still work, but we don't want to encourage people to use
those links.

Change-Id: I4d237f85518bce699c20cb3720faec5233272c92
---
 doc/source/index.rst        | 20 +++++++++++-------
 doc/source/placeholders.rst | 42 -------------------------------------
 2 files changed, 12 insertions(+), 50 deletions(-)
 delete mode 100644 doc/source/placeholders.rst

diff --git a/doc/source/index.rst b/doc/source/index.rst
index 292d2826..7ad37fa7 100644
--- a/doc/source/index.rst
+++ b/doc/source/index.rst
@@ -73,17 +73,21 @@ Juno
 
    specs/juno-implemented/*
 
-
-Placeholders
-============
-
-During the Liberty development cycle, we restructured the spec folders. Links
-were left in the locations of previous specs so as not to break any external
-references to them.
+..
+   ----------------
+   The locations of specs were changed during the Liberty development
+   cycle.  These are placeholders and specs in the old locations.
+   They need to be available because there may be external references
+   to them, but we don't want to explicitly provide links to them.
 
 .. toctree::
+   :glob:
+   :hidden:
+
+   specs/liberty/*
+   specs/kilo/*
+   specs/juno/*
 
-   placeholders
 
 ==================
 Indices and tables
diff --git a/doc/source/placeholders.rst b/doc/source/placeholders.rst
deleted file mode 100644
index 158d6871..00000000
--- a/doc/source/placeholders.rst
+++ /dev/null
@@ -1,42 +0,0 @@
-.. ironic-specs documentation master file
-
-==========================================
-Ironic Project Specifications Placeholders
-==========================================
-
-This page serves as a list of all placeholders for specs that have been
-since moved. The placeholder exists to avoid breaking old links.
-
-Liberty
--------
-
-.. toctree::
-   :glob:
-   :maxdepth: 1
-
-   specs/liberty/*
-
-Kilo
-----
-
-.. toctree::
-   :glob:
-   :maxdepth: 1
-
-   specs/kilo/*
-
-Juno
-----
-
-.. toctree::
-   :glob:
-   :maxdepth: 1
-
-   specs/juno/*
-
-
-==================
-Indices and tables
-==================
-
-* :ref:`search`