From 8259a392dabe91ec553633aa3aefc512a16dace9 Mon Sep 17 00:00:00 2001 From: Eelco Dolstra Date: Tue, 16 Sep 2014 14:14:09 +0200 Subject: [PATCH] Manual build fixes --- doc/manual/installation/installing-source.xml | 3 +-- doc/manual/installation/multi-user.xml | 7 ++++--- doc/manual/local.mk | 2 +- doc/manual/manual.xml | 18 +++++++++--------- 4 files changed, 15 insertions(+), 15 deletions(-) diff --git a/doc/manual/installation/installing-source.xml b/doc/manual/installation/installing-source.xml index 77beff1bc..c261a109d 100644 --- a/doc/manual/installation/installing-source.xml +++ b/doc/manual/installation/installing-source.xml @@ -11,7 +11,6 @@ a source distribution. - - \ No newline at end of file + diff --git a/doc/manual/installation/multi-user.xml b/doc/manual/installation/multi-user.xml index 2eb4c258f..312f59664 100644 --- a/doc/manual/installation/multi-user.xml +++ b/doc/manual/installation/multi-user.xml @@ -22,12 +22,12 @@ store (such as builds) are forwarded to a Nix daemon running under the owner of the Nix store/database that performs the operation. -Multi-user mode has one important limitation: only +Multi-user mode has one important limitation: only root can run nix-pull to register the availability of pre-built binaries. However, those registrations are shared by all users, so they still get the benefit from nix-pulls -done by root. +done by root. @@ -80,6 +80,7 @@ into the users’ login scripts. + Restricting access @@ -103,4 +104,4 @@ perform Nix operations. - \ No newline at end of file + diff --git a/doc/manual/local.mk b/doc/manual/local.mk index 1c5a3a2ff..f359b3e27 100644 --- a/doc/manual/local.mk +++ b/doc/manual/local.mk @@ -8,7 +8,7 @@ XSLTPROC = $(xsltproc) --nonet $(xmlflags) \ --param callout.graphics.extension \'.gif\' \ --param contrib.inline.enabled 0 -MANUAL_SRCS := $(wildcard $(d)/*.xml) +MANUAL_SRCS := $(call rwildcard, $(d), *.xml) # Do XInclude processing / RelaxNG validation diff --git a/doc/manual/manual.xml b/doc/manual/manual.xml index 8fae04f61..513eb311c 100644 --- a/doc/manual/manual.xml +++ b/doc/manual/manual.xml @@ -1,8 +1,7 @@ + version="5.0"> @@ -30,13 +29,14 @@ - -Preface -This manual describes how to set up and use Nix package manager and Nix expressions. - + + Preface + This manual describes how to set up and use the Nix package + manager. + - + @@ -47,8 +47,8 @@ - -