From 41e6c664d8b751b81effd2341cf1bd5950c40d8c Mon Sep 17 00:00:00 2001
From: Andrew Kelley <superjoe30@gmail.com>
Date: Wed, 13 Jun 2018 11:09:41 -0400
Subject: [PATCH] langref: add merge error sets operator to operator table

---
 doc/langref.html.in | 18 +++++++++++++++++-
 1 file changed, 17 insertions(+), 1 deletion(-)

diff --git a/doc/langref.html.in b/doc/langref.html.in
index 290ed77e7d..1fccd6e351 100644
--- a/doc/langref.html.in
+++ b/doc/langref.html.in
@@ -1261,6 +1261,22 @@ const ptr = &amp;x;
 x.* == 1234</code></pre>
           </td>
         </tr>
+        <tr>
+          <td><pre><code class="zig">a || b<code></pre></td>
+          <td>
+            <ul>
+              <li>{#link|Error Set Type#}</li>
+            </ul>
+          </td>
+          <td>
+              {#link|Merging Error Sets#}
+          </td>
+          <td>
+            <pre><code class="zig">const A = error{One};
+const B = error{Two};
+(A || B) == error{One, Two}</code></pre>
+          </td>
+        </tr>
       </table>
       </div>
       {#header_close#}
@@ -1269,7 +1285,7 @@ x.* == 1234</code></pre>
 a!b
 !x -x -%x ~x &amp;x ?x
 x{} x.* x.?
-! * / % ** *%
+! * / % ** *% ||
 + - ++ +% -%
 &lt;&lt; &gt;&gt;
 &amp;