Skip to content

Commit a7beabf

Browse files
Merge branch 'master' of https://github.com/MicrosoftDocs/azure-docs-pr into us1546060u
2 parents 4c8ba15 + bf32cb6 commit a7beabf

File tree

400 files changed

+6157
-3919
lines changed

Some content is hidden

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

400 files changed

+6157
-3919
lines changed

.openpublishing.redirection.json

Lines changed: 59 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -779,7 +779,12 @@
779779
"source_path": "articles/cognitive-services/LUIS/luis-how-to-account-settings.md",
780780
"redirect_url": "/azure/cognitive-services/LUIS/luis-how-to-azure-subscription",
781781
"redirect_document_id": false
782-
},
782+
},
783+
{
784+
"source_path": "articles/cognitive-services/QnAMaker/How-To/create-knowledge-base.md",
785+
"redirect_url": "/azure/cognitive-services/QnAMaker/Quickstarts/create-publish-knowledge-base",
786+
"redirect_document_id": false
787+
},
783788
{
784789
"source_path": "articles/cognitive-services/QnAMaker/quickstarts/csharp.md",
785790
"redirect_url": "/azure/cognitive-services/QnAMaker/quickstarts/create-publish-kb-csharp-sdk",
@@ -14420,6 +14425,16 @@
1442014425
"redirect_url": "/azure/sql-data-warehouse/release-notes-10-0-10106-0",
1442114426
"redirect_document_id": false
1442214427
},
14428+
{
14429+
"source_path": "articles/sql-data-warehouse/changing-maintenance-schedule.md",
14430+
"redirect_url": "/azure/sql-data-warehouse/maintenance-scheduling#change-a-maintenance-schedule",
14431+
"redirect_document_id": false
14432+
},
14433+
{
14434+
"source_path": "articles/sql-data-warehouse/viewing-maintenance-schedule.md",
14435+
"redirect_url": "/azure/sql-data-warehouse/maintenance-scheduling#view-a-maintenance-schedule",
14436+
"redirect_document_id": false
14437+
},
1442314438
{
1442414439
"source_path": "articles/sql-data-warehouse/release-notes-april-2018.md",
1442514440
"redirect_url": "/azure/sql-data-warehouse/release-notes-10-0-10106-0",
@@ -14630,6 +14645,31 @@
1463014645
"redirect_url": "/azure/cognitive-services/Bing-Custom-Search/language-support",
1463114646
"redirect_document_id": true
1463214647
},
14648+
{
14649+
"source_path": "articles/cognitive-services/Bing-Web-Search/paging-webpages.md",
14650+
"redirect_url": "/azure/cognitive-services/Bing-Web-Search/paging-search-results",
14651+
"redirect_document_id": true
14652+
},
14653+
{
14654+
"source_path": "articles/cognitive-services/Bing-Custom-Search/page-webpages.md",
14655+
"redirect_url": "/azure/cognitive-services/Bing-Web-Search/paging-search-results",
14656+
"redirect_document_id": false
14657+
},
14658+
{
14659+
"source_path": "articles/cognitive-services/Bing-News-Search/paging-news.md",
14660+
"redirect_url": "/azure/cognitive-services/Bing-Web-Search/paging-search-results",
14661+
"redirect_document_id": false
14662+
},
14663+
{
14664+
"source_path": "articles/cognitive-services/Bing-Video-Search/paging-videos.md",
14665+
"redirect_url": "/azure/cognitive-services/Bing-Web-Search/paging-search-results",
14666+
"redirect_document_id": false
14667+
},
14668+
{
14669+
"source_path": "articles/cognitive-services/Bing-Image-Search/paging-images.md",
14670+
"redirect_url": "/azure/cognitive-services/Bing-Web-Search/paging-search-results",
14671+
"redirect_document_id": false
14672+
},
1463314673
{
1463414674
"source_path": "articles/cognitive-services/Bing-Spell-Check/bing-spell-check-supported-languages.md",
1463514675
"redirect_url": "/azure/cognitive-services/bing-spell-check/language-support",
@@ -20921,7 +20961,7 @@
2092120961
},
2092220962
{
2092320963
"source_path": "articles/virtual-machines/virtual-machines-linux-vertical-scaling-automation.md",
20924-
"redirect_url": "/azure/virtual-machines/linux/vertical-scaling-automation",
20964+
"redirect_url": "/azure/virtual-machine-scale-sets/virtual-machine-scale-sets-vertical-scale-reprovision",
2092520965
"redirect_document_id": false
2092620966
},
2092720967
{
@@ -22351,7 +22391,17 @@
2235122391
},
2235222392
{
2235322393
"source_path": "articles/virtual-machines/virtual-machines-windows-vertical-scaling-automation.md",
22354-
"redirect_url": "/azure/virtual-machines/windows/vertical-scaling-automation",
22394+
"redirect_url": "/azure/virtual-machine-scale-sets/virtual-machine-scale-sets-vertical-scale-reprovision",
22395+
"redirect_document_id": false
22396+
},
22397+
{
22398+
"source_path": "articles/virtual-machines/windows/vertical-scaling-automation.md",
22399+
"redirect_url": "/azure/virtual-machine-scale-sets/virtual-machine-scale-sets-vertical-scale-reprovision",
22400+
"redirect_document_id": false
22401+
},
22402+
{
22403+
"source_path": "articles/virtual-machines/linux/vertical-scaling-automation.md",
22404+
"redirect_url": "/azure/virtual-machine-scale-sets/virtual-machine-scale-sets-vertical-scale-reprovision",
2235522405
"redirect_document_id": false
2235622406
},
2235722407
{
@@ -31661,7 +31711,7 @@
3166131711
},
3166231712
{
3166331713
"source_path": "articles/cognitive-services/QnAMaker/Guides/CreateKB.md",
31664-
"redirect_url": "/azure/cognitive-services/QnAMaker/How-To/create-knowledge-base",
31714+
"redirect_url": "/azure/cognitive-services/QnAMaker/Quickstarts/create-publish-knowledge-base",
3166531715
"redirect_document_id": false
3166631716
},
3166731717
{
@@ -35848,6 +35898,11 @@
3584835898
"redirect_url": "/azure/iot-central/quick-deploy-iot-central",
3584935899
"redirect_document_id": false
3585035900
},
35901+
{
35902+
"source_path": "articles/iot-central/howto-connect-powerbi-pnp.md",
35903+
"redirect_url": "/azure/iot-central/howto-connect-powerbi",
35904+
"redirect_document_id": false
35905+
},
3585135906
{
3585235907
"source_path": "articles/cognitive-services/QnAMaker/Quickstarts/update-kb-csharp.md",
3585335908
"redirect_url": "/azure/cognitive-services/QnAMaker/Quickstarts/csharp#Update",

articles/active-directory-b2c/jwt-issuer-technical-profile.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -49,7 +49,7 @@ The **InputClaims**, **OutputClaims**, and **PersistClaims** elements are empty
4949
| refresh_token_lifetime_secs | No | Refresh token lifetimes. The maximum time period before which a refresh token can be used to acquire a new access token, if your application had been granted the offline_access scope. The default is 120,9600 seconds (14 days). The minimum (inclusive) is 86,400 seconds (24 hours). The maximum (inclusive) is 7,776,000 seconds (90 days). |
5050
| rolling_refresh_token_lifetime_secs | No | Refresh token sliding window lifetime. After this time period elapses the user is forced to reauthenticate, irrespective of the validity period of the most recent refresh token acquired by the application. If you don't want to enforce a sliding window lifetime, set the value of allow_infinite_rolling_refresh_token to `true`. The default is 7,776,000 seconds (90 days). The minimum (inclusive) is 86,400 seconds (24 hours). The maximum (inclusive) is 31,536,000 seconds (365 days). |
5151
| allow_infinite_rolling_refresh_token | No | If set to `true`, the refresh token sliding window lifetime never expires. |
52-
| IssuanceClaimPattern | Yes | Controls the Issuer (iss) claim. One of the values:<ul><li>AuthorityAndTenantGuid - The iss claim includes your domain name, such as `login.microsoftonline` or `tenant-name.b2clogin.com`, and your tenant identifier https://login.microsoftonline.com/00000000-0000-0000-0000-000000000000/v2.0/</li><li>AuthorityWithTfp - The iss claim includes your domain name, such as `login.microsoftonline` or `tenant-name.b2clogin.com`, your tenant identifier and your relying party policy name. https://login.microsoftonline.com/tfp/00000000-0000-0000-0000-000000000000/b2c_1a_tp_sign-up-or-sign-in/v2.0/</li></ul> |
52+
| IssuanceClaimPattern | Yes | Controls the Issuer (iss) claim. One of the values:<ul><li>AuthorityAndTenantGuid - The iss claim includes your domain name, such as `login.microsoftonline` or `tenant-name.b2clogin.com`, and your tenant identifier https:\//login.microsoftonline.com/00000000-0000-0000-0000-000000000000/v2.0/</li><li>AuthorityWithTfp - The iss claim includes your domain name, such as `login.microsoftonline` or `tenant-name.b2clogin.com`, your tenant identifier and your relying party policy name. https:\//login.microsoftonline.com/tfp/00000000-0000-0000-0000-000000000000/b2c_1a_tp_sign-up-or-sign-in/v2.0/</li></ul> |
5353
| AuthenticationContextReferenceClaimPattern | No | Controls the `acr` claim value.<ul><li>None - Azure AD B2C doesn't issue the acr claim</li><li>PolicyId - the `acr` claim contains the policy name</li></ul>The options for setting this value are TFP (trust framework policy) and ACR (authentication context reference). It is recommended setting this value to TFP, to set the value, ensure the `<Item>` with the `Key="AuthenticationContextReferenceClaimPattern"` exists and the value is `None`. In your relying party policy, add `<OutputClaims>` item, add this element `<OutputClaim ClaimTypeReferenceId="trustFrameworkPolicy" Required="true" DefaultValue="{policy}" />`. Also make sure your policy contains the claim type `<ClaimType Id="trustFrameworkPolicy"> <DisplayName>trustFrameworkPolicy</DisplayName> <DataType>string</DataType> </ClaimType>` |
5454

5555
## Cryptographic keys

articles/active-directory-domain-services/manage-group-policy.md

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -35,6 +35,9 @@ To complete this article, you need the following resources and privileges:
3535
* If needed, complete the tutorial to [create a Windows Server VM and join it to a managed domain][create-join-windows-vm].
3636
* A user account that's a member of the *Azure AD DC administrators* group in your Azure AD tenant.
3737

38+
> [!NOTE]
39+
> As there's [no access to domain controllers in Azure AD DS](faqs.md#can-i-connect-to-the-domain-controller-for-my-managed-domain-using-remote-desktop), you can't create and use a Central Store for group policy administrative templates in a managed domain. [Sysvol isn't included in on-premises Azure AD Connect synchronization](synchronization.md#what-isnt-synchronized-to-azure-ad-ds), so you also can't create an on-premises Central Store and synchronize it to Azure AD DS through Azure AD.
40+
3841
## Install Group Policy Management tools
3942

4043
To create and configure Group Policy Object (GPOs), you need to install the Group Policy Management tools. These tools can be installed as a feature in Windows Server. For more information on how to install the administrative tools on a Windows client, see install [Remote Server Administration Tools (RSAT)][install-rsat].

articles/active-directory/develop/TOC.yml

Lines changed: 88 additions & 92 deletions
Original file line numberDiff line numberDiff line change
@@ -219,6 +219,94 @@
219219
href: scenario-mobile-call-api.md
220220
- name: Move to production
221221
href: scenario-mobile-production.md
222+
- name: Microsoft Authentication Library (MSAL)
223+
items:
224+
- name: Overview
225+
href: msal-overview.md
226+
- name: Accounts & tenant profiles (Android)
227+
href: accounts-overview.md
228+
- name: Authorization agents (Android)
229+
href: authorization-agents.md
230+
- name: Brokered auth (Android)
231+
href: brokered-auth.md
232+
- name: Migration
233+
items:
234+
- name: Migrate to MSAL.NET
235+
href: msal-net-migration.md
236+
- name: Migrate to MSAL.js
237+
href: msal-compare-msal-js-and-adal-js.md
238+
- name: Migrate to MSAL.Android
239+
href: migrate-android-adal-msal.md
240+
- name: Migrate to MSAL.iOS and MacOS
241+
href: migrate-objc-adal-msal.md
242+
- name: Migrate Xamarin apps using brokers from ADAL.NET to MSAL.NET
243+
href: msal-net-migration-ios-broker.md
244+
- name: Supported authentication flows
245+
href: msal-authentication-flows.md
246+
- name: Single and multi account public client apps (Android)
247+
href: single-multi-account.md
248+
- name: Acquire and cache tokens
249+
items:
250+
- name: Acquire and cache tokens
251+
href: msal-acquire-cache-tokens.md
252+
- name: Scopes for v1.0 apps
253+
href: msal-v1-app-scopes.md
254+
- name: Client applications
255+
items:
256+
- name: Client applications
257+
href: msal-client-applications.md
258+
- name: Application configuration (.NET)
259+
href: msal-client-application-configuration.md
260+
- name: Initialize applications (.NET)
261+
href: msal-net-initializing-client-applications.md
262+
- name: Client assertions (.NET)
263+
href: msal-net-client-assertions.md
264+
- name: Initialize applications (JS)
265+
href: msal-js-initializing-client-applications.md
266+
- name: Handle errors and exceptions
267+
href: msal-handling-exceptions.md
268+
- name: Logging
269+
href: msal-logging.md
270+
- name: Single sign-on
271+
items:
272+
- name: Single sign-on with MSAL.js
273+
href: msal-js-sso.md
274+
- name: Single sign-on with MSAL for iOS and macOS
275+
items:
276+
- name: SSO between MSAL apps
277+
href: single-sign-on-macos-ios.md
278+
- name: SSO between ADAL and MSAL apps
279+
href: sso-between-adal-msal-apps-macos-ios.md
280+
- name: Integrate with ADFS
281+
items:
282+
- name: ADFS support in MSAL.NET
283+
href: msal-net-adfs-support.md
284+
- name: Integrate with Azure AD B2C
285+
items:
286+
- name: Android
287+
href: msal-android-b2c.md
288+
- name: JavaScript
289+
href: msal-b2c-overview.md
290+
- name: .NET
291+
href: msal-net-aad-b2c-considerations.md
292+
- name: iOS and macOS
293+
href: config-authority.md#b2c
294+
- name: Considerations and known issues
295+
items:
296+
- name: MSAL.NET
297+
items:
298+
- name: Web browsers
299+
href: msal-net-web-browsers.md
300+
- name: MSAL.js
301+
items:
302+
- name: Considerations using IE
303+
href: msal-js-use-ie-browser.md
304+
- name: Known issues- IE and Microsoft Edge
305+
href: msal-js-known-issues-ie-edge-browsers.md
306+
- name: Known issues- Safari
307+
href: msal-js-known-issues-safari-browser.md
308+
- name: MSAL for iOS and macOS SSL issues
309+
href: ssl-issues.md
222310
- name: Authentication protocol
223311
items:
224312
- name: Application types and OAuth2.0
@@ -368,98 +456,6 @@
368456
href: vs-active-directory-webapi-what-happened.md
369457
- name: Error during authentication detection
370458
href: vs-active-directory-error.md
371-
- name: Microsoft Authentication Library (MSAL)
372-
items:
373-
- name: Overview
374-
href: msal-overview.md
375-
- name: Accounts & tenant profiles (Android)
376-
href: accounts-overview.md
377-
- name: Authorization agents (Android)
378-
href: authorization-agents.md
379-
- name: Brokered auth (Android)
380-
items:
381-
- name: Brokered auth (Android)
382-
href: brokered-auth.md
383-
- name: Migration
384-
items:
385-
- name: Migrate to MSAL.NET
386-
href: msal-net-migration.md
387-
- name: Migrate to MSAL.js
388-
href: msal-compare-msal-js-and-adal-js.md
389-
- name: Migrate to MSAL.Android
390-
href: migrate-android-adal-msal.md
391-
- name: Migrate to MSAL.iOS and MacOS
392-
href: migrate-objc-adal-msal.md
393-
- name: Migrate Xamarin apps using brokers from ADAL.NET to MSAL.NET
394-
href: msal-net-migration-ios-broker.md
395-
- name: Supported authentication flows
396-
href: msal-authentication-flows.md
397-
- name: Single and multi account public client apps (Android)
398-
href: single-multi-account.md
399-
- name: Acquire and cache tokens
400-
items:
401-
- name: Acquire and cache tokens
402-
href: msal-acquire-cache-tokens.md
403-
- name: Scopes for v1.0 apps
404-
href: msal-v1-app-scopes.md
405-
- name: Client applications
406-
items:
407-
- name: Client applications
408-
href: msal-client-applications.md
409-
- name: Application configuration (.NET)
410-
href: msal-client-application-configuration.md
411-
- name: Initialize applications (.NET)
412-
href: msal-net-initializing-client-applications.md
413-
- name: Client assertions (.NET)
414-
href: msal-net-client-assertions.md
415-
- name: Initialize applications (JS)
416-
href: msal-js-initializing-client-applications.md
417-
- name: Handle errors and exceptions
418-
href: msal-handling-exceptions.md
419-
- name: Logging
420-
href: msal-logging.md
421-
- name: Single sign-on
422-
items:
423-
- name: Single sign-on with MSAL.js
424-
href: msal-js-sso.md
425-
- name: Single sign-on with MSAL for iOS and macOS
426-
items:
427-
- name: SSO between MSAL apps
428-
href: single-sign-on-macos-ios.md
429-
- name: SSO between ADAL and MSAL apps
430-
href: sso-between-adal-msal-apps-macos-ios.md
431-
- name: Integrate with ADFS
432-
items:
433-
- name: ADFS support in MSAL.NET
434-
href: msal-net-adfs-support.md
435-
- name: Integrate with Azure AD B2C
436-
items:
437-
- name: Android
438-
href: msal-android-b2c.md
439-
- name: JavaScript
440-
href: msal-b2c-overview.md
441-
- name: .NET
442-
href: msal-net-aad-b2c-considerations.md
443-
- name: iOS and macOS
444-
href: config-authority.md#b2c
445-
- name: Considerations and known issues
446-
items:
447-
- name: MSAL.NET
448-
items:
449-
- name: Web browsers
450-
href: msal-net-web-browsers.md
451-
- name: MSAL.js
452-
items:
453-
- name: Considerations using IE
454-
href: msal-js-use-ie-browser.md
455-
- name: Known issues- IE and Microsoft Edge
456-
href: msal-js-known-issues-ie-edge-browsers.md
457-
- name: Known issues- Safari
458-
href: msal-js-known-issues-safari-browser.md
459-
- name: MSAL for iOS and macOS
460-
items:
461-
- name: SSL issues
462-
href: ssl-issues.md
463459
- name: References
464460
items:
465461
- name: Authentication libraries

articles/active-directory/develop/active-directory-saml-claims-customization.md

Lines changed: 15 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ ms.workload: identity
1414
ms.tgt_pltfrm: na
1515
ms.devlang: na
1616
ms.topic: conceptual
17-
ms.date: 04/03/2019
17+
ms.date: 10/01/2019
1818
ms.author: ryanwi
1919
ms.reviewer: luleon, paulgarn, jeedes
2020
ms.custom: aaddev
@@ -80,6 +80,20 @@ Select the desired source for the `NameIdentifier` (or NameID) claim. You can se
8080

8181
For more info, see [Table 3: Valid ID values per source](active-directory-claims-mapping.md#table-3-valid-id-values-per-source).
8282

83+
You can also assign any constant (static) value to any claims which you define in Azure AD. Please follow the below steps to assign a constant value:
84+
85+
1. In the [Azure portal](https://portal.azure.com/), on the **User Attributes & Claims** section, click on the **Edit** icon to edit the claims.
86+
87+
1. Click on the required claim which you want to modify.
88+
89+
1. Enter the constant value in the **Source attribute** as per your organization and click **Save**.
90+
91+
![Open the User Attributes & Claims section in the Azure portal](./media/active-directory-saml-claims-customization/organization-attribute.png)
92+
93+
1. The constant value will be displayed as below.
94+
95+
![Open the User Attributes & Claims section in the Azure portal](./media/active-directory-saml-claims-customization/edit-attributes-claims.png)
96+
8397
### Special claims - Transformations
8498

8599
You can also use the claims transformations functions.

0 commit comments

Comments
 (0)