Skip to content

Commit 475eb8e

Browse files
authored
Merge branch 'MicrosoftDocs:main' into main
2 parents b8e46a0 + 9b1dc9d commit 475eb8e

File tree

896 files changed

+6493
-4734
lines changed

Some content is hidden

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

896 files changed

+6493
-4734
lines changed
Lines changed: 68 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,68 @@
1+
name: "📄 Azure Kubernetes Services - Feedback control template"
2+
title: "Feedback"
3+
description: >-
4+
🛈 FYI - This issue template is intended for use by the feedback control on the bottom of Azure Kubernetes Services pages on the
5+
https://learn.microsoft.com/azure/aks site.
6+
labels:
7+
- "azure-kubernetes-services/svc"
8+
body:
9+
- type: markdown
10+
attributes:
11+
value: "## Enter your feedback"
12+
- type: markdown
13+
attributes:
14+
value: Select the issue type, and describe the issue in the text box below. Add as much detail as needed to help us resolve the issue.
15+
- type: dropdown
16+
id: issue-type
17+
attributes:
18+
label: Type of issue
19+
options:
20+
- Typo
21+
- Code doesn't work
22+
- Missing information
23+
- Outdated article
24+
- Other (describe below)
25+
validations:
26+
required: true
27+
- type: textarea
28+
id: userfeedback
29+
validations:
30+
required: true
31+
attributes:
32+
label: Feedback
33+
description: >-
34+
If possible, please provide extended details that will add context and help the team update
35+
the documentation. Additional details may not be useful for typos, grammar, formatting, etc.
36+
For technical or factual errors, please include code snippets and output to show how the
37+
documentation is incorrect.
38+
- type: markdown
39+
attributes:
40+
value: "## 🚧 Article information 🚧"
41+
- type: markdown
42+
attributes:
43+
value: "*Don't modify the following fields*. They are automatically filled in for you. Doing so will disconnect your issue from the affected article. *Don't edit them*."
44+
- type: input
45+
id: pageUrl
46+
validations:
47+
required: true
48+
attributes:
49+
label: Page URL
50+
- type: input
51+
id: contentSourceUrl
52+
validations:
53+
required: true
54+
attributes:
55+
label: Content source URL
56+
- type: input
57+
id: author
58+
validations:
59+
required: true
60+
attributes:
61+
label: Author
62+
description: GitHub Id of the author
63+
- type: input
64+
id: documentVersionIndependentId
65+
validations:
66+
required: true
67+
attributes:
68+
label: Document Id

.openpublishing.redirection.virtual-desktop.json

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -424,6 +424,11 @@
424424
"source_path_from_root": "/articles/virtual-desktop/fslogix-containers-azure-files.md",
425425
"redirect_url": "/azure/virtual-desktop/fslogix-profile-containers",
426426
"redirect_document_id": true
427+
},
428+
{
429+
"source_path_from_root": "/articles/virtual-desktop/host-pool-load-balancing.md",
430+
"redirect_url": "/azure/virtual-desktop/configure-host-pool-load-balancing",
431+
"redirect_document_id": false
427432
}
428433
]
429434
}

articles/active-directory-b2c/TOC.yml

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -824,8 +824,6 @@
824824
href: user-flow-versions-legacy.md
825825
- name: Resources
826826
items:
827-
- name: Azure Roadmap
828-
href: https://azure.microsoft.com/updates/?status=nowavailable,inpreview,indevelopment&category=identity,security&query=b2c
829827
- name: Frequently asked questions
830828
href: ./faq.yml
831829
displayName: FAQ

articles/ai-services/cognitive-services-virtual-networks.md

Lines changed: 15 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ manager: nitinme
88
ms.service: azure-ai-services
99
ms.custom: devx-track-azurepowershell, devx-track-azurecli
1010
ms.topic: how-to
11-
ms.date: 04/05/2024
11+
ms.date: 06/13/2024
1212
ms.author: aahi
1313
---
1414

@@ -573,7 +573,10 @@ You can grant a subset of trusted Azure services access to Azure OpenAI, while m
573573
|Azure AI Search | `Microsoft.Search` |
574574
575575
576-
You can grant networking access to trusted Azure services by creating a network rule exception using the REST API:
576+
You can grant networking access to trusted Azure services by creating a network rule exception using the REST API or Azure portal:
577+
578+
### Using the Azure CLI
579+
577580
```bash
578581
579582
accessToken=$(az account get-access-token --resource https://management.azure.com --query "accessToken" --output tsv)
@@ -595,9 +598,6 @@ curl -i -X PATCH https://management.azure.com$rid?api-version=2023-10-01-preview
595598
'
596599
```
597600

