Merge branch 'main' into UserStory145919

Author: TomArcherMsft

.openpublishing.redirection.json

@@ -24132,11 +24132,15 @@
             "source_path_from_root": "/articles/reliability/migrate-app-service-environment.md",
             "redirect_url": "/azure/reliability/reliability-app-service",
             "redirect_document_id": false
+        },
+        {
+            "source_path_from_root": "/articles/flexible-server/concepts-high-availability.md",
+            "redirect_url": "/azure/reliability/reliability-postgre-flexible",
+            "redirect_document_id": false
         }
 
 
 
-
-       
+        
     ]
 }

articles/active-directory-b2c/partner-nok-nok.md

@@ -28,7 +28,7 @@ To get started, you need:
   * If you don't have one, get a [Azure free account](https://azure.microsoft.com/free/)
 * An Azure AD B2C tenant linked to the Azure subscription
   * [Tutorial: Create an Azure Active Directory B2C tenant](tutorial-create-tenant.md) 
-* Go to [noknok.com](https://noknok.com/products/strong-authentication-service/). On the top menu, select **Demo**.
+* Go to [noknok.com](https://noknok.com/). On the top menu, select **Demo**.
 
 ## Scenario description
 

articles/active-directory/saas-apps/slack-tutorial.md

@@ -9,7 +9,7 @@ ms.service: active-directory
 ms.subservice: saas-app-tutorial
 ms.workload: identity
 ms.topic: tutorial
-ms.date: 01/25/2023
+ms.date: 08/11/2023
 ms.author: jeedes
 ---
 
@@ -113,9 +113,6 @@ Follow these steps to enable Azure AD SSO in the Azure portal.
     | emailaddress | user.userprincipalname |
     | email | user.userprincipalname |
 
-   > [!NOTE]
-   > In order to set up the service provider (SP) configuration, you must click on **Expand** next to **Advanced Options** in the SAML configuration page. In the **Service Provider Issuer** box, enter the workspace URL. The default is slack.com. 
-
 1. On the **Set up single sign-on with SAML** page, in the **SAML Signing Certificate** section,  find **Certificate (Base64)** and select **Download** to download the certificate and save it on your computer.
 
 	![The Certificate download link](common/certificatebase64.png)
@@ -187,6 +184,9 @@ In this section, you'll enable B.Simon to use Azure single sign-on by granting a
 
     c. Choose how the SAML response from your IDP is signed from the two options.
 
+   > [!NOTE]
+   > In order to set up the service provider (SP) configuration, you must click on **Expand** next to **Advanced Options** in the SAML configuration page. In the **Service Provider Issuer** box, enter the workspace URL. The default is slack.com. 
+
 1. Under **Settings**, decide if members can edit their profile information (like their email or display name) after SSO is enabled. You can also choose whether SSO is required, partially required or optional.
 
    ![Screenshot of Configure Save configuration single sign-on On App Side.](./media/slack-tutorial/save-configuration-button.png) 

articles/active-directory/standards/configure-cmmc-level-2-additional-controls.md

@@ -16,7 +16,7 @@ ms.collection: M365-identity-device-management
 
 # Configure Azure Active Directory to meet CMMC Level 2
 
-Azure Active Directory helps meet identity-related practice requirements in each Cybersecurity Maturity Model Certification (CMMC) level. To be compliant with requirements in [CMMC V2.0 level 2](https://cmmc-coe.org/maturity-level-two/), it's the responsibility of companies performing work with, and on behalf of, the US Dept. of Defense (DoD) to complete other configurations or processes.
+Azure Active Directory helps meet identity-related practice requirements in each Cybersecurity Maturity Model Certification (CMMC) level. To be compliant with requirements in CMMC V2.0 level 2, it's the responsibility of companies performing work with, and on behalf of, the US Dept. of Defense (DoD) to complete other configurations or processes.
 
 In CMMC Level 2, there are 13 domains that have one or more practices related to identity:
 

articles/active-directory/standards/configure-cmmc-level-2-identification-and-authentication.md

@@ -16,7 +16,7 @@ ms.collection: M365-identity-device-management
 
 # Configure CMMC Level 2 Identification and Authentication (IA) controls
 
-Azure Active Directory helps you meet identity-related practice requirements in each Cybersecurity Maturity Model Certification (CMMC) level. To complete other configurations or processes to be compliant with [CMMC V2.0 level 2](https://cmmc-coe.org/maturity-level-two/)requirements, is the responsibility of companies performing work with, and on behalf of, the US Dept. of Defense (DoD).
+Azure Active Directory helps you meet identity-related practice requirements in each Cybersecurity Maturity Model Certification (CMMC) level. To complete other configurations or processes to be compliant with CMMC V2.0 level 2 requirements, is the responsibility of companies performing work with, and on behalf of, the US Dept. of Defense (DoD).
 
 CMMC Level 2 has 13 domains that have one or more practices related to identity. The domains are:
 
@@ -56,4 +56,4 @@ The following table provides a list of practice statement and objectives, and Az
 * [Configure Azure Active Directory for CMMC compliance](configure-for-cmmc-compliance.md)
 * [Configure CMMC Level 1 controls](configure-cmmc-level-1-controls.md)
 * [Configure CMMC Level 2 Access Control (AC) controls](configure-cmmc-level-2-access-control.md)
-* [Configure CMMC Level 2 additional controls](configure-cmmc-level-2-additional-controls.md)
+* [Configure CMMC Level 2 additional controls](configure-cmmc-level-2-additional-controls.md)

articles/active-directory/standards/configure-for-fedramp-high-impact.md

@@ -32,7 +32,7 @@ There are multiple paths towards FedRAMP authorization. You can reuse the existi
 
 ## Scope of guidance
 
-The FedRAMP high baseline is made up of 421 controls and control enhancements from [NIST 800-53 Security Controls Catalog Revision 4](https://csrc.nist.gov/publications/detail/sp/800-53/rev-4/final). Where applicable, we included clarifying information from the [800-53 Revision 5](https://csrc.nist.gov/publications/detail/sp/800-53/rev-5/final). This article set covers a subset of these controls that are related to identity, and which you must configure. 
+The FedRAMP high baseline is made up of 421 controls and control enhancements from [NIST 800-53 Security Controls Catalog Revision 4](https://csrc.nist.gov/pubs/itlb/2015/01/release-of-nist-special-publication-80053a-revisio/final). Where applicable, we included clarifying information from the [800-53 Revision 5](https://csrc.nist.gov/publications/detail/sp/800-53/rev-5/final). This article set covers a subset of these controls that are related to identity, and which you must configure. 
 
 We provide prescriptive guidance to help you achieve compliance with controls you're responsible for configuring in Azure Active Directory (Azure AD). To fully address some identity control requirements, you might need to use other systems. Other systems might include a security information and event management tool, such as Microsoft Sentinel. If you're using Azure services outside of Azure Active Directory, there will be other controls you need to consider, and you can use the capabilities Azure already has in place to meet the controls.
 

articles/active-directory/standards/hipaa-configure-for-compliance.md

@@ -43,7 +43,7 @@ The remaining articles in this series provide guidance and links to resources, o
 
 * [HHS Zero Trust in Healthcare pdf](https://www.hhs.gov/sites/default/files/zero-trust.pdf)
 
-* [Combined regulation text](https://www.hhs.gov/ocr/privacy/hipaa/administrative/combined/index.html?language=es) of all HIPAA Administrative Simplification Regulations found at 45 CFR 160, 162, and 164
+* [Combined regulation text](https://www.hhs.gov/hipaa/for-professionals/privacy/laws-regulations/combined-regulation-text/index.html) of all HIPAA Administrative Simplification Regulations found at 45 CFR 160, 162, and 164
 
 * [Code of Federal Regulations (CFR) Title 45](https://www.ecfr.gov/current/title-45) describing the public welfare portion of the regulation
 

articles/ai-services/qnamaker/includes/quickstart-sdk-nodejs.md

@@ -17,7 +17,7 @@ Use the QnA Maker client library for Node.js to:
 * Get an answer from a knowledgebase
 * Delete knowledge base
 
-[Reference documentation](/javascript/api/@azure/cognitiveservices-qnamaker/) | [Library source code](https://github.com/Azure/azure-sdk-for-js/tree/master/sdk/cognitiveservices/cognitiveservices-qnamaker) | [Package (npm)](https://www.npmjs.com/package/@azure/cognitiveservices-qnamaker) | [Node.js Samples](https://github.com/Azure-Samples/cognitive-services-quickstart-code/blob/master/javascript/QnAMaker/sdk/qnamaker_quickstart.js)
+[Reference documentation](/javascript/api/@azure/cognitiveservices-qnamaker/) | [Package (npm)](https://www.npmjs.com/package/@azure/cognitiveservices-qnamaker) | [Node.js Samples](https://github.com/Azure-Samples/cognitive-services-quickstart-code/blob/master/javascript/QnAMaker/sdk/qnamaker_quickstart.js)
 
 [!INCLUDE [Custom subdomains notice](../../../../includes/cognitive-services-custom-subdomains-note.md)]
 

articles/ai-services/speech-service/includes/quickstarts/openai-speech/csharp.md

@@ -166,7 +166,7 @@ Follow these steps to create a new console application.
     }
     ```
 
-1. To increase or decrease the number of tokens returned by Azure OpenAI, change the `MaxTokens` property in the `CompletionsOptions` class instance. For more information tokens and cost implications, see [Azure OpenAI tokens](/azure/ai-services/openai/overview.md#tokens) and [Azure OpenAI pricing](https://azure.microsoft.com/pricing/details/cognitive-services/openai-service/).
+1. To increase or decrease the number of tokens returned by Azure OpenAI, change the `MaxTokens` property in the `CompletionsOptions` class instance. For more information tokens and cost implications, see [Azure OpenAI tokens](/azure/ai-services/openai/overview#tokens) and [Azure OpenAI pricing](https://azure.microsoft.com/pricing/details/cognitive-services/openai-service/).
 
 Run your new console application to start speech recognition from a microphone:
 
@@ -199,8 +199,8 @@ Now that you've completed the quickstart, here are some more considerations:
 
 - To change the speech recognition language, replace `en-US` with another [supported language](~/articles/ai-services/speech-service/language-support.md). For example, `es-ES` for Spanish (Spain). The default language is `en-US` if you don't specify a language. For details about how to identify one of multiple languages that might be spoken, see [language identification](~/articles/ai-services/speech-service/language-identification.md). 
 - To change the voice that you hear, replace `en-US-JennyMultilingualNeural` with another [supported voice](~/articles/ai-services/speech-service/language-support.md#prebuilt-neural-voices). If the voice doesn't speak the language of the text returned from Azure OpenAI, the Speech service doesn't output synthesized audio.
-- To use a different [model](/azure/ai-services/openai/concepts/models.md#model-summary-table-and-region-availability), replace `text-davinci-003` with the ID of another [deployment](/azure/ai-services/openai/how-to/create-resource.md#deploy-a-model). Keep in mind that the deployment ID isn't necessarily the same as the model name. You named your deployment when you created it in [Azure OpenAI Studio](https://oai.azure.com/).
-- Azure OpenAI also performs content moderation on the prompt inputs and generated outputs. The prompts or responses may be filtered if harmful content is detected. For more information, see the [content filtering](/azure/ai-services/openai/concepts/content-filters.md) article.
+- To use a different [model](/azure/ai-services/openai/concepts/models#model-summary-table-and-region-availability), replace `text-davinci-003` with the ID of another [deployment](/azure/ai-services/openai/how-to/create-resource?pivots=web-portal#deploy-a-model). Keep in mind that the deployment ID isn't necessarily the same as the model name. You named your deployment when you created it in [Azure OpenAI Studio](https://oai.azure.com/).
+- Azure OpenAI also performs content moderation on the prompt inputs and generated outputs. The prompts or responses may be filtered if harmful content is detected. For more information, see the [content filtering](/azure/ai-services/openai/concepts/content-filter) article.
 
 ## Clean up resources
 

articles/ai-services/speech-service/includes/release-notes/release-notes-stt.md

@@ -6,35 +6,43 @@ ms.date: 01/09/2023
 ms.author: eur
 ---
 
-### May 2023 release
+### August 2023 release
 
 #### Pronunciation Assessment
 
-- Speech [Pronunciation Assessment](../../how-to-pronunciation-assessment.md) now supports 3 additional languages generally available in German (Germany), Japanese (Japan), and Spanish (Mexico), with 4 additional languages available in preview. For more information, see the full [language list for Pronunciation Assessment](../../language-support.md?tabs=pronunciation-assessment).
+- Speech [Pronunciation Assessment](../../how-to-pronunciation-assessment.md) now supports 3 additional languages generally available in English (Canada), English (India), and French (Canada), with 3 additional languages available in preview. For more information, see the full [language list for Pronunciation Assessment](../../language-support.md?tabs=pronunciation-assessment).
 
   | Language | Locale (BCP-47) | 
   |--|--|
   |Arabic (Saudi Arabia)|`ar-SA`<sup>1</sup> |
   |Chinese (Mandarin, Simplified)|`zh-CN`|
   |English (Australia)|`en-AU`|
-  |English (Canada)|`en-CA`<sup>1</sup> |
-  |English (India)|`en-IN`<sup>1</sup> |
+  |English (Canada)|`en-CA` |
+  |English (India)|`en-IN` |
   |English (United Kingdom)|`en-GB`|
   |English (United States)|`en-US`|  
-  |French (Canada)|`fr-CA`<sup>1</sup> | 
+  |French (Canada)|`fr-CA`| 
   |French (France)|`fr-FR`|  
   |German (Germany)|`de-DE`|
+  |Italian (Italy)|`it-IT`<sup>1</sup>|
   |Japanese (Japan)|`ja-JP`|
+  |Korean (Korea)|`ko-KR`<sup>1</sup>|
   |Malay (Malaysia)|`ms-MY`<sup>1</sup>|
   |Norwegian Bokmål (Norway)|`nb-NO`<sup>1</sup>|
   |Portuguese (Brazil)|`pt-BR`<sup>1</sup>|
+  |Russian (Russia)|`ru-RU`<sup>1</sup>|
   |Spanish (Mexico)|`es-MX` | 
   |Spanish (Spain)|`es-ES` | 
   |Tamil (India)|`ta-IN`<sup>1</sup> | 
   |Vietnamese (Vietnam)|`vi-VN`<sup>1</sup> |
 
   <sup>1</sup> The language is in public preview for pronunciation assessment.
 
+### May 2023 release
+
+#### Pronunciation Assessment
+
+- Speech [Pronunciation Assessment](../../how-to-pronunciation-assessment.md) now supports 3 additional languages generally available in German (Germany), Japanese (Japan), and Spanish (Mexico), with 4 additional languages available in preview. For more information, see the full [language list for Pronunciation Assessment](../../language-support.md?tabs=pronunciation-assessment).
 - You can now use the standard Speech to Text commitment tier for pronunciation assessment on all public regions. If you purchase a commitment tier for standard Speech to text, the spend for pronunciation assessment goes towards meeting the commitment. See [commitment tier pricing](https://azure.microsoft.com/pricing/details/cognitive-services/speech-services). 
 
 ### February 2023 release