diff options
| author | github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com> | 2021-03-24 12:11:57 +0000 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-03-24 12:11:57 +0000 |
| commit | 380cb1e99543fa778c3051449ae90ab9c0ee3541 (patch) | |
| tree | 1fdb482a8cb0611dc40bc951f13b7a1246b27aa4 /nixos/doc/manual | |
| parent | f29a6f587782235aed55403fe4386ce8f33e5b94 (diff) | |
| parent | 6b74bbfb9603418fac02cda0352b70661eab2aa6 (diff) | |
| download | nixlib-380cb1e99543fa778c3051449ae90ab9c0ee3541.tar nixlib-380cb1e99543fa778c3051449ae90ab9c0ee3541.tar.gz nixlib-380cb1e99543fa778c3051449ae90ab9c0ee3541.tar.bz2 nixlib-380cb1e99543fa778c3051449ae90ab9c0ee3541.tar.lz nixlib-380cb1e99543fa778c3051449ae90ab9c0ee3541.tar.xz nixlib-380cb1e99543fa778c3051449ae90ab9c0ee3541.tar.zst nixlib-380cb1e99543fa778c3051449ae90ab9c0ee3541.zip | |
Merge master into staging-next
Diffstat (limited to 'nixos/doc/manual')
| -rw-r--r-- | nixos/doc/manual/Makefile | 2 | ||||
| -rw-r--r-- | nixos/doc/manual/development/writing-documentation.xml | 3 |
2 files changed, 3 insertions, 2 deletions
diff --git a/nixos/doc/manual/Makefile b/nixos/doc/manual/Makefile index b86a76005753..b2b6481b20c7 100644 --- a/nixos/doc/manual/Makefile +++ b/nixos/doc/manual/Makefile @@ -1,5 +1,5 @@ .PHONY: all -all: manual-combined.xml format +all: manual-combined.xml .PHONY: debug debug: generated manual-combined.xml diff --git a/nixos/doc/manual/development/writing-documentation.xml b/nixos/doc/manual/development/writing-documentation.xml index 32e00544ceff..89fab6665616 100644 --- a/nixos/doc/manual/development/writing-documentation.xml +++ b/nixos/doc/manual/development/writing-documentation.xml @@ -25,7 +25,8 @@ <screen> <prompt>$ </prompt>cd /path/to/nixpkgs/nixos/doc/manual -<prompt>$ </prompt>make +<prompt>$ </prompt>nix-shell +<prompt>nix-shell$ </prompt>make </screen> <para> |