Merge branch 'main' into waf/refactor

Author: ADubhlaoich

content/includes/nginx-one/cloud-access.md

@@ -2,17 +2,25 @@
 files:
   - content/nginx-one/secure-your-fleet/set-up-security-alerts.md
   - content/nginx-one/getting-started.md
+  - content/nginx-one/workshops/lab1/getting-started-with-nginx-one.md
 ---
 
-Confirm that an F5 Distributed Cloud tenant has been provisioned for you.
+Confirm that an F5 Distributed Cloud tenant has been provisioned for you. To do so:
 
 1. Log in to [MyF5](https://my.f5.com/manage/s/) and review your subscriptions.
 2. Look for **Distributed Cloud** in one of your subscriptions. This could appear under an NGINX subscription or a Distributed Cloud subscription.
 
 If you don’t see **Distributed Cloud** in any subscription, contact your F5 account team or Customer Success Manager.
 
-When your tenant is created, you or someone in your organization should receive an email from **[email protected]** asking you to set your password. The account name in bold in the email is your tenant name.
+When you have a subscription, you or someone in your organization should have an email from [email protected] asking you to update your password.
 
-Go to `https://<TENANT_NAME>.console.ves.volterra.io/` to access F5 Distributed Cloud.  
-If you have never signed in, select **Forgot Password?** on the sign-in page.  
-Alternatively, ask someone in your organization with access to add you as a user in your tenant with a role that includes permissions for NGINX One Console.
+That email includes an account name, which is the TENANT_NAME.
+
+To access F5 Distributed Cloud, go to to https://INSERT_YOUR_TENANT_NAME.console.ves.volterra.io/. If you have never logged in, select the **Forgot Password?** option in the log in screen. Alternatively, if someone within your organization has access, ask them to add you as a user within your tenant with access to NGINX One Console.
+
+If you do not know your TENANT_NAME, you can:
+
+- Email [email protected] to get your username and TENANT_NAME.
+- If you have a dedicated F5 tenant administrator, ask them to:
+  - Provide a username for your tenant
+  - Ask them to reset your password

content/nginx-one/k8s/add-ngf-helm.md

@@ -108,7 +108,11 @@ helm install ngf .  \
 
 {{%tab name="NGINX Plus"%}}
 
-{{< note >}} If applicable, replace the F5 Container registry `private-registry.nginx.com` with your internal registry for your NGINX Plus image, and replace `nginx-plus-registry-secret` with your Secret name containing the registry credentials. If your NGINX Plus JWT Secret has a different name than the default `nplus-license`, then define that name using the `nginx.usage.secretName` flag. {{< /note >}}
+{{< call-out "note" >}} 
+
+If applicable, replace the F5 Container registry `private-registry.nginx.com` with your internal registry for your NGINX Plus image, and replace `nginx-plus-registry-secret` with your Secret name containing the registry credentials. If your NGINX Plus JWT Secret has a different name than the default `nplus-license`, then define that name using the `nginx.usage.secretName` flag. 
+
+{{< /call-out >}}
 
 To install the chart into the **nginx-gateway** namespace, run the following command:
 

content/nginx-one/secure-your-fleet/set-up-security-alerts.md

@@ -27,11 +27,7 @@ If you already have accessed F5 Distributed Cloud and have NGINX instances avail
 
 ### Confirm access to the F5 Distributed Cloud
 
-Confirm an F5 Distributed Cloud tenant has been provisioned for you. Log in to the [MyF5](https://my.f5.com) customer portal and review your subscriptions. You should see within one of your subscriptions "Distributed Cloud". This could be in either an NGINX subscription or a Distributed Cloud. If the above does not appear in any of your subscriptions, reach out to either your F5 Account Team or Customer Success Manager.
-
-With access, you or someone in your organization should have an email from [email protected] asking you to update your password when the tenant was created. The account name referenced in the email in bold is the tenant name.
-
-Go to https://INSERT_YOUR_TENANT_NAME.console.ves.volterra.io/ to access F5 Distributed Cloud. If you have never logged in, select the **Forgot Password?** option in the log in screen. Alternatively, if someone within your organization has access, ask them to add you as a user within your tenant with a role providing permissions for NGINX One.
+{{< include "/nginx-one/cloud-access.md" >}}
 
 ### Confirm access to NGINX One Console in the F5 Distributed Cloud