Merge branch '4.18' into 4.19

Author: DaanHoogland

source/installguide/configuration.rst

@@ -407,6 +407,9 @@ Basic Zone Configuration
 #. In a new zone, CloudStack adds the first pod for you. You can always
    add more pods later. For an overview of what a pod is, see :ref:`about-pods`
 
+.. note::
+   The network described below must be a subnet of the physical network marked as type "management".
+
    To configure the first pod, enter the following, then click Next:
 
    -  **Pod Name.** A name for the pod.
@@ -602,6 +605,9 @@ Core Zone
 #. In a new zone, CloudStack adds the first pod for you. You can always
    add more pods later. For an overview of what a pod is, see :ref:`about-pods`
 
+.. note::
+   The network described below must be a subnet of the physical network marked as type "management".
+
    To configure the first pod, enter the following, then click Next:
 
    -  **Pod Name.** (Obligatory) A name for the pod.
@@ -850,6 +856,9 @@ can add more pods at any time using the procedure in this section.
       Secondary Storage VMs, Console Proxy VMs, and DHCP. For more
       information, see System Reserved IP Addresses.
 
+.. note::
+   * The network described above must be a subnet of the management network.
+
 #. Click OK.
 
 

source/quickinstallationguide/qig.rst

@@ -730,6 +730,9 @@ will assign IPs from this range to system VMs. This will also be part of our loc
 
 #. End Reserved system IP - we will use ``172.16.10.30`` # (or e.g. 192.168.1.30)
 
+.. note::
+   * The network described above must be a subnet of the management network.
+
 Click "Next" to continue.
 
 Guest Traffic