Skip to content

Commit 877045e

Browse files
committed
Merge branch 'dev' of https://github.com/huangpf/azure-powershell into dev
2 parents d07b1eb + 3b94797 commit 877045e

File tree

2 files changed

+13
-13
lines changed

2 files changed

+13
-13
lines changed

src/ResourceManager/RedisCache/Commands.RedisCache/Microsoft.Azure.Commands.RedisCache.dll-Help.xml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -350,7 +350,7 @@
350350
<command:parameter required="false" variableLength="false" globbing="false" pipelineInput="True (ByPropertyName)" position="named" aliases="">
351351
<maml:name>VirtualNetwork</maml:name>
352352
<maml:description>
353-
<maml:para>The exact ARM resource ID of the virtual network to deploy the redis cache in. Example format: /subscriptions/{subid}/resourceGroups/{resourceGroupName}/Microsoft.ClassicNetwork/VirtualNetworks/vnet1</maml:para>
353+
<maml:para>The exact ARM resource ID of the virtual network to deploy the redis cache in. Example format: /subscriptions/{subid}/resourceGroups/{resourceGroupName}/providers/Microsoft.ClassicNetwork/VirtualNetworks/{vnetName}</maml:para>
354354
</maml:description>
355355
<command:parameterValue required="true" variableLength="false">String</command:parameterValue>
356356
</command:parameter>
@@ -500,7 +500,7 @@
500500
<command:parameter required="false" variableLength="false" globbing="false" pipelineInput="True (ByPropertyName)" position="named" aliases="">
501501
<maml:name>VirtualNetwork</maml:name>
502502
<maml:description>
503-
<maml:para>The exact ARM resource ID of the virtual network to deploy the redis cache in. Example format: /subscriptions/{subid}/resourceGroups/{resourceGroupName}/Microsoft.ClassicNetwork/VirtualNetworks/vnet1</maml:para>
503+
<maml:para>The exact ARM resource ID of the virtual network to deploy the redis cache in. Example format: /subscriptions/{subid}/resourceGroups/{resourceGroupName}/providers/Microsoft.ClassicNetwork/VirtualNetworks/{vnetName}</maml:para>
504504
</maml:description>
505505
<command:parameterValue required="true" variableLength="false">String</command:parameterValue>
506506
<dev:type>

