port missing doc PRs to master

doc/install_others.txt

@@ -25,18 +25,21 @@ focusing on how to install the appropriate dependencies.
 
 Nicolas Pinto provides `ebuild scripts <https://github.com/npinto/sekyfsr-gentoo-overlay/tree/master/sci-libs/Theano>`_.
 
-Docker images
--------------
+Docker
+~~~~~~
 
-Builds of Theano are available as `Docker <https://www.docker.com/whatisdocker>`_ images:
-`Theano Docker (CPU) <https://hub.docker.com/r/kaixhin/theano/>`_ or `Theano Docker (CUDA) <https://hub.docker.com/r/kaixhin/cuda-theano/>`_.
-These are updated on a weekly basis with bleeding-edge builds of Theano. Examples of running bash in a Docker container
-are as follows:
+Builds of Theano are available as `Docker <https://www.docker.com>`_
+images: `Theano Docker (CPU) <https://hub.docker.com/r/kaixhin/theano/>`_ or
+`Theano Docker (CUDA) <https://hub.docker.com/r/kaixhin/cuda-theano/>`_. These
+are updated on a weekly basis with bleeding-edge builds of Theano.
+Examples of running bash in a Docker container are as follows:
 
 .. code-block:: bash
 
     sudo docker run -it kaixhin/theano
-    sudo docker run -it --device /dev/nvidiactl --device /dev/nvidia-uvm --device /dev/nvidia0 kaixhin/cuda-theano:7.0
+    sudo nvidia-docker run -it kaixhin/cuda-theano:7.0
 
-For a guide to Docker, see the `official docs <https://docs.docker.com/userguide/>`_. For more details on how to use the
-Theano Docker images, including requirements for CUDA support, consult the `source project <https://github.com/Kaixhin/dockerfiles>`_.
+For a guide to Docker, see the `official docs <https://docs.docker.com>`_.
+CUDA support requires `NVIDIA Docker <https://github.com/NVIDIA/nvidia-docker>`_.
+For more details on how to use the Theano Docker images,
+consult the `source project <https://github.com/Kaixhin/dockerfiles>`_.

doc/troubleshooting.txt

@@ -323,21 +323,6 @@ try the following.
       [gcc]
       cxxflags = -L/opt/local/lib
 
-- An obscure ``Bus error`` can sometimes be caused when linking
-  Theano-generated object files against the ``framework`` library in Leopard.
-  For this reason, we have disabled linking with ``-framework Python``, since on
-  most configurations this solves the ``Bus error`` problem. If this default
-  configuration causes problems with your Python/Theano installation and you think
-  that linking with ``-framework Python`` might help, then either set
-  the :envvar:`THEANO_FLAGS` environment variable with
-  ``THEANO_FLAGS=cmodule.mac_framework_link`` or edit your ``~/.theanorc`` to
-  contain
-
-    .. code-block:: cfg
-
-      [cmodule]
-      mac_framework_link=True
-
 - More generally, to investigate libraries issues, you can use the ``otool -L``
   command on ``.so`` files found under your ``~/.theano`` directory. This will
   list shared libraries dependencies, and may help identify incompatibilities.

theano/configdefaults.py

@@ -606,10 +606,6 @@ AddConfigVar(
     IntParam(0),
     in_c_key=False)
 
-AddConfigVar('experimental.mrg',
-             "Another random number generator that work on the gpu",
-             BoolParam(False))
-
 AddConfigVar('experimental.unpickle_gpu_on_cpu',
              "Allow unpickling of pickled CudaNdarrays as numpy.ndarrays."
              "This is useful, if you want to open a CudaNdarray without "