Skip to content

Commit 2035c1b

Browse files
committed
Merge branch 'master' of https://github.com/MicrosoftDocs/azure-docs-pr into how-to-configure-lvm-raid-on-crypt
2 parents 82613a5 + 0959bb3 commit 2035c1b

File tree

408 files changed

+4781
-4077
lines changed

Some content is hidden

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

408 files changed

+4781
-4077
lines changed

.openpublishing.redirection.json

Lines changed: 61 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1995,6 +1995,26 @@
19951995
"redirect_url": "/azure/cognitive-services/bing-video-search/quickstarts/client-libraries?pivots=programming-language-python",
19961996
"redirect_document_id": false
19971997
},
1998+
{
1999+
"source_path": "articles/cognitive-services/bing-visual-search/visual-search-sdk-c-sharp.md",
2000+
"redirect_url": "/azure/cognitive-services/bing-visual-search/quickstarts/client-libraries?pivots=programming-language-csharp",
2001+
"redirect_document_id": false
2002+
},
2003+
{
2004+
"source_path": "articles/cognitive-services/bing-visual-search/visual-search-sdk-java.md",
2005+
"redirect_url": "/azure/cognitive-services/bing-visual-search/quickstarts/client-libraries?pivots=programming-language-java",
2006+
"redirect_document_id": false
2007+
},
2008+
{
2009+
"source_path": "articles/cognitive-services/bing-visual-search/visual-search-sdk-node.md",
2010+
"redirect_url": "/azure/cognitive-services/bing-visual-search/quickstarts/client-libraries?pivots=programming-language-javascript",
2011+
"redirect_document_id": false
2012+
},
2013+
{
2014+
"source_path": "articles/cognitive-services/bing-visual-search/visual-search-sdk-python.md",
2015+
"redirect_url": "/azure/cognitive-services/bing-visual-search/quickstarts/client-libraries?pivots=programming-language-python",
2016+
"redirect_document_id": false
2017+
},
19982018
{
19992019
"source_path": "articles/virtual-machines/linux/classic/rdma-cluster.md",
20002020
"redirect_url": "/azure/virtual-machines/linux/sizes-hpc#rdma-capable-instances",
@@ -2902,7 +2922,7 @@
29022922
},
29032923
{
29042924
"source_path": "articles/machine-learning/service/overview-more-machine-learning.md",
2905-
"redirect_url": "/azure/architecture/data-guide/technology-choices/data-science-and-machine-learning",
2925+
"redirect_url": "https://docs.microsoft.com/azure/architecture/data-guide/technology-choices/data-science-and-machine-learning",
29062926
"redirect_document_id": false
29072927
},
29082928
{
@@ -2982,7 +3002,7 @@
29823002
},
29833003
{
29843004
"source_path": "articles/machine-learning/service/support-for-aml-services.md",
2985-
"redirect_url": "https://aka.ms/aml-forum-service",
3005+
"redirect_url": "https://social.msdn.microsoft.com/Forums/home?forum=AzureMachineLearningService",
29863006
"redirect_document_id": false
29873007
},
29883008
{
@@ -3072,17 +3092,17 @@
30723092
},
30733093
{
30743094
"source_path": "articles/machine-learning/studio/live-chat.md",
3075-
"redirect_url": "https://social.msdn.microsoft.com/Forums/en-US/home?forum=MachineLearning",
3095+
"redirect_url": "https://social.msdn.microsoft.com/Forums/home?forum=MachineLearning",
30763096
"redirect_document_id": false
30773097
},
30783098
{
30793099
"source_path": "articles/machine-learning/studio/datamarket-deprecation.md",
3080-
"redirect_url": "https://microsoft.com/cognitive",
3100+
"redirect_url": "https://azure.microsoft.com/services/cognitive-services/",
30813101
"redirect_document_id": false
30823102
},
30833103
{
30843104
"source_path": "articles/machine-learning/r-developers-guide.md",
3085-
"redirect_url": "/azure/architecture/data-guide/technology-choices/r-developers-guide",
3105+
"redirect_url": "https://docs.microsoft.com/azure/architecture/data-guide/technology-choices/r-developers-guide",
30863106
"redirect_document_id": false
30873107
},
30883108
{
@@ -15161,7 +15181,7 @@
1516115181
},
1516215182
{
1516315183
"source_path": "articles/machine-learning/service/how-to-create-portal-experiments.md",
15164-
"redirect_url": "/azure/machine-learning/how-to-create-portal-experiments",
15184+
"redirect_url": "/azure/machine-learning/tutorial-first-experiment-automated-ml",
1516515185
"redirect_document_id": false
1516615186
},
1516715187
{
@@ -29744,6 +29764,26 @@
2974429764
"redirect_url": "/azure/sentinel/fusion",
2974529765
"redirect_document_id": false
2974629766
},
29767+
{
29768+
"source_path": "articles/security-center/security-center-apply-system-updates.md",
29769+
"redirect_url": "/azure/security-center/security-center-virtual-machine-protection",
29770+
"redirect_document_id": false
29771+
},
29772+
{
29773+
"source_path": "articles/security-center/security-center-investigation.md",
29774+
"redirect_url": "/azure/security-center/security-center-features-retirement-july2019#security-alerts-investigation",
29775+
"redirect_document_id": false
29776+
},
29777+
{
29778+
"source_path": "articles/security-center/security-center-threat-intel.md",
29779+
"redirect_url": "/azure/security-center/security-center-features-retirement-july2019#menu_securityeventsmap",
29780+
"redirect_document_id": false
29781+
},
29782+
{
29783+
"source_path": "articles/security-center/security-center-apply-disk-encryption.md",
29784+
"redirect_url": "/azure/security-center/security-center-virtual-machine-protection",
29785+
"redirect_document_id": false
29786+
},
2974729787
{
2974829788
"source_path": "articles/security-center/security-center-confidence-score.md",
2974929789
"redirect_url": "/azure/security-center/security-center-intro",
@@ -47329,6 +47369,11 @@
4732947369
"redirect_url": "https://feedback.azure.com/forums/169401-azure-active-directory?category_id=160593",
4733047370
"redirect_document_id": false
4733147371
},
47372+
{
47373+
"source_path": "articles/active-directory-domain-services/compatible-software.md",
47374+
"redirect_url": "/azure/active-directory-domain-services/overview",
47375+
"redirect_document_id": false
47376+
},
4733247377
{
4733347378
"source_path": "articles/active-directory-domain-services/active-directory-ds-troubleshooting.md",
4733447379
"redirect_url": "/azure/active-directory-domain-services/troubleshoot",
@@ -50503,6 +50548,16 @@
5050350548
{
5050450549
"source_path": "articles/sql-database/sql-database-managed-instance-index.yml",
5050550550
"redirect_url": "/azure/sql-database/sql-database-managed-instance"
50551+
},
50552+
{
50553+
"source_path": "articles/aks/integrate-azure.md",
50554+
"redirect_url": "/azure/aks/",
50555+
"redirect_document_id": false
50556+
},
50557+
{
50558+
"source_path": "articles/aks/use-cosmosdb-osba-mongo-app.md",
50559+
"redirect_url": "/azure/aks/",
50560+
"redirect_document_id": false
5050650561
}
5050750562
]
5050850563
}

