colin/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #73808 from mayflower/installation-docs-wording

Browse Source 
nixos/manual: reword installation section
This commit is contained in:
Linus Heckemann 2019-11-20 10:36:09 +01:00 committed by GitHub
commit 1c1a45218b
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
nixos/doc/manual/installation/installing.xml
View File

@ -392,11 +392,11 @@
<filename>hardware-configuration.nix</filename> is included from <filename>hardware-configuration.nix</filename> is included from
<filename>configuration.nix</filename> and will be overwritten by future <filename>configuration.nix</filename> and will be overwritten by future
invocations of <command>nixos-generate-config</command>; thus, you invocations of <command>nixos-generate-config</command>; thus, you
generally should not modify it.) Additionally, you may want to look at generally should not modify it.) Additionally, you may want to look at
<link xlink:href="https://github.com/NixOS/nixos-hardware">Hardware <link xlink:href="https://github.com/NixOS/nixos-hardware">Hardware
configuration for known-hardware</link> at this point or after configuration for known-hardware</link> at this point or after
installation. installation.
</para> </para>
<note> <note>
<para> <para>
@ -418,11 +418,11 @@
Do the installation: Do the installation:
<screen> <screen>
<prompt># </prompt>nixos-install</screen> <prompt># </prompt>nixos-install</screen>
Cross fingers. If this fails due to a temporary problem (such as a network This will install your system based on the configuration you provided.
issue while downloading binaries from the NixOS binary cache), you can If anything fails due to a configuration problem or any other issue
just re-run <command>nixos-install</command>. Otherwise, fix your (such as a network outage while downloading binaries from the NixOS
<filename>configuration.nix</filename> and then re-run binary cache), you can re-run <command>nixos-install</command> after
<command>nixos-install</command>. fixing your <filename>configuration.nix</filename>.
</para> </para>
<para> <para>
As the last step, <command>nixos-install</command> will ask you to set the As the last step, <command>nixos-install</command> will ask you to set the