diff options
| author | John Ericson <John.Ericson@Obsidian.Systems> | 2020-09-04 02:40:36 +0000 |
|---|---|---|
| committer | John Ericson <John.Ericson@Obsidian.Systems> | 2020-09-04 02:40:36 +0000 |
| commit | 25f7ff16fa47a6143a129fb56c9a4ecdb2259a8d (patch) | |
| tree | 03764f681fddc94e532dc7a74608f37a0a698cd2 /.gitignore | |
| parent | e12bcabdcbddc228d7af157bb3c2090e324c59a7 (diff) | |
| parent | 8a945d6ddb0676b454458e6fe0e9ea6f8b4b5659 (diff) | |
Merge remote-tracking branch 'upstream/master' into fix-and-ci-static-builds
Diffstat (limited to '.gitignore')
| -rw-r--r-- | .gitignore | 11 |
1 files changed, 6 insertions, 5 deletions
diff --git a/.gitignore b/.gitignore index 983026570..0ea27c8c8 100644 --- a/.gitignore +++ b/.gitignore @@ -22,14 +22,15 @@ perl/Makefile.config /corepkgs/nar/unnar.sh # /doc/manual/ -/doc/manual/manual.html -/doc/manual/manual.xmli -/doc/manual/manual.pdf -/doc/manual/manual.is-valid /doc/manual/*.1 /doc/manual/*.5 /doc/manual/*.8 -/doc/manual/version.txt +/doc/manual/nix.json +/doc/manual/conf-file.json +/doc/manual/builtins.json +/doc/manual/src/command-ref/nix.md +/doc/manual/src/command-ref/conf-file.md +/doc/manual/src/expressions/builtins.md # /scripts/ /scripts/nix-profile.sh |