Skip to content

Commit a85a340

Browse files
committed
Merge branch 'release-build-publisher-verification' of https://github.com/MicrosoftDocs/azure-docs-pr into pv-initial
2 parents e8c0adc + bc2cd94 commit a85a340

File tree

198 files changed

+2843
-2170
lines changed

Some content is hidden

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

198 files changed

+2843
-2170
lines changed

.openpublishing.redirection.json

Lines changed: 30 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -20295,6 +20295,36 @@
2029520295
"redirect_url": "/azure/marketplace/marketplace-commercial-transaction-capabilities-and-considerations",
2029620296
"redirect_document_id": false
2029720297
},
20298+
{
20299+
"source_path": "articles/marketplace/cloud-partner-portal/consulting-services/cloud-partner-portal-consulting-services-publishing-offer.md",
20300+
"redirect_url": "/azure/marketplace/partner-center-portal/create-consulting-service-offer",
20301+
"redirect_document_id": false
20302+
},
20303+
{
20304+
"source_path": "articles/marketplace/cloud-partner-portal/consulting-services/cpp-consulting-service-prerequisites.md",
20305+
"redirect_url": "/azure/marketplace/partner-center-portal/consulting-service-prerequisites",
20306+
"redirect_document_id": false
20307+
},
20308+
{
20309+
"source_path": "articles/marketplace/cloud-partner-portal/consulting-services/cpp-consulting-service-create-offer.md",
20310+
"redirect_url": "/azure/marketplace/partner-center-portal/create-consulting-service-offer",
20311+
"redirect_document_id": false
20312+
},
20313+
{
20314+
"source_path": "articles/marketplace/cloud-partner-portal/consulting-services/cpp-consulting-service-define-offer-settings.md",
20315+
"redirect_url": "/azure/marketplace/partner-center-portal/create-consulting-service-offer",
20316+
"redirect_document_id": false
20317+
},
20318+
{
20319+
"source_path": "articles/marketplace/cloud-partner-portal/consulting-services/cpp-consulting-service-storefront-details.md",
20320+
"redirect_url": "/azure/marketplace/partner-center-portal/create-consulting-service-offer",
20321+
"redirect_document_id": false
20322+
},
20323+
{
20324+
"source_path": "articles/marketplace/cloud-partner-portal/consulting-services/cpp-consulting-service-publish-offer.md",
20325+
"redirect_url": "/azure/marketplace/partner-center-portal/create-consulting-service-offer",
20326+
"redirect_document_id": false
20327+
},
2029820328
{
2029920329
"source_path": "articles/multi-factor-authentication/multi-factor-authentication-app-faq.md",
2030020330
"redirect_url": "./end-user/microsoft-authenticator-app-faq",

articles/active-directory/users-groups-roles/TOC.yml

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -68,7 +68,7 @@
6868
href: /azure/active-directory/b2b/use-dynamic-groups?context=azure/active-directory/users-groups-roles/context/ugr-context
6969
- name: Manage your directory
7070
items:
71-
- name: Administer your directory
71+
- name: Azure AD organizations
7272
href: /azure/active-directory/fundamentals/active-directory-administer?context=azure/active-directory/users-groups-roles/context/ugr-context
7373
- name: Manage domain names
7474
href: domains-manage.md
@@ -84,7 +84,7 @@
8484
href: /azure/active-directory/connect/active-directory-aadconnect?context=azure/active-directory/users-groups-roles/context/ugr-context
8585
- name: Manage groups
8686
items:
87-
- name: Manage access with Azure AD groups
87+
- name: Manage access with groups
8888
href: /azure/active-directory/fundamentals/active-directory-manage-groups?context=azure/active-directory/users-groups-roles/context/ugr-context
8989
- name: Create a group (Azure portal)
9090
href: /azure/active-directory/fundamentals/active-directory-groups-create-azure-portal?context=azure/active-directory/users-groups-roles/context/ugr-context
@@ -134,6 +134,8 @@
134134
href: groups-assign-sensitivity-labels.md
135135
- name: Assign licenses
136136
items:
137+
- name: Assign licenses to users
138+
href: /azure/active-directory/fundamentals/license-users-groups?context=azure/active-directory/users-groups-roles/context/ugr-context
137139
- name: Assign licenses to a group
138140
href: licensing-groups-assign.md
139141
- name: Resolve group license problems

articles/active-directory/users-groups-roles/my-staff-configure.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ ms.topic: article
99
ms.service: active-directory
1010
ms.subservice: user-help
1111
ms.workload: identity
12-
ms.date: 05/01/2020
12+
ms.date: 05/08/2020
1313
ms.author: curtand
1414
ms.reviewer: sahenry
1515
ms.custom: oldportal;it-pro;

articles/automation/automation-child-runbooks.md

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -10,9 +10,6 @@ ms.topic: conceptual
1010

1111
It is a recommended practice in Azure Automation to write reusable, modular runbooks with a discrete function that is called by other runbooks. A parent runbook often calls one or more child runbooks to perform required functionality. There are two ways to call a child runbook, and there are distinct differences that you should understand to be able to determine which is best for your scenarios.
1212

13-
>[!NOTE]
14-
>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).
15-
1613
## Invoking a child runbook using inline execution
1714

