Skip to content

Commit 5302ef3

Browse files
huypubhuypub
committed
resolve the conflict
2 parents d2d7b11 + 435303e commit 5302ef3

File tree

6 files changed

+47
-40
lines changed

6 files changed

+47
-40
lines changed

‎.openpublishing.redirection.json

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -371,10 +371,15 @@
371371
"redirect_document_id": false
372372
},
373373
{
374-
"source_path": "docs-conceptual/azurermps-6.10.0/azurerm-ps-in-docker.md",
374+
"source_path": "docs-conceptual/azurermps-6.12.0/azurerm-ps-in-docker.md",
375375
"redirect_url": "/powershell/azure/install-azurerm-ps",
376376
"redirect_document_id": false
377377
},
378+
{
379+
"source_path": "docs-conceptual/azurermps-6.12.0/install-azurermps-maclinux.md",
380+
"redirect_url": "/powershell/azure/install-az-ps",
381+
"redirect_document_id": false
382+
},
378383
{
379384
"source_path": "azureservicefabricps/conceptual/0/index.md",
380385
"redirect_url": "/powershell/azure/overview",

‎azurermps-2.3.0/AzureRm.Insights/New-AzureRmAlertRuleEmail.md

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -24,21 +24,21 @@ The **New-AzureRmAlertRuleEmail** cmdlet creates an e-mail action for an alert r
2424

2525
### Example 1: Create an alert rule email action for service owners
2626
```
27-
PS C:\>New-AzureRmAlertRuleEmail -SendToServiceOwners
27+
PS C:\>New-AzureRmAlertRuleEmail -SendToServiceOwner
2828
```
2929

3030
This command creates an alert rule email action to send for its service owners when an alert rule is fired.
3131

3232
### Example 2: Create an alert rule email action for non-service owners
3333
```
34-
PS C:\>New-AzureRmAlertRuleEmail -CustomEmails pattif@contoso.com,davidchew@contoso.net
34+
PS C:\>New-AzureRmAlertRuleEmail -CustomEmail pattif@contoso.com,davidchew@contoso.net
3535
```
3636

3737
This command creates an alert rule email action for the specified email addresses, but not for the service owners.
3838

3939
### Example 3: Create an alert rule email action for service owners and non-service owners
4040
```
41-
PS C:\>New-AzureRmAlertRuleEmail -CustomEmails pattif@contoso.net -SendToServiceOwners
41+
PS C:\>New-AzureRmAlertRuleEmail -CustomEmail pattif@contoso.net -SendToServiceOwner
4242
```
4343

4444
This command creates an alert rule email action for the specified address and for its service owners.

‎docs-conceptual/azurermps-6.13.0/install-az-ps.md

Lines changed: 17 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -1,17 +1,18 @@
11
---
2-
title: Install Azure PowerShell with PowerShellGet
3-
description: How to install Azure PowerShell with PowerShellGet
2+
title: Install Azure PowerShell 'Az' with PowerShellGet
3+
description: How to install Azure PowerShell with PowerShellGet on Windows, macOS, and Linux.
44
author: sptramer
55
ms.author: sttramer
66
manager: carmonm
77
ms.devlang: powershell
88
ms.topic: conceptual
9-
ms.date: 10/29/2018
9+
ms.date: 11/16/2018
1010
---
1111

12-
# Install Azure PowerShell with PowerShellGet
12+
# Install the Azure PowerShell 'Az' module
1313

14-
This article tells you how to install the Azure PowerShell modules using PowerShellGet. For the preview release of Az, no other install methods are supported.
14+
This article tells you how to install the Azure PowerShell modules using PowerShellGet. These instructions work on Windows, macOS, and Linux
15+
platforms. For the preview release of Az, no other install methods are supported.
1516

1617
## Requirements
1718

@@ -65,20 +66,20 @@ the available Azure Resource Manager modules, and makes their cmdlets available
6566

6667
## Sign in
6768

68-
To start working with Azure PowerShell, you need to load `Az` into your current PowerShell session
69-
with the [Import-Module](/powershell/module/Microsoft.PowerShell.Core/Import-Module) cmdlet, and then sign in
70-
with your Azure credentials.
69+
To start working with Azure PowerShell, sign in with your Azure credentials.
7170

7271
```powershell-interactive
73-
# Import the module into the PowerShell session
74-
Import-Module Az
7572
# Connect to Azure with a browser sign in token
7673
Connect-AzAccount
7774
```
7875

79-
You'll need to repeat these steps for every new PowerShell session you start. Automatically importing the `Az` module requires
80-
setting up a PowerShell profile, which you can learn about in [About Profiles](/powershell/module/microsoft.powershell.core/about/about_profiles).
81-
To learn how to persist your Azure sign-in across sessions, see [Persist user credentials across PowerShell sessions](context-persistence.md).
76+
> [!NOTE]
77+
>
78+
> If you've disabled module autoloading, you need to manually import the module with `Import-Module Az`. Because of
79+
> the way the module is structured, this can take a few seconds.
80+
81+
You'll need to repeat these steps for every new PowerShell session you start. To learn how to persist your Azure sign-in
82+
across PowerShell sessions, see [Persist user credentials across PowerShell sessions](context-persistence.md).
8283

8384
## Update the Azure PowerShell module
8485

@@ -101,14 +102,14 @@ Get-Module -Name Az -List | select Name,Version
101102

102103
To remove a version of Azure PowerShell, see [Uninstall the Azure PowerShell module](uninstall-azurerm-ps.md).
103104

104-
You can load a specific version of the `Az` module by using the `-RequiredVersion` argument with `Install-Module` or `Import-Module`:
105+
You can load a specific version of the `Az` module by using the `-RequiredVersion` argument with `Install-Module` and `Import-Module`:
105106

106107
```powershell-interactive
107108
Install-Module -Name Az -RequiredVersion 0.4.0
108109
Import-Module -Name Az -RequiredVersion 0.4.0
109110
```
110111

111-
If you have more than one version of the module installed, the latest version is loaded by default when importing.
112+
If you have more than one version of the module installed, the latest version is loaded by default.
112113

113114
## Provide feedback
114115

@@ -117,4 +118,4 @@ To provide feedback from the command line, use the [Send-Feedback](/powershell/m
117118

118119
## Next Steps
119120

120-
To get started using Azure PowerShell, see [Get Started with Azure PowerShell](get-started-azureps.md) to learn more about the module and its features.
121+
To get started using Azure PowerShell, see [Get Started with Azure PowerShell](get-started-azureps.md) to learn more about the module and its features.

‎docs-conceptual/azurermps-6.13.0/install-azurerm-ps.md

Lines changed: 11 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ ms.author: sttramer
66
manager: carmonm
77
ms.devlang: powershell
88
ms.topic: conceptual
9-
ms.date: 10/08/2018
9+
ms.date: 11/16/2018
1010
---
1111

1212
# Install Azure PowerShell on Windows with PowerShellGet
@@ -71,20 +71,21 @@ the available Azure Resource Manager modules, and makes their cmdlets available
7171

7272
## Sign in
7373

74-
To start working with Azure PowerShell, you need to load `AzureRM` into your current PowerShell session
75-
with the [Import-Module](/powershell/module/Microsoft.PowerShell.Core/Import-Module) cmdlet, and then sign in
76-
with your Azure credentials.
74+
To start working with Azure PowerShell, sign in with your Azure credentials.
7775

7876
```powershell-interactive
79-
# Import the module into the PowerShell session
80-
Import-Module AzureRM
8177
# Connect to Azure with an interactive dialog for sign-in
8278
Connect-AzureRmAccount
8379
```
8480

85-
You'll need to repeat these steps for every new PowerShell session you start. Automatically importing the `AzureRM` module requires
86-
setting up a PowerShell profile, which you can learn about in [About Profiles](/powershell/module/microsoft.powershell.core/about/about_profiles).
87-
To learn how to persist your Azure sign-in across sessions, see [Persist user credentials across PowerShell sessions](context-persistence.md).
81+
> [!NOTE]
82+
>
83+
> If you've disabled module autoloading, you need to manually import the module with `Import-Module AzureRM`. Because of
84+
> the way the module is structured, this can take a few seconds.
85+
86+
87+
You'll need to repeat these steps for every new PowerShell session you start. To learn how to persist your Azure sign-in
88+
across PowerShell sessions, see [Persist user credentials across PowerShell sessions](context-persistence.md).
8889

8990
## Update the Azure PowerShell module
9091

@@ -130,4 +131,4 @@ To provide feedback from the command line, use the [Send-Feedback](/powershell/m
130131

131132
## Next Steps
132133

133-
To get started using Azure PowerShell, see [Get Started with Azure PowerShell](get-started-azureps.md) to learn more about the module and its features.
134+
To get started using Azure PowerShell, see [Get Started with Azure PowerShell](get-started-azureps.md) to learn more about the module and its features.

‎docs-conceptual/azurermps-6.13.0/other-install.md

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ ms.author: sttramer
66
manager: carmonm
77
ms.devlang: powershell
88
ms.topic: conceptual
9-
ms.date: 09/11/2018
9+
ms.date: 11/16/2018
1010
---
1111

1212
# Install Azure PowerShell on Windows with MSI
@@ -33,17 +33,17 @@ modules in `${env:ProgramFiles}\WindowsPowerShell\Modules`. Both the `AzureRM` a
3333
> [!NOTE]
3434
> Only use the `Azure` module if you are working with the Azure classic deployment model.
3535
36-
To start working with Azure PowerShell, you need to load `AzureRM` into your current PowerShell session
37-
with the [Import-Module](/powershell/module/Microsoft.PowerShell.Core/Import-Module) cmdlet, and then sign in
38-
with your Azure credentials.
36+
To start working with Azure PowerShell, sign in with your Azure credentials.
3937

4038
```powershell-interactive
41-
# Import the module into the PowerShell session
42-
Import-Module AzureRM
4339
# Connect to Azure with an interactive dialog for sign-in
4440
Connect-AzureRmAccount
4541
```
4642

47-
You'll need to repeat these steps for every new PowerShell session you start. Automatically importing the `AzureRM` module requires
48-
setting up a PowerShell profile, which you can learn about in [About Profiles](/powershell/module/microsoft.powershell.core/about/about_profiles).
49-
To learn how to persist your Azure sign-in across sessions, see [Persist user credentials across PowerShell sessions](context-persistence.md).
43+
> [!NOTE]
44+
>
45+
> If you've disabled module autoloading, you need to manually import the module with `Import-Module AzureRM`. Because of
46+
> the way the module is structured, this can take a few seconds.
47+
48+
You'll need to repeat this step for every new PowerShell session you start. To learn how to persist your
49+
Azure sign-in across PowerShell sessions, see [Persist user credentials across PowerShell sessions](context-persistence.md).

‎docs-conceptual/azurermps-6.13.0/toc.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@
1212
href: install-azurerm-ps.md
1313
items:
1414
- name: Install on macOS or Linux
15-
href: install-azurermps-maclinux.md
15+
href: install-az-ps.md
1616
- name: Install with MSI
1717
href: other-install.md
1818
- name: Uninstall

0 commit comments

Comments
 (0)