Skip to content

Commit cf3bf0b

Browse files
authored
Merge pull request #203956 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 b368e38 + cc04108 commit cf3bf0b

File tree

20 files changed

+36
-21
lines changed

20 files changed

+36
-21
lines changed

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ ms.collection: M365-identity-device-management
1717
---
1818
# Azure AD registered devices
1919

20-
The goal of Azure AD registered devices is to provide your users with support for bring your own device (BYOD) or mobile device scenarios. In these scenarios, a user can access your organization’s resources using a personal device.
20+
The goal of Azure AD registered - also known as Workplace joined - devices is to provide your users with support for bring your own device (BYOD) or mobile device scenarios. In these scenarios, a user can access your organization’s resources using a personal device.
2121

2222
| Azure AD Registered | Description |
2323
| --- | --- |

articles/active-directory/devices/howto-hybrid-join-downlevel.md

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -21,6 +21,7 @@ If some of your domain-joined devices are Windows [downlevel devices](hybrid-azu
2121

2222
- Configure the local intranet settings for device registration
2323
- Install Microsoft Workplace Join for Windows downlevel computers
24+
- Need AD FS (for federated domains) or Seamless SSO configured (for managed domains).
2425

2526
> [!NOTE]
2627
> Windows 7 support ended on January 14, 2020. For more information, [Support for Windows 7 has ended](https://support.microsoft.com/en-us/help/4057281/windows-7-support-ended-on-january-14-2020).

articles/active-directory/managed-identities-azure-resources/how-to-view-associated-resources-for-an-identity.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -64,7 +64,7 @@ https://management.azure.com/subscriptions/{resourceID of user-assigned identity
6464

6565
| Parameter | Example |Description |
6666
|---|---|---|
67-
| $filter | ```'type' eq 'microsoft.cognitiveservices/account' and contains(name, 'test')``` | An OData expression that allows you to filter any of the available fields: name, type, resourceGroup, subscriptionId, subscriptionDisplayName, subscriptionId, subscriptionDisplayName<br/><br/>The following operations are supported: ```and```, ```or```, ```eq``` and ```contains``` |
67+
| $filter | ```'type' eq 'microsoft.cognitiveservices/account' and contains(name, 'test')``` | An OData expression that allows you to filter any of the available fields: name, type, resourceGroup, subscriptionId, subscriptionDisplayName<br/><br/>The following operations are supported: ```and```, ```or```, ```eq``` and ```contains``` |
6868
| $orderby | ```name asc``` | An OData expression that allows you to order by any of the available fields |
6969
| $skip | 50 | The number of items you want to skip while paging through the results. |
7070
| $top | 10 | The number of resources to return. 0 will return only a count of the resources. |

articles/azure-functions/functions-manually-run-non-http.md

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -63,6 +63,9 @@ Open Postman and follow these steps:
6363

6464
:::image type="content" source="./media/functions-manually-run-non-http/functions-manually-run-non-http-body.png" alt-text="Postman body settings." border="true":::
6565

66+
> [!NOTE]
67+
> If you don't want to pass data into the function, you must still pass an empty dictionary `{}` as the body of the POST request.
68+
6669
1. Select **Send**.
6770

6871
:::image type="content" source="./media/functions-manually-run-non-http/functions-manually-run-non-http-send.png" alt-text="Send a request with Postman." border="true":::

articles/azure-monitor/app/availability-overview.md

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ You can set up availability tests for any HTTP or HTTPS endpoint that's accessib
1717
There are four types of availability tests:
1818

1919
* [URL ping test (classic)](monitor-web-app-availability.md): You can create this simple test through the portal to validate whether an endpoint is responding and measure performance associated with that response. You can also set custom success criteria coupled with more advanced features, like parsing dependent requests and allowing for retries.
20-
* [Standard test (Preview)](availability-standard-tests.md): This single request test is similar to the URL ping test. It includes SSL certificate validity, proactive lifetime check, HTTP request verb (for example `GET`, `HEAD`, or `POST`), custom headers, and custom data associated with your HTTP request.
20+
* [Standard test](availability-standard-tests.md): This single request test is similar to the URL ping test. It includes SSL certificate validity, proactive lifetime check, HTTP request verb (for example `GET`, `HEAD`, or `POST`), custom headers, and custom data associated with your HTTP request.
2121
* [Multi-step web test (classic)](availability-multistep.md): You can play back this recording of a sequence of web requests to test more complex scenarios. Multi-step web tests are created in Visual Studio Enterprise and uploaded to the portal, where you can run them.
2222
* [Custom TrackAvailability test](availability-azure-functions.md): If you decide to create a custom application to run availability tests, you can use the [TrackAvailability()](/dotnet/api/microsoft.applicationinsights.telemetryclient.trackavailability) method to send the results to Application Insights.
2323

@@ -36,7 +36,8 @@ See the dedicated [troubleshooting article](https://docs.microsoft.com/troublesh
3636
## Next steps
3737

3838
* [Availability alerts](availability-alerts.md)
39-
* [Multi-step web tests](availability-multistep.md)
4039
* [URL tests](monitor-web-app-availability.md)
40+
* [Standard Tests](availability-standard-tests.md)
41+
* [Multi-step web tests](availability-multistep.md)
4142
* [Create and run custom availability tests using Azure Functions](availability-azure-functions.md)
4243
* [Web Tests Azure Resource Manager template](/azure/templates/microsoft.insights/webtests?tabs=json)

articles/azure-vmware/enable-public-ip-nsx-edge.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -122,7 +122,7 @@ For example, the following rule is set to Match External Address, and this setti
122122

123123
If **Match Internal Address** was specified, the destination would be the internal or private IP address of the VM.
124124
For more information on the NSX-T Gateway Firewall see the [NSX-T Gateway Firewall Administration Guide]( https://docs.vmware.com/en/VMware-NSX-T-Data-Center/3.1/administration/GUID-A52E1A6F-F27D-41D9-9493-E3A75EC35481.html)
125-
The Distributed Firewall could be used to filter traffic to VMs. This feature is outside the scope of this document. For more information, see [NSX-T Distributed Firewall Administration Guide]( https://docs.vmware.com/en/VMware-NSX-T-Data-Center/3.1/administration/GUID-6AB240DB-949C-4E95-A9A7-4AC6EF5E3036.html)git status.
125+
The Distributed Firewall could be used to filter traffic to VMs. This feature is outside the scope of this document. For more information, see [NSX-T Distributed Firewall Administration Guide]( https://docs.vmware.com/en/VMware-NSX-T-Data-Center/3.1/administration/GUID-6AB240DB-949C-4E95-A9A7-4AC6EF5E3036.html).
126126

127127
## Next steps
128128
[Internet connectivity design considerations (Preview)](concepts-design-public-internet-access.md)

articles/cognitive-services/Anomaly-Detector/toc.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -26,9 +26,9 @@
2626
- name: Jupyter Notebook
2727
href: https://github.com/Azure-Samples/AnomalyDetector/tree/master/ipython-notebook
2828
- name: Azure samples (univariate)
29-
href: https://github.com/Azure-Samples/AnomalyDetector/tree/master/quickstarts
29+
href: https://github.com/Azure-Samples/AnomalyDetector/tree/master/samples-univariate
3030
- name: Azure samples (multivariate)
31-
href: https://github.com/Azure-Samples/AnomalyDetector/tree/master/quickstarts-multivariate
31+
href: https://github.com/Azure-Samples/AnomalyDetector/tree/master/samples-multivariate
3232
- name: How-to guides
3333
items:
3434
- name: Identify anomalies in your data (univariate)

articles/cosmos-db/cassandra/access-data-spring-data-app.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -51,7 +51,7 @@ The following procedure configures the test application.
5151
```
5252

5353
> [!NOTE]
54-
> Although the usage described below is identical for both Java version 3 and version 4 samples above, the way in which they have been implemented in order to include custom retry and load balancing policies is different. We recommend reviewing the code to understand how to implement custom policies if you are making changes to an existing spring java application.
54+
> Although the usage described below is identical for both Java version 3 and version 4 samples above, the way in which they have been implemented in order to include custom retry and load balancing policies is different. We recommend reviewing the code to understand how to implement custom policies if you are making changes to an existing Spring Java application.
5555
5656
1. Locate the *application.properties* file in the *resources* directory of the sample project, or create the file if it does not already exist.
5757

@@ -153,4 +153,4 @@ For more information about using Azure with Java, see the [Azure for Java Develo
153153
[COSMOSDB04]: media/access-data-spring-data-app/create-cosmos-db-04.png
154154
[COSMOSDB05]: media/access-data-spring-data-app/create-cosmos-db-05.png
155155
[COSMOSDB05-1]: media/access-data-spring-data-app/create-cosmos-db-05-1.png
156-
[COSMOSDB06]: media/access-data-spring-data-app/create-cosmos-db-06.png
156+
[COSMOSDB06]: media/access-data-spring-data-app/create-cosmos-db-06.png

articles/cosmos-db/table/create-table-java.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -219,7 +219,7 @@ The connection string for your Cosmos DB account is considered an app secret and
219219

220220
## 4 - Include the azure-data-tables package
221221

222-
To access the Cosmos DB Tables API from a java application, include the [azure-data-tables](https://search.maven.org/artifact/com.azure/azure-data-tables) package.
222+
To access the Cosmos DB Tables API from a Java application, include the [azure-data-tables](https://search.maven.org/artifact/com.azure/azure-data-tables) package.
223223

224224
```xml
225225
<dependency>

articles/defender-for-cloud/alerts-reference.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -378,7 +378,7 @@ Microsoft Defender for Containers provides security alerts on the cluster level
378378

379379
<sup><a name="footnote1"></a>1</sup>: **Preview for non-AKS clusters**: This alert is generally available for AKS clusters, but it is in preview for other environments, such as Azure Arc, EKS and GKE.
380380

381-
<sup><a name="footnote2"></a>2</sup>: **Limitations on GKE clusters**: GKE uses a Kuberenetes audit policy that doesn't support all alert types. As a result, this security alert, which is based on Kubernetes audit events, are not supported for GKE clusters.
381+
<sup><a name="footnote2"></a>2</sup>: **Limitations on GKE clusters**: GKE uses a Kuberenetes audit policy that doesn't support all alert types. As a result, this security alert, which is based on Kubernetes audit events, is not supported for GKE clusters.
382382

383383
<sup><a name="footnote3"></a>3</sup>: This alert is supported on Windows nodes/containers.
384384

0 commit comments

Comments
 (0)