Merge pull request #19 from nabobalis/master

reverted back to numpydoc
sunpy · Jan 11, 2019 · 9090d59 · 9090d59
2 parents 37fa7eb + 2d90f6c
commit 9090d59
Showing 1 changed file with 1 addition and 5 deletions.
diff --git a/doc/conf.py b/doc/conf.py
@@ -22,7 +22,7 @@
     'sphinx.ext.autosummary',
     'sphinx.ext.intersphinx',
     'sphinx.ext.coverage',
-    'sphinx.ext.napoleon'
+    'numpydoc'
 ]
 
 # Generate API docs.
@@ -124,12 +124,9 @@
 
 try:
     from sunpy_sphinx_theme.conf import *
-
     # Custom sidebar templates, maps document names to template names.
     html_sidebars = {'**': ['docsidebar.html']}
-
 except ImportError:
-
     html_theme = 'drmsdoc'
     # Add any paths that contain templates here, relative to this directory.
     templates_path = ['_templates']
@@ -310,4 +307,3 @@
 
 # If true, do not generate a @detailmenu in the "Top" node's menu.
 #texinfo_no_detailmenu = False
-