diff options
Diffstat (limited to 'doc/manual')
| -rw-r--r-- | doc/manual/nix-store.xml | 8 | ||||
| -rw-r--r-- | doc/manual/package-management.xml | 16 | ||||
| -rw-r--r-- | doc/manual/writing-nix-expressions.xml | 6 |
3 files changed, 15 insertions, 15 deletions
diff --git a/doc/manual/nix-store.xml b/doc/manual/nix-store.xml index 522de60d3696..9592396c38ed 100644 --- a/doc/manual/nix-store.xml +++ b/doc/manual/nix-store.xml @@ -171,10 +171,10 @@ <quote>live</quote> store paths, which are all the store paths reachable from a set of <quote>root</quote> store expressions read from standard input. Live paths should - never be deleted, since that would break consistency - — it would become possible that applications are - installed that reference things that are no longer - present in the store. + never be deleted, since that would break consistency — + it would become possible that applications are installed + that reference things that are no longer present in the + store. </para> </listitem> </varlistentry> diff --git a/doc/manual/package-management.xml b/doc/manual/package-management.xml index a6ef0c947d70..470cb80a09e1 100644 --- a/doc/manual/package-management.xml +++ b/doc/manual/package-management.xml @@ -2,7 +2,7 @@ <para>This chapter discusses how to do package management with Nix, i.e., how to obtain, install, upgrade, and erase components. This is -the <quote>user's</quote> perspective of the Nix system — people +the <quote>user's</quote> perspective of the Nix system — people who want to <emphasis>create</emphasis> components should consult <xref linkend='chap-writing-nix-expressions' />.</para> @@ -18,7 +18,7 @@ available for installation.</para> on the set of installed applications. That is, there might be lots of applications present on the system (possibly in many different versions), but users can have a specific selection of those -active — where <quote>active</quote> just means that it appears +active — where <quote>active</quote> just means that it appears in a directory in the user's <envar>PATH</envar>.</para> <para>Such a view on the set of installed applications is called a @@ -95,11 +95,11 @@ url='http://subversion.tigris.org/'>Subversion version management system</ulink>).</para> <para>When you do this for the first time, Nix will start building -Subversion and all its dependencies. This will take quite a while -— typically an hour or two on modern machines. Fortunately, -there is a faster way (so just do a Ctrl-C on that install -operation!): you just need to tell Nix that pre-built binaries of all -those components are available somewhere. This is done using the +Subversion and all its dependencies. This will take quite a while — +typically an hour or two on modern machines. Fortunately, there is a +faster way (so just do a Ctrl-C on that install operation!): you just +need to tell Nix that pre-built binaries of all those components are +available somewhere. This is done using the <command>nix-pull</command> command, which must be supplied with a URL containing a <emphasis>manifest</emphasis> describing what binaries are available. This URL should correspond to the Nix Packages release @@ -137,7 +137,7 @@ defined by some pretty much arbitrary rules regarding ordering of version numbers (which generally do what you'd expect of them). To just unconditionally replace Subversion with whatever version is in the Nix expressions, use <parameter>-i</parameter> instead of -<parameter>-u</parameter> — <parameter>-i</parameter> will +<parameter>-u</parameter> — <parameter>-i</parameter> will remove whatever version is already installed.</para> <para>You can also upgrade all components for which there are newer diff --git a/doc/manual/writing-nix-expressions.xml b/doc/manual/writing-nix-expressions.xml index c4ea5d1f39ef..eb366c249c32 100644 --- a/doc/manual/writing-nix-expressions.xml +++ b/doc/manual/writing-nix-expressions.xml @@ -2,7 +2,7 @@ <sect1><title>A simple Nix expression</title> -<para>This section shows how to write simple Nix expressions—the +<para>This section shows how to write simple Nix expressions — the things that describe how to build a package.</para> <example id='ex-hello-nix'><title>Nix expression for GNU Hello</title> @@ -139,8 +139,8 @@ must not be null and it must have been built using the same instance of the <varname>expat</varname> library as was passed to the Subversion expression. This is since the Subversion code is dynamically linked against the Apache code and they both use Expat, -they must be linked against the same instance—otherwise a -conflict might occur.</para> +they must be linked against the same instance — otherwise a conflict +might occur.</para> </sect1> |