Merge pull request #221224 from MicrosoftDocs/repo_sync_working_branch

Confirm merge from repo_sync_working_branch to main to sync with https://github.com/MicrosoftDocs/azure-docs (branch main)

Author: huypub

articles/active-directory/conditional-access/terms-of-use.md

@@ -385,8 +385,8 @@ A: On the Terms of use blade, select the number under **Accepted**. You can also
 **Q: How long is information stored?**<br />
 A: The user counts in the terms of use report and who accepted/declined are stored for the life of the terms of use. The Azure AD audit logs are stored for 30 days.
 
-**Q: Why do I see a different number of consents in the terms of use report vs. the Azure AD audit logs?**<br />
-A: The terms of use report is stored for the lifetime of that terms of use policy, while the Azure AD audit logs are stored for 30 days. Also, the terms of use report only displays the users current consent state. For example, if a user declines and then accepts, the terms of use report will only show that user's accept. If you need to see the history, you can use the Azure AD audit logs.
+**Q: Why do I see a different number of consents in the terms of use details overview versus the exported CSV report?**<br />
+A: The terms of use details overview reflects aggregated acceptances of the current version of the policy (updated once every day).  If expiration is enabled or a TOU agreement is updated (with re-acceptance required), the count on the details overview is reset since the acceptances are expired, thereby showing the count of the current version. All acceptance history is still captured in the CSV report.
 
 **Q: If hyperlinks are in the terms of use policy PDF document, will end users be able to click them?**<br />
 A: Yes, end users are able to select hyperlinks to other pages but links to sections within the document aren't supported. Also, hyperlinks in terms of use policy PDFs don't work when accessed from the Azure AD MyApps/MyAccount portal.

articles/api-management/how-to-deploy-self-hosted-gateway-kubernetes.md

@@ -35,19 +35,26 @@ This article describes the steps for deploying the self-hosted gateway component
 5. Select the **Kubernetes** tab under **Deployment scripts**.
 6. Select the **\<gateway-name\>.yml** file link and download the YAML file.
 7. Select the **copy** icon at the lower-right corner of the **Deploy** text box to save the `kubectl` commands to the clipboard.
-8. Paste commands to the terminal (or command) window. The first command creates a Kubernetes secret that contains the access token generated in step 4. The second command applies the configuration file downloaded in step 6 to the Kubernetes cluster and expects the file to be in the current directory.
+8. When using Azure Kubernetes Service (AKS), run `az aks get-credentials --resource-group <resource-group-name> --name <resource-name> --admin` in a new terminal session.
 9. Run the commands to create the necessary Kubernetes objects in the [default namespace](https://kubernetes.io/docs/concepts/overview/working-with-objects/namespaces/) and start self-hosted gateway pods from the [container image](https://aka.ms/apim/shgw/registry-portal) downloaded from the Microsoft Artifact Registry.
+   - The first step creates a Kubernetes secret that contains the access token generated in step 4. Next, it creates a Kubernetes deployment for the self-hosted gateway which uses a ConfigMap with the configuration of the gateway.
 10. Run the following command to check if the deployment succeeded. Note that it might take a little time for all the objects to be created and for the pods to initialize.
 
     ```console
     kubectl get deployments
-    NAME             READY   UP-TO-DATE   AVAILABLE   AGE
+    ```
+    It should return
+    ```console
+        NAME             READY   UP-TO-DATE   AVAILABLE   AGE
     <gateway-name>   1/1     1            1           18s
     ```
 11. Run the following command to check if the service was successfully created. Note that your service IPs and ports will be different.
 
     ```console
     kubectl get services
+    ```
+    It should return
+    ```console
     NAME             TYPE           CLUSTER-IP      EXTERNAL-IP   PORT(S)                      AGE
     <gateway-name>   LoadBalancer   10.99.236.168   <pending>     80:31620/TCP,443:30456/TCP   9m1s
     ```

articles/container-apps/dapr-github-actions.md

@@ -62,7 +62,7 @@ Replace \<Placeholders\> with your values.
 ```powershell
 $ResourceGroup="my-containerapp-store"
 $Location="canadacentral"
-$GithubUsername="<GithubUsername>"
+$GitHubUsername="<GitHubUsername>"
 $SubscriptionId="<SubscriptionId>"
 ```
 
@@ -117,7 +117,7 @@ Now that you've validated your Azure CLI setup, bring the application code to yo
     # [PowerShell](#tab/powershell)
 
     ```git
-    git clone https://github.com/$GithubUsername/container-apps-store-api-microservice.git
+    git clone https://github.com/$GitHubUsername/container-apps-store-api-microservice.git
     ```
 
     ---

articles/cost-management-billing/costs/enable-tag-inheritance.md

@@ -63,7 +63,7 @@ Let's look at an example of how a resource tag gets applied. In the following di
 
 Let's look at another example where a resource tag gets overridden. In the following diagram, resource 4 and resource group 2 have the same tag: **App**. Because the user chose to use the resource group or subscription tag, usage record 4 is updated with the resource group tag value, which is *backend*.
 
-:::image type="content" source="./media/enable-tag-inheritance/tag-example-03.svg" alt-text="Example diagram showing how a resource tag gets overridden." border="false":::
+:::image type="content" source="./media/enable-tag-inheritance/tag-example-03.svg" alt-text="Example diagram showing how a resource tag gets overridden." border="false" lightbox="./media/enable-tag-inheritance/tag-example-03.svg":::
 
 ## Usage record updates
 
@@ -93,4 +93,4 @@ You can also view the inherited tags by downloading your Azure usage. For more i
 
 ## Next steps
 
-- Learn how to [split shared costs](allocate-costs.md).
+- Learn how to [split shared costs](allocate-costs.md).