[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
183/376: Manual build fixes
From: |
Ludovic Courtès |
Subject: |
183/376: Manual build fixes |
Date: |
Wed, 28 Jan 2015 22:04:54 +0000 |
civodul pushed a commit to tag 1.8
in repository guix.
commit 8259a392dabe91ec553633aa3aefc512a16dace9
Author: Eelco Dolstra <address@hidden>
Date: Tue Sep 16 14:14:09 2014 +0200
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 77beff1..c261a10 100644
--- a/doc/manual/installation/installing-source.xml
+++ b/doc/manual/installation/installing-source.xml
@@ -11,7 +11,6 @@ a source distribution.</para>
<xi:include href="prerequisites-source.xml" />
<xi:include href="obtaining-source.xml" />
-<xi:include href="installing-source.xml" />
<xi:include href="building-source.xml" />
-</chapter>
\ No newline at end of file
+</chapter>
diff --git a/doc/manual/installation/multi-user.xml
b/doc/manual/installation/multi-user.xml
index 2eb4c25..312f596 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 <emphasis>Nix
daemon</emphasis> running under the owner of the Nix store/database
that performs the operation.</para>
-<note>Multi-user mode has one important limitation: only
+<note><para>Multi-user mode has one important limitation: only
<systemitem class="username">root</systemitem> can run <command
linkend="sec-nix-pull">nix-pull</command> to register the availability
of pre-built binaries. However, those registrations are shared by all
users, so they still get the benefit from <command>nix-pull</command>s
-done by <systemitem class="username">root</systemitem>.</note>
+done by <systemitem class="username">root</systemitem>.</para></note>
<simplesect>
@@ -80,6 +80,7 @@ into the users’ login scripts.</para>
</simplesect>
+
<simplesect>
<title>Restricting access</title>
@@ -103,4 +104,4 @@ perform Nix operations.</para>
</simplesect>
-</section>
\ No newline at end of file
+</section>
diff --git a/doc/manual/local.mk b/doc/manual/local.mk
index 1c5a3a2..f359b3e 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 8fae04f..513eb31 100644
--- a/doc/manual/manual.xml
+++ b/doc/manual/manual.xml
@@ -1,8 +1,7 @@
<book xmlns="http://docbook.org/ns/docbook"
xmlns:xlink="http://www.w3.org/1999/xlink"
xmlns:xi="http://www.w3.org/2001/XInclude"
- version="5.0"
- xml:id="NixManual">
+ version="5.0">
<info>
@@ -30,13 +29,14 @@
</info>
-<preface>
-<title>Preface</title>
-<para>This manual describes how to set up and use Nix package manager and Nix
expressions.</para>
-</preface>
+ <preface>
+ <title>Preface</title>
+ <para>This manual describes how to set up and use the Nix package
+ manager.</para>
+ </preface>
<xi:include href="introduction/introduction.xml" />
- <xi:include href="quicks-start/quick-start.xml" />
+ <xi:include href="quick-start/quick-start.xml" />
<xi:include href="installation/installation.xml" />
<xi:include href="packages/package-management.xml" />
<xi:include href="expressions/writing-nix-expressions.xml" />
@@ -47,8 +47,8 @@
<xi:include href="glossary/glossary.xml" />
<xi:include href="hacking.xml" />
<xi:include href="release-notes/release-notes.xml" />
-
-<!--
+
+<!--
<appendix>
<title>Nix Release Notes</title>
<xi:include href="release-notes/release-notes.xml"
- 194/376: Style tweak, (continued)
- 194/376: Style tweak, Ludovic Courtès, 2015/01/28
- 192/376: Fix references to version.txt, Ludovic Courtès, 2015/01/28
- 188/376: Drop "service deployment" bla bla, Ludovic Courtès, 2015/01/28
- 185/376: Release notes: Use a section per version, Ludovic Courtès, 2015/01/28
- 191/376: Drop separate release notes, Ludovic Courtès, 2015/01/28
- 199/376: Settings: Add bool get(), Ludovic Courtès, 2015/01/28
- 193/376: Fix parallel make of manpages, Ludovic Courtès, 2015/01/28
- 195/376: Make troubleshooting an appendix, Ludovic Courtès, 2015/01/28
- 197/376: Remove unhelpful suggestion, Ludovic Courtès, 2015/01/28
- 196/376: Delete bugs.xml, Ludovic Courtès, 2015/01/28
- 183/376: Manual build fixes,
Ludovic Courtès <=
- 203/376: Remove unused w3m dependency, Ludovic Courtès, 2015/01/28
- 182/376: Merge branch 'master' of github.com:thatdocslady/nix, Ludovic Courtès, 2015/01/28
- 207/376: Remove debug statement, Ludovic Courtès, 2015/01/28
- 204/376: Install some pkgconfig files, Ludovic Courtès, 2015/01/28
- 206/376: Store.so: Add dependency on libnixutil, Ludovic Courtès, 2015/01/28
- 200/376: Add some instrumentation for debugging GC leaks, Ludovic Courtès, 2015/01/28
- 210/376: Inline Bindings::find(), Ludovic Courtès, 2015/01/28
- 202/376: On Linux, disable address space randomization, Ludovic Courtès, 2015/01/28
- 205/376: Update spec file, Ludovic Courtès, 2015/01/28
- 201/376: Add Make flag to disable optimization, Ludovic Courtès, 2015/01/28