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

wrap added notes in <note>

This commit is contained in:
Paul Kinsky 2017-01-26 15:21:15 -08:00 committed by Graham Christensen
parent 2d78767973
commit b14dd0e6c3
No known key found for this signature in database
GPG Key ID: 06121D366FE9435C
1 changed files with 10 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
doc/functions.xml
View File

@ -133,7 +133,7 @@
<varname>stdenv.mkDerivation</varname>, are defined using this <varname>stdenv.mkDerivation</varname>, are defined using this
function, which means most packages in the nixpkgs expression, function, which means most packages in the nixpkgs expression,
<varname>pkgs</varname>, have this function. <varname>pkgs</varname>, have this function.
</para> </para>
<para> <para>
Example usage: Example usage:
@ -228,7 +228,7 @@
] name)</code> from the <literal>INI</literal> generator. It gets the name ] name)</code> from the <literal>INI</literal> generator. It gets the name
of a section and returns a sanitized name. The default of a section and returns a sanitized name. The default
<literal>mkSectionName</literal> escapes <literal>[</literal> and <literal>mkSectionName</literal> escapes <literal>[</literal> and
<literal>]</literal> with a backslash. <literal>]</literal> with a backslash.
</para> </para>
<note><para>Nix store paths can be converted to strings by enclosing a <note><para>Nix store paths can be converted to strings by enclosing a
@ -523,17 +523,22 @@
It is possible to inspect the arguments with which an image was built It is possible to inspect the arguments with which an image was built
using its <varname>buildArgs</varname> attribute. using its <varname>buildArgs</varname> attribute.
</para> </para>
<note>
<para> <para>
If you see errors similar to <literal>getProtocolByName: does not exist (no such protocol name: tcp)</literal> If you see errors similar to <literal>getProtocolByName: does not exist (no such protocol name: tcp)</literal>
you may need to add <literal>pkgs.iana_etc</literal> to <varname>contents</varname>. you may need to add <literal>pkgs.iana_etc</literal> to <varname>contents</varname>.
</para> </para>
</note>
<note>
<para> <para>
If you see errors similar to <literal>Error_Protocol ("certificate has unknown CA",True,UnknownCa)</literal> If you see errors similar to <literal>Error_Protocol ("certificate has unknown CA",True,UnknownCa)</literal>
you may need to add <literal>pkgs.cacert</literal> to <varname>contents</varname>. you may need to add <literal>pkgs.cacert</literal> to <varname>contents</varname>.
</para> </para>
</note>
</section> </section>