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

html-test/ref/Bug923.html

@@ -74,7 +74,7 @@
 		  >forall</span
 		  > a1. a1 -&gt; <a href="#" title="Bug923"
 		  >T</a
-		  > ('<a href="#" title="GHC.Tuple.Prim"
+		  > ('<a href="#" title="GHC.Tuple"
 		  >(,)</a
 		  > a1 :: <a href="#" title="Data.Kind"
 		  >Type</a
@@ -124,7 +124,7 @@
 		  >forall</span
 		  > a1. a1 -&gt; <a href="#" title="Bug923"
 		  >T</a
-		  > ('<a href="#" title="GHC.Tuple.Prim"
+		  > ('<a href="#" title="GHC.Tuple"
 		  >(,)</a
 		  > a1 :: <a href="#" title="Data.Kind"
 		  >Type</a
@@ -156,7 +156,7 @@
 		      >Eq</a
 		      > (<a href="#" title="Bug923"
 		      >T</a
-		      > ('<a href="#" title="GHC.Tuple.Prim"
+		      > ('<a href="#" title="GHC.Tuple"
 		      >(,)</a
 		      > a :: <a href="#" title="Data.Kind"
 		      >Type</a
@@ -190,7 +190,7 @@
 			  >(==)</a
 			  > :: <a href="#" title="Bug923"
 			  >T</a
-			  > ('<a href="#" title="GHC.Tuple.Prim"
+			  > ('<a href="#" title="GHC.Tuple"
 			  >(,)</a
 			  > a :: <a href="#" title="Data.Kind"
 			  >Type</a
@@ -200,7 +200,7 @@
 			  >Type</a
 			  >)) -&gt; <a href="#" title="Bug923"
 			  >T</a
-			  > ('<a href="#" title="GHC.Tuple.Prim"
+			  > ('<a href="#" title="GHC.Tuple"
 			  >(,)</a
 			  > a :: <a href="#" title="Data.Kind"
 			  >Type</a
@@ -218,7 +218,7 @@
 			  >(/=)</a
 			  > :: <a href="#" title="Bug923"
 			  >T</a
-			  > ('<a href="#" title="GHC.Tuple.Prim"
+			  > ('<a href="#" title="GHC.Tuple"
 			  >(,)</a
 			  > a :: <a href="#" title="Data.Kind"
 			  >Type</a
@@ -228,7 +228,7 @@
 			  >Type</a
 			  >)) -&gt; <a href="#" title="Bug923"
 			  >T</a
-			  > ('<a href="#" title="GHC.Tuple.Prim"
+			  > ('<a href="#" title="GHC.Tuple"
 			  >(,)</a
 			  > a :: <a href="#" title="Data.Kind"
 			  >Type</a

html-test/ref/Instances.html

@@ -444,7 +444,7 @@
 		      >Foo</a
 		      > f) =&gt; <a href="#" title="Instances"
 		      >Foo</a
-		      > (<a href="#" title="GHC.Tuple.Prim"
+		      > (<a href="#" title="GHC.Tuple"
 		      >(,)</a
 		      > (f a))</span
 		    > <a href="#" class="selflink"
@@ -556,7 +556,7 @@
 		      ></span
 		      > <a href="#" title="Instances"
 		      >Foo</a
-		      > (<a href="#" title="GHC.Tuple.Prim"
+		      > (<a href="#" title="GHC.Tuple"
 		      >(,,)</a
 		      > a a)</span
 		    > <a href="#" class="selflink"
@@ -1162,11 +1162,11 @@
 		      ></span
 		      > <a href="#" title="Instances"
 		      >Foo</a
-		      > (<a href="#" title="GHC.Tuple.Prim"
+		      > (<a href="#" title="GHC.Tuple"
 		      >(,,)</a
 		      > a b) =&gt; <a href="#" title="Instances"
 		      >Bar</a
-		      > (<a href="#" title="GHC.Tuple.Prim"
+		      > (<a href="#" title="GHC.Tuple"
 		      >(,,)</a
 		      > a b) (a, b, a)</span
 		    > <a href="#" class="selflink"