Merge pull request #225588 from MicrosoftDocs/repo_sync_working_branch

huypub · web-flow · commit d6026ea0dfa7 · 2023-01-30T14:36:28.000-08:00
Confirm merge from repo_sync_working_branch to main to sync with https://github.com/MicrosoftDocs/azure-docs (branch main)
diff --git a/articles/active-directory-domain-services/tutorial-create-replica-set.md b/articles/active-directory-domain-services/tutorial-create-replica-set.md
@@ -100,7 +100,7 @@ The replica set reports as *Provisioning* as deployment continues, as shown in t
 
 ## Delete a replica set
 
-A managed domain is currently limited to four replicas - the initial replica set, and three additional replica sets. If you don't need a replica set anymore, or if you want to create a replica set in another region, you can delete unneeded replica sets.
+A managed domain is currently limited to five replicas - the initial replica set, and four additional replica sets. If you don't need a replica set anymore, or if you want to create a replica set in another region, you can delete unneeded replica sets.
 
 > [!IMPORTANT]
 > You can't delete either the last replica set or the initial replica set in a managed domain.
diff --git a/articles/active-directory/authentication/howto-mfa-reporting.md b/articles/active-directory/authentication/howto-mfa-reporting.md
@@ -143,7 +143,7 @@ The following additional information and reports are available for MFA events, i
 | Report | Location | Description |
 |:--- |:--- |:--- |
 | Blocked User History | Azure AD > Security > MFA > Block/unblock users | Shows the history of requests to block or unblock users. |
-| Usage for on-premises components | Azure AD > Security > MFA > Activity Report | Provides information on overall usage for MFA Server through the NPS extension, AD FS, and MFA Server. |
+| Usage for on-premises components | Azure AD > Security > MFA > Activity Report | Provides information on overall usage for MFA Server. NPS extension and AD FS logs for cloud MFA activity are now included in the [Sign-in logs](../reports-monitoring/concept-sign-ins.md), and no longer published on this report. |
 | Bypassed User History | Azure AD > Security > MFA > One-time bypass | Provides a history of MFA Server requests to bypass MFA for a user. |
 | Server status | Azure AD > Security > MFA > Server status | Displays the status of MFA Servers associated with your account. |
 
diff --git a/articles/aks/use-multiple-node-pools.md b/articles/aks/use-multiple-node-pools.md
@@ -150,6 +150,7 @@ You can add a Mariner node pool into your existing cluster using the `az aks nod
 az aks nodepool add \
     --resource-group myResourceGroup \
     --cluster-name myAKSCluster \
+    --name marinerpool \
     --os-sku CBLMariner
 ```
 
diff --git a/articles/aks/use-tags.md b/articles/aks/use-tags.md
@@ -38,6 +38,7 @@ It's a good idea to understand what happens when you set and update Azure tags w
 When you create or update an AKS cluster with the `--tags` parameter, the following are assigned the Azure tags that you've specified:
 
 * The AKS cluster
+* The node resource group
 * The route table that's associated with the cluster
 * The public IP that's associated with the cluster
 * The load balancer that's associated with the cluster
@@ -54,7 +55,7 @@ When you create or update an AKS cluster with the `--tags` parameter, the follow
 To create a cluster and assign Azure tags, run `az aks create` with the `--tags` parameter, as shown in the following command. Running the command creates a *myAKSCluster* in the *myResourceGroup* with the tags *dept=IT* and *costcenter=9999*.
 
 > [!NOTE]
