about summary refs log tree commit diff
diff options
context:
space:
mode:
authorEelco Dolstra <eelco.dolstra@logicblox.com>2013-02-08T19·02+0100
committerEelco Dolstra <eelco.dolstra@logicblox.com>2013-02-08T19·04+0100
commit79a3ba7fa3cd23b31ea43007899ed79f181d4faf (patch)
tree47ae631637b7a5229c2d48d8cd57c7c00a6c2f75
parent5f18cd2e84bb4d7405f7dbcc8b6554365556a3a1 (diff)
Document ‘hashString’
-rw-r--r--doc/manual/builtins.xml12
-rw-r--r--doc/manual/release-notes.xml14
2 files changed, 26 insertions, 0 deletions
diff --git a/doc/manual/builtins.xml b/doc/manual/builtins.xml
index 9f5f4438ce55..b75f58e21f1b 100644
--- a/doc/manual/builtins.xml
+++ b/doc/manual/builtins.xml
@@ -302,6 +302,18 @@ stdenv.mkDerivation {
   </varlistentry>
 
 
+  <varlistentry><term><function>builtins.hashString</function>
+  <replaceable>type</replaceable> <replaceable>s</replaceable></term>
+
+    <listitem><para>Return a base-16 representation of the
+    cryptographic hash of string <replaceable>s</replaceable>.  The
+    hash algorithm specified by <replaceable>type</replaceable> must
+    be one of <literal>"md5"</literal>, <literal>"sha1"</literal> or
+    <literal>"sha256"</literal>.</para></listitem>
+
+  </varlistentry>
+
+
   <varlistentry><term><function>builtins.head</function>
   <replaceable>list</replaceable></term>
 
diff --git a/doc/manual/release-notes.xml b/doc/manual/release-notes.xml
index e7e9bf3c5b43..6f81e7223ebc 100644
--- a/doc/manual/release-notes.xml
+++ b/doc/manual/release-notes.xml
@@ -8,6 +8,20 @@
 
 <!--==================================================================-->
 
+<section xml:id="ssec-relnotes-1.4"><title>Release 1.4 (TBA)</title>
+
+<itemizedlist>
+
+  <listitem><para>New built-in function:
+  <function>builtins.hashString</function>.</para></listitem>
+
+</itemizedlist>
+
+</section>
+
+
+<!--==================================================================-->
+
 <section xml:id="ssec-relnotes-1.3"><title>Release 1.3 (January 4, 2013)</title>
 
 <para>This is primarily a bug fix release.  When this version is first