Skip to content

Commit 29c3940

Browse files
authored
Merge branch 'master' into seven-marketplace-articles
2 parents ada740e + a250526 commit 29c3940

File tree

461 files changed

+9737
-3025
lines changed

Some content is hidden

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

461 files changed

+9737
-3025
lines changed

.openpublishing.redirection.json

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -250,6 +250,16 @@
250250
"redirect_url": "/azure//virtual-machines/windows/sql/virtual-machines-windows-portal-sql-create-failover-cluster-premium-file-share",
251251
"redirect_document_id": false
252252
},
253+
{
254+
"source_path": "articles/virtual-machines/windows/shared-images.md",
255+
"redirect_url": "/azure/virtual-machines/shared-images-powershell",
256+
"redirect_document_id": false
257+
},
258+
{
259+
"source_path": "articles/virtual-machines/linux/shared-images.md",
260+
"redirect_url": "/azure/virtual-machines/shared-images-cli",
261+
"redirect_document_id": false
262+
},
253263
{
254264
"source_path": "articles/virtual-machines/windows/encrypt-disks.md",
255265
"redirect_url": "/azure//virtual-machines/windows/disk-encryption-overview",

CODEOWNERS

Lines changed: 8 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,11 @@
11
# Testing the new code owners feature in GitHub. Please contact Cory Fowler if you have questions.
2+
3+
# Horizontals
4+
5+
## Azure Policy: Samples
6+
articles/**/policy-samples.md @DCtheGeek
7+
includes/policy/ @DCtheGeek
8+
29
# Cognitive Services
310
articles/cognitive-services/ @diberry @erhopf @aahill @ievangelist @patrickfarley @nitinme
411

@@ -9,7 +16,7 @@ articles/jenkins/ @TomArcherMsft
916
articles/terraform/ @TomArcherMsft
1017

1118
# Requires Internal Review
12-
articles/best-practices-availability-paired-regions.md @jpconnock @martinekuan @syntaxc4 @tysonn @snoviking
19+
articles/best-practices-availability-paired-regions.md @martinekuan @syntaxc4 @snoviking
1320

1421
# Governance
1522
articles/governance/ @DCtheGeek

articles/active-directory/authentication/overview-authentication.md

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -85,14 +85,14 @@ Azure AD provides ways to natively authenticate using passwordless methods to si
8585

8686
## Next steps
8787

88-
To get started, see the [quickstart for self-service password reset][quickstart-sspr] and [Azure Multi-Factor Authentication tutorial][tutorial-mfa-applications].
88+
To get started, see the [tutorial for self-service password reset (SSPR)][tutorial-sspr] and [Azure Multi-Factor Authentication][tutorial-azure-mfa].
8989

9090
To learn more about self-service password reset concepts, see [How Azure AD self-service password reset works][concept-sspr].
9191

9292
To learn more about multi-factor authentication concepts, see [How Azure Multi-Factor Authentication works][concept-mfa].
9393

9494
<!-- INTERNAL LINKS -->
95-
[quickstart-sspr]: quickstart-sspr.md
96-
[tutorial-mfa-applications]: tutorial-mfa-applications.md
95+
[tutorial-sspr]: tutorial-enable-sspr.md
96+
[tutorial-azure-mfa]: tutorial-enable-azure-mfa.md
9797
[concept-sspr]: concept-sspr-howitworks.md
9898
[concept-mfa]: concept-mfa-howitworks.md
-1.79 KB
Loading

articles/active-directory/develop/sample-v2-code.md

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -38,9 +38,11 @@ These samples show how to write a single-page application secured with Microsoft
3838
| Platform | Description | Link |
3939
| -------- | --------------------- | -------- |
4040
| ![This image shows the JavaScript logo](media/sample-v2-code/logo_js.png) [JavaScript (msal.js)](https://github.com/AzureAD/microsoft-authentication-library-for-js/blob/dev/lib/msal-core) | Calls Microsoft Graph |[javascript-graphapi-v2](https://github.com/Azure-Samples/active-directory-javascript-graphapi-v2) |
41+
| ![This image shows the JavaScript logo](media/sample-v2-code/logo_js.png) [JavaScript (msal.js)](https://github.com/AzureAD/microsoft-authentication-library-for-js/blob/dev/lib/msal-core) | Calls Microsoft Graph using Auth Code Flow w/ PKCE |[javascript-v2](https://github.com/Azure-Samples/ms-identity-javascript-v2) |
4142
| ![This image shows the JavaScript logo](media/sample-v2-code/logo_js.png) [JavaScript (msal.js)](https://github.com/AzureAD/microsoft-authentication-library-for-js/blob/dev/lib/msal-core) | Calls B2C |[b2c-javascript-msal-singlepageapp](https://github.com/Azure-Samples/active-directory-b2c-javascript-msal-singlepageapp) |
42-
| ![This image shows the JavaScript logo](media/sample-v2-code/logo_js.png) [JavaScript (msal.js)](https://github.com/AzureAD/microsoft-authentication-library-for-js/blob/dev/lib/msal-core) | Calls own web API |[javascript-singlepageapp-dotnet-webapi-v2](https://github.com/Azure-Samples/active-directory-javascript-singlepageapp-dotnet-webapi-v2) |
43+
| ![This image shows the Angular logo](media/sample-v2-code/logo_angular.png) [JavaScript (MSAL Angular)](https://github.com/AzureAD/microsoft-authentication-library-for-js/blob/dev/lib/msal-angular)| Calls own Web API | [ms-identity-javascript-angular-spa-aspnetcore-webapi](https://github.com/Azure-Samples/ms-identity-javascript-angular-spa-aspnetcore-webapi) |
4344
| ![This image shows the Angular logo](media/sample-v2-code/logo_angular.png) [JavaScript (MSAL Angular)](https://github.com/AzureAD/microsoft-authentication-library-for-js/blob/dev/lib/msal-angular)| Calls Microsoft Graph | [active-directory-javascript-singlepageapp-angular](https://github.com/Azure-Samples/active-directory-javascript-singlepageapp-angular) |
45+
| ![This image shows the React logo](media/sample-v2-code/logo_react.png) [JavaScript (msal.js)](https://github.com/AzureAD/microsoft-authentication-library-for-js/blob/dev/lib/msal-core)| Calls own Web API which in turn calls Microsoft Graph | [ms-identity-javascript-react-spa-dotnetcore-webapi-obo](https://github.com/Azure-Samples/ms-identity-javascript-react-spa-dotnetcore-webapi-obo) |
4446
| ![This image shows the Angular logo](media/sample-v2-code/logo_angular.png) [JavaScript (MSAL Angular)](https://github.com/AzureAD/microsoft-authentication-library-for-js/blob/dev/lib/msal-angular) | Calls B2C |[active-directory-b2c-javascript-angular-spa](https://github.com/Azure-Samples/active-directory-b2c-javascript-angular-spa) |
4547

4648
## Web applications

articles/active-directory/devices/manage-stale-devices.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -175,7 +175,7 @@ To learn more about the different types, see the [device management overview](ov
175175

176176
Any authentication where a device is being used to authenticate to Azure AD are denied. Common examples are:
177177

178-
- **Hybrid Azure AD joined device** - Users might be to use the device to sign-in to their on-premises domain. However, they can't access Azure AD resources such as Office 365.
178+
- **Hybrid Azure AD joined device** - Users might be able to use the device to sign-in to their on-premises domain. However, they can't access Azure AD resources such as Office 365.
179179
- **Azure AD joined device** - Users can't use the device to sign in.
180180
- **Mobile devices** - User can't access Azure AD resources such as Office 365.
181181

articles/active-directory/fundamentals/toc.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -50,7 +50,7 @@
5050
- name: Deployment guide
5151
items:
5252
- name: Deployment 30, 90, and beyond
53-
href: active-directory-deployment-checklist-p2.md
53+
href: active-directory-deployment-checklist-p2.md
5454
- name: Data storage
5555
items:
5656
- name: Identity data storage for Europe

articles/active-directory/identity-protection/howto-identity-protection-configure-notifications.md

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ services: active-directory
66
ms.service: active-directory
77
ms.subservice: identity-protection
88
ms.topic: conceptual
9-
ms.date: 10/18/2019
9+
ms.date: 05/05/2020
1010

1111
ms.author: joflore
1212
author: MicrosoftGuyJFlo
@@ -47,12 +47,11 @@ Configure the users at risk email in the **Azure portal** under **Azure Active D
4747
The weekly digest email contains a summary of new risk detections.
4848
It includes:
4949

50-
- Users at risk
51-
- Suspicious activities
52-
- Detected vulnerabilities
50+
- New risky users detected
51+
- New risky sign-ins detected (in real-time)
5352
- Links to the related reports in Identity Protection
5453

55-
![Weekly digest email](./media/howto-identity-protection-configure-notifications/400.png)
54+
![Weekly digest email](./media/howto-identity-protection-configure-notifications/weekly-digest-email.png)
5655

5756
By default, recipients include all Global Admins. Global Admins can also add other Global Admins, Security Admins, Security Readers as recipients.
5857

Loading

0 commit comments

Comments
 (0)