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

Containers: Use systemd-nspawn's --network-veth flag

2014-05-07 17:53:57 +02:00

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

Move all of NixOS to nixos/ in preparation of the repository merge

2013-10-10 13:28:20 +02:00

man-nixos-build-vms.xml

Move all of NixOS to nixos/ in preparation of the repository merge

2013-10-10 13:28:20 +02:00

man-nixos-generate-config.xml

nixos-generate-config: Add --show-hardware-config.

2013-10-23 17:16:17 +02:00

man-nixos-install.xml

nixos-install: Ask the user to set a root password

2014-05-09 00:52:02 +02:00

man-nixos-option.xml

nixos manual: replace /etc/nixos/nixos which no longer exists with more generic and more

2013-10-27 08:39:32 +02:00

man-nixos-rebuild.xml

nixos manual: replace /etc/nixos/nixos which no longer exists with more generic and more

2013-10-27 08:39:32 +02:00

man-pages.xml

Document nixos-install

2013-10-13 17:35:57 +02:00

manual.xml

Update section on writing tests

2014-04-14 19:19:39 +02:00

options-to-docbook.xsl

Simplify

2014-04-14 10:26:12 +02:00

release-notes.xml

Containers: Use systemd-nspawn's --network-veth flag

2014-05-07 17:53:57 +02:00

running.xml

Manual: Add some IDs

2014-04-14 19:27:26 +02:00

style.css

Move all of NixOS to nixos/ in preparation of the repository merge

2013-10-10 13:28:20 +02:00

troubleshooting.xml

Manual: Add some IDs

2014-04-14 19:27:26 +02:00