From 473a3ef60619d6be04a41ee6de633df6067a1c68 Mon Sep 17 00:00:00 2001 From: Guillaume Maudoux Date: Fri, 8 Feb 2019 10:23:57 +0100 Subject: [PATCH 1/2] nixos/manual: add dummy ids to silence warnings --- nixos/doc/manual/administration/running.xml | 2 +- nixos/doc/manual/configuration/configuration.xml | 2 +- nixos/doc/manual/development/development.xml | 2 +- nixos/doc/manual/installation/installation.xml | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/nixos/doc/manual/administration/running.xml b/nixos/doc/manual/administration/running.xml index 786dd5e2390d..19bec1f7794d 100644 --- a/nixos/doc/manual/administration/running.xml +++ b/nixos/doc/manual/administration/running.xml @@ -4,7 +4,7 @@ version="5.0" xml:id="ch-running"> Administration - + This chapter describes various aspects of managing a running NixOS system, such as how to use the systemd service manager. diff --git a/nixos/doc/manual/configuration/configuration.xml b/nixos/doc/manual/configuration/configuration.xml index cebc4122c6c6..9c6459e17d4d 100644 --- a/nixos/doc/manual/configuration/configuration.xml +++ b/nixos/doc/manual/configuration/configuration.xml @@ -4,7 +4,7 @@ version="5.0" xml:id="ch-configuration"> Configuration - + This chapter describes how to configure various aspects of a NixOS machine through the configuration file diff --git a/nixos/doc/manual/development/development.xml b/nixos/doc/manual/development/development.xml index 03dee6ff09bb..43f511b3e96b 100644 --- a/nixos/doc/manual/development/development.xml +++ b/nixos/doc/manual/development/development.xml @@ -4,7 +4,7 @@ version="5.0" xml:id="ch-development"> Development - + This chapter describes how you can modify and extend NixOS. diff --git a/nixos/doc/manual/installation/installation.xml b/nixos/doc/manual/installation/installation.xml index d4276be95d68..2901f462dee0 100644 --- a/nixos/doc/manual/installation/installation.xml +++ b/nixos/doc/manual/installation/installation.xml @@ -4,7 +4,7 @@ version="5.0" xml:id="ch-installation"> Installation - + This section describes how to obtain, install, and configure NixOS for first-time use. From a65974c604d6541fc2a194f289a79e330c3fea8d Mon Sep 17 00:00:00 2001 From: Guillaume Maudoux Date: Fri, 8 Feb 2019 10:50:59 +0100 Subject: [PATCH 2/2] nixos/manual: error out on missing IDs --- nixos/doc/manual/default.nix | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/nixos/doc/manual/default.nix b/nixos/doc/manual/default.nix index 02b91773f5da..1a5314e66cb9 100644 --- a/nixos/doc/manual/default.nix +++ b/nixos/doc/manual/default.nix @@ -268,7 +268,10 @@ in rec { --stringparam id.warnings "1" \ --nonet --output $dst/ \ ${docbook_xsl_ns}/xml/xsl/docbook/xhtml/chunktoc.xsl \ - ${manual-combined}/manual-combined.xml + ${manual-combined}/manual-combined.xml \ + |& tee xsltproc.out + grep "^ID recommended on" xsltproc.out &>/dev/null && echo "error: some IDs are missing" && false + rm xsltproc.out mkdir -p $dst/images/callouts cp ${docbook_xsl_ns}/xml/xsl/docbook/images/callouts/*.svg $dst/images/callouts/