Merge pull request #9433 from matplotlib/auto-backport-of-pr-9420

dstansby · web-flow · commit 0d021b129d53 · 2017-10-17T09:54:19.000+01:00
Backport PR #9420 on branch v2.1.0-doc
diff --git a/doc/faq/osx_framework.rst b/doc/faq/osx_framework.rst
@@ -13,16 +13,14 @@ Working with Matplotlib on OSX
 Introduction
 ============
 
-On OSX, two different types of Python Builds exist: a regular build and a
-framework build. In order to interact correctly with OSX through the native
-GUI frameworks you need a framework build of Python.
-At the time of writing the ``macosx`` and ``WXAgg`` backends require a
-framework build to function correctly. This can result in issues for
-a python installation not build as a framework and may also happen in
-virtual envs and when using (Ana)Conda.
-From Matplotlib 1.5 onwards the ``macosx`` backend
-checks that a framework build is available and fails if a non framework
-build is found. WX has a similar check build in.
+On OSX, two different types of Python builds exist: a regular build and a
+framework build.  In order to interact correctly with OSX through the native
+GUI frameworks you need a framework build of Python.  At the time of writing
+the ``macosx`` and ``WXAgg`` backends require a framework build to function
+correctly. This can result in issues for a Python installation not build as a
+framework and may also happen in virtual envs and when using (Ana)Conda.  From
+Matplotlib 1.5 onwards, both backends check that a framework build is available
+and fail if a non framework build is found.
 
 Without this check a partially functional figure is created.
 Among the issues with it is that it is produced in the background and
@@ -103,9 +101,9 @@ build within the virtual environment you can do ``frameworkpython -m IPython``
 ``PYTHONHOME`` and Jupyter
 ^^^^^^^^^^^^^^^^^^^^^^^^^^
 
-This approach can be followed even if using `Jupyter <https://jupyter.org/>`_ 
-notebooks: you just need to setup a kernel with the suitable ``PYTHONHOME`` 
-definition. The  `jupyter-virtualenv-osx  <https://github.com/mapio/jupyter-virtualenv-osx>`_ 
+This approach can be followed even if using `Jupyter <https://jupyter.org/>`_
+notebooks: you just need to setup a kernel with the suitable ``PYTHONHOME``
+definition. The  `jupyter-virtualenv-osx  <https://github.com/mapio/jupyter-virtualenv-osx>`_
 script automates the creation of such a kernel.
 
 
@@ -139,7 +137,7 @@ With this in place you can run ``frameworkpython`` as above but will need to add
 to every virtualenv
 
 PythonW Compiler
-^^^^^^^^^^^^^^^^
+----------------
 
 In addition
 `virtualenv-pythonw-osx <https://github.com/gldnspud/virtualenv-pythonw-osx>`_
diff --git a/doc/faq/virtualenv_faq.rst b/doc/faq/virtualenv_faq.rst
@@ -4,14 +4,6 @@
 Working with Matplotlib in Virtual environments
 ***********************************************
 
-.. contents::
-   :backlinks: none
-
-.. _virtualenv_introduction:
-
-Introduction
-============
-
 When running Matplotlib in a `virtual environment
 <https://virtualenv.pypa.io/en/latest/>`_ you may discover a few issues.
 Matplotlib itself has no issue with virtual environments.  However, some of
