merge

1 files changed, 8 insertions, 3 deletions

diff --git a/srfi-225.html b/srfi-225.html
index 9d5736f..3ff98c6 100644
--- a/srfi-225.html
+++ b/srfi-225.html
@@ -19,6 +19,7 @@
   <li>60-day deadline: 2021-09-16</li>
   <li>Draft #1 published: 2021-07-18</li>
   <li>Draft #2 published: 2021-07-26</li>
+  <li>Draft #3 published: 2021-08-07</li>
   <li>John Cowan's <a href="https://github.com/pre-srfi/dictionaries">personal
     Git repo for this SRFI</a> for reference while the SRFI is in
     <em>draft</em> status (<a href="https://htmlpreview.github.io/?https://github.com/johnwcowan/srfi-225/blob/master/srfi-225.html">preview</a>)</li>
@@ -130,7 +131,11 @@ Otherwise, returns two values, a dictionary that contains all the associations o
 <code>(dict-update!</code>&nbsp;<em>dtd dictionary key updater</em> [<em>failure</em> [<em>success</em>] ]<code>)</code></p>
 <p>Retrieves the value of <em>key</em> as if by <code>dict-ref</code>, invokes <em>updater</em> on it, and sets the value of <em>key</em> to be the result of calling <em>updater</em> as if by <code>dict-set</code>, but may do so more efficiently. Returns the updated dictionary. The default value of <em>failure</em> signals an error; the default value of <em>success</em> is the identity procedure.</p>
 <code>(dict-update/default</code>&nbsp;<em>dtd dictionary key updater default</em><code>)</code><br>
+<<<<<<< HEAD
 <code>(dict-update/default!</code>&nbsp;<em>dtd dictionary key updater default</em><code>)</code></p>
+=======
+<code>(dict-update/default!</code>&nbsp;<em>dtd dictionary key updater default</em><code>)</code>
+>>>>>>> ffd17d798ba88943d709a266e7478507f96349ab
 <p>Retrieves the value of <em>key</em> as if by <code>dict-ref/default</code>, invokes <em>updater</em> on it, and sets the value of <em>key</em> to be the result of calling <em>updater</em> as if by <code>dict-set</code>, but may do so more efficiently. Returns the updated dictionary.</p>
 <p><code>(dict-pop</code>&nbsp;<em>dtd dictionary</em><code>)</code><br>
 <code>(dict-pop!</code>&nbsp;<em>dtd dictionary</em><code>)</code></p>
@@ -315,7 +320,7 @@ except that the alternating <em>procindexes</em> and <em>procs</em>
 are used to replace the corresponding entries in <em>dtd</em>.
 Caution should be used when replacing any procedure
 other than the six listed in the definition of <code>make-dtd</code>.</p>
-<p>A common use of this is to replace the 
+<p>A common use of this is to replace the
 implementation of <code>make-dictionary</code> with one that provides specific
 arguments to the underlying dictionary-type-specific constructor.
 (<code>make-hash-table</code>, e.g.)</p>
@@ -324,7 +329,7 @@ arguments to the underlying dictionary-type-specific constructor.
   make-dictionary-index
     (lambda (dtd comparator)
       (make-hash-table comparator 'weak-keys))) =&gt;
-  a DTD for weak hash tables</code></blockquote>
+  a DTD for weak hash tables</pre></blockquote>
 <p><code>(make-alist-dtd</code>&nbsp;<em>equal</em><code>)</code></p>
 <p>Returns a DTD for manipulating an alist using the equality predicate <em>equal</em>.</p>
 <blockquote><code>(make-alist-dtd =) =&gt; a DTD for alists using numeric equality</code></blockquote>
@@ -426,7 +431,7 @@ new dictionary types that may not have complete dictionary APIs:</p>
 <li><code>dict-entries</code> depends on <code>dict-fold</code></li>
 <li><code>dict-fold</code> depends on <code>dict-for-each</code></li>
 <li><code>dict-map->list</code> depends on <code>dict-fold</code></li>
-<li><code>dict->alist</code> depends on <code>dict-map->list</code></li>
+<li><code>dict->alist</code> depends on <code>dict-map->list</code></li></ul>
 
 <p>For example, the first dependency means that if a DTD
 being created has something corresponding to <code>dict-ref</code> it need not