Merge branch 'master' of git+ssh://db.debian.org/git/dsa-wiki

* 'master' of git+ssh://db.debian.org/git/dsa-wiki:
  spacing
  upgrade updates
  duplicate line
  further improvments to squeeze procedure
  further improvments to squeeze procedure
  reorder and fix

Conflicts:
	input/howto/upgrade-to-squeeze.mdwn

diff --cc input/howto/upgrade-to-squeeze.mdwn
index 26baa82,b7bbcc7..b14ea72
--- 1/input/howto/upgrade-to-squeeze.mdwn
--- 2/input/howto/upgrade-to-squeeze.mdwn
+++ b/input/howto/upgrade-to-squeeze.mdwn
@@@ -94,17 -93,17 +93,23 @@@ re-init samhai
  
  possibly reboot
  
- re-enable exim
 +maybe do:
 +      upgrade-from-grub-legacy
 +      apt-get purge grub
 +      apt-get install grub-pc
 +      apt-get purge dhcp3-client
 +      apt-get install isc-dhcp-client
 +
+ re-enable exim, samhain
  
-       mv /etc/rc2.d/K20exim4 /etc/rc2.d/S20exim4
+       mv /etc/rc2.d/K02exim4 /etc/rc2.d/S02exim4
 -      env -i /etc/init.d/exim4 start
 -
+       mv /etc/rc2.d/K02samhain /etc/rc2.d/S02samhain
        env -i /etc/init.d/exim4 start
++      env -i /etc/init.d/samhain
+ 
+       insserv
+ 
+ re-init samhain
  
  
  ### Problems with CCISS