latest documentation

docs/source/index.rst

@@ -12,17 +12,9 @@ Table of Contents
 
 .. toctree::
    :maxdepth: 2
-   :caption: Modules
+   :caption: API
 
-   modules/musicbrainzapi.rst
-
-.. toctree::
-   :maxdepth: 2
-   :caption: Submodules
-
-   modules/musicbrainzapi.api.rst
-   modules/musicbrainzapi.cli.rst
-   modules/musicbrainzapi.wordcloud.rst
+   modules/modules
 
 .. toctree::
    :caption: Table of Contents

docs/source/modules/musicbrainzapi.api.rst

@@ -1,17 +1,26 @@
-musicbrainzapi.api
---------------------------------------------------------------------------
+musicbrainzapi.api package
+===========================
 
 .. automodule:: musicbrainzapi.api
-   :members:
-   :undoc-members:
-   :show-inheritance:
-   :private-members:
+    :members:
+    :undoc-members:
+    :show-inheritance:
+    :private-members:
 
+Subpackages
+===========
 
 .. toctree::
+    musicbrainzapi.lyrics
 
-   musicbrainzapi.api.lyrics
+Submodules
+==========
 
-.. toctree::
+musicbrainzapi.api.authenticate
+-------------------------------
 
-   musicbrainzapi.api.authenticate
+.. automodule:: musicbrainzapi.api.authenticate
+    :members:
+    :undoc-members:
+    :show-inheritance:
+    :private-members:

docs/source/modules/musicbrainzapi.rst

@@ -1,7 +1,5 @@
-.. include:: ../global.rst
-
-musicbrainzapi :modname:`musicbrainzapi`
------------------------------------------
+musicbrainzapi 
+===============
 
 .. automodule:: musicbrainzapi
    :members:
@@ -9,4 +7,10 @@ musicbrainzapi :modname:`musicbrainzapi`
    :show-inheritance:
    :private-members:
 
-Main module text
+Subpackages
+===========
+
+.. toctree::
+    musicbrainzapi.api
+    musicbrainzapi.wordcloud
+