diff --git a/docs/distributions/c8.md b/docs/distributions/c8.md
new file mode 100644
index 0000000000000000000000000000000000000000..d799db7752a82b5667ba79e911d6e643b0efe0c8
--- /dev/null
+++ b/docs/distributions/c8.md
@@ -0,0 +1,7 @@
+# CentOS 8
+
+Although not released yet officially at CERN, it will be soon the recommended release, so you can already test it. More details:
+
+<http://linux.web.cern.ch/linux/centos8/>
+
+We will update this page in due time.
diff --git a/docs/distributions/cc7.md b/docs/distributions/cc7.md
index 3f0edb1f88d0983cadc058ebc2b1fa9ba2c4e5a7..c8dc5be59b00683c623444247482ef6c8238008a 100644
--- a/docs/distributions/cc7.md
+++ b/docs/distributions/cc7.md
@@ -2,17 +2,15 @@
 
 ## A bit of history
 
-CERN CentOS 7 was released in 2014 and will be supported until at least July 2024.
+CERN CentOS 7 was released in 2014 and will be supported until July 2024.
 
 > CERN Community ENTerprise Operating System 7 is the upstream CentOS 7, built to integrate into the CERN computing environment but it is not a site-specific product: all CERN site customisations are optional and can be deactivated for external users.
 
 In 2015, CERN began migrating away from the Scientific Linux collaboration to provide the next version (RHEL 7 rebuild).
 
