Merge branch 'master' of git+ssh://puppet.debian.org/srv/puppet.debian.org/git/dsa...

* 'master' of git+ssh://puppet.debian.org/srv/puppet.debian.org/git/dsa-puppet:
  move alias expansion above userforward so that that can be overridden
  Same dash - everywhere
  Add danzi

diff --git a/modules/debian-org/manifests/init.pp b/modules/debian-org/manifests/init.pp
index 3a3c8b2..229d73a 100644 (file)
--- a/modules/debian-org/manifests/init.pp
+++ b/modules/debian-org/manifests/init.pp
@@ -121,6 +121,8 @@ class debian-org {
     set_alternatives {
         "editor":
             linkto => "/usr/bin/vim.basic",
+        "view":
+            linkto => "/usr/bin/vim.basic",
     }
    
     exec {