Skip to content

Commit 08ddf96

Browse files
committed
Merge branch 'main' of https://github.com/MicrosoftDocs/azure-docs-pr into rolyon-rbac-troubleshoot-limits-note-increase
2 parents 03542a2 + 4a5de8d commit 08ddf96

File tree

7 files changed

+356
-26
lines changed

7 files changed

+356
-26
lines changed

.openpublishing.publish.config.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -413,7 +413,7 @@
413413
{
414414
"path_to_root": "azureml-examples-vj",
415415
"url": "https://github.com/azure/azureml-examples",
416-
"branch": "vijetajo-patch-2",
416+
"branch": "main",
417417
"branch_mapping": {}
418418
},
419419
{

articles/azure-app-configuration/faq.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -144,7 +144,7 @@ sections:
144144
145145
- question: Why can't I create an App Configuration store with the same name as one that I just deleted?
146146
answer: |
147-
All App Configuration stores in the standard tier have automatically enabled the [soft-delete](concept-soft-delete.md) feature. When a standard tier App Configuration store is deleted, its name is reserved for the retention period. To recreate a store with the same name before the retention period expires, you need to [purge the soft-deleted store](howto-recover-deleted-stores-in-azure-app-configuration.md#list-recover-or-purge-a-soft-deleted-app-configuration-store) first, provided the store doesn't have purge protection enabled. If the purge protection is enabled, you must wait for the retention period to elapse. Use the purge function or set a shorter retention period if you often need to recreate a store with the same name.
147+
All App Configuration stores in the standard tier have automatically enabled the [soft-delete](concept-soft-delete.md) feature. When a standard tier App Configuration store is deleted, its name is reserved for the retention period. To recreate a store with the same name before the retention period expires, you need to [purge the soft-deleted store](howto-recover-deleted-stores-in-azure-app-configuration.md#list-recover-or-purge-a-soft-deleted-app-configuration-store) first, provided the store doesn't have purge protection enabled. If the purge protection is enabled, you must wait for the retention period to elapse. Use the purge function or set a shorter retention period if you often need to recreate a store with the same name. Workflows that require recreating a store with the same name should allow for one hour between purging a configuration store and performing the subsequent create. This recommendation is in place because once a purge is requested the actual cleanup of configuration store resources is performed asynchronously, requiring a bit of extra time to finalize. To avoid any need to wait, workflows that create ephemeral configuration stores are recommended to use unique names.
148148
149149
- question: How can I restore an App Configuration store that I deleted mistakenly?
150150
answer: |

articles/azure-monitor/app/asp-net-core.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -197,7 +197,7 @@ HttpContext.Features.Get<RequestTelemetry>().Properties["myProp"] = someData
197197

198198
## Enable client-side telemetry for web applications
199199

200-
The preceding steps are enough to help you start collecting server-side telemetry. If your application has client-side components, follow the next steps to start collecting [usage telemetry](./usage-overview.md) JavaScript (Web) SDK Loader Script injection by configuration.
200+
The preceding steps are enough to help you start collecting server-side telemetry. If your application has client-side components, follow the next steps to start collecting [usage telemetry](./usage-overview.md) using JavaScript (Web) SDK Loader Script injection by configuration.
201201

202202
1. In `_ViewImports.cshtml`, add injection:
203203

articles/cognitive-services/openai/how-to/business-continuity-disaster-recovery.md

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -7,9 +7,9 @@ manager: nitinme
77
ms.service: cognitive-services
88
ms.subservice: openai
99
ms.topic: how-to
10-
ms.date: 6/24/2022
11-
author: ChrisHMSFT
12-
ms.author: chrhoder
10+
ms.date: 6/21/2023
11+
author: mrbullwinkle
12+
ms.author: mbullwin
1313
recommendations: false
1414
keywords:
1515

@@ -19,7 +19,7 @@ keywords:
1919

2020
Azure OpenAI is available in multiple regions. Since subscription keys are region bound, when a customer acquires a key, they select the region in which their deployments will reside and from then on, all operations stay associated with that Azure server region.
2121

22-
It's rare, but not impossible, to encounter a network issue that hits an entire region. If your service needs to always be available, then you should design it to either fail-over into another region or split the workload between two or more regions. Both approaches require at least two OpenAI resources in different regions. This article provides general recommendations for how to implement Business Continuity and Disaster Recovery (BCDR) for your Azure OpenAI applications.
22+
It's rare, but not impossible, to encounter a network issue that hits an entire region. If your service needs to always be available, then you should design it to either fail-over into another region or split the workload between two or more regions. Both approaches require at least two Azure OpenAI resources in different regions. This article provides general recommendations for how to implement Business Continuity and Disaster Recovery (BCDR) for your Azure OpenAI applications.
2323

2424
## Best practices
2525

@@ -37,11 +37,11 @@ If you're using a default endpoint, you should configure your client code to mon
3737

3838
Follow these steps to configure your client to monitor errors:
3939

40-
1. Use this page to identify the list of available regions for the OpenAI service.
40+
1. Use the [models page](../concepts/models.md) to identify the list of available regions for Azure OpenAI.
4141

4242
2. Select a primary and one secondary/backup regions from the list.
4343

44-
3. Create OpenAI Service resources for each region selected
44+
3. Create Azure OpenAI resources for each region selected.
4545

4646
4. For the primary region and any backup regions your code will need to know:
4747

articles/logic-apps/export-from-consumption-to-standard-logic-app.md

Lines changed: 1 addition & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -9,12 +9,7 @@ ms.date: 10/28/2022
99
#Customer intent: As a developer, I want to export one or more Consumption workflows to a Standard workflow.
1010
---
1111

12-
# Export Consumption workflows to a Standard logic app (Preview)
13-
14-
> [!NOTE]
15-
>
16-
> This capability is in preview and is subject to the
17-
> [Supplemental Terms of Use for Microsoft Azure Previews](https://azure.microsoft.com/support/legal/preview-supplemental-terms/).
12+
# Export Consumption workflows to a Standard logic app
1813

1914
Standard logic app workflows, which run in single-tenant Azure Logic Apps, offer many new and improved capabilities. For example, you get compute isolation, virtual network integration, and private endpoints along with App Services Environment hosting, local development and debugging using Visual Studio Code, low latency with stateless workflows, and more.
2015

articles/logic-apps/export-from-ise-to-standard-logic-app.md

Lines changed: 1 addition & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -10,12 +10,7 @@ ms.custom: engagement-fy23
1010
#Customer intent: As a developer, I want to export one or more ISE workflows to a Standard workflow.
1111
---
1212

13-
# Export ISE workflows to a Standard logic app (Preview)
14-
15-
> [!NOTE]
16-
>
17-
> This capability is in preview and is subject to the
18-
> [Supplemental Terms of Use for Microsoft Azure Previews](https://azure.microsoft.com/support/legal/preview-supplemental-terms/).
13+
# Export ISE workflows to a Standard logic app
1914

2015
Standard logic app workflows, which run in single-tenant Azure Logic Apps, offer many new and improved capabilities. For example, you get compute isolation, virtual network integration, and private endpoints along with App Services Environment hosting, local development and debugging using Visual Studio Code, low latency with stateless workflows, and more.
2116

0 commit comments

Comments
 (0)