matplotlib
diff --git a/‎doc/README.txt
Copy file name to clipboardExpand all lines: doc/README.txt
+4-5Lines changed: 4 additions & 5 deletions b/‎doc/README.txt
Copy file name to clipboardExpand all lines: doc/README.txt
+4-5Lines changed: 4 additions & 5 deletions
diff --git a/‎doc/conf.py
Copy file name to clipboardExpand all lines: doc/conf.py
+7-3Lines changed: 7 additions & 3 deletions b/‎doc/conf.py
Copy file name to clipboardExpand all lines: doc/conf.py
+7-3Lines changed: 7 additions & 3 deletions
diff --git a/‎doc/make.py
Copy file name to clipboardExpand all lines: doc/make.py
+1-1Lines changed: 1 addition & 1 deletion b/‎doc/make.py
Copy file name to clipboardExpand all lines: doc/make.py
+1-1Lines changed: 1 addition & 1 deletion
@@ -33,11 +33,10 @@ python documentation system built on top of ReST.  This directory contains
 * mpl_examples - a link to the matplotlib examples in case any
   documentation wants to literal include them
 
-To build the HTML documentation, install sphinx (1.0 or greater
-required), then type "python make.py html" in this directory.  Wait
-for the initial run (which builds the example gallery) to be done,
-then run "python make.py html" again. The top file of the results will
-be ./build/html/index.html
+To build the HTML documentation, install sphinx (1.0 or greater required) and,
+if sphinx older than 1.3, sphinxcontrib-napoleon, then type "python make.py
+html" in this directory.  The top file of the results will be
+./build/html/index.html
 
 Note that Sphinx uses the installed version of the package to build
 the documentation, so matplotlib must be installed *before* the docs
 
@@ -32,7 +32,11 @@
               'sphinx.ext.inheritance_diagram',
               'sphinxext.gen_gallery', 'sphinxext.gen_rst',
               'sphinxext.github',
-              'numpydoc']
+             ]
+if hasattr(sphinx, 'version_info') and sphinx.version_info[:2] >= (1, 3):
+    extensions += ['sphinx.ext.napoleon']
+else:
+    extensions += ['sphinxcontrib.napoleon']
 
 exclude_patterns = ['api/api_changes/*', 'users/whats_new/*']
 
@@ -328,5 +332,5 @@ def getapi(*args):
 sys.modules['sip'] = mocksip
 sys.modules['PyQt4'] = mockpyqt4
 
-################# numpydoc config ####################
-numpydoc_show_class_members = False
+################# napoleon config ####################
+napoleon_google_docstring = False
@@ -60,7 +60,7 @@ def htmlhelp():
     with open('build/htmlhelp/index.html', 'r+') as fh:
         content = fh.read()
         fh.seek(0)
-        content = re.sub(r'<script>.*?</script>', '', content, 
+        content = re.sub(r'<script>.*?</script>', '', content,
                          flags=re.MULTILINE| re.DOTALL)
         fh.write(content)
         fh.truncate()