Skip to content

Commit f9be0f9

Browse files
committed
Merge branch 'master' of https://github.com/MicrosoftDocs/azure-docs-pr into image-tutorial
2 parents 5491a83 + b4a4bca commit f9be0f9

File tree

1,228 files changed

+6383
-7413
lines changed

Some content is hidden

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

1,228 files changed

+6383
-7413
lines changed

.openpublishing.redirection.json

Lines changed: 49 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -245,6 +245,12 @@
245245
"redirect_url": "/azure/site-recovery/vmware-physical-mobility-service-overview#install-mobility-agent-through-ui",
246246
"redirect_document_id": false
247247
},
248+
249+
{
250+
"source_path": "articles/site-recovery/scvmm-site-recovery-deprecation.md",
251+
"redirect_url": "/azure/site-recovery/site-to-site-deprecation",
252+
"redirect_document_id": false
253+
},
248254
{
249255
"source_path": "articles/machine-learning/service/quickstart-get-started.md",
250256
"redirect_url": "/azure/machine-learning/service/quickstart-run-cloud-notebook",
@@ -520,11 +526,16 @@
520526
"redirect_url": "/azure/machine-learning",
521527
"redirect_document_id": false
522528
},
529+
{
530+
"source_path": "articles/cognitive-services/LUIS/luis-how-to-add-example-utterances.md",
531+
"redirect_url": "/azure/cognitive-services/LUIS/luis-how-to-add-entities",
532+
"redirect_document_id": false
533+
},
523534
{
524535
"source_path": "articles/cognitive-services/LUIS/luis-tutorial-prebuilt-intents-entities.md",
525536
"redirect_url": "/azure/cognitive-services/LUIS/tutorial-machine-learned-entity",
526537
"redirect_document_id": false
527-
},
538+
},
528539
{
529540
"source_path": "articles/cognitive-services/LUIS/luis-quickstart-intents-only.md",
530541
"redirect_url": "/azure/cognitive-services/LUIS/tutorial-intents-only",
@@ -43604,6 +43615,43 @@
4360443615
"redirect_document_id": false
4360543616
},
4360643617
{
43618+
"source_path": "articles/load-balancer/load-balancer-outbound-connections-classic.md",
43619+
"redirect_url": "/previous-versions/azure/load-balancer/load-balancer-outbound-connections-classic",
43620+
"redirect_document_id": false
43621+
},
43622+
{
43623+
"source_path": "articles/load-balancer/load-balancer-multivip.md",
43624+
"redirect_url": "/previous-versions/azure/load-balancer/load-balancer-multivip",
43625+
"redirect_document_id": false
43626+
},
43627+
{
43628+
"source_path": "articles/load-balancer/load-balancer-get-started-ilb-classic-cloud.md",
43629+
"redirect_url": "/previous-versions/azure/load-balancer/load-balancer-get-started-ilb-classic-cloud",
43630+
"redirect_document_id": false
43631+
},
43632+
{
43633+
"source_path": "articles/load-balancer/load-balancer-get-started-ilb-classic-ps.md",
43634+
"redirect_url": "/previous-versions/azure/load-balancer/load-balancer-get-started-ilb-classic-ps",
43635+
"redirect_document_id": false
43636+
},
43637+
{
43638+
"source_path": "articles/load-balancer/load-balancer-get-started-ilb-classic-cli.md",
43639+
"redirect_url": "/previous-versions/azure/load-balancer/load-balancer-get-started-ilb-classic-cli",
43640+
"redirect_document_id": false
43641+
},
43642+
{
43643+
"source_path": "articles/load-balancer/load-balancer-get-started-internet-classic-ps.md",
43644+
"redirect_url": "/previous-versions/azure/load-balancer/load-balancer-get-started-internet-classic-ps",
43645+
"redirect_document_id": false
43646+
},
43647+
{
43648+
"source_path": "articles/load-balancer/load-balancer-get-started-internet-classic-cloud.md",
43649+
"redirect_url": "/previous-versions/azure/load-balancer/load-balancer-get-started-internet-classic-cloud",
43650+
"redirect_document_id": false
43651+
},
43652+
{
43653+
"source_path": "articles/load-balancer/load-balancer-get-started-internet-classic-cli.md",
43654+
"redirect_url": "/previous-versions/azure/load-balancer/load-balancer-get-started-internet-classic-cli",
4360743655
"source_path": "articles/cognitive-services/translator/how-to-install-containers.md",
4360843656
"redirect_url": "/azure/cognitive-services/translator/translator-info-overview",
4360943657
"redirect_document_id": false

articles/active-directory/authentication/TOC.yml

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -139,8 +139,6 @@
139139
href: howto-authentication-passwordless-security-key.md
140140
- name: Passwordless Windows 10
141141
href: howto-authentication-passwordless-security-key-windows.md
142-
- name: Passwordless on-premises
143-
href: howto-authentication-passwordless-security-key-on-premises.md
144142
- name: Passwordless phone sign-in
145143
href: howto-authentication-passwordless-phone.md
146144
- name: Windows Hello for Business

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

Lines changed: 12 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ ms.collection: M365-identity-device-management
1919

2020
This article helps you to manage Multi-Factor Authentication settings in the Azure portal. It covers various topics that help you to get the most out of Azure Multi-Factor Authentication. Not all of the features are available in every version of Azure Multi-Factor Authentication.
2121

22-
You can access settings related to Azure Multi-Factor Authentication from the Azure portal by browsing to **Azure Active Directory** > **MFA**.
22+
You can access settings related to Azure Multi-Factor Authentication from the Azure portal by browsing to **Azure Active Directory** > **Security** > **MFA**.
2323

2424
![Azure portal - Azure AD Multi-Factor Authentication settings](./media/howto-mfa-mfasettings/multi-factor-authentication-settings-portal.png)
2525

@@ -59,15 +59,15 @@ Use the _block and unblock users_ feature to prevent users from receiving authen
5959
### Block a user
6060

6161
1. Sign in to the [Azure portal](https://portal.azure.com) as an administrator.
62-
2. Browse to **Azure Active Directory** > **MFA** > **Block/unblock users**.
62+
2. Browse to **Azure Active Directory** > **Security** > **MFA** > **Block/unblock users**.
6363
3. Select **Add** to block a user.
6464
4. Select the **Replication Group**. Enter the username for the blocked user as **username\@domain.com**. Enter a comment in the **Reason** field.
6565
5. Select **Add** to finish blocking the user.
6666

6767
### Unblock a user
6868

6969
1. Sign in to the [Azure portal](https://portal.azure.com) as an administrator.
70-
2. Browse to **Azure Active Directory** > **MFA** > **Block/unblock users**.
70+
2. Browse to **Azure Active Directory** > **Security** > **MFA** > **Block/unblock users**.
7171
3. Select **Unblock** in the **Action** column next to the user to unblock.
7272
4. Enter a comment in the **Reason for unblocking** field.
7373
5. Select **Unblock** to finish unblocking the user.
@@ -79,7 +79,7 @@ Configure the _fraud alert_ feature so that your users can report fraudulent att
7979
### Turn on fraud alerts
8080

8181
1. Sign in to the [Azure portal](https://portal.azure.com) as an administrator.
82-
2. Browse to **Azure Active Directory** > **MFA** > **Fraud alert**.
82+
2. Browse to **Azure Active Directory** > **Security** > **MFA** > **Fraud alert**.
8383
3. Set the **Allow users to submit fraud alerts** setting to **On**.
8484
4. Select **Save**.
8585

@@ -121,7 +121,7 @@ You can use your own recordings or greetings for two-step verification with the
121121
Before you begin, be aware of the following restrictions:
122122

123123
* The supported file formats are .wav and .mp3.
124-
* The file size limit is 5 MB.
124+
* The file size limit is 1 MB.
125125
* Authentication messages should be shorter than 20 seconds. Messages that are longer than 20 seconds can cause the verification to fail. The user might not respond before the message finishes and the verification times out.
126126

127127
### Custom message language behavior
@@ -142,7 +142,7 @@ For example, if there is only one custom message, with a language of German:
142142
### Set up a custom message
143143

144144
1. Sign in to the [Azure portal](https://portal.azure.com) as an administrator.
145-
1. Browse to **Azure Active Directory** > **MFA** > **Phone call settings**.
145+
1. Browse to **Azure Active Directory** > **Security** > **MFA** > **Phone call settings**.
146146
1. Select **Add greeting**.
147147
1. Choose the type of greeting.
148148
1. Choose the language.
@@ -181,7 +181,7 @@ The _one-time bypass_ feature allows a user to authenticate a single time withou
181181
### Create a one-time bypass
182182

183183
1. Sign in to the [Azure portal](https://portal.azure.com) as an administrator.
184-
2. Browse to **Azure Active Directory** > **MFA** > **One-time bypass**.
184+
2. Browse to **Azure Active Directory** > **Security** > **MFA** > **One-time bypass**.
185185
3. Select **Add**.
186186
4. If necessary, select the replication group for the bypass.
187187
5. Enter the username as **username\@domain.com**. Enter the number of seconds that the bypass should last. Enter the reason for the bypass.
@@ -190,7 +190,7 @@ The _one-time bypass_ feature allows a user to authenticate a single time withou
190190
### View the one-time bypass report
191191

192192
1. Sign in to the [Azure portal](https://portal.azure.com).
193-
2. Browse to **Azure Active Directory** > **MFA** > **One-time bypass**.
193+
2. Browse to **Azure Active Directory** > **Security** > **MFA** > **One-time bypass**.
194194

195195
## Caching rules
196196

@@ -202,18 +202,20 @@ You can set a time period to allow authentication attempts after a user is authe
202202
### Set up caching
203203

204204
1. Sign in to the [Azure portal](https://portal.azure.com) as an administrator.
205-
2. Browse to **Azure Active Directory** > **MFA** > **Caching rules**.
205+
2. Browse to **Azure Active Directory** > **Security** > **MFA** > **Caching rules**.
206206
3. Select **Add**.
207207
4. Select the **cache type** from the drop-down list. Enter the maximum number of **cache seconds**.
208208
5. If necessary, select an authentication type and specify an application.
209209
6. Select **Add**.
210210

211211
## MFA service settings
212212

213-
Settings for app passwords, trusted IPs, verification options, and remember multi-factor authentication for Azure Multi-Factor Authentication can be found in service settings. Service settings can be accessed from the Azure portal by browsing to **Azure Active Directory** > **MFA** > **Getting started** > **Configure** > **Additional cloud-based MFA settings**.
213+
Settings for app passwords, trusted IPs, verification options, and remember multi-factor authentication for Azure Multi-Factor Authentication can be found in service settings. Service settings can be accessed from the Azure portal by browsing to **Azure Active Directory** > **Security** > **MFA** > **Getting started** > **Configure** > **Additional cloud-based MFA settings**.
214214

215215
![Azure Multi-Factor Authentication service settings](./media/howto-mfa-mfasettings/multi-factor-authentication-settings-service-settings.png)
216216

217+
The trusted IP address ranges can be private or public.
218+
217219
## App passwords
218220

219221
Some applications, like Office 2010 or earlier and Apple Mail before iOS 11, don't support two-step verification. The apps aren't configured to accept a second verification. To use these applications, take advantage of the _app passwords_ feature. You can use an app password in place of your traditional password to allow an app to bypass two-step verification and continue working.

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

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -21,16 +21,16 @@ Azure Multi-Factor Authentication provides several reports that can be used by y
2121

2222
| Report | Location | Description |
2323
|:--- |:--- |:--- |
24-
| Blocked User History | Azure AD > MFA Server > Block/unblock users | Shows the history of requests to block or unblock users. |
24+
| Blocked User History | Azure AD > Security > MFA > Block/unblock users | Shows the history of requests to block or unblock users. |
2525
| Usage and fraud alerts | Azure AD > Sign-ins | Provides information on overall usage, user summary, and user details; as well as a history of fraud alerts submitted during the date range specified. |
26-
| Usage for on-premises components | Azure AD > MFA Server > Activity Report | Provides information on overall usage for MFA through the NPS extension, ADFS, and MFA server. |
27-
| Bypassed User History | Azure AD > MFA Server > One-time bypass | Provides a history of requests to bypass Multi-Factor Authentication for a user. |
28-
| Server status | Azure AD > MFA Server > Server status | Displays the status of Multi-Factor Authentication Servers associated with your account. |
26+
| Usage for on-premises components | Azure AD > Security > MFA > Activity Report | Provides information on overall usage for MFA through the NPS extension, ADFS, and MFA server. |
27+
| Bypassed User History | Azure AD > Security > MFA > One-time bypass | Provides a history of requests to bypass Multi-Factor Authentication for a user. |
28+
| Server status | Azure AD > Security > MFA > Server status | Displays the status of Multi-Factor Authentication Servers associated with your account. |
2929

3030
## View MFA reports
3131

3232
1. Sign in to the [Azure portal](https://portal.azure.com).
33-
2. On the left, select **Azure Active Directory** > **MFA Server**.
33+
2. On the left, select **Azure Active Directory** > **Security** > **MFA**.
3434
3. Select the report that you wish to view.
3535

3636
![MFA Server server status report in the Azure portal](./media/howto-mfa-reporting/report.png)

articles/active-directory/authentication/howto-sspr-writeback.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -96,7 +96,7 @@ To set up the appropriate permissions for password writeback to occur, complete
9696
* **Write pwdLastSet**
9797
9. Select **Apply/OK** to apply the changes and exit any open dialog boxes.
9898

99-
Since the source of authority is on premises, the password complexity policies apply from the same connected data source. Make sure you've changed the existing group policies for "Minimum Password Length". The group policy shouldn't be set to 1, which means password should be at least a day old before it can be updated. You need make sure it's set to 0. These settings can be found in `gpmc.msc` under **Computer Configuration > Policies > Windows Settings > Security Settings > Account Policies**. Run `gpupdate /force` to ensure that the change takes effect.
99+
Since the source of authority is on premises, the password complexity policies apply from the same connected data source. Make sure you've changed the existing group policies for "Minimum password age". The group policy shouldn't be set to 1, which means password should be at least a day old before it can be updated. You need make sure it's set to 0. These settings can be found in `gpmc.msc` under **Computer Configuration > Policies > Windows Settings > Security Settings > Account Policies**. Run `gpupdate /force` to ensure that the change takes effect.
100100

101101
## Next steps
102102

Loading

articles/active-directory/b2b/troubleshoot.md

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ services: active-directory
55
ms.service: active-directory
66
ms.subservice: B2B
77
ms.topic: troubleshooting
8-
ms.date: 05/25/2017
8+
ms.date: 11/12/2019
99
tags: active-directory
1010
ms.author: mimart
1111
author: v-miegge
@@ -90,6 +90,10 @@ To resolve this problem, you must take over the abandoned tenant. Refer to [Tak
9090

9191
If the identity tenant is a just-in-time (JIT) or viral tenant (meaning it's a separate, unmanaged Azure tenant), only the guest user can reset their password. Sometimes an organization will [take over management of viral tenants](https://docs.microsoft.com/azure/active-directory/users-groups-roles/domains-admin-takeover) that are created when employees use their work email addresses to sign up for services. After the organization takes over a viral tenant, only an administrator in that organization can reset the user's password or enable SSPR. If necessary, as the inviting organization, you can remove the guest user account from your directory and resend an invitation.
9292

93+
## A guest user is unable to use the AzureAD PowerShell V1 module
94+
95+
As of November 18, 2019, guest users in your directory (defined as user accounts where the **userType** property equals **Guest**) are blocked from using the AzureAD PowerShell V1 module. Going forward, a user will need to either be a member user (where **userType** equals **Member**) or use the AzureAD PowerShell V2 module.
96+
9397
## Next steps
9498

9599
[Get support for B2B collaboration](get-support.md)

articles/active-directory/conditional-access/location-condition.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -48,7 +48,7 @@ A named location has the following components:
4848
- **IP ranges** - One or more IPv4 address ranges in CIDR format. Specifying an IPv6 address range is not supported.
4949

5050
> [!NOTE]
51-
> IPv6 address rangess cannot currently be included in a named location. This measn IPv6 ranges cannot be excluded from a Conditional Access policy.
51+
> IPv6 address ranges cannot currently be included in a named location. This means IPv6 ranges cannot be excluded from a Conditional Access policy.
5252
5353
- **Mark as trusted location** - A flag you can set for a named location to indicate a trusted location. Typically, trusted locations are network areas that are controlled by your IT department. In addition to Conditional Access, trusted named locations are also used by Azure Identity Protection and Azure AD security reports to reduce [false positives](../reports-monitoring/concept-risk-events.md#impossible-travel-to-atypical-locations-1).
5454
- **Countries/Regions** - This option enables you to select one or more country or region to define a named location.

articles/active-directory/develop/TOC.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -392,9 +392,9 @@
392392
href: active-directory-configurable-token-lifetimes.md
393393
- name: Application configuration
394394
items:
395-
- name: Azure portal app registrations training guide (legacy)
395+
- name: Transitioning from App registrations (Legacy) to the new App registrations experience in the Azure portal
396396
href: app-registrations-training-guide-for-app-registrations-legacy-users.md
397-
- name: Application Registration Portal app registration guide
397+
- name: Transitioning from Application Registration Portal to the new App registrations experience in the Azure portal
398398
href: app-registration-portal-training-guide.md
399399
- name: Convert a single-tenant app to a multi-tenant app
400400
href: howto-convert-app-to-be-multi-tenant.md

articles/active-directory/develop/active-directory-configurable-token-lifetimes.md

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -49,11 +49,11 @@ Clients use access tokens to access a protected resource. An access token can be
4949

5050
### SAML tokens
5151

52-
SAML tokens are used by many web based SAAS applications, and are obtained using Azure Active Directory's SAML2 protocol endpoint. They are also consumed by applications using WS-Federation. The default lifetime of the token is 1 hour. After From and applications perspective the validity period of the token is specified by the NotOnOrAfter value of the <conditions …> element in the token. After the token validity period the client must initiate a new authentication request, which will often be satisfied without interactive sign in as a result of the Single Sign On (SSO) Session token.
52+
SAML tokens are used by many web based SAAS applications, and are obtained using Azure Active Directory's SAML2 protocol endpoint. They are also consumed by applications using WS-Federation. The default lifetime of the token is 1 hour. From an application's perspective, the validity period of the token is specified by the NotOnOrAfter value of the `<conditions …>` element in the token. After the validity period of the token has ended, the client must initiate a new authentication request, which will often be satisfied without interactive sign in as a result of the Single Sign On (SSO) Session token.
5353

54-
The value of NotOnOrAfter can be changed using the AccessTokenLifetime parameter in a TokenLifetimePolicy. It will be set to the lifetime configured in the policy if any, plus a clock skew factor of five minutes.
54+
The value of NotOnOrAfter can be changed using the `AccessTokenLifetime` parameter in a `TokenLifetimePolicy`. It will be set to the lifetime configured in the policy if any, plus a clock skew factor of five minutes.
5555

56-
Note that the subject confirmation NotOnOrAfter specified in the <SubjectConfirmationData> element is not affected by the Token Lifetime configuration.
56+
Note that the subject confirmation NotOnOrAfter specified in the `<SubjectConfirmationData>` element is not affected by the Token Lifetime configuration.
5757

5858
### Refresh tokens
5959

0 commit comments

Comments
 (0)