Eelco Dolstra 7f410ef923 Merge remote-tracking branch 'origin/master' into staging ... Conflicts: pkgs/misc/vim-plugins/default.nix		2014-07-22 11:00:00 +02:00
..
configuration.xml	Fix trivial spelling mistake in docs	2014-06-13 11:11:27 +01:00
containers.xml
default.nix	Another attempt to eradicate ensureDir	2014-06-30 14:56:10 +02:00
development.xml	Manual: Note about using a local branch	2014-05-28 14:38:07 +02:00
installation.xml	Adding a missing instruction for EFI installations	2014-07-21 17:54:38 +02:00
man-configuration.xml
man-nixos-build-vms.xml
man-nixos-generate-config.xml
man-nixos-install.xml
man-nixos-option.xml
man-nixos-rebuild.xml
man-pages.xml
manual.xml
options-to-docbook.xsl
release-notes.xml
running.xml
style.css
troubleshooting.xml