Merge branch 'main' into dependabot/pip/ophyd-async-ca--0.14.0

Author: rerpha

doc/dev/troubleshooting.md

@@ -5,6 +5,7 @@
 
 ## Where is ...?
 
+{#where_are_plans_devices}
 ### Instrument-specific plans & devices
 
 This is located in each instrument's `inst` script area, with their other instrument-specific scripts.

doc/plans/plans.md

@@ -1,4 +1,9 @@
-# General Plans 
+# General Plans
+
+:::{note}
+{ref}`Instrument-specific bluesky plans <where_are_plans_devices>` are defined in each instrument's `inst` scripts area.
+This page documents general cross-instrument plans provided within the {py:obj}`ibex_bluesky_core` library.
+:::
 
 The {py:obj}`ibex_bluesky_core.plans` module provides a number of plans that can be run by the RunEngine directly. These are mostly wrappers around the generic {external+bluesky:doc}`bluesky plans <plans>`.
 

doc/plans/reflectometry.md

@@ -1,5 +1,10 @@
 # Reflectometry-specific Plans
 
+:::{note}
+{ref}`Instrument-specific bluesky plans <where_are_plans_devices>` are defined in each instrument's `inst` scripts area.
+This page documents general cross-instrument plans provided within the {py:obj}`ibex_bluesky_core` library.
+:::
+
 These are plans that are only expected to be useful on Reflectometry beamlines.
 
 ```{toctree}

doc/tutorial/overview.md

@@ -42,6 +42,8 @@ def plan():
     yield from bps.null()
 ```
 
+{ref}`Instrument-specific bluesky plans <where_are_plans_devices>` are defined in each instrument's `inst` scripts area.
+
 ## Devices
 
 The {py:obj}`ibex_bluesky_core.devices` module provides built-in support for a number of ISIS-specific devices. For example,
@@ -60,6 +62,8 @@ Block objects provide several mechanisms for configuring write behaviour; see
 Likewise, the DAE is available as a bluesky device: see [the DAE Documentation](../devices/dae.md)
 for full examples including example configurations.
 
+{ref}`Instrument-specific bluesky device instances <where_are_plans_devices>` are defined in each instrument's `inst` scripts area.
+
 ## Setting and reading values
 
 Bluesky provides plan stubs for setting & reading values from bluesky devices: `bps.mv()` and