diff --git a/README.md b/README.md
index aa0daaa8a649e3ccfd0cbbef10251fd2cbbde65a..10e3f87ce4bb080c2c113c454e94538db2655448 100644
--- a/README.md
+++ b/README.md
@@ -65,6 +65,9 @@ Here are some noteworthy sections:
   [Slides](http://events.linuxfoundation.org/sites/events/files/slides/ELC16_LISA_20160326.pdf)
   and [Video](https://www.youtube.com/watch?v=yXZzzUEngiU)
 
+  Note: the LISA classes referred by the slides are outdated, but all the other
+  concepts and the overall architecture stays the same. 
+
 # License
 
 This project is licensed under Apache-2.0.
diff --git a/doc/lisa_shell/man/man.rst b/doc/lisa_shell/man/man.rst
index 4a03975a2bb7b34e12034dc6d2a596153ab7336e..82b243902a35d39a5f37f5a03021249a7cce7d55 100644
--- a/doc/lisa_shell/man/man.rst
+++ b/doc/lisa_shell/man/man.rst
@@ -9,6 +9,8 @@ Once you have all of the required dependencies installed, you can use the LISA
 shell, which provides a convenient set of commands for easy access to many LISA
 related functions, scripts and environment variables.
 
+For more details, see
+`<https://lisa-linux-integrated-system-analysis.readthedocs.io/en/master/>`_
 
 ACTIVATION
 ++++++++++
@@ -34,9 +36,8 @@ Most LISA Shell commands start with ``lisa-``, thus using shell completion it
 is easy to get a list of all the available commands.
 
 Here is the documentation of the simple ones, more complex scripts have
-integrated ``--help`` documentation sections [#]_, or man pages.
-
-.. [#] `<https://lisa-linux-integrated-system-analysis.readthedocs.io/en/master/>`_
+integrated ``--help`` documentation, a section in the online documentation, or
+man pages.
 
 Maintenance commands
 --------------------
diff --git a/doc/man1/lisa.1 b/doc/man1/lisa.1
index ef6e63957adbb889afc133be030756de5b1573f3..02d4f55d035077efd05ed41e14bb43c0d9f09288 100644
--- a/doc/man1/lisa.1
+++ b/doc/man1/lisa.1
@@ -35,6 +35,9 @@ level margin: \\n[rst2man-indent\\n[rst2man-indent-level]]
 Once you have all of the required dependencies installed, you can use the LISA
 shell, which provides a convenient set of commands for easy access to many LISA
 related functions, scripts and environment variables.
+.sp
+For more details, see
+\fI\%https://lisa\-linux\-integrated\-system\-analysis.readthedocs.io/en/master/\fP
 .SH ACTIVATION
 .sp
 In order to use the shell, source the script:
@@ -69,9 +72,8 @@ Most LISA Shell commands start with \fBlisa\-\fP, thus using shell completion it
 is easy to get a list of all the available commands.
 .sp
 Here is the documentation of the simple ones, more complex scripts have
-integrated \fB\-\-help\fP documentation sections [1], or man pages.
-.IP [1] 5
-\fI\%https://lisa\-linux\-integrated\-system\-analysis.readthedocs.io/en/master/\fP
+integrated \fB\-\-help\fP documentation, a section in the online documentation, or
+man pages.
 .SS Maintenance commands
 .INDENT 0.0
 .IP \(bu 2