Skip to content

Commit 8559920

Browse files
authored
Merge pull request #241907 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 019b001 + bf2a36e commit 8559920

28 files changed

+262
-67
lines changed

articles/active-directory/cloud-infrastructure-entitlement-management/onboard-gcp.md

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -55,7 +55,7 @@ There are several moving parts across GCP and Azure, which are required to be co
5555
> 1. Return to the Permissions Management window, and in the **Permissions Management Onboarding - Azure AD OIDC App Creation**, select **Next**.
5656
5757
### 2. Set up a GCP OIDC project.
58-
1. In the **Permissions Management Onboarding - GCP OIDC Account Details & IDP Access** page, enter the **OIDC Project ID** and **OIDC Project Number** of the GCP project in which the OIDC provider and pool will be created. You can change the role name to your requirements.
58+
1. In the **Permissions Management Onboarding - GCP OIDC Account Details & IDP Access** page, enter the **OIDC Project Number** and **OIDC Project ID**of the GCP project in which the OIDC provider and pool will be created. You can change the role name to your requirements.
5959

6060
> [!NOTE]
6161
> You can find the **Project number** and **Project ID** of your GCP project on the GCP **Dashboard** page of your project in the **Project info** panel.
@@ -64,8 +64,9 @@ There are several moving parts across GCP and Azure, which are required to be co
6464

6565
Optionally, specify **G-Suite IDP Secret Name** and **G-Suite IDP User Email** to enable G-Suite integration.
6666

67-
You can either download and run the script at this point or you can do it in the Google Cloud Shell.
68-
1. Select **Next**.
67+
1. You can either download and run the script at this point or you can run it in the Google Cloud Shell.
68+
69+
1. Select **Next** after sucessfully running the setup script.
6970

7071
Choose from 3 options to manage GCP projects.
7172

articles/active-directory/develop/active-directory-v2-protocols.md

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ Four parties are generally involved in an OAuth 2.0 and OpenID Connect authentic
2424

2525
![Diagram showing the OAuth 2.0 roles](./media/v2-flows/protocols-roles.svg)
2626

27-
* **Authorization server** - The identity platform is the authorization server. Also called an *identity provider* or *IdP*, it securely handles the end-user's information, their access, and the trust relationships between the parties in the auth flow. The authorization server issues the security tokens your apps and APIs use for granting, denying, or revoking access to resources (authorization) after the user has signed in (authenticated).
27+
* **Authorization server** - The Microsoft identity platform is the authorization server. Also called an *identity provider* or *IdP*, it securely handles the end-user's information, their access, and the trust relationships between the parties in the auth flow. The authorization server issues the security tokens your apps and APIs use for granting, denying, or revoking access to resources (authorization) after the user has signed in (authenticated).
2828

2929
* **Client** - The client in an OAuth exchange is the application requesting access to a protected resource. The client could be a web app running on a server, a single-page web app running in a user's web browser, or a web API that calls another web API. You'll often see the client referred to as *client application*, *application*, or *app*.
3030

@@ -34,7 +34,7 @@ Four parties are generally involved in an OAuth 2.0 and OpenID Connect authentic
3434

3535
## Tokens
3636

