aboutsummaryrefslogtreecommitdiff
path: root/doc/manual/src
diff options
context:
space:
mode:
Diffstat (limited to 'doc/manual/src')
-rw-r--r--doc/manual/src/SUMMARY.md2
-rw-r--r--doc/manual/src/command-ref/new-cli/nix3-config-show.md1
-rw-r--r--doc/manual/src/command-ref/new-cli/nix3-config.md1
-rw-r--r--doc/manual/src/command-ref/new-cli/nix3-show-config.md1
-rw-r--r--doc/manual/src/command-ref/nix-env.md22
5 files changed, 15 insertions, 12 deletions
diff --git a/doc/manual/src/SUMMARY.md b/doc/manual/src/SUMMARY.md
index 7747b9061..2437c0dc5 100644
--- a/doc/manual/src/SUMMARY.md
+++ b/doc/manual/src/SUMMARY.md
@@ -91,6 +91,8 @@
- [nix](command-ref/new-cli/nix.md)
- [nix build](command-ref/new-cli/nix3-build.md)
- [nix bundle](command-ref/new-cli/nix3-bundle.md)
+ - [nix config](command-ref/new-cli/nix3-config.md)
+ - [nix config show](command-ref/new-cli/nix3-config-show.md)
- [nix copy](command-ref/new-cli/nix3-copy.md)
- [nix daemon](command-ref/new-cli/nix3-daemon.md)
- [nix derivation](command-ref/new-cli/nix3-derivation.md)
diff --git a/doc/manual/src/command-ref/new-cli/nix3-config-show.md b/doc/manual/src/command-ref/new-cli/nix3-config-show.md
new file mode 100644
index 000000000..a39cd13e9
--- /dev/null
+++ b/doc/manual/src/command-ref/new-cli/nix3-config-show.md
@@ -0,0 +1 @@
+{{#include @generated@/command-ref/new-cli/nix3-config-show.md}}
diff --git a/doc/manual/src/command-ref/new-cli/nix3-config.md b/doc/manual/src/command-ref/new-cli/nix3-config.md
new file mode 100644
index 000000000..ba824c7bc
--- /dev/null
+++ b/doc/manual/src/command-ref/new-cli/nix3-config.md
@@ -0,0 +1 @@
+{{#include @generated@/command-ref/new-cli/nix3-config.md}}
diff --git a/doc/manual/src/command-ref/new-cli/nix3-show-config.md b/doc/manual/src/command-ref/new-cli/nix3-show-config.md
deleted file mode 100644
index 060fc065d..000000000
--- a/doc/manual/src/command-ref/new-cli/nix3-show-config.md
+++ /dev/null
@@ -1 +0,0 @@
-{{#include @generated@/command-ref/new-cli/nix3-show-config.md}}
diff --git a/doc/manual/src/command-ref/nix-env.md b/doc/manual/src/command-ref/nix-env.md
index 941723216..5a9e05fed 100644
--- a/doc/manual/src/command-ref/nix-env.md
+++ b/doc/manual/src/command-ref/nix-env.md
@@ -25,17 +25,17 @@ individual users can switch between different environments.
`nix-env` takes exactly one *operation* flag which indicates the
subcommand to be performed. The following operations are available:
-- [`--install`](./nix-env/install.md)
-- [`--upgrade`](./nix-env/upgrade.md)
-- [`--uninstall`](./nix-env/uninstall.md)
-- [`--set`](./nix-env/set.md)
-- [`--set-flag`](./nix-env/set-flag.md)
-- [`--query`](./nix-env/query.md)
-- [`--switch-profile`](./nix-env/switch-profile.md)
-- [`--list-generations`](./nix-env/list-generations.md)
-- [`--delete-generations`](./nix-env/delete-generations.md)
-- [`--switch-generation`](./nix-env/switch-generation.md)
-- [`--rollback`](./nix-env/rollback.md)
+- [`--install`](./nix-env/install.md) - add packages to user environment
+- [`--upgrade`](./nix-env/upgrade.md) - upgrade packages in user environment
+- [`--uninstall`](./nix-env/uninstall.md) - remove packages from user environment
+- [`--set`](./nix-env/set.md) - set profile to contain a specified derivation
+- [`--set-flag`](./nix-env/set-flag.md) - modify meta attributes of installed packages
+- [`--query`](./nix-env/query.md) - display information about packages
+- [`--switch-profile`](./nix-env/switch-profile.md) - set user environment to a given profile
+- [`--list-generations`](./nix-env/list-generations.md) - list profile generations
+- [`--delete-generations`](./nix-env/delete-generations.md) - delete profile generations
+- [`--switch-generation`](./nix-env/switch-generation.md) - set user environment to a given profile generation
+- [`--rollback`](./nix-env/rollback.md) - set user environment to previous generation
These pages can be viewed offline: