aboutsummaryrefslogtreecommitdiff
path: root/doc/manual/command-ref/nix-channel.xml
diff options
context:
space:
mode:
Diffstat (limited to 'doc/manual/command-ref/nix-channel.xml')
-rw-r--r--doc/manual/command-ref/nix-channel.xml17
1 files changed, 3 insertions, 14 deletions
diff --git a/doc/manual/command-ref/nix-channel.xml b/doc/manual/command-ref/nix-channel.xml
index a6f4a2720..0a1f2a8b7 100644
--- a/doc/manual/command-ref/nix-channel.xml
+++ b/doc/manual/command-ref/nix-channel.xml
@@ -73,11 +73,10 @@ condition="manual">See also <xref linkend="sec-channels"
<listitem><para>Downloads the Nix expressions of all subscribed
channels (or only those included in
- <replaceable>names</replaceable> if specified), makes them the
+ <replaceable>names</replaceable> if specified) and makes them the
default for <command>nix-env</command> operations (by symlinking
- them from the directory <filename>~/.nix-defexpr</filename>), and
- performs a <command>nix-pull</command> on the manifests of all
- channels to make pre-built binaries available.</para></listitem>
+ them from the directory
+ <filename>~/.nix-defexpr</filename>).</para></listitem>
</varlistentry>
@@ -187,16 +186,6 @@ following files:</para>
</varlistentry>
- <varlistentry><term><filename>MANIFEST.bz2</filename></term>
-
- <listitem><para>(Deprecated in favour of binary caches.) A
- manifest as created by <command>nix-push</command>. Only used if
- <filename>binary-cache-url</filename> is not present or if the
- <filename>nix.conf</filename> option
- <option>force-manifest</option> is set.</para></listitem>
-
- </varlistentry>
-
</variablelist>
</refsection>