0
0
Fork 0
mirror of https://github.com/NixOS/nixpkgs.git synced 2025-07-12 05:16:25 +03:00

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.
This commit is contained in:
pennae 2022-08-13 11:35:46 +02:00 committed by pennae
parent 8f8e101527
commit e4ed177f82
13 changed files with 20 additions and 27 deletions

View file

@ -207,8 +207,8 @@ in {
description = '' description = ''
These lines go to the end of <literal>krb5.conf</literal> verbatim. These lines go to the end of <literal>krb5.conf</literal> verbatim.
<literal>krb5.conf</literal> may include any of the relations that are <literal>krb5.conf</literal> may include any of the relations that are
valid for <literal>kdc.conf</literal> (see <literal>man valid for <literal>kdc.conf</literal> (see <literal>man kdc.conf</literal>),
kdc.conf</literal>), but it is not a recommended practice. but it is not a recommended practice.
''; '';
}; };

View file

@ -323,8 +323,7 @@ let
description = '' description = ''
Attribute set describing resource limits. Defaults to the Attribute set describing resource limits. Defaults to the
value of <option>security.pam.loginLimits</option>. value of <option>security.pam.loginLimits</option>.
The meaning of the values is explained in <citerefentry> The meaning of the values is explained in <citerefentry><refentrytitle>limits.conf</refentrytitle><manvolnum>5</manvolnum></citerefentry>.
<refentrytitle>limits.conf</refentrytitle><manvolnum>5</manvolnum></citerefentry>.
''; '';
}; };

View file

@ -51,8 +51,7 @@ in
example = "/var/lib/dendrite/registration_secret"; example = "/var/lib/dendrite/registration_secret";
default = null; default = null;
description = '' description = ''
Environment file as defined in <citerefentry> Environment file as defined in <citerefentry><refentrytitle>systemd.exec</refentrytitle><manvolnum>5</manvolnum></citerefentry>.
<refentrytitle>systemd.exec</refentrytitle><manvolnum>5</manvolnum></citerefentry>.
Secrets may be passed to the service without adding them to the world-readable 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 Nix store, by specifying placeholder variables as the option value in Nix and
setting these variables accordingly in the environment file. Currently only used setting these variables accordingly in the environment file. Currently only used

View file

@ -18,8 +18,7 @@ in
Enable gitolite management under the Enable gitolite management under the
<literal>gitolite</literal> user. After <literal>gitolite</literal> user. After
switching to a configuration with Gitolite enabled, you can switching to a configuration with Gitolite enabled, you can
then run <literal>git clone then run <literal>git clone gitolite@host:gitolite-admin.git</literal> to manage it further.
gitolite@host:gitolite-admin.git</literal> to manage it further.
''; '';
}; };

View file

@ -1730,8 +1730,7 @@ in
default = true; default = true;
example = "syntax-only"; example = "syntax-only";
description = '' description = ''
Check configuration with <literal>promtool Check configuration with <literal>promtool check</literal>. The call to <literal>promtool</literal> is
check</literal>. The call to <literal>promtool</literal> is
subject to sandboxing by Nix. subject to sandboxing by Nix.
If you use credentials stored in external files If you use credentials stored in external files

View file

@ -201,8 +201,8 @@ in
]; ];
description = '' description = ''
Shared folder list. If enabled, web UI must be Shared folder list. If enabled, web UI must be
disabled. Secrets can be generated using <literal>rslsync disabled. Secrets can be generated using <literal>rslsync --generate-secret</literal>.
--generate-secret</literal>. Note that this secret will be Note that this secret will be
put inside the Nix store, so it is realistically not very put inside the Nix store, so it is realistically not very
secret. secret.

View file

@ -51,9 +51,8 @@ in {
are supplied, they will be combined, with values from are supplied, they will be combined, with values from
<option>configFile</option> taking precedence. <option>configFile</option> taking precedence.
You can use the command <literal>nix-shell -p yggdrasil --run You can use the command <literal>nix-shell -p yggdrasil --run "yggdrasil -genconf"</literal>
"yggdrasil -genconf"</literal> to generate default to generate default configuration values with documentation.
configuration values with documentation.
''; '';
}; };

View file

@ -125,8 +125,8 @@ in {
contain non-consecutive underscores except at the end, and consists of contain non-consecutive underscores except at the end, and consists of
small-case a-z characters and digits 0-9. The small-case a-z characters and digits 0-9. The
<command>htpasswd</command> tool from the <literal>apacheHttpd</literal> <command>htpasswd</command> tool from the <literal>apacheHttpd</literal>
package may be used to generate the hash: <command>htpasswd package may be used to generate the hash:
-bnBC 12 username password</command> <command>htpasswd -bnBC 12 username password</command>
<warning> <warning>
<para> <para>

View file

@ -92,8 +92,8 @@ let
Whether this activation script supports being dry-activated. Whether this activation script supports being dry-activated.
These activation scripts will also be executed on dry-activate These activation scripts will also be executed on dry-activate
activations with the environment variable activations with the environment variable
<literal>NIXOS_ACTION</literal> being set to <literal>dry-activate <literal>NIXOS_ACTION</literal> being set to <literal>dry-activate</literal>.
</literal>. it's important that these activation scripts don't it's important that these activation scripts don't
modify anything about the system when the variable is set. modify anything about the system when the variable is set.
''; '';
}; };

View file

@ -539,8 +539,8 @@ in
Useful for mounting a number of devices that use the same Useful for mounting a number of devices that use the same
passphrase without retyping it several times. passphrase without retyping it several times.
Such setup can be useful if you use <command>cryptsetup Such setup can be useful if you use <command>cryptsetup luksSuspend</command>.
luksSuspend</command>. Different LUKS devices will still have Different LUKS devices will still have
different master keys even when using the same passphrase. different master keys even when using the same passphrase.
''; '';
}; };

View file

@ -49,8 +49,8 @@ in {
description = '' description = ''
The URI of the NixOS channel to use for automatic The URI of the NixOS channel to use for automatic
upgrades. By default, this is the channel set using upgrades. By default, this is the channel set using
<command>nix-channel</command> (run <literal>nix-channel <command>nix-channel</command> (run <literal>nix-channel --list</literal>
--list</literal> to see the current value). to see the current value).
''; '';
}; };

View file

@ -188,8 +188,7 @@ in
Instead of specifying <literal>device</literal>, you can also Instead of specifying <literal>device</literal>, you can also
specify a volume label (<literal>label</literal>) for file specify a volume label (<literal>label</literal>) for file
systems that support it, such as ext2/ext3 (see <command>mke2fs systems that support it, such as ext2/ext3 (see <command>mke2fs -L</command>).
-L</command>).
''; '';
}; };

View file

@ -55,8 +55,7 @@ in
description = description =
'' ''
This is the config file for managing unprivileged user network This is the config file for managing unprivileged user network
administration access in LXC. See <citerefentry><refentrytitle>lxc-usernet</refentrytitle><manvolnum>5</manvolnum> administration access in LXC. See <citerefentry><refentrytitle>lxc-usernet</refentrytitle><manvolnum>5</manvolnum></citerefentry>.
</citerefentry>.
''; '';
}; };
}; };