matplotlib
diff --git a/‎doc/faq/environment_variables_faq.rst
+22-10 b/‎doc/faq/environment_variables_faq.rst
+22-10
diff --git a/‎doc/faq/howto_faq.rst
+5-5 b/‎doc/faq/howto_faq.rst
+5-5
@@ -8,18 +8,21 @@ Environment Variables
    :backlinks: none
 
 
-.. envvar:: HOME
+.. envvar:: DISPLAY
 
-  The user's home directory. On linux, :envvar:`~ <HOME>` is shorthand for :envvar:`HOME`.
+  The server and screen on which to place windows. This is interpreted by GUI
+  toolkits in a backend-specific manner, but generally refers to an `X.org
+  display name
+  <https://www.x.org/releases/X11R7.7/doc/man/man7/X.7.xhtml#heading5>`_.
 
-.. envvar:: PATH
+.. envvar:: HOME
 
-  The list of directories searched to find executable programs
+  The user's home directory. On linux, :envvar:`~ <HOME>` is shorthand for :envvar:`HOME`.
 
-.. envvar:: PYTHONPATH
+.. envvar:: MPLBACKEND
 
-  The list of directories that is added to Python's standard search list when
-  importing packages and modules
+  This optional variable can be set to choose the Matplotlib backend. See
+  :ref:`what-is-a-backend`.
 
 .. envvar:: MPLCONFIGDIR
 
@@ -31,10 +34,19 @@ Environment Variables
   is used to find a base directory in which the :file:`matplotlib` subdirectory 
   is created.
 
-.. envvar:: MPLBACKEND
+.. envvar:: PATH
 
-  This optional variable can be set to choose the matplotlib backend.  See
-  :ref:`what-is-a-backend`.
+  The list of directories searched to find executable programs.
+
+.. envvar:: PYTHONPATH
+
+  The list of directories that are added to Python's standard search list when
+  importing packages and modules.
+
+.. envvar:: QT_API
+
+   The Python Qt wrapper to prefer when using Qt-based backends. See :ref:`the
+   entry in the usage guide <QT_API-usage>` for more information.
 
 .. _setting-linux-osx-environment-variables:
 
 
@@ -27,7 +27,7 @@ converter with the `matplotlib.units` module::
   from pandas.tseries import converter as pdtc
   pdtc.register()
 
-If you only want to use the `pandas` converter for `datetime64` values ::
+If you only want to use the `pandas` converter for `numpy.datetime64` values ::
 
   from pandas.tseries import converter as pdtc
   import matplotlib.units as munits
@@ -48,7 +48,7 @@ recursively search the artist for any artists it may contain that meet
 some criteria (e.g., match all :class:`~matplotlib.lines.Line2D`
 instances or match some arbitrary filter function).  For example, the
 following snippet finds every object in the figure which has a
-`set_color` property and makes the object blue::
+``set_color`` property and makes the object blue::
 
     def myfunc(x):
         return hasattr(x, 'set_color')
@@ -246,8 +246,8 @@ over so that the tick labels fit in the figure:
 Configure the tick widths
 -------------------------
 
-Wherever possible, it is recommended to use the :meth:`~Axes.tick_params` or
-:meth:`~Axis.set_tick_params` methods to modify tick properties::
+Wherever possible, it is recommended to use the :meth:`~.axes.Axes.tick_params`
+or :meth:`~.axis.Axis.set_tick_params` methods to modify tick properties::
 
     import matplotlib.pyplot as plt
 
@@ -648,7 +648,7 @@ In general, the simplest solution when using Matplotlib in a web server is
 to completely avoid using pyplot (pyplot maintains references to the opened
 figures to make `~.matplotlib.pyplot.show` work, but this will cause memory
 leaks unless the figures are properly closed).  Since Matplotlib 3.1, one
-can directly create figures using the `Figure` constructor and save them to
+can directly create figures using the `.Figure` constructor and save them to
 in-memory buffers.  The following example uses Flask_, but other frameworks
 work similarly::