Skip to content

Commit 063c548

Browse files
committed
Merge branch 'master' of https://github.com/MicrosoftDocs/azure-docs-pr into migration-overview
2 parents c1314a2 + 73af96d commit 063c548

File tree

62 files changed

+632
-332
lines changed

Some content is hidden

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

62 files changed

+632
-332
lines changed

articles/active-directory/devices/assign-local-admin.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -46,7 +46,7 @@ To view and update the membership of the global administrator role, see:
4646

4747
In the Azure portal, you can manage the device administrator role on the **Devices** page. To open the **Devices** page:
4848

49-
1. Sign in to your [Azure portal](https://portal.azure.com) as a global administrator or device administrator.
49+
1. Sign in to your [Azure portal](https://portal.azure.com) as a global administrator.
5050
1. Search for and select *Azure Active Directory*.
5151
1. In the **Manage** section, click **Devices**.
5252
1. On the **Devices** page, click **Device settings**.

articles/active-directory/devices/troubleshoot-device-dsregcmd.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -131,7 +131,7 @@ This section lists the status of various attributes for the user currently logge
131131
- **CanReset:** - Denotes if the Windows Hello key can be reset by the user.
132132
- **Possible values:** - DestructiveOnly, NonDestructiveOnly, DestructiveAndNonDestructive, or Unknown if error.
133133
- **WorkplaceJoined:** - Set to “YES” if Azure AD registered accounts have been added to the device in the current NTUSER context.
134-
- **WamDefaultSet:** - Set to “YES” if a WAM default WebAccount is created for the logged in user. This field could display an error if dsreg /status is run in admin context.
134+
- **WamDefaultSet:** - Set to “YES” if a WAM default WebAccount is created for the logged in user. This field could display an error if dsreg /status is run from an elevated command prompt.
135135
- **WamDefaultAuthority:** - Set to “organizations” for Azure AD.
136136
- **WamDefaultId:** - Always “https://login.microsoft.com” for Azure AD.
137137
- **WamDefaultGUID:** - The WAM provider’s (Azure AD/Microsoft account) GUID for the default WAM WebAccount.

articles/active-directory/fundamentals/whats-new.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -45,7 +45,7 @@ This page is updated monthly, so revisit it regularly. If you're looking for ite
4545

4646
We're planning to replace the current custom controls preview with an approach that allows partner-provided authentication capabilities to work seamlessly with the Azure Active Directory administrator and end user experiences. Today, partner MFA solutions face the following limitations: they work only after a password has been entered; they don't serve as MFA for step-up authentication in other key scenarios; and they don't integrate with end user or administrative credential management functions. The new implementation will allow partner-provided authentication factors to work alongside built-in factors for key scenarios, including registration, usage, MFA claims, step up authentication, reporting, and logging.
4747

48-
Custom controls will continue to be supported in preview alongside the new design until it reaches general availability. At that point, we'll give customers time to migrate to the new design. Because of the limitations of the current approach, we won't onboard new providers until the new design is available. We are working closely with customers and providers and will communicate the timeline as we get closer. [Learn more](https://docs.microsoft.com/azure/active-directory/conditional-access/controls).
48+
Custom controls will continue to be supported in preview alongside the new design until it reaches general availability. At that point, we'll give customers time to migrate to the new design. Because of the limitations of the current approach, we won't onboard new providers until the new design is available. We are working closely with customers and providers and will communicate the timeline as we get closer. [Learn more](https://techcommunity.microsoft.com/t5/azure-active-directory-identity/upcoming-changes-to-custom-controls/ba-p/1144696#).
4949

5050
### Identity Secure Score - MFA improvement action updates
5151

articles/automation/source-control-integration.md

Lines changed: 25 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ ms.topic: conceptual
1010

1111
Source control integration in Azure Automation supports single-direction synchronization from your source control repository. Source control allows you to keep your runbooks in your Automation account up to date with scripts in your GitHub or Azure Repos source control repository. This feature makes it easy to promote code that has been tested in your development environment to your production Automation account.
1212

13-
Using source control integration, you can easily collaborate with your team, track changes, and roll back to earlier versions of your runbooks. For example, source control allows you to synchronize different branches in source control with your development, test, and production Automation accounts.
13+
Source control integration lets you easily collaborate with your team, track changes, and roll back to earlier versions of your runbooks. For example, source control allows you to synchronize different branches in source control with your development, test, and production Automation accounts.
1414

1515
>[!NOTE]
1616
>This article has been updated to use the new Azure PowerShell Az module. You can still use the AzureRM module, which will continue to receive bug fixes until at least December 2020. To learn more about the new Az module and AzureRM compatibility, see [Introducing the new Azure PowerShell Az module](https://docs.microsoft.com/powershell/azure/new-azureps-module-az?view=azps-3.5.0). For Az module installation instructions on your Hybrid Runbook Worker, see [Install the Azure PowerShell Module](https://docs.microsoft.com/powershell/azure/install-az-ps?view=azps-3.5.0). For your Automation account, you can update your modules to the latest version using [How to update Azure PowerShell modules in Azure Automation](automation-update-azure-modules.md).
@@ -36,11 +36,11 @@ Azure Automation supports three types of source control:
3636

3737
This section tells how to configure source control for your Automation account. You can use either the Azure portal or PowerShell.
3838

39-
### Configure source control -- Azure portal
39+
### Configure source control in Azure portal
4040

4141
Use this procedure to configure source control using the Azure portal.
4242

43-
1. Within your Automation account, select **Source Control** and click **+ Add**.
43+
1. In your Automation account, select **Source Control** and click **Add**.
4444

4545
![Select source control](./media/source-control-integration/select-source-control.png)
4646

@@ -66,14 +66,14 @@ Use this procedure to configure source control using the Azure portal.
6666
![Source control summary](./media/source-control-integration/source-control-summary.png)
6767

6868
> [!NOTE]
69-
> The login for your source control repository might be different from your login for the Azure portal. Ensure that you are logged in with the correct account for your source control repository when configuring source control. If there is a doubt, open a new tab in your browser, log out from **visualstudio.com** or **github.com**, and try connecting to source control again.
69+
> The login for your source control repository might be different from your login for the Azure portal. Ensure that you are logged in with the correct account for your source control repository when configuring source control. If there is a doubt, open a new tab in your browser, log out from **dev.azure.com**, **visualstudio.com**, or **github.com**, and try reconnecting to source control.
7070
71-
### Configure source control -- PowerShell
71+
### Configure source control in PowerShell
7272

7373
You can also use PowerShell to configure source control in Azure Automation. To use the PowerShell cmdlets for this operation, you need a personal access token (PAT). Use the [New-AzAutomationSourceControl](https://docs.microsoft.com/powershell/module/az.automation/new-azautomationsourcecontrol?view=azps-3.5.0
7474
) cmdlet to create the source control connection. This cmdlet requires a secure string for the PAT. To learn how to create a secure string, see [ConvertTo-SecureString](/powershell/module/microsoft.powershell.security/convertto-securestring?view=powershell-6).
7575

76-
The following subsections illustrate PowerShell creation of the source control connection for GitHub, Azure Repos (Git), and Azure Repos (TFVC).
76+
The following subsections illustrate PowerShell creation of the source control connection for GitHub, Azure Repos (Git), and Azure Repos (TFVC).
7777

7878
#### Create source control connection for GitHub
7979

@@ -83,14 +83,21 @@ New-AzAutomationSourceControl -Name SCGitHub -RepoUrl https://github.com/<accoun
8383

8484
#### Create source control connection for Azure Repos (Git)
8585

86+
> [!NOTE]
87+
> Azure Repos (Git) uses a URL that accesses **dev.azure.com** instead of **visualstudio.com**, used in earlier formats. The older URL format `https://<accountname>.visualstudio.com/<projectname>/_git/<repositoryname>` is deprecated but still supported. The new format is preferred.
88+
89+
8690
```powershell-interactive
87-
New-AzAutomationSourceControl -Name SCReposGit -RepoUrl https://<accountname>.visualstudio.com/<projectname>/_git/<repositoryname> -SourceType VsoGit -AccessToken <secureStringofPAT> -Branch master -ResourceGroupName <ResourceGroupName> -AutomationAccountName <AutomationAccountName> -FolderPath "/Runbooks"
91+
New-AzAutomationSourceControl -Name SCReposGit -RepoUrl https://dev.azure.com/<accountname>/<adoprojectname>/_git/<repositoryname> -SourceType VsoGit -AccessToken <secureStringofPAT> -Branch master -ResourceGroupName <ResourceGroupName> -AutomationAccountName <AutomationAccountName> -FolderPath "/Runbooks"
8892
```
8993

9094
#### Create source control connection for Azure Repos (TFVC)
9195

96+
> [!NOTE]
97+
> Azure Repos (TFVC) uses a URL that accesses **dev.azure.com** instead of **visualstudio.com**, used in earlier formats. The older URL format `https://<accountname>.visualstudio.com/<projectname>/_versionControl` is deprecated but still supported. The new format is preferred.
98+
9299
```powershell-interactive
93-
New-AzAutomationSourceControl -Name SCReposTFVC -RepoUrl https://<accountname>.visualstudio.com/<projectname>/_versionControl -SourceType VsoTfvc -AccessToken <secureStringofPAT> -ResourceGroupName <ResourceGroupName> -AutomationAccountName <AutomationAccountName> -FolderPath "/Runbooks"
100+
New-AzAutomationSourceControl -Name SCReposTFVC -RepoUrl https://dev.azure.com/<accountname>/<adoprojectname>/_git/<repositoryname> -SourceType VsoTfvc -AccessToken <secureStringofPAT> -ResourceGroupName <ResourceGroupName> -AutomationAccountName <AutomationAccountName> -FolderPath "/Runbooks"
94101
```
95102

96103
#### Personal access token (PAT) permissions
@@ -117,14 +124,14 @@ The following list defines the minimum PAT permissions required for Azure Repos.
117124

118125
| Scope | Access Type |
119126
|---------| ----------|
120-
| Code | Read |
121-
| Project and team | Read |
122-
| Identity | Read |
123-
| User profile | Read |
124-
| Work items | Read |
125-
| Service connections | Read, query, manage<sup>1</sup> |
127+
| `Code` | Read |
128+
| `Project and team` | Read |
129+
| `Identity` | Read |
130+
| `User profile` | Read |
131+
| `Work items` | Read |
132+
| `Service connections` | Read, query, manage<sup>1</sup> |
126133

127-
<sup>1</sup> The Service connections permission is only required if you have enabled autosync.
134+
<sup>1</sup> The `Service connections` permission is only required if you have enabled autosync.
128135

129136
## Synchronizing
130137

@@ -143,7 +150,7 @@ Follow these steps to synchronize with source control.
143150
5. Clicking on a job allows you to view the job output. The following example is the output from a source control sync job.
144151

145152
```output
146-
============================================================================
153+
===================================================================
147154
148155
Azure Automation Source Control.
149156
Supported runbooks to sync: PowerShell Workflow, PowerShell Scripts, DSC Configurations, Graphical, and Python 2.
@@ -168,7 +175,7 @@ Follow these steps to synchronize with source control.
168175
- ExampleRunbook1.ps1
169176
- ExampleRunbook2.ps1
170177
171-
=========================================================================
178+
==================================================================
172179
173180
```
174181
@@ -190,7 +197,7 @@ If multiple people are editing runbooks in your source control repository using
190197
191198
## Updating the PAT
192199
193-
Currently, there is no way to use the Azure portal to update the PAT in source control. After your PAT has expired or been revoked, you can update source control with a new access token in one of these ways:
200+
Currently, you can't use the Azure portal to update the PAT in source control. When your PAT is expired or revoked, you can update source control with a new access token in one of these ways:
194201
195202
* Use the [REST API](https://docs.microsoft.com/rest/api/automation/sourcecontrol/update).
196203
* Use the [Update-AzAutomationSourceControl](/powershell/module/az.automation/update-azautomationsourcecontrol) cmdlet.

articles/azure-databricks/quickstart-create-databricks-workspace-portal.md

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ ms.author: mamccrea
88
ms.reviewer: jasonh
99
ms.workload: big-data
1010
ms.topic: quickstart
11-
ms.date: 05/08/2019
11+
ms.date: 03/23/2020
1212
ms.custom: mvc
1313
---
1414

@@ -54,6 +54,8 @@ In this section, you create an Azure Databricks workspace using the Azure portal
5454

5555
![Databricks deployment tile](./media/quickstart-create-databricks-workspace-portal/databricks-deployment-tile.png "Databricks deployment tile")
5656

57+
When a workspace deployment fails, the workspace is still created in a failed state. Delete the failed workspace and create a new workspace that resolves the deployment errors. When you delete the failed workspace, the managed resource group and any successfully deployed resources are also deleted.
58+
5759
## Create a Spark cluster in Databricks
5860

5961
> [!NOTE]

articles/azure-databricks/quickstart-create-databricks-workspace-resource-manager-template.md

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ ms.reviewer: jasonh
99
ms.workload: big-data
1010
ms.topic: quickstart
1111
ms.custom: mvc
12-
ms.date: 07/12/2019
12+
ms.date: 03/23/2020
1313
---
1414

1515
# Quickstart: Run a Spark job on Azure Databricks using the Azure Resource Manager template
@@ -56,6 +56,8 @@ In this section, you create an Azure Databricks workspace using the Azure Resour
5656

5757
![Databricks deployment tile](./media/quickstart-create-databricks-workspace-resource-manager-template/databricks-deployment-tile.png "Databricks deployment tile")
5858

59+
When a workspace deployment fails, the workspace is still created in a failed state. Delete the failed workspace and create a new workspace that resolves the deployment errors. When you delete the failed workspace, the managed resource group and any successfully deployed resources are also deleted.
60+
5961
## Create a Spark cluster in Databricks
6062

6163
1. In the Azure portal, go to the Databricks workspace that you created, and then click **Launch Workspace**.

articles/azure-databricks/quickstart-create-databricks-workspace-vnet-injection.md

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ ms.author: mamccrea
77
ms.reviewer: jasonh
88
ms.service: azure-databricks
99
ms.topic: conceptual
10-
ms.date: 12/04/2019
10+
ms.date: 03/23/2020
1111
---
1212

1313
# Quickstart: Create an Azure Databricks workspace in your own Virtual Network
@@ -96,6 +96,8 @@ Sign in to the [Azure portal](https://portal.azure.com/).
9696

9797
![Azure Databricks managed resource group](./media/quickstart-create-databricks-workspace-vnet-injection/managed-resource-group.png)
9898

99+
When a workspace deployment fails, the workspace is still created in a failed state. Delete the failed workspace and create a new workspace that resolves the deployment errors. When you delete the failed workspace, the managed resource group and any successfully deployed resources are also deleted.
100+
99101
## Create a cluster
100102

101103
> [!NOTE]

articles/azure-functions/durable/durable-functions-http-features.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -253,7 +253,7 @@ If any of these limitations might affect your use case, consider instead using a
253253

254254
Customizing the behavior of the orchestration's internal HTTP client is possible using [Azure Functions .NET dependency injection](https://docs.microsoft.com/azure/azure-functions/functions-dotnet-dependency-injection). This ability can be useful for making small behavioral changes. It can also be useful for unit testing the HTTP client by injecting mock objects.
255255

256-
The following example demonstrates using dependency injection to disable SSL certificate validation for orchestrator functions that call external HTTP endpoints.
256+
The following example demonstrates using dependency injection to disable TLS/SSL certificate validation for orchestrator functions that call external HTTP endpoints.
257257

258258
```csharp
259259
public class Startup : FunctionsStartup
@@ -271,7 +271,7 @@ public class MyDurableHttpMessageHandlerFactory : IDurableHttpMessageHandlerFact
271271
{
272272
public HttpMessageHandler CreateHttpMessageHandler()
273273
{
274-
// Disable SSL certificate validation (not recommended in production!)
274+
// Disable TLS/SSL certificate validation (not recommended in production!)
275275
return new HttpClientHandler
276276
{
277277
ServerCertificateCustomValidationCallback =

articles/azure-portal/azure-portal-dashboard-share-access.md

Lines changed: 8 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ ms.devlang: NA
1313
ms.topic: conceptual
1414
ms.tgt_pltfrm: NA
1515
ms.workload: na
16-
ms.date: 01/29/2020
16+
ms.date: 03/23/2020
1717
ms.author: mblythe
1818

1919
---
@@ -36,7 +36,7 @@ With Role-Based Access Control (RBAC), you can assign users to roles at three di
3636
* resource group
3737
* resource
3838

39-
The permissions you assign inherit from subscription down to the resource. The published dashboard is a resource. You may already have users assigned to roles for the subscription that apply for the published dashboard.
39+
The permissions you assign inherit from the subscription down to the resource. The published dashboard is a resource. You may already have users assigned to roles for the subscription that apply for the published dashboard.
4040

4141
Let's say you have an Azure subscription and various members of your team have been assigned the roles of *owner*, *contributor*, or *reader* for the subscription. Users who are owners or contributors can list, view, create, modify, or delete dashboards within the subscription. Users who are readers can list and view dashboards, but can't modify or delete them. Users with reader access can make local edits to a published dashboard, such as when troubleshooting an issue, but they can't publish those changes back to the server. They can make a private copy of the dashboard for themselves.
4242

@@ -56,35 +56,31 @@ Before assigning access, you must publish the dashboard.
5656

5757
![publish your dashboard](./media/azure-portal-dashboard-share-access/publish-dashboard-for-access-control.png)
5858

59-
By default, sharing publishes your dashboard to a resource group named **dashboards**.
59+
By default, sharing publishes your dashboard to a resource group named **dashboards**. To select a different resource group, clear the checkbox.
6060

6161
Your dashboard is now published. If the permissions inherited from the subscription are suitable, you don't need to do anything more. Other users in your organization can access and modify the dashboard based on their subscription level role.
6262

6363
## Assign access to a dashboard
6464

6565
You can assign a group of users to a role for that dashboard.
6666

67-
1. After publishing the dashboard, in **Sharing + access control**, select **Manage users**.
67+
1. After publishing the dashboard, select the **Share** or **Unshare** option to access **Sharing + access control**.
6868

69-
![manage users for a dashboard](./media/azure-portal-dashboard-share-access/manage-users-for-access-control.png)
69+
1. In **Sharing + access control**, select **Manage users**.
7070

71-
To access **Sharing + access control** from a dashboard, select the **Share** or **Unshare** option.
71+
![manage users for a dashboard](./media/azure-portal-dashboard-share-access/manage-users-for-access-control.png)
7272

7373
1. Select **Role assignments** to see existing users that are already assigned a role for this dashboard.
7474

75-
1. To add a new user or group, select **Add**.
75+
1. To add a new user or group, select **Add** then **Add role assignment**.
7676

7777
![add a user for access to the dashboard](./media/azure-portal-dashboard-share-access/manage-users-existing-users.png)
7878

7979
1. Select the role that represents the permissions to grant. For this example, select **Contributor**.
8080

8181
1. Select the user or group to assign to the role. If you don't see the user or group you're looking for in the list, use the search box. Your list of available groups depends on the groups you've created in Active Directory.
8282

83-
1. When you have finished adding users or groups, select **OK**.
84-
85-
The new assignment is added to the list of users. Its **Access** is listed as **Assigned** rather than **Inherited**.
86-
87-
![assigned roles](./media/azure-portal-dashboard-share-access/assigned-roles.png)
83+
1. When you've finished adding users or groups, select **Save**.
8884

8985
## Next steps
9086

0 commit comments

Comments
 (0)