Skip to content

Commit 96d8950

Browse files
authored
Merge pull request #222568 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 574397b + dc4b50a commit 96d8950

File tree

6 files changed

+10
-7
lines changed

6 files changed

+10
-7
lines changed

articles/active-directory/conditional-access/concept-condition-filters-for-devices.md

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -128,6 +128,9 @@ The following device attributes can be used with the filter for devices conditio
128128
| trustType | Equals, NotEquals | A valid registered state for devices. Supported values are: AzureAD (used for Azure AD joined devices), ServerAD (used for Hybrid Azure AD joined devices), Workplace (used for Azure AD registered devices) | (device.trustType -eq "ServerAD") |
129129
| extensionAttribute1-15 | Equals, NotEquals, StartsWith, NotStartsWith, EndsWith, NotEndsWith, Contains, NotContains, In, NotIn | extensionAttributes1-15 are attributes that customers can use for device objects. Customers can update any of the extensionAttributes1 through 15 with custom values and use them in the filter for devices condition in Conditional Access. Any string value can be used. | (device.extensionAttribute1 -eq "SAW") |
130130

131+
> [!NOTE]
132+
> When building complex rules or using too many individual identifiers like deviceid for device identities, keep in mind "The maximum length for the filter rule is 3072 characters".
133+
131134
> [!NOTE]
132135
> The `Contains` and the `NotContains` operators work differently depending on attribute types. For string attributes such as `operatingSystem` and `model`, the `Contains` operator indicates whether a specified substring occurs within the attribute. For string collection attributes such as `physicalIds` and `systemLabels`, the `Contains` operator indicates whether a specified string matches one of the whole strings in the collection.
133136

articles/active-directory/devices/concept-azure-ad-register.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -53,7 +53,7 @@ Azure AD registration can be accomplished when accessing a work application for
5353

5454
## Scenarios
5555

56-
A user in your organization wants to access your benefits enrollment tool from their home PC. Your organization requires that anyone accesses this tool from an Intune compliant device. The user registers their home PC with Azure AD and the required Intune policies are enforced giving the user access to their resources.
56+
A user in your organization wants to access your benefits enrollment tool from their home PC. Your organization requires that anyone accesses this tool from an Intune compliant device. The user registers their home PC with Azure AD and Enrolls the device in Intune, then the required Intune policies are enforced giving the user access to their resources.
5757

5858
Another user wants to access their organizational email on their personal Android phone that has been rooted. Your company requires a compliant device and has created an Intune compliance policy to block any rooted devices. The employee is stopped from accessing organizational resources on this device.
5959

articles/azure-monitor/app/azure-ad-authentication.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -106,7 +106,7 @@ Application Insights Node.JS supports the credential classes provided by [Azure
106106
#### DefaultAzureCredential
107107

108108
```javascript
109-
let appInsights = require("applicationinsights");
109+
import appInsights from "applicationinsights";
110110
import { DefaultAzureCredential } from "@azure/identity";
111111

112112
const credential = new DefaultAzureCredential();
@@ -118,7 +118,7 @@ appInsights.defaultClient.config.aadTokenCredential = credential;
118118
#### ClientSecretCredential
119119

120120
```javascript
121-
let appInsights = require("applicationinsights");
121+
import appInsights from "applicationinsights";
122122
import { ClientSecretCredential } from "@azure/identity";
123123

124124
const credential = new ClientSecretCredential(

articles/backup/backup-azure-sql-backup-cli.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -156,7 +156,7 @@ As the instruction is to back up all future databases, the operation is done at
156156
az backup protection auto-enable-for-azurewl --resource-group SQLResourceGroup \
157157
--vault-name SQLVault \
158158
--policy-name SQLPolicy \
159-
--protectable-item-name "sqlinstance;mssqlserver;" \
159+
--protectable-item-name "sqlinstance;mssqlserver" \
160160
--protectable-item-type SQLInstance \
161161
--server-name testSQLVM \
162162
--workload-type MSSQL\

articles/expressroute/designing-for-disaster-recovery-with-expressroute-privatepeering.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -57,7 +57,7 @@ In this article, let's discuss how to address challenges you may face when confi
5757

5858
## Small to medium on-premises network considerations
5959

60-
Let's consider the example network illustrated in the following diagram. In the example, geo-redundant ExpressRoute connectivity is established between a Contoso's on-premises location and Contoso's VNet in an Azure region. In the diagram, solid green line indicates preferred path (via ExpressRoute 1) and the dotted one represents stand-by path (via ExpressRoute 2).
60+
Let's consider the example network illustrated in the following diagram. In the example, geo-redundant ExpressRoute connectivity is established between a Contoso's on-premises location and Contoso's VNet in an Azure region. In the diagram, solid blue line indicates preferred path (via ExpressRoute 1) and the dotted one represents stand-by path (via ExpressRoute 2).
6161

6262
:::image type="content" source="./media/designing-for-disaster-recovery-with-expressroute-pvt/one-region.png" alt-text="Diagram of small to medium size on-premises network considerations.":::
6363

@@ -155,4 +155,4 @@ In this article, we discussed how to design for disaster recovery of an ExpressR
155155
[Enterprise DR]: https://azure.microsoft.com/solutions/architecture/disaster-recovery-enterprise-scale-dr/
156156
[SMB DR]: https://azure.microsoft.com/solutions/architecture/disaster-recovery-smb-azure-site-recovery/
157157
[con wgt]: ./expressroute-optimize-routing.md#solution-assign-a-high-weight-to-local-connection
158-
[AS Path Pre]: ./expressroute-optimize-routing.md#solution-use-as-path-prepending
158+
[AS Path Pre]: ./expressroute-optimize-routing.md#solution-use-as-path-prepending

articles/expressroute/expressroute-erdirect-about.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -75,7 +75,7 @@ ExpressRoute Direct supports large data ingestion scenarios into services such a
7575
| <ul><li>5 Gbps</li><li>10 Gbps</li><li>40 Gbps</li><li>100 Gbps</li></ul> | <ul><li>1 Gbps</li><li>2 Gbps</li><li>5 Gbps</li><li>10 Gbps</li></ul>
7676
7777
> [!NOTE]
78-
> You can provision logical ExpressRoute circuits on top of your selected ExpressRoute Direct resource of 10-Gbps or 100-Gbps up to the subscribed Bandwidth of 20Gbps or 200Gbps. For example,you can provision two 10 Gbps ExpressRoute circuits within a single 10 Gbps ExpressRoute Direct resource (port pair). Configuring circuits that over-subscribe the ExpressRoute Direct resource is only avialable with Azure PowerShell and Azure CLI.
78+
> You can provision logical ExpressRoute circuits on top of your selected ExpressRoute Direct resource of 10-Gbps or 100-Gbps up to the subscribed Bandwidth of 20Gbps or 200Gbps. For example,you can provision two 10 Gbps ExpressRoute circuits within a single 10 Gbps ExpressRoute Direct resource (port pair). Configuring circuits that over-subscribe the ExpressRoute Direct resource is only available with Azure PowerShell and Azure CLI.
7979
8080
## Technical Requirements
8181

0 commit comments

Comments
 (0)