-> To set tags on the initial node pool, the node resource group, the virtual machine scale set, and each virtual machine scale set instance that's associated with the initial node pool, also set the `--nodepool-tags` parameter.
+> To set tags on the initial node pool, the virtual machine scale set, and each virtual machine scale set instance that's associated with the initial node pool, also set the `--nodepool-tags` parameter.
 
 ```azurecli-interactive
 az aks create \
@@ -111,7 +112,6 @@ You can apply an Azure tag to a new or existing node pool in your AKS cluster. T
 When you create or update a node pool with the `--tags` parameter, the tags that you specify are assigned to the following resources:
 
 * The node pool
-* The node resource group
 * The virtual machine scale set and each virtual machine scale set instance that's associated with the node pool
 
 To create a node pool with an Azure tag, run `az aks nodepool add` with the `--tags` parameter. Running the following command creates a *tagnodepool* node pool with the tags *abtest=a* and *costcenter=5555* in the *myAKSCluster*.
diff --git a/articles/cognitive-services/cognitive-services-container-support.md b/articles/cognitive-services/cognitive-services-container-support.md
@@ -61,9 +61,9 @@ Azure Cognitive Services containers provide the following set of Docker containe
 > To use Speech containers, you will need to complete an [online request form](https://aka.ms/csgate).
 
 | Service |  Container | Description | Availability |
-|--|--|--|
+|--|--|--|--|
 | [Speech Service API][sp-containers-stt] |  **Speech-to-text** ([image](https://hub.docker.com/_/microsoft-azure-cognitive-services-speechservices-custom-speech-to-text)) | Transcribes continuous real-time speech into text. | Generally available. <br> This container can also [run in disconnected environments](containers/disconnected-containers.md). |
-| [Speech Service API][sp-containers-cstt] | **Custom Speech-to-text** ([image](https://hub.docker.com/_/microsoft-azure-cognitive-services-speechservices-custom-speech-to-text)) | Transcribes continuous real-time speech into text using a custom model. | Generally available |
+| [Speech Service API][sp-containers-cstt] | **Custom Speech-to-text** ([image](https://hub.docker.com/_/microsoft-azure-cognitive-services-speechservices-custom-speech-to-text)) | Transcribes continuous real-time speech into text using a custom model. | Generally available <br> This container can also [run in disconnected environments](containers/disconnected-containers.md). |
 | [Speech Service API][sp-containers-ntts] | **Neural Text-to-speech** ([image](https://hub.docker.com/_/microsoft-azure-cognitive-services-speechservices-neural-text-to-speech)) | Converts text to natural-sounding speech using deep neural network technology, allowing for more natural synthesized speech. | Generally available. <br> This container can also [run in disconnected environments](containers/disconnected-containers.md). |
 | [Speech Service API][sp-containers-lid] | **Speech language detection** ([image](https://hub.docker.com/_/microsoft-azure-cognitive-services-speechservices-language-detection)) | Determines the language of spoken audio. | Gated preview |
 
diff --git a/articles/cognitive-services/containers/disconnected-container-faq.yml b/articles/cognitive-services/containers/disconnected-container-faq.yml
@@ -19,9 +19,10 @@ sections:
         answer: |
           Azure Cognitive Services containers allow developers to use the same intelligent APIs that are available in Azure, but with the [benefits](../cognitive-services-container-support.md#features-and-benefits) of containerization. 
           Disconnected containers are offered through commitment tier pricing, each offering a discounted rate compared to the pay-as-you-go pricing model. With commitment tier pricing, you can commit to using the following Cognitive Services features for a fixed fee, enabling you to have a predictable total cost based on the needs of your workload.
-          * Speech services
-            *	Speech to Text (Standard)
-            * Neural Text to Speech
+          * Speech Services
+            *	Speech-to-Text
+            *	Custom Speech-to-Text
+            * Neural Text-to-Speech
           *	Text Translation (Standard)
           * Language Understanding (LUIS)
           *	Azure Cognitive Service for Language
@@ -128,8 +129,9 @@ sections:
           > To find the pricing information for disconnected containers on these pricing pages, scroll down to **Commitment Tiers** section.
 
           * [Speech Services](https://azure.microsoft.com/pricing/details/cognitive-services/speech-services/) for:
-            * Speech to Text (Standard)
-            * Neural Text to Speech
+            *	Speech-to-Text
+            *	Custom Speech-to-Text
+            * Neural Text-to-Speech
           * [Text Translation (Standard)](https://azure.microsoft.com/pricing/details/cognitive-services/translator/)
           * [Language Understanding (LUIS)](https://azure.microsoft.com/pricing/details/cognitive-services/language-understanding-intelligent-services/)
           *	[Azure Cognitive Service for Language pricing](https://azure.microsoft.com/pricing/details/cognitive-services/language-service/) for
@@ -149,8 +151,9 @@ sections:
           Cognitive Services containers are x64-based containers that can run any compatible Linux node, VM, and edge device that supports x64 Linux Docker containers. They all require CPU processors. You can find the minimum and recommended configurations for each container offering on these pages:
 
           * [Speech Services](../speech-service/speech-container-howto.md#host-computer-requirements-and-recommendations) for:
-            * Speech to Text (Standard)
-            * Neural Text to Speech
+            *	Speech-to-Text
+            *	Custom Speech-to-Text
+            * Neural Text-to-Speech
           * [Text Translation (Standard)](../translator/containers/translator-how-to-install-container.md#host-computer)
           * [Language Understanding (LUIS)](../luis/luis-container-howto.md#container-requirements-and-recommendations)
           *	Azure Cognitive Service for Language documentation for
diff --git a/articles/cognitive-services/containers/disconnected-containers.md b/articles/cognitive-services/containers/disconnected-containers.md
@@ -15,8 +15,9 @@ ms.author: aahi
 
 Containers enable you to run Cognitive Services APIs in your own environment, and are great for your specific security and data governance requirements. Disconnected containers enable you to use several of these APIs disconnected from the internet. Currently, the following containers can be run in this manner:
 
-* [Speech to Text (Standard)](../speech-service/speech-container-howto.md?tabs=stt)
-* [Neural Text to Speech](../speech-service/speech-container-howto.md?tabs=ntts)
+* [Speech-to-Text](../speech-service/speech-container-howto.md?tabs=stt)
+* [Custom Speech-to-Text](../speech-service/speech-container-howto.md?tabs=cstt)
+* [Neural Text-to-Speech](../speech-service/speech-container-howto.md?tabs=ntts)
 * [Text Translation (Standard)](../translator/containers/translator-how-to-install-container.md#host-computer)
 * [Language Understanding (LUIS)](../LUIS/luis-container-howto.md)
 * Azure Cognitive Service for Language
@@ -160,9 +161,9 @@ If you're using the [Translator container](../translator/containers/translator-h
 -e TRANSLATORSYSTEMCONFIG=/path/to/model/config/translatorsystemconfig.json
 ```
 
