Skip to content

Commit 17449ea

Browse files
authored
Merge pull request #100394 from MicrosoftDocs/repo_sync_working_branch
Confirm merge from repo_sync_working_branch to master to sync with https://github.com/Microsoft/azure-docs (branch master)
2 parents 502ad43 + 1709352 commit 17449ea

File tree

104 files changed

+300
-261
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

104 files changed

+300
-261
lines changed

articles/active-directory-b2c/connect-with-saml-service-providers.md

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -269,7 +269,7 @@ Your custom policy and Azure AD B2C tenant are now ready. Next, create an applic
269269
1. In the left menu, select **Azure AD B2C**. Or, select **All services** and search for and select **Azure AD B2C**.
270270
1. Select **App registrations (Preview)**, and then select **New registration**.
271271
1. Enter a **Name** for the application. For example, *SAMLApp1*.
272-
1. Under **Supported account types**, select **Accounts in any organizational directory or any identity provider.**
272+
1. Under **Supported account types**, select **Accounts in this organizational directory only**
273273
1. Under **Redirect URI**, select **Web**, and then enter `https://localhost`. You modify this value later in the application registration's manifest.
274274
1. Select **Grant admin consent to openid and offline_access permissions**.
275275
1. Select **Register**.
@@ -281,11 +281,11 @@ For SAML apps, there are several properties you need to configure in the applica
281281
1. In the [Azure portal](https://portal.azure.com), navigate to the application registration that you created in the previous section.
282282
1. Under **Manage**, select **Manifest** to open the manifest editor. You modify several properties in the following sections.
283283

284-
#### IdentifierUri
284+
#### identifierUris
285285

286-
The `IdentifierUri` is a string collection containing user-defined URI(s) that uniquely identify a Web app within its Azure AD B2C tenant. The identifier URI must be from a verified domain within your organization's directory. For example, `https://contoso.onmicrosoft.com/app-name`. Your service provider must set this value in the `Issuer` element of a SAML request.
286+
The `identifierUris` is a string collection containing user-defined URI(s) that uniquely identify a Web app within its Azure AD B2C tenant. Your service provider must set this value in the `Issuer` element of a SAML request.
287287

288-
#### SamlMetadataUrl
288+
#### samlMetadataUrl
289289

290290
This property represents service provider's publicly available metadata URL. The metadata URL can point to a metadata file uploaded to any anonymously accessible endpoint, for example blob storage.
291291

@@ -299,7 +299,7 @@ For this tutorial which uses the SAML test application, use the following value
299299
"samlMetadataUrl":"https://samltestapp2.azurewebsites.net/Metadata",
300300
```
301301

302-
#### ReplyUrlWithType (Optional)
302+
#### replyUrlsWithType (Optional)
303303

304304
If you do not provide a metadata URI, you can explicitly specify the reply URL. This optional property represents the `AssertionConsumerServiceUrl` (`SingleSignOnService` URL in the service provider metadata) and the `BindingType` is assumed to be `HTTP POST`.
305305

@@ -316,7 +316,7 @@ For this tutorial, in which you use the SAML test application, set the `url` pro
316316
],
317317
```
318318

319-
#### LogoutUrl (Optional)
319+
#### logoutUrl (Optional)
320320

321321
This optional property represents the `Logout` URL (`SingleLogoutService` URL in the relying party metadata), and the `BindingType` for this is assumed to be `Http-Redirect`.
322322

articles/active-directory/authentication/howto-mfa-userstates.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -133,7 +133,7 @@ Using PowerShell is a good option when you need to bulk enable users. As an exam
133133
To disable MFA, use this script:
134134

135135
```PowerShell
136-
Get-MsolUser -UserPrincipalName [email protected] | Set-MsolUser -StrongAuthenticationMethods @()
136+
Get-MsolUser -UserPrincipalName [email protected] | Set-MsolUser -StrongAuthenticationRequirements @()
137137
```
138138

139139
which can also be shortened to:

articles/active-directory/authentication/howto-password-smart-lockout.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -65,7 +65,7 @@ Based on your organizational requirements, smart lockout values may need to be c
6565
To check or modify the smart lockout values for your organization, use the following steps:
6666

6767
1. Sign in to the [Azure portal](https://portal.azure.com).
68-
1. Search for and select *Azure Active Directory*. Select **Authentication methods** > **Password protection**.
68+
1. Search for and select *Azure Active Directory*. Select **Security** > **Authentication methods** > **Password protection**.
6969
1. Set the **Lockout threshold**, based on how many failed sign-ins are allowed on an account before its first lockout. The default is 10.
7070
1. Set the **Lockout duration in seconds**, to the length in seconds of each lockout. The default is 60 seconds (one minute).
7171

articles/active-directory/conditional-access/concept-baseline-protection.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ Baseline policies are a set of predefined policies that help protect organizatio
2222
Managing customized Conditional Access policies requires an Azure AD Premium license.
2323

2424
> [!IMPORTANT]
25-
> Baseline policies are being depricated. See [What's new in Azure Active Directory?](../fundamentals/whats-new.md#replacement-of-baseline-policies-with-security-defaults) for more information.
25+
> Baseline policies are being deprecated. See [What's new in Azure Active Directory?](../fundamentals/whats-new.md#replacement-of-baseline-policies-with-security-defaults) for more information.
2626
2727
## Baseline policies
2828

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

Lines changed: 5 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -103,14 +103,11 @@ To configure Azure AD single sign-on with HackerOne, perform the following steps
103103

104104
![HackerOne Domain and URLs single sign-on information](common/sp-identifier.png)
105105

106-
a. In the **Sign on URL** text box, type a URL using the following pattern:
107-
`https://hackerone.com/<company name>/authentication`
106+
a. In the **Sign on URL** text box, enter the following:
107+
`https://hackerone.com/users/saml/auth`
108108

109-
b. In the **Identifier (Entity ID)** text box, type a URL:
110-
`https://hackerone.com/users/saml/metadata`
111-
112-
> [!NOTE]
113-
> This Sign on URL value is not real. Update this value with the actual Sign-On URL. Contact [HackerOne Client support team](mailto:[email protected]) to get this value. You can also refer to the patterns shown in the **Basic SAML Configuration** section in the Azure portal.
109+
b. In the **Identifier (Entity ID)** text box, enter the following:
110+
`hackerone.com`
114111

115112
5. On the **Set up Single Sign-On with SAML** page, in the **SAML Signing Certificate** section, click **Download** to download the **Certificate (Base64)** from the given options as per your requirement and save it on your computer.
116113

@@ -225,4 +222,4 @@ When you click the HackerOne tile in the Access Panel, you should be automatical
225222

226223
- [What is application access and single sign-on with Azure Active Directory?](https://docs.microsoft.com/azure/active-directory/active-directory-appssoaccess-whatis)
227224

228-
- [What is Conditional Access in Azure Active Directory?](https://docs.microsoft.com/azure/active-directory/conditional-access/overview)
225+
- [What is Conditional Access in Azure Active Directory?](https://docs.microsoft.com/azure/active-directory/conditional-access/overview)

articles/analysis-services/analysis-services-gateway.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ ms.reviewer: minewiskan
1010
---
1111
# Connecting to on-premises data sources with On-premises data gateway
1212

13-
The on-premises data gateway provides secure data transfer between on-premises data sources and your Azure Analysis Services servers in the cloud. In addition to working with multiple Azure Analysis Services servers in the same region, the latest version of the gateway also works with Azure Logic Apps, Power BI, Power Apps, and Microsoft Flow. You can associate multiple services in the same subscription and same region with a single gateway. While the gateway you install is the same across all of these services, Azure Analysis Services and Logic Apps have some additional steps.
13+
The on-premises data gateway provides secure data transfer between on-premises data sources and your Azure Analysis Services servers in the cloud. In addition to working with multiple Azure Analysis Services servers in the same region, the latest version of the gateway also works with Azure Logic Apps, Power BI, Power Apps, and Power Automate. You can associate multiple services in the same subscription and same region with a single gateway. While the gateway you install is the same across all of these services, Azure Analysis Services and Logic Apps have some additional steps.
1414

1515
For Azure Analysis Services, getting setup with the gateway the first time is a four-part process:
1616

articles/app-service/configure-authentication-provider-microsoft.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -19,15 +19,15 @@ This topic shows you how to configure Azure App Service to use Microsoft Account
1919

2020
1. Go to [**App registrations**](https://portal.azure.com/#blade/Microsoft_AAD_RegisteredApps/ApplicationsListBlade) in the Azure portal. If needed, sign in with your Microsoft account.
2121
1. Select **New registration**, then enter an application name.
22-
1. In **Redirect URIs**, select **Web**, and then enter `https://<app-domain-name>/.auth/login/microsoftaccount/callback supply the endpoint for your application`. Replace *\<app-domain-name>* with the domain name of your app. For example, `https://contoso.azurewebsites.net/.auth/login/microsoftaccount/callback`. Be sure to use the HTTPS scheme in the URL.
22+
1. In **Redirect URIs**, select **Web**, and then enter `https://<app-domain-name>/.auth/login/microsoftaccount/callback`. Replace *\<app-domain-name>* with the domain name of your app. For example, `https://contoso.azurewebsites.net/.auth/login/microsoftaccount/callback`. Be sure to use the HTTPS scheme in the URL.
2323

2424
1. Select **Register**.
2525
1. Copy the **Application (Client) ID**. You'll need it later.
2626
1. From the left pane, select **Certificates & secrets** > **New client secret**. Enter a description, select the validity duration, and select **Add**.
2727
1. Copy the value that appears on the **Certificates & secrets** page. After you leave the page, it won't be displayed again.
2828

2929
> [!IMPORTANT]
30-
> The password is an important security credential. Do not share the password with anyone or distribute it within a client application.
30+
> The client secret value (password) is an important security credential. Do not share the password with anyone or distribute it within a client application.
3131
3232
## <a name="secrets"> </a>Add Microsoft Account information to your App Service application
3333

articles/app-service/configure-ssl-certificate.md

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ ms.custom: seodec18
1010
---
1111
# Add an SSL certificate in Azure App Service
1212

13-
[Azure App Service](overview.md) provides a highly scalable, self-patching web hosting service. This article shows you how create, upload, or import a private certificate or a public certificate into App Service.
13+
[Azure App Service](overview.md) provides a highly scalable, self-patching web hosting service. This article shows you how to create, upload, or import a private certificate or a public certificate into App Service.
1414

1515
Once the certificate is added to your App Service app or [function app](https://docs.microsoft.com/azure/azure-functions/), you can [secure a custom DNS name with it](configure-ssl-bindings.md) or [use it in your application code](configure-ssl-certificate-in-code.md).
1616

@@ -108,8 +108,8 @@ Use the following table to help you configure the certificate. When finished, cl
108108
|-|-|
109109
| Name | A friendly name for your App Service certificate. |
110110
| Naked Domain Host Name | Specify the root domain here. The issued certificate secures *both* the root domain and the `www` subdomain. In the issued certificate, the Common Name field contains the root domain, and the Subject Alternative Name field contains the `www` domain. To secure any subdomain only, specify the fully qualified domain name of the subdomain here (for example, `mysubdomain.contoso.com`).|
111-
| Subscription | The datacenter where the web app is hosted. |
112-
| Resource group | The resource group that contains the certificate. You can use a new resource group or select the same resource group as your App Service app, for example. |
111+
| Subscription | The subscription that will contain the certificate. |
112+
| Resource group | The resource group that will contain the certificate. You can use a new resource group or select the same resource group as your App Service app, for example. |
113113
| Certificate SKU | Determines the type of certificate to create, whether a standard certificate or a [wildcard certificate](https://wikipedia.org/wiki/Wildcard_certificate). |
114114
| Legal Terms | Click to confirm that you agree with the legal terms. The certificates are obtained from GoDaddy. |
115115

@@ -123,7 +123,7 @@ Select the certificate in the [App Service Certificates](https://portal.azure.co
123123

124124
[Key Vault](https://docs.microsoft.com/azure/key-vault/key-vault-overview) is an Azure service that helps safeguard cryptographic keys and secrets used by cloud applications and services. It's the storage of choice for App Service certificates.
125125

126-
In the **Key Vault Status** page, click **Key Vault Repository** to create a new vault or choose an existing vault. If you choose to create a new vault, use the following table to help you configure the vault and click Create. see to create new Key Vault inside same subscription and resource group.
126+
In the **Key Vault Status** page, click **Key Vault Repository** to create a new vault or choose an existing vault. If you choose to create a new vault, use the following table to help you configure the vault and click Create. Create the new Key Vault inside the same subscription and resource group as your App Service app.
127127

128128
| Setting | Description |
129129
|-|-|
@@ -134,7 +134,7 @@ In the **Key Vault Status** page, click **Key Vault Repository** to create a new
134134
| Access policies| Defines the applications and the allowed access to the vault resources. You can configure it later, following the steps at [Grant several applications access to a key vault](../key-vault/key-vault-group-permissions-for-apps.md). |
135135
| Virtual Network Access | Restrict vault access to certain Azure virtual networks. You can configure it later, following the steps at [Configure Azure Key Vault Firewalls and Virtual Networks](../key-vault/key-vault-network-security.md) |
136136

137-
Once you've selected the vault, close the **Key Vault Repository** page. The **Store** option should show a green check mark for success. Keep the page open for the next step.
137+
Once you've selected the vault, close the **Key Vault Repository** page. The **Step 1: Store** option should show a green check mark for success. Keep the page open for the next step.
138138

139139
### Verify domain ownership
140140

@@ -178,7 +178,7 @@ In the <a href="https://portal.azure.com" target="_blank">Azure portal</a>, from
178178

179179
From the left navigation of your app, select **TLS/SSL settings** > **Private Key Certificates (.pfx)** > **Import Key Vault Certificate**.
180180

181-
![Import Key Vault certificate in App Service](./media/configure-ssl-certificate/import-key-vault-cert.png))
181+
![Import Key Vault certificate in App Service](./media/configure-ssl-certificate/import-key-vault-cert.png)
182182

183183
Use the following table to help you select the certificate.
184184

articles/app-service/containers/configure-language-dotnetcore.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,7 @@ az webapp config set --name <app-name> --resource-group <resource-group-name> --
4141
In App Service, you can [set app settings](../configure-common.md?toc=%2fazure%2fapp-service%2fcontainers%2ftoc.json#configure-app-settings) outside of your app code. Then you can access them in any class using the standard ASP.NET Core dependency injection pattern:
4242

4343
```csharp
44-
include Microsoft.Extensions.Configuration;
44+
using Microsoft.Extensions.Configuration;
4545

4646
namespace SomeNamespace
4747
{
@@ -149,4 +149,4 @@ az webapp config appsettings set --name <app-name> --resource-group <resource-gr
149149
> [Tutorial: ASP.NET Core app with SQL Database](tutorial-dotnetcore-sqldb-app.md)
150150
151151
> [!div class="nextstepaction"]
152-
> [App Service Linux FAQ](app-service-linux-faq.md)
152+
> [App Service Linux FAQ](app-service-linux-faq.md)

articles/app-service/containers/quickstart-python.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -47,7 +47,7 @@ In a terminal window, use the commands below (as appropriate for your operating
4747
python3 -m venv venv
4848
source venv/bin/activate
4949
pip install -r requirements.txt
50-
FLASK_APP=application.py
50+
export FLASK_APP=application.py
5151
flask run
5252
```
5353

@@ -93,7 +93,7 @@ az login
9393

9494
The [`az webapp up`](/cli/azure/webapp#az-webapp-up) command creates the web app on App Service and deploys your code.
9595

96-
In the *python-docs-hello-world* folder that contains the sample code, run the following `az webapp up` command. Replace `<app-name>` with a globally unique app name (*valid characters are `a-z`, `0-9`, and `-`*). Also replace `<location-name>` with an Azure region such as **centralus**, **eastasia**, **westeurope**, **koreasouth**, **brazilsouth**, **centralindia**, and so on. (You can retrieve a list of allowable regions for your Azure account by running the [`az account locations-list`](/cli/azure/appservice?view=azure-cli-latest.md#az-appservice-list-locations) command.)
96+
In the *python-docs-hello-world* folder that contains the sample code, run the following `az webapp up` command. Replace `<app-name>` with a globally unique app name (*valid characters are `a-z`, `0-9`, and `-`*). Also replace `<location-name>` with an Azure region such as **centralus**, **eastasia**, **westeurope**, **koreasouth**, **brazilsouth**, **centralindia**, and so on. (You can retrieve a list of allowable regions for your Azure account by running the [`az account list-locations`](/cli/azure/appservice?view=azure-cli-latest.md#az-appservice-list-locations) command.)
9797

9898

9999
```terminal

0 commit comments

Comments
 (0)