X-Git-Url: http://git.megacz.com/?a=blobdiff_plain;f=docs%2Fusers_guide%2Fglasgow_exts.xml;h=9a9cd38f1d4c4ad6ffc4669afb2de890cc4bbfad;hb=70dd3e6b74d368f2df585c18d86426373e7e89e5;hp=dd410c81ba449a7959b12a00845a06b8d317590e;hpb=04e62d08f6681d1c456af9437073db0b3e7d045c;p=ghc-hetmet.git

diff --git a/docs/users_guide/glasgow_exts.xml b/docs/users_guide/glasgow_exts.xml
index dd410c8..9a9cd38 100644
--- a/docs/users_guide/glasgow_exts.xml
+++ b/docs/users_guide/glasgow_exts.xml
@@ -244,7 +244,8 @@ documentation</ulink> describes all the libraries that come with GHC.
 	<term><option>-fth</option></term>
 	<listitem>
 	  <para>Enables Template Haskell (see <xref
-	  linkend="template-haskell"/>).  Currently also implied by
+	  linkend="template-haskell"/>).  This flag must
+	  be given explicitly; it is no longer implied by
 	  <option>-fglasgow-exts</option>.</para>
 
 	  <para>Syntax stolen: <literal>[|</literal>,
@@ -3742,20 +3743,17 @@ Derived instance declarations are constructed as follows. Consider the
 declaration (after expansion of any type synonyms)
 
 <programlisting> 
-  newtype T v1...vn = T' (S t1...tk vk+1...vn) deriving (c1...cm) 
+  newtype T v1...vn = T' (t vk+1...vn) deriving (c1...cm) 
 </programlisting> 
 
 where 
  <itemizedlist>
 <listitem><para>
-  <literal>S</literal> is a type constructor, 
+  The type <literal>t</literal> is an arbitrary type
 </para></listitem>
 <listitem><para>
-  The <literal>t1...tk</literal> are types,
-</para></listitem>
-<listitem><para>
-  The <literal>vk+1...vn</literal> are type variables which do not occur in any of
-  the <literal>ti</literal>, and
+  The <literal>vk+1...vn</literal> are type variables which do not occur in 
+  <literal>t</literal>, and
 </para></listitem>
 <listitem><para>
   The <literal>ci</literal> are partial applications of
@@ -3773,7 +3771,7 @@ where
 Then, for each <literal>ci</literal>, the derived instance
 declaration is:
 <programlisting> 
-  instance ci (S t1...tk vk+1...v) => ci (T v1...vp)
+  instance ci (t vk+1...v) => ci (T v1...vp)
 </programlisting>
 where <literal>p</literal> is chosen so that <literal>T v1...vp</literal> is of the 
 right <emphasis>kind</emphasis> for the last parameter of class <literal>Ci</literal>.
@@ -4089,9 +4087,8 @@ Tim Sheard is going to expand it.)
       constructions.  You need to use the flag
       <option>-fth</option><indexterm><primary><option>-fth</option></primary>
       </indexterm>to switch these syntactic extensions on
-      (<option>-fth</option> is currently implied by
-      <option>-fglasgow-exts</option>, but you are encouraged to
-      specify it explicitly).</para>
+      (<option>-fth</option> is no longer implied by
+      <option>-fglasgow-exts</option>).</para>
 
 	<itemizedlist>
 	      <listitem><para>