Skip to content

Commit 856db17

Browse files
authored
Merge pull request #113218 from MicrosoftDocs/master
4/29 AM Publish
2 parents eaec2e7 + fe52fb2 commit 856db17

File tree

428 files changed

+1837
-1301
lines changed

Some content is hidden

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

428 files changed

+1837
-1301
lines changed

.openpublishing.redirection.json

Lines changed: 115 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -51485,6 +51485,121 @@
5148551485
"redirect_url": "/azure/media-services",
5148651486
"redirect_document_id": false
5148751487
},
51488+
{
51489+
"source_path": "articles/databox-online/data-box-edge-deploy-add-shares.md",
51490+
"redirect_url": "/azure/databox-online/azure-stack-edge-deploy-add-shares",
51491+
"redirect_document_id": false
51492+
},
51493+
{
51494+
"source_path": "articles/databox-online/data-box-edge-connect-powershell-interface.md",
51495+
"redirect_url": "/azure/databox-online/azure-stack-edge-connect-powershell-interface",
51496+
"redirect_document_id": false
51497+
},
51498+
{
51499+
"source_path": "articles/databox-online/data-box-edge-contact-microsoft-support.md",
51500+
"redirect_url": "/azure/databox-online/azure-stack-edge-contact-microsoft-support",
51501+
"redirect_document_id": false
51502+
},
51503+
{
51504+
"source_path": "articles/databox-online/data-box-edge-create-iot-edge-module.md",
51505+
"redirect_url": "/azure/databox-online/azure-stack-edge-create-iot-edge-module",
51506+
"redirect_document_id": false
51507+
},
51508+
{
51509+
"source_path": "articles/databox-online/data-box-edge-deploy-configure-compute.md",
51510+
"redirect_url": "/azure/databox-online/azure-stack-edge-deploy-configure-compute",
51511+
"redirect_document_id": false
51512+
},
51513+
{
51514+
"source_path": "articles/databox-online/data-box-edge-deploy-configure-compute-advanced.md",
51515+
"redirect_url": "/azure/databox-online/azure-stack-edge-deploy-configure-compute-advanced",
51516+
"redirect_document_id": false
51517+
},
51518+
{
51519+
"source_path": "articles/databox-online/data-box-edge-deploy-connect-setup-activate.md",
51520+
"redirect_url": "/azure/databox-online/azure-stack-edge-deploy-connect-setup-activate",
51521+
"redirect_document_id": false
51522+
},
51523+
{
51524+
"source_path": "articles/databox-online/data-box-edge-deploy-install.md",
51525+
"redirect_url": "/azure/databox-online/azure-stack-edge-deploy-install",
51526+
"redirect_document_id": false
51527+
},
51528+
{
51529+
"source_path": "articles/databox-online/data-box-edge-deploy-prep.md",
51530+
"redirect_url": "/azure/databox-online/azure-stack-edge-deploy-prep",
51531+
"redirect_document_id": false
51532+
},
51533+
{
51534+
"source_path": "articles/databox-online/data-box-edge-extend-compute-access-modules.md",
51535+
"redirect_url": "/azure/databox-online/azure-stack-edge-extend-compute-access-modules",
51536+
"redirect_document_id": false
51537+
},
51538+
{
51539+
"source_path": "articles/databox-online/data-box-edge-limits.md",
51540+
"redirect_url": "/azure/databox-online/azure-stack-edge-limits",
51541+
"redirect_document_id": false
51542+
},
51543+
{
51544+
"source_path": "articles/databox-online/data-box-edge-manage-access-power-connectivity-mode.md",
51545+
"redirect_url": "/azure/databox-online/azure-stack-edge-manage-access-power-connectivity-mode",
51546+
"redirect_document_id": false
51547+
},
51548+
{
51549+
"source_path": "articles/databox-online/data-box-edge-manage-bandwidth-schedules.md",
51550+
"redirect_url": "/azure/databox-online/azure-stack-edge-manage-bandwidth-schedules",
51551+
"redirect_document_id": false
51552+
},
51553+
{
51554+
"source_path": "articles/databox-online/data-box-edge-manage-compute.md",
51555+
"redirect_url": "/azure/databox-online/azure-stack-edge-manage-compute",
51556+
"redirect_document_id": false
51557+
},
51558+
{
51559+
"source_path": "articles/databox-online/data-box-edge-manage-shares.md",
51560+
"redirect_url": "/azure/databox-online/azure-stack-edge-manage-shares",
51561+
"redirect_document_id": false
51562+
},
51563+
{
51564+
"source_path": "articles/databox-online/data-box-edge-manage-users.md",
51565+
"redirect_url": "/azure/databox-online/azure-stack-edge-manage-users",
51566+
"redirect_document_id": false
51567+
},
51568+
{
51569+
"source_path": "articles/databox-online/data-box-edge-monitor.md",
51570+
"redirect_url": "/azure/databox-online/azure-stack-edge-monitor",
51571+
"redirect_document_id": false
51572+
},
51573+
{
51574+
"source_path": "articles/databox-online/data-box-edge-overview.md",
51575+
"redirect_url": "/azure/databox-online/azure-stack-edge-overview",
51576+
"redirect_document_id": false
51577+
},
51578+
{
51579+
"source_path": "articles/databox-online/data-box-edge-return-device.md",
51580+
"redirect_url": "/azure/databox-online/azure-stack-edge-return-device",
51581+
"redirect_document_id": false
51582+
},
51583+
{
51584+
"source_path": "articles/databox-online/data-box-edge-security.md",
51585+
"redirect_url": "/azure/databox-online/azure-stack-edge-security",
51586+
"redirect_document_id": false
51587+
},
51588+
{
51589+
"source_path": "articles/databox-online/data-box-edge-system-requirements.md",
51590+
"redirect_url": "/azure/databox-online/azure-stack-edge-system-requirements",
51591+
"redirect_document_id": false
51592+
},
51593+
{
51594+
"source_path": "articles/databox-online/data-box-edge-technical-specifications-compliance.md",
51595+
"redirect_url": "/azure/databox-online/azure-stack-edge-technical-specifications-compliance",
51596+
"redirect_document_id": false
51597+
},
51598+
{
51599+
"source_path": "articles/databox-online/data-box-edge-troubleshoot.md",
51600+
"redirect_url": "/azure/databox-online/azure-stack-edge-troubleshoot",
51601+
"redirect_document_id": false
51602+
},
5148851603
{
5148951604
"source_path": "articles/aks/kubernetes-draft.md",
5149051605
"redirect_url": "/azure/aks/quickstart-helm",

articles/active-directory-b2c/userjourneys.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -60,7 +60,7 @@ The **OrchestrationStep** element contains the following attributes:
6060
| Attribute | Required | Description |
6161
| --------- | -------- | ----------- |
6262
| `Order` | Yes | The order of the orchestration steps. |
63-
| `Type` | Yes | The type of the orchestration step. Possible values: <ul><li>**ClaimsProviderSelection** - Indicates that the orchestration step presents various claims providers to the user to select one.</li><li>**CombinedSignInAndSignUp** - Indicates that the orchestration step presents a combined social provider sign-in and local account sign-up page.</li><li>**ClaimsExchange** - Indicates that the orchestration step exchanges claims with a claims provider.</li><li>**GetClaims** - Indicates that the orchestration step reads the input claims.</li><li>**SendClaims** - Indicates that the orchestration step sends the claims to the relying party with a token issued by a claims issuer.</li></ul> |
63+
| `Type` | Yes | The type of the orchestration step. Possible values: <ul><li>**ClaimsProviderSelection** - Indicates that the orchestration step presents various claims providers to the user to select one.</li><li>**CombinedSignInAndSignUp** - Indicates that the orchestration step presents a combined social provider sign-in and local account sign-up page.</li><li>**ClaimsExchange** - Indicates that the orchestration step exchanges claims with a claims provider.</li><li>**GetClaims** - Specifies that the orchestration step should process claim data sent to Azure AD B2C from the relying party via its `InputClaims` configuration.</li><li>**SendClaims** - Indicates that the orchestration step sends the claims to the relying party with a token issued by a claims issuer.</li></ul> |
6464
| ContentDefinitionReferenceId | No | The identifier of the [content definition](contentdefinitions.md) associated with this orchestration step. Usually the content definition reference identifier is defined in the self-asserted technical profile. But, there are some cases when Azure AD B2C needs to display something without a technical profile. There are two examples - if the type of the orchestration step is one of following: `ClaimsProviderSelection` or `CombinedSignInAndSignUp`, Azure AD B2C needs to display the identity provider selection without having a technical profile. |
6565
| CpimIssuerTechnicalProfileReferenceId | No | The type of the orchestration step is `SendClaims`. This property defines the technical profile identifier of the claims provider that issues the token for the relying party. If absent, no relying party token is created. |
6666

articles/active-directory/app-provisioning/how-provisioning-works.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ ms.collection: M365-identity-device-management
2222

2323
Automatic provisioning refers to creating user identities and roles in the cloud applications that users need access to. In addition to creating user identities, automatic provisioning includes the maintenance and removal of user identities as status or roles change. Before you start a deployment, you can review this article to learn how Azure AD provision works and get configuration recommendations.
2424

25-
The **Azure AD Provisioning Service** provisions users to SaaS apps and other systems by connecting to a System for Cross-Domain Identity Management (SCIM) 2.0 user management API endpoint provided by the application vendor. This SCIM endpoint allows Azure AD to programmatically create, update, and remove users. For selected applications, the provisioning service can also create, update, and remove additional identity-related objects, such as groups and roles. The channel used for provisioning between Azure AD and the application is encrypted using HTTPS TLS encryption.
25+
The **Azure AD Provisioning Service** provisions users to SaaS apps and other systems by connecting to a System for Cross-Domain Identity Management (SCIM) 2.0 user management API endpoint provided by the application vendor. This SCIM endpoint allows Azure AD to programmatically create, update, and remove users. For selected applications, the provisioning service can also create, update, and remove additional identity-related objects, such as groups and roles. The channel used for provisioning between Azure AD and the application is encrypted using HTTPS TLS 1.2 encryption.
2626

2727

2828
![Azure AD Provisioning Service](./media/how-provisioning-works/provisioning0.PNG)

articles/active-directory/develop/scenario-web-app-call-api-call-api.md

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -56,10 +56,9 @@ public async Task<IActionResult> Profile()
5656
var content = await response.Content.ReadAsStringAsync();
5757

5858
dynamic me = JsonConvert.DeserializeObject(content);
59-
return me;
59+
ViewData["Me"] = me;
6060
}
6161

