diff options
| author | github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com> | 2021-06-18 12:04:55 +0000 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-06-18 12:04:55 +0000 |
| commit | dd892e7e2fab404d4cdd733e818cd2342140401d (patch) | |
| tree | 2d4c10f54893f9088a6fcbae118a6b2e92d3ad3b /doc | |
| parent | ff10be160c68c6949197e7534c52ca78a20d5f42 (diff) | |
| parent | 3b6c3bee9174dfe56fd0e586449457467abe7116 (diff) | |
| download | nixpkgs-dd892e7e2fab404d4cdd733e818cd2342140401d.tar nixpkgs-dd892e7e2fab404d4cdd733e818cd2342140401d.tar.gz nixpkgs-dd892e7e2fab404d4cdd733e818cd2342140401d.tar.bz2 nixpkgs-dd892e7e2fab404d4cdd733e818cd2342140401d.tar.lz nixpkgs-dd892e7e2fab404d4cdd733e818cd2342140401d.tar.xz nixpkgs-dd892e7e2fab404d4cdd733e818cd2342140401d.tar.zst nixpkgs-dd892e7e2fab404d4cdd733e818cd2342140401d.zip | |
Merge master into staging-next
Diffstat (limited to 'doc')
| -rw-r--r-- | doc/Makefile | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/doc/Makefile b/doc/Makefile index d4f1250c4d7..1d3a0e7ccbd 100644 --- a/doc/Makefile +++ b/doc/Makefile @@ -3,6 +3,7 @@ MD_TARGETS=$(addsuffix .xml, $(basename $(shell find . -type f -regex '.*\.md$$' PANDOC ?= pandoc pandoc_media_dir = media +# NOTE: Keep in sync with NixOS manual (/nixos/doc/manual/md-to-db.sh). # TODO: Remove raw-attribute when we can get rid of DocBook altogether. pandoc_commonmark_enabled_extensions = +attributes+fenced_divs+footnotes+bracketed_spans+definition_lists+pipe_tables+raw_attribute pandoc_flags = --extract-media=$(pandoc_media_dir) \ @@ -101,10 +102,10 @@ functions/library/generated: doc-support/result %.section.xml: %.section.md $(PANDOC) $^ -t docbook \ $(pandoc_flags) \ - | cat > $@ + -o $@ %.chapter.xml: %.chapter.md $(PANDOC) $^ -t docbook \ --top-level-division=chapter \ $(pandoc_flags) \ - | cat > $@ + -o $@ |