Merge branch 'main' into release-preview-mswb

Author: v-alje

articles/active-directory/develop/application-consent-experience.md

@@ -42,7 +42,7 @@ The following diagram and table provide information about the building blocks of
 | 5 | Publisher name and verification | The blue "verified" badge means that the app publisher has verified their identity using a Microsoft Partner Network account and has completed the verification process. If the app is publisher verified, the publisher name is displayed.  If the app isn't publisher verified, "Unverified" is displayed instead of a publisher name. For more information, read about [Publisher Verification](publisher-verification-overview.md). Selecting the publisher name displays more app info as available, such as the publisher name, publisher domain, date created, certification details, and reply URLs. |
 | 6 |  Microsoft 365 Certification | The Microsoft 365 Certification logo means that an app has been vetted against controls derived from leading industry standard frameworks, and that strong security and compliance practices are in place to protect customer data.  For more information, read about [Microsoft 365 Certification](/microsoft-365-app-certification/docs/enterprise-app-certification-guide).|
 | 7 | Publisher information  | Displays whether the application is published by Microsoft. |
-| 8 | Permissions | This list contains the permissions being requested by the client application. Users should always evaluate the types of permissions being requested to understand what data the client application will be authorized to access on their behalf if they accept. As an application developer it's best to request access, to the permissions with the least privilege. |
+| 8 | Permissions | This list contains the permissions being requested by the client application. Users should always evaluate the types of permissions being requested to understand what data the client application will be authorized to access on their behalf if they accept. As an application developer, it's best to request access to the permissions with the least privilege. |
 | 9 | Permission description | This value is provided by the service exposing the permissions. To see the permission descriptions, you must toggle the chevron next to the permission. |
 | 10 | https://myapps.microsoft.com | This is the link where users can review and remove any non-Microsoft applications that currently have access to their data. |
 | 11 | Report it here | This link is used to report a suspicious app if you don't trust the app, if you believe the app is impersonating another app, if you believe the app will misuse your data, or for some other reason. |

articles/active-directory/external-identities/tenant-restrictions-v2.md

@@ -318,7 +318,7 @@ Suppose you use tenant restrictions to block access by default, but you want to
 
 ## Step 3: Enable tenant restrictions on Windows managed devices
 
-After you create a tenant restrictions V2 policy, you can enforce the policy on each Windows 10, Windows 11, and Windows Server 2022 device by adding your tenant ID and the policy ID to the device's **Tenant Restrictions** configuration. When tenant restrictions are enabled on a Windows device, corporate proxies aren't required for policy enforcement. Devices don't need to be Azure AD managed to enforce tenant restrictions V2; domain-joined devices that are managed with Group Policy are also supported.
+After you create a tenant restrictions V2 policy, you can enforce the policy on each Windows 10 and Windows 11 device by adding your tenant ID and the policy ID to the device's **Tenant Restrictions** configuration. When tenant restrictions are enabled on a Windows device, corporate proxies aren't required for policy enforcement. Devices don't need to be Azure AD managed to enforce tenant restrictions V2; domain-joined devices that are managed with Group Policy are also supported.
 
 ### Administrative Templates (.admx) for Windows 10 November 2021 Update (21H2) and Group policy settings
 
@@ -333,7 +333,7 @@ To test the tenant restrictions V2 policy on a device, follow these steps.
 
 > [!NOTE]
 >
-> - The device must be running Windows 10, Windows 11, or Windows Server 2022 with the latest updates.
+> - The device must be running Windows 10 or Windows 11 with the latest updates.
 
 1. On the Windows computer, press the Windows key, type **gpedit**, and then select **Edit group policy (Control panel)**.
 
@@ -352,7 +352,7 @@ To test the tenant restrictions V2 policy on a device, follow these steps.
 
 ## Step 4: Set up tenant restrictions V2 on your corporate proxy
 
