diff --git a/doc/manual/default.nix b/doc/manual/default.nix
index 8433feec098..1e9581e8dd4 100644
--- a/doc/manual/default.nix
+++ b/doc/manual/default.nix
@@ -4,6 +4,7 @@
}:
let
+
# To prevent infinite recursion, remove system.path from the
# options. Not sure why this happens.
options_ =
@@ -33,7 +34,7 @@ let
'';
optionsDocBook = pkgs.runCommand "options-db.xml" {} ''
- ${pkgs.libxslt}/bin/xsltproc -o $out ${./options-to-docbook.xsl} ${optionsXML}
+ ${pkgs.libxslt}/bin/xsltproc -o $out ${./options-to-docbook.xsl} ${optionsXML_}
'';
manual = pkgs.stdenv.mkDerivation {
@@ -67,14 +68,10 @@ let
dst=$out/share/doc/nixos
ensureDir $dst
xsltproc $xsltFlags --nonet --xinclude \
- --output ./manual.html \
+ --output $dst/manual.html \
${pkgs.docbook5_xsl}/xml/xsl/docbook/xhtml/docbook.xsl \
./manual.xml
- sed '
- s,!\([^!]*\)!!\([^!]*\)!,\2
,g
- ' ./manual.html > $dst/manual.html
-
ln -s ${pkgs.docbook5_xsl}/xml/xsl/docbook/images $dst/
cp ${./style.css} $dst/style.css
@@ -83,6 +80,7 @@ let
xsltproc --nonet --xinclude \
--param man.output.in.separate.dir 1 \
--param man.output.base.dir "'$out/share/man/'" \
+ --param man.endnotes.are.numbered 0 \
${pkgs.docbook5_xsl}/xml/xsl/docbook/manpages/docbook.xsl \
./man-pages.xml
diff --git a/doc/manual/options-to-docbook.xsl b/doc/manual/options-to-docbook.xsl
index a9d77da977d..d8cd057ac29 100644
--- a/doc/manual/options-to-docbook.xsl
+++ b/doc/manual/options-to-docbook.xsl
@@ -62,15 +62,15 @@
Declared by:
-
+
Defined by:
-
+
@@ -129,20 +129,20 @@
- (download of )
+ (download of )
- (build of )
+ (build of )
-
+
-
+
-
+
diff --git a/doc/manual/style.css b/doc/manual/style.css
index e992a9a85dd..5756d60eba3 100644
--- a/doc/manual/style.css
+++ b/doc/manual/style.css
@@ -281,3 +281,8 @@ div.calloutlist td
{
padding-bottom: 1em;
}
+
+table
+{
+ margin-bottom: 1em;
+}