Skip to content

Commit a5a180d

Browse files
committed
Merge branch 'main' of https://github.com/MicrosoftDocs/azure-docs-pr into nw-flow-portal
2 parents 217cf09 + 25b4240 commit a5a180d

File tree

756 files changed

+1891
-1532
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

756 files changed

+1891
-1532
lines changed

.openpublishing.redirection.json

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,11 @@
11
{
22
"redirections": [
33
{
4+
"source_path": "articles/application-gateway/powershell-samples.md",
5+
"redirect_url": "/previous-versions/azure/application-gateway/powershell-samples",
6+
"redirect_document_id": false
7+
},
8+
{
49
"source_path": "articles/storage/blobs/storage-blob-scalable-app-create-vm.md",
510
"redirect_url": "/previous-versions/azure/storage/blobs/storage-blob-scalable-app-create-vm",
611
"redirect_document_id": false
@@ -4750,6 +4755,11 @@
47504755
"source_path_from_root": "/articles/load-balancer/load-balancer-ipv6-internet-cli.md",
47514756
"redirect_url": "/azure/load-balancer/virtual-network-ipv4-ipv6-dual-stack-standard-load-balancer-powershell",
47524757
"redirect_document_id": false
4758+
},
4759+
{
4760+
"source_path_from_root": "/articles/third-party-notices.md",
4761+
"redirect_url": "/azure-docs/ThirdPartyNotices.md",
4762+
"redirect_document_id": false
47534763
}
47544764
]
47554765
}

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

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -32,6 +32,8 @@ Azure AD B2C is **generally available worldwide** with the option for **data res
3232

3333
If you enable [Go-Local add-on](#go-local-add-on), you can store your data exclusively in a specific country/region.
3434

35+
> [!NOTE]
36+
> 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.
3537
3638
## Region availability
3739

articles/active-directory-b2c/faq.yml

Lines changed: 2 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -268,12 +268,9 @@ sections:
268268
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).
269269
270270
- question: |
271-
What Azure AD B2C features are unavailable in Microsoft Azure Government?
271+
Is Azure AD B2C available in Microsoft Azure Government?
272272
answer: |
273-
The following AD B2C features are currently unavailable in Microsoft Azure Government:
274-
275-
* API connectors
276-
* Conditional Access
273+
No, Azure AD B2C is not available in Microsoft Azure Government.
277274
278275
- question: |
279276
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

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -23,3 +23,7 @@ zone_pivot_groups: app-service-openai
2323
:::zone pivot="openai-java"
2424
[!INCLUDE [deploy-intelligent-apps-linux-java-pivot.md](includes/deploy-intelligent-apps/deploy-intelligent-apps-linux-java-pivot.md)]
2525
::: zone-end
26+
27+
:::zone pivot="openai-node"
28+
[!INCLUDE [deploy-intelligent-apps-linux-node-pivot.md](includes/deploy-intelligent-apps/deploy-intelligent-apps-linux-node-pivot.md)]
29+
::: zone-end

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

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ You can use Azure App Service to create applications using Azure OpenAI and Open
1919

2020
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:
2121

22-
```bash
22+
```java
2323
@RequestMapping("/")
2424
String sayHello() {
2525

@@ -66,7 +66,7 @@ For OpenAI, use the following settings:
6666
| `OPENAI_API_KEY` | @Microsoft.KeyVault(SecretUri=https://myvault.vault.azure.net/secrets/mysecret/) |
6767
| `OPENAI_MODEL_NAME` | @Microsoft.KeyVault(SecretUri=https://myvault.vault.azure.net/secrets/mysecret/) |
6868

69-
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:
69+
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:
7070

7171
For Azure OpenAI:
7272

@@ -132,7 +132,7 @@ OpenAIClient client = new OpenAIClientBuilder()
132132
.buildClient();
133133
```
134134

135-
Once added, you see the following imports are added to the Application.java `http://Application.java` file:
135+
Once added, you see the following imports are added to the `Application.java` file:
136136

137137
```java
138138
import com.azure.ai.openai.OpenAIClient;

0 commit comments

Comments
 (0)