diff --git a/edge_deployment/fabric_switch_bootstrap.rst b/edge_deployment/fabric_switch_bootstrap.rst
index bb5b038..d40a878 100644
--- a/edge_deployment/fabric_switch_bootstrap.rst
+++ b/edge_deployment/fabric_switch_bootstrap.rst
@@ -2,8 +2,14 @@
    SPDX-FileCopyrightText: © 2020 Open Networking Foundation <support@opennetworking.org>
    SPDX-License-Identifier: Apache-2.0
 
-Fabric Switch Bootstrap
-=======================
+Fabric Switch Bootstrap (Beta)
+==============================
+
+.. note::
+
+   Fabric switches running the P4 UPF is a beta feature of the Aether 1.5
+   release, and the hardware and software setup is not required if using the
+   BESS UPF.
 
 The installation of the ONL OS image on the fabric switches uses the DHCP and
 HTTP server set up on the management server.
diff --git a/edge_deployment/overview.rst b/edge_deployment/overview.rst
index c78e99c..216740c 100644
--- a/edge_deployment/overview.rst
+++ b/edge_deployment/overview.rst
@@ -79,9 +79,9 @@
 BESS-based Network Topology
 ---------------------------
 
-The :doc:`Software-only BESS UPF
-</edge_deployment/bess_upf_deployment>`, which can be used for deployments that
-do not have P4 switching hardware.
+The :doc:`Software-only BESS UPF </edge_deployment/bess_upf_deployment>`, is
+supported for production use in the Aether 1.5 release.  This UPF can be used
+for deployments that do not have P4 switching hardware.
 
 .. image:: images/edge_mgmt_only.svg
    :alt: BESS network topology
@@ -97,6 +97,12 @@
 P4-based Network Topology
 -------------------------
 
+.. note::
+
+  The P4-based SD-Fabric UPF is an advanced feature and is of beta quality in
+  the Aether 1.5 release.  It requires one or more P4-capable switches using
+  the Tofino chipset.
+
 If only a single P4 switch is used, the :doc:`Simple
 <trellis:supported-topology>` topology can be used, but provides no network
 redundancy:
@@ -312,11 +318,11 @@
 Some quantities are dependent on other quantities - for example, the number of
 DAC cables frequently depends on the number of servers in use.
 
-These BOMs do not include UE devices.  It's recommended that the testing
+These BoMs do not include UE devices.  It's recommended that the testing
 hardware given above be added to every BoM for monitoring purposes.
 
 
-BESS UPF Testing BOM
+BESS UPF Testing BoM
 """"""""""""""""""""
 
 The following is the minimum BoM required to run Aether with the BESS UPF.
@@ -332,7 +338,7 @@
 Sufficient   Cat6 Network Cabling  Between all equipment
 ============ ===================== ===============================================
 
-P4 UPF Testing BOM
+P4 UPF Testing BoM
 """"""""""""""""""
 
 ============ ===================== ===============================================
@@ -351,7 +357,7 @@
 Sufficient   Cat6 Network Cabling  Between all equipment
 ============ ===================== ===============================================
 
-P4 UPF Paired Leaves BOM
+P4 UPF Paired Leaves BoM
 """"""""""""""""""""""""
 
 ============ ===================== ===============================================
@@ -372,7 +378,7 @@
 ============ ===================== ===============================================
 
 
-P4 UPF 2x2 Leaf Spine Fabric BOM
+P4 UPF 2x2 Leaf Spine Fabric BoM
 """"""""""""""""""""""""""""""""
 
 ============ ===================== ===============================================
diff --git a/edge_deployment/sdfabric_deployment.rst b/edge_deployment/sdfabric_deployment.rst
index c587701..4f2ba48 100644
--- a/edge_deployment/sdfabric_deployment.rst
+++ b/edge_deployment/sdfabric_deployment.rst
@@ -2,8 +2,13 @@
    SPDX-FileCopyrightText: © 2020 Open Networking Foundation <support@opennetworking.org>
    SPDX-License-Identifier: Apache-2.0
 
-SD-Fabric Deployment
-====================
+SD-Fabric Deployment (Beta)
+===========================
+
+.. note::
+
+   SD-Fabric using the P4 UPF is a beta feature in the Aether 1.5 release, and
+   the hardware and software setup is not required if using the BESS UPF.
 
 Update aether-pod-configs
 -------------------------
diff --git a/edge_deployment/site_planning.rst b/edge_deployment/site_planning.rst
index 9c36a97..278a50e 100644
--- a/edge_deployment/site_planning.rst
+++ b/edge_deployment/site_planning.rst
@@ -5,6 +5,21 @@
 Site Planning
 =============
 
+Planning an edge site generally happens in three phases:
+
+1. A BoM of equipment is defined, then purchased.
+
+2. The equipment is delivered and inventoried. This usually is done by the edge
+   site, and involves collecting information like the serial numbers, MAC
+   addresses and other details about the specific pieces of equipment being
+   installed.
+
+3. ONF Staff enters this information into Netbox, which is used to generate
+   configuration for the edge site and document the configuration.
+
+This document describes the 3rd phase, and exists primarily as a reference for
+ONF Staff.
+
 Site Design in Netbox
 ---------------------