62-
ViewData["Me"] = me;
6362
return View();
6463
}
6564
```

articles/active-directory/users-groups-roles/groups-naming-policy.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,7 @@ You can enforce naming policy for groups in two different ways:
3737

3838
### Prefix-suffix naming policy
3939

40-
The general structure of the naming convention is ‘Prefix[GroupName]Suffix’. While you can define multiple prefixes and suffixes, you can only have one instance of the [GroupName] in the setting. The prefixes or suffixes can be either fixed strings or user attributes such as \[Department\] that are substituted based on the user who is creating the group. The total allowable number of characters for your prefix and suffix strings combined is 53 characters.
40+
The general structure of the naming convention is ‘Prefix[GroupName]Suffix’. While you can define multiple prefixes and suffixes, you can only have one instance of the [GroupName] in the setting. The prefixes or suffixes can be either fixed strings or user attributes such as \[Department\] that are substituted based on the user who is creating the group. The total allowable number of characters for your prefix and suffix strings including group name is 53 characters.
4141

4242
Prefixes and suffixes can contain special characters that are supported in group name and group alias. Any characters in the prefix or suffix that are not supported in the group alias are still applied in the group name, but removed from the group alias. Because of this restriction, the prefixes and suffixes applied to the group name might be different from the ones applied to the group alias.
4343

articles/aks/configure-kubenet.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -195,7 +195,7 @@ When you create an AKS cluster, a network security group and route table are cre
195195

196196
## Next steps
197197

198-
With an AKS cluster deployed into your existing virtual network subnet, you can now use the cluster as normal. Get started with [building apps using Azure Dev Spaces][dev-spaces] or [using Draft][use-draft], or [deploy apps using Helm][use-helm].
198+
With an AKS cluster deployed into your existing virtual network subnet, you can now use the cluster as normal. Get started with [building apps using Azure Dev Spaces][dev-spaces], [deploy existing apps using Helm][use-helm], or [creating new apps using Helm][develop-helm].
199199

200200
<!-- LINKS - External -->
201201
[dev-spaces]: https://docs.microsoft.com/azure/dev-spaces/
@@ -213,8 +213,8 @@ With an AKS cluster deployed into your existing virtual network subnet, you can
213213
[az-network-vnet-subnet-show]: /cli/azure/network/vnet/subnet#az-network-vnet-subnet-show
214214
[az-role-assignment-create]: /cli/azure/role/assignment#az-role-assignment-create
215215
[az-aks-create]: /cli/azure/aks#az-aks-create
216+
[develop-helm]: quickstart-helm.md
216217
[use-helm]: kubernetes-helm.md
217-
[use-draft]: kubernetes-draft.md
218218
[virtual-nodes]: virtual-nodes-cli.md
219219
[vnet-peering]: ../virtual-network/virtual-network-peering-overview.md
220220
[express-route]: ../expressroute/expressroute-introduction.md

0 commit comments

Comments
 (0)