1815
To invoke a runbook inline from another runbook, use the name of the runbook and provide values for its parameters, just like you would use an activity or a cmdlet. All runbooks in the same Automation account are available to all others to be used in this manner. The parent runbook waits for the child runbook to complete before moving to the next line, and any output returns directly to the parent.

articles/automation/automation-config-aws-account.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,4 +27,4 @@ After you have created and copied your AWS security keys, you need to create a C
2727

2828
## Next steps
2929

30-
* Review the solution article [Automating deployment of a VM in Amazon Web Services](automation-scenario-aws-deployment.md) to learn how to create runbooks to automate tasks in AWS.
30+
* Review [Automating deployment of a VM in Amazon Web Services](automation-scenario-aws-deployment.md) to learn how to create runbooks to automate tasks in AWS.

articles/automation/automation-connections.md

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -22,9 +22,6 @@ When you create a connection, you must specify a connection type. The connection
2222
>[!NOTE]
2323
>Secure assets in Azure Automation include credentials, certificates, connections, and encrypted variables. These assets are encrypted and stored in Azure Automation using a unique key that is generated for each Automation account. Azure Automation stores the key in the system-managed Key Vault. Before storing a secure asset, Automation loads the key from Key Vault and then uses it to encrypt the asset.
2424
25-
>[!NOTE]
26-
>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).
27-
2825
## Connection types
2926

3027
Azure Automation makes the following built-in connection types available:

articles/automation/automation-create-account-template.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ You can use [Azure Resource Manager templates](../azure-resource-manager/templat
1818
* Automates the creation of an Azure Automation account.
1919
* Links the Automation account to the Log Analytics workspace.
2020

21-
The template doesn't automate the onboarding of Azure or non-Azure virtual machines or solutions.
21+
The template doesn't automate the enabling of Azure or non-Azure virtual machines.
2222

2323
>[!NOTE]
2424
>Creation of the Automation Run As account is not supported when you're using an Azure Resource Manager template. To create a Run As account manually from the portal or with PowerShell, see [Manage Run As accounts](manage-runas-account.md).

articles/automation/automation-create-alert-triggered-runbook.md

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -10,9 +10,6 @@ ms.topic: conceptual
1010

1111
You can use [Azure Monitor](../azure-monitor/overview.md?toc=%2fazure%2fautomation%2ftoc.json) to monitor base-level metrics and logs for most services in Azure. You can call Azure Automation runbooks by using [action groups](../azure-monitor/platform/action-groups.md?toc=%2fazure%2fautomation%2ftoc.json) or by using classic alerts to automate tasks based on alerts. This article shows you how to configure and run a runbook by using alerts.
1212

13-
>[!NOTE]
14-
>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).
15-
1613
## Alert types
1714

1815
You can use automation runbooks with three alert types:

articles/automation/automation-create-standalone-account.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ ms.topic: conceptual
88
---
99
# Create a standalone Azure Automation account
1010

11-
This article shows you how to create an Azure Automation account in the Azure portal. You can use the portal Automation account to evaluate and learn about Automation without using additional management solutions or integration with Azure Monitor logs. You can add those management solutions or integrate with Azure Monitor logs for advanced monitoring of runbook jobs at any point in the future.
11+
This article shows you how to create an Azure Automation account in the Azure portal. You can use the portal Automation account to evaluate and learn about Automation without using additional management features or integrating with Azure Monitor logs. You can add management features or integrate with Azure Monitor logs for advanced monitoring of runbook jobs at any point in the future.
1212

1313
With an Automation account, you can authenticate runbooks by managing resources in either Azure Resource Manager or the classic deployment model. One Automation Account can manage resources across all regions and subscriptions for a given tenant.
1414

articles/automation/automation-deploy-template-runbook.md

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -20,9 +20,6 @@ templates in a central, secure location such as Azure Storage.
2020
In this article, we create a PowerShell runbook that uses a Resource Manager template stored in
2121
[Azure Storage](../storage/common/storage-introduction.md) to deploy a new Azure Storage account.
2222

23-
>[!NOTE]
24-
>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).
25-
2623
## Prerequisites
2724

2825
To complete this tutorial, you need the following items:

0 commit comments

Comments
 (0)