From d9f30fe7c74ae8518a575c0d15ee00aa46a2229a Mon Sep 17 00:00:00 2001 From: Eelco Dolstra Date: Mon, 2 Feb 2004 10:51:54 +0000 Subject: * Sort `nix-env -q' output by derivation name. * `--version' flag for all commands. * Manual updates. --- doc/manual/Makefile.am | 2 +- doc/manual/manual.xml | 3 +- doc/manual/nix-env.xml | 9 +-- doc/manual/nix-instantiate.xml | 22 ++------ doc/manual/nix-store.xml | 21 +------ doc/manual/opt-common-syn.xml | 8 +++ doc/manual/opt-common.xml | 122 +++++++++++++++++++++++++++++++++++++++++ doc/manual/opt-verbose.xml | 87 ----------------------------- 8 files changed, 142 insertions(+), 132 deletions(-) create mode 100644 doc/manual/opt-common-syn.xml create mode 100644 doc/manual/opt-common.xml delete mode 100644 doc/manual/opt-verbose.xml (limited to 'doc') diff --git a/doc/manual/Makefile.am b/doc/manual/Makefile.am index b1f5c3f46560..8bf06cf2b468 100644 --- a/doc/manual/Makefile.am +++ b/doc/manual/Makefile.am @@ -8,7 +8,7 @@ XSLTPROC = $(ENV) $(xsltproc) $(xmlflags) --catalogs \ SOURCES = manual.xml introduction.xml installation.xml overview.xml \ nix-env.xml nix-store.xml nix-instantiate.xml \ - troubleshooting.xml bugs.xml opt-verbose.xml \ + troubleshooting.xml bugs.xml opt-common.xml opt-common-syn.xml \ quick-start.xml style.css images manual.is-valid: $(SOURCES) version.xml diff --git a/doc/manual/manual.xml b/doc/manual/manual.xml index d47e57123853..686ab612f29a 100644 --- a/doc/manual/manual.xml +++ b/doc/manual/manual.xml @@ -7,7 +7,8 @@ - + + diff --git a/doc/manual/nix-env.xml b/doc/manual/nix-env.xml index c73716381f4d..a943fd9760e3 100644 --- a/doc/manual/nix-env.xml +++ b/doc/manual/nix-env.xml @@ -7,12 +7,7 @@ nix-env - - - - - - + &opt-common-syn; @@ -71,7 +66,7 @@ - &opt-verbose; + &opt-common; / diff --git a/doc/manual/nix-instantiate.xml b/doc/manual/nix-instantiate.xml index 2e2749e43441..ee073a17b7c6 100644 --- a/doc/manual/nix-instantiate.xml +++ b/doc/manual/nix-instantiate.xml @@ -1,16 +1,13 @@ nix-instantiate - generate Nix expressions from a high-level description + instantiate store expressions from Nix expressions - fix - - - - + nix-instantiate + &opt-common-syn; files @@ -19,19 +16,10 @@ Description - The command fix generates Nix expressions from - expressions is Fix's own high-level language. While Nix expressions are - very primitive and not intended to be written directly, Fix expressions - are quite easy to write. + The command nix-instantiate generates + (low-level) store expressions from (high-level) Nix expressions. - - - diff --git a/doc/manual/nix-store.xml b/doc/manual/nix-store.xml index 7758d04eacdf..a3fcad0631d0 100644 --- a/doc/manual/nix-store.xml +++ b/doc/manual/nix-store.xml @@ -7,12 +7,7 @@ nix-store - - - - - - + &opt-common-syn; operation options arguments @@ -51,19 +46,7 @@ - &opt-verbose; - - - / - - - Specifies that in case of a build failure, the temporary directory - (usually in /tmp) in which the build takes - place should not be deleted. The path of the build directory is - printed as an informational message. - - - + &opt-common; diff --git a/doc/manual/opt-common-syn.xml b/doc/manual/opt-common-syn.xml new file mode 100644 index 000000000000..3a3e4ce87247 --- /dev/null +++ b/doc/manual/opt-common-syn.xml @@ -0,0 +1,8 @@ + + + + + + + + diff --git a/doc/manual/opt-common.xml b/doc/manual/opt-common.xml new file mode 100644 index 000000000000..6c8db2a72757 --- /dev/null +++ b/doc/manual/opt-common.xml @@ -0,0 +1,122 @@ + + + + + Prints out a summary of the command syntax and exits. + + + + + + + + + + Prints out the Nix version number on standard output and exits. + + + + + + + / + + + Increases the level of verbosity of diagnostic messages printed + on standard error. For each Nix operation, the information + printed on standard output is well-defined; any diagnostic + information is printed on standard error, never on standard + output. + + + + This option may be specified repeatedly. Currently, the + following verbosity levels exist: + + + + + 0 + + + Errors only: only print messages explaining + why the Nix invocation failed. + + + + + 1 + + + Informational: print + useful messages about what Nix is + doing. + + + + + 2 + + + Talkative: print more informational messages. + + + + + 3 + + + Chatty: print even more informational messages. + + + + + 4 + + + Debug: print debug information: + + + + + 5 + + + Vomit: print vast amounts of debug + information. + + + + + + + + + + + / + + + Causes the output written by build actions to standard output + and standard error to be echoed to standard error, regardless of + verbosity level. By default, it is only echoed at a verbosity + level of at least 4 (Debug), and is suppressed at + lower levels. Note that it is always written to a log file in + prefix/nix/var/log/nix. + + + + + + + / + + + Specifies that in case of a build failure, the temporary + directory (usually in /tmp) in which the + build takes place should not be deleted. The path of the build + directory is printed as an informational message. + + + + diff --git a/doc/manual/opt-verbose.xml b/doc/manual/opt-verbose.xml deleted file mode 100644 index 53fe07ae76b8..000000000000 --- a/doc/manual/opt-verbose.xml +++ /dev/null @@ -1,87 +0,0 @@ - - / - - - Increases the level of verbosity of diagnostic messages printed - on standard error. For each Nix operation, the information - printed on standard output is well-defined; any diagnostic - information is printed on standard error, never on standard - output. - - - - This option may be specified repeatedly. Currently, the - following verbosity levels exist: - - - - - 0 - - - Errors only: only print messages explaining - why the Nix invocation failed. - - - - - 1 - - - Informational: print - useful messages about what Nix is - doing. - - - - - 2 - - - Talkative: print more informational messages. - - - - - 3 - - - Chatty: print even more informational messages. - - - - - 4 - - - Debug: print debug information: - - - - - 5 - - - Vomit: print vast amounts of debug - information. - - - - - - - - - - / - - - Causes the output written by build actions to standard output - and standard error to be echoed to standard error, regardless of - verbosity level. By default, it is only echoed at a verbosity - level of at least 4 (Debug), and is suppressed at - lower levels. Note that it is always written to a log file in - prefix/nix/var/log/nix. - - - -- cgit 1.4.1