3 Commits

Author	SHA1	Message	Date
Eelco Dolstra	d5047faede	Remove uses of the "merge" option attribute ... It's redundant because you can (and should) specify an option type, or an apply function.	2013-10-28 22:45:56 +01:00
Eelco Dolstra	29014a47fb	Allow options to be marked as "internal" ... This means they're not for end users. Currently they're filtered from the manual, but we could include them in a separate section.	2013-10-23 20:08:21 +02:00
Eelco Dolstra	5c1f8cbc70	Move all of NixOS to nixos/ in preparation of the repository merge	2013-10-10 13:28:20 +02:00