diff options
| author | Eelco Dolstra <eelco.dolstra@logicblox.com> | 2017-07-07 11:04:06 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-07-07 11:04:06 +0200 |
| commit | eef09c220db6a80a2e069c7b8aecb5977015e226 (patch) | |
| tree | 358e6c05b5603955009f93fcf645e431f7d70331 | |
| parent | a3dc1e65abe29f9d0528d3b5ea45812f4dcd63ed (diff) | |
| parent | 01722b3d2c10090f53290e68b585c50d042f0adb (diff) | |
Merge pull request #1444 from robx/man
Fix nix-instantiate manpage indentation
| -rw-r--r-- | doc/manual/command-ref/nix-instantiate.xml | 3 | ||||
| -rw-r--r-- | tests/common.sh.in | 2 |
2 files changed, 2 insertions, 3 deletions
diff --git a/doc/manual/command-ref/nix-instantiate.xml b/doc/manual/command-ref/nix-instantiate.xml index 3d03358be..fe077ff65 100644 --- a/doc/manual/command-ref/nix-instantiate.xml +++ b/doc/manual/command-ref/nix-instantiate.xml @@ -43,7 +43,8 @@ <arg choice='plain'><option>-E</option></arg> </group> <arg choice='plain' rep='repeat'><replaceable>files</replaceable></arg> - <sbr/> + </cmdsynopsis> + <cmdsynopsis> <command>nix-instantiate</command> <arg choice='plain'><option>--find-file</option></arg> <arg choice='plain' rep='repeat'><replaceable>files</replaceable></arg> diff --git a/tests/common.sh.in b/tests/common.sh.in index 6c3804a25..a8d56707e 100644 --- a/tests/common.sh.in +++ b/tests/common.sh.in @@ -1,7 +1,5 @@ set -e -datadir="@datadir@" - export TEST_ROOT=$(realpath ${TMPDIR:-/tmp}/nix-test) export NIX_STORE_DIR if ! NIX_STORE_DIR=$(readlink -f $TEST_ROOT/store 2> /dev/null); then |