Skip to content

Commit 60af818

Browse files
authored
Merge pull request #242339 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 d3f9fd5 + 13843f6 commit 60af818

10 files changed

+25
-24
lines changed

articles/active-directory/hybrid/connect/reference-connect-version-history.md

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -37,8 +37,7 @@ Required permissions | For permissions required to apply an update, see [Azure A
3737

3838
## Retiring Azure AD Connect 1.x versions
3939
> [!IMPORTANT]
40-
> *As of August 31, 2022, all 1.x versions of Azure AD Connect are retired because they include SQL Server 2012 components that will no longer be supported.* Upgrade to the most recent version of Azure AD Connect (2.x version) by that date or [evaluate and switch to Azure AD cloud sync](../cloud-sync/what-is-cloud-sync.md).
41-
> AADConnect V1.x may stop working on December 31st, due to the retirement of the ADAL library service on that date.
40+
> Action required: Synchronization will stop working on October 1, 2023, for any customers still running Azure AD Connect Sync V1. Customers using cloud sync or Azure AD Connect V2 will remain fully operational with no action required. For more information and next step guidance, see [Decommission Azure AD Connect V1](https://aka.ms/DecommissionAADConnectV1) if an upgrade is required.
4241
4342
## Retiring Azure AD Connect 2.x versions
4443
> [!IMPORTANT]
@@ -81,11 +80,11 @@ To read more about autoupgrade, see [Azure AD Connect: Automatic upgrade](how-to
8180
## 2.2.1.0
8281

8382
### Release status
84-
5/23/2023: Released for autoupgrade only
83+
6/19/2023: Released for download and autoupgrade.
8584

8685
### Functional Changes
8786
- We have enabled Auto Upgrade for tenants with custom synchronization rules. Note that deleted (not disabled) default rules will be re-created and enabled upon Auto Upgrade.
88-
- We have added Microsoft Azure AD Connect Agent Updater service to the install.
87+
- We have added Microsoft Azure AD Connect Agent Updater service to the install. This new service will be used for future auto upgrades.
8988
- We have removed the Synchronization Service WebService Connector Config program from the install.
9089

9190
### Bug Fixes

articles/azure-cache-for-redis/cache-best-practices-performance.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -179,7 +179,7 @@ The following tables show the GET requests per second at different capacities, u
179179

180180
| Instance | Capacity 2 | Capacity 4 | Capacity 6 |
181181
|:---:| ---:| ---:| ---:|
182-
| E10 | 1,00,000 | 1,900,000 | 2,500,000 |
182+
| E10 | 1,000,000 | 1,900,000 | 2,500,000 |
183183
| E20 | 900,000 | 1,700,000 | 2,300,000 |
184184
| E50 | 1,700,000 | 3,000,000 | 3,900,000 |
185185
| E100 | 2,500,000 | 4,400,000 | 4,900,000|

articles/azure-maps/drawing-conversion-error-codes.md

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,9 @@
11
---
22
title: Azure Maps Drawing Conversion errors and warnings
3+
titleSuffix: Microsoft Azure Maps Creator
34
description: Learn about the Conversion errors and warnings you may meet while you're using the Azure Maps Conversion service. Read the recommendations on how to resolve the errors and the warnings, with some examples.
4-
author: eriklindeman
5-
ms.author: eriklind
5+
author: brendansco
6+
ms.author: brendanc
67
ms.date: 05/21/2021
78
ms.topic: conceptual
89
ms.service: azure-maps

articles/azure-maps/drawing-error-visualizer.md

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,9 @@
11
---
22
title: Use Azure Maps Drawing Error Visualizer
3+
titleSuffix: Microsoft Azure Maps Creator
34
description: This article demonstrates how to visualize warnings and errors returned by the Creator Conversion API.
4-
author: eriklindeman
5-
ms.author: eriklind
5+
author: brendansco
6+
ms.author: brendanc
67
ms.date: 02/17/2023
78
ms.topic: conceptual
89
ms.service: azure-maps

articles/azure-maps/how-to-manage-creator.md

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,9 @@
11
---
22
title: Manage Microsoft Azure Maps Creator
3+
titleSuffix: Microsoft Azure Maps Creator
34
description: This article demonstrates how to manage Microsoft Azure Maps Creator.
4-
author: eriklindeman
5-
ms.author: eriklind
5+
author: brendansco
6+
ms.author: brendanc
67
ms.date: 01/20/2022
78
ms.topic: how-to
89
ms.service: azure-maps

articles/azure-maps/how-to-use-indoor-module.md

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,9 @@
11
---
22
title: Use the Azure Maps Indoor Maps module with Microsoft Creator services with custom styles (preview)
3+
titleSuffix: Microsoft Azure Maps Creator
34
description: Learn how to use the Microsoft Azure Maps Indoor Maps module to render maps by embedding the module's JavaScript libraries.
4-
author: eriklindeman
5-
ms.author: eriklind
5+
author: brendansco
6+
ms.author: brendanc
67
ms.date: 09/23/2022
78
ms.topic: how-to
89
ms.service: azure-maps

articles/azure-maps/indoor-map-dynamic-styling.md

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
---
22
title: Implement dynamic styling for Azure Maps Creator indoor maps
3+
titleSuffix: Microsoft Azure Maps Creator
34
description: Learn how to Implement dynamic styling for Creator indoor maps
45
author: brendansco
56
ms.author: Brendanc

articles/azure-maps/schema-stateset-stylesobject.md

Lines changed: 5 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,12 @@
11
---
22
title: StylesObject Schema reference guide for Dynamic Azure Maps
33
description: Reference guide to the dynamic Azure Maps StylesObject schema and syntax.
4-
author: eriklindeman
5-
ms.author: eriklind
4+
author: brendansco
5+
ms.author: brendanc
66
ms.date: 02/17/2023
77
ms.topic: reference
88
ms.service: azure-maps
99
services: azure-maps
10-
1110
---
1211

1312
# StylesObject Schema reference guide for dynamic Maps
@@ -18,14 +17,12 @@ services: azure-maps
1817

1918
A `StyleObject` is one of the following style rules:
2019

21-
* [`BooleanTypeStyleRule`](#booleantypestylerule)
22-
* [`NumericTypeStyleRule`](#numerictypestylerule)
23-
* [`StringTypeStyleRule`](#stringtypestylerule)
20+
* [`BooleanTypeStyleRule`](#booleantypestylerule)
21+
* [`NumericTypeStyleRule`](#numerictypestylerule)
22+
* [`StringTypeStyleRule`](#stringtypestylerule)
2423

2524
The JSON below shows example usage of each of the three style types. The `BooleanTypeStyleRule` is used to determine the dynamic style for features whose `occupied` property is true and false. The `NumericTypeStyleRule` is used to determine the style for features whose `temperature` property falls within a certain range. Finally, the `StringTypeStyleRule` is used to match specific styles to `meetingType`.
2625

27-
28-
2926
```json
3027
"styles": [
3128
{

articles/data-factory/quickstart-create-data-factory-python.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -196,7 +196,7 @@ You define a dataset that represents the source data in Azure Blob. This Blob da
196196
```python
197197
# Create an Azure blob dataset (input)
198198
ds_name = 'ds_in'
199-
ds_ls = LinkedServiceReference(reference_name=ls_name)
199+
ds_ls = LinkedServiceReference(type="LinkedServiceReference",reference_name=ls_name)
200200
blob_path = '<container>/<folder path>'
201201
blob_filename = '<file name>'
202202
ds_azure_blob = DatasetResource(properties=AzureBlobDataset(
@@ -370,7 +370,7 @@ def main():
370370

371371
# Create an Azure blob dataset (input)
372372
ds_name = 'ds_in'
373-
ds_ls = LinkedServiceReference(reference_name=ls_name)
373+
ds_ls = LinkedServiceReference(type="LinkedServiceReference",reference_name=ls_name)
374374
blob_path = '<container>/<folder path>'
375375
blob_filename = '<file name>'
376376
ds_azure_blob = DatasetResource(properties=AzureBlobDataset(

articles/defender-for-cloud/how-to-manage-attack-path.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ You can check out the full list of [Attack path names and descriptions](attack-p
2020
| Aspect | Details |
2121
|--|--|
2222
| Release state | GA (General Availability) |
23-
| Prerequisites | - [Enable agentless scanning](enable-vulnerability-assessment-agentless.md), or [Enable Defender for Server P1 (which includes MDVM)](defender-for-servers-introduction.md) or [Defender for Server P2 (which includes MDVM and Qualys)](defender-for-servers-introduction.md). <br> - [Enable Defender CSPM](enable-enhanced-security.md) <br> - [Enable Defender for Containers](defender-for-containers-enable.md), and install the relevant agents in order to view attack paths that are related to containers. This also gives you the ability to [query](how-to-manage-cloud-security-explorer.md#build-a-query-with-the-cloud-security-explorer) containers data plane workloads in security explorer. |
23+
| Prerequisites | - [Enable agentless scanning](enable-vulnerability-assessment-agentless.md), or [Enable Defender for Server P1 (which includes MDVM)](defender-for-servers-introduction.md) or [Defender for Server P2 (which includes MDVM and Qualys)](defender-for-servers-introduction.md). <br> - [Enable Defender CSPM](enable-enhanced-security.md) <br> - Enable agentless container posture extension in Defender CSPM, or [Enable Defender for Containers](defender-for-containers-enable.md), and install the relevant agents in order to view attack paths that are related to containers. This also gives you the ability to [query](how-to-manage-cloud-security-explorer.md#build-a-query-with-the-cloud-security-explorer) containers data plane workloads in security explorer. |
2424
| Required plans | - Defender Cloud Security Posture Management (CSPM) enabled |
2525
| Required roles and permissions: | - **Security Reader** <br> - **Security Admin** <br> - **Reader** <br> - **Contributor** <br> - **Owner** |
2626
| Clouds: | :::image type="icon" source="./media/icons/yes-icon.png"::: Commercial clouds (Azure, AWS) <br>:::image type="icon" source="./media/icons/no-icon.png"::: Commercial clouds (GCP) <br>:::image type="icon" source="./media/icons/no-icon.png"::: National (Azure Government, Azure China 21Vianet) |

0 commit comments

Comments
 (0)