tidy up postinstall-en.txt

2 files changed, 32 insertions, 28 deletions

diff --git a/net-analyzer/cacti/Manifest b/net-analyzer/cacti/Manifest
index 571b5d4e7a91..5104a859267c 100644
--- a/net-analyzer/cacti/Manifest
+++ b/net-analyzer/cacti/Manifest
@@ -6,7 +6,7 @@ MD5 759fc5dc4f65edbc8034298a120d1305 cacti-0.8.6b.ebuild 1571
 MD5 12ee53e1577c53542a20d942b4f47452 ChangeLog 4324
 MD5 9683bb7323c40d69b48d54ad0eb169ed metadata.xml 221
 MD5 7cc300afca6489e25dbf3da4fc8f63c5 cacti-0.8.5a-r2.ebuild 4218
-MD5 7e6cb83dce0d1be3017fb7761f4a00bc files/postinstall-en.txt 2236
+MD5 c6ef454f0968bc6e3bdc6819ac9bc5f8 files/postinstall-en.txt 2305
 MD5 5415dc0df13fd1528eb90acce7f44989 files/digest-cacti-0.8.6b 65
 MD5 9921205d0e13d5948104d5de2e58d3ee files/cacti-0.8.5a-sql-injection.patch 625
 MD5 44637d48edf68b76a472c70817449cd6 files/digest-cacti-0.8.5a-r1 64
@@ -14,7 +14,7 @@ MD5 44637d48edf68b76a472c70817449cd6 files/digest-cacti-0.8.5a-r2 64
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v1.2.6 (GNU/Linux)
 
-iD8DBQFBbgkHT+MN7JbqCpMRAowZAJ0a7NN/DFdmCkvzAvfvjdkz55GmUgCffJGb
-gP4gs7ShGj/gf3hYbOQfRUI=
-=Eqs/
+iD8DBQFBbmH7T+MN7JbqCpMRAiVPAJ9XkihgXI0conzxVgMLPIrTttnmnwCdF8AY
++YhQHPRxNSuWpUt4MWzEmgI=
+=shoq
 -----END PGP SIGNATURE-----
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