Merge pull request #183138 from jaidharosenblatt/apipa-change

Document support for multiple BGP APIPA (Don't merge)

Author: laurabren

articles/vpn-gateway/bgp-howto.md

@@ -76,7 +76,7 @@ In this step, you create a VPN gateway with the corresponding BGP parameters.
 
    * The **Azure APIPA BGP IP address** field is optional. If your on-premises VPN devices use APIPA address for BGP, you must select an address from the Azure-reserved APIPA address range for VPN, which is from **169.254.21.0** to **169.254.22.255**. This example uses 169.254.21.11.
 
-   * If you are creating an active-active VPN gateway, the BGP section will show an additional **Second Custom Azure APIPA BGP IP address**. From the allowed APIPA range (**169.254.21.0** to **169.254.22.255**), select another IP address. The second IP address must be different than the first address.
+   * If you are creating an active-active VPN gateway, the BGP section will show an additional **Second Custom Azure APIPA BGP IP address**. Each address you select must be unique and be in the allowed APIPA range (**169.254.21.0** to **169.254.22.255**). Active-active gateways also support multiple addresses for both **Azure APIPA BGP IP address** and **Second Custom Azure APIPA BGP IP address**. Additional inputs will only appear after you enter your first APIPA BGP IP address.
 
    > [!IMPORTANT]
    >

articles/vpn-gateway/media/bgp-howto/create-gateway-1-bgp.png

@@ -48,11 +48,11 @@ These ASNs aren't reserved by IANA or Azure for use, and therefore can be used t
 
 By default, VPN Gateway allocates a single IP address from the *GatewaySubnet* range for active-standby VPN gateways, or two IP addresses for active-active VPN gateways. These addresses are allocated automatically when you create the VPN gateway. You can get the actual BGP IP address allocated by using PowerShell or by locating it in the Azure portal. In PowerShell, use **Get-AzVirtualNetworkGateway**, and look for the **bgpPeeringAddress** property. In the Azure portal, on the **Gateway Configuration** page, look under the **Configure BGP ASN** property.
 
-If your on-premises VPN routers use **APIPA** IP addresses (169.254.x.x) as the BGP IP addresses, you must specify an additional **Azure APIPA BGP IP address** on your Azure VPN gateway. Azure VPN Gateway selects the APIPA address to use with the on-premises APIPA BGP peer specified in the local network gateway, or the private IP address for a non-APIPA, on-premises BGP peer. For more information, see [Configure BGP](../articles/vpn-gateway/bgp-howto.md).
+If your on-premises VPN routers use **APIPA** IP addresses (169.254.x.x) as the BGP IP addresses, you must specify one or more **Azure APIPA BGP IP addresses** on your Azure VPN gateway. Azure VPN Gateway selects the APIPA addresses to use with the on-premises APIPA BGP peer specified in the local network gateway, or the private IP address for a non-APIPA, on-premises BGP peer. For more information, see [Configure BGP](../articles/vpn-gateway/bgp-howto.md).
 
 ### What are the requirements for the BGP peer IP addresses on my VPN device?
 
-Your on-premises BGP peer address must not be the same as the public IP address of your VPN device or from the virtual network address space of the VPN gateway. Use a different IP address on the VPN device for your BGP peer IP. It can be an address assigned to the loopback interface on the device (either a regular IP address or an APIPA address). If your device uses an APIPA address for BGP, you must specify an APIPA BGP IP address on your Azure VPN gateway, as described in [Configure BGP](../articles/vpn-gateway/bgp-howto.md). Specify this address in the corresponding local network gateway representing the location.
+Your on-premises BGP peer address must not be the same as the public IP address of your VPN device or from the virtual network address space of the VPN gateway. Use a different IP address on the VPN device for your BGP peer IP. It can be an address assigned to the loopback interface on the device (either a regular IP address or an APIPA address). If your device uses an APIPA address for BGP, you must specify one or more APIPA BGP IP addresses on your Azure VPN gateway, as described in [Configure BGP](../articles/vpn-gateway/bgp-howto.md). Specify these addresses in the corresponding local network gateway representing the location.
 
 ### What should I specify as my address prefixes for the local network gateway when I use BGP?