Merge ~adam-collard/maas:api-docs-reformat into maas:master

[Adam Collard]

Remove unwanted formatting of docs

[Alberto Donato (ack)]

+1

review: Approve

[MAAS Lander (maas-lander)]

LANDING
-b api-docs-reformat lp:~adam-collard/maas/+git/maas into -b master lp:~maas-committers/maas

STATUS: FAILED BUILD
LOG: http://maas-ci.internal:8080/job/maas/job/branch-tester/9131/consoleText

diff --git a/src/maasserver/api/doc_handler.py b/src/maasserver/api/doc_handler.py
index 6652133..6425110 100644
--- a/src/maasserver/api/doc_handler.py
+++ b/src/maasserver/api/doc_handler.py
@@ -81,7 +81,7 @@ from maasserver.utils import build_absolute_uri
 api_doc_title = dedent(
     """
     :tocdepth: 3
-    .. _region-controller-api:
+    .. _maas-api:
 
     ========
     MAAS API
@@ -168,7 +168,9 @@ def render_api_docs():
         line()
         for (http_method, op), function in sorted(exports, key=export_key):
             operation = " op=%s" % op if op is not None else ""
-            subsection = "``%s %s%s``" % (http_method, uri_template, operation)
+            subsection = (
+                f"<code>{http_method} {uri_template}{operation}</code>"
+            )
             docstring = getdoc(function)
             if docstring is not None:
                 if APIDocstringParser.is_annotated_docstring(docstring):
@@ -183,7 +185,10 @@ def render_api_docs():
                         )
                     )
                 else:
-                    line("%s\n%s\n" % (subsection, "#" * len(subsection)))
+                    line(".. raw:: html")
+                    line()
+                    line("  <details>")
+                    line(f"  <summary>{subsection}</summary>")
                     line()
                     for docline in dedent(docstring).splitlines():
                         if docline.strip() == "":
@@ -192,9 +197,16 @@ def render_api_docs():
                         else:
                             # Print documentation line, indented.
                             line(docline)
+                    line()
+                    line(".. raw:: html")
+                    line()
+                    line("  </details>")
+                    line()
                 line()
             else:
-                line("%s\n%s\n" % (subsection, "#" * len(subsection)))
+                line(".. raw:: html")
+                line()
+                line(f"  <p>{subsection}</p>\n")
                 line()
 
     line()
diff --git a/src/maasserver/api/tmpl-apidoc.rst b/src/maasserver/api/tmpl-apidoc.rst
index af49b2b..1d2c3e5 100644
--- a/src/maasserver/api/tmpl-apidoc.rst
+++ b/src/maasserver/api/tmpl-apidoc.rst
@@ -1,9 +1,7 @@
 .. raw:: html
 
   <details>
-    <summary>``{{ http_method }} {{ uri }}{{if operation != ""}}?{{ operation }}{{endif}}``</summary>
-
-######################################################################################################
+    <summary><code>{{ http_method }} {{ uri }}{{if operation != ""}}?{{ operation }}{{endif}}</code></summary>
 
 {{py:
 params_length = len(params)
diff --git a/src/maasserver/tests/test_commands.py b/src/maasserver/tests/test_commands.py
index fdda41e..ce906c9 100644
--- a/src/maasserver/tests/test_commands.py
+++ b/src/maasserver/tests/test_commands.py
@@ -62,7 +62,7 @@ class TestCommands(MAASServerTestCase):
         # should not exceed 3 levels deep.)
         self.assertThat(
             result[:100],
-            StartsWith(":tocdepth: 3\n.. _region-controller-api:"),
+            StartsWith(":tocdepth: 3\n.. _maas-api:"),
         )
         # It also contains a ReST title (not indented).
         self.assertIn("===", result[:100])