Commit d703117e authored by syz's avatar syz
Browse files

Merge remote-tracking branch 'origin/cades_dev' into cades_dev_local

# Conflicts:
#	setup.py
parents 972bc0e5 f314598f
...@@ -9,9 +9,9 @@ Examples using ``pycroscopy.analysis.be_sho.SHOestimateGuess`` ...@@ -9,9 +9,9 @@ Examples using ``pycroscopy.analysis.be_sho.SHOestimateGuess``
.. only:: html .. only:: html
.. figure:: /auto_examples/images/thumb/sphx_glr_tutorial_04_parallel_computing_thumb.png .. figure:: /auto_examples/dev_tutorials/images/thumb/sphx_glr_plot_tutorial_04_parallel_computing_thumb.png
:ref:`sphx_glr_auto_examples_tutorial_04_parallel_computing.py` :ref:`sphx_glr_auto_examples_dev_tutorials_plot_tutorial_04_parallel_computing.py`
.. raw:: html .. raw:: html
...@@ -19,4 +19,22 @@ Examples using ``pycroscopy.analysis.be_sho.SHOestimateGuess`` ...@@ -19,4 +19,22 @@ Examples using ``pycroscopy.analysis.be_sho.SHOestimateGuess``
.. only:: not html .. only:: not html
* :ref:`sphx_glr_auto_examples_tutorial_04_parallel_computing.py` * :ref:`sphx_glr_auto_examples_dev_tutorials_plot_tutorial_04_parallel_computing.py`
.. raw:: html
<div class="sphx-glr-thumbcontainer" tooltip="**Suhas Somnath, Chris R. Smith**">
.. only:: html
.. figure:: /auto_tutorials/images/thumb/sphx_glr_plot_tutorial_04_parallel_computing_thumb.png
:ref:`sphx_glr_auto_tutorials_plot_tutorial_04_parallel_computing.py`
.. raw:: html
</div>
.. only:: not html
* :ref:`sphx_glr_auto_tutorials_plot_tutorial_04_parallel_computing.py`
...@@ -9,9 +9,9 @@ Examples using ``pycroscopy.analysis.be_sho.SHOfunc`` ...@@ -9,9 +9,9 @@ Examples using ``pycroscopy.analysis.be_sho.SHOfunc``
.. only:: html .. only:: html
.. figure:: /auto_examples/images/thumb/sphx_glr_tutorial_04_parallel_computing_thumb.png .. figure:: /auto_examples/dev_tutorials/images/thumb/sphx_glr_plot_tutorial_04_parallel_computing_thumb.png
:ref:`sphx_glr_auto_examples_tutorial_04_parallel_computing.py` :ref:`sphx_glr_auto_examples_dev_tutorials_plot_tutorial_04_parallel_computing.py`
.. raw:: html .. raw:: html
...@@ -19,4 +19,22 @@ Examples using ``pycroscopy.analysis.be_sho.SHOfunc`` ...@@ -19,4 +19,22 @@ Examples using ``pycroscopy.analysis.be_sho.SHOfunc``
.. only:: not html .. only:: not html
* :ref:`sphx_glr_auto_examples_tutorial_04_parallel_computing.py` * :ref:`sphx_glr_auto_examples_dev_tutorials_plot_tutorial_04_parallel_computing.py`
.. raw:: html
<div class="sphx-glr-thumbcontainer" tooltip="**Suhas Somnath, Chris R. Smith**">
.. only:: html
.. figure:: /auto_tutorials/images/thumb/sphx_glr_plot_tutorial_04_parallel_computing_thumb.png
:ref:`sphx_glr_auto_tutorials_plot_tutorial_04_parallel_computing.py`
.. raw:: html
</div>
.. only:: not html
* :ref:`sphx_glr_auto_tutorials_plot_tutorial_04_parallel_computing.py`
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment