Skip to content

Commit 056b185

Browse files
authored
Merge pull request #220153 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 1709e96 + 8370444 commit 056b185

File tree

5 files changed

+9
-3
lines changed

5 files changed

+9
-3
lines changed

articles/active-directory/conditional-access/howto-conditional-access-policy-compliant-device.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -55,7 +55,7 @@ The following steps will help create a Conditional Access policy to require mult
5555
After confirming your settings using [report-only mode](howto-conditional-access-insights-reporting.md), an administrator can move the **Enable policy** toggle from **Report-only** to **On**.
5656

5757
> [!NOTE]
58-
> You can enroll your new devices to Intune even if you select **Require device to be marked as compliant** for **All users** and **All cloud apps** using the steps above. **Require device to be marked as compliant** control does not block Intune enrollment.
58+
> You can enroll your new devices to Intune even if you select **Require device to be marked as compliant** for **All users** and **All cloud apps** using the steps above. **Require device to be marked as compliant** control does not block Intune enrollment and the access to the Microsoft Intune Web Company Portal application.
5959
6060
### Known behavior
6161

articles/active-directory/manage-apps/configure-admin-consent-workflow.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -59,4 +59,4 @@ To configure the admin consent workflow programmatically, use the [Update adminC
5959

6060
[Grant tenant-wide admin consent to an application](grant-admin-consent.md)
6161

62-
[Reivew admin consent requests](review-admin-consent-requests.md)
62+
[Review admin consent requests](review-admin-consent-requests.md)

articles/iot-edge/module-deployment-monitoring.md

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,8 @@ Automatic deployments and layered deployment help you manage and configure modul
1818

1919
Azure IoT Edge provides two ways to configure the modules to run on IoT Edge devices. The first method is to deploy modules on a per-device basis. You create a deployment manifest and then apply it to a particular device by name. The second method is to deploy modules automatically to any registered device that meets a set of defined conditions. You create a deployment manifest and then define which devices it applies to based on [tags](../iot-edge/how-to-deploy-at-scale.md#identify-devices-using-tags) in the device twin.
2020

21+
You can't combine per-device and automatic deployments. Once you start targeting IoT Edge devices with automatic deployments (with or without layered deployments), per-device deployments are no longer supported.
22+
2123
This article focuses on configuring and monitoring fleets of devices, collectively referred to as *IoT Edge automatic deployments*. The basic deployment steps are as follows:
2224

2325
1. An operator defines a deployment that describes a set of modules and the target devices. Each deployment has a deployment manifest that reflects this information.

articles/machine-learning/how-to-troubleshoot-environments.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -58,7 +58,7 @@ Updates for AzureML based images are released regularly, with a commitment of no
5858
It's your responsibility to evaluate the threat and address vulnerabilities in environments.
5959
Not all the vulnerabilities are exploitable, so you need to use your judgment when choosing between reproducibility and resolving vulnerabilities.
6060
> [!IMPORTANT]
61-
> There's no guarantee that the same set of python dependencies will be materialized with an image rebuild or for a new environment with the same set of Python dependencies.
61+
> There's no guarantee that the same set of Python dependencies will be materialized with an image rebuild or for a new environment with the same set of Python dependencies.
6262
6363
## **Environment definition problems**
6464

articles/synapse-analytics/monitoring/how-to-monitor-using-azure-monitor.md

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -106,6 +106,10 @@ Here are the logs emitted by Azure Synapse Analytics workspaces:
106106
| SynapseIntegrationActivityRuns | IntegrationActivityRuns | Azure Synapse integration activity runs. |
107107
| SynapseIntegrationTriggerRuns | IntegrationTriggerRuns | Azure Synapse integration trigger runs. |
108108

109+
> [!NOTE]
110+
> The event **SynapseBuiltinSqlReqsEnded** is only emitted for queries that read data from storage. It will not be emitted for queries that only process metadata.
111+
112+
109113
### Dedicated SQL pool logs
110114

111115
Here are the logs emitted by dedicated SQL pools:

0 commit comments

Comments
 (0)