src/ResourceManager/Sql/Commands.Sql/Microsoft.Azure.Commands.Sql.dll-Help.xml

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -4895,7 +4895,7 @@ Status : Queued</maml:para>
48954895
<command:details>
48964896
<command:name>Get-AzureRmSqlServerCommunicationLink</command:name>
48974897
<maml:description>
4898-
<maml:para>Gets server communication links and their property values in an Azure SQL Server.</maml:para>
4898+
<maml:para>Gets server communication links and their property values in an Azure SQL Database.</maml:para>
48994899
</maml:description>
49004900
<maml:copyright>
49014901
<maml:para />
@@ -5012,7 +5012,7 @@ Status : Queued</maml:para>
50125012
</maml:introduction>
50135013
<dev:code>PS C:\&gt; Get-AzureRmSqlServerCommunicationLink -ResourceGroupName &quot;resourcegroup01&quot; -ServerName &quot;server01&quot;</dev:code>
50145014
<dev:remarks>
5015-
<maml:para>Gets all server-to-server partnership for Elastic transactions that the specified server is involved in.</maml:para>
5015+
<maml:para>Gets all server-to-server partnerships for Elastic transactions that the specified server in Azure SQL Database is involved in.</maml:para>
50165016
<maml:para />
50175017
<maml:para />
50185018
<maml:para></maml:para>
@@ -7194,7 +7194,7 @@ FirewallRuleName : rule01</maml:para>
71947194
<command:details>
71957195
<command:name>New-AzureRmSqlServerCommunicationLink</command:name>
71967196
<maml:description>
7197-
<maml:para>Creates an Azure SQL Server partnership for Elastic transactions. Once established, Elastic transactions will be able to span databases in either of the servers paired.</maml:para>
7197+
<maml:para>Creates a communication link for Elastic transactions between two logical servers in Azure SQL Database. Once established, Elastic transactions will be able to span databases in either of the servers paired.</maml:para>
71987198
</maml:description>
71997199
<maml:copyright>
72007200
<maml:para />
@@ -7204,7 +7204,7 @@ FirewallRuleName : rule01</maml:para>
72047204
<dev:version />
72057205
</command:details>
72067206
<maml:description>
7207-
<maml:para>The New-AzureRmSqlServerCommunicationLink cmdlet creates an Azure SQL Server partnership for Elastic transactions. The partnership can be set up for two servers at a time and once established, Elastic transactions will be able to span databases in either of the servers paired. Users can create many server partnerships as necessary and involve a server in multiple partnerships to span Elastic transactions over a larger number of servers.</maml:para>
7207+
<maml:para>The New-AzureRmSqlServerCommunicationLink cmdlet creates a communication link for Elastic transactions between two logical servers in Azure SQL Database. The communication link can be set up for two servers at a time and once established, Elastic transactions will be able to span databases in either of the servers paired. Users can create as many server partnerships as necessary and involve a server in multiple partnerships to span Elastic transactions over a larger number of servers.</maml:para>
72087208
</maml:description>
72097209
<command:syntax>
72107210
<command:syntaxItem>
@@ -7324,7 +7324,7 @@ FirewallRuleName : rule01</maml:para>
73247324
</maml:alertSet>
73257325
<command:examples>
73267326
<command:example>
7327-
<maml:title>-------------------------- Example 1: Create a new Azure SQL Server communication link --------------------------</maml:title>
7327+
<maml:title>-------------------------- Example 1: Create a new communication link --------------------------</maml:title>
73287328
<maml:introduction>
73297329
<maml:paragraph>PS C:\&gt;</maml:paragraph>
73307330
</maml:introduction>
@@ -9300,7 +9300,7 @@ resourcegroup01 server01 DBAs 40b79501-b343-44ed-9ce7-da4c8cc7353b</m
93009300
<command:details>
93019301
<command:name>Remove-AzureRmSqlServerCommunicationLink</command:name>
93029302
<maml:description>
9303-
<maml:para>Deletes an Azure SQL Server communication link.</maml:para>
9303+
<maml:para>Deletes a communication link for Elastic transactions between two logical servers in Azure SQL Database.</maml:para>
93049304
</maml:description>
93059305
<maml:copyright>
93069306
<maml:para />
@@ -9346,14 +9346,14 @@ resourcegroup01 server01 DBAs 40b79501-b343-44ed-9ce7-da4c8cc7353b</m
93469346
<command:parameter required="false" variableLength="false" globbing="false" pipelineInput="false" position="named">
93479347
<maml:name>WhatIf</maml:name>
93489348
<maml:description>
9349-
<maml:para>Shows what would happen if the cmdlet runs. The cmdlet is not run.Shows what would happen if the cmdlet runs. The cmdlet is not run.</maml:para>
9349+
<maml:para>Shows what would happen if the cmdlet runs. The cmdlet is not run.</maml:para>
93509350
</maml:description>
93519351
<command:parameterValue required="false" variableLength="false">SwitchParameter</command:parameterValue>
93529352
</command:parameter>
93539353
<command:parameter required="false" variableLength="false" globbing="false" pipelineInput="false" position="named">
93549354
<maml:name>Confirm</maml:name>
93559355
<maml:description>
9356-
<maml:para>Prompts you for confirmation before running the cmdlet.Prompts you for confirmation before running the cmdlet.</maml:para>
9356+
<maml:para>Prompts you for confirmation before running the cmdlet.</maml:para>
93579357
</maml:description>
93589358
<command:parameterValue required="false" variableLength="false">SwitchParameter</command:parameterValue>
93599359
</command:parameter>
@@ -9411,7 +9411,7 @@ resourcegroup01 server01 DBAs 40b79501-b343-44ed-9ce7-da4c8cc7353b</m
94119411
<command:parameter required="false" variableLength="false" globbing="false" pipelineInput="false" position="named">
94129412
<maml:name>WhatIf</maml:name>
94139413
<maml:description>
9414-
<maml:para>Shows what would happen if the cmdlet runs. The cmdlet is not run.Shows what would happen if the cmdlet runs. The cmdlet is not run.</maml:para>
9414+
<maml:para>Shows what would happen if the cmdlet runs. The cmdlet is not run.</maml:para>
94159415
</maml:description>
94169416
<command:parameterValue required="false" variableLength="false">SwitchParameter</command:parameterValue>
94179417
<dev:type>
@@ -9423,7 +9423,7 @@ resourcegroup01 server01 DBAs 40b79501-b343-44ed-9ce7-da4c8cc7353b</m
94239423
<command:parameter required="false" variableLength="false" globbing="false" pipelineInput="false" position="named">
94249424
<maml:name>Confirm</maml:name>
94259425
<maml:description>
9426-
<maml:para>Prompts you for confirmation before running the cmdlet.Prompts you for confirmation before running the cmdlet.</maml:para>
9426+
<maml:para>Prompts you for confirmation before running the cmdlet.</maml:para>
94279427
</maml:description>
94289428
<command:parameterValue required="false" variableLength="false">SwitchParameter</command:parameterValue>
94299429
<dev:type>
@@ -14101,4 +14101,4 @@ The final command upgrades the existing server named server02 in the resource g
1410114101
</maml:navigationLink>
1410214102
</maml:relatedLinks>
1410314103
</command:command>
14104-
</helpItems>
14104+
</helpItems>

0 commit comments

Comments
 (0)