From 5cccc82609d6e38ab027ce5d711fdb87aec4e881 Mon Sep 17 00:00:00 2001
From: Ian Lynagh <igloo@earth.li>
Date: Mon, 30 Jan 2012 18:08:53 +0000
Subject: [PATCH] MERGED: FIX #5819: add -XDataKinds to the language options
 section of the user's guide

---
 docs/users_guide/flags.xml | 9 +++++++--
 1 file changed, 7 insertions(+), 2 deletions(-)

diff --git a/docs/users_guide/flags.xml b/docs/users_guide/flags.xml
index 6ce948a6afca..cdf23f98a7de 100644
--- a/docs/users_guide/flags.xml
+++ b/docs/users_guide/flags.xml
@@ -808,10 +808,15 @@
 	      <entry>dynamic</entry>
 	      <entry><option>-XNoConstraintKinds</option></entry>
 	    </row>
+        <row>
+          <entry><option>-XDataKinds</option></entry>
+          <entry>Enable <link linkend="kind-polymorphism-and-promotion">datatype promotion</link>.</entry>
+          <entry>dynamic</entry>
+          <entry><option>-XNoDataKinds</option></entry>
+        </row>
 	    <row>
 	      <entry><option>-XPolyKinds</option></entry>
-	      <entry>Enable <link linkend="kind-polymorphism">kind polymorphism</link>.
-                     Implies <option>-XKindSignatures</option>.</entry>
+	      <entry>Enable <link linkend="kind-polymorphism-and-promotion">kind polymorphism</link>.</entry>
 	      <entry>dynamic</entry>
 	      <entry><option>-XNoPolyKinds</option></entry>
 	    </row>
-- 
GitLab