Skip to content

Commit b8745af

Browse files
committed
Merge branch 'main' of https://github.com/MicrosoftDocs/azure-docs into end-links-5
2 parents 52e6847 + 87920b2 commit b8745af

File tree

3 files changed

+17
-9
lines changed

3 files changed

+17
-9
lines changed

articles/active-directory/authentication/concept-system-preferred-multifactor-authentication.md

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,6 +14,7 @@ ms.collection: M365-identity-device-management
1414

1515
# Customer intent: As an identity administrator, I want to encourage users to use the Microsoft Authenticator app in Azure AD to improve and secure user sign-in events.
1616
---
17+
1718
# System-preferred multifactor authentication - Authentication methods policy
1819

1920
System-preferred multifactor authentication (MFA) prompts users to sign in by using the most secure method they registered. Administrators can enable system-preferred MFA to improve sign-in security and discourage less secure sign-in methods like SMS.
@@ -111,7 +112,7 @@ When a user signs in, the authentication process checks which authentication met
111112

112113
1. [Temporary Access Pass](howto-authentication-temporary-access-pass.md)
113114
1. [FIDO2 security key](concept-authentication-passwordless.md#fido2-security-keys)
114-
1. [Microsoft Authenticator push notifications](concept-authentication-authenticator-app.md)
115+
1. [Microsoft Authenticator notifications](concept-authentication-authenticator-app.md)
115116
1. [Time-based one-time password (TOTP)](concept-authentication-oath-tokens.md)<sup>1</sup>
116117
1. [Telephony](concept-authentication-phone-options.md)<sup>2</sup>
117118
1. [Certificate-based authentication](concept-certificate-based-authentication.md)
@@ -134,3 +135,5 @@ The system-preferred MFA also applies for users who are enabled for MFA in the l
134135

135136
* [Authentication methods in Azure Active Directory](concept-authentication-authenticator-app.md)
136137
* [How to run a registration campaign to set up Microsoft Authenticator](how-to-mfa-registration-campaign.md)
138+
139+

articles/azure-maps/drawing-requirements.md

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@ For easy reference, here are some terms and definitions that are important as yo
3636
| Xref | A file in AutoCAD DWG file format, attached to the primary drawing as an external reference. |
3737
| Level | An area of a building at a set elevation. For example, the floor of a building. |
3838
|Feature| An instance of an object produced from the Conversion service that combines a geometry with metadata information. |
39-
|Feature classes| A common blueprint for features. For example, a *unit* is a feature class, and an *office* is a feature. |
39+
|Feature classes| A common blueprint for features. For example, a _unit_ is a feature class, and an _office_ is a feature. |
4040

4141
## Drawing package structure
4242

@@ -58,7 +58,7 @@ The [Conversion service] does the following on each DWG file:
5858
- Openings
5959
- Walls
6060
- Vertical penetrations
61-
- Produces a *Facility* feature.
61+
- Produces a _Facility_ feature.
6262
- Produces a minimal set of default Category features referenced by other features:
6363
- room
6464
- structure
@@ -103,7 +103,7 @@ The following sections describe the requirements for each layer.
103103

104104
### Exterior layer
105105

106-
The DWG file for each level must contain a layer to define that level's perimeter. This layer is referred to as the *exterior* layer. For example, if a facility contains two levels, then it needs to have two DWG files, with an exterior layer for each file.
106+
The DWG file for each level must contain a layer to define that level's perimeter. This layer is referred to as the _exterior_ layer. For example, if a facility contains two levels, then it needs to have two DWG files, with an exterior layer for each file.
107107

108108
No matter how many entity drawings are in the exterior layer, the [resulting facility dataset](tutorial-creator-feature-stateset.md) contains only one level feature for each DWG file. Additionally:
109109

@@ -454,7 +454,7 @@ For easy reference, here are some terms and definitions that are important as yo
454454
A drawing package is a ZIP archive that contains the following files:
455455

456456
- DWG files in AutoCAD DWG file format.
457-
-*manifest.json* file that describes the DWG files in the drawing package.
457+
-_manifest.json_ file that describes the DWG files in the drawing package.
458458

459459
The drawing package must be compressed into a single archive file, with the .zip extension. The DWG files can be organized in any way inside the drawing package, but the manifest file must be in the root directory. The next sections explain the conversion process and requirements for both the DWG and manifest files, and the content of these files. To view a sample package, you can download the [sample drawing package v2].
460460

@@ -475,7 +475,7 @@ Each DWG file must adhere to these requirements:
475475

476476
- The DWG file can't contain features from multiple facilities.
477477
- The DWG file can't contain features from multiple levels. For example, a facility with three levels has three DWG files in the drawing package.
478-
- All data of a single level must be contained in a single DWG file. Any external references (*xrefs*) must be bound to the parent drawing.
478+
- All data of a single level must be contained in a single DWG file. Any external references (_xrefs_) must be bound to the parent drawing.
479479
- The DWG file must define layer(s) representing the boundary of that level.
480480
- The DWG must reference the same measurement system and unit of measurement as other DWG files in the drawing package.
481481
- The DWG file must be aligned when stacked on top of another level from the same facility.
@@ -519,7 +519,7 @@ You can see an example of the Level perimeter layer as the `GROS$` layer in the
519519
The drawing package must contain a manifest file at the root level and the file must be named **manifest.json**. It describes the DWG files
520520
allowing the  [Conversion service] to parse their content. Only the files identified by the manifest are used. Files that are in the drawing package, but aren't properly listed in the manifest, are ignored.
521521

522-
The file paths in the buildingLevels object of the manifest file must be relative to the root of the drawing package. The DWG file name must exactly match the name of the facility level. For example, a DWG file for the "Basement" level is *Basement.dwg*. A DWG file for level 2 is named as *level_2.dwg*. Filenames can't contain spaces, you can use an underscore to replace any spaces.
522+
The file paths in the buildingLevels object of the manifest file must be relative to the root of the drawing package. The DWG file name must exactly match the name of the facility level. For example, a DWG file for the "Basement" level is _Basement.dwg_. A DWG file for level 2 is named as _level_2.dwg_. Filenames can't contain spaces, you can use an underscore to replace any spaces.
523523

524524
Although there are requirements when you use the manifest objects, not all objects are required. The following table shows the required and optional objects for the 2023-03-01-preview [Conversion service].
525525

@@ -530,7 +530,7 @@ Although there are requirements when you use the manifest objects, not all objec
530530

531531
| Property | Type | Required | Description  |
532532
|----------------|-------------------------------|----------|-----------------------------------------------------------------------------------------|
533-
| `version` | number | TRUE | Manifest schema version. Currently version 2.0 |
533+
| `version` | string | TRUE | Manifest schema version. Currently version "2.0" |
534534
|`buildingLevels`| [BuildingLevels] object  | TRUE | Specifies the levels of the facility and the files containing the design of the levels. |
535535
|`featureClasses`|Array of [featureClass] objects| TRUE | List of feature class objects that define how layers are read from the DWG drawing file.|
536536
| `georeference` |[Georeference] object | FALSE | Contains numerical geographic information for the facility drawing.     |
@@ -560,7 +560,7 @@ The next sections detail the requirements for each object.
560560
|------------------------|-------------------------------|----------|---------------------------------------------|
561561
| `dwgLayers`| Array of strings| TRUE| The name of each layer that defines the feature class. Each entity on the specified layer is converted to an instance of the feature class. The `dwgLayer` name that a feature is converted from ends up as a property of that feature. |
562562
| `featureClassName` | String | TRUE | The name of the feature class. Typical examples include room, workspace or wall.|
563-
|`featureClassProperties`| Array of [featureClassProperty] objects | TRUE | Specifies text layers in the DWG file associated to the feature as a property. For example, a label that falls inside the bounds of a space, such as a room number.|
563+
|`featureClassProperties`| Array of [featureClassProperty] objects | FALSE | Specifies text layers in the DWG file associated to the feature as a property. For example, a label that falls inside the bounds of a space, such as a room number.|
564564

565565
#### featureClassProperty
566566

articles/virtual-wan/how-to-virtual-hub-routing-powershell.md

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -80,6 +80,11 @@ The steps in this section help you set up routing configuration for a virtual ne
8080
$updatedRoutingConfiguration= New-AzRoutingConfiguration -AssociatedRouteTable $associatedTable.Id -Label @("testLabel") -Id @($propagatedTable.Id) -StaticRoute @($staticRoute)
8181
```
8282

83+
> [!NOTE]
84+
> For updates, when using the `New-AzRoutingConfiguration`, all exisiting cofiguration needs to be provided, such as AssociatedRouteTables, Labels and/or StaticRoutes.
85+
> This command creates a new configuration, which will overwrite existing configurations, when the `Update-AzVirtualHubVnetConnection` is executed.
86+
87+
8388
1. Update the existing virtual network connection.
8489

8590
```azurepowershell-interactive

0 commit comments

Comments
 (0)