diff --git a/docs/config_reference.rst b/docs/config_reference.rst
index 8489c67f26..3d0c3a5d11 100644
--- a/docs/config_reference.rst
+++ b/docs/config_reference.rst
@@ -552,7 +552,7 @@ ReFrame allows you to define custom scheduler resources for each partition that
 
    A resource specification may also start with ``#PREFIX``, in which case ``#PREFIX`` will replace the standard job script prefix of the backend scheduler of this partition.
    This is useful in cases of job schedulers like Slurm, that allow alternative prefixes for certain features.
-   An example is the `DataWarp <https://www.cray.com/datawarp>`__ functionality of Slurm which is supported by the ``#DW`` prefix.
+   An example is the `DataWarp <https://www.nersc.gov/assets/Uploads/dw-overview-overby.pdf>`__ functionality of Slurm which is supported by the ``#DW`` prefix.
    One could then define DataWarp related resources as follows:
 
    .. code:: python
diff --git a/docs/configure.rst b/docs/configure.rst
index 3585150fd9..3b1ff68b4e 100644
--- a/docs/configure.rst
+++ b/docs/configure.rst
@@ -418,8 +418,8 @@ Auto-detecting processor information
 .. _devices: config_reference.html#.systems[].partitions[].devices
 .. |processor| replace:: :attr:`processor`
 .. _processor: config_reference.html#.systems[].partitions[].processor
-.. |detect_remote_system_topology| replace:: :attr:`detect_remote_system_topology`
-.. _detect_remote_system_topology: config_reference.html#.general[].detect_remote_system_topology
+.. |detect_remote_system_topology| replace:: :attr:`remote_detect`
+.. _detect_remote_system_topology: config_reference.html#.general[].remote_detect
 
 ReFrame is able to detect the processor topology of both local and remote partitions automatically.
 The processor and device information are made available to the tests through the corresponding attributes of the :attr:`~reframe.core.pipeline.RegressionTest.current_partition` allowing a test to modify its behavior accordingly.
diff --git a/docs/index.rst b/docs/index.rst
index a2f9579007..68ce0b9863 100644
--- a/docs/index.rst
+++ b/docs/index.rst
@@ -27,7 +27,7 @@ Publications
 * Slides [`pdf <https://fosdem.org/2019/schedule/event/reframe/attachments/slides/3226/export/events/attachments/reframe/slides/3226/FOSDEM_2019.pdf>`__] & `Talk <https://fosdem.org/2019/schedule/event/reframe/>`__ @ `FOSDEM'19 <https://fosdem.org/2019/>`__.
 * Slides [`pdf <https://indico.cism.ucl.ac.be/event/4/contributions/24/attachments/30/62/ReFrame_EUM_2019.pdf>`__] @ `4th EasyBuild User Meeting <https://github.com/easybuilders/easybuild/wiki/4th-EasyBuild-User-Meeting>`__.
 * Slides [`pdf <https://drive.google.com/open?id=1bSykDrl1e2gPflf4jFJ8kfe_SZAtrJ_Q>`__] @ `HUST 2018 <https://sc18.supercomputing.org/>`__, SC'18.
-* Slides [`pdf <https://github.com/reframe-hpc/UserLabDay/blob/master/2018/slides/ci_and_regression/ReFrame_CI.pdf>`__] @ `CSCS User Lab Day 2018 <https://github.com/reframe-hpc/UserLabDay>`__.
+* Slides [`pdf <https://github.com/eth-cscs/UserLabDay/blob/master/2018/slides/ci_and_regression/ReFrame_CI.pdf>`__] @ `CSCS User Lab Day 2018 <https://github.com/eth-cscs/UserLabDay>`__.
 * Slides [`pdf <https://drive.google.com/open?id=1sZhibvUlGlT670aOHPdMlWFffWptYzLX>`__] @ `HPC Advisory Council 2018 <http://www.hpcadvisorycouncil.com/events/2018/swiss-workshop/>`__.
 * Slides [`pdf <https://drive.google.com/open?id=1EyJ-siupkgLeVT54A4WlFpQtrJaU0xOy>`__] @ `SC17 <https://sc17.supercomputing.org/>`__.
 * Slides [`pdf <https://drive.google.com/open?id=18VrCy0MTplGo67uxVbzYZicQChor9VSY>`__] @ `CUG 2017 <https://cug.org/cug-2017/>`__.
