Skip to content

Commit f765ac0

Browse files
authored
Merge pull request #229142 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 883b5b6 + 0089b0b commit f765ac0

File tree

13 files changed

+76
-74
lines changed

13 files changed

+76
-74
lines changed

articles/active-directory/conditional-access/plan-conditional-access.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -184,7 +184,7 @@ The following name indicates that this policy is the first of four policies to e
184184

185185
### Block countries from which you never expect a sign-in.
186186

187-
Azure active directory allows you to create [named locations](location-condition.md). Create the list of countries that are allowed, and then create a network block policy with these "allowed countries" as an exclusion. This is less overhead for customers who are based in smaller geographic locations.**Be sure to exempt your emergency access accounts from this policy**.
187+
Azure active directory allows you to create [named locations](location-condition.md). Create the list of countries that are allowed, and then create a network block policy with these "allowed countries" as an exclusion. This is less overhead for customers who are based in smaller geographic locations. **Be sure to exempt your emergency access accounts from this policy**.
188188

189189
## Deploy Conditional Access policy
190190

articles/active-directory/hybrid/how-to-connect-password-hash-synchronization.md

Lines changed: 8 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -37,6 +37,11 @@ Your current cloud service session is not immediately affected by a synchronized
3737

3838
A user must enter their corporate credentials a second time to authenticate to Azure AD, regardless of whether they're signed in to their corporate network. This pattern can be minimized, however, if the user selects the Keep me signed in (KMSI) check box at sign-in. This selection sets a session cookie that bypasses authentication for 180 days. KMSI behavior can be enabled or disabled by the Azure AD administrator. In addition, you can reduce password prompts by configuring [Azure AD join](../devices/concept-azure-ad-join.md) or [Hybrid Azure AD join](../devices/concept-azure-ad-join-hybrid.md), which automatically signs users in when they are on their corporate devices connected to your corporate network.
3939

40+
### Additional advantages
41+
42+
- Generally, password hash synchronization is simpler to implement than a federation service. It doesn't require any additional servers, and eliminates dependence on a highly available federation service to authenticate users.
43+
- Password hash synchronization can also be enabled in addition to federation. It may be used as a fallback if your federation service experiences an outage.
44+
4045
> [!NOTE]
4146
> Password sync is only supported for the object type user in Active Directory. It is not supported for the iNetOrgPerson object type.
4247
@@ -142,6 +147,8 @@ To support temporary passwords in Azure AD for synchronized users, you can enabl
142147
> Forcing a user to change their password on next logon requires a password change at the same time. Azure AD Connect will not pick up the force password change flag by itself; it is supplemental to the detected password change that occurs during password hash sync.
143148
>
144149
> If the user has the option "Password never expires" set in Active Directory (AD), the force password change flag will not be set in Active Directory (AD), so the user will not be prompted to change the password during the next sign-in.
150+
>
151+
> A new user created in Active Directory with "User must change password at next logon" flag will always be provisioned in Azure AD with a password policy to "Force change password on next sign-in", irrespective of the *ForcePasswordChangeOnLogOn* feature being true or false. This is an Azure AD internal logic since the new user is provisioned without a password, whereas *ForcePasswordChangeOnLogOn* feature only affects admin password reset scenarios.
145152
146153
> [!CAUTION]
147154
> You should only use this feature when SSPR and Password Writeback are enabled on the tenant. This is so that if a user changes their password via SSPR, it will be synchronized to Active Directory.
@@ -152,19 +159,14 @@ If your organization uses the accountExpires attribute as part of user account m
152159

153160
### Overwrite synchronized passwords
154161

155-
An administrator can manually reset your password by using Windows PowerShell.
162+
An administrator can manually reset your password directly in Azure AD by using Windows PowerShell (unless the user is in a Federated Domain).
156163

157164
In this case, the new password overrides your synchronized password, and all password policies defined in the cloud are applied to the new password.
158165

159166
If you change your on-premises password again, the new password is synchronized to the cloud, and it overrides the manually updated password.
160167

