Skip to content

Commit 31b4aa9

Browse files
authored
Merge pull request #97267 from MicrosoftDocs/repo_sync_working_branch
Confirm merge from repo_sync_working_branch to master to sync with https://github.com/Microsoft/azure-docs (branch master)
2 parents 32d86b8 + 5ba8392 commit 31b4aa9

File tree

4 files changed

+5
-5
lines changed

4 files changed

+5
-5
lines changed

articles/active-directory/authentication/howto-mfa-getstarted.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -77,7 +77,7 @@ Some of the risk detections detected by Azure Active Directory Identity Protecti
7777

7878
## Define network locations
7979

80-
We recommended that organizations use Conditional Access to define their network using [named locations](../conditional-access/location-condition.md#named-locations). If your organization is using Identity Protection, consider using risk-based policies instead of named locations.
80+
We recommend that organizations use Conditional Access to define their network using [named locations](../conditional-access/location-condition.md#named-locations). If your organization is using Identity Protection, consider using risk-based policies instead of named locations.
8181

8282
### Configuring a named location
8383

articles/azure-monitor/platform/stream-monitoring-data-event-hubs.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -51,7 +51,7 @@ Routing your monitoring data to an event hub with Azure Monitor enables you to e
5151
| SumoLogic | Instructions for setting up SumoLogic to consume data from an event hub are available at [Collect Logs for the Azure Audit App from Event Hub](https://help.sumologic.com/Send-Data/Applications-and-Other-Data-Sources/Azure-Audit/02Collect-Logs-for-Azure-Audit-from-Event-Hub). |
5252
| ArcSight | The ArcSight Azure Event Hub smart connector is available as part of [the ArcSight smart connector collection](https://community.softwaregrp.com/t5/Discussions/Announcing-General-Availability-of-ArcSight-Smart-Connectors-7/m-p/1671852). |
5353
| Syslog server | If you want to stream Azure Monitor data directly to a syslog server, you can use a [solution based on an Azure function](https://github.com/miguelangelopereira/azuremonitor2syslog/).
54-
| LogRhythm | Instructions to sett up LogRhythm to collect logs from an event hub are available [here](https://logrhythm.com/six-tips-for-securing-your-azure-cloud-environment/).
54+
| LogRhythm | Instructions to set up LogRhythm to collect logs from an event hub are available [here](https://logrhythm.com/six-tips-for-securing-your-azure-cloud-environment/).
5555

5656

5757
## Next Steps

articles/cosmos-db/consistency-levels-across-apis.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ When using Cassandra API or Azure Cosmos DB’s API for MongoDB, applications ge
2020

2121
## <a id="cassandra-mapping"></a>Mapping between Apache Cassandra and Azure Cosmos DB consistency levels
2222

23-
Unlike AzureCosmos DB, Apache Cassandra does not natively provide precisely defined consistency guarantees. Instead, Apache Cassandra provides a write consistency level and a read consistency level, to enable the high availability, consistency, and latency tradeoffs. When using Azure Cosmos DB’s Cassandra API:
23+
Unlike Azure Cosmos DB, Apache Cassandra does not natively provide precisely defined consistency guarantees. Instead, Apache Cassandra provides a write consistency level and a read consistency level, to enable the high availability, consistency, and latency tradeoffs. When using Azure Cosmos DB’s Cassandra API:
2424

2525
* The write consistency level of Apache Cassandra is mapped to the default consistency level configured on your Azure Cosmos account.
2626

@@ -54,4 +54,4 @@ Read more about consistency levels and compatibility between Azure Cosmos DB API
5454

5555
* [Availability and performance tradeoffs for various consistency levels](consistency-levels-tradeoffs.md)
5656
* [MongoDB features supported by the Azure Cosmos DB's API for MongoDB](mongodb-feature-support.md)
57-
* [Apache Cassandra features supported by the Azure Cosmos DB Cassandra API](cassandra-support.md)
57+
* [Apache Cassandra features supported by the Azure Cosmos DB Cassandra API](cassandra-support.md)

articles/sql-database/sql-database-service-tiers-general-purpose-business-critical.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
---
2-
title: Ggeneral purpose and business critical
2+
title: General purpose and business critical
33
description: The article discusses the general purpose and business critical service tiers in the vCore-based purchasing model.
44
services: sql-database
55
ms.service: sql-database

0 commit comments

Comments
 (0)