articles/active-directory-b2c/custom-policy-localization.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ ms.subservice: B2C
1717

1818
[!INCLUDE [active-directory-b2c-advanced-audience-warning](../../includes/active-directory-b2c-advanced-audience-warning.md)]
1919

20-
Language customization in Azure Active Directory B2C (Azure AD B2C) allows you to accommodate different languages to suit your customer' needs. Microsoft provides the translations for 36 languages, but you can also provide your own translations for any language. Even if your experience is provided for only a single language, you can customize any text on the pages.
20+
Language customization in Azure Active Directory B2C (Azure AD B2C) allows you to accommodate different languages to suit your customer' needs. Microsoft provides the translations for [36 languages](https://docs.microsoft.com/azure/active-directory-b2c/user-flow-language-customization#supported-languages), but you can also provide your own translations for any language. Even if your experience is provided for only a single language, you can customize any text on the pages.
2121

2222
This article shows you how to support multiple locales or languages in the policy for user journeys. Localization requires three steps: set-up the explicit list of supported languages, provide language-specific strings and collections, and edit the [content definition](contentdefinitions.md) for the page.
2323

articles/active-directory-domain-services/TOC.yml

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -145,8 +145,6 @@
145145
href: faqs.md
146146
- name: Service updates
147147
href: https://azure.microsoft.com/updates/?product=active-directory-ds
148-
- name: Compatible third-party software
149-
href: compatible-software.md
150148
- name: Pricing
151149
href: https://azure.microsoft.com/pricing/details/active-directory-ds/
152150
- name: Azure AD feedback forum

