From 8326dd5fbdabdde1bd7d470e245c1b4d886b9219 Mon Sep 17 00:00:00 2001 From: Maxime Mangel Date: Mon, 30 Dec 2024 21:11:45 +0100 Subject: [PATCH 1/3] style: try make code more consistent and align HTML DSL to 4 spaces indentation --- .editorconfig | 19 +- src/FSharp.Formatting.ApiDocs/GenerateHtml.fs | 1315 ++++++++++------- 2 files changed, 829 insertions(+), 505 deletions(-) diff --git a/.editorconfig b/.editorconfig index 3c8678113..8779598c5 100644 --- a/.editorconfig +++ b/.editorconfig @@ -3,10 +3,7 @@ root = true [*] end_of_line = lf - -[*.{fs,fsi,fsx}] charset = utf-8 -end_of_line = lf indent_style = space indent_size = 4 trim_trailing_whitespace = true @@ -16,5 +13,19 @@ fsharp_max_array_or_list_width=120 fsharp_max_infix_operator_expression=80 fsharp_max_value_binding_width=120 +# Specific settings for "View/HTML" related files +# It makes the code more consistent in term of spacing and indentation [GenerateHtml.fs] -fsharp_experimental_elmish = true \ No newline at end of file +fsharp_experimental_elmish = true +fsharp_array_or_list_multiline_formatter = number_of_items +fsharp_max_array_or_list_number_of_items = 0 +fsharp_multi_line_lambda_closing_newline = true +fsharp_multiline_bracket_style = aligned +fsharp_keep_max_number_of_blank_lines = 1 +fsharp_align_function_signature_to_indentation = true +# Keep the if/then/else consistent +fsharp_max_if_then_else_short_width = 0 +# Keep records consistent +fsharp_max_record_number_of_items = 0 +fsharp_record_multiline_formatter = number_of_items +fsharp_alternative_long_member_definitions = true diff --git a/src/FSharp.Formatting.ApiDocs/GenerateHtml.fs b/src/FSharp.Formatting.ApiDocs/GenerateHtml.fs index a6067d233..7d2d1aa4b 100644 --- a/src/FSharp.Formatting.ApiDocs/GenerateHtml.fs +++ b/src/FSharp.Formatting.ApiDocs/GenerateHtml.fs @@ -18,7 +18,15 @@ let fsdocsSummary (x: ApiDocHtml) = if x.HtmlText.StartsWith("
", StringComparison.Ordinal) then
         embed x
     else
-        div [ Class "fsdocs-summary-contents" ] [ p [ Class "fsdocs-summary" ] [ embed x ] ]
+        div [
+            Class "fsdocs-summary-contents"
+        ] [
+            p [
+                Class "fsdocs-summary"
+            ] [
+                embed x
+            ]
+        ]
 
 type HtmlRender(model: ApiDocModel, ?menuTemplateFolder: string) =
     let root = model.Root
@@ -42,20 +50,37 @@ type HtmlRender(model: ApiDocModel, ?menuTemplateFolder: string) =
             let id = UniqueID().ToString()
 
             code
-                [ OnMouseOut(sprintf "hideTip(event, '%s', %s)" id id)
-                  OnMouseOver(sprintf "showTip(event, '%s', %s)" id id) ]
+                [
+                    OnMouseOut(sprintf "hideTip(event, '%s', %s)" id id)
+                    OnMouseOver(sprintf "showTip(event, '%s', %s)" id id)
+                ]
                 content
 
-            div [ Class "fsdocs-tip"; Id id ] tip
+            div
+                [
+                    Class "fsdocs-tip"
+                    Id id
+                ]
+                tip
         ]
 
     let sourceLink url =
-        [ match url with
-          | None -> ()
-          | Some href ->
-              a [ Href href; Class "fsdocs-source-link"; HtmlProperties.Title "Source on GitHub" ] [
-                  iconifyIcon [ Icon "ri:github-fill"; Height "24"; Width "24" ]
-              ] ]
+        [
+            match url with
+            | None -> ()
+            | Some href ->
+                a [
+                    Href href
+                    Class "fsdocs-source-link"
+                    HtmlProperties.Title "Source on GitHub"
+                ] [
+                    iconifyIcon [
+                        Icon "ri:github-fill"
+                        Height "24"
+                        Width "24"
+                    ]
+                ]
+        ]
 
     let removeParen (memberName: string) =
         let firstParen = memberName.IndexOf('(')
@@ -71,13 +96,21 @@ type HtmlRender(model: ApiDocModel, ?menuTemplateFolder: string) =
             Class "fsdocs-source-link"
             HtmlProperties.Title "Copy signature (XML)"
             OnClick(sprintf "Clipboard_CopyTo('')" xmlDocSig)
-        ] [ iconifyIcon [ HtmlProperties.Icon "bi:filetype-xml"; Height "24"; Width "24" ] ]
+        ] [
+            iconifyIcon [
+                HtmlProperties.Icon "bi:filetype-xml"
+                Height "24"
+                Width "24"
+            ]
+        ]
 
     let copyXmlSigIconForSymbol (symbol: FSharpSymbol) =
-        [ match symbol with
-          | :? FSharpMemberOrFunctionOrValue as v -> copyXmlSigIcon (removeParen v.XmlDocSig)
-          | :? FSharpEntity as v -> copyXmlSigIcon (removeParen v.XmlDocSig)
-          | _ -> () ]
+        [
+            match symbol with
+            | :? FSharpMemberOrFunctionOrValue as v -> copyXmlSigIcon (removeParen v.XmlDocSig)
+            | :? FSharpEntity as v -> copyXmlSigIcon (removeParen v.XmlDocSig)
+            | _ -> ()
+        ]
 
     // Copy XML sig for use in `cref` markdown
     let copyXmlSigIconMarkdown (xmlDocSig: string) =
@@ -85,184 +118,286 @@ type HtmlRender(model: ApiDocModel, ?menuTemplateFolder: string) =
             div [] []
         else
             let delim =
-                if xmlDocSig.Contains("``") then "```"
-                elif xmlDocSig.Contains("`") then "``"
-                else "`"
+                if xmlDocSig.Contains("``") then
+                    "```"
+                elif xmlDocSig.Contains("`") then
+                    "``"
+                else
+                    "`"
 
             div [
                 Class "fsdocs-source-link"
                 HtmlProperties.Title "Copy signature (Markdown)"
                 OnClick(sprintf "Clipboard_CopyTo('%scref:%s%s')" delim xmlDocSig delim)
-            ] [ iconifyIcon [ HtmlProperties.Icon "bi:filetype-md"; Height "24"; Width "24" ] ]
+            ] [
+                iconifyIcon [
+                    HtmlProperties.Icon "bi:filetype-md"
+                    Height "24"
+                    Width "24"
+                ]
+            ]
 
     let copyXmlSigIconForSymbolMarkdown (symbol: FSharpSymbol) =
-        [ match symbol with
-          | :? FSharpMemberOrFunctionOrValue as v -> copyXmlSigIconMarkdown (removeParen v.XmlDocSig)
-          | :? FSharpEntity as v -> copyXmlSigIconMarkdown (removeParen v.XmlDocSig)
-          | _ -> () ]
+        [
+            match symbol with
+            | :? FSharpMemberOrFunctionOrValue as v -> copyXmlSigIconMarkdown (removeParen v.XmlDocSig)
+            | :? FSharpEntity as v -> copyXmlSigIconMarkdown (removeParen v.XmlDocSig)
+            | _ -> ()
+        ]
 
     let renderMembers header tableHeader (members: ApiDocMember list) =