37-
The parties in an authentication flow use **bearer tokens** to assure, verify, and authenticate a principal (user, host, or service) and to grant or deny access to protected resources (authorization). Bearer tokens in the identity platform are formatted as [JSON Web Tokens](https://tools.ietf.org/html/rfc7519) (JWT).
37+
The parties in an authentication flow use **bearer tokens** to assure, verify, and authenticate a principal (user, host, or service) and to grant or deny access to protected resources (authorization). Bearer tokens in the Microsoft identity platform are formatted as [JSON Web Tokens](https://tools.ietf.org/html/rfc7519) (JWT).
3838

3939
Three types of bearer tokens are used by the identity platform as *security tokens*:
4040

@@ -46,7 +46,7 @@ Three types of bearer tokens are used by the identity platform as *security toke
4646

4747
## App registration
4848

49-
Your client app needs a way to trust the security tokens issued to it by the identity platform. The first step in establishing trust is by [registering your app](quickstart-register-app.md). When you register your app, the identity platform automatically assigns it some values, while others you configure based on the application's type.
49+
Your client app needs a way to trust the security tokens issued to it by the Microsoft identity platform. The first step in establishing trust is by [registering your app](quickstart-register-app.md). When you register your app, the identity platform automatically assigns it some values, while others you configure based on the application's type.
5050

5151
Two of the most commonly referenced app registration settings are:
5252

@@ -57,7 +57,7 @@ Your app's registration also holds information about the authentication and auth
5757

5858
## Endpoints
5959

60-
The identity platform offers authentication and authorization services using standards-compliant implementations of OAuth 2.0 and OpenID Connect (OIDC) 1.0. Standards-compliant authorization servers like the identity platform provide a set of HTTP endpoints for use by the parties in an auth flow to execute the flow.
60+
The Microsoft identity platform offers authentication and authorization services using standards-compliant implementations of OAuth 2.0 and OpenID Connect (OIDC) 1.0. Standards-compliant authorization servers like the identity platform provide a set of HTTP endpoints for use by the parties in an auth flow to execute the flow.
6161

6262
The endpoint URIs for your app are generated automatically when you register or configure your app. The endpoints you use in your app's code depend on the application's type and the identities (account types) it should support.
6363

@@ -89,7 +89,7 @@ Next, learn about the OAuth 2.0 authentication flows used by each application ty
8989
* [Authentication flows and application scenarios](authentication-flows-app-scenarios.md)
9090
* [Microsoft Authentication Library (MSAL)](msal-overview.md)
9191

92-
**We strongly advise against crafting your own library or raw HTTP calls to execute authentication flows.** A [Microsoft Authentication Library](reference-v2-libraries.md) is safer and easier. However, if your scenario prevents you from using our libraries or you'd just like to learn more about the identity platform's implementation, we have protocol reference:
92+
**We strongly advise against crafting your own library or raw HTTP calls to execute authentication flows.** A [Microsoft Authentication Library](reference-v2-libraries.md) is safer and easier. However, if your scenario prevents you from using our libraries or you'd just like to learn more about the Microsoft identity platform's implementation, we have protocol reference:
9393

9494
* [Authorization code grant flow](v2-oauth2-auth-code-flow.md) - Single-page apps (SPA), mobile apps, native (desktop) applications
9595
* [Client credentials flow](v2-oauth2-client-creds-grant-flow.md) - Server-side processes, scripts, daemons

articles/aks/tutorial-kubernetes-prepare-app.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -86,7 +86,7 @@ azure-voting-app-redis
8686
The following command uses the sample `docker-compose.yaml` file to create the container image, download the Redis image, and start the application.
8787

8888
```console
89-
docker-compose up -d
89+
docker compose up -d
9090
```
9191

9292
When completed, use the [`docker images`][docker-images] command to see the created images. Two images are downloaded or created. The *azure-vote-front* image contains the front-end application. The *redis* image is used to start a Redis instance.
@@ -121,7 +121,7 @@ Now that the application's functionality has been validated, the running contain
121121
To stop and remove the container instances and resources, use the [`docker-compose down`][docker-compose-down] command.
122122

123123
```console
124-
docker-compose down
124+
docker compose down
125125
```
126126

127127
When the local application has been removed, you have a Docker image that contains the Azure Vote application, *azure-vote-front*, to use in the next tutorial.

articles/api-management/api-management-configuration-repository-git.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -265,7 +265,7 @@ The `apis` folder contains a folder for each API in the service instance, which
265265
* `apis\<api name>\operations\` - Folder containing `<operation name>.description.html` files that map to the operations in the API. Each file contains the description of a single operation in the API, which maps to the `description` property of the [operation entity](/rest/api/apimanagement/current-ga/operation) in the REST API.
266266

267267
### apiVersionSets folder
268-
The `apiVerionSets` folder contains a folder for each API version set created for an API, and contains the following items.
268+
The `apiVersionSets` folder contains a folder for each API version set created for an API, and contains the following items.
269269

270270
* `apiVersionSets\<api version set Id>\configuration.json` - Configuration for the version set. This is the same information that would be returned if you were to call the [Get a specific version set](/rest/api/apimanagement/current-ga/api-version-set/get) operation.
271271

articles/api-management/api-management-howto-mutual-certificates-for-clients.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -71,7 +71,7 @@ You can also create policy expressions with the [`context` variable](api-managem
7171

7272
> [!IMPORTANT]
7373
> * Starting May 2021, the `context.Request.Certificate` property only requests the certificate when the API Management instance's [`hostnameConfiguration`](/rest/api/apimanagement/current-ga/api-management-service/create-or-update#hostnameconfiguration) sets the `negotiateClientCertificate` property to True. By default, `negotiateClientCertificate` is set to False.
74-
> * If TLS renegotiation is disabled in your client, you may see TLS errors when requesting the certificate using the `context.Request.Certificate` property. If this occurs, enable TLS renegotation settings in the client.
74+
> * If TLS renegotiation is disabled in your client, you may see TLS errors when requesting the certificate using the `context.Request.Certificate` property. If this occurs, enable TLS renegotiation settings in the client.
7575
7676
### Checking the issuer and subject
7777

articles/api-management/api-management-template-resources.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -476,7 +476,7 @@ The following localization options are supported:
476476
|ValidationErrorCredentialsInvalid|Email or password is invalid. Please correct the errors and try again.|
477477
|WebAuthenticationRequestIsNotValid|Request is not valid|
478478
|WebAuthenticationUserIsNotConfirm|Please confirm your registration before attempting to sign in.|
479-
|WebAuthenticationInvalidEmailFormated|Email is invalid: {0}|
479+
|WebAuthenticationInvalidEmailFormatted|Email is invalid: {0}|
480480
|WebAuthenticationUserNotFound|User not found|
481481
|WebAuthenticationTenantNotRegistered|Your account belongs to an Azure Active Directory tenant which is not authorized to access this portal.|
482482
|WebAuthenticationAuthenticationFailed|Authentication has failed.|

articles/api-management/import-logic-app-as-api.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@ In this article, you learn how to:
2727
> - Test the API in the Azure portal
2828
2929
> [!NOTE]
30-
> API Management supports automated import of a Logic App (Consumption) resource. which runs in the multi-tenant Logic Apps environment. Learn more about [single-tenant versus muti-tenant Logic Apps](../logic-apps/single-tenant-overview-compare.md).
30+
> API Management supports automated import of a Logic App (Consumption) resource. which runs in the multi-tenant Logic Apps environment. Learn more about [single-tenant versus multi-tenant Logic Apps](../logic-apps/single-tenant-overview-compare.md).
3131
3232
## Prerequisites
3333

articles/api-management/json-to-xml-policy.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ The `json-to-xml` policy converts a request or response body from JSON to XML.
2323
consider-accept-header="true | false"
2424
parse-date="true | false"
2525
namespace-separator="separator character"
26-
namespace-prefix="namepsace prefix"
26+
namespace-prefix="namespace prefix"
2727
attribute-block-name="name" />
2828
```
2929

articles/api-management/sap-api.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -63,7 +63,7 @@ In this article, you'll:
6363
1. From the side navigation menu, under the **APIs** section, select **APIs**.
6464
1. Under **Create a new definition**, select **OpenAPI specification**.
6565

66-
:::image type="content" source="./media/import-api-from-oas/oas-api.png" alt-text="OpenAPI specifiction":::
66+
:::image type="content" source="./media/import-api-from-oas/oas-api.png" alt-text="OpenAPI specification":::
6767

6868
1. Click **Select a file**, and select the `openapi-spec.json` file that you saved locally in a previous step.
6969

articles/azure-maps/creator-qgis-plugin.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
---
2-
title: View and edit data with the Azure Maps QGIS plugin
2+
title: Work with datasets using the QGIS plugin
33
titleSuffix: Microsoft Azure Maps Creator
44
description: How to view and edit indoor map data using the Azure Maps QGIS plugin
55
author: brendansco

0 commit comments

Comments
 (0)