Merge branch 'MicrosoftDocs:main' into patch-13

Author: jasongroce

articles/active-directory/authentication/concept-certificate-based-authentication-technical-deep-dive.md

@@ -76,16 +76,16 @@ Now we'll walk through each step:
 
 Azure AD CBA supports second factors to meet MFA requirements with single-factor certificates. Users can use either passwordless sign-in or FIDO2 security keys as second factors when the first factor is single-factor CBA. Users need to register passwordless sign-in or FIDO2 in advance to signing in with Azure AD CBA.
 
-** Steps to set up passwordless phone signin(PSI) with CBA
+**Steps to set up passwordless phone signin(PSI) with CBA**
 
 For passwordless sign-in to work, users should disable legacy notification through mobile app.
 
 1. Sign in to the [Azure portal](https://portal.azure.com).
 
 1. Follow the steps at [Enable passwordless phone sign-in authentication](../authentication/howto-authentication-passwordless-phone.md#enable-passwordless-phone-sign-in-authentication-methods)
 
->[!IMPORTANT]
->In the above configuration under step 4, please choose **Passwordless** option. Change the mode for each groups added for PSI for **Authentication mode**, choose  **Passwordless** for passwordless sign-in to work with CBA.
+   >[!IMPORTANT]
+   >In the above configuration under step 4, please choose **Passwordless** option. Change the mode for each groups added for PSI for **Authentication mode**, choose      **Passwordless** for passwordless sign-in to work with CBA.
 
 1. Select **Azure Active Directory** > **Security** > **Multifactor authentication** > **Additional cloud-based multifactor authentication settings**.
 

articles/azure-functions/functions-premium-plan.md

@@ -256,32 +256,32 @@ See the complete regional availability of Functions on the [Azure web site](http
 |East Asia| 100 | 20 |
 |East US | 100 | 100 |
 |East US 2| 100 | 100 |
-|France Central| 100 | 20 |
+|France Central| 100 | 60 |
 |Germany West Central| 100 | 20 |
 |Japan East| 100 | 20 |
 |Japan West| 100 | 20 |
 |Jio India West| 100 | 20 |
 |Korea Central| 100 | 20 |
 |Korea South| Not Available | 20 |
 |North Central US| 100 | 20 |
-|North Europe| 100 | 80 |
+|North Europe| 100 | 100 |
 |Norway East| 100 | 20 |
 |South Africa North| 100 | 20 |
-|South Central US| 100 | 60 |
+|South Central US| 100 | 100 |
 |South India | 100 | Not Available |
 |Southeast Asia| 100 | 20 |
 |Switzerland North| 100 | 20 |
 |Switzerland West| 100 | 20 |
 |UAE North| 100 | 20 |
-|UK South| 100 | 60 |
+|UK South| 100 | 100 |
 |UK West| 100 | 20 |
 |USGov Arizona| 100 | 20 |
 |USGov Texas| 100 | Not Available |
 |USGov Virginia| 100 | 20 |
 |West Central US| 100 | 20 |
 |West Europe| 100 | 100 |
 |West India| 100 | 20 |
-|West US| 100 | 40 |
+|West US| 100 | 100 |
 |West US 2| 100 | 20 |
 |West US 3| 100 | 20 |
 

articles/azure-maps/how-to-dev-guide-js-sdk.md

@@ -62,7 +62,7 @@ mapsDemo
 
 | Service Name  | npm packages            |  Samples     |
 |---------------|-------------------------|--------------|
-| [Search][search readme] | [@azure/maps-search][search package] | [search samples][search sample] |
+| [Search][search readme] | [@azure-rest/maps-search][search package] | [search samples][search sample] |
 | [Route][js route readme] | [@azure-rest/maps-route][js route package] | [route samples][js route sample] |
 | [Render][js render readme] | [@azure-rest/maps-render][js render package]|[render sample][js render sample] |
 | [Geolocation][js geolocation readme]|[@azure-rest/maps-geolocation][js geolocation package]|[geolocation sample][js geolocation sample] |
@@ -381,9 +381,9 @@ main().catch((err) => {
 [Host daemon]: ./how-to-secure-daemon-app.md#host-a-daemon-on-non-azure-resources
 [dotenv]: https://github.com/motdotla/dotenv#readme
 
-[search package]: https://www.npmjs.com/package/@azure/maps-search
-[search readme]: https://github.com/Azure/azure-sdk-for-js/blob/main/sdk/maps/maps-search/README.md
-[search sample]: https://github.com/Azure/azure-sdk-for-js/tree/main/sdk/maps/maps-search/samples/v1-beta
+[search package]: https://www.npmjs.com/package/@azure-rest/maps-search
+[search readme]: https://github.com/Azure/azure-sdk-for-js/blob/main/sdk/maps/maps-search-rest/README.md
+[search sample]: https://github.com/Azure/azure-sdk-for-js/tree/main/sdk/maps/maps-search-rest/samples/v1-beta
 
 [js route readme]: https://github.com/Azure/azure-sdk-for-js/blob/main/sdk/maps/maps-route-rest/README.md
 [js route package]: https://www.npmjs.com/package/@azure-rest/maps-route

articles/azure-maps/rest-sdk-developer-guide.md

@@ -102,9 +102,9 @@ For more information, see the [Java SDK Developers Guide](how-to-dev-guide-java-
 
 <!--  JavaScript/TypeScript SDK Developers Guide  --->
 [Node.js]: https://nodejs.org/en/download/
-[js search readme]: https://github.com/Azure/azure-sdk-for-js/blob/main/sdk/maps/maps-search/README.md
-[js search package]: https://www.npmjs.com/package/@azure/maps-search
-[js search sample]: https://github.com/Azure/azure-sdk-for-js/tree/main/sdk/maps/maps-search/samples/v1-beta/javascript
+[js search readme]: https://github.com/Azure/azure-sdk-for-js/blob/main/sdk/maps/maps-search-rest/README.md
+[js search package]: https://www.npmjs.com/package/@azure-rest/maps-search
+[js search sample]: https://github.com/Azure/azure-sdk-for-js/tree/main/sdk/maps/maps-search-rest/samples/v1-beta/javascript
 
 [js route readme]: https://github.com/Azure/azure-sdk-for-js/blob/main/sdk/maps/maps-route-rest/README.md
 [js route package]: https://www.npmjs.com/package/@azure-rest/maps-route

articles/azure-monitor/snapshot-debugger/snapshot-debugger-app-service.md

@@ -6,17 +6,16 @@ ms.author: hannahhunter
 author: hhunter-ms
 ms.reviewer: charles.weininger
 reviewer: cweining
-ms.date: 08/18/2022
+ms.date: 01/24/2023
 ms.custom: devdivchpfy22
 ---
 
 # Enable Snapshot Debugger for .NET apps in Azure App Service
 
 Snapshot Debugger currently supports ASP.NET and ASP.NET Core apps that are running on Azure App Service on Windows service plans.
 
-We recommend that you run your application on the Basic service tier, or higher, when using Snapshot Debugger.
-
-For most applications, the Free and Shared service tiers don't have enough memory or disk space to save snapshots.
+> [!NOTE]
+> We recommend that you run your application on the Basic service tier, or higher, when using Snapshot Debugger. For most applications, the Free and Shared service tiers don't have enough memory or disk space to save snapshots. The Consumption tier is not currently available for Snapshot Debugger.
 
 ## <a id="installation"></a> Enable Snapshot Debugger
 

articles/azure-vmware/deploy-arc-for-azure-vmware-solution.md

@@ -15,7 +15,7 @@ In this article, you'll learn how to deploy Arc for Azure VMware Solution. Once
 Before you begin checking off the prerequisites, verify the following actions have been done:
 
 - You deployed an Azure VMware Solution private cluster. 
-- You have a connection to the Azure VMware Solution private cloud through your on-prem environment or your native Azure Virtual Network. 
+- You have a connection to the Azure VMware Solution private cloud through your on-premises environment or your native Azure Virtual Network. 
 - There should be an isolated NSX-T Data Center segment for deploying the Arc for Azure VMware Solution Open Virtualization Appliance (OVA). If an isolated NSX-T Data Center segment doesn't exist, one will be created.
 
 ## Prerequisites 
@@ -35,7 +35,7 @@ The following items are needed to ensure you're set up to begin the onboarding p
 > [!NOTE]
 > Only the default port of 443 is supported. If you use a different port, Appliance VM creation will fail. 
 
-At this point, you should have already deployed an Azure VMware Solution private cloud. You need to have a connection from your on-prem environment or your native Azure Virtual Network to the Azure VMware Solution private cloud.
+At this point, you should have already deployed an Azure VMware Solution private cloud. You need to have a connection from your on-premises environment or your native Azure Virtual Network to the Azure VMware Solution private cloud.
 
 For Network planning and setup, use the [Network planning checklist - Azure VMware Solution | Microsoft Docs](./tutorial-network-checklist.md)
 
@@ -93,7 +93,7 @@ Use the following steps to guide you through the process to onboard in Arc for A
     - `GatewayIPAddress` is the gateway for the segment for Arc appliance VM. 
     - `applianceControlPlaneIpAddress` is the IP address for the Kubernetes API server that should be part of the segment IP CIDR provided. It shouldn't be part of the k8s node pool IP range.  
     - `k8sNodeIPPoolStart`, `k8sNodeIPPoolEnd` are the starting and ending IP of the pool of IPs to assign to the appliance VM. Both need to be within the `networkCIDRForApplianceVM`. 
-    - `k8sNodeIPPoolStart`, `k8sNodeIPPoolEnd`, `gatewayIPAddress` ,`applianceControlPlaneIpAddress` are optional. You may choose to skip all the optional fields or provide values for all. If you choose not to provide the optional fields then you must use /28 address space for `networkCIDRForApplianceVM`
+    - `k8sNodeIPPoolStart`, `k8sNodeIPPoolEnd`, `gatewayIPAddress` ,`applianceControlPlaneIpAddress` are optional. You may choose to skip all the optional fields or provide values for all. If you choose not to provide the optional fields, then you must use /28 address space for `networkCIDRForApplianceVM`
 
     **Json example**
     ```json
@@ -306,9 +306,9 @@ When the extension installation steps are completed, they trigger deployment and
 
 ## Change Arc appliance credential
 
-When **cloudadmin** credentials are updated, use the following steps to update the credentials in the appliance store.
+When **cloud admin** credentials are updated, use the following steps to update the credentials in the appliance store.
 
-1. Log into the jumpbox VM from where onboarding was performed. Change the directory to **onboarding directory**.
+1. Log in to the jumpbox VM from where onboarding was performed. Change the directory to **onboarding directory**.
 1. Run the following command for Windows-based jumpbox VM.
 
     `./.temp/.env/Scripts/activate`
@@ -344,7 +344,7 @@ Use the following steps to perform a manual upgrade for Arc appliance virtual ma
     1. Power off the VM.
     1. Delete the VM.
 1. Delete the download template corresponding to the VM.
-1. Delete the resource bridge ARM resource.
+1. Delete the resource bridge Azure Resource Manager resource.
 1. Get the previous script `Config_avs` file and add the following configuration item:
     1. `"register":false`
 1. Download the latest version of the Azure VMware Solution onboarding script.
@@ -361,7 +361,7 @@ Use the following steps to uninstall extensions from the portal.
 >[!NOTE]
 >**Steps 2-5** must be performed for all the VMs that have VM extensions installed.
 
-1. Log into your Azure VMware Solution private cloud. 
+1. Log in to your Azure VMware Solution private cloud. 
 1. Select **Virtual machines** in **Private cloud**, found in the left navigation under “Arc-enabled VMware resources”.
 1. Search and select the virtual machine where you have **Guest management** enabled.
 1. Select **Extensions**.
@@ -401,9 +401,9 @@ For the final step, you'll need to delete the resource bridge VM and the VM temp
 
 ## Preview FAQ
 
-**Is Arc supported in all the Azure VMware Solution regions?**
+**Region support for Azure VMware Solution**
 
-Arc is supported in EastUS, WestEU, UK South, Australia East, Canada Central and Southeast Asia regions however we are working to extend the regional support.
+Arc for Azure VMware Solution is supported in all regions where Arc for VMware vSphere on-premises is supported. For more details, see [Azure Arc-enabled VMware vSphere](https://learn.microsoft.com/azure/azure-arc/vmware-vsphere/overview).
 
 **How does support work?**
 
@@ -419,7 +419,7 @@ Yes
 
 **Is DHCP support available?**
 
-DHCP support is not available to customers at this time, we only support static IP.
+DHCP support isn't available to customers at this time, we only support static IP.
 
 >[!NOTE]
 > This is Azure VMware Solution 2.0 only. It's not available for Azure VMware Solution by Cloudsimple.

articles/container-instances/TOC.yml

@@ -4,6 +4,8 @@
   items:
   - name: About Azure Container Instances
     href: container-instances-overview.md
+  - name: Resources and Quota Limits
+    href: container-instances-resource-and-quota-limits.md
 - name: Quickstarts
   expanded: true
   items:
@@ -53,10 +55,8 @@
   items:
   - name: Container groups
     href: container-instances-container-groups.md
-  - name: Quotas and limits
-    href: container-instances-quotas.md
-  - name: Region availability
-    href: container-instances-region-availability.md
+  - name: Region and resource availability
+    href: container-instances-resource-and-quota-limits.md
   - name: Relationship to orchestrators
     href: container-instances-orchestrator-relationship.md
   - name: Security
@@ -185,7 +185,7 @@
   - name: Build your skills with Microsoft Learn training
     href: /training/browse/?products=azure-container-instances
   - name: Region availability
-    href: https://azure.microsoft.com/regions/services/
+    href: https://azure.microsoft.com/en-us/explore/global-infrastructure/products-by-region/?products=container-instances
   - name: Pricing
     href: https://azure.microsoft.com/pricing/details/container-instances/
   - name: Roadmap

articles/container-instances/container-instances-resource-and-quota-limits.md

@@ -0,0 +1,122 @@
+---
+title: Resource availability & quota limits for ACI
+description: Availability and quota limits of compute and memory resources for the Azure Container Instances service in different Azure regions.
+ms.author: tomcassidy
+author: tomvcassidy
+ms.service: container-instances
+services: container-instances
+ms.topic: conceptual
+ms.date: 1/19/2023
+ms.custom: references_regions
+
+---
+# Resource availability & quota limits for ACI
+
+This article details the availability and quota limits of Azure Container Instances compute, memory, and storage resources in Azure regions and by target operating system. For a general list of available regions for Azure Container Instances, see [available regions](https://azure.microsoft.com/regions/services/). 
+
+Values presented are the maximum resources available per deployment of a [container group](container-instances-container-groups.md). Values are current at time of publication. 
+
+> [!NOTE] 
+> Container groups created within these resource limits are subject to availability within the deployment region. When a region is under heavy load, you may experience a failure when deploying instances. To mitigate such a deployment failure, try deploying instances with lower resource settings, or try your deployment at a later time or in a different region with available resources. 
+
+## Default Quota Limits 
+
+All Azure services include certain default limits and quotas for resources and features. This section details the default quotas and limits for Azure Container Instances.  
+
+Use the [List Usage](/rest/api/container-instances/location/listusage) API to review current quota usage in a region for a subscription. 
+
+Certain default limits and quotas can be increased. To request an increase of one or more resources that support such an increase, please submit an [Azure support request][azure-support] (select "Quota" for **Issue type**). 
+
+> [!IMPORTANT]  
+> Not all limit increase requests are guaranteed to be approved.
+> Deployments with GPU resources are not supported in an Azure virtual network deployment and are only available on Linux container groups.
+> Using GPU resources (preview) is not fully supported yet and any support is provided on a best-effort basis.
+
+### Unchangeable (Hard) Limits 
+
+The following limits are default limits that can’t be increased through a quota request. Any quota increase requests for these limits will not be approved.  
+
+| Resource | Actual Limit | 
+| --- | :--- | 
+| Number of containers per container group | 60 | 
+| Number of volumes per container group | 20 | 
+| Ports per IP | 5 | 
+| Container instance log size - running instance | 4 MB | 
+| Container instance log size - stopped instance | 16 KB or 1,000 lines | 
+
+
+### Changeable Limits (Eligible for Quota Increases) 
+
+| Resource | Actual Limit | 
+| --- | :--- | 
+| Standard sku container groups per region per subscription | 100 | 
+| Standard sku cores (CPUs) per region per subscription | 100 | 
+| Standard sku cores (CPUs) for K80 GPU per region per subscription | 0 | 
+| Standard sku cores (CPUs) for V100 GPU per region per subscription | 0 | 
+| Container group creates per hour |300<sup>1</sup> | 
+| Container group creates per 5 minutes | 100<sup>1</sup> | 
+| Container group deletes per hour | 300<sup>1</sup> | 
+| Container group deletes per 5 minutes | 100<sup>1</sup> | 
+
+## Standard Core Resources 
+
+### Linux Container Groups 
+
+By default, the following resources are available general purpose (standard core SKU) containers in general deployments and [Azure virtual network](container-instances-vnet.md) deployments) for Linux & Windows containers. 
+
+| Max CPU | Max Memory (GB) | VNET Max CPU | VNET Max Memory (GB) | Storage (GB) | 
+| :---: | :---: | :----: | :-----: | :-------: |
+| 4 | 16 | 4 | 16 | 50 | 
+
+For a general list of available regions for Azure Container Instances, see [available regions](https://azure.microsoft.com/regions/services/). 
+
+### Windows Containers 
+
+The following regions and maximum resources are available to container groups with [supported and preview](./container-instances-faq.yml) Windows Server containers. 
+
+#### Windows Server 2019 LTSC 
+
+> [!NOTE] 
+> 1B and 2B hosts have been deprecated for Windows Server 2019 LSTC. See [Host and container version compatibility](/virtualization/windowscontainers/deploy-containers/update-containers#host-and-container-version-compatibility) for more information on 1B, 2B, and 3B hosts. 
+
+The following resources are available in all Azure Regions supported by Azure Container Instances. For a general list of available regions for Azure Container Instances, see [available regions](https://azure.microsoft.com/regions/services/). 
+
+| 3B Max CPU | 3B Max Memory (GB) | Storage (GB) | Availability Zone support | 
+| :----: | :-----: | :-------: | 
+| 4 | 16 | 20 | Y | 
+
+## GPU Resources (Preview) 
+
+> [!IMPORTANT]  
+> Not all limit increase requests are guaranteed to be approved.
+> Deployments with GPU resources are not supported in an Azure virtual network deployment and are only available on Linux container groups.
+> Using GPU resources (preview) is not fully supported yet and any support is provided on a best-effort basis.
+
+The following maximum resources are available to a container group deployed with [GPU resources](container-instances-gpu.md) (preview). 
+
+| GPU SKUs | GPU count | Max CPU | Max Memory (GB) | Storage (GB) | 
+| --- | --- | --- | --- | --- | 
+| K80 | 1 | 6 | 56 | 50 | 
+| K80 | 2 | 12 | 112 | 50 | 
+| K80 | 4 | 24 | 224 | 50 | 
+| P100, V100 | 1 | 6 | 112 | 50 | 
+| P100, V100 | 2 | 12 | 224 | 50 | 
+| P100, V100 | 4 | 24 | 448 | 50 | 
+
+## Next steps 
+
+Certain default limits and quotas can be increased. To request an increase of one or more resources that support such an increase, please submit an [Azure support request][azure-support] (select "Quota" for **Issue type**). 
+
+Let the team know if you'd like to see additional regions or increased resource availability at [aka.ms/aci/feedback](https://aka.ms/aci/feedback). 
+
+For information on troubleshooting container instance deployment, see [Troubleshoot deployment issues with Azure Container Instances](container-instances-troubleshooting.md) 
+
+<!-- LINKS - External --> 
+
+[az-region-support]: ../availability-zones/az-overview.md#regions 
+
+[azure-support]: https://portal.azure.com/#blade/Microsoft_Azure_Support/HelpAndSupportBlade/newsupportrequest 
+
+ 
+
+