tidy up postinstall-en.txt

1 files changed, 28 insertions, 24 deletions

diff --git a/net-analyzer/cacti/files/postinstall-en.txt b/net-analyzer/cacti/files/postinstall-en.txt
index c66b8a786695..5e46d8af4fd0 100644
--- a/net-analyzer/cacti/files/postinstall-en.txt
+++ b/net-analyzer/cacti/files/postinstall-en.txt
@@ -2,50 +2,54 @@
 New Install
 
 1. Create the new cacti database
-  shell> mysqladmin --user=root create cacti
+   shell> mysqladmin -p --user=root create cacti
 2. Import the default cacti database:
-  shell> mysql cacti < ${MY_INSTALLDIR}/cacti.sql
-3. Optional: Create a MySQL username and password for cacti.
-  shell> mysql --user=root mysql
-  mysql> GRANT ALL ON cacti.* TO cactiuser@localhost IDENTIFIED BY 'somepassword';
-  mysql> flush privileges;
-4. Copy ${MY_INSTALLDIR}/include/config-sample.php to config.php.
- + Modify the MySQL user, password and database for your
-   cacti configuration.
+   shell> mysql -p cacti < ${MY_INSTALLDIR}/cacti.sql
+3. Create a MySQL username and password for cacti.
+   shell> mysql -p --user=root mysql
+   mysql> GRANT ALL ON cacti.* TO cactiuser@localhost IDENTIFIED BY 'somepassword';
+   mysql> flush privileges;
+4. Copy ${MY_INSTALLDIR}/include/config-sample.php to config.php
+   And modify the MySQL user, password and database for your cacti configuration.
+
+   Example:
 	\$database_default = "cacti";
 	\$database_hostname = "localhost";
 	\$database_username = "cactiuser";
 	\$database_password = "cacti";
-6. Point your web browser to:  http://your-server/cacti/
- Make sure to fill in all of the path variables carefully and
- correctly on the following screen.
+
+5. Point your web browser to:  http://your-server/cacti/
+   Make sure to fill in all of the path variables carefully and
+    correctly on the following screen.
 
 
 Upgrading
 
 Before cacti works you must upgrade the cacti database:
 1. Backup the old cacti database:
-  shell> mysqlhotcopy --suffix=_old cacti
+   shell> mysqlhotcopy --suffix=_old cacti
 2. Drop the old cacti database:
-  shell> mysqladmin -p drop cacti
+   shell> mysqladmin -p drop cacti
 3. Create the new cacti database
-  shell> mysqladmin --user=root create cacti
+   shell> mysqladmin --user=root create cacti
 4. Import the default cacti database:
-  shell> mysql cacti < ${MY_INSTALLDIR}/cacti.sql
-5. Edit ${MY_INSTALLDIR}/include/config.php.
- + Modify the MySQL user, password and database for your
-   cacti configuration.
+   shell> mysql cacti < ${MY_INSTALLDIR}/cacti.sql
+5. Edit ${MY_INSTALLDIR}/include/config.php, and confirm that the MySQL user,
+   password and database is correct for your cacti configuration.
+
+   Example:
 	\$database_default = "cacti";
 	\$database_hostname = "localhost";
 	\$database_username = "cactiuser";
 	\$database_password = "cacti";
+
 6. Point your web browser to:  http://your-server/cacti/
- Select "Upgrade".
- Make sure to fill in all of the path variables carefully and
- correctly on the following screen.
+   Select "Upgrade".
+   Make sure to fill in all of the path variables carefully and
+   correctly on the following screen.
 7. Test your upgraded installation. When all is fine you can
-drop the cacti_old database like so:
-  shell> mysqladmin -p drop cacti_old
+   drop the cacti_old database like so:
+   shell> mysqladmin -p drop cacti_old
 
 
 Cronjob