Merge branch 'main' of https://github.com/MicrosoftDocs/azure-docs-pr into pauljewell-py-undelete

Author: pauljewellmsft

.openpublishing.publish.config.json

@@ -996,7 +996,7 @@
   "articles/iot-develop/.openpublishing.redirection.iot-develop.json",
   "articles/iot-dps/.openpublishing.redirection.iot-dps.json",
   "articles/iot-edge/.openpublishing.redirection.iot-edge.json",
-  "articles/iot-fundamentals/.openpublishing.redirection.iot-fundamentals.json",
+  "articles/iot/.openpublishing.redirection.iot.json",
   "articles/iot-hub/.openpublishing.redirection.iot-hub.json",
   "articles/load-testing/.openpublishing.redirection.azure-load-testing.json",
   "articles/logic-apps/.openpublishing.redirection.logic-apps.json",

.openpublishing.redirection.json

@@ -12510,12 +12510,12 @@
         },
         {
             "source_path_from_root": "/articles/security/fundamentals/iot-overview.md",
-            "redirect_url": "/azure/iot-fundamentals/iot-security-architecture",
+            "redirect_url": "/azure/iot/iot-security-architecture",
             "redirect_document_id": false
         },
         {
             "source_path_from_root": "/articles/security/fundamentals/iot-best-practices.md",
-            "redirect_url": "/azure/iot-fundamentals/iot-security-best-practices",
+            "redirect_url": "/azure/iot/iot-security-best-practices",
             "redirect_document_id": false
         },
         {

articles/azure-arc/servers/onboard-service-principal.md

@@ -53,41 +53,28 @@ The Azure Arc service in the Azure portal provides a streamlined way to create a
 
 You can use [Azure PowerShell](/powershell/azure/install-az-ps) to create a service principal with the [New-AzADServicePrincipal](/powershell/module/Az.Resources/New-AzADServicePrincipal) cmdlet.
 
-1. Run the following command. You must store the output of the [`New-AzADServicePrincipal`](/powershell/module/az.resources/new-azadserviceprincipal) cmdlet in a variable, or you will not be able to retrieve the password needed in a later step.
-
+1. Check the context of your Azure PowerShell session to ensure you're working in the correct subscription. Use [Set-AzContext](/powershell/module/az.accounts/set-azcontext) if you need to change the subscription.
+    
     ```azurepowershell-interactive
-    $sp = New-AzADServicePrincipal -DisplayName "Arc-for-servers" -Role "Azure Connected Machine Onboarding"
-    $sp
-    ```
-
-    ```output
-    Secret                : System.Security.SecureString
-    ServicePrincipalNames : {ad9bcd79-be9c-45ab-abd8-80ca1654a7d1, https://Arc-for-servers}
-    ApplicationId         : ad9bcd79-be9c-45ab-abd8-80ca1654a7d1
-    ObjectType            : ServicePrincipal
-    DisplayName           : Hybrid-RP
-    Id                    : 5be92c87-01c4-42f5-bade-c1c10af87758
-    Type                  :
+    Get-AzContext
     ```
-
-2. To retrieve the password stored in the `$sp` variable, run the following command:
-
+    
+1. Run the following command to create a service principal and assign it the Azure Connected Machine Onboarding role for the selected subscription. After the service principal is created, it will print the application ID and secret. The secret is valid for 1 year, after which you'll need to generate a new secret and update any scripts with the new secret.
+   
     ```azurepowershell-interactive
-    $credential = New-Object pscredential -ArgumentList "temp", $sp.Secret
-    $credential.GetNetworkCredential().password
+    $sp = New-AzADServicePrincipal -DisplayName "Arc server onboarding account" -Role "Azure Connected Machine Onboarding"
+    $sp | Format-Table AppId, @{ Name = "Secret"; Expression = { $_.PasswordCredentials.SecretText }}
+    ```
+    ```output
+    AppId                                Secret
+    -----                                ------
+    aaaaaaaa-bbbb-cccc-dddd-eeeeeeeeeeee PASSWORD_SHOWN_HERE
     ```
 
-3. In the output, find the values for the fields **password** and **ApplicationId**. You'll need these values later, so save them in a secure place. If you forget or lose your service principal password, you can reset it using the [`New-AzADSpCredential`](/powershell/module/az.resources/new-azadspcredential) cmdlet.
-
-The values from the following properties are used with parameters passed to the `azcmagent`:
-
-- The value from the **ApplicationId** property is used for the `--service-principal-id` parameter value
-- The value from the **password** property is used for the  `--service-principal-secret` parameter used to connect the agent.
-
-> [!TIP]
-> Make sure to use the service principal **ApplicationId** property, not the **Id** property.
-
-4. Assign the **Azure Connected Machine Onboarding** role to the service principal for the designated resource group or subscription. This role contains only the permissions required to onboard a machine. Note that your account must be a member of the **Owner** or **User Access Administrator** role for the subscription to which the service principal will have access. For information on how to add role assignments, see [Assign Azure roles using the Azure portal](../../role-based-access-control/role-assignments-portal.md) or [Assign Azure roles using Azure CLI](../../role-based-access-control/role-assignments-cli.md).
+    The values from the following properties are used with parameters passed to the `azcmagent`:
+    
+    - The value from the **AppId** property is used for the `--service-principal-id` parameter value
+    - The value from the **Secret** property is used for the `--service-principal-secret` parameter used to connect the agent.
 
 ## Generate the installation script from the Azure portal
 
@@ -144,8 +131,21 @@ After you install the agent and configure it to connect to Azure Arc-enabled ser
 
 ![Screenshot showing a successful server connection in the Azure portal.](./media/onboard-portal/arc-for-servers-successful-onboard.png)
 
+
+
+
+
+
+
+
+
+
+
 ## Next steps
 
 - Review the [Planning and deployment guide](plan-at-scale-deployment.md) to plan for deploying Azure Arc-enabled servers at any scale and implement centralized management and monitoring.
 - Learn how to [troubleshoot agent connection issues](troubleshoot-agent-onboard.md).
 - Learn how to manage your machines using [Azure Policy](../../governance/policy/overview.md) for such things as VM [guest configuration](../../governance/machine-configuration/overview.md), verifying that machines are reporting to the expected Log Analytics workspace, monitoring with [VM insights](../../azure-monitor/vm/vminsights-enable-policy.md), and more.
+```
+
+```

articles/azure-maps/toc.yml

@@ -500,7 +500,7 @@ items:
   - name: Azure Maps code samples
     href: https://samples.azuremaps.com/
   - name: Support and help options
-    href: ../iot-fundamentals/iot-support-help.md?toc=/azure/azure-maps/toc.json&bc=/azure/azure-maps/breadcrumb/toc.json
+    href: ../iot/iot-support-help.md?toc=/azure/azure-maps/toc.json&bc=/azure/azure-maps/breadcrumb/toc.json
   - name: Azure Maps QPS Rate Limits
     href: azure-maps-qps-rate-limits.md
   - name: Azure IoT services

articles/digital-twins/TOC.yml

@@ -336,6 +336,6 @@
     - name: Azure portal
       href: https://portal.azure.com
   - name: Support and help options
-    href: ../iot-fundamentals/iot-support-help.md?toc=/azure/digital-twins/toc.json&bc=/azure/digital-twins/breadcrumb/toc.json
+    href: ../iot/iot-support-help.md?toc=/azure/digital-twins/toc.json&bc=/azure/digital-twins/breadcrumb/toc.json
   - name: IoT Glossary
-    href: ../iot-fundamentals/iot-glossary.md?toc=/azure/digital-twins/toc.json&bc=/azure/digital-twins/breadcrumb/toc.json
+    href: ../iot/iot-glossary.md?toc=/azure/digital-twins/toc.json&bc=/azure/digital-twins/breadcrumb/toc.json

articles/digital-twins/breadcrumb/toc.yml

@@ -3,12 +3,12 @@
   topicHref: /azure/index
   items: 
   - name: Internet of Things
-    tocHref: /azure/iot-fundamentals/
-    topicHref: /azure/iot-fundamentals/index
+    tocHref: /azure/iot/
+    topicHref: /azure/iot/index
     items: 
     - name: Azure Digital Twins
       tocHref: /azure/digital-twins/
       topicHref: /azure/digital-twins/index/
     - name: Azure Digital Twins
-      tocHref: /azure/iot-fundamentals/
+      tocHref: /azure/iot/
       topicHref: /azure/digital-twins/index

articles/digital-twins/overview.md

@@ -110,7 +110,7 @@ You can read about the service limits of Azure Digital Twins in the [Azure Digit
 
 ### Terminology
 
-You can view a list of common IoT terms and their uses across the Azure IoT services, including Azure Digital Twins, in the [Azure IoT Glossary](../iot-fundamentals/iot-glossary.md?toc=/azure/digital-twins/toc.json&bc=/azure/digital-twins/breadcrumb/toc.json). This resource may be a useful reference while you get started with Azure Digital Twins and building an IoT solution.
+You can view a list of common IoT terms and their uses across the Azure IoT services, including Azure Digital Twins, in the [Azure IoT Glossary](../iot/iot-glossary.md?toc=/azure/digital-twins/toc.json&bc=/azure/digital-twins/breadcrumb/toc.json). This resource may be a useful reference while you get started with Azure Digital Twins and building an IoT solution.
 
 ## Next steps
 

articles/event-hubs/event-hubs-federation-overview.md

@@ -18,7 +18,7 @@ Practically, that means your solution will maintain multiple Event Hubs, often
 in different regions and Event Hubs namespaces, and then replicate events between
 them. You might also exchange events with sources and targets like [Azure
 Service Bus](../service-bus-messaging/service-bus-messaging-overview.md), [Azure
-IoT Hub](../iot-fundamentals/iot-introduction.md), or [Apache
+IoT Hub](../iot/iot-introduction.md), or [Apache
 Kafka](https://kafka.apache.org). 
 
 Maintaining multiple active Event Hubs in different regions also allows clients

articles/industrial-iot/TOC.yml

@@ -94,9 +94,9 @@
   - name: IIoT Platform GitHub repository
     href: https://github.com/Azure/iot-edge-opc-publisher
   - name: Support and help options
-    href: ../iot-fundamentals/iot-support-help.md?toc=/azure/industrial-iot/toc.json&bc=/azure/industrial-iot/breadcrumb/toc.json
+    href: ../iot/iot-support-help.md?toc=/azure/industrial-iot/toc.json&bc=/azure/industrial-iot/breadcrumb/toc.json
   - name: IoT Glossary
-    href: ../iot-fundamentals/iot-glossary.md?toc=/azure/industrial-iot/toc.json&bc=/azure/industrial-iot/breadcrumb/toc.json
+    href: ../iot/iot-glossary.md?toc=/azure/industrial-iot/toc.json&bc=/azure/industrial-iot/breadcrumb/toc.json
   - name: Azure IoT services
     items:
     - name: IoT Hub

articles/industrial-iot/breadcrumb/toc.yml

@@ -3,12 +3,12 @@
   topicHref: /azure/index
   items:
   - name: Internet of Things
-    tocHref: /azure/iot-fundamentals/
-    topicHref: /azure/iot-fundamentals/index
+    tocHref: /azure/iot/
+    topicHref: /azure/iot/index
     items:
       - name: Industrial IoT
         tocHref: /azure/iot-edge/
         topicHref: /azure/industrial-iot/index
       - name: Industrial IoT
-        tocHref: /azure/iot-fundamentals/
+        tocHref: /azure/iot/
         topicHref: /azure/industrial-iot/index