Vladimír Čunát e51f73652d Merge recent master into staging ... Hydra: ?compare=1149952 Conflicts: nixos/doc/manual/configuration.xml (changed split file) nixos/modules/config/users-groups.nix (choosing filterNull instead of inline definition) pkgs/development/libraries/readline/readline6.3.nix (auto-solved)		2014-08-30 10:04:02 +02:00
..
abstractions.xml	Chunk NixOS manual	2014-08-26 19:03:49 +02:00
ad-hoc-network-config.xml	Chunk NixOS manual	2014-08-26 19:03:49 +02:00
ad-hoc-packages.xml	Chunk NixOS manual	2014-08-26 19:03:49 +02:00
adding-custom-packages.xml	Chunk NixOS manual	2014-08-26 19:03:49 +02:00
config-file.xml	Chunk NixOS manual	2014-08-26 19:03:49 +02:00
config-syntax.xml	Chunk NixOS manual	2014-08-26 19:03:49 +02:00
configuration.xml	Manual: Start of module-specific documentation	2014-08-27 12:24:44 +02:00
customizing-packages.xml	Chunk NixOS manual	2014-08-26 19:03:49 +02:00
declarative-packages.xml	Chunk NixOS manual	2014-08-26 19:03:49 +02:00
file-systems.xml	No caps in filenames	2014-08-26 19:04:02 +02:00
firewall.xml	Chunk NixOS manual	2014-08-26 19:03:49 +02:00
ipv4-config.xml	Chunk NixOS manual	2014-08-26 19:03:49 +02:00
ipv6-config.xml	Chunk NixOS manual	2014-08-26 19:03:49 +02:00
linux-kernel.xml	Chunk NixOS manual	2014-08-26 19:03:49 +02:00
luks-file-systems.xml	No caps in filenames	2014-08-26 19:04:02 +02:00
modularity.xml	Chunk NixOS manual	2014-08-26 19:03:49 +02:00
network-manager.xml	Chunk NixOS manual	2014-08-26 19:03:49 +02:00
networking.xml	Chunk NixOS manual	2014-08-26 19:03:49 +02:00
package-mgmt.xml	Chunk NixOS manual	2014-08-26 19:03:49 +02:00
ssh.xml	Chunk NixOS manual	2014-08-26 19:03:49 +02:00
summary.xml	Chunk NixOS manual	2014-08-26 19:03:49 +02:00
user-mgmt.xml	Merge recent master into staging	2014-08-30 10:04:02 +02:00
wireless.xml	Chunk NixOS manual	2014-08-26 19:03:49 +02:00
x-windows.xml	Chunk NixOS manual	2014-08-26 19:03:49 +02:00