svn path=/nixos/trunk/; revision=10548

etc/profile.sh

@@ -1,7 +1,7 @@
 export PATH=@wrapperDir@:/var/run/current-system/sw/bin:/var/run/current-system/sw/sbin
 export MODULE_DIR=@modulesTree@/lib/modules
 export NIXPKGS_CONFIG=/nix/etc/config.nix
-export PAGER=less
+export PAGER="less -R"
 export TZ=@timeZone@
 export TZDIR=@glibc@/share/zoneinfo
 export FONTCONFIG_FILE=/etc/fonts/fonts.conf

system/options.nix

@@ -2064,7 +2064,7 @@ root        ALL=(ALL) SETENV: ALL
 	purpose and do not want default package list. Setting 
 	<varname>cleanStart<varname> to <literal>true</literal> allows you 
 	to create a system with empty path - only extraPackages will be 
-	included..
+	included.
       ";
     };
 

system/system.nix

@@ -239,7 +239,7 @@ rec {
     pkgs.iputils
     pkgs.less
     pkgs.lvm2
-    pkgs.man_db
+    pkgs.man
     pkgs.mdadm
     pkgs.module_init_tools
     pkgs.nano