Skip to content

Commit 63fb2c7

Browse files
authored
Merge pull request #246074 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 92a35d9 + 345ebcc commit 63fb2c7

File tree

5 files changed

+35
-24
lines changed

5 files changed

+35
-24
lines changed

articles/active-directory/authentication/howto-mfa-nps-extension-errors.md

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,8 @@ If you encounter errors with the NPS extension for Azure AD Multi-Factor Authent
2929
| **ESTS_TOKEN_ERROR** | Follow the instructions in [Troubleshooting the MFA NPS extension](howto-mfa-nps-extension.md#troubleshooting) to investigate client cert and security token problems. |
3030
| **HTTPS_COMMUNICATION_ERROR** | The NPS server is unable to receive responses from Azure AD MFA. Verify that your firewalls are open bidirectionally for traffic to and from `https://adnotifications.windowsazure.com` and that TLS 1.2 is enabled (default). If TLS 1.2 is disabled, user authentication will fail and event ID 36871 with source SChannel is entered in the System log in Event Viewer. To verify TLS 1.2 is enabled, see [TLS registry settings](/windows-server/security/tls/tls-registry-settings#tls-dtls-and-ssl-protocol-version-settings). |
3131
| **HTTP_CONNECT_ERROR** | On the server that runs the NPS extension, verify that you can reach `https://adnotifications.windowsazure.com` and `https://login.microsoftonline.com/`. If those sites don't load, troubleshoot connectivity on that server. |
32-
| **NPS Extension for Azure AD MFA:** <br> NPS Extension for Azure AD MFA only performs Secondary Auth for Radius requests in AccessAccept State. Request received for User username with response state AccessReject, ignoring request. | This error usually reflects an authentication failure in AD or that the NPS server is unable to receive responses from Azure AD. Verify that your firewalls are open bidirectionally for traffic to and from `https://adnotifications.windowsazure.com` and `https://login.microsoftonline.com` using ports 80 and 443. It is also important to check that on the DIAL-IN tab of Network Access Permissions, the setting is set to "control access through NPS Network Policy". This error can also trigger if the user is not assigned a license. |
32+
| **NPS Extension for Azure AD MFA (AccessReject):** <br> NPS Extension for Azure AD MFA only performs Secondary Auth for Radius requests in AccessAccept State. Request received for User username with response state AccessReject, ignoring request. | This error usually reflects an authentication failure in AD or that the NPS server is unable to receive responses from Azure AD. Verify that your firewalls are open bidirectionally for traffic to and from `https://adnotifications.windowsazure.com` and `https://login.microsoftonline.com` using ports 80 and 443. It is also important to check that on the DIAL-IN tab of Network Access Permissions, the setting is set to "control access through NPS Network Policy". This error can also trigger if the user is not assigned a license. |
33+
| **NPS Extension for Azure AD MFA (AccessChallenge):** <br> NPS Extension for Azure AD MFA only performs Secondary Auth for Radius requests in AccessAccept State. Request received for User username with response state AccessChallenge, ignoring request. | This response is used when additional information is required from the user to complete the authentication or authorization process. The NPS server sends a challenge to the user, requesting further credentials or information. It usually preceeds an Access-Accept or Access-Reject response. |
3334
| **REGISTRY_CONFIG_ERROR** | A key is missing in the registry for the application, which may be because the [PowerShell script](howto-mfa-nps-extension.md#install-the-nps-extension) wasn't run after installation. The error message should include the missing key. Make sure you have the key under HKEY_LOCAL_MACHINE\SOFTWARE\Microsoft\AzureMfa. |
3435
| **REQUEST_FORMAT_ERROR** <br> Radius Request missing mandatory Radius userName\Identifier attribute.Verify that NPS is receiving RADIUS requests | This error usually reflects an installation issue. The NPS extension must be installed in NPS servers that can receive RADIUS requests. NPS servers that are installed as dependencies for services like RDG and RRAS don't receive radius requests. NPS Extension does not work when installed over such installations and errors out since it cannot read the details from the authentication request. |
3536
| **REQUEST_MISSING_CODE** | Make sure that the password encryption protocol between the NPS and NAS servers supports the secondary authentication method that you're using. **PAP** supports all the authentication methods of Azure AD MFA in the cloud: phone call, one-way text message, mobile app notification, and mobile app verification code. **CHAPV2** and **EAP** support phone call and mobile app notification. |

articles/azure-maps/set-drawing-options.md

Lines changed: 28 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
---
22
title: Drawing tools module
33
titleSuffix: Microsoft Azure Maps
4-
description: In this article, you'll learn how to set drawing options data using the Microsoft Azure Maps Web SDK
4+
description: This article describes how to set drawing options data using the Microsoft Azure Maps Web SDK
55
author: dubiety
66
ms.author: yuchungchen
77
ms.date: 06/15/2023
@@ -11,20 +11,20 @@ ms.service: azure-maps
1111

1212
# Use the drawing tools module
1313

14-
The Azure Maps Web SDK provides a [drawing tools module]. This module makes it easy to draw and edit shapes on the map using an input device such as a mouse or touch screen. The core class of this module is the [drawing manager](/javascript/api/azure-maps-drawing-tools/atlas.drawing.drawingmanager#setoptions-drawingmanageroptions-). The drawing manager provides all the capabilities needed to draw and edit shapes on the map. It can be used directly, and it's integrated with a custom toolbar UI. You can also use the built-in [drawing toolbar](/javascript/api/azure-maps-drawing-tools/atlas.control.drawingtoolbar) class.
14+
The Azure Maps Web SDK provides a [drawing tools module]. This module makes it easy to draw and edit shapes on the map using an input device such as a mouse or touch screen. The core class of this module is the [drawing manager]. The drawing manager provides all the capabilities needed to draw and edit shapes on the map. It can be used directly, and it's integrated with a custom toolbar UI. You can also use the built-in [drawing toolbar] class.
1515

1616
## Loading the drawing tools module in a webpage
1717

18-
1. Create a new HTML file and [implement the map as usual](./how-to-use-map-control.md).
18+
1. Create a new HTML file and [implement the map as usual].
1919
2. Load the Azure Maps drawing tools module. You can load it in one of two ways:
20-
- Use the globally hosted, Azure Content Delivery Network version of the Azure Maps services module. Add reference to the JavaScript and CSS Style Sheet in the `<head>` element of the file:
20+
- Use the globally hosted, Azure Content Delivery Network version of the Azure Maps services module. Add reference to the JavaScript and CSS in the `<head>` element of the file:
2121

2222
```html
2323
<link rel="stylesheet" href="https://atlas.microsoft.com/sdk/javascript/drawing/1/atlas-drawing.min.css" type="text/css" />
2424
<script src="https://atlas.microsoft.com/sdk/javascript/drawing/1/atlas-drawing.min.js"></script>
2525
```
2626

27-
- Or, you can load the drawing tools module for the Azure Maps Web SDK source code locally by using the [azure-maps-drawing-tools](https://www.npmjs.com/package/azure-maps-drawing-tools) npm package, and then host it with your app. This package also includes TypeScript definitions. Use this command:
27+
- Or, you can load the drawing tools module for the Azure Maps Web SDK source code locally by using the [azure-maps-drawing-tools] npm package, and then host it with your app. This package also includes TypeScript definitions. Use this command:
2828

2929
`npm install azure-maps-drawing-tools`
3030

@@ -34,7 +34,7 @@ The Azure Maps Web SDK provides a [drawing tools module]. This module makes it e
3434
import * as drawing from "azure-maps-drawing-tools";
3535
```
3636

37-
You would also need to embed the CSS Style Sheet for various controls to display correctly. If you're using a JavaScript bundler to bundle the dependencies and package your code, refer to your bundler's documentation on how it's done. For [Webpack], it's commonly done via a combination of `style-loader` and `css-loader` with documentation available at [style-loader].
37+
You would also need to embed the CSS for various controls to display correctly. If you're using a JavaScript bundler to bundle the dependencies and package your code, refer to your bundler's documentation on how it's done. For [Webpack], it's commonly done via a combination of `style-loader` and `css-loader` with documentation available at [style-loader].
3838

3939
To begin, install style-loader and css-loader:
4040

@@ -67,7 +67,7 @@ The Azure Maps Web SDK provides a [drawing tools module]. This module makes it e
6767

6868
## Use the drawing manager directly
6969

70-
Once the drawing tools module is loaded in your application, you can enable drawing and editing capabilities using the [drawing manager](/javascript/api/azure-maps-drawing-tools/atlas.drawing.drawingmanager#setoptions-drawingmanageroptions-). You can specify options for the drawing manager while instantiating it or alternatively use the `drawingManager.setOptions()` function.
70+
Once the drawing tools module is loaded in your application, you can enable drawing and editing capabilities using the [drawing manager]. You can specify options for the drawing manager while instantiating it or alternatively use the `drawingManager.setOptions()` function.
7171

7272
### Set the drawing mode
7373

@@ -95,7 +95,7 @@ The following image is an example of drawing mode of the `DrawingManager`. Selec
9595
The drawing manager supports three different ways of interacting with the map to draw shapes.
9696

9797
- `click` - Coordinates are added when the mouse or touch is clicked.
98-
- `freehand` - Coordinates are added when the mouse or touch is dragged on the map.
98+
- `freehand` - Coordinates are added when the mouse or touch is dragged on the map.
9999
- `hybrid` - Coordinates are added when the mouse or touch is clicked or dragged.
100100

101101
The following code enables the polygon drawing mode and sets the type of drawing interaction that the drawing manager should adhere to `freehand`.
@@ -191,34 +191,43 @@ The following table lists the type of editing supported by different types of sh
191191

192192
## Next steps
193193

194-
Learn how to use additional features of the drawing tools module:
194+
Learn how to use more features of the drawing tools module:
195195

196196
> [!div class="nextstepaction"]
197-
> [Add a drawing toolbar](map-add-drawing-toolbar.md)
197+
> [Add a drawing toolbar]
198198
199199
> [!div class="nextstepaction"]
200-
> [Get shape data](map-get-shape-data.md)
200+
> [Get shape data]
201201
202202
> [!div class="nextstepaction"]
203-
> [React to drawing events](drawing-tools-events.md)
203+
> [React to drawing events]
204204
205205
> [!div class="nextstepaction"]
206-
> [Interaction types and keyboard shortcuts](drawing-tools-interactions-keyboard-shortcuts.md)
206+
> [Interaction types and keyboard shortcuts]
207207
208208
Learn more about the classes and methods used in this article:
209209

210210
> [!div class="nextstepaction"]
211-
> [Map](/javascript/api/azure-maps-control/atlas.map)
211+
> [Map]
212212
213213
> [!div class="nextstepaction"]
214-
> [Drawing manager](/javascript/api/azure-maps-drawing-tools/atlas.drawing.drawingmanager)
214+
> [Drawing manager]
215215
216216
> [!div class="nextstepaction"]
217-
> [Drawing toolbar](/javascript/api/azure-maps-drawing-tools/atlas.control.drawingtoolbar)
217+
> [drawing toolbar]
218218
219-
[Drawing manager options]: https://samples.azuremaps.com/drawing-tools-module/drawing-manager-options
220-
[Webpack]: https://webpack.js.org/
221-
[style-loader]: https://webpack.js.org/loaders/style-loader/
219+
[Add a drawing toolbar]: map-add-drawing-toolbar.md
220+
[azure-maps-drawing-tools]: https://www.npmjs.com/package/azure-maps-drawing-tools
222221
[Drawing manager options source code]: https://github.com/Azure-Samples/AzureMapsCodeSamples/blob/main/Samples/Drawing%20Tools%20Module/Drawing%20manager%20options/Drawing%20manager%20options.html
222+
[Drawing manager options]: https://samples.azuremaps.com/drawing-tools-module/drawing-manager-options
223+
[drawing manager]: /javascript/api/azure-maps-drawing-tools/atlas.drawing.drawingmanager
224+
[drawing toolbar]: /javascript/api/azure-maps-drawing-tools/atlas.control.drawingtoolbar
223225
[drawing tools module]: https://www.npmjs.com/package/azure-maps-drawing-tools
226+
[Get shape data]: map-get-shape-data.md
224227
[How to use the Azure Maps map control npm package]: how-to-use-npm-package.md
228+
[implement the map as usual]: how-to-use-map-control.md
229+
[Interaction types and keyboard shortcuts]: drawing-tools-interactions-keyboard-shortcuts.md
230+
[Map]: /javascript/api/azure-maps-control/atlas.map
231+
[React to drawing events]: drawing-tools-events.md
232+
[style-loader]: https://webpack.js.org/loaders/style-loader/
233+
[Webpack]: https://webpack.js.org/

articles/batch/batch-account-create-portal.md

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
title: Create a Batch account in the Azure portal
33
description: Learn how to use the Azure portal to create and manage an Azure Batch account for running large-scale parallel workloads in the cloud.
44
ms.topic: how-to
5-
ms.date: 04/03/2023
5+
ms.date: 07/18/2023
66
ms.custom: subject-rbac-steps, devx-track-linux
77
---
88

@@ -120,12 +120,13 @@ For detailed steps, see [Assign Azure roles by using the Azure portal](../role-b
120120

121121
### Create a key vault
122122

123-
User subscription mode requires [Azure Key Vault](/azure/key-vault/general/overview). The key vault must be in the same subscription and region as the Batch account.
123+
User subscription mode requires [Azure Key Vault](/azure/key-vault/general/overview). The key vault must be in the same subscription and region as the Batch account and use a [Vault Access Policy](/azure/key-vault/general/assign-access-policy).
124124

125125
To create a new key vault:
126126

127127
1. Search for and select **key vaults** from the Azure Search box, and then select **Create** on the **Key vaults** page.
128128
1. On the **Create a key vault** page, enter a name for the key vault, and choose an existing resource group or create a new one in the same region as your Batch account.
129+
1. On the **Access configuration** tab, select **Vault access policy** under **Permission model**.
129130
1. Leave the remaining settings at default values, select **Review + create**, and then select **Create**.
130131

131132
### Create a Batch account in user subscription mode

articles/private-link/private-endpoint-dns.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -81,7 +81,7 @@ For Azure services, use the recommended zone names as described in the following
8181
| Azure Relay (Microsoft.Relay/namespaces) / namespace | privatelink.servicebus.windows.net | servicebus.windows.net |
8282
| Azure Event Grid (Microsoft.EventGrid/topics) / topic | privatelink.eventgrid.azure.net | eventgrid.azure.net |
8383
| Azure Event Grid (Microsoft.EventGrid/domains) / domain | privatelink.eventgrid.azure.net | eventgrid.azure.net |
84-
| Azure Web Apps (Microsoft.Web/sites) / sites | privatelink.azurewebsites.net </br> scm.privatelink.azurewebsites.net | azurewebsites.net </br> scm.azurewebsites.net |
84+
| Azure Web Apps - Azure Function Apps (Microsoft.Web/sites) / sites | privatelink.azurewebsites.net </br> scm.privatelink.azurewebsites.net | azurewebsites.net </br> scm.azurewebsites.net |
8585
| Azure Machine Learning (Microsoft.MachineLearningServices/workspaces) / amlworkspace | privatelink.api.azureml.ms<br/>privatelink.notebooks.azure.net | api.azureml.ms<br/>notebooks.azure.net<br/>instances.azureml.ms<br/>aznbcontent.net<br/>inference.ml.azure.com |
8686
| SignalR (Microsoft.SignalRService/SignalR) / signalR | privatelink.service.signalr.net | service.signalr.net |
8787
| Azure Monitor (Microsoft.Insights/privateLinkScopes) / azuremonitor | privatelink.monitor.azure.com<br/> privatelink.oms.opinsights.azure.com <br/> privatelink.ods.opinsights.azure.com <br/> privatelink.agentsvc.azure-automation.net <br/> privatelink.blob.core.windows.net | monitor.azure.com<br/> oms.opinsights.azure.com<br/> ods.opinsights.azure.com<br/> agentsvc.azure-automation.net <br/> blob.core.windows.net |

articles/synapse-analytics/sql/develop-tables-cetas.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@ For dedicated SQL pool, CETAS usage and syntax, check the [CREATE EXTERNAL TABLE
2929

3030
When using serverless SQL pool, CETAS is used to create an external table and export query results to Azure Storage Blob or Azure Data Lake Storage Gen2.
3131

32-
For complete syntax, refer to [CREATE EXTERNAL TABLE AS SELECT (Transact-SQL)](/sql/t-sql/statements/create-external-data-source-transact-sql?view=azure-sqldw-latest&preserve-view=true).
32+
For complete syntax, refer to [CREATE EXTERNAL TABLE AS SELECT (Transact-SQL)](/sql/t-sql/statements/create-external-table-as-select-transact-sql).
3333

3434
## Examples
3535

0 commit comments

Comments
 (0)