Skip to content

Commit 4ea09d5

Browse files
authored
Merge pull request #49286 from MicrosoftDocs/repo_sync_working_branch
Confirm merge from repo_sync_working_branch to master to sync with https://github.com/Microsoft/azure-docs (branch master)
2 parents 49e3aee + 919fae8 commit 4ea09d5

7 files changed

+14
-12
lines changed

articles/data-factory/tutorial-bulk-copy-portal.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -103,7 +103,7 @@ For both SQL Database and SQL Data Warehouse, allow Azure services to access SQL
103103
![Get started page](./media/tutorial-bulk-copy-portal/get-started-page.png)
104104

105105
## Create linked services
106-
You create linked services to link your data stores and computes to a data factory. A linked has the connection information that the Data Factory service uses to connect to the data store at runtime.
106+
You create linked services to link your data stores and computes to a data factory. A linked service has the connection information that the Data Factory service uses to connect to the data store at runtime.
107107

108108
In this tutorial, you link your Azure SQL Database, Azure SQL Data Warehouse, and Azure Blob Storage data stores to your data factory. The Azure SQL Database is the source data store. The Azure SQL Data Warehouse is the sink/destination data store. The Azure Blob Storage is to stage the data before the data is loaded into SQL Data Warehouse by using PolyBase.
109109

@@ -234,7 +234,7 @@ The **GetTableListAndTriggerCopyData** takes a list of tables as a parameter. F
234234

235235
![ForEach activity settings](./media/tutorial-bulk-copy-portal/for-each-activity-settings.png)
236236

237-
c. In the **Add Dynamic Content** page, collapse the System Vairables and Funcstions section, click the **tableList** under **Parameters** which will automatically populate the top expression text box as `@pipeline().parameter.tableList`, then click **Finish**.
237+
c. In the **Add Dynamic Content** page, collapse the System Vairables and Functions section, click the **tableList** under **Parameters** which will automatically populate the top expression text box as `@pipeline().parameter.tableList`, then click **Finish**.
238238

239239
![Foreach parameter builder](./media/tutorial-bulk-copy-portal/for-each-parameter-builder.png)
240240

articles/expressroute/expressroute-howto-add-gateway-classic.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
---
1+
---
22
title: 'Configure a VNet gateway for ExpressRoute using PowerShell: classic: Azure | Microsoft Docs'
33
description: Configure a VNet gateway for a classic deployment model VNet using PowerShell for an ExpressRoute configuration.
44
documentationcenter: na
@@ -26,7 +26,7 @@ ms.author: charwen
2626
>
2727
>
2828
29-
This article will walk you through the steps to add, resize, and remove a virtual network (VNet) gateway for a pre-existing VNet. The steps for this configuration are specifically for VNets that were created using the **classic deployment model** and that will be be used in an ExpressRoute configuration.
29+
This article will walk you through the steps to add, resize, and remove a virtual network (VNet) gateway for a pre-existing VNet. The steps for this configuration are specifically for VNets that were created using the **classic deployment model** and that will be used in an ExpressRoute configuration.
3030

3131
[!INCLUDE [expressroute-classic-end-include](../../includes/expressroute-classic-end-include.md)]
3232

articles/service-fabric/service-fabric-service-model-schema-complex-types.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2072,7 +2072,7 @@ Declares service instances that are automatically created whenever an applicatio
20722072
</xs:attribute>
20732073
<xs:attribute name="ServicePackageActivationMode" type="xs:string" use="optional" default="SharedProcess">
20742074
<xs:annotation>
2075-
<xs:documentation>ServicePackageActivationMode to be used when creating the service. Allowed values are 'SharedProcess' and 'ExclusiveProcess'. With SharedProcess mode, replica(s) or instance(s) from different partition(s) of service will share same same activation of service package on a node. With ExclusiveProcess mode, each replica or instance of service will have its own dedicated activation of service package.</xs:documentation>
2075+
<xs:documentation>ServicePackageActivationMode to be used when creating the service. Allowed values are 'SharedProcess' and 'ExclusiveProcess'. With SharedProcess mode, replica(s) or instance(s) from different partition(s) of service will share the same activation of service package on a node. With ExclusiveProcess mode, each replica or instance of service will have its own dedicated activation of service package.</xs:documentation>
20762076
</xs:annotation>
20772077
</xs:attribute>
20782078
</xs:complexType>
@@ -2093,7 +2093,7 @@ Declares service instances that are automatically created whenever an applicatio
20932093
</xs:attribute>
20942094
<xs:attribute name="ServicePackageActivationMode" type="xs:string" use="optional" default="SharedProcess">
20952095
<xs:annotation>
2096-
<xs:documentation>ServicePackageActivationMode to be used when creating the service. Allowed values are 'SharedProcess' and 'ExclusiveProcess'. With SharedProcess mode, replica(s) or instance(s) from different partition(s) of service will share same same activation of service package on a node. With ExclusiveProcess mode, each replica or instance of service will have its own dedicated activation of service package.</xs:documentation>
2096+
<xs:documentation>ServicePackageActivationMode to be used when creating the service. Allowed values are 'SharedProcess' and 'ExclusiveProcess'. With SharedProcess mode, replica(s) or instance(s) from different partition(s) of service will share the same activation of service package on a node. With ExclusiveProcess mode, each replica or instance of service will have its own dedicated activation of service package.</xs:documentation>
20972097
</xs:annotation>
20982098
</xs:attribute>
20992099
</xs:complexType>

