Merge pull request #178961 from K900/fix-manual-mismerge

nixos/doc: regenerate
This commit is contained in:
Lassulus
2022-06-25 11:01:17 +02:00
committed by GitHub
@@ -190,6 +190,7 @@
</para>
</listitem>
<listitem>
<para>
<literal>i18n.supportedLocales</literal> is now by default
only generated with the default locale set in
<literal>i18n.defaultLocale</literal>. This got copied over
@@ -199,7 +200,6 @@
</para>
</listitem>
<listitem>
<para>
<para>
The <literal>isPowerPC</literal> predicate, found on
<literal>platform</literal> attrsets