Skip to content

Commit 9a7950d

Browse files
Merge pull request #232509 from MicrosoftDocs/repo_sync_working_branch
Resolve syncing conflicts from repo_sync_working_branch to main
2 parents 24dabf2 + 8bb2a26 commit 9a7950d

22 files changed

+81
-56
lines changed

articles/active-directory/develop/v2-oauth2-client-creds-grant-flow.md

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -149,7 +149,7 @@ After you've acquired the necessary authorization for your application, proceed
149149

150150
```HTTP
151151
POST /{tenant}/oauth2/v2.0/token HTTP/1.1 //Line breaks for clarity
152-
Host: login.microsoftonline.com
152+
Host: login.microsoftonline.com:443
153153
Content-Type: application/x-www-form-urlencoded
154154
155155
client_id=535fb089-9ff3-47b6-9bfb-4f1264799865
@@ -175,7 +175,7 @@ curl -X POST -H "Content-Type: application/x-www-form-urlencoded" -d 'client_id=
175175

176176
```HTTP
177177
POST /{tenant}/oauth2/v2.0/token HTTP/1.1 // Line breaks for clarity
178-
Host: login.microsoftonline.com
178+
Host: login.microsoftonline.com:443
179179
Content-Type: application/x-www-form-urlencoded
180180
181181
scope=https%3A%2F%2Fgraph.microsoft.com%2F.default
@@ -200,7 +200,7 @@ The parameters for the certificate-based request differ in only one way from the
200200

