Skip to content

Commit 0e1693e

Browse files
committed
Merge branch 'release-iot-edge-v2' of https://github.com/MicrosoftDocs/azure-docs-pr into edge-ui
2 parents bb28105 + 6cfb7fa commit 0e1693e

File tree

6 files changed

+7
-6
lines changed

6 files changed

+7
-6
lines changed

articles/iot-edge/how-to-create-gateway-device.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -56,7 +56,7 @@ When you connect devices to a IoT Edge gateway using the Azure IoT device SDK, y
5656
* Set up the downstream device with a connection string referring to the gateway device hostname; and
5757
* Make sure that the downstream device trusts the certificate used to accept the connection by the gateway device.
5858

59-
When you install the Azure IoT Edge runtime using the control script, a certificate is created for the Edge hub, as you did in the tutorial [Install IoT Edge on a simulated device][lnk-tutorial1]. This certificate is used by the Edge hub to accept incoming TLS connections, and has to be trusted by the downstream device when connecting to the gateway device.
59+
When you install the Azure IoT Edge runtime using the control script, a certificate is created for the Edge hub, as you did in the tutorial Install IoT Edge on a simulated device on [Windows][lnk-tutorial1-win] and [Linux][lnk-tutorial1-lin]. This certificate is used by the Edge hub to accept incoming TLS connections, and has to be trusted by the downstream device when connecting to the gateway device.
6060

6161
You can create any certificate infrastructure that enables the trust required for your device-gateway topology. In this article, we assume the same certificate setup that you would use to enable [X.509 CA security][lnk-iothub-x509] in IoT Hub, which involves a X.509 CA certificate associated to a specific IoT hub (the *IoT hub owner CA*), and a series of certificates, signed with this CA, installed in the IoT Edge devices.
6262

articles/iot-edge/how-to-install-iot-core.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ The Azure IoT Edge Runtime can run even on tiny Single Board Computer (SBC) devi
2323
1. Install [Windows 10 IoT Core Dashboard][lnk-core] on a host system.
2424
1. Follow the steps in [Set up your device][lnk-board] to configure your board with the MinnowBoard Turbot/MAX Build 16299 image.
2525
1. Turn on the device, then [login remotely with PowerShell][lnk-powershell].
26-
1. In the PowerShell console, [install Docker binaries][lnk-docker].
26+
1. In the PowerShell console, [install Docker binaries][lnk-docker-install].
2727
1. Run the following command in the PowerShell console to install the IoT Edge runtime and verify your configuration:
2828

2929
```powershell

articles/iot-edge/module-composition.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -138,7 +138,7 @@ This an example of a deployment manifest JSON document.
138138
"edgeAgent": {
139139
"type": "docker",
140140
"settings": {
141-
"image": "edgepreview.azurecr.io/azureiotedge/edge-agent:1.0-preview",
141+
"image": "microsoft/azureiotedge-agent:1.0-preview",
142142
"createOptions": ""
143143
}
144144
},
@@ -147,7 +147,7 @@ This an example of a deployment manifest JSON document.
147147
"status": "running",
148148
"restartPolicy": "always",
149149
"settings": {
150-
"image": "edgepreview.azurecr.io/azureiotedge/edge-hub:1.0-preview",
150+
"image": "microsoft/azureiotedge-hub:1.0-preview",
151151
"createOptions": ""
152152
}
153153
}

articles/iot-edge/quickstart-linux.md

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -119,6 +119,7 @@ You learned how to deploy an IoT Edge module to an IoT Edge device. Now try depl
119119
[lnk-iothub-explorer]: https://github.com/azure/iothub-explorer
120120
[lnk-account]: https://azure.microsoft.com/free
121121
[lnk-portal]: https://portal.azure.com
122+
[lnk-delete]: https://docs.microsoft.com/cli/azure/iot/hub?view=azure-cli-latest#az_iot_hub_delete
122123

123124
<!-- Anchor links -->
124125
[anchor-register]: #register-an-iot-edge-device

articles/iot-edge/tutorial-deploy-machine-learning.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ You can use IoT Edge modules to deploy code that implements your business logic
2424
2525
This tutorial uses a sample Azure Machine Learning module hosted in DockerHub.
2626

27-
When you want to use your own [Azure Machine Learning][https://docs.microsoft.com/azure/machine-learning/preview/] model in your solution you will [deploy a model](https://aka.ms/aml-iot-edge-doc) for IoT Edge and host it in a container registry like [Azure Container Registry](../container-registry/index.yml) or Docker.
27+
When you want to use your own [Azure Machine Learning](https://docs.microsoft.com/azure/machine-learning/preview/) model in your solution you will [deploy a model](https://aka.ms/aml-iot-edge-doc) for IoT Edge and host it in a container registry like [Azure Container Registry](../container-registry/index.yml) or Docker.
2828

2929
## Prerequisites
3030

articles/iot-edge/tutorial-simulate-device-windows.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ manager: timlt
88

99
ms.author: kgremban
1010
ms.reviewer: elioda
11-
ms.date: 10/05/2017
11+
ms.date: 11/15/2017
1212
ms.topic: article
1313
ms.service: iot-edge
1414

0 commit comments

Comments
 (0)