Merge branch 'master' of https://github.com/MicrosoftDocs/azure-docs-pr into ipv6gamarch-batch1

Author: KumudD

articles/availability-zones/TOC.yml

@@ -85,6 +85,10 @@
       items:
       - name: Create an Azure Active Directory Domain Services instance
         href: ../active-directory-domain-services/tutorial-create-instance.md
+  - name: Edge Zones Documentation
+    items:
+    - name: What are Edge Zones?
+      href: ../networking/edge-zones-overview.md
 - name: Disaster Recovery
   items:
   - name: Use Azure Site Recovery

articles/iot-edge/tutorial-deploy-function.md

@@ -28,9 +28,6 @@ You can use Azure Functions to deploy code that implements your business logic d
 ![Diagram - Tutorial architecture: stage and deploy function module](./media/tutorial-deploy-function/functions-architecture.png)
 </center>
 
->[!NOTE]
->Azure Function modules on Azure IoT Edge are in [public preview](https://azure.microsoft.com/support/legal/preview-supplemental-terms/).
-
 The Azure function that you create in this tutorial filters the temperature data that's generated by your device. The function only sends messages upstream to Azure IoT Hub when the temperature is above a specified threshold.
 
 [!INCLUDE [quickstarts-free-trial-note](../../includes/quickstarts-free-trial-note.md)]

articles/media-services/latest/limits-quotas-constraints.md

@@ -22,10 +22,10 @@ This article describes quotas and limitations in Azure Media Services v3.
 | --- | --- | 
 | Assets per Azure Media Services account | 1,000,000|
 | Dynamic Manifest Filters|100|
-| JobInputs per Job | 50  (fixed)|
-| JobOutputs per Job | 20 (fixed) |
-| TransformOutputs in a Transform | 20 (fixed) |
-| Files per JobInput|10 (fixed)|
+| Job inputs per Job | 50  (fixed)|
+| Job outputs per Job | 20 (fixed) |
+| Transform outputs in a Transform | 20 (fixed) |
+| Files per job input|10 (fixed)|
 | File size| In some scenarios, there is a limit on the maximum file size supported for processing in Media Services. <sup>(1)</sup> |
 | Jobs per Media Services account | 500,000 <sup>(2)</sup> (fixed)|
 | Live Events per Media Services account |5|

articles/networking/edge-zones-overview.md

@@ -0,0 +1,169 @@
+---
+title: About Azure Edge Zones - Preview
+description: Learn about edge computing offerings from Microsoft.
+services: vnf-manager
+author: cherylmc
+
+ms.service: vnf-manager
+ms.topic: article
+ms.date: 03/30/2020
+ms.author: cherylmc
+
+---
+
+# About Azure Edge Zones - Preview
+
+Azure Edge Zones is a family of offerings from Microsoft Azure that enables data processing close to the user. You can deploy VMs, containers, and other select Azure services into Edge Zones to address the low latency and high throughput requirements of applications.
+
+Typical use case scenarios for Edge Zones include:
+
+- Real-time command and control in robotics
+- Real-time analytics and inferencing with Artificial Intelligence and Machine Learning
+- Machine Vision
+- Remote rendering for mixed reality and VDI scenarios
+- Immersive multi-player gaming
+- Media streaming and content delivery
+- Surveillance and security
+
+Azure Edge Zones come in three discrete offerings:
+
+- Azure Edge Zones
+- Azure Edge Zones with Carrier
+- Azure Private Edge Zones
+
+## <a name="edge-zones"></a>Azure Edge Zones
+
+![Edge Zones](./media/edge-zones-overview/edge-zones.png "Edge zones")
+
+Azure Edge Zones are small footprint extensions of Azure placed in population centers that are far away from Azure regions. Azure Edge Zones support VMs, containers, and a select set of Azure services that let you run latency sensitive and throughput intensive applications close to end users. Azure Edge Zones are part of the Microsoft global network and offer secure, reliable, and high-bandwidth connectivity between applications running at the Edge Zone close to the user, and the full set of Azure services running within Azure regions. Azure Edge Zones are owned and operated by Microsoft and let you use the same set of Azure tools and portal to manage and deploy services into the Edge Zones.
+
+Typical use cases include:
+
+- Gaming and game streaming
+- Media streaming and content delivery
+- Real-time analytics and inferencing using artificial intelligence and machine learning
+- Rendering for mixed reality
+
+Azure Edge Zones will be available in the following metros:
+
+- New York, NY
+- Los Angeles, CA
+- Miami, FL
+
+[Reach out to the Edge Zones team](mailto:[email protected]) for more information.
+
+## <a name="carrier"></a>Azure Edge Zones with Carrier
+
+![Edge Zones with Carrier](./media/edge-zones-overview/edge-carrier.png "Edge Zones with Carrier")
+
+Azure Edge Zones with carrier are small footprint extensions of Azure placed in mobile operators' datacenters in population centers. Azure Edge Zones with carrier infrastructure is placed one hop away from the mobile operator's 5G network, offering sub-10 millisecond latency to applications from mobile devices. Azure Edge Zones with carrier is deployed in mobile operators' datacenters and are connected to the Microsoft global network. They offer secure, reliable, and high-bandwidth connectivity between applications running close to the user and the full set of Azure services running within Azure regions. Developers can use the same set of familiar tools to build and deploy services into the Edge Zones.
+
+Typical use cases include:
+
+- Gaming and game streaming
+- Media streaming and content delivery
+- Real-time analytics and inferencing using artificial intelligence and machine learning
+- Rendering for mixed reality
+- Connected automobiles
+- Telemedicine
+
+Edge Zones will be offered in partnership with the following operators:
+
+- AT&T (Atlanta, Dallas, and Los Angeles)
+- Etisalat
+- Rogers
+- Vodafone
+
+## <a name="private-edge-zones"></a>Azure Private Edge Zones
+
+![Private Edge Zones](./media/edge-zones-overview/private-edge.png "Private Edge Zones")
+
+Azure Private Edge Zones are small footprint extensions of Azure placed on-premises. Azure Private Edge Zones is based on the [Azure Stack Edge](https://azure.microsoft.com/products/azure-stack/edge/) platform and enables low latency access to computing and storage services deployed on-premises. Private Edge Zones also lets you deploy virtualized network functions (VNFs) such as mobile packet cores, routers, firewalls, and SD-WAN appliances, and applications from ISVS as [Azure managed applications](https://azure.microsoft.com/services/managed-applications/) side-by-side along with virtual machines and containers on-premises. Azure Private Edge Zones comes with a cloud-native orchestration solution that lets you manage the lifecycle of Virtualized Network Functions (VNF) and applications from the Azure portal.
+
+Azure Private Edge Zones lets you develop and deploy applications on-premises using the same familiar tools used to build and deploy applications in Azure. You can also run private mobile networks (private LTE, private 5G), security functions such as firewalls, and extend your on-premises networks across multiple branches and Azure using SD-WAN appliances on the same Private Edge Zone appliances and manage them from Azure.
+
+Typical use cases include:
+
+- Real-time command and control in robotics
+- Real-time analytics and inferencing with Artificial Intelligence and Machine Learning
+- Machine Vision
+- Remote rendering for mixed reality and VDI scenarios
+- Surveillance and security
+
+We have a rich ecosystem of VNF vendors, ISVs, and MSP partners to enable end-to-end solutions using Private Edge Zones. [Reach out to the Private Edge Zones team](mailto:[email protected]) for more information.
+
+## <a name="private-edge-partners"></a>Private Edge Zones - Partners
+
+![Private Edge Zone Partners](./media/edge-zones-overview/partners.png "Private Edge Zone Partners")
+
+### <a name="vnf"></a>Virtualized Network Functions (VNFs)
+
+#### <a name="vEPC"></a>Virtualized Evolved Packet Core (vEPC) for Mobile Networks
+
+- [Affirmed Networks](https://www.affirmednetworks.com/)
+- [Druid Software](https://www.druidsoftware.com/)
+- [Expeto](https://www.expeto.io/)
+- [Mavenir](https://mavenir.com/)
+- [Metaswitch](https://www.metaswitch.com/)
+- [Nokia Digital Automation Cloud](https://www.dac.nokia.com/)
+
+#### <a name="mobile-radio"></a>Mobile Radio Partners
+
+- [Commscope Ruckus](https://support.ruckuswireless.com/)
+
+#### <a name="sdwan-vendors"></a>SD-WAN Vendors
+
+- [NetFoundry](https://netfoundry.io/)
+- [NuageNetworks from Nokia](https://www.nuagenetworks.net/)
+- [VMware SD-WAN by Velocloud](https://www.velocloud.com/)
+
+#### <a name="router-vendors"></a>Router Vendors
+
+- [Arista](https://www.arista.com/)
+
+[Reach out to the Private Edge Zones team](mailto:[email protected]) for more information on how to become a partner.
+
+#### <a name="firewall-vendors"></a>Firewall Vendors
+
+- Palo Alto Networks
+
+### <a name="msp-mobile"></a>Managed Solutions Providers - Mobile Operators and Global System Integrators
+
+| Global SIs and Operators | Mobile Operators |
+| --- | --- |
+| Amdocs                       | Etisalat             |
+| American Tower               | Rogers               |
+| Expeto                       | Singtel              |
+| Federated Wireless           | Vodafone             |
+| Infosys                      |      *                |
+| Tech Mahindra                |      *                |
+
+[Reach out to the Private Edge Zones team](mailto:[email protected]) for more information on how to become a partner.
+
+## <a name="solutions-private-edge"></a>Private Edge Zones - Solutions
+
+### <a name="private-mobile-private-edge"></a>Private Mobile Network on Private Edge Zones
+
+![Private Mobile Network on Private Edge Zones](./media/edge-zones-overview/mobile-networks.png "Private Mobile Network on Private Edge Zones")
+
+You can now deploy a private mobile network on private edge zones. Private mobile networks enable ultra-low latency, high capacity, and a reliable and secure wireless network that is required for business critical applications. Private mobile networks can enable scenarios such as command and control of automated guided vehicles (AGV) in a warehouse, real-time communication between robots in a smart factory and augmented realty, and virtual reality edge applications.
+
+The virtualized evolved packet core (vEPC) network function forms the brains of a private mobile network. You can now deploy a vEPC on Private Edge Zones. For a list of vEPC partners that are available on private edge zones, see [vEPC ISVs](#vEPC).
+
+Deploying a private mobile network solution on Private Edge Zones requires other components such as mobile access points, SIM cards, and other VNFs such as routers. Access to licensed or unlicensed spectrum is critical to setting up a private mobile network. Additionally, you may need help with RF planning, physical layout, installation, and support. For a list of partners, see [Mobile radio partners](#mobile-radio).
+
+Microsoft provides a partner ecosystem that can help with all aspects of this process – from planning the network, purchasing the required devices, setting up hardware, to managing the configuration from Azure. With a set of validated partners that are tightly integrated with Microsoft, you can be assured that the solution will be reliable and easy to use. You can focus on your core scenarios, while relying on Microsoft and its partners to help with the rest.
+
+### <a name="sdwan-private-edge"></a>SD-WAN on Private Edge Zones
+
+![SD-WAN on Private Edge Zones](./media/edge-zones-overview/sd-wan.png "SD-WAN on Private Edge Zones")
+ 
+SD-WAN as a technology lets you create enterprise-grade Wide Area Networks (WAN) with increased bandwidth, high-performance access to cloud, service insertion, reliability, policy management, and extensive network visibility. SD-WAN provides seamless branch office connectivity orchestrated from redundant central controllers, at lower cost of ownership.
+SD-WAN on Private Edge Zones lets you move away from capex-centric model, to a Software-as-a-service (SaaS) model to reduce IT budgets. You can use your choice of SD-WAN partners orchestrator or controller to enable new services and propagate them throughout the entire network immediately.
+
+## Next steps
+
+For more information, reach out to the following teams:
+
+* [Edge Zones team](mailto:[email protected])
+* [Private Edge Zones team](mailto:[email protected])