Merge branch 'main' of https://github.com/MicrosoftDocs/azure-docs-pr into vnet-old-review-1

Author: asudbring

articles/azure-arc/servers/manage-agent.md

@@ -336,7 +336,7 @@ Actions of the [zypper](https://en.opensuse.org/Portal:Zypper) command, such as
 
 ### Facilitating auto-upgrade of the agent
 
-The Azure Connected Machine agent will be supporting an automatic upgrade feature to reduce the agent management overhead associated with Azure Arc-enabled servers. To facilitate this new functionality, a scheduler job is configured on the connected machine. This scheduler job is a scheduled task for Windows and a Cron job for Linux. This scheduler job will appear in the Azure Connected Machine Agent version 1.29 or higher.
+The Azure Connected Machine agent will be supporting an automatic upgrade feature to reduce the agent management overhead associated with Azure Arc-enabled servers. To facilitate this new functionality, a scheduler job is configured on the connected machine. This scheduler job is a scheduled task for Windows and a Cron job for Linux. This scheduler job will appear in the Azure Connected Machine Agent version 1.30 or higher.
 
 To view these scheduler jobs in Windows through PowerShell:
 

articles/bastion/troubleshoot.md

@@ -5,7 +5,7 @@ services: bastion
 author: charwen
 ms.service: bastion
 ms.topic: troubleshooting
-ms.date: 10/16/2019
+ms.date: 05/08/2023
 ms.author: charwen
 ---
 
@@ -24,9 +24,9 @@ For more information, see [NSG guidance for Azure Bastion](bastion-nsg.md).
 
 ## <a name="sshkey"></a>Unable to use my SSH key with Azure Bastion
 
-**Q:** When I try to browse my SSH key file, I get the following error: *'SSH Private key must start with -----BEGIN RSA PRIVATE KEY----- and ends with -----END RSA PRIVATE KEY-----'*.
+**Q:** When I try to browse my SSH key file, I get the following error: *'SSH Private key must start with -----BEGIN RSA/DSA/OPENSSH PRIVATE KEY----- and ends with -----END RSA/DSA/OPENSSH PRIVATE KEY-----'*.
 
-**A:** Azure Bastion supports only RSA SSH keys, at this point in time. Make sure that you browse a key file that is RSA private key for SSH, with public key provisioned on the target VM. 
+**A:** Azure Bastion supports RSA, DSA, and OPENSSH private keys, at this point in time. Make sure that you browse a key file that is RSA, DSA, or OPENSSH private key for SSH, with public key provisioned on the target VM. 
 
 As an example, you can use the following command to create a new RSA SSH key:
 
@@ -85,4 +85,4 @@ The key's randomart image is:
 
 ## Next steps
 
-For more information, see the [Bastion FAQ](bastion-faq.md).
+For more information, see the [Bastion FAQ](bastion-faq.md).

articles/iot-hub-device-update/network-security.md

@@ -28,8 +28,9 @@ You can use service tags to define network access controls on [network security
 
 ### Regional IP ranges
 Because IoT Hub IP rules do not support Service Tags, you have to use AzureDeviceUpdate Service Tag IP prefixes instead. Because this tag is currently global, we are providing the following table for convenience. Please note that location is that of Device Update resources.  
+
 | Location | IP ranges |
-| --- | --- |
+| --- | --- |  
 | Australia East | 20.211.71.192/26,20.53.47.16/28,20.70.223.192/26,104.46.179.224/28,20.92.5.128/25,20.92.5.128/26 |
 | East US | 20.119.27.192/26,20.119.28.128/26,20.62.132.240/28,20.62.135.128/27,20.62.135.160/28,20.59.77.64/26,20.59.81.64/26,20.66.3.208/28 |
 | East US 2 | 20.119.155.192/26,20.62.59.16/28,20.98.195.192/26,20.40.229.32/28,20.98.148.192/26,20.98.148.64/26 |

articles/spring-apps/how-to-maven-deploy-apps.md

@@ -133,7 +133,7 @@ To generate configurations and deploy the app, follow these steps:
                <configuration>
                    <subscriptionId>xxxxxxxxx-xxxx-xxxx-xxxxxxxxxxxx</subscriptionId>
                    <clusterName>v-spr-cld</clusterName>
-                   <appName>customers-service</appName>
+                   <appName>hellospring</appName>
    ```
 
    The POM file now contains the plugin dependencies and configurations.

articles/spring-apps/how-to-staging-environment.md

@@ -163,12 +163,12 @@ Use the following steps to view deployed apps.
    :::image type="content" source="media/how-to-staging-environment/running-staging-app.png" lightbox="media/how-to-staging-environment/running-staging-app.png" alt-text="Screenshot that shows the URL of the staging app.":::
 
 >[!TIP]
-> Confirm that your test endpoint ends with a slash (/) to ensure that the CSS file is loaded correctly. If your browser requires you to enter login credentials to view the page, use [URL decode](https://www.urldecoder.org/) to decode your test endpoint. URL decode returns a URL in the format `https://\<username>:\<password>@\<cluster-name>.test.azureapps.io/gateway/green`. Use this format to access your endpoint.
+> Confirm that your test endpoint ends with a slash (/) to ensure that the CSS file is loaded correctly. If your browser requires you to enter login credentials to view the page, use [URL decode](https://www.urldecoder.org/) to decode your test endpoint. URL decode returns a URL in the format `https://\<username>:\<password>@\<cluster-name>.test.azureapps.io/demo/green`. Use this format to access your endpoint.
 
 >[!NOTE]
-> Configuration server settings apply to both your staging environment and your production environment. For example, if you set the context path (*server.servlet.context-path*) for your app gateway in the configuration server as *somepath*, the path to your green deployment changes to `https://\<username>:\<password>@\<cluster-name>.test.azureapps.io/gateway/green/somepath/...`.
+> Configuration server settings apply to both your staging environment and your production environment. For example, if you set the context path (*server.servlet.context-path*) for your app demo in the configuration server as *somepath*, the path to your green deployment changes to `https://\<username>:\<password>@\<cluster-name>.test.azureapps.io/demo/green/somepath/...`.
 
-If you visit your public-facing app gateway at this point, you should see the old page without your new change.
+If you visit your public-facing app demo at this point, you should see the old page without your new change.
 
 ## Set the green deployment as the production environment
 
@@ -193,9 +193,9 @@ If you're not satisfied with your change, you can modify your application code,
 az spring app deploy \
     --resource-group <resource-group-name> \
     --service <service-instance-name> \
-    --name gateway \
+    --name demo \
     --deployment green \
-    --artifact-path gateway.jar
+    --artifact-path demo.jar
 ```
 
 ## Delete the staging deployment
@@ -209,7 +209,7 @@ az spring app deployment delete \
     --resource-group <resource-group-name> \
     --service <service-instance-name> \
     --name <staging-deployment-name> \
-    --app gateway
+    --app demo
 ```
 
 ## Next steps

articles/virtual-wan/index.yml

@@ -97,6 +97,8 @@ landingContent:
         links:
           - text: About virtual hub routing
             url: about-virtual-hub-routing.md
+          - text: About Route-maps
+            url: route-maps-about.md
           - text: Scenario - Route traffic through an NVA
             url: scenario-route-through-nva.md
           - text: Scenario - Any spoke to any spoke