-#### Speech-to-text and Neural text-to-speech containers
+#### Speech-to-text, Custom Speech-to-Text and Neural text-to-speech containers
 
-The [speech-to-text](../speech-service/speech-container-howto.md?tabs=stt) and [neural text-to-speech](../speech-service/speech-container-howto.md?tabs=ntts) containers provide a default directory for writing the license file and billing log at runtime. The default directories are /license and /output respectively. 
+The [Speech-to-Text](../speech-service/speech-container-howto.md?tabs=stt), [Custom Speech-to-Text](../speech-service/speech-container-howto.md?tabs=cstt) and [Neural Text-to-Speech](../speech-service/speech-container-howto.md?tabs=ntts) containers provide a default directory for writing the license file and billing log at runtime. The default directories are /license and /output respectively. 
 
 When you're mounting these directories to the container with the `docker run -v` command, make sure the local machine directory is set ownership to `user:group nonroot:nonroot` before running the container.
 
diff --git a/articles/communication-services/concepts/detailed-call-flows.md b/articles/communication-services/concepts/detailed-call-flows.md
@@ -88,8 +88,8 @@ This topology is used by customers that use Communication Services from the clou
 The direction of the arrows on the above diagram reflect the initiation direction of the communication that affects connectivity at the enterprise perimeters. In the case of UDP for media, the first packet(s) may flow in the reverse direction, but these packets may be blocked until packets in the other direction are flowing.
 
 Flow descriptions:
