~ chicken-core (chicken-5) e311b61770a64fde0ba4503cea5930b4d74679c0


commit e311b61770a64fde0ba4503cea5930b4d74679c0
Author:     Peter Bex <peter@more-magic.net>
AuthorDate: Tue Oct 10 12:13:01 2017 +0200
Commit:     Evan Hanson <evhan@foldling.org>
CommitDate: Wed Oct 11 18:41:34 2017 +1300

    Mention which keys win in case of conflicts with hash-table-merge[!] and alist->hash-table
    
    Fixes #1290
    
    Signed-off-by: Evan Hanson <evhan@foldling.org>

diff --git a/manual/Unit srfi-69 b/manual/Unit srfi-69
index 8eb222e8..08390368 100644
--- a/manual/Unit srfi-69	
+++ b/manual/Unit srfi-69	
@@ -37,6 +37,9 @@ to each other, even if they contain exactly the same key/value pairs.
 Returns a new {{HASH-TABLE}}. The {{HASH-TABLE}} is populated from the
 {{A-LIST}}. The keyword arguments are per {{make-hash-table}}.
 
+If a key occurs multiple times in {{A-LIST}}, the first occurrence
+will be used in the hash table.
+
 
 ==== hash-table?
 
@@ -237,7 +240,8 @@ Deletes all entries in {{HASH-TABLE}}.
 <procedure>(hash-table-merge HASH-TABLE-1 HASH-TABLE-2)</procedure>
 
 Returns a new {{HASH-TABLE}} with the union of {{HASH-TABLE-1}} and
-{{HASH-TABLE-2}}.
+{{HASH-TABLE-2}}. Keys that exist in both tables will be taken from
+{{HASH-TABLE-1}}.
 
 
 ==== hash-table-merge!
@@ -245,7 +249,8 @@ Returns a new {{HASH-TABLE}} with the union of {{HASH-TABLE-1}} and
 <procedure>(hash-table-merge! HASH-TABLE-1 HASH-TABLE-2)</procedure>
 
 Returns {{HASH-TABLE-1}} as the union of {{HASH-TABLE-1}} and
-{{HASH-TABLE-2}}.
+{{HASH-TABLE-2}}. Keys that exist in both tables will be taken from
+{{HASH-TABLE-1}}.
 
 
 ==== hash-table-map
Trap