-For more details please check [Next Linux version @ CERN](http://linux.web.ncern.ch/linux/nextversion.shtml).
-
 ## Default repositories
 
-Each Red Hat based distribution is shipped with few default repositories.
+Each Red Hat based distribution is shipped with a few default repositories.
 
 At CERN you can list them with:
 
@@ -38,7 +36,7 @@ Additional `-release` rpm packages can be searched with `yum search release`.
 !!! Note ""
     Please note that on a puppet managed node the repositories are managed by the `osrepos` module, and repo files stored in an alternative directory `/etc/yum-puppet.repos.d/`.
 
-Details about the CERN specific repositories.
+Details about the CERN specific repositories:
 
 ### The `cernonly` repository
 
diff --git a/docs/distributions/slc6.md b/docs/distributions/slc6.md
index 783d1c757c20cde6809ff6b3ceba287b97308191..19f255a98202eab9b6951997cd61d360e331d694 100644
--- a/docs/distributions/slc6.md
+++ b/docs/distributions/slc6.md
@@ -1,5 +1,8 @@
 # Scientific Linux CERN 6
 
+!!! danger ""
+    If you are about to start using Linux at CERN, please do not start with SLC6, as its EOL (End Of Life) is forecasted later this year. If you are new, please start straight away with [CC7](cc7.md). For more info: [OTG0054345](https://cern.service-now.com/service-portal/view-outage.do?n=OTG0054345)
+
 ## A bit of history
 
 Scientific Linux CERN 6 was released in 2010 and will be supported until at least Decembrer 2020.
@@ -34,7 +37,7 @@ Additional `-release` rpm packages can be found with `yum search release`. On SL
 
 > Please note that on a puppet managed node the repositories are managed by the `osrepos` module, and repo files stored in an alternative directory `/etc/yum-puppet.repos.d/`.
 
-Some details regarding CERN specific repositories.
+Some details regarding CERN specific repositories:
 
 ### The `cernonly` repository
 
diff --git a/docs/distributions/supported.md b/docs/distributions/supported.md
index 33a844c35aa03474201e3b50d79cf9d2be62b11d..77bce2024d5dbd9b43abb8a7631e8e2b1f05eaa7 100644
--- a/docs/distributions/supported.md
+++ b/docs/distributions/supported.md
@@ -2,10 +2,14 @@
 
 At CERN, two distributions are supported:
 
-* Scientific Linux CERN 6
 * CERN CentOS 7
+* Scientific Linux CERN 6 (Support ending November 2020)
 
-Scientific Linux and CentOS are derived from Red Hat Enterprise Linux(RHEL), with Red Hat trademarks removed, thus making it freely available.
+And one is coming soon (Q2 2020):
+
+* CentOS 8
+
+Scientific Linux and CentOS are derived from Red Hat Enterprise Linux (RHEL), with Red Hat trademarks removed, thus making it freely available.
 Scientific Linux and CentOS deovelopers use Red Hat's source code to create a final product similar to RHEL.
 
 The distribution content is provided by Red Hat, no update to any existing package is provided by CERN.
diff --git a/docs/index.md b/docs/index.md
index d91516967ebe01cb5b02b84803076d3e314b5fc5..d38179c1f98d91bbbec54c2106a5d2ee10f90654 100644
--- a/docs/index.md
+++ b/docs/index.md
@@ -1,6 +1,6 @@
 # Linux survival kit guide
 
-Today, the CERN Linux Support team is responsible for over 50,000 (~35,000 in the Data Centre and ~15,000 across the HEP community and user devices).
+Today, the CERN Linux Support team is responsible for over 50,000 devices (~35,000 in the Data Centre and ~15,000 across the HEP community and user devices).
 
 Maintaining such a large number of devices and providing support is a challenge: hence the need for an end-user training is very important.
 This training has been designed to give an overview of Linux services and also give users an overview of the different technologies provided by the IT Department.
@@ -9,15 +9,26 @@ Finally, users will get a better understanding about our choices around the supp
 
 A number of links to more specific CERN trainings will be given when necessary.
 
-The latest version of the training material will always be found at https://cern.ch/linuxtraining/
-
-Slides for the on site training can be found at https://cern.ch/linuxtraining/slides/. Please note that those slides are not needed to follow this guide by yourself.
+The latest version of the training material will always be found at <https://cern.ch/linuxtraining/>
 
 ## What this guide will not do
 
 * This guide will not mention unsupported distributions. It will focus on the newest supported version at CERN: i.e. _CERN CentOS 7_.
+
+* This guide is not an introduction to Linux. It is focused of CERN-related features (packages, repositories, filesystems, etc.). If you are new to Linux, you might want to check some of the courses available through the LMS course [UDEMY for CERN](https://lms.cern.ch/ekp/servlet/ekp?PX=N&TEACHREVIEW=N&PTX=&CID=EKP000043153&TX=FORMAT1&LANGUAGE_TAG=en&DECORATEPAGE=N), such as:
+
+    For absolute beginners:
+
+    * Linux Mastery: Master the Linux Command Line in 11.5 Hours
+    * Learning Linux Essentials: Taking your first steps in Linux
+
+    For more experienced users:
+
+    * CentOS 7 Linux Server: Alternative to Red Hat Enterprise
+    * Linux Academy Red Hat Certified Engineer Prep
+
+
 * This guide will not explain how to manage machines or services in the datacentre, please check:
-    * The Official training [Tools for IT Service Managers: Getting started](https://lms.cern.ch/ekp/servlet/ekp?PX=N&TEACHREVIEW=N&PTX=&CID=EKP000041103&TX=FORMAT1&LANGUAGE_TAG=en&DECORATEPAGE=N)
     * <https://cern.ch/clouddocs/>
     * <https://cern.ch/configtraining/>
 
@@ -29,7 +40,7 @@ To learn more about the Linux kernel and detailed software packages, please chec
 
 ## Changelog and updates
 
-* Version 2.0 (September 2019)
+* Version 2.0 (February 2020)
   General revision and migration to mkdocs
 
 * Version 1.0 (November 2018)
diff --git a/docs/introduction/permissions.md b/docs/introduction/permissions.md
index 53ae124223b7519a4b8509cbd974bb6493be0839..79841fc6da0c283d3b56b98770564f6ef820fb0e 100644
--- a/docs/introduction/permissions.md
+++ b/docs/introduction/permissions.md
@@ -26,3 +26,5 @@ Open <https://openstack.cern.ch>
 ## Try to login to the CERNBOX dashboard
 
 Open <https://cernbox.cern.ch>
+
+If you can access these three resources without any issue, you are good to go!
diff --git a/docs/linux/aims2.md b/docs/linux/aims2.md
index 0d4eb84cb9a46406579a4fa42acb6a316500c96c..e61f5e52936a198b8f8ffb1f00ae79ea86a28e22 100644
--- a/docs/linux/aims2.md
+++ b/docs/linux/aims2.md
@@ -2,44 +2,39 @@
 
 ## Introduction
 
-aims2client is the client-side software for communicating with the Linux Automated Installation Management Service (AIMS2). The client is designed to allow you to register and de-register hosts for PXE installation. You can use the client to register your Kickstart file, Anaconda/Kernel append options and the pxeboot target you wish to use for your installation.
+`aims2client` is the client-side software for communicating with the Linux Automated Installation Management Service (AIMS2). The client is designed to allow you to register and de-register hosts for PXE installation. You can use the client to register your Kickstart file, Anaconda/Kernel append options and the pxeboot target you wish to use for your installation.
 
-The aims2 client also allows you to interact with the pxeboot media library displaying information about already uploaded images or uploading your own pxeboot media.
+The `aims2client` also allows you to interact with the pxeboot media library displaying information about already uploaded images or uploading your own pxeboot media.
 
 ## Quickstart aims2client
 
-Please check the manpage for advanced usage.
+Please check the manpage (`man aims2client`) for advanced usage.
 
 The [installation documentation](http://linux.web.cern.ch/linux/install/#aims) will guide you in details.
 
 ### List available images
 
-{% shell %}
-{% prompt "host ", delimiter="$ ", path="~ " %}
-{% command %}
-aims2client showimg \*
-{% info %}
+```
+# aims2client showimg \*
+[...]
 CC72_X86_64                   ,x86_64 ,N   ,CERN CENTOS 7.2 X86_64
 CC73_X86_64                   ,x86_64 ,Y   ,CERN CENTOS 7.3 X86_64
 CC74_X86_64                   ,x86_64 ,Y   ,CERN CENTOS 7.4 X86_64
 CC7_X86_64                    ,x86_64 ,Y   ,CERN CENTOS 7 X86_64 (LATEST)
-...
+[...]
 RHEL_7_3_X86_64               ,x86_64 ,Y   ,RHEL 7 SERVER UPDATE 3 FOR X86_64
 RHEL_7_4_X86_64               ,x86_64 ,Y   ,RHEL 7 SERVER UPDATE 4 FOR X86_64
-...
+[...]
 SLC69_I386                    ,i386   ,N   ,SCIENTIFIC LINUX CERN 6.9 FOR I386 ARCH
 SLC69_X86_64                  ,x86_64 ,Y   ,SCIENTIFIC LINUX CERN 6.9 FOR X86_64 ARCH
 SLC6X_I386                    ,i386   ,N   ,SCIENTIFIC LINUX CERN 6 LATEST FOR I386 ARCH.
-
-{% endshell %}
+[...]
+```
 
 ### View image details
 
-{% shell %}
-{% prompt "host ", delimiter="$ ", path="~ " %}
-{% command %}
+```
 aims2client showimg CC7_X86_64 --all
-{% info %}
 -------------------------------------------------------------------------------
 Image NAME:                CC7_X86_64
 Architecture:              x86_64
@@ -57,23 +52,19 @@ Image OWNER:               toulevey
 Image uploaded at:         2017/11/09 09:40:48
 Synchronized:              Y
 -------------------------------------------------------------------------------
-{% endshell %}
+```
 
 ### Add a host and install latest CC7
 
-{% shell %}
-{% prompt "host ", delimiter="$ ", path="~ " %}
-{% command %}
+Say you want to configure kost `berries01` to boot automatically and be configured with a kickstart file `myfruit.ks`. You would achieve so by doing:
+
+```
 aims2 addhost berries01 --kickstart myfruit.ks
-{% info %}
-{% endshell %}
+```
 
-{% shell %}
-{% prompt "host ", delimiter="$ ", path="~ " %}
-{% command %}
+And setting the Operating System to `CC7_X86_64` as we saw this image (CERN CentOS 7)  was uploaded to AIMS with this name:
+```
 aims2 pxeon berries01 CC7_X86_64
-{% info %}
-{% endshell %}
-
+```
 
-Please note that you kickstart need to contain a [snippet](http://linux.web.cern.ch/linux/centos7/docs/kickstart-example.ks) to deregister the host, so your installation will not loop.
+Please note that you kickstart needs to contain a [snippet](http://linux.web.cern.ch/linux/centos7/docs/kickstart-example.ks) to deregister the host, so your installation will not loop.
diff --git a/docs/linux/doc.md b/docs/linux/doc.md
index a00d2e81d86bd674bea05b975208c8e2f0c2145a..fd478ace5f6fa84542f207d4c9952610fd14dfc3 100644
--- a/docs/linux/doc.md
+++ b/docs/linux/doc.md
@@ -10,6 +10,7 @@ It contains up-to-date information about the lifecycle of distributions at CERN
 
  * [SLC6 (Scientific Linux CERN 6)](https://linux.web.cern.ch/linux/scientific6/)
  * [CC7 (CERN CentOS 7)](https://linux.web.cern.ch/linux/centos7/)
+ * [C8 (CentOS 8)](https://linux.web.cern.ch/linux/centos8/)
 
 [Weekly updates](https://linux.web.cern.ch/linux/) are documented with links to relevant Red Hat reports if available.
 
@@ -21,9 +22,10 @@ Red Hat provides documentation for every released product :
 
  * [RHEL6](https://access.redhat.com/documentation/en-us/red_hat_enterprise_linux/6/)
  * [RHEL7](https://access.redhat.com/documentation/en-us/red_hat_enterprise_linux/7/)
+ * [RHEL8](https://access.redhat.com/documentation/en-us/red_hat_enterprise_linux/8/)
 
 The Red Hat documentation is very useful to deep dive in specific parts of the system and is very well organised around topics (Installation, System administration, tuning, etc...)
 
 ## Linux support tools / open source tools
 
-All published work is available under our Gitlab organisation: <https://gitlab.cern.ch/linuxsupport>
+All published work is available under our Gitlab organisation: <https://gitlab.cern.ch/linuxsupport>. Do not hesitate to contribute.
diff --git a/docs/linux/install.md b/docs/linux/install.md
index 60d998f67b494c4370290b67de9c69dafb85da75..ef0da6431f6b9164ed8fc150966ab6b261fe0362 100644
--- a/docs/linux/install.md
+++ b/docs/linux/install.md
@@ -1,10 +1,8 @@
 # Installation at CERN
 
-In a first time with the default installation menu, and then unattended with the help of a kickstart and aims2 tool.
-
 ## Network database
 
-To be able to install and use a system at CERN you need to first register it in the network database, also called LanDB.
+To be able to install and use a system at CERN you need to first register it in the network database, also called LanDB:
 
 Open <https://network.cern.ch>
 
@@ -20,4 +18,4 @@ In this section a CC7 installation will be performed from the network following
 
 ## Kickstart CC7 installation
 
-Next section will guide through aims2 and a unattended kickstart installation of a VM.
+Next section will guide through aims2 and a unattended kickstart installation of a VM. This is a more advanced usecase and requires understanding of tools such as Anaconda Kickstart, PXE booting, etc.
diff --git a/docs/linux/kerberos.md b/docs/linux/kerberos.md
index e69de29bb2d1d6434b8b29ae775ad8c2e48c5391..38f2910d8769adfb787b601426570c4de0d1c790 100644
--- a/docs/linux/kerberos.md
+++ b/docs/linux/kerberos.md
@@ -0,0 +1,3 @@
+# Kerberos
+
+Please check <http://linux.web.cern.ch/linux/docs/kerberos-access.shtml>
diff --git a/docs/linux/kickstart.md b/docs/linux/kickstart.md
index 4e79843bce76ef76c22e9ba643b9f6a82ec00035..8d1b1e9411fe6f2a7379551f216f5d3f1667e736 100644
--- a/docs/linux/kickstart.md
+++ b/docs/linux/kickstart.md
@@ -1,33 +1,26 @@
 # What is a kickstart ?
 
-kickstart is the default method to run unattended installations for Red Hat Entreprise linux and derivatives.
+Kickstart is the default method to run unattended installations for Red Hat Entreprise linux and derivatives.
+
+!!! note "From RHEL documentation:"
+    Using kickstart, a system administrator can create a single file containing the answers to all the questions that would normally be asked during a typical installation.
 
 Let's install an additional tool:
 
-{% shell %}
-{% prompt "host ", delimiter="# ", path="~ " %}
-{% command %}
+```
 yum install pykickstart
-{% info %}
-{% endshell %}
+```
 
 After installing the package, you can validate a Kickstart file using the following command:
 
-{% shell %}
-{% prompt "host ", delimiter="$ ", path="~ " %}
-{% command %}
+```
 ksvalidator /path/to/kickstart.ks
-{% info %}
-{% endshell %}
-
+```
 
-Let review the default CC7 [kickstart](http://linux.web.cern.ch/linux/centos7/docs/kickstart-example.ks):
+The default CC7 [kickstart](http://linux.web.cern.ch/linux/centos7/docs/kickstart-example.ks):
 
-{% shell %}
-{% prompt "host ", delimiter="$ ", path="~ " %}
-{% command %}
+```
 cat /path/to/kickstart.ks
-{% info %}
 ##############################################################################
 #
 # Example KickStart file for CC7 installations
@@ -210,7 +203,6 @@ shost=`/bin/hostname -s`
 exit 0
 
 %end
-{% endshell %}
-
+```
 
 Default SLC6 kickstart can be found [here](http://linux.web.cern.ch/linux/scientific6/docs/kickstart-example.ks).
diff --git a/docs/linux/licenses.md b/docs/linux/licenses.md
index edac5d2b28e6cc4eb2c11334c063d8fdd111df3a..903fd8e521980bb67ae719135dc72ea17705534f 100644
--- a/docs/linux/licenses.md
+++ b/docs/linux/licenses.md
@@ -2,12 +2,12 @@
 
 ## Red Hat Entreprise Linux
 
-Official webiste: http://linux.web.cern.ch/linux/rhel/
+Official webiste: <http://linux.web.cern.ch/linux/rhel/>
 
 For offical usage with applications requiring commercial support, CERN purchased a limited number of Red Hat Enterprise Linux Server licenses.
 
 A license must be requested through this [SNOW form](https://cern.service-now.com/service-portal/report-ticket.do?name=general-request-Linux&se=linux-desktop).
 
-Registered systems holding valid Red Hat Enterprise Linux license can be installed using same methods as CC7/SLC6.
+Registered systems holding valid Red Hat Enterprise Linux license can be installed using the same methods as CC7/SLC6.
 
-Red Hat Entreprise Linux repositories are also mirrored internally and a .repo file need to be copied after the installation.
+Red Hat Entreprise Linux repositories are also mirrored internally and a `.repo` file needs to be copied after the installation.
diff --git a/docs/linux/locmap.md b/docs/linux/locmap.md
index a61af729ab168ed4fd2e0c5cb97b6e7668da510a..b539ad463837b2c65dc0f5d0216d704ca64861b7 100644
--- a/docs/linux/locmap.md
+++ b/docs/linux/locmap.md
@@ -1,20 +1,15 @@
-# Configuring CERN machine
+# Configuring a CERN machine
 
 ## CC7
 
-`locmap` (Local Configuration with Masterless Puppet) helps to configure your machine with Linux support puppet modules.
-
-`locmap` is installed by default.
+A tool called `locmap` (Local Configuration with Masterless Puppet) helps to configure your machine with Linux support puppet modules and is installed by default with the CERN supported distributions.
 
 ### Usage
 
 #### Show information about your machine and associated users
 
-{% shell %}
-{% prompt "host ", delimiter="# ", path="~ " %}
-{% command %}
-locmap --info
-{% info %}
+```
+$ locmap --info
 --------------
 Configuration:
 --------------
@@ -50,16 +45,14 @@ cern_domain:default
 Users:
 ------
  toulevey     IT-CM-LCS      Primary    31  thomas.oulevey@cern.ch
-
-{% endshell %}
+```
 
 #### List available modules:
 
-{% shell %}
-{% prompt "host ", delimiter="# ", path="~ " %}
-{% command %}
-locmap --list
-{% info %}
+Here you can see all the different modules you can have configured by locmap. For instance, `afs` and `eosclient` will configure the AFS and EOS filesystems so that you can access them from your machine:
+
+```
+$ locmap --list
 [Available Modules]
 afs            [ enabled]
 cernbox        [ enabled]
@@ -72,30 +65,30 @@ ntp            [ enabled]
 sendmail       [ enabled]
 ssh            [ enabled]
 sudo           [ enabled]
-{% endshell %}
-
-#### Enable and configure module
+```
 
-{% shell %}
-{% prompt "host ", delimiter="# ", path="~ " %}
-{% command %}
-locmap --enable afs
-{% info %}
+#### Enable and configure a module
 
+```
+$ locmap --enable afs
 [INFO] module afs enabled.
+```
 
-{% endshell %}
-
-{% shell %}
-{% prompt "host ", delimiter="# ", path="~ " %}
-{% command %}
-locmap --configure afs
-{% info %}
+Once enabled, we are able to actually configure AFS in our machine:
+```
+$ locmap --configure afs
 [INFO    ] Please wait while your system is being configured...
 [INFO    ] The run succeeded with no changes or failures; the system was already in the desired state.
-{% endshell %}
+```
+
+You can check it by listing the contents of your personal folder:
 
-## SLC6 (SLC5)
+```
+ls /afs/cern.ch/user/u/username/
+```
+(NOTE: Substitute the u for the initial of your username, and username for your actual username)
+
+## SLC6 (deprecated in November 2020)
 
 `lcm` (Local Configuration Manager) is the equivalent of `locmap` on SLC6. It is using Quattor components to configure machines.
 
@@ -105,11 +98,8 @@ locmap --configure afs
 
 #### List available components:
 
-{% shell %}
-{% prompt "host ", delimiter="# ", path="~ " %}
-{% command %}
-lcm --list
-{% info %}
+```
+$ lcm --list
 
 [INFO] LCM version 0.6 started by root at: Mon Nov 12 11:58:03 2018
 
@@ -126,15 +116,12 @@ afsclt:        yes
 ntpd:          yes
 ocsagent:      yes
 krb5clt:       yes
-{% endshell %}
+```
 
-#### Configure one of the component
+#### Configure one of the components
 
-{% shell %}
-{% prompt "host ", delimiter="# ", path="~ " %}
-{% command %}
-lcm --configure ntpd
-{% info %}
+```
+$ lcm --configure ntpd
 [INFO] LCM version 0.6 started by root at: Mon Nov 12 12:01:51 2018
 
 [INFO] NCM-NCD version 1.2.23 started by root at: Mon Nov 12 12:01:51 2018
@@ -148,5 +135,4 @@ lcm --configure ntpd
 =========================================================
 
 [OK]   0 errors, 0 warnings executing configure
-{% endshell %}
-
+```
diff --git a/docs/linux/support.md b/docs/linux/support.md
index 9d354a5ccf2f51fde15678c3e84767bf132e8682..9b7b0cee83b77c354976013b627131a06a90e589 100644
--- a/docs/linux/support.md
+++ b/docs/linux/support.md
@@ -5,35 +5,27 @@
 Please have the following information available:
 
   * Hostname of the machine
-  * Running kernel `uname -a`
+  * Running kernel (you can obtain it running `uname -a`)
   * A specific problem description and its severity, that is, its impact on your operations
   * Additional relevant information about the affected systems: attach logs and error messages.
+  * It is not unlikely that Linux Support will ask you to get access to the machine, in that case:
 
 ## Grant access to the support team
 
 At CERN, a tool exists to give temporary access to your machine to the support staff.
 
-{% shell %}
-{% prompt "host ", delimiter="# ", path="~ " %}
-{% command %}
+```
 yum install cern-linuxsupport-access
-{% info %}
-{% endshell %}
+```
 
 Enable access:
 
-{% shell %}
-{% prompt "host ", delimiter="# ", path="~ " %}
-{% command %}
-/usr/sbin/cern-linuxsupport-access enable
-{% info %}
-{% endshell %}
+```
+cern-linuxsupport-access enable
+```
 
 Disable access:
 
-{% shell %}
-{% prompt "host ", delimiter="# ", path="~ " %}
-{% command %}
-/usr/sbin/cern-linuxsupport-access disable
-{% info %}
-{% endshell %}
+```
+cern-linuxsupport-access disable
+```
diff --git a/docs/lxplus/introduction.md b/docs/lxplus/introduction.md
index d3aa08c6684bb48e39de3e5183e454ab0e10e186..f7c275e07764a772ae01ad853cc9aee046439314 100644
--- a/docs/lxplus/introduction.md
+++ b/docs/lxplus/introduction.md
@@ -13,9 +13,15 @@ It will be used extensively during this course.
 
 ## Lxplus access
 
-### From linux
+### From Linux
 
-Most Linux distributions have an ssh client installed.
+Most Linux distributions have an SSH client installed.
+
+    ssh yourlogin@lxplus.cern.ch
+
+### From Mac
+
+Mac has a native SSH client included in the Terminal, so just open it and:
 
     ssh yourlogin@lxplus.cern.ch
 
diff --git a/docs/others/faq.md b/docs/others/faq.md
index 198112e17424679a51b42239a3937d181f314f3b..242c328ddc5f74750fe108f5cffea67330a5ae88 100644
--- a/docs/others/faq.md
+++ b/docs/others/faq.md
@@ -2,21 +2,22 @@
 
 ## Can you upgrade package X to version Y.Z ?
 
-As mentioned in the introduction, Scientific Linux and CentOS are a rebuild made from Red Hat Entreprise Linux.
-We therefore do not upgrade package with our own.
-If your package does not exists at all in the offering, we could propose it upstream to EPEL, or in our internal CERN/CERNONLY repository.
+As mentioned in the introduction, `Scientific Linux` and `CentOS` are rebuilds made from Red Hat Entreprise Linux.
+We therefore do not upgrade packages on our own.
+If your package does not exist in the CERN offering, we could propose it upstream to EPEL, or include it in our internal CERN/CERNONLY repository.
 You can contact us for further information.
 
-## Why should I mirror my software repository on linuxsoft and not use company X repository ?
+## Why should I mirror my software repository on `linuxsoft` and not use `company X` repository ?
 
-Some company may not exist in 5 years. Many machines at CERN do not have and should not have full Internet access.
-By requesting a mirror, you make sure your deployement will be consitent even if a repository disapear.
+A random company may not exist in 5 years.
+Many machines at CERN do not have and should not have full Internet access.
+By requesting a mirror, you make sure your deployement will be consitent even if a repository disappears.
 
 ## The version of package X.Y-Z is vulnerable to a security issue.
 
-Please note that Red Hat backports security fixes on older version, so the package NAME-VERSION-RELEASE is not relevant.
-A better way to check if a CVE has been fixed is to use `rpm -q --changelog <package>` and read/ grep the content.
+Please note that Red Hat backports security fixes on older versions, so the package NAME-VERSION-RELEASE is not relevant.
+A better way to check if a CVE has been fixed is to use `rpm -q --changelog <package>` and read/grep the content.
 
 ## Why not switching to ubuntu/arch/gentoo/alpine/mint/elementary/fedora/tails/openSUSE ?
 
-Red Hat derived distributions are the official WLCG distributions and by their longer lifecycle (> 10 years) allow Linux support to provide a effective support to scientists for a full LHC run.
+Red Hat derived distributions are the official WLCG distributions and having a long lifecycle (> 10 years) allows Linux Support to provide a effective support to scientists for a full LHC run.
diff --git a/docs/pkg/rpm.md b/docs/pkg/rpm.md
index f4cc7dd7676e5c7df2d59129d09d9b2af16b4427..65615a49466c26149b3c5cb09417c4cb01a997c1 100644
--- a/docs/pkg/rpm.md
+++ b/docs/pkg/rpm.md
@@ -1,21 +1,28 @@
 # Red Hat Package Manager (RPM)
 
+RPM is a free an open-source package management system. Check [Wikipedia](https://en.wikipedia.org/wiki/RPM_Package_Manager) for a longer description.
+
 ## Query
 
-Query all installed packages on your system
-{% shell %}
-{% prompt "host ", delimiter="# ", path="~ " %}
-{% command %}
-rpm -qa
-{% info %}
-{% endshell %}
-
-Show installed package information
-{% shell %}
-{% prompt "host ", delimiter="# ", path="~ " %}
-{% command %}
+Query all installed packages on your system:
+
+```
+$ rpm -qa
+```
+
+You might want to grep for a certain string (e.g. "openstack" in this case) to get all related packages:
+
+```
+$ rpm -qa | grep openstack
+python2-openstacksdk-0.36.1-1.el7.noarch
+python-openstackclient-lang-4.0.0-1.el7.noarch
+python2-openstackclient-4.0.0-1.el7.noarch
+```
+
+In order to show information regarding an installed package:
+
+```
 rpm -qi iptables
-{% info %}
 Name        : iptables
 Version     : 1.4.21
 Release     : 24.1.el7_5
@@ -37,37 +44,28 @@ Description :
 The iptables utility controls the network packet filtering code in the
 Linux kernel. If you need to set up firewalls and/or IP masquerading,
 you should install this package.
-{% endshell %}
-
-Check installed kernel versions
-{% shell %}
-{% prompt "host ", delimiter="# ", path="~ " %}
-{% command %}
-rpm -q kernel
-{% info %}
+```
+
+Check installed kernel versions:
+```
+$ rpm -q kernel
 kernel-3.10.0-862.11.6.el7.x86_64
 kernel-3.10.0-862.14.4.el7.x86_64
-{% endshell %}
-
-Check if a file is part of a package
-{% shell %}
-{% prompt "host ", delimiter="# ", path="~ " %}
-{% command %}
-rpm -qf /etc/sysconfig/
-{% info %}
+```
+
+Check if a file is part of a package:
+```
+$ rpm -qf /etc/sysconfig/
 iptables-1.4.21-24.1.el7_5.x86_64
-{% endshell %}
+```
 
 ## Verify
 
 Verifying a package compares information about the installed files in the package with information about the
 files taken from the package metadata stored in the rpm database.
 
-{% shell %}
-{% prompt "host ", delimiter="# ", path="~ " %}
-{% command %}
-rpm -V iptables
-{% info %}
+```
+$rpm -V iptables
 ..?......  c /etc/sysconfig/ip6tables-config
 ..?......  c /etc/sysconfig/iptables-config
 
@@ -81,24 +79,18 @@ Help:
     G Group ownership differs
     T mTime differs
     P caPabilities differ
-    (? in any position : couldn't check)
-{% endshell %}
+```
+
+This might be useful, for instance, if you want to check whether you have modified some of the default files installed along a package.
 
 ## Install a single package
 
-{% shell %}
-{% prompt "host ", delimiter="# ", path="~ " %}
-{% command %}
+```
 rpm -i myrpm.rpm
-{% info %}
-{% endshell %}
+```
 
 ## Remove a single package
 
-{% shell %}
-{% prompt "host ", delimiter="# ", path="~ " %}
-{% command %}
+```
 rpm -e myrpm
-{% info %}
-{% endshell %}
-
+```
diff --git a/docs/pkg/tools.md b/docs/pkg/tools.md
index 19cc935291bfbc8b60e33f96324cd8dbc7f1fb12..964b47bb4c62eea336c45a3d9cbfcb453ab95fb9 100644
--- a/docs/pkg/tools.md
+++ b/docs/pkg/tools.md
@@ -2,68 +2,50 @@
 
 ## yumdowloader
 
-`yumdownloader` is part of yum-utils package
-{% shell %}
-{% prompt "host ", delimiter="# ", path="~ " %}
-{% command %}
+`yumdownloader` is part of the `yum-utils` package:
+
+```
 yum install yum-utils
-{% info %}
-{% endshell %}
+```
 
 ### Download an rpm
 
-{% shell %}
-{% prompt "host ", delimiter="# ", path="~ " %}
-{% command %}
+```
 yumdownloader wget
-{% info %}
-{% endshell %}
+```
 
 ### Download the rpm source package
 
-{% shell %}
-{% prompt "host ", delimiter="# ", path="~ " %}
-{% command %}
+```
 yumdownloader --source wget
-{% info %}
-{% endshell %}
+```
 
 ## db_recover
 
-`db_recover` is part of yum-utils package
-{% shell %}
-{% prompt "host ", delimiter="# ", path="~ " %}
-{% command %}
+`db_recover` is part of the `libdb-utils` package:
+
+```
 yum install libdb-utils
-{% info %}
-{% endshell %}
+```
 
 ### Recover the /var/lib/rpm database
 
-After a crash, recovery of the rpmdb may be needed.
-{% shell %}
-{% prompt "host ", delimiter="# ", path="~ " %}
-{% command %}
+After a crash, recovery of the rpmdb may be needed:
+
+```
 /usr/bin/db_recover -h /var/lib/rpm
-{% info %}
-{% endshell %}
+```
 
 ## repoquery
 
-`repoquery` is part of yum-utils package
-{% shell %}
-{% prompt "host ", delimiter="# ", path="~ " %}
-{% command %}
+`repoquery` is part of yum-utils package:
+
+```
 yum install yum-utils
-{% info %}
-{% endshell %}
+```
 
 ### Query a remote repository without installing it
 
-{% shell %}
-{% prompt "host ", delimiter="# ", path="~ " %}
-{% command %}
-repoquery  --repofrompath=repotmp,https://linuxsoft.cern.ch/cern/slc5X/x86_64/yum/os/ --repoid=repotmp -qa
-{% info %}
-{% endshell %}
-
+```
+repoquery --repofrompath=repotmp,https://linuxsoft.cern.ch/cern/slc5X/x86_64/yum/os/ --repoid=repotmp -qa
+```
diff --git a/docs/pkg/yum.md b/docs/pkg/yum.md
index f422dd1b935e4139d935dce49420e0a63c0436ac..a1d9ddcbafdb15704d2ae98cee92b69edb6aa07f 100644
--- a/docs/pkg/yum.md
+++ b/docs/pkg/yum.md
@@ -1,42 +1,34 @@
 # Yellowdog Updater Modified (YUM)
 
-## Clean yum cache
+YUM, similarly to RPM, is a command-line package-management utility. It is different, and better, in that it allows for automatic updates and package and dependency management. Yum works with software repositories that allow for the updates, yet runs RPM underneath.
 
-YUM uses a cache to speed-up his operations, when you first logs on the machine it is a good idea to clear it.
+## YUM Basics
 
-{% shell %}
-{% prompt "host ", delimiter="# ", path="~ " %}
-{% command %}
+### Cleaning the  yum cache
+
+YUM uses a cache to speed-up its operations, it is always a good idea to "clean" whenever you first log in to a machine:
+
+```
 yum clean all
-{% info %}
-{% endshell %}
+```
 
-## Query
+### Retrieve information about your packages
 
-Query packages available on your system
-{% shell %}
-{% prompt "host ", delimiter="# ", path="~ " %}
-{% command %}
+In order to query packages available on your system:
+```
 yum list
-{% info %}
-{% endshell %}
-
-Check installed kernel versions
-{% shell %}
-{% prompt "host ", delimiter="# ", path="~ " %}
-{% command %}
-yum list kernel
-{% info %}
+```
+
+Check installed kernel versions:
+```
+$ yum list kernel
 kernel-3.10.0-862.11.6.el7.x86_64
 kernel-3.10.0-862.14.4.el7.x86_64
-{% endshell %}
+```
 
-Check if a file is part of an available package
-{% shell %}
-{% prompt "host ", delimiter="# ", path="~ " %}
-{% command %}
+Check if a file is part of an available package:
+```
 yum provides /usr/bin/korgac
-{% info %}
 Loaded plugins: changelog, fastestmirror, kernel-module, langpacks, protectbase, tsflags, versionlock
 Loading mirror speeds from cached hostfile
 
@@ -46,22 +38,75 @@ Loading mirror speeds from cached hostfile
 Repo        : @cr-testing
 Matched from:
 Filename    : /usr/bin/korgac
-{% endshell %}
+```
 
-## Install a package
+### Install a package
 
-{% shell %}
-{% prompt "host ", delimiter="# ", path="~ " %}
-{% command %}
+```
 yum install wget
-{% info %}
-{% endshell %}
+```
 
-## Remove a package
+### Remove a package
 
-{% shell %}
-{% prompt "host ", delimiter="# ", path="~ " %}
-{% command %}
+```
 yum remove wget
-{% info %}
-{% endshell %}
+```
+
+### Update all the installed packages in your system
+
+```
+yum update
+```
+
+## YUM repositories
+
+The above commands are very similar to the ones shown in [RPM 101](./rpm.md). However, the true power of yum is managing packages through repositories.
+
+A repository is a storage location where packages are stored, and thus can be retrieved and installed.
+
+An example is the [CC7 CERN repository](http://linuxsoft.cern.ch/centos/7/updates/x86_64/Packages/), where one can find all CERN-related packages maintained by us.
+
+Although the recommended way of configuring software repositories is using puppet (through the [CERN central configuration management service](https://gitlab.cern.ch/ai/it-puppet-module-osrepos/blob/master/code/README.md)) one might need to perform certain operations by hand:
+
+Check the list of enabled repositories:
+```
+yum repolist
+```
+
+This will show the enabled repositories that YUM will be aware of in that system. If trying to install a certain package it is not found, you might want to add additional repositories where that packaged might be stored. CentOS default repositories are very minimal as it is a system meant for servers, so for instance not many GUI packages are in the default repositories.
+
+YUM repositories are just files under `/etc/yum.repos.d` (if your system is not puppet managed), with a similar format:
+
+```
+cat /etc/yum.repos.d/cernbox.repo
+[cernbox]
+name=CERNBOX2.0 client repository (EOS backend)
+baseurl=http://cernbox.cern.ch/cernbox/doc/Linux/repo/CentOS_7
+enabled=1
+gpgcheck=1
+repo_gpgcheck=0
+gpgkey=http://cernbox.cern.ch/cernbox/doc/Linux/repo/CentOS_7/repodata/repomd.xml.key
+```
+
+You can also check all configured repositories in your system (even if not enabled) running:
+
+```
+yum repolist all
+```
+
+And to enable a repository, you can do it either:
+
+For the command you are running (temporarily):
+```
+yum --enablerepo=docker-ce-test/x86_64 install docker
+```
+
+Or permanently editing the corresponding `.repo` file, changing the `enabled=` param to `1`:
+
+```
+$ cat /etc/yum.repos.d/docker-ce.repo
+[docker-ce-test]
+[...]
+enabled=1
+[...]
+```
diff --git a/docs/services/containers.md b/docs/services/containers.md
index 0016cd5e69f99e832b50e7464f19f1d30d1c6220..3d50f3d4978e71849bf6d78f4f1fb5687311813e 100644
--- a/docs/services/containers.md
+++ b/docs/services/containers.md
@@ -1,19 +1,19 @@
 # Containers
 
-Official documentation : http://linux.web.cern.ch/linux/docs/dockerimages.shtml
+Official documentation : <http://linux.web.cern.ch/linux/docs/dockerimages.shtml>
 
-Linux support provides container, images are updated every 8 weeks.
+Linux support provides container, images are updated on a regularly basis.
 
 These images are built with koji.
 
 ## Docker hub
 
-Official image can be downloaded at https://hub.docker.com/u/cern/
+Official images can be downloaded from <https://hub.docker.com/u/cern/>
 
 ## CERN gitlab registry
 
 A local copy in gitlab can be also used:
 
- * https://gitlab.cern.ch/linuxsupport/slc6-base/container_registry
- * https://gitlab.cern.ch/linuxsupport/slc5-base/container_registry
- * https://gitlab.cern.ch/linuxsupport/cc7-base/container_registry
+ * <https://gitlab.cern.ch/linuxsupport/c8-base/container_registry>
+ * <https://gitlab.cern.ch/linuxsupport/cc7-base/container_registry>
+ * <https://gitlab.cern.ch/linuxsupport/slc6-base/container_registry>
diff --git a/docs/services/koji.md b/docs/services/koji.md
index 3c6db9a362589b865d505ccf76d1130df3f4e0ca..94179720b1b74d2f385992de05eaa5aaaac2a832 100644
--- a/docs/services/koji.md
+++ b/docs/services/koji.md
@@ -2,7 +2,7 @@
 
 ## Introduction
 
-Koji is an open source project used by Red Hat and Fedora to build in an automated way RPMs.
+Koji is an open source project used by Red Hat and Fedora to build RMPs in an automated way.
 
 From [https://pagure.io/koji/](https://pagure.io/koji/):
 
@@ -16,4 +16,7 @@ Build RPM from source rpms file or from git repository, mainly gitlab at CERN.
 
 Please read the [documentation](https://twiki.cern.ch/twiki/bin/view/LinuxSupport/BuildingRPMswithKoji).
 
-More examples to come in a future training.
+The recommended way to build RPMs using Koji and Gitlab's CI infrastructure is documented here:
+<https://gitlab.cern.ch/linuxsupport/rpmci>
+
+And it was presented in this [ASDF session](https://indico.cern.ch/event/884283/#17-rpmci-building-rpms-in-your)
diff --git a/docs/services/mirror.md b/docs/services/mirror.md
index f1d6031531ed4cfb0561203dad1c5e7530b872bd..b9148e7cfb725f134b4031b9e330262519683f1e 100644
--- a/docs/services/mirror.md
+++ b/docs/services/mirror.md
@@ -2,14 +2,15 @@
 
 ## Mirrors type
 
-We provide two types of mirror:
- * Official mirrors ; we are listed as official URL for few projects (i.e : CentOS).
- * Local mirror ; we just mirror the content so it is available in case something goes wrong on external servers, it allows use to have a consistent and reproducible installation process.
+We provide two types of mirrors:
+
+ * Official mirrors: we are listed as official URL for a few projects such as [CentOS](https://www.centos.org/download/mirrors/).
+ * Local mirrors: we just mirror the content so it is available in case something goes wrong on external servers, it allows us to have a consistent and reproducible installation process.
 
 You can request a local mirror, by creating a [SNOW](https://cern.service-now.com/service-portal/service-element.do?name=linux-desktop) request to Linux support.
 
-Please note that being an official mirror for a new open source project need to go through a careful review (space, bandwidth, rules, content validation, etc...).
+Please note that being an official mirror for a new open source project needs to go through a careful review (space, bandwidth, rules, content validation, etc...).
 
 ## Content
 
-You can browse local mirrors at : http://linuxsoft.cern.ch/mirror/
+You can browse local mirrors at : <http://linuxsoft.cern.ch/mirror/>
diff --git a/docs/storage/afs.md b/docs/storage/afs.md
index f302e5c2dee0674c312bfbd03a92bc31fce49a84..dc75a6d7e1aafa1b99be520905a9640fb3fb016f 100644
--- a/docs/storage/afs.md
+++ b/docs/storage/afs.md
@@ -1,8 +1,8 @@
 # Andrew File System (AFS)
 
-Official documentation: http://information-technology.web.cern.ch/fr/services/afs-service
+Official documentation: <http://information-technology.web.cern.ch/fr/services/afs-service>
 
-Support: https://cern.service-now.com/service-portal/service-element.do?name=afs-service
+Support through [ServiceNow](https://cern.service-now.com/service-portal/service-element.do?name=afs-service)
 
 ## Introduction
 
@@ -12,10 +12,21 @@ The AFS Service is based on OpenAFS, an open-source distributed filesystem which
 
 ## Install with locmap
 
+```
 locmap --enable afs
-
 locmap --configure afs
+```
 
 ## Access AFS
 
+```
 ls /afs/cern.ch
+```
+
+All CERN registered users get an AFS home folder, that is indeed your `$HOME` folder in interactive systems such as [lxplus](https://lxplusdoc.web.cern.ch/).
+
+An example for user `dabadaba`:
+
+```
+/afs/cern.ch/user/d/dabadaba/
+```
diff --git a/docs/storage/cernbox.md b/docs/storage/cernbox.md
index e69de29bb2d1d6434b8b29ae775ad8c2e48c5391..4391b49a54092b10606e3c28449c49c3374d4e93 100644
--- a/docs/storage/cernbox.md
+++ b/docs/storage/cernbox.md
@@ -0,0 +1,13 @@
+# Cernbox
+
+Official documentation: <http://cernbox.web.cern.ch/>
+
+## Introduction
+
+CERNBox is the "cloud storage solution from CERN", providing a service similar to Google Drive, Dropbox, etc.
+
+It is built on top of [EOS](eos.md)
+
+## Installation
+
+Although Cernbox is available through locmap, the recommended way is to follow the guide maintained by the CERNBox team: <https://cernbox.cern.ch/cernbox/doc/linux.html>
diff --git a/docs/storage/cvmfs.md b/docs/storage/cvmfs.md
index 2ebf915e48995aa1ee4e1e1ad7340ee7f1d24f58..c8ef85ab22af13f30659503a47b279fb989a5201 100644
--- a/docs/storage/cvmfs.md
+++ b/docs/storage/cvmfs.md
@@ -1,24 +1,28 @@
 # CVMFS
 
-Official documentation: https://cvmfs.readthedocs.io/
+Official documentation: <https://cvmfs.readthedocs.io/>
 
-Support: https://cernvm.cern.ch/portal/support
+Support: <https://cernvm.cern.ch/portal/support>
 
 ## Introduction
 
 The CernVM File System provides a scalable, reliable and low-maintenance software distribution service.
+
 It was developed to assist High Energy Physics (HEP) collaborations to deploy software on the worldwide-distributed computing infrastructure used to run data processing applications.
+
 CernVM-FS is implemented as a POSIX read-only file system in user space (a FUSE module).
-Files and directories are hosted on standard web servers and mounted in the universal namespace /cvmfs.
+
+Files and directories are hosted on standard web servers and mounted in the universal namespace `/cvmfs`.
 
 ## Install with locmap
 
+```
 locmap --enable cvmfs
-
 locmap --configure cvmfs
+```
 
 ## Access CVMFS
 
+```
 ls /cvmfs/
-
-
+```
diff --git a/docs/storage/eos.md b/docs/storage/eos.md
index e69de29bb2d1d6434b8b29ae775ad8c2e48c5391..e74004c9336aba8495a1b6f51c386f62593cb20e 100644
--- a/docs/storage/eos.md
+++ b/docs/storage/eos.md
@@ -0,0 +1,30 @@
+# EOS
+
+EOS is a disk-based, low-latency storage service, developed at CERN, and in principle the successor of AFS.
+
+Official documentation: <http://information-technology.web.cern.ch/services/eos-service>
+
+## Introduction
+
+The main target area for the service is physics data analysis, which is characterised by many concurrent users, a significant fraction of random data access and a large file-open rate.
+
+## Install with locmape
+
+```
+locmap --enable eos
+locmap --configure eos
+```
+
+## Access EOS
+
+```
+ls /eos/
+```
+
+As EOS is meant to replace AFS at some point, all CERN registered users ghet an EOS home. You can access this "home" folder in interactive systems such as [lxplus](https://lxplusdoc.web.cern.ch/), although it is not yet set to be the home folder.
+
+An example for user `dabadaba`:
+
+```
+/eos/home-d/dabadaba/
+```
diff --git a/docs/storage/s3.md b/docs/storage/s3.md
index 976d964c5f1ef450b5c91f869687a987078c6fd3..f5ed1eeb782a3388d855991ec732d4bc76e49078 100644
--- a/docs/storage/s3.md
+++ b/docs/storage/s3.md
@@ -1,8 +1,8 @@
 # CVMFS
 
-Official documentation: http://cern.ch/cephdocs
+Official documentation: <http://cern.ch/cephdocs>
 
-Support: https://cern.service-now.com/service-portal/function.do?name=S3ObjectStorage
+Support: <https://cern.service-now.com/service-portal/function.do?name=S3ObjectStorage>
 
 ## Introduction
 
@@ -10,18 +10,20 @@ S3 is a storage API for various object storages.
 
 Amazon S3, Ceph, Google Cloud, Azure etc... are supporting object storages.
 
-CERN S3 implementation is based on Ceph and available at http://s3.cern.ch
+CERN S3 implementation is based on Ceph and available at <http://s3.cern.ch>
 
-Within the S3 storage, one stores objects(files/data) in a bucket(directory/place-holder).
+Within the S3 storage, one stores objects (files/data) in a bucket (directory/place-holder).
 
-To access S3 storage, an access_key_id and secret_access_key is needed.
+To access S3 storage, an `access_key_id` and `secret_access_key` is needed.
 
 ## Install a client with yum
 
+```
 yum install s3cmd
+```
 
 ## Configure s3cmd
 
+```
 s3cmd ls s3://lxtrn
-
-
+```
diff --git a/docs/til/acron.md b/docs/til/acron.md
deleted file mode 100644
index e69de29bb2d1d6434b8b29ae775ad8c2e48c5391..0000000000000000000000000000000000000000
diff --git a/docs/til/docker.md b/docs/til/docker.md
index eb23d740bc73093b64c5d9a8976ffe20e52c3b53..fc8f6fb0791e86c9e8301fd461ec54220f136c2d 100644
--- a/docs/til/docker.md
+++ b/docs/til/docker.md
@@ -2,69 +2,39 @@
 
 ## Installation on CC7
 
-{% shell %}
-{% prompt "host ", delimiter="# ", path="~ " %}
-{% command %}
-yun install docker-latest
-{% info %}
-{% endshell %}
-
-{% shell %}
-{% prompt "host ", delimiter="# ", path="~ " %}
-{% command %}
+```
+yum install docker-latest
 systemctl enable docker-latest # Enable at boot time
-{% info %}
-{% endshell %}
-
-{% shell %}
-{% prompt "host ", delimiter="# ", path="~ " %}
-{% command %}
 systemctl start docker-latest
-{% info %}
-{% endshell %}
+```
 
 ## Usage with CERN image
 
-Run a container with bash
-{% shell %}
-{% prompt "host ", delimiter="# ", path="~ " %}
-{% command %}
+Run a container with bash:
+```
 docker run -it cern/cc7-base bash
-{% info %}
-{% endshell %}
+```
 
 Run and detach a container
-{% shell %}
-{% prompt "host ", delimiter="# ", path="~ " %}
-{% command %}
-docker run -it -d cern/cc7-base bash
-{% info %}
+```
+$ docker run -it -d cern/cc7-base bash
 29ce8fd9a414e43793b9b1c5989c623a19aacb5a052a3823aed5b5548a6d5a7f
-{% endshell %}
+```
 
 Re-attach to your container
-{% shell %}
-{% prompt "host ", delimiter="# ", path="~ " %}
-{% command %}
+```
 docker attach 29ce8fd9a414e43793b9b1c5989c623a19aacb5a052a3823aed5b5548a6d5a7f # ctrl p + ctrl q
-{% info %}
-{% endshell %}
+```
 
 ## Check logs
 
 Check logs
-{% shell %}
-{% prompt "host ", delimiter="# ", path="~ " %}
-{% command %}
+```
 docker logs 29ce8fd9a414e43793b9b1c5989c623a19aacb5a052a3823aed5b5548a6d5a7f # ctrl p + ctrl q
-{% info %}
-{% endshell %}
+```
 
-## Check running container
+## Check running containers
 
-{% shell %}
-{% prompt "host ", delimiter="# ", path="~ " %}
-{% command %}
+```
 docker ps
-{% info %}
-{% endshell %}
+```
diff --git a/docs/til/phonebook.md b/docs/til/phonebook.md
index 4dbbb152216ba47eeb82851e3d8529bb06b62344..4db8e100ad5e3768936f6d17f957f4ea27b7ea3d 100644
--- a/docs/til/phonebook.md
+++ b/docs/til/phonebook.md
@@ -1,29 +1,25 @@
 # Phonebook
 
+Similar to what can be found in the <https://phonebook.cern.ch/>, one can access it through the CLI.
+
 ## Usage
-{% shell %}
-{% prompt "host ", delimiter="# ", path="~ " %}
-{% command %}
-/usr/bin/phonebook --help
-{% info %}
+```
+$ /usr/bin/phonebook --help
 phonebook [--help]
               phonebook SEARCHSTRING [--all]
 
-              phonebook [SEARCHSTRING] [--surname SN] [--firstname FN] 
+              phonebook [SEARCHSTRING] [--surname SN] [--firstname FN]
               [--building BD] [--office FL-OFF] [--email M@A]
               [--phone PH] [--mobile MB]
               [--department DP] [--group GP] [--section ST ] [--pobox PB]
               [--login LN] [--ccid ID] [--uid UID] [--gid GID]
               [--externals] [--yellowpages] [--all|--terse TTT] [--orderby OOO]
-{% endshell %}
+```
 
 ## Check account status
 
-{% shell %}
-{% prompt "host ", delimiter="# ", path="~ " %}
-{% command %}
-/usr/bin/phonebook -l linux --all
-{% info %}
+```
+$ /usr/bin/phonebook -l linux --all
 #------------------------------------------------------------------------------
 Surname:            service
 Firstname:          linux
@@ -48,4 +44,4 @@ linux    def-cg sA 44767 2766 11/11/18 01:35 /bin/bash /
 #-------------------------------------------------------------------------------
 #Account St(atus): P(rimary), S(econdary), s(ervice), U(nknown)
 #                  A(ctive),  D(isabled),  P(assword expired),  L(ocked out)
-{% endshell %}
+```
diff --git a/docs/til/sc.md b/docs/til/sc.md
deleted file mode 100644
index e69de29bb2d1d6434b8b29ae775ad8c2e48c5391..0000000000000000000000000000000000000000
diff --git a/docs/til/systemd.md b/docs/til/systemd.md
index 93283539f3b689e306aa0ee92cec25212818a6bb..77b186e153aa25e1a837e201b8dbb832a516414d 100644
--- a/docs/til/systemd.md
+++ b/docs/til/systemd.md
@@ -1,130 +1,85 @@
 # Systemd
 
-This section contains few one liners to help with everyday systemd operations
+This section contains a few one liners to help with everyday `systemd` operations
 
 # systemctl
 
-Enable a service
-{% shell %}
-{% prompt "host ", delimiter="# ", path="~ " %}
-{% command %}
+Enable a service (making it start at boot time)
+```
 systemctl enable nginx.service
-{% info %}
-{% endshell %}
+```
 
 Disable a service
-{% shell %}
-{% prompt "host ", delimiter="# ", path="~ " %}
-{% command %}
+```
 systemctl disable nginx.service
-{% info %}
-{% endshell %}
+```
 
 Start a service
-{% shell %}
-{% prompt "host ", delimiter="# ", path="~ " %}
-{% command %}
+```
 systemctl start nginx.service
-{% info %}
-{% endshell %}
+```
 
 Stop a service
-{% shell %}
-{% prompt "host ", delimiter="# ", path="~ " %}
-{% command %}
+```
 systemctl stop nginx.service
-{% info %}
-{% endshell %}
+```
 
 Restart a service
-{% shell %}
-{% prompt "host ", delimiter="# ", path="~ " %}
-{% command %}
+```
 systemctl restart nginx.service
-{% info %}
-{% endshell %}
+```
 
 Reload a service
-{% shell %}
-{% prompt "host ", delimiter="# ", path="~ " %}
-{% command %}
+```
 systemctl reload nginx.service
-{% info %}
-{% endshell %}
+```
 
 List all of the units that systemd has loaded or attempted to load into memory
-{% shell %}
-{% prompt "host ", delimiter="# ", path="~ " %}
-{% command %}
+```
 systemctl list-units --all # --list-unit-files list everything
-{% info %}
-{% endshell %}
+```
 
 # journalctl
 
 Make journald persistent
-{% shell %}
-{% prompt "host ", delimiter="# ", path="~ " %}
-{% command %}
+```
 mkdir -p /var/log/journal
-{% info %}
-{% endshell %}
+```
 
-{% shell %}
-{% prompt "host ", delimiter="# ", path="~ " %}
-{% command %}
+```
 cat /etc/systemd/journald.conf
-journalctl --utc
-{% info %}
-. . .
+
+...
 [Journal]
 Storage=persistent # set Storage to persistent
-{% endshell %}
+```
 
 Display the timestamps in UTC
-{% shell %}
-{% prompt "host ", delimiter="# ", path="~ " %}
-{% command %}
+```
 journalctl --utc
-{% info %}
-{% endshell %}
+```
 
 View log since last boot
-{% shell %}
-{% prompt "host ", delimiter="# ", path="~ " %}
-{% command %}
+```
 journalctl -b
-{% info %}
-{% endshell %}
+```
 
 View log since a specified date
-{% shell %}
-{% prompt "host ", delimiter="# ", path="~ " %}
-{% command %}
+```
 journalctl --since "2018-09-10 20:00" # --until can be used too
-{% info %}
-{% endshell %}
+```
 
-Follow logs (`tail -f`)
-{% shell %}
-{% prompt "host ", delimiter="# ", path="~ " %}
-{% command %}
+Follow logs (à la `tail -f`)
+```
 journalctl -f
-{% info %}
-{% endshell %}
+```
 
 Check a service log
-{% shell %}
-{% prompt "host ", delimiter="# ", path="~ " %}
-{% command %}
+```
 journalctl -u crond
-{% info %}
-{% endshell %}
+```
 
 Check entries that involve an executable
-{% shell %}
-{% prompt "host ", delimiter="# ", path="~ " %}
-{% command %}
+```
 journalctl /usr/bin/bash
-{% info %}
-{% endshell %}
+```
diff --git a/docs/til/tmux.md b/docs/til/tmux.md
deleted file mode 100644
index e69de29bb2d1d6434b8b29ae775ad8c2e48c5391..0000000000000000000000000000000000000000
diff --git a/docs/tools/201811-participants.txt b/docs/tools/201811-participants.txt
deleted file mode 100644
index 8f39b3dc994bf003fc0096eb11a37b25c96ff5d1..0000000000000000000000000000000000000000
--- a/docs/tools/201811-participants.txt
+++ /dev/null
@@ -1,12 +0,0 @@
-A,dbillard
-A,ebournon
-A,dcaretti
-A,pgrzywac
-A,ygurimsk
-A,efokas
-A,hagen
-A,fiharden
-A,fmrabet
-A,mrodozov
-A,ansedzic
-A,mowiehe
diff --git a/mkdocs.yml b/mkdocs.yml
index e4c64e5c6f180101058ecca30b561421d97aeee7..c49c68dbbc34cefe283fccfb002cf297b0946f93 100644
--- a/mkdocs.yml
+++ b/mkdocs.yml
@@ -21,14 +21,15 @@ nav:
     - 'LXPLUS': lxplus/introduction.md
   - 'Distributions':
     - 'Supported distributions': distributions/supported.md
-    - 'Scientific Linux CERN 6': distributions/slc6.md
     - 'CERN CentOS 7': distributions/cc7.md
+    - 'CentOS 8': distributions/c8.md
+    - 'Scientific Linux CERN 6': distributions/slc6.md
   - 'GNU/Linux at CERN':
     - 'Getting help': linux/help.md
     - 'Website and documentation': linux/doc.md
     - 'Installation procedure': linux/install.md
     - 'AIMS2': linux/aims2.md
-    - 'Kickstarts': linux/kickstart.md
+    - 'Kickstart': linux/kickstart.md
     - 'Apply CERN settings': linux/locmap.md
     - 'Red Hat licenses': linux/licenses.md
     - 'Kerberos': linux/kerberos.md
@@ -39,7 +40,6 @@ nav:
     - 'Additional tools': pkg/tools.md
   - 'Interacting with different storage solutions at CERN':
     - 'AFS (Home directory)': storage/afs.md
-    - 'EOSFUSE': storage/eosfuse.md
     - 'CVMFS': storage/cvmfs.md
     - 'CERNBOX': storage/cernbox.md
     - 'EOS': storage/eos.md
@@ -48,12 +48,9 @@ nav:
     - 'Software mirrors at CERN': services/mirror.md
     - 'KOJI RPM Software building service': services/koji.md
     - 'Containers': services/containers.md
-  - 'Today I learn about...':
+  - 'Today I learned about...':
     - 'CERN phonebook': til/phonebook.md
     - 'Basic usage systemd / journald': til/systemd.md
     - 'Run CERN docker images': til/docker.md
-    - 'An introduction to tmux': til/tmux.md
-    - 'Software collections at CERN': til/sc.md
-    - 'Authenticated cron jobs at CERN': til/acron.md
   - 'Other useful information':
     - 'FAQ': others/faq.md