Eelco Dolstra 585983bc95 Merge remote-tracking branch 'origin/staging' ...

Conflicts:
	pkgs/applications/version-management/subversion/default.nix

2014-09-08 11:42:09 +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

Manual: Start of module-specific documentation

2014-08-27 12:24:44 +02:00

customizing-packages.xml

…

declarative-packages.xml

…

file-systems.xml

No caps in filenames

2014-08-26 19:04:02 +02:00

firewall.xml

…

ipv4-config.xml

Revert "Revert "Merge pull request #3182 from wkennington/master.ipv6""

2014-08-31 09:46:16 -07:00

ipv6-config.xml

…

linux-kernel.xml

…

luks-file-systems.xml

No caps in filenames

2014-08-26 19:04:02 +02:00

modularity.xml

…

network-manager.xml

…

networking.xml

…

package-mgmt.xml

…

ssh.xml

…

summary.xml

…

user-mgmt.xml

Merge recent master into staging

2014-08-30 10:04:02 +02:00

wireless.xml

…

x-windows.xml

nixos-manual: Fix reference to obsolete configuration option

2014-09-07 11:58:06 +02:00