merge changes from 4.00 branching to 4.00.0 (part 1)

git-svn-id: http://caml.inria.fr/svn/ocaml/trunk@12784 f963ae5c-01c2-4b8c-9fe0-0dff7051ff02

1 files changed, 13 insertions, 2 deletions

diff --git a/ocamldoc/odoc_gen.ml b/ocamldoc/odoc_gen.ml
index b77b186d4..b1909e786 100644
--- a/ocamldoc/odoc_gen.ml
+++ b/ocamldoc/odoc_gen.ml
@@ -18,13 +18,24 @@ module type Base = sig
     class generator : doc_generator
   end;;
 
+module Base_generator : Base = struct
+  class generator : doc_generator = object method generate l = () end
+  end;;
+
+module type Base_functor = functor (G: Base) -> Base
+module type Html_functor = functor (G: Odoc_html.Html_generator) -> Odoc_html.Html_generator
+module type Latex_functor = functor (G: Odoc_latex.Latex_generator) -> Odoc_latex.Latex_generator
+module type Texi_functor = functor (G: Odoc_texi.Texi_generator) -> Odoc_texi.Texi_generator
+module type Man_functor = functor (G: Odoc_man.Man_generator) -> Odoc_man.Man_generator
+module type Dot_functor = functor (G: Odoc_dot.Dot_generator) -> Odoc_dot.Dot_generator
+
 type generator =
   | Html of (module Odoc_html.Html_generator)
   | Latex of (module Odoc_latex.Latex_generator)
   | Texi of (module Odoc_texi.Texi_generator)
   | Man of (module Odoc_man.Man_generator)
   | Dot of (module Odoc_dot.Dot_generator)
-  | Other of (module Base)
+  | Base of (module Base)
 ;;
 
 let get_minimal_generator = function
@@ -43,7 +54,7 @@ let get_minimal_generator = function
 | Dot m ->
     let module M = (val m : Odoc_dot.Dot_generator) in
     (new M.dot :> doc_generator)
-| Other m ->
+| Base m ->
     let module M = (val m : Base) in
     new M.generator
     ;;