Merge pull request #1932 from mfiano/patch-1

nix-channel grammar and punctuation
This commit is contained in:
Eelco Dolstra 2018-03-02 16:58:00 +01:00 committed by GitHub
commit 5c7a6d07de
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23

View file

@ -31,7 +31,7 @@
<refsection><title>Description</title> <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 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 just a URL that points to a place containing both a set of Nix
expressions and a pointer to a binary cache. <phrase expressions and a pointer to a binary cache. <phrase
@ -165,8 +165,8 @@ following files:</para>
<varlistentry><term><filename>nixexprs.tar.xz</filename></term> <varlistentry><term><filename>nixexprs.tar.xz</filename></term>
<listitem><para>A tarball containing Nix expressions and files <listitem><para>A tarball containing Nix expressions and files
referenced by them (such as build scripts and patches). At referenced by them (such as build scripts and patches). At the
top-level, the tarball should contain a single directory. That top level, the tarball should contain a single directory. That
directory must contain a file <filename>default.nix</filename> directory must contain a file <filename>default.nix</filename>
that serves as the channels “entry point”.</para></listitem> that serves as the channels “entry point”.</para></listitem>
@ -175,7 +175,7 @@ following files:</para>
<varlistentry><term><filename>binary-cache-url</filename></term> <varlistentry><term><filename>binary-cache-url</filename></term>
<listitem><para>A file containing the URL to a binary cache (such <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 check this cache for pre-built binaries, if the user has
sufficient rights to add binary caches. For instance, in a sufficient rights to add binary caches. For instance, in a
multi-user Nix setup, the binary caches provided by the channels multi-user Nix setup, the binary caches provided by the channels