Skip to content

Commit 157ab01

Browse files
authored
Merge pull request #231884 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 a14f316 + e721549 commit 157ab01

File tree

7 files changed

+52
-44
lines changed

7 files changed

+52
-44
lines changed

articles/active-directory/conditional-access/concept-conditional-access-conditions.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -190,7 +190,7 @@ By selecting **Other clients**, you can specify a condition that affects apps th
190190

191191
## Device state (deprecated)
192192

193-
**This preview feature has been deprecated.** Customers should use the **Filter for devices** condition in the Conditional Access policy, to satisfy scenarios previously achieved using device state (preview) condition.
193+
**This preview feature has been deprecated.** Customers should use the **Filter for devices** condition in the Conditional Access policy, to satisfy scenarios previously achieved using device state (deprecated) condition.
194194

195195

196196
The device state condition was used to exclude devices that are hybrid Azure AD joined and/or devices marked as compliant with a Microsoft Intune compliance policy from an organization's Conditional Access policies.
@@ -206,7 +206,7 @@ The above scenario, can be configured using *All users* accessing the *Microsoft
206206
207207
## Filter for devices
208208

209-
There’s a new optional condition in Conditional Access called filter for devices. When configuring filter for devices as a condition, organizations can choose to include or exclude devices based on a filter using a rule expression on device properties. The rule expression for filter for devices can be authored using rule builder or rule syntax. This experience is similar to the one used for dynamic membership rules for groups. For more information, see the article [Conditional Access: Filter for devices (preview)](concept-condition-filters-for-devices.md).
209+
There’s a new optional condition in Conditional Access called filter for devices. When configuring filter for devices as a condition, organizations can choose to include or exclude devices based on a filter using a rule expression on device properties. The rule expression for filter for devices can be authored using rule builder or rule syntax. This experience is similar to the one used for dynamic membership rules for groups. For more information, see the article [Conditional Access: Filter for devices](concept-condition-filters-for-devices.md).
210210

211211
## Next steps
212212

articles/active-directory/conditional-access/concept-token-protection.md

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -19,6 +19,9 @@ Token protection (sometimes referred to as token binding in the industry) attemp
1919

2020
Token protection creates a cryptographically secure tie between the token and the device (client secret) it's issued to. Without the client secret, the bound token is useless. When a user registers a Windows 10 or newer device in Azure AD, their primary identity is [bound to the device](../devices/concept-primary-refresh-token.md#how-is-the-prt-protected). This connection means that any issued sign-in token is tied to the device significantly reducing the chance of theft and replay attacks.
2121

