Skip to content

Commit 7d426fe

Browse files
authored
Merge pull request #211802 from MicrosoftDocs/repo_sync_working_branch
Confirm merge from repo_sync_working_branch to main to sync with https://github.com/MicrosoftDocs/azure-docs (branch main)
2 parents e2194af + fe31d09 commit 7d426fe

File tree

8 files changed

+20
-20
lines changed

8 files changed

+20
-20
lines changed

articles/active-directory/fundamentals/multi-tenant-user-management-introduction.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -98,7 +98,7 @@ There are several mechanisms available for creating and managing the lifecycle o
9898

9999
| Mechanism | Description | Best when |
100100
| - | - | - |
101-
| [End-user-initiated](multi-tenant-user-management-scenarios.md#end-user-initiated-scenario) | Resource tenant admins delegate the ability to invite guest users to the tenant, an app, or a resource to users within the resource tenant. Users from the home tenant are invited or sign up individually. | <li>Users need improvised access to resources. <li>No automatic synchronization of user attributes is necessary.<li>Unified GAL is not needed.a |
101+
| [End-user-initiated](multi-tenant-user-management-scenarios.md#end-user-initiated-scenario) | Resource tenant admins delegate the ability to invite guest users to the tenant, an app, or a resource to users within the resource tenant. Users from the home tenant are invited or sign up individually. | <li>Users need improvised access to resources. <li>No automatic synchronization of user attributes is necessary.<li>Unified GAL is not needed. |
102102
|[Scripted](multi-tenant-user-management-scenarios.md#scripted-scenario) | Resource tenant administrators deploy a scripted “pull” process to automate discovery and provisioning of guest users to support sharing scenarios. | <li>No more than two tenants.<li>No automatic synchronization of user attributes is necessary.<li>Users need pre-configured (not improvised) access to resources.|
103103
|[Automated](multi-tenant-user-management-scenarios.md#automated-scenario)|Resource tenant admins use an identity provisioning system to automate the provisioning and deprovisioning processes. | <li>Full identity lifecycle management with provisioning and deprovisioning must be automated.<li>Attribute syncing is required to populate the GAL details and support dynamic entitlement scenarios.<li>Users need pre-configured (not ad hoc) access to resources on “Day One”.|
104104

articles/active-directory/governance/what-are-lifecycle-workflows.md

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ Azure AD Lifecycle Workflows is a new Azure AD Identity Governance service that
2323

2424
Workflows contain specific processes, which run automatically against users as they move through their life cycle. Workflows are made up of [Tasks](lifecycle-workflow-tasks.md) and [Execution conditions](understanding-lifecycle-workflows.md#understanding-lifecycle-workflows).
2525

26-
Tasks are specific actions that run automatically when a workflow is triggered. An Execution condition defines the 'Scope' of "who and the 'Trigger' of when a workflow will be performed. For example, send a manager an email 7 days before the value in the NewEmployeeHireDate attribute of new employees, can be described as a workflow. It consists of:
26+
Tasks are specific actions that run automatically when a workflow is triggered. An Execution condition defines the 'Scope' of "who" and the 'Trigger' of "when" a workflow will be performed. For example, sending a manager an email 7 days before the value in the NewEmployeeHireDate attribute of new employees can be described as a workflow. It consists of:
2727
- Task: send email
2828
- When (trigger): Seven days before the NewEmployeeHireDate attribute value
2929
- Who (scope): new employees
@@ -40,17 +40,17 @@ Finally, Lifecycle Workflows can even [integrate with Logic Apps](lifecycle-work
4040
Anyone who wants to modernize their identity lifecycle management process for employees, needs to ensure:
4141

4242
- **New employee on-boarding** - That when a user joins the organization, they're ready to go on day one. They have the correct access to the information, membership to groups, and applications they need.
43-
- **Employee retirement/terminations/off-boarding** - That users who are no longer tied to the company for various reasons (termination, separation, leave of absence or retirement), have their access revoked in a timely manner
43+
- **Employee retirement/terminations/off-boarding** - That users who are no longer tied to the company for various reasons (termination, separation, leave of absence or retirement), have their access revoked in a timely manner.
4444
- **Easy to administer in my organization** - That there's a seamless process to accomplish the above tasks, that isn't overly burdensome or time consuming for Administrators.
4545
- **Robust troubleshooting/auditing/compliance** - That there's the ability to easily troubleshoot issues when they arise and that there's sufficient logging to help with this and compliance related issues.
4646

4747
The following are key reasons to use Lifecycle workflows.
4848
- **Extend** your HR-driven provisioning process with other workflows that simplify and automate tasks.
4949
- **Centralize** your workflow process so you can easily create and manage workflows all in one location.
50-
- Easily **troubleshoot** workflow scenarios with the Workflow history and Audit logs
50+
- Easily **troubleshoot** workflow scenarios with the Workflow history and Audit logs.
5151
- **Manage** user lifecycle at scale. As your organization grows, the need for other resources to manage user lifecycles are reduced.
52-
- **Reduce** or remove manual tasks that were done in the past with automated lifecycle workflows
53-
- **Apply** logic apps to extend workflows for more complex scenarios using your existing Logic apps
52+
- **Reduce** or remove manual tasks that were done in the past with automated lifecycle workflows.
53+
- **Apply** logic apps to extend workflows for more complex scenarios using your existing Logic apps.
5454

5555

5656
All of the above can help ensure a holistic experience by allowing you to remove other dependencies and applications to achieve the same result. Thus translating into, increased on-boarding and off-boarding efficiency.
@@ -73,4 +73,4 @@ You can use Lifecycle workflows to address any of the following conditions.
7373

7474
## Next steps
7575
- [Create a custom workflow using the Azure portal](tutorial-onboard-custom-workflow-portal.md)
76-
- [Create a Lifecycle workflow](create-lifecycle-workflow.md)
76+
- [Create a Lifecycle workflow](create-lifecycle-workflow.md)

articles/app-service/overview.md

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -72,14 +72,14 @@ First, validate that the new platform update which contains Debian 11 has reache
7272
Next, create a deployment slot to test that your application works properly with Debian 11 before applying the change to production.
7373

7474
1. [Create a deployment slot](deploy-staging-slots.md#add-a-slot) if you do not already have one, and clone your settings from the production slot. A deployment slot will allow you to safely test changes to your application (such as upgrading to Debian 11) and swap those changes into production after review.
75-
1. To upgrade to Debian 11 (Bullseye), create an app setting on your slot named `ORYX_DEFAULT_OS` with a value of `bullseye`.
75+
1. To upgrade to Debian 11 (Bullseye), create an app setting on your slot named `WEBSITE_LINUX_OS_VERSION` with a value of `DEBIAN|BULLSEYE`.
7676

7777
```bash
78-
az webapp config appsettings set -g MyResourceGroup -n MyUniqueApp --settings ORYX_DEFAULT_OS=bullseye
78+
az webapp config appsettings set -g MyResourceGroup -n MyUniqueApp --settings WEBSITE_LINUX_OS_VERSION="DEBIAN|BULLSEYE"
7979
```
8080
1. Deploy your application to the deployment slot using the tool of your choice (VS Code, Azure CLI, GitHub Actions, etc.)
8181
1. Confirm your application is functioning as expected in the deployment slot.
82-
1. [Swap your production and staging slots](deploy-staging-slots.md#swap-two-slots). This will apply the `ORYX_DEFAULT_OS=bullseye` app setting to production.
82+
1. [Swap your production and staging slots](deploy-staging-slots.md#swap-two-slots). This will apply the `WEBSITE_LINUX_OS_VERSION=DEBIAN|BULLSEYE` app setting to production.
8383
1. Delete the deployment slot if you are no longer using it.
8484

8585
##### Resources

articles/cost-management-billing/reservations/prepay-hana-large-instances-reserved-capacity.md

Lines changed: 5 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -50,7 +50,7 @@ armclient post /providers/Microsoft.Capacity/calculatePrice?api-version=2019-04-
5050
'billingScopeId': '/subscriptions/11111111-1111-1111-111111111111',
5151
'term': 'P1Y',
5252
'quantity': '1',
53-
'billingplan': 'Monthly'
53+
'billingplan': 'Monthly',
5454
'displayName': 'testreservation_S224om',
5555
'appliedScopes': ['/subscriptions/11111111-1111-1111-111111111111'],
5656
'appliedScopeType': 'Single',
@@ -105,7 +105,7 @@ The following example response resembles what you get returned. Note the value y
105105

106106
### Make your purchase
107107

108-
Make your purchase using the returned `quoteId` and the `reservationOrderId` that you got from the preceding [Get the reservation order and price](#get-the-reservation-order-and-price) section.
108+
Make your purchase using the returned `reservationOrderId` that you got from the preceding [Get the reservation order and price](#get-the-reservation-order-and-price) section.
109109

110110
Here's an example request:
111111

@@ -120,14 +120,13 @@ armclient put /providers/Microsoft.Capacity/reservationOrders/22222222-2222-2222
120120
'billingScopeId': '/subscriptions/11111111-1111-1111-111111111111',
121121
'term': 'P1Y',
122122
'quantity': '1',
123-
'billingplan': 'Monthly'
123+
'billingplan': 'Monthly',
124124
125125
'displayName': ' testreservation_S224om',
126126
'appliedScopes': ['/subscriptions/11111111-1111-1111-111111111111/resourcegroups/123'],
127127
'appliedScopeType': 'Single',
128128
'instanceFlexibility': 'NotSupported',
129-
'renew': true,
130-
'quoteId': 'd0fd3a890795'
129+
'renew': true
131130
}
132131
}"
133132
```
@@ -254,4 +253,4 @@ location. You can also go to https://aka.ms/corequotaincrease to learn about quo
254253
## Next steps
255254

256255
- Learn about [How to call Azure REST APIs with Postman and cURL](/rest/api/azure/#how-to-call-azure-rest-apis-with-postman).
257-
- See [SKUs for SAP HANA on Azure (Large Instances)](../../virtual-machines/workloads/sap/hana-available-skus.md) for the available SKU list and regions.
256+
- See [SKUs for SAP HANA on Azure (Large Instances)](../../virtual-machines/workloads/sap/hana-available-skus.md) for the available SKU list and regions.

articles/cost-management-billing/reservations/save-compute-costs-reservations.md

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -98,6 +98,7 @@ For more information, see [Self-service exchanges and refunds for Azure Reservat
9898
- **Azure Cache for Redis** - Only the compute costs are included with a reservation. A reservation doesn't cover networking or storage charges associated with the Redis cache instances.
9999
- **Azure Dedicated Host** - Only the compute costs are included with the Dedicated host.
100100
- **Azure Disk Storage reservations** - A reservation only covers premium SSDs of P30 size or greater. It doesn't cover any other disk types or sizes smaller than P30.
101+
- **Azure Backup Storage reserved capacity** - A capacity reservation lowers storage costs of backup data in a Recovery Services Vault.
101102

102103
Software plans:
103104

articles/logic-apps/create-integration-service-environment-rest-api.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -47,7 +47,7 @@ Deployment usually takes within two hours to finish. Occasionally, deployment mi
4747

4848
> [!NOTE]
4949
> If deployment fails or you delete your ISE, Azure might take up to an hour before releasing your subnets.
50-
> This delay means means you might have to wait before reusing those subnets in another ISE.
50+
> This delay means you might have to wait before reusing those subnets in another ISE.
5151
>
5252
> If you delete your virtual network, Azure generally takes up to two hours
5353
> before releasing up your subnets, but this operation might take longer.

articles/machine-learning/how-to-auto-train-forecast.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -126,7 +126,7 @@ automl_config = AutoMLConfig(task='forecasting',
126126
cv_step_size = "auto", # Could be customized as an integer
127127
enable_ensembling=False,
128128
verbosity=logging.INFO,
129-
**forecasting_parameters)
129+
forecasting_parameters=forecasting_parameters)
130130
```
131131

132132
The amount of data required to successfully train a forecasting model with automated ML is influenced by the `forecast_horizon`, `n_cross_validations`, and `target_lags` or `target_rolling_window_size` values specified when you configure your `AutoMLConfig`.
@@ -229,7 +229,7 @@ To enable deep learning, set the `enable_dnn=True` in the `AutoMLConfig` object.
229229
automl_config = AutoMLConfig(task='forecasting',
230230
enable_dnn=True,
231231
...
232-
**forecasting_parameters)
232+
forecasting_parameters=forecasting_parameters)
233233
```
234234
> [!Warning]
235235
> When you enable DNN for experiments created with the SDK, [best model explanations](how-to-machine-learning-interpretability-automl.md) are disabled.

articles/stream-analytics/stream-analytics-window-functions.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -154,7 +154,7 @@ Will return:
154154

155155
## Snapshot window
156156

157-
[**Snapshot**](/stream-analytics-query/snapshot-window-azure-stream-analytics) windows group events that have the same timestamp. Unlike other windowing types, which require a specific window function (such as [SessionWindow()](/stream-analytics-query/session-window-azure-stream-analytics), you can apply a snapshot window by adding System.Timestamp() to the GROUP BY clause.
157+
[**Snapshot**](/stream-analytics-query/snapshot-window-azure-stream-analytics) windows group events that have the same timestamp. Unlike other windowing types, which require a specific window function (such as [SessionWindow()](/stream-analytics-query/session-window-azure-stream-analytics)), you can apply a snapshot window by adding System.Timestamp() to the GROUP BY clause.
158158

159159
![Stream Analytics snapshot window](media/stream-analytics-window-functions/stream-analytics-window-functions-snapshot-intro.png)
160160

0 commit comments

Comments
 (0)