Merge pull request #295341 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: Taojunshen

articles/active-directory-b2c/json-transformations.md

@@ -337,7 +337,7 @@ The GetClaimFromJson claims transformation gets a single element from a JSON dat
 
 ## GetClaimsFromJsonArray
 
-Get a list of specified elements from Json data. Check out the [Live demo](https://github.com/azure-ad-b2c/unit-tests/tree/main/claims-transformation/json#getclaimsfromjsonarray) of this claims transformation.
+Get a list of specified elements from JSON data. Check out the [Live demo](https://github.com/azure-ad-b2c/unit-tests/tree/main/claims-transformation/json#getclaimsfromjsonarray) of this claims transformation.
 
 | Element | TransformationClaimType | Data Type | Notes |
 | ---- | ----------------------- | --------- | ----- |

articles/app-service/configure-language-python.md

@@ -20,7 +20,7 @@ This article describes how [Azure App Service](overview.md) runs Python apps, ho
 The App Service deployment engine automatically activates a virtual environment and runs `pip install -r requirements.txt` for you when you deploy a [Git repository](deploy-local-git.md), or when you deploy a [zip package](deploy-zip.md) [with build automation enabled](deploy-zip.md#enable-build-automation-for-zip-deploy).
 
 > [!NOTE]
-> Currently App Service requires `requirements.txt` in your project's root directory, even if you're using modern Python packaging tools such as `pyproject.toml`.
+> Currently App Service requires `requirements.txt` in your project's root directory even if you have a `pyproject.toml`. See [Generate requirements.txt from pyproject.toml](#generate-requirementstxt-from-pyprojecttoml) for recommended approaches.
 
 This guide provides key concepts and instructions for Python developers who use a built-in Linux container in App Service. If you've never used Azure App Service, first follow the [Python quickstart](quickstart-python.md) and [Flask](tutorial-python-postgresql-app-flask.md), [Django](tutorial-python-postgresql-app-django.md), or [FastAPI](tutorial-python-postgresql-app-fastapi.md) with PostgreSQL tutorial.
 
@@ -101,6 +101,30 @@ For more information on how App Service runs and builds Python apps in Linux, se
 > [!NOTE]
 > Always use relative paths in all pre- and post-build scripts because the build container in which Oryx runs is different from the runtime container in which the app runs. Never rely on the exact placement of your app project folder within the container (for example, that it's placed under *site/wwwroot*).
 
+## Generate requirements.txt from pyproject.toml
+
+App Service does not directly support `pyproject.toml` at the moment.  If you're using tools like Poetry or uv, the recommended approach is to generate a compatible `requirements.txt` before deployment in your project's root:
+
+### Using Poetry
+
+Using [Poetry](https://python-poetry.org/) with the [export plugin](https://github.com/python-poetry/poetry-plugin-export):
+
+```sh
+
+poetry export -f requirements.txt --output requirements.txt --without-hashes
+
+```
+
+### Using uv
+
+Using [uv](https://docs.astral.sh/uv/concepts/projects/sync/#exporting-the-lockfile):
+
+```sh
+
+uv export --format requirements-txt --no-hashes --output-file requirements.txt
+
+```
+
 ## Migrate existing applications to Azure
 
 Existing web applications can be redeployed to Azure as follows:

articles/app-service/configure-ssl-certificate.md

@@ -141,7 +141,7 @@ By default, the App Service resource provider doesn't have access to your key va
 |--|--|--|
 | **Microsoft Azure App Service** or **Microsoft.Azure.WebSites** | - `abfa0a7c-a6b6-4736-8310-5855508787cd` for public Azure cloud environment <br><br>- `6a02c803-dafd-4136-b4c3-5a6f318b4714` for Azure Government cloud environment | Certificate User |
 
-The service principal app ID or assignee value is the ID for the App Service resource provider. To learn how to authorize key vault permissions for the App Service resource provider using an access policy, see the [provide access to Key Vault keys, certificates, and secrets with an Azure role-based access control documentation](/azure/key-vault/general/rbac-guide?tabs=azure-portal#key-vault-scope-role-assignment).
+The service principal app ID or assignee value is the ID for the App Service resource provider. Note that when granting access using RBAC, the corresponding Object ID of the service principal app ID is tenant-specific. To learn how to authorize key vault permissions for the App Service resource provider using an access policy, see the [provide access to Key Vault keys, certificates, and secrets with an Azure role-based access control documentation](/azure/key-vault/general/rbac-guide?tabs=azure-portal#key-vault-scope-role-assignment).
 
 ### [Access policy permissions](#tab/accesspolicy)
 

articles/app-service/manage-backup.md

@@ -359,18 +359,22 @@ You can back up to a firewall-protected storage account if it's part of the same
 
 ### How do I restore to an app in a different subscription?
 
-1. Make a custom backup to an Azure Storage container.
-1. [Download the backup ZIP file](../storage/blobs/storage-quickstart-blobs-portal.md) to your local machine.
-1. On the **Backups** page for your target app, select **Restore** in the top menu.
-1. In **Backup details**, select **Storage** in **Source**.
-1. Select the preferred storage account.
-1. In **Zip file**, select **Upload file**.
-1. In **Name**, select **Browse** and select the downloaded ZIP file.
-1. Configure the rest of the sections as described in [Restore a backup](#restore-a-backup).
+1. Make a custom backup of the source App to an **Azure Storage container**.
+2. [Download the backup ZIP file](../storage/blobs/storage-quickstart-blobs-portal.md) and the **XML metadata file** to your local machine.
+3. Upload **both the ZIP and XML files** to the target storage account.
+4. In the **Backups** page of your target app, click **Restore** in the top menu.
+5. In the **Backup details** section, choose **Storage** as the **Source**. Select the **storage account** where you uploaded the backup files.
+6. Click **Use file in storage account** and select the **ZIP file** to restore.
+7. Configure the remaining settings as outlined in the [Restore a backup](#restore-a-backup). Confirm and start the restore process.
 
 ### How do I restore to an app in the same subscription but in a different region?
 
-The steps are the same as in [How do I restore to an app in a different subscription?](#how-do-i-restore-to-an-app-in-a-different-subscription).
+You can restore an app to a different region within the same subscription. The process follows the same steps outlined in [Restore a backup](#restore-a-backup).
+
+#### Key considerations
+Ensure that the backup storage for the source app is accessible by the target app.
+The restoration process in the Azure portal allows selecting an app in a different region as long as it remains within the same subscription.
+
 
 ### Where are the automatic backups stored?
 

articles/azure-cache-for-redis/cache-aspnet-output-cache-provider.md

@@ -147,7 +147,7 @@ If you don’t think you need retry or if you want to handle the retry logic you
 
 ### About _redisSerializerType_
 
-The serialization to store the values on Redis is done in a binary format by default, which is provided by the **BinaryFormatter** class. Use _redisSerializerType_ to specify the assembly qualified type name of a class that implements **Microsoft.Web.Redis.ISerializer** and has the custom logic to serialize and deserialize the values. For example, here's a Json serializer class using JSON.NET:
+The serialization to store the values on Redis is done in a binary format by default, which is provided by the **BinaryFormatter** class. Use _redisSerializerType_ to specify the assembly qualified type name of a class that implements **Microsoft.Web.Redis.ISerializer** and has the custom logic to serialize and deserialize the values. For example, here's a JSON serializer class using JSON.NET:
 
 ```cs
 namespace MyCompany.Redis

articles/azure-functions/functions-bindings-rabbitmq-trigger.md

@@ -69,7 +69,7 @@ namespace Company.Function
 }
 ```
 
-Like with Json objects, an error will occur if the message isn't properly formatted as a C# object. If it is, it's then bound to the variable pocObj, which can be used for what whatever it's needed for.
+Like with JSON objects, an error will occur if the message isn't properly formatted as a C# object. If it is, it's then bound to the variable pocObj, which can be used for what whatever it's needed for.
 
 ---
 

articles/azure-web-pubsub/howto-develop-reliable-clients.md

@@ -28,7 +28,7 @@ The following tutorial walks you through the important part of implementing the
 
 To use reliable subprotocols, you must set the subprotocol when constructing WebSocket connections. In JavaScript, you can use the following code:
 
-- Use Json reliable subprotocol:
+- Use JSON reliable subprotocol:
 
   ```js
   var pubsub = new WebSocket(

articles/azure-web-pubsub/includes/terms.md

@@ -6,7 +6,7 @@ ms.topic: include
 ms.date: 01/23/2024
 ---
 
-- **Connection**: A connection, also known as a client or a **client connection**, it's a logical relationship between a client and the Web PubSub service. Over a 'connection', the client and the service engage in a series of stateful interactions. **Connections** using different protocols might behave differently, for example, some **connection** are limited to the duration of a network connection, while others can extend across multiple successive network connections between a client and the service.
+- **Connection**: A connection, also known as a client or a **client connection**, it's a logical relationship between a client and the Web PubSub service. Over a 'connection', the client and the service engage in a series of stateful interactions. **Connections** using different protocols might behave differently, for example, some **connections** are limited to the duration of a network connection, while others can extend across multiple successive network connections between a client and the service.
 
 - **Hub**: A hub is a logical concept for a set of client connections. Usually you use one hub for one scenario, for example, a *chat* hub, or a *notification* hub. When a client connection connects, it connects to a hub, and during its lifetime it belongs to that hub. Once a client connection connects to the hub, the hub exists. Different applications can share one Azure Web PubSub service by using different hub names. While there is no strict limit on the number of hubs, a **hub** consumes more service load comparing to a **group**. It is recommended to have a predetermined set of hubs rather than generating them dynamically.
 

articles/backup/backup-azure-linux-database-consistent-enhanced-pre-post.md

@@ -13,7 +13,7 @@ ms.author: jsuri
 Azure Backup service already provides a [_prepost_ script framework](./backup-azure-linux-app-consistent.md) to achieve application consistency in Linux VMs using Azure Backup. This process involves invoking a pre-script (to quiesce the applications) before taking
 snapshot of disks and calling post-script (commands to un-freeze the applications) after the snapshot is completed to return the applications to the normal mode.
 
-Authoring, debugging and maintenance of e pre/post scripts could be challenging. To remove this complexity, Azure Backup provides simplified pre/post-script experience for marquee databases to get application consistent snapshot with least overhead.
+Authoring, debugging, and maintenance of the pre/post scripts could be challenging. To remove this complexity, Azure Backup provides simplified pre/post-script experience for marquee databases to get application consistent snapshot with least overhead.
 
 :::image type="content" source="./media/backup-azure-linux-database-consistent-enhanced-pre-post/linux-application-consistent-snapshot.png" alt-text="Diagram showing Linux application-consistent snapshot by Azure Backup.":::
 

articles/cloud-services-extended-support/in-place-migration-overview.md

@@ -112,7 +112,7 @@ For more information, see [Overview of Platform-supported migration of IaaS reso
 - 	User Defined Routes
 - 	Internal load balancer
 - 	Certificate migration to key vault
-- 	Plugins and Extension (XML and Json based)
+- 	Plugins and Extension (XML and JSON based)
 - 	On Start / On Stop Tasks
 - 	Deployments with Accelerated Networking
 - 	Deployments using single or multiple roles