Merge branch 'master' of git.psi.ch:linux-infra/documentation

admin-guide/puppet/development.rst

@@ -11,7 +11,7 @@ workstations via sshfs.
 
 The typical workflow would be:
 
-   #. user mounts the environment area (``puppet01:/envs/`` on the puppet master) via sshfs on ``~/puppetenv``;
+   #. user mounts the environment area (``puppet01:/envs/`` on the puppet master - this is the directory /srv/puppet/code/dev/envs on puppet01!) via sshfs on ``~/puppetenv``;
    #. user create a directory for the new environent (``mkdir ~/puppetenv/issue_x``);
    #. after a few seconds ``issue_x`` will be populated with a copy of the content of the the ``preprod`` environment with a proper git branch named ``issue_x``;
    #. user edits files in that directory;

index.md

@@ -31,7 +31,22 @@ Right now following people are on the list:
 - Konrad Bucheli
 
 This email list is administered by Outlook in the following way (if you have manager right):
-[HowTo](pdf/HowToManageEmailList.pdf)
+
+- Open outlook and go to the address book
+
+![outlook_01.png](outlook_01.png)
+
+- Search for the PSI.Linux mailing list and double click
+
+![outlook_02.png](outlook_02.png)
+
+- Go to modify members (you only see this if you are a manager)
+
+![outlook_03.png](outlook_03.png)
+- Click on Add and add a new email address
+
+![outlook_04.png](outlook_04.png)
+
 
 ## Meetings