Skip to content

Commit

Permalink
Merge pull request #2724 from Microsoft/FromPublicRepo
Browse files Browse the repository at this point in the history
From public repo
  • Loading branch information
v-anpasi committed Dec 9, 2016
2 parents 83783be + b24ca75 commit 226ce4f
Show file tree
Hide file tree
Showing 3 changed files with 6 additions and 11 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -46,9 +46,9 @@ There are several ways you can trigger a Logic app from another app. Here's a fe
* [Monitor logic apps](app-service-logic-monitor-your-logic-apps.md)

## Content types, conversions, and transformations
The Logic Apps [workflow definition language](http://aka.ms/logicappsdocs) contains many functions to allow you to convert and work with different content types. In addition the engine will do all it can to preserve content-types as data flows through the workflow.
The Logic Apps [workflow definition language](http://aka.ms/logicappsdocs) contains many functions to allow you to convert and work with different content types. In addition, the engine will do all it can to preserve content-types as data flows through the workflow.

* [Handling of content-types](app-service-logic-content-type.md) like application/json, application/xml, and plain/text
* [Handling of content-types](app-service-logic-content-type.md) such as application/json, application/xml, and text/plain
* [Authoring workflow definitions](app-service-logic-author-definitions.md)
* [Workflow definition language reference](http://aka.ms/logicappsdocs)

Expand Down
12 changes: 3 additions & 9 deletions articles/virtual-network/virtual-network-manage-nsg-arm-ps.md
Original file line number Diff line number Diff line change
Expand Up @@ -376,25 +376,19 @@ To associate the **NSG-FrontEnd** NSG to the **TestNICWeb1** NIC, complete the f
### Dissociate an NSG from a NIC
To dissociate the **NSG-FrontEnd** NSG from the **TestNICWeb1** NIC, complete the following steps:

1. Run the following command to retrieve the existing NSG and store it in a variable:

```powershell
$nsg = Get-AzureRmNetworkSecurityGroup -ResourceGroupName RG-NSG -Name NSG-FrontEnd
```

2. Run the following command to retrieve the existing NIC and store it in a variable:
1. Run the following command to retrieve the existing NIC and store it in a variable:

```powershell
$nic = Get-AzureRmNetworkInterface -ResourceGroupName RG-NSG -Name TestNICWeb1
```

3. Set the **NetworkSecurityGroup** property of the **NIC** variable to **$null** by running the following command:
2. Set the **NetworkSecurityGroup** property of the **NIC** variable to **$null** by running the following command:

```powershell
$nic.NetworkSecurityGroup = $null
```

4. To save the changes made to the NIC, run the following command:
3. To save the changes made to the NIC, run the following command:

```powershell
Set-AzureRmNetworkInterface -NetworkInterface $nic
Expand Down
1 change: 1 addition & 0 deletions articles/virtual-network/virtual-networks-udr-overview.md
Original file line number Diff line number Diff line change
Expand Up @@ -26,6 +26,7 @@ This flow of communication is possible because Azure uses a series of system rou
* From a subnet to another within a VNet.
* From VMs to the Internet.
* From a VNet to another VNet through a VPN gateway.
* From a VNet to another VNet through VNet Peering (Service Chaining).
* From a VNet to your on-premises network through a VPN gateway.

The figure below shows a simple setup with a VNet, two subnets, and a few VMs, along with the system routes that allow IP traffic to flow.
Expand Down

0 comments on commit 226ce4f

Please sign in to comment.