merged

--- a/doc-src/antiquote_setup.ML	Tue Nov 29 14:16:06 2011 +0100
+++ b/doc-src/antiquote_setup.ML	Tue Nov 29 18:22:31 2011 +0100
@@ -205,7 +205,7 @@
   entity_antiqs (K check_tool) "isatt" "tool" #>
   entity_antiqs (K (can Thy_Info.get_theory)) "" "theory" #>
   entity_antiqs (thy_check ML_Context.intern_antiq ML_Context.defined_antiq)
-    "" Markup.ML_antiquotationN;
+    "" Isabelle_Markup.ML_antiquotationN;
 
 end;