diff --git a/doc/source/admin/networking-nova.rst b/doc/source/admin/networking-nova.rst
index b1aa9fcbba61..4e36ed7e967a 100644
--- a/doc/source/admin/networking-nova.rst
+++ b/doc/source/admin/networking-nova.rst
@@ -2,7 +2,7 @@
 Networking with nova-network
 ============================
 
-.. important::
+.. deprecated:: 14.0.0
 
    ``nova-network`` was deprecated in the OpenStack Newton release.  In Ocata
    and future releases, you can start ``nova-network`` only with a cells v1
diff --git a/doc/source/cli/nova-cells.rst b/doc/source/cli/nova-cells.rst
index a2f69ce544f4..2ec08b9f7e62 100644
--- a/doc/source/cli/nova-cells.rst
+++ b/doc/source/cli/nova-cells.rst
@@ -26,7 +26,8 @@ Starts the `nova-cells` service.
 The `nova-cells` service handles communication between cells and selects cells
 for new instances.
 
-.. warning:: Everything in this document is referring to Cells v1, which is
+.. deprecated:: 16.0.0
+    Everything in this document is referring to Cells v1, which is
     not recommended for new deployments and is deprecated in favor of Cells v2
     as of the 16.0.0 Pike release. For information about commands to use
     with Cells v2, see the man page for :ref:`man-page-cells-v2`.
diff --git a/doc/source/cli/nova-network.rst b/doc/source/cli/nova-network.rst
index 1acb0f5a6f7a..d3b8f7273c8d 100644
--- a/doc/source/cli/nova-network.rst
+++ b/doc/source/cli/nova-network.rst
@@ -24,7 +24,7 @@ Description
 `nova-network` is a server daemon that serves the Nova Network service, which
 is responsible for allocating IPs and setting up the network
 
-.. warning::
+.. deprecated:: 14.0.0
 
    `nova-network` is deprecated and will be removed in an upcoming release. Use
    `neutron` or another networking solution instead.
diff --git a/doc/source/user/cells.rst b/doc/source/user/cells.rst
index 923b85116681..a838ce0c5b41 100644
--- a/doc/source/user/cells.rst
+++ b/doc/source/user/cells.rst
@@ -40,8 +40,8 @@ See `Comparison with Cells V1`_ for more detail.
 Status
 ~~~~~~
 
-.. warning:: Cells v1 is deprecated in favor of Cells v2 as of the
-             16.0.0 Pike release.
+.. deprecated:: 16.0.0
+    Cells v1 is deprecated in favor of Cells v2 as of the 16.0.0 Pike release.
 
 Cells v1 is considered experimental and receives much less testing than the
 rest of Nova. For example, there is no job for testing cells v1 with Neutron.
@@ -576,8 +576,11 @@ FAQs
    There are a couple of ways to do this.
 
    1. Run ``nova-manage --config-file <cell config> host list``. This will
-      only lists hosts in the provided cell nova.conf. Note, however, that
-      this command is deprecated as of the 16.0.0 Pike release.
+      only lists hosts in the provided cell nova.conf.
+
+      .. deprecated:: 16.0.0
+         The ``nova-manage host list`` command is deprecated as of the
+         16.0.0 Pike release.
 
    2. Run ``nova-manage cell_v2 discover_hosts --verbose``. This does not
       produce a report but if you are trying to determine if a host is in a