161168
The synchronization of a password has no impact on the Azure user who is signed in. Your current cloud service session is not immediately affected by a synchronized password change that occurs while you're signed in to a cloud service. KMSI extends the duration of this difference. When the cloud service requires you to authenticate again, you need to provide your new password.
162169

163-
### Additional advantages
164-
165-
- Generally, password hash synchronization is simpler to implement than a federation service. It doesn't require any additional servers, and eliminates dependence on a highly available federation service to authenticate users.
166-
- Password hash synchronization can also be enabled in addition to federation. It may be used as a fallback if your federation service experiences an outage.
167-
168170
## Password hash sync process for Azure AD Domain Services
169171

170172
If you use Azure AD Domain Services to provide legacy authentication for applications and services that need to use Kerberos, LDAP, or NTLM, some additional processes are part of the password hash synchronization flow. Azure AD Connect uses the additional following process to synchronize password hashes to Azure AD for use in Azure AD Domain Services:

articles/applied-ai-services/form-recognizer/quickstarts/includes/v3-javascript-sdk.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -220,7 +220,7 @@ Extract text, selection marks, text styles, table structures, and bounding regio
220220
async function main() {
221221
const client = new DocumentAnalysisClient(endpoint, new AzureKeyCredential(key));
222222

223-
const poller = await client.beginAnalyzeDocumentFromUrl("prebuilt-layout", formUrlLayout);
223+
const poller = await client.beginAnalyzeDocumentFromUrl("prebuilt-layout", formUrl);
224224

225225
const {
226226
pages,

articles/azure-maps/about-azure-maps.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -168,9 +168,9 @@ Maps Creator service is a suite of web services that developers can use to creat
168168

169169
Maps Creator provides the following services:
170170

171-
* [Dataset service][Dataset service]. Use the Dataset service to create a dataset from a converted Drawing package data. For information about Drawing package requirements, see Drawing package requirements.
171+
* [Dataset service][Dataset service]. Use the Dataset service to create a dataset from a converted drawing package data. For information about Drawing package requirements, see Drawing package requirements.
172172

173-
* [Conversion service][Conversion service]. Use the Conversion service to convert a DWG design file into Drawing package data for indoor maps.
173+
* [Conversion service][Conversion service]. Use the Conversion service to convert a DWG design file into drawing package data for indoor maps.
174174

175175
* [Tileset service][Tileset]. Use the Tileset service to create a vector-based representation of a dataset. Applications can use a tileset to present a visual tile-based view of the dataset.
176176

articles/azure-maps/creator-indoor-maps.md

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -55,17 +55,17 @@ Creator services create, store, and use various data types that are defined and
5555
- Feature stateset
5656
- Routeset
5757

58-
## Upload a Drawing package
58+
## Upload a drawing package
5959

60-
Creator collects indoor map data by converting an uploaded Drawing package. The Drawing package represents a constructed or remodeled facility. For information about Drawing package requirements, see [Drawing package requirements](drawing-requirements.md).
60+
Creator collects indoor map data by converting an uploaded drawing package. The drawing package represents a constructed or remodeled facility. For information about drawing package requirements, see [Drawing package requirements](drawing-requirements.md).
6161

62-
Use the [Azure Maps Data Upload API](/rest/api/maps/data-v2/update) to upload a Drawing package. After the Drawing packing is uploaded, the Data Upload API returns a user data identifier (`udid`). The `udid` can then be used to convert the uploaded package into indoor map data.
62+
Use the [Azure Maps Data Upload API](/rest/api/maps/data-v2/update) to upload a drawing package. After the Drawing packing is uploaded, the Data Upload API returns a user data identifier (`udid`). The `udid` can then be used to convert the uploaded package into indoor map data.
6363

64-
## Convert a Drawing package
64+
## Convert a drawing package
6565

66-
The [Azure Maps Conversion service](/rest/api/maps/v2/conversion) converts an uploaded Drawing package into indoor map data. The Conversion service also validates the package. Validation issues are classified into two types:
66+
The [Azure Maps Conversion service](/rest/api/maps/v2/conversion) converts an uploaded drawing package into indoor map data. The Conversion service also validates the package. Validation issues are classified into two types:
6767

68-
- Errors: If any errors are detected, the conversion process fails. When an error occurs, the Conversion service provides a link to the [Azure Maps Drawing Error Visualizer](drawing-error-visualizer.md) stand-alone web application. You can use the Drawing Error Visualizer to inspect [Drawing package warnings and errors](drawing-conversion-error-codes.md) that occurred during the conversion process. After you fix the errors, you can attempt to upload and convert the package.
68+
- Errors: If any errors are detected, the conversion process fails. When an error occurs, the Conversion service provides a link to the [Azure Maps Drawing Error Visualizer](drawing-error-visualizer.md) stand-alone web application. You can use the Drawing Error Visualizer to inspect [drawing package warnings and errors](drawing-conversion-error-codes.md) that occurred during the conversion process. After you fix the errors, you can attempt to upload and convert the package.
6969
- Warnings: If any warnings are detected, the conversion succeeds. However, we recommend that you review and resolve all warnings. A warning means that part of the conversion was ignored or automatically fixed. Failing to resolve the warnings could result in errors in later processes.
7070
For more information, see [Drawing package warnings and errors](drawing-conversion-error-codes.md).
7171

@@ -82,7 +82,7 @@ Use the Tileset service to create a vector-based representation of a dataset. Ap
8282

8383
### Datasets
8484

85-
A dataset is a collection of indoor map features. The indoor map features represent facilities that are defined in a converted Drawing package. After you create a dataset with the [Dataset service](/rest/api/maps/v2/dataset), you can create any number of [tilesets](#tilesets) or [feature statesets](#feature-statesets).
85+
A dataset is a collection of indoor map features. The indoor map features represent facilities that are defined in a converted drawing package. After you create a dataset with the [Dataset service](/rest/api/maps/v2/dataset), you can create any number of [tilesets](#tilesets) or [feature statesets](#feature-statesets).
8686

8787
At any time, developers can use the [Dataset service](/rest/api/maps/v2/dataset) to add or remove facilities to an existing dataset. For more information about how to update an existing dataset using the API, see the append options in [Dataset service](/rest/api/maps/v2/dataset). For an example of how to update a dataset, see [Data maintenance](#data-maintenance).
8888

@@ -288,7 +288,7 @@ As you begin to develop solutions for indoor maps, you can discover ways to inte
288288

289289
The following example shows how to update a dataset, create a new tileset, and delete an old tileset:
290290

291-
1. Follow steps in the [Upload a Drawing package](#upload-a-drawing-package) and [Convert a Drawing package](#convert-a-drawing-package) sections to upload and convert the new Drawing package.
291+
1. Follow steps in the [Upload a drawing package](#upload-a-drawing-package) and [Convert a drawing package](#convert-a-drawing-package) sections to upload and convert the new drawing package.
292292
2. Use the [Dataset Create API](/rest/api/maps/v2/dataset/create) to append the converted data to the existing dataset.
293293
3. Use the [Tileset Create API](/rest/api/maps/v2/tileset/create) to generate a new tileset out of the updated dataset.
294294
4. Save the new **tilesetId** for the next step.

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

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ services: azure-maps
1212

1313
# Drawing conversion errors and warnings
1414

15-
The [Azure Maps Conversion service](/rest/api/maps/v2/conversion) lets you convert uploaded Drawing packages into map data. Drawing packages must adhere to the [Drawing package requirements](drawing-requirements.md). If one or more requirements aren't met, then the Conversion service will return errors or warnings. This article lists the conversion error and warning codes, with recommendations on how to resolve them. It also provides some examples of drawings that can cause the Conversion service to return these codes.
15+
The [Azure Maps Conversion service](/rest/api/maps/v2/conversion) lets you convert uploaded drawing packages into map data. Drawing packages must adhere to the [Drawing package requirements](drawing-requirements.md). If one or more requirements aren't met, then the Conversion service will return errors or warnings. This article lists the conversion error and warning codes, with recommendations on how to resolve them. It also provides some examples of drawings that can cause the Conversion service to return these codes.
1616

1717
The Conversion service will succeed if there are any conversion warnings. However, it's recommended that you review and resolve all warnings. A warning means part of the conversion was ignored or automatically fixed. Failing to resolve the warnings could result in errors in latter processes.
1818

@@ -72,7 +72,7 @@ The image below shows an unsupported entity type as a multi-line text object on
7272

7373
#### *How to fix unsupportedFeatureRepresentation*
7474

75-
Ensure that your DWG files contain only the supported entity types. Supported types are listed under the [Drawing files requirements section in the Drawing package requirements article](drawing-requirements.md#drawing-package-requirements).
75+
Ensure that your DWG files contain only the supported entity types. Supported types are listed under the [Drawing files requirements](drawing-requirements.md#drawing-package-requirements) section in the drawing package requirements article.
7676

7777
### **automaticRepairPerformed**
7878

@@ -318,15 +318,15 @@ An **invalidUserData** error occurs when the Conversion service is unable to rea
318318

319319
#### *Example scenario for invalidUserData*
320320

321-
You attempted to upload a Drawing package with an incorrect `udid` parameter.
321+
You attempted to upload a drawing package with an incorrect `udid` parameter.
322322

323323
#### *How to fix invalidUserData*
324324

325325
To fix an **invalidUserData** error, verify that:
326326

327327
* You've provided a correct `udid` for the uploaded package.
328-
* Azure Maps Creator has been enabled for the Azure Maps account you used for uploading the Drawing package.
329-
* The API request to the Conversion service contains the subscription key to the Azure Maps account you used for uploading the Drawing package.
328+
* Azure Maps Creator has been enabled for the Azure Maps account you used for uploading the drawing package.
329+
* The API request to the Conversion service contains the subscription key to the Azure Maps account you used for uploading the drawing package.
330330

331331
### **dwgError**
332332

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

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -27,9 +27,9 @@ This tutorial uses the [Postman](https://www.postman.com/) application, but you
2727

2828
## Download
2929

30-
1. Upload your Drawing package to the Azure Maps Creator service to obtain a `udid` for the uploaded package. For steps on how to upload a package, see [Upload a drawing package](tutorial-creator-indoor-maps.md#upload-a-drawing-package).
30+
1. Upload your drawing package to the Azure Maps Creator service to obtain a `udid` for the uploaded package. For steps on how to upload a package, see [Upload a drawing package](tutorial-creator-indoor-maps.md#upload-a-drawing-package).
3131

32-
2. Now that the Drawing package is uploaded, we'll use `udid` for the uploaded package to convert the package into map data. For steps on how to convert a package, see [Convert a drawing package](tutorial-creator-indoor-maps.md#convert-a-drawing-package).
32+
2. Now that the drawing package is uploaded, we'll use `udid` for the uploaded package to convert the package into map data. For steps on how to convert a package, see [Convert a drawing package](tutorial-creator-indoor-maps.md#convert-a-drawing-package).
3333

3434
>[!NOTE]
3535
>If your conversion process succeeds, you will not receive a link to the Error Visualizer tool.
@@ -79,7 +79,7 @@ The _ConversionWarningsAndErrors.json_ file has been placed at the root of the
7979

8080
:::image type="content" source="./media/drawing-errors-visualizer/loading-data.gif" alt-text="Drawing Error Visualizer App - Drag and drop to load data":::
8181

82-
Once the _ConversionWarningsAndErrors.json_ file loads, you'll see a list of your Drawing package errors and warnings. Each error or warning is specified by the layer, level, and a detailed message. To view detailed information about an error or warning, click on the **Details** link. An intractable section will then appear below the list. You may now navigate to each error to learn more details on how to resolve the error.
82+
Once the _ConversionWarningsAndErrors.json_ file loads, you'll see a list of your drawing package errors and warnings. Each error or warning is specified by the layer, level, and a detailed message. To view detailed information about an error or warning, click on the **Details** link. An intractable section will then appear below the list. You may now navigate to each error to learn more details on how to resolve the error.
8383

8484
:::image type="content" source="./media/drawing-errors-visualizer/errors.png" alt-text="Drawing Error Visualizer App - Errors and Warnings":::
8585

0 commit comments

Comments
 (0)