DOC glossary on n_jobs=None semantics (#11806)

jnothman · rth · commit c564df963456 · 2018-08-14T11:07:27.000+03:00
diff --git a/doc/conf.py b/doc/conf.py
@@ -237,6 +237,7 @@
     'scipy': ('https://docs.scipy.org/doc/scipy/reference', None),
     'matplotlib': ('https://matplotlib.org/', None),
     'pandas': ('https://pandas.pydata.org/pandas-docs/stable/', None),
+    'joblib': ('https://joblib.readthedocs.io/en/latest/', None),
 }
 
 sphinx_gallery_conf = {
diff --git a/doc/glossary.rst b/doc/glossary.rst
@@ -1482,6 +1482,10 @@ functions or non-estimator constructors.
         parallel computing code is used at all.  For n_jobs below -1, (n_cpus +
         1 + n_jobs) are used. Thus for n_jobs = -2, all CPUs but one are used.
 
+        ``n_jobs=None`` means *unset*; it will generally be interpreted as
+        ``n_jobs=1``, unless the current :class:`joblib.Parallel` backend
+        context specifies otherwise.
+
         The use of ``n_jobs``-based parallelism in estimators varies:
 
         * Most often parallelism happens in :term:`fitting <fit>`, but
