Merge branch 'main' into austinmc-stix-api

Author: austinmccollum

articles/active-directory-b2c/TOC.yml

@@ -824,8 +824,6 @@
     href: user-flow-versions-legacy.md
 - name: Resources
   items:
-  - name: Azure Roadmap
-    href: https://azure.microsoft.com/updates/?status=nowavailable,inpreview,indevelopment&category=identity,security&query=b2c
   - name: Frequently asked questions
     href: ./faq.yml
     displayName: FAQ

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

@@ -8,7 +8,7 @@ manager: nitinme
 ms.service: azure-ai-services
 ms.custom: devx-track-azurepowershell, devx-track-azurecli
 ms.topic: how-to
-ms.date: 04/05/2024
+ms.date: 06/13/2024
 ms.author: aahi
 ---
 
@@ -573,7 +573,10 @@ You can grant a subset of trusted Azure services access to Azure OpenAI, while m
 |Azure AI Search     | `Microsoft.Search`         |
 
 
-You can grant networking access to trusted Azure services by creating a network rule exception using the REST API:
+You can grant networking access to trusted Azure services by creating a network rule exception using the REST API or Azure portal:
+
+### Using the Azure CLI
+
 ```bash
 
 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
 '
 ```
 
-> [!NOTE]
-> The trusted service feature is only available using the command line described above, and cannot be done using the Azure portal.
-
 To revoke the exception, set `networkAcls.bypass` to `None`. 
 
 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,
 
     :::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":::
 
+### Using the Azure portal
+
+1. Navigate to your Azure OpenAI resource, and select **Networking** from the navigation menu. 
+1. Under **Exceptions**, select **Allow Azure services on the trusted services list to access this cognitive services account.**
+    > [!TIP]
+    > You can view the **Exceptions** option by selecting either **Selected networks and private endpoints** or **Disabled** under **Allow access from**.    
+
+    :::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":::
+***
+
 ### Pricing
 
 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

@@ -39,7 +39,7 @@ The host should allowlist **port 443** and the following domains:
 
 #### Disable deep packet inspection
 
-[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.
+[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.
 
 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.
 

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

@@ -1,6 +1,6 @@
 ---
 title: Create shared access signature (SAS) tokens for your storage containers and blobs
-description: How to create Shared Access Signature tokens (SAS) for containers and blobs with Microsoft Storage Explorer and the Azure portal.
+description: How to create Shared Access Signature (SAS) tokens for containers and blobs with Microsoft Storage Explorer and the Azure portal.
 ms.topic: how-to
 author: laujan
 manager: nitinme

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

@@ -34,7 +34,7 @@ monikerRange: 'doc-intel-3.1.0 || doc-intel-3.0.0'
 
   If you aren't using Visual Studio Code, make sure you have the following installed in your development environment:
 
-  - 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).
+  - 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).
   - [**Gradle**](https://docs.gradle.org/current/userguide/installation.html), version 6.8 or later.
 
 - 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

@@ -27,7 +27,7 @@ ms.custom: devx-track-csharp, ignite-2023, linux-related-content
 
   If you aren't using Visual Studio Code, make sure you have the following installed in your development environment:
 
-  - 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).
+  - 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).
   - [**Gradle**](https://docs.gradle.org/current/userguide/installation.html), version 6.8 or later.
 
 - 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
 
 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.
 
-    ```kotlin
-    plugins {
-       java
-       application
+   ```kotlin
+   plugins {
+      java
+      application
    }
    application {
        mainClass.set("DocIntelligence")
@@ -98,9 +98,8 @@ This article uses the Gradle dependency manager. You can find the client library
    }
    dependencies {
        implementation group: 'com.azure', name: 'azure-ai-documentintelligence', version: '1.0.0-beta.2'
-
    }
-    ```
+   ```
 
 ## Create a Java application
 

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

@@ -43,7 +43,7 @@ In this quickstart, use the following features to analyze and extract data and v
 
 * If you aren't using Visual Studio Code, make sure you have the following installed in your development environment:
 
-  * 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).
+  * 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).
 
   * [**Gradle**](https://docs.gradle.org/current/userguide/installation.html), version 6.8 or later.
 

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

@@ -21,7 +21,7 @@ In this quickstart, you use the following APIs to extract structured data from f
 
 * Azure subscription - [Create one for free](https://azure.microsoft.com/free/cognitive-services/).
 
-* 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).
+* 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).
 
 * 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.
 

articles/ai-services/language-service/entity-linking/includes/quickstarts/java-sdk.md

@@ -17,7 +17,7 @@ Use this quickstart to create an entity linking application with the client libr
 ## Prerequisites
 
 * Azure subscription - [Create one for free](https://azure.microsoft.com/free/cognitive-services)
-* [Java Development Kit](https://www.oracle.com/technetwork/java/javase/downloads/index.html) (JDK) with version 8 or above
+* [Java Development Kit (JDK)](https://www.oracle.com/technetwork/java/javase/downloads/index.html) with version 8 or above
 
 
 ## Setting up

articles/ai-services/language-service/key-phrase-extraction/includes/quickstarts/java-sdk.md

@@ -16,7 +16,7 @@ Use this quickstart to create a key phrase extraction application with the clien
 ## Prerequisites
 
 * Azure subscription - [Create one for free](https://azure.microsoft.com/free/cognitive-services)
-* [Java Development Kit](https://www.oracle.com/technetwork/java/javase/downloads/index.html) (JDK) with version 8 or above
+* [Java Development Kit (JDK)](https://www.oracle.com/technetwork/java/javase/downloads/index.html) with version 8 or above
 
 
 ## Setting up