Skip to content

Commit 5f0540e

Browse files
authored
Merge branch 'MicrosoftDocs:main' into end-links-4
2 parents e0cfeb8 + 6d8d70c commit 5f0540e

File tree

3 files changed

+25
-13
lines changed

3 files changed

+25
-13
lines changed

articles/active-directory/devices/howto-vm-sign-in-azure-ad-linux.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -190,7 +190,7 @@ There are two ways to configure role assignments for a VM:
190190
- Azure Cloud Shell experience
191191

192192
> [!NOTE]
193-
> The Virtual Machine Administrator Login and Virtual Machine User Login roles use `dataActions` and can be assigned at the management group, subscription, resource group, or resource scope. We recommend that you assign the roles at the management group, subscription, or resource level and not at the individual VM level. This practice avoids the risk of reaching the [Azure role assignments limit](../../role-based-access-control/troubleshoot-limits.md) per subscription.
193+
> The Virtual Machine Administrator Login and Virtual Machine User Login roles use `dataActions` and can be assigned at the management group, subscription, resource group, or resource scope. We recommend that you assign the roles at the management group, subscription, or resource group level and not at the individual VM level. This practice avoids the risk of reaching the [Azure role assignments limit](../../role-based-access-control/troubleshoot-limits.md) per subscription.
194194
195195
### Azure AD portal
196196

articles/machine-learning/prompt-flow/get-started-prompt-flow.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -97,7 +97,7 @@ At the right, it's the graph view for visualization only. You can zoom in, zoom
9797

9898
:::image type="content" source="./media/get-started-prompt-flow/graph-view.png" alt-text="Screenshot of web classification highlighting graph view area." lightbox = "./media/get-started-prompt-flow/graph-view.png":::
9999

100-
In this guide, we use **Web Classification** sample to walk you through the main user journey. Web Classification is a flow demonstrating multi-class classification with LLM. Given a URL, it will classify the URL into a web category with just a few shots, simple summarization and classification prompts. For example, given \"https://www.imbd.com/\", it will classify this URL into \"Movie\".
100+
In this guide, we use **Web Classification** sample to walk you through the main user journey. Web Classification is a flow demonstrating multi-class classification with LLM. Given a URL, it will classify the URL into a web category with just a few shots, simple summarization and classification prompts. For example, given \"https://www.imdb.com/\", it will classify this URL into \"Movie\".
101101

102102
In the graph view, you can see how the sample flow looks like. The input is a URL to classify, then it uses a Python script to fetch text content from the URL, use LLM to summarize the text content within 100 words, then classify based on the URL and summarized text content, last use Python script to convert LLM output into a dictionary. The prepare_examples node is to feed few-shot examples to classification node's prompt.
103103

@@ -113,7 +113,7 @@ When unfolding **Inputs** section, you can create and view inputs. For Web Class
113113

114114
:::image type="content" source="./media/get-started-prompt-flow/flow-input.png" alt-text="Screenshot of Web classification highlighting the inputs." lightbox = "./media/get-started-prompt-flow/flow-input.png":::
115115

116-
The input schema (name: url; type: string) and value are already set when cloning samples. You can change to another value manually, for example \"https://www.imbd.com/\".
116+
The input schema (name: url; type: string) and value are already set when cloning samples. You can change to another value manually, for example \"https://www.imdb.com/\".
117117

118118
### Set up LLM nodes
119119

articles/search/semantic-search-overview.md

Lines changed: 22 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -115,23 +115,35 @@ By default, semantic search is disabled on all services. To enable semantic sear
115115

116116
Semantic Search's free plan is capped at 1,000 queries per month. After the first 1,000 queries in the free plan, you'll receive an error message letting you know you've exhausted your quota whenever you issue a semantic query. When this happens, you need to upgrade to the standard plan to continue using semantic search.
117117

118-
Alternatively, you can also enable semantic search using the [Create or Update Service API](/rest/api/searchmanagement/2021-04-01-preview/services/create-or-update#searchsemanticsearch) that's described in the next section.
118+
Alternatively, you can also enable semantic search using the REST API that's described in the next section.
119119

120-
## Disable semantic search
120+
## Enable semantic search using the REST API
121121

122-
To reverse feature enablement, or for full protection against accidental usage and charges, you can [disable semantic search](/rest/api/searchmanagement/2021-04-01-preview/services/create-or-update#searchsemanticsearch) using the Create or Update Service API on your search service. After the feature is disabled, any requests that include the semantic query type will be rejected.
122+
To enable Semantic Search using the REST API, you can use the [Create or Update Service API](/rest/api/searchmanagement/2021-04-01-preview/services/create-or-update#searchsemanticsearch).
123+
124+
> [!NOTE]
125+
> Create or Update supports two HTTP methods: PUT and PATCH. Both PUT and PATCH can be used to update existing services, but only PUT can be used to create a new service. If PUT is used to update an existing service, it replaces all properties in the service with their defaults if they are not specified in the request. When PATCH is used to update an existing service, it only replaces properties that are specified in the request. When using PUT to update an existing service, it's possible to accidentally introduce an unexpected scaling or configuration change. When enabling semantic search on an existing service, it's recommended to use PATCH instead of PUT.
126+
127+
* Management REST API version 2021-04-01-Preview provides the semantic search property
123128

124-
* Management REST API version 2021-04-01-Preview provides this option
129+
* Owner or Contributor permissions are required to enable or disable features
125130

126-
* Owner or Contributor permissions are required to disable features
131+
```
132+
PATCH https://management.azure.com/subscriptions/{{subscriptionId}}/resourcegroups/{{resource-group}}/providers/Microsoft.Search/searchServices/{{search-service-name}}?api-version=2021-04-01-Preview
133+
{
134+
"properties": {
135+
"semanticSearch": "standard"
136+
}
137+
}
138+
```
139+
140+
## Disable semantic search using the REST API
141+
142+
To reverse feature enablement, or for full protection against accidental usage and charges, you can [disable semantic search](/rest/api/searchmanagement/2021-04-01-preview/services/create-or-update#searchsemanticsearch) using the Create or Update Service API on your search service. After the feature is disabled, any requests that include the semantic query type will be rejected.
127143

128144
```http
129-
PUT https://management.azure.com/subscriptions/{{subscriptionId}}/resourcegroups/{{resource-group}}/providers/Microsoft.Search/searchServices/{{search-service-name}}?api-version=2021-04-01-Preview
145+
PATCH https://management.azure.com/subscriptions/{{subscriptionId}}/resourcegroups/{{resource-group}}/providers/Microsoft.Search/searchServices/{{search-service-name}}?api-version=2021-04-01-Preview
130146
{
131-
"location": "{{region}}",
132-
"sku": {
133-
"name": "standard"
134-
},
135147
"properties": {
136148
"semanticSearch": "disabled"
137149
}

0 commit comments

Comments
 (0)