Merge pull request #12053 from noviluni/small_fixes

Small fixes

.gitignore

@@ -7,7 +7,6 b' docs/source/api/generated'
 docs/source/config/options
 docs/source/config/shortcuts/*.csv
 docs/source/interactive/magics-generated.txt
-docs/source/config/shortcuts/*.csv
 docs/gh-pages
 jupyter_notebook/notebook/static/mathjax
 jupyter_notebook/static/style/*.map

IPython/testing/ipunittest.py

@@ -155,7 +155,7 b' class Doc2UnitTester(object):'
                     # failed should contain at most one item.  More than that
                     # is a case we can't handle and should error out on
                     if len(failed) > 1:
-                        err = "Invalid number of test results:" % failed
+                        err = "Invalid number of test results: %s" % failed
                         raise ValueError(err)
                     # Report a normal failure.
                     self.fail('failed doctests: %s' % str(failed[0]))

docs/source/conf.py

@@ -225,7 +225,6 b" htmlhelp_basename = 'ipythondoc'"
 intersphinx_mapping = {'python': ('https://docs.python.org/3/', None),
                        'rpy2': ('https://rpy2.readthedocs.io/en/version_2.8.x/', None),
                        'jupyterclient': ('https://jupyter-client.readthedocs.io/en/latest/', None),
-                       'ipyparallel': ('https://ipyparallel.readthedocs.io/en/latest/', None),
                        'jupyter': ('https://jupyter.readthedocs.io/en/latest/', None),
                        'jedi': ('https://jedi.readthedocs.io/en/latest/', None),
                        'traitlets': ('https://traitlets.readthedocs.io/en/latest/', None),