From 7de4b1e9aa72c21f5c98001ea2a5f312d26634b7 Mon Sep 17 00:00:00 2001
From: Rok Garbas <rok@garbas.si>
Date: Thu, 17 Dec 2020 23:42:49 +0100
Subject: [PATCH] smaller fixes

---
 doc/manual/src/SUMMARY.md.in           |  1 +
 doc/manual/src/command-ref/nix.md      |  1 -
 doc/manual/src/contributing/hacking.md | 76 +++++++++++++++++++++++++
 doc/manual/src/hacking.md              | 77 --------------------------
 4 files changed, 77 insertions(+), 78 deletions(-)
 delete mode 100644 doc/manual/src/command-ref/nix.md
 delete mode 100644 doc/manual/src/hacking.md

diff --git a/doc/manual/src/SUMMARY.md.in b/doc/manual/src/SUMMARY.md.in
index fdb1f7969..448fee803 100644
--- a/doc/manual/src/SUMMARY.md.in
+++ b/doc/manual/src/SUMMARY.md.in
@@ -62,6 +62,7 @@
     - [nix-instantiate](command-ref/nix-instantiate.md)
     - [nix-prefetch-url](command-ref/nix-prefetch-url.md)
   - [Experimental Commands](command-ref/experimental-commands.md)
+@manpages@
   - [Files](command-ref/files.md)
     - [nix.conf](command-ref/conf-file.md)
 - [Glossary](glossary.md)
diff --git a/doc/manual/src/command-ref/nix.md b/doc/manual/src/command-ref/nix.md
deleted file mode 100644
index cc677d127..000000000
--- a/doc/manual/src/command-ref/nix.md
+++ /dev/null
@@ -1 +0,0 @@
-# nix
diff --git a/doc/manual/src/contributing/hacking.md b/doc/manual/src/contributing/hacking.md
index 2ad773dea..2a1e55e5b 100644
--- a/doc/manual/src/contributing/hacking.md
+++ b/doc/manual/src/contributing/hacking.md
@@ -1 +1,77 @@
 # Hacking
+
+This section provides some notes on how to hack on Nix. To get the
+latest version of Nix from GitHub:
+
+```console
+$ git clone https://github.com/NixOS/nix.git
+$ cd nix
+```
+
+To build Nix for the current operating system/architecture use
+
+```console
+$ nix-build
+```
+
+or if you have a flake-enabled nix:
+
+```console
+$ nix build
+```
+
+This will build `defaultPackage` attribute defined in the `flake.nix`
+file. To build for other platforms add one of the following suffixes to
+it: aarch64-linux, i686-linux, x86\_64-darwin, x86\_64-linux. i.e.
+
+```console
+$ nix-build -A defaultPackage.x86_64-linux
+```
+
+To build all dependencies and start a shell in which all environment
+variables are set up so that those dependencies can be found:
+
+```console
+$ nix-shell
+```
+
+To build Nix itself in this shell:
+
+```console
+[nix-shell]$ ./bootstrap.sh
+[nix-shell]$ ./configure $configureFlags --prefix=$(pwd)/outputs/out
+[nix-shell]$ make -j $NIX_BUILD_CORES
+```
+
+To install it in `$(pwd)/outputs` and test it:
+
+```console
+[nix-shell]$ make install
+[nix-shell]$ make installcheck -j $NIX_BUILD_CORES
+[nix-shell]$ ./outputs/out/bin/nix --version
+nix (Nix) 3.0
+```
+
+To run a functional test:
+
+```console
+make tests/test-name-should-auto-complete.sh.test
+```
+
+To run the unit-tests for C++ code:
+
+```
+make check
+```
+
+If you have a flakes-enabled Nix you can replace:
+
+```console
+$ nix-shell
+```
+
+by:
+
+```console
+$ nix develop
+```
diff --git a/doc/manual/src/hacking.md b/doc/manual/src/hacking.md
deleted file mode 100644
index 2a1e55e5b..000000000
--- a/doc/manual/src/hacking.md
+++ /dev/null
@@ -1,77 +0,0 @@
-# Hacking
-
-This section provides some notes on how to hack on Nix. To get the
-latest version of Nix from GitHub:
-
-```console
-$ git clone https://github.com/NixOS/nix.git
-$ cd nix
-```
-
-To build Nix for the current operating system/architecture use
-
-```console
-$ nix-build
-```
-
-or if you have a flake-enabled nix:
-
-```console
-$ nix build
-```
-
-This will build `defaultPackage` attribute defined in the `flake.nix`
-file. To build for other platforms add one of the following suffixes to
-it: aarch64-linux, i686-linux, x86\_64-darwin, x86\_64-linux. i.e.
-
-```console
-$ nix-build -A defaultPackage.x86_64-linux
-```
-
-To build all dependencies and start a shell in which all environment
-variables are set up so that those dependencies can be found:
-
-```console
-$ nix-shell
-```
-
-To build Nix itself in this shell:
-
-```console
-[nix-shell]$ ./bootstrap.sh
-[nix-shell]$ ./configure $configureFlags --prefix=$(pwd)/outputs/out
-[nix-shell]$ make -j $NIX_BUILD_CORES
-```
-
-To install it in `$(pwd)/outputs` and test it:
-
-```console
-[nix-shell]$ make install
-[nix-shell]$ make installcheck -j $NIX_BUILD_CORES
-[nix-shell]$ ./outputs/out/bin/nix --version
-nix (Nix) 3.0
-```
-
-To run a functional test:
-
-```console
-make tests/test-name-should-auto-complete.sh.test
-```
-
-To run the unit-tests for C++ code:
-
-```
-make check
-```
-
-If you have a flakes-enabled Nix you can replace:
-
-```console
-$ nix-shell
-```
-
-by:
-
-```console
-$ nix develop
-```