diff options
author | Eelco Dolstra <eelco.dolstra@logicblox.com> | 2018-03-02T15·58+0100 |
---|---|---|
committer | GitHub <noreply@github.com> | 2018-03-02T15·58+0100 |
commit | 5c7a6d07de1dbe18eaac5e6bce766dbe978b8165 (patch) | |
tree | 625e06e8fef307b4733fcdcf711953a7afffed21 | |
parent | 939cf4ccebb199e61da648873fb078ae8833263f (diff) | |
parent | ad97d1a78653373fad8dc3ed98c3607862581b76 (diff) |
Merge pull request #1932 from mfiano/patch-1
nix-channel grammar and punctuation
-rw-r--r-- | doc/manual/command-ref/nix-channel.xml | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/doc/manual/command-ref/nix-channel.xml b/doc/manual/command-ref/nix-channel.xml index 9acf44e52984..ff4021a765e0 100644 --- a/doc/manual/command-ref/nix-channel.xml +++ b/doc/manual/command-ref/nix-channel.xml @@ -31,7 +31,7 @@ <refsection><title>Description</title> -<para>A Nix channel is mechanism that allows you to automatically stay +<para>A Nix channel is a mechanism that allows you to automatically stay up-to-date with a set of pre-built Nix expressions. A Nix channel is just a URL that points to a place containing both a set of Nix expressions and a pointer to a binary cache. <phrase @@ -165,8 +165,8 @@ following files:</para> <varlistentry><term><filename>nixexprs.tar.xz</filename></term> <listitem><para>A tarball containing Nix expressions and files - referenced by them (such as build scripts and patches). At - top-level, the tarball should contain a single directory. That + referenced by them (such as build scripts and patches). At the + top level, the tarball should contain a single directory. That directory must contain a file <filename>default.nix</filename> that serves as the channel’s “entry point”.</para></listitem> @@ -175,7 +175,7 @@ following files:</para> <varlistentry><term><filename>binary-cache-url</filename></term> <listitem><para>A file containing the URL to a binary cache (such - as <uri>https://cache.nixos.org</uri>. Nix will automatically + as <uri>https://cache.nixos.org</uri>). Nix will automatically check this cache for pre-built binaries, if the user has sufficient rights to add binary caches. For instance, in a multi-user Nix setup, the binary caches provided by the channels |