copyedits

Author: hmorris3293

docs/marketplace-docs/guides/moodle/index.md

@@ -29,34 +29,49 @@ Moodle is the most widely used open source learning management system. It is aim
 
 ## Configuration Options
 
-- **Supported distributions:** Ubuntu 20.04 LTS
+- **Supported distributions:** Ubuntu 24.04 LTS
 - **Recommended minimum plan:** All plan types and sizes can be used.
 
 ### Moodle Options
 
-- **Moodle Admin Password** *(required)*: Enter a *strong* password for the Moodle admin account.
-- **Moodle Admin Email** *(required)*: The email address you wish to use with the Moodle admin account.
-| **MySQL Root Password** *(required)*: Enter a *strong* password for the MySQL root user.
-- **Moodle database User Password** *(required)*: Enter a *strong* password for the database user.
-- **Limited sudo user** *(required)*: Enter your preferred username for the limited user.
-- **Password for the limited user** *(required)*: Enter a *strong* password for the new user.
+- **Email address** *(required)*: Enter the email address you want to use for generating the SSL certificates and configuring the server and DNS records.
+
+- **Moodle Admin Username** *(required)*: Enter a Admin username for the Moodle admin account.
+
+- **Moodle Database Username** *(required)*: Enter a Database username for the Moodle database admin.
+
+{{% content "marketplace-required-limited-user-fields-shortguide" %}}
 
 {{% content "marketplace-custom-domain-fields-shortguide" %}}
 
 {{% content "marketplace-special-character-limitations-shortguide" %}}
 
-#### Limited User SSH Options (Optional)
+### Obtain the Credentials
+
+Once the app is deployed, you need to obtain the credentials from the server.
+
+To obtain the credentials:
+
+1.  Log in to your new Compute Instance using one of the methods below:
+
+    - **Lish Console**: Log in to Cloud Manager, click the **Linodes** link in the left menu, and select the Compute Instance you just deployed. Click **Launch LISH Console**. Log in as the `root` user. To learn more, see [Using the Lish Console](/docs/products/compute/compute-instances/guides/lish/).
+    - **SSH**: Log in to your Compute Instance over SSH using the `root` user. To learn how, see [Connecting to a Remote Server Over SSH](/docs/guides/connect-to-server-over-ssh/).
+
+1.  Run the following command to access the credentials file:
+
+    ```command
+    cat /home/$USERNAME/.credentials
+    ```
 
-- **SSH public key for the limited user:** If you wish to login as the limited user through public key authentication (without entering a password), enter your public key here. See [Creating an SSH Key Pair and Configuring Public Key Authentication on a Server](/docs/guides/use-public-key-authentication-with-ssh/) for instructions on generating a key pair.
-- **Disable root access over SSH:** To block the root user from logging in over SSH, select *Yes* (recommended). You can still switch to the root user once logged in and you can also log in as root through [Lish](/docs/products/compute/compute-instances/guides/lish/).
+This returns passwords that were automatically generated when the instance was deployed. Save them. Once saved, you can safely delete the file.
 
 ## Getting Started After Deployment
 
 ### Access Your Moodle App
 
 To access your Moodle instance, Open a browser and navigate to your Linode rDNS domain `https://203-0-113-0.ip.linodeusercontent.com`. Replace `https://203-0-113-0.ip.linodeusercontent.com` with your [Linode's RDNS domain](/docs/products/compute/compute-instances/guides/manage-ip-addresses/#viewing-ip-addresses).
 
-From there, you can login by clicking the box on the top right of the page. Once you see the login page, you can enter `moodle` as the *username* and the *password* that was entered during the creation of the Linode.
+From there, you can login by clicking the box on the top right of the page. Once you see the login page, you can enter the admin username entered at deployment as the *username* and the *password* that can be obtained in the credentials file.
 
 Now that you’ve accessed your dashboard, checkout [the official Moodle documentation](https://docs.moodle.org/311/en/Main_page) to learn how to further configure your instance.
 
@@ -67,7 +82,7 @@ The Moodle Marketplace App installs the following required software on your Lino
 | Software | Description |
 | -- | -- |
 | [**PHP**](https://www.php.net) | A popular general-purpose scripting language that is especially suited to web development. |
-| [**MariaDB Server**](https://mariadb.org) | A relational database server. The root password is set, locking down access outside the system. To gain access to the root user, obtain the password from `/root/.root_mysql_password` file. |
+| [**MariaDB Server**](https://mariadb.org) | A relational database server. The root password is set, locking down access outside the system.|
 | [**UFW**](https://wiki.ubuntu.com/UncomplicatedFirewall) | Firewall utility that allows access only for SSH (port 22, rate limited), HTTP (port 80), and HTTPS (port 443). |
 | [**Certbot**](https://certbot.eff.org) | Certbot is a fully-featured, easy-to-use, extensible client for the Let's Encrypt CA. |
 | [**Apache2**](https://httpd.apache.org) | HTTP Server. |

docs/marketplace-docs/guides/pihole/index.md

@@ -29,20 +29,38 @@ marketplace_app_name: "Pi-hole"
 
 ## Configuration Options
 
-- **Supported distributions:** Ubuntu 20.04 LTS
+- **Supported distributions:** Ubuntu 24.04 LTS
 - **Recommended plan:** All plan types and sizes can be used.
 
 ### Pi-hole Options
 
-- **Pi-hole user password** *(required)*: This will be the password to get into the Pi-hole dashboard.
+- **Email address** *(required)*: Enter the email address you want to use for generating the SSL certificates and configuring the server and DNS records.
 
-{{% content "marketplace-limited-user-fields-shortguide" %}}
+{{% content "marketplace-required-limited-user-fields-shortguide" %}}
 
 {{% content "marketplace-custom-domain-fields-shortguide" %}}
-- **Email address for the SOA record:** The start of authority (SOA) email address for this server. This is a required field if you want the installer to create DNS records.
 
 {{% content "marketplace-special-character-limitations-shortguide" %}}
 
+### Obtain the Credentials
+
+Once the app is deployed, you need to obtain the credentials from the server.
+
+To obtain the credentials:
+
+1.  Log in to your new Compute Instance using one of the methods below:
+
+    - **Lish Console**: Log in to Cloud Manager, click the **Linodes** link in the left menu, and select the Compute Instance you just deployed. Click **Launch LISH Console**. Log in as the `root` user. To learn more, see [Using the Lish Console](/docs/products/compute/compute-instances/guides/lish/).
+    - **SSH**: Log in to your Compute Instance over SSH using the `root` user. To learn how, see [Connecting to a Remote Server Over SSH](/docs/guides/connect-to-server-over-ssh/).
+
+1.  Run the following command to access the credentials file:
+
+    ```command
+    cat /home/$USERNAME/.credentials
+    ```
+
+This returns passwords that were automatically generated when the instance was deployed. Save them. Once saved, you can safely delete the file.
+
 ## Getting Started after Deployment
 
 ### Accessing the Pi-hole App
@@ -53,7 +71,7 @@ marketplace_app_name: "Pi-hole"
 
     ![Screenshot of the Pi-hole dashboard](pihole-dashboard.png)
 
-1.  To log yourself in and access most of Pi-hole's features, click the **Login** link on the left menu. Enter the Pi-hole user password that you created when deploying the Compute Instance.
+1.  To log yourself in and access most of Pi-hole's features, click the **Login** link on the left menu. Enter the Pi-hole user password that is found in your credentials file.
 
 Now that you’ve accessed your dashboard, check out [the official Pi-hole documentation](https://docs.pi-hole.net/) to learn how to further use your Pi-hole instance.