summaryrefslogtreecommitdiffstats
path: root/doc/functions.xml
diff options
context:
space:
mode:
authorPaul Kinsky <pkinsky@gmail.com>2017-01-26 15:21:15 -0800
committerGraham Christensen <graham@grahamc.com>2017-02-20 22:25:32 -0500
commitb14dd0e6c38d93693dcdec1a78cc86fd56eda650 (patch)
tree16fab90896a2fe2552753816cb79ad662b8ff71a /doc/functions.xml
parent2d78767973aa98861cd87f423eb2b54ea1eb1659 (diff)
wrap added notes in <note>
Diffstat (limited to 'doc/functions.xml')
-rw-r--r--doc/functions.xml15
1 files changed, 10 insertions, 5 deletions
diff --git a/doc/functions.xml b/doc/functions.xml
index 602d419a1803..efe2590ddfb4 100644
--- a/doc/functions.xml
+++ b/doc/functions.xml
@@ -133,7 +133,7 @@
<varname>stdenv.mkDerivation</varname>, are defined using this
function, which means most packages in the nixpkgs expression,
<varname>pkgs</varname>, have this function.
- </para>
+ </para>
<para>
Example usage:
@@ -228,7 +228,7 @@
] name)</code> from the <literal>INI</literal> generator. It gets the name
of a section and returns a sanitized name. The default
<literal>mkSectionName</literal> escapes <literal>[</literal> and
- <literal>]</literal> with a backslash.
+ <literal>]</literal> with a backslash.
</para>
<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
using its <varname>buildArgs</varname> attribute.
</para>
-
-
+
+
+
+ <note>
<para>
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>.
</para>
-
+ </note>
+
+ <note>
<para>
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>.
</para>
+ </note>
</section>