Reorganize the information about the ruby upgrade to 1.8 on i386.

Noted by:	kris

2 files changed, 22 insertions, 45 deletions

diff --git a/CHANGES b/CHANGES
index f43c4897038f..83acd01681d1 100644
--- a/CHANGES
+++ b/CHANGES
@@ -14,40 +14,8 @@ All ports committers are allowed to commit to this file.
 	The default version of Ruby is now 1.8 on all platforms
 	including the i386.
 
-	Users on the i386 platform need to follow the below
-	instructions to cope with this upgrade.
-
-	If you are a ruby developer and want to keep ruby 1.6 as
-	default, please add RUBY_DEFAULT_VER=1.6 to /etc/make.conf.
-
-	Otherwise, please run the following series of commands to
-	migrate to ruby 1.8:
-
-	1) Reinstall portupgrade manually (and as a result ruby 1.8
-	   will be installed):
-
-	   $ pkg_delete portupgrade-\*
-	   $ (cd /usr/ports/sysutils/portupgrade; make install clean)
-
-	2) Reinstall everything that depends on ruby 1.6 to use ruby
-	   1.8 instead:
-
-	   $ portupgrade -fr lang/ruby16
-
-	3) Reinstall ruby 1.8 (because the previous step kills
-	   symlinks)
-
-	   $ portupgrade -f lang/ruby18
-
-	4) Deinstall ruby 1.6 stuff (if you are paranoia)
-
-	   $ pkg_deinstall -ri lang/ruby16
-
-	5) If the above commands do now work somehow and portupgrade
-	starts causing LoadError, please reinstall portupgrade
-	manually again.  Whenever you get confused, you can just
-	deinstall portupgrade and all the ruby stuff (run "pkg_delete
-	-r ruby-\*") and reinstall portupgrade as a last resort.
+	Users on the i386 platform need to follow the instructions
+	described in the UPDATING file to cope with this upgrade.
 
 	Next time ruby is major upgraded, you won't need to do this
 	kind of messy work because some subtle changes have been made
diff --git a/UPDATING b/UPDATING
index 135f140cdcff..d7f555fb18d2 100644
--- a/UPDATING
+++ b/UPDATING
@@ -12,22 +12,31 @@ upgrades.
   Change the default version of ruby to 1.8 for i386.
 
   If you are a ruby developer and want to keep ruby 1.6 as default,
-  please add RUBY_DEFAULT_VER=1.6 to /etc/make.conf.  Otherwise, please
-  run the following series of commands to migrate to ruby 1.8:
+  please add RUBY_DEFAULT_VER=1.6 to /etc/make.conf.
 
-  1) Reinstall portupgrade manually (and ruby 1.8 will be installed)
-        pkg_delete portupgrade-\*
-        (cd /usr/ports/sysutils/portupgrade; make install clean)
+  Otherwise, please run the following series of commands to migrate to
+  ruby 1.8:
 
-  2) Reinstall everything that depends on ruby 1.6 (to use ruby 1.8)
-        portupgrade -fr lang/ruby16
+  1) Reinstall portupgrade manually (and as a result ruby 1.8 will be
+     installed):
+	pkg_delete portupgrade-\*
+	(cd /usr/ports/sysutils/portupgrade; make install clean)
 
-  3) Reinstall ruby 1.8 (because the previous step kills symlinks)
-        portupgrade -f lang/ruby18
+  2) Reinstall everything that depends on ruby 1.6 to use ruby 1.8
+     instead:
+	portupgrade -fr lang/ruby16
 
-  4) Deinstall ruby 1.6 stuff (if you are paranoid)
-        pkg_deinstall -ri lang/ruby16
+  3) Reinstall ruby 1.8 (because the previous step kills symlinks):
+	portupgrade -f lang/ruby18
 
+  4) Deinstall ruby 1.6 stuff (if you are paranoia):
+	pkg_deinstall -ri lang/ruby16
+
+  5) If the above commands do now work somehow and portupgrade starts
+     causing LoadError, please reinstall portupgrade manually again.
+     Whenever you get confused, you can always deinstall portupgrade
+     and all the ruby stuff (run "pkg_delete -r ruby-\*") and
+     reinstall portupgrade as a last resort.
 
 20040204:
   AFFECTS: 5.2-CURRENT users who started with a 5.2-RELEASE or older.