diff --git a/doc/install-guide/source/index.rst b/doc/install-guide/source/index.rst
index 96b15279fc..3db6aad7f3 100644
--- a/doc/install-guide/source/index.rst
+++ b/doc/install-guide/source/index.rst
@@ -55,7 +55,8 @@ or as connected entities.
 .. only:: ubuntu
 
    This guide will walk through an installation by using packages
-   available through Canonical's Ubuntu Cloud archive repository.
+   available through Canonical's Ubuntu Cloud archive repository for
+   Ubuntu 16.04 (LTS).
 
 .. endonly
 
diff --git a/www/project-install-guide/draft/index.html b/www/project-install-guide/draft/index.html
index 47263e46e9..e7d91e09b6 100644
--- a/www/project-install-guide/draft/index.html
+++ b/www/project-install-guide/draft/index.html
@@ -27,7 +27,7 @@
             <div class="row docs-toc">
                 <div class="col-lg-6 col-md-6 col-sm-6">
                     <div class="docs-link-sections">
-                        <h3><i class="fa fa-cogs"></i>Draft Installation Tutorial for Debian with debconf</h3>
+                        <h3><i class="fa fa-cogs"></i>Draft Installation Tutorial for Debian 8 with debconf</h3>
                         <a href="/draft/install-guide-debconf/">Abstract</a></li>
                         <a href="/draft/install-guide-debconf/common/conventions.html">Conventions</a></li>
                         <a href="/draft/install-guide-debconf/overview.html">Overview</a></li>
@@ -38,14 +38,11 @@
                         <a href="/draft/install-guide-debconf/neutron.html">Networking service</a></li>
                         <a href="/draft/install-guide-debconf/horizon.html">Dashboard</a></li>
                         <a href="/draft/install-guide-debconf/cinder.html">Block Storage service</a></li>
-                        <a href="/project-install-guide/shared-file-systems/draft/">Shared File Systems service</a></li>
-                        <a href="/project-install-guide/object-storage/draft/">Object Storage service</a></li>
                         <a href="/project-install-guide/orchestration/draft/">Orchestration service</a></li>
-                        <a href="/project-install-guide/database/draft/">Database service</a></li>
                         <a href="/draft/install-guide-debconf/launch-instance.html">Launch an instance</a></li>
                     </div>
                     <div class="docs-link-sections">
-                        <h3><i class="fa fa-cogs"></i>Draft Installation Tutorial for Debian</h3>
+                        <h3><i class="fa fa-cogs"></i>Draft Installation Tutorial for Debian 8</h3>
                         <a href="/draft/install-guide-debian/">Abstract</a></li>
                         <a href="/draft/install-guide-debian/common/conventions.html">Conventions</a></li>
                         <a href="/draft/install-guide-debian/overview.html">Overview</a></li>
@@ -58,8 +55,6 @@
                         <a href="/draft/install-guide-debian/cinder.html">Block Storage service</a></li>
                         <a href="/project-install-guide/shared-file-systems/draft/">Shared File Systems service</a></li>
                         <a href="/project-install-guide/object-storage/draft/">Object Storage service</a></li>
-                        <a href="/project-install-guide/orchestration/draft/">Orchestration service</a></li>
-                        <a href="/project-install-guide/database/draft/">Database service</a></li>
                         <a href="/project-install-guide/container-infrastructure-management/draft/">Container Infrastructure Management service</a></li>
                         <a href="/draft/install-guide-debian/launch-instance.html">Launch an instance</a></li>
                     </div>
diff --git a/www/project-install-guide/newton/index.html b/www/project-install-guide/newton/index.html
index 45ac8fdd30..e0c28399c8 100644
--- a/www/project-install-guide/newton/index.html
+++ b/www/project-install-guide/newton/index.html
@@ -24,7 +24,7 @@
             <div class="row docs-toc">
                 <div class="col-lg-6 col-md-6 col-sm-6">
                     <div class="docs-link-sections">
-                        <h3><i class="fa fa-cogs"></i>Newton Installation Tutorial for Debian with debconf</h3>
+                        <h3><i class="fa fa-cogs"></i>Newton Installation Tutorial for Debian 8 with debconf</h3>
                         <a href="/newton/install-guide-debconf/">Abstract</a></li>
                         <a href="/newton/install-guide-debconf/common/conventions.html">Conventions</a></li>
                         <a href="/newton/install-guide-debconf/overview.html">Overview</a></li>
@@ -35,14 +35,11 @@
                         <a href="/newton/install-guide-debconf/neutron.html">Networking service</a></li>
                         <a href="/newton/install-guide-debconf/horizon.html">Dashboard</a></li>
                         <a href="/newton/install-guide-debconf/cinder.html">Block Storage service</a></li>
-                        <a href="/project-install-guide/shared-file-systems/newton/">Shared File Systems service</a></li>
-                        <a href="/project-install-guide/object-storage/newton/">Object Storage service</a></li>
                         <a href="/project-install-guide/orchestration/newton/">Orchestration service</a></li>
-                        <a href="/project-install-guide/database/newton/">Database service</a></li>
                         <a href="/newton/install-guide-debconf/launch-instance.html">Launch an instance</a></li>
                     </div>
                     <div class="docs-link-sections">
-                        <h3><i class="fa fa-cogs"></i>Newton Installation Tutorial for Debian</h3>
+                        <h3><i class="fa fa-cogs"></i>Newton Installation Tutorial for Debian 8</h3>
                         <a href="/newton/install-guide-debian/">Abstract</a></li>
                         <a href="/newton/install-guide-debian/common/conventions.html">Conventions</a></li>
                         <a href="/newton/install-guide-debian/overview.html">Overview</a></li>
@@ -55,8 +52,6 @@
                         <a href="/newton/install-guide-debian/cinder.html">Block Storage service</a></li>
                         <a href="/project-install-guide/shared-file-systems/newton/">Shared File Systems service</a></li>
                         <a href="/project-install-guide/object-storage/newton/">Object Storage service</a></li>
-                        <a href="/project-install-guide/orchestration/newton/">Orchestration service</a></li>
-                        <a href="/project-install-guide/database/newton/">Database service</a></li>
                         <a href="/project-install-guide/container-infrastructure-management/newton/">Container Infrastructure Management service</a></li>
                         <a href="/newton/install-guide-debian/launch-instance.html">Launch an instance</a></li>
                     </div>
diff --git a/www/www-index.html b/www/www-index.html
index 3819199134..590c262aab 100644
--- a/www/www-index.html
+++ b/www/www-index.html
@@ -11,6 +11,7 @@
 <li><a href="www/developer/openstack-projects.html">/developer/openstack-projects.html</a></li>
 <li><a href="www/ops/index.html">/ops/index.html</a></li>
 <li><a href="www/project-install-guide/draft/index.html">/project-install-guide/draft/index.html</a></li>
+<li><a href="www/project-install-guide/newton/index.html">/project-install-guide/newton/index.html</a></li>
 <li><a href="www/sec/index.html">/sec/index.html</a></li>
 <li><a href="www/training_labs/index.html">/training_labs/index.html</a></li>
 <!-- release -->