Skip to content

Commit

Permalink
Correct links
Browse files Browse the repository at this point in the history
  • Loading branch information
jenshnielsen committed Feb 18, 2019
1 parent cc840d3 commit 43113fa
Show file tree
Hide file tree
Showing 3 changed files with 4 additions and 4 deletions.
4 changes: 2 additions & 2 deletions docs/community/objects.rst
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ to use. Normal text shows the container includes and uses of this object.
- *actions*
- DataManager
- **DataServer**
- :ref:`loops`
- :ref:`loops_api`
- actions: Parameter, Task, Wait, (Active)Loop
- **ActiveLoop**

Expand All @@ -36,7 +36,7 @@ to use. Normal text shows the container includes and uses of this object.
Station
-------

Read more about :ref:`station`.
Read more about :ref:`station_api`.

.. todo:: is this how we want it ? or like the one below ?

Expand Down
2 changes: 1 addition & 1 deletion docs/user/configuration.rst
Original file line number Diff line number Diff line change
Expand Up @@ -85,7 +85,7 @@ There is the possibility to save to env variable, and current working directory.
More
~~~~

For a overview of the API, read this: :ref:`config_label` .
For a overview of the API, read this: :ref:`config_api` .

.. note:: for now are supported all the JSON types MINUS enum
.. todo:: add GUI for creating config, explain saving (note on config loaded at module import so no effect if changed at runtime).
Expand Down
2 changes: 1 addition & 1 deletion docs/user/intro.rst
Original file line number Diff line number Diff line change
Expand Up @@ -178,7 +178,7 @@ The key loop running conditions are:
The Loop is responsible for:
- creating the dataset_ that will be needed to store its data
- generating all the metadata for the DataSet. Metadata is intended to describe the system and software configuration to give it context, help reproduce and troubleshoot the experiment, and to aid searching and datamining later. The Loop generates its own metadata, regarding when and how it was run and the Parameters and other actions involved, as well as asking all the Instruments, via a :ref:`station` if possible, for their own metadata and including it.
- generating all the metadata for the DataSet. Metadata is intended to describe the system and software configuration to give it context, help reproduce and troubleshoot the experiment, and to aid searching and datamining later. The Loop generates its own metadata, regarding when and how it was run and the Parameters and other actions involved, as well as asking all the Instruments, via a :ref:`station_api` if possible, for their own metadata and including it.
- sequencing actions: the Loop should have the highest priority and the least overhead of extra responsibilities so that setpoints and actions occur with as fast and reliable timing as possible.

.. state
Expand Down

0 comments on commit 43113fa

Please sign in to comment.