Merge branch 'main' of https://github.com/MicrosoftDocs/azure-docs-pr into cse-v2.1

Author: pauljewellmsft

articles/app-service/configure-common.md

@@ -4,7 +4,7 @@ description: Learn to configure common settings for an App Service app. App sett
 keywords: azure app service, web app, app settings, environment variables
 ms.assetid: 9af8a367-7d39-4399-9941-b80cbc5f39a0
 ms.topic: article
-ms.date: 06/04/2024
+ms.date: 10/03/2024
 ms.custom: devx-track-csharp, devx-track-azurecli, devx-track-azurepowershell, AppServiceConnectivity
 ms.devlang: azurecli
 author: cephalin
@@ -446,7 +446,8 @@ Here, you can configure some common settings for the app. Some settings require
     - **Always On**: Keeps the app loaded even when there's no traffic. When **Always On** isn't turned on (default), the app is unloaded after 20 minutes without any incoming requests. The unloaded app can cause high latency for new requests because of its warm-up time. When **Always On** is turned on, the front-end load balancer sends a GET request to the application root every five minutes. The continuous ping prevents the app from being unloaded.
 
         Always On is required for continuous WebJobs or for WebJobs that are triggered using a CRON expression.
-    - **ARR affinity**: In a multi-instance deployment, ensure that the client is routed to the same instance for the life of the session. You can set this option to **Off** for stateless applications.
+    - **Session affinity**: In a multi-instance deployment, ensure that the client is routed to the same instance for the life of the session. You can set this option to **Off** for stateless applications.
+    - **Session affinity proxy**: Session affinity proxy can be turned on if your app is behind a reverse proxy (like Azure Application Gateway or Azure Front Door) and you are using the default host name. The domain for the session affinity cookie will align with the forwarded host name from the reverse proxy. 
     - **HTTPS Only**: When enabled, all HTTP traffic is redirected to HTTPS.
     - **Minimum TLS version**: Select the minimum TLS encryption version required by your app.
 - **Debugging**: Enable remote debugging for [ASP.NET](troubleshoot-dotnet-visual-studio.md#remotedebug), [ASP.NET Core](/visualstudio/debugger/remote-debugging-azure), or [Node.js](configure-language-nodejs.md#debug-remotely) apps. This option turns off automatically after 48 hours.

articles/app-service/deploy-staging-slots.md

@@ -547,7 +547,7 @@ Here are some common swap errors:
 
 - Local cache initialization might fail when the app content exceeds the local disk quota specified for the local cache. For more information, see [Local cache overview](overview-local-cache.md).
 
-- During a site update operation, the following error may occur "_The slot cannot be changed because its configuration settings have been prepared for swap_". This can occur if either [swap with preview (multi-phase swap)](#swap-with-preview-multi-phase-swap) phase 1 has been completed but phase 2 has not yet been performed, or a swap has failed. There are two ways resolve the issue:
+- During a site update operation, the following error may occur "_The slot cannot be changed because its configuration settings have been prepared for swap_". This can occur if either [swap with preview (multi-phase swap)](#swap-with-preview-multi-phase-swap) phase 1 has been completed but phase 2 has not yet been performed, or a swap has failed. There are two ways to resolve this issue:
 
     1. Cancel the swap operation which will reset the site back to the old state
     1. Complete the swap operation which will update site to the desired new state

articles/app-service/overview-tls.md

@@ -29,6 +29,17 @@ Transport Layer Security (TLS) is a widely adopted security protocol designed to
 
 For incoming requests to your web app, App Service supports TLS versions 1.0, 1.1, 1.2, and 1.3.  
 
+### Set Minimum TLS Version
+Follow these steps to change the Minimum TLS version of your App Service resource:
+1. Browse to your app in the [Azure portal](https://portal.azure.com/) 
+1. In the left menu, select **configuration** and then select the **General settings** tab. 
+1. On __Minimum Inbound TLS Version__, using the dropdown, select your desired version. 
+1. Select **Save** to save the changes. 
+
+### Minimum TLS Version with Azure Policy 
+
+You can use Azure Policy to help audit your resources when it comes to minimum TLS version. You can refer to [App Service apps should use the latest TLS version policy definition](https://ms.portal.azure.com/#view/Microsoft_Azure_Policy/PolicyDetailBlade/definitionId/%2Fproviders%2FMicrosoft.Authorization%2FpolicyDefinitions%2Ff0e6e85b-9b9f-4a4b-b67b-f730d42f1b0b) and change the values to your desired minimum TLS version. For similar policy definitions for other App Service resources, refer to [List of built-in policy definitions - Azure Policy for App Service](../governance/policy/samples/built-in-policies.md#app-service). 
+
 ### Minimum TLS Version and SCM Minimum TLS Version 
 
 App Service also allows you to set minimum TLS version for incoming requests to your web app and to SCM site. By default, the minimum TLS version for incoming requests to your web app and to SCM would be set to 1.2 on both portal and API. 

articles/azure-government/compliance/azure-services-in-fedramp-auditscope.md

@@ -1,8 +1,8 @@
 ---
 title: Azure and other Microsoft cloud services compliance scope
-description: This article tracks FedRAMP and DoD compliance scope for Azure, Dynamics 365, Microsoft 365, and Power Platform cloud services across Azure, Azure Government, and Azure Government Secret cloud environments.
+description: FedRAMP & DoD compliance scope for Azure, Dynamics 365, Microsoft 365, and Power Platform for Azure, Azure Government, & Azure Government Secret.
 author: gjain
-ms.author: gjain
+ms.author: eliotgra
 ms.topic: article
 ms.service: azure-government
 ms.custom: references_regions

articles/azure-government/compliance/compliance-tic.md

@@ -1,8 +1,8 @@
 ---
 title: Trusted Internet Connections guidance
-description: Learn about Trusted Internet Connections (TIC) guidance for Azure IaaS and PaaS services
+description: Learn how you can use Trusted Internet Connections (TIC) guidance for your Azure IaaS and PaaS services
 author: anaharris-ms
-ms.author: anaharris 
+ms.author: eliotgra 
 ms.service: azure-government
 ms.topic: article
 recommendations: false

articles/azure-government/compliance/documentation-accelerate-compliance.md

@@ -1,16 +1,15 @@
 ---
-title: How to accelerate your journey to FedRAMP compliance with Azure
+title: Accelerate your journey to FedRAMP compliance with Azure
 description: Provides an overview of resources for Development, Automation, and Advisory partners to help them accelerate their path to ATO with Azure.
 titleSuffix: Azure Government
 services: azure-government
 cloud: gov
 author: todorgb
 manager: vernonw
-
+ms.author: eliotgra
 ms.service: azure-government
 ms.topic: article
 ms.date: 05/30/2023
-ms.author: todorb
 ---
 
 # FedRAMP compliance program overview

articles/azure-government/documentation-government-csp-list.md

@@ -1,18 +1,18 @@
 ---
 title: Azure Government authorized reseller list
-description: Comprehensive list of Azure Government cloud solution providers, resellers, and distributors.
+description: Comprehensive list of all the authorized Azure Government cloud solution providers, resellers, and distributors.
 ms.service: azure-government
 ms.topic: article
 author: todorgb
-ms.author: todorb
+ms.author: eliotgra
 ms.date: 10/31/2023
 ---
 
 # Azure Government authorized reseller list
 
-Since the launch of [Azure Government services in the Cloud Solution Provider (CSP) program)](https://azure.microsoft.com/blog/announcing-microsoft-azure-government-services-in-the-cloud-solution-provider-program/), we've worked with the partner community to bring them the benefits of this channel. Our goal is to enable the partner community to resell Azure Government and help them grow their business while providing customers with cloud services they need.
+From the launch of [Azure Government services in the Cloud Solution Provider (CSP) program)](https://azure.microsoft.com/blog/announcing-microsoft-azure-government-services-in-the-cloud-solution-provider-program/), Microsoft worked with the partner community to bring them the benefits of this channel. The goal is to enable the partner community to resell Azure Government and help them grow their business while providing customers with cloud services they need.
 
-Below you can find a list of all the authorized Cloud Solution Providers (CSPs), Agreement for Online Services for Government (AOS-G), and Licensing Solution Providers (LSP) that can transact Azure Government. Updates to this list will be made as new partners are onboarded. 
+The following tables contain lists of all the authorized Cloud Solution Providers (CSPs), Agreement for Online Services for Government (AOS-G), and Licensing Solution Providers (LSP) that can transact Azure Government. We update this list as new partners are onboarded. 
 
 ## Approved direct CSPs
 

articles/azure-government/index.yml

@@ -10,7 +10,7 @@ metadata:
   ms.service: azure-government
   ms.topic: landing-page
   author: anaharris-ms
-  ms.author: anaharris 
+  ms.author: eliotgra 
   ms.date: 05/07/2022
 
 # linkListType: architecture | concept | deploy | download | get-started | how-to-guide | learn | overview | quickstart | reference | sample | tutorial | video | whats-new

articles/communication-services/how-tos/calling-sdk/includes/spotlight/spotlight-android.md

@@ -5,46 +5,30 @@ ms.topic: include
 ms.date: 06/20/2023
 ms.author: cnwankwo
 ---
-[!INCLUDE [Install SDK](../install-sdk/install-sdk-android.md)]
-
-Communication Services or Microsoft 365 users can call the spotlight APIs based on role type and conversation type
-
-**In a one to one call or group call scenario, the following APIs are supported for both Communication Services and Microsoft 365 users**
 
-|APIs| Organizer | Presenter | Attendee |
-|----------------------------------------------|--------|--------|--------|
-| startSpotlight | ✔️ | ✔️  | ✔️ |
-| stopSpotlight | ✔️ | ✔️ | ✔️ |
-| stopAllSpotlight |  ✔️ | ✔️ | ✔️ |
-| getSpotlightedParticipants |  ✔️ | ✔️ | ✔️ |
-| maxSupported |  ✔️ | ✔️ | ✔️ |
-
-**For meeting scenario the following APIs are supported for both Communication Services and Microsoft 365 users**
+[!INCLUDE [Install SDK](../install-sdk/install-sdk-android.md)]
 
-|APIs| Organizer | Presenter | Attendee |
-|----------------------------------------------|--------|--------|--------|
-| startSpotlight | ✔️ | ✔️  |  |
-| stopSpotlight | ✔️ | ✔️ | ✔️ |
-| stopAllSpotlight |  ✔️ | ✔️ |  |
-| getSpotlightedParticipants |  ✔️ | ✔️ | ✔️ |
-| maxSupported |  ✔️ | ✔️ | ✔️ |
+## Implement spotlight
 
-Spotlight is an extended feature of the core `Call` API. You first need to import calling Features from the Calling SDK:
+Spotlight is an extended feature of the core `Call` API. You first need to import calling features from the Calling SDK.
 
 ```java
 import com.azure.android.communication.calling.SpotlightFeature;
 ```
 
-Then you can get the feature API object from the call instance:
+Then you can get the feature API object from the call instance.
 
 ```java
 SpotlightCallFeature spotlightCallFeature;
 spotlightCallFeature = call.feature(Features.SPOTLIGHT);
 ```
-### Start spotlight for participants:
-Any participant in the call or meeting can be pinned. Only Microsoft 365 users who have an organizer, co-organizer or presenter role can start spotlight for other participants. This action is idempotent, trying to start spotlight on a pinned participant does nothing
 
-To use this feature, a list of participants identifiers is required
+### Start spotlight for participants
+
+Any participant in the call or meeting can be pinned. Only Microsoft 365 users who have an organizer, co-organizer, or presenter role can start spotlight for other participants. This action is idempotent, trying to start spotlight on a pinned participant does nothing
+
+You need a list of participant identifiers to use this feature.
+
 ```java
 List<CommunicationIdentifier> spotlightIdentifiers = new ArrayList<>();
 CommunicationUserIdentifier acsUser = new CommunicationUserIdentifier(<USER_ID>);
@@ -53,17 +37,21 @@ spotlightIdentifiers.add(new CommunicationUserIdentifier("<USER_ID>"));
 spotlightIdentifiers.add(new MicrosoftTeamsUserIdentifier("<USER_ID>"));
 spotlightCallFeature.StartSpotlight(spotlightIdentifiers);
 ```
-The following API can also be used to start the spotlight of participants
+
+You can also use the following code to start a participant spotlight.
+
 ```java
 CommunicationUserIdentifier acsUser = new CommunicationUserIdentifier(<USER_ID>);
 MicrosoftTeamsUserIdentifier teamsUser = new MicrosoftTeamsUserIdentifier(<USER_ID>);
 spotlightCallFeature.StartSpotlight(acsUser, teamsUser);
 ```
 
 ### Remove spotlight from participants
-Any pinned participant in the call or meeting can be unpinned. Only Microsoft 365 users who have an organizer, co-organizer or presenter role can unpin other participants. This action is idempotent, trying to stop spotlight on an unpinned participant does nothing 
 
-To use this feature, a list of participants identifiers is required
+Any pinned participant in the call or meeting can be unpinned. Only Microsoft 365 users who have an organizer, co-organizer, or presenter role can unpin other participants. This action is idempotent, trying to stop spotlight on an unpinned participant does nothing.
+
+You need a list of participants identifiers to use this feature.
+
 ```java
 List<CommunicationIdentifier> spotlightIdentifiers = new ArrayList<>();
 CommunicationUserIdentifier acsUser = new CommunicationUserIdentifier(<USER_ID>);
@@ -72,20 +60,29 @@ spotlightIdentifiers.add(new CommunicationUserIdentifier("<USER_ID>"));
 spotlightIdentifiers.add(new MicrosoftTeamsUserIdentifier("<USER_ID>"));
 spotlightCallFeature.StopSpotlight(spotlightIdentifiers);
 ```
-The following API can also be used to remove the spotlight of participants
+
+You can also use the following code to remove a participant spotlight.
+
 ```java
 CommunicationUserIdentifier acsUser = new CommunicationUserIdentifier(<USER_ID>);
 MicrosoftTeamsUserIdentifier teamsUser = new MicrosoftTeamsUserIdentifier(<USER_ID>);
 spotlightCallFeature.StopSpotlight(acsUser, teamsUser);
 ```
+
 ### Remove all spotlights
-All pinned participants can be unpinned using this API. Only MicrosoftTeamsUserIdentifier users who have an organizer, co-organizer or presenter role can unpin all participants.
+
+All pinned participants can be unpinned using this operation. Only `MicrosoftTeamsUserIdentifier` users who have an organizer, co-organizer, or presenter role can unpin all participants.
+
 ```java
 spotlightCallFeature.stopAllSpotlight();
 ```
 
 ### Handle changed states
-The `Spotlight` API allows you to subscribe to `SpotlightChanged` events. A `SpotlightChanged` event comes from a `call` instance and contains information about newly spotlighted participants and participants whose spotlight were stopped
+
+Spotlight mode enables you to subscribe to `SpotlightChanged` events. A `SpotlightChanged` event comes from a call instance and contains information about newly spotlighted participants and participants whose spotlight stopped. The returned array `SpotlightedParticipant` is sorted by the order the participants were spotlighted.
+
+To get information about all participants with spotlight state changes on the current call, use the following code.
+
 ```java
 import com.azure.android.communication.calling.SpotlightedParticipant;
 
@@ -106,8 +103,9 @@ void onSpotlightChanged(SpotlightChangedEvent args) {
 spotlightCallFeature.addOnSpotlightChangedListener(onSpotlightChanged);
 ```
 
-### Get all spotlighted participants:
-To get information about all participants that have spotlight state on current call, you can use the following API. The returned array is sorted by the order the participants were spotlighted.
+### Get all spotlighted participants
+
+To get information about all participants that have spotlight state on current call, use the following operation. The returned array is sorted by the order the participants were spotlighted.
 
 ``` java
 List<SpotlightedParticipant> currentSpotlightedParticipants = spotlightCallFeature.getSpotlightedParticipants();
@@ -117,8 +115,10 @@ foreach (SpotlightedParticipant participant in currentSpotlightedParticipants)
 }
 ```
 
-### Get the maximum supported spotlight:
-The following API can be used to get the maximum number of participants that can be spotlighted using the Calling SDK
+### Get the maximum supported spotlight participants
+
+Use the following operation to get the maximum number of participants that can be spotlighted using the Calling SDK.
+
 ``` java
 spotlightCallFeature.maxSupported();
 ```