articles/active-directory-domain-services/compatible-software.md

Lines changed: 0 additions & 41 deletions
This file was deleted.

articles/active-directory/authentication/howto-authentication-passwordless-deployment.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -56,7 +56,7 @@ Microsoft's passwordless authentication methods enable different scenarios. Cons
5656
| **Web app sign-in**: <br> from a mobile or non-windows device | **Yes** | **No** | **No** |
5757
| **Computer sign in**: <br> Non-Windows computer | **No** | **No** | **No** |
5858

59-
For information on selecting the best method for your organization, see [Deciding a passwordless method](https://docs.microsoft.com/azure/security/fundamentals/ad-passwordless#deciding-a-passwordless-method).
59+
For information on selecting the best method for your organization, see [Deciding a passwordless method](https://docs.microsoft.com/azure/active-directory/authentication/concept-authentication-passwordless#choose-a-passwordless-method).
6060

6161
## Prerequisites
6262

@@ -130,7 +130,7 @@ See [Best practices for a pilot](https://aka.ms/deploymentplans) on the deployme
130130

131131
The Microsoft Authenticator app is a free download from Google Play or the Apple App Store. [Learn more about downloading the Microsoft Authenticator app](https://www.microsoft.com/p/microsoft-authenticator/9nblgggzmcj6). Have users download the Microsoft Authenticator app. and follow the directions to enable phone sign in.
132132

133-
It turns any iOS or Android phone into a strong, passwordless credential. Users sign in to any platform or browser by getting a notification to their phone, matching a number displayed on the screen to the one on their phone, and then using biometrics or a PIN to confirm. [See details on how the Microsoft Authenticator app works](https://docs.microsoft.com/azure/security/fundamentals/ad-passwordless#user-using-microsoft-authenticator-for-passwordless-sign-in).
133+
It turns any iOS or Android phone into a strong, passwordless credential. Users sign in to any platform or browser by getting a notification to their phone, matching a number displayed on the screen to the one on their phone, and then using biometrics or a PIN to confirm. [See details on how the Microsoft Authenticator app works](https://docs.microsoft.com/azure/active-directory/authentication/concept-authentication-passwordless#microsoft-authenticator-app).
134134

135135
![sign in with the Authenticator app](./media/howto-authentication-passwordless-deployment/passwordless-dp-sign-in.png)
136136

articles/active-directory/develop/authentication-scenarios.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -167,7 +167,7 @@ This attribute causes ASP.NET to check for the presence of a session cookie cont
167167
User authentication happens via the browser. The OpenID protocol uses standard HTTP protocol messages.
168168
* The web app sends an HTTP 302 (redirect) to the browser to use Azure AD.
169169
* When the user is authenticated, Azure AD sends the token to the web app by using a redirect through the browser.
170-
* The redirect is provided by the web app in the form of a redirect URI. This redirect URI is registered with the Azure AD application object. There can be several redirect URIs because the application may be deployed at several URLs. So the web app will also need to specify the redirect URi to use.
170+
* The redirect is provided by the web app in the form of a redirect URI. This redirect URI is registered with the Azure AD application object. There can be several redirect URIs because the application may be deployed at several URLs. So the web app will also need to specify the redirect URI to use.
171171
* Azure AD verifies that the redirect URI sent by the web app is one of the registered redirect URIs for the app.
172172

173173
## Desktop and mobile app sign-in flow with Azure AD

articles/active-directory/develop/customize-webviews.md

Lines changed: 27 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -18,34 +18,43 @@ ms.custom: aaddev
1818

1919
# How to: Customize browsers and WebViews for iOS/macOS
2020

21-
A web browser is required for interactive authentication. On iOS, the Microsoft Authentication Library (MSAL) uses the system web browser by default (which might appear on top of your app) to do interactive authentication to sign in users. Using the system browser has the advantage of sharing the Single Sign On (SSO) state with other applications and with web applications.
21+
A web browser is required for interactive authentication. On iOS and macOS 10.15+, the Microsoft Authentication Library (MSAL) uses the system web browser by default (which might appear on top of your app) to do interactive authentication to sign in users. Using the system browser has the advantage of sharing the Single Sign On (SSO) state with other applications and with web applications.
2222

2323
You can change the experience by customizing the configuration to other options for displaying web content, such as:
2424

2525
For iOS only:
2626

27-
- [ASWebAuthenticationSession](https://developer.apple.com/documentation/authenticationservices/aswebauthenticationsession?language=objc)
2827
- [SFAuthenticationSession](https://developer.apple.com/documentation/safariservices/sfauthenticationsession?language=objc)
2928
- [SFSafariViewController](https://developer.apple.com/documentation/safariservices/sfsafariviewcontroller?language=objc)
3029

3130
For iOS and macOS:
3231

32+
- [ASWebAuthenticationSession](https://developer.apple.com/documentation/authenticationservices/aswebauthenticationsession?language=objc)
3333
- [WKWebView](https://developer.apple.com/documentation/webkit/wkwebview?language=objc).
3434

35-
MSAL for macOS only supports `WKWebView`.
35+
MSAL for macOS only supports `WKWebView` on older OS versions. `ASWebAuthenticationSession` is only supported on macOS 10.15 and above.
3636

3737
## System browsers
3838

39-
For iOS, `ASWebAuthenticationSession`, `SFAuthenticationSession`, and `SFSafariViewController` are considered system browsers. In general, system browsers share cookies and other website data with the Safari browser application.
39+
For iOS, `ASWebAuthenticationSession`, `SFAuthenticationSession`, and `SFSafariViewController` are considered system browsers. For macOS, only `ASWebAuthenticationSession` is available. In general, system browsers share cookies and other website data with the Safari browser application.
4040

4141
By default, MSAL will dynamically detect iOS version and select the recommended system browser available on that version. On iOS 12+ it will be `ASWebAuthenticationSession`.
4242

43+
### Default configuration for iOS
44+
4345
| Version | Web browser |
4446
|:-------------:|:-------------:|
4547
| iOS 12+ | ASWebAuthenticationSession |
4648
| iOS 11 | SFAuthenticationSession |
4749
| iOS 10 | SFSafariViewController |
4850

51+
### Default configuration for macOS
52+
53+
| Version | Web browser |
54+
|:-------------:|:-------------:|
55+
| macOS 10.15+ | ASWebAuthenticationSession |
56+
| other versions | WKWebView |
57+
4958
Developers can also select a different system browser for MSAL apps:
5059

5160
- `SFAuthenticationSession` is the iOS 11 version of `ASWebAuthenticationSession`.
@@ -61,7 +70,7 @@ The browser you use impacts the SSO experience because of how they share cookies
6170

6271
| Technology | Browser Type | iOS availability | macOS availability | Shares cookies and other data | MSAL availability | SSO |
6372
|:-------------:|:-------------:|:-------------:|:-------------:|:-------------:|:-------------:|-------------:|
64-
| [ASWebAuthenticationSession](https://developer.apple.com/documentation/authenticationservices/aswebauthenticationsession) | System | iOS12 and up | macOS 10.15 and up | Yes | iOS only | w/ Safari instances
73+
| [ASWebAuthenticationSession](https://developer.apple.com/documentation/authenticationservices/aswebauthenticationsession) | System | iOS12 and up | macOS 10.15 and up | Yes | iOS and macOS 10.15+ | w/ Safari instances
6574
| [SFAuthenticationSession](https://developer.apple.com/documentation/safariservices/sfauthenticationsession) | System | iOS11 and up | N/A | Yes | iOS only | w/ Safari instances
6675
| [SFSafariViewController](https://developer.apple.com/documentation/safariservices/sfsafariviewcontroller) | System | iOS11 and up | N/A | No | iOS only | No**
6776
| **SFSafariViewController** | System | iOS10 | N/A | Yes | iOS only | w/ Safari instances
@@ -134,21 +143,26 @@ All MSAL supported web browser types are declared in the [MSALWebviewType enum](
134143
```objc
135144
typedef NS_ENUM(NSInteger, MSALWebviewType)
136145
{
137-
#if TARGET_OS_IPHONE
138-
// For iOS 11 and up, uses AuthenticationSession (ASWebAuthenticationSession
139-
// or SFAuthenticationSession).
140-
// For older versions, with AuthenticationSession not being available, uses
141-
// SafariViewController.
146+
/**
147+
For iOS 11 and up, uses AuthenticationSession (ASWebAuthenticationSession or SFAuthenticationSession).
148+
For older versions, with AuthenticationSession not being available, uses SafariViewController.
149+
For macOS 10.15 and above uses ASWebAuthenticationSession
150+
For older macOS versions uses WKWebView
151+
*/
142152
MSALWebviewTypeDefault,
143153

144-
// Use SFAuthenticationSession/ASWebAuthenticationSession
154+
/** Use ASWebAuthenticationSession where available.
155+
On older iOS versions uses SFAuthenticationSession
156+
Doesn't allow any other webview type, so if either of these are not present, fails the request*/
145157
MSALWebviewTypeAuthenticationSession,
146158

147-
// Use SFSafariViewController for all versions.
159+
#if TARGET_OS_IPHONE
160+
161+
/** Use SFSafariViewController for all versions. */
148162
MSALWebviewTypeSafariViewController,
149163

150164
#endif
151-
// Use WKWebView
165+
/** Use WKWebView */
152166
MSALWebviewTypeWKWebView,
153167
};
154168
```

articles/active-directory/develop/howto-create-service-principal-portal.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ manager: CelesteDG
99
ms.service: active-directory
1010
ms.subservice: develop
1111
ms.topic: conceptual
12-
ms.date: 02/26/2020
12+
ms.date: 04/01/2020
1313
ms.author: ryanwi
1414
ms.reviewer: tomfitz
1515
ms.custom: aaddev, seoapril2019, identityplatformtop40
@@ -95,7 +95,7 @@ Export this certificate to a file using the [Manage User Certificate](/dotnet/fr
9595

9696
1. To view your certificates, under **Certificates - Current User** in the left pane, expand the **Personal** directory.
9797
1. Right-click on the cert you created, select **All tasks->Export**.
98-
1. Follow the Certificate Export wizard. Export the private key, specify a password for the cert file, and export to a file.
98+
1. Follow the Certificate Export wizard. Do not export the private key, and export to a .CER file.
9999

100100
To upload the certificate:
101101

0 commit comments

Comments
 (0)