Skip to content

Commit a438453

Browse files
authored
Merge branch 'master' into patch-2
2 parents 14dc294 + b5e66e7 commit a438453

File tree

799 files changed

+21153
-11296
lines changed

Some content is hidden

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

799 files changed

+21153
-11296
lines changed

.openpublishing.publish.config.json

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -419,6 +419,11 @@
419419
"url": "https://github.com/Azure/azure-cosmosdb-java",
420420
"branch": "master"
421421
},
422+
{
423+
"path_to_root": "azure-cosmosdb-graph-dotnet",
424+
"url": "https://github.com/Azure-Samples/azure-cosmos-db-graph-gremlindotnet-getting-started",
425+
"branch": "master"
426+
},
422427
{
423428
"path_to_root": "azure-cosmosdb-java-v4-getting-started",
424429
"url": "https://github.com/Azure-Samples/azure-cosmos-java-getting-started",

.openpublishing.redirection.json

Lines changed: 85 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -5775,6 +5775,11 @@
57755775
"redirect_url": "/azure/active-directory-b2c/custom-policy-multi-factor-authentication",
57765776
"redirect_document_id": true
57775777
},
5778+
{
5779+
"source_path": "articles/active-directory-b2c/view-usage-reports.md",
5780+
"redirect_url": "/azure/active-directory-b2c/view-audit-logs",
5781+
"redirect_document_id": false
5782+
},
57785783
{
57795784
"source_path": "articles/active-directory-b2c/active-directory-b2c-reference-audit-logs.md",
57805785
"redirect_url": "/azure/active-directory-b2c/view-audit-logs",
@@ -13805,6 +13810,11 @@
1380513810
"redirect_url": "https://docs.microsoft.com/azure/cosmos-db/geospatial",
1380613811
"redirect_document_id": false
1380713812
},
13813+
{
13814+
"source_path": "articles/cosmos-db/geospatial.md",
13815+
"redirect_url": "/azure/cosmos-db/sql-query-geospatial-intro",
13816+
"redirect_document_id": false
13817+
},
1380813818
{
1380913819
"source_path": "articles/documentdb/documentdb-get-started-quickstart.md",
1381013820
"redirect_url": "https://docs.microsoft.com/azure/cosmos-db/create-documentdb-dotnet",
@@ -18120,6 +18130,11 @@
1812018130
"redirect_url": "/azure/virtual-machine-scale-sets/disk-encryption-powershell",
1812118131
"redirect_document_id": true
1812218132
},
18133+
{
18134+
"source_path": "articles/virtual-machines/linux/update-infrastructure-redhat.md",
18135+
"redirect_url": "/azure/virtual-machines/workloads/redhat/redhat-rhui",
18136+
"redirect_document_id": false
18137+
},
1812318138
{
1812418139
"source_path": "articles/virtual-machine-scale-sets/virtual-machine-scale-sets-advanced-autoscale.md",
1812518140
"redirect_url": "/azure/monitoring-and-diagnostics/insights-advanced-autoscale-virtual-machine-scale-sets",
@@ -23527,7 +23542,7 @@
2352723542
},
2352823543
{
2352923544
"source_path": "articles/virtual-machines/virtual-machines-linux-update-infrastructure-redhat.md",
23530-
"redirect_url": "/azure/virtual-machines/linux/update-infrastructure-redhat",
23545+
"redirect_url": "/azure/virtual-machines/workloads/redhat/redhat-rhui",
2353123546
"redirect_document_id": false
2353223547
},
2353323548
{
@@ -31416,8 +31431,8 @@
3141631431
"redirect_document_id": false
3141731432
},
3141831433
{
31419-
"source_path": "articles/key-vault/key-vault-security-attributes.md",
31420-
"redirect_url": "/azure/key-vault/key-vault-security-controls",
31434+
"source_path": "articles/key-vault/key-vault-security-controls.md",
31435+
"redirect_url": "/azure/key-vault/security-baseline",
3142131436
"redirect_document_id": false
3142231437
},
3142331438
{
@@ -35545,6 +35560,11 @@
3554535560
"redirect_url": "/azure/iot-accelerators/iot-accelerators-device-simulation-advanced-device",
3554635561
"redirect_document_id": false
3554735562
},
35563+
{
35564+
"source_path": "articles/active-directory/conditional-access/app-based-mfa.md",
35565+
"redirect_url": "/azure/active-directory/authentication/tutorial-enable-azure-mfa",
35566+
"redirect_document_id": false
35567+
},
3554835568
{
3554935569
"source_path": "articles/active-directory/conditional-access/technical-reference.md",
3555035570
"redirect_url": "/azure/active-directory/conditional-access/concept-conditional-access-conditions",
@@ -36297,8 +36317,13 @@
3629736317
},
3629836318
{
3629936319
"source_path": "articles/active-directory/active-directory-enterprise-apps-manage-sso.md",
36300-
"redirect_url": "/azure/active-directory/manage-apps/configure-single-sign-on-portal",
36301-
"redirect_document_id": true
36320+
"redirect_url": "/azure/active-directory/manage-apps/configure-single-sign-on-non-gallery-applications",
36321+
"redirect_document_id": false
36322+
},
36323+
{
36324+
"source_path": "articles/active-directory/manage-apps/configure-single-sign-on-portal.md",
36325+
"redirect_url": "/azure/active-directory/manage-apps/configure-single-sign-on-non-gallery-applications",
36326+
"redirect_document_id": false
3630236327
},
3630336328
{
3630436329
"source_path": "articles/active-directory/active-directory-enterprise-apps-advance-certificate-options.md",
@@ -36492,8 +36517,13 @@
3649236517
},
3649336518
{
3649436519
"source_path": "articles/active-directory/application-config-add-app-problem-how-to-choose-application-type.md",
36495-
"redirect_url": "/azure/active-directory/manage-apps/choose-application-type",
36496-
"redirect_document_id": true
36520+
"redirect_url": "/azure/active-directory/app-provisioning/isv-automatic-provisioning-multi-tenant-apps",
36521+
"redirect_document_id": false
36522+
},
36523+
{
36524+
"source_path": "articles/active-directory/manage-apps/choose-application-type.md",
36525+
"redirect_url": "/azure/active-directory/app-provisioning/isv-automatic-provisioning-multi-tenant-apps",
36526+
"redirect_document_id": false
3649736527
},
3649836528
{
3649936529
"source_path": "articles/active-directory/application-config-add-app-problem-problem-adding-gallery-app.md",
@@ -36512,8 +36542,13 @@
3651236542
},
3651336543
{
3651436544
"source_path": "articles/active-directory/application-config-sso-how-to-configure-federated-sso-gallery.md",
36515-
"redirect_url": "/azure/active-directory/manage-apps/configure-federated-single-sign-on-gallery-applications",
36516-
"redirect_document_id": true
36545+
"redirect_url": "/azure/active-directory/manage-apps/configure-single-sign-on-non-gallery-applications",
36546+
"redirect_document_id": false
36547+
},
36548+
{
36549+
"source_path": "articles/active-directory/manage-apps/configure-federated-single-sign-on-gallery-applications.md",
36550+
"redirect_url": "/azure/active-directory/manage-apps/configure-single-sign-on-non-gallery-applications",
36551+
"redirect_document_id": false
3651736552
},
3651836553
{
3651936554
"source_path": "articles/active-directory/application-config-sso-how-to-configure-federated-sso-non-gallery.md",
@@ -36522,8 +36557,13 @@
3652236557
},
3652336558
{
3652436559
"source_path": "articles/active-directory/application-config-sso-how-to-configure-password-sso-gallery.md",
36525-
"redirect_url": "/azure/active-directory/manage-apps/configure-password-single-sign-on-gallery-applications",
36526-
"redirect_document_id": true
36560+
"redirect_url": "/azure/active-directory/manage-apps/configure-password-single-sign-on-non-gallery-applications",
36561+
"redirect_document_id": false
36562+
},
36563+
{
36564+
"source_path": "articles/active-directory/manage-apps/configure-password-single-sign-on-gallery-applications.md",
36565+
"redirect_url": "/azure/active-directory/manage-apps/configure-password-single-sign-on-non-gallery-applications",
36566+
"redirect_document_id": false
3652736567
},
3652836568
{
3652936569
"source_path": "articles/active-directory/application-config-sso-how-to-configure-password-sso-non-gallery.md",
@@ -36552,8 +36592,13 @@
3655236592
},
3655336593
{
3655436594
"source_path": "articles/active-directory/application-provisioning-config-how-to.md",
36555-
"redirect_url": "/azure/active-directory/manage-apps/application-provisioning-config-how-to",
36556-
"redirect_document_id": true
36595+
"redirect_url": "/azure/active-directory/app-provisioning/configure-automatic-user-provisioning-portal",
36596+
"redirect_document_id": false
36597+
},
36598+
{
36599+
"source_path": "articles/active-directory/manage-apps/application-provisioning-config-how-to.md",
36600+
"redirect_url": "/azure/active-directory/app-provisioning/configure-automatic-user-provisioning-portal",
36601+
"redirect_document_id": false
3655736602
},
3655836603
{
3655936604
"source_path": "articles/active-directory/application-provisioning-config-problem-no-users-provisioned.md",
@@ -37215,11 +37260,6 @@
3721537260
"redirect_url": "/azure/active-directory/user-help/myprofile-portal-overview",
3721637261
"redirect_document_id": false
3721737262
},
37218-
{
37219-
"source_path": "articles/active-directory/authentication/howto-authentication-passwordless-security-key-on-premises.md",
37220-
"redirect_url": "/azure/active-directory/authentication/howto-authentication-passwordless-security-key-windows",
37221-
"redirect_document_id": false
37222-
},
3722337263
{
3722437264
"source_path": "articles/active-directory/authentication/quickstart-sspr.md",
3722537265
"redirect_url": "/azure/active-directory/authentication/tutorial-enable-sspr",
@@ -45557,12 +45597,12 @@
4555745597
},
4555845598
{
4555945599
"source_path": "articles/iot-central/core/howto-export-data-blob-storage.md",
45560-
"redirect_url": "/azure/iot-central/core/",
45600+
"redirect_url": "/azure/iot-central/core/howto-export-data/",
4556145601
"redirect_document_id": false
4556245602
},
4556345603
{
4556445604
"source_path": "articles/iot-central/core/howto-export-data-event-hubs-service-bus.md",
45565-
"redirect_url": "/azure/iot-central/core/",
45605+
"redirect_url": "/azure/iot-central/core/howto-export-data/",
4556645606
"redirect_document_id": false
4556745607
},
4556845608
{
@@ -48805,6 +48845,31 @@
4880548845
"source_path": "articles/terraform/terraform-vm-managed-identities-for-azure-resources.md",
4880648846
"redirect_url": "/azure/terraform/terraform-create-complete-vm",
4880748847
"redirect_document_id": false
48848+
},
48849+
{
48850+
"source_path": "articles/cognitive-services/Speech-Service/speech-devices-sdk-android-quickstart.md",
48851+
"redirect_url": "/azure/cognitive-services/speech-service/speech-devices-sdk-quickstart?pivots=platform-android",
48852+
"redirect_document_id": false
48853+
},
48854+
{
48855+
"source_path": "articles/cognitive-services/Speech-Service/speech-devices-sdk-linux-quickstart.md",
48856+
"redirect_url": "/azure/cognitive-services/speech-service/speech-devices-sdk-quickstart?pivots=platform-linux",
48857+
"redirect_document_id": false
48858+
},
48859+
{
48860+
"source_path": "articles/cognitive-services/Speech-Service/speech-devices-sdk-windows-quickstart.md",
48861+
"redirect_url": "/azure/cognitive-services/speech-service/speech-devices-sdk-quickstart?pivots=platform-windows",
48862+
"redirect_document_id": false
48863+
},
48864+
{
48865+
"source_path": "articles/media-services/previous/media-services-develop-video-players.md",
48866+
"redirect_url": "/azure/media-services",
48867+
"redirect_document_id": false
48868+
},
48869+
{
48870+
"source_path": "articles/virtual-machines/windows/chef-automation.md",
48871+
"redirect_url": "/azure/chef/chef-automation",
48872+
"redirect_document_id": true
4880848873
}
4880948874
]
4881048875
}