diff --git a/docs/tutorial_tips_tricks.rst b/docs/tutorial_tips_tricks.rst
index d3f3d39e97..cbc03ff842 100644
--- a/docs/tutorial_tips_tricks.rst
+++ b/docs/tutorial_tips_tricks.rst
@@ -52,7 +52,7 @@ As suggested by the warning message, passing :option:`-v` will give you the stac
 Debugging deferred expressions
 ==============================
 
-Although deferred expressions that are used in sanity and performance functions behave similarly to normal Python expressions, you need to understand their `implicit evaluation rules <deferrable_functions_reference.html#implicit-evaluation-of-sanity-functions>`__.
+Although deferred expressions that are used in sanity and performance functions behave similarly to normal Python expressions, you need to understand their `implicit evaluation rules <deferrable_functions_reference.html#implicit-evaluation-of-deferrable-functions>`__.
 One of the rules is that :func:`str` triggers the implicit evaluation, so trying to use the standard :func:`print` function with a deferred expression, you might get unexpected results if that expression is not yet to be evaluated.
 For this reason, ReFrame offers a sanity function counterpart of :func:`print`, which allows you to safely print deferred expressions.
 
diff --git a/hpctestlib/interactive/jupyter/ipcmagic/__init__.py b/hpctestlib/interactive/jupyter/ipcmagic/__init__.py
index 9bb961a03f..5eab750727 100644
--- a/hpctestlib/interactive/jupyter/ipcmagic/__init__.py
+++ b/hpctestlib/interactive/jupyter/ipcmagic/__init__.py
@@ -16,7 +16,7 @@ class ipcmagic_check(rfm.RunOnlyRegressionTest, pin_prefix=True):
     `ipcmagic <https://github.com/eth-cscs/ipcluster_magic>`__ is a Python
     package and collection of CLI scripts for controlling clusters for
     Jupyter. For more information, please have a look
-    `here <https://user.cscs.ch/tools/interactive/jupyterlab/#ipython>`__.
+    `here <https://user.cscs.ch/tools/interactive/jupyterlab/>`__.
 
     This test checks the ipcmagic performance.
     To do this, a single-layer neural network is trained against a noisy linear
diff --git a/reframe/core/pipeline.py b/reframe/core/pipeline.py
index 2a0782eb9f..5a8c617f56 100644
--- a/reframe/core/pipeline.py
+++ b/reframe/core/pipeline.py
@@ -775,9 +775,10 @@ def pipeline_hooks(cls):
     #: Time limit for this test.
     #:
     #: Time limit is specified as a string in the form
-    #: ``<days>d<hours>h<minutes>m<seconds>s`` or as number of seconds.
-    #: If set to :class:`None`, the |time_limit|_
-    #: of the current system partition will be used.
+    #: ``<days>d<hours>h<minutes>m<seconds>s`` or as number of seconds. If set
+    #: to :class:`None`, the
+    #: :attr:`~reframe.core.systems.SystemPartition.time_limit` of the current
+    #: system partition will be used.
     #:
     #: :type: :class:`str` or :class:`float` or :class:`int`
     #: :default: :class:`None`
@@ -798,9 +799,6 @@ def pipeline_hooks(cls):
     #:    .. versionchanged:: 3.5.1
     #:       The default value is now :class:`None` and it can be set globally
     #:       per partition via the configuration.
-    #:
-    #:    .. |time_limit| replace:: :attr:`time_limit`
-    #:    .. _time_limit: #.systems[].partitions[].time_limit
     time_limit = variable(type(None), field=fields.TimerField,
                           value=None, loggable=True)
 
diff --git a/reframe/utility/__init__.py b/reframe/utility/__init__.py
index 5515ceb56b..df670933c5 100644
--- a/reframe/utility/__init__.py
+++ b/reframe/utility/__init__.py
@@ -542,7 +542,7 @@ def shortest(*iterables):
     :arg iterables: The iterables to check.
     :returns: The shortest iterable.
 
-    .. _Sized: https://docs.python.org/3/library/collections.abc.html#collections.abc.Sized # noqa: E501
+    .. _Sized: https://bit.ly/3QqJlmw
     .. |Sized| replace:: :class:`Sized`
     '''