Merge branch 'winbuild' of github.com:story645/matplotlib

story645 · story645 · commit 05241d1d317a · 2020-05-28T15:55:27.000-04:00
diff --git a/doc/devel/documenting_mpl.rst b/doc/devel/documenting_mpl.rst
@@ -111,6 +111,12 @@ it, use
 .. code-block:: sh
 
    make SPHINXOPTS= html
+   
+On Windows the arguments must be at the end of the statement:
+
+.. code-block:: bat
+
+   make html SPHINXOPTS=
 
 You can use the ``O`` variable to set additional options:
 
@@ -121,8 +127,12 @@ You can use the ``O`` variable to set additional options:
 Multiple options can be combined using e.g. ``make O='-j4 -Dplot_gallery=0'
 html``.
 
-On Windows, options needs to be set as environment variables, e.g. ``set O=-W
---keep-going -j4 & make html``.
+On Windows, either use the format shown above or set options as environment variables, e.g.:
+
+.. code-block:: bat
+
+   set O=-W --keep-going -j4 
+   make html 
 
 .. _writing-rest-pages:
 
