nixos/* eliminate inner whitespace in tags that was missed earlier

nix-doc-munge won't match tags that contain newlines anywhere. most of
these have already been removed, but a few obviously made it through.

13 files changed, 20 insertions, 27 deletions

diff --git a/nixos/modules/config/krb5/default.nix b/nixos/modules/config/krb5/default.nix
index 6cc30c47b7de7..db5321f176c83 100644
--- a/nixos/modules/config/krb5/default.nix
+++ b/nixos/modules/config/krb5/default.nix
@@ -207,8 +207,8 @@ in {
         description = ''
           These lines go to the end of <literal>krb5.conf</literal> verbatim.
           <literal>krb5.conf</literal> may include any of the relations that are
-          valid for <literal>kdc.conf</literal> (see <literal>man
-          kdc.conf</literal>), but it is not a recommended practice.
+          valid for <literal>kdc.conf</literal> (see <literal>man kdc.conf</literal>),
+          but it is not a recommended practice.
         '';
       };
 
diff --git a/nixos/modules/security/pam.nix b/nixos/modules/security/pam.nix
index 9f89508bd1fe5..fefa303603ddc 100644
--- a/nixos/modules/security/pam.nix
+++ b/nixos/modules/security/pam.nix
@@ -323,8 +323,7 @@ let
         description = ''
           Attribute set describing resource limits.  Defaults to the
           value of <option>security.pam.loginLimits</option>.
-          The meaning of the values is explained in <citerefentry>
-          <refentrytitle>limits.conf</refentrytitle><manvolnum>5</manvolnum></citerefentry>.
+          The meaning of the values is explained in <citerefentry><refentrytitle>limits.conf</refentrytitle><manvolnum>5</manvolnum></citerefentry>.
         '';
       };
 
diff --git a/nixos/modules/services/matrix/dendrite.nix b/nixos/modules/services/matrix/dendrite.nix
index 7cf9fd9e75f38..ecb7c4876e13f 100644
--- a/nixos/modules/services/matrix/dendrite.nix
+++ b/nixos/modules/services/matrix/dendrite.nix
@@ -51,8 +51,7 @@ in
       example = "/var/lib/dendrite/registration_secret";
       default = null;
       description = ''
-        Environment file as defined in <citerefentry>
-        <refentrytitle>systemd.exec</refentrytitle><manvolnum>5</manvolnum></citerefentry>.
+        Environment file as defined in <citerefentry><refentrytitle>systemd.exec</refentrytitle><manvolnum>5</manvolnum></citerefentry>.
         Secrets may be passed to the service without adding them to the world-readable
         Nix store, by specifying placeholder variables as the option value in Nix and
         setting these variables accordingly in the environment file. Currently only used
diff --git a/nixos/modules/services/misc/gitolite.nix b/nixos/modules/services/misc/gitolite.nix
index b313be074db0d..7de0e4f4897ca 100644
--- a/nixos/modules/services/misc/gitolite.nix
+++ b/nixos/modules/services/misc/gitolite.nix
@@ -18,8 +18,7 @@ in
           Enable gitolite management under the
           <literal>gitolite</literal> user. After
           switching to a configuration with Gitolite enabled, you can
-          then run <literal>git clone
-          gitolite@host:gitolite-admin.git</literal> to manage it further.
+          then run <literal>git clone gitolite@host:gitolite-admin.git</literal> to manage it further.
         '';
       };
 
diff --git a/nixos/modules/services/monitoring/prometheus/default.nix b/nixos/modules/services/monitoring/prometheus/default.nix
index 3bc61fba158f3..ce7455425a638 100644
--- a/nixos/modules/services/monitoring/prometheus/default.nix
+++ b/nixos/modules/services/monitoring/prometheus/default.nix
@@ -1730,8 +1730,7 @@ in
       default = true;
       example = "syntax-only";
       description = ''
-        Check configuration with <literal>promtool
-        check</literal>. The call to <literal>promtool</literal> is
+        Check configuration with <literal>promtool check</literal>. The call to <literal>promtool</literal> is
         subject to sandboxing by Nix.
 
         If you use credentials stored in external files
diff --git a/nixos/modules/services/networking/resilio.nix b/nixos/modules/services/networking/resilio.nix
index 05798a2c83eea..eca5f5ccfe936 100644
--- a/nixos/modules/services/networking/resilio.nix
+++ b/nixos/modules/services/networking/resilio.nix
@@ -201,8 +201,8 @@ in
           ];
         description = ''
           Shared folder list. If enabled, web UI must be
-          disabled. Secrets can be generated using <literal>rslsync
-          --generate-secret</literal>. Note that this secret will be
+          disabled. Secrets can be generated using <literal>rslsync --generate-secret</literal>.
+          Note that this secret will be
           put inside the Nix store, so it is realistically not very
           secret.
 
diff --git a/nixos/modules/services/networking/yggdrasil.nix b/nixos/modules/services/networking/yggdrasil.nix
index 81ed6d1dd5662..d29ec55807bd1 100644
--- a/nixos/modules/services/networking/yggdrasil.nix
+++ b/nixos/modules/services/networking/yggdrasil.nix
@@ -51,9 +51,8 @@ in {
           are supplied, they will be combined, with values from
           <option>configFile</option> taking precedence.
 
-          You can use the command <literal>nix-shell -p yggdrasil --run
-          "yggdrasil -genconf"</literal> to generate default
-          configuration values with documentation.
+          You can use the command <literal>nix-shell -p yggdrasil --run "yggdrasil -genconf"</literal>
+          to generate default configuration values with documentation.
         '';
       };
 
diff --git a/nixos/modules/services/torrent/magnetico.nix b/nixos/modules/services/torrent/magnetico.nix
index c7255eba05654..ffc8577375b7f 100644
--- a/nixos/modules/services/torrent/magnetico.nix
+++ b/nixos/modules/services/torrent/magnetico.nix
@@ -125,8 +125,8 @@ in {
         contain non-consecutive underscores except at the end, and consists of
         small-case a-z characters and digits 0-9.  The
         <command>htpasswd</command> tool from the <literal>apacheHttpd</literal>
-        package may be used to generate the hash: <command>htpasswd
-        -bnBC 12 username password</command>
+        package may be used to generate the hash:
+        <command>htpasswd -bnBC 12 username password</command>
 
         <warning>
         <para>
diff --git a/nixos/modules/system/activation/activation-script.nix b/nixos/modules/system/activation/activation-script.nix
index 88b3ac1d18e83..3a57642a53ee5 100644
--- a/nixos/modules/system/activation/activation-script.nix
+++ b/nixos/modules/system/activation/activation-script.nix
@@ -92,8 +92,8 @@ let
               Whether this activation script supports being dry-activated.
               These activation scripts will also be executed on dry-activate
               activations with the environment variable
-              <literal>NIXOS_ACTION</literal> being set to <literal>dry-activate
-              </literal>.  it's important that these activation scripts  don't
+              <literal>NIXOS_ACTION</literal> being set to <literal>dry-activate</literal>.
+              it's important that these activation scripts  don't
               modify anything about the system when the variable is set.
             '';
           };
diff --git a/nixos/modules/system/boot/luksroot.nix b/nixos/modules/system/boot/luksroot.nix
index 78301a57bd970..899f7df51e455 100644
--- a/nixos/modules/system/boot/luksroot.nix
+++ b/nixos/modules/system/boot/luksroot.nix
@@ -539,8 +539,8 @@ in
         Useful for mounting a number of devices that use the same
         passphrase without retyping it several times.
 
-        Such setup can be useful if you use <command>cryptsetup
-        luksSuspend</command>. Different LUKS devices will still have
+        Such setup can be useful if you use <command>cryptsetup luksSuspend</command>.
+        Different LUKS devices will still have
         different master keys even when using the same passphrase.
       '';
     };
diff --git a/nixos/modules/tasks/auto-upgrade.nix b/nixos/modules/tasks/auto-upgrade.nix
index bfc5265518d26..309790eb0ed82 100644
--- a/nixos/modules/tasks/auto-upgrade.nix
+++ b/nixos/modules/tasks/auto-upgrade.nix
@@ -49,8 +49,8 @@ in {
         description = ''
           The URI of the NixOS channel to use for automatic
           upgrades. By default, this is the channel set using
-          <command>nix-channel</command> (run <literal>nix-channel
-          --list</literal> to see the current value).
+          <command>nix-channel</command> (run <literal>nix-channel --list</literal>
+          to see the current value).
         '';
       };
 
diff --git a/nixos/modules/tasks/filesystems.nix b/nixos/modules/tasks/filesystems.nix
index 318740a44f4ae..cf9429f76b4c7 100644
--- a/nixos/modules/tasks/filesystems.nix
+++ b/nixos/modules/tasks/filesystems.nix
@@ -188,8 +188,7 @@ in
 
         Instead of specifying <literal>device</literal>, you can also
         specify a volume label (<literal>label</literal>) for file
-        systems that support it, such as ext2/ext3 (see <command>mke2fs
-        -L</command>).
+        systems that support it, such as ext2/ext3 (see <command>mke2fs -L</command>).
       '';
     };
 
diff --git a/nixos/modules/virtualisation/lxc.nix b/nixos/modules/virtualisation/lxc.nix
index d7bbc3f8414c3..2ae392ef931b9 100644
--- a/nixos/modules/virtualisation/lxc.nix
+++ b/nixos/modules/virtualisation/lxc.nix
@@ -55,8 +55,7 @@ in
         description =
           ''
             This is the config file for managing unprivileged user network
-            administration access in LXC. See <citerefentry><refentrytitle>lxc-usernet</refentrytitle><manvolnum>5</manvolnum>
-            </citerefentry>.
+            administration access in LXC. See <citerefentry><refentrytitle>lxc-usernet</refentrytitle><manvolnum>5</manvolnum></citerefentry>.
           '';
       };
   };