Skip to content

Commit f784875

Browse files
authored
Merge pull request #50015 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 c41adfa + 5f98ef5 commit f784875

File tree

3 files changed

+7
-3
lines changed

3 files changed

+7
-3
lines changed

articles/iot-edge/how-to-deploy-modules-vscode.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -125,7 +125,7 @@ You deploy modules to your device by applying the deployment manifest that you c
125125

126126
2. Right-click on the device that you want to configure with the deployment manifest.
127127

128-
3. Select **Create Deployment for IoT Edge Device**.
128+
3. Select **Create Deployment for Single Device**.
129129

130130
4. Navigate to the deployment manifest JSON file that you want to use, and click **Select Edge Deployment Manifest**.
131131

@@ -144,4 +144,4 @@ Right-click the name of a module to view and edit the module twin.
144144

145145
## Next steps
146146

147-
Learn how to [Deploy and monitor IoT Edge modules at scale](how-to-deploy-monitor.md)
147+
Learn how to [Deploy and monitor IoT Edge modules at scale](how-to-deploy-monitor.md)

articles/postgresql/quickstart-create-server-database-portal.md

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -80,6 +80,10 @@ Azure Database for PostgreSQL creates a firewall at the server level. It prevent
8080
AllowAllIps | 0.0.0.0 | 255.255.255.255
8181

8282
![Set Firewall Rules](./media/quickstart-create-database-portal/5-firewall-2.png)
83+
84+
> [!NOTE]
85+
> For production instances you should only set your firewall rules to accept incoming requests from known IP addresses. These settings are for example purposes only.
86+
>
8387
8488
4. On the upper toolbar of the **Connection security** page, select **Save**. Wait until the notification appears stating that the connection security update has finished successfully before you continue.
8589

articles/vpn-gateway/vpn-gateway-about-vpn-devices.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -69,7 +69,7 @@ To help configure your VPN device, refer to the links that correspond to appropr
6969
| ShareTech | Next Generation UTM (NU series) | 9.0.1.3 | Not compatible | [Configuration guide](http://www.sharetech.com.tw/images/file/Solution/NU_UTM/S2S_VPN_with_Azure_Route_Based_en.pdf) |
7070
| SonicWall |TZ Series, NSA Series<br>SuperMassive Series<br>E-Class NSA Series |SonicOS 5.8.x<br>SonicOS 5.9.x<br>SonicOS 6.x |Not compatible |[Configuration guide](https://www.sonicwall.com/support/knowledge-base/170505320011694) |
7171
| Sophos | XG Next Gen Firewall | XG v17 | | [Configuration guide](https://community.sophos.com/kb/127546) |
72-
| Ubiquiti | EdgeRouter | EdgeOS v1.10 | | [BGP over IKEv2/IPsec](https://na01.safelinks.protection.outlook.com/?url=https%3A%2F%2Fhelp.ubnt.com%2Fhc%2Fen-us%2Farticles%2F115012374708&data=02%7C01%7Cmaafiri%40microsoft.com%7C7580cdf59eb94528c0de08d4f9fd78bd%7C72f988bf86f141af91ab2d7cd011db47%7C1%7C0%7C636408314443168072&sdata=2EF5KFljZwtAGQDSm8%2FF2f6DqI2bkmA2qKG4u0rPgbQ%3D&reserved=0)<br><br>[VTI over IKEv2/IPsec](https://na01.safelinks.protection.outlook.com/?url=https%3A%2F%2Fhelp.ubnt.com%2Fhc%2Fen-us%2Farticles%2F115012305347&data=02%7C01%7Cmaafiri%40microsoft.com%7C7580cdf59eb94528c0de08d4f9fd78bd%7C72f988bf86f141af91ab2d7cd011db47%7C1%7C0%7C636408314443168072&sdata=ycgiDJCOQYTPN7sAEBSigphzC6mBaADz%2FgdCOm7TsXA%3D&reserved=0)
72+
| Ubiquiti | EdgeRouter | EdgeOS v1.10 | | [BGP over IKEv2/IPsec](https://help.ubnt.com/hc/en-us/articles/115012374708)<br><br>[VTI over IKEv2/IPsec](https://help.ubnt.com/hc/en-us/articles/115012305347)
7373
| WatchGuard |All |Fireware XTM<br> PolicyBased: v11.11.x<br>RouteBased: v11.12.x |[Configuration guide](http://watchguardsupport.force.com/publicKB?type=KBArticle&SFDCID=kA2F00000000LI7KAM&lang=en_US) |[Configuration guide](http://watchguardsupport.force.com/publicKB?type=KBArticle&SFDCID=kA22A000000XZogSAG&lang=en_US)|
7474

7575
> [!NOTE]

0 commit comments

Comments
 (0)