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

nixos: Fix build of manual

Browse Source 
XML error introduced with merge commit 4e0fea3fe294d112ac6eef5adbed2357.

This was probably because of wrong conflict resolution, because the
actual change (d8e697b4fcfd929d05221ac3e67b9c04ac69df86) had the close
tag of the <para/> element, but the merge commit didn't.

Signed-off-by: aszlig <aszlig@nix.build>
This commit is contained in:
aszlig 2020-02-10 13:28:18 +01:00
parent 40c98652e2
commit 8754986076
No known key found for this signature in database
GPG Key ID: 684089CE67EBB691
1 changed files with 2 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
nixos/doc/manual/release-notes/rl-2003.xml
View File

@ -675,8 +675,9 @@ auth required pam_succeed_if.so uid >= 1000 quiet
Certificates will be regenerated anew on the next renewal date. The credentials for simp-le are Certificates will be regenerated anew on the next renewal date. The credentials for simp-le are
preserved and thus it is possible to roll back to previous versions without breaking certificate preserved and thus it is possible to roll back to previous versions without breaking certificate
generation. generation.
</para>
</listitem> </listitem>
<listitem> <listitem>
<para> <para>
It is now possible to unlock LUKS-Encrypted file systems using a FIDO2 token It is now possible to unlock LUKS-Encrypted file systems using a FIDO2 token
via <option>boot.initrd.luks.fido2Support</option>. via <option>boot.initrd.luks.fido2Support</option>.