Merge pull request #219936 from KennedyDMSFT/US43315

v-stsavell · web-flow · commit a7d8130de386 · 2022-11-30T16:29:40.000-06:00
User Story 43315 - in progress
diff --git a/articles/iot-hub/TOC.yml b/articles/iot-hub/TOC.yml
@@ -669,13 +669,13 @@
       items:
       - name: C# (.NET)
         displayName: samples, azure-iot-samples-csharp, .NET Core SDK
-        href: https://github.com/Azure-Samples/azure-iot-samples-csharp
+        href: https://github.com/Azure/azure-iot-sdk-csharp#samples
       - name: Node.js
         displayName: samples, azure-iot-samples-node, Node.js LTS, npm
         href: https://azure.microsoft.com/resources/samples/azure-iot-samples-node/
       - name: Java
         displayName: samples, azure-iot-samples-java, Java SE 8, Maven 3, mvn
-        href: https://github.com/Azure-Samples/azure-iot-samples-java
+        href: https://github.com/Azure/azure-iot-sdk-java#samples
       - name: Python
         displayName: samples, azure-iot-samples-python, Azure IoT Python SDK, 
         href: https://azure.microsoft.com/resources/samples/azure-iot-samples-python/
diff --git a/articles/iot-hub/iot-hub-devguide-messages-read-builtin.md b/articles/iot-hub/iot-hub-devguide-messages-read-builtin.md
@@ -52,7 +52,7 @@ In the portal, the Event Hub-compatible endpoint field contains a complete Event
 | Hostname | abcd1234namespace.servicebus.windows.net |
 | Namespace | abcd1234namespace |
 
-You can then choose any shared access policy from the drop-down as shown in the screenshot above. It only shows policies that have the **ServiceConnect** permissions to connect to the specified Event Hub.
+You can then choose any shared access policy from the drop-down as shown in the screenshot above. It only shows policies that have the **ServiceConnect** permissions to connect to the specified event hub.
 
 The SDKs you can use to connect to the built-in Event Hub-compatible endpoint that IoT Hub exposes include:
 
