Skip to content

Commit df91792

Browse files
Merge pull request #113516 from BethWilke/branch129
Fixing 1709035, 1712624, latent errors
2 parents 88782b1 + b5ed692 commit df91792

File tree

9 files changed

+18
-18
lines changed

9 files changed

+18
-18
lines changed

articles/automation/automation-connections.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -35,9 +35,9 @@ Azure Automation makes the following built-in connection types available:
3535

3636
In most cases, you don't need to create a connection resource because it is created when you create a [Run As account](manage-runas-account.md).
3737

38-
## Windows PowerShell cmdlets to access connections
38+
## PowerShell cmdlets to access connections
3939

40-
The cmdlets in the following table create and manage Automation connections with Windows PowerShell. They ship as part of the [Az modules](shared-resources/modules.md#az-modules).
40+
The cmdlets in the following table create and manage Automation connections with PowerShell. They ship as part of the [Az modules](shared-resources/modules.md#az-modules).
4141

4242
|Cmdlet|Description|
4343
|---|---|

articles/automation/graphical-runbook-sdk.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ ms.topic: conceptual
1313

1414
## Prerequisites
1515

16-
Import the `Microsoft.Azure.Management.Automation.GraphicalRunbook.Model` package into your project.
16+
Import the [Microsoft.Azure.Management.Automation.Models](https://docs.microsoft.com/dotnet/api/microsoft.azure.management.automation.models?view=azure-dotnet) package into your project.
1717

1818
## Create a runbook object instance
1919

articles/automation/shared-resources/certificates.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -21,9 +21,9 @@ Certificates are stored securely in Azure Automation for access by runbooks and
2121
>[!NOTE]
2222
>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).
2323
24-
## Windows PowerShell cmdlets to access certificates
24+
## PowerShell cmdlets to access certificates
2525

26-
The cmdlets in the following table create and manage Automation certificates with Windows PowerShell. They ship as part of the [Az modules](modules.md#az-modules).
26+
The cmdlets in the following table create and manage Automation certificates with PowerShell. They ship as part of the [Az modules](modules.md#az-modules).
2727

2828
|Cmdlet |Description|
2929
| --- | ---|

articles/automation/shared-resources/credentials.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -23,9 +23,9 @@ An Automation credential asset holds an object that contains security credential
2323
2424
[!INCLUDE [gdpr-dsr-and-stp-note.md](../../../includes/gdpr-dsr-and-stp-note.md)]
2525

26-
## Windows PowerShell cmdlets used to access credentials
26+
## PowerShell cmdlets used to access credentials
2727

28-
The cmdlets in the following table create and manage Automation credentials with Windows PowerShell. They ship as part of the [Az modules](modules.md#az-modules).
28+
The cmdlets in the following table create and manage Automation credentials with PowerShell. They ship as part of the [Az modules](modules.md#az-modules).
2929

3030
| Cmdlet | Description |
3131
|:--- |:--- |

articles/automation/shared-resources/modules.md

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -112,15 +112,15 @@ This section includes considerations to take into account when migrating to the
112112

113113
We don't recommend running AzureRM modules and Az modules in the same Automation account. When you're sure you want to migrate from AzureRM to Az, it's best to fully commit to a complete migration. The most important reason for this is that Azure Automation often reuses sandboxes within the Automation account to save on startup times. If you don't make a full module migration, you might start a job using only AzureRM modules, then start another job using only Az modules. The sandbox soon crashes and you receive a fatal error stating that the modules aren’t compatible. This situation results in randomly occurring crashes for any given runbook or configuration.
114114

115-
#### Import of Az modules into the PowerShell session
115+
#### Importing Az modules into the PowerShell session
116116

117117
Importing an Az module into your Automation account doesn't automatically import the module into the PowerShell session that runbooks use. Modules are imported into the PowerShell session in the following situations:
118118

119119
* When a runbook invokes a cmdlet from a module
120120
* When a runbook imports the module explicitly with the [Import-Module](https://docs.microsoft.com/powershell/module/microsoft.powershell.core/import-module?view=powershell-7) cmdlet
121121
* When a runbook imports another dependent module
122122

123-
#### Testing for your runbooks and DSC configurations prior to module migration
123+
#### Testing your runbooks and DSC configurations prior to module migration
124124

125125
Be sure to test all runbooks and DSC configurations carefully in a separate Automation account before migrating to the Az modules.
126126

@@ -304,7 +304,7 @@ Your module should not depend on any unique registry settings on a host. Example
304304

305305
Make sure that all files in the module have paths with fewer than 140 characters. Any paths over 140 characters in length cause issues with importing runbooks. Azure Automation can't import a file with path size over 140 characters into the PowerShell session with `Import-Module`.
306306

307-
## Importing modules
307+
## Import modules
308308

309309
This section defines several ways that you can import a module into your Automation account.
310310

@@ -355,7 +355,7 @@ To import a PowerShell Gallery module directly from your Automation account:
355355

356356
![PowerShell Gallery import from Azure portal](../media/modules/gallery-azure-portal.png)
357357

358-
## Deleting modules
358+
## Delete modules
359359

360360
If you have issues with a module or you need to roll back to a previous version of a module, you can delete it from your Automation account. You can't delete the original versions of the [default modules](#default-modules) that are imported when you create an Automation account. If the module to delete is a newer version of one of the [default modules](#default-modules), it rolls back to the version that was installed with your Automation account. Otherwise, any module you delete from your Automation account is removed.
361361

articles/automation/shared-resources/schedules.md

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -21,9 +21,9 @@ To schedule a runbook in Azure Automation to start at a specified time, you link
2121
>[!NOTE]
2222
>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 by using [How to update Azure PowerShell modules in Azure Automation](../automation-update-azure-modules.md).
2323
24-
## Windows PowerShell cmdlets used to access schedules
24+
## PowerShell cmdlets used to access schedules
2525

26-
The cmdlets in the following table create and manage Automation schedules with Windows PowerShell. They ship as part of the [Az modules](modules.md#az-modules).
26+
The cmdlets in the following table create and manage Automation schedules with PowerShell. They ship as part of the [Az modules](modules.md#az-modules).
2727

2828
| Cmdlets | Description |
2929
|:--- |:--- |
@@ -194,4 +194,4 @@ Remove-AzAutomationSchedule -AutomationAccountName $automationAccountName `
194194
## Next steps
195195

196196
* To learn more about the cmdlets used to access schedules, see [Manage modules in Azure Automation](modules.md).
197-
* For general information about runbooks, see [Runbook execution in Azure Automation](../automation-runbook-execution.md).
197+
* For general information about runbooks, see [Runbook execution in Azure Automation](../automation-runbook-execution.md).

articles/automation/shared-resources/variables.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -51,9 +51,9 @@ You can store multiple values to a single variable by creating an array or hasht
5151
>[!NOTE]
5252
>VM name variables can be a maximum of 80 characters. Resource group variables can be a maximum of 90 characters. See [Naming rules and restrictions for Azure resources](https://docs.microsoft.com/azure/azure-resource-manager/management/resource-name-rules).
5353
54-
## Windows PowerShell cmdlets to manage variables
54+
## PowerShell cmdlets to access variables
5555

56-
The cmdlets in the following table create and manage Automation variables with Windows PowerShell. They ship as part of the [Az modules](modules.md#az-modules).
56+
The cmdlets in the following table create and manage Automation variables with PowerShell. They ship as part of the [Az modules](modules.md#az-modules).
5757

5858
| Cmdlet | Description |
5959
|:---|:---|

articles/automation/troubleshoot/desired-state-configuration.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -45,7 +45,7 @@ For information on using **xDscDiagnostics**, see [Using xDscDiagnostics to anal
4545

4646
### 3. Ensure that nodes and the Automation workspace have required modules
4747

48-
DSC depends on modules installed on the node. When you use Azure Automation State Configuration, import any required modules into your Automation account by following the steps in [Import Modules](../shared-resources/modules.md#importing-modules). Configurations can also have a dependency on specific versions of modules. For more information, see [Troubleshoot modules](shared-resources.md#modules).
48+
DSC depends on modules installed on the node. When you use Azure Automation State Configuration, import any required modules into your Automation account by following the steps in [Import Modules](../shared-resources/modules.md#import-modules). Configurations can also have a dependency on specific versions of modules. For more information, see [Troubleshoot modules](shared-resources.md#modules).
4949

5050
## <a name="unsupported-characters"></a>Scenario: A configuration with special characters can't be deleted from the portal
5151

articles/automation/troubleshoot/runbooks.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@ When you receive errors during runbook execution in Azure Automation, you can us
3636

3737
1. Ensure that your nodes and Automation workspace have the required modules.
3838

39-
If your runbook imports any modules, verify that they're available to your Automation account by using the steps in [Import modules](../shared-resources/modules.md#importing-modules). Update your PowerShell modules to the latest version by following the instructions in [Update Azure PowerShell modules in Azure Automation](../automation-update-azure-modules.md). For more troubleshooting information, see [Troubleshoot modules](shared-resources.md#modules).
39+
If your runbook imports any modules, verify that they're available to your Automation account by using the steps in [Import modules](../shared-resources/modules.md#import-modules). Update your PowerShell modules to the latest version by following the instructions in [Update Azure PowerShell modules in Azure Automation](../automation-update-azure-modules.md). For more troubleshooting information, see [Troubleshoot modules](shared-resources.md#modules).
4040

4141
1. If your runbook is suspended or unexpectedly fails:
4242

0 commit comments

Comments
 (0)