From 3dc0323baed79a478a91e71e42932737a46b042b Mon Sep 17 00:00:00 2001 From: pennae Date: Mon, 13 Mar 2023 17:58:38 +0100 Subject: [PATCH] nixos/manual: apply options preprocessing to full manual the conversion to the markdown-based workflow missed that generating the manual as docbook also generates the option docs with nixos-specific wrapper elements that require postprocessing before the document is real, valid docbook. restore this processing to the full manual. it's not the prettiest thing, done like this, but we only need it for one release so it doesn't have to be. --- nixos/doc/manual/default.nix | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/nixos/doc/manual/default.nix b/nixos/doc/manual/default.nix index 2e07edd61c2a..4032595e8059 100644 --- a/nixos/doc/manual/default.nix +++ b/nixos/doc/manual/default.nix @@ -166,7 +166,11 @@ let --manpage-urls ${manpageUrls} \ --revision ${lib.escapeShellArg revision} \ ./manual.md \ - ./manual-combined.xml + ./manual-combined-pre.xml + + ${pkgs.libxslt.bin}/bin/xsltproc \ + -o manual-combined.xml ${./../../lib/make-options-doc/postprocess-option-descriptions.xsl} \ + manual-combined-pre.xml ${linterFunctions}