22+
> [!IMPORTANT]
23+
> Token protection is currently in public preview. For more information about previews, see [Supplemental Terms of Use for Microsoft Azure Previews](https://azure.microsoft.com/support/legal/preview-supplemental-terms/).
24+
2225
With this preview, we're giving you the ability to create a Conditional Access policy to require token protection for sign-in tokens for specific services. We support token protection for sign-in tokens in Conditional Access for desktop applications accessing Exchange Online and SharePoint Online on Windows devices.
2326

2427
:::image type="content" source="media/concept-token-protection/complete-policy-components-session.png" alt-text="Screenshot showing a Conditional Access policy requiring token protection as the session control":::

articles/active-directory/governance/understanding-lifecycle-workflows.md

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -168,6 +168,9 @@ Once scheduling is enabled, the workflow will be evaluated every three hours to
168168

169169
[![Workflow template schedule.](media/understanding-lifecycle-workflows/workflow-10.png)](media/understanding-lifecycle-workflows/workflow-10.png#lightbox)
170170

171+
>[!NOTE]
172+
> For a particular user and workflow version, the scheduled workflow execution is performed only once every 30 days. Also, the execution of on-demand workflows of a particular workflow version in the last 30 days results in the scheduled workflow execution not taking place for a particular user.
173+
171174
To view a detailed guide on scheduling a workflow, see: [Customize the schedule of workflows](customize-workflow-schedule.md).
172175

173176
### On-demand scheduling

articles/azure-maps/drawing-package-guide.md

Lines changed: 8 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ zone_pivot_groups: drawing-package-version
1515

1616
:::zone pivot="drawing-package-v1"
1717

18-
This guide shows you how to prepare your Drawing Package for the [Azure Maps Conversion service] using specific CAD commands to correctly prepare your DWG files and manifest file for the Conversion service.
18+
This guide shows you how to prepare your Drawing Package for the Azure Maps [Conversion service] using specific CAD commands to correctly prepare your DWG files and manifest file for the Conversion service.
1919

2020
To start with, make sure your Drawing Package is in .zip format, and contains the following files:
2121

@@ -117,7 +117,7 @@ The wall layer is meant to represent the physical extents of a facility such as
117117

118118
The drawing package Manifest is a JSON file. The Manifest tells the Azure Maps Conversion service how to read the facility DWG files and metadata. Some examples of this information could be the specific information each DWG layer contains, or the geographical location of the facility.
119119

120-
To achieve a successful conversion, all “required” properties must be defined. A sample manifest file can be found inside the [sample drawing package]. This guide doesn't cover properties supported by the manifest. For more information about manifest properties, see [Manifest File Properties].
120+
To achieve a successful conversion, all “required” properties must be defined. A sample manifest file can be found inside the [sample drawing package]. This guide doesn't cover properties supported by the manifest. For more information about manifest properties, see [Manifest file requirements].
121121

122122
### Building levels
123123

@@ -227,7 +227,7 @@ You should now have all the DWG drawings prepared to meet Azure Maps Conversion
227227

228228
:::zone pivot="drawing-package-v2"
229229

230-
This guide shows you how to prepare your Drawing Package for the Azure Maps [Conversion service v2]. A Drawing Package contains one or more DWG drawing files for a single facility and a manifest file describing the DWG files.
230+
This guide shows you how to prepare your Drawing Package for the Azure Maps [Conversion service]. A Drawing Package contains one or more DWG drawing files for a single facility and a manifest file describing the DWG files.
231231

232232
If you don't have your own package to reference along with this guide, you may download the [sample drawing package v2].
233233

@@ -288,7 +288,7 @@ For a better understanding of layers and feature classes, see [Drawing Package R
288288

289289
The drawing package Manifest is a JSON file. The Manifest tells the Azure Maps Conversion service how to read the facility DWG files and metadata. Some examples of this information could be the specific information each DWG layer contains, or the geographical location of the facility.
290290

291-
To achieve a successful conversion, all “required” properties must be defined. A sample manifest file can be found inside the [sample drawing package v2]. This guide doesn't cover properties supported by the manifest. For more information about manifest properties, see [Manifest File Properties].
291+
To achieve a successful conversion, all “required” properties must be defined. A sample manifest file can be found inside the [sample drawing package v2]. This guide doesn't cover properties supported by the manifest. For more information about manifest properties, see [Manifest file requirements].
292292

293293
The manifest can be created manually in any text editor, or can be created using the Azure Maps Creator onboarding tool. This guide provides examples for each.
294294

@@ -316,7 +316,7 @@ Defining text properties enables you to associate text entities that fall inside
316316
:::image type="content" source="./media/creator-indoor-maps/onboarding-tool/dwg-layers.png" alt-text="Screenshot showing the create a new manifest screen of the onboarding tool.":::
317317

318318
> [!IMPORTANT]
319-
> Wayfinding support for `Drawing Package 2.0` will be supported in the near future. The following feature class should be defined (non-case sensitive) in order to use [wayfinding]. `Wall` will be treated as an obstruction for a given path request. `Stair` and `Elevator` will be treated as level connectors to navigate across floors:
319+
> Wayfinding support for `Drawing Package 2.0` will be available soon. The following feature class should be defined (not case sensitive) in order to use [wayfinding]. `Wall` will be treated as an obstruction for a given path request. `Stair` and `Elevator` will be treated as level connectors to navigate across floors:
320320
>
321321
> 1. Wall
322322
> 2. Stair
@@ -356,16 +356,15 @@ You should now have all the DWG drawings prepared to meet Azure Maps Conversion
356356
> [Tutorial: Creating a Creator indoor map]
357357
358358
<!--------------------- Drawing Package v1 links--------------------------------------------------->
359-
[Azure Maps Conversion service]: /rest/api/maps/v2/conversion
360359
[sample drawing package]: https://github.com/Azure-Samples/am-creator-indoor-data-examples/tree/master/Drawing%20Package%201.0
361-
[Manifest File Properties]: drawing-requirements.md#manifest-file-requirements
360+
[Manifest file requirements]: drawing-requirements.md#manifest-file-requirements-1
362361
[Drawing Package Requirements]: drawing-requirements.md
363362
[Tutorial: Creating a Creator indoor map]: tutorial-creator-indoor-maps.md
364363

365364
<!--------------------- Drawing Package v2 links--------------------------------------------------->
366-
[Conversion service v2]: https://aka.ms/creator-conversion
365+
[Conversion service]: https://aka.ms/creator-conversion
367366
[sample drawing package v2]: https://github.com/Azure-Samples/am-creator-indoor-data-examples/tree/master/Drawing%20Package%202.0
368367
[Azure Maps Creator onboarding tool]: https://azure.github.io/azure-maps-creator-onboarding-tool
369-
[manifest files]: /azure/azure-maps/drawing-requirements#manifest-file-requirements
368+
[manifest files]: drawing-requirements.md#manifest-file-1
370369
[wayfinding]: creator-indoor-maps.md#wayfinding-preview
371370
[facility level]: drawing-requirements.md#facility-level

0 commit comments

Comments
 (0)