Skip to content

Commit a8018d1

Browse files
authored
Merge pull request #211631 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 4fe74ee + ce89a9c commit a8018d1

File tree

6 files changed

+9
-9
lines changed

6 files changed

+9
-9
lines changed

articles/active-directory/enterprise-users/groups-dynamic-membership.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -346,7 +346,7 @@ device.objectId -ne null
346346

347347
## Extension properties and custom extension properties
348348

349-
Extension attributes and custom extension properties are supported as string properties in dynamic membership rules. [Extension attributes](/graph/api/resources/onpremisesextensionattributes) can be synced from on-premises Window Server Active Directory or updated using Microsoft Graph and take the format of "ExtensionAttributeX", where X equals 1 - 15. Here's an example of a rule that uses an extension attribute as a property:
349+
Extension attributes and custom extension properties are supported as string properties in dynamic membership rules. [Extension attributes](/graph/api/resources/onpremisesextensionattributes) can be synced from on-premises Window Server Active Directory or updated using Microsoft Graph and take the format of "ExtensionAttributeX", where X equals 1 - 15. Multi-value extension properties are not supported in dynamic membership rules. Here's an example of a rule that uses an extension attribute as a property:
350350

351351
```
352352
(user.extensionAttribute15 -eq "Marketing")

articles/azure-fluid-relay/how-tos/container-deletion.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ In this scenario, we will be deleting an existing Fluid container. Once a contai
1414

1515
## Requirements to delete a Fluid container
1616
- To get started, you need to install [Azure CLI](/cli/azure/install-azure-cli). If you already have Azure CLI installed, please ensure your version is 2.0.67 or greater by running `az version`.
17-
- In order to delete a Fluid container, you must ensure your application and its clients are no longer connected to the container.
17+
- In order to delete a Fluid container, you must ensure that your application and its clients have been disconnected from the container for more than 10 minutes.
1818

1919
## List the containers within a Fluid Relay resource
2020
To see all of the containers belonging to your Fluid Relay resource, you can run the following command:

articles/azure-monitor/agents/agent-linux.md

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -112,10 +112,10 @@ The Log Analytics agent for Linux is composed of multiple packages. The release
112112
113113
**Package** | **Version** | **Description**
114114
----------- | ----------- | --------------
115-
omsagent | 1.13.9 | The Log Analytics Agent for Linux
115+
omsagent | 1.14.19 | The Log Analytics Agent for Linux
116116
omsconfig | 1.1.1 | Configuration agent for the Log Analytics agent
117-
omi | 1.6.4 | Open Management Infrastructure (OMI) -- a lightweight CIM Server. *Note that OMI requires root access to run a cron job necessary for the functioning of the service*
118-
scx | 1.6.4 | OMI CIM Providers for operating system performance metrics
117+
omi | 1.6.9 | Open Management Infrastructure (OMI) -- a lightweight CIM Server. *Note that OMI requires root access to run a cron job necessary for the functioning of the service*
118+
scx | 1.6.9 | OMI CIM Providers for operating system performance metrics
119119
apache-cimprov | 1.0.1 | Apache HTTP Server performance monitoring provider for OMI. Only installed if Apache HTTP Server is detected.
120120
mysql-cimprov | 1.0.1 | MySQL Server performance monitoring provider for OMI. Only installed if MySQL/MariaDB server is detected.
121121
docker-cimprov | 1.0.0 | Docker provider for OMI. Only installed if Docker is detected.

articles/defender-for-cloud/defender-for-containers-architecture.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ ms.date: 06/19/2022
88
---
99
# Defender for Containers architecture
1010

11-
Defender for Containers is designed differently for each container environment whether they're running in:
11+
Defender for Containers is designed differently for each Kubernetes environment whether they're running in:
1212

1313
- **Azure Kubernetes Service (AKS)** - Microsoft's managed service for developing, deploying, and managing containerized applications.
1414

articles/marketplace/partner-center-portal/pc-saas-fulfillment-subscription-api.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -54,7 +54,7 @@ Response body example:
5454
"subscriptionName": "Contoso Cloud Solution", // SaaS subscription name
5555
"offerId": "offer1", // purchased offer ID
5656
"planId": "silver", // purchased offer's plan ID
57-
"quantity": "20", // number of purchased seats, might be empty if the plan is not per seat
57+
"quantity": 20, // number of purchased seats, might be empty if the plan is not per seat
5858
"subscription": { // full SaaS subscription details, see Get Subscription APIs response body for full description
5959
"id": "<guid>",
6060
"publisherId": "contoso",

articles/search/search-security-trimming-for-azure-search.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ ms.date: 12/16/2020
1313

1414
# Security filters for trimming results in Azure Cognitive Search
1515

16-
You can apply security filters to trim search results in Azure Cognitive Search based on user identity. This search experience generally requires comparing the identity of whoever requests the search against a field containing the principles who have permissions to the document. When a match is found, the user or principal (such as a group or role) has access to that document.
16+
You can apply security filters to trim search results in Azure Cognitive Search based on user identity. This search experience generally requires comparing the identity of whoever requests the search against a field containing the principals who have permissions to the document. When a match is found, the user or principal (such as a group or role) has access to that document.
1717

1818
One way to achieve security filtering is through a complicated disjunction of equality expressions: for example, `Id eq 'id1' or Id eq 'id2'`, and so forth. This approach is error-prone, difficult to maintain, and in cases where the list contains hundreds or thousands of values, slows down query response time by many seconds.
1919

@@ -157,4 +157,4 @@ This article described a pattern for filtering results based on user identity an
157157
For an alternative pattern based on Active Directory, or to revisit other security features, see the following links.
158158

159159
* [Security filters for trimming results using Active Directory identities](search-security-trimming-for-azure-search-with-aad.md)
160-
* [Security in Azure Cognitive Search](search-security-overview.md)
160+
* [Security in Azure Cognitive Search](search-security-overview.md)

0 commit comments

Comments
 (0)