Merge branch 'master' into repo_sync_working_branch

Author: TimShererWithAquent

.openpublishing.redirection.json

@@ -26616,6 +26616,11 @@
       "redirect_url": "/azure/spatial-anchors/how-tos/create-locate-anchors-unity",
       "redirect_document_id": false
     },
+    {
+      "source_path_from_root": "/articles/spring-cloud/how-to-provision-azure-spring-cloud-instance-terraform.md",
+      "redirect_url": "/azure/spring-cloud/quickstart-deploy-infrastructure-vnet-terraform",
+      "redirect_document_id": false
+    },
     {
       "source_path_from_root": "/articles/spring-cloud/spring-cloud-vnet-customer-responsibilities.md",
       "redirect_url": "/azure/spring-cloud/vnet-customer-responsibilities",

.whatsnew/.external-identities.json

@@ -7,7 +7,7 @@
         "relativeLinkPrefix": "/azure/active-directory/external-identities"
     },
     "inclusionCriteria": {
-        "excludePullRequestTitles": true,
+        "omitPullRequestTitles" : true,
         "minAdditionsToFile" : 10,
         "maxFilesChanged": 50,
         "labels": [
@@ -17,7 +17,7 @@
     },
     "areas": [
         {
-            "name": ".",
+            "names": [ "."],
             "heading": "Azure Active Directory external identities"
         }
     ]

ISSUE_TEMPLATE

@@ -28,4 +28,4 @@ If you would like to contact Microsoft about other things, such as product feedb
 
 - If you need technical support using Azure, the paid and free support options are described here: https://azure.microsoft.com/support/options/.
 
-- Each article in the Azure technical documentation contains a product feedback button - it's best to submit product feedback directly from a relevant article. Otherwise, you can submit product feedback for most Azure products in the following product feedback forum: https://feedback.azure.com/forums/34192--general-feedback.
+- Each article in the Azure technical documentation contains a product feedback button - it's best to submit product feedback directly from a relevant article. Otherwise, you can submit product feedback for most Azure products in the following product feedback forum: https://feedback.azure.com/d365community/forum/79b1327d-d925-ec11-b6e6-000d3a4f06a4.

articles/active-directory-b2c/TOC.yml

@@ -633,6 +633,7 @@
     href: https://azure.microsoft.com/roadmap/?category=security-identity
   - name: Frequently asked questions
     href: ./faq.yml
+    displayName: FAQ
   - name: Getting help
     href: ../active-directory/develop/developer-support-help-options.md
   - name: Pricing

articles/active-directory-b2c/custom-email-sendgrid.md

@@ -60,10 +60,10 @@ Next, store the SendGrid API key in an Azure AD B2C policy key for your policies
 
 With a SendGrid account created and SendGrid API key stored in an Azure AD B2C policy key, create a SendGrid [dynamic transactional template](https://sendgrid.com/docs/ui/sending-email/how-to-send-an-email-with-dynamic-transactional-templates/).
 
-1. On the SendGrid site, open the [transactional templates](https://sendgrid.com/dynamic_templates) page and select **Create Template**.
-1. Enter a unique template name like `Verification email` and then select **Save**.
-1. To begin editing your new template, select **Add Version**.
-1. Select **Code Editor** and then **Continue**.
+1. On the SendGrid site, open the [transactional templates](https://sendgrid.com/dynamic_templates) page and select **Create a Dynamic Template**.
+1. Enter a unique template name like `Verification email` and then select **Create**.
+1. To begin editing your new template, select the template i.e. `Verification email`, then select **Add Version**.
+1. Select **Blank Template** and then **Code Editor**.
 1. In the HTML editor, paste following HTML template or use your own. The `{{otp}}` and `{{email}}` parameters will be replaced dynamically with the one-time password value and the user email address.
 
     ```HTML
@@ -158,8 +158,9 @@ With a SendGrid account created and SendGrid API key stored in an Azure AD B2C p
     </html>
     ```
 
-1. Expand **Settings** on the left, and for **Email Subject**, enter `{{subject}}`.
-1. Select **Save Template**.
+1. Expand **Settings** on the left, and for **Version Name**, enter a template version. 
+1. For **Subject**, enter `{{subject}}`.
+1. A the top of the page, select **Save**.
 1. Return to the **Transactional Templates** page by selecting the back arrow.
 1. Record the **ID** of template you created for use in a later step. For example, `d-989077fbba9746e89f3f6411f596fb96`. You specify this ID when you [add the claims transformation](#add-the-claims-transformation).
 

articles/active-directory-b2c/custom-policy-developer-notes.md

@@ -105,7 +105,7 @@ The following table summarizes the Security Assertion Markup Language (SAML) app
 |[Azure AD B2C](identity-provider-azure-ad-b2c.md) | GA | GA | |
 |[eBay](identity-provider-ebay.md) | NA | Preview | |
 |[Facebook](identity-provider-facebook.md) | GA | GA | |
-|[GitHub](identity-provider-github.md) | GA | GA | |
+|[GitHub](identity-provider-github.md) | Preview | GA | |
 |[Google](identity-provider-google.md) | GA | GA | |
 |[ID.me](identity-provider-id-me.md) | GA | GA | |
 |[LinkedIn](identity-provider-linkedin.md) | GA | GA | |

articles/active-directory-b2c/faq.yml

@@ -149,7 +149,7 @@ sections:
       - question: |
           Can I use my own URLs on my sign-up and sign-in pages that are served by Azure AD B2C? For instance, can I change the URL from contoso.b2clogin.com to login.contoso.com?
         answer: |
-          This feature is available in public preview. For details, see [Azure AD B2C custom domains](./custom-domain.md?pivots=b2c-user-flow).
+          Yes, you can use your own domain. For details, see [Azure AD B2C custom domains](./custom-domain.md?pivots=b2c-user-flow).
           
       - question: |
           How do I delete my Azure AD B2C tenant?

articles/active-directory-b2c/tutorial-create-tenant.md

@@ -55,7 +55,7 @@ You learn how to register an application in the next tutorial.
 1. Add **Microsoft.AzureActiveDirectory** as a resource provider for the Azure subscription your're using ([learn more](../azure-resource-manager/management/resource-providers-and-types.md?WT.mc_id=Portal-Microsoft_Azure_Support#register-resource-provider-1)):
 
     1. On the Azure portal, search for and select **Subscriptions**.
-    2. Select your subscription, and then in the left menu, select **Resource providers**. If you do not see the left menu, select the **Show the menu for < name of your subscription >** icon at the top left part of the page to open it.
+    2. Select your subscription, and then in the left menu, select **Resource providers**. If you don't see the left menu, select the **Show the menu for < name of your subscription >** icon at the top left part of the page to expand it.
     3. Make sure the **Microsoft.AzureActiveDirectory** row shows a status of **Registered**. If it doesn't, select the row, and then select **Register**.
 
 1. On the Azure portal menu or from the **Home** page, select **Create a resource**.

articles/active-directory-domain-services/TOC.yml

@@ -167,6 +167,6 @@
     - name: Pricing
       href: https://azure.microsoft.com/pricing/details/active-directory-ds/
     - name: Azure AD feedback forum
-      href: https://feedback.azure.com/forums/169401-azure-active-directory
+      href: https://feedback.azure.com/d365community/forum/22920db1-ad25-ec11-b6e6-000d3a4f0789
     - name: Use Azure AD Domain Services in Azure CSP subscriptions
       href: csp.md

articles/active-directory-domain-services/delete-aadds.md

@@ -46,5 +46,5 @@ Consider [sharing feedback][feedback] for the features that you would like to se
 If you want to get started with Azure AD DS again, see [Create and configure an Azure Active Directory Domain Services managed domain][create-instance].
 
 <!-- INTERNAL LINKS -->
-[feedback]: https://feedback.azure.com/forums/169401-azure-active-directory?category_id=160593%3fcategory_id%3d160593
-[create-instance]: tutorial-create-instance.md
+[feedback]: https://feedback.azure.com/d365community/forum/22920db1-ad25-ec11-b6e6-000d3a4f0789?c=5d63b5b7-ae25-ec11-b6e6-000d3a4f0789
+[create-instance]: tutorial-create-instance.md