diff --git a/doc/manual/expressions/debug-build.xml b/doc/manual/expressions/debug-build.xml
deleted file mode 100644
index 0c1f4e671..000000000
--- a/doc/manual/expressions/debug-build.xml
+++ /dev/null
@@ -1,34 +0,0 @@
-
-
-Debugging Build Failures
-
-At the beginning of each phase of the build (such as unpacking,
-building or installing), the set of all shell variables is written to
-the file env-vars at the top-level build
-directory. This is useful for debugging: it allows you to recreate
-the environment in which a build was performed. For instance, if a
-build fails, then assuming you used the -K flag, you
-can go to the output directory and switch
to the
-environment of the builder:
-
-
-$ nix-build -K ./foo.nix
-... fails, keeping build directory `/tmp/nix-1234-0'
-
-$ cd /tmp/nix-1234-0
-
-$ source env-vars
-
-(edit some files...)
-
-$ make
-
-(execution continues with the same GCC, make, etc.)
-
-
-
-
diff --git a/doc/manual/expressions/simple-building-testing.xml b/doc/manual/expressions/simple-building-testing.xml
index bd3901a13..0348c082b 100644
--- a/doc/manual/expressions/simple-building-testing.xml
+++ b/doc/manual/expressions/simple-building-testing.xml
@@ -81,6 +81,4 @@ Just pass the option -j
in parallel, or set. Typically this should be the number of
CPUs.
-Nix can be uninstalled using rpm -e nix or
-dpkg -r nix on RPM- and Dpkg-based systems,
-respectively. After this you should manually remove the Nix store and
-other auxiliary data, if desired:
-
-
-$ rm -rf /nix
-
-
-
You can uninstall Nix simply by running:
diff --git a/doc/manual/installation/supported-platforms.xml b/doc/manual/installation/supported-platforms.xml
index a468a5640..6858573ff 100644
--- a/doc/manual/installation/supported-platforms.xml
+++ b/doc/manual/installation/supported-platforms.xml
@@ -33,7 +33,4 @@
-Nix is fairly portable, so it should work on most platforms that
-support POSIX threads and have a C++11 compiler.
-
diff --git a/doc/manual/introduction/quick-start.xml b/doc/manual/introduction/quick-start.xml
index aa239b753..1ce6c8d50 100644
--- a/doc/manual/introduction/quick-start.xml
+++ b/doc/manual/introduction/quick-start.xml
@@ -15,7 +15,7 @@ to subsequent chapters.
Install single-user Nix by running the following:
-$ curl https://nixos.org/nix/install | sh
+$ bash <(curl https://nixos.org/nix/install)
This will install Nix in /nix . The install script
diff --git a/doc/manual/manual.xml b/doc/manual/manual.xml
index 61205d916..b5a6af7d0 100644
--- a/doc/manual/manual.xml
+++ b/doc/manual/manual.xml
@@ -12,14 +12,11 @@
Eelco
Dolstra
-
- LogicBlox
-
Author
- 2004-2014
+ 2004-2017
Eelco Dolstra
@@ -41,7 +38,6 @@
-
-Collisions in <command>nix-env</command>
-
-Symptom: when installing or upgrading, you get an error message such as
-
-
-$ nix-env -i docbook-xml
-...
-adding /nix/store/s5hyxgm62gk2...-docbook-xml-4.2
-collision between `/nix/store/s5hyxgm62gk2...-docbook-xml-4.2/xml/dtd/docbook/calstblx.dtd'
- and `/nix/store/06h377hr4b33...-docbook-xml-4.3/xml/dtd/docbook/calstblx.dtd'
- at /nix/store/...-builder.pl line 62.
-
-
-
-The cause is that two installed packages in the user environment
-have overlapping filenames (e.g.,
-xml/dtd/docbook/calstblx.dtd . This usually
-happens when you accidentally try to install two versions of the same
-package. For instance, in the example above, the Nix Packages
-collection contains two versions of docbook-xml , so
-nix-env -i will try to install both. The default
-user environment builder has no way to way to resolve such conflicts,
-so it just gives up.
-
-Solution: remove one of the offending packages from the user
-environment (if already installed) using nix-env
--e , or specify exactly which version should be installed
-(e.g., nix-env -i docbook-xml-4.2 ).
-
-
-
-
diff --git a/doc/manual/troubleshooting/links-nix-store.xml b/doc/manual/troubleshooting/links-nix-store.xml
deleted file mode 100644
index c76888956..000000000
--- a/doc/manual/troubleshooting/links-nix-store.xml
+++ /dev/null
@@ -1,43 +0,0 @@
-
-
-<quote>Too many links</quote> Error in the Nix store
-
-
-Symptom: when building something, you get an error message such as
-
-
-...
-mkdir: cannot create directory `/nix/store/name ': Too many links
-
-
-
-This is usually because you have more than 32,000 subdirectories
-in /nix/store , as can be seen using ls
--l :
-
-
-$ ls -ld /nix/store
-drwxrwxrwt 32000 nix nix 4620288 Sep 8 15:08 store
-
-The ext2 file system is limited to an inode link
-count of 32,000 (each subdirectory increasing the count by one).
-Furthermore, the st_nlink field of the
-stat system call is a 16-bit value.
-
-This only happens on very large Nix installations (such as build
-machines).
-
-Quick solution: run the garbage collector. You may want to use
-the --max-links option.
-
-Real solution: put the Nix store on a file system that supports
-more than 32,000 subdirectories per directory, such as ext4. (This
-doesn’t solve the st_nlink limit, but ext4 lies to
-the kernel by reporting a link count of 1 if it exceeds the
-limit.)
-
-
diff --git a/doc/manual/troubleshooting/troubleshooting.xml b/doc/manual/troubleshooting/troubleshooting.xml
deleted file mode 100644
index 1e973a192..000000000
--- a/doc/manual/troubleshooting/troubleshooting.xml
+++ /dev/null
@@ -1,16 +0,0 @@
-
-
-Troubleshooting
-
-This section provides solutions for some common problems. See
-the
-
-