diff --git a/src/document/comment.ml b/src/document/comment.ml
index be0ff78d28..f8c42f82dc 100644
--- a/src/document/comment.ml
+++ b/src/document/comment.ml
@@ -234,16 +234,19 @@ let module_references ms =
 
 let rec nestable_block_element : Comment.nestable_block_element -> Block.one =
  fun content ->
+  let label { Odoc_model.Paths.Identifier.iv = `Label (_, label); _ } =
+    Odoc_model.Names.LabelName.to_string label
+  in
   match content with
-  | `Paragraph p -> paragraph p
-  | `Code_block (lang_tag, code) ->
+  | `Paragraph (lbl, p) -> paragraph ~label:(label lbl) p
+  | `Code_block (lbl, lang_tag, code) ->
       let lang_tag =
         match lang_tag with None -> default_lang_tag | Some t -> t
       in
-      block
+      block ~label:(label lbl)
       @@ Source (lang_tag, source_of_code (Odoc_model.Location_.value code))
-  | `Math_block s -> block @@ Math s
-  | `Verbatim s -> block @@ Verbatim s
+  | `Math_block (lbl, s) -> block ~label:(label lbl) @@ Math s
+  | `Verbatim (lbl, s) -> block ~label:(label lbl) @@ Verbatim s
   | `Modules ms -> module_references ms
   | `List (kind, items) ->
       let kind =
@@ -252,17 +255,20 @@ let rec nestable_block_element : Comment.nestable_block_element -> Block.one =
         | `Ordered -> Block.Ordered
       in
       let f = function
-        | [ { Odoc_model.Location_.value = `Paragraph content; _ } ] ->
-            [ block @@ Block.Inline (inline_element_list content) ]
+        | [ { Odoc_model.Location_.value = `Paragraph (lbl, content); _ } ] ->
+            [
+              block ~label:(label lbl)
+              @@ Block.Inline (inline_element_list content);
+            ]
         | item -> nestable_block_element_list item
       in
       let items = List.map f items in
       block @@ Block.List (kind, items)
 
-and paragraph : Comment.paragraph -> Block.one = function
+and paragraph ?label : Comment.paragraph -> Block.one = function
   | [ { value = `Raw_markup (target, s); _ } ] ->
-      block @@ Block.Raw_markup (target, s)
-  | p -> block @@ Block.Paragraph (inline_element_list p)
+      block ?label @@ Block.Raw_markup (target, s)
+  | p -> block ?label @@ Block.Paragraph (inline_element_list p)
 
 and nestable_block_element_list elements =
   elements
diff --git a/src/document/generator.ml b/src/document/generator.ml
index 21a29a964d..eff7742b20 100644
--- a/src/document/generator.ml
+++ b/src/document/generator.ml
@@ -1805,7 +1805,7 @@ module Make (Syntax : SYNTAX) = struct
       in
       let page_of_dir (dir : SourceDir.t) (dir_children, file_children) =
         let url = Url.Path.source_dir_from_identifier dir in
-        let block ?(attr = []) desc = Block.{ attr; desc } in
+        let block ?(attr = []) desc = Block.{ attr; desc; label = None } in
         let inline ?(attr = []) desc = Inline.[ { attr; desc } ] in
         let header =
           let title = inline (Text (SourceDir.name dir)) in
@@ -1837,7 +1837,9 @@ module Make (Syntax : SYNTAX) = struct
           (name, url)
         in
         let items =
-          let text ?(attr = []) desc = Item.Text [ { attr; desc } ] in
+          let text ?(attr = []) desc =
+            Item.Text [ { attr; desc; label = None } ]
+          in
           let list l = Block.List (Block.Unordered, l) in
           let list_of_children =
             let dir_list =
diff --git a/src/document/types.ml b/src/document/types.ml
index 0ae2588098..ce5615cfe4 100644
--- a/src/document/types.ml
+++ b/src/document/types.ml
@@ -78,7 +78,7 @@ and Block : sig
 
   type t = one list
 
-  and one = { attr : Class.t; desc : desc }
+  and one = { attr : Class.t; desc : desc; label : string option }
 
   and desc =
     | Inline of Inline.t
@@ -187,4 +187,4 @@ end
 
 let inline ?(attr = []) desc = Inline.{ attr; desc }
 
-let block ?(attr = []) desc = Block.{ attr; desc }
+let block ?(attr = []) ?label desc = Block.{ attr; desc; label }
diff --git a/src/html/generator.ml b/src/html/generator.ml
index 9e89a071c4..8c02d27597 100644
--- a/src/html/generator.ml
+++ b/src/html/generator.ml
@@ -181,7 +181,10 @@ let rec block ~config ~resolve (l : Block.t) : flow Html.elt list =
   let as_flow x = (x : phrasing Html.elt list :> flow Html.elt list) in
   let one (t : Block.one) =
     let mk_block ?(extra_class = []) mk content =
-      let a = Some (class_ (extra_class @ t.attr)) in
+      let id =
+        match t.label with None -> [] | Some label -> [ Html.a_id label ]
+      in
+      let a = Some (id @ class_ (extra_class @ t.attr)) in
       [ mk ?a content ]
     in
     match t.desc with
diff --git a/src/model/comment.ml b/src/model/comment.ml
index a95eff2123..595a8a7bdf 100644
--- a/src/model/comment.ml
+++ b/src/model/comment.ml
@@ -42,10 +42,10 @@ type module_reference = {
     resolved during linking. *)
 
 type nestable_block_element =
-  [ `Paragraph of paragraph
-  | `Code_block of string option * string with_location
-  | `Math_block of string
-  | `Verbatim of string
+  [ `Paragraph of Identifier.Label.t * paragraph
+  | `Code_block of Identifier.Label.t * string option * string with_location
+  | `Math_block of Identifier.Label.t * string
+  | `Verbatim of Identifier.Label.t * string
   | `Modules of module_reference list
   | `List of
     [ `Unordered | `Ordered ] * nestable_block_element with_location list list
@@ -86,8 +86,7 @@ type heading_attrs = {
 
 type block_element =
   [ nestable_block_element
-  | `Heading of
-    heading_attrs * Identifier.Label.t * inline_element with_location list
+  | `Heading of heading_attrs * Identifier.Label.t * paragraph
   | `Tag of tag ]
 
 type docs = block_element with_location list
@@ -97,7 +96,7 @@ type docs_or_stop = [ `Docs of docs | `Stop ]
 (** The synopsis is the first element of a comment if it is a paragraph.
     Otherwise, there is no synopsis. *)
 let synopsis = function
-  | { Location_.value = `Paragraph p; _ } :: _ -> Some p
+  | { Location_.value = `Paragraph (_, p); _ } :: _ -> Some p
   | _ -> None
 
 let rec link_content_of_inline_element :
diff --git a/src/model/predefined.ml b/src/model/predefined.ml
index 7ab6a54c70..18bb1958ef 100644
--- a/src/model/predefined.ml
+++ b/src/model/predefined.ml
@@ -270,20 +270,27 @@ let floatarray_decl =
     |> List.rev_map (fun s -> [ `Space; `Word s ])
     |> List.flatten |> List.tl |> List.rev
   in
+  let label =
+    Paths.Identifier.Mk.label
+      ( Paths.Identifier.Mk.root (None, ModuleName.make_std "Array"),
+        LabelName.make_std "1" )
+  in
   let doc =
     [
       `Paragraph
-        (words [ "This"; "type"; "is"; "used"; "to"; "implement"; "the" ]
-         @ [
-             `Space;
-             `Reference
-               ( `Module
-                   (`Root ("Array", `TModule), ModuleName.make_std "Floatarray"),
-                 [] );
-             `Space;
-           ]
-         @ words [ "module."; "It"; "should"; "not"; "be"; "used"; "directly." ]
-        |> List.map (Location_.at predefined_location));
+        ( label,
+          words [ "This"; "type"; "is"; "used"; "to"; "implement"; "the" ]
+          @ [
+              `Space;
+              `Reference
+                ( `Module
+                    (`Root ("Array", `TModule), ModuleName.make_std "Floatarray"),
+                  [] );
+              `Space;
+            ]
+          @ words
+              [ "module."; "It"; "should"; "not"; "be"; "used"; "directly." ]
+          |> List.map (Location_.at predefined_location) );
     ]
     |> List.map (Location_.at predefined_location)
   in
diff --git a/src/model/semantics.ml b/src/model/semantics.ml
index 9770fed63a..d10c9ddd53 100644
--- a/src/model/semantics.ml
+++ b/src/model/semantics.ml
@@ -216,6 +216,21 @@ let rec inline_element :
 
 and inline_elements status elements = List.map (inline_element status) elements
 
+let generate_label =
+  let current_label = ref 0 in
+  fun kind status ->
+    let lbl =
+      match kind with
+      | `Paragraph -> "p"
+      | `Code_block -> "code"
+      | `Verbatim -> "v"
+      | `Math_block -> "math"
+    in
+    let name = Format.sprintf "%s%d" lbl !current_label in
+    incr current_label;
+    Paths.Identifier.Mk.label
+      (status.parent_of_sections, Names.LabelName.make_std name)
+
 let rec nestable_block_element :
     status ->
     Odoc_parser.Ast.nestable_block_element with_location ->
@@ -223,16 +238,23 @@ let rec nestable_block_element :
  fun status element ->
   match element with
   | { value = `Paragraph content; location } ->
-      Location.at location (`Paragraph (inline_elements status content))
+      let content = inline_elements status content in
+      let label = generate_label `Paragraph status in
+      Location.at location (`Paragraph (label, content))
   | { value = `Code_block (metadata, code); location } ->
       let lang_tag =
         match metadata with
         | Some ({ Location.value; _ }, _) -> Some value
         | None -> None
       in
-      Location.at location (`Code_block (lang_tag, code))
-  | { value = `Math_block s; location } -> Location.at location (`Math_block s)
-  | { value = `Verbatim _; _ } as element -> element
+      let label = generate_label `Code_block status in
+      Location.at location (`Code_block (label, lang_tag, code))
+  | { value = `Math_block s; location } ->
+      let label = generate_label `Verbatim status in
+      Location.at location (`Math_block (label, s))
+  | { value = `Verbatim v; location } ->
+      let label = generate_label `Math_block status in
+      Location.at location (`Verbatim (label, v))
   | { value = `Modules modules; location } ->
       let modules =
         List.fold_left
@@ -381,9 +403,10 @@ let section_heading :
   | `None, _any_level ->
       Error.raise_warning (headings_not_allowed location);
       let text = (text :> Comment.inline_element with_location list) in
+      let label = generate_label `Paragraph status in
       let element =
         Location.at location
-          (`Paragraph [ Location.at location (`Styled (`Bold, text)) ])
+          (`Paragraph (label, [ Location.at location (`Styled (`Bold, text)) ]))
       in
       (top_heading_level, element)
   | `No_titles, 0 ->
diff --git a/src/model_desc/comment_desc.ml b/src/model_desc/comment_desc.ml
index 28ee873228..17cf7f53c2 100644
--- a/src/model_desc/comment_desc.ml
+++ b/src/model_desc/comment_desc.ml
@@ -18,10 +18,10 @@ type general_inline_element =
 and general_link_content = general_inline_element with_location list
 
 type general_block_element =
-  [ `Paragraph of general_link_content
-  | `Code_block of string option * string with_location
-  | `Math_block of string
-  | `Verbatim of string
+  [ `Paragraph of Identifier.Label.t * general_link_content
+  | `Code_block of Identifier.Label.t * string option * string with_location
+  | `Math_block of Identifier.Label.t * string
+  | `Verbatim of Identifier.Label.t * string
   | `Modules of Comment.module_reference list
   | `List of
     [ `Unordered | `Ordered ] * general_block_element with_location list list
@@ -105,11 +105,11 @@ let rec block_element : general_block_element t =
   in
   Variant
     (function
-    | `Paragraph x -> C ("`Paragraph", x, link_content)
-    | `Code_block (x1, x2) ->
+    | `Paragraph (_, x) -> C ("`Paragraph", x, link_content)
+    | `Code_block (_, x1, x2) ->
         C ("`Code_block", (x1, ignore_loc x2), Pair (Option string, string))
-    | `Math_block x -> C ("`Math_block", x, string)
-    | `Verbatim x -> C ("`Verbatim", x, string)
+    | `Math_block (_, x) -> C ("`Math_block", x, string)
+    | `Verbatim (_, x) -> C ("`Verbatim", x, string)
     | `Modules x -> C ("`Modules", x, List module_reference)
     | `List (x1, x2) ->
         C ("`List", (x1, (x2 :> general_docs list)), Pair (list_kind, List docs))
diff --git a/src/xref2/component.ml b/src/xref2/component.ml
index bca7b69a26..c2af08507a 100644
--- a/src/xref2/component.ml
+++ b/src/xref2/component.ml
@@ -462,9 +462,21 @@ end =
   Substitution
 
 and CComment : sig
+  type nestable_block_element =
+    [ `Paragraph of Label.t * Odoc_model.Comment.paragraph
+    | `Code_block of
+      Label.t * string option * string Odoc_model.Comment.with_location
+    | `Math_block of Label.t * string
+    | `Verbatim of Label.t * string
+    | `Modules of Odoc_model.Comment.module_reference list
+    | `List of
+      [ `Unordered | `Ordered ]
+      * nestable_block_element Odoc_model.Comment.with_location list list ]
+
   type block_element =
-    [ Odoc_model.Comment.nestable_block_element
-    | `Heading of Label.t
+    [ nestable_block_element
+    | `Heading of
+      Odoc_model.Comment.heading_attrs * Label.t * Odoc_model.Comment.paragraph
     | `Tag of Odoc_model.Comment.tag ]
 
   type docs = block_element Odoc_model.Comment.with_location list
@@ -474,11 +486,14 @@ end =
   CComment
 
 and Label : sig
+  (** In order to generate content for links without content *)
+  type content = Heading of Odoc_model.Comment.paragraph | NestableBlock
+
   type t = {
-    attrs : Odoc_model.Comment.heading_attrs;
     label : Ident.label;
-    text : Odoc_model.Comment.paragraph;
+    content : content;
     location : Odoc_model.Location_.span;
+        (** In order to check for ambiguous labels *)
   }
 end =
   Label
@@ -2412,16 +2427,51 @@ module Of_Lang = struct
     in
     { items; removed = []; compiled = sg.compiled; doc = docs ident_map sg.doc }
 
-  and block_element _ b :
+  and nestable_block_element map
+      (b : Odoc_model.Comment.nestable_block_element Comment.with_location) =
+    let mk_label label location =
+      {
+        Label.label = Ident.Of_Identifier.label label;
+        location;
+        content = NestableBlock;
+      }
+    in
+    match b with
+    | { Odoc_model.Location_.value = `Paragraph (label, text); location } ->
+        let label = mk_label label location in
+        let para = `Paragraph (label, text) in
+        Odoc_model.Location_.same b para
+    | { value = `Code_block (label, l, s); location } ->
+        let label = mk_label label location in
+        let cb = `Code_block (label, l, s) in
+        Odoc_model.Location_.same b cb
+    | { value = `Math_block (label, s); location } ->
+        let label = mk_label label location in
+        let mb = `Math_block (label, s) in
+        Odoc_model.Location_.same b mb
+    | { value = `Verbatim (label, s); location } ->
+        let label = mk_label label location in
+        let v = `Verbatim (label, s) in
+        Odoc_model.Location_.same b v
+    | { value = `List (ord, items); _ } ->
+        let items = List.map (List.map (nestable_block_element map)) items in
+        let l = `List (ord, items) in
+        Odoc_model.Location_.same b l
+    | { value = `Modules _; _ } as n -> n
+
+  and block_element map b :
       CComment.block_element Odoc_model.Comment.with_location =
     match b with
     | { Odoc_model.Location_.value = `Heading (attrs, label, text); location }
       ->
         let label = Ident.Of_Identifier.label label in
         Odoc_model.Location_.same b
-          (`Heading { Label.attrs; label; text; location })
+          (`Heading
+            (attrs, { Label.label; content = Heading text; location }, text))
     | { value = `Tag _; _ } as t -> t
