Merge pull request #287634 from MicrosoftDocs/main

9/30/2024 PM Publish

Author: Taojunshen

.openpublishing.redirection.json

@@ -1,6 +1,11 @@
 {
   "redirections": [
     {
+      "source_path": "articles/application-gateway/powershell-samples.md",
+      "redirect_url": "/previous-versions/azure/application-gateway/powershell-samples",
+      "redirect_document_id": false
+    },
+    {   
       "source_path": "articles/storage/blobs/storage-blob-scalable-app-create-vm.md",
       "redirect_url": "/previous-versions/azure/storage/blobs/storage-blob-scalable-app-create-vm",
       "redirect_document_id": false
@@ -4750,6 +4755,11 @@
       "source_path_from_root": "/articles/load-balancer/load-balancer-ipv6-internet-cli.md",
       "redirect_url": "/azure/load-balancer/virtual-network-ipv4-ipv6-dual-stack-standard-load-balancer-powershell",
       "redirect_document_id": false
+    },
+    {
+      "source_path_from_root": "/articles/third-party-notices.md",
+      "redirect_url": "/azure-docs/ThirdPartyNotices.md",
+      "redirect_document_id": false
     }
   ]
 }

articles/active-directory-b2c/data-residency.md

@@ -32,6 +32,8 @@ Azure AD B2C is **generally available worldwide** with the option for **data res
 
 If you enable [Go-Local add-on](#go-local-add-on), you can store your data exclusively in a specific country/region.
 
+> [!NOTE]
+> Azure AD B2C is generally available in the Microsoft Azure global cloud and Microsoft Azure operated by 21Vianet. Azure AD B2C is not available in Microsoft Azure Government.
 
 ## Region availability
 

articles/active-directory-b2c/faq.yml

@@ -268,12 +268,9 @@ sections:
           No, Azure AD B2C tenants don't support [group-based assignment to Microsoft Entra Enterprise Applications](../active-directory/manage-apps/assign-user-or-group-access-portal.md).
           
       - question: |
-          What Azure AD B2C features are unavailable in Microsoft Azure Government?
+          Is Azure AD B2C available in Microsoft Azure Government?
         answer: |
-          The following AD B2C features are currently unavailable in Microsoft Azure Government:
-
-          * API connectors
-          * Conditional Access
+          No, Azure AD B2C is not available in Microsoft Azure Government.
 
       - question: |
           I am using rolling refresh tokens for my application and I am getting an invalid_grant error on redeeming newly acquired refresh tokens well within their set validity period. Why does this happen? 

articles/app-service/deploy-intelligent-apps.md

@@ -23,3 +23,7 @@ zone_pivot_groups: app-service-openai
 :::zone pivot="openai-java"
 [!INCLUDE [deploy-intelligent-apps-linux-java-pivot.md](includes/deploy-intelligent-apps/deploy-intelligent-apps-linux-java-pivot.md)]
 ::: zone-end
+
+:::zone pivot="openai-node"
+[!INCLUDE [deploy-intelligent-apps-linux-node-pivot.md](includes/deploy-intelligent-apps/deploy-intelligent-apps-linux-node-pivot.md)]
+::: zone-end

articles/app-service/includes/deploy-intelligent-apps/deploy-intelligent-apps-linux-java-pivot.md

@@ -19,7 +19,7 @@ You can use Azure App Service to create applications using Azure OpenAI and Open
 
 For this Spring Boot application, we're building off the [quickstart](../../quickstart-java.md?tabs=springboot&pivots=java-javase) app and adding an extra feature to make a request to an Azure OpenAI or OpenAI service. Add the following code to your application:
 
-```bash
+```java
   @RequestMapping("/")
 	String sayHello() {
 
@@ -66,7 +66,7 @@ For OpenAI, use the following settings:
 | `OPENAI_API_KEY` | @Microsoft.KeyVault(SecretUri=https://myvault.vault.azure.net/secrets/mysecret/) |
 | `OPENAI_MODEL_NAME` | @Microsoft.KeyVault(SecretUri=https://myvault.vault.azure.net/secrets/mysecret/) |
 
-Once your app settings are saved, you can access the app settings in your code by referencing them in your application. Add the following code in the *Application.java `http://Application.java`* file:
+Once your app settings are saved, you can access the app settings in your code by referencing them in your application. Add the following code in the `Application.java` file:
 
 For Azure OpenAI:
 
@@ -132,7 +132,7 @@ OpenAIClient client = new OpenAIClientBuilder()
     .buildClient();
 ```
 
-Once added, you see the following imports are added to the Application.java `http://Application.java` file:
+Once added, you see the following imports are added to the `Application.java` file:
 
 ```java
 import com.azure.ai.openai.OpenAIClient;