articles/service-fabric/service-fabric-service-model-schema-elements.md

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -6260,7 +6260,7 @@ Declares a service to be created automatically when the application is instantia
62606260
</xs:attribute>
62616261
<xs:attribute name="ServicePackageActivationMode" type="xs:string" use="optional" default="SharedProcess">
62626262
<xs:annotation>
6263-
<xs:documentation>ServicePackageActivationMode to be used when creating the service. Allowed values are 'SharedProcess' and 'ExclusiveProcess'. With SharedProcess mode, replica(s) or instance(s) from different partition(s) of service will share same same activation of service package on a node. With ExclusiveProcess mode, each replica or instance of service will have its own dedicated activation of service package.</xs:documentation>
6263+
<xs:documentation>ServicePackageActivationMode to be used when creating the service. Allowed values are 'SharedProcess' and 'ExclusiveProcess'. With SharedProcess mode, replica(s) or instance(s) from different partition(s) of service will share the same activation of service package on a node. With ExclusiveProcess mode, each replica or instance of service will have its own dedicated activation of service package.</xs:documentation>
62646264
</xs:annotation>
62656265
</xs:attribute>
62666266
</xs:complexType>
@@ -6295,7 +6295,7 @@ The DNS name of the service.
62956295
|use|optional|
62966296

62976297
#### ServicePackageActivationMode
6298-
ServicePackageActivationMode to be used when creating the service. Allowed values are 'SharedProcess' and 'ExclusiveProcess'. With SharedProcess mode, replica(s) or instance(s) from different partition(s) of service will share same same activation of service package on a node. With ExclusiveProcess mode, each replica or instance of service will have its own dedicated activation of service package.
6298+
ServicePackageActivationMode to be used when creating the service. Allowed values are 'SharedProcess' and 'ExclusiveProcess'. With SharedProcess mode, replica(s) or instance(s) from different partition(s) of service will share the same activation of service package on a node. With ExclusiveProcess mode, each replica or instance of service will have its own dedicated activation of service package.
62996299
|Attribute|Value|
63006300
|---|---|
63016301
|name|ServicePackageActivationMode|
@@ -6490,7 +6490,7 @@ A collection of services that are automatically located together, so they are al
64906490
</xs:attribute>
64916491
<xs:attribute name="ServicePackageActivationMode" type="xs:string" use="optional" default="SharedProcess">
64926492
<xs:annotation>
6493-
<xs:documentation>ServicePackageActivationMode to be used when creating the service. Allowed values are 'SharedProcess' and 'ExclusiveProcess'. With SharedProcess mode, replica(s) or instance(s) from different partition(s) of service will share same same activation of service package on a node. With ExclusiveProcess mode, each replica or instance of service will have its own dedicated activation of service package.</xs:documentation>
6493+
<xs:documentation>ServicePackageActivationMode to be used when creating the service. Allowed values are 'SharedProcess' and 'ExclusiveProcess'. With SharedProcess mode, replica(s) or instance(s) from different partition(s) of service will share the same activation of service package on a node. With ExclusiveProcess mode, each replica or instance of service will have its own dedicated activation of service package.</xs:documentation>
64946494
</xs:annotation>
64956495
</xs:attribute>
64966496
</xs:complexType>
@@ -6509,7 +6509,7 @@ Name of this service relative to this application Name URI. Fully qualified Name
65096509
|use|required|
65106510

