Skip to content

Commit

Permalink
nixos: Fix build of manual
Browse files Browse the repository at this point in the history
XML error introduced with merge commit 4e0fea3.

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

Signed-off-by: aszlig <[email protected]>
  • Loading branch information
aszlig committed Feb 10, 2020
1 parent 40c9865 commit 8754986
Showing 1 changed file with 2 additions and 1 deletion.
3 changes: 2 additions & 1 deletion nixos/doc/manual/release-notes/rl-2003.xml
Original file line number Diff line number Diff line change
Expand Up @@ -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
preserved and thus it is possible to roll back to previous versions without breaking certificate
generation.
</para>
</listitem>
<listitem>
<listitem>
<para>
It is now possible to unlock LUKS-Encrypted file systems using a FIDO2 token
via <option>boot.initrd.luks.fido2Support</option>.
Expand Down

0 comments on commit 8754986

Please sign in to comment.