@@ -79,7 +79,7 @@ You can use the Event Hubs SDKs to read from the built-in endpoint in environmen
 | Language | Sample |
 | -------- | ------ |
 | .NET | [ReadD2cMessages .NET](https://github.com/Azure/azure-iot-sdk-csharp/tree/main/iothub/service/samples/getting%20started/ReadD2cMessages) |
-| Java | [read-d2c-messages Java](https://github.com/Azure-Samples/azure-iot-samples-java/tree/master/iot-hub/Quickstarts/read-d2c-messages) |
+| Java | [read-d2c-messages Java](https://github.com/Azure/azure-iot-sdk-java/tree/main/service/iot-service-samples/read-d2c-messages) |
 | Node.js | [read-d2c-messages Node.js](https://github.com/Azure-Samples/azure-iot-samples-node/tree/master/iot-hub/Quickstarts/read-d2c-messages) |
 | Python | [read-dec-messages Python](https://github.com/Azure-Samples/azure-iot-samples-python/tree/master/iot-hub/Quickstarts/read-d2c-messages) |
 
diff --git a/articles/iot-hub/iot-hub-how-to-android-things.md b/articles/iot-hub/iot-hub-how-to-android-things.md
@@ -65,13 +65,13 @@ A device must be registered with your IoT hub before it can connect. In this qui
    adb devices
    ```
 
-3. Download our sample for Android/Android Things from this [repository](https://github.com/Azure-Samples/azure-iot-samples-java) or use Git.
+3. Download our sample for Android/Android Things from the [Microsoft Azure IoT SDKs for Java repository](https://github.com/Azure/azure-iot-sdk-java/#samples) or use Git to clone the repository as shown in the following example.
 
    ```
-   git clone https://github.com/Azure-Samples/azure-iot-samples-java.git
+   git clone https://github.com/Azure/azure-iot-sdk-java.git
    ```
 
-4. In Android Studio, open the Android Project in located in "\azure-iot-samples-java\iot-hub\Samples\device\AndroidSample".
+4. In Android Studio, open the Android Project from the *\azure-iot-sdk-java\device\iot-device-samples\android-sample* folder in your copy of the repository.
 
 5. Open gradle.properties file, and replace "Device_connection_string" with your device connection string noted earlier.
  
diff --git a/articles/iot-hub/iot-hub-ios-swift-c2d.md b/articles/iot-hub/iot-hub-ios-swift-c2d.md
@@ -33,7 +33,7 @@ To learn more about cloud-to-device messages, see [Send cloud-to-device messages
 
 * An active IoT hub in Azure.
 
-* The code sample from [Azure samples](https://github.com/Azure-Samples/azure-iot-samples-ios/archive/master.zip).
+* The code sample from the [Azure IoT Samples for IoS Platform repository](https://github.com/Azure-Samples/azure-iot-samples-ios).
 
 * The latest version of [XCode](https://developer.apple.com/xcode/), running the latest version of the iOS SDK. This quickstart was tested with XCode 9.3 and iOS 11.3.
 
@@ -49,7 +49,7 @@ In this section, you simulate an iOS device running a Swift application to recei
 
 CocoaPods manages dependencies for iOS projects that use third-party libraries.
 
-In a terminal window, navigate to the Azure-IoT-Samples-iOS folder that you downloaded in the prerequisites. Then, navigate to the sample project:
+In a terminal window, navigate to the folder containing the repository that you downloaded in the [prerequisites](#prerequisites). Then, navigate to the sample project:
 
 ```sh
 cd quickstart/sample-device
diff --git a/articles/iot-hub/quickstart-control-device-android.md b/articles/iot-hub/quickstart-control-device-android.md
@@ -24,9 +24,9 @@ In this quickstart, you use a direct method to control a simulated device connec
 
 * [Git](https://git-scm.com/download/).
 
-* [Device SDK sample Android application](https://github.com/Azure-Samples/azure-iot-samples-java/tree/master/iot-hub/Samples/device/AndroidSample), included in [Azure IoT Samples (Java)](https://github.com/Azure-Samples/azure-iot-samples-java).
+* [Device SDK sample Android application](https://github.com/Azure/azure-iot-sdk-java/tree/main/device/iot-device-samples/android-sample), included in the [Microsoft Azure IoT SDKs for Java repository](https://github.com/Azure/azure-iot-sdk-java).
 
-* [Service SDK sample Android application](https://github.com/Azure-Samples/azure-iot-samples-java/tree/master/iot-hub/Samples/service/AndroidSample), included in Azure IoT Samples (Java).
+* [Service SDK sample Android application](https://github.com/Azure/azure-iot-sdk-java/tree/main/device/iot-device-samples/android-sample), included in the [Microsoft Azure IoT SDKs for Java repository](https://github.com/Azure/azure-iot-sdk-java).
 
 * Port 8883 open in your firewall. The device sample in this quickstart 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).
 
@@ -92,11 +92,11 @@ You use this value later in the quickstart. This service connection string is di
 
 ## Listen for direct method calls
 
-Both of the samples for this quickstart are part of the azure-iot-samples-java repository on GitHub. Download or clone the [azure-iot-samples-java](https://github.com/Azure-Samples/azure-iot-samples-java) repository.
+Both of the samples for this quickstart are part of the [Microsoft Azure IoT SDKs for Java repository](https://github.com/Azure/azure-iot-sdk-java) on GitHub. Download or clone the repository.
 
 The device SDK sample application can be run on a physical Android device or an Android emulator. The sample connects to a device-specific endpoint on your IoT hub, sends simulated telemetry, and listens for direct method calls from your hub. In this quickstart, the direct method call from the hub tells the device to change the interval at which it sends telemetry. The simulated device sends an acknowledgment back to your hub after it executes the direct method.
 
-1. Open the GitHub sample Android project in Android Studio. The project is located in the following directory of your cloned or downloaded copy of [azure-iot-sample-java](https://github.com/Azure-Samples/azure-iot-samples-java) repository: *\azure-iot-samples-java\iot-hub\Samples\device\AndroidSample*.
+1. Open the GitHub sample Android project in Android Studio. The project is located in the following directory of your cloned or downloaded copy of the [Microsoft Azure IoT SDKs for Java repository](https://github.com/Azure/azure-iot-sdk-java): *\azure-iot-sdk-java\device\iot-device-samples\android-sample*.
 
 2. In Android Studio, open *gradle.properties* for the sample project and replace the **Device_Connection_String** placeholder with the device connection string you made a note of earlier.
 
@@ -146,7 +146,7 @@ Run this app on a separate physical Android device or Android emulator.
 
 An IoT Hub back-end service application typically runs in the cloud, where it's easier to mitigate the risks associated with the sensitive connection string that controls all devices on an IoT Hub. In this example, we are running it as an Android app for demonstration purposes only. The other-language versions of this quickstart provide examples that align more closely with a typical back-end service application.
 
-1. Open the GitHub service sample Android project in Android Studio. The project is located in the following directory of your cloned or downloaded copy of [azure-iot-sample-java](https://github.com/Azure-Samples/azure-iot-samples-java) repository: *\azure-iot-samples-java\iot-hub\Samples\service\AndroidSample*.
+1. Open the GitHub service sample Android project in Android Studio. The project is located in the following directory of your cloned or downloaded copy of the [Microsoft Azure IoT SDKs for Java repository](https://github.com/Azure/azure-iot-sdk-java): *\azure-iot-sdk-java\device\iot-device-samples\android-sample*.
 
 2. In Android Studio, open *gradle.properties* for the sample project. Update the values for the **ConnectionString** and **DeviceId** properties with the service connection string you noted earlier and the Android device ID you registered.
 
