diff --git a/docs/source/devices/configure.rst b/docs/source/devices/configure.rst
index ba16efcba32e33497ce095b7f977860ed1c9d9de..ffe21feeb9ca61d3e20d8de858dba0bad80396d2 100644
--- a/docs/source/devices/configure.rst
+++ b/docs/source/devices/configure.rst
@@ -4,7 +4,7 @@ Device Configuration
 The devices receive their configuration from two sources:
 
 - The TangoDB database, for static *properties*,
-- Externally, from the user, or a control system, that set *control attributes*.
+- Externally, from the user, or a control system, that set *control attributes* (see :doc:`devices` for what to set, and :ref:`attributes` for how to set them).
 
 .. _tangodb:
 
diff --git a/docs/source/devices/using.rst b/docs/source/devices/using.rst
index 824d56cff77ca303397af7db616e392f29ee426b..0fa4a3faa52f89e966de763c24024f1a3f96afb5 100644
--- a/docs/source/devices/using.rst
+++ b/docs/source/devices/using.rst
@@ -14,7 +14,7 @@ To access a device, one creates a ``Device`` object. For example::
 
     recv = Device("LTS/RECV/1")
 
-See :doc:`../control` on how and where to execute this code.
+See :doc:`../interfaces/control` on how and where to execute this code.
 
 States
 ------------
@@ -55,7 +55,9 @@ typically involves the following sequence of commands::
   # turn on the device
   device.on()
 
-Of course, the device could go into ``FAULT`` again, even during the ``initialise()`` command, for example because the hardware it manages is unreachable. To debug the fault condition, check the :doc:`../logs` of the device in question.
+Of course, the device could go into ``FAULT`` again, even during the ``initialise()`` command, for example because the hardware it manages is unreachable. To debug the fault condition, check the :doc:`../interfaces/logs` of the device in question.
+
+.. _attributes:
 
 Attributes
 ------------