Skip to content

Commit db734cd

Browse files
authored
Merge pull request #211459 from MicrosoftDocs/repo_sync_working_branch
Confirm merge from repo_sync_working_branch to main to sync with https://github.com/MicrosoftDocs/azure-docs (branch main)
2 parents 565f0b3 + 4c1a3eb commit db734cd

File tree

5 files changed

+11
-8
lines changed

5 files changed

+11
-8
lines changed

articles/active-directory/saas-apps/confluencemicrosoft-tutorial.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -57,7 +57,7 @@ As of now, following versions of Confluence are supported:
5757

5858
- Confluence: 5.0 to 5.10
5959
- Confluence: 6.0.1 to 6.15.9
60-
- Confluence: 7.0.1 to 7.17.0
60+
- Confluence: 7.0.1 to 7.19.0
6161

6262
> [!NOTE]
6363
> Please note that our Confluence Plugin also works on Ubuntu Version 16.04

articles/active-directory/saas-apps/ms-confluence-jira-plugin-adminguide.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -64,7 +64,7 @@ The plug-in supports the following versions of Jira and Confluence:
6464
* JIRA also supports 5.2. For more details, click [Microsoft Azure Active Directory single sign-on for JIRA 5.2](./jira52microsoft-tutorial.md)
6565
* Confluence: 5.0 to 5.10
6666
* Confluence: 6.0.1 to 6.15.9
67-
* Confluence: 7.0.1 to 7.17.0
67+
* Confluence: 7.0.1 to 7.19.0
6868

6969
## Installation
7070

@@ -171,7 +171,7 @@ The plug-in supports these versions:
171171
* JIRA also supports 5.2. For more details, click [Microsoft Azure Active Directory single sign-on for JIRA 5.2](./jira52microsoft-tutorial.md)
172172
* Confluence: 5.0 to 5.10
173173
* Confluence: 6.0.1 to 6.15.9
174-
* Confluence: 7.0.1 to 7.17.0
174+
* Confluence: 7.0.1 to 7.19.0
175175

176176
### Is the plug-in free or paid?
177177

articles/azure-arc/data/plan-azure-arc-data-services.md

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -26,6 +26,12 @@ In order to experience Azure Arc-enabled data services, you'll need to complete
2626
The details in this article will guide your plan.
2727

2828
1. [Install client tools](install-client-tools.md).
29+
30+
1. Register the Microsoft.AzureArcData provider for the subscription where the Azure Arc-enabled data services will be deployed, as follows:
31+
```console
32+
az provider register --namespace Microsoft.AzureArcData
33+
```
34+
2935
1. Access a Kubernetes cluster.
3036

3137
For demonstration, testing, and validation purposes, you can use an Azure Kubernetes Service cluster. To create a cluster, follow the instructions at [Quickstart: Deploy Azure Arc-enabled data services - directly connected mode - Azure portal](create-complete-managed-instance-directly-connected.md) to walk through the entire process.
@@ -62,6 +68,7 @@ Verify that:
6268
kubectl cluster-info
6369
```
6470
- You have an Azure subscription that resources such as an Azure Arc data controller, Azure Arc-enabled SQL managed instance, or Azure Arc-enabled PostgreSQL server will be projected and billed to.
71+
- The Microsoft.AzureArcData provider is registered for the subscription where the Azure Arc-enabled data services will be deployed.
6572

6673
After you're prepared the infrastructure, deploy Azure Arc-enabled data services in the following way:
6774
1. Create an Azure Arc-enabled data controller on one of the validated distributions of a Kubernetes cluster.

articles/azure-arc/kubernetes/private-link.md

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -132,10 +132,6 @@ The Private Endpoint on your virtual network allows it to reach Azure Arc-enable
132132
1. Let validation pass.
133133
1. Select **Create**.
134134

135-
:::image type="content" source="media/private-link/create-private-endpoint-2.png" alt-text="Screenshot of the Configuration step to create a private endpoint in the Azure portal.":::
136-
137-
> [!NOTE]
138-
> If you choose **No** and prefer to manage DNS records manually, first complete setting up your Private Link, including this private endpoint and the Private Scope configuration. Next, configure your DNS according to the instructions in [Azure Private Endpoint DNS configuration](/azure/private-link/private-endpoint-dns). Make sure not to create empty records as preparation for your Private Link setup. The DNS records you create can override existing settings and impact your connectivity with Arc-enabled Kubernetes clusters.
139135

140136
## Configure on-premises DNS forwarding
141137

articles/azure-monitor/alerts/proactive-email-notification.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ ms.reviewer: yagil
88
# Smart Detection e-mail notification change
99

1010
>[!NOTE]
11-
>You can migrate your Application Insight resources to alerts-bases smart detection (preview). The migration creates alert rules for the different smart detection modules. Once created, you can manage and configure these rules just like any other Azure Monitor alert rules. You can also configure action groups for these rules, thus enabling multiple methods of taking actions or triggering notification on new detections.
11+
>You can migrate your Application Insight resources to alerts-based smart detection (preview). The migration creates alert rules for the different smart detection modules. Once created, you can manage and configure these rules just like any other Azure Monitor alert rules. You can also configure action groups for these rules, thus enabling multiple methods of taking actions or triggering notification on new detections.
1212
>
1313
> See [Smart Detection Alerts migration](./alerts-smart-detections-migration.md) for more details on the migration process and the behavior of smart detection after the migration.
1414

0 commit comments

Comments
 (0)