Commit f9043a36 authored by Samuel Debionne's avatar Samuel Debionne

Merge branch 'fix-doc-links' into 'master'

Fix broken links in documentation.

See merge request !105
parents 4d37b78d 474a9a43
Pipeline #7118 passed with stages
in 10 minutes and 10 seconds
......@@ -127,4 +127,4 @@ The camera image can be viewed by selecting the "image_ccd" tab
.. _Python: http://python.org
.. _PyTango: http://github.com/tango-cs/pytango
.. _Tango: http://tango-control.org
.. _Tango: http://tango-controls.org
......@@ -273,7 +273,7 @@ Camera device
Once the plug-in was developed, you must create a camera device to execute all commands on the camera. This device can be developed in Python or C++. Python devices must be located on "Lima/applications/tango/camera", C++ devices on "Lima/applications/tango/LimaDetector"
In order to enhance the general software quality of Device Servers developed by the various institutes using Tango, a Design and Implementation Guidelines document has been written by SOLEIL. This document can be downloaded `here <http://www-controle.synchrotron-soleil.fr:8001/docs/TangoGuidelines/TangoDesignGuidelines-GB4-3.pdf>`_.
In order to enhance the general software quality of Device Servers developed by the various institutes using Tango, a Design and Implementation Guidelines document has been written by SOLEIL. This document can be downloaded `here <https://tango-controls.readthedocs.io/en/latest/development/device-api/ds-guideline>`_.
It is recommended that the camera device comply with these design guidelines.
......
......@@ -3,7 +3,7 @@
Requirements
------------
Some tools and libraries are required to build Lima for either Windows and Linux.
Some tools and libraries are required to build LImA for either Windows and Linux.
.. note::
All the dependencies, build or runtime, are available as Conda_ packages for both Windows and Linux platforms.
......@@ -22,7 +22,7 @@ Build dependencies
Python dependencies
~~~~~~~~~~~~~~~~~~~
Lima_ is compatible with python 2 and 3.
LImA_ is compatible with python 2 and 3.
- numpy_ >= 1.1
- sip_ >= 4.19
......@@ -51,8 +51,8 @@ PyTango server dependencies
.. _CMake: https://cmake.org
.. _Conda: https://conda.io
.. _Python: http://python.org
.. _Lima: http://lima.blissgarden.org
.. _Python: https://python.org
.. _LImA: https://lima1.readthedocs.io
.. _GSL: https://www.gnu.org/software/gsl
.. _gsl-windows: http://ftp.esrf.fr/pub/bliss/lima/gsl-windows.zip
.. _zlib-windows: http://ftp.esrf.fr/pub/bliss/lima/zlib-windows.zip
......@@ -60,7 +60,7 @@ PyTango server dependencies
.. _Tango: http://tango-control.org
.. _PyTango: http://github.com/tango-cs/pytango
.. _libtango: http://tango-controls.org/downloads/source
.. _libtango: http://www.tango-controls.org/downloads/
.. _numpy: http://pypi.python.org/pypi/numpy
.. _sip: https://www.riverbankcomputing.com/software/sip
......
......@@ -28,6 +28,7 @@ Linux Only
Dectris Mythen <camera/mythen/doc/index>
Dectris Mythen 3 <camera/mythen3/doc/index>
Dectris Pilatus 2 & 3 <camera/pilatus/doc/index>
Fli <camera/fli/doc/index>
ImXpad <camera/imxpad/doc/index>
Merlin <camera/merlin/doc/index>
Pixirad <camera/pixirad/doc/index>
......
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