-Tenant restrictions V2 policies can't be directly enforced on non-Windows 10, Windows 11, or Windows Server 2022 devices, such as Mac computers, mobile devices, unsupported Windows applications, and Chrome browsers. To ensure sign-ins are restricted on all devices and apps in your corporate network, configure your corporate proxy to enforce tenant restrictions V2. Although configuring tenant restrictions on your corporate proxy don't provide data plane protection, it does provide authentication plane protection.
+Tenant restrictions V2 policies can't be directly enforced on non-Windows 10 or Windows 11 devices, such as Mac computers, mobile devices, unsupported Windows applications, and Chrome browsers. To ensure sign-ins are restricted on all devices and apps in your corporate network, configure your corporate proxy to enforce tenant restrictions V2. Although configuring tenant restrictions on your corporate proxy don't provide data plane protection, it does provide authentication plane protection.
 
 > [!IMPORTANT]
 > If you've previously set up tenant restrictions, you'll need to stop sending `restrict-msa` to login.live.com. Otherwise, the new settings will conflict with your existing instructions to the MSA login service.

articles/ai-services/TOC.yml

@@ -43,38 +43,36 @@
     href: diagnostic-logging.md
   - name: Manage resources
     href: manage-resources.md
-  - name: Deploy
+  - name: Deploy containers
     items:
-    - name: Containers
+    - name: Azure AI containers documentation
+      href: containers/index.yml
+    - name: Azure AI containers overview
+      href: cognitive-services-container-support.md
+    - name: General container FAQ
+      href: ./containers/container-faq.yml
+    - name: Use containers in disconnected environments
+      href: ./containers/disconnected-containers.md
+    - name: Disconnected containers FAQ
+      href: ./containers/disconnected-container-faq.yml
+    - name: Container recipes
       items:
-      - name: Azure AI containers documentation
-        href: containers/index.yml
-      - name: Azure AI containers overview
-        href: cognitive-services-container-support.md
-      - name: General container FAQ
-        href: ./containers/container-faq.yml
-      - name: Use containers in disconnected environments
-        href: ./containers/disconnected-containers.md
-      - name: Disconnected containers FAQ
-        href: ./containers/disconnected-container-faq.yml
-      - name: Container recipes
-        items:
-        - name: Container Reuse
-          href: ./containers/container-reuse-recipe.md
-        - name: Deploy to Azure Container Instance
-          href: ./containers/azure-container-instance-recipe.md
-        - name: Deploy to Azure Kubernetes
-          href: ./containers/azure-kubernetes-recipe.md
-        - name: Deploy with Docker Compose
-          href: ./containers/docker-compose-recipe.md
-      - name: Other Container Services
-        items:
-        - name: Azure Container Instances
-          href: ../container-instances/container-instances-tutorial-prepare-app.md
-        - name: Azure Container Registry
-          href: ../container-registry/container-registry-get-started-azure-cli.md
-        - name: Azure Kubernetes Service (AKS)
-          href: ../aks/tutorial-kubernetes-prepare-app.md
+      - name: Container Reuse
+        href: ./containers/container-reuse-recipe.md
+      - name: Deploy to Azure Container Instance
+        href: ./containers/azure-container-instance-recipe.md
+      - name: Deploy to Azure Kubernetes
+        href: ./containers/azure-kubernetes-recipe.md
+      - name: Deploy with Docker Compose
+        href: ./containers/docker-compose-recipe.md
+    - name: Other Container Services
+      items:
+      - name: Azure Container Instances
+        href: ../container-instances/container-instances-tutorial-prepare-app.md
+      - name: Azure Container Registry
+        href: ../container-registry/container-registry-get-started-azure-cli.md
+      - name: Azure Kubernetes Service (AKS)
+        href: ../aks/tutorial-kubernetes-prepare-app.md
   - name: Security
     items:
     - name: Security features

articles/container-apps/TOC.yml

@@ -58,6 +58,8 @@
   items:
     - name: Deploy an app with containerapp up
       href: containerapp-up.md
+    - name: Scale a container app
+      href: tutorial-scaling.md
     - name: Create and deploy a container app using the CLI
       href: tutorial-deploy-first-app-cli.md
     - name: Connect to apps & services