201201
```HTTP
202202
POST /{tenant}/oauth2/v2.0/token HTTP/1.1 // Line breaks for clarity
203-
Host: login.microsoftonline.com
203+
Host: login.microsoftonline.com:443
204204
Content-Type: application/x-www-form-urlencoded
205205
206206
scope=https%3A%2F%2Fgraph.microsoft.com%2F.default
@@ -267,8 +267,8 @@ An error response (400 Bad Request) looks like this:
267267
Now that you've acquired a token, use the token to make requests to the resource. When the token expires, repeat the request to the `/token` endpoint to acquire a fresh access token.
268268

269269
```HTTP
270-
GET /v1.0/users
271-
Host: https://graph.microsoft.com
270+
GET /v1.0/users HTTP/1.1
271+
Host: graph.microsoft.com:443
272272
Authorization: Bearer eyJ0eXAiOiJKV1QiLCJhbGciOiJSUzI1NiIsIng1dCI6Ik5HVEZ2ZEstZnl0aEV1Q...
273273
```
274274
Try the following command in your terminal, ensuring to replace the token with your own.

articles/api-management/api-management-gateways-overview.md

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -74,6 +74,8 @@ The following table compares features available in the managed gateway versus th
7474
| [CA root certificates](api-management-howto-ca-certificates.md) for certificate validation | ✔️ || ✔️<sup>3</sup> |
7575
| [Managed domain certificates](configure-custom-domain.md?tabs=managed#domain-certificate-options) | ✔️ | ✔️ ||
7676
| [TLS settings](api-management-howto-manage-protocols-ciphers.md) | ✔️ | ✔️ | ✔️ |
77+
| **HTTP/2** (Client-to-gateway) ||| ✔️ |
78+
| **HTTP/2** (Gateway-to-backend) ||| ✔️ |
7779

7880
<sup>1</sup> Depends on how the gateway is deployed, but is the responsibility of the customer.<br/>
7981
<sup>2</sup> Connectivity to the self-hosted gateway v2 [configuration endpoint](self-hosted-gateway-overview.md#fqdn-dependencies) requires DNS resolution of the default endpoint hostname; custom domain name is currently not supported.<br/>
@@ -93,7 +95,7 @@ The following table compares features available in the managed gateway versus th
9395
| [Service Fabric](../service-fabric/service-fabric-api-management-overview.md) | Developer, Premium |||
9496
| [Passthrough GraphQL](graphql-api.md) | ✔️ | ✔️<sup>1</sup> ||
9597
| [Synthetic GraphQL](graphql-schema-resolve-api.md) | ✔️ |||
96-
| [Passthrough WebSocket](websocket-api.md) | ✔️ || |
98+
| [Passthrough WebSocket](websocket-api.md) | ✔️ || ✔️ |
9799

98100
<sup>1</sup> GraphQL subscriptions aren't supported in the Consumption tier.
99101

articles/api-management/self-hosted-gateway-overview.md

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -55,9 +55,12 @@ We provide a variety of container images for self-hosted gateways to meet your n
5555
| `v{major}` | Use this tag to always run a major version of the gateway with every new feature and patch. |`v2` | ✔️ ||
5656
| `v{major}-preview` | Use this tag if you always want to run our latest preview container image. | `v2-preview` | ✔️ ||
5757
| `latest` | Use this tag if you want to evaluate the self-hosted gateway. | `latest` | ✔️ ||
58+
| `beta`<sup>1</sup> | Use this tag if you want to evaluate preview versions of the self-hosted gateway. | `beta` | ✔️ ||
5859

5960
You can find a full list of available tags [here](https://mcr.microsoft.com/product/azure-api-management/gateway/tags).
6061

62+
<sup>1</sup>Preview versions are not officially supported and are for experimental purposes only.<br/>
63+
6164
### Use of tags in our official deployment options
6265

6366
Our deployment options in the Azure portal use the `v2` tag that allows customers to use the most recent version of the self-hosted gateway v2 container image with all feature updates and patches.

articles/app-service/overview.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ ms.custom: UpdateFrequency3
1212

1313
*Azure App Service* is an HTTP-based service for hosting web applications, REST APIs, and mobile back ends. You can develop in your favorite language, be it .NET, .NET Core, Java, Ruby, Node.js, PHP, or Python. Applications run and scale with ease on both Windows and [Linux](#app-service-on-linux)-based environments.
1414

15-
App Service not only adds the power of Microsoft Azure to your application, such as security, load balancing, autoscaling, and automated management. You can also take advantage of its DevOps capabilities, such as continuous deployment from Azure DevOps, GitHub, Docker Hub, and other sources, package management, staging environments, custom domain, and TLS/SSL certificates.
15+
App Service adds the power of Microsoft Azure to your application, such as security, load balancing, autoscaling, and automated management. Additionally, you can take advantage of its DevOps capabilities, such as continuous deployment from Azure DevOps, GitHub, Docker Hub, and other sources, package management, staging environments, custom domain, and TLS/SSL certificates.
1616

1717
With App Service, you pay for the Azure compute resources you use. The compute resources you use are determined by the *App Service plan* that you run your apps on. For more information, see [Azure App Service plans overview](overview-hosting-plans.md).
1818

articles/app-service/tutorial-connect-msi-azure-database.md

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -251,8 +251,8 @@ In this section, connectivity to the Azure database in your code follows the `De
251251
1. Instantiate a `DefaultAzureCredential` from the Azure Identity client library. If you're using a user-assigned identity, specify the client ID of the identity.
252252
1. Get an access token for the resource URI respective to the database type.
253253
- For Azure SQL Database: `https://database.windows.net/.default`
254-
- For Azure Database for MySQL: `https://ossrdbms-aad.database.windows.net`
255-
- For Azure Database for PostgreSQL: `https://ossrdbms-aad.database.windows.net`
254+
- For Azure Database for MySQL: `https://ossrdbms-aad.database.windows.net/.default`
255+
- For Azure Database for PostgreSQL: `https://ossrdbms-aad.database.windows.net/.default`
256256
1. Add the token to your connection string.
257257
1. Open the connection.
258258
@@ -319,7 +319,7 @@ For Azure Database for MySQL and Azure Database for PostgreSQL, the database use
319319
//var credential = new DefaultAzureCredential(new DefaultAzureCredentialOptions { ManagedIdentityClientId = '<client-id-of-user-assigned-identity>' }); // user-assigned identity
320320
321321
// Get token for Azure Database for MySQL
322-
var token = credential.GetToken(new Azure.Core.TokenRequestContext(new[] { "https://ossrdbms-aad.database.windows.net" }));
322+
var token = credential.GetToken(new Azure.Core.TokenRequestContext(new[] { "https://ossrdbms-aad.database.windows.net/.default" }));
323323
324324
// Set MySQL user depending on the environment
325325
string user;
@@ -351,7 +351,7 @@ For Azure Database for MySQL and Azure Database for PostgreSQL, the database use
351351
//var credential = new DefaultAzureCredential(new DefaultAzureCredentialOptions { ManagedIdentityClientId = '<client-id-of-user-assigned-identity>' }); // user-assigned identity
352352
353353
// Get token for Azure Database for PostgreSQL
354-
var token = credential.GetToken(new Azure.Core.TokenRequestContext(new[] { "https://ossrdbms-aad.database.windows.net" }));
354+
var token = credential.GetToken(new Azure.Core.TokenRequestContext(new[] { "https://ossrdbms-aad.database.windows.net/.default" }));
355355
356356
// Check if in Azure and set user accordingly
357357
string postgresqlUser;
@@ -431,7 +431,7 @@ For Azure Database for MySQL and Azure Database for PostgreSQL, the database use
431431
//var credential = new DefaultAzureCredential(new DefaultAzureCredentialOptions { ManagedIdentityClientId = '<client-id-of-user-assigned-identity>' }); // user-assigned identity
432432
433433
// Get token for Azure Database for MySQL
434-
var token = credential.GetToken(new Azure.Core.TokenRequestContext(new[] { "https://ossrdbms-aad.database.windows.net" }));
434+
var token = credential.GetToken(new Azure.Core.TokenRequestContext(new[] { "https://ossrdbms-aad.database.windows.net/.default" }));
435435
436436
// Set MySQL user depending on the environment
437437
string user;
@@ -465,7 +465,7 @@ For Azure Database for MySQL and Azure Database for PostgreSQL, the database use
465465
//var credential = new DefaultAzureCredential(new DefaultAzureCredentialOptions { ManagedIdentityClientId = '<client-id-of-user-assigned-identity>' }); // user-assigned identity
466466
467467
// Get token for Azure Database for PostgreSQL
468-
var token = credential.GetToken(new Azure.Core.TokenRequestContext(new[] { "https://ossrdbms-aad.database.windows.net" }));
468+
var token = credential.GetToken(new Azure.Core.TokenRequestContext(new[] { "https://ossrdbms-aad.database.windows.net/.default" }));
469469
470470
// Check if in Azure and set user accordingly
471471
string postgresqlUser;
@@ -563,7 +563,7 @@ For Azure Database for MySQL and Azure Database for PostgreSQL, the database use
563563
//const credential = new DefaultAzureCredential({ managedIdentityClientId: '<client-id-of-user-assigned-identity>' }); // user-assigned identity
564564
565565
// Get token for Azure Database for MySQL
566-
const accessToken = await credential.getToken("https://ossrdbms-aad.database.windows.net");
566+
const accessToken = await credential.getToken("https://ossrdbms-aad.database.windows.net/.default");
567567
568568
// Set MySQL user depending on the environment
569569
if(process.env.IDENTITY_ENDPOINT) {
@@ -617,7 +617,7 @@ For Azure Database for MySQL and Azure Database for PostgreSQL, the database use
617617
//const credential = new DefaultAzureCredential({ managedIdentityClientId: '<client-id-of-user-assigned-identity>' }); // user-assigned identity
618618
619619
// Get token for Azure Database for PostgreSQL
620-
const accessToken = await credential.getToken("https://ossrdbms-aad.database.windows.net");
620+
const accessToken = await credential.getToken("https://ossrdbms-aad.database.windows.net/.default");
621621
622622
// Set PosrgreSQL user depending on the environment
623623
if(process.env.IDENTITY_ENDPOINT) {
@@ -719,7 +719,7 @@ For Azure Database for MySQL and Azure Database for PostgreSQL, the database use
719719
#credential = DefaultAzureCredential(managed_identity_client_id='<client-id-of-user-assigned-identity>') # user-assigned identity
720720
721721
# Get token for Azure Database for MySQL
722-
token = credential.get_token("https://ossrdbms-aad.database.windows.net")
722+
token = credential.get_token("https://ossrdbms-aad.database.windows.net/.default")
723723
724724
# Set MySQL user depending on the environment
725725
if 'IDENTITY_ENDPOINT' in os.environ:
@@ -754,7 +754,7 @@ For Azure Database for MySQL and Azure Database for PostgreSQL, the database use
754754
#credential = DefaultAzureCredential(managed_identity_client_id='<client-id-of-user-assigned-identity>') # user-assigned identity
755755
756756
# Get token for Azure Database for PostgreSQL
757-
token = credential.get_token("https://ossrdbms-aad.database.windows.net")
757+
token = credential.get_token("https://ossrdbms-aad.database.windows.net/.default")
758758
759759
# Set PostgreSQL user depending on the environment
760760
if 'IDENTITY_ENDPOINT' in os.environ:
@@ -884,7 +884,7 @@ For Azure Database for MySQL and Azure Database for PostgreSQL, the database use
884884
885885
// Get the token
886886
TokenRequestContext request = new TokenRequestContext();
887-
request.addScopes("https://ossrdbms-aad.database.windows.net");
887+
request.addScopes("https://ossrdbms-aad.database.windows.net/.default");
888888
AccessToken token=creds.getToken(request).block();
889889
890890
// Set MySQL user depending on the environment
@@ -930,7 +930,7 @@ For Azure Database for MySQL and Azure Database for PostgreSQL, the database use
930930
931931
// Get the token
932932
TokenRequestContext request = new TokenRequestContext();
933-
request.addScopes("https://ossrdbms-aad.database.windows.net");
933+
request.addScopes("https://ossrdbms-aad.database.windows.net/.default");
934934
AccessToken token=creds.getToken(request).block();
935935
936936
// Set PostgreSQL user depending on the environment

articles/azure-maps/drawing-requirements.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -261,7 +261,7 @@ The `unitProperties` object contains a JSON array of unit properties.
261261
| Property | Type | Required | Description |
262262
|-----------|------|----------|-------------|
263263
|`unitName`|string|true|Name of unit to associate with this `unitProperty` record. This record is only valid when a label matching `unitName` is found in the `unitLabel` layers. |
264-
|`categoryName`|string|false|Purpose of the unit. A list of values that the provided rendering styles can make use of is available [here](https://atlas.microsoft.com/sdk/javascript/indoor/0.2/categories.json).|
264+
|`categoryName`|string|false|Purpose of the unit. A list of values that the provided rendering styles can make use of is documented in [categories.json](https://atlas.microsoft.com/sdk/javascript/indoor/0.2/categories.json).|
265265
|`occupants`|array of directoryInfo objects |false |List of occupants for the unit. |
266266
|`nameAlt`|string|false|Alternate name of the unit. |
267267
|`nameSubtitle`|string|false|Subtitle of the unit. |
@@ -279,7 +279,7 @@ The `zoneProperties` object contains a JSON array of zone properties.
279279
| Property | Type | Required | Description |
280280
|-----------|------|----------|-------------|
281281
|zoneName |string |true |Name of zone to associate with `zoneProperty` record. This record is only valid when a label matching `zoneName` is found in the `zoneLabel` layer of the zone. |
282-
|categoryName| string| false |Purpose of the zone. A list of values that the provided rendering styles can make use of is available [here](https://atlas.microsoft.com/sdk/javascript/indoor/0.2/categories.json).|
282+
|categoryName| string| false |Purpose of the zone. A list of values that the provided rendering styles can make use of is documented in [categories.json](https://atlas.microsoft.com/sdk/javascript/indoor/0.2/categories.json).|
283283
|zoneNameAlt| string| false |Alternate name of the zone. |
284284
|zoneNameSubtitle| string | false |Subtitle of the zone. |
285285
|zoneSetId| string | false | Set ID to establish a relationship among multiple zones so that they can be queried or selected as a group. For example, zones that span multiple levels. |

articles/azure-maps/how-to-use-map-control.md

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ ms.custom: devx-track-js
1515

1616
The Map Control client-side JavaScript library allows you to render maps and embedded Azure Maps functionality into your web or mobile application.
1717

18-
This documentation uses the Azure Maps Web SDK, however the Azure Maps services can be used with any map control. [Here](open-source-projects.md#third-part-map-control-plugins) are some popular open-source map controls that the Azure Maps team has created plugin's for.
18+
This article uses the Azure Maps Web SDK, however the Azure Maps services work with any map control. For a list of third-party map control plug-ins, see [Azure Maps community - Open-source projects](open-source-projects.md#third-part-map-control-plugins).
1919

2020
## Prerequisites
2121

@@ -122,7 +122,7 @@ You can embed a map in a web page by using the Map Control client-side JavaScrip
122122
</script>
123123
```
124124

125-
For more information about authentication with Azure Maps, see the [Authentication with Azure Maps](azure-maps-authentication.md) document. Also, a list of samples showing how to integrate Azure Active Directory (AAD) with Azure Maps can be found [here](https://github.com/Azure-Samples/Azure-Maps-AzureAD-Samples).
125+
For more information about authentication with Azure Maps, see the [Authentication with Azure Maps](azure-maps-authentication.md) document. For a list of samples showing how to integrate Azure Active Directory (AAD) with Azure Maps, see [Azure Maps & Azure Active Directory Samples](https://github.com/Azure-Samples/Azure-Maps-AzureAD-Samples) in GitHub.
126126

127127
>[!TIP]
128128
>In this example, we've passed in the `id` of the map `<div>`. Another way to do this is to pass in the `HTMLElement` object by passing`document.getElementById('myMap')` as the first parameter.
@@ -227,7 +227,7 @@ Here is an example of Azure Maps with the language set to "fr-FR" and the region
227227

228228
![Map image showing labels in French](./media/how-to-use-map-control/websdk-localization.png)
229229

230-
A complete list of supported languages and regional views is documented [here](supported-languages.md).
230+
For a list of supported languages and regional views, see [Localization support in Azure Maps](supported-languages.md).
231231

232232
## Azure Government cloud support
233233

articles/azure-maps/map-accessibility.md

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -10,20 +10,20 @@ ms.service: azure-maps
1010

1111
# Building an accessible application
1212

13-
Upwards of 20% of internet users have a need for accessible web applications. As such, it's important to make sure your application is designed such that any user can easily use it. Rather than thinking of accessibility as a set of tasks to complete, think of it as part of your overall user experience. The more accessible your application, the more people who can use it.
13+
Upwards of 20% of internet users have a need for accessible web applications. As such, it's important to make sure your application is designed such that any user can easily use it. Rather than thinking of accessibility as a set of tasks to complete, think of it as part of your overall user experience. The more accessible your application, the more people who can use it.
1414

1515
When it comes to rich interactive content like a map, some common accessibility considerations are:
1616
- Support the screen reader for users who have difficulty seeing the web application.
1717
- Have multiple methods for interacting with and navigating the web application such as mouse, touch, and keyboard.
18-
- Ensure color contrast is such that colors don't blend together and become hard to distinguish from each other.
18+
- Ensure color contrast is such that colors don't blend together and become hard to distinguish from each other.
1919

2020
The Azure Maps Web SDK comes prebuilt with many accessibility features such as:
2121
- Screen reader descriptions when the map moves and when the user focuses on a control or popup.
2222
- Mouse, touch, and keyboard support.
2323
- Accessible color contrast support in the road map style.
2424
- High contrast support.
2525

26-
Full accessibility conformance details for all Microsoft products can be found [here](https://cloudblogs.microsoft.com/industry-blog/government/2018/09/11/accessibility-conformance-reports/). Search for "Azure Maps web" to find the document specifically for the Azure Maps Web SDK.
26+
For accessibility conformance details for all Microsoft products, see [Accessibility Conformance Reports](https://cloudblogs.microsoft.com/industry-blog/government/2018/09/11/accessibility-conformance-reports/). Search for "Azure Maps web" to find the document specifically for the Azure Maps Web SDK.
2727

2828
## Navigating the map
2929

@@ -49,16 +49,16 @@ There are several different ways in which the map can be zoomed, panned, rotated
4949

5050
**Rotate the map**
5151

52-
- Using a mouse, press down with the right mouse button on the map and drag left or right.
52+
- Using a mouse, press down with the right mouse button on the map and drag left or right.
5353
- Using a touch screen, touch the map with two fingers and rotate.
5454
- With the map focused, use the shift key and the left or right arrow keys.
5555
- Using the rotation control with a mouse, touch or keyboard tab/enter keys.
5656

5757
**Pitch the map**
5858

59-
- Using the mouse, press down with the right mouse button on the map and drag up or down.
59+
- Using the mouse, press down with the right mouse button on the map and drag up or down.
6060
- Using a touch screen, touch the map with two fingers and drag them up or down together.
61-
- With the map focused, use the shift key plus the up or down arrow keys.
61+
- With the map focused, use the shift key plus the up or down arrow keys.
6262
- Using the pitch control with a mouse, touch or keyboard tab/enter keys.
6363

6464
## Change the Map Style

0 commit comments

Comments
 (0)