Merge remote-tracking branch 'origin/master' into ghc-head

1 files changed, 54 insertions, 14 deletions

diff --git a/html-test/ref/Operators.html b/html-test/ref/Operators.html
index 6c795d85..d498a906 100644
--- a/html-test/ref/Operators.html
+++ b/html-test/ref/Operators.html
@@ -6,11 +6,11 @@
     ><link href="#" rel="stylesheet" type="text/css" title="Ocean"
      /><script src="haddock-util.js" type="text/javascript"
     ></script
-    ><script src="https://cdn.mathjax.org/mathjax/latest/MathJax.js?config=TeX-AMS-MML_HTMLorMML" type="text/javascript"
+    ><script src="https://cdnjs.cloudflare.com/ajax/libs/mathjax/2.7.0/MathJax.js?config=TeX-AMS-MML_HTMLorMML" type="text/javascript"
     ></script
     ><script type="text/javascript"
     >//
-window.onload = function () {pageLoad();setSynopsis(&quot;mini_Operators.html&quot;);};
+window.onload = function () {pageLoad();};
 //
 </script
     ></head
@@ -97,7 +97,7 @@ window.onload = function () {pageLoad();setSynopsis(&quot;mini_Operators.html&qu
 	    >(:+)</a
 	    > :: <span class="keyword"
 	    >forall</span
-	    > t. t -&gt; t -&gt; [t]</li
+	    > a. a -&gt; a -&gt; [a]</li
 	  ><li class="src short"
 	  ><span class="keyword"
 	    >data</span
@@ -271,7 +271,7 @@ window.onload = function () {pageLoad();setSynopsis(&quot;mini_Operators.html&qu
 	    >(:+)</a
 	    > :: <span class="keyword"
 	    >forall</span
-	    > t. t -&gt; t -&gt; [t] <span class="fixity"
+	    > a. a -&gt; a -&gt; [a] <span class="fixity"
 	    >infixr 3</span
 	    ><span class="rightedge"
 	    ></span
@@ -432,12 +432,18 @@ window.onload = function () {pageLoad();setSynopsis(&quot;mini_Operators.html&qu
 	    ><p class="src"
 	    ><a id="v:-62--62--60-" class="def"
 	      >(&gt;&gt;&lt;)</a
-	      >, <a id="v:-60--60--62-" class="def"
+	      > :: a -&gt; b -&gt; () <span class="fixity"
+	      >infixr 4</span
+	      ><span class="rightedge"
+	      ></span
+	      > <a href="#" class="selflink"
+	      >#</a
+	      ></p
+	    ><p class="src"
+	    ><a id="v:-60--60--62-" class="def"
 	      >(&lt;&lt;&gt;)</a
 	      > :: a -&gt; b -&gt; () <span class="fixity"
-	      >infixl 5 &lt;&lt;&gt;</span
-	      ><span class="fixity"
-	      >infixr 4 &gt;&gt;&lt;</span
+	      >infixl 5</span
 	      ><span class="rightedge"
 	      ></span
 	      > <a href="#" class="selflink"
@@ -446,16 +452,50 @@ window.onload = function () {pageLoad();setSynopsis(&quot;mini_Operators.html&qu
 	    ><p class="src"
 	    ><a id="v:-42--42--62-" class="def"
 	      >(**&gt;)</a
-	      >, <a id="v:-42--42--60-" class="def"
+	      > :: a -&gt; a -&gt; () <span class="fixity"
+	      >infixr 8</span
+	      ><span class="rightedge"
+	      ></span
+	      > <a href="#" class="selflink"
+	      >#</a
+	      ></p
+	    ><div class="doc"
+	    ><p
+	      >Multiple fixities</p
+	      ></div
+	    ><p class="src"
+	    ><a id="v:-42--42--60-" class="def"
 	      >(**&lt;)</a
-	      >, <a id="v:-62--42--42-" class="def"
+	      > :: a -&gt; a -&gt; () <span class="fixity"
+	      >infixl 8</span
+	      ><span class="rightedge"
+	      ></span
+	      > <a href="#" class="selflink"
+	      >#</a
+	      ></p
+	    ><div class="doc"
+	    ><p
+	      >Multiple fixities</p
+	      ></div
+	    ><p class="src"
+	    ><a id="v:-62--42--42-" class="def"
 	      >(&gt;**)</a
-	      >, <a id="v:-60--42--42-" class="def"
+	      > :: a -&gt; a -&gt; () <span class="fixity"
+	      >infixr 8</span
+	      ><span class="rightedge"
+	      ></span
+	      > <a href="#" class="selflink"
+	      >#</a
+	      ></p
+	    ><div class="doc"
+	    ><p
+	      >Multiple fixities</p
+	      ></div
+	    ><p class="src"
+	    ><a id="v:-60--42--42-" class="def"
 	      >(&lt;**)</a
 	      > :: a -&gt; a -&gt; () <span class="fixity"
-	      >infixr 8 **&gt;, &gt;**</span
-	      ><span class="fixity"
-	      >infixl 8 **&lt;, &lt;**</span
+	      >infixl 8</span
 	      ><span class="rightedge"
 	      ></span
 	      > <a href="#" class="selflink"