resolve conflict with main branch

Author: VeryEarly

src/ApiManagement/ApiManagement/help/New-AzApiManagementSubscription.md

@@ -43,13 +43,13 @@ This command subscribes an existing user to a product.
 ### Example 2: Create a subscription for all Api Scope
 ```powershell
 $apimContext = New-AzApiManagementContext -ResourceGroupName "Api-Default-WestUS" -ServiceName "contoso"
-New-AzApiManagementSubscription -Context $context -Scope "/apis" -Name "GlobalApiScope"
+New-AzApiManagementSubscription -Context $apimContext -Scope "/apis" -Name "GlobalApiScope"
 ```
 
 ### Example 3: Create a subscription for Product Scope
 ```powershell
 $apimContext = New-AzApiManagementContext -ResourceGroupName "Api-Default-WestUS" -ServiceName "contoso"
-New-AzApiManagementSubscription -Context $context -Scope "/products/starter" -Name "UnlimitedProductSub"
+New-AzApiManagementSubscription -Context $apimContext -Scope "/products/starter" -Name "UnlimitedProductSub"
 ```
 
 ## PARAMETERS

src/ApplicationInsights/ApplicationInsights/help/Get-AzApplicationInsightsApiKey.md

@@ -42,17 +42,16 @@ Get-AzApplicationInsightsApiKey -ResourceGroupName "testGroup" -Name "test"
 ```output
 Id                                   Description Permissions                       CreatedDate                   ApiKey
 --                                   ----------- -----------                       -----------                   ------
-7c4c61dc-b392-4aa4-992f-ee92b84e5dee test1 ReadTelemetry                     Wed, 18 Oct 2017 23:36:40 GMT
-63657030-dea6-4c52-82f4-6f5128cb92cb test2  {ReadTelemetry, WriteAnnotations} Wed, 18 Oct 2017 21:46:41 GMT
-82549f39-f3ae-492e-8f94-f7aada75fa57 test3  ReadTelemetry                     Wed, 18 Oct 2017 22:30:23 GMT
+7c4c61dc-b392-4aa4-992f-ee92b84e5dee test1       ReadTelemetry                     Wed, 18 Oct 2017 23:36:40 GMT
+63657030-dea6-4c52-82f4-6f5128cb92cb test2       {ReadTelemetry, WriteAnnotations} Wed, 18 Oct 2017 21:46:41 GMT
+82549f39-f3ae-492e-8f94-f7aada75fa57 test3       ReadTelemetry                     Wed, 18 Oct 2017 22:30:23 GMT
 ```
 
 Get application insights api keys for resource "test" in resource group "testGroup".
 
 ### Example 2 Get specific API key for an application insights resource
 ```powershell
-Get-AzApplicationInsightsApiKey -ResourceGroupName "testGroup" -Name "test"  -ApiKeyId 
-7c4c61dc-b392-4aa4-992f-ee92b84e5dee
+Get-AzApplicationInsightsApiKey -ResourceGroupName "testGroup" -Name "test" -ApiKeyId 7c4c61dc-b392-4aa4-992f-ee92b84e5dee
 ```
 ```output
 ApiKey      :
@@ -62,8 +61,8 @@ Permissions : {ReadTelemetry}
 Description : test1
 ```
 
-Get specific application insights api key that id is "dd173f38-4fd1-4c75-8af5-9
-9c29aa0f867" for resource "test" in resource group "testGroup".
+Get specific application insights api key that id is "7c4c61dc-b392-4aa4-992f-e
+e92b84e5dee" for resource "test" in resource group "testGroup".
 
 ## PARAMETERS
 

src/ApplicationInsights/ApplicationInsights/help/Get-AzApplicationInsightsWebTest.md

@@ -87,7 +87,7 @@ Get-AzApplicationInsightsWebTest -ResourceGroupName azpwsh-rg-test -AppInsightsN
 Name                                 Location WebTestKind ResourceGroupName   Enabled
 ----                                 -------- ----------- -----------------   -------
 bsaic-portal-appinsights-portal01    westus2  ping        azpwsh-rg-test      True
-basic-portal02-appinsights-portal01  westus2  ping        azpwsh-rg-test      True  
+basic-portal02-appinsights-portal01  westus2  ping        azpwsh-rg-test      True
 basic-portal03-appinsights-portal01  westus2  ping        azpwsh-rg-test      True
 standard-portal-appinsights-portal01 westus2  standard    azpwsh-rg-test      True
 standard-pwsh01                      westus2  standard    azpwsh-rg-test      True
