From f74cc356e6ac00ab9a3e9ad3f03f1518aa0783cf Mon Sep 17 00:00:00 2001
From: JT Smith <jt@plainblack.com>
Date: Sat, 19 Nov 2005 02:04:39 +0000
Subject: [PATCH] better upgrade warning message

---
 sbin/upgrade.pl | 28 +++++++++++++---------------
 1 file changed, 13 insertions(+), 15 deletions(-)

diff --git a/sbin/upgrade.pl b/sbin/upgrade.pl
index 23927e779..8a88c123f 100644
--- a/sbin/upgrade.pl
+++ b/sbin/upgrade.pl
@@ -51,13 +51,17 @@ if ($help){
         print <<STOP;
 
 
-Usage: perl $0 
+Usage: perl $0 --doit
 
 Options:
 
 	--backupDir	The folder where backups should be
 			created. Defaults to '/data/backups'.
 
+	--doit		This flag is required. You MUST include this
+			flag in your command line or the upgrade
+                        will not run.
+
         --help          Display this help message and exit.
 
 	--history	Displays the upgrade history for each of
@@ -91,12 +95,6 @@ STOP
 unless ($doit) {
 	print <<STOP;
 
-+--------------------------------------------------------------------+
-|                                                                    |
-| For more information about this utility type:                      |
-|                                                                    |
-| perl upgrade.pl --help                                             |
-|                                                                    |
 +--------------------------------------------------------------------+
 |                                                                    |
 |                         W  A  R  N  I  N  G                        |
@@ -104,18 +102,18 @@ unless ($doit) {
 | There are no guarantees of any kind provided with this software.   |
 | This utility has been tested rigorously, and has performed without |
 | error or consequence in our labs, and on our production servers    |
-| for more than a year. However, there is no substitute for a good   |
-| backup of your software and data before performing any kind of     |
-| upgrade.                                                           |
+| for many years. However, there is no substitute for a good backup  |
+| of your software and data before performing any kind of upgrade.   |
 |                                                                    |
-| NOTE: This utility will work on MySQL databases only. Any          |
-| configs using non-MySQL databases will be skipped.                 |
+| BEFORE YOU UPGRADE you should definitely read docs/gotcha.txt to   |
+| find out what things you should know about that will affect your   |
+| upgrade.                                                           |
 |                                                                    |
 +--------------------------------------------------------------------+
 |                                                                    |
-| You must include the command line argument "--doit" in your        |
-| command in order to bypass this message. The upgrade will not run  |
-| without the "--doit" flag.                                         |
+| For more information about this utility type:                      |
+|                                                                    |
+| perl upgrade.pl --help                                             |
 |                                                                    |
 +--------------------------------------------------------------------+