Skip to content

Commit ca51012

Browse files
authored
Merge pull request #245575 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 3cdab11 + 1aca57e commit ca51012

File tree

22 files changed

+160
-112
lines changed

22 files changed

+160
-112
lines changed

articles/active-directory-b2c/authorization-code-flow.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -124,7 +124,7 @@ grant_type=authorization_code&client_id=90c0fe63-bcf2-44d5-8fb7-b8bbc0b29dc6&sco
124124
| client_id |Required |The application ID assigned to your app in the [Azure portal](https://portal.azure.com).|
125125
| client_secret | Yes, in Web Apps | The application secret that was generated in the [Azure portal](https://portal.azure.com/). Client secrets are used in this flow for Web App scenarios, where the client can securely store a client secret. For Native App (public client) scenarios, client secrets cannot be securely stored, and therefore are not used in this call. If you use a client secret, please change it on a periodic basis. |
126126
| grant_type |Required |The type of grant. For the authorization code flow, the grant type must be `authorization_code`. |
127-
| scope |Required |A space-separated list of scopes. A single scope value indicates to Azure AD both of the permissions that are being requested. Using the client ID as the scope indicates that your app needs an access token that can be used against your own service or web API, represented by the same client ID. The `offline_access` scope indicates that your app needs a refresh token for long-lived access to resources. You also can use the `openid` scope to request an ID token from Azure AD B2C. |
127+
| scope |Recommended |A space-separated list of scopes. A single scope value indicates to Azure AD both of the permissions that are being requested. Using the client ID as the scope indicates that your app needs an access token that can be used against your own service or web API, represented by the same client ID. The `offline_access` scope indicates that your app needs a refresh token for long-lived access to resources. You also can use the `openid` scope to request an ID token from Azure AD B2C. |
128128
| code |Required |The authorization code that you acquired in from the `/authorize` endpoint. |
129129
| redirect_uri |Required |The redirect URI of the application where you received the authorization code. |
130130
| code_verifier | recommended | The same `code_verifier` used to obtain the authorization code. Required if PKCE was used in the authorization code grant request. For more information, see the [PKCE RFC](https://tools.ietf.org/html/rfc7636). |

articles/active-directory/cloud-infrastructure-entitlement-management/ui-triggers.md

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -31,6 +31,9 @@ This article describes how to use the **Alerts** dashboard in Permissions Manage
3131

3232
- **Alerts**
3333
- **Alert Triggers**
34+
35+
- Select the **Authorization system**(s) and/or **folder**(s) to display alerts and alert triggers in scope of the selected view.
36+
- Alert triggers are based on data collected. All alerts, if triggered, are shown every hour under the Alerts subtab.
3437

3538
## View information about alerts
3639

@@ -55,7 +58,6 @@ The **Rule-Based Anomaly** tab and the **Statistical Anomaly** tab both have one
5558
- **Columns**: Select the columns you want to display: **Task**, **Resource**, and **Identity**.
5659
- To return to the system default settings, select **Reset to default**.
5760

58-
Alert triggers are based on data collected. All alerts, if triggered, are shown every hour under the Alerts subtab.
5961

6062

6163
## View information about alert triggers

articles/active-directory/saas-apps/confluencemicrosoft-tutorial.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -60,7 +60,7 @@ As of now, following versions of Confluence are supported:
6060

6161
- Confluence: 5.0 to 5.10
6262
- Confluence: 6.0.1 to 6.15.9
63-
- Confluence: 7.0.1 to 8.3.0
63+
- Confluence: 7.0.1 to 8.0.4
6464

6565
> [!NOTE]
6666
> Please note that our Confluence Plugin also works on Ubuntu Version 16.04

articles/active-directory/saas-apps/ms-confluence-jira-plugin-adminguide.md

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -64,7 +64,7 @@ The plug-in supports the following versions of Jira and Confluence:
6464
* JIRA also supports 5.2. For more details, click [Microsoft Azure Active Directory single sign-on for JIRA 5.2](./jira52microsoft-tutorial.md).
6565
* Confluence: 5.0 to 5.10.
6666
* Confluence: 6.0.1 to 6.15.9.
67-
* Confluence: 7.0.1 to 8.3.0.
67+
* Confluence: 7.0.1 to 8.0.4.
6868

6969
## Installation
7070

@@ -148,7 +148,7 @@ Confluence:
148148

149149
|Plugin Version | Release Notes | Supported JIRA versions |
150150
|-----------------|-------------------------------------------------------------------------------------------|-------------------------------------|
151-
| 6.3.9 | Bug Fixes: | Confluence Server: 7.20.3 to 8.3.0 |
151+
| 6.3.9 | Bug Fixes: | Confluence Server: 7.20.3 to 8.0.4 |
152152
| | System Error: Metadata link cannot be configured on SSO plugins. | |
153153
| | | |
154154
| 6.3.8 | New Feature: | Confluence Server: 5.0 to 7.20.1 |
@@ -212,7 +212,7 @@ The plug-in supports these versions:
212212
* JIRA also supports 5.2. For more details, click [Microsoft Azure Active Directory single sign-on for JIRA 5.2](./jira52microsoft-tutorial.md).
213213
* Confluence: 5.0 to 5.10.
214214
* Confluence: 6.0.1 to 6.15.9.
215-
* Confluence: 7.0.1 to 8.3.0.
215+
* Confluence: 7.0.1 to 8.0.4.
216216

217217
### Is the plug-in free or paid?
218218

articles/ai-services/document-intelligence/faq.yml

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -445,6 +445,12 @@ sections:
445445
446446
- Switching subscriptions or resources can be done under Settings -> Resource tab.
447447
448+
- question: |
449+
Why am I receiving an AuthorizationFailure error on Auto Label or OCR Upgrade when my Storage Account is configured with a firewall?
450+
answer: |
451+
452+
Please add our website IP address, 20.3.165.95, to the allowlist of firewall. This is Document Intelligence Studio's dedicated IP address and can be safely allowed.
453+
448454
- name: Containers
449455
questions:
450456
- question: |

articles/azure-maps/power-bi-visual-show-real-time-traffic.md

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,18 +1,18 @@
11
---
22
title: Show real-time traffic on an Azure Maps Power BI visual
33
titleSuffix: Microsoft Azure Maps
4-
description: In this article, you will learn how to show real-time traffic on an Azure Maps Power BI visual.
4+
description: This article demonstrates how to show real-time traffic on an Azure Maps Power BI visual.
55
author: deniseatmicrosoft
66
ms.author: limingchen
7-
ms.date: 11/29/2021
7+
ms.date: 07/18/2023
88
ms.topic: how-to
99
ms.service: azure-maps
1010
services: azure-maps
1111
---
1212

1313
# Show real-time traffic
1414

15-
The traffic layer feature overlays real-time traffic data on top of the map. To enable this feature, move the **Traffic layer** slider in the **Format** pane to the **On** position. This will overlay traffic flow data as color coded roads.
15+
The traffic layer feature overlays real-time traffic data on top of the map. To enable this feature, move the **Traffic layer** slider in the **Format** pane to the **On** position. This overlays traffic flow data as color coded roads.
1616

1717
:::image type="content" source="media/power-bi-visual/traffic-layer.png" alt-text="A map displaying real-time traffic data.":::
1818

articles/azure-maps/power-bi-visual-understanding-layers.md

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,10 @@
11
---
22
title: Layers in an Azure Maps Power BI visual
3-
titleSuffix: Microsoft Azure Maps
4-
description: In this article, you will learn about the different layers available in an Azure Maps Power BI visual.
3+
titleSuffix: Microsoft Azure Maps Power BI visual
4+
description: This article describes the different layers available in an Azure Maps Power BI visual.
55
author: deniseatmicrosoft
66
ms.author: limingchen
7-
ms.date: 11/29/2021
7+
ms.date: 07/19/2023
88
ms.topic: how-to
99
ms.service: azure-maps
1010
services: azure-maps
@@ -74,21 +74,21 @@ The second type of layer connects addition external sources of data to map to pr
7474
:::column-end:::
7575
:::row-end:::
7676

77-
All the data rendering layers, as well as the **Tile layer**, have options for min and max zoom levels that are used to specify a zoom level range these layers should be displayed at. This allows one type of rendering layer to be used at one zoom level and a transition to another rendering layer at another zoom level.
77+
All the data rendering layers and the **Tile layer**, have options for min and max zoom levels that are used to specify a zoom level range these layers should be displayed at. These options allow one type of rendering layer to be used at one zoom level and a transition to another rendering layer at another zoom level.
7878

79-
These layers also have an option to be positioned relative to other layers in the map. When multiple data rendering layers are used, the order in which they are added to the map determines their relative layering order when they have the same **Layer position** value.
79+
These layers can also be positioned relative to other layers in the map. When multiple data rendering layers are used, the order in which they're added to the map determines their relative layering order when they have the same **Layer position** value.
8080

8181
## General layer settings
8282

8383
The general layer section of the **Format** pane are common settings that apply to the layers that are connected to the Power BI dataset in the **Fields** pane (Bubble layer, 3D column layer).
8484

85-
| Setting | Description |
86-
|-------------|---------------|
87-
| Unselected transparency | The transparency of shapes that are not selected, when one or more shapes are selected. |
88-
| Show zeros | Specifies if points that have a size value of zero should be shown on the map using the minimum radius. |
89-
| Show negatives | Specifies if absolute value of negative size values should be plotted. |
90-
| Min data value | The minimum value of the input data to scale against. Good for clipping outliers. |
91-
| Max data value | The maximum value of the input data to scale against. Good for clipping outliers. |
85+
| Setting | Description |
86+
|----------------|----------------------------------------|
87+
| Unselected transparency | The transparency of shapes that aren't selected, when one or more shapes are selected. |
88+
| Show zeros | Specifies if points that have a size value of zero should be shown on the map using the minimum radius. |
89+
| Show negatives | Specifies if absolute value of negative size values should be plotted. |
90+
| Min data value | The minimum value of the input data to scale against. Good for clipping outliers. |
91+
| Max data value | The maximum value of the input data to scale against. Good for clipping outliers. |
9292

9393
## Next steps
9494

articles/azure-maps/quick-android-map.md

Lines changed: 33 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -24,9 +24,9 @@ This article shows you how to add the Azure Maps to an Android app. It walks you
2424

2525
## Prerequisites
2626

27-
1. A subscription to [Microsoft Azure](https://azure.microsoft.com). If you don't have an Azure subscription, [create a free account](https://azure.microsoft.com/free/) before you begin.
27+
1. A subscription to [Microsoft Azure]. If you don't have an Azure subscription, [create a free account] before you begin.
2828

29-
1. [Android Studio](https://developer.android.com/studio/). If you don't have Android Studio, you can get it for free from Google.
29+
1. [Android Studio]. If you don't have Android Studio, you can get it for free from Google.
3030

3131
> [!NOTE]
3232
> Many of the instructions in this quickstart were created using Android Studio Arctic Fox (2020.3.1). If you use a different version of Android Studio, the steps specific to Android Studio may vary.
@@ -35,7 +35,7 @@ This article shows you how to add the Azure Maps to an Android app. It walks you
3535

3636
Create a new Azure Maps account using the following steps:
3737

38-
1. In the upper left-hand corner of the [Azure portal](https://portal.azure.com), select **Create a resource**.
38+
1. In the upper left-hand corner of the [Azure portal], select **Create a resource**.
3939
2. In the *Search the Marketplace* box, type **Azure Maps**, then select **Azure Maps** from the search results.
4040
3. Select the **Create** button.
4141
4. On the **Create Maps Account** page, enter the following values:
@@ -58,7 +58,7 @@ Once your Azure Maps account is successfully created, retrieve the subscription
5858
3. Copy the **Primary Key** and save it locally to use later in this tutorial.
5959

6060
>[!NOTE]
61-
> For security purposes, it is recommended that you rotate between your primary and secondary keys. To rotate keys, update your app to use the secondary key, deploy, then press the cycle/refresh button beside the primary key to generate a new primary key. The old primary key will be disabled. For more information on key rotation, see [Set up Azure Key Vault with key rotation and auditing](../key-vault/secrets/tutorial-rotation-dual.md)
61+
> For security purposes, it is recommended that you rotate between your primary and secondary keys. To rotate keys, update your app to use the secondary key, deploy, then press the cycle/refresh button beside the primary key to generate a new primary key. The old primary key will be disabled. For more information on key rotation, see [Set up Azure Key Vault with key rotation and auditing].
6262
6363
:::image type="content" source="./media/quick-android-map/get-key.png" alt-text="A screenshot showing the Azure Maps Primary key in the Azure portal.":::
6464

@@ -76,15 +76,15 @@ Complete the following steps to create a new project with an empty activity in A
7676

7777
:::image type="content" source="./media/quick-android-map/3-empty-activity.png" alt-text="A screenshot that shows the Create an Empty Activity screen in Android Studio.":::
7878

79-
1. In the **Empty Activity** screen you'll need to enter values for the following fields:
79+
1. In the **Empty Activity** screen, enter values for the following fields:
8080
* **Name**. Enter **AzureMapsApp**.
8181
* **Package name**. Use the default **com.example.azuremapsapp**.
8282
* **Save location**. Use the default or select a new location to save your project files. Avoid using spaces in the path or filename due to potential problems with the NDK tools.
8383
* **Language**. Select Kotlin or Java.
8484
* **Minimum SDK**. Select `API 21: Android 5.0.0 (Lollipop)` as the minimum SDK. It's the earliest version supported by the Azure Maps Android SDK.
8585
1. Select **Finish** to create your new project.
8686

87-
See the [Android Studio documentation](https://developer.android.com/studio/intro/) for more help with installing Android Studio and creating a new project.
87+
See the [Android Studio documentation] for more help with installing Android Studio and creating a new project.
8888

8989
## Set up a virtual device
9090

@@ -96,7 +96,7 @@ To set up an Android Virtual Device (AVD):
9696
1. The **Android Virtual Device Manager** appears. Select **Create Virtual Device**.
9797
1. In the **Phones** category, select **Nexus 5X**, and then select **Next**.
9898

99-
You can learn more about setting up an AVD in the [Android Studio documentation](https://developer.android.com/studio/run/managing-avds).
99+
For more information about setting up an AVD, see [Create and manage virtual devices] in the Android Studio documentation.
100100

101101
:::image type="content" source="./media/quick-android-map/4-avd-select-hardware.png" alt-text="A screenshot that shows the Select Hardware screen in Android Virtual Device Manager when creating a new Virtual Device.":::
102102

@@ -121,14 +121,13 @@ The next step in building your application is to install the Azure Maps Android
121121
:::image type="content" source="./media/quick-android-map/project-settings-file.png" alt-text="A screenshot of the project settings file in Android Studio.":::
122122
123123
3. Open the project's **gradle.properties** file, verify that `android.useAndroidX` and `android.enableJetifier` are both set to `true`.
124-
124+
125125
If the **gradle.properties** file doesn't include `android.useAndroidX` and `android.enableJetifier`, add the next two lines to the end of the file:
126-
126+
127127
```gradle
128128
android.useAndroidX=true
129129
android.enableJetifier=true
130130
```
131-
132131

133132
4. Open the application **build.gradle** file and do the following:
134133

@@ -169,7 +168,7 @@ The next step in building your application is to install the Azure Maps Android
169168
170169
::: zone pivot="programming-language-java-android"
171170
172-
6. In the **MainActivity.java** file you'll need to:
171+
6. In the **MainActivity.java** file:
173172
174173
* Add imports for the Azure Maps SDK.
175174
* Set your Azure Maps authentication information.
@@ -277,7 +276,7 @@ The next step in building your application is to install the Azure Maps Android
277276
278277
::: zone pivot="programming-language-kotlin"
279278
280-
7. In the **MainActivity.kt** file you'll need to:
279+
7. In the **MainActivity.kt** file:
281280
282281
* add imports for the Azure Maps SDK
283282
* set your Azure Maps authentication information
@@ -397,7 +396,7 @@ Android Studio takes a few seconds to build the application. After the build is
397396
## Clean up resources
398397
399398
>[!WARNING]
400-
> The tutorials listed in the [Next Steps](#next-steps) section detail how to use and configure Azure Maps with your account. Don't clean up the resources created in this quickstart if you plan to continue to the tutorials.
399+
> The tutorials listed in the [Next Steps] section detail how to use and configure Azure Maps with your account. Don't clean up the resources created in this quickstart if you plan to continue to the tutorials.
401400
402401
If you don't plan to continue to the tutorials, take these steps to clean up the resources:
403402
@@ -412,15 +411,30 @@ If you don't plan on continuing to develop with the Azure Maps Android SDK:
412411
413412
For more code examples, see these guides:
414413
415-
* [Manage authentication in Azure Maps](how-to-manage-authentication.md)
416-
* [Change map styles in Android maps](set-android-map-styles.md)
417-
* [Add a symbol layer](how-to-add-symbol-to-android-map.md)
418-
* [Add a line layer](android-map-add-line-layer.md)
419-
* [Add a polygon layer](how-to-add-shapes-to-android-map.md)
414+
* [Manage authentication in Azure Maps]
415+
* [Change map styles in Android maps]
416+
* [Add a symbol layer]
417+
* [Add a line layer]
418+
* [Add a polygon layer]
420419
421420
## Next steps
422421
423422
In this quickstart, you created your Azure Maps account and created a demo application. Take a look at the following tutorial to learn more about Azure Maps:
424423
425424
> [!div class="nextstepaction"]
426-
> [Load GeoJSON data into Azure Maps](tutorial-load-geojson-file-android.md)
425+
> [Tutorial: Load GeoJSON data into Azure Maps Android SDK]
426+
427+
[Add a line layer]: android-map-add-line-layer.md
428+
[Add a polygon layer]: how-to-add-shapes-to-android-map.md
429+
[Add a symbol layer]: how-to-add-symbol-to-android-map.md
430+
[Android Studio documentation]: https://developer.android.com/studio/intro
431+
[Android Studio]: https://developer.android.com/studio
432+
[Azure portal]: https://portal.azure.com
433+
[Change map styles in Android maps]: set-android-map-styles.md
434+
[create a free account]: https://azure.microsoft.com/free
435+
[Create and manage virtual devices]: https://developer.android.com/studio/run/managing-avds
436+
[Manage authentication in Azure Maps]: how-to-manage-authentication.md
437+
[Microsoft Azure]: https://azure.microsoft.com
438+
[Next Steps]: #next-steps
439+
[Set up Azure Key Vault with key rotation and auditing]: ../key-vault/secrets/tutorial-rotation-dual.md
440+
[Tutorial: Load GeoJSON data into Azure Maps Android SDK]: tutorial-load-geojson-file-android.md

0 commit comments

Comments
 (0)