@@ -110,14 +110,10 @@ This command gets a specific Application Insights web test definition.
 ### Example 5: Get a specific Application Insights web test definition by pipeline
 ```powershell
 $location01 = New-AzApplicationInsightsWebTestGeolocationObject -Location "emea-nl-ams-azr"
-```
-```powershell
 $location02 = New-AzApplicationInsightsWebTestGeolocationObject -Location "us-ca-sjc-azr"
-```
-```powershell
- New-AzApplicationInsightsWebTest -ResourceGroup azpwsh-rg-test -Name standardwebtestpwsh03 -Location 'westus2' `
+New-AzApplicationInsightsWebTest -ResourceGroup azpwsh-rg-test -Name standardwebtestpwsh03 -Location 'westus2' `
 -Tag @{"hidden-link:/subscriptions/xxxxxxxxxx-xxxx-xxxxx-xxxxxxxxxxxx/resourceGroups/azpwsh-rg-test/providers/microsoft.insights/components/appinsightsportal01" = "Resource"} `
--RequestUrl "https://docs.microsoft.com/"  -RequestHttpVerb "GET" `
+-RequestUrl "https://docs.microsoft.com/" -RequestHttpVerb "GET" `
 -NameInAppInsights 'standardwebtestpwsh03' `
 -RuleSslCheck -RuleSslCertRemainingLifetimeCheck 7 -RuleExpectedHttpStatusCode 200 `
 -Enabled -Frequency 300 -Timeout 120 -WebTestKind "standard" -RetryEnabled -GeoLocations $location01, $location02 ` |Get-AzApplicationInsightsWebTest

src/ApplicationInsights/ApplicationInsights/help/New-AzApplicationInsightsApiKey.md

@@ -38,12 +38,8 @@ Create an application insights api keys for an application insights resource
 
 ### Example 1 Create a new Api Key for an application insights resource
 ```powershell
-$apiKeyDescription="testapiKey"
-```
-```powershell
+$apiKeyDescription = "testapiKey"
 $permissions = @("ReadTelemetry", "WriteAnnotations")
-```
-```powershell
 New-AzApplicationInsightsApiKey -ResourceGroupName "testGroup" -Name "test" -Description $apiKeyDescription -Permissions $permissions
 ```
 ```output

src/ApplicationInsights/ApplicationInsights/help/New-AzApplicationInsightsContinuousExport.md

@@ -41,14 +41,10 @@ Create a new application insights continuous export configuration for an applica
 ### Example 1 Create a new continuous export configuration for an application insights resource
 ```powershell
 $sastoken = New-AzStorageContainerSASToken -Name testcontainer -Context $context -ExpiryTime (Get-Date).AddYears(50) -Permission w
- ```
- ```powershell
- $sasuri = "https://teststorageaccount.blob.core.windows.net/testcontainer" + $sastoken
- ```
- ```powershell
-New-AzApplicationInsightsContinuousExport -ResourceGroupName "testgroup" -Name "test"
- -DocumentType "Request","Trace", "Custom Event" -StorageAccountId "/subscriptions/50359d91-7b9d-4823-85af-eb298a61ba96/resourceGroups/testgroup/providers/Microsoft.Storage/storageAccounts/teststorageaccount" -StorageLocation sourcecentralus
- -StorageSASUri $sasuri
+$sasuri = "https://teststorageaccount.blob.core.windows.net/testcontainer" + $sastoken
+New-AzApplicationInsightsContinuousExport -ResourceGroupName "testgroup" -Name "test" `
+-DocumentType "Request","Trace", "Custom Event" -StorageAccountId "/subscriptions/50359d91-7b9d-4823-85af-eb298a61ba96/resourceGroups/testgroup/providers/Microsoft.Storage/storageAccounts/teststorageaccount" -StorageLocation sourcecentralus `
+-StorageSASUri $sasuri
 ```
 ```output
 ExportId                         : jlTFEiBg1rkDXOCIeJQ2mB2TxZg=

src/ApplicationInsights/ApplicationInsights/help/New-AzApplicationInsightsLinkedStorageAccount.md

@@ -40,7 +40,6 @@ Create an application insights linked storage account
 ### Example 1
 ```powershell
 $account = Get-AzStorageAccount -ResourceGroupName "rgName" -Name "accountName"
-
 Get-AzApplicationInsights -ResourceGroupName "rgName" -Name "componentName" | New-AzApplicationInsightsLinkedStorageAccount -LinkedStorageAccountResourceId $account.Id
 ```
 

src/ApplicationInsights/ApplicationInsights/help/New-AzApplicationInsightsWebTest.md

@@ -42,12 +42,8 @@ Creates or updates an Application Insights web test definition.
 ### Example 1: Creates or updates an standard kind of the Application Insights web test
 ```powershell
 $geoLocation = @()
