Skip to content

Commit 8a1845f

Browse files
committed
Merge branch 'preview' of https://github.com/Azure/azure-powershell into preview
2 parents d0c0544 + d0caa08 commit 8a1845f

File tree

3 files changed

+5
-2
lines changed

3 files changed

+5
-2
lines changed

.gitattributes

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5,4 +5,7 @@
55
*.cs text eol=crlf
66
*.csproj text eol=crlf
77
*.ps1 text eol=crlf
8+
*.psd1 text eol=crlf
9+
*.psm1 text eol=crlf
10+
*.ps1xml text eol=crlf
811
build.proj text eol=crlf

src/ResourceManager/Compute/Stack/Commands.Compute/help/Set-AzureRmVMPlan.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@ Before being able to deploy a Marketplace image through the command-line, progra
2929
### -Name
3030
Specifies the name of the image from the Marketplace.
3131
This is the same value that is returned by the Get-AzureRmVMImageSku cmdlet.
32-
For more information about how to find image information, see Navigating and Selecting Azure Virtual Machine images with PowerShell and the Azure CLIhttps://azure.microsoft.com/documentation/articles/resource-groups-vm-searching/ (https://azure.microsoft.com/documentation/articles/resource-groups-vm-searching/) in the Microsoft Azure documentation.
32+
For more information about how to find image information, see [Navigating and Selecting Azure Virtual Machine images with PowerShell and the Azure CLI](https://azure.microsoft.com/documentation/articles/resource-groups-vm-searching/) in the Microsoft Azure documentation.
3333

3434
```yaml
3535
Type: String

src/ServiceManagement/Services/Commands.Utilities/Microsoft.WindowsAzure.Commands.dll-Help.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10492,7 +10492,7 @@
1049210492
<maml:para>C:\PS&gt;</maml:para>
1049310493
C:\PS&gt;
1049410494
</maml:introduction>
10495-
<dev:code>Get-AzureWebsiteLocations</dev:code>
10495+
<dev:code>Get-AzureWebsiteLocation</dev:code>
1049610496
<dev:remarks>
1049710497
<maml:para>List all available locations for the current subscription</maml:para>
1049810498
<maml:para>

0 commit comments

Comments
 (0)