diff options
author | Mark H Weaver <mhw@netris.org> | 2016-08-04 08:17:05 -0400 |
---|---|---|
committer | Mark H Weaver <mhw@netris.org> | 2016-08-04 08:17:05 -0400 |
commit | 536fc5f8cd45023c3c6f28f9c768338b5e797b47 (patch) | |
tree | 8516410664ed4d6ff0f68b48e71e5ec866367c44 /doc/guix.texi | |
parent | 0832787e5c463c713d8f24fdec0f52900ff1c2bd (diff) | |
parent | a8cb87abe98d57fb763d5b14524dc32c96bd31b5 (diff) | |
download | guix-536fc5f8cd45023c3c6f28f9c768338b5e797b47.tar guix-536fc5f8cd45023c3c6f28f9c768338b5e797b47.tar.gz |
Merge branch 'core-updates'
Diffstat (limited to 'doc/guix.texi')
-rw-r--r-- | doc/guix.texi | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/doc/guix.texi b/doc/guix.texi index 3725f6c242..df8b5a9241 100644 --- a/doc/guix.texi +++ b/doc/guix.texi @@ -6401,8 +6401,9 @@ builds to @file{/gnu/store} which, initially, is an in-memory file system. Next, you have to edit a file and provide the declaration of the operating system to be installed. To -that end, the installation system comes with two text editors: GNU nano -(@pxref{Top,,, nano, GNU nano Manual}), and GNU Zile, an Emacs clone. +that end, the installation system comes with three text editors: GNU nano +(@pxref{Top,,, nano, GNU nano Manual}), GNU Zile (an Emacs clone), and +nvi (a clone of the original BSD @command{vi} editor). We strongly recommend storing that file on the target root file system, say, as @file{/mnt/etc/config.scm}. Failing to do that, you will have lost your configuration file once you have rebooted into the newly-installed system. @@ -7796,7 +7797,6 @@ maximum address space that can be locked in memory. These settings are commonly used for real-time audio systems. @end deffn - @node Scheduled Job Execution @subsubsection Scheduled Job Execution |