598-
> [!NOTE]
599-
> The trusted service feature is only available using the command line described above, and cannot be done using the Azure portal.
600-
601601
To revoke the exception, set `networkAcls.bypass` to `None`.
602602

603603
To verify if the trusted service has been enabled from the Azure portal,
@@ -610,6 +610,16 @@ To verify if the trusted service has been enabled from the Azure portal,
610610

611611
:::image type="content" source="media/vnet/virtual-network-trusted-service.png" alt-text="A screenshot showing the trusted service is enabled." lightbox="media/vnet/virtual-network-trusted-service.png":::
612612

613+
### Using the Azure portal
614+
615+
1. Navigate to your Azure OpenAI resource, and select **Networking** from the navigation menu.
616+
1. Under **Exceptions**, select **Allow Azure services on the trusted services list to access this cognitive services account.**
617+
> [!TIP]
618+
> You can view the **Exceptions** option by selecting either **Selected networks and private endpoints** or **Disabled** under **Allow access from**.
619+
620+
:::image type="content" source="media/vnet/toggle-trusted-service.png" alt-text="A screenshot showing the networking settings for a resource in the Azure portal." lightbox="media/vnet/toggle-trusted-service.png":::
621+
***
622+
613623
### Pricing
614624

615625
For pricing details, see [Azure Private Link pricing](https://azure.microsoft.com/pricing/details/private-link).

articles/ai-services/containers/includes/cognitive-services-container-security.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,7 @@ The host should allowlist **port 443** and the following domains:
3939

4040
#### Disable deep packet inspection
4141

42-
[Deep packet inspection](https://en.wikipedia.org/wiki/Deep_packet_inspection) (DPI) is a type of data processing that inspects in detail the data sent over a computer network, and usually takes action by blocking, rerouting, or logging it accordingly.
42+
[Deep packet inspection (DPI)](https://en.wikipedia.org/wiki/Deep_packet_inspection) is a type of data processing that inspects in detail the data sent over a computer network, and usually takes action by blocking, rerouting, or logging it accordingly.
4343

4444
Disable DPI on the secure channels that the Azure AI containers create to Microsoft servers. Failure to do so will prevent the container from functioning correctly.
4545

articles/ai-services/document-intelligence/create-sas-tokens.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
---
22
title: Create shared access signature (SAS) tokens for your storage containers and blobs
3-
description: How to create Shared Access Signature tokens (SAS) for containers and blobs with Microsoft Storage Explorer and the Azure portal.
3+
description: How to create Shared Access Signature (SAS) tokens for containers and blobs with Microsoft Storage Explorer and the Azure portal.
44
ms.topic: how-to
55
author: laujan
66
manager: nitinme

articles/ai-services/document-intelligence/how-to-guides/includes/v3-0/java-sdk.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@ monikerRange: 'doc-intel-3.1.0 || doc-intel-3.0.0'
3434

3535
If you aren't using Visual Studio Code, make sure you have the following installed in your development environment:
3636

37-
- A [**Java Development Kit** (JDK)](/java/openjdk/download#openjdk-17) version 8 or later. For more information, see [Microsoft Build of OpenJDK](https://www.microsoft.com/openjdk).
37+
- A [**Java Development Kit (JDK)**](/java/openjdk/download#openjdk-17) version 8 or later. For more information, see [Microsoft Build of OpenJDK](https://www.microsoft.com/openjdk).
3838
- [**Gradle**](https://docs.gradle.org/current/userguide/installation.html), version 6.8 or later.
3939

4040
- An Azure AI services or Document Intelligence resource. Create a <a href="https://portal.azure.com/#create/Microsoft.CognitiveServicesFormRecognizer" title="Create a Document Intelligence resource." target="_blank">single-service</a> or <a href="https://portal.azure.com/#create/Microsoft.CognitiveServicesAllInOne" title="Create a multiple Document Intelligence resource." target="_blank">multi-service</a>. You can use the free pricing tier (`F0`) to try the service, and upgrade later to a paid tier for production.

articles/ai-services/document-intelligence/how-to-guides/includes/v4-0/java-sdk.md

Lines changed: 6 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@ ms.custom: devx-track-csharp, ignite-2023, linux-related-content
2727

2828
If you aren't using Visual Studio Code, make sure you have the following installed in your development environment:
2929

30-
- A [**Java Development Kit** (JDK)](/java/openjdk/download#openjdk-17) version 8 or later. For more information, see [Microsoft Build of OpenJDK](https://www.microsoft.com/openjdk).
30+
- A [**Java Development Kit (JDK)**](/java/openjdk/download#openjdk-17) version 8 or later. For more information, see [Microsoft Build of OpenJDK](https://www.microsoft.com/openjdk).
3131
- [**Gradle**](https://docs.gradle.org/current/userguide/installation.html), version 6.8 or later.
3232

3333
- An Azure AI services or Document Intelligence resource. Create a <a href="https://portal.azure.com/#create/Microsoft.CognitiveServicesFormRecognizer" title="Create a Document Intelligence resource." target="_blank">single-service</a> or <a href="https://portal.azure.com/#create/Microsoft.CognitiveServicesAllInOne" title="Create a multiple Document Intelligence resource." target="_blank">multi-service</a>. You can use the free pricing tier (`F0`) to try the service, and upgrade later to a paid tier for production.
@@ -85,10 +85,10 @@ This article uses the Gradle dependency manager. You can find the client library
8585

8686
1. Open the project's *build.gradle.kts* file in your IDE. Copy and paste the following code to include the client library as an `implementation` statement, along with the required plugins and settings.
8787

88-
```kotlin
89-
plugins {
90-
java
91-
application
88+
```kotlin
89+
plugins {
90+
java
91+
application
9292
}
9393
application {
9494
mainClass.set("DocIntelligence")
@@ -98,9 +98,8 @@ This article uses the Gradle dependency manager. You can find the client library
9898
}
9999
dependencies {
100100
implementation group: 'com.azure', name: 'azure-ai-documentintelligence', version: '1.0.0-beta.2'
101-
102101
}
103-
```
102+
```
104103

105104
## Create a Java application
106105

articles/ai-services/document-intelligence/quickstarts/includes/java-sdk.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -43,7 +43,7 @@ In this quickstart, use the following features to analyze and extract data and v
4343
4444
* If you aren't using Visual Studio Code, make sure you have the following installed in your development environment:
4545

46-
* A [**Java Development Kit** (JDK)](/java/openjdk/download#openjdk-17) version 8 or later. For more information, *see* [Microsoft Build of OpenJDK](https://www.microsoft.com/openjdk).
46+
* A [**Java Development Kit (JDK)**](/java/openjdk/download#openjdk-17) version 8 or later. For more information, *see* [Microsoft Build of OpenJDK](https://www.microsoft.com/openjdk).
4747

4848
* [**Gradle**](https://docs.gradle.org/current/userguide/installation.html), version 6.8 or later.
4949

articles/ai-services/document-intelligence/quickstarts/includes/v2-1/java.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ In this quickstart, you use the following APIs to extract structured data from f
2121

2222
* Azure subscription - [Create one for free](https://azure.microsoft.com/free/cognitive-services/).
2323

24-
* A [**Java Development Kit** (JDK)](https://wiki.openjdk.java.net/display/jdk8u) version 8 or later. For more information, *see* [supported Java Versions and update schedule](/azure/developer/java/fundamentals/java-support-on-azure#supported-java-versions-and-update-schedule).
24+
* A [**Java Development Kit (JDK)**](https://wiki.openjdk.java.net/display/jdk8u) version 8 or later. For more information, *see* [supported Java Versions and update schedule](/azure/developer/java/fundamentals/java-support-on-azure#supported-java-versions-and-update-schedule).
2525

2626
* An Azure AI services or Document Intelligence resource. Once you have your Azure subscription, create a [single-service](https://portal.azure.com/#create/Microsoft.CognitiveServicesFormRecognizer) or [multi-service](https://portal.azure.com/#create/Microsoft.CognitiveServicesAllInOne) Document Intelligence resource in the Azure portal to get your key and endpoint. You can use the free pricing tier (`F0`) to try the service, and upgrade later to a paid tier for production.
2727

0 commit comments

Comments
 (0)