diff options
| author | Rok Garbas <rok@garbas.si> | 2020-12-07 15:13:36 +0100 |
|---|---|---|
| committer | Rok Garbas <rok@garbas.si> | 2020-12-07 15:13:36 +0100 |
| commit | 24db5b125f06f7f01f4afb024d41132ad1709801 (patch) | |
| tree | 513ef449fc06963566c3f5cd8aefdc0ef6609d21 /doc/manual/src | |
| parent | 44da19f73cfa87bb09c14fe64fce97904db0970c (diff) | |
| parent | 8a06edbf7e984bae426068189ff9a631bc26af72 (diff) | |
Merge remote-tracking branch 'origin/master' into cli-guideline
Diffstat (limited to 'doc/manual/src')
| -rw-r--r-- | doc/manual/src/SUMMARY.md.in (renamed from doc/manual/src/SUMMARY.md) | 6 | ||||
| -rw-r--r-- | doc/manual/src/contributing/cli-guideline.md (renamed from doc/manual/src/command-ref/cli-guideline.md) | 0 |
2 files changed, 3 insertions, 3 deletions
diff --git a/doc/manual/src/SUMMARY.md b/doc/manual/src/SUMMARY.md.in index 27a08bb43..fdb1f7969 100644 --- a/doc/manual/src/SUMMARY.md +++ b/doc/manual/src/SUMMARY.md.in @@ -62,12 +62,12 @@ - [nix-instantiate](command-ref/nix-instantiate.md) - [nix-prefetch-url](command-ref/nix-prefetch-url.md) - [Experimental Commands](command-ref/experimental-commands.md) - - [nix](command-ref/nix.md) - - [CLI guideline](command-ref/cli-guideline.md) - [Files](command-ref/files.md) - [nix.conf](command-ref/conf-file.md) - [Glossary](glossary.md) -- [Hacking](hacking.md) +- [Contributing](contributing/contributing.md) + - [Hacking](contributing/hacking.md) + - [CLI guideline](contributing/cli-guideline.md) - [Release Notes](release-notes/release-notes.md) - [Release 2.3 (2019-09-04)](release-notes/rl-2.3.md) - [Release 2.2 (2019-01-11)](release-notes/rl-2.2.md) diff --git a/doc/manual/src/command-ref/cli-guideline.md b/doc/manual/src/contributing/cli-guideline.md index 01df07136..01df07136 100644 --- a/doc/manual/src/command-ref/cli-guideline.md +++ b/doc/manual/src/contributing/cli-guideline.md |