nixpkgs/nixos/doc/manual/configuration
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
ad-hoc-network-config.xml
ad-hoc-packages.xml
adding-custom-packages.xml
config-file.xml
config-syntax.xml
configuration.xml
customizing-packages.xml
declarative-packages.xml
file-systems.xml
firewall.xml
ipv4-config.xml
ipv6-config.xml
linux-kernel.xml
luks-file-systems.xml
modularity.xml
network-manager.xml
networking.xml
package-mgmt.xml
ssh.xml
summary.xml
user-mgmt.xml
wireless.xml
x-windows.xml