Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion docs/source/explanation/about.md
Original file line number Diff line number Diff line change
Expand Up @@ -60,4 +60,4 @@ A facility adopts pyAML by writing a *configuration* describing its machine. The

There is one simple rule behind the configuration: each item names a Python class, and each of its other fields is an argument of that class's constructor. See [Configuration Structure and Syntax](configuration.md).

The terms used throughout the documentation are defined in the [Glossary](glossary.md).
The terms used throughout the documentation are defined in the [Glossary](../glossary.md).
4 changes: 2 additions & 2 deletions docs/source/glossary.md
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ Accelerator
: The top-level pyAML object describing one machine (a storage ring, a booster, a transfer line, ...). It holds all the control modes, arrays and devices.

Control mode
: One way of accessing the accelerator, for example `live` (the real machine) or `design` (a simulation). All control modes offer the same interface. See [Control Modes](control-modes.md).
: One way of accessing the accelerator, for example `live` (the real machine) or `design` (a simulation). All control modes offer the same interface. See [Control Modes](./explanation/control-modes.md).

Element
: A single object of the accelerator that can be read or set: a magnet, a BPM, an RF plant, a tune monitor, ...
Expand All @@ -21,7 +21,7 @@ Backend
: The system that a control mode talks to: a control system (through control-system bindings such as `tango-pyaml` or `pyaml-cs-oa`) or a simulation code (`pyAT`).

Catalog
: The backend-specific description of how a key used in the configuration maps to a signal of the control system. See [Control System Catalogs](catalog.md).
: The backend-specific description of how a key used in the configuration maps to a signal of the control system. See [Control System Catalogs](./explanation/catalog.md).

Virtual accelerator
: A simulated machine exposed through a real control system (for example TANGO devices backed by a simulation), so that it can be used exactly like the real machine.
Expand Down
Loading