nixpkgs/doc
Tuomas Tynkkynen e2c6740c37 Merge commit 'adaee73' from staging into master
This one was already merged into release-16.09, so let's not have the
stable branch is ahead of master and confuse things. In addition to
that, currently we have an odd situation that master has less things
actually finished building than in staging.

Conflicts:
	pkgs/data/documentation/man-pages/default.nix
2016-09-03 01:02:51 +03:00
..
languages-frameworks pythonPackages: use mkPythonDerivation 2016-09-01 16:16:31 +02:00
old Fix #4210: Remove builderDefs 2016-08-31 11:34:46 +02:00
coding-conventions.xml nixpkgs-doc: add patches to coding conventions 2016-08-06 09:05:23 +09:00
configuration.xml nixpkgs manual: more extensible example (#15557) 2016-05-23 11:02:46 +01:00
contributing.xml
default.nix add epub for nixpkgs manual ( #15575 ) (#17053) 2016-07-20 17:57:31 +02:00
functions.xml Improve overrideDerivation docs. (#16867) 2016-07-12 09:57:26 +02:00
introduction.md nixpkgs manual introduction: improve 2016-04-05 10:06:10 +02:00
manual.xml nixpkgs manual: cleanup (#15611) 2016-05-22 10:05:37 +01:00
meta.xml nixpkgs manual: Fix license strings docs 2016-02-24 01:48:02 +01:00
multiple-output.xml docdev -> devdoc 2016-09-01 11:07:23 +02:00
package-notes.xml autojump: add package note 2016-05-04 20:31:38 +01:00
quick-start.xml
release-notes.xml
stdenv.xml Merge pull request #9607 from nckx/update-doc 2016-08-31 10:02:16 +02:00
style.css
submitting-changes.xml nixpkgs manual: more strict commit policy (close #11609) 2015-12-18 15:00:33 +01:00