-    | { value = #Odoc_model.Comment.nestable_block_element; _ } as n -> n
+    | { value = #Odoc_model.Comment.nestable_block_element; _ } as n ->
+        (nestable_block_element map n
+          :> CComment.block_element Odoc_model.Comment.with_location)
 
   and docs ident_map d = List.map (block_element ident_map) d
 
diff --git a/src/xref2/component.mli b/src/xref2/component.mli
index 483cb0c676..bdad6fd2d1 100644
--- a/src/xref2/component.mli
+++ b/src/xref2/component.mli
@@ -432,9 +432,21 @@ and Substitution : sig
 end
 
 and CComment : sig
+  type nestable_block_element =
+    [ `Paragraph of Label.t * Odoc_model.Comment.paragraph
+    | `Code_block of
+      Label.t * string option * string Odoc_model.Comment.with_location
+    | `Math_block of Label.t * string
+    | `Verbatim of Label.t * string
+    | `Modules of Odoc_model.Comment.module_reference list
+    | `List of
+      [ `Unordered | `Ordered ]
+      * nestable_block_element Odoc_model.Comment.with_location list list ]
+
   type block_element =
-    [ Odoc_model.Comment.nestable_block_element
-    | `Heading of Label.t
+    [ nestable_block_element
+    | `Heading of
+      Odoc_model.Comment.heading_attrs * Label.t * Odoc_model.Comment.paragraph
     | `Tag of Odoc_model.Comment.tag ]
 
   type docs = block_element Odoc_model.Comment.with_location list
@@ -443,11 +455,14 @@ and CComment : sig
 end
 
 and Label : sig
+  (** In order to generate content for links without content *)
+  type content = Heading of Odoc_model.Comment.paragraph | NestableBlock
+
   type t = {
-    attrs : Odoc_model.Comment.heading_attrs;
     label : Ident.label;
-    text : Odoc_model.Comment.paragraph;
+    content : content;
     location : Odoc_model.Location_.span;
+        (** In order to check for ambiguous labels *)
   }
 end
 
diff --git a/src/xref2/env.ml b/src/xref2/env.ml
index 6a277a36ae..e5fbb7698a 100644
--- a/src/xref2/env.ml
+++ b/src/xref2/env.ml
@@ -228,7 +228,7 @@ let add_to_elts kind identifier component env =
     ids = ElementsById.add identifier component env.ids;
   }
 
-let add_label identifier heading env =
+let add_label identifier (heading : Component.Label.t) env =
   assert env.linking;
   let comp = `Label (identifier, heading) in
   let name = Identifier.name identifier in
@@ -259,13 +259,31 @@ let add_label identifier heading env =
     ids = ElementsById.add identifier comp env.ids;
   }
 
-let add_docs (docs : Comment.docs) env =
+let rec add_docs (docs : Comment.docs) env =
   assert env.linking;
   List.fold_left
     (fun env -> function
-      | { Location_.value = `Heading (attrs, id, text); location } ->
+      | { Location_.value = `Heading (_attrs, id, text); location } ->
           let label = Ident.Of_Identifier.label id in
-          add_label id { Component.Label.attrs; label; text; location } env
+          add_label id
+            { Component.Label.label; content = Heading text; location }
+            env
+      | {
+          Location_.value =
+            ( `Paragraph (id, _)
+            | `Code_block (id, _, _)
+            | `Math_block (id, _)
+            | `Verbatim (id, _) );
+          location;
+        } ->
+          let label = Ident.Of_Identifier.label id in
+          add_label id
+            { Component.Label.label; content = NestableBlock; location }
+            env
+      | { Location_.value = `List (_, l); location = _ } ->
+          List.fold_left
+            (fun env docs -> add_docs (docs :> Comment.docs) env)
+            env l
       | _ -> env)
     env docs
 
@@ -276,7 +294,7 @@ let add_cdocs p (docs : Component.CComment.docs) env =
   List.fold_left
     (fun env element ->
       match element.Location_.value with
-      | `Heading h ->
+      | `Heading (_attrs, h, _text) ->
           let (`LLabel (name, _)) = h.Component.Label.label in
           let label =
             Paths.Identifier.Mk.label (Paths.Identifier.label_parent p, name)
diff --git a/src/xref2/find.ml b/src/xref2/find.ml
index 354a022bdc..0e3a97177f 100644
--- a/src/xref2/find.ml
+++ b/src/xref2/find.ml
@@ -211,7 +211,8 @@ let any_in_comment d name =
     match xs with
     | elt :: rest -> (
         match elt.Odoc_model.Location_.value with
-        | `Heading lbl when Ident.Name.label lbl.Label.label = name ->
+        | `Heading (_attrs, lbl, _text)
+          when Ident.Name.label lbl.Label.label = name ->
             Some (`FLabel lbl)
         | _ -> inner rest)
     | [] -> None
diff --git a/src/xref2/lang_of.ml b/src/xref2/lang_of.ml
index 4d838d4404..af80fb2d3f 100644
--- a/src/xref2/lang_of.ml
+++ b/src/xref2/lang_of.ml
@@ -1039,26 +1039,66 @@ and exception_ map parent id (e : Component.Exception.t) :
     res = Opt.map (type_expr map (parent :> Identifier.Parent.t)) e.res;
   }
 
-and block_element parent
-    (d : Component.CComment.block_element Odoc_model.Location_.with_location) :
-    Odoc_model.Comment.block_element Odoc_model.Location_.with_location =
+and nestable_block_element parent
+    (d :
+      Component.CComment.nestable_block_element
+      Odoc_model.Location_.with_location) :
+    Odoc_model.Comment.nestable_block_element Odoc_model.Location_.with_location
+    =
+  let mk_label h =
+    let { Component.Label.label; content = _; location = _ } = h in
+    try Identifier.Mk.label (parent, Ident.Name.typed_label label)
+    with Not_found ->
+      Format.fprintf Format.err_formatter "Failed to find id: %a\n" Ident.fmt
+        label;
+      raise Not_found
+  in
   let value =
     match d.Odoc_model.Location_.value with
-    | `Heading h ->
-        let { Component.Label.attrs; label; text; location = _ } = h in
-        let label =
-          try Identifier.Mk.label (parent, Ident.Name.typed_label label)
-          with Not_found ->
-            Format.fprintf Format.err_formatter "Failed to find id: %a\n"
-              Ident.fmt label;
-            raise Not_found
+    | `Paragraph (h, text) ->
+        let label = mk_label h in
+        `Paragraph (label, text)
+    | `Code_block (h, l, s) ->
+        let label = mk_label h in
+        `Code_block (label, l, s)
+    | `Math_block (h, s) ->
+        let label = mk_label h in
+        `Math_block (label, s)
+    | `Verbatim (h, s) ->
+        let label = mk_label h in
+        `Verbatim (label, s)
+    | `List (ord, li) ->
+        let li =
+          List.map (List.map (fun x -> nestable_block_element parent x)) li
         in
-        `Heading (attrs, label, text)
-    | `Tag t -> `Tag t
-    | #Odoc_model.Comment.nestable_block_element as n -> n
+        `List (ord, li)
+    | `Modules _ as n -> n
   in
   { d with Odoc_model.Location_.value }
 
+and block_element parent
+    (d : Component.CComment.block_element Odoc_model.Location_.with_location) :
+    Odoc_model.Comment.block_element Odoc_model.Location_.with_location =
+  match d.Odoc_model.Location_.value with
+  | `Heading (attrs, h, text) ->
+      let { Component.Label.label; content = _; location = _ } = h in
+      let label =
+        try Identifier.Mk.label (parent, Ident.Name.typed_label label)
+        with Not_found ->
+          Format.fprintf Format.err_formatter "Failed to find id: %a\n"
+            Ident.fmt label;
+          raise Not_found
+      in
+      let value = `Heading (attrs, label, text) in
+      { d with Odoc_model.Location_.value }
+  | `Tag t ->
+      let value = `Tag t in
+      { d with Odoc_model.Location_.value }
+  | #Component.CComment.nestable_block_element as value ->
+      let e = { d with Odoc_model.Location_.value } in
+      (nestable_block_element parent e
+        :> Odoc_model.Comment.block_element Odoc_model.Location_.with_location)
+
 and docs :
     Identifier.LabelParent.t ->
     Component.CComment.docs ->
diff --git a/src/xref2/link.ml b/src/xref2/link.ml
index 5f896fc17a..5d21b98e6d 100644
--- a/src/xref2/link.ml
+++ b/src/xref2/link.ml
@@ -13,9 +13,7 @@ let locations env id locs =
 (** Equivalent to {!Comment.synopsis}. *)
 let synopsis_from_comment (docs : Component.CComment.docs) =
   match docs with
-  | ({ value = #Comment.nestable_block_element; _ } as e) :: _ ->
-      (* Only the first element is considered. *)
-      Comment.synopsis [ e ]
+  | { value = `Paragraph (_, text); _ } :: _ -> Some text
   | _ -> None
 
 let synopsis_of_module env (m : Component.Module.t) =
@@ -45,10 +43,23 @@ let ambiguous_label_warning label_name labels =
     Location_.pp_span_start fmt x.Component.Label.location
   in
   Lookup_failures.report_warning
-    "@[<2>Label '%s' is ambiguous. The other occurences are:@ %a@]" label_name
+    "@[<2>Label '%s' is ambiguous. The other occurrences are:@ %a@]" label_name
     (Format.pp_print_list ~pp_sep:Format.pp_force_newline pp_label_loc)
     labels
 
+let ambiguous_labels ~loc env
+    ({ Odoc_model.Paths.Identifier.iv = `Label (_, label_name); _ } as id) =
+  (* Looking for an identical identifier but a different location. *)
+  let conflicting (`Label (id', comp)) =
+    Id.equal id id'
+    && not (Location_.span_equal comp.Component.Label.location loc)
+  in
+  let label_name = Names.LabelName.to_string label_name in
+  match Env.lookup_by_name Env.s_label label_name env with
+  | Ok lbl when conflicting lbl -> [ lbl ]
+  | Error (`Ambiguous (hd, tl)) -> List.filter conflicting (hd :: tl)
+  | Ok _ | Error `Not_found -> []
+
 (** Raise a warning when a label explicitly set by the user collides. This
     warning triggers even if one of the colliding labels have been automatically
     generated. *)
@@ -57,19 +68,24 @@ let check_ambiguous_label ~loc env
       ({ Odoc_model.Paths.Identifier.iv = `Label (_, label_name); _ } as id),
       _ ) =
   if attrs.Comment.heading_label_explicit then
-    (* Looking for an identical identifier but a different location. *)
-    let conflicting (`Label (id', comp)) =
-      Id.equal id id'
-      && not (Location_.span_equal comp.Component.Label.location loc)
-    in
     let label_name = Names.LabelName.to_string label_name in
-    match Env.lookup_by_name Env.s_label label_name env with
-    | Ok lbl when conflicting lbl -> ambiguous_label_warning label_name [ lbl ]
-    | Error (`Ambiguous (hd, tl)) -> (
-        match List.filter conflicting (hd :: tl) with
-        | [] -> ()
-        | xs -> ambiguous_label_warning label_name xs)
-    | Ok _ | Error `Not_found -> ()
+    match ambiguous_labels ~loc env id with
+    | [] -> ()
+    | lbls -> ambiguous_label_warning label_name lbls
+
+let disambiguate_label ~loc env
+    ({ Odoc_model.Paths.Identifier.iv = `Label (lbl_parent, label_name); _ } as
+    id) =
+  let label_name = Names.LabelName.to_string label_name in
+  let need_new_label label = ambiguous_labels ~loc env label != [] in
+  let rec give_new_label n =
+    let new_label =
+      Paths.Identifier.Mk.label
+        (lbl_parent, Names.LabelName.make_std (label_name ^ string_of_int n))
+    in
+    if need_new_label new_label then give_new_label (n + 1) else new_label
+  in
+  if need_new_label id then give_new_label 0 else id
 
 let expansion_needed self target =
   let self = (self :> Paths.Path.Resolved.t) in
@@ -212,9 +228,11 @@ let rec comment_inline_element :
             match (content, x) with
             | [], `Identifier ({ iv = #Id.Label.t_pv; _ } as i) -> (
                 match Env.lookup_by_id Env.s_label i env with
-                | Some (`Label (_, lbl)) ->
-                    Odoc_model.Comment.link_content_of_inline_elements
-                      lbl.Component.Label.text
+                | Some (`Label (_, lbl)) -> (
+                    match lbl.content with
+                    | Heading text ->
+                        Odoc_model.Comment.link_content_of_inline_elements text
+                    | NestableBlock -> [])
                 | None -> [])
             | content, _ -> content
           in
@@ -232,11 +250,21 @@ and resolve_external_synopsis env synopsis =
   let env = Env.inherit_resolver env in
   paragraph env synopsis
 
-and comment_nestable_block_element env parent ~loc:_
+and comment_nestable_block_element env parent ~loc
     (x : Comment.nestable_block_element) =
   match x with
-  | `Paragraph elts -> `Paragraph (paragraph env elts)
-  | (`Code_block _ | `Math_block _ | `Verbatim _) as x -> x
+  | `Paragraph (lbl, elts) ->
+      let lbl = disambiguate_label ~loc env lbl in
+      `Paragraph (lbl, paragraph env elts)
+  | `Code_block (lbl, l, s) ->
+      let lbl = disambiguate_label ~loc env lbl in
+      `Code_block (lbl, l, s)
+  | `Math_block (lbl, s) ->
+      let lbl = disambiguate_label ~loc env lbl in
+      `Math_block (lbl, s)
+  | `Verbatim (lbl, s) ->
+      let lbl = disambiguate_label ~loc env lbl in
+      `Verbatim (lbl, s)
   | `List (x, ys) ->
       `List
         ( x,
diff --git a/src/xref2/ref_tools.ml b/src/xref2/ref_tools.ml
index 6143fb41f1..15fa3562a1 100644
--- a/src/xref2/ref_tools.ml
+++ b/src/xref2/ref_tools.ml
@@ -113,8 +113,16 @@ let ambiguous_label_warning name (labels : Component.Element.any list) =
 
 let ambiguous_warning name (results : [< Component.Element.any ] list) =
   let results = (results :> Component.Element.any list) in
-  if List.for_all (function `Label _ -> true | _ -> false) results then
-    ambiguous_label_warning name results
+  if
+    List.for_all
+      (function
+        | `Label
+            (_, { Component.Label.label = _; content = Heading _; location = _ })
+          ->
+            true
+        | _ -> false)
+      results
+  then ambiguous_label_warning name results
   else ambiguous_generic_ref_warning name (List.map ref_kind_of_element results)
 
 let env_lookup_by_name ?(kind = `Any) scope name env =
diff --git a/test/generators/html/Alerts-Top1.html b/test/generators/html/Alerts-Top1.html
index a917f9c94e..6b5183f84b 100644
--- a/test/generators/html/Alerts-Top1.html
+++ b/test/generators/html/Alerts-Top1.html
@@ -12,7 +12,8 @@
    <a href="Alerts.html">Alerts</a> &#x00BB; Top1
   </nav>
   <header class="odoc-preamble">
-   <h1>Module <code><span>Alerts.Top1</span></code></h1><p>Top-comment.</p>
+   <h1>Module <code><span>Alerts.Top1</span></code></h1>
+   <p id="p1">Top-comment.</p>
    <ul class="at-tags">
     <li class="deprecated"><span class="at-tag">deprecated</span> A</li>
    </ul>
diff --git a/test/generators/html/Alerts-Top2.html b/test/generators/html/Alerts-Top2.html
index d7b6f91821..f384b055c6 100644
--- a/test/generators/html/Alerts-Top2.html
+++ b/test/generators/html/Alerts-Top2.html
@@ -12,7 +12,8 @@
    <a href="Alerts.html">Alerts</a> &#x00BB; Top2
   </nav>
   <header class="odoc-preamble">
-   <h1>Module <code><span>Alerts.Top2</span></code></h1><p>Top-comment.</p>
+   <h1>Module <code><span>Alerts.Top2</span></code></h1>
+   <p id="p2">Top-comment.</p>
    <ul class="at-tags">
     <li class="deprecated"><span class="at-tag">deprecated</span> A</li>
    </ul>
diff --git a/test/generators/html/Alerts.html b/test/generators/html/Alerts.html
index e26cb370a4..2de5f2b947 100644
--- a/test/generators/html/Alerts.html
+++ b/test/generators/html/Alerts.html
@@ -29,7 +29,8 @@ <h1>Module <code><span>Alerts</span></code></h1>
     </div>
     <div class="spec-doc">
      <ul class="at-tags">
-      <li class="deprecated"><span class="at-tag">deprecated</span> <p>b.</p>
+      <li class="deprecated"><span class="at-tag">deprecated</span> 
+       <p id="p0">b.</p>
       </li>
      </ul>
     </div>
diff --git a/test/generators/html/Alias-X.html b/test/generators/html/Alias-X.html
index 465fe6eb1f..40ca313753 100644
--- a/test/generators/html/Alias-X.html
+++ b/test/generators/html/Alias-X.html
@@ -22,8 +22,8 @@ <h1>Module <code><span>Alias.X</span></code></h1>
      </code>
     </div>
     <div class="spec-doc">
-     <p>Module Foo__X documentation. This should appear in the documentation
-       for the alias to this module 'X'
+     <p id="p0">Module Foo__X documentation. This should appear in the
+       documentation for the alias to this module 'X'
      </p>
     </div>
    </div>
diff --git a/test/generators/html/Bugs.html b/test/generators/html/Bugs.html
index 735988e182..a10102b163 100644
--- a/test/generators/html/Bugs.html
+++ b/test/generators/html/Bugs.html
@@ -32,7 +32,7 @@ <h1>Module <code><span>Bugs</span></code></h1>
      </code>
     </div>
     <div class="spec-doc">
-     <p>Triggers an assertion failure when 
+     <p id="p0">Triggers an assertion failure when 
       <a href="https://github.com/ocaml/odoc/issues/101">
        https://github.com/ocaml/odoc/issues/101
       </a> is not fixed.
diff --git a/test/generators/html/Bugs_post_406.html b/test/generators/html/Bugs_post_406.html
index 836c834bd4..18beab0b00 100644
--- a/test/generators/html/Bugs_post_406.html
+++ b/test/generators/html/Bugs_post_406.html
@@ -10,8 +10,9 @@
  <body class="odoc">
   <header class="odoc-preamble">
    <h1>Module <code><span>Bugs_post_406</span></code></h1>
-   <p>Let-open in class types, https://github.com/ocaml/odoc/issues/543
-     This was added to the language in 4.06
+   <p id="p0">Let-open in class types, 
+    https://github.com/ocaml/odoc/issues/543 This was added to the language
+     in 4.06
    </p>
   </header>
   <div class="odoc-content">
diff --git a/test/generators/html/Class_comments-class-c.html b/test/generators/html/Class_comments-class-c.html
index fe6e33762a..f1e6a14272 100644
--- a/test/generators/html/Class_comments-class-c.html
+++ b/test/generators/html/Class_comments-class-c.html
@@ -22,7 +22,7 @@ <h1>Class <code><span>Class_comments.c</span></code></h1>
        <a href="Class_comments-class-x.html">x</a>
       </span>
      </code>
-    </div><div class="spec-doc"><p>Inherit.</p></div>
+    </div><div class="spec-doc"><p id="p0">Inherit.</p></div>
    </div>
    <div class="odoc-spec">
     <div class="spec">
@@ -31,8 +31,8 @@ <h1>Class <code><span>Class_comments.c</span></code></h1>
        <span class="type-var">'a</span> = int
       </span>
      </code>
-    </div><div class="spec-doc"><p>Constraint.</p></div>
-   </div><p>Floating comment.</p>
+    </div><div class="spec-doc"><p id="p1">Constraint.</p></div>
+   </div><p id="p2">Floating comment.</p>
    <div class="odoc-spec">
     <div class="spec method anchored" id="method-bar">
      <a href="#method-bar" class="anchor"></a>
diff --git a/test/generators/html/External.html b/test/generators/html/External.html
index a2806fc060..2f70317fe7 100644
--- a/test/generators/html/External.html
+++ b/test/generators/html/External.html
@@ -20,7 +20,7 @@ <h1>Module <code><span>External</span></code></h1>
        <span>unit <span class="arrow">&#45;&gt;</span></span> unit
       </span>
      </code>
-    </div><div class="spec-doc"><p>Foo <em>bar</em>.</p></div>
+    </div><div class="spec-doc"><p id="p0">Foo <em>bar</em>.</p></div>
    </div>
   </div>
  </body>
diff --git a/test/generators/html/Include2-X.html b/test/generators/html/Include2-X.html
index 5e147f4b74..aadb22b85f 100644
--- a/test/generators/html/Include2-X.html
+++ b/test/generators/html/Include2-X.html
@@ -12,7 +12,8 @@
   </nav>
   <header class="odoc-preamble">
    <h1>Module <code><span>Include2.X</span></code></h1>
-   <p>Comment about X that should not appear when including X below.</p>
+   <p id="p0">Comment about X that should not appear when including X below.
+   </p>
   </header>
   <div class="odoc-content">
    <div class="odoc-spec">
diff --git a/test/generators/html/Include2-Y.html b/test/generators/html/Include2-Y.html
index 6ddb4bf0e4..e67176e75c 100644
--- a/test/generators/html/Include2-Y.html
+++ b/test/generators/html/Include2-Y.html
@@ -12,7 +12,7 @@
   </nav>
   <header class="odoc-preamble">
    <h1>Module <code><span>Include2.Y</span></code></h1>
-   <p>Top-comment of Y.</p>
+   <p id="p1">Top-comment of Y.</p>
   </header>
   <div class="odoc-content">
    <div class="odoc-spec">
diff --git a/test/generators/html/Include2-Y_include_doc.html b/test/generators/html/Include2-Y_include_doc.html
index 4b65326afc..0e75b88494 100644
--- a/test/generators/html/Include2-Y_include_doc.html
+++ b/test/generators/html/Include2-Y_include_doc.html
@@ -17,8 +17,8 @@ <h1>Module <code><span>Include2.Y_include_doc</span></code></h1>
   <div class="odoc-content">
    <div class="odoc-include">
     <div class="spec-doc">
-     <p>Doc attached to <code>include Y</code>. <code>Y</code>'s top-comment
-       shouldn't appear here.
+     <p id="p3">Doc attached to <code>include Y</code>. <code>Y</code>
+      's top-comment shouldn't appear here.
      </p>
     </div>
     <details open="open">
diff --git a/test/generators/html/Include2-Y_include_synopsis.html b/test/generators/html/Include2-Y_include_synopsis.html
index a1039bbe30..dea9cedfaa 100644
--- a/test/generators/html/Include2-Y_include_synopsis.html
+++ b/test/generators/html/Include2-Y_include_synopsis.html
@@ -13,8 +13,8 @@
   </nav>
   <header class="odoc-preamble">
    <h1>Module <code><span>Include2.Y_include_synopsis</span></code></h1>
-   <p>The <code>include Y</code> below should have the synopsis from 
-    <code>Y</code>'s top-comment attached to it.
+   <p id="p2">The <code>include Y</code> below should have the synopsis
+     from <code>Y</code>'s top-comment attached to it.
    </p>
   </header>
   <div class="odoc-content">
diff --git a/test/generators/html/Include2.html b/test/generators/html/Include2.html
index 55526916aa..782c2f79bf 100644
--- a/test/generators/html/Include2.html
+++ b/test/generators/html/Include2.html
@@ -40,7 +40,9 @@ <h1>Module <code><span>Include2</span></code></h1>
        </span>
       </code>
      </summary>
-     <p>Comment about X that should not appear when including X below.</p>
+     <p id="p0">Comment about X that should not appear when including
+       X below.
+     </p>
      <div class="odoc-spec">
       <div class="spec type anchored" id="type-t">
        <a href="#type-t" class="anchor"></a>
diff --git a/test/generators/html/Include_sections-module-type-Something.html b/test/generators/html/Include_sections-module-type-Something.html
index ffd1e615c2..6238588901 100644
--- a/test/generators/html/Include_sections-module-type-Something.html
+++ b/test/generators/html/Include_sections-module-type-Something.html
@@ -13,7 +13,7 @@
   </nav>
   <header class="odoc-preamble">
    <h1>Module type <code><span>Include_sections.Something</span></code></h1>
-   <p>A module type.</p>
+   <p id="p0">A module type.</p>
   </header>
   <nav class="odoc-toc">
    <ul>
@@ -31,7 +31,7 @@ <h1>Module type <code><span>Include_sections.Something</span></code></h1>
     </div>
    </div>
    <h2 id="something-1"><a href="#something-1" class="anchor"></a>Something 1
-   </h2><p>foo</p>
+   </h2><p id="p1">foo</p>
    <div class="odoc-spec">
     <div class="spec value anchored" id="val-foo">
      <a href="#val-foo" class="anchor"></a>
@@ -44,11 +44,11 @@ <h3 id="something-2"><a href="#something-2" class="anchor"></a>Something 2
     <div class="spec value anchored" id="val-bar">
      <a href="#val-bar" class="anchor"></a>
      <code><span><span class="keyword">val</span> bar : unit</span></code>
-    </div><div class="spec-doc"><p>foo bar</p></div>
+    </div><div class="spec-doc"><p id="p2">foo bar</p></div>
    </div>
    <h2 id="something-1-bis"><a href="#something-1-bis" class="anchor"></a>
     Something 1-bis
-   </h2><p>Some text.</p>
+   </h2><p id="p3">Some text.</p>
   </div>
  </body>
 </html>
diff --git a/test/generators/html/Include_sections.html b/test/generators/html/Include_sections.html
index 2bfc6ac8e8..b24a7d1b7b 100644
--- a/test/generators/html/Include_sections.html
+++ b/test/generators/html/Include_sections.html
@@ -47,49 +47,49 @@ <h1>Module <code><span>Include_sections</span></code></h1>
      </code>
     </div><div class="spec-doc"><p>A module type.</p></div>
    </div>
-   <p>Let's include 
+   <p id="p4">Let's include 
     <a href="Include_sections-module-type-Something.html">
      <code>Something</code>
     </a> once
    </p>
    <h2 id="something-1"><a href="#something-1" class="anchor"></a>Something 1
-   </h2><p>foo</p>
+   </h2><p id="p1">foo</p>
    <h3 id="something-2"><a href="#something-2" class="anchor"></a>Something 2
    </h3>
    <h2 id="something-1-bis"><a href="#something-1-bis" class="anchor"></a>
     Something 1-bis
-   </h2><p>Some text.</p>
+   </h2><p id="p3">Some text.</p>
    <h2 id="second-include"><a href="#second-include" class="anchor"></a>
     Second include
    </h2>
-   <p>Let's include 
+   <p id="p6">Let's include 
     <a href="Include_sections-module-type-Something.html">
      <code>Something</code>
     </a> a second time: the heading level should be shift here.
    </p>
    <h3 id="something-1_2"><a href="#something-1_2" class="anchor"></a>
     Something 1
-   </h3><p>foo</p>
+   </h3><p id="p1">foo</p>
    <h4 id="something-2_2"><a href="#something-2_2" class="anchor"></a>
     Something 2
    </h4>
    <h3 id="something-1-bis_2">
     <a href="#something-1-bis_2" class="anchor"></a>Something 1-bis
-   </h3><p>Some text.</p>
+   </h3><p id="p3">Some text.</p>
    <h3 id="third-include"><a href="#third-include" class="anchor"></a>
     Third include
-   </h3><p>Shifted some more.</p>
+   </h3><p id="p8">Shifted some more.</p>
    <h4 id="something-1_3"><a href="#something-1_3" class="anchor"></a>
     Something 1
-   </h4><p>foo</p>
+   </h4><p id="p1">foo</p>
    <h5 id="something-2_3"><a href="#something-2_3" class="anchor"></a>
     Something 2
    </h5>
    <h4 id="something-1-bis_3">
     <a href="#something-1-bis_3" class="anchor"></a>Something 1-bis
-   </h4><p>Some text.</p>
-   <p>And let's include it again, but without inlining it this time: 
-    the ToC shouldn't grow.
+   </h4><p id="p3">Some text.</p>
+   <p id="p10">And let's include it again, but without inlining it this
+     time: the ToC shouldn't grow.
    </p>
    <div class="odoc-include">
     <details open="open">
@@ -109,7 +109,7 @@ <h4 id="something-1-bis_3">
      </div>
      <h2 id="something-1_4"><a href="#something-1_4" class="anchor"></a>
       Something 1
-     </h2><p>foo</p>
+     </h2><p id="p1">foo</p>
      <div class="odoc-spec">
       <div class="spec value anchored" id="val-foo">
        <a href="#val-foo" class="anchor"></a>
@@ -123,11 +123,11 @@ <h3 id="something-2_4"><a href="#something-2_4" class="anchor"></a>
       <div class="spec value anchored" id="val-bar">
        <a href="#val-bar" class="anchor"></a>
        <code><span><span class="keyword">val</span> bar : unit</span></code>
-      </div><div class="spec-doc"><p>foo bar</p></div>
+      </div><div class="spec-doc"><p id="p2">foo bar</p></div>
      </div>
      <h2 id="something-1-bis_4">
       <a href="#something-1-bis_4" class="anchor"></a>Something 1-bis
-     </h2><p>Some text.</p>
+     </h2><p id="p3">Some text.</p>
     </details>
    </div>
   </div>
diff --git a/test/generators/html/Interlude.html b/test/generators/html/Interlude.html
index 5350059fc6..cc96a30f00 100644
--- a/test/generators/html/Interlude.html
+++ b/test/generators/html/Interlude.html
@@ -10,24 +10,25 @@
  <body class="odoc">
   <header class="odoc-preamble">
    <h1>Module <code><span>Interlude</span></code></h1>
-   <p>This is the comment associated to the module.</p>
+   <p id="p0">This is the comment associated to the module.</p>
   </header>
   <div class="odoc-content">
-   <p>Some separate stray text at the top of the module.</p>
+   <p id="p1">Some separate stray text at the top of the module.</p>
    <div class="odoc-spec">
     <div class="spec value anchored" id="val-foo">
      <a href="#val-foo" class="anchor"></a>
      <code><span><span class="keyword">val</span> foo : unit</span></code>
-    </div><div class="spec-doc"><p>Foo.</p></div>
+    </div><div class="spec-doc"><p id="p2">Foo.</p></div>
    </div>
-   <p>Some stray text that is not associated with any signature item.</p>
-   <p>It has multiple paragraphs.</p>
-   <p>A separate block of stray text, adjacent to the preceding one.</p>
+   <p id="p3">Some stray text that is not associated with any signature item.
+   </p><p id="p4">It has multiple paragraphs.</p>
+   <p id="p5">A separate block of stray text, adjacent to the preceding one.
+   </p>
    <div class="odoc-spec">
     <div class="spec value anchored" id="val-bar">
      <a href="#val-bar" class="anchor"></a>
      <code><span><span class="keyword">val</span> bar : unit</span></code>
-    </div><div class="spec-doc"><p>Bar.</p></div>
+    </div><div class="spec-doc"><p id="p6">Bar.</p></div>
    </div>
    <div class="odoc-spec">
     <div class="spec value anchored" id="val-multiple">
@@ -48,7 +49,7 @@ <h1>Module <code><span>Interlude</span></code></h1>
      <a href="#val-items" class="anchor"></a>
      <code><span><span class="keyword">val</span> items : unit</span></code>
     </div>
-   </div><p>Stray text at the bottom of the module.</p>
+   </div><p id="p7">Stray text at the bottom of the module.</p>
   </div>
  </body>
 </html>
diff --git a/test/generators/html/Labels.html b/test/generators/html/Labels.html
index f01fe5dffe..eb8ec9f6f8 100644
--- a/test/generators/html/Labels.html
+++ b/test/generators/html/Labels.html
@@ -177,7 +177,7 @@ <h2 id="L2"><a href="#L2" class="anchor"></a>Attached to nothing</h2>
       </li>
      </ol><code><span>}</span></code>
     </div>
-   </div><p>Testing that labels can be referenced</p>
+   </div><p id="p0">Testing that labels can be referenced</p>
    <ul><li><a href="#L1" title="L1">Attached to unit</a></li>
     <li><a href="#L2" title="L2">Attached to nothing</a></li>
     <li><a href="#L3" title="L3">Attached to module</a></li>
diff --git a/test/generators/html/Markup.html b/test/generators/html/Markup.html
index 91a9f12ac5..323909c3b7 100644
--- a/test/generators/html/Markup.html
+++ b/test/generators/html/Markup.html
@@ -31,7 +31,7 @@
  <body class="odoc">
   <header class="odoc-preamble">
    <h1>Module <code><span>Markup</span></code></h1>
-   <p>Here, we test the rendering of comment markup.</p>
+   <p id="p0">Here, we test the rendering of comment markup.</p>
   </header>
   <nav class="odoc-toc">
    <ul>
@@ -63,40 +63,40 @@ <h1>Module <code><span>Markup</span></code></h1>
   </nav>
   <div class="odoc-content">
    <h2 id="sections"><a href="#sections" class="anchor"></a>Sections</h2>
-   <p>Let's get these done first, because sections will be used to break
-     up the rest of this test.
-   </p><p>Besides the section heading above, there are also</p>
+   <p id="p1">Let's get these done first, because sections will be used
+     to break up the rest of this test.
+   </p><p id="p2">Besides the section heading above, there are also</p>
    <h3 id="subsection-headings">
     <a href="#subsection-headings" class="anchor"></a>Subsection headings
-   </h3><p>and</p>
+   </h3><p id="p3">and</p>
    <h4 id="sub-subsection-headings">
     <a href="#sub-subsection-headings" class="anchor"></a>Sub-subsection
      headings
    </h4>
-   <p>but odoc has banned deeper headings. There are also title headings,
-     but they are only allowed in mld files.
+   <p id="p4">but odoc has banned deeper headings. There are also title
+     headings, but they are only allowed in mld files.
    </p><h4 id="anchors"><a href="#anchors" class="anchor"></a>Anchors</h4>
-   <p>Sections can have attached 
+   <p id="p5">Sections can have attached 
     <a href="#anchors" title="anchors">Anchors</a>, and it is possible
      to <a href="#anchors" title="anchors">link</a> to them. Links to
      section headers should not be set in source code style.
    </p>
    <h5 id="paragraph"><a href="#paragraph" class="anchor"></a>Paragraph</h5>
-   <p>Individual paragraphs can have a heading.</p>
+   <p id="p6">Individual paragraphs can have a heading.</p>
    <h6 id="subparagraph"><a href="#subparagraph" class="anchor"></a>
     Subparagraph
    </h6>
-   <p>Parts of a longer paragraph that can be considered alone can also
-     have headings.
+   <p id="p7">Parts of a longer paragraph that can be considered alone
+     can also have headings.
    </p><h2 id="styling"><a href="#styling" class="anchor"></a>Styling</h2>
-   <p>This paragraph has some styled elements: <b>bold</b> and <i>italic</i>
-    , <b><i>bold italic</i></b>, <em>emphasis</em>, 
+   <p id="p8">This paragraph has some styled elements: <b>bold</b> and
+     <i>italic</i>, <b><i>bold italic</i></b>, <em>emphasis</em>, 
     <em><em class="odd">emphasis</em> within emphasis</em>, 
     <b><i>bold italic</i></b>, super<sup>script</sup>, sub<sub>script</sub>
     . The line spacing should be enough for superscripts and subscripts
      not to look odd.
    </p>
-   <p>Note: 
+   <p id="p9">Note: 
     <i>In italics <em>emphasis</em> is rendered as normal text while 
      <em>emphasis <em class="odd">in</em> emphasis</em> is rendered in
       italics.
@@ -107,37 +107,37 @@ <h6 id="subparagraph"><a href="#subparagraph" class="anchor"></a>
      </a>
     </i>
    </p>
-   <p><code>code</code> is a different kind of markup that doesn't allow
-     nested markup.
+   <p id="p10"><code>code</code> is a different kind of markup that doesn't
+     allow nested markup.
    </p>
-   <p>It's possible for two markup elements to appear <b>next</b> <i>to</i>
-     each other and have a space, and appear <b>next</b><i>to</i> each
-     other with no space. It doesn't matter <b>how</b> <i>much</i> space
-     it was in the source: in this sentence, it was two space characters.
-     And in this one, there is <b>a</b> <i>newline</i>.
+   <p id="p11">It's possible for two markup elements to appear <b>next</b>
+     <i>to</i> each other and have a space, and appear <b>next</b><i>to</i>
+     each other with no space. It doesn't matter <b>how</b> <i>much</i>
+     space it was in the source: in this sentence, it was two space 
+    characters. And in this one, there is <b>a</b> <i>newline</i>.
    </p>
-   <p>This is also true between <em>non-</em><code>code</code> markup
-     <em>and</em> <code>code</code>.
+   <p id="p12">This is also true between <em>non-</em><code>code</code>
+     markup <em>and</em> <code>code</code>.
    </p>
-   <p>Code can appear <b>inside <code>other</code> markup</b>. Its display
-     shouldn't be affected.
+   <p id="p13">Code can appear <b>inside <code>other</code> markup</b>
+    . Its display shouldn't be affected.
    </p>
    <h2 id="links-and-references">
     <a href="#links-and-references" class="anchor"></a>Links and references
    </h2>
-   <p>This is a <a href="#">link</a>. It sends you to the top of this
-     page. Links can have markup inside them: <a href="#"><b>bold</b></a>
-    , <a href="#"><i>italics</i></a>, <a href="#"><em>emphasis</em></a>
-    , <a href="#">super<sup>script</sup></a>, 
-    <a href="#">sub<sub>script</sub></a>, and 
+   <p id="p14">This is a <a href="#">link</a>. It sends you to the top
+     of this page. Links can have markup inside them: 
+    <a href="#"><b>bold</b></a>, <a href="#"><i>italics</i></a>, 
+    <a href="#"><em>emphasis</em></a>, <a href="#">super<sup>script</sup></a>
+    , <a href="#">sub<sub>script</sub></a>, and 
     <a href="#"><code>code</code></a>. Links can also be nested 
     <em><a href="#">inside</a></em> markup. Links cannot be nested inside
      each other. This link has no replacement text: <a href="#">#</a>
     . The text is filled in by odoc. This is a shorthand link: 
     <a href="#">#</a>. The text is also filled in by odoc in this case.
    </p>
-   <p>This is a reference to <a href="#val-foo"><code>foo</code></a>.
-     References can have replacement text: 
+   <p id="p15">This is a reference to <a href="#val-foo"><code>foo</code></a>
+    . References can have replacement text: 
     <a href="#val-foo" title="foo">the value foo</a>. Except for the 
     special lookup support, references are pretty much just like links.
      The replacement text can have nested styles: 
@@ -154,8 +154,8 @@ <h2 id="links-and-references">
    </p>
    <h2 id="preformatted-text">
     <a href="#preformatted-text" class="anchor"></a>Preformatted text
-   </h2><p>This is a code block:</p>
-   <pre class="language-ocaml">
+   </h2><p id="p16">This is a code block:</p>
+   <pre id="code17" class="language-ocaml">
     <code>
      let foo = ()
      (** There are some nested comments in here, but an unpaired comment
@@ -165,9 +165,10 @@ <h2 id="preformatted-text">
      let bar =
        ignore foo
     </code>
-   </pre><p>There are also verbatim blocks:</p>
-   <pre>The main difference is these don't get syntax highlighting.</pre>
-   <h2 id="lists"><a href="#lists" class="anchor"></a>Lists</h2>
+   </pre><p id="p18">There are also verbatim blocks:</p>
+   <pre id="math19">
+    The main difference is these don't get syntax highlighting.
+   </pre><h2 id="lists"><a href="#lists" class="anchor"></a>Lists</h2>
    <ul><li>This is a</li><li>shorthand bulleted list,</li>
     <li>and the paragraphs in each list item support <em>styling</em>.</li>
    </ul><ol><li>This is a</li><li>shorthand numbered list.</li></ol>
@@ -176,12 +177,12 @@ <h2 id="lists"><a href="#lists" class="anchor"></a>Lists</h2>
      to put two paragraphs into a shorthand list item using a double 
      line break
     </li>
-   </ul><p>just creates a paragraph outside the list.</p>
+   </ul><p id="p26">just creates a paragraph outside the list.</p>
    <ul><li>Similarly, inserting a blank line between two list items</li></ul>
    <ul><li>creates two separate lists.</li></ul>
    <ul>
-    <li><p>To get around this limitation, one</p>
-     <p>can use explicitly-delimited lists.</p>
+    <li><p id="p29">To get around this limitation, one</p>
+     <p id="p30">can use explicitly-delimited lists.</p>
     </li><li>This one is bulleted,</li>
    </ul><ol><li>but there is also the numbered variant.</li></ol>
    <ul>
@@ -192,11 +193,11 @@ <h2 id="lists"><a href="#lists" class="anchor"></a>Lists</h2>
      </ul>
     </li>
    </ul><h2 id="unicode"><a href="#unicode" class="anchor"></a>Unicode</h2>
-   <p>The parser supports any ASCII-compatible encoding, in particuλar
-     UTF-8.
+   <p id="p37">The parser supports any ASCII-compatible encoding, in 
+    particuλar UTF-8.
    </p><h2 id="raw-html"><a href="#raw-html" class="anchor"></a>Raw HTML</h2>
-   <p>Raw HTML can be <input type="text" placeholder="inserted"> as inline
-     elements into sentences.
+   <p id="p38">Raw HTML can be <input type="text" placeholder="inserted">
+     as inline elements into sentences.
    </p>
    
     <blockquote>
@@ -205,10 +206,10 @@ <h2 id="lists"><a href="#lists" class="anchor"></a>Lists</h2>
     </blockquote>
     
    <h2 id="math"><a href="#math" class="anchor"></a>Math</h2>
-   <p>Math elements can be inline: 
+   <p id="p40">Math elements can be inline: 
     <code class="odoc-katex-math">\int_{-\infty}^\infty</code>, or blocks:
    </p>
-   <div>
+   <div id="v41">
     <pre class="odoc-katex-math display">
          % \f is defined as #1f(#2) using the macro
          \newcommand{\f}[2]{#1f(#2)}
@@ -223,42 +224,45 @@ <h2 id="math"><a href="#math" class="anchor"></a>Math</h2>
    <ul class="modules"><li><a href="Markup-X.html"><code>X</code></a> </li>
     <li><a href="Markup-Y.html"><code>Y</code></a> </li>
    </ul><h2 id="tags"><a href="#tags" class="anchor"></a>Tags</h2>
-   <p>Each comment can end with zero or more tags. Here are some examples:
+   <p id="p42">Each comment can end with zero or more tags. Here are 
+    some examples:
    </p>
    <ul class="at-tags">
     <li class="author"><span class="at-tag">author</span> antron</li>
    </ul>
    <ul class="at-tags">
     <li class="deprecated"><span class="at-tag">deprecated</span> 
-     <p>a <em>long</em> time ago</p>
+     <p id="p43">a <em>long</em> time ago</p>
     </li>
    </ul>
    <ul class="at-tags">
     <li class="parameter"><span class="at-tag">parameter</span> 
-     <span class="value">foo</span> <p>unused</p>
+     <span class="value">foo</span> <p id="p44">unused</p>
     </li>
    </ul>
    <ul class="at-tags">
     <li class="raises"><span class="at-tag">raises</span> 
-     <code>Failure</code> <p>always</p>
+     <code>Failure</code> <p id="p45">always</p>
     </li>
    </ul>
    <ul class="at-tags">
-    <li class="returns"><span class="at-tag">returns</span> <p>never</p></li>
+    <li class="returns"><span class="at-tag">returns</span> 
+     <p id="p46">never</p>
+    </li>
    </ul>
    <ul class="at-tags">
     <li class="see"><span class="at-tag">see</span> 
-     <a href="#" class="value">#</a> <p>this url</p>
+     <a href="#" class="value">#</a> <p id="p47">this url</p>
     </li>
    </ul>
    <ul class="at-tags">
     <li class="see"><span class="at-tag">see</span> 
-     <code class="value">foo.ml</code> <p>this file</p>
+     <code class="value">foo.ml</code> <p id="p48">this file</p>
     </li>
    </ul>
    <ul class="at-tags">
     <li class="see"><span class="at-tag">see</span> 
-     <span class="value">Foo</span> <p>this document</p>
+     <span class="value">Foo</span> <p id="p49">this document</p>
     </li>
    </ul>
    <ul class="at-tags">
@@ -267,7 +271,7 @@ <h2 id="math"><a href="#math" class="anchor"></a>Math</h2>
    <ul class="at-tags">
     <li class="before"><span class="at-tag">before</span> 
      <span class="value">1.0</span> 
-     <p>it was in b<sup>e</sup>t<sub>a</sub></p>
+     <p id="p50">it was in b<sup>e</sup>t<sub>a</sub></p>
     </li>
    </ul>
    <ul class="at-tags">
@@ -279,11 +283,11 @@ <h2 id="math"><a href="#math" class="anchor"></a>Math</h2>
      <code><span><span class="keyword">val</span> foo : unit</span></code>
     </div>
     <div class="spec-doc">
-     <p>Comments in structure items <b>support</b> <em>markup</em>, t
-      <sup>o</sup><sub>o</sub>.
+     <p id="p51">Comments in structure items <b>support</b> <em>markup</em>
+      , t<sup>o</sup><sub>o</sub>.
      </p>
     </div>
-   </div><p>Some modules to support references.</p>
+   </div><p id="p52">Some modules to support references.</p>
    <div class="odoc-spec">
     <div class="spec module anchored" id="module-X">
      <a href="#module-X" class="anchor"></a>
diff --git a/test/generators/html/Module.html b/test/generators/html/Module.html
index 98e06a8c70..e478aa7c14 100644
--- a/test/generators/html/Module.html
+++ b/test/generators/html/Module.html
@@ -8,7 +8,7 @@
  </head>
  <body class="odoc">
   <header class="odoc-preamble">
-   <h1>Module <code><span>Module</span></code></h1><p>Foo.</p>
+   <h1>Module <code><span>Module</span></code></h1><p id="p0">Foo.</p>
   </header>
   <div class="odoc-content">
    <div class="odoc-spec">
@@ -17,8 +17,9 @@ <h1>Module <code><span>Module</span></code></h1><p>Foo.</p>
      <code><span><span class="keyword">val</span> foo : unit</span></code>
     </div>
     <div class="spec-doc">
-     <p>The module needs at least one signature item, otherwise a bug
-       causes the compiler to drop the module comment (above). See 
+     <p id="p1">The module needs at least one signature item, otherwise
+       a bug causes the compiler to drop the module comment (above). 
+      See 
       <a href="https://caml.inria.fr/mantis/view.php?id=7701">
        https://caml.inria.fr/mantis/view.php?id=7701
       </a>.
diff --git a/test/generators/html/Module_type_alias.html b/test/generators/html/Module_type_alias.html
index 7ffa36fbc7..b9215af61f 100644
--- a/test/generators/html/Module_type_alias.html
+++ b/test/generators/html/Module_type_alias.html
@@ -10,7 +10,7 @@
  <body class="odoc">
   <header class="odoc-preamble">
    <h1>Module <code><span>Module_type_alias</span></code></h1>
-   <p>Module Type Aliases</p>
+   <p id="p0">Module Type Aliases</p>
   </header>
   <div class="odoc-content">
    <div class="odoc-spec">
diff --git a/test/generators/html/Nested-F-argument-1-Arg1.html b/test/generators/html/Nested-F-argument-1-Arg1.html
index c71d953347..108e1d2ba9 100644
--- a/test/generators/html/Nested-F-argument-1-Arg1.html
+++ b/test/generators/html/Nested-F-argument-1-Arg1.html
@@ -25,7 +25,7 @@ <h2 id="type"><a href="#type" class="anchor"></a>Type</h2>
     <div class="spec type anchored" id="type-t">
      <a href="#type-t" class="anchor"></a>
      <code><span><span class="keyword">type</span> t</span></code>
-    </div><div class="spec-doc"><p>Some type.</p></div>
+    </div><div class="spec-doc"><p id="p7">Some type.</p></div>
    </div><h2 id="values"><a href="#values" class="anchor"></a>Values</h2>
    <div class="odoc-spec">
     <div class="spec value anchored" id="val-y">
@@ -34,7 +34,7 @@ <h2 id="type"><a href="#type" class="anchor"></a>Type</h2>
       <span><span class="keyword">val</span> y : <a href="#type-t">t</a>
       </span>
      </code>
-    </div><div class="spec-doc"><p>The value of y.</p></div>
+    </div><div class="spec-doc"><p id="p8">The value of y.</p></div>
    </div>
   </div>
  </body>
diff --git a/test/generators/html/Nested-F-argument-2-Arg2.html b/test/generators/html/Nested-F-argument-2-Arg2.html
index 86df8b8b7f..02208a4ad7 100644
--- a/test/generators/html/Nested-F-argument-2-Arg2.html
+++ b/test/generators/html/Nested-F-argument-2-Arg2.html
@@ -22,7 +22,7 @@ <h2 id="type"><a href="#type" class="anchor"></a>Type</h2>
     <div class="spec type anchored" id="type-t">
      <a href="#type-t" class="anchor"></a>
      <code><span><span class="keyword">type</span> t</span></code>
-    </div><div class="spec-doc"><p>Some type.</p></div>
+    </div><div class="spec-doc"><p id="p11">Some type.</p></div>
    </div>
   </div>
  </body>
diff --git a/test/generators/html/Nested-F.html b/test/generators/html/Nested-F.html
index 34877afd6d..e8bd276971 100644
--- a/test/generators/html/Nested-F.html
+++ b/test/generators/html/Nested-F.html
@@ -12,7 +12,8 @@
   </nav>
   <header class="odoc-preamble">
    <h1>Module <code><span>Nested.F</span></code></h1>
-   <p>This is a functor F.</p><p>Some additional comments.</p>
+   <p id="p9">This is a functor F.</p>
+   <p id="p10">Some additional comments.</p>
   </header>
   <nav class="odoc-toc">
    <ul><li><a href="#parameters">Parameters</a></li>
@@ -53,7 +54,7 @@ <h2 id="type"><a href="#type" class="anchor"></a>Type</h2>
         * <a href="Nested-F-argument-2-Arg2.html#type-t">Arg2.t</a>
       </span>
      </code>
-    </div><div class="spec-doc"><p>Some type.</p></div>
+    </div><div class="spec-doc"><p id="p12">Some type.</p></div>
    </div>
   </div>
  </body>
diff --git a/test/generators/html/Nested-X.html b/test/generators/html/Nested-X.html
index ebd1b378b1..f16ee43741 100644
--- a/test/generators/html/Nested-X.html
+++ b/test/generators/html/Nested-X.html
@@ -11,8 +11,8 @@
    <a href="Nested.html">Nested</a> &#x00BB; X
   </nav>
   <header class="odoc-preamble">
-   <h1>Module <code><span>Nested.X</span></code></h1><p>This is module X.</p>
-   <p>Some additional comments.</p>
+   <h1>Module <code><span>Nested.X</span></code></h1>
+   <p id="p1">This is module X.</p><p id="p2">Some additional comments.</p>
   </header>
   <nav class="odoc-toc">
    <ul><li><a href="#type">Type</a></li><li><a href="#values">Values</a></li>
@@ -24,7 +24,7 @@ <h2 id="type"><a href="#type" class="anchor"></a>Type</h2>
     <div class="spec type anchored" id="type-t">
      <a href="#type-t" class="anchor"></a>
      <code><span><span class="keyword">type</span> t</span></code>
-    </div><div class="spec-doc"><p>Some type.</p></div>
+    </div><div class="spec-doc"><p id="p3">Some type.</p></div>
    </div><h2 id="values"><a href="#values" class="anchor"></a>Values</h2>
    <div class="odoc-spec">
     <div class="spec value anchored" id="val-x">
@@ -33,7 +33,7 @@ <h2 id="type"><a href="#type" class="anchor"></a>Type</h2>
       <span><span class="keyword">val</span> x : <a href="#type-t">t</a>
       </span>
      </code>
-    </div><div class="spec-doc"><p>The value of x.</p></div>
+    </div><div class="spec-doc"><p id="p4">The value of x.</p></div>
    </div>
   </div>
  </body>
diff --git a/test/generators/html/Nested-class-z.html b/test/generators/html/Nested-class-z.html
index 9b317ef6c4..923193edfe 100644
--- a/test/generators/html/Nested-class-z.html
+++ b/test/generators/html/Nested-class-z.html
@@ -11,8 +11,8 @@
    <a href="Nested.html">Nested</a> &#x00BB; z
   </nav>
   <header class="odoc-preamble">
-   <h1>Class <code><span>Nested.z</span></code></h1><p>This is class z.</p>
-   <p>Some additional comments.</p>
+   <h1>Class <code><span>Nested.z</span></code></h1>
+   <p id="p13">This is class z.</p><p id="p14">Some additional comments.</p>
   </header>
   <nav class="odoc-toc"><ul><li><a href="#methods">Methods</a></li></ul>
   </nav>
@@ -21,7 +21,7 @@ <h1>Class <code><span>Nested.z</span></code></h1><p>This is class z.</p>
     <div class="spec value instance-variable anchored" id="val-y">
      <a href="#val-y" class="anchor"></a>
      <code><span><span class="keyword">val</span> y : int</span></code>
-    </div><div class="spec-doc"><p>Some value.</p></div>
+    </div><div class="spec-doc"><p id="p15">Some value.</p></div>
    </div>
    <div class="odoc-spec">
     <div class="spec value instance-variable anchored" id="val-y'">
@@ -38,7 +38,7 @@ <h1>Class <code><span>Nested.z</span></code></h1><p>This is class z.</p>
     <div class="spec method anchored" id="method-z">
      <a href="#method-z" class="anchor"></a>
      <code><span><span class="keyword">method</span> z : int</span></code>
-    </div><div class="spec-doc"><p>Some method.</p></div>
+    </div><div class="spec-doc"><p id="p16">Some method.</p></div>
    </div>
    <div class="odoc-spec">
     <div class="spec method anchored" id="method-z'">
diff --git a/test/generators/html/Nested-module-type-Y.html b/test/generators/html/Nested-module-type-Y.html
index 0f847780ee..3535f7703b 100644
--- a/test/generators/html/Nested-module-type-Y.html
+++ b/test/generators/html/Nested-module-type-Y.html
@@ -12,7 +12,8 @@
   </nav>
   <header class="odoc-preamble">
    <h1>Module type <code><span>Nested.Y</span></code></h1>
-   <p>This is module type Y.</p><p>Some additional comments.</p>
+   <p id="p5">This is module type Y.</p>
+   <p id="p6">Some additional comments.</p>
   </header>
   <nav class="odoc-toc">
    <ul><li><a href="#type">Type</a></li><li><a href="#values">Values</a></li>
@@ -24,7 +25,7 @@ <h2 id="type"><a href="#type" class="anchor"></a>Type</h2>
     <div class="spec type anchored" id="type-t">
      <a href="#type-t" class="anchor"></a>
      <code><span><span class="keyword">type</span> t</span></code>
-    </div><div class="spec-doc"><p>Some type.</p></div>
+    </div><div class="spec-doc"><p id="p7">Some type.</p></div>
    </div><h2 id="values"><a href="#values" class="anchor"></a>Values</h2>
    <div class="odoc-spec">
     <div class="spec value anchored" id="val-y">
@@ -33,7 +34,7 @@ <h2 id="type"><a href="#type" class="anchor"></a>Type</h2>
       <span><span class="keyword">val</span> y : <a href="#type-t">t</a>
       </span>
      </code>
-    </div><div class="spec-doc"><p>The value of y.</p></div>
+    </div><div class="spec-doc"><p id="p8">The value of y.</p></div>
    </div>
   </div>
  </body>
diff --git a/test/generators/html/Nested.html b/test/generators/html/Nested.html
index 6a490bf140..9ff6f7bbd3 100644
--- a/test/generators/html/Nested.html
+++ b/test/generators/html/Nested.html
@@ -9,7 +9,7 @@
  <body class="odoc">
   <header class="odoc-preamble">
    <h1>Module <code><span>Nested</span></code></h1>
-   <p>This comment needs to be here before #235 is fixed.</p>
+   <p id="p0">This comment needs to be here before #235 is fixed.</p>
   </header>
   <nav class="odoc-toc">
    <ul><li><a href="#module">Module</a></li>
diff --git a/test/generators/html/Ocamlary-Aliases.html b/test/generators/html/Ocamlary-Aliases.html
index 171b0d549f..fedec3ba8c 100644
--- a/test/generators/html/Ocamlary-Aliases.html
+++ b/test/generators/html/Ocamlary-Aliases.html
@@ -13,7 +13,7 @@
   </nav>
   <header class="odoc-preamble">
    <h1>Module <code><span>Ocamlary.Aliases</span></code></h1>
-   <p>Let's imitate jst's layout.</p>
+   <p id="p139">Let's imitate jst's layout.</p>
   </header>
   <nav class="odoc-toc"><ul><li><a href="#incl">include of Foo</a></li></ul>
   </nav>
@@ -102,8 +102,8 @@ <h1>Module <code><span>Ocamlary.Aliases</span></code></h1>
      </code>
     </div>
    </div><h4 id="incl"><a href="#incl" class="anchor"></a>include of Foo</h4>
-   <p>Just for giggle, let's see what happens when we include 
-    <a href="Ocamlary-Aliases-Foo.html"><code>Foo</code></a>.
+   <p id="p140">Just for giggle, let's see what happens when we include
+     <a href="Ocamlary-Aliases-Foo.html"><code>Foo</code></a>.
    </p>
    <div class="odoc-include">
     <details open="open">
@@ -171,7 +171,7 @@ <h1>Module <code><span>Ocamlary.Aliases</span></code></h1>
      </code>
     </div>
    </div>
-   <p>And also, let's refer to 
+   <p id="p141">And also, let's refer to 
     <a href="Ocamlary-Aliases-Foo-A.html#type-t"><code>A.t</code></a>
      and 
     <a href="Ocamlary-Aliases-Foo-B.html#val-id"><code>Foo.B.id</code></a>
diff --git a/test/generators/html/Ocamlary-Buffer.html b/test/generators/html/Ocamlary-Buffer.html
index f1235c684d..e378f20e6b 100644
--- a/test/generators/html/Ocamlary-Buffer.html
+++ b/test/generators/html/Ocamlary-Buffer.html
@@ -13,8 +13,8 @@
   </nav>
   <header class="odoc-preamble">
    <h1>Module <code><span>Ocamlary.Buffer</span></code></h1>
-   <p>References are resolved after everything, so <code>{!Buffer.t}</code>
-     won't resolve.
+   <p id="p43">References are resolved after everything, so 
+    <code>{!Buffer.t}</code> won't resolve.
    </p>
   </header>
   <div class="odoc-content">
diff --git a/test/generators/html/Ocamlary-CollectionModule-InnerModuleA-InnerModuleA'.html b/test/generators/html/Ocamlary-CollectionModule-InnerModuleA-InnerModuleA'.html
index 18fb9a5bb3..ea35dfc3b5 100644
--- a/test/generators/html/Ocamlary-CollectionModule-InnerModuleA-InnerModuleA'.html
+++ b/test/generators/html/Ocamlary-CollectionModule-InnerModuleA-InnerModuleA'.html
@@ -18,7 +18,7 @@
   </nav>
   <header class="odoc-preamble">
    <h1>Module <code><span>InnerModuleA.InnerModuleA'</span></code></h1>
-   <p>This comment is for <code>InnerModuleA'</code>.</p>
+   <p id="p69">This comment is for <code>InnerModuleA'</code>.</p>
   </header>
   <div class="odoc-content">
    <div class="odoc-spec">
@@ -32,7 +32,8 @@ <h1>Module <code><span>InnerModuleA.InnerModuleA'</span></code></h1>
       </span>
      </code>
     </div>
-    <div class="spec-doc"><p>This comment is for <code>t</code>.</p></div>
+    <div class="spec-doc"><p id="p70">This comment is for <code>t</code>.</p>
+    </div>
    </div>
   </div>
  </body>
diff --git a/test/generators/html/Ocamlary-CollectionModule-InnerModuleA-module-type-InnerModuleTypeA'.html b/test/generators/html/Ocamlary-CollectionModule-InnerModuleA-module-type-InnerModuleTypeA'.html
index c23b24485f..f34270c8aa 100644
--- a/test/generators/html/Ocamlary-CollectionModule-InnerModuleA-module-type-InnerModuleTypeA'.html
+++ b/test/generators/html/Ocamlary-CollectionModule-InnerModuleA-module-type-InnerModuleTypeA'.html
@@ -20,7 +20,7 @@
   </nav>
   <header class="odoc-preamble">
    <h1>Module type <code><span>InnerModuleA.InnerModuleTypeA'</span></code>
-   </h1><p>This comment is for <code>InnerModuleTypeA'</code>.</p>
+   </h1><p id="p71">This comment is for <code>InnerModuleTypeA'</code>.</p>
   </header>
   <div class="odoc-content">
    <div class="odoc-spec">
@@ -35,7 +35,8 @@ <h1>Module type <code><span>InnerModuleA.InnerModuleTypeA'</span></code>
       </span>
      </code>
     </div>
-    <div class="spec-doc"><p>This comment is for <code>t</code>.</p></div>
+    <div class="spec-doc"><p id="p72">This comment is for <code>t</code>.</p>
+    </div>
    </div>
   </div>
  </body>
diff --git a/test/generators/html/Ocamlary-CollectionModule-InnerModuleA.html b/test/generators/html/Ocamlary-CollectionModule-InnerModuleA.html
index 4aacd1d3cf..95e1846675 100644
--- a/test/generators/html/Ocamlary-CollectionModule-InnerModuleA.html
+++ b/test/generators/html/Ocamlary-CollectionModule-InnerModuleA.html
@@ -15,7 +15,7 @@
   </nav>
   <header class="odoc-preamble">
    <h1>Module <code><span>CollectionModule.InnerModuleA</span></code></h1>
-   <p>This comment is for <code>InnerModuleA</code>.</p>
+   <p id="p67">This comment is for <code>InnerModuleA</code>.</p>
   </header>
   <div class="odoc-content">
    <div class="odoc-spec">
@@ -28,7 +28,8 @@ <h1>Module <code><span>CollectionModule.InnerModuleA</span></code></h1>
       </span>
      </code>
     </div>
-    <div class="spec-doc"><p>This comment is for <code>t</code>.</p></div>
+    <div class="spec-doc"><p id="p68">This comment is for <code>t</code>.</p>
+    </div>
    </div>
    <div class="odoc-spec">
     <div class="spec module anchored" id="module-InnerModuleA'">
diff --git a/test/generators/html/Ocamlary-CollectionModule.html b/test/generators/html/Ocamlary-CollectionModule.html
index 8e725baf5a..f2cc7b8b2e 100644
--- a/test/generators/html/Ocamlary-CollectionModule.html
+++ b/test/generators/html/Ocamlary-CollectionModule.html
@@ -13,7 +13,7 @@
   </nav>
   <header class="odoc-preamble">
    <h1>Module <code><span>Ocamlary.CollectionModule</span></code></h1>
-   <p>This comment is for <code>CollectionModule</code>.</p>
+   <p id="p65">This comment is for <code>CollectionModule</code>.</p>
   </header>
   <div class="odoc-content">
    <div class="odoc-spec">
@@ -21,7 +21,8 @@ <h1>Module <code><span>Ocamlary.CollectionModule</span></code></h1>
      <a href="#type-collection" class="anchor"></a>
      <code><span><span class="keyword">type</span> collection</span></code>
     </div>
-    <div class="spec-doc"><p>This comment is for <code>collection</code>.</p>
+    <div class="spec-doc">
+     <p id="p66">This comment is for <code>collection</code>.</p>
     </div>
    </div>
    <div class="odoc-spec">
diff --git a/test/generators/html/Ocamlary-Empty.html b/test/generators/html/Ocamlary-Empty.html
index f9b2e0088b..5075228d60 100644
--- a/test/generators/html/Ocamlary-Empty.html
+++ b/test/generators/html/Ocamlary-Empty.html
@@ -13,8 +13,8 @@
   </nav>
   <header class="odoc-preamble">
    <h1>Module <code><span>Ocamlary.Empty</span></code></h1>
-   <p>A plain, empty module</p>
-   <p>This module has a signature without any members.</p>
+   <p id="p29">A plain, empty module</p>
+   <p id="p30">This module has a signature without any members.</p>
   </header><div class="odoc-content"></div>
  </body>
 </html>
diff --git a/test/generators/html/Ocamlary-FunctorTypeOf-argument-1-Collection-InnerModuleA-InnerModuleA'.html b/test/generators/html/Ocamlary-FunctorTypeOf-argument-1-Collection-InnerModuleA-InnerModuleA'.html
index 77da390a7f..408110e555 100644
--- a/test/generators/html/Ocamlary-FunctorTypeOf-argument-1-Collection-InnerModuleA-InnerModuleA'.html
+++ b/test/generators/html/Ocamlary-FunctorTypeOf-argument-1-Collection-InnerModuleA-InnerModuleA'.html
@@ -24,7 +24,7 @@
   </nav>
   <header class="odoc-preamble">
    <h1>Module <code><span>InnerModuleA.InnerModuleA'</span></code></h1>
-   <p>This comment is for <code>InnerModuleA'</code>.</p>
+   <p id="p69">This comment is for <code>InnerModuleA'</code>.</p>
   </header>
   <div class="odoc-content">
    <div class="odoc-spec">
@@ -38,7 +38,8 @@ <h1>Module <code><span>InnerModuleA.InnerModuleA'</span></code></h1>
       </span>
      </code>
     </div>
-    <div class="spec-doc"><p>This comment is for <code>t</code>.</p></div>
+    <div class="spec-doc"><p id="p70">This comment is for <code>t</code>.</p>
+    </div>
    </div>
   </div>
  </body>
diff --git a/test/generators/html/Ocamlary-FunctorTypeOf-argument-1-Collection-InnerModuleA-module-type-InnerModuleTypeA'.html b/test/generators/html/Ocamlary-FunctorTypeOf-argument-1-Collection-InnerModuleA-module-type-InnerModuleTypeA'.html
index ea06b050ba..d4a08133fe 100644
--- a/test/generators/html/Ocamlary-FunctorTypeOf-argument-1-Collection-InnerModuleA-module-type-InnerModuleTypeA'.html
+++ b/test/generators/html/Ocamlary-FunctorTypeOf-argument-1-Collection-InnerModuleA-module-type-InnerModuleTypeA'.html
@@ -24,7 +24,7 @@
   </nav>
   <header class="odoc-preamble">
    <h1>Module type <code><span>InnerModuleA.InnerModuleTypeA'</span></code>
-   </h1><p>This comment is for <code>InnerModuleTypeA'</code>.</p>
+   </h1><p id="p71">This comment is for <code>InnerModuleTypeA'</code>.</p>
   </header>
   <div class="odoc-content">
    <div class="odoc-spec">
@@ -39,7 +39,8 @@ <h1>Module type <code><span>InnerModuleA.InnerModuleTypeA'</span></code>
       </span>
      </code>
     </div>
-    <div class="spec-doc"><p>This comment is for <code>t</code>.</p></div>
+    <div class="spec-doc"><p id="p72">This comment is for <code>t</code>.</p>
+    </div>
    </div>
   </div>
  </body>
diff --git a/test/generators/html/Ocamlary-FunctorTypeOf-argument-1-Collection-InnerModuleA.html b/test/generators/html/Ocamlary-FunctorTypeOf-argument-1-Collection-InnerModuleA.html
index 4a52bef20c..a7809c5314 100644
--- a/test/generators/html/Ocamlary-FunctorTypeOf-argument-1-Collection-InnerModuleA.html
+++ b/test/generators/html/Ocamlary-FunctorTypeOf-argument-1-Collection-InnerModuleA.html
@@ -18,7 +18,7 @@
   </nav>
   <header class="odoc-preamble">
    <h1>Module <code><span>Collection.InnerModuleA</span></code></h1>
-   <p>This comment is for <code>InnerModuleA</code>.</p>
+   <p id="p67">This comment is for <code>InnerModuleA</code>.</p>
   </header>
   <div class="odoc-content">
    <div class="odoc-spec">
@@ -33,7 +33,8 @@ <h1>Module <code><span>Collection.InnerModuleA</span></code></h1>
       </span>
      </code>
     </div>
-    <div class="spec-doc"><p>This comment is for <code>t</code>.</p></div>
+    <div class="spec-doc"><p id="p68">This comment is for <code>t</code>.</p>
+    </div>
    </div>
    <div class="odoc-spec">
     <div class="spec module anchored" id="module-InnerModuleA'">
diff --git a/test/generators/html/Ocamlary-FunctorTypeOf-argument-1-Collection.html b/test/generators/html/Ocamlary-FunctorTypeOf-argument-1-Collection.html
index 848e9249d1..606f2bd39c 100644
--- a/test/generators/html/Ocamlary-FunctorTypeOf-argument-1-Collection.html
+++ b/test/generators/html/Ocamlary-FunctorTypeOf-argument-1-Collection.html
@@ -17,13 +17,14 @@
    <h1>Parameter <code><span>FunctorTypeOf.Collection</span></code></h1>
   </header>
   <div class="odoc-content">
-   <p>This comment is for <code>CollectionModule</code>.</p>
+   <p id="p65">This comment is for <code>CollectionModule</code>.</p>
    <div class="odoc-spec">
     <div class="spec type anchored" id="type-collection">
      <a href="#type-collection" class="anchor"></a>
      <code><span><span class="keyword">type</span> collection</span></code>
     </div>
-    <div class="spec-doc"><p>This comment is for <code>collection</code>.</p>
+    <div class="spec-doc">
+     <p id="p66">This comment is for <code>collection</code>.</p>
     </div>
    </div>
    <div class="odoc-spec">
diff --git a/test/generators/html/Ocamlary-FunctorTypeOf.html b/test/generators/html/Ocamlary-FunctorTypeOf.html
index 84d05ce6cc..8c1b5a09f8 100644
--- a/test/generators/html/Ocamlary-FunctorTypeOf.html
+++ b/test/generators/html/Ocamlary-FunctorTypeOf.html
@@ -13,7 +13,7 @@
   </nav>
   <header class="odoc-preamble">
    <h1>Module <code><span>Ocamlary.FunctorTypeOf</span></code></h1>
-   <p>This comment is for <code>FunctorTypeOf</code>.</p>
+   <p id="p92">This comment is for <code>FunctorTypeOf</code>.</p>
   </header>
   <nav class="odoc-toc">
    <ul><li><a href="#parameters">Parameters</a></li>
@@ -51,7 +51,8 @@ <h2 id="signature"><a href="#signature" class="anchor"></a>Signature</h2>
       </span>
      </code>
     </div>
-    <div class="spec-doc"><p>This comment is for <code>t</code>.</p></div>
+    <div class="spec-doc"><p id="p93">This comment is for <code>t</code>.</p>
+    </div>
    </div>
   </div>
  </body>
diff --git a/test/generators/html/Ocamlary-ModuleWithSignature.html b/test/generators/html/Ocamlary-ModuleWithSignature.html
index f5ed434042..78befd214f 100644
--- a/test/generators/html/Ocamlary-ModuleWithSignature.html
+++ b/test/generators/html/Ocamlary-ModuleWithSignature.html
@@ -13,7 +13,7 @@
   </nav>
   <header class="odoc-preamble">
    <h1>Module <code><span>Ocamlary.ModuleWithSignature</span></code></h1>
-   <p>A plain module of a signature of 
+   <p id="p38">A plain module of a signature of 
     <a href="Ocamlary-module-type-EmptySig.html"><code>EmptySig</code></a>
      (reference)
    </p>
diff --git a/test/generators/html/Ocamlary-ModuleWithSignatureAlias.html b/test/generators/html/Ocamlary-ModuleWithSignatureAlias.html
index 60e6e191e9..94e47c110c 100644
--- a/test/generators/html/Ocamlary-ModuleWithSignatureAlias.html
+++ b/test/generators/html/Ocamlary-ModuleWithSignatureAlias.html
@@ -14,10 +14,10 @@
   </nav>
   <header class="odoc-preamble">
    <h1>Module <code><span>Ocamlary.ModuleWithSignatureAlias</span></code>
-   </h1><p>A plain module with an alias signature</p>
+   </h1><p id="p39">A plain module with an alias signature</p>
    <ul class="at-tags">
     <li class="deprecated"><span class="at-tag">deprecated</span> 
-     <p>I don't like this element any more.</p>
+     <p id="p40">I don't like this element any more.</p>
     </li>
    </ul>
   </header><div class="odoc-content"></div>
diff --git a/test/generators/html/Ocamlary-Recollection-InnerModuleA-InnerModuleA'.html b/test/generators/html/Ocamlary-Recollection-InnerModuleA-InnerModuleA'.html
index 73b7bbc2fe..2d53f49861 100644
--- a/test/generators/html/Ocamlary-Recollection-InnerModuleA-InnerModuleA'.html
+++ b/test/generators/html/Ocamlary-Recollection-InnerModuleA-InnerModuleA'.html
@@ -18,7 +18,7 @@
   </nav>
   <header class="odoc-preamble">
    <h1>Module <code><span>InnerModuleA.InnerModuleA'</span></code></h1>
-   <p>This comment is for <code>InnerModuleA'</code>.</p>
+   <p id="p69">This comment is for <code>InnerModuleA'</code>.</p>
   </header>
   <div class="odoc-content">
    <div class="odoc-spec">
@@ -32,7 +32,8 @@ <h1>Module <code><span>InnerModuleA.InnerModuleA'</span></code></h1>
       </span>
      </code>
     </div>
-    <div class="spec-doc"><p>This comment is for <code>t</code>.</p></div>
+    <div class="spec-doc"><p id="p70">This comment is for <code>t</code>.</p>
+    </div>
    </div>
   </div>
  </body>
diff --git a/test/generators/html/Ocamlary-Recollection-InnerModuleA-module-type-InnerModuleTypeA'.html b/test/generators/html/Ocamlary-Recollection-InnerModuleA-module-type-InnerModuleTypeA'.html
index 40b6b0cfe4..e6ccd91d6c 100644
--- a/test/generators/html/Ocamlary-Recollection-InnerModuleA-module-type-InnerModuleTypeA'.html
+++ b/test/generators/html/Ocamlary-Recollection-InnerModuleA-module-type-InnerModuleTypeA'.html
@@ -19,7 +19,7 @@
   </nav>
   <header class="odoc-preamble">
    <h1>Module type <code><span>InnerModuleA.InnerModuleTypeA'</span></code>
-   </h1><p>This comment is for <code>InnerModuleTypeA'</code>.</p>
+   </h1><p id="p71">This comment is for <code>InnerModuleTypeA'</code>.</p>
   </header>
   <div class="odoc-content">
    <div class="odoc-spec">
@@ -33,7 +33,8 @@ <h1>Module type <code><span>InnerModuleA.InnerModuleTypeA'</span></code>
       </span>
      </code>
     </div>
-    <div class="spec-doc"><p>This comment is for <code>t</code>.</p></div>
+    <div class="spec-doc"><p id="p72">This comment is for <code>t</code>.</p>
+    </div>
    </div>
   </div>
  </body>
diff --git a/test/generators/html/Ocamlary-Recollection-InnerModuleA.html b/test/generators/html/Ocamlary-Recollection-InnerModuleA.html
index 1252ce3cff..f51f8a8cc0 100644
--- a/test/generators/html/Ocamlary-Recollection-InnerModuleA.html
+++ b/test/generators/html/Ocamlary-Recollection-InnerModuleA.html
@@ -15,7 +15,7 @@
   </nav>
   <header class="odoc-preamble">
    <h1>Module <code><span>Recollection.InnerModuleA</span></code></h1>
-   <p>This comment is for <code>InnerModuleA</code>.</p>
+   <p id="p67">This comment is for <code>InnerModuleA</code>.</p>
   </header>
   <div class="odoc-content">
    <div class="odoc-spec">
@@ -27,7 +27,8 @@ <h1>Module <code><span>Recollection.InnerModuleA</span></code></h1>
       </span>
      </code>
     </div>
-    <div class="spec-doc"><p>This comment is for <code>t</code>.</p></div>
+    <div class="spec-doc"><p id="p68">This comment is for <code>t</code>.</p>
+    </div>
    </div>
    <div class="odoc-spec">
     <div class="spec module anchored" id="module-InnerModuleA'">
diff --git a/test/generators/html/Ocamlary-Recollection-argument-1-C-InnerModuleA-InnerModuleA'.html b/test/generators/html/Ocamlary-Recollection-argument-1-C-InnerModuleA-InnerModuleA'.html
index 4dcb7d91d7..3d57ff246c 100644
--- a/test/generators/html/Ocamlary-Recollection-argument-1-C-InnerModuleA-InnerModuleA'.html
+++ b/test/generators/html/Ocamlary-Recollection-argument-1-C-InnerModuleA-InnerModuleA'.html
@@ -20,7 +20,7 @@
   </nav>
   <header class="odoc-preamble">
    <h1>Module <code><span>InnerModuleA.InnerModuleA'</span></code></h1>
-   <p>This comment is for <code>InnerModuleA'</code>.</p>
+   <p id="p69">This comment is for <code>InnerModuleA'</code>.</p>
   </header>
   <div class="odoc-content">
    <div class="odoc-spec">
@@ -34,7 +34,8 @@ <h1>Module <code><span>InnerModuleA.InnerModuleA'</span></code></h1>
       </span>
      </code>
     </div>
-    <div class="spec-doc"><p>This comment is for <code>t</code>.</p></div>
+    <div class="spec-doc"><p id="p70">This comment is for <code>t</code>.</p>
+    </div>
    </div>
   </div>
  </body>
diff --git a/test/generators/html/Ocamlary-Recollection-argument-1-C-InnerModuleA-module-type-InnerModuleTypeA'.html b/test/generators/html/Ocamlary-Recollection-argument-1-C-InnerModuleA-module-type-InnerModuleTypeA'.html
index a61c3551fd..134c120f86 100644
--- a/test/generators/html/Ocamlary-Recollection-argument-1-C-InnerModuleA-module-type-InnerModuleTypeA'.html
+++ b/test/generators/html/Ocamlary-Recollection-argument-1-C-InnerModuleA-module-type-InnerModuleTypeA'.html
@@ -21,7 +21,7 @@
   </nav>
   <header class="odoc-preamble">
    <h1>Module type <code><span>InnerModuleA.InnerModuleTypeA'</span></code>
-   </h1><p>This comment is for <code>InnerModuleTypeA'</code>.</p>
+   </h1><p id="p71">This comment is for <code>InnerModuleTypeA'</code>.</p>
   </header>
   <div class="odoc-content">
    <div class="odoc-spec">
@@ -36,7 +36,8 @@ <h1>Module type <code><span>InnerModuleA.InnerModuleTypeA'</span></code>
       </span>
      </code>
     </div>
-    <div class="spec-doc"><p>This comment is for <code>t</code>.</p></div>
+    <div class="spec-doc"><p id="p72">This comment is for <code>t</code>.</p>
+    </div>
    </div>
   </div>
  </body>
diff --git a/test/generators/html/Ocamlary-Recollection-argument-1-C-InnerModuleA.html b/test/generators/html/Ocamlary-Recollection-argument-1-C-InnerModuleA.html
index c96d3f8d2e..b2574af008 100644
--- a/test/generators/html/Ocamlary-Recollection-argument-1-C-InnerModuleA.html
+++ b/test/generators/html/Ocamlary-Recollection-argument-1-C-InnerModuleA.html
@@ -17,7 +17,7 @@
   </nav>
   <header class="odoc-preamble">
    <h1>Module <code><span>C.InnerModuleA</span></code></h1>
-   <p>This comment is for <code>InnerModuleA</code>.</p>
+   <p id="p67">This comment is for <code>InnerModuleA</code>.</p>
   </header>
   <div class="odoc-content">
    <div class="odoc-spec">
@@ -31,7 +31,8 @@ <h1>Module <code><span>C.InnerModuleA</span></code></h1>
       </span>
      </code>
     </div>
-    <div class="spec-doc"><p>This comment is for <code>t</code>.</p></div>
+    <div class="spec-doc"><p id="p68">This comment is for <code>t</code>.</p>
+    </div>
    </div>
    <div class="odoc-spec">
     <div class="spec module anchored" id="module-InnerModuleA'">
diff --git a/test/generators/html/Ocamlary-Recollection-argument-1-C.html b/test/generators/html/Ocamlary-Recollection-argument-1-C.html
index 0874817a0e..d10ea52874 100644
--- a/test/generators/html/Ocamlary-Recollection-argument-1-C.html
+++ b/test/generators/html/Ocamlary-Recollection-argument-1-C.html
@@ -16,13 +16,14 @@
    <h1>Parameter <code><span>Recollection.C</span></code></h1>
   </header>
   <div class="odoc-content">
-   <p>This comment is for <code>CollectionModule</code>.</p>
+   <p id="p65">This comment is for <code>CollectionModule</code>.</p>
    <div class="odoc-spec">
     <div class="spec type anchored" id="type-collection">
      <a href="#type-collection" class="anchor"></a>
      <code><span><span class="keyword">type</span> collection</span></code>
     </div>
-    <div class="spec-doc"><p>This comment is for <code>collection</code>.</p>
+    <div class="spec-doc">
+     <p id="p66">This comment is for <code>collection</code>.</p>
     </div>
    </div>
    <div class="odoc-spec">
diff --git a/test/generators/html/Ocamlary-Recollection.html b/test/generators/html/Ocamlary-Recollection.html
index 8fbc7722c4..63274968ed 100644
--- a/test/generators/html/Ocamlary-Recollection.html
+++ b/test/generators/html/Ocamlary-Recollection.html
@@ -33,7 +33,7 @@ <h2 id="parameters"><a href="#parameters" class="anchor"></a>Parameters
     </div>
    </div>
    <h2 id="signature"><a href="#signature" class="anchor"></a>Signature</h2>
-   <p>This comment is for <code>CollectionModule</code>.</p>
+   <p id="p65">This comment is for <code>CollectionModule</code>.</p>
    <div class="odoc-spec">
     <div class="spec type anchored" id="type-collection">
      <a href="#type-collection" class="anchor"></a>
@@ -47,7 +47,8 @@ <h2 id="signature"><a href="#signature" class="anchor"></a>Signature</h2>
       </span>
      </code>
     </div>
-    <div class="spec-doc"><p>This comment is for <code>collection</code>.</p>
+    <div class="spec-doc">
+     <p id="p66">This comment is for <code>collection</code>.</p>
     </div>
    </div>
    <div class="odoc-spec">
diff --git a/test/generators/html/Ocamlary-With10-module-type-T.html b/test/generators/html/Ocamlary-With10-module-type-T.html
index dc685c9b6c..505f01b65e 100644
--- a/test/generators/html/Ocamlary-With10-module-type-T.html
+++ b/test/generators/html/Ocamlary-With10-module-type-T.html
@@ -14,7 +14,8 @@
   </nav>
   <header class="odoc-preamble">
    <h1>Module type <code><span>With10.T</span></code></h1>
-   <p><a href="#"><code>With10.T</code></a> is a submodule type.</p>
+   <p id="p135"><a href="#"><code>With10.T</code></a> is a submodule type.
+   </p>
   </header>
   <div class="odoc-content">
    <div class="odoc-spec">
diff --git a/test/generators/html/Ocamlary-module-type-A-Q-InnerModuleA-InnerModuleA'.html b/test/generators/html/Ocamlary-module-type-A-Q-InnerModuleA-InnerModuleA'.html
index 30a10700e3..4bb2044d8c 100644
--- a/test/generators/html/Ocamlary-module-type-A-Q-InnerModuleA-InnerModuleA'.html
+++ b/test/generators/html/Ocamlary-module-type-A-Q-InnerModuleA-InnerModuleA'.html
@@ -18,7 +18,7 @@
   </nav>
   <header class="odoc-preamble">
    <h1>Module <code><span>InnerModuleA.InnerModuleA'</span></code></h1>
-   <p>This comment is for <code>InnerModuleA'</code>.</p>
+   <p id="p69">This comment is for <code>InnerModuleA'</code>.</p>
   </header>
   <div class="odoc-content">
    <div class="odoc-spec">
@@ -32,7 +32,8 @@ <h1>Module <code><span>InnerModuleA.InnerModuleA'</span></code></h1>
       </span>
      </code>
     </div>
-    <div class="spec-doc"><p>This comment is for <code>t</code>.</p></div>
+    <div class="spec-doc"><p id="p70">This comment is for <code>t</code>.</p>
+    </div>
    </div>
   </div>
  </body>
diff --git a/test/generators/html/Ocamlary-module-type-A-Q-InnerModuleA-module-type-InnerModuleTypeA'.html b/test/generators/html/Ocamlary-module-type-A-Q-InnerModuleA-module-type-InnerModuleTypeA'.html
index 900196c3cd..5279239faf 100644
--- a/test/generators/html/Ocamlary-module-type-A-Q-InnerModuleA-module-type-InnerModuleTypeA'.html
+++ b/test/generators/html/Ocamlary-module-type-A-Q-InnerModuleA-module-type-InnerModuleTypeA'.html
@@ -19,7 +19,7 @@
   </nav>
   <header class="odoc-preamble">
    <h1>Module type <code><span>InnerModuleA.InnerModuleTypeA'</span></code>
-   </h1><p>This comment is for <code>InnerModuleTypeA'</code>.</p>
+   </h1><p id="p71">This comment is for <code>InnerModuleTypeA'</code>.</p>
   </header>
   <div class="odoc-content">
    <div class="odoc-spec">
@@ -34,7 +34,8 @@ <h1>Module type <code><span>InnerModuleA.InnerModuleTypeA'</span></code>
       </span>
      </code>
     </div>
-    <div class="spec-doc"><p>This comment is for <code>t</code>.</p></div>
+    <div class="spec-doc"><p id="p72">This comment is for <code>t</code>.</p>
+    </div>
    </div>
   </div>
  </body>
diff --git a/test/generators/html/Ocamlary-module-type-A-Q-InnerModuleA.html b/test/generators/html/Ocamlary-module-type-A-Q-InnerModuleA.html
index 54a8f20128..549dde3380 100644
--- a/test/generators/html/Ocamlary-module-type-A-Q-InnerModuleA.html
+++ b/test/generators/html/Ocamlary-module-type-A-Q-InnerModuleA.html
@@ -15,7 +15,7 @@
   </nav>
   <header class="odoc-preamble">
    <h1>Module <code><span>Q.InnerModuleA</span></code></h1>
-   <p>This comment is for <code>InnerModuleA</code>.</p>
+   <p id="p67">This comment is for <code>InnerModuleA</code>.</p>
   </header>
   <div class="odoc-content">
    <div class="odoc-spec">
@@ -27,7 +27,8 @@ <h1>Module <code><span>Q.InnerModuleA</span></code></h1>
       </span>
      </code>
     </div>
-    <div class="spec-doc"><p>This comment is for <code>t</code>.</p></div>
+    <div class="spec-doc"><p id="p68">This comment is for <code>t</code>.</p>
+    </div>
    </div>
    <div class="odoc-spec">
     <div class="spec module anchored" id="module-InnerModuleA'">
diff --git a/test/generators/html/Ocamlary-module-type-A-Q.html b/test/generators/html/Ocamlary-module-type-A-Q.html
index 6741240f84..2f0705b2ea 100644
--- a/test/generators/html/Ocamlary-module-type-A-Q.html
+++ b/test/generators/html/Ocamlary-module-type-A-Q.html
@@ -15,13 +15,14 @@
   <header class="odoc-preamble"><h1>Module <code><span>A.Q</span></code></h1>
   </header>
   <div class="odoc-content">
-   <p>This comment is for <code>CollectionModule</code>.</p>
+   <p id="p65">This comment is for <code>CollectionModule</code>.</p>
    <div class="odoc-spec">
     <div class="spec type anchored" id="type-collection">
      <a href="#type-collection" class="anchor"></a>
      <code><span><span class="keyword">type</span> collection</span></code>
     </div>
-    <div class="spec-doc"><p>This comment is for <code>collection</code>.</p>
+    <div class="spec-doc">
+     <p id="p66">This comment is for <code>collection</code>.</p>
     </div>
    </div>
    <div class="odoc-spec">
diff --git a/test/generators/html/Ocamlary-module-type-B-Q-InnerModuleA-InnerModuleA'.html b/test/generators/html/Ocamlary-module-type-B-Q-InnerModuleA-InnerModuleA'.html
index 0cef212d7d..7860178554 100644
--- a/test/generators/html/Ocamlary-module-type-B-Q-InnerModuleA-InnerModuleA'.html
+++ b/test/generators/html/Ocamlary-module-type-B-Q-InnerModuleA-InnerModuleA'.html
@@ -18,7 +18,7 @@
   </nav>
   <header class="odoc-preamble">
    <h1>Module <code><span>InnerModuleA.InnerModuleA'</span></code></h1>
-   <p>This comment is for <code>InnerModuleA'</code>.</p>
+   <p id="p69">This comment is for <code>InnerModuleA'</code>.</p>
   </header>
   <div class="odoc-content">
    <div class="odoc-spec">
@@ -32,7 +32,8 @@ <h1>Module <code><span>InnerModuleA.InnerModuleA'</span></code></h1>
       </span>
      </code>
     </div>
-    <div class="spec-doc"><p>This comment is for <code>t</code>.</p></div>
+    <div class="spec-doc"><p id="p70">This comment is for <code>t</code>.</p>
+    </div>
    </div>
   </div>
  </body>
diff --git a/test/generators/html/Ocamlary-module-type-B-Q-InnerModuleA-module-type-InnerModuleTypeA'.html b/test/generators/html/Ocamlary-module-type-B-Q-InnerModuleA-module-type-InnerModuleTypeA'.html
index 14fb2a05da..004137572b 100644
--- a/test/generators/html/Ocamlary-module-type-B-Q-InnerModuleA-module-type-InnerModuleTypeA'.html
+++ b/test/generators/html/Ocamlary-module-type-B-Q-InnerModuleA-module-type-InnerModuleTypeA'.html
@@ -19,7 +19,7 @@
   </nav>
   <header class="odoc-preamble">
    <h1>Module type <code><span>InnerModuleA.InnerModuleTypeA'</span></code>
-   </h1><p>This comment is for <code>InnerModuleTypeA'</code>.</p>
+   </h1><p id="p71">This comment is for <code>InnerModuleTypeA'</code>.</p>
   </header>
   <div class="odoc-content">
    <div class="odoc-spec">
@@ -34,7 +34,8 @@ <h1>Module type <code><span>InnerModuleA.InnerModuleTypeA'</span></code>
       </span>
      </code>
     </div>
-    <div class="spec-doc"><p>This comment is for <code>t</code>.</p></div>
+    <div class="spec-doc"><p id="p72">This comment is for <code>t</code>.</p>
+    </div>
    </div>
   </div>
  </body>
diff --git a/test/generators/html/Ocamlary-module-type-B-Q-InnerModuleA.html b/test/generators/html/Ocamlary-module-type-B-Q-InnerModuleA.html
index 4c359a2e98..567002ac84 100644
--- a/test/generators/html/Ocamlary-module-type-B-Q-InnerModuleA.html
+++ b/test/generators/html/Ocamlary-module-type-B-Q-InnerModuleA.html
@@ -15,7 +15,7 @@
   </nav>
   <header class="odoc-preamble">
    <h1>Module <code><span>Q.InnerModuleA</span></code></h1>
-   <p>This comment is for <code>InnerModuleA</code>.</p>
+   <p id="p67">This comment is for <code>InnerModuleA</code>.</p>
   </header>
   <div class="odoc-content">
    <div class="odoc-spec">
@@ -27,7 +27,8 @@ <h1>Module <code><span>Q.InnerModuleA</span></code></h1>
       </span>
      </code>
     </div>
-    <div class="spec-doc"><p>This comment is for <code>t</code>.</p></div>
+    <div class="spec-doc"><p id="p68">This comment is for <code>t</code>.</p>
+    </div>
    </div>
    <div class="odoc-spec">
     <div class="spec module anchored" id="module-InnerModuleA'">
diff --git a/test/generators/html/Ocamlary-module-type-B-Q.html b/test/generators/html/Ocamlary-module-type-B-Q.html
index 22eee0a224..42091d5e6b 100644
--- a/test/generators/html/Ocamlary-module-type-B-Q.html
+++ b/test/generators/html/Ocamlary-module-type-B-Q.html
@@ -15,13 +15,14 @@
   <header class="odoc-preamble"><h1>Module <code><span>B.Q</span></code></h1>
   </header>
   <div class="odoc-content">
-   <p>This comment is for <code>CollectionModule</code>.</p>
+   <p id="p65">This comment is for <code>CollectionModule</code>.</p>
    <div class="odoc-spec">
     <div class="spec type anchored" id="type-collection">
      <a href="#type-collection" class="anchor"></a>
      <code><span><span class="keyword">type</span> collection</span></code>
     </div>
-    <div class="spec-doc"><p>This comment is for <code>collection</code>.</p>
+    <div class="spec-doc">
+     <p id="p66">This comment is for <code>collection</code>.</p>
     </div>
    </div>
    <div class="odoc-spec">
diff --git a/test/generators/html/Ocamlary-module-type-C-Q-InnerModuleA-InnerModuleA'.html b/test/generators/html/Ocamlary-module-type-C-Q-InnerModuleA-InnerModuleA'.html
index 727a4a55bd..9da83f85bb 100644
--- a/test/generators/html/Ocamlary-module-type-C-Q-InnerModuleA-InnerModuleA'.html
+++ b/test/generators/html/Ocamlary-module-type-C-Q-InnerModuleA-InnerModuleA'.html
@@ -18,7 +18,7 @@
   </nav>
   <header class="odoc-preamble">
    <h1>Module <code><span>InnerModuleA.InnerModuleA'</span></code></h1>
-   <p>This comment is for <code>InnerModuleA'</code>.</p>
+   <p id="p69">This comment is for <code>InnerModuleA'</code>.</p>
   </header>
   <div class="odoc-content">
    <div class="odoc-spec">
@@ -32,7 +32,8 @@ <h1>Module <code><span>InnerModuleA.InnerModuleA'</span></code></h1>
       </span>
      </code>
     </div>
-    <div class="spec-doc"><p>This comment is for <code>t</code>.</p></div>
+    <div class="spec-doc"><p id="p70">This comment is for <code>t</code>.</p>
+    </div>
    </div>
   </div>
  </body>
diff --git a/test/generators/html/Ocamlary-module-type-C-Q-InnerModuleA-module-type-InnerModuleTypeA'.html b/test/generators/html/Ocamlary-module-type-C-Q-InnerModuleA-module-type-InnerModuleTypeA'.html
index 1e96699892..ad9fb46e14 100644
--- a/test/generators/html/Ocamlary-module-type-C-Q-InnerModuleA-module-type-InnerModuleTypeA'.html
+++ b/test/generators/html/Ocamlary-module-type-C-Q-InnerModuleA-module-type-InnerModuleTypeA'.html
@@ -19,7 +19,7 @@
   </nav>
   <header class="odoc-preamble">
    <h1>Module type <code><span>InnerModuleA.InnerModuleTypeA'</span></code>
-   </h1><p>This comment is for <code>InnerModuleTypeA'</code>.</p>
+   </h1><p id="p71">This comment is for <code>InnerModuleTypeA'</code>.</p>
   </header>
   <div class="odoc-content">
    <div class="odoc-spec">
@@ -34,7 +34,8 @@ <h1>Module type <code><span>InnerModuleA.InnerModuleTypeA'</span></code>
       </span>
      </code>
     </div>
-    <div class="spec-doc"><p>This comment is for <code>t</code>.</p></div>
+    <div class="spec-doc"><p id="p72">This comment is for <code>t</code>.</p>
+    </div>
    </div>
   </div>
  </body>
diff --git a/test/generators/html/Ocamlary-module-type-C-Q-InnerModuleA.html b/test/generators/html/Ocamlary-module-type-C-Q-InnerModuleA.html
index 19e27aa3b2..5f3ae2517e 100644
--- a/test/generators/html/Ocamlary-module-type-C-Q-InnerModuleA.html
+++ b/test/generators/html/Ocamlary-module-type-C-Q-InnerModuleA.html
@@ -15,7 +15,7 @@
   </nav>
   <header class="odoc-preamble">
    <h1>Module <code><span>Q.InnerModuleA</span></code></h1>
-   <p>This comment is for <code>InnerModuleA</code>.</p>
+   <p id="p67">This comment is for <code>InnerModuleA</code>.</p>
   </header>
   <div class="odoc-content">
    <div class="odoc-spec">
@@ -27,7 +27,8 @@ <h1>Module <code><span>Q.InnerModuleA</span></code></h1>
       </span>
      </code>
     </div>
-    <div class="spec-doc"><p>This comment is for <code>t</code>.</p></div>
+    <div class="spec-doc"><p id="p68">This comment is for <code>t</code>.</p>
+    </div>
    </div>
    <div class="odoc-spec">
     <div class="spec module anchored" id="module-InnerModuleA'">
diff --git a/test/generators/html/Ocamlary-module-type-C-Q.html b/test/generators/html/Ocamlary-module-type-C-Q.html
index 6e404925b8..6739f417cb 100644
--- a/test/generators/html/Ocamlary-module-type-C-Q.html
+++ b/test/generators/html/Ocamlary-module-type-C-Q.html
@@ -15,13 +15,14 @@
   <header class="odoc-preamble"><h1>Module <code><span>C.Q</span></code></h1>
   </header>
   <div class="odoc-content">
-   <p>This comment is for <code>CollectionModule</code>.</p>
+   <p id="p65">This comment is for <code>CollectionModule</code>.</p>
    <div class="odoc-spec">
     <div class="spec type anchored" id="type-collection">
      <a href="#type-collection" class="anchor"></a>
      <code><span><span class="keyword">type</span> collection</span></code>
     </div>
-    <div class="spec-doc"><p>This comment is for <code>collection</code>.</p>
+    <div class="spec-doc">
+     <p id="p66">This comment is for <code>collection</code>.</p>
     </div>
    </div>
    <div class="odoc-spec">
diff --git a/test/generators/html/Ocamlary-module-type-C.html b/test/generators/html/Ocamlary-module-type-C.html
index 1bec482720..bbcaa10a09 100644
--- a/test/generators/html/Ocamlary-module-type-C.html
+++ b/test/generators/html/Ocamlary-module-type-C.html
@@ -12,7 +12,7 @@
   </nav>
   <header class="odoc-preamble">
    <h1>Module type <code><span>Ocamlary.C</span></code></h1>
-   <p>This module type includes two signatures.</p>
+   <p id="p89">This module type includes two signatures.</p>
    <ul>
     <li>it includes <a href="Ocamlary-module-type-A.html"><code>A</code></a>
     </li>
diff --git a/test/generators/html/Ocamlary-module-type-COLLECTION-InnerModuleA-InnerModuleA'.html b/test/generators/html/Ocamlary-module-type-COLLECTION-InnerModuleA-InnerModuleA'.html
index 87734c2d4f..61563d8c59 100644
--- a/test/generators/html/Ocamlary-module-type-COLLECTION-InnerModuleA-InnerModuleA'.html
+++ b/test/generators/html/Ocamlary-module-type-COLLECTION-InnerModuleA-InnerModuleA'.html
@@ -19,7 +19,7 @@
   </nav>
   <header class="odoc-preamble">
    <h1>Module <code><span>InnerModuleA.InnerModuleA'</span></code></h1>
-   <p>This comment is for <code>InnerModuleA'</code>.</p>
+   <p id="p69">This comment is for <code>InnerModuleA'</code>.</p>
   </header>
   <div class="odoc-content">
    <div class="odoc-spec">
@@ -33,7 +33,8 @@ <h1>Module <code><span>InnerModuleA.InnerModuleA'</span></code></h1>
       </span>
      </code>
     </div>
-    <div class="spec-doc"><p>This comment is for <code>t</code>.</p></div>
+    <div class="spec-doc"><p id="p70">This comment is for <code>t</code>.</p>
+    </div>
    </div>
   </div>
  </body>
diff --git a/test/generators/html/Ocamlary-module-type-COLLECTION-InnerModuleA-module-type-InnerModuleTypeA'.html b/test/generators/html/Ocamlary-module-type-COLLECTION-InnerModuleA-module-type-InnerModuleTypeA'.html
index fb6d32f6c2..67cb87fadd 100644
--- a/test/generators/html/Ocamlary-module-type-COLLECTION-InnerModuleA-module-type-InnerModuleTypeA'.html
+++ b/test/generators/html/Ocamlary-module-type-COLLECTION-InnerModuleA-module-type-InnerModuleTypeA'.html
@@ -20,7 +20,7 @@
   </nav>
   <header class="odoc-preamble">
    <h1>Module type <code><span>InnerModuleA.InnerModuleTypeA'</span></code>
-   </h1><p>This comment is for <code>InnerModuleTypeA'</code>.</p>
+   </h1><p id="p71">This comment is for <code>InnerModuleTypeA'</code>.</p>
   </header>
   <div class="odoc-content">
    <div class="odoc-spec">
@@ -35,7 +35,8 @@ <h1>Module type <code><span>InnerModuleA.InnerModuleTypeA'</span></code>
       </span>
      </code>
     </div>
-    <div class="spec-doc"><p>This comment is for <code>t</code>.</p></div>
+    <div class="spec-doc"><p id="p72">This comment is for <code>t</code>.</p>
+    </div>
    </div>
   </div>
  </body>
diff --git a/test/generators/html/Ocamlary-module-type-COLLECTION-InnerModuleA.html b/test/generators/html/Ocamlary-module-type-COLLECTION-InnerModuleA.html
index 55ed080c26..21ffbae31f 100644
--- a/test/generators/html/Ocamlary-module-type-COLLECTION-InnerModuleA.html
+++ b/test/generators/html/Ocamlary-module-type-COLLECTION-InnerModuleA.html
@@ -15,7 +15,7 @@
   </nav>
   <header class="odoc-preamble">
    <h1>Module <code><span>COLLECTION.InnerModuleA</span></code></h1>
-   <p>This comment is for <code>InnerModuleA</code>.</p>
+   <p id="p67">This comment is for <code>InnerModuleA</code>.</p>
   </header>
   <div class="odoc-content">
    <div class="odoc-spec">
@@ -29,7 +29,8 @@ <h1>Module <code><span>COLLECTION.InnerModuleA</span></code></h1>
       </span>
      </code>
     </div>
-    <div class="spec-doc"><p>This comment is for <code>t</code>.</p></div>
+    <div class="spec-doc"><p id="p68">This comment is for <code>t</code>.</p>
+    </div>
    </div>
    <div class="odoc-spec">
     <div class="spec module anchored" id="module-InnerModuleA'">
diff --git a/test/generators/html/Ocamlary-module-type-COLLECTION.html b/test/generators/html/Ocamlary-module-type-COLLECTION.html
index 85b9d992f5..d98a6503d4 100644
--- a/test/generators/html/Ocamlary-module-type-COLLECTION.html
+++ b/test/generators/html/Ocamlary-module-type-COLLECTION.html
@@ -13,16 +13,17 @@
   </nav>
   <header class="odoc-preamble">
    <h1>Module type <code><span>Ocamlary.COLLECTION</span></code></h1>
-   <p>module type of</p>
+   <p id="p74">module type of</p>
   </header>
   <div class="odoc-content">
-   <p>This comment is for <code>CollectionModule</code>.</p>
+   <p id="p65">This comment is for <code>CollectionModule</code>.</p>
    <div class="odoc-spec">
     <div class="spec type anchored" id="type-collection">
      <a href="#type-collection" class="anchor"></a>
      <code><span><span class="keyword">type</span> collection</span></code>
     </div>
-    <div class="spec-doc"><p>This comment is for <code>collection</code>.</p>
+    <div class="spec-doc">
+     <p id="p66">This comment is for <code>collection</code>.</p>
     </div>
    </div>
    <div class="odoc-spec">
diff --git a/test/generators/html/Ocamlary-module-type-Empty.html b/test/generators/html/Ocamlary-module-type-Empty.html
index 5d6b095ef4..193bce2c42 100644
--- a/test/generators/html/Ocamlary-module-type-Empty.html
+++ b/test/generators/html/Ocamlary-module-type-Empty.html
@@ -13,7 +13,7 @@
   </nav>
   <header class="odoc-preamble">
    <h1>Module type <code><span>Ocamlary.Empty</span></code></h1>
-   <p>An ambiguous, misnamed module type</p>
+   <p id="p31">An ambiguous, misnamed module type</p>
   </header>
   <div class="odoc-content">
    <div class="odoc-spec">
diff --git a/test/generators/html/Ocamlary-module-type-EmptySig.html b/test/generators/html/Ocamlary-module-type-EmptySig.html
index bcb61dbc4d..70dea7378f 100644
--- a/test/generators/html/Ocamlary-module-type-EmptySig.html
+++ b/test/generators/html/Ocamlary-module-type-EmptySig.html
@@ -13,7 +13,7 @@
   </nav>
   <header class="odoc-preamble">
    <h1>Module type <code><span>Ocamlary.EmptySig</span></code></h1>
-   <p>A plain, empty module signature</p>
+   <p id="p34">A plain, empty module signature</p>
   </header><div class="odoc-content"></div>
  </body>
 </html>
diff --git a/test/generators/html/Ocamlary-module-type-IncludeModuleType.html b/test/generators/html/Ocamlary-module-type-IncludeModuleType.html
index c0318d621f..78319e0f41 100644
--- a/test/generators/html/Ocamlary-module-type-IncludeModuleType.html
+++ b/test/generators/html/Ocamlary-module-type-IncludeModuleType.html
@@ -13,12 +13,12 @@
   </nav>
   <header class="odoc-preamble">
    <h1>Module type <code><span>Ocamlary.IncludeModuleType</span></code></h1>
-   <p>This comment is for <code>IncludeModuleType</code>.</p>
+   <p id="p94">This comment is for <code>IncludeModuleType</code>.</p>
   </header>
   <div class="odoc-content">
    <div class="odoc-include shadowed-include">
     <div class="spec-doc">
-     <p>This comment is for <code>include EmptySigAlias</code>.</p>
+     <p id="p95">This comment is for <code>include EmptySigAlias</code>.</p>
     </div>
     <details open="open">
      <summary class="spec include">
diff --git a/test/generators/html/Ocamlary-module-type-MMM-C-InnerModuleA-InnerModuleA'.html b/test/generators/html/Ocamlary-module-type-MMM-C-InnerModuleA-InnerModuleA'.html
index 2347cae82b..13c81e9394 100644
--- a/test/generators/html/Ocamlary-module-type-MMM-C-InnerModuleA-InnerModuleA'.html
+++ b/test/generators/html/Ocamlary-module-type-MMM-C-InnerModuleA-InnerModuleA'.html
@@ -19,7 +19,7 @@
   </nav>
   <header class="odoc-preamble">
    <h1>Module <code><span>InnerModuleA.InnerModuleA'</span></code></h1>
-   <p>This comment is for <code>InnerModuleA'</code>.</p>
+   <p id="p69">This comment is for <code>InnerModuleA'</code>.</p>
   </header>
   <div class="odoc-content">
    <div class="odoc-spec">
@@ -33,7 +33,8 @@ <h1>Module <code><span>InnerModuleA.InnerModuleA'</span></code></h1>
       </span>
      </code>
     </div>
-    <div class="spec-doc"><p>This comment is for <code>t</code>.</p></div>
+    <div class="spec-doc"><p id="p70">This comment is for <code>t</code>.</p>
+    </div>
    </div>
   </div>
  </body>
diff --git a/test/generators/html/Ocamlary-module-type-MMM-C-InnerModuleA-module-type-InnerModuleTypeA'.html b/test/generators/html/Ocamlary-module-type-MMM-C-InnerModuleA-module-type-InnerModuleTypeA'.html
index cd572f2ff8..874349f0ca 100644
--- a/test/generators/html/Ocamlary-module-type-MMM-C-InnerModuleA-module-type-InnerModuleTypeA'.html
+++ b/test/generators/html/Ocamlary-module-type-MMM-C-InnerModuleA-module-type-InnerModuleTypeA'.html
@@ -19,7 +19,7 @@
   </nav>
   <header class="odoc-preamble">
    <h1>Module type <code><span>InnerModuleA.InnerModuleTypeA'</span></code>
-   </h1><p>This comment is for <code>InnerModuleTypeA'</code>.</p>
+   </h1><p id="p71">This comment is for <code>InnerModuleTypeA'</code>.</p>
   </header>
   <div class="odoc-content">
    <div class="odoc-spec">
@@ -34,7 +34,8 @@ <h1>Module type <code><span>InnerModuleA.InnerModuleTypeA'</span></code>
       </span>
      </code>
     </div>
-    <div class="spec-doc"><p>This comment is for <code>t</code>.</p></div>
+    <div class="spec-doc"><p id="p72">This comment is for <code>t</code>.</p>
+    </div>
    </div>
   </div>
  </body>
diff --git a/test/generators/html/Ocamlary-module-type-MMM-C-InnerModuleA.html b/test/generators/html/Ocamlary-module-type-MMM-C-InnerModuleA.html
index f15b794bd9..f66435c7f4 100644
--- a/test/generators/html/Ocamlary-module-type-MMM-C-InnerModuleA.html
+++ b/test/generators/html/Ocamlary-module-type-MMM-C-InnerModuleA.html
@@ -15,7 +15,7 @@
   </nav>
   <header class="odoc-preamble">
    <h1>Module <code><span>C.InnerModuleA</span></code></h1>
-   <p>This comment is for <code>InnerModuleA</code>.</p>
+   <p id="p67">This comment is for <code>InnerModuleA</code>.</p>
   </header>
   <div class="odoc-content">
    <div class="odoc-spec">
@@ -28,7 +28,8 @@ <h1>Module <code><span>C.InnerModuleA</span></code></h1>
       </span>
      </code>
     </div>
-    <div class="spec-doc"><p>This comment is for <code>t</code>.</p></div>
+    <div class="spec-doc"><p id="p68">This comment is for <code>t</code>.</p>
+    </div>
    </div>
    <div class="odoc-spec">
     <div class="spec module anchored" id="module-InnerModuleA'">
diff --git a/test/generators/html/Ocamlary-module-type-MMM-C.html b/test/generators/html/Ocamlary-module-type-MMM-C.html
index c50306ea93..45d9ff55b5 100644
--- a/test/generators/html/Ocamlary-module-type-MMM-C.html
+++ b/test/generators/html/Ocamlary-module-type-MMM-C.html
@@ -16,13 +16,14 @@
    <h1>Module <code><span>MMM.C</span></code></h1>
   </header>
   <div class="odoc-content">
-   <p>This comment is for <code>CollectionModule</code>.</p>
+   <p id="p65">This comment is for <code>CollectionModule</code>.</p>
    <div class="odoc-spec">
     <div class="spec type anchored" id="type-collection">
      <a href="#type-collection" class="anchor"></a>
      <code><span><span class="keyword">type</span> collection</span></code>
     </div>
-    <div class="spec-doc"><p>This comment is for <code>collection</code>.</p>
+    <div class="spec-doc">
+     <p id="p66">This comment is for <code>collection</code>.</p>
     </div>
    </div>
    <div class="odoc-spec">
diff --git a/test/generators/html/Ocamlary-module-type-MissingComment.html b/test/generators/html/Ocamlary-module-type-MissingComment.html
index 88ba18c04b..d529b77a3b 100644
--- a/test/generators/html/Ocamlary-module-type-MissingComment.html
+++ b/test/generators/html/Ocamlary-module-type-MissingComment.html
@@ -13,7 +13,7 @@
   </nav>
   <header class="odoc-preamble">
    <h1>Module type <code><span>Ocamlary.MissingComment</span></code></h1>
-   <p>An ambiguous, misnamed module type</p>
+   <p id="p32">An ambiguous, misnamed module type</p>
   </header>
   <div class="odoc-content">
    <div class="odoc-spec">
diff --git a/test/generators/html/Ocamlary-module-type-RecollectionModule-InnerModuleA-InnerModuleA'.html b/test/generators/html/Ocamlary-module-type-RecollectionModule-InnerModuleA-InnerModuleA'.html
index 9b1c6ae3d0..70ab7631ba 100644
--- a/test/generators/html/Ocamlary-module-type-RecollectionModule-InnerModuleA-InnerModuleA'.html
+++ b/test/generators/html/Ocamlary-module-type-RecollectionModule-InnerModuleA-InnerModuleA'.html
@@ -21,7 +21,7 @@
   </nav>
   <header class="odoc-preamble">
    <h1>Module <code><span>InnerModuleA.InnerModuleA'</span></code></h1>
-   <p>This comment is for <code>InnerModuleA'</code>.</p>
+   <p id="p84">This comment is for <code>InnerModuleA'</code>.</p>
   </header>
   <div class="odoc-content">
    <div class="odoc-spec">
@@ -35,7 +35,8 @@ <h1>Module <code><span>InnerModuleA.InnerModuleA'</span></code></h1>
       </span>
      </code>
     </div>
-    <div class="spec-doc"><p>This comment is for <code>t</code>.</p></div>
+    <div class="spec-doc"><p id="p85">This comment is for <code>t</code>.</p>
+    </div>
    </div>
   </div>
  </body>
diff --git a/test/generators/html/Ocamlary-module-type-RecollectionModule-InnerModuleA-module-type-InnerModuleTypeA'.html b/test/generators/html/Ocamlary-module-type-RecollectionModule-InnerModuleA-module-type-InnerModuleTypeA'.html
index 69c62484d9..1fb1ec5d0d 100644
--- a/test/generators/html/Ocamlary-module-type-RecollectionModule-InnerModuleA-module-type-InnerModuleTypeA'.html
+++ b/test/generators/html/Ocamlary-module-type-RecollectionModule-InnerModuleA-module-type-InnerModuleTypeA'.html
@@ -22,7 +22,7 @@
   </nav>
   <header class="odoc-preamble">
    <h1>Module type <code><span>InnerModuleA.InnerModuleTypeA'</span></code>
-   </h1><p>This comment is for <code>InnerModuleTypeA'</code>.</p>
+   </h1><p id="p86">This comment is for <code>InnerModuleTypeA'</code>.</p>
   </header>
   <div class="odoc-content">
    <div class="odoc-spec">
@@ -37,7 +37,8 @@ <h1>Module type <code><span>InnerModuleA.InnerModuleTypeA'</span></code>
       </span>
      </code>
     </div>
-    <div class="spec-doc"><p>This comment is for <code>t</code>.</p></div>
+    <div class="spec-doc"><p id="p87">This comment is for <code>t</code>.</p>
+    </div>
    </div>
   </div>
  </body>
diff --git a/test/generators/html/Ocamlary-module-type-RecollectionModule-InnerModuleA.html b/test/generators/html/Ocamlary-module-type-RecollectionModule-InnerModuleA.html
index cbd7e343af..c0007983d9 100644
--- a/test/generators/html/Ocamlary-module-type-RecollectionModule-InnerModuleA.html
+++ b/test/generators/html/Ocamlary-module-type-RecollectionModule-InnerModuleA.html
@@ -16,7 +16,7 @@
   </nav>
   <header class="odoc-preamble">
    <h1>Module <code><span>RecollectionModule.InnerModuleA</span></code></h1>
-   <p>This comment is for <code>InnerModuleA</code>.</p>
+   <p id="p82">This comment is for <code>InnerModuleA</code>.</p>
   </header>
   <div class="odoc-content">
    <div class="odoc-spec">
@@ -30,7 +30,8 @@ <h1>Module <code><span>RecollectionModule.InnerModuleA</span></code></h1>
       </span>
      </code>
     </div>
-    <div class="spec-doc"><p>This comment is for <code>t</code>.</p></div>
+    <div class="spec-doc"><p id="p83">This comment is for <code>t</code>.</p>
+    </div>
    </div>
    <div class="odoc-spec">
     <div class="spec module anchored" id="module-InnerModuleA'">
diff --git a/test/generators/html/Ocamlary-module-type-SigForMod.html b/test/generators/html/Ocamlary-module-type-SigForMod.html
index 33e21dd328..6a48c2a413 100644
--- a/test/generators/html/Ocamlary-module-type-SigForMod.html
+++ b/test/generators/html/Ocamlary-module-type-SigForMod.html
@@ -13,7 +13,7 @@
   </nav>
   <header class="odoc-preamble">
    <h1>Module type <code><span>Ocamlary.SigForMod</span></code></h1>
-   <p>There's a signature in a module in this signature.</p>
+   <p id="p41">There's a signature in a module in this signature.</p>
   </header>
   <div class="odoc-content">
    <div class="odoc-spec">
diff --git a/test/generators/html/Ocamlary.html b/test/generators/html/Ocamlary.html
index 46ac3a4d7d..4140f6b34b 100644
--- a/test/generators/html/Ocamlary.html
+++ b/test/generators/html/Ocamlary.html
@@ -10,19 +10,20 @@
  <body class="odoc">
   <header class="odoc-preamble">
    <h1>Module <code><span>Ocamlary</span></code></h1>
-   <p>This is an <i>interface</i> with <b>all</b> of the 
+   <p id="p0">This is an <i>interface</i> with <b>all</b> of the 
     <em>module system</em> features. This documentation demonstrates:
    </p>
    <ul><li>comment formatting</li><li>unassociated comments</li>
     <li>documentation sections</li>
-    <li><p>module system documentation including</p>
+    <li><p id="p4">module system documentation including</p>
      <ol><li>submodules</li><li>module aliases</li><li>module types</li>
       <li>module type aliases</li><li>modules with signatures</li>
       <li>modules with aliased signatures</li>
      </ol>
     </li>
-   </ul><p>A numbered list:</p><ol><li>3</li><li>2</li><li>1</li></ol>
-   <p>David Sheets is the author.</p>
+   </ul><p id="p11">A numbered list:</p>
+   <ol><li>3</li><li>2</li><li>1</li></ol>
+   <p id="p15">David Sheets is the author.</p>
    <ul class="at-tags">
     <li class="author"><span class="at-tag">author</span> David Sheets</li>
    </ul>
@@ -70,14 +71,14 @@ <h1>Module <code><span>Ocamlary</span></code></h1>
    </ul>
   </nav>
   <div class="odoc-content">
-   <p>You may find more information about this HTML documentation renderer
-     at 
+   <p id="p16">You may find more information about this HTML documentation
+     renderer at 
     <a href="https://github.com/dsheets/ocamlary">github.com/dsheets/ocamlary
     </a>.
-   </p><p>This is some verbatim text:</p><pre>verbatim</pre>
-   <p>This is some verbatim text:</p><pre>[][df[]]}}</pre>
-   <p>Here is some raw LaTeX: </p>
-   <p>Here is an index table of <code>Empty</code> modules:</p>
+   </p><p id="p17">This is some verbatim text:</p>
+   <pre id="math18">verbatim</pre><p id="p19">This is some verbatim text:</p>
+   <pre id="math20">[][df[]]}}</pre><p id="p21">Here is some raw LaTeX: </p>
+   <p id="p22">Here is an index table of <code>Empty</code> modules:</p>
    <ul class="modules">
     <li><a href="Ocamlary-Empty.html"><code>Empty</code></a> 
      <span class="synopsis">A plain, empty module</span>
@@ -85,12 +86,12 @@ <h1>Module <code><span>Ocamlary</span></code></h1>
     <li><a href="Ocamlary-Empty.html"><code>EmptyAlias</code></a> 
      <span class="synopsis">A plain module alias of <code>Empty</code></span>
     </li>
-   </ul><p>Odoc doesn't support <code>{!indexlist}</code>.</p>
-   <p>Here is some superscript: x<sup>2</sup></p>
-   <p>Here is some subscript: x<sub>0</sub></p>
-   <p>Here are some escaped brackets: { [ @ ] }</p>
-   <p>Here is some <em>emphasis</em> <code>followed by code</code>.</p>
-   <p>An unassociated comment</p>
+   </ul><p id="p23">Odoc doesn't support <code>{!indexlist}</code>.</p>
+   <p id="p24">Here is some superscript: x<sup>2</sup></p>
+   <p id="p25">Here is some subscript: x<sub>0</sub></p>
+   <p id="p26">Here are some escaped brackets: { [ @ ] }</p>
+   <p id="p27">Here is some <em>emphasis</em> <code>followed by code</code>.
+   </p><p id="p28">An unassociated comment</p>
    <h2 id="level-1"><a href="#level-1" class="anchor"></a>Level 1</h2>
    <h3 id="level-2"><a href="#level-2" class="anchor"></a>Level 2</h3>
    <h4 id="level-3"><a href="#level-3" class="anchor"></a>Level 3</h4>
@@ -257,7 +258,7 @@ <h4 id="emptySig"><a href="#emptySig" class="anchor"></a>EmptySig</h4>
      </code>
     </div>
    </div>
-   <p>For a good time, see 
+   <p id="p42">For a good time, see 
     <a href="Ocamlary-module-type-SuperSig-module-type-SubSigA.html#subSig">
      <code>subSig</code>
     </a> or 
@@ -289,11 +290,11 @@ <h4 id="emptySig"><a href="#emptySig" class="anchor"></a>EmptySig</h4>
        won't resolve.
      </p>
     </div>
-   </div><p>Some text before exception title.</p>
+   </div><p id="p44">Some text before exception title.</p>
    <h4 id="basic-exception-stuff">
     <a href="#basic-exception-stuff" class="anchor"></a>Basic exception
      stuff
-   </h4><p>After exception title.</p>
+   </h4><p id="p45">After exception title.</p>
    <div class="odoc-spec">
     <div class="spec exception anchored" id="exception-Kaboom">
      <a href="#exception-Kaboom" class="anchor"></a>
@@ -302,7 +303,8 @@ <h4 id="basic-exception-stuff">
        <span class="keyword">of</span> unit
       </span>
      </code>
-    </div><div class="spec-doc"><p>Unary exception constructor</p></div>
+    </div>
+    <div class="spec-doc"><p id="p46">Unary exception constructor</p></div>
    </div>
    <div class="odoc-spec">
     <div class="spec exception anchored" id="exception-Kablam">
@@ -312,7 +314,8 @@ <h4 id="basic-exception-stuff">
        <span class="keyword">of</span> unit * unit
       </span>
      </code>
-    </div><div class="spec-doc"><p>Binary exception constructor</p></div>
+    </div>
+    <div class="spec-doc"><p id="p47">Binary exception constructor</p></div>
    </div>
    <div class="odoc-spec">
     <div class="spec exception anchored" id="exception-Kapow">
@@ -324,7 +327,7 @@ <h4 id="basic-exception-stuff">
      </code>
     </div>
     <div class="spec-doc">
-     <p>Unary exception constructor over binary tuple</p>
+     <p id="p48">Unary exception constructor over binary tuple</p>
     </div>
    </div>
    <div class="odoc-spec">
@@ -335,7 +338,7 @@ <h4 id="basic-exception-stuff">
      </code>
     </div>
     <div class="spec-doc">
-     <p>
+     <p id="p49">
       <a href="Ocamlary-module-type-EmptySig.html"><code>EmptySig</code></a>
        is a module and 
       <a href="#exception-EmptySig"><code>EmptySig</code></a> is this
@@ -351,7 +354,8 @@ <h4 id="basic-exception-stuff">
      </code>
     </div>
     <div class="spec-doc">
-     <p><a href="#exception-EmptySigAlias"><code>EmptySigAlias</code></a>
+     <p id="p50">
+      <a href="#exception-EmptySigAlias"><code>EmptySigAlias</code></a>
        is this exception.
      </p>
     </div>
@@ -376,8 +380,8 @@ <h4 id="basic-type-and-value-stuff-with-advanced-doc-comments">
      </code>
     </div>
     <div class="spec-doc">
-     <p><a href="#type-a_function"><code>a_function</code></a> is this
-       type and <a href="#val-a_function"><code>a_function</code></a>
+     <p id="p51"><a href="#type-a_function"><code>a_function</code></a>
+       is this type and <a href="#val-a_function"><code>a_function</code></a>
        is the value below.
      </p>
     </div>
@@ -392,15 +396,17 @@ <h4 id="basic-type-and-value-stuff-with-advanced-doc-comments">
      </code>
     </div>
     <div class="spec-doc">
-     <p>This is <code>a_function</code> with param and return type.</p>
+     <p id="p52">This is <code>a_function</code> with param and return type.
+     </p>
      <ul class="at-tags">
       <li class="parameter"><span class="at-tag">parameter</span> 
-       <span class="value">x</span> <p>the <code>x</code> coordinate</p>
+       <span class="value">x</span> 
+       <p id="p53">the <code>x</code> coordinate</p>
       </li>
      </ul>
      <ul class="at-tags">
       <li class="returns"><span class="at-tag">returns</span> 
-       <p>the <code>y</code> coordinate</p>
+       <p id="p54">the <code>y</code> coordinate</p>
       </li>
      </ul>
     </div>
@@ -447,7 +453,7 @@ <h4 id="basic-type-and-value-stuff-with-advanced-doc-comments">
     <div class="spec-doc">
      <ul class="at-tags">
       <li class="raises"><span class="at-tag">raises</span> 
-       <code>Not_found</code> <p>That's all it does</p>
+       <code>Not_found</code> <p id="p55">That's all it does</p>
       </li>
      </ul>
     </div>
@@ -465,7 +471,7 @@ <h4 id="basic-type-and-value-stuff-with-advanced-doc-comments">
      <ul class="at-tags">
       <li class="raises"><span class="at-tag">raises</span> 
        <a href="#exception-Kaboom"><code>Kaboom</code></a> 
-       <p>That's all it does</p>
+       <p id="p56">That's all it does</p>
       </li>
      </ul>
     </div>
@@ -480,7 +486,7 @@ <h4 id="basic-type-and-value-stuff-with-advanced-doc-comments">
      <ul class="at-tags">
       <li class="see"><span class="at-tag">see</span> 
        <a href="http://ocaml.org/" class="value">http://ocaml.org/</a>
-        <p>The OCaml Web site</p>
+        <p id="p57">The OCaml Web site</p>
       </li>
      </ul>
     </div>
@@ -495,7 +501,7 @@ <h4 id="basic-type-and-value-stuff-with-advanced-doc-comments">
      <ul class="at-tags">
       <li class="see"><span class="at-tag">see</span> 
        <code class="value">some_file</code> 
-       <p>The file called <code>some_file</code></p>
+       <p id="p58">The file called <code>some_file</code></p>
       </li>
      </ul>
     </div>
@@ -510,7 +516,7 @@ <h4 id="basic-type-and-value-stuff-with-advanced-doc-comments">
      <ul class="at-tags">
       <li class="see"><span class="at-tag">see</span> 
        <span class="value">some_doc</span> 
-       <p>The document called <code>some_doc</code></p>
+       <p id="p59">The document called <code>some_doc</code></p>
       </li>
      </ul>
     </div>
@@ -523,7 +529,7 @@ <h4 id="basic-type-and-value-stuff-with-advanced-doc-comments">
      </code>
     </div>
     <div class="spec-doc">
-     <p>This value was introduced in the Mesozoic era.</p>
+     <p id="p60">This value was introduced in the Mesozoic era.</p>
      <ul class="at-tags">
       <li class="since"><span class="at-tag">since</span> mesozoic</li>
      </ul>
@@ -536,15 +542,15 @@ <h4 id="basic-type-and-value-stuff-with-advanced-doc-comments">
      </code>
     </div>
     <div class="spec-doc">
-     <p>This value has had changes in 1.0.0, 1.1.0, and 1.2.0.</p>
+     <p id="p61">This value has had changes in 1.0.0, 1.1.0, and 1.2.0.</p>
      <ul class="at-tags">
       <li class="before"><span class="at-tag">before</span> 
-       <span class="value">1.0.0</span> <p>before 1.0.0</p>
+       <span class="value">1.0.0</span> <p id="p62">before 1.0.0</p>
       </li>
      </ul>
      <ul class="at-tags">
       <li class="before"><span class="at-tag">before</span> 
-       <span class="value">1.1.0</span> <p>before 1.1.0</p>
+       <span class="value">1.1.0</span> <p id="p63">before 1.1.0</p>
       </li>
      </ul>
      <ul class="at-tags">
@@ -917,7 +923,7 @@ <h4 id="advanced-type-stuff">
        <a href="#type-record.field1" class="anchor"></a>
        <code><span>field1 : int;</span></code>
        <div class="def-doc"><span class="comment-delim">(*</span>
-        <p>This comment is for <code>field1</code>.</p>
+        <p id="p98">This comment is for <code>field1</code>.</p>
         <span class="comment-delim">*)</span>
        </div>
       </li>
@@ -925,14 +931,15 @@ <h4 id="advanced-type-stuff">
        <a href="#type-record.field2" class="anchor"></a>
        <code><span>field2 : int;</span></code>
        <div class="def-doc"><span class="comment-delim">(*</span>
-        <p>This comment is for <code>field2</code>.</p>
+        <p id="p99">This comment is for <code>field2</code>.</p>
         <span class="comment-delim">*)</span>
        </div>
       </li>
      </ol><code><span>}</span></code>
     </div>
-    <div class="spec-doc"><p>This comment is for <code>record</code>.</p>
-     <p>This comment is also for <code>record</code>.</p>
+    <div class="spec-doc">
+     <p id="p96">This comment is for <code>record</code>.</p>
+     <p id="p97">This comment is also for <code>record</code>.</p>
     </div>
    </div>
    <div class="odoc-spec">
@@ -947,7 +954,7 @@ <h4 id="advanced-type-stuff">
        <code><span><span class="keyword">mutable</span> a : int;</span>
        </code>
        <div class="def-doc"><span class="comment-delim">(*</span>
-        <p><code>a</code> is first and mutable</p>
+        <p id="p100"><code>a</code> is first and mutable</p>
         <span class="comment-delim">*)</span>
        </div>
       </li>
@@ -955,7 +962,7 @@ <h4 id="advanced-type-stuff">
        <a href="#type-mutable_record.b" class="anchor"></a>
        <code><span>b : unit;</span></code>
        <div class="def-doc"><span class="comment-delim">(*</span>
-        <p><code>b</code> is second and immutable</p>
+        <p id="p101"><code>b</code> is second and immutable</p>
         <span class="comment-delim">*)</span>
        </div>
       </li>
@@ -964,7 +971,7 @@ <h4 id="advanced-type-stuff">
        <code><span><span class="keyword">mutable</span> c : int;</span>
        </code>
        <div class="def-doc"><span class="comment-delim">(*</span>
-        <p><code>c</code> is third and mutable</p>
+        <p id="p102"><code>c</code> is third and mutable</p>
         <span class="comment-delim">*)</span>
        </div>
       </li>
@@ -1004,7 +1011,7 @@ <h4 id="advanced-type-stuff">
         <span><span class="constructor">TagA</span></span>
        </code>
        <div class="def-doc"><span class="comment-delim">(*</span>
-        <p>This comment is for <code>TagA</code>.</p>
+        <p id="p105">This comment is for <code>TagA</code>.</p>
         <span class="comment-delim">*)</span>
        </div>
       </li>
@@ -1016,7 +1023,7 @@ <h4 id="advanced-type-stuff">
         </span>
        </code>
        <div class="def-doc"><span class="comment-delim">(*</span>
-        <p>This comment is for <code>ConstrB</code>.</p>
+        <p id="p106">This comment is for <code>ConstrB</code>.</p>
         <span class="comment-delim">*)</span>
        </div>
       </li>
@@ -1028,7 +1035,7 @@ <h4 id="advanced-type-stuff">
         </span>
        </code>
        <div class="def-doc"><span class="comment-delim">(*</span>
-        <p>This comment is for binary <code>ConstrC</code>.</p>
+        <p id="p107">This comment is for binary <code>ConstrC</code>.</p>
         <span class="comment-delim">*)</span>
        </div>
       </li>
@@ -1040,14 +1047,16 @@ <h4 id="advanced-type-stuff">
         </span>
        </code>
        <div class="def-doc"><span class="comment-delim">(*</span>
-        <p>This comment is for unary <code>ConstrD</code> of binary tuple.
+        <p id="p108">This comment is for unary <code>ConstrD</code> of
+          binary tuple.
         </p><span class="comment-delim">*)</span>
        </div>
       </li>
      </ol>
     </div>
-    <div class="spec-doc"><p>This comment is for <code>variant</code>.</p>
-     <p>This comment is also for <code>variant</code>.</p>
+    <div class="spec-doc">
+     <p id="p103">This comment is for <code>variant</code>.</p>
+     <p id="p104">This comment is also for <code>variant</code>.</p>
     </div>
    </div>
    <div class="odoc-spec">
@@ -1069,8 +1078,8 @@ <h4 id="advanced-type-stuff">
      </ol><code><span> ]</span></code>
     </div>
     <div class="spec-doc">
-     <p>This comment is for <code>poly_variant</code>.</p>
-     <p>Wow! It was a polymorphic variant!</p>
+     <p id="p109">This comment is for <code>poly_variant</code>.</p>
+     <p id="p110">Wow! It was a polymorphic variant!</p>
     </div>
    </div>
    <div class="odoc-spec">
@@ -1129,8 +1138,9 @@ <h4 id="advanced-type-stuff">
       </li>
      </ol>
     </div>
-    <div class="spec-doc"><p>This comment is for <code>full_gadt</code>.</p>
-     <p>Wow! It was a GADT!</p>
+    <div class="spec-doc">
+     <p id="p111">This comment is for <code>full_gadt</code>.</p>
+     <p id="p112">Wow! It was a GADT!</p>
     </div>
    </div>
    <div class="odoc-spec">
@@ -1181,8 +1191,8 @@ <h4 id="advanced-type-stuff">
      </ol>
     </div>
     <div class="spec-doc">
-     <p>This comment is for <code>partial_gadt</code>.</p>
-     <p>Wow! It was a mixed GADT!</p>
+     <p id="p113">This comment is for <code>partial_gadt</code>.</p>
+     <p id="p114">Wow! It was a mixed GADT!</p>
     </div>
    </div>
    <div class="odoc-spec">
@@ -1192,7 +1202,8 @@ <h4 id="advanced-type-stuff">
       <span> = <a href="#type-variant">variant</a></span>
      </code>
     </div>
-    <div class="spec-doc"><p>This comment is for <code>alias</code>.</p>
+    <div class="spec-doc">
+     <p id="p115">This comment is for <code>alias</code>.</p>
     </div>
    </div>
    <div class="odoc-spec">
@@ -1209,7 +1220,8 @@ <h4 id="advanced-type-stuff">
       </span>
      </code>
     </div>
-    <div class="spec-doc"><p>This comment is for <code>tuple</code>.</p>
+    <div class="spec-doc">
+     <p id="p116">This comment is for <code>tuple</code>.</p>
     </div>
    </div>
    <div class="odoc-spec">
@@ -1252,7 +1264,7 @@ <h4 id="advanced-type-stuff">
      </ol>
     </div>
     <div class="spec-doc">
-     <p>This comment is for <code>variant_alias</code>.</p>
+     <p id="p117">This comment is for <code>variant_alias</code>.</p>
     </div>
    </div>
    <div class="odoc-spec">
@@ -1274,7 +1286,7 @@ <h4 id="advanced-type-stuff">
      </ol><code><span>}</span></code>
     </div>
     <div class="spec-doc">
-     <p>This comment is for <code>record_alias</code>.</p>
+     <p id="p118">This comment is for <code>record_alias</code>.</p>
     </div>
    </div>
    <div class="odoc-spec">
@@ -1297,7 +1309,7 @@ <h4 id="advanced-type-stuff">
      </ol><code><span> ]</span></code>
     </div>
     <div class="spec-doc">
-     <p>This comment is for <code>poly_variant_union</code>.</p>
+     <p id="p119">This comment is for <code>poly_variant_union</code>.</p>
     </div>
    </div>
    <div class="odoc-spec">
@@ -1556,7 +1568,7 @@ <h4 id="advanced-type-stuff">
      </ol>
     </div>
     <div class="spec-doc">
-     <p>This comment is for <code>full_gadt_alias</code>.</p>
+     <p id="p120">This comment is for <code>full_gadt_alias</code>.</p>
     </div>
    </div>
    <div class="odoc-spec">
@@ -1614,7 +1626,7 @@ <h4 id="advanced-type-stuff">
      </ol>
     </div>
     <div class="spec-doc">
-     <p>This comment is for <code>partial_gadt_alias</code>.</p>
+     <p id="p121">This comment is for <code>partial_gadt_alias</code>.</p>
     </div>
    </div>
    <div class="odoc-spec">
@@ -1627,7 +1639,7 @@ <h4 id="advanced-type-stuff">
      </code>
     </div>
     <div class="spec-doc">
-     <p>This comment is for 
+     <p id="p122">This comment is for 
       <a href="#exception-Exn_arrow"><code>Exn_arrow</code></a>.
      </p>
     </div>
@@ -1653,7 +1665,7 @@ <h4 id="advanced-type-stuff">
         </span>
        </code>
        <div class="def-doc"><span class="comment-delim">(*</span>
-        <p>This comment is between 
+        <p id="p124">This comment is between 
          <a href="#type-mutual_constr_a"><code>mutual_constr_a</code></a>
           and 
          <a href="#type-mutual_constr_b"><code>mutual_constr_b</code></a>
@@ -1664,7 +1676,7 @@ <h4 id="advanced-type-stuff">
      </ol>
     </div>
     <div class="spec-doc">
-     <p>This comment is for 
+     <p id="p123">This comment is for 
       <a href="#type-mutual_constr_a"><code>mutual_constr_a</code></a>
        then <a href="#type-mutual_constr_b"><code>mutual_constr_b</code></a>
       .
@@ -1692,14 +1704,15 @@ <h4 id="advanced-type-stuff">
         </span>
        </code>
        <div class="def-doc"><span class="comment-delim">(*</span>
-        <p>This comment must be here for the next to associate correctly.</p>
-        <span class="comment-delim">*)</span>
+        <p id="p126">This comment must be here for the next to associate
+          correctly.
+        </p><span class="comment-delim">*)</span>
        </div>
       </li>
      </ol>
     </div>
     <div class="spec-doc">
-     <p>This comment is for 
+     <p id="p125">This comment is for 
       <a href="#type-mutual_constr_b"><code>mutual_constr_b</code></a>
        then <a href="#type-mutual_constr_a"><code>mutual_constr_a</code></a>
       .
@@ -1777,7 +1790,9 @@ <h4 id="advanced-type-stuff">
      <code><span><span class="keyword">type</span> ext</span><span> = </span>
       <span>..</span>
      </code>
-    </div><div class="spec-doc"><p>A mystery wrapped in an ellipsis</p></div>
+    </div>
+    <div class="spec-doc"><p id="p127">A mystery wrapped in an ellipsis</p>
+    </div>
    </div>
    <div class="odoc-spec">
     <div class="spec type extension anchored" id="extension-decl-ExtA">
@@ -1877,7 +1892,7 @@ <h4 id="advanced-type-stuff">
       <span><span class="keyword">type</span> <span>'a poly_ext</span></span>
       <span> = </span><span>..</span>
      </code>
-    </div><div class="spec-doc"><p>'a poly_ext</p></div>
+    </div><div class="spec-doc"><p id="p128">'a poly_ext</p></div>
    </div>
    <div class="odoc-spec">
     <div class="spec type extension anchored" id="extension-decl-Foo">
@@ -1905,7 +1920,7 @@ <h4 id="advanced-type-stuff">
         </span>
        </code>
        <div class="def-doc"><span class="comment-delim">(*</span>
-        <p>'b poly_ext</p><span class="comment-delim">*)</span>
+        <p id="p129">'b poly_ext</p><span class="comment-delim">*)</span>
        </div>
       </li>
      </ol>
@@ -1928,7 +1943,7 @@ <h4 id="advanced-type-stuff">
         </span>
        </code>
        <div class="def-doc"><span class="comment-delim">(*</span>
-        <p>'c poly_ext</p><span class="comment-delim">*)</span>
+        <p id="p130">'c poly_ext</p><span class="comment-delim">*)</span>
        </div>
       </li>
      </ol>
@@ -1962,7 +1977,8 @@ <h4 id="advanced-type-stuff">
         <span><span class="extension">ZzzTop0</span></span>
        </code>
        <div class="def-doc"><span class="comment-delim">(*</span>
-        <p>It's got the rock</p><span class="comment-delim">*)</span>
+        <p id="p131">It's got the rock</p>
+        <span class="comment-delim">*)</span>
        </div>
       </li>
      </ol>
@@ -1985,7 +2001,8 @@ <h4 id="advanced-type-stuff">
         </span>
        </code>
        <div class="def-doc"><span class="comment-delim">(*</span>
-        <p>and it packs a unit.</p><span class="comment-delim">*)</span>
+        <p id="p132">and it packs a unit.</p>
+        <span class="comment-delim">*)</span>
        </div>
       </li>
      </ol>
@@ -1999,7 +2016,8 @@ <h4 id="advanced-type-stuff">
        <span>unit <span class="arrow">&#45;&gt;</span></span> unit
       </span>
      </code>
-    </div><div class="spec-doc"><p>Rotate keys on my mark...</p></div>
+    </div>
+    <div class="spec-doc"><p id="p133">Rotate keys on my mark...</p></div>
    </div>
    <div class="odoc-spec">
     <div class="spec type anchored" id="type-my_mod">
@@ -2013,7 +2031,8 @@ <h4 id="advanced-type-stuff">
       </span>
      </code>
     </div>
-    <div class="spec-doc"><p>A brown paper package tied up with string</p>
+    <div class="spec-doc">
+     <p id="p134">A brown paper package tied up with string</p>
     </div>
    </div>
    <div class="odoc-spec">
@@ -2701,11 +2720,11 @@ <h4 id="advanced-type-stuff">
    <h2 id="indexmodules"><a href="#indexmodules" class="anchor"></a>Trying
      the {!modules: ...} command.
    </h2>
-   <p>With ocamldoc, toplevel units will be linked and documented, while
-     submodules will behave as simple references.
+   <p id="p136">With ocamldoc, toplevel units will be linked and documented,
+     while submodules will behave as simple references.
    </p>
-   <p>With odoc, everything should be resolved (and linked) but only 
-    toplevel units will be documented.
+   <p id="p137">With odoc, everything should be resolved (and linked)
+     but only toplevel units will be documented.
    </p>
    <ul class="modules">
     <li><a href="Ocamlary-Dep1-X.html"><code>Dep1.X</code></a> </li>
@@ -2749,7 +2768,7 @@ <h2 id="playing-with-@canonical-paths">
      </code>
     </div>
    </div>
-   <p>Some ref to 
+   <p id="p138">Some ref to 
     <a href="Ocamlary-CanonicalTest-Base_Tests-C.html#type-t">
      <code>CanonicalTest.Base_Tests.C.t</code>
     </a> and 
@@ -2780,7 +2799,7 @@ <h2 id="aliases"><a href="#aliases" class="anchor"></a>Aliases again</h2>
    <h2 id="section-title-splicing">
     <a href="#section-title-splicing" class="anchor"></a>Section title
      splicing
-   </h2><p>I can refer to</p>
+   </h2><p id="p142">I can refer to</p>
    <ul>
     <li><code>{!section:indexmodules}</code> : 
      <a href="#indexmodules" title="indexmodules">Trying the {!modules:
@@ -2790,7 +2809,7 @@ <h2 id="section-title-splicing">
     <li><code>{!aliases}</code> : 
      <a href="#aliases" title="aliases">Aliases again</a>
     </li>
-   </ul><p>But also to things in submodules:</p>
+   </ul><p id="p145">But also to things in submodules:</p>
    <ul>
     <li><code>{!section:SuperSig.SubSigA.subSig}</code> : 
      <a href="Ocamlary-module-type-SuperSig-module-type-SubSigA.html#subSig">
@@ -2800,7 +2819,7 @@ <h2 id="section-title-splicing">
     <li><code>{!Aliases.incl}</code> : 
      <a href="Ocamlary-Aliases.html#incl"><code>incl</code></a>
     </li>
-   </ul><p>And just to make sure we do not mess up:</p>
+   </ul><p id="p148">And just to make sure we do not mess up:</p>
    <ul>
     <li><code>{{!section:indexmodules}A}</code> : 
      <a href="#indexmodules" title="indexmodules">A</a>
@@ -2846,7 +2865,7 @@ <h2 id="new-reference-syntax">
       </span>
      </code>
     </div>
-   </div><p>Here goes:</p>
+   </div><p id="p153">Here goes:</p>
    <ul>
     <li><code>{!module-M.t}</code> : 
      <a href="Ocamlary-M.html#type-t"><code>M.t</code></a>
diff --git a/test/generators/html/Recent.html b/test/generators/html/Recent.html
index 3458023d01..d0edaf12ce 100644
--- a/test/generators/html/Recent.html
+++ b/test/generators/html/Recent.html
@@ -66,8 +66,8 @@ <h1>Module <code><span>Recent</span></code></h1>
        <a href="#type-variant.C" class="anchor"></a>
        <code><span>| </span><span><span class="constructor">C</span></span>
        </code>
-       <div class="def-doc"><span class="comment-delim">(*</span><p>foo</p>
-        <span class="comment-delim">*)</span>
+       <div class="def-doc"><span class="comment-delim">(*</span>
+        <p id="p0">foo</p><span class="comment-delim">*)</span>
        </div>
       </li>
       <li id="type-variant.D" class="def variant constructor anchored">
@@ -75,7 +75,7 @@ <h1>Module <code><span>Recent</span></code></h1>
        <code><span>| </span><span><span class="constructor">D</span></span>
        </code>
        <div class="def-doc"><span class="comment-delim">(*</span>
-        <p><em>bar</em></p><span class="comment-delim">*)</span>
+        <p id="p1"><em>bar</em></p><span class="comment-delim">*)</span>
        </div>
       </li>
       <li id="type-variant.E" class="def variant constructor anchored">
@@ -118,8 +118,8 @@ <h1>Module <code><span>Recent</span></code></h1>
          <span>string <a href="#type-gadt">gadt</a></span>
         </span>
        </code>
-       <div class="def-doc"><span class="comment-delim">(*</span><p>foo</p>
-        <span class="comment-delim">*)</span>
+       <div class="def-doc"><span class="comment-delim">(*</span>
+        <p id="p2">foo</p><span class="comment-delim">*)</span>
        </div>
       </li>
       <li id="type-gadt.C" class="def variant constructor anchored">
@@ -161,15 +161,15 @@ <h1>Module <code><span>Recent</span></code></h1>
       <li id="type-polymorphic_variant.C" class="def constructor anchored">
        <a href="#type-polymorphic_variant.C" class="anchor"></a>
        <code><span>| </span></code><code><span>`C</span></code>
-       <div class="def-doc"><span class="comment-delim">(*</span><p>foo</p>
-        <span class="comment-delim">*)</span>
+       <div class="def-doc"><span class="comment-delim">(*</span>
+        <p id="p3">foo</p><span class="comment-delim">*)</span>
        </div>
       </li>
       <li id="type-polymorphic_variant.D" class="def constructor anchored">
        <a href="#type-polymorphic_variant.D" class="anchor"></a>
        <code><span>| </span></code><code><span>`D</span></code>
-       <div class="def-doc"><span class="comment-delim">(*</span><p>bar</p>
-        <span class="comment-delim">*)</span>
+       <div class="def-doc"><span class="comment-delim">(*</span>
+        <p id="p4">bar</p><span class="comment-delim">*)</span>
        </div>
       </li>
      </ol><code><span> ]</span></code>
diff --git a/test/generators/html/Section.html b/test/generators/html/Section.html
index 45cbbf2113..cbb81a0fb6 100644
--- a/test/generators/html/Section.html
+++ b/test/generators/html/Section.html
@@ -10,8 +10,8 @@
  <body class="odoc">
   <header class="odoc-preamble">
    <h1>Module <code><span>Section</span></code></h1>
-   <p>This is the module comment. Eventually, sections won't be allowed
-     in it.
+   <p id="p0">This is the module comment. Eventually, sections won't 
+    be allowed in it.
    </p>
   </header>
   <nav class="odoc-toc">
@@ -40,9 +40,9 @@ <h2 id="empty-section"><a href="#empty-section" class="anchor"></a>
     Empty section
    </h2>
    <h2 id="text-only"><a href="#text-only" class="anchor"></a>Text only</h2>
-   <p>Foo bar.</p>
+   <p id="p1">Foo bar.</p>
    <h2 id="aside-only"><a href="#aside-only" class="anchor"></a>Aside only
-   </h2><p>Foo bar.</p>
+   </h2><p id="p2">Foo bar.</p>
    <h2 id="value-only"><a href="#value-only" class="anchor"></a>Value only
    </h2>
    <div class="odoc-spec">
@@ -65,9 +65,9 @@ <h2 id="this-section-title-has-markup">
     <a href="#this-section-title-has-markup" class="anchor"></a><em>This</em>
      <code>section</code> <b>title</b> <sub>has</sub> <sup>markup</sup>
    </h2>
-   <p>But links are impossible thanks to the parser, so we never have
-     trouble rendering a section title in a table of contents – no 
-    link will be nested inside another link.
+   <p id="p3">But links are impossible thanks to the parser, so we never
+     have trouble rendering a section title in a table of contents –
+     no link will be nested inside another link.
    </p>
   </div>
  </body>
diff --git a/test/generators/html/Stop-P.html b/test/generators/html/Stop-P.html
index 3373bc50fd..f26597d719 100644
--- a/test/generators/html/Stop-P.html
+++ b/test/generators/html/Stop-P.html
@@ -11,7 +11,7 @@
    <a href="Stop.html">Stop</a> &#x00BB; P
   </nav>
   <header class="odoc-preamble">
-   <h1>Module <code><span>Stop.P</span></code></h1><p>Doc.</p>
+   <h1>Module <code><span>Stop.P</span></code></h1><p id="p8">Doc.</p>
   </header>
   <div class="odoc-content">
    <div class="odoc-spec">
diff --git a/test/generators/html/Stop.html b/test/generators/html/Stop.html
index 4f0e4398d2..945f5ae055 100644
--- a/test/generators/html/Stop.html
+++ b/test/generators/html/Stop.html
@@ -9,24 +9,25 @@
  <body class="odoc">
   <header class="odoc-preamble">
    <h1>Module <code><span>Stop</span></code></h1>
-   <p>This test cases exercises stop comments.</p>
+   <p id="p0">This test cases exercises stop comments.</p>
   </header>
   <div class="odoc-content">
    <div class="odoc-spec">
     <div class="spec value anchored" id="val-foo">
      <a href="#val-foo" class="anchor"></a>
      <code><span><span class="keyword">val</span> foo : int</span></code>
-    </div><div class="spec-doc"><p>This is normal commented text.</p></div>
+    </div>
+    <div class="spec-doc"><p id="p1">This is normal commented text.</p></div>
    </div>
-   <p>The next value is <code>bar</code>, and it should be missing from
-     the documentation. There is also an entire module, <code>M</code>
+   <p id="p2">The next value is <code>bar</code>, and it should be missing
+     from the documentation. There is also an entire module, <code>M</code>
     , which should also be hidden. It contains a nested stop comment,
      but that stop comment should not turn documentation back on in this
      outer module, because stop comments respect scope.
-   </p><p>Documentation is on again.</p>
-   <p>Now, we have a nested module, and it has a stop comment between
-     its two items. We want to see that the first item is displayed, 
-    but the second is missing, and the stop comment disables documenation
+   </p><p id="p4">Documentation is on again.</p>
+   <p id="p5">Now, we have a nested module, and it has a stop comment
+     between its two items. We want to see that the first item is displayed,
+     but the second is missing, and the stop comment disables documenation
      only in that module, and not in this outer module.
    </p>
    <div class="odoc-spec">
@@ -47,9 +48,9 @@ <h1>Module <code><span>Stop</span></code></h1>
      <code><span><span class="keyword">val</span> lol : int</span></code>
     </div>
    </div>
-   <p>The first comment can also be a stop-comment. The test case 
-    <code>stop_first_comment.mli</code> is testing the same thing but
-     at the toplevel. We should see <code>bar</code> inside 
+   <p id="p6">The first comment can also be a stop-comment. The test 
+    case <code>stop_first_comment.mli</code> is testing the same thing
+     but at the toplevel. We should see <code>bar</code> inside 
     <a href="Stop-O.html"><code>O</code></a>.
    </p>
    <div class="odoc-spec">
@@ -63,7 +64,9 @@ <h1>Module <code><span>Stop</span></code></h1>
       </span>
      </code>
     </div>
-   </div><p>The top-comment computation must not mess with stop comments.</p>
+   </div>
+   <p id="p7">The top-comment computation must not mess with stop comments.
+   </p>
    <div class="odoc-spec">
     <div class="spec module anchored" id="module-P">
      <a href="#module-P" class="anchor"></a>
diff --git a/test/generators/html/Tag_link.html b/test/generators/html/Tag_link.html
index 70b14cda65..a35205fa1f 100644
--- a/test/generators/html/Tag_link.html
+++ b/test/generators/html/Tag_link.html
@@ -20,35 +20,35 @@ <h1>Module <code><span>Tag_link</span></code></h1>
    </div>
    <ul class="at-tags">
     <li class="deprecated"><span class="at-tag">deprecated</span> 
-     <p><a href="#val-foo"><code>foo</code></a></p>
+     <p id="p0"><a href="#val-foo"><code>foo</code></a></p>
     </li>
    </ul>
    <ul class="at-tags">
     <li class="parameter"><span class="at-tag">parameter</span> 
      <span class="value">foo</span> 
-     <p><a href="#val-foo"><code>foo</code></a></p>
+     <p id="p1"><a href="#val-foo"><code>foo</code></a></p>
     </li>
    </ul>
    <ul class="at-tags">
     <li class="raises"><span class="at-tag">raises</span> <code>Foo</code>
-      <p><a href="#val-foo"><code>foo</code></a></p>
+      <p id="p2"><a href="#val-foo"><code>foo</code></a></p>
     </li>
    </ul>
    <ul class="at-tags">
     <li class="returns"><span class="at-tag">returns</span> 
-     <p><a href="#val-foo"><code>foo</code></a></p>
+     <p id="p3"><a href="#val-foo"><code>foo</code></a></p>
     </li>
    </ul>
    <ul class="at-tags">
     <li class="see"><span class="at-tag">see</span> 
      <span class="value">foo</span> 
-     <p><a href="#val-foo"><code>foo</code></a></p>
+     <p id="p4"><a href="#val-foo"><code>foo</code></a></p>
     </li>
    </ul>
    <ul class="at-tags">
     <li class="before"><span class="at-tag">before</span> 
      <span class="value">0.0.1</span> 
-     <p><a href="#val-foo"><code>foo</code></a></p>
+     <p id="p5"><a href="#val-foo"><code>foo</code></a></p>
     </li>
    </ul>
   </div>
diff --git a/test/generators/html/Toplevel_comments-Alias.html b/test/generators/html/Toplevel_comments-Alias.html
index c9a186904e..c79c49df6a 100644
--- a/test/generators/html/Toplevel_comments-Alias.html
+++ b/test/generators/html/Toplevel_comments-Alias.html
@@ -13,7 +13,8 @@
   </nav>
   <header class="odoc-preamble">
    <h1>Module <code><span>Toplevel_comments.Alias</span></code></h1>
-   <p>Doc of <code>Alias</code>.</p><p>Doc of <code>T</code>, part 2.</p>
+   <p id="p13">Doc of <code>Alias</code>.</p>
+   <p id="p2">Doc of <code>T</code>, part 2.</p>
   </header>
   <div class="odoc-content">
    <div class="odoc-spec">
diff --git a/test/generators/html/Toplevel_comments-Comments_on_open.html b/test/generators/html/Toplevel_comments-Comments_on_open.html
index 3a09f82c09..d14f125eaa 100644
--- a/test/generators/html/Toplevel_comments-Comments_on_open.html
+++ b/test/generators/html/Toplevel_comments-Comments_on_open.html
@@ -31,8 +31,8 @@ <h1>Module <code><span>Toplevel_comments.Comments_on_open</span></code>
      </code>
     </div>
    </div><h3 id="sec"><a href="#sec" class="anchor"></a>Section</h3>
-   <p>Comments attached to open are treated as floating comments. Referencing
-     <a href="#sec" title="sec">Section</a> 
+   <p id="p21">Comments attached to open are treated as floating comments.
+     Referencing <a href="#sec" title="sec">Section</a> 
     <a href="Toplevel_comments-Comments_on_open-M.html#type-t">
      <code>M.t</code>
     </a> works
diff --git a/test/generators/html/Toplevel_comments-Include_inline'.html b/test/generators/html/Toplevel_comments-Include_inline'.html
index f0b9734ed9..687fbc116f 100644
--- a/test/generators/html/Toplevel_comments-Include_inline'.html
+++ b/test/generators/html/Toplevel_comments-Include_inline'.html
@@ -14,10 +14,10 @@
   </nav>
   <header class="odoc-preamble">
    <h1>Module <code><span>Toplevel_comments.Include_inline'</span></code>
-   </h1><p>Doc of <code>Include_inline</code>, part 1.</p>
-   <p>Doc of <code>Include_inline</code>, part 2.</p>
+   </h1><p id="p3">Doc of <code>Include_inline</code>, part 1.</p>
+   <p id="p4">Doc of <code>Include_inline</code>, part 2.</p>
   </header>
-  <div class="odoc-content"><div class="spec-doc"><p>part 3</p></div>
+  <div class="odoc-content"><div class="spec-doc"><p id="p5">part 3</p></div>
    <div class="odoc-spec">
     <div class="spec type anchored" id="type-t">
      <a href="#type-t" class="anchor"></a>
diff --git a/test/generators/html/Toplevel_comments-Include_inline.html b/test/generators/html/Toplevel_comments-Include_inline.html
index 4485b9ab95..6f6f28de88 100644
--- a/test/generators/html/Toplevel_comments-Include_inline.html
+++ b/test/generators/html/Toplevel_comments-Include_inline.html
@@ -14,7 +14,7 @@
   </nav>
   <header class="odoc-preamble">
    <h1>Module <code><span>Toplevel_comments.Include_inline</span></code></h1>
-   <p>Doc of <code>T</code>, part 2.</p>
+   <p id="p2">Doc of <code>T</code>, part 2.</p>
   </header>
   <div class="odoc-content">
    <div class="odoc-spec">
diff --git a/test/generators/html/Toplevel_comments-M''.html b/test/generators/html/Toplevel_comments-M''.html
index 78433c5733..1bf58c3c1b 100644
--- a/test/generators/html/Toplevel_comments-M''.html
+++ b/test/generators/html/Toplevel_comments-M''.html
@@ -13,8 +13,8 @@
   </nav>
   <header class="odoc-preamble">
    <h1>Module <code><span>Toplevel_comments.M''</span></code></h1>
-   <p>Doc of <code>M''</code>, part 1.</p>
-   <p>Doc of <code>M''</code>, part 2.</p>
+   <p id="p11">Doc of <code>M''</code>, part 1.</p>
+   <p id="p12">Doc of <code>M''</code>, part 2.</p>
   </header><div class="odoc-content"></div>
  </body>
 </html>
diff --git a/test/generators/html/Toplevel_comments-M'.html b/test/generators/html/Toplevel_comments-M'.html
index 3f54b568d9..1e03a736fb 100644
--- a/test/generators/html/Toplevel_comments-M'.html
+++ b/test/generators/html/Toplevel_comments-M'.html
@@ -13,7 +13,7 @@
   </nav>
   <header class="odoc-preamble">
    <h1>Module <code><span>Toplevel_comments.M'</span></code></h1>
-   <p>Doc of <code>M'</code> from outside</p>
+   <p id="p10">Doc of <code>M'</code> from outside</p>
   </header><div class="odoc-content"></div>
  </body>
 </html>
diff --git a/test/generators/html/Toplevel_comments-M.html b/test/generators/html/Toplevel_comments-M.html
index b9a21a41c2..eaf1c044f0 100644
--- a/test/generators/html/Toplevel_comments-M.html
+++ b/test/generators/html/Toplevel_comments-M.html
@@ -13,7 +13,7 @@
   </nav>
   <header class="odoc-preamble">
    <h1>Module <code><span>Toplevel_comments.M</span></code></h1>
-   <p>Doc of <code>M</code></p>
+   <p id="p9">Doc of <code>M</code></p>
   </header><div class="odoc-content"></div>
  </body>
 </html>
diff --git a/test/generators/html/Toplevel_comments-Ref_in_synopsis.html b/test/generators/html/Toplevel_comments-Ref_in_synopsis.html
index 643caa86e2..ded5e24bcf 100644
--- a/test/generators/html/Toplevel_comments-Ref_in_synopsis.html
+++ b/test/generators/html/Toplevel_comments-Ref_in_synopsis.html
@@ -14,9 +14,9 @@
   </nav>
   <header class="odoc-preamble">
    <h1>Module <code><span>Toplevel_comments.Ref_in_synopsis</span></code>
-   </h1><p><a href="#type-t"><code>t</code></a>.</p>
-   <p>This reference should resolve in the context of this module, even
-     when used as a synopsis.
+   </h1><p id="p19"><a href="#type-t"><code>t</code></a>.</p>
+   <p id="p20">This reference should resolve in the context of this module,
+     even when used as a synopsis.
    </p>
   </header>
   <div class="odoc-content">
diff --git a/test/generators/html/Toplevel_comments-class-c1.html b/test/generators/html/Toplevel_comments-class-c1.html
index aa6a437456..b7bf64da6e 100644
--- a/test/generators/html/Toplevel_comments-class-c1.html
+++ b/test/generators/html/Toplevel_comments-class-c1.html
@@ -13,8 +13,8 @@
   </nav>
   <header class="odoc-preamble">
    <h1>Class <code><span>Toplevel_comments.c1</span></code></h1>
-   <p>Doc of <code>c1</code>, part 1.</p>
-   <p>Doc of <code>c1</code>, part 2.</p>
+   <p id="p14">Doc of <code>c1</code>, part 1.</p>
+   <p id="p15">Doc of <code>c1</code>, part 2.</p>
   </header><div class="odoc-content"></div>
  </body>
 </html>
diff --git a/test/generators/html/Toplevel_comments-class-c2.html b/test/generators/html/Toplevel_comments-class-c2.html
index 092ed22a3d..58efa95741 100644
--- a/test/generators/html/Toplevel_comments-class-c2.html
+++ b/test/generators/html/Toplevel_comments-class-c2.html
@@ -13,7 +13,8 @@
   </nav>
   <header class="odoc-preamble">
    <h1>Class <code><span>Toplevel_comments.c2</span></code></h1>
-   <p>Doc of <code>c2</code>.</p><p>Doc of <code>ct</code>, part 2.</p>
+   <p id="p18">Doc of <code>c2</code>.</p>
+   <p id="p17">Doc of <code>ct</code>, part 2.</p>
   </header><div class="odoc-content"></div>
  </body>
 </html>
diff --git a/test/generators/html/Toplevel_comments-class-type-ct.html b/test/generators/html/Toplevel_comments-class-type-ct.html
index 28ce08169b..7180e9f290 100644
--- a/test/generators/html/Toplevel_comments-class-type-ct.html
+++ b/test/generators/html/Toplevel_comments-class-type-ct.html
@@ -13,8 +13,8 @@
   </nav>
   <header class="odoc-preamble">
    <h1>Class type <code><span>Toplevel_comments.ct</span></code></h1>
-   <p>Doc of <code>ct</code>, part 1.</p>
-   <p>Doc of <code>ct</code>, part 2.</p>
+   <p id="p16">Doc of <code>ct</code>, part 1.</p>
+   <p id="p17">Doc of <code>ct</code>, part 2.</p>
   </header><div class="odoc-content"></div>
  </body>
 </html>
diff --git a/test/generators/html/Toplevel_comments-module-type-Include_inline_T'.html b/test/generators/html/Toplevel_comments-module-type-Include_inline_T'.html
index 97f9ae61ba..ad93462c83 100644
--- a/test/generators/html/Toplevel_comments-module-type-Include_inline_T'.html
+++ b/test/generators/html/Toplevel_comments-module-type-Include_inline_T'.html
@@ -15,10 +15,10 @@
   <header class="odoc-preamble">
    <h1>Module type 
     <code><span>Toplevel_comments.Include_inline_T'</span></code>
-   </h1><p>Doc of <code>Include_inline_T'</code>, part 1.</p>
-   <p>Doc of <code>Include_inline_T'</code>, part 2.</p>
+   </h1><p id="p6">Doc of <code>Include_inline_T'</code>, part 1.</p>
+   <p id="p7">Doc of <code>Include_inline_T'</code>, part 2.</p>
   </header>
-  <div class="odoc-content"><div class="spec-doc"><p>part 3</p></div>
+  <div class="odoc-content"><div class="spec-doc"><p id="p8">part 3</p></div>
    <div class="odoc-spec">
     <div class="spec type anchored" id="type-t">
      <a href="#type-t" class="anchor"></a>
diff --git a/test/generators/html/Toplevel_comments-module-type-Include_inline_T.html b/test/generators/html/Toplevel_comments-module-type-Include_inline_T.html
index 0c52cdf592..c6ce4d8d86 100644
--- a/test/generators/html/Toplevel_comments-module-type-Include_inline_T.html
+++ b/test/generators/html/Toplevel_comments-module-type-Include_inline_T.html
@@ -15,7 +15,7 @@
   <header class="odoc-preamble">
    <h1>Module type 
     <code><span>Toplevel_comments.Include_inline_T</span></code>
-   </h1><p>Doc of <code>T</code>, part 2.</p>
+   </h1><p id="p2">Doc of <code>T</code>, part 2.</p>
   </header>
   <div class="odoc-content">
    <div class="odoc-spec">
diff --git a/test/generators/html/Toplevel_comments-module-type-T.html b/test/generators/html/Toplevel_comments-module-type-T.html
index fbc2014c28..80f208198f 100644
--- a/test/generators/html/Toplevel_comments-module-type-T.html
+++ b/test/generators/html/Toplevel_comments-module-type-T.html
@@ -13,7 +13,8 @@
   </nav>
   <header class="odoc-preamble">
    <h1>Module type <code><span>Toplevel_comments.T</span></code></h1>
-   <p>Doc of <code>T</code>, part 1.</p><p>Doc of <code>T</code>, part 2.</p>
+   <p id="p1">Doc of <code>T</code>, part 1.</p>
+   <p id="p2">Doc of <code>T</code>, part 2.</p>
   </header>
   <div class="odoc-content">
    <div class="odoc-spec">
diff --git a/test/generators/html/Toplevel_comments.html b/test/generators/html/Toplevel_comments.html
index 78df3372ab..328f03eb11 100644
--- a/test/generators/html/Toplevel_comments.html
+++ b/test/generators/html/Toplevel_comments.html
@@ -10,8 +10,8 @@
  <body class="odoc">
   <header class="odoc-preamble">
    <h1>Module <code><span>Toplevel_comments</span></code></h1>
-   <p>A doc comment at the beginning of a module is considered to be 
-    that module's doc.
+   <p id="p0">A doc comment at the beginning of a module is considered
+     to be that module's doc.
    </p>
   </header>
   <div class="odoc-content">
diff --git a/test/generators/html/Type.html b/test/generators/html/Type.html
index 3b7870c640..f602d443fb 100644
--- a/test/generators/html/Type.html
+++ b/test/generators/html/Type.html
@@ -15,7 +15,8 @@ <h1>Module <code><span>Type</span></code></h1>
     <div class="spec type anchored" id="type-abstract">
      <a href="#type-abstract" class="anchor"></a>
      <code><span><span class="keyword">type</span> abstract</span></code>
-    </div><div class="spec-doc"><p>Some <em>documentation</em>.</p></div>
+    </div>
+    <div class="spec-doc"><p id="p0">Some <em>documentation</em>.</p></div>
    </div>
    <div class="odoc-spec">
     <div class="spec type anchored" id="type-alias">
@@ -233,8 +234,8 @@ <h1>Module <code><span>Type</span></code></h1>
        <a href="#type-variant.C" class="anchor"></a>
        <code><span>| </span><span><span class="constructor">C</span></span>
        </code>
-       <div class="def-doc"><span class="comment-delim">(*</span><p>foo</p>
-        <span class="comment-delim">*)</span>
+       <div class="def-doc"><span class="comment-delim">(*</span>
+        <p id="p1">foo</p><span class="comment-delim">*)</span>
        </div>
       </li>
       <li id="type-variant.D" class="def variant constructor anchored">
@@ -242,7 +243,7 @@ <h1>Module <code><span>Type</span></code></h1>
        <code><span>| </span><span><span class="constructor">D</span></span>
        </code>
        <div class="def-doc"><span class="comment-delim">(*</span>
-        <p><em>bar</em></p><span class="comment-delim">*)</span>
+        <p id="p2"><em>bar</em></p><span class="comment-delim">*)</span>
        </div>
       </li>
       <li id="type-variant.E" class="def variant constructor anchored">
@@ -360,15 +361,15 @@ <h1>Module <code><span>Type</span></code></h1>
       <li id="type-record.c" class="def record field anchored">
        <a href="#type-record.c" class="anchor"></a>
        <code><span>c : int;</span></code>
-       <div class="def-doc"><span class="comment-delim">(*</span><p>foo</p>
-        <span class="comment-delim">*)</span>
+       <div class="def-doc"><span class="comment-delim">(*</span>
+        <p id="p3">foo</p><span class="comment-delim">*)</span>
        </div>
       </li>
       <li id="type-record.d" class="def record field anchored">
        <a href="#type-record.d" class="anchor"></a>
        <code><span>d : int;</span></code>
        <div class="def-doc"><span class="comment-delim">(*</span>
-        <p><em>bar</em></p><span class="comment-delim">*)</span>
+        <p id="p4"><em>bar</em></p><span class="comment-delim">*)</span>
        </div>
       </li>
       <li id="type-record.e" class="def record field anchored">
@@ -747,7 +748,7 @@ <h1>Module <code><span>Type</span></code></h1>
         <span><span class="extension">Extension</span></span>
        </code>
        <div class="def-doc"><span class="comment-delim">(*</span>
-        <p>Documentation for 
+        <p id="p5">Documentation for 
          <a href="#extension-Extension"><code>Extension</code></a>.
         </p><span class="comment-delim">*)</span>
        </div>
@@ -758,7 +759,7 @@ <h1>Module <code><span>Type</span></code></h1>
         <span><span class="extension">Another_extension</span></span>
        </code>
        <div class="def-doc"><span class="comment-delim">(*</span>
-        <p>Documentation for 
+        <p id="p6">Documentation for 
          <a href="#extension-Another_extension">
           <code>Another_extension</code>
          </a>.
diff --git a/test/generators/html/Val.html b/test/generators/html/Val.html
index 29f6266b2d..4e1857d160 100644
--- a/test/generators/html/Val.html
+++ b/test/generators/html/Val.html
@@ -15,7 +15,7 @@
      <a href="#val-documented" class="anchor"></a>
      <code><span><span class="keyword">val</span> documented : unit</span>
      </code>
-    </div><div class="spec-doc"><p>Foo.</p></div>
+    </div><div class="spec-doc"><p id="p0">Foo.</p></div>
    </div>
    <div class="odoc-spec">
     <div class="spec value anchored" id="val-undocumented">
@@ -30,7 +30,7 @@
      <code>
       <span><span class="keyword">val</span> documented_above : unit</span>
      </code>
-    </div><div class="spec-doc"><p>Bar.</p></div>
+    </div><div class="spec-doc"><p id="p1">Bar.</p></div>
    </div>
   </div>
  </body>
diff --git a/test/generators/html/mld.html b/test/generators/html/mld.html
index 54b100972a..bfd4829bd5 100644
--- a/test/generators/html/mld.html
+++ b/test/generators/html/mld.html
@@ -9,9 +9,10 @@
  <body class="odoc">
   <header class="odoc-preamble">
    <h1 id="mld-page"><a href="#mld-page" class="anchor"></a>Mld Page</h1>
-   <p>This is an <code>.mld</code> file. It doesn't have an auto-generated
-     title, like modules and other pages generated fully by odoc do.
-   </p><p>It will have a TOC generated from section headings.</p>
+   <p id="p0">This is an <code>.mld</code> file. It doesn't have an 
+    auto-generated title, like modules and other pages generated fully
+     by odoc do.
+   </p><p id="p1">It will have a TOC generated from section headings.</p>
   </header>
   <nav class="odoc-toc">
    <ul><li><a href="#section">Section</a></li>
@@ -24,18 +25,21 @@ <h1 id="mld-page"><a href="#mld-page" class="anchor"></a>Mld Page</h1>
   </nav>
   <div class="odoc-content">
    <h2 id="section"><a href="#section" class="anchor"></a>Section</h2>
-   <p>This is a section.</p><p>Another paragraph in section.</p>
+   <p id="p2">This is a section.</p>
+   <p id="p3">Another paragraph in section.</p>
    <h2 id="another-section"><a href="#another-section" class="anchor"></a>
     Another section
-   </h2><p>This is another section.</p><p>Another paragraph in section 2.</p>
+   </h2><p id="p4">This is another section.</p>
+   <p id="p5">Another paragraph in section 2.</p>
    <h3 id="subsection"><a href="#subsection" class="anchor"></a>Subsection
-   </h3><p>This is a subsection.</p><p>Another paragraph in subsection.</p>
-   <p>Yet another paragraph in subsection.</p>
+   </h3><p id="p6">This is a subsection.</p>
+   <p id="p7">Another paragraph in subsection.</p>
+   <p id="p8">Yet another paragraph in subsection.</p>
    <h3 id="another-subsection">
     <a href="#another-subsection" class="anchor"></a>Another Subsection
-   </h3><p>This is another subsection.</p>
-   <p>Another paragraph in subsection 2.</p>
-   <p>Yet another paragraph in subsection 2.</p>
+   </h3><p id="p9">This is another subsection.</p>
+   <p id="p10">Another paragraph in subsection 2.</p>
+   <p id="p11">Yet another paragraph in subsection 2.</p>
   </div>
  </body>
 </html>
diff --git a/test/integration/html_opts.t/run.t b/test/integration/html_opts.t/run.t
index 7bb00136dc..77f31de380 100644
--- a/test/integration/html_opts.t/run.t
+++ b/test/integration/html_opts.t/run.t
@@ -22,7 +22,7 @@ Generate --as-json embeddable HTML fragment output:
 
   $ odoc html-generate test.odocl -o html --as-json --indent
   $ cat html/test/Test/index.html.json
-  {"type":"documentation","uses_katex":false,"breadcrumbs":[{"name":"test","href":"../index.html","kind":"page"},{"name":"Test","href":"#","kind":"module"}],"toc":[{"title":"Section 1","href":"#section-1","children":[]},{"title":"Section 2","href":"#section-2","children":[]}],"source_anchor":null,"preamble":"<p>Test</p>","content":"<h2 id=\"section-1\"><a href=\"#section-1\" class=\"anchor\"></a>Section 1</h2><div class=\"odoc-spec\">\u000A <div class=\"spec type anchored\" id=\"type-t\">\u000A  <a href=\"#type-t\" class=\"anchor\"></a>\u000A  <code><span><span class=\"keyword\">type</span> t</span></code>\u000A </div>\u000A</div><h2 id=\"section-2\"><a href=\"#section-2\" class=\"anchor\"></a>Section 2</h2><div class=\"odoc-spec\">\u000A <div class=\"spec type anchored\" id=\"type-u\">\u000A  <a href=\"#type-u\" class=\"anchor\"></a>\u000A  <code><span><span class=\"keyword\">type</span> u</span></code>\u000A </div>\u000A</div>"}
+  {"type":"documentation","uses_katex":false,"breadcrumbs":[{"name":"test","href":"../index.html","kind":"page"},{"name":"Test","href":"#","kind":"module"}],"toc":[{"title":"Section 1","href":"#section-1","children":[]},{"title":"Section 2","href":"#section-2","children":[]}],"source_anchor":null,"preamble":"<p id=\"p0\">Test</p>","content":"<h2 id=\"section-1\"><a href=\"#section-1\" class=\"anchor\"></a>Section 1</h2><div class=\"odoc-spec\">\u000A <div class=\"spec type anchored\" id=\"type-t\">\u000A  <a href=\"#type-t\" class=\"anchor\"></a>\u000A  <code><span><span class=\"keyword\">type</span> t</span></code>\u000A </div>\u000A</div><h2 id=\"section-2\"><a href=\"#section-2\" class=\"anchor\"></a>Section 2</h2><div class=\"odoc-spec\">\u000A <div class=\"spec type anchored\" id=\"type-u\">\u000A  <a href=\"#type-u\" class=\"anchor\"></a>\u000A  <code><span><span class=\"keyword\">type</span> u</span></code>\u000A </div>\u000A</div>"}
 
   $ odoc html-targets test.odocl -o html --as-json --indent
   html/test/Test/index.html.json
diff --git a/test/xref2/canonical_hidden_module.t/run.t b/test/xref2/canonical_hidden_module.t/run.t
index 5b5e51cf28..7ef22ff463 100644
--- a/test/xref2/canonical_hidden_module.t/run.t
+++ b/test/xref2/canonical_hidden_module.t/run.t
@@ -153,8 +153,8 @@ See the comments on the types at the end of test.mli for the expectation.
        </code>
       </div>
       <div class="spec-doc">
-       <p>This should render as A.t but link to A_nonhidden/index.html 
-        - since A has no expansion
+       <p id="p4">This should render as A.t but link to A_nonhidden/index.html
+         - since A has no expansion
        </p>
       </div>
      </div>
@@ -164,8 +164,8 @@ See the comments on the types at the end of test.mli for the expectation.
        <code><span><span class="keyword">type</span> b</span></code>
       </div>
       <div class="spec-doc">
-       <p>This should have no RHS as it's hidden and there is no canonical
-         alternative
+       <p id="p5">This should have no RHS as it's hidden and there is no
+         canonical alternative
        </p>
       </div>
      </div>
@@ -177,7 +177,7 @@ See the comments on the types at the end of test.mli for the expectation.
        </code>
       </div>
       <div class="spec-doc">
-       <p>This should render as C.t and link to C/index.html</p>
+       <p id="p6">This should render as C.t and link to C/index.html</p>
       </div>
      </div>
      <div class="odoc-spec">
@@ -188,7 +188,7 @@ See the comments on the types at the end of test.mli for the expectation.
        </code>
       </div>
       <div class="spec-doc">
-       <p>This should render as D.t and link to D/index.html</p>
+       <p id="p7">This should render as D.t and link to D/index.html</p>
       </div>
      </div>
     </div>
diff --git a/test/xref2/labels/ambiguous_label_warning.t/run.t b/test/xref2/labels/ambiguous_label_warning.t/run.t
index bf6d953139..7d47e8af8d 100644
--- a/test/xref2/labels/ambiguous_label_warning.t/run.t
+++ b/test/xref2/labels/ambiguous_label_warning.t/run.t
@@ -6,8 +6,8 @@ The warning only shows up for explicitly defined labels.
     File "test.mli", line 7, character 4
     File "test.mli", line 9, character 4
   File "test.mli", line 5, characters 4-14:
-  Warning: Label 'foo' is ambiguous. The other occurences are:
+  Warning: Label 'foo' is ambiguous. The other occurrences are:
     File "test.mli", line 3, character 4
   File "test.mli", line 3, characters 4-14:
-  Warning: Label 'foo' is ambiguous. The other occurences are:
+  Warning: Label 'foo' is ambiguous. The other occurrences are:
     File "test.mli", line 5, character 4
diff --git a/test/xref2/labels/labels.t/run.t b/test/xref2/labels/labels.t/run.t
index e964ca9263..1198cc50ee 100644
--- a/test/xref2/labels/labels.t/run.t
+++ b/test/xref2/labels/labels.t/run.t
@@ -5,10 +5,10 @@
     File "test.mli", line 3, character 4
     File "test.mli", line 21, character 4
   File "test.mli", line 21, characters 4-22:
-  Warning: Label 'B' is ambiguous. The other occurences are:
+  Warning: Label 'B' is ambiguous. The other occurrences are:
     File "test.mli", line 3, character 4
   File "test.mli", line 3, characters 4-24:
-  Warning: Label 'B' is ambiguous. The other occurences are:
+  Warning: Label 'B' is ambiguous. The other occurrences are:
     File "test.mli", line 21, character 4
 
 Labels:
@@ -63,7 +63,7 @@ There are two references in N, one should point to a local label and the other t
     </nav>
     <div class="odoc-content">
      <h2 id="B"><a href="#B" class="anchor"></a>An other conflicting label</h2>
-     <p><a href="#B" title="B">An other conflicting label</a> 
+     <p id="p0"><a href="#B" title="B">An other conflicting label</a> 
       <a href="../M/index.html#B"><code>B</code></a>
      </p>
     </div>
@@ -123,9 +123,9 @@ The second occurence of 'B' in the main page should be disambiguated
        </code>
       </div>
      </div><h2 id="B_2"><a href="#B_2" class="anchor"></a>Dupplicate B</h2>
-     <p>Define <code>B</code> again in the same scope.</p>
-     <p>References to the labels:</p>
-     <p><a href="#A" title="A">First label</a> 
+     <p id="p1">Define <code>B</code> again in the same scope.</p>
+     <p id="p2">References to the labels:</p>
+     <p id="p3"><a href="#A" title="A">First label</a> 
       <a href="#B" title="B">Dupplicate B</a> 
       <a href="M/index.html#C"><code>C</code></a> 
       <a href="M/index.html#D"><code>D</code></a> 
diff --git a/test/xref2/module_preamble.t/run.t b/test/xref2/module_preamble.t/run.t
index 0e7895eec0..12812e96c1 100644
--- a/test/xref2/module_preamble.t/run.t
+++ b/test/xref2/module_preamble.t/run.t
@@ -42,7 +42,7 @@ and that "hidden" modules (eg. `A__b`, rendered to `html/A__b`) are not rendered
      <a href="../index.html">test</a> &#x00BB; A
     </nav>
     <header class="odoc-preamble"><h1>Module <code><span>A</span></code></h1>
-     <p>Module A.</p>
+     <p id="p0">Module A.</p>
     </header>
     <div class="odoc-content">
      <div class="odoc-spec">
@@ -81,8 +81,8 @@ and that "hidden" modules (eg. `A__b`, rendered to `html/A__b`) are not rendered
       &#x00BB; B
     </nav>
     <header class="odoc-preamble"><h1>Module <code><span>A.B</span></code></h1>
-     <p>Module B. This paragraph is the synopsis.</p>
-     <p>This paragraph and the previous are part of the preamble.</p>
+     <p id="p0">Module B. This paragraph is the synopsis.</p>
+     <p id="p1">This paragraph and the previous are part of the preamble.</p>
     </header>
     <nav class="odoc-toc">
      <ul><li><a href="#an-heading">An heading</a></li></ul>
@@ -90,8 +90,8 @@ and that "hidden" modules (eg. `A__b`, rendered to `html/A__b`) are not rendered
     <div class="odoc-content">
      <h3 id="an-heading"><a href="#an-heading" class="anchor"></a>An heading
      </h3>
-     <p>This paragraph is not part of the preamble. It'll be rendered in
-       the &quot;content&quot;.
+     <p id="p2">This paragraph is not part of the preamble. It'll be rendered
+       in the &quot;content&quot;.
      </p>
      <div class="odoc-spec">
       <div class="spec type anchored" id="type-t">