From 0ddc8a303bec3df0e0a6c8f4e47d49134dedd72a Mon Sep 17 00:00:00 2001
From: Linus Heckemann <git@sphalerite.org>
Date: Wed, 25 Oct 2017 10:08:37 +0100
Subject: [PATCH 1/2] nixos manual: suggest nixos-help as well

Part of improving #30760: users on a serial console can't switch ttys,
so providing another method to access the manual is useful.
---
 nixos/doc/manual/installation/installing.xml | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/nixos/doc/manual/installation/installing.xml b/nixos/doc/manual/installation/installing.xml
index 8c37643c08f..94d8e9d2e1a 100644
--- a/nixos/doc/manual/installation/installing.xml
+++ b/nixos/doc/manual/installation/installing.xml
@@ -16,7 +16,8 @@
   hardware.</para></listitem>
 
   <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>
   (with empty password).</para></listitem>

From b2c5075e8ad442a8a2b42979ea9351e35dc647fe Mon Sep 17 00:00:00 2001
From: Linus Heckemann <git@sphalerite.org>
Date: Wed, 25 Oct 2017 10:13:33 +0100
Subject: [PATCH 2/2] nixos-manual service: show nixos-help option

Part of improving accessibility (#30760). Makes the manual easier to
access e.g. on serial consoles.
---
 nixos/modules/services/misc/nixos-manual.nix | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/nixos/modules/services/misc/nixos-manual.nix b/nixos/modules/services/misc/nixos-manual.nix
index 515864ec2e2..41cadb4a6de 100644
--- a/nixos/modules/services/misc/nixos-manual.nix
+++ b/nixos/modules/services/misc/nixos-manual.nix
@@ -135,8 +135,9 @@ in
         };
       };
 
-    services.mingetty.helpLine = mkIf cfg.showManual
-      "\nPress <Alt-F${toString cfg.ttyNumber}> for the NixOS manual.";
+      services.mingetty.helpLine = "\nRun `nixos-help` "
+        + lib.optionalString cfg.showManual "or press <Alt-F${toString cfg.ttyNumber}> "
+        + "for the NixOS manual.";
 
   };