Merge branch 'master' into anne2017

Author: annelsGB

appveyor.yml

@@ -1,6 +1,3 @@
-branches:
-  only:
-    - master
 clone_folder: c:\projects\azure-docs-powershell
 environment:
   nodejs_version: "6"
@@ -16,7 +13,7 @@ before_build:
   - git clone -q https://github.com/MicrosoftDocs/azure-psdocs-ciscripts.git c:\projects\ciscripts
   - cd c:\projects\ciscripts
   - git clone -q https://github.com/MicrosoftDocs/azure-psdocs-processing.git azure-psdocs-processing
-  - git clone -q https://github.com/Azure/azure-docs-powershell
+  - git clone -q https://github.com/Azure/azure-docs-powershell -b %APPVEYOR_REPO_BRANCH%
   - npm install
   - npm install -g typescript
   - tsc
@@ -28,6 +25,6 @@ test: off
 on_success:
   - cd azure-psdocs-processing
   - git add -A
-  - git diff --quiet --exit-code --cached || git commit --author="VSC CI Service <vscavu@microsoft.com>" -m "Update azure powershell docs." && git pull origin master --rebase && git push origin master
+  - git diff --quiet --exit-code --cached || git commit --author="VSC CI Service <vscavu@microsoft.com>" -m "Update azure powershell docs." && git push origin %APPVEYOR_REPO_BRANCH%
 # on_finish:
 #  - ps: $blockRdp = $true; iex ((new-object net.webclient).DownloadString('https://raw.githubusercontent.com/appveyor/ci/master/scripts/enable-rdp.ps1'))

azureps-cmdlets-docs/AzureStack/AzureRM.AzureStackAdmin/v0.10.6/Add-AzureRMGalleryItem.md

@@ -17,11 +17,12 @@ Add-AzureRMGalleryItem -GalleryItemUri <String> [-InformationAction <ActionPrefe
 ```
 
 ## DESCRIPTION
+
 The **Add-AzureRMGalleryItem** cmdlet adds the gallery item package. Typically a .azpkg file is uploaded to a publicly accessible blob container and its URI is provided as the **GallelryItemUri** parameter.
 
 ## EXAMPLES
 
-### -------------------------- EXAMPLE 1 --------------------------
+### Example 1:
 ```
 Add-AzureRMGalleryItem -ApiVersion 2015-04-01 -GalleryItemUri "http://127.0.0.1:10000/devstoreaccount1/sqlrpgallery/Microsoft.SqlDatabase.0.1.0.azpkg"
 ```

azureps-cmdlets-docs/AzureStack/AzureRM.AzureStackAdmin/v0.10.6/Add-AzureRMResourceProviderRegistration.md

@@ -34,7 +34,7 @@ The **Add-AzureRMResourceProviderRegistration** cmdlet adds a resource provider
 
 ## EXAMPLES
 
-### -------------------------- EXAMPLE 1 --------------------------
+### Example 1:
 ```
     # Make sure to provide the resource types json of the resource provider being registered
     $adminResourceTypesFile="$PSScriptRoot\AdminResourceTypes.json"

azureps-cmdlets-docs/AzureStack/AzureRM.AzureStackAdmin/v0.10.6/Add-AzureRMUsageConnection.md

@@ -24,7 +24,7 @@ The **Add-AzureRMUsageConnection** cmdlet adds usage connection details for a re
 
 ## EXAMPLES
 
-### -------------------------- EXAMPLE 1 --------------------------
+### Example 1:
 ```
 $usageConnectionId = "sqlrpusageconnection"
 $location = "local"

azureps-cmdlets-docs/AzureStack/AzureRM.AzureStackAdmin/v0.10.6/Get-AzureRMGalleryItem.md

@@ -21,7 +21,7 @@ The **Get-AzureRmGalleryItem** cmdlet gets the gallery item.
 
 ## EXAMPLES
 
-### -------------------------- EXAMPLE 1 --------------------------
+### Example 1:
 ```
 Get-AzureRMGalleryItem -Name "Microsoft.SqlDatabase.0.1.0" -ApiVersion "2015-04-01"
 ```

azureps-cmdlets-docs/AzureStack/AzureRM.AzureStackAdmin/v0.10.6/Get-AzureRMManagedLocation.md

@@ -21,7 +21,7 @@ The **Get-AzureRmMangedLocation** cmdlet gets the details about a location manag
 
 ## EXAMPLES
 
-### -------------------------- EXAMPLE 1 --------------------------
+### Example 1:
 ```
 Get-AzureRMManagedLocation -Name "Chicago"
 ```

azureps-cmdlets-docs/AzureStack/AzureRM.AzureStackAdmin/v0.10.6/Get-AzureRMManagedSubscription.md

@@ -21,7 +21,7 @@ The **Get-AzureRMManagedSubscription** cmdlet gets details about the target subs
 
 ## EXAMPLES
 
-### -------------------------- EXAMPLE 1 --------------------------
+### Example 1:
 ```
 Get-AzureRMManagedSubscription -TargetSubscriptionId "2fff214f-8589-4d25-b468-dc99320724bc"
 ```

azureps-cmdlets-docs/AzureStack/AzureRM.AzureStackAdmin/v0.10.6/Get-AzureRMOffer.md

@@ -34,14 +34,14 @@ The **Get-AzureRMOffer** cmdlet gets an offer. This cmdlet can be executed as a
 
 ## EXAMPLES
 
-### -------------------------- EXAMPLE 1 --------------------------
+### Example 1:
 ```
 Get-AzureRMOffer -Name "ComputeOffer" -ResourceGroup "OfferGroup" -Managed
 ```
 
 This command gets the offer named "ComputeOffer" and created in the "OfferGroup" resource group. This command is being executed as a service administrator.
 
-### -------------------------- EXAMPLE 2 --------------------------
+### Example 2:
 ```
 Get-AzureRMOffer -Provider "default" | Where-Object name -eq "ComputeOffer"
 ```

azureps-cmdlets-docs/AzureStack/AzureRM.AzureStackAdmin/v0.10.6/Get-AzureRMPlan.md

@@ -34,7 +34,7 @@ The **Get-AzureRmPlan** cmdlet gets the details of a plan. This cmdlet can be ex
 
 ## EXAMPLES
 
-### -------------------------- EXAMPLE 1 --------------------------
+### Example 1:
 ```
 Get-AzureRMPlan -Name "ComputePlan" -ResourceGroup "PlanGroup" -Managed
 ```

azureps-cmdlets-docs/AzureStack/AzureRM.AzureStackAdmin/v0.10.6/Get-AzureRMResourceProviderRegistration.md

@@ -22,7 +22,7 @@ The **Get-AzureRmResourceProviderRegistration** cmdlet gets the registration det
 
 ## EXAMPLES
 
-### -------------------------- EXAMPLE 1 --------------------------
+### Example 1:
 ```
 $registration = Get-AzureRMResourceProviderRegistration -Name "Microsoft.Sql.Admin" -ResourceGroup "System"
 ```