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

* 'master' of ssh://db.debian.org/git/dsa-wiki:
  No longer need to set editor alternative - puppet does that.  Just make sure vim is installed soon enough

diff --git a/input/howto/new-machine.creole b/input/howto/new-machine.creole
index fcf4c31..b5e982f 100644 (file)
--- a/input/howto/new-machine.creole
+++ b/input/howto/new-machine.creole
@@ -8,6 +8,11 @@ Note: this has recently been changed to rely more on [[puppet|howto/puppet-setup
     apt-get install ssh
 }}}
 
+* sane editor
+{{{
+    apt-get install vim
+}}}
+
 * sane locales: (make sure there is _no_ locale defined in /etc/environment and /etc/default/locale)
 {{{
    echo -n > /etc/environment
@@ -117,11 +122,6 @@ Note: this has recently been changed to rely more on [[puppet|howto/puppet-setup
   newaliases
 }}}
 
-* sane default editor
-{{{
-    apt-get install vim && update-alternatives --set editor /usr/bin/vim.basic
-}}}
-
 * add to munin on spohr
 {{{
     : :: spohr :: && sudo vi /etc/munin/munin.conf