Skip to content

Commit a17dbcb

Browse files
authored
Merge pull request #174985 from MicrosoftDocs/repo_sync_working_branch
Confirm merge from repo_sync_working_branch to master to sync with https://github.com/MicrosoftDocs/azure-docs (branch master)
2 parents 81a358e + 5c068d4 commit a17dbcb

File tree

4 files changed

+11
-14
lines changed

4 files changed

+11
-14
lines changed

articles/active-directory/devices/concept-primary-refresh-token.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -206,4 +206,4 @@ The following diagrams illustrate the underlying details in issuing, renewing, a
206206
207207
## Next steps
208208

209-
For more information on troubleshooting PRT-related issues, see the article [Troubleshooting hybrid Azure Active Directory joined Windows 10 and Windows Server 2016 devices](troubleshoot-hybrid-join-windows-current.md).
209+
For more information on troubleshooting PRT-related issues, see the article [Troubleshooting hybrid Azure Active Directory joined Windows 10 and Windows Server 2016 devices](troubleshoot-hybrid-join-windows-current.md#troubleshoot-post-join-authentication-issues).

articles/applied-ai-services/form-recognizer/quickstarts/try-sample-label-tool.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -83,7 +83,7 @@ Extract text, tables and key value pairs from invoices, sales receipts, ID docum
8383
4. Choose the file you would like to analyze from the below options:
8484

8585
* A URL for an image of an invoice. You can use a [sample invoice document](https://raw.githubusercontent.com/Azure/azure-sdk-for-python/master/sdk/formrecognizer/azure-ai-formrecognizer/samples/sample_forms/forms/Invoice_1.pdf) for this quickstart.
86-
* A URL for an image of a receipt. You can use a [sample ID document](https://raw.githubusercontent.com/Azure-Samples/cognitive-services-REST-api-samples/master/curl/form-recognizer/id-license.jpg) for this quickstart.
86+
* A URL for an image of an ID document. You can use a [sample ID document](https://raw.githubusercontent.com/Azure-Samples/cognitive-services-REST-api-samples/master/curl/form-recognizer/DriverLicense.png) for this quickstart.
8787
* A URL for an image of a receipt. You can use a [sample receipt image](https://raw.githubusercontent.com/Azure-Samples/cognitive-services-REST-api-samples/master/curl/form-recognizer/contoso-allinone.jpg) for this quickstart.
8888
* A URL for an image of a business card. You can use a [sample business card image](https://raw.githubusercontent.com/Azure/azure-sdk-for-python/master/sdk/formrecognizer/azure-ai-formrecognizer/samples/sample_forms/business_cards/business-card-english.jpg) for this quickstart.
8989

articles/databox/data-box-cable-options.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -113,7 +113,7 @@ Use this configuration if your device will be in a DHCP environment.
113113

114114
Before you begin, make sure you have:
115115

116-
- An RJ45 cable if you wish to connect DATA 1.
116+
- An RJ45 cable if you wish to connect DATA 3.
117117
- A 10-GbE SFP+ Twinax copper cable for each 10-GbE data port that you want to connect.
118118
- One or more data sources running a [Supported OS](data-box-system-requirements.md#supported-operating-systems-for-clients). These data sources could be in different networks such as 1 GbE or 10-GbE networks.
119119

articles/iot-edge/tutorial-nested-iot-edge.md

Lines changed: 8 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -83,9 +83,8 @@ To create a hierarchy of IoT Edge devices, you will need:
8383
8484
![The virtual machine will output a JSON upon creation, which contains its SSH handle](./media/tutorial-nested-iot-edge/virtual-machine-outputs.png)
8585

86-
* Make sure that the following ports are open inbound for all devices except the lowest layer device: 8000, 443, 5671, 8883:
87-
* 8000: Used to pull Docker container images through the API proxy.
88-
* 443: Used between parent and child edge hubs for REST API calls.
86+
* Make sure that the following ports are open inbound for all devices except the lowest layer device: 443, 5671, 8883:
87+
* 443: Used between parent and child edge hubs for REST API calls and to pull docker container images.
8988
* 5671, 8883: Used for AMQP and MQTT.
9089

9190
For more information, see [how to open ports to a virtual machine with the Azure portal](../virtual-machines/windows/nsg-quickstart-portal.md).
@@ -231,7 +230,7 @@ Run the configuration and connectivity checks on your devices. For the **top lay
231230
For the **lower layer device**, the diagnostics image needs to be manually passed in the command:
232231

233232
```bash
234-
sudo iotedge check --diagnostics-image-name <parent_device_fqdn_or_ip>:8000/azureiotedge-diagnostics:1.2
233+
sudo iotedge check --diagnostics-image-name <parent_device_fqdn_or_ip>:443/azureiotedge-diagnostics:1.2
235234
```
236235

237236
On your **top layer device**, expect to see an output with several passing evaluations. You may see some warnings about logs policies and, depending on your network, DNS policies.
@@ -255,9 +254,9 @@ In the [Azure Cloud Shell](https://shell.azure.com/), you can take a look at the
255254

256255
In addition the runtime modules **IoT Edge Agent** and **IoT Edge Hub**, the **top layer device** receives the **Docker registry** module and **IoT Edge API Proxy** module.
257256

258-
The **Docker registry** module points to an existing Azure Container Registry. In this case, `REGISTRY_PROXY_REMOTEURL` points to the Microsoft Container Registry. In the `createOptions`, you can see it communicates on port 5000.
257+
The **Docker registry** module points to an existing Azure Container Registry. In this case, `REGISTRY_PROXY_REMOTEURL` points to the Microsoft Container Registry. By default, **Docker registry** listens on port 5000.
259258

260-
The **IoT Edge API Proxy** module routes HTTP requests to other modules, allowing lower layer devices to pull container images or push blobs to storage. In this tutorial, it communicates on port 8000 and is configured to send Docker container image pull requests route to your **Docker registry** module on port 5000. Also, any blob storage upload requests route to module AzureBlobStorageonIoTEdge on port 11002. For more information about the **IoT Edge API Proxy** module and how to configure it, see the module's [how-to guide](how-to-configure-api-proxy-module.md).
259+
The **IoT Edge API Proxy** module routes HTTP requests to other modules, allowing lower layer devices to pull container images or push blobs to storage. In this tutorial, it communicates on port 443 and is configured to send Docker container image pull requests route to your **Docker registry** module on port 5000. Also, any blob storage upload requests route to module AzureBlobStorageonIoTEdge on port 11002. For more information about the **IoT Edge API Proxy** module and how to configure it, see the module's [how-to guide](how-to-configure-api-proxy-module.md).
261260

262261
If you'd like a look at how to create a deployment like this through the Azure portal or Azure Cloud Shell, see [top layer device section of the how-to guide](how-to-connect-downstream-iot-edge-device.md#deploy-modules-to-top-layer-devices).
263262

@@ -267,7 +266,7 @@ In the [Azure Cloud Shell](https://shell.azure.com/), you can take a look at the
267266
cat ~/nestedIotEdgeTutorial/iotedge_config_cli_release/templates/tutorial/deploymentLowerLayer.json
268267
```
269268

270-
You can see under `systemModules` that the **lower layer device's** runtime modules are set to pull from `$upstream:8000`, instead of `mcr.microsoft.com`, as the **top layer device** did. The **lower layer device** sends Docker image requests the **IoT Edge API Proxy** module on port 8000, as it cannot directly pull the images from the cloud. The other module deployed to the **lower layer device**, the **Simulated Temperature Sensor** module, also makes its image request to `$upstream:8000`.
269+
You can see under `systemModules` that the **lower layer device's** runtime modules are set to pull from `$upstream:443`, instead of `mcr.microsoft.com`, as the **top layer device** did. The **lower layer device** sends Docker image requests the **IoT Edge API Proxy** module on port 443, as it cannot directly pull the images from the cloud. The other module deployed to the **lower layer device**, the **Simulated Temperature Sensor** module, also makes its image request to `$upstream:443`.
271270

272271
If you'd like a look at how to create a deployment like this through the Azure portal or Azure Cloud Shell, see [lower layer device section of the how-to guide](how-to-connect-downstream-iot-edge-device.md#deploy-modules-to-lower-layer-devices).
273272

@@ -301,10 +300,8 @@ You can run `iotedge check` in a nested hierarchy, even if the child machines do
301300

302301
When you run `iotedge check` from the lower layer, the program tries to pull the image from the parent through port 443.
303302

304-
In this tutorial, we use port 8000, so we need to specify it:
305-
306303
```bash
307-
sudo iotedge check --diagnostics-image-name $upstream:8000/azureiotedge-diagnostics:1.2
304+
sudo iotedge check --diagnostics-image-name $upstream:443/azureiotedge-diagnostics:1.2
308305
```
309306

310307
The `azureiotedge-diagnostics` value is pulled from the container registry that's linked with the registry module. This tutorial has it set by default to https://mcr.microsoft.com:
@@ -336,4 +333,4 @@ To learn more about using gateways to create hierarchical layers of IoT Edge dev
336333
To see how Azure IoT Edge can create more solutions for your business, continue on to the other tutorials.
337334

338335
> [!div class="nextstepaction"]
339-
> [Deploy an Azure Machine Learning model as a module](tutorial-deploy-machine-learning.md)
336+
> [Deploy an Azure Machine Learning model as a module](tutorial-deploy-machine-learning.md)

0 commit comments

Comments
 (0)