Merge pull request #206896 from w-azure/winona-upload

Updated file upload articles

Author: BCS2022

articles/iot-hub/iot-hub-csharp-csharp-file-upload.md

@@ -46,7 +46,7 @@ At the end of this article you run two .NET console apps:
 
 * A registered device. Register one in the [Azure portal](iot-hub-create-through-portal.md#register-a-new-device-in-the-iot-hub).
 
-* The sample applications you run in this article are written using C#. For the Azure IoT C# samples, we recommend you have the .NET Core SDK 3.1 or greater on your development machine.
+* The sample applications you run in this article are written using C# with .NET Core.
 
     You can download the .NET Core SDK for multiple platforms from [.NET](https://dotnet.microsoft.com/download).
 
@@ -256,7 +256,7 @@ You can use the portal to view the uploaded file in the storage container you co
 1. Select the folder named after your device.
 1. Select the blob that you uploaded your file to. In this article, it's the blob named **TestPayload.txt**.  
 
-    :::image type="content" source="./media/iot-hub-csharp-csharp-file-upload/view-uploaded-file.png" alt-text="Screenshot of selecting the uploaded file in the Azure portal.":::
+    :::image type="content" source="./media/iot-hub-csharp-csharp-file-upload/view-uploaded-file.png" alt-text="Screenshot of selecting the uploaded file in the Azure portal." lightbox="./media/iot-hub-csharp-csharp-file-upload/view-uploaded-file.png":::
 
 1. View the blob properties on the page that opens. You can select **Download** to download the file and view its contents locally.
 

articles/iot-hub/iot-hub-java-java-file-upload.md

@@ -292,7 +292,7 @@ mvn exec:java -Dexec.mainClass="com.mycompany.app.App"
 
 You can use the portal to view the uploaded file in the storage container you configured:
 
-![Uploaded file](media/iot-hub-java-java-upload/uploaded-file.png)
+:::image type="content" source="media/iot-hub-java-java-upload/uploaded-file.png" alt-text="Screenshot showing a file that had been uploaded to your storage container." lightbox="media/iot-hub-java-java-upload/uploaded-file.png":::
 
 ## Receive a file upload notification
 
@@ -402,7 +402,7 @@ In this section, you create a Java console app that receives file upload notific
 4. Save and close the `pom.xml` file.
 
 5. Get the IoT Hub service connection string.
-    [!INCLUDE [iot-hub-include-find-service-connection-string](../../includes/iot-hub-include-find-service-connection-string.md)]
+   [!INCLUDE [iot-hub-include-find-service-connection-string](../../includes/iot-hub-include-find-service-connection-string.md)]
 
 6. Using a text editor, open the `my-app\src\main\java\com\mycompany\app\App.java` file and replace the code with the following.
 

articles/iot-hub/iot-hub-node-node-file-upload.md

@@ -297,7 +297,7 @@ You can use the portal to view the uploaded file in the storage container you co
 1. Select the folder named after your device.
 1. Select the blob that you uploaded your file to. In this article, it's the blob with the same name as your file.  
 
-    :::image type="content" source="./media/iot-hub-node-node-file-upload/view-uploaded-file.png" alt-text="Screenshot of viewing the uploaded file in the Azure portal.":::
+    :::image type="content" source="./media/iot-hub-node-node-file-upload/view-uploaded-file.png" alt-text="Screenshot of viewing the uploaded file in the Azure portal." lightbox="./media/iot-hub-node-node-file-upload/view-uploaded-file.png":::
 
 1. View the blob properties on the page that opens. You can select **Download** to download the file and view its contents locally.
 

articles/iot-hub/iot-hub-python-python-file-upload.md

@@ -40,15 +40,11 @@ At the end of this article, you run the Python console app:
 
 ## Prerequisites
 
-* Make sure that port 8883 is open in your firewall. The device sample in this article uses MQTT protocol, which communicates over port 8883. This port may be blocked in some corporate and educational network environments. For more information and ways to work around this issue, see [Connecting to IoT Hub (MQTT)](iot-hub-mqtt-support.md#connecting-to-iot-hub).
-
-## Create an IoT hub
+* An IoT Hub. Create one with the [CLI](iot-hub-create-using-cli.md) or the [Azure portal](iot-hub-create-through-portal.md).
 
-[!INCLUDE [iot-hub-include-create-hub](../../includes/iot-hub-include-create-hub.md)]
+* A registered device. Register one in the [Azure portal](iot-hub-create-through-portal.md#register-a-new-device-in-the-iot-hub).
 
-## Register a new device in the IoT hub
-
-[!INCLUDE [iot-hub-include-create-device](../../includes/iot-hub-include-create-device.md)]
+* Make sure that port 8883 is open in your firewall. The device sample in this article uses MQTT protocol, which communicates over port 8883. This port may be blocked in some corporate and educational network environments. For more information and ways to work around this issue, see [Connecting to IoT Hub (MQTT)](iot-hub-mqtt-support.md#connecting-to-iot-hub).
 
 [!INCLUDE [iot-hub-associate-storage](../../includes/iot-hub-include-associate-storage.md)]
 
@@ -188,11 +184,11 @@ Now you're ready to run the application.
 
 2. The following screenshot shows the output from the **FileUpload** app:
 
-    ![Output from simulated-device app](./media/iot-hub-python-python-file-upload/run-device-app.png)
+    :::image type="content" source="./media/iot-hub-python-python-file-upload/run-device-app.png" alt-text="Screenshot showing output from running the FileUpload app." border="true" lightbox="./media/iot-hub-python-python-file-upload/run-device-app.png":::
 
 3. You can use the portal to view the uploaded file in the storage container you configured:
 
-    ![Uploaded file](./media/iot-hub-python-python-file-upload/view-blob.png)
+    :::image type="content" source="./media/iot-hub-python-python-file-upload/view-blob.png" alt-text="Screenshot of the container in the Azure portal that shows the uploaded file." border="true" lightbox="./media/iot-hub-python-python-file-upload/view-blob.png":::
 
 ## Next steps
 

articles/iot-hub/media/iot-hub-java-java-upload/uploaded-file.png

@@ -18,9 +18,10 @@ To associate an Azure Storage account with your IoT hub:
 
 1. Under **Hub settings**, select **File upload** on the left-pane of your IoT hub.
 
-    :::image type="content" source="./media/iot-hub-include-associate-storage/select-storage.png" alt-text="Screen capture showing select file upload settings from the portal." border="true":::
+    :::image type="content" source="./media/iot-hub-include-associate-storage/select-storage.png" alt-text="Screen capture showing select file upload settings from the portal." border="true" lightbox="./media/iot-hub-include-associate-storage/select-storage.png":::
 
 1. On the **File upload** pane, select **Azure Storage Container**. For this article, it's recommended that your storage account and IoT Hub be located in the same region.
+
     * If you already have a storage account you want to use, select it from the list.
 
     * To create a new storage account, select **+Storage account**. Provide a name for the storage account and make sure the **Location** is set to the same region as your IoT hub, then select **OK**. The new account is created in the same resource group as your IoT hub. When the deployment completes, select the storage account from the list.
@@ -34,6 +35,6 @@ To associate an Azure Storage account with your IoT hub:
 
 1. Back on the **File upload** pane, make sure that file notifications are set to **On**. You can leave all other settings at their defaults. Select **Save** and wait for the settings to complete before moving on to the next section.
 
-    :::image type="content" source="./media/iot-hub-include-associate-storage/file-upload-settings-small.png" alt-text="Screen capture showing confirm file upload settings in the portal." border="true":::
+    :::image type="content" source="./media/iot-hub-include-associate-storage/file-upload-settings-small.png" alt-text="Screen capture showing confirm file upload settings in the portal." border="true" lightbox="./media/iot-hub-include-associate-storage/file-upload-settings-small.png":::
 
 For more detailed instructions on how to create an Azure Storage account, see [Create a storage account](../articles/storage/common/storage-account-create.md). For more detailed instructions on how to associate a storage account and blob container with an IoT hub, see [Configure file uploads using the Azure portal](../articles/iot-hub/iot-hub-configure-file-upload.md).

articles/iot-hub/media/iot-hub-node-node-file-upload/view-uploaded-file.png

@@ -21,6 +21,6 @@ To get the IoT Hub connection string for the **service** policy, follow these st
 
 1. Copy the **Primary connection string** and save the value.
 
-:::image type="content" source="./media/iot-hub-include-find-service-connection-string/iot-hub-get-connection-string.png" alt-text="Screenshot that shows how to retrieve the connection string" border="true":::
+:::image type="content" source="./media/iot-hub-include-find-service-connection-string/iot-hub-get-connection-string.png" alt-text="Screenshot that shows how to retrieve the connection string from your IoT Hub in the Azure portal." border="true" lightbox="./media/iot-hub-include-find-service-connection-string/iot-hub-get-connection-string.png":::
 
 For more information about IoT Hub shared access policies and permissions, see [Access control and permissions](../articles/iot-hub/iot-hub-dev-guide-sas.md#access-control-and-permissions).