merge

TODO

@@ -13,6 +13,7 @@ haddock review
 spell check
 update changelog
 update website text
+regenerate the examples on the index.txt
 
 = Later general tasks:
 
@@ -30,6 +31,8 @@ testing
 
 review tests to copy from hssqlppp
 
+add lots more tests using SQL from the xb2 manual
+
 much more table reference tests, for joins and aliases etc.?
 
 review internal sql collection for more syntax/tests
@@ -166,3 +169,9 @@ db2?
 maybe later: other dml
   insert, update, delete, truncate, merge + set, show?
   copy, execute?, explain?, begin/end/rollback?
+
+big feature summary:
+1. dialects
+2. position annotation
+3. dml
+4. quasiquotes