-```
-```powershell
 $geoLocation += New-AzApplicationInsightsWebTestGeolocationObject -Location "emea-nl-ams-azr"
 $geoLocation += New-AzApplicationInsightsWebTestGeolocationObject -Location "us-ca-sjc-azr"
-```
-```powershell
 New-AzApplicationInsightsWebTest -ResourceGroup azpwsh-rg-test -Name standard-pwsh01 -Location 'westus2' `
 -Tag @{"hidden-link:/subscriptions/xxxxxxxxxx-xxxx-xxxxx-xxxxxxxxxxxx/resourceGroups/azpwsh-rg-test/providers/microsoft.insights/components/appinsights-portal01" = "Resource"} `
 -RequestUrl "https://www.bing.com" -RequestHttpVerb "GET" -TestName 'standard-pwsh01' `
@@ -66,14 +62,8 @@ We enter hidden-link in the `Tag` parameter to associate WebTest and Application
 ### Example 2: Creates or updates an ping kind of the Application Insights web test
 ```powershell
 $geoLocation = @()
-```
-```powershell
 $geoLocation += New-AzApplicationInsightsWebTestGeolocationObject -Location "emea-nl-ams-azr"
-```
-```powershell
 $geoLocation += New-AzApplicationInsightsWebTestGeolocationObject -Location "us-ca-sjc-azr"
-```
-```powershell
 New-AzApplicationInsightsWebTest -ResourceGroupName azpwsh-rg-test -Name 'pingwebtest-pwsh01' -TestName 'pingwentest-pwsh01testname' -Location 'westus2' `
 -Tag @{"hidden-link:/subscriptions/xxxxxxxxxx-xxxx-xxxxx-xxxxxxxxxxxx/resourceGroups/azpwsh-rg-test/providers/microsoft.insights/components/appinsights-portal01" = "Resource"} `
 -GeoLocation $geoLocation -RetryEnabled -Enabled -Frequency 300 -Timeout 90 `
@@ -91,14 +81,8 @@ This command creates or updates an ping kind of the Application Insights web tes
 ### Example 3: Creates or updates an ping kind of the Application Insights web test with custom configuration
 ```powershell
 $geoLocation = @()
-```
-```powershell
 $geoLocation += New-AzApplicationInsightsWebTestGeolocationObject -Location "emea-nl-ams-azr"
-```
-```powershell
 $geoLocation += New-AzApplicationInsightsWebTestGeolocationObject -Location "us-ca-sjc-azr"
-```
-```powershell
 New-AzApplicationInsightsWebTest -ResourceGroupName azpwsh-rg-test -Name 'pingwebtest-pwsh01' -TestName 'pingwentest-pwsh01testname' -Location 'westus2' `
 -Tag @{"hidden-link:/subscriptions/xxxxxxxxxx-xxxx-xxxxx-xxxxxxxxxxxx/resourceGroups/azpwsh-rg-test/providers/microsoft.insights/components/appinsights-portal01" = "Resource"} `
 -GeoLocation $geoLocation -RetryEnabled -Enabled -Frequency 300 -Timeout 90 `

src/ApplicationInsights/ApplicationInsights/help/Remove-AzApplicationInsightsApiKey.md

@@ -38,8 +38,9 @@ Remove an application insights api key for an application insights resource
 
 ### Example 1 Remove an application insights api key for an application insights resource
 ```powershell
-Remove-AzApplicationInsightsApiKey -ResourceGroupName "testGroup" -Name "test"  -ApiKeyId dd173f38-4fd1-4c75-8af5-9
-9c29aa0f867 -PassThru
+Remove-AzApplicationInsightsApiKey -ResourceGroupName "testGroup" -Name "test" -ApiKeyId dd173f38-4fd1-4c75-8af5-99c29aa0f867 -PassThru
+```
+```output
 True
 ```
 

src/ApplicationInsights/ApplicationInsights/help/Remove-AzApplicationInsightsContinuousExport.md

@@ -40,6 +40,8 @@ Remove a continuous export configuration in an application insights resource
 ### Example 1 Remove a continuous export configuration in an application insights resource
 ```powershell
 Remove-AzApplicationInsightsContinuousExport -ResourceGroupName "testgroup" -Name "test" -ExportId "uGOoki0jQsyEs3IdQ83Q4QsNr4=" -PassThru
+```
+```output
 True
 ```
 

src/ApplicationInsights/ApplicationInsights/help/Remove-AzApplicationInsightsWebTest.md

@@ -32,15 +32,13 @@ Deletes an Application Insights web test.
 ### Example 1: Deletes an Application Insights web test
 ```powershell
 Remove-AzApplicationInsightsWebTest -ResourceGroupName azpwsh-rg-test -Name standardwebtest01-lucasappinsights
