Revert "Merge branch 'main' into jokebeck"

This reverts commit 13efa36, reversing
changes made to 4659fc1.

Author: jkebeck

articles/ai-services/speech-service/how-to-custom-speech-test-and-train.md

@@ -270,7 +270,7 @@ Use <a href="http://sox.sourceforge.net" target="_blank" rel="noopener">SoX</a>
 
 ### Custom display text formatting data for training
 
-Learn more about [preparing display text formatting data](./how-to-custom-speech-display-text-format.md) and [display text formatting with speech to text](./display-text-format.md).
+Learn more about [display text formatting with speech to text](./display-text-format.md).
 
 Automatic Speech Recognition output display format is critical to downstream tasks and one-size doesn’t fit all. Adding Custom Display Format rules allows users to define their own lexical-to-display format rules to improve the speech recognition service quality on top of Microsoft Azure Custom Speech Service.
 

articles/ai-services/speech-service/includes/release-notes/release-notes-tts.md

@@ -16,40 +16,6 @@ The custom voice API is available for creating and managing [professional](../..
 
 The newly trained voice models now support 48 kHz sample rate, irrespective of the model version. For previously trained voice models, it's necessary to [upgrade the engine version](../../how-to-custom-voice-create-voice.md?tabs=neural#update-engine-version-for-your-voice-model) to at least **2023.11.13.0** version to enhance the sample rate to 48 kHz.
 
-#### Prebuilt neural voice
-- Introducing new multilingual voices for public preview:
-
-| Locale (BCP-47) | Language | Text to speech voices |
-| ----- | ----- | ----- |
-| `de-DE` | German (Germany) | `de-DE-FlorianMultilingualNeural` (Male) |
-| `en-US` | English (United States) | `en-US-AvaMultilingualNeural` (Female) |
-| `en-US` | English (United States) | `en-US-EmmaMultilingualNeural` (Female) |
-| `fr-FR` | French (France) | `fr-FR-RemyMultilingualNeural` (Male) |
-| `en-US` | English (United States) | `en-US-BrianMultilingualNeural` (Male) |
-| `en-US` | English (United States) | `en-US-AndrewMultilingualNeural` (Male) |
-| `fr-FR` | French (France) | `fr-FR-SeraphinaMultilingualNeural` (Female) |
-| `fr-FR` | French (France) | `fr-FR-VivienneMultilingualNeural` (Female) |
-| `zh-CN` | Chinese (Mandarin, Simplified) | `zh-CN-XiaoxiaoMultilingualNeural` (Female) |
-| `zh-CN` | Chinese (Mandarin, Simplified) | `zh-CN-XiaochenMultilingualNeural` (Female) |
-| `zh-CN` | Chinese (Mandarin, Simplified) | `zh-CN-YunyiMultilingualNeural` (Male) |
-
-- Introducing new `zh-CN-XiaoxiaoDialectsNeural` voices for public preview which support several Chinese dialects and accents:
-
-| Voicename | Secondary language | Dialect/Accent |
-| ----- | ----- | ----- |
-| `zh-CN-XiaoxiaoDialectsNeural` | `zh-CN-shaanxi` | Chinese (Zhongyuan Mandarin Shaanxi, Simplified) |
-|  | `zh-CN-sichuan` | Chinese (Southwestern Mandarin, Simplified) |
-|  | `zh-CN-shanxi` | Chinese (Shanxi Accent Mandarin, Simplified) |
-|  | `nan-CN` | Chinese (Southern Min, Simplified) |
-|  | `zh-CN-anhui` | Chinese (Jianghuai Mandarin Anhui, Simplified) |
-|  | `zh-CN-hunan` | Chinese (Hunan Accent Mandarin, Simplified) |
-|  | `zh-CN-gansu` | Chinese (Lanyin Mandarin Gansu, Simplified) |
-|  | `zh-CN-shandong` | Chinese (Jilu Mandarin, Simplified) |
-|  | `zh-CN-henan` | Chinese (Zhongyuan Mandarin Henan, Simplified) |
-|  | `zh-CN-liaoning` | Chinese (Northeastern Mandarin, Simplified) |
-|  | `zh-TW` | Chinese (Taiwanese Mandarin, Traditional) |
-
-
 ### November 2023 release
 
 #### Personal voice

articles/api-management/migrate-stv1-to-stv2.md

@@ -6,7 +6,7 @@ author: dlepow
 ms.service: api-management
 ms.custom: devx-track-azurecli
 ms.topic: how-to
-ms.date: 01/11/2024
+ms.date: 10/18/2023
 ms.author: danlep
 ---
 
@@ -52,17 +52,26 @@ API Management platform migration from `stv1` to `stv2` involves updating the un
 
 For an API Management instance that's not deployed in a VNet, migrate your instance using the **Platform migration** blade in the Azure portal, or invoke the Migrate to `stv2` REST API. 
 
-During the migration, the VIP address of your API Management instance will be preserved. 
+You can choose whether the virtual IP address of API Management will change, or whether the original VIP address is preserved.
 
-* API requests will be unresponsive for approximately 15 minutes while the IP address is migrated to the new infrastructure. 
-* Infrastructure configuration (such as custom domains, locations, and CA certificates) will be locked for 45 minutes. 
-* No further configuration is required after migration.
+* **New virtual IP address (recommended)** - If you choose this mode, API requests remain responsive during migration. Infrastructure configuration (such as custom domains, locations, and CA certificates) will be locked for 30 minutes. After migration, you'll need to update any network dependencies including DNS, firewall rules, and VNets to use the new VIP address. 
+
+* **Preserve IP address** - If you preserve the VIP address, API requests will be unresponsive for approximately 15 minutes while the IP address is migrated to the new infrastructure. Infrastructure configuration (such as custom domains, locations, and CA certificates) will be locked for 45 minutes. No further configuration is required after migration.
 
 #### [Portal](#tab/portal)
 
 1. In the [Azure portal](https://portal.azure.com), navigate to your API Management instance.
 1. In the left menu, under **Settings**, select **Platform migration**.
-1. On the **Platform migration** page, review guidance for the migration process, and prepare your environment. 
+1. On the **Platform migration** page, select one of the two migration options:
+
+    * **New virtual IP address (recommended)**. The VIP address of your API Management instance will change automatically. Your service will have no downtime, but after migration you'll need to update any network dependencies including DNS, firewall rules, and VNets to use the new VIP address.
+
+    * **Preserve IP address** - The VIP address of your API Management instance won't change. Your instance will have downtime for up to 15 minutes.
+
+        :::image type="content" source="media/migrate-stv1-to-stv2/platform-migration-portal.png" alt-text="Screenshot of API Management platform migration in the portal.":::
+
+1. Review guidance for the migration process, and prepare your environment. 
+
 1. After you've completed preparation steps, select **I have read and understand the impact of the migration process.** Select **Migrate**.
 
 #### [Azure CLI](#tab/cli)
@@ -93,15 +102,22 @@ RG_NAME={name of your resource group}
 # Get resource ID of API Management instance
 APIM_RESOURCE_ID=$(az apim show --name $APIM_NAME --resource-group $RG_NAME --query id --output tsv)
 
-# Call REST API to migrate to stv2 and preserve VIP address
-az rest --method post --uri "$APIM_RESOURCE_ID/migrateToStv2?api-version=2023-03-01-preview" --body '{"mode": "PreserveIp"}'
+# Call REST API to migrate to stv2 and change VIP address
+az rest --method post --uri "$APIM_RESOURCE_ID/migrateToStv2?api-version=2023-03-01-preview" --body '{"mode": "NewIp"}'
+
+# Alternate call to migrate to stv2 and preserve VIP address
+# az rest --method post --uri "$APIM_RESOURCE_ID/migrateToStv2?api-version=2023-03-01-preview" --body '{"mode": "PreserveIp"}'
 ```
 ---
 
 ### Verify migration
 
 To verify that the migration was successful, when the status changes to `Online`, check the [platform version](compute-infrastructure.md#how-do-i-know-which-platform-hosts-my-api-management-instance) of your API Management instance. After successful migration, the value is `stv2`.
 
+### Update network dependencies
+
+On successful migration, update any network dependencies including DNS, firewall rules, and VNets to use the new VIP address.
+
 ## Scenario 2: Migrate a network-injected API Management instance
 
 Trigger migration of a network-injected API Management instance to the `stv2` platform by updating the existing network configuration to use new network settings (see the following section). After that update completes, as an optional step, you can migrate back to the original VNet and subnet you used.

articles/azure-cache-for-redis/cache-high-availability.md

@@ -120,11 +120,9 @@ Zone-redundant Enterprise and Enterprise Flash tier caches are available in the
 | Canada Central* | North Europe | | | Australia East |
 | Central US* | UK South | | | Central India |
 | East US | West Europe | | | Southeast Asia |
-| East US 2 | | | | Japan East* |
-| South Central US | | | | East Asia* |
+| East US 2 | | | | |
+| South Central US | | | | |
 | West US 2 | | | | |
-| West US 3 | | | | |
-| Brazil South | | | | |
 
 \* Enterprise Flash tier not available in this region.
 

articles/azure-functions/configure-monitoring.md

@@ -50,7 +50,6 @@ The following chart describes the main categories of logs that the runtime creat
 
 | Category | Table | Description |
 | ----- | ----- | ----- |
-| **`Function`** | **traces**| Includes function started and completed logs for all function runs. For successful runs, these logs are at the `Information` level. Exceptions are logged at the `Error` level. The runtime also creates `Warning` level logs, such as when queue messages are sent to the [poison queue](functions-bindings-storage-queue-trigger.md#poison-messages).|
 | **`Function.<YOUR_FUNCTION_NAME>`** | **dependencies**| Dependency data is automatically collected for some services. For successful runs, these logs are at the `Information` level. For more information, see [Dependencies](functions-monitoring.md#dependencies). Exceptions are logged at the `Error` level. The runtime also creates `Warning` level logs, such as when queue messages are sent to the [poison queue](functions-bindings-storage-queue-trigger.md#poison-messages). |
 | **`Function.<YOUR_FUNCTION_NAME>`** | **customMetrics**<br/>**customEvents** | C# and JavaScript SDKs lets you collect custom metrics and log custom events. For more information, see [Custom telemetry data](functions-monitoring.md#custom-telemetry-data).|
 | **`Function.<YOUR_FUNCTION_NAME>`** | **traces**| Includes function started and completed logs for specific function runs. For successful runs, these logs are at the `Information` level. Exceptions are logged at the `Error` level. The runtime also creates `Warning` level logs, such as when queue messages are sent to the [poison queue](functions-bindings-storage-queue-trigger.md#poison-messages). |
@@ -279,12 +278,7 @@ With scale controller logging enabled, you're now able to [query your scale cont
 
 ## Enable Application Insights integration
 
-For a function app to send data to Application Insights, it needs to connect to the Application Insights resource using **only one** of these application settings:
-
-| Setting name | Description | 
-| ---- | ---- |
-| **[APPLICATIONINSIGHTS_CONNECTION_STRING](functions-app-settings.md#applicationinsights_connection_string)** | This is the recommended setting, which is required when your Application Insights instance runs in a sovereign cloud. The connection string supports other [new capabilities](../azure-monitor/app/migrate-from-instrumentation-keys-to-connection-strings.md#new-capabilities).   |
-| **[APPINSIGHTS_INSTRUMENTATIONKEY](functions-app-settings.md#appinsights_instrumentationkey)** | Legacy setting, which is deprecated by Application Insights in favor of the connection string setting. |
+For a function app to send data to Application Insights, it needs to know the instrumentation key of an Application Insights resource. The key must be in an app setting named **APPINSIGHTS_INSTRUMENTATIONKEY**.
 
 When you create your function app in the [Azure portal](./functions-get-started.md) from the command line by using [Azure Functions Core Tools](./create-first-function-cli-csharp.md) or [Visual Studio Code](./create-first-function-vs-code-csharp.md), Application Insights integration is enabled by default. The Application Insights resource has the same name as your function app, and it's created either in the same region or in the nearest region.
 
@@ -294,12 +288,12 @@ To review the Application Insights resource being created, select it to expand t
 
 :::image type="content" source="media/functions-monitoring/enable-ai-new-function-app.png" alt-text="Screenshot of enabling Application Insights while creating a function app.":::
 
-When you select **Create**, an Application Insights resource is created with your function app, which has the `APPLICATIONINSIGHTS_CONNECTION_STRING` set in application settings. Everything is ready to go.
+When you select **Create**, an Application Insights resource is created with your function app, which has the `APPINSIGHTS_INSTRUMENTATIONKEY` set in application settings. Everything is ready to go.
 
 <a id="manually-connect-an-app-insights-resource"></a>
 ### Add to an existing function app 
 
-If an Application Insights resource wasn't created with your function app, use the following steps to create the resource. You can then add the connection string from that resource as an [application setting](functions-how-to-use-azure-function-app-settings.md#settings) in your function app.
+If an Application Insights resource wasn't created with your function app, use the following steps to create the resource. You can then add the instrumentation key from that resource as an [application setting](functions-how-to-use-azure-function-app-settings.md#settings) in your function app.
 
 1. In the [Azure portal](https://portal.azure.com), search for and select **function app**, and then select your function app.
 
@@ -320,14 +314,14 @@ If an Application Insights resource wasn't created with your function app, use t
 
    The Application Insights resource is created in the same resource group and subscription as your function app. After the resource is created, close the **Application Insights** window.
 
-1. In your function app, select **Configuration** under **Settings**, and then select **Application settings**. If you see a setting named `APPLICATIONINSIGHTS_CONNECTION_STRING`, Application Insights integration is enabled for your function app running in Azure. If for some reason this setting doesn't exist, add it using your Application Insights connection string as the value.
+1. In your function app, select **Configuration** under **Settings**, and then select **Application settings**. If you see a setting named `APPINSIGHTS_INSTRUMENTATIONKEY`, Application Insights integration is enabled for your function app running in Azure. If for some reason this setting doesn't exist, add it using your Application Insights instrumentation key as the value.
 
 > [!NOTE]
-> Older function apps might be using `APPINSIGHTS_INSTRUMENTATIONKEY` instead of `APPLICATIONINSIGHTS_CONNECTION_STRING`. When possible, you should update your app to use the connection string instead of the instrumentation key.   
+> Early versions of Functions used built-in monitoring, which is no longer recommended. When you're enabling Application Insights integration for such a function app, you must also [disable built-in logging](#disable-built-in-logging).  
 
 ## Disable built-in logging
 
-Early versions of Functions used built-in monitoring, which is no longer recommended. When you enable Application Insights, disable the built-in logging that uses Azure Storage. The built-in logging is useful for testing with light workloads, but isn't intended for high-load production use. For production monitoring, we recommend Application Insights. If built-in logging is used in production, the logging record might be incomplete because of throttling on Azure Storage.
+When you enable Application Insights, disable the built-in logging that uses Azure Storage. The built-in logging is useful for testing with light workloads, but isn't intended for high-load production use. For production monitoring, we recommend Application Insights. If built-in logging is used in production, the logging record might be incomplete because of throttling on Azure Storage.
 
 To disable built-in logging, delete the `AzureWebJobsDashboard` app setting. For more information about how to delete app settings in the Azure portal, see the **Application settings** section of [How to manage a function app](functions-how-to-use-azure-function-app-settings.md#settings). Before you delete the app setting, ensure that no existing functions in the same function app use the setting for Azure Storage triggers or bindings.
 
@@ -446,10 +440,10 @@ To configure these values at App settings level (and avoid redeployment on just
 | Host.json path | App setting |
 |----------------|-------------|
 | logging.logLevel.default  | AzureFunctionsJobHost__logging__logLevel__default  |
-| logging.logLevel.Host.Aggregator | AzureFunctionsJobHost__logging__logLevel__Host__Aggregator |
+| logging.logLevel.Host.Aggregator | AzureFunctionsJobHost__logging__logLevel__Host.Aggregator |
 | logging.logLevel.Function | AzureFunctionsJobHost__logging__logLevel__Function |
-| logging.logLevel.Function.Function1 | AzureFunctionsJobHost__logging__logLevel__Function__Function1 |
-| logging.logLevel.Function.Function1.User | AzureFunctionsJobHost__logging__logLevel__Function__Function1__User |
+| logging.logLevel.Function.Function1 | AzureFunctionsJobHost__logging__logLevel__Function.Function1 |
+| logging.logLevel.Function.Function1.User | AzureFunctionsJobHost__logging__logLevel__Function.Function1.User |
 
 You can override the settings directly at the Azure portal Function App Configuration blade or by using an Azure CLI or PowerShell script.