-        [ if members.Length > 0 then
-              h3 [] [ !!header ]
-
-              table [ Class "table outer-list fsdocs-member-list" ] [
-                  thead [] [
-                      tr [] [
-                          td [ Class "fsdocs-member-list-header" ] [ !!tableHeader ]
-                          td [ Class "fsdocs-member-list-header" ] [ !! "Description"; fsdocsDetailsToggle [] ]
-                      ]
-                  ]
-                  tbody [] [
-                      for m in members do
-                          tr [] [
-                              td [ Class "fsdocs-member-usage" ] [
-
-                                  codeWithToolTip [
-                                      // This adds #MemberName anchor. These may be ambiguous due to overloading
-                                      p [] [ a [ Id m.Name ] [ a [ Href("#" + m.Name) ] [ embed m.UsageHtml ] ] ]
-                                  ] [
-                                      div [ Class "member-tooltip" ] [
-                                          !! "Full Usage: "
-                                          embed m.UsageHtml
-                                          br []
-                                          br []
-                                          if not m.Parameters.IsEmpty then
-                                              !! "Parameters: "
-
-                                              ul [] [
-                                                  for p in m.Parameters do
-                                                      span [] [
-                                                          b [] [ !!p.ParameterNameText ]
-                                                          !! ":"
-                                                          embed p.ParameterType
-                                                          match p.ParameterDocs with
-                                                          | None -> ()
-                                                          | Some d ->
-                                                              !! " - "
-                                                              embed d
-                                                      ]
-
-                                                      br []
-                                              ]
-
-                                              br []
-                                          match m.ReturnInfo.ReturnType with
-                                          | None -> ()
-                                          | Some(_, rty) ->
-                                              span [] [
-                                                  !!(if m.Kind <> ApiDocMemberKind.RecordField then
-                                                         "Returns: "
-                                                     else
-                                                         "Field type: ")
-                                                  embed rty
-                                              ]
-
-                                              match m.ReturnInfo.ReturnDocs with
-                                              | None -> ()
-                                              | Some d -> embed d
-
-                                              br []
-                                          //!! "Signature: "
-                                          //encode(m.SignatureTooltip)
-                                          if not m.Modifiers.IsEmpty then
-                                              !! "Modifiers: "
-                                              encode (m.FormatModifiers)
-                                              br []
-
-                                              // We suppress the display of ill-formatted type parameters for places
-                                              // where these have not been explicitly declared
-                                              match m.FormatTypeArguments with
-                                              | None -> ()
-                                              | Some v ->
-                                                  !! "Type parameters: "
-                                                  encode (v)
-                                      ]
-                                  ]
-                              ]
-
-                              let smry =
-                                  div [ Class "fsdocs-summary" ] [
-                                      fsdocsSummary m.Comment.Summary
-                                      div [ Class "icon-button-row" ] [
-                                          yield! sourceLink m.SourceLocation
-                                          yield! copyXmlSigIconForSymbol m.Symbol
-                                          yield! copyXmlSigIconForSymbolMarkdown m.Symbol
-                                      ]
-                                  ]
-
-                              let dtls =
-                                  [ match m.Comment.Remarks with
-                                    | Some r -> p [ Class "fsdocs-remarks" ] [ embed r ]
-                                    | None -> ()
-
-                                    match m.ExtendedType with
-                                    | Some(_, extendedTypeHtml) -> p [] [ !! "Extended Type: "; embed extendedTypeHtml ]
-                                    | _ -> ()
-
-                                    if not m.Parameters.IsEmpty then
-                                        dl [ Class "fsdocs-params" ] [
-                                            for parameter in m.Parameters do
-                                                dt [ Class "fsdocs-param" ] [
-                                                    span [ Class "fsdocs-param-name" ] [ !!parameter.ParameterNameText ]
-                                                    !! ":"
-                                                    embed parameter.ParameterType
-                                                ]
+        [
+            if members.Length > 0 then
+                h3 [] [
+                    !!header
+                ]
 
-                                                dd [ Class "fsdocs-param-docs" ] [
-                                                    match parameter.ParameterDocs with
-                                                    | None -> ()
-                                                    | Some d -> p [] [ embed d ]
+                table [
+                    Class "table outer-list fsdocs-member-list"
+                ] [
+                    thead [] [
+                        tr [] [
+                            td [
+                                Class "fsdocs-member-list-header"
+                            ] [
+                                !!tableHeader
+                            ]
+                            td [
+                                Class "fsdocs-member-list-header"
+                            ] [
+                                !! "Description"
+                                fsdocsDetailsToggle []
+                            ]
+                        ]
+                    ]
+                    tbody [] [
+                        for m in members do
+                            tr [] [
+                                td [
+                                    Class "fsdocs-member-usage"
+                                ] [
+
+                                    codeWithToolTip [
+                                        // This adds #MemberName anchor. These may be ambiguous due to overloading
+                                        p [] [
+                                            a [
+                                                Id m.Name
+                                            ] [
+                                                a [
+                                                    Href("#" + m.Name)
+                                                ] [
+                                                    embed m.UsageHtml
                                                 ]
+                                            ]
                                         ]
+                                    ] [
+                                        div [
+                                            Class "member-tooltip"
+                                        ] [
+                                            !! "Full Usage: "
+                                            embed m.UsageHtml
+                                            br []
+                                            br []
+                                            if not m.Parameters.IsEmpty then
+                                                !! "Parameters: "
+
+                                                ul [] [
+                                                    for p in m.Parameters do
+                                                        span [] [
+                                                            b [] [
+                                                                !!p.ParameterNameText
+                                                            ]
+                                                            !! ":"
+                                                            embed p.ParameterType
+                                                            match p.ParameterDocs with
+                                                            | None -> ()
+                                                            | Some d ->
+                                                                !! " - "
+                                                                embed d
+                                                        ]
+
+                                                        br []
+                                                ]
 
-                                    match m.ReturnInfo.ReturnType with
-                                    | None -> ()
-                                    | Some(_, returnTypeHtml) ->
-                                        dl [ Class "fsdocs-returns" ] [
-                                            dt [] [
-                                                span [ Class "fsdocs-return-name" ] [
+                                                br []
+                                            match m.ReturnInfo.ReturnType with
+                                            | None -> ()
+                                            | Some(_, rty) ->
+                                                span [] [
                                                     !!(if m.Kind <> ApiDocMemberKind.RecordField then
                                                            "Returns: "
                                                        else
                                                            "Field type: ")
+                                                    embed rty
                                                 ]
-                                                embed returnTypeHtml
-                                            ]
-                                            dd [ Class "fsdocs-return-docs" ] [
+
                                                 match m.ReturnInfo.ReturnDocs with
                                                 | None -> ()
-                                                | Some r -> p [] [ embed r ]
-                                            ]
+                                                | Some d -> embed d
+
+                                                br []
+                                            //!! "Signature: "
+                                            //encode(m.SignatureTooltip)
+                                            if not m.Modifiers.IsEmpty then
+                                                !! "Modifiers: "
+                                                encode (m.FormatModifiers)
+                                                br []
+
+                                                // We suppress the display of ill-formatted type parameters for places
+                                                // where these have not been explicitly declared
+                                                match m.FormatTypeArguments with
+                                                | None -> ()
+                                                | Some v ->
+                                                    !! "Type parameters: "
+                                                    encode (v)
                                         ]
+                                    ]
+                                ]
+
+                                let smry =
+                                    div [
+                                        Class "fsdocs-summary"
+                                    ] [
+                                        fsdocsSummary m.Comment.Summary
+                                        div [
+                                            Class "icon-button-row"
+                                        ] [
+                                            yield! sourceLink m.SourceLocation
+                                            yield! copyXmlSigIconForSymbol m.Symbol
+                                            yield! copyXmlSigIconForSymbolMarkdown m.Symbol
+                                        ]
+                                    ]
+
+                                let dtls =
+                                    [
+                                        match m.Comment.Remarks with
+                                        | Some r ->
+                                            p [
+                                                Class "fsdocs-remarks"
+                                            ] [
+                                                embed r
+                                            ]
+                                        | None -> ()
+
+                                        match m.ExtendedType with
+                                        | Some(_, extendedTypeHtml) ->
+                                            p [] [
+                                                !! "Extended Type: "
+                                                embed extendedTypeHtml
+                                            ]
+                                        | _ -> ()
+
+                                        if not m.Parameters.IsEmpty then
+                                            dl [
+                                                Class "fsdocs-params"
+                                            ] [
+                                                for parameter in m.Parameters do
+                                                    dt [
+                                                        Class "fsdocs-param"
+                                                    ] [
+                                                        span [
+                                                            Class "fsdocs-param-name"
+                                                        ] [
+                                                            !!parameter.ParameterNameText
+                                                        ]
+                                                        !! ":"
+                                                        embed parameter.ParameterType
+                                                    ]
+
+                                                    dd [
+                                                        Class "fsdocs-param-docs"
+                                                    ] [
+                                                        match parameter.ParameterDocs with
+                                                        | None -> ()
+                                                        | Some d ->
+                                                            p [] [
+                                                                embed d
+                                                            ]
+                                                    ]
+                                            ]
 
-                                    if not m.Comment.Exceptions.IsEmpty then
-                                        //p [] [ !! "Exceptions:" ]
-                                        table [ Class "fsdocs-exception-list" ] [
-                                            for (nm, link, html) in m.Comment.Exceptions do
-                                                tr [] [
-                                                    td
-                                                        []
-                                                        (match link with
-                                                         | None -> []
-                                                         | Some href -> [ a [ Href href ] [ !!nm ] ])
-                                                    td [] [ embed html ]
+                                        match m.ReturnInfo.ReturnType with
+                                        | None -> ()
+                                        | Some(_, returnTypeHtml) ->
+                                            dl [
+                                                Class "fsdocs-returns"
+                                            ] [
+                                                dt [] [
+                                                    span [
+                                                        Class "fsdocs-return-name"
+                                                    ] [
+                                                        !!(if m.Kind <> ApiDocMemberKind.RecordField then
+                                                               "Returns: "
+                                                           else
+                                                               "Field type: ")
+                                                    ]
+                                                    embed returnTypeHtml
                                                 ]
-                                        ]
+                                                dd [
+                                                    Class "fsdocs-return-docs"
+                                                ] [
+                                                    match m.ReturnInfo.ReturnDocs with
+                                                    | None -> ()
+                                                    | Some r ->
+                                                        p [] [
+                                                            embed r
+                                                        ]
+                                                ]
+                                            ]
 
-                                    for e in m.Comment.Notes do
-                                        h5 [ Class "fsdocs-note-header" ] [ !! "Note" ]
+                                        if not m.Comment.Exceptions.IsEmpty then
+                                            //p [] [ !! "Exceptions:" ]
+                                            table [
+                                                Class "fsdocs-exception-list"
+                                            ] [
+                                                for (nm, link, html) in m.Comment.Exceptions do
+                                                    tr [] [
+                                                        td
+                                                            []
+                                                            (match link with
+                                                             | None -> []
+                                                             | Some href ->
+                                                                 [
+                                                                     a [
+                                                                         Href href
+                                                                     ] [
+                                                                         !!nm
+                                                                     ]
+                                                                 ])
+                                                        td [] [
+                                                            embed html
+                                                        ]
+                                                    ]
+                                            ]
 
-                                        p [ Class "fsdocs-note" ] [ embed e ]
+                                        for e in m.Comment.Notes do
+                                            h5 [
+                                                Class "fsdocs-note-header"
+                                            ] [
+                                                !! "Note"
+                                            ]
 
-                                    for e in m.Comment.Examples do
-                                        h5 [ Class "fsdocs-example-header" ] [ !! "Example" ]
+                                            p [
+                                                Class "fsdocs-note"
+                                            ] [
+                                                embed e
+                                            ]
 
-                                        p [
-                                            yield Class "fsdocs-example"
-                                            match e.Id with
-                                            | None -> ()
-                                            | Some id -> yield Id id
-                                        ] [ embed e ]
+                                        for e in m.Comment.Examples do
+                                            h5 [
+                                                Class "fsdocs-example-header"
+                                            ] [
+                                                !! "Example"
+                                            ]
+
+                                            p [
+                                                yield Class "fsdocs-example"
+                                                match e.Id with
+                                                | None -> ()
+                                                | Some id -> yield Id id
+                                            ] [
+                                                embed e
+                                            ]
                                     //if m.IsObsolete then
                                     //    obsoleteMessage m.ObsoleteMessage
 
@@ -270,77 +405,110 @@ type HtmlRender(model: ApiDocModel, ?menuTemplateFolder: string) =
                                     //    p [] [!!"CompiledName: "; code [] [!!m.Details.FormatCompiledName]]
                                     ]
 
-                              td [ Class "fsdocs-member-xmldoc" ] [
-                                  if List.isEmpty dtls then
-                                      smry
-                                  elif String.IsNullOrWhiteSpace(m.Comment.Summary.HtmlText) then
-                                      div [ Class "fsdocs-member-xmldoc-column" ] [
-                                          div [ Class "icon-button-row" ] (sourceLink m.SourceLocation)
-                                          yield! dtls
-                                      ]
-                                  else
-                                      details [] ((summary [] [ smry ]) :: dtls)
-                              ]
-                          ]
-                  ]
-              ] ]
+                                td [
+                                    Class "fsdocs-member-xmldoc"
+                                ] [
+                                    if List.isEmpty dtls then
+                                        smry
+                                    elif String.IsNullOrWhiteSpace(m.Comment.Summary.HtmlText) then
+                                        div [
+                                            Class "fsdocs-member-xmldoc-column"
+                                        ] [
+                                            div
+                                                [
+                                                    Class "icon-button-row"
+                                                ]
+                                                (sourceLink m.SourceLocation)
+                                            yield! dtls
+                                        ]
+                                    else
+                                        details
+                                            []
+                                            ((summary [] [
+                                                smry
+                                             ])
+                                             :: dtls)
+                                ]
+                            ]
+                    ]
+                ]
+        ]
 
     let renderEntities (entities: ApiDocEntity list) =
-        [ if entities.Length > 0 then
-              let hasTypes = entities |> List.exists (fun e -> e.IsTypeDefinition)
-
-              let hasModules = entities |> List.exists (fun e -> not e.IsTypeDefinition)
-
-              table [ Class "table outer-list fsdocs-entity-list" ] [
-                  thead [] [
-                      tr [] [
-                          td [] [
-                              !!(if hasTypes && hasModules then "Type/Module"
-                                 elif hasTypes then "Type"
-                                 else "Modules")
-                          ]
-                          td [] [ !! "Description" ]
-                      ]
-                  ]
-                  tbody [] [
-                      for e in entities do
-                          tr [] [
-                              td [ Class "fsdocs-entity-name" ] [
-                                  let nm = e.Name
-
-                                  let multi = (entities |> List.filter (fun e -> e.Name = nm) |> List.length) > 1
-
-                                  let nmWithSiffix =
-                                      if multi then
-                                          (if e.IsTypeDefinition then
-                                               nm + " (Type)"
-                                           else
-                                               nm + " (Module)")
-                                      else
-                                          nm
-
-                                  // This adds #EntityName anchor. These may currently be ambiguous
-                                  p [] [
-                                      a [ Name nm ] [
-                                          a [ Href(e.Url(root, collectionName, qualify, model.FileExtensions.InUrl)) ] [
-                                              !!nmWithSiffix
-                                          ]
-                                      ]
-                                  ]
-                              ]
-                              td [ Class "fsdocs-entity-xmldoc" ] [
-                                  div [] [
-                                      fsdocsSummary e.Comment.Summary
-                                      div [ Class "icon-button-row" ] [
-                                          yield! sourceLink e.SourceLocation
-                                          yield! copyXmlSigIconForSymbol e.Symbol
-                                          yield! copyXmlSigIconForSymbolMarkdown e.Symbol
-                                      ]
-                                  ]
-                              ]
-                          ]
-                  ]
-              ] ]
+        [
+            if entities.Length > 0 then
+                let hasTypes = entities |> List.exists (fun e -> e.IsTypeDefinition)
+
+                let hasModules = entities |> List.exists (fun e -> not e.IsTypeDefinition)
+
+                table [
+                    Class "table outer-list fsdocs-entity-list"
+                ] [
+                    thead [] [
+                        tr [] [
+                            td [] [
+                                !!(if hasTypes && hasModules then
+                                       "Type/Module"
+                                   elif hasTypes then
+                                       "Type"
+                                   else
+                                       "Modules")
+                            ]
+                            td [] [
+                                !! "Description"
+                            ]
+                        ]
+                    ]
+                    tbody [] [
+                        for e in entities do
+                            tr [] [
+                                td [
+                                    Class "fsdocs-entity-name"
+                                ] [
+                                    let nm = e.Name
+
+                                    let multi = (entities |> List.filter (fun e -> e.Name = nm) |> List.length) > 1
+
+                                    let nmWithSiffix =
+                                        if multi then
+                                            (if e.IsTypeDefinition then
+                                                 nm + " (Type)"
+                                             else
+                                                 nm + " (Module)")
+                                        else
+                                            nm
+
+                                    // This adds #EntityName anchor. These may currently be ambiguous
+                                    p [] [
+                                        a [
+                                            Name nm
+                                        ] [
+                                            a [
+                                                Href(e.Url(root, collectionName, qualify, model.FileExtensions.InUrl))
+                                            ] [
+                                                !!nmWithSiffix
+                                            ]
+                                        ]
+                                    ]
+                                ]
+                                td [
+                                    Class "fsdocs-entity-xmldoc"
+                                ] [
+                                    div [] [
+                                        fsdocsSummary e.Comment.Summary
+                                        div [
+                                            Class "icon-button-row"
+                                        ] [
+                                            yield! sourceLink e.SourceLocation
+                                            yield! copyXmlSigIconForSymbol e.Symbol
+                                            yield! copyXmlSigIconForSymbolMarkdown e.Symbol
+                                        ]
+                                    ]
+                                ]
+                            ]
+                    ]
+                ]
+        ]
 
     let entityContent (info: ApiDocEntityInfo) =
         // Get all the members & comment for the type
@@ -355,267 +523,385 @@ type HtmlRender(model: ApiDocModel, ?menuTemplateFolder: string) =
             | Some m when m.RequiresQualifiedAccess -> m.Name + "." + entity.Name
             | _ -> entity.Name
 
-        [ h2 [] [ !!(usageName + (if entity.IsTypeDefinition then " Type" else " Module")) ]
-          dl [ Class "fsdocs-metadata" ] [
-              dt [] [
-                  !! "Namespace: "
-                  a [ Href(info.Namespace.Url(root, collectionName, qualify, model.FileExtensions.InUrl)) ] [
-                      !!info.Namespace.Name
-                  ]
-              ]
-              dt [] [ !!("Assembly: " + entity.Assembly.Name + ".dll") ]
-
-              match info.ParentModule with
-              | None -> ()
-              | Some parentModule ->
-                  dt [] [
-                      !! "Parent Module: "
-                      a [ Href(parentModule.Url(root, collectionName, qualify, model.FileExtensions.InUrl)) ] [
-                          !!parentModule.Name
-                      ]
-                  ]
-
-
-              match entity.AbbreviatedType with
-              | Some(_, abbreviatedTypHtml) -> dt [] [ !! "Abbreviation For: "; embed abbreviatedTypHtml ]
-
-              | None -> ()
-
-              match entity.BaseType with
-              | Some(_, baseTypeHtml) -> dt [] [ !! "Base Type: "; embed baseTypeHtml ]
-              | None -> ()
-
-              match entity.AllInterfaces with
-              | [] -> ()
-              | l ->
-                  dt [] [
-                      !!("All Interfaces: ")
-                      for (i, (_, ityHtml)) in Seq.indexed l do
-                          if i <> 0 then
-                              !! ", "
-
-                          embed ityHtml
-                  ]
-
-              if entity.Symbol.IsValueType then
-                  dt [] [ !!("Kind: Struct") ]
-
-              match entity.DelegateSignature with
-              | Some(_, delegateSigHtml) -> dt [] [ !!("Delegate Signature: "); embed delegateSigHtml ]
-              | None -> ()
-
-              if entity.Symbol.IsProvided then
-                  dt [] [ !!("This is a provided type definition") ]
-
-              if entity.Symbol.IsAttributeType then
-                  dt [] [ !!("This is an attribute type definition") ]
-
-              if entity.Symbol.IsEnum then
-                  dt [] [ !!("This is an enum type definition") ]
-
-          //if info.Entity.IsObsolete then
-          //    obsoleteMessage entity.ObsoleteMessage
-          ]
-          // Show the summary (and sectioned docs without any members)
-          div [ Class "fsdocs-xmldoc" ] [
-              div [] [
-                  //yield! copyXmlSigIconForSymbol entity.Symbol
-                  //yield! sourceLink entity.SourceLocation
-                  fsdocsSummary entity.Comment.Summary
-              ]
-              // Show the remarks etc.
-              match entity.Comment.Remarks with
-              | Some r -> p [ Class "fsdocs-remarks" ] [ embed r ]
-              | None -> ()
-              for note in entity.Comment.Notes do
-                  h5 [ Class "fsdocs-note-header" ] [ !! "Note" ]
-
-                  p [ Class "fsdocs-note" ] [ embed note ]
-
-              for example in entity.Comment.Examples do
-                  h5 [ Class "fsdocs-example-header" ] [ !! "Example" ]
-
-                  p [ Class "fsdocs-example" ] [ embed example ]
-
-          ]
-
-          if (byCategory.Length > 1) then
-              // If there is more than 1 category in the type, generate TOC
-              h3 [] [ !! "Table of contents" ]
-
-              ul [] [
-                  for (index, _, name) in byCategory do
-                      li [] [ a [ Href(sprintf "#section%d" index) ] [ !!name ] ]
-              ]
-
-          //
-
-          let nestedEntities = entity.NestedEntities |> List.filter (fun e -> not e.IsObsolete)
-
-          if (nestedEntities.Length > 0) then
-              div [] [
-                  h3 [] [
-                      !!(if nestedEntities |> List.forall (fun e -> not e.IsTypeDefinition) then
-                             "Nested modules"
-                         elif nestedEntities |> List.forall (fun e -> e.IsTypeDefinition) then
-                             "Types"
-                         else
-                             "Types and nested modules")
-                  ]
-                  yield! renderEntities nestedEntities
-              ]
-
-          for (index, ms, name) in byCategory do
-              // Iterate over all the categories and print members. If there are more than one
-              // categories, print the category heading (as 
) and add XML comment from the type
-              // that is related to this specific category.
-              if (byCategory.Length > 1) then
-                  h2 [ Id(sprintf "section%d" index) ] [ !!name ]
-              // 

-              let functionsOrValues = ms |> List.filter (fun m -> m.Kind = ApiDocMemberKind.ValueOrFunction)
-              let extensions = ms |> List.filter (fun m -> m.Kind = ApiDocMemberKind.TypeExtension)
-              let activePatterns = ms |> List.filter (fun m -> m.Kind = ApiDocMemberKind.ActivePattern)
-              let unionCases = ms |> List.filter (fun m -> m.Kind = ApiDocMemberKind.UnionCase)
-              let recordFields = ms |> List.filter (fun m -> m.Kind = ApiDocMemberKind.RecordField)
-              let staticParameters = ms |> List.filter (fun m -> m.Kind = ApiDocMemberKind.StaticParameter)
-              let constructors = ms |> List.filter (fun m -> m.Kind = ApiDocMemberKind.Constructor)
-              let instanceMembers = ms |> List.filter (fun m -> m.Kind = ApiDocMemberKind.InstanceMember)
-              let staticMembers = ms |> List.filter (fun m -> m.Kind = ApiDocMemberKind.StaticMember)
-              div [] (renderMembers "Functions and values" "Function or value" functionsOrValues)
-              div [] (renderMembers "Type extensions" "Type extension" extensions)
-              div [] (renderMembers "Active patterns" "Active pattern" activePatterns)
-              div [] (renderMembers "Union cases" "Union case" unionCases)
-              div [] (renderMembers "Record fields" "Record Field" recordFields)
-              div [] (renderMembers "Static parameters" "Static parameters" staticParameters)
-              div [] (renderMembers "Constructors" "Constructor" constructors)
-              div [] (renderMembers "Instance members" "Instance member" instanceMembers)
-              div [] (renderMembers "Static members" "Static member" staticMembers) ]
+        [
+            h2 [] [
+                !!(usageName
+                   + (if entity.IsTypeDefinition then
+                          " Type"
+                      else
+                          " Module"))
+            ]
+            dl [
+                Class "fsdocs-metadata"
+            ] [
+                dt [] [
+                    !! "Namespace: "
+                    a [
+                        Href(info.Namespace.Url(root, collectionName, qualify, model.FileExtensions.InUrl))
+                    ] [
+                        !!info.Namespace.Name
+                    ]
+                ]
+                dt [] [
+                    !!("Assembly: " + entity.Assembly.Name + ".dll")
+                ]
+
+                match info.ParentModule with
+                | None -> ()
+                | Some parentModule ->
+                    dt [] [
+                        !! "Parent Module: "
+                        a [
+                            Href(parentModule.Url(root, collectionName, qualify, model.FileExtensions.InUrl))
+                        ] [
+                            !!parentModule.Name
+                        ]
+                    ]
+
+                match entity.AbbreviatedType with
+                | Some(_, abbreviatedTypHtml) ->
+                    dt [] [
+                        !! "Abbreviation For: "
+                        embed abbreviatedTypHtml
+                    ]
+
+                | None -> ()
+
+                match entity.BaseType with
+                | Some(_, baseTypeHtml) ->
+                    dt [] [
+                        !! "Base Type: "
+                        embed baseTypeHtml
+                    ]
+                | None -> ()
+
+                match entity.AllInterfaces with
+                | [] -> ()
+                | l ->
+                    dt [] [
+                        !!("All Interfaces: ")
+                        for (i, (_, ityHtml)) in Seq.indexed l do
+                            if i <> 0 then
+                                !! ", "
+
+                            embed ityHtml
+                    ]
+
+                if entity.Symbol.IsValueType then
+                    dt [] [
+                        !!("Kind: Struct")
+                    ]
+
+                match entity.DelegateSignature with
+                | Some(_, delegateSigHtml) ->
+                    dt [] [
+                        !!("Delegate Signature: ")
+                        embed delegateSigHtml
+                    ]
+                | None -> ()
+
+                if entity.Symbol.IsProvided then
+                    dt [] [
+                        !!("This is a provided type definition")
+                    ]
+
+                if entity.Symbol.IsAttributeType then
+                    dt [] [
+                        !!("This is an attribute type definition")
+                    ]
+
+                if entity.Symbol.IsEnum then
+                    dt [] [
+                        !!("This is an enum type definition")
+                    ]
+
+            //if info.Entity.IsObsolete then
+            //    obsoleteMessage entity.ObsoleteMessage
+            ]
+            // Show the summary (and sectioned docs without any members)
+            div [
+                Class "fsdocs-xmldoc"
+            ] [
+                div [] [
+                    //yield! copyXmlSigIconForSymbol entity.Symbol
+                    //yield! sourceLink entity.SourceLocation
+                    fsdocsSummary entity.Comment.Summary
+                ]
+                // Show the remarks etc.
+                match entity.Comment.Remarks with
+                | Some r ->
+                    p [
+                        Class "fsdocs-remarks"
+                    ] [
+                        embed r
+                    ]
+                | None -> ()
+                for note in entity.Comment.Notes do
+                    h5 [
+                        Class "fsdocs-note-header"
+                    ] [
+                        !! "Note"
+                    ]
+
+                    p [
+                        Class "fsdocs-note"
+                    ] [
+                        embed note
+                    ]
+
+                for example in entity.Comment.Examples do
+                    h5 [
+                        Class "fsdocs-example-header"
+                    ] [
+                        !! "Example"
+                    ]
+
+                    p [
+                        Class "fsdocs-example"
+                    ] [
+                        embed example
+                    ]
+
+            ]
+
+            if (byCategory.Length > 1) then
+                // If there is more than 1 category in the type, generate TOC
+                h3 [] [
+                    !! "Table of contents"
+                ]
+
+                ul [] [
+                    for (index, _, name) in byCategory do
+                        li [] [
+                            a [
+                                Href(sprintf "#section%d" index)
+                            ] [
+                                !!name
+                            ]
+                        ]
+                ]
+
+            //
+
+            let nestedEntities = entity.NestedEntities |> List.filter (fun e -> not e.IsObsolete)
+
+            if (nestedEntities.Length > 0) then
+                div [] [
+                    h3 [] [
+                        !!(if nestedEntities |> List.forall (fun e -> not e.IsTypeDefinition) then
+                               "Nested modules"
+                           elif nestedEntities |> List.forall (fun e -> e.IsTypeDefinition) then
+                               "Types"
+                           else
+                               "Types and nested modules")
+                    ]
+                    yield! renderEntities nestedEntities
+                ]
+
+            for (index, ms, name) in byCategory do
+                // Iterate over all the categories and print members. If there are more than one
+                // categories, print the category heading (as 
) and add XML comment from the type
+                // that is related to this specific category.
+                if (byCategory.Length > 1) then
+                    h2 [
+                        Id(sprintf "section%d" index)
+                    ] [
+                        !!name
+                    ]
+                // 

+                let functionsOrValues = ms |> List.filter (fun m -> m.Kind = ApiDocMemberKind.ValueOrFunction)
+                let extensions = ms |> List.filter (fun m -> m.Kind = ApiDocMemberKind.TypeExtension)
+                let activePatterns = ms |> List.filter (fun m -> m.Kind = ApiDocMemberKind.ActivePattern)
+                let unionCases = ms |> List.filter (fun m -> m.Kind = ApiDocMemberKind.UnionCase)
+                let recordFields = ms |> List.filter (fun m -> m.Kind = ApiDocMemberKind.RecordField)
+                let staticParameters = ms |> List.filter (fun m -> m.Kind = ApiDocMemberKind.StaticParameter)
+                let constructors = ms |> List.filter (fun m -> m.Kind = ApiDocMemberKind.Constructor)
+                let instanceMembers = ms |> List.filter (fun m -> m.Kind = ApiDocMemberKind.InstanceMember)
+                let staticMembers = ms |> List.filter (fun m -> m.Kind = ApiDocMemberKind.StaticMember)
+                div [] (renderMembers "Functions and values" "Function or value" functionsOrValues)
+                div [] (renderMembers "Type extensions" "Type extension" extensions)
+                div [] (renderMembers "Active patterns" "Active pattern" activePatterns)
+                div [] (renderMembers "Union cases" "Union case" unionCases)
+                div [] (renderMembers "Record fields" "Record Field" recordFields)
+                div [] (renderMembers "Static parameters" "Static parameters" staticParameters)
+                div [] (renderMembers "Constructors" "Constructor" constructors)
+                div [] (renderMembers "Instance members" "Instance member" instanceMembers)
+                div [] (renderMembers "Static members" "Static member" staticMembers)
+        ]
 
     let namespaceContent (nsIndex, ns: ApiDocNamespace) =
         let allByCategory = Categorise.entities (nsIndex, ns, false)
 
-        [ if allByCategory.Length > 0 then
-              h2 [ Id ns.UrlHash ] [ !!(ns.Name + " Namespace") ]
+        [
+            if allByCategory.Length > 0 then
+                h2 [
+                    Id ns.UrlHash
+                ] [
+                    !!(ns.Name + " Namespace")
+                ]
 
-              div [ Class "fsdocs-xmldoc" ] [
-                  match ns.NamespaceDocs with
-                  | Some nsdocs ->
-                      p [] [ embed nsdocs.Summary ]
+                div [
+                    Class "fsdocs-xmldoc"
+                ] [
+                    match ns.NamespaceDocs with
+                    | Some nsdocs ->
+                        p [] [
+                            embed nsdocs.Summary
+                        ]
 
-                      match nsdocs.Remarks with
-                      | Some r -> p [] [ embed r ]
-                      | None -> ()
+                        match nsdocs.Remarks with
+                        | Some r ->
+                            p [] [
+                                embed r
+                            ]
+                        | None -> ()
 
-                  | None -> ()
-              ]
+                    | None -> ()
+                ]
 
-              if (allByCategory.Length > 1) then
-                  h3 [] [ !! "Contents" ]
+                if (allByCategory.Length > 1) then
+                    h3 [] [
+                        !! "Contents"
+                    ]
 
-                  ul [] [
-                      for category in allByCategory do
-                          li [] [ a [ Href("#category-" + category.CategoryIndex) ] [ !!category.CategoryName ] ]
-                  ]
+                    ul [] [
+                        for category in allByCategory do
+                            li [] [
+                                a [
+                                    Href("#category-" + category.CategoryIndex)
+                                ] [
+                                    !!category.CategoryName
+                                ]
+                            ]
+                    ]
 
-              for category in allByCategory do
-                  if (allByCategory.Length > 1) then
-                      h3 [] [
-                          a [
-                              Class "anchor"
-                              Name("category-" + category.CategoryIndex)
-                              Href("#category-" + category.CategoryIndex)
-                          ] [ !!category.CategoryName ]
-                      ]
+                for category in allByCategory do
+                    if (allByCategory.Length > 1) then
+                        h3 [] [
+                            a [
+                                Class "anchor"
+                                Name("category-" + category.CategoryIndex)
+                                Href("#category-" + category.CategoryIndex)
+                            ] [
+                                !!category.CategoryName
+                            ]
+                        ]
 
-                  yield! renderEntities category.CategoryEntites ]
+                    yield! renderEntities category.CategoryEntites
+        ]
 
     let tableOfNamespacesAux () =
-        [ let categorise = Categorise.model model
-
-          for _allByCategory, ns in categorise do
-
-              // Generate the entry for the namespace
-              tr [] [
-                  td [] [
-                      a [
-                          Href(ns.Url(root, collectionName, qualify, model.FileExtensions.InUrl))
-                          HtmlProperties.Title ns.Name
-                      ] [ !!ns.Name ]
-                  ]
-                  td [] [
-                      match ns.NamespaceDocs with
-                      | Some nsdocs -> embed nsdocs.Summary
-                      | None -> ()
-                  ]
-              ] ]
+        [
+            let categorise = Categorise.model model
+
+            for _allByCategory, ns in categorise do
+
+                // Generate the entry for the namespace
+                tr [] [
+                    td [] [
+                        a [
+                            Href(ns.Url(root, collectionName, qualify, model.FileExtensions.InUrl))
+                            HtmlProperties.Title ns.Name
+                        ] [
+                            !!ns.Name
+                        ]
+                    ]
+                    td [] [
+                        match ns.NamespaceDocs with
+                        | Some nsdocs -> embed nsdocs.Summary
+                        | None -> ()
+                    ]
+                ]
+        ]
 
     let listOfNamespacesNavAux otherDocs (nsOpt: ApiDocNamespace option) =
         [
-          // For FSharp.Core we make all entries available to other docs else there's not a lot else to show.
-          //
-          // For non-FSharp.Core we only show one link "API Reference" in the nav menu
-          if otherDocs && model.Collection.CollectionName <> "FSharp.Core" then
-              li [ Class "nav-header" ] [ !! "API Reference" ]
-
-              li [ Class "nav-item" ] [
-                  a [
-                      Class "nav-link"
-                      Href(model.IndexFileUrl(root, collectionName, qualify, model.FileExtensions.InUrl))
-                  ] [ !! "All Namespaces" ]
-              ]
-          else
-
-              let categorise = Categorise.model model
-
-              let someExist = categorise.Length > 0
-
-              if someExist then
-                  li [ Class "nav-header" ] [ !! "Namespaces" ]
-
-              for allByCategory, ns in categorise do
-
-                  // Generate the entry for the namespace
-                  li [
-                      Class(
-                          "nav-item"
-                          +
-                          // add the 'active' class if this is the namespace of the thing being shown
-                          match nsOpt with
-                          | Some ns2 when ns.Name = ns2.Name -> " active"
-                          | _ -> ""
-                      )
-                  ] [
-                      span [] [
-                          a [
-                              Class(
-                                  "nav-link"
-                                  +
-                                  // add the 'active' class if this is the namespace of the thing being shown
-                                  match nsOpt with
-                                  | Some ns2 when ns.Name = ns2.Name -> " active"
-                                  | _ -> ""
-                              )
-                              Href(ns.Url(root, collectionName, qualify, model.FileExtensions.InUrl))
-                          ] [ !!ns.Name ]
-
-                      ]
-                  ]
-
-                  // In the navigation bar generate the expanded list of entities
-                  // for the active namespace
-                  match nsOpt with
-                  | Some ns2 when ns.Name = ns2.Name ->
-                      ul [ Custom("list-style-type", "none") (* Class "navbar-nav " *) ] [
-                          for category in allByCategory do
-                              for e in category.CategoryEntites do
-                                  li [ Class "nav-item" ] [
-                                      a [
-                                          Class "nav-link"
-                                          Href(e.Url(root, collectionName, qualify, model.FileExtensions.InUrl))
-                                      ] [ !!e.Name ]
-                                  ]
-                      ]
-                  | _ -> () ]
+            // For FSharp.Core we make all entries available to other docs else there's not a lot else to show.
+            //
+            // For non-FSharp.Core we only show one link "API Reference" in the nav menu
+            if otherDocs && model.Collection.CollectionName <> "FSharp.Core" then
+                li [
+                    Class "nav-header"
+                ] [
+                    !! "API Reference"
+                ]
+
+                li [
+                    Class "nav-item"
+                ] [
+                    a [
+                        Class "nav-link"
+                        Href(model.IndexFileUrl(root, collectionName, qualify, model.FileExtensions.InUrl))
+                    ] [
+                        !! "All Namespaces"
+                    ]
+                ]
+            else
+
+                let categorise = Categorise.model model
+
+                let someExist = categorise.Length > 0
+
+                if someExist then
+                    li [
+                        Class "nav-header"
+                    ] [
+                        !! "Namespaces"
+                    ]
+
+                for allByCategory, ns in categorise do
+
+                    // Generate the entry for the namespace
+                    li [
+                        Class(
+                            "nav-item"
+                            +
+                            // add the 'active' class if this is the namespace of the thing being shown
+                            match nsOpt with
+                            | Some ns2 when ns.Name = ns2.Name -> " active"
+                            | _ -> ""
+                        )
+                    ] [
+                        span [] [
+                            a [
+                                Class(
+                                    "nav-link"
+                                    +
+                                    // add the 'active' class if this is the namespace of the thing being shown
+                                    match nsOpt with
+                                    | Some ns2 when ns.Name = ns2.Name -> " active"
+                                    | _ -> ""
+                                )
+                                Href(ns.Url(root, collectionName, qualify, model.FileExtensions.InUrl))
+                            ] [
+                                !!ns.Name
+                            ]
+
+                        ]
+                    ]
+
+                    // In the navigation bar generate the expanded list of entities
+                    // for the active namespace
+                    match nsOpt with
+                    | Some ns2 when ns.Name = ns2.Name ->
+                        ul [
+                            Custom("list-style-type", "none") (* Class "navbar-nav " *)
+                        ] [
+                            for category in allByCategory do
+                                for e in category.CategoryEntites do
+                                    li [
+                                        Class "nav-item"
+                                    ] [
+                                        a [
+                                            Class "nav-link"
+                                            Href(e.Url(root, collectionName, qualify, model.FileExtensions.InUrl))
+                                        ] [
+                                            !!e.Name
+                                        ]
+                                    ]
+                        ]
+                    | _ -> ()
+        ]
 
     let listOfNamespacesNav otherDocs (nsOpt: ApiDocNamespace option) =
         let noTemplatingFallback () =
@@ -635,9 +921,13 @@ type HtmlRender(model: ApiDocModel, ?menuTemplateFolder: string) =
                     let title = "All Namespaces"
                     let link = model.IndexFileUrl(root, collectionName, qualify, model.FileExtensions.InUrl)
 
-                    [ { Menu.MenuItem.Link = link
-                        Menu.MenuItem.Content = title
-                        Menu.MenuItem.IsActive = true } ]
+                    [
+                        {
+                            Menu.MenuItem.Link = link
+                            Menu.MenuItem.Content = title
+                            Menu.MenuItem.IsActive = true
+                        }
+                    ]
 
                 Menu.createMenu menuTemplateFolder false "API Reference" menuItems
 
@@ -653,41 +943,64 @@ type HtmlRender(model: ApiDocModel, ?menuTemplateFolder: string) =
                             let link = ns.Url(root, collectionName, qualify, model.FileExtensions.InUrl)
                             let name = ns.Name
 
-                            { Menu.MenuItem.Link = link
-                              Menu.MenuItem.Content = name
-                              Menu.MenuItem.IsActive = false })
+                            {
+                                Menu.MenuItem.Link = link
+                                Menu.MenuItem.Content = name
+                                Menu.MenuItem.IsActive = false
+                            }
+                        )
 
                     Menu.createMenu menuTemplateFolder false "Namespaces" menuItems
 
     /// Get the substitutions relevant to all
     member _.GlobalSubstitutions: Substitutions =
         let toc = listOfNamespacesNav true None
-        [ yield (ParamKeys.``fsdocs-list-of-namespaces``, toc); yield ParamKeys.``fsdocs-body-class``, "api-docs" ]
+
+        [
+            yield (ParamKeys.``fsdocs-list-of-namespaces``, toc)
+            yield ParamKeys.``fsdocs-body-class``, "api-docs"
+        ]
 
     member _.Generate(outDir: string, templateOpt, collectionName, globalParameters) =
 
         let getSubstitutons parameters toc (content: HtmlElement) pageTitle =
-            [| yield! parameters
-               yield (ParamKeys.``fsdocs-list-of-namespaces``, toc)
-               yield (ParamKeys.``fsdocs-content``, content.ToString())
-               yield (ParamKeys.``fsdocs-source``, String.Empty)
-               yield (ParamKeys.``fsdocs-tooltips``, String.Empty)
-               yield (ParamKeys.``fsdocs-page-title``, pageTitle)
-               yield (ParamKeys.``fsdocs-page-content-list``, PageContentList.EmptyContent)
-               yield (ParamKeys.``fsdocs-meta-tags``, String.Empty)
-               yield! globalParameters |]
+            [|
+                yield! parameters
+                yield (ParamKeys.``fsdocs-list-of-namespaces``, toc)
+                yield (ParamKeys.``fsdocs-content``, content.ToString())
+                yield (ParamKeys.``fsdocs-source``, String.Empty)
+                yield (ParamKeys.``fsdocs-tooltips``, String.Empty)
+                yield (ParamKeys.``fsdocs-page-title``, pageTitle)
+                yield (ParamKeys.``fsdocs-page-content-list``, PageContentList.EmptyContent)
+                yield (ParamKeys.``fsdocs-meta-tags``, String.Empty)
+                yield! globalParameters
+            |]
 
         let collection = model.Collection
 
         (let content =
             div [] [
-                h1 [] [ !! "API Reference" ]
-                h2 [] [ !! "Available Namespaces:" ]
-                table [ Class "table outer-list fsdocs-member-list" ] [
+                h1 [] [
+                    !! "API Reference"
+                ]
+                h2 [] [
+                    !! "Available Namespaces:"
+                ]
+                table [
+                    Class "table outer-list fsdocs-member-list"
+                ] [
                     thead [] [
                         tr [] [
-                            td [ Class "fsdocs-member-list-header" ] [ !! "Namespace" ]
-                            td [ Class "fsdocs-member-list-header" ] [ !! "Description" ]
+                            td [
+                                Class "fsdocs-member-list-header"
+                            ] [
+                                !! "Namespace"
+                            ]
+                            td [
+                                Class "fsdocs-member-list-header"
+                            ] [
+                                !! "Description"
+                            ]
                         ]
                     ]
                     tbody [] (tableOfNamespacesAux ())

From af6c99a58f2764924d704192b9859f345e238053 Mon Sep 17 00:00:00 2001
From: Maxime Mangel 
Date: Thu, 2 Jan 2025 11:15:33 +0100
Subject: [PATCH 2/3] style: remove style rules which have no effect for the
 GenerateHtml.fs file

---
 .editorconfig | 5 -----
 1 file changed, 5 deletions(-)

diff --git a/.editorconfig b/.editorconfig
index 8779598c5..2dd490df8 100644
--- a/.editorconfig
+++ b/.editorconfig
@@ -22,10 +22,5 @@ fsharp_max_array_or_list_number_of_items = 0
 fsharp_multi_line_lambda_closing_newline = true
 fsharp_multiline_bracket_style = aligned
 fsharp_keep_max_number_of_blank_lines = 1
-fsharp_align_function_signature_to_indentation = true
 # Keep the if/then/else consistent
 fsharp_max_if_then_else_short_width = 0
-# Keep records consistent
-fsharp_max_record_number_of_items = 0
-fsharp_record_multiline_formatter = number_of_items
-fsharp_alternative_long_member_definitions = true

From 68a33d0dae526cef852bb3a3af0017ed1e1cc981 Mon Sep 17 00:00:00 2001
From: Maxime Mangel 
Date: Thu, 2 Jan 2025 20:15:50 +0100
Subject: [PATCH 3/3] style: adapt the configuration accordingly to @nojaf
 feedback

---
 .editorconfig                                 |   7 +-
 src/FSharp.Formatting.ApiDocs/GenerateHtml.fs | 469 ++++--------------
 2 files changed, 97 insertions(+), 379 deletions(-)

diff --git a/.editorconfig b/.editorconfig
index 2dd490df8..17e3f2898 100644
--- a/.editorconfig
+++ b/.editorconfig
@@ -3,7 +3,10 @@ root = true
 
 [*]
 end_of_line = lf
+
+[*.{fs,fsi,fsx}]
 charset = utf-8
+end_of_line = lf
 indent_style = space
 indent_size = 4
 trim_trailing_whitespace = true
@@ -17,10 +20,6 @@ fsharp_max_value_binding_width=120
 # It makes the code more consistent in term of spacing and indentation
 [GenerateHtml.fs]
 fsharp_experimental_elmish = true
-fsharp_array_or_list_multiline_formatter = number_of_items
-fsharp_max_array_or_list_number_of_items = 0
 fsharp_multi_line_lambda_closing_newline = true
 fsharp_multiline_bracket_style = aligned
 fsharp_keep_max_number_of_blank_lines = 1
-# Keep the if/then/else consistent
-fsharp_max_if_then_else_short_width = 0
diff --git a/src/FSharp.Formatting.ApiDocs/GenerateHtml.fs b/src/FSharp.Formatting.ApiDocs/GenerateHtml.fs
index 7d2d1aa4b..da215d3d9 100644
--- a/src/FSharp.Formatting.ApiDocs/GenerateHtml.fs
+++ b/src/FSharp.Formatting.ApiDocs/GenerateHtml.fs
@@ -18,15 +18,7 @@ let fsdocsSummary (x: ApiDocHtml) =
     if x.HtmlText.StartsWith("
", StringComparison.Ordinal) then
         embed x
     else
-        div [
-            Class "fsdocs-summary-contents"
-        ] [
-            p [
-                Class "fsdocs-summary"
-            ] [
-                embed x
-            ]
-        ]
+        div [ Class "fsdocs-summary-contents" ] [ p [ Class "fsdocs-summary" ] [ embed x ] ]
 
 type HtmlRender(model: ApiDocModel, ?menuTemplateFolder: string) =
     let root = model.Root
@@ -56,12 +48,7 @@ type HtmlRender(model: ApiDocModel, ?menuTemplateFolder: string) =
                 ]
                 content
 
-            div
-                [
-                    Class "fsdocs-tip"
-                    Id id
-                ]
-                tip
+            div [ Class "fsdocs-tip"; Id id ] tip
         ]
 
     let sourceLink url =
@@ -69,16 +56,8 @@ type HtmlRender(model: ApiDocModel, ?menuTemplateFolder: string) =
             match url with
             | None -> ()
             | Some href ->
-                a [
-                    Href href
-                    Class "fsdocs-source-link"
-                    HtmlProperties.Title "Source on GitHub"
-                ] [
-                    iconifyIcon [
-                        Icon "ri:github-fill"
-                        Height "24"
-                        Width "24"
-                    ]
+                a [ Href href; Class "fsdocs-source-link"; HtmlProperties.Title "Source on GitHub" ] [
+                    iconifyIcon [ Icon "ri:github-fill"; Height "24"; Width "24" ]
                 ]
         ]
 
@@ -96,13 +75,7 @@ type HtmlRender(model: ApiDocModel, ?menuTemplateFolder: string) =
             Class "fsdocs-source-link"
             HtmlProperties.Title "Copy signature (XML)"
             OnClick(sprintf "Clipboard_CopyTo('')" xmlDocSig)
-        ] [
-            iconifyIcon [
-                HtmlProperties.Icon "bi:filetype-xml"
-                Height "24"
-                Width "24"
-            ]
-        ]
+        ] [ iconifyIcon [ HtmlProperties.Icon "bi:filetype-xml"; Height "24"; Width "24" ] ]
 
     let copyXmlSigIconForSymbol (symbol: FSharpSymbol) =
         [
@@ -118,24 +91,15 @@ type HtmlRender(model: ApiDocModel, ?menuTemplateFolder: string) =
             div [] []
         else
             let delim =
-                if xmlDocSig.Contains("``") then
-                    "```"
-                elif xmlDocSig.Contains("`") then
-                    "``"
-                else
-                    "`"
+                if xmlDocSig.Contains("``") then "```"
+                elif xmlDocSig.Contains("`") then "``"
+                else "`"
 
             div [
                 Class "fsdocs-source-link"
                 HtmlProperties.Title "Copy signature (Markdown)"
                 OnClick(sprintf "Clipboard_CopyTo('%scref:%s%s')" delim xmlDocSig delim)
-            ] [
-                iconifyIcon [
-                    HtmlProperties.Icon "bi:filetype-md"
-                    Height "24"
-                    Width "24"
-                ]
-            ]
+            ] [ iconifyIcon [ HtmlProperties.Icon "bi:filetype-md"; Height "24"; Width "24" ] ]
 
     let copyXmlSigIconForSymbolMarkdown (symbol: FSharpSymbol) =
         [
@@ -148,52 +112,25 @@ type HtmlRender(model: ApiDocModel, ?menuTemplateFolder: string) =
     let renderMembers header tableHeader (members: ApiDocMember list) =
         [
             if members.Length > 0 then
-                h3 [] [
-                    !!header
-                ]
+                h3 [] [ !!header ]
 
-                table [
-                    Class "table outer-list fsdocs-member-list"
-                ] [
+                table [ Class "table outer-list fsdocs-member-list" ] [
                     thead [] [
                         tr [] [
-                            td [
-                                Class "fsdocs-member-list-header"
-                            ] [
-                                !!tableHeader
-                            ]
-                            td [
-                                Class "fsdocs-member-list-header"
-                            ] [
-                                !! "Description"
-                                fsdocsDetailsToggle []
-                            ]
+                            td [ Class "fsdocs-member-list-header" ] [ !!tableHeader ]
+                            td [ Class "fsdocs-member-list-header" ] [ !! "Description"; fsdocsDetailsToggle [] ]
                         ]
                     ]
                     tbody [] [
                         for m in members do
                             tr [] [
-                                td [
-                                    Class "fsdocs-member-usage"
-                                ] [
+                                td [ Class "fsdocs-member-usage" ] [
 
                                     codeWithToolTip [
                                         // This adds #MemberName anchor. These may be ambiguous due to overloading
-                                        p [] [
-                                            a [
-                                                Id m.Name
-                                            ] [
-                                                a [
-                                                    Href("#" + m.Name)
-                                                ] [
-                                                    embed m.UsageHtml
-                                                ]
-                                            ]
-                                        ]
+                                        p [] [ a [ Id m.Name ] [ a [ Href("#" + m.Name) ] [ embed m.UsageHtml ] ] ]
                                     ] [
-                                        div [
-                                            Class "member-tooltip"
-                                        ] [
+                                        div [ Class "member-tooltip" ] [
                                             !! "Full Usage: "
                                             embed m.UsageHtml
                                             br []
@@ -204,9 +141,7 @@ type HtmlRender(model: ApiDocModel, ?menuTemplateFolder: string) =
                                                 ul [] [
                                                     for p in m.Parameters do
                                                         span [] [
-                                                            b [] [
-                                                                !!p.ParameterNameText
-                                                            ]
+                                                            b [] [ !!p.ParameterNameText ]
                                                             !! ":"
                                                             embed p.ParameterType
                                                             match p.ParameterDocs with
@@ -255,13 +190,9 @@ type HtmlRender(model: ApiDocModel, ?menuTemplateFolder: string) =
                                 ]
 
                                 let smry =
-                                    div [
-                                        Class "fsdocs-summary"
-                                    ] [
+                                    div [ Class "fsdocs-summary" ] [
                                         fsdocsSummary m.Comment.Summary
-                                        div [
-                                            Class "icon-button-row"
-                                        ] [
+                                        div [ Class "icon-button-row" ] [
                                             yield! sourceLink m.SourceLocation
                                             yield! copyXmlSigIconForSymbol m.Symbol
                                             yield! copyXmlSigIconForSymbolMarkdown m.Symbol
@@ -271,61 +202,38 @@ type HtmlRender(model: ApiDocModel, ?menuTemplateFolder: string) =
                                 let dtls =
                                     [
                                         match m.Comment.Remarks with
-                                        | Some r ->
-                                            p [
-                                                Class "fsdocs-remarks"
-                                            ] [
-                                                embed r
-                                            ]
+                                        | Some r -> p [ Class "fsdocs-remarks" ] [ embed r ]
                                         | None -> ()
 
                                         match m.ExtendedType with
                                         | Some(_, extendedTypeHtml) ->
-                                            p [] [
-                                                !! "Extended Type: "
-                                                embed extendedTypeHtml
-                                            ]
+                                            p [] [ !! "Extended Type: "; embed extendedTypeHtml ]
                                         | _ -> ()
 
                                         if not m.Parameters.IsEmpty then
-                                            dl [
-                                                Class "fsdocs-params"
-                                            ] [
+                                            dl [ Class "fsdocs-params" ] [
                                                 for parameter in m.Parameters do
-                                                    dt [
-                                                        Class "fsdocs-param"
-                                                    ] [
-                                                        span [
-                                                            Class "fsdocs-param-name"
-                                                        ] [
+                                                    dt [ Class "fsdocs-param" ] [
+                                                        span [ Class "fsdocs-param-name" ] [
                                                             !!parameter.ParameterNameText
                                                         ]
                                                         !! ":"
                                                         embed parameter.ParameterType
                                                     ]
 
-                                                    dd [
-                                                        Class "fsdocs-param-docs"
-                                                    ] [
+                                                    dd [ Class "fsdocs-param-docs" ] [
                                                         match parameter.ParameterDocs with
                                                         | None -> ()
-                                                        | Some d ->
-                                                            p [] [
-                                                                embed d
-                                                            ]
+                                                        | Some d -> p [] [ embed d ]
                                                     ]
                                             ]
 
                                         match m.ReturnInfo.ReturnType with
                                         | None -> ()
                                         | Some(_, returnTypeHtml) ->
-                                            dl [
-                                                Class "fsdocs-returns"
-                                            ] [
+                                            dl [ Class "fsdocs-returns" ] [
                                                 dt [] [
-                                                    span [
-                                                        Class "fsdocs-return-name"
-                                                    ] [
+                                                    span [ Class "fsdocs-return-name" ] [
                                                         !!(if m.Kind <> ApiDocMemberKind.RecordField then
                                                                "Returns: "
                                                            else
@@ -333,71 +241,41 @@ type HtmlRender(model: ApiDocModel, ?menuTemplateFolder: string) =
                                                     ]
                                                     embed returnTypeHtml
                                                 ]
-                                                dd [
-                                                    Class "fsdocs-return-docs"
-                                                ] [
+                                                dd [ Class "fsdocs-return-docs" ] [
                                                     match m.ReturnInfo.ReturnDocs with
                                                     | None -> ()
-                                                    | Some r ->
-                                                        p [] [
-                                                            embed r
-                                                        ]
+                                                    | Some r -> p [] [ embed r ]
                                                 ]
                                             ]
 
                                         if not m.Comment.Exceptions.IsEmpty then
                                             //p [] [ !! "Exceptions:" ]
-                                            table [
-                                                Class "fsdocs-exception-list"
-                                            ] [
+                                            table [ Class "fsdocs-exception-list" ] [
                                                 for (nm, link, html) in m.Comment.Exceptions do
                                                     tr [] [
                                                         td
                                                             []
                                                             (match link with
                                                              | None -> []
-                                                             | Some href ->
-                                                                 [
-                                                                     a [
-                                                                         Href href
-                                                                     ] [
-                                                                         !!nm
-                                                                     ]
-                                                                 ])
-                                                        td [] [
-                                                            embed html
-                                                        ]
+                                                             | Some href -> [ a [ Href href ] [ !!nm ] ])
+                                                        td [] [ embed html ]
                                                     ]
                                             ]
 
                                         for e in m.Comment.Notes do
-                                            h5 [
-                                                Class "fsdocs-note-header"
-                                            ] [
-                                                !! "Note"
-                                            ]
+                                            h5 [ Class "fsdocs-note-header" ] [ !! "Note" ]
 
-                                            p [
-                                                Class "fsdocs-note"
-                                            ] [
-                                                embed e
-                                            ]
+                                            p [ Class "fsdocs-note" ] [ embed e ]
 
                                         for e in m.Comment.Examples do
-                                            h5 [
-                                                Class "fsdocs-example-header"
-                                            ] [
-                                                !! "Example"
-                                            ]
+                                            h5 [ Class "fsdocs-example-header" ] [ !! "Example" ]
 
                                             p [
                                                 yield Class "fsdocs-example"
                                                 match e.Id with
                                                 | None -> ()
                                                 | Some id -> yield Id id
-                                            ] [
-                                                embed e
-                                            ]
+                                            ] [ embed e ]
                                     //if m.IsObsolete then
                                     //    obsoleteMessage m.ObsoleteMessage
 
@@ -405,29 +283,16 @@ type HtmlRender(model: ApiDocModel, ?menuTemplateFolder: string) =
                                     //    p [] [!!"CompiledName: "; code [] [!!m.Details.FormatCompiledName]]
                                     ]
 
-                                td [
-                                    Class "fsdocs-member-xmldoc"
-                                ] [
+                                td [ Class "fsdocs-member-xmldoc" ] [
                                     if List.isEmpty dtls then
                                         smry
                                     elif String.IsNullOrWhiteSpace(m.Comment.Summary.HtmlText) then
-                                        div [
-                                            Class "fsdocs-member-xmldoc-column"
-                                        ] [
-                                            div
-                                                [
-                                                    Class "icon-button-row"
-                                                ]
-                                                (sourceLink m.SourceLocation)
+                                        div [ Class "fsdocs-member-xmldoc-column" ] [
+                                            div [ Class "icon-button-row" ] (sourceLink m.SourceLocation)
                                             yield! dtls
                                         ]
                                     else
-                                        details
-                                            []
-                                            ((summary [] [
-                                                smry
-                                             ])
-                                             :: dtls)
+                                        details [] ((summary [] [ smry ]) :: dtls)
                                 ]
                             ]
                     ]
@@ -441,30 +306,21 @@ type HtmlRender(model: ApiDocModel, ?menuTemplateFolder: string) =
 
                 let hasModules = entities |> List.exists (fun e -> not e.IsTypeDefinition)
 
-                table [
-                    Class "table outer-list fsdocs-entity-list"
-                ] [
+                table [ Class "table outer-list fsdocs-entity-list" ] [
                     thead [] [
                         tr [] [
                             td [] [
-                                !!(if hasTypes && hasModules then
-                                       "Type/Module"
-                                   elif hasTypes then
-                                       "Type"
-                                   else
-                                       "Modules")
-                            ]
-                            td [] [
-                                !! "Description"
+                                !!(if hasTypes && hasModules then "Type/Module"
+                                   elif hasTypes then "Type"
+                                   else "Modules")
                             ]
+                            td [] [ !! "Description" ]
                         ]
                     ]
                     tbody [] [
                         for e in entities do
                             tr [] [
-                                td [
-                                    Class "fsdocs-entity-name"
-                                ] [
+                                td [ Class "fsdocs-entity-name" ] [
                                     let nm = e.Name
 
                                     let multi = (entities |> List.filter (fun e -> e.Name = nm) |> List.length) > 1
@@ -480,25 +336,17 @@ type HtmlRender(model: ApiDocModel, ?menuTemplateFolder: string) =
 
                                     // This adds #EntityName anchor. These may currently be ambiguous
                                     p [] [
-                                        a [
-                                            Name nm
-                                        ] [
-                                            a [
-                                                Href(e.Url(root, collectionName, qualify, model.FileExtensions.InUrl))
-                                            ] [
+                                        a [ Name nm ] [
+                                            a [ Href(e.Url(root, collectionName, qualify, model.FileExtensions.InUrl)) ] [
                                                 !!nmWithSiffix
                                             ]
                                         ]
                                     ]
                                 ]
-                                td [
-                                    Class "fsdocs-entity-xmldoc"
-                                ] [
+                                td [ Class "fsdocs-entity-xmldoc" ] [
                                     div [] [
                                         fsdocsSummary e.Comment.Summary
-                                        div [
-                                            Class "icon-button-row"
-                                        ] [
+                                        div [ Class "icon-button-row" ] [
                                             yield! sourceLink e.SourceLocation
                                             yield! copyXmlSigIconForSymbol e.Symbol
                                             yield! copyXmlSigIconForSymbolMarkdown e.Symbol
@@ -524,55 +372,33 @@ type HtmlRender(model: ApiDocModel, ?menuTemplateFolder: string) =
             | _ -> entity.Name
 
         [
-            h2 [] [
-                !!(usageName
-                   + (if entity.IsTypeDefinition then
-                          " Type"
-                      else
-                          " Module"))
-            ]
-            dl [
-                Class "fsdocs-metadata"
-            ] [
+            h2 [] [ !!(usageName + (if entity.IsTypeDefinition then " Type" else " Module")) ]
+            dl [ Class "fsdocs-metadata" ] [
                 dt [] [
                     !! "Namespace: "
-                    a [
-                        Href(info.Namespace.Url(root, collectionName, qualify, model.FileExtensions.InUrl))
-                    ] [
+                    a [ Href(info.Namespace.Url(root, collectionName, qualify, model.FileExtensions.InUrl)) ] [
                         !!info.Namespace.Name
                     ]
                 ]
-                dt [] [
-                    !!("Assembly: " + entity.Assembly.Name + ".dll")
-                ]
+                dt [] [ !!("Assembly: " + entity.Assembly.Name + ".dll") ]
 
                 match info.ParentModule with
                 | None -> ()
                 | Some parentModule ->
                     dt [] [
                         !! "Parent Module: "
-                        a [
-                            Href(parentModule.Url(root, collectionName, qualify, model.FileExtensions.InUrl))
-                        ] [
+                        a [ Href(parentModule.Url(root, collectionName, qualify, model.FileExtensions.InUrl)) ] [
                             !!parentModule.Name
                         ]
                     ]
 
                 match entity.AbbreviatedType with
-                | Some(_, abbreviatedTypHtml) ->
-                    dt [] [
-                        !! "Abbreviation For: "
-                        embed abbreviatedTypHtml
-                    ]
+                | Some(_, abbreviatedTypHtml) -> dt [] [ !! "Abbreviation For: "; embed abbreviatedTypHtml ]
 
                 | None -> ()
 
                 match entity.BaseType with
-                | Some(_, baseTypeHtml) ->
-                    dt [] [
-                        !! "Base Type: "
-                        embed baseTypeHtml
-                    ]
+                | Some(_, baseTypeHtml) -> dt [] [ !! "Base Type: "; embed baseTypeHtml ]
                 | None -> ()
 
                 match entity.AllInterfaces with
@@ -588,40 +414,26 @@ type HtmlRender(model: ApiDocModel, ?menuTemplateFolder: string) =
                     ]
 
                 if entity.Symbol.IsValueType then
-                    dt [] [
-                        !!("Kind: Struct")
-                    ]
+                    dt [] [ !!("Kind: Struct") ]
 
                 match entity.DelegateSignature with
-                | Some(_, delegateSigHtml) ->
-                    dt [] [
-                        !!("Delegate Signature: ")
-                        embed delegateSigHtml
-                    ]
+                | Some(_, delegateSigHtml) -> dt [] [ !!("Delegate Signature: "); embed delegateSigHtml ]
                 | None -> ()
 
                 if entity.Symbol.IsProvided then
-                    dt [] [
-                        !!("This is a provided type definition")
-                    ]
+                    dt [] [ !!("This is a provided type definition") ]
 
                 if entity.Symbol.IsAttributeType then
-                    dt [] [
-                        !!("This is an attribute type definition")
-                    ]
+                    dt [] [ !!("This is an attribute type definition") ]
 
                 if entity.Symbol.IsEnum then
-                    dt [] [
-                        !!("This is an enum type definition")
-                    ]
+                    dt [] [ !!("This is an enum type definition") ]
 
             //if info.Entity.IsObsolete then
             //    obsoleteMessage entity.ObsoleteMessage
             ]
             // Show the summary (and sectioned docs without any members)
-            div [
-                Class "fsdocs-xmldoc"
-            ] [
+            div [ Class "fsdocs-xmldoc" ] [
                 div [] [
                     //yield! copyXmlSigIconForSymbol entity.Symbol
                     //yield! sourceLink entity.SourceLocation
@@ -629,56 +441,27 @@ type HtmlRender(model: ApiDocModel, ?menuTemplateFolder: string) =
                 ]
                 // Show the remarks etc.
                 match entity.Comment.Remarks with
-                | Some r ->
-                    p [
-                        Class "fsdocs-remarks"
-                    ] [
-                        embed r
-                    ]
+                | Some r -> p [ Class "fsdocs-remarks" ] [ embed r ]
                 | None -> ()
                 for note in entity.Comment.Notes do
-                    h5 [
-                        Class "fsdocs-note-header"
-                    ] [
-                        !! "Note"
-                    ]
+                    h5 [ Class "fsdocs-note-header" ] [ !! "Note" ]
 
-                    p [
-                        Class "fsdocs-note"
-                    ] [
-                        embed note
-                    ]
+                    p [ Class "fsdocs-note" ] [ embed note ]
 
                 for example in entity.Comment.Examples do
-                    h5 [
-                        Class "fsdocs-example-header"
-                    ] [
-                        !! "Example"
-                    ]
+                    h5 [ Class "fsdocs-example-header" ] [ !! "Example" ]
 
-                    p [
-                        Class "fsdocs-example"
-                    ] [
-                        embed example
-                    ]
+                    p [ Class "fsdocs-example" ] [ embed example ]
 
             ]
 
             if (byCategory.Length > 1) then
                 // If there is more than 1 category in the type, generate TOC
-                h3 [] [
-                    !! "Table of contents"
-                ]
+                h3 [] [ !! "Table of contents" ]
 
                 ul [] [
                     for (index, _, name) in byCategory do
-                        li [] [
-                            a [
-                                Href(sprintf "#section%d" index)
-                            ] [
-                                !!name
-                            ]
-                        ]
+                        li [] [ a [ Href(sprintf "#section%d" index) ] [ !!name ] ]
                 ]
 
             //
@@ -703,11 +486,7 @@ type HtmlRender(model: ApiDocModel, ?menuTemplateFolder: string) =
                 // categories, print the category heading (as 
) and add XML comment from the type
                 // that is related to this specific category.
                 if (byCategory.Length > 1) then
-                    h2 [
-                        Id(sprintf "section%d" index)
-                    ] [
-                        !!name
-                    ]
+                    h2 [ Id(sprintf "section%d" index) ] [ !!name ]
                 // 

                 let functionsOrValues = ms |> List.filter (fun m -> m.Kind = ApiDocMemberKind.ValueOrFunction)
                 let extensions = ms |> List.filter (fun m -> m.Kind = ApiDocMemberKind.TypeExtension)
@@ -734,45 +513,26 @@ type HtmlRender(model: ApiDocModel, ?menuTemplateFolder: string) =
 
         [
             if allByCategory.Length > 0 then
-                h2 [
-                    Id ns.UrlHash
-                ] [
-                    !!(ns.Name + " Namespace")
-                ]
+                h2 [ Id ns.UrlHash ] [ !!(ns.Name + " Namespace") ]
 
-                div [
-                    Class "fsdocs-xmldoc"
-                ] [
+                div [ Class "fsdocs-xmldoc" ] [
                     match ns.NamespaceDocs with
                     | Some nsdocs ->
-                        p [] [
-                            embed nsdocs.Summary
-                        ]
+                        p [] [ embed nsdocs.Summary ]
 
                         match nsdocs.Remarks with
-                        | Some r ->
-                            p [] [
-                                embed r
-                            ]
+                        | Some r -> p [] [ embed r ]
                         | None -> ()
 
                     | None -> ()
                 ]
 
                 if (allByCategory.Length > 1) then
-                    h3 [] [
-                        !! "Contents"
-                    ]
+                    h3 [] [ !! "Contents" ]
 
                     ul [] [
                         for category in allByCategory do
-                            li [] [
-                                a [
-                                    Href("#category-" + category.CategoryIndex)
-                                ] [
-                                    !!category.CategoryName
-                                ]
-                            ]
+                            li [] [ a [ Href("#category-" + category.CategoryIndex) ] [ !!category.CategoryName ] ]
                     ]
 
                 for category in allByCategory do
@@ -782,9 +542,7 @@ type HtmlRender(model: ApiDocModel, ?menuTemplateFolder: string) =
                                 Class "anchor"
                                 Name("category-" + category.CategoryIndex)
                                 Href("#category-" + category.CategoryIndex)
-                            ] [
-                                !!category.CategoryName
-                            ]
+                            ] [ !!category.CategoryName ]
                         ]
 
                     yield! renderEntities category.CategoryEntites
@@ -802,9 +560,7 @@ type HtmlRender(model: ApiDocModel, ?menuTemplateFolder: string) =
                         a [
                             Href(ns.Url(root, collectionName, qualify, model.FileExtensions.InUrl))
                             HtmlProperties.Title ns.Name
-                        ] [
-                            !!ns.Name
-                        ]
+                        ] [ !!ns.Name ]
                     ]
                     td [] [
                         match ns.NamespaceDocs with
@@ -820,21 +576,13 @@ type HtmlRender(model: ApiDocModel, ?menuTemplateFolder: string) =
             //
             // For non-FSharp.Core we only show one link "API Reference" in the nav menu
             if otherDocs && model.Collection.CollectionName <> "FSharp.Core" then
-                li [
-                    Class "nav-header"
-                ] [
-                    !! "API Reference"
-                ]
+                li [ Class "nav-header" ] [ !! "API Reference" ]
 
-                li [
-                    Class "nav-item"
-                ] [
+                li [ Class "nav-item" ] [
                     a [
                         Class "nav-link"
                         Href(model.IndexFileUrl(root, collectionName, qualify, model.FileExtensions.InUrl))
-                    ] [
-                        !! "All Namespaces"
-                    ]
+                    ] [ !! "All Namespaces" ]
                 ]
             else
 
@@ -843,11 +591,7 @@ type HtmlRender(model: ApiDocModel, ?menuTemplateFolder: string) =
                 let someExist = categorise.Length > 0
 
                 if someExist then
-                    li [
-                        Class "nav-header"
-                    ] [
-                        !! "Namespaces"
-                    ]
+                    li [ Class "nav-header" ] [ !! "Namespaces" ]
 
                 for allByCategory, ns in categorise do
 
@@ -873,9 +617,7 @@ type HtmlRender(model: ApiDocModel, ?menuTemplateFolder: string) =
                                     | _ -> ""
                                 )
                                 Href(ns.Url(root, collectionName, qualify, model.FileExtensions.InUrl))
-                            ] [
-                                !!ns.Name
-                            ]
+                            ] [ !!ns.Name ]
 
                         ]
                     ]
@@ -884,20 +626,14 @@ type HtmlRender(model: ApiDocModel, ?menuTemplateFolder: string) =
                     // for the active namespace
                     match nsOpt with
                     | Some ns2 when ns.Name = ns2.Name ->
-                        ul [
-                            Custom("list-style-type", "none") (* Class "navbar-nav " *)
-                        ] [
+                        ul [ Custom("list-style-type", "none") (* Class "navbar-nav " *) ] [
                             for category in allByCategory do
                                 for e in category.CategoryEntites do
-                                    li [
-                                        Class "nav-item"
-                                    ] [
+                                    li [ Class "nav-item" ] [
                                         a [
                                             Class "nav-link"
                                             Href(e.Url(root, collectionName, qualify, model.FileExtensions.InUrl))
-                                        ] [
-                                            !!e.Name
-                                        ]
+                                        ] [ !!e.Name ]
                                     ]
                         ]
                     | _ -> ()
@@ -956,10 +692,7 @@ type HtmlRender(model: ApiDocModel, ?menuTemplateFolder: string) =
     member _.GlobalSubstitutions: Substitutions =
         let toc = listOfNamespacesNav true None
 
-        [
-            yield (ParamKeys.``fsdocs-list-of-namespaces``, toc)
-            yield ParamKeys.``fsdocs-body-class``, "api-docs"
-        ]
+        [ yield (ParamKeys.``fsdocs-list-of-namespaces``, toc); yield ParamKeys.``fsdocs-body-class``, "api-docs" ]
 
     member _.Generate(outDir: string, templateOpt, collectionName, globalParameters) =
 
@@ -980,27 +713,13 @@ type HtmlRender(model: ApiDocModel, ?menuTemplateFolder: string) =
 
         (let content =
             div [] [
-                h1 [] [
-                    !! "API Reference"
-                ]
-                h2 [] [
-                    !! "Available Namespaces:"
-                ]
-                table [
-                    Class "table outer-list fsdocs-member-list"
-                ] [
+                h1 [] [ !! "API Reference" ]
+                h2 [] [ !! "Available Namespaces:" ]
+                table [ Class "table outer-list fsdocs-member-list" ] [
                     thead [] [
                         tr [] [
-                            td [
-                                Class "fsdocs-member-list-header"
-                            ] [
-                                !! "Namespace"
-                            ]
-                            td [
-                                Class "fsdocs-member-list-header"
-                            ] [
-                                !! "Description"
-                            ]
+                            td [ Class "fsdocs-member-list-header" ] [ !! "Namespace" ]
+                            td [ Class "fsdocs-member-list-header" ] [ !! "Description" ]
                         ]
                     ]
                     tbody [] (tableOfNamespacesAux ())