diff --git a/.gitignore b/.gitignore
deleted file mode 100644
index 853276503cfc7dabead1de6cc0ceedd7923cdccf..0000000000000000000000000000000000000000
--- a/.gitignore
+++ /dev/null
@@ -1,4 +0,0 @@
-*swp
-*swo
-_book
-node_modules
diff --git a/README.md b/README.md
index 7ea32d83fcea1000a866bc6200a49e9c74f270ce..3f955cf8eaa5608c1e727d4c52dd365a1dd69610 100644
--- a/README.md
+++ b/README.md
@@ -1,33 +1 @@
-# Linux survival kit guide
-
-Today the CERN linux support team is responsible for over 50000 (~35,000 in the datacentre and ~15,000 across HEP community and user devices).
-Maintaining such a large number of devices and providing support is a challenge : 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 different technologies provided by the IT Department.
-Finally, users will get a better understanding about our choices around the supported distributions and how to request help for issues through [SNOW service portal](https://cern.service-now.com/service-portal/service-element.do?name=linux-desktop).
-
-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.
-
-## What this guide won't do
-
-* This guide will not mention unsupported distribution. It will focus on newest supported version _CERN CentOS 7_.
-* This guide won't explain how to manage machine 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)
-
-  AND/OR self-paced tutorials:
-  * http://clouddocs.web.cern.ch/clouddocs/
-  * http://configtraining.web.cern.ch/configtraining/
-
-* This guide will not teach Linux kernel internals. The idea is to give the user an overview of Linux usage at CERN.
-To learn more about Linux kernel and detailled software packages, please follow the following links:
-  * https://access.redhat.com/documentation/en-us/
-  * https://github.com/0xAX/linux-insides
-
-
-## Changelog and updates
-
-Version 1.0 (November 2018) <!--- FIXME --->
-* Initial version
+# Linux Survival Kit
diff --git a/SUMMARY.md b/SUMMARY.md
deleted file mode 100644
index 7c206e35fc64a57a31b146d73d196c2d483cfe82..0000000000000000000000000000000000000000
--- a/SUMMARY.md
+++ /dev/null
@@ -1,52 +0,0 @@
-# Summary
-
-## Introduction
- * [Introduction](README.md)
- * [Prerequisites](introduction/prereq.md)
- * [Checking your permissions](introduction/permissions.md)
-
-## lxplus.cern.ch
- * [An introduction](lxplus/introduction.md)
-
-## GNU/Linux at CERN
- * [Getting help](linux/help.md)
- * [Website and documentation](linux/doc.md)
- * [Supported distributions](linux/distributions.md)
- * [Scientific Linux CERN 6](linux/slc6.md)
- * [CERN CentOS 7](linux/cc7.md)
- * [Installation procedure](linux/install.md)
- * [AIMS2](linux/aims2.md)
- * [Kickstarts](linux/kickstart.md)
- * [Apply CERN settings](linux/locmap.md)
- * [Red Hat licenses](linux/licenses.md)
- * [Open a great Linux support case](linux/support.md)
-
-## RPM and YUM
- * [RPM 101](pkg/rpm.md)
- * [YUM 101](pkg/yum.md)
- * [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)
- * [S3](storage/s3.md)
-
-## Other services
- * [Software mirrors at CERN](services/mirror.md)
- * [KOJI RPM Software building service](services/koji.md)
- * [Containers](services/containers.md)
-
-## Today I learn 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)
diff --git a/book.json b/book.json
deleted file mode 100644
index 2aa2bf7bbac3a04e257bc18ec16f27f1aaa7e2ac..0000000000000000000000000000000000000000
--- a/book.json
+++ /dev/null
@@ -1,28 +0,0 @@
-{
-  "github": false,
-  "gitbook": "latest",
-
-  "plugins": [
-      "anchors",
-      "code",
-      "hints@git+https://github.com/davidmogar/plugin-hints.git",
-      "panel",
-      "ribbon",
-      "shell"
-    ],
-
-  "pluginsConfig": {
-      "ribbon": {
-            "appendFilepath": true,
-            "color": "blue",
-            "icon": "fa-pencil",
-            "text": "Fix this page",
-            "url": "https://gitlab.cern.ch/linuxsupport/linuxtraining/blob/master"
-          },
-          "theme-default": {
-              "showLevel": true
-          }
-    }
-
-}
-
diff --git a/distributions/README.md b/distributions/README.md
deleted file mode 100644
index e69de29bb2d1d6434b8b29ae775ad8c2e48c5391..0000000000000000000000000000000000000000
diff --git a/docs/distributions/c8.md b/docs/distributions/c8.md
new file mode 100644
index 0000000000000000000000000000000000000000..d1daf6db783d7fb177653e69f8416a557c36491f
--- /dev/null
+++ b/docs/distributions/c8.md
@@ -0,0 +1,10 @@
+# CentOS 8
+
+## A bit of history
+
+CentOS 8 @ CERN was initially introduced via an [ASDF session](https://indico.cern.ch/event/866058/) on the 12.12.2019
+The operating system is supported by CERN IT as the next production linux distribution of CERN, as of April 2020. We strongly encourage all users of SLC6 and CC7 to migrate to C8.
+
+> The CentOS Project is a community-driven free software effort focused on delivering a robust open source ecosystem around a Linux platform. Packages contained in CentOS are built from source code from the RedHat Enterprise Linux (RHEL) distribution. More information on the CentOS project can be found upstream at the [CentOS website](https://www.centos.org/).
+
+For more details on CentOS at Cern: <http://linux.web.cern.ch/linux/centos8/>
\ No newline at end of file
diff --git a/docs/distributions/cc7.md b/docs/distributions/cc7.md
new file mode 100644
index 0000000000000000000000000000000000000000..c8dc5be59b00683c623444247482ef6c8238008a
--- /dev/null
+++ b/docs/distributions/cc7.md
@@ -0,0 +1,132 @@
+# CERN CentOS 7
+
+## A bit of history
+
+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).
+
+## Default repositories
+
+Each Red Hat based distribution is shipped with a few default repositories.
+
+At CERN you can list them with:
+
+    ls -l /etc/yum.repos.d/*.repo
+    -rw-r--r--. 1 root root 1964 Nov 27  2018 /etc/yum.repos.d/CentOS-Base.repo
+    -rw-r--r--. 1 root root 2395 Nov 27  2018 /etc/yum.repos.d/CentOS-CERN.repo
+    -rw-r--r--. 1 root root 1008 Nov 27  2018 /etc/yum.repos.d/CentOS-CR.repo
+    -rw-r--r--. 1 root root  331 Nov 27  2018 /etc/yum.repos.d/CentOS-Debuginfo.repo
+    -rw-r--r--. 1 root root  210 Nov 27  2018 /etc/yum.repos.d/CentOS-fasttrack.repo
+    -rw-r--r--. 1 root root 2105 Nov 27  2018 /etc/yum.repos.d/CentOS-Sources.repo
+    -rw-r--r--. 1 root root 7983 Nov 27  2018 /etc/yum.repos.d/CentOS-Vault.repo
+    -rw-r--r--. 1 root root 1008 Dec  7  2015 /etc/yum.repos.d/elrepo.repo
+    -rw-r--r--. 1 root root  587 Sep  3  2014 /etc/yum.repos.d/epel.repo
+    -rw-r--r--. 1 root root  665 Sep  3  2014 /etc/yum.repos.d/epel-testing.repo
+
+These repositories are installed by `-release` rpm packages.
+
+    rpm -qf /etc/yum.repos.d/epel.repo
+    epel-release-7-2.1.el7.cern.noarch
+
+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:
+
+### The `cernonly` repository
+
+This is a special repository only available inside cern, it contains proprietary software and tools very cern specific that we cannot redistribute.
+
+### The `cern` repository
+
+This repository contains all additional software that Linux Support adds to the main distribution. These packages are maintained at CERN.
+
+## Special Interest Groups (SIGs)
+
+A new concept is available in the CentOS community : the Special Interest Groups (SIGs).
+
+From the [wiki](https://wiki.centos.org/SpecialInterestGroup) you can get a detailed description:
+
+!!! Note ""
+    Special Interest Groups (SIG) are smaller groups within the CentOS community that focus on a small set of issues, in order to either create awareness or to focus on development along a specific topic. Each SIG can seek a dedicated section on the wiki, along with an option to display the names of the people involved in that SIG. A mailing list on the CentOS list server can also be setup as well. As proper, and subject to available resources, other resources they might need (eg. a SCM system, web hosting space, admin services, etc.) may be offered.
+
+For end users it results in additional packages available :
+
+    yum search centos-release
+    [...]
+    centos-release.x86_64 : CentOS Linux release file
+    centos-release-ansible26.noarch : Ansible 2.6 packages from the CentOS ConfigManagement SIG repository
+    centos-release-azure.noarch : Yum configuration for CentOS Virt SIG Azure repo
+    centos-release-ceph-hammer.noarch : Ceph Hammer packages from the CentOS Storage SIG repository
+    centos-release-ceph-jewel.noarch : Ceph Jewel packages from the CentOS Storage SIG repository
+    centos-release-ceph-luminous.noarch : Ceph Luminous packages from the CentOS Storage SIG repository
+    centos-release-ceph-nautilus.noarch : Ceph Nautilus packages from the CentOS Storage SIG repository
+    centos-release-configmanagement.noarch : Release file for ConfigManagement SIG repository
+    centos-release-dotnet.noarch : Config to enable the repository for DotNet on CentOS
+    centos-release-fdio.noarch : fd.io packages from the CentOS NFV SIG repository
+    centos-release-gluster-legacy.noarch : Disable unmaintained Gluster repositories from the CentOS Storage SIG
+    centos-release-gluster310.noarch : Gluster 3.10 (Long Term Stable) packages from the CentOS Storage SIG repository
+    centos-release-gluster312.noarch : Gluster 3.12 (Long Term Stable) packages from the CentOS Storage SIG repository
+    centos-release-gluster313.noarch : Gluster 3.13 (Short Term Stable) packages from the CentOS Storage SIG repository
+    centos-release-gluster36.noarch : GlusterFS 3.6 packages from the CentOS Storage SIG repository
+    centos-release-gluster37.noarch : GlusterFS 3.7 packages from the CentOS Storage SIG repository
+    centos-release-gluster38.noarch : GlusterFS 3.8 packages from the CentOS Storage SIG repository
+    centos-release-gluster39.noarch : Gluster 3.9 (Short Term Stable) packages from the CentOS Storage SIG repository
+    centos-release-gluster40.x86_64 : Gluster 4.0 (Short Term Stable) packages from the CentOS Storage SIG repository
+    centos-release-gluster41.x86_64 : Gluster 4.1 (Long Term Stable) packages from the CentOS Storage SIG repository
+    centos-release-gluster41.noarch : Gluster 4.1 (Long Term Stable) packages from the CentOS Storage SIG repository
+    centos-release-gluster5.noarch : Gluster 5 packages from the CentOS Storage SIG repository
+    centos-release-gluster6.noarch : Gluster 6 packages from the CentOS Storage SIG repository
+    centos-release-nfs-ganesha28.noarch : NFS-Ganesha 2.8 packages from the CentOS Storage SIG repository
+    centos-release-nfv-common.noarch : Common release file to establish shared metadata for CentOS NFV SIG
+    centos-release-openshift-origin.noarch : Common release file to establish shared metadata for CentOS PaaS SIG
+    centos-release-openshift-origin13.noarch : Yum configuration for OpenShift Origin 1.3 packages
+    centos-release-openshift-origin14.noarch : Yum configuration for OpenShift Origin 1.4 packages
+    centos-release-openshift-origin15.noarch : Yum configuration for OpenShift Origin 1.5 packages
+    centos-release-openshift-origin310.noarch : Yum configuration for OpenShift Origin 3.10 packages
+    centos-release-openshift-origin311.noarch : Yum configuration for OpenShift Origin 3.11 packages
+    centos-release-openshift-origin36.noarch : Yum configuration for OpenShift Origin 3.6 packages
+    centos-release-openshift-origin37.noarch : Yum configuration for OpenShift Origin 3.7 packages
+    centos-release-openshift-origin39.noarch : Yum configuration for OpenShift Origin 3.9 packages
+    centos-release-openstack.noarch : OpenStack from the CentOS Cloud SIG repo configs
+    centos-release-openstack-kilo.noarch : OpenStack from the CentOS Cloud SIG repo configs
+    centos-release-openstack-liberty.noarch : OpenStack from the CentOS Cloud SIG repo configs
+    centos-release-openstack-mitaka.noarch : OpenStack from the CentOS Cloud SIG repo configs
+    centos-release-openstack-newton.noarch : OpenStack from the CentOS Cloud SIG repo configs
+    centos-release-openstack-ocata.noarch : OpenStack from the CentOS Cloud SIG repo configs
+    centos-release-openstack-pike.x86_64 : OpenStack from the CentOS Cloud SIG repo configs
+    centos-release-openstack-pike.noarch : OpenStack from the CentOS Cloud SIG repo configs
+    centos-release-openstack-queens.x86_64 : OpenStack from the CentOS Cloud SIG repo configs
+    centos-release-openstack-queens.noarch : OpenStack from the CentOS Cloud SIG repo configs
+    centos-release-openstack-rocky.noarch : OpenStack from the CentOS Cloud SIG repo configs
+    centos-release-openstack-stein.noarch : OpenStack from the CentOS Cloud SIG repo configs
+    centos-release-opstools.noarch : Config to enable the repository for OpsTools SIG
+    centos-release-ovirt35.noarch : oVirt 3.5 packages from the CentOS Virtualization SIG repository
+    centos-release-ovirt36.noarch : oVirt 3.6 packages from the CentOS Virtualization SIG repository
+    centos-release-ovirt40.noarch : oVirt 4.0 packages from the CentOS Virtualization SIG repository
+    centos-release-ovirt41.noarch : oVirt 4.1 packages from the CentOS Virtualization SIG repository
+    centos-release-ovirt42.noarch : oVirt 4.2 packages from the CentOS Virtualization SIG repository
+    centos-release-ovirt43.noarch : oVirt 4.3 packages from the CentOS Virtualization SIG repository
+    centos-release-paas-common.noarch : Common release file to establish shared metadata for CentOS PaaS SIG
+    centos-release-qemu-ev.noarch : QEMU Enterprise Virtualization packages from the CentOS Virtualization SIG repository
+    centos-release-scl.noarch : Software collections from the CentOS SCLo SIG
+    centos-release-scl-rh.noarch : Software collections from the CentOS SCLo SIG (upstream scl only)
+    centos-release-storage-common.noarch : Common release file to establish shared metadata for CentOS Storage SIG
+    centos-release-virt-common.noarch : Common release file to establish shared metadata for CentOS Virt SIG
+    centos-release-xen.x86_64 : CentOS Virt SIG Xen repo configs
+    centos-release-xen-410.x86_64 : CentOS Virt Sig Xen repo configs for Xen 4.10
+    centos-release-xen-412.x86_64 : CentOS Virt Sig Xen repo configs for Xen 4.12
+    centos-release-xen-46.x86_64 : CentOS Virt Sig Xen repo configs for Xen 4.6
+    centos-release-xen-48.x86_64 : CentOS Virt Sig Xen repo configs for Xen 4.8
+    centos-release-xen-common.x86_64 : CentOS Virt Sig Xen support files
+    centos-release-yum4.noarch : YUM4 packages from the CentOS ConfigManagement SIG repository
+
+Please note that all these additional packages are provided as-is and support requests *should not* be addressed to the linux support team.
+
+!!! Note ""
+    Most of these repositories are available with the `osrepos` module in the puppet world.
diff --git a/docs/distributions/slc6.md b/docs/distributions/slc6.md
new file mode 100644
index 0000000000000000000000000000000000000000..19f255a98202eab9b6951997cd61d360e331d694
--- /dev/null
+++ b/docs/distributions/slc6.md
@@ -0,0 +1,48 @@
+# 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.
+
+> Scientific Linux CERN 6 is a Linux distribution built within the framework of Scientific Linux which in turn is rebuilt from the freely available Red Hat Enterprise Linux 6 (Server) product sources under terms and conditions of the Red Hat EULA. Scientific Linux CERN is built to integrate into the CERN computing environment but it is not a site-specific product: all CERN site customizations are optional and can be deactivated for external users.
+
+## Default repositories
+
+Each Red Hat based distribution is shipped with a few default repositories.
+
+At CERN you can list them with :
+
+    ls -l /etc/yum.repos.d/*.repo
+    -rw-r--r--. 1 root root 1616 Jun 21  2018 /etc/yum.repos.d/atrpms.repo
+    -rw-r--r--. 1 root root 1593 Jun 21  2018 /etc/yum.repos.d/elrepo.repo
+    -rw-r--r--. 1 root root 1543 Jun 21  2018 /etc/yum.repos.d/epel.repo
+    -rw-r--r--. 1 root root  211 Jun 21  2018 /etc/yum.repos.d/igtfca.repo
+    -rw-r--r--. 1 root root  988 Jun 21  2018 /etc/yum.repos.d/rpmforge.repo
+    -rw-r--r--. 1 root root  758 Jun 21  2018 /etc/yum.repos.d/slc6-cernonly.repo
+    -rw-r--r--. 1 root root  782 Jun 21  2018 /etc/yum.repos.d/slc6-extras.repo
+    -rw-r--r--. 1 root root  716 Jun 21  2018 /etc/yum.repos.d/slc6-os.repo
+    -rw-r--r--. 1 root root 1531 Jun 21  2018 /etc/yum.repos.d/slc6-rhcommon.repo
+    -rw-r--r--. 1 root root  761 Jun 21  2018 /etc/yum.repos.d/slc6-testing.repo
+    -rw-r--r--. 1 root root  763 Jun 21  2018 /etc/yum.repos.d/slc6-updates.repo
+
+Those repositories are installed by the `sl-release` rpm package.
+
+    rpm -qf /etc/yum.repos.d/epel.repo
+    sl-release-6.10-1.slc6.x86_64
+
+Additional `-release` rpm packages can be found with `yum search release`. On SLC6 we have a small set, while it considerably grew on CC7.
+
+> 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:
+
+### The `cernonly` repository
+
+This is a special repository only available inside CERN, it contains proprietary software and tools very CERN specific.
+
+### The `extras` repository
+
+This repository contains all additional software that Linux Support adds to the main distribution. These packages are maintained at CERN.
diff --git a/docs/distributions/supported.md b/docs/distributions/supported.md
new file mode 100644
index 0000000000000000000000000000000000000000..9eae11c41fe72d5bb88ed5fdb2d2ef62623b204f
--- /dev/null
+++ b/docs/distributions/supported.md
@@ -0,0 +1,22 @@
+# CERN Linux Distributions
+
+At CERN, three distributions are supported:
+
+* CentOS 8
+* 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.
+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.
+
+If a bug is discovered, a report is sent to Red Hat who will propose a fix.
+
+Technical support is primarily provided, at CERN, by Linux Support. Outside, support is provided by the community via official mailing lists, web forums, and chat rooms.
+
+Participating in these open source initiatives is available to any individual. New contributors from CERN are always a great addition.
+
+New releases are typically produced a few weeks after each Red Hat release.
+
+In the following sections, details for each distribution will be given.
diff --git a/docs/index.md b/docs/index.md
new file mode 100644
index 0000000000000000000000000000000000000000..06077774d6e1890373691aa6c3d5a88db1a52ee0
--- /dev/null
+++ b/docs/index.md
@@ -0,0 +1,47 @@
+# Linux survival kit guide
+
+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.
+
+Finally, users will get a better understanding about our choices around the supported distributions and how to request help for issues through the [SNow service portal](https://cern.service-now.com/service-portal/service-element.do?name=linux-desktop).
+
+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/>
+
+## 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 Systems Administrator Prep
+
+
+* This guide will not explain how to manage machines or services in the datacentre, please check:
+    * <https://cern.ch/clouddocs/>
+    * <https://cern.ch/configtraining/>
+
+* This guide will not teach Linux kernel internals. The idea is to give the user an overview of Linux usage at CERN.
+To learn more about the Linux kernel and detailed software packages, please check the following links:
+    * <https://access.redhat.com/documentation/en-us/>
+    * <https://github.com/0xAX/linux-insides>
+
+
+## Changelog and updates
+
+* Version 2.0 (February 2020)
+  General revision and migration to mkdocs
+
+* Version 1.0 (November 2018)
+  Initial version
diff --git a/docs/introduction/permissions.md b/docs/introduction/permissions.md
new file mode 100644
index 0000000000000000000000000000000000000000..79841fc6da0c283d3b56b98770564f6ef820fb0e
--- /dev/null
+++ b/docs/introduction/permissions.md
@@ -0,0 +1,30 @@
+# Checking you permissions
+
+## Try to login on lxplus with your account
+
+    ssh yourlogin@lxplus
+    Last login: Sat Nov 10 14:37:53 2018 from XXX
+    * ********************************************************************
+    * Welcome to lxplus727.cern.ch, CentOS, 7.6.1810
+    * Archive of news is available in /etc/motd-archive
+    * Reminder: you have agreed to the CERN
+    *   computing rules, in particular OC5. CERN implements
+    *   the measures necessary to ensure compliance.
+    *   https://cern.ch/ComputingRules
+    * Puppet environment: production, Roger state: production
+    * Foreman hostgroup: lxplus/nodes/login
+    * Availability zone: cern-geneva-b
+    * LXPLUS Public Login Service - https://cern.ch/lxplusdoc
+    * lxplus alias switch to CC7 on Apr 2nd 2019 . http://cern.ch/go/K7lq
+    * ********************************************************************
+    [yourlogin@lxplus727 ~]$
+
+## Try to login to the Openstack dashboard
+
+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/introduction/prereq.md b/docs/introduction/prereq.md
new file mode 100644
index 0000000000000000000000000000000000000000..bc48005fa5a76e1543fb5a562f2127e30abf3c10
--- /dev/null
+++ b/docs/introduction/prereq.md
@@ -0,0 +1,19 @@
+# Prerequisites
+
+ * You have a CERN account
+ * You know linux basic commands `ls`, `cp`, `mv`, `scp`, etc...
+ * You know how to connect to a remote machine with `ssh` and/or Putty.
+
+## Suscribe to services before the training
+
+Because some services need a few hours for synchronisation/replication we ask users to follow these steps a few days before the training.
+
+A reminder was sent to you by the training staff.
+
+ * Login to <https://cern.ch/account>
+ * Click on "Resources and Services" on the right column
+ * Click on "List Services" icon
+ * If not done please subscribe to:
+    * "LXPLUS and Linux"
+    * "Cloud infrastructure"
+    * "EOS/CERNBox"
diff --git a/linux/aims2.md b/docs/linux/aims2.md
similarity index 63%
rename from linux/aims2.md
rename to docs/linux/aims2.md
index 0d4eb84cb9a46406579a4fa42acb6a316500c96c..e61f5e52936a198b8f8ffb1f00ae79ea86a28e22 100644
--- a/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
new file mode 100644
index 0000000000000000000000000000000000000000..fd478ace5f6fa84542f207d4c9952610fd14dfc3
--- /dev/null
+++ b/docs/linux/doc.md
@@ -0,0 +1,31 @@
+## Website
+
+The Linux website is available at the following URL: <https://linux.cern.ch>
+
+## CERN Documentation
+
+The website contains all the end-user documentation, and we will extensively use it for the exercices during this tutorial.
+
+It contains up-to-date information about the lifecycle of distributions at CERN and the future plans.
+
+ * [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.
+
+## Red Hat documentation
+
+Since the CentOS distribution is based on RHEL (Red Hat Entreprise Linux), it is very similar to it and Red Hat documentation is very relevant.
+
+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>. Do not hesitate to contribute.
diff --git a/linux/help.md b/docs/linux/help.md
similarity index 60%
rename from linux/help.md
rename to docs/linux/help.md
index 328db5615b594f5de3c418a318175b717b8722a1..ccfd6f5c60abbb70a7a2aeb3cba2f75372e4a398 100644
--- a/linux/help.md
+++ b/docs/linux/help.md
@@ -4,34 +4,34 @@
 
 Incidents and upcoming changes with the linux support service are reported using the IT tools.
 
-You can suscribe to [linux-users](https://e-groups.cern.ch) egroup to receive important updates by email.
+You can suscribe to the [linux-users](https://e-groups.cern.ch/e-groups/Egroup.do?egroupId=159316) egroup to receive important updates by email.
 
-[SLS](https://cern.service-now.com/service-portal/sls.do) give you a quick overview of the IT service status.
+The [SLS](https://cern.service-now.com/service-portal/sls.do) gives you a quick overview of the IT service status.
 
 Upcoming changes and incidents are reported to the [IT Status Board](https://cern.service-now.com/service-portal/ssb.do?area=IT).
 
 ## Reporting problems
 
-For reporting problems or asking for assistance, please contact the service desk at https://cern.service-now.com/service-portal/.
+For reporting problems or asking for assistance, please contact the service desk at <https://cern.service-now.com/service-portal/>.
 Checking the IT SSB and the IT Service Display will help to see if the problem is known.
 
 For raising a ticket specifically for the Linux support team, you can use this [direct link](https://cern.service-now.com/service-portal/service-element.do?name=linux-desktop).
 
-# Getting updates and help on IT projects
+## Getting updates and help on IT projects
 
-## IT Technical Users Meeting (ITUM)
+### IT Technical Users Meeting (ITUM)
 
 This meeting provides a technical update on IT department services, including ‘heads-up’ information on future plans.
 It is aimed at technical experts within CERN's Experiments and User Communities.
 
-http://cern.ch/itum
+<http://cern.ch/itum>
 
 Minutes and notes can be found in [Indico](https://indico.cern.ch/category/2958/).
 
 
-## IT Consulting Service
+### IT Consulting Service
 
-The IT consulting service is a recent initiative from IT Departement.
+The IT consulting service is a recent initiative from the IT Departement that offers:
 
   * The possibility to exchange ideas in order to understand the supported IT landscape at CERN.
   * Help with system architecture and design.
@@ -39,10 +39,11 @@ The IT consulting service is a recent initiative from IT Departement.
 
 You can make a request in [SNOW](https://cern.service-now.com/service-portal/service-element.do?name=it-consulting) for any enquiry.
 
-Tell your managers !
+Tell your managers!
 
-## Online chat
+### Online chat
 
-For quick discussion [Mattermost](https://mattermost.web.cern.ch/it-dep/channels/linux) exists.
-Most of IT projects have a channel.
-For support matters, it is always better to create a SNOW ticket.
+For quick discussions a [Mattermost linux channel](https://mattermost.web.cern.ch/it-dep/channels/linux) exists.
+Most IT projects have a channel.
+
+Nonetheless, for support matters, it is always encouraged to create a SNOW ticket.
diff --git a/linux/install.md b/docs/linux/install.md
similarity index 65%
rename from linux/install.md
rename to docs/linux/install.md
index b9837f61be055bc7e40f72c1c39b3af618b6aaaf..ef0da6431f6b9164ed8fc150966ab6b261fe0362 100644
--- a/linux/install.md
+++ b/docs/linux/install.md
@@ -1,12 +1,10 @@
 # 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 first to 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 http://network.cern.ch
+Open <https://network.cern.ch>
 
 Check if your machine is registered:
 
@@ -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
new file mode 100644
index 0000000000000000000000000000000000000000..38f2910d8769adfb787b601426570c4de0d1c790
--- /dev/null
+++ 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/linux/kickstart.md b/docs/linux/kickstart.md
similarity index 92%
rename from linux/kickstart.md
rename to docs/linux/kickstart.md
index 4e79843bce76ef76c22e9ba643b9f6a82ec00035..8d1b1e9411fe6f2a7379551f216f5d3f1667e736 100644
--- a/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/linux/licenses.md b/docs/linux/licenses.md
similarity index 72%
rename from linux/licenses.md
rename to docs/linux/licenses.md
index edac5d2b28e6cc4eb2c11334c063d8fdd111df3a..903fd8e521980bb67ae719135dc72ea17705534f 100644
--- a/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/linux/locmap.md b/docs/linux/locmap.md
similarity index 73%
rename from linux/locmap.md
rename to docs/linux/locmap.md
index a61af729ab168ed4fd2e0c5cb97b6e7668da510a..b539ad463837b2c65dc0f5d0216d704ca64861b7 100644
--- a/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/linux/support.md b/docs/linux/support.md
similarity index 54%
rename from linux/support.md
rename to docs/linux/support.md
index 9d354a5ccf2f51fde15678c3e84767bf132e8682..9b7b0cee83b77c354976013b627131a06a90e589 100644
--- a/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
new file mode 100644
index 0000000000000000000000000000000000000000..f7c275e07764a772ae01ad853cc9aee046439314
--- /dev/null
+++ b/docs/lxplus/introduction.md
@@ -0,0 +1,30 @@
+# An introduction
+
+Official documentation: <https://cern.ch/lxplusdoc/>
+
+LXPLUS, the "Linux Public Login User Service" is the interactive logon service to Linux for all CERN users.
+The cluster LXPLUS consists of public machines provided by the IT Department for interactive work.
+
+You can use SSH to access it from anywhere in the world with your CERN account.
+
+A list of all lxplus aliases can be found at <https://cern.ch/lxplusdoc/evolution/list.html>
+
+It will be used extensively during this course.
+
+## Lxplus access
+
+### From Linux
+
+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
+
+### From Windows
+
+You can use the [Putty](https://espace.cern.ch/winservices-help/NICEApplications/HelpForApplications/Pages/UsingPuttyCERN.aspx) tool.
diff --git a/docs/others/faq.md b/docs/others/faq.md
new file mode 100644
index 0000000000000000000000000000000000000000..242c328ddc5f74750fe108f5cffea67330a5ae88
--- /dev/null
+++ b/docs/others/faq.md
@@ -0,0 +1,23 @@
+# Frequently asked questions
+
+## Can you upgrade package X to version Y.Z ?
+
+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 ?
+
+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 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 having a long lifecycle (> 10 years) allows Linux Support to provide a effective support to scientists for a full LHC run.
diff --git a/pkg/rpm.md b/docs/pkg/rpm.md
similarity index 63%
rename from pkg/rpm.md
rename to docs/pkg/rpm.md
index f4cc7dd7676e5c7df2d59129d09d9b2af16b4427..65615a49466c26149b3c5cb09417c4cb01a997c1 100644
--- a/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
new file mode 100644
index 0000000000000000000000000000000000000000..964b47bb4c62eea336c45a3d9cbfcb453ab95fb9
--- /dev/null
+++ b/docs/pkg/tools.md
@@ -0,0 +1,51 @@
+# Tools
+
+## yumdowloader
+
+`yumdownloader` is part of the `yum-utils` package:
+
+```
+yum install yum-utils
+```
+
+### Download an rpm
+
+```
+yumdownloader wget
+```
+
+### Download the rpm source package
+
+```
+yumdownloader --source wget
+```
+
+## db_recover
+
+`db_recover` is part of the `libdb-utils` package:
+
+```
+yum install libdb-utils
+```
+
+### Recover the /var/lib/rpm database
+
+After a crash, recovery of the rpmdb may be needed:
+
+```
+/usr/bin/db_recover -h /var/lib/rpm
+```
+
+## repoquery
+
+`repoquery` is part of yum-utils package:
+
+```
+yum install yum-utils
+```
+
+### Query a remote repository without installing it
+
+```
+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
new file mode 100644
index 0000000000000000000000000000000000000000..a1d9ddcbafdb15704d2ae98cee92b69edb6aa07f
--- /dev/null
+++ b/docs/pkg/yum.md
@@ -0,0 +1,112 @@
+# Yellowdog Updater Modified (YUM)
+
+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 Basics
+
+### 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
+```
+
+### Retrieve information about your packages
+
+In order to query packages available on your system:
+```
+yum list
+```
+
+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
+```
+
+Check if a file is part of an available package:
+```
+yum provides /usr/bin/korgac
+Loaded plugins: changelog, fastestmirror, kernel-module, langpacks, protectbase, tsflags, versionlock
+Loading mirror speeds from cached hostfile
+
+[...]
+
+7:kdepim-4.10.5-7.el7.x86_64 : KDE PIM (Personal Information Manager) applications
+Repo        : @cr-testing
+Matched from:
+Filename    : /usr/bin/korgac
+```
+
+### Install a package
+
+```
+yum install wget
+```
+
+### Remove a package
+
+```
+yum remove wget
+```
+
+### 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
new file mode 100644
index 0000000000000000000000000000000000000000..3d50f3d4978e71849bf6d78f4f1fb5687311813e
--- /dev/null
+++ b/docs/services/containers.md
@@ -0,0 +1,19 @@
+# Containers
+
+Official documentation : <http://linux.web.cern.ch/linux/docs/dockerimages.shtml>
+
+Linux support provides container, images are updated on a regularly basis.
+
+These images are built with koji.
+
+## Docker hub
+
+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/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/services/koji.md b/docs/services/koji.md
similarity index 63%
rename from services/koji.md
rename to docs/services/koji.md
index 3c6db9a362589b865d505ccf76d1130df3f4e0ca..94179720b1b74d2f385992de05eaa5aaaac2a832 100644
--- a/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
new file mode 100644
index 0000000000000000000000000000000000000000..b9148e7cfb725f134b4031b9e330262519683f1e
--- /dev/null
+++ b/docs/services/mirror.md
@@ -0,0 +1,16 @@
+# Mirror service on linuxsoft.cern.ch
+
+## Mirrors type
+
+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 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/>
diff --git a/storage/afs.md b/docs/storage/afs.md
similarity index 51%
rename from storage/afs.md
rename to docs/storage/afs.md
index f302e5c2dee0674c312bfbd03a92bc31fce49a84..dc75a6d7e1aafa1b99be520905a9640fb3fb016f 100644
--- a/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
new file mode 100644
index 0000000000000000000000000000000000000000..4391b49a54092b10606e3c28449c49c3374d4e93
--- /dev/null
+++ 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/storage/cvmfs.md b/docs/storage/cvmfs.md
similarity index 77%
rename from storage/cvmfs.md
rename to docs/storage/cvmfs.md
index 2ebf915e48995aa1ee4e1e1ad7340ee7f1d24f58..c8ef85ab22af13f30659503a47b279fb989a5201 100644
--- a/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
new file mode 100644
index 0000000000000000000000000000000000000000..e74004c9336aba8495a1b6f51c386f62593cb20e
--- /dev/null
+++ 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/storage/eosfuse.md b/docs/storage/eosfuse.md
similarity index 100%
rename from storage/eosfuse.md
rename to docs/storage/eosfuse.md
diff --git a/docs/storage/s3.md b/docs/storage/s3.md
new file mode 100644
index 0000000000000000000000000000000000000000..488684ede4e3edef432c5db3d506b023f4a6a2ef
--- /dev/null
+++ b/docs/storage/s3.md
@@ -0,0 +1,29 @@
+# S3
+
+Official documentation: <http://cern.ch/cephdocs>
+
+Support: <https://cern.service-now.com/service-portal/function.do?name=S3ObjectStorage>
+
+## Introduction
+
+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>
+
+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.
+
+## Install a client with yum
+
+```
+yum install s3cmd
+```
+
+## Configure s3cmd
+
+```
+s3cmd ls s3://lxtrn
+```
diff --git a/docs/til/docker.md b/docs/til/docker.md
new file mode 100644
index 0000000000000000000000000000000000000000..fc8f6fb0791e86c9e8301fd461ec54220f136c2d
--- /dev/null
+++ b/docs/til/docker.md
@@ -0,0 +1,40 @@
+# Docker
+
+## Installation on CC7
+
+```
+yum install docker-latest
+systemctl enable docker-latest # Enable at boot time
+systemctl start docker-latest
+```
+
+## Usage with CERN image
+
+Run a container with bash:
+```
+docker run -it cern/cc7-base bash
+```
+
+Run and detach a container
+```
+$ docker run -it -d cern/cc7-base bash
+29ce8fd9a414e43793b9b1c5989c623a19aacb5a052a3823aed5b5548a6d5a7f
+```
+
+Re-attach to your container
+```
+docker attach 29ce8fd9a414e43793b9b1c5989c623a19aacb5a052a3823aed5b5548a6d5a7f # ctrl p + ctrl q
+```
+
+## Check logs
+
+Check logs
+```
+docker logs 29ce8fd9a414e43793b9b1c5989c623a19aacb5a052a3823aed5b5548a6d5a7f # ctrl p + ctrl q
+```
+
+## Check running containers
+
+```
+docker ps
+```
diff --git a/til/phonebook.md b/docs/til/phonebook.md
similarity index 85%
rename from til/phonebook.md
rename to docs/til/phonebook.md
index 4dbbb152216ba47eeb82851e3d8529bb06b62344..4db8e100ad5e3768936f6d17f957f4ea27b7ea3d 100644
--- a/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/systemd.md b/docs/til/systemd.md
new file mode 100644
index 0000000000000000000000000000000000000000..77b186e153aa25e1a837e201b8dbb832a516414d
--- /dev/null
+++ b/docs/til/systemd.md
@@ -0,0 +1,85 @@
+# Systemd
+
+This section contains a few one liners to help with everyday `systemd` operations
+
+# systemctl
+
+Enable a service (making it start at boot time)
+```
+systemctl enable nginx.service
+```
+
+Disable a service
+```
+systemctl disable nginx.service
+```
+
+Start a service
+```
+systemctl start nginx.service
+```
+
+Stop a service
+```
+systemctl stop nginx.service
+```
+
+Restart a service
+```
+systemctl restart nginx.service
+```
+
+Reload a service
+```
+systemctl reload nginx.service
+```
+
+List all of the units that systemd has loaded or attempted to load into memory
+```
+systemctl list-units --all # --list-unit-files list everything
+```
+
+# journalctl
+
+Make journald persistent
+```
+mkdir -p /var/log/journal
+```
+
+```
+cat /etc/systemd/journald.conf
+
+...
+[Journal]
+Storage=persistent # set Storage to persistent
+```
+
+Display the timestamps in UTC
+```
+journalctl --utc
+```
+
+View log since last boot
+```
+journalctl -b
+```
+
+View log since a specified date
+```
+journalctl --since "2018-09-10 20:00" # --until can be used too
+```
+
+Follow logs (à la `tail -f`)
+```
+journalctl -f
+```
+
+Check a service log
+```
+journalctl -u crond
+```
+
+Check entries that involve an executable
+```
+journalctl /usr/bin/bash
+```
diff --git a/tools/README b/docs/tools/README
similarity index 100%
rename from tools/README
rename to docs/tools/README
diff --git a/introduction/permissions.md b/introduction/permissions.md
deleted file mode 100644
index d9e479da9e59d26180e4ba7f12f5c3105a6aa054..0000000000000000000000000000000000000000
--- a/introduction/permissions.md
+++ /dev/null
@@ -1,33 +0,0 @@
-# Checking you permissions
-
-## Try to login on lxplus with your account
-
-{% shell %}
-{% prompt "host ", delimiter="$ ", path="~ " %}
-{% command %}
-ssh yourlogin@lxplus
-{% info %}
-Last login: Sat Nov 10 14:37:53 2018 from XXX
-* ********************************************************************
-* * Welcome to lxplus062.cern.ch, SLC, 6.10
-* * Archive of news is available in /etc/motd-archive
-* * Reminder: you have agreed to the CERN
-* *   computing rules, in particular OC5. CERN implements
-* *   the measures necessary to ensure compliance.
-* *   https://cern.ch/ComputingRules
-* * Puppet environment: production, Roger state: production
-* * Foreman hostgroup: lxplus/nodes/login
-* * Availability zone: cern-geneva-c
-* * LXPLUS Public Login Service - https://cern.ch/lxplusdoc
-* * LSF to be decommissioned on Jan 30th 2019. http://cern.ch/go/7Zmn
-* * ********************************************************************
-* [yourlogin@lxplus0XX ~]$
-{% endshell %}
-
-## Try to login to the Openstack dashboard
-
-Open in a browser http://openstack.cern.ch
-
-## Try to login to the CERNBOX dashboard
-
-Open in a browser http://cernbox.cern.ch
diff --git a/introduction/prereq.md b/introduction/prereq.md
deleted file mode 100644
index 00656553c8cdbc37360333c9c023652ba68ee992..0000000000000000000000000000000000000000
--- a/introduction/prereq.md
+++ /dev/null
@@ -1,18 +0,0 @@
-# Prerequisites
-
- * You have a CERN account
- * You know linux basic commands ls, cp, mv, scp, etc...
- * You know how to connect to a remote machine with ssh and/or Putty.
-
-## Suscribe to services before the training
-
-Because some service need few hours for synchronisation/replication we ask users to follow next steps few days before the training.
-
-A reminder was sent to you by the training staff.
-
- * Login to : https://cern.ch/account
- * Click on "resources and services" on the right column
- * Click on "list services" icon
- * If not done please subscribe to "LXPLUS and Linux"
- * If not done please subscribe to "Cloud infrastructure"
- * If not done please subscribe to "EOS/CERNBox"
diff --git a/linux/cc7.md b/linux/cc7.md
deleted file mode 100644
index 56a7c64436937013aeba9d44c214243b86e34dcd..0000000000000000000000000000000000000000
--- a/linux/cc7.md
+++ /dev/null
@@ -1,122 +0,0 @@
-# CERN CentOS 7
-
-## A bit of history
-
-CERN CentOS 7 was released in 2014 and will be supported until at least 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 customizations are optional and can be deactivated for external users.
-
-In 2015, CERN began migrating away from Scientific Linux collaboration to provide the next version (RHEL 7 rebuild).
-
-For more details please check [Next Linux version @ CERN](http://linux.web.cern.ch/linux/nextversion.shtml).
-
-## Default repositories
-
-Each Red Hat based distribution is shipped with few default repositories.
-
-Those repositories are install by `-release` rpm package.
-
-At CERN you can list them with :
-
-{% shell %}
-{% prompt "host ", delimiter="$ ", path="~ " %}
-{% command %}
-ls  /etc/yum.repos.d/*.repo
-{% info %}
--rw-r--r--.   1 root root  587 Sep  3  2014 epel.repo
--rw-r--r--.   1 root root  665 Sep  3  2014 epel-testing.repo
--rw-r--r--.   1 root root 1008 Dec  7  2015 elrepo.repo
--rw-r--r--.   1 root root 3217 Sep  7  2017 CentOS-Vault.repo
--rw-r--r--.   1 root root 2105 Sep  7  2017 CentOS-Sources.repo
--rw-r--r--.   1 root root  210 Sep  7  2017 CentOS-fasttrack.repo
--rw-r--r--.   1 root root  331 Sep  7  2017 CentOS-Debuginfo.repo
--rw-r--r--.   1 root root 1008 Sep  7  2017 CentOS-CR.repo
--rw-r--r--.   1 root root 2395 Sep  7  2017 CentOS-CERN.repo
--rw-r--r--.   1 root root 1964 Sep  7  2017 CentOS-Base.repo
-{% endshell %}
-
-{% shell %}
-{% prompt "host ", delimiter="$ ", path="~ " %}
-{% command %}
-rpm -qf /etc/yum.repos.d/epel.repo
-{% info %}
-epel-release-7-2.1.el7.cern.noarch
-{% endshell %}
-
-Additional -release rpm package can be searched with `yum search release`.
-
-> Please note that on a puppet node the repositories are managed by the `osrepos` module, and repo files stored in an alternative directory `/etc/yum-puppet.repos.d/`.
-
-Let's detail specific CERN repositories.
-
-### cernonly repository
-
-This is a special repository only available inside cern, it contains proprietary software and tools very cern specific we cannot redistribute.
-
-### cern repository
-
-This repository contain all additional software that linux support add to the main distribution. The packages are maintained at CERN.
-
-## Special interest groups
-
-A new concept is available in the CentOS community : the Special interest groups (SIGs).
-
-From the [wiki](https://wiki.centos.org/SpecialInterestGroup) you can get a detailed description:
-
-> Special Interest Groups (SIG) are smaller groups within the CentOS community that focus on a small set of issues, in order to either create awareness or to focus on development along a specific topic. Each SIG can seek a dedicated section on the wiki, along with an option to display the names of the people involved in that SIG. A mailing list on the CentOS list server can also be setup as well. As proper, and subject to available resources, other resources they might need (eg. a SCM system, web hosting space, admin services, etc.) may be offered.
-
-For end users it results in additional packages available :
-
-{% shell %}
-{% prompt "host ", delimiter="$ ", path="~ " %}
-{% command %}
-yum search centos-release
-{% info %}
-centos-release.x86_64 : CentOS Linux release file
-centos-release-openshift-origin.noarch : Common release file to establish shared metadata for CentOS PaaS SIG
-centos-release-paas-common.noarch : Common release file to establish shared metadata for CentOS PaaS SIG
-centos-release-storage-common.noarch : Common release file to establish shared metadata for CentOS Storage SIG
-centos-release-virt-common.noarch : Common release file to establish shared metadata for CentOS Virt SIG
-centos-release-ceph-hammer.noarch : Ceph Hammer packages from the CentOS Storage SIG repository
-centos-release-ceph-jewel.noarch : Ceph Jewel packages from the CentOS Storage SIG repository
-centos-release-ceph-luminous.noarch : Ceph Luminous packages from the CentOS Storage SIG repository
-centos-release-dotnet.noarch : Config to enable the repository for DotNet on CentOS
-centos-release-gluster310.noarch : Gluster 3.10 (Long Term Stable) packages from the CentOS Storage SIG repository
-centos-release-gluster312.noarch : Gluster 3.12 (Long Term Stable) packages from the CentOS Storage SIG repository
-centos-release-gluster313.noarch : Gluster 3.13 (Short Term Stable) packages from the CentOS Storage SIG repository
-centos-release-gluster36.noarch : GlusterFS 3.6 packages from the CentOS Storage SIG repository
-centos-release-gluster37.noarch : GlusterFS 3.7 packages from the CentOS Storage SIG repository
-centos-release-gluster38.noarch : GlusterFS 3.8 packages from the CentOS Storage SIG repository
-centos-release-gluster39.noarch : Gluster 3.9 (Short Term Stable) packages from the CentOS Storage SIG repository
-centos-release-openshift-origin13.noarch : Yum configuration for OpenShift Origin 1.3 packages
-centos-release-openshift-origin14.noarch : Yum configuration for OpenShift Origin 1.4 packages
-centos-release-openshift-origin15.noarch : Yum configuration for OpenShift Origin 1.5 packages
-centos-release-openshift-origin36.noarch : Yum configuration for OpenShift Origin 3.6 packages
-centos-release-openshift-origin37.noarch : Yum configuration for OpenShift Origin 3.7 packages
-centos-release-openstack.noarch : OpenStack from the CentOS Cloud SIG repo configs
-centos-release-openstack-kilo.noarch : OpenStack from the CentOS Cloud SIG repo configs
-centos-release-openstack-liberty.noarch : OpenStack from the CentOS Cloud SIG repo configs
-centos-release-openstack-mitaka.noarch : OpenStack from the CentOS Cloud SIG repo configs
-centos-release-openstack-newton.noarch : OpenStack from the CentOS Cloud SIG repo configs
-centos-release-openstack-ocata.noarch : OpenStack from the CentOS Cloud SIG repo configs
-centos-release-openstack-pike.noarch : OpenStack from the CentOS Cloud SIG repo configs
-centos-release-openstack-queens.noarch : OpenStack from the CentOS Cloud SIG repo configs
-centos-release-opstools.noarch : Config to enable the repository for OpsTools SIG
-centos-release-ovirt35.noarch : oVirt 3.5 packages from the CentOS Virtualization SIG repository
-centos-release-ovirt36.noarch : oVirt 3.6 packages from the CentOS Virtualization SIG repository
-centos-release-ovirt40.noarch : oVirt 4.0 packages from the CentOS Virtualization SIG repository
-centos-release-ovirt41.noarch : oVirt 4.1 packages from the CentOS Virtualization SIG repository
-centos-release-ovirt42.noarch : oVirt 4.2 packages from the CentOS Virtualization SIG repository
-centos-release-qemu-ev.noarch : QEMU Enterprise Virtualization packages from the CentOS Virtualization SIG repository
-centos-release-scl.noarch : Software collections from the CentOS SCLo SIG
-centos-release-scl-rh.noarch : Software collections from the CentOS SCLo SIG (upstream scl only)
-centos-release-xen.x86_64 : CentOS Virt SIG Xen repo configs
-centos-release-xen-46.x86_64 : CentOS Virt Sig Xen repo configs for Xen 4.6
-centos-release-xen-48.x86_64 : CentOS Virt Sig Xen repo configs for Xen 4.8
-centos-release-xen-common.x86_64 : CentOS Virt Sig Xen support files
-centos-release-yum4.noarch : YUM4 packages from the CentOS ConfigManagement SIG repository
-{% endshell %}
-
-Please note that all these additional packages are provided as-is and support requests *should not* be addressed to the linux support team.
-
-> Most of these repositories are available with the `osrepos` module in the puppet world.
diff --git a/linux/distributions.md b/linux/distributions.md
deleted file mode 100644
index bc7b93e7ac8bfd1dc9c724e1b45a208489ef73a5..0000000000000000000000000000000000000000
--- a/linux/distributions.md
+++ /dev/null
@@ -1,19 +0,0 @@
-# CERN Linux Distributions
-
-At CERN, two distributions _Scientific Linux CERN 6_ and _CERN CentOS 7_
-are supported. <!--- FIXME --->
-
-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 are provided by CERN.
-
-If a bug is discovered a report is sent to Red Hat who will propose a fix.
-
-Technical support is primarily provided, at CERN, by Linux Support and outside by the community via official mailing lists, web forums, and chat rooms.
-
-Participating in these open source initiatives is available to any individual. New contributors for CERN are always a great addition.
-
-New releases are typically produced about few weeks after each Red Hat release.
-
-In the following section, details for each distribution will be given.
diff --git a/linux/doc.md b/linux/doc.md
deleted file mode 100644
index 6fdf279bc12bc1025ad77bf0e0cc82603b185f08..0000000000000000000000000000000000000000
--- a/linux/doc.md
+++ /dev/null
@@ -1,25 +0,0 @@
-## Website
-
-Linux website is available at the following URL https://linux.cern.ch.
-
-## CERN Documentation
-
-The website contain all the end-user documentation, we will extensively use it for the exercices during this tutorial.
-
-It contains up-to-date information about the lifecycle of distribution at CERN and the future plans.
- * [SLC6](https://linux.web.cern.ch/linux/scientific6/)
- * [CC7](https://linux.web.cern.ch/linux/centos7/)
-
-[Weekly updates](https://linux.web.cern.ch/linux/) are documented with link to relevant Red Hat reports if available.
-
-## Red Hat documentation
-
-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/)
-
-The Red Hat documentation is very useful to deep dive in specific part 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.
diff --git a/linux/kerberos.md b/linux/kerberos.md
deleted file mode 100644
index e69de29bb2d1d6434b8b29ae775ad8c2e48c5391..0000000000000000000000000000000000000000
diff --git a/linux/slc6.md b/linux/slc6.md
deleted file mode 100644
index 1412504762d781767f1ebb262aa998e67111f1b6..0000000000000000000000000000000000000000
--- a/linux/slc6.md
+++ /dev/null
@@ -1,56 +0,0 @@
-# Scientific Linux CERN 6
-
-## A bit of history
-
-Scientific Linux CERN 6 was released in 2010 and will be supported until at least Decembrer 2020.
-
-> Scientific Linux CERN 6 is a Linux distribution build within the framework of Scientific Linux which in turn is rebuilt from the freely available Red Hat Enterprise Linux 6 (Server) product sources under terms and conditions of the Red Hat EULA. Scientific Linux CERN is built to integrate into the CERN computing environment but it is not a site-specific product: all CERN site customizations are optional and can be deactivated for external users.
-
-## Default repositories
-
-Each Red Hat based distribution is shipped with few default repositories.
-
-Those repositories are install by `-release` rpm package.
-
-At CERN you can list them with :
-
-{% shell %}
-{% prompt "host ", delimiter="$ ", path="~ " %}
-{% command %}
-ls  /etc/yum.repos.d/*.repo
-{% info %}
--rw-r--r--. 1 root root 1616 Mar 28  2017 /etc/yum.repos.d/atrpms.repo
--rw-r--r--. 1 root root 1593 Mar 28  2017 /etc/yum.repos.d/elrepo.repo
--rw-r--r--. 1 root root 1543 Mar 28  2017 /etc/yum.repos.d/epel.repo
--rw-r--r--. 1 root root  211 Mar 28  2017 /etc/yum.repos.d/igtfca.repo
--rw-r--r--. 1 root root  988 Mar 28  2017 /etc/yum.repos.d/rpmforge.repo
--rw-r--r--. 1 root root  758 Mar 28  2017 /etc/yum.repos.d/slc6-cernonly.repo
--rw-r--r--. 1 root root  782 Mar 28  2017 /etc/yum.repos.d/slc6-extras.repo
--rw-r--r--. 1 root root  716 Mar 28  2017 /etc/yum.repos.d/slc6-os.repo
--rw-r--r--. 1 root root 1531 Mar 28  2017 /etc/yum.repos.d/slc6-rhcommon.repo
--rw-r--r--. 1 root root  761 Mar 28  2017 /etc/yum.repos.d/slc6-testing.repo
--rw-r--r--. 1 root root  763 Mar 28  2017 /etc/yum.repos.d/slc6-updates.repo
-{% endshell %}
-
-{% shell %}
-{% prompt "host ", delimiter="$ ", path="~ " %}
-{% command %}
-rpm -qf /etc/yum.repos.d/epel.repo
-{% info %}
-sl-release-6.9-1.slc6.x86_64
-{% endshell %}
-
-
-Additional -release rpm packages can be found with `yum search release`. On SLC 6 we have a small set, while it consider grew on CC 7.
-
-> 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/`.
-
-Let's detail specific CERN repositories.
-
-### cernonly repository
-
-This is a special repository only available inside cern, it contains proprietary software and tools very CERN specific.
-
-### extras repository
-
-This repository contain all additional software that linux support add to the main distribution. The packages are maintained at CERN.
diff --git a/lxplus/introduction.md b/lxplus/introduction.md
deleted file mode 100644
index 0677c5103bb0707397641eb83326be93792edd8b..0000000000000000000000000000000000000000
--- a/lxplus/introduction.md
+++ /dev/null
@@ -1,22 +0,0 @@
-# An introduction
-
-Official documentation: http://lxplusdoc.web.cern.ch/lxplusdoc/
-
-LXPLUS (Linux Public Login User Service) is the interactive logon service to Linux for all CERN users.
-The cluster LXPLUS consists of public machines provided by the IT Department for interactive work.
-
-You can use SSH to access it from anywhere in the world with your CERN account.
-
-A list of all lxplus aliases can be found at http://lxplusdoc.web.cern.ch/lxplusdoc/evolution/list.html
-
-It will be used extensively during this course.
-
-## Lxplus access
-
-### From linux
-
-Most Linux distributions have an ssh client installed.
-
-### From Windows
-
-You can use the putty tool.
diff --git a/mkdocs.yml b/mkdocs.yml
new file mode 100644
index 0000000000000000000000000000000000000000..c49c68dbbc34cefe283fccfb002cf297b0946f93
--- /dev/null
+++ b/mkdocs.yml
@@ -0,0 +1,56 @@
+site_name: Linux Training
+site_description: Linux Trainng
+site_author: Linux Support
+site_url: https://linux-training.web.cern.ch/
+
+repo_name: linuxtraining
+repo_url: https://gitlab.cern.ch/linuxsupport/linuxtraining
+edit_uri: 'blob/master'
+
+theme:
+    name: material
+
+markdown_extensions:
+  - admonition
+
+nav:
+  - 'Introduction':
+    - 'Introduction': index.md
+    - 'Prerequisites': introduction/prereq.md
+    - 'Checking your permissions': introduction/permissions.md
+    - 'LXPLUS': lxplus/introduction.md
+  - 'Distributions':
+    - 'Supported distributions': distributions/supported.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
+    - 'Kickstart': linux/kickstart.md
+    - 'Apply CERN settings': linux/locmap.md
+    - 'Red Hat licenses': linux/licenses.md
+    - 'Kerberos': linux/kerberos.md
+    - 'Open a great Linux support case': linux/support.md
+  - 'RPM and YUM':
+    - 'RPM 101': pkg/rpm.md
+    - 'YUM 101': pkg/yum.md
+    - 'Additional tools': pkg/tools.md
+  - 'Interacting with different storage solutions at CERN':
+    - 'AFS (Home directory)': storage/afs.md
+    - 'CVMFS': storage/cvmfs.md
+    - 'CERNBOX': storage/cernbox.md
+    - 'EOS': storage/eos.md
+    - 'S3': storage/s3.md
+  - 'Other services':
+    - 'Software mirrors at CERN': services/mirror.md
+    - 'KOJI RPM Software building service': services/koji.md
+    - 'Containers': services/containers.md
+  - 'Today I learned about...':
+    - 'CERN phonebook': til/phonebook.md
+    - 'Basic usage systemd / journald': til/systemd.md
+    - 'Run CERN docker images': til/docker.md
+  - 'Other useful information':
+    - 'FAQ': others/faq.md
diff --git a/others/faq.md b/others/faq.md
deleted file mode 100644
index 198112e17424679a51b42239a3937d181f314f3b..0000000000000000000000000000000000000000
--- a/others/faq.md
+++ /dev/null
@@ -1,22 +0,0 @@
-# Frequently asked questions
-
-## 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.
-You can contact us for further information.
-
-## 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.
-
-## 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.
-
-## 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.
diff --git a/pkg/tools.md b/pkg/tools.md
deleted file mode 100644
index 19cc935291bfbc8b60e33f96324cd8dbc7f1fb12..0000000000000000000000000000000000000000
--- a/pkg/tools.md
+++ /dev/null
@@ -1,69 +0,0 @@
-# Tools
-
-## yumdowloader
-
-`yumdownloader` is part of yum-utils package
-{% shell %}
-{% prompt "host ", delimiter="# ", path="~ " %}
-{% command %}
-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 %}
-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 %}
-/usr/bin/db_recover -h /var/lib/rpm
-{% info %}
-{% endshell %}
-
-## repoquery
-
-`repoquery` is part of yum-utils package
-{% shell %}
-{% prompt "host ", delimiter="# ", path="~ " %}
-{% command %}
-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 %}
-
diff --git a/pkg/yum.md b/pkg/yum.md
deleted file mode 100644
index f422dd1b935e4139d935dce49420e0a63c0436ac..0000000000000000000000000000000000000000
--- a/pkg/yum.md
+++ /dev/null
@@ -1,67 +0,0 @@
-# Yellowdog Updater Modified (YUM)
-
-## Clean yum cache
-
-YUM uses a cache to speed-up his operations, when you first logs on the machine it is a good idea to clear it.
-
-{% shell %}
-{% prompt "host ", delimiter="# ", path="~ " %}
-{% command %}
-yum clean all
-{% info %}
-{% endshell %}
-
-## Query
-
-Query packages available on your system
-{% shell %}
-{% prompt "host ", delimiter="# ", path="~ " %}
-{% command %}
-yum list
-{% info %}
-{% endshell %}
-
-Check installed kernel versions
-{% shell %}
-{% prompt "host ", delimiter="# ", path="~ " %}
-{% command %}
-yum list kernel
-{% info %}
-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 %}
-yum provides /usr/bin/korgac
-{% info %}
-Loaded plugins: changelog, fastestmirror, kernel-module, langpacks, protectbase, tsflags, versionlock
-Loading mirror speeds from cached hostfile
-
-[...]
-
-7:kdepim-4.10.5-7.el7.x86_64 : KDE PIM (Personal Information Manager) applications
-Repo        : @cr-testing
-Matched from:
-Filename    : /usr/bin/korgac
-{% endshell %}
-
-## Install a package
-
-{% shell %}
-{% prompt "host ", delimiter="# ", path="~ " %}
-{% command %}
-yum install wget
-{% info %}
-{% endshell %}
-
-## Remove a package
-
-{% shell %}
-{% prompt "host ", delimiter="# ", path="~ " %}
-{% command %}
-yum remove wget
-{% info %}
-{% endshell %}
diff --git a/services/containers.md b/services/containers.md
deleted file mode 100644
index 0016cd5e69f99e832b50e7464f19f1d30d1c6220..0000000000000000000000000000000000000000
--- a/services/containers.md
+++ /dev/null
@@ -1,19 +0,0 @@
-# Containers
-
-Official documentation : http://linux.web.cern.ch/linux/docs/dockerimages.shtml
-
-Linux support provides container, images are updated every 8 weeks.
-
-These images are built with koji.
-
-## Docker hub
-
-Official image can be downloaded at 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
diff --git a/services/mirror.md b/services/mirror.md
deleted file mode 100644
index f1d6031531ed4cfb0561203dad1c5e7530b872bd..0000000000000000000000000000000000000000
--- a/services/mirror.md
+++ /dev/null
@@ -1,15 +0,0 @@
-# Mirror service on linuxsoft.cern.ch
-
-## 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.
-
-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...).
-
-## Content
-
-You can browse local mirrors at : http://linuxsoft.cern.ch/mirror/
diff --git a/storage/cernbox.md b/storage/cernbox.md
deleted file mode 100644
index e69de29bb2d1d6434b8b29ae775ad8c2e48c5391..0000000000000000000000000000000000000000
diff --git a/storage/eos.md b/storage/eos.md
deleted file mode 100644
index e69de29bb2d1d6434b8b29ae775ad8c2e48c5391..0000000000000000000000000000000000000000
diff --git a/storage/s3.md b/storage/s3.md
deleted file mode 100644
index 976d964c5f1ef450b5c91f869687a987078c6fd3..0000000000000000000000000000000000000000
--- a/storage/s3.md
+++ /dev/null
@@ -1,27 +0,0 @@
-# CVMFS
-
-Official documentation: http://cern.ch/cephdocs
-
-Support: https://cern.service-now.com/service-portal/function.do?name=S3ObjectStorage
-
-## Introduction
-
-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
-
-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.
-
-## Install a client with yum
-
-yum install s3cmd
-
-## Configure s3cmd
-
-s3cmd ls s3://lxtrn
-
-
diff --git a/til/docker.md b/til/docker.md
deleted file mode 100644
index eb23d740bc73093b64c5d9a8976ffe20e52c3b53..0000000000000000000000000000000000000000
--- a/til/docker.md
+++ /dev/null
@@ -1,70 +0,0 @@
-# Docker
-
-## Installation on CC7
-
-{% shell %}
-{% prompt "host ", delimiter="# ", path="~ " %}
-{% command %}
-yun install docker-latest
-{% info %}
-{% endshell %}
-
-{% shell %}
-{% prompt "host ", delimiter="# ", path="~ " %}
-{% command %}
-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 %}
-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 %}
-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
-
-{% shell %}
-{% prompt "host ", delimiter="# ", path="~ " %}
-{% command %}
-docker ps
-{% info %}
-{% endshell %}
diff --git a/til/sc.md b/til/sc.md
deleted file mode 100644
index e69de29bb2d1d6434b8b29ae775ad8c2e48c5391..0000000000000000000000000000000000000000
diff --git a/til/systemd.md b/til/systemd.md
deleted file mode 100644
index 93283539f3b689e306aa0ee92cec25212818a6bb..0000000000000000000000000000000000000000
--- a/til/systemd.md
+++ /dev/null
@@ -1,130 +0,0 @@
-# Systemd
-
-This section contains few one liners to help with everyday systemd operations
-
-# systemctl
-
-Enable a service
-{% shell %}
-{% prompt "host ", delimiter="# ", path="~ " %}
-{% command %}
-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 %}
-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/til/tmux.md b/til/tmux.md
deleted file mode 100644
index e69de29bb2d1d6434b8b29ae775ad8c2e48c5391..0000000000000000000000000000000000000000
diff --git a/tools/201811-participants.txt b/tools/201811-participants.txt
deleted file mode 100644
index 8f39b3dc994bf003fc0096eb11a37b25c96ff5d1..0000000000000000000000000000000000000000
--- a/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