[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
197/376: Remove unhelpful suggestion
From: |
Ludovic Courtès |
Subject: |
197/376: Remove unhelpful suggestion |
Date: |
Wed, 28 Jan 2015 22:04:59 +0000 |
civodul pushed a commit to tag 1.8
in repository guix.
commit a2fc9c6b57ff64d535eef555d2260a81c19e2a2b
Author: Eelco Dolstra <address@hidden>
Date: Tue Sep 16 15:42:20 2014 +0200
Remove unhelpful suggestion
---
doc/manual/troubleshooting/collisions-nixenv.xml | 7 +------
1 files changed, 1 insertions(+), 6 deletions(-)
diff --git a/doc/manual/troubleshooting/collisions-nixenv.xml
b/doc/manual/troubleshooting/collisions-nixenv.xml
index 316d2d1..23cc43f 100644
--- a/doc/manual/troubleshooting/collisions-nixenv.xml
+++ b/doc/manual/troubleshooting/collisions-nixenv.xml
@@ -33,11 +33,6 @@ environment (if already installed) using <command>nix-env
-e</command>, or specify exactly which version should be installed
(e.g., <literal>nix-env -i docbook-xml-4.2</literal>).</para>
-<para>Alternatively, you can modify the user environment builder
-script (in
-<filename><replaceable>prefix</replaceable>/share/nix/corepkgs/buildenv/builder.pl</filename>)
-to implement some conflict resolution policy. E.g., the script could
-be modified to rename conflicting file names, or to pick one over the
-other.</para>
+<!-- FIXME: describe priorities -->
</section>
- 198/376: Derive Emacs nix-mode from prog-mode., (continued)
- 198/376: Derive Emacs nix-mode from prog-mode., Ludovic Courtès, 2015/01/28
- 179/376: Fix JAR installation, Ludovic Courtès, 2015/01/28
- 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 <=
- 196/376: Delete bugs.xml, Ludovic Courtès, 2015/01/28
- 183/376: Manual build fixes, Ludovic Courtès, 2015/01/28
- 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