-
 ```
 
 This command deletes an Application Insights web test.
 
 ### Example 2: Deletes an Application Insights web test by pipeline
 ```powershell
 Get-AzApplicationInsightsWebTest -ResourceGroupName azpwsh-rg-test -Name webtest01-lucasappinsights | Remove-AzApplicationInsightsWebTest
-
 ```
 
 This command deletes an Application Insights web test by pipeline.

src/ApplicationInsights/ApplicationInsights/help/Set-AzApplicationInsightsContinuousExport.md

@@ -42,15 +42,11 @@ Update a continuous export configuration in an application insights resource
 ### Example 1
 ```powershell
 $sastoken = New-AzStorageContainerSASToken -Name testcontainer -Context $context -ExpiryTime (Get-Date).AddYears(50) -Permission w
-```
-```powershell
 $sasuri = "https://teststorageaccount.blob.core.windows.net/testcontainer" + $sastoken
-```
-```powershell
 Set-AzApplicationInsightsContinuousExport -ResourceGroupName "testgroup" -Name "test"
- -DocumentType "Request","Trace" -ExportId "jlTFEiBg1rkDXOCIeJQ2mB2TxZg=" -StorageAccountId "/subscriptions/50359d91-7b9d-4823-85af-eb298a61ba96/resourceGroups/testgroup/providers/Microsoft.Storage/storageAccounts/teststorageaccount" -StorageLocation sourcecentralus
- -StorageSASUri $sasuri
- ```
+-DocumentType "Request","Trace" -ExportId "jlTFEiBg1rkDXOCIeJQ2mB2TxZg=" -StorageAccountId "/subscriptions/50359d91-7b9d-4823-85af-eb298a61ba96/resourceGroups/testgroup/providers/Microsoft.Storage/storageAccounts/teststorageaccount" -StorageLocation sourcecentralus
+-StorageSASUri $sasuri
+```
 ```output
 ExportId                         : jlTFEiBg1rkDXOCIeJQ2mB2TxZg=
 StorageName                      : teststorageaccount

src/ApplicationInsights/ApplicationInsights/help/Set-AzApplicationInsightsDailyCap.md

@@ -40,8 +40,7 @@ Set daily data volume cap for an application insights resource
 
 ### Example 1 Set daily data volume cap for an application insights resource
 ```powershell
-Set-AzApplicationInsightsDailyCap -ResourceGroupName "testgroup" -Name "test" -DailyCapGB 400
- -DisableNotificationWhenHitCap
+Set-AzApplicationInsightsDailyCap -ResourceGroupName "testgroup" -Name "test" -DailyCapGB 400 -DisableNotificationWhenHitCap
 ```
 ```output
  Cap ResetTime StopSendNotificationWhenHitCap

src/BotService/help/Export-AzBotServiceApp.md

@@ -22,21 +22,21 @@ Returns a BotService specified by the parameters.
 
 ## EXAMPLES
 
-### Example 1: DownLoad the BotService App folder
+### Example 1: Download the BotService App folder
 ```powershell
 Export-AzBotServiceApp -ResourceGroupName youriBotTest -name youriechobottest
-
+```
+```output
 Parameter $SavePath not provided, defaulting to current working directory.
 
     Directory: D:\powershell\BotService\azure-powershell\src\BotService
-```
-```output
+
 Mode                 LastWriteTime         Length Name
 ----                 -------------         ------ ----
 d----          2020/12/15    13:45                youriechobottest
 ```
 
-DownLoad the BotService App folder
+Download the BotService App folder
 
 ## PARAMETERS
 

src/BotService/help/Update-AzBotService.md

@@ -54,7 +54,6 @@ Update the Bot by Name and ResourceGroupName
 $getAzbot = Get-AzBotService -Name 'youri-apptest' -ResourceGroupName 'youriBotTest'
 Update-AzBotService -InputObject $getAzbot -kind sdk
 ```
-
 ```output
 Etag                                   Kind Location Name            SkuName SkuTier Type
 ----                                   ---- -------- ----            ------- ------- ----

src/ConfidentialLedger/Az.ConfidentialLedger.csproj

@@ -0,0 +1,7 @@
+<Project Sdk="Microsoft.NET.Sdk">
+  <PropertyGroup>
+    <PsModuleName>ConfidentialLedger</PsModuleName>
+  </PropertyGroup>
+
+  <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory).., build.proj))\src\Az.autorest.props" />
+</Project>