65116511
#### ServicePackageActivationMode
6512-
ServicePackageActivationMode to be used when creating the service. Allowed values are 'SharedProcess' and 'ExclusiveProcess'. With SharedProcess mode, replica(s) or instance(s) from different partition(s) of service will share same same activation of service package on a node. With ExclusiveProcess mode, each replica or instance of service will have its own dedicated activation of service package.
6512+
ServicePackageActivationMode to be used when creating the service. Allowed values are 'SharedProcess' and 'ExclusiveProcess'. With SharedProcess mode, replica(s) or instance(s) from different partition(s) of service will share the same activation of service package on a node. With ExclusiveProcess mode, each replica or instance of service will have its own dedicated activation of service package.
65136513
|Attribute|Value|
65146514
|---|---|
65156515
|name|ServicePackageActivationMode|

articles/virtual-machines/scripts/virtual-machines-windows-powershell-sample-copy-snapshot-to-same-or-different-subscription.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ ms.author: ramankum
2020

2121
# Copy snapshot of a managed disk in same subscription or different subscription with PowerShell
2222

23-
This script creates a copy of a snapshot in the same same subscription or different subscription. Use this script to move a snapshot to different subscription for data retention. Storing snapshots in different subscription protect you from accidental deletion of snapshots in your main subscription.
23+
This script creates a copy of a snapshot in the same subscription or different subscription. Use this script to move a snapshot to different subscription for data retention. Storing snapshots in different subscription protect you from accidental deletion of snapshots in your main subscription.
2424

2525
[!INCLUDE [sample-powershell-install](../../../includes/sample-powershell-install.md)]
2626

articles/virtual-network/virtual-networks-udr-overview.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -63,7 +63,7 @@ Azure adds additional default system routes for different Azure capabilities, bu
6363
|Default |Multiple |VirtualNetworkServiceEndpoint|Only the subnet a service endpoint is enabled for.|
6464

6565
- **Virtual network (VNet) peering**: When you create a virtual network peering between two virtual networks, a route is added for each address range within the address space of each virtual network a peering is created for. Learn more about [virtual network peering](virtual-network-peering-overview.md).
66-
- **Virtual network gateway**: One or more routes with *Virtual network gateway* listed as the next hop type are added when a virtual network gateway is added to a virtual network. The source is also *virtual network gateway*, because the gateway adds the routes to the subnet. If your on-premises network gateway exchanges border gateway protocol ([BGP](#border-gateway-protocol) routes with an Azure virtual network gateway, a route is added for each route propagated from the on-premises network gateway. It's recommended that you summarize on-premises routes to the largest address ranges possible, so the fewest number of routes are propagated to an Azure virtual network gateway. There are limits to the number of routes you can propagate to an Azure virtual network gateway. For details, see [Azure limits](../azure-subscription-service-limits.md?toc=%2fazure%2fvirtual-network%2ftoc.json#networking-limits).
66+
- **Virtual network gateway**: One or more routes with *Virtual network gateway* listed as the next hop type are added when a virtual network gateway is added to a virtual network. The source is also *virtual network gateway*, because the gateway adds the routes to the subnet. If your on-premises network gateway exchanges border gateway protocol ([BGP](#border-gateway-protocol)) routes with an Azure virtual network gateway, a route is added for each route propagated from the on-premises network gateway. It's recommended that you summarize on-premises routes to the largest address ranges possible, so the fewest number of routes are propagated to an Azure virtual network gateway. There are limits to the number of routes you can propagate to an Azure virtual network gateway. For details, see [Azure limits](../azure-subscription-service-limits.md?toc=%2fazure%2fvirtual-network%2ftoc.json#networking-limits).
6767
- **VirtualNetworkServiceEndpoint**: The public IP addresses for certain services are added to the route table by Azure when you enable a service endpoint to the service. Service endpoints are enabled for individual subnets within a virtual network, so the route is only added to the route table of a subnet a service endpoint is enabled for. The public IP addresses of Azure services change periodically. Azure manages the addresses in the route table automatically when the addresses change. Learn more about [virtual network service endpoints](virtual-network-service-endpoints-overview.md), and the services you can create service endpoints for.
6868

6969
> [!NOTE]

articles/vpn-gateway/vpn-gateway-howto-point-to-site-resource-manager-portal.md

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -175,6 +175,8 @@ The VPN client configuration files contain settings to configure devices to conn
175175

176176
From the Network dialog box, locate the client profile that you want to use, specify the settings from the [VpnSettings.xml](point-to-site-vpn-client-configuration-azure-cert.md#installmac), and then click **Connect**.
177177

178+
Please check [Install - Mac (OS X)](https://docs.microsoft.com/en-us/azure/vpn-gateway/point-to-site-vpn-client-configuration-azure-cert#installmac) for detailed instrcutions.
179+
178180
![Mac connection](./media/vpn-gateway-howto-point-to-site-rm-ps/applyconnect.png)
179181

180182
## <a name="verify"></a>To verify your connection

0 commit comments

Comments
 (0)