Merge pull request #260803 from MicrosoftDocs/main

merge main to live Sunday 12/10, 4 PM

Author: American-Dipper

.openpublishing.redirection.json

@@ -9622,6 +9622,11 @@
             "redirect_url": "/azure/azure-functions/functions-reference-python?pivots=python-mode-decorators#triggers-and-inputs",
             "redirect_document_id": false
         },
+        {
+            "source_path_from_root": "/articles/azure-functions/update-java-versions.md",
+            "redirect_url": "/azure/azure-functions/update-language-versions",
+            "redirect_document_id": false
+        },
         {
             "source_path_from_root": "/articles/azure-government/documentation-government-k8.md",
             "redirect_url": "/azure/azure-government",

articles/ai-services/translator/document-translation/overview.md

@@ -99,37 +99,22 @@ Document Translation supports the following glossary file types:
 
 Document Translation data residency depends on the Azure region where your Translator resource was created:
 
-* Translator resources **created** in any region in Europe are **processed** at data center in West Europe and North Europe.
-* Translator resources **created** in any region in Asia or Australia are **processed** at data center in Southeast Asia and Australia East.
-* Translator resource **created** in all other regions including Global, North America and South America are **processed** at data center in East US and West US 2.
-
-### Text Translation data residency
-
-✔️ Feature: **Translator Text** </br>
-✔️ Region where resource created: **Any**
-
-| Service endpoint | Request processing data center |
-|------------------|--------------------------|
-|**Global (recommended):**</br>**`api.cognitive.microsofttranslator.com`**|Closest available data center.|
-|**Americas:**</br>**`api-nam.cognitive.microsofttranslator.com`**|East US &bull; South Central US &bull; West Central US &bull; West US 2|
-|**Europe:**</br>**`api-eur.cognitive.microsofttranslator.com`**|North Europe &bull; West Europe|
-| **Asia Pacific:**</br>**`api-apc.cognitive.microsofttranslator.com`**|Korea South &bull; Japan East &bull; Southeast Asia &bull; Australia East|
-|
+* Translator resources **created** in any region in Europe (except Switzerland) are **processed** at data center in North Europe and West Europe.
+* Translator resources **created** in any region in Switzerland are **processed** at data center in Switzerland North and Switzerland West
+* Translator resources **created** in any region in Asia Pacific or Australia are **processed** at data center in Southeast Asia and Australia East.
+* Translator resource **created** in all other regions including Global, North America, and South America are **processed** at data center in East US and West US 2.
 
 ### Document Translation data residency
 
 ✔️ Feature: **Document Translation**</br>
 ✔️ Service endpoint:  **Custom:** &#8198;&#8198;&#8198; **`<name-of-your-resource.cognitiveservices.azure.com/translator/text/batch/v1.1`**
 
- |Resource region| Request processing data center |
+|Resource region| Request processing data center |
 |----------------------------------|-----------------------|
-|**Global and any region in the Americas**  | East US &bull; West US 2|
-|**Any region in Europe**| North Europe &bull; West Europe|
-|**Any region in Asia Pacific**| Southeast Asia &bull; Australia East|
-
-
-### Document Translation data residency
-
+|**Any region within Europe (except Switzerland)**| Europe — North Europe &bull; West Europe|
+|**Switzerland**|Switzerland — Switzerland North &bull; Switzerland West|
+|**Any region within Asia Pacific and Australia**| Asia — Southeast Asia &bull; Australia East|
+|**All other regions including Global, North America, and South America**  | US — East US &bull; West US 2|
 
 ## Next steps
 

articles/ai-services/translator/text-translation-overview.md

@@ -58,6 +58,26 @@ Add Text Translation to your projects and applications using the following resou
     > * The [**Translator container image**](https://mcr.microsoft.com/product/azure-cognitive-services/translator/text-translation/about) supports limited features compared to cloud offerings.
     >
 
+## Data residency
+
+Text Translation data residency depends on the Azure region where your Translator resource was created:
+
+* Translator resources **created** in any region in Europe are **processed** at data center in West Europe and North Europe.
+* Translator resources **created** in any region in Asia or Australia are **processed** at data center in Southeast Asia and Australia East.
+* Translator resource **created** in all other regions including Global, North America and South America are **processed** at data center in East US and West US 2.
+
+### Text Translation data residency
+
+✔️ Feature: **Translator Text** </br>
+✔️ Region where resource created: **Any**
+
+| Service endpoint | Request processing data center |
+|------------------|--------------------------|
+|**Global (recommended):**</br>**`api.cognitive.microsofttranslator.com`**|Closest available data center.|
+|**Americas:**</br>**`api-nam.cognitive.microsofttranslator.com`**|East US &bull; South Central US &bull; West Central US &bull; West US 2|
+|**Europe:**</br>**`api-eur.cognitive.microsofttranslator.com`**|North Europe &bull; West Europe|
+| **Asia Pacific:**</br>**`api-apc.cognitive.microsofttranslator.com`**|Korea South &bull; Japan East &bull; Southeast Asia &bull; Australia East|
+
 ## Get started with Text Translation
 
 Ready to begin?

articles/azure-functions/TOC.yml

@@ -568,8 +568,9 @@
           items:
             - name: Migrate to model v4.x
               href: functions-node-upgrade-v4.md
-        - name: Update Java versions
-          href: update-java-versions.md  
+        - name: Update language versions
+          href: update-language-versions.md  
+          displayName: upgrade, migrate, language stack
     - name: Monitor
       items:
         - name: Monitor function apps with Azure Monitor