Merge pull request #216139 from MicrosoftDocs/main

Merge main to live, 4 AM

Author: v-ccolin

.openpublishing.redirection.healthcare-apis.json

@@ -542,13 +542,25 @@
         "redirect_url": "/azure/healthcare-apis/iot/how-to-enable-diagnostic-settings",
         "redirect_document_id": false
     },
+    {   "source_path_from_root": "/articles/healthcare-apis/iot/how-to-use-collection-content-mappings.md",
+        "redirect_url": "/azure/healthcare-apis/iot/how-to-use-device-mappings",
+        "redirect_document_id": false
+    },
+    {   "source_path_from_root": "/articles/healthcare-apis/iot/how-to-use-jsonpath-content-mappings.md",
+        "redirect_url": "/azure/healthcare-apis/iot/how-to-use-device-mappings",
+        "redirect_document_id": false
+    }, 
+    {   "source_path_from_root": "/articles/healthcare-apis/iot/how-to-use-iot-central-json-content-mappings.md",
+        "redirect_url": "/azure/healthcare-apis/iot/how-to-use-iot-jsonpath-content-mappings",
+        "redirect_document_id": false
+    },
     {   "source_path_from_root": "/articles/healthcare-apis/events/events-display-metrics.md",
         "redirect_url": "/azure/healthcare-apis/events/events-use-metrics",
         "redirect_document_id": false
     },
     {    "source_path_from_root": "/articles/healthcare-apis/events/events-export-logs-metrics.md",
         "redirect_url": "/azure/healthcare-apis/events/events-enable-diagnostic-settings",
         "redirect_document_id": false
-    }    
+    }
   ]
 }

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

@@ -9,7 +9,7 @@ ms.service: active-directory
 ms.subservice: saas-app-tutorial
 ms.workload: identity
 ms.topic: tutorial
-ms.date: 08/04/2022
+ms.date: 10/27/2022
 ms.author: jeedes
 ---
 
@@ -166,7 +166,10 @@ Follow these steps to enable Azure AD SSO in the Azure portal.
 
 1. Your Google Cloud / G Suite Connector by Microsoft application expects the SAML assertions in a specific format, which requires you to add custom attribute mappings to your SAML token attributes configuration. The following screenshot shows an example for this. The default value of **Unique User Identifier** is **user.userprincipalname** but Google Cloud / G Suite Connector by Microsoft expects this to be mapped with the user's email address. For that you can use **user.mail** attribute from the list or use the appropriate attribute value based on your organization configuration.
 
-	![image](common/default-attributes.png) 
+	![image](common/default-attributes.png)
+
+    > [!NOTE]
+    > Ensure that the the SAML Response doesn't include any non-standard ASCII characters in the DisplayName and Surname attributes.
 
 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.
 

articles/aks/azure-cni-powered-by-cilium.md

@@ -149,7 +149,7 @@ az aks create -n <clusterName> -g <resourceGroupName> -l <location> \
 
 - *Can I customize Cilium configuration?*
 
-    No, the Cilium configuration is managed by AKS can't be modified. We recommend that customers who require more control use [AKS BYO CNI](./use-byo-cni.md) and install Cilium manually.
+    No, the Cilium configuration is managed by AKS and can't be modified. We recommend that customers who require more control use [AKS BYO CNI](./use-byo-cni.md) and install Cilium manually.
 
 - *Can I use `CiliumNetworkPolicy` custom resources instead of Kubernetes `NetworkPolicy` resources?*
 
@@ -173,4 +173,4 @@ Learn more about networking in AKS in the following articles:
 [aks-ingress-tls]: ingress-tls.md
 [aks-ingress-static-tls]: ingress-static-ip.md
 [aks-http-app-routing]: http-application-routing.md
-[aks-ingress-internal]: ingress-internal-ip.md
+[aks-ingress-internal]: ingress-internal-ip.md

articles/app-service/includes/tutorial-dotnetcore-sqldb-app/deploy-local-git.md

@@ -12,7 +12,7 @@ You can deploy your application code from a local Git repository to Azure by con
 | Instructions    | Screenshot |
 |:----------------|-----------:|
 | [!INCLUDE [Deploy from Local Git 1](<./deploy-from-local-git-azure-portal-1.md>)] | :::image type="content" source="../../media/tutorial-dotnetcore-sqldb-app/azure-portal-deploy-local-git-01-240px.png" alt-text="A screenshot showing how to navigate to a web app using the search box in Azure portal." lightbox="../../media/tutorial-dotnetcore-sqldb-app/azure-portal-deploy-local-git-01.png"::: |
-| [!INCLUDE [Deploy from Local Git 2](<./deploy-from-local-git-azure-portal-2.md>)] | :::image type="content" source="../../media/tutorial-dotnetcore-sqldb-app/azure-portal-deploy-local-git-02-240px.png" alt-text="A screenshot showing te location of the deployment page and how to configure a web app for local Git deployment in the Azure portal." lightbox="../../media/tutorial-dotnetcore-sqldb-app/azure-portal-deploy-local-git-02.png"::: |
+| [!INCLUDE [Deploy from Local Git 2](<./deploy-from-local-git-azure-portal-2.md>)] | :::image type="content" source="../../media/tutorial-dotnetcore-sqldb-app/azure-portal-deploy-local-git-02-240px.png" alt-text="A screenshot showing the location of the deployment page and how to configure a web app for local Git deployment in the Azure portal." lightbox="../../media/tutorial-dotnetcore-sqldb-app/azure-portal-deploy-local-git-02.png"::: |
 | [!INCLUDE [Deploy from Local Git 3](<./deploy-from-local-git-azure-portal-3.md>)] | :::image type="content" source="../../media/tutorial-dotnetcore-sqldb-app/azure-portal-deploy-local-git-03-240px.png" alt-text="A screenshot of the Azure portal showing the Git URL to push code to for local Git deployments." lightbox="../../media/tutorial-dotnetcore-sqldb-app/azure-portal-deploy-local-git-03.png"::: |
 
 ### [Azure CLI](#tab/deploy-instructions-azcli)
@@ -36,17 +36,21 @@ az webapp deployment list-publishing-credentials \
 
 ---
 
-Next, let's add an Azure origin to our local Git repo using the App Service Git deployment URL from the step where we created our App Service.  Make sure to replace your app name in the url below.  You can also get this completed URL from the Azure Portal Local Git/FTPS Credentials tab.
+Next, let's add an Azure origin to our local Git repo using the App Service Git deployment URL from the step where we created our App Service.  Make sure to replace your app name in the url below.  You can also get this completed URL from the Azure portal Local Git/FTPS Credentials tab.
 
 ```bash
 git remote add azure https://<your-app-name>.scm.azurewebsites.net/<your-app-name>.git
 ```
-
+Before pushing your code to App Service you need to commit the changes in your local Git that were done in Step#5. 
+```bash
+git add <file-name> or git add . 
+git commit -m "Updating the modified appsettings.json and Startup.cs files"
+```
 Finally, push your code using the correct origin and branch name.
 
 ```bash
 ## Master is the default deployment branch for App Service - this will ensure our local main branch works for the deployment
 git push azure main:master
 ```
 
-Enter your password if you are prompted to do so. This command will take a moment to run as it deploys your app code to the Azure App Service.
+Enter your password if you are prompted to do so. This command will take a moment to run as it deploys your app code to the Azure App Service.