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

Merge pull request #30787 from lheckemann/nixos-help-doc

Browse Source 
Document nixos-help more obviously
This commit is contained in:
Joachim F
2017-10-28 10:41:59 +00:00
committed by GitHub
parent b5503b115e b2c5075e8a
commit 9ab20a4a04
2 changed files with 5 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
nixos/doc/manual/installation/installing.xml
+2 -1
View File
@@ -16,7 +16,8 @@
hardware.</para></listitem> hardware.</para></listitem>
<listitem><para>The NixOS manual is available on virtual console 8 <listitem><para>The NixOS manual is available on virtual console 8
(press Alt+F8 to access).</para></listitem> (press Alt+F8 to access) or by running <command>nixos-help</command>.
</para></listitem>
<listitem><para>You get logged in as <literal>root</literal> <listitem><para>You get logged in as <literal>root</literal>
(with empty password).</para></listitem> (with empty password).</para></listitem>
nixos/modules/services/misc/nixos-manual.nix
+3 -2
View File
@@ -135,8 +135,9 @@ in
}; };
}; };
services.mingetty.helpLine = mkIf cfg.showManual services.mingetty.helpLine = "\nRun `nixos-help` "
"\nPress <Alt-F${toString cfg.ttyNumber}> for the NixOS manual."; + lib.optionalString cfg.showManual "or press <Alt-F${toString cfg.ttyNumber}> "
+ "for the NixOS manual.";
}; };