Index: branches/fc15-dev/server/doc/install-howto.sh
===================================================================
--- branches/fc15-dev/server/doc/install-howto.sh	(revision 2047)
+++ branches/fc15-dev/server/doc/install-howto.sh	(revision 2050)
@@ -79,4 +79,7 @@
     yum remove NetworkManager
 
+# Make sure sendmail isn't installed
+    yum remove sendmail
+
 # Check out the scripts /etc configuration
     cd /root
@@ -100,5 +103,5 @@
     # Some of these packages are naughty and clobber some of our files
     cd /etc
-    svn revert resolv.conf hosts sysconfig/openafs
+    svn revert resolv.conf hosts sysconfig/openafs nsswitch.conf
 
 # Replace rsyslog with syslog-ng by doing:
@@ -115,7 +118,4 @@
 # it can't install /one/ package.
     yum install -y --skip-broken $(cat packages.txt)
-
-# Make sure sendmail isn't installed
-    yum remove sendmail
 
 # Check which packages are installed on your new server that are not
@@ -135,5 +135,5 @@
 # explicit versions.  So temporarily rpm -e the package, and then
 # install it again after you install haskell-platform.  [Note: You
-# probably won't need this in Fedora 15 or something, when the Haskell
+# probably won't need this in Fedora 17 or something, when the Haskell
 # Platform gets updated.]
     rpm -e ghc-cgi-devel ghc-cgi
@@ -192,4 +192,5 @@
     gem install $(gem list --no-version | grep -Fxvf - gem.txt)
     # Also, we need to install the old rails version
+    gem install -v=2.3.5 rails
 
 # - Look at `pear list` for Pear fruits (or whatever they're called).
@@ -210,4 +211,7 @@
 # ----------------------------->8--------------------------------------
 #                       INFINITE CONFIGURATION
+
+# Create fedora-ds user (needed for credit-card)
+useradd -u 103 -r -d /var/lib/dirsrv fedora-ds
 
 # Run credit-card to clone in credentials and make things runabble
@@ -296,11 +300,8 @@
     cd /etc
     svn status -q
-    # Some usual candidates for clobbering include nsswitch.conf and
-    # sysconfig/openafs
+    # Some usual candidates for clobbering include nsswitch.conf,
+    # resolv.conf and sysconfig/openafs
     # [WIZARD/TEST] Remember that changes you made should not get
     # reverted!
-
-# ThisCell got clobbered, replace it with athena.mit.edu
-    echo "athena.mit.edu" > /usr/vice/etc/ThisCell
 
 # Reboot the machine to restore a consistent state, in case you