-* Flow 2* – Represents a flow initiated by a user on the customer network to the Internet as a part of the user's Communication Services experience. Examples of these flows include DNS and peer-to-peer media transmission.
-* Flow 2 – Represents a flow initiated by a remote mobile Communication Services user, with VPN to the customer network.
+* Flow 2 – Represents a flow initiated by a user on the customer network to the Internet as a part of the user's Communication Services experience. Examples of these flows include DNS and peer-to-peer media transmission.
+* Flow 2` – Represents a flow initiated by a remote mobile Communication Services user, with VPN to the customer network.
 * Flow 3 – Represents a flow initiated by a remote mobile Communication Services user to Communication Services endpoints.
 * Flow 4 – Represents a flow initiated by a user on the customer network to Communication Services.
 * Flow 5 – Represents a peer-to-peer media flow between one Communication Services user and another within the customer network.
diff --git a/articles/container-apps/managed-identity.md b/articles/container-apps/managed-identity.md
@@ -170,6 +170,9 @@ With managed identities, an app can obtain tokens to access Azure resources that
 
 Container Apps provides an internally accessible [REST endpoint](managed-identity.md?tabs=cli%2Chttp#rest-endpoint-reference) to retrieve tokens. The REST endpoint can be accessed from within the app with a standard HTTP GET, which can be implemented with a generic HTTP client in every language. For .NET, JavaScript, Java, and Python, the Azure Identity client library provides an abstraction over this REST endpoint. Connecting to other Azure services is as simple as adding a credential object to the service-specific client.
 
+> [!NOTE]
+> When using Azure Identity client library, the user-assigned managed identity client id must be specified.
+
 # [.NET](#tab/dotnet)
 
 > [!NOTE]
diff --git a/articles/ddos-protection/ddos-protection-sku-comparison.md b/articles/ddos-protection/ddos-protection-sku-comparison.md
@@ -34,6 +34,8 @@ The following table shows features and corresponding SKUs.
 
 | Feature | DDoS IP Protection | DDoS Network Protection |
 |---|---|---|
+| Protects Public IP Standard SKU | Yes | Yes |
+| Protects Public IP Basic SKU | No | Yes |
 | Active traffic monitoring & always on detection |  Yes| Yes |
 | L3/L4 Automatic attack mitigation  | Yes | Yes |
 | Automatic attack mitigation | Yes | Yes |
diff --git a/articles/dns/private-dns-getstarted-portal.md b/articles/dns/private-dns-getstarted-portal.md
@@ -15,7 +15,7 @@ ms.custom: mode-ui
 
 This quickstart walks you through the steps to create your first private DNS zone and record using the Azure portal.
 
-A DNS zone is used to host the DNS records for a particular domain. To start hosting your domain in Azure DNS, you need to create a DNS zone for that domain name. Each DNS record for your domain is then created inside this DNS zone. To publish a private DNS zone to your virtual network, you specify the list of virtual networks that are allowed to resolve records within the zone.  These are called *linked* virtual networks. When autoregistration is enabled, Azure DNS also updates the zone records whenever a virtual machine is created, changes its' IP address, or is deleted.
+A DNS zone is used to host the DNS records for a particular domain. To start hosting your domain in Azure DNS, you need to create a DNS zone for that domain name. Each DNS record for your domain is then created inside this DNS zone. To publish a private DNS zone to your virtual network, you specify the list of virtual networks that are allowed to resolve records within the zone.  These are called *linked* virtual networks. When autoregistration is enabled, Azure DNS also updates the zone records whenever a virtual machine is created, changes its IP address, or is deleted.
 
 ## Prerequisites
 
diff --git a/articles/iot-dps/how-to-control-access.md b/articles/iot-dps/how-to-control-access.md
@@ -217,7 +217,7 @@ As a comparison, the equivalent Python code to generate a security token is:
 from base64 import b64encode, b64decode
 from hashlib import sha256
 from time import time
-from urllib import quote_plus, urlencode
+from urllib.parse import quote_plus, urlencode
 from hmac import HMAC
 
 def generate_sas_token(uri, key, policy_name, expiry=3600):
diff --git a/articles/spring-apps/tutorial-custom-domain.md b/articles/spring-apps/tutorial-custom-domain.md
@@ -31,7 +31,7 @@ Certificates encrypt web traffic. These TLS/SSL certificates can be stored in Az
 
 ## Keyvault Private Link Considerations
 
-The Azure Spring Apps management IPs are not yet part of the Azure Trusted Microsoft services. Therefore, to allow Azure Spring Apps to load certificates from a Key Vault protected with Private endpoint connections, you must add the following IPs to Azure Key Vault Firewall: `20.53.123.160 52.143.241.210 40.65.234.114 52.142.20.14 20.54.40.121 40.80.210.49 52.253.84.152 20.49.137.168 40.74.8.134 51.143.48.243`
+The Azure Spring Apps management IPs are not yet part of the Azure Trusted Microsoft services. Therefore, to allow Azure Spring Apps to load certificates from a Key Vault protected with Private endpoint connections, you must add the following IPs to Azure Key Vault Firewall: `20.99.204.111, 20.201.9.97, 20.74.97.5, 52.235.25.35, 20.194.10.0, 20.59.204.46, 104.214.186.86, 52.153.221.222, 52.160.137.39, 20.39.142.56, 20.199.190.222, 20.79.64.6, 20.211.128.96, 52.149.104.144, 20.197.121.209, 40.119.175.77, 20.108.108.22, 102.133.143.38, 52.226.244.150, 20.84.171.169, 20.93.48.108, 20.75.4.46, 20.78.29.213, 20.106.86.34, 20.193.151.132`
 
 ## Import certificate
 
diff --git a/articles/virtual-desktop/authentication.md b/articles/virtual-desktop/authentication.md
@@ -23,7 +23,7 @@ Since users must be discoverable through Azure Active Directory (Azure AD) to ac
 
 ### Hybrid identity
 
-Azure Virtual Desktop supports [hybrid identities](../active-directory/hybrid/whatis-hybrid-identity.md) through Azure AD, including those federated using AD FS. You can manage these user identities in AD DS and sync them to Azure AD using [Azure AD Connect](../active-directory/hybrid/whatis-azure-ad-connect.md). You can also use Azure AD to manage these identities and sync them to [Azure AD Directory Services (Azure AD DS)](../active-directory-domain-services/overview.md).
+Azure Virtual Desktop supports [hybrid identities](../active-directory/hybrid/whatis-hybrid-identity.md) through Azure AD, including those federated using AD FS. You can manage these user identities in AD DS and sync them to Azure AD using [Azure AD Connect](../active-directory/hybrid/whatis-azure-ad-connect.md). You can also use Azure AD to manage these identities and sync them to [Azure AD Domain Services (Azure AD DS)](../active-directory-domain-services/overview.md).
 
 When accessing Azure Virtual Desktop using hybrid identities, sometimes the User Principal Name (UPN) or Security Identifier (SID) for the user in Active Directory (AD) and Azure AD don't match. For example, the AD account user@contoso.local may correspond to user@contoso.com in Azure AD. Azure Virtual Desktop only supports this type of configuration if either the UPN or SID for both your AD and Azure AD accounts match. SID refers to the user object property "ObjectSID" in AD and "OnPremisesSecurityIdentifier" in Azure AD.
 