articles/active-directory-b2c/TOC.yml

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -350,8 +350,6 @@
350350
- name: Azure Monitor
351351
href: azure-monitor.md
352352
displayName: log, logs, logging, usage, events
353-
- name: Export usage report
354-
href: view-usage-reports.md
355353
- name: Account management
356354
href: manage-user-accounts-graph-api.md
357355
- name: Deploy with Azure Pipelines

articles/active-directory-b2c/billing.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -136,4 +136,4 @@ Before you initiate the move, be sure to read the entire article to fully unders
136136

137137
## Next steps
138138

139-
In addition to reviewing the usage and billing details within a selected Azure subscription, you can review detailed day-by-day usage reports by using the [usage reporting API](view-usage-reports.md).
139+
For the latest pricing information, see [Azure Active Directory B2C pricing](https://azure.microsoft.com/pricing/details/active-directory-b2c/).

articles/active-directory-b2c/claimsschema.md

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ manager: celestedg
88
ms.service: active-directory
99
ms.workload: identity
1010
ms.topic: reference
11-
ms.date: 02/17/2020
11+
ms.date: 02/24/2020
1212
ms.author: marsma
1313
ms.subservice: B2C
1414
---
@@ -171,6 +171,8 @@ The **Restriction** element contains the following elements:
171171

172172
#### Enumeration
173173

174+
The **Enumeration** element defines available options for the user to select for a claim in the user interface, such as a value in a `CheckboxMultiSelect`, `DropdownSingleSelect`, or `RadioSingleSelect`. Alternatively, you can define and localize available options with [LocalizedCollections](localization.md#localizedcollections) element. To look up an item from a claim **Enumeration** collection, use [GetMappedValueFromLocalizedCollection](string-transformations.md#getmappedvaluefromlocalizedcollection) claims transformation.
175+
174176
The **Enumeration** element contains the following attributes:
175177

176178
| Attribute | Required | Description |
@@ -243,7 +245,7 @@ The **UserInputType** element available user input types:
243245
|Paragraph | `boolean`, `date`, `dateTime`, `duration`, `int`, `long`, `string`|A field that shows text only in a paragraph tag. |
244246
|Password | `string` |Password text box.|
245247
|RadioSingleSelect |`string` | Collection of radio buttons. The claim value is the selected value.|
246-
|Readonly | `boolean`, `date`, `dateTime`, `duration`, `int`, `long`, `string`| Read only text box. |
248+
|Readonly | `boolean`, `date`, `dateTime`, `duration`, `int`, `long`, `string`| Read-only text box. |
247249
|TextBox |`boolean`, `int`, `string` |Single-line text box. |
248250

249251

@@ -403,5 +405,3 @@ The **Paragraph** user input type is used to provide a field that shows text onl
403405
</Restriction>
404406
</ClaimType>
405407
```
406-
407-
To display one of the **Enumeration** values in a **responseMsg** claim, use `GetMappedValueFromLocalizedCollection` or `CreateStringClaim` claims transformation. For more information, see [String Claims Transformations](string-transformations.md)

articles/active-directory-b2c/connect-with-saml-service-providers.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.workload: identity
1111
ms.topic: reference
12-
ms.date: 12/10/2019
12+
ms.date: 02/24/2020
1313
ms.author: marsma
1414
ms.subservice: B2C
1515
ms.custom: fasttrack-edit
@@ -255,7 +255,7 @@ Your final relying party policy file should look like the following:
255255

256256
Save your changes and upload the new policy file. After you've uploaded both policies (the extension and the relying party files), open a web browser and navigate to the policy metadata.
257257

258-
The Azure AD B2C policy metadata is available at the following URL. Replace `tenant-name` with the name of your Azure AD B2C tenant, and `policy-name` with the name (ID) of the policy:
258+
Azure AD B2C policy IDP metadata is information used in the SAML protocol to expose the configuration of a SAML identity provider. Metadata defines the location of the services, such as sign-in and sign-out, certificates, sign-in method, and more. The Azure AD B2C policy metadata is available at the following URL. Replace `tenant-name` with the name of your Azure AD B2C tenant, and `policy-name` with the name (ID) of the policy:
259259

260260
`https://tenant-name.b2clogin.com/tenant-name.onmicrosoft.com/policy-name/Samlp/metadata`
261261

articles/active-directory-b2c/microsoft-graph-operations.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.workload: identity
1111
ms.topic: reference
12-
ms.date: 02/14/2020
12+
ms.date: 02/20/2020
1313
ms.author: marsma
1414
ms.subservice: B2C
1515
---
@@ -52,7 +52,7 @@ Configure pre-built policies for sign-up, sign-in, combined sign-up and sign-in,
5252

5353
The following operations allow you to manage your Azure AD B2C Trust Framework policies, known as [custom policies](custom-policy-overview.md).
5454

55-
- [List all trust framework policies configured in a tenant](https://docs.microsoft.com/graph/api/trustframework-list-trustframeworkpolicies.md)
55+
- [List all trust framework policies configured in a tenant](https://docs.microsoft.com/graph/api/trustframework-list-trustframeworkpolicies)
5656
- [Create trust framework policy](https://docs.microsoft.com/graph/api/trustframework-post-trustframeworkpolicy)
5757
- [Read properties of an existing trust framework policy](https://docs.microsoft.com/graph/api/trustframeworkpolicy-get)
5858
- [Update or create trust framework policy.](https://docs.microsoft.com/graph/api/trustframework-put-trustframeworkpolicy)

articles/active-directory-b2c/oauth2-technical-profile.md

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ manager: celestedg
99
ms.service: active-directory
1010
ms.workload: identity
1111
ms.topic: reference
12-
ms.date: 02/13/2020
12+
ms.date: 02/24/2020
1313
ms.author: marsma
1414
ms.subservice: B2C
1515
---
@@ -93,6 +93,7 @@ The technical profile also returns claims that aren't returned by the identity p
9393
| ExtraParamsInAccessTokenEndpointResponse | No | Contains the extra parameters that can be returned in the response from **AccessTokenEndpoint** by some identity providers. For example, the response from **AccessTokenEndpoint** contains an extra parameter such as `openid`, which is a mandatory parameter besides the access_token in a **ClaimsEndpoint** request query string. Multiple parameter names should be escaped and separated by the comma ',' delimiter. |
9494
| ExtraParamsInClaimsEndpointRequest | No | Contains the extra parameters that can be returned in the **ClaimsEndpoint** request by some identity providers. Multiple parameter names should be escaped and separated by the comma ',' delimiter. |
9595
| IncludeClaimResolvingInClaimsHandling  | No | For input and output claims, specifies whether [claims resolution](claim-resolver-overview.md) is included in the technical profile. Possible values: `true`, or `false` (default). If you want to use a claims resolver in the technical profile, set this to `true`. |
96+
| ResolveJsonPathsInJsonTokens | No | Indicates whether the technical profile resolves JSON paths. Possible values: `true`, or `false` (default). Use this metadata to read data from a nested JSON element. In an [OutputClaim](technicalprofiles.md#outputclaims), set the `PartnerClaimType` to the JSON path element you want to output. For example: `firstName.localized`, or `data.0.to.0.email`.|
9697

9798
## Cryptographic keys
9899

0 commit comments

Comments
 (0)