Skip to content

Commit b8b1c3d

Browse files
authored
Merge pull request #262251 from MicrosoftDocs/main
1/3 11:00 AM IST Publish
2 parents 17ee3be + f8ebd5c commit b8b1c3d

File tree

449 files changed

+932
-576
lines changed

Some content is hidden

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

449 files changed

+932
-576
lines changed

articles/ai-services/computer-vision/concept-describe-images-40.md

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -20,9 +20,6 @@ Caption generates a one sentence description for all image contents. Dense Capti
2020

2121
At this time, image captioning is available in English language only.
2222

23-
### Gender-neutral captions
24-
All captions contain gender terms: "man", "woman", "boy" and "girl" by default. You have the option to replace these terms with "person" in your results and receive gender-neutral captions. You can do so by setting the optional API request parameter, **gender-neutral-caption** to `true` in the request URL.
25-
2623
> [!IMPORTANT]
2724
> Image captioning in Image Analysis 4.0 is only available in the following Azure data center regions at this time: East US, France Central, Korea Central, North Europe, Southeast Asia, West Europe, West US, East Asia. You must use a Vision resource located in one of these regions to get results from Caption and Dense Captions features.
2825
>
@@ -33,6 +30,9 @@ Try out the image captioning features quickly and easily in your browser using V
3330
> [!div class="nextstepaction"]
3431
> [Try Vision Studio](https://portal.vision.cognitive.azure.com/)
3532
33+
### Gender-neutral captions
34+
All captions contain gender terms: "man", "woman", "boy" and "girl" by default. You have the option to replace these terms with "person" in your results and receive gender-neutral captions. You can do so by setting the optional API request parameter, **gender-neutral-caption** to `true` in the request URL.
35+
3636
## Caption and Dense Captions examples
3737

3838
#### [Caption](#tab/image)

articles/ai-services/security-controls-policy.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
---
22
title: Azure Policy Regulatory Compliance controls for Azure AI services
33
description: Lists Azure Policy Regulatory Compliance controls available for Azure AI services. These built-in policy definitions provide common approaches to managing the compliance of your Azure resources.
4-
ms.date: 12/14/2023
4+
ms.date: 01/02/2024
55
ms.topic: sample
66
author: PatrickFarley
77
ms.author: pafarley

articles/ai-studio/how-to/create-manage-runtime.md

Lines changed: 19 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -39,11 +39,11 @@ If you have a compute instance, you can use it to build your compute instance ru
3939
Automatic is the default option for runtime, you can start automatic runtime in runtime dropdown in flow page.
4040

4141

42-
1. Start creates automatic runtime using the environment defined in`flow.dag.yaml` in flow folder on the VM size you have quota in the project.
42+
- **Start** creates automatic runtime using the environment defined in `flow.dag.yaml` in flow folder on the VM size you have quota in the project.
4343

4444
:::image type="content" source="../media/prompt-flow/how-to-create-manage-runtime/runtime-create-automatic-init.png" alt-text="Screenshot of prompt flow on the start automatic with default settings on flow page. " lightbox = "../media/prompt-flow/how-to-create-manage-runtime/runtime-create-automatic-init.png":::
4545

46-
2. Start with advanced settings, you can customize the VM size used by the runtime. You can also customize the idle time, which will delete runtime automatically if it isn't in use to save code. Meanwhile, you can set the user assigned manage identity used by automatic runtime, it's used to pull base image (please make sure user assigned manage identity have ACR pull permission) and install packages. If you don't set it, we use user identity as default. Learn more about [how to create update user assigned identities to project](../../machine-learning/how-to-identity-based-service-authentication.md#to-create-a-workspace-with-multiple-user-assigned-identities-use-one-of-the-following-methods).
46+
- **Start with advanced settings**, you can customize the VM size used by the runtime. You can also customize the idle time, which will delete runtime automatically if it isn't in use to save code. Meanwhile, you can set the user assigned manage identity used by automatic runtime, it's used to pull base image (please make sure user assigned manage identity have ACR pull permission) and install packages. If you don't set it, we use user identity as default. Learn more about [how to create update user assigned identities to project](../../machine-learning/how-to-identity-based-service-authentication.md#to-create-a-workspace-with-multiple-user-assigned-identities-use-one-of-the-following-methods).
4747

4848
:::image type="content" source="../media/prompt-flow/how-to-create-manage-runtime/runtime-creation-automatic-settings.png" alt-text="Screenshot of prompt flow on the start automatic with advanced setting on flow page. " lightbox = "../media/prompt-flow/how-to-create-manage-runtime/runtime-creation-automatic-settings.png":::
4949

@@ -115,17 +115,26 @@ You can also customize the environment used to run this flow.
115115
116116
#### Add packages in private feed in Azure DevOps
117117

118-
If you want to use a private feed in Azure DevOps, add the Managed Identity in the Azure DevOps organization. To learn more, see [Use service principals & managed identities](/azure/devops/integrate/get-started/authentication/service-principal-managed-identity)
118+
If you want to use a private feed in Azure DevOps, you need follow these steps:
119119

120-
> [!NOTE]
121-
> If the 'Add Users' button isn't visible, it's likely you don't have the necessary permissions to perform this action.
120+
1. Create user assigned managed identity and add this user assigned managed identity in the Azure DevOps organization. To learn more, see [Use service principals & managed identities](/azure/devops/integrate/get-started/authentication/service-principal-managed-identity).
121+
122+
> [!NOTE]
123+
> If the 'Add Users' button isn't visible, it's likely you don't have the necessary permissions to perform this action.
124+
125+
1. [Add or update user assigned identities to project](../../machine-learning/how-to-identity-based-service-authentication.md#to-create-a-workspace-with-multiple-user-assigned-identities-use-one-of-the-following-methods).
126+
127+
128+
1. You need to add `{private}` to your private feed URL. For example, if you want to install `test_package` from `test_feed` in Azure devops, add `-i https://{private}@{test_feed_url_in_azure_devops}` in `requirements.txt`.
129+
130+
```txt
131+
-i https://{private}@{test_feed_url_in_azure_devops}
132+
test_package
133+
```
122134
123-
You need to add `{private}` to your private feed URL. For example, if you want to install `test_package` from `test_feed` in Azure devops, add `-i https://{private}@{test_feed_url_in_azure_devops}` in `requirements.txt`.
135+
1. Specify the user assigned managed identity in `start with advanced setting` if automatic runtime is not running or `edit` button if automatic runtime is running.
124136
125-
```txt
126-
-i https://{private}@{test_feed_url_in_azure_devops}
127-
test_package
128-
```
137+
:::image type="content" source="../media/prompt-flow/how-to-create-manage-runtime/runtime-advanced-setting-msi.png" alt-text="Screenshot of specify user assigned managed identity. " lightbox = "../media/prompt-flow/how-to-create-manage-runtime/runtime-advanced-setting-msi.png":::
129138
130139
### Update compute instance runtime in runtime page
131140
58.4 KB
Loading

articles/aks/security-controls-policy.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
---
22
title: Azure Policy Regulatory Compliance controls for Azure Kubernetes Service (AKS)
33
description: Lists Azure Policy Regulatory Compliance controls available for Azure Kubernetes Service (AKS). These built-in policy definitions provide common approaches to managing the compliance of your Azure resources.
4-
ms.date: 12/14/2023
4+
ms.date: 01/02/2024
55
ms.topic: sample
66
ms.custom: subject-policy-compliancecontrols
77
---

articles/api-management/cache-store-policy.md

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ author: dlepow
66

77
ms.service: api-management
88
ms.topic: article
9-
ms.date: 12/07/2022
9+
ms.date: 01/02/2024
1010
ms.author: danlep
1111
---
1212

@@ -75,10 +75,10 @@ This example shows how to configure API Management response caching duration tha
7575
<!-- The following cache policy snippets demonstrate how to control API Management response cache duration with Cache-Control headers sent by the backend service. -->
7676

7777
<!-- Copy this snippet into the inbound section -->
78-
<cache-store vary-by-developer="false" vary-by-developer-groups="false" downstream-caching-type="public" must-revalidate="true" >
78+
<cache-lookup vary-by-developer="false" vary-by-developer-groups="false" downstream-caching-type="public" must-revalidate="true" >
7979
<vary-by-header>Accept</vary-by-header>
8080
<vary-by-header>Accept-Charset</vary-by-header>
81-
</cache-store>
81+
</cache-lookup>
8282

8383
<!-- Copy this snippet into the outbound section. Note that cache duration is set to the max-age value provided in the Cache-Control header received from the backend service or to the default value of 5 min if none is found -->
8484
<cache-store duration="@{

articles/api-management/cors-policy.md

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ author: dlepow
66

77
ms.service: api-management
88
ms.topic: article
9-
ms.date: 11/18/2022
9+
ms.date: 01/02/2024
1010
ms.author: danlep
1111
---
1212

@@ -59,7 +59,7 @@ The `cors` policy adds cross-origin resource sharing (CORS) support to an operat
5959

6060
|Name|Description|Required|Default|
6161
|----------|-----------------|--------------|-------------|
62-
|origin|The value can be either `*` to allow all origins, or a URI that specifies a single origin. The URI must include a scheme, host, and port.|Yes|If the port is omitted in a URI, port 80 is used for HTTP and port 443 is used for HTTPS.|
62+
|origin|The value can be either `*` to allow all origins, or a URI that specifies a single origin. The URI must include a scheme, host, and port. Do not include quotation marks.|Yes|If the port is omitted in a URI, port 80 is used for HTTP and port 443 is used for HTTPS.|
6363

6464

6565
### allowed-methods attributes
@@ -166,4 +166,4 @@ This example demonstrates how to support [preflight requests](https://developer.
166166

167167
* [API Management cross-domain policies](api-management-cross-domain-policies.md)
168168

169-
[!INCLUDE [api-management-policy-ref-next-steps](../../includes/api-management-policy-ref-next-steps.md)]
169+
[!INCLUDE [api-management-policy-ref-next-steps](../../includes/api-management-policy-ref-next-steps.md)]

articles/api-management/security-controls-policy.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
---
22
title: Azure Policy Regulatory Compliance controls for Azure API Management
33
description: Lists Azure Policy Regulatory Compliance controls available for Azure API Management. These built-in policy definitions provide common approaches to managing the compliance of your Azure resources.
4-
ms.date: 12/14/2023
4+
ms.date: 01/02/2024
55
ms.topic: sample
66
author: dlepow
77
ms.author: danlep

articles/app-service/security-controls-policy.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
---
22
title: Azure Policy Regulatory Compliance controls for Azure App Service
33
description: Lists Azure Policy Regulatory Compliance controls available for Azure App Service. These built-in policy definitions provide common approaches to managing the compliance of your Azure resources.
4-
ms.date: 12/14/2023
4+
ms.date: 01/02/2024
55
ms.topic: sample
66
ms.service: app-service
77
ms.custom: "UpdateFrequency3, subject-policy-compliancecontrols"

articles/automation/security-controls-policy.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
---
22
title: Azure Policy Regulatory Compliance controls for Azure Automation
33
description: Lists Azure Policy Regulatory Compliance controls available for Azure Automation. These built-in policy definitions provide common approaches to managing the compliance of your Azure resources.
4-
ms.date: 12/14/2023
4+
ms.date: 01/02/2024
55
ms.topic: sample
66
ms.service: automation
77
ms.custom: subject-policy-compliancecontrols

0 commit comments

Comments
 (0)