From 4f9cdfb6971bb84771cb74940a2d056719a4f601 Mon Sep 17 00:00:00 2001
From: Daniel Juarez Gonzalez <daniel.juarez.gonzalez@cern.ch>
Date: Wed, 22 Apr 2020 15:30:15 +0000
Subject: [PATCH 1/2] Escape hashes properly

---
 docs/centos7/docs/mod_auth_mellon.md  | 50 +++++++++---------
 docs/centos7/hardware/index.md        | 22 ++++----
 docs/docs/lyncav.md                   | 44 ++++++++--------
 docs/docs/mattermost.md               | 16 +++---
 docs/docs/ptrace_kernel_upgrade.md    | 34 ++++++------
 docs/docs/smartcards.md               | 74 +++++++++++++--------------
 docs/docs/ssokrb5.md                  | 14 ++---
 docs/koji/garbagecollection.md        |  2 +-
 docs/libreoffice.md                   | 10 ++--
 docs/ovm/index.md                     |  4 +-
 docs/scientific6/docs/dfsaccess.md    |  4 +-
 docs/scientific6/docs/softwaremgmt.md | 14 ++---
 12 files changed, 144 insertions(+), 144 deletions(-)

diff --git a/docs/centos7/docs/mod_auth_mellon.md b/docs/centos7/docs/mod_auth_mellon.md
index 10f30dbbe..ffacbcc4c 100644
--- a/docs/centos7/docs/mod_auth_mellon.md
+++ b/docs/centos7/docs/mod_auth_mellon.md
@@ -1,4 +1,4 @@
-<!--&#35include virtual="/linux/layout/header" -->
+<!--&#35;include virtual="/linux/layout/header" -->
 # CC7: CERN Single Sign-On using mod_auth_mellon
 
 <h2>CERN Single Sign On (SSO) integration with Apache and Mod_Auth_Mellon on CentOS CERN 7</h2>
@@ -13,7 +13,7 @@
 <h3>Installation</h3>
 As root on your system run:
 <pre>
-&#35 /usr/bin/yum install mod_auth_mellon_cern
+&#35; /usr/bin/yum install mod_auth_mellon_cern
 </pre>
 (above command will install on your system all needed dependencies, including
 mod_auth_mellon and httpd packages)
@@ -31,8 +31,8 @@ or can be obtained using the <a href="/docs/certificate-autoenroll">AutoEnrollme
 <ol>
 <li>Generate and install mod_auth_mellon metadata and certificates (subsitute <b>HOSTNAME</b> by your system hostname):
 <pre>
-&#35 cd /etc/httpd/conf.d/mellon/
-&#35 /usr/libexec/mod_auth_mellon/mellon_create_metadata.sh \
+&#35; cd /etc/httpd/conf.d/mellon/
+&#35; /usr/libexec/mod_auth_mellon/mellon_create_metadata.sh \
   https://<b>HOSTNAME</b>.cern.ch/mellon \
   https://<b>HOSTNAME</b>.cern.ch/mellon
 </pre>
@@ -50,20 +50,20 @@ MellonSPMetadataFile /etc/httpd/conf.d/mellon/https_<b>HOSTNAME</b>.cern.ch_mell
 </pre>
 <li>Review the default settings in <i><b>/etc/httpd/conf.d/auth_mellon_adfs_cern.conf</b></i>  (and/or: <i><b>/etc/httpd/conf.d/auth_mellon.conf</b></i>) editing path to protected location. Here is an example:
 <pre>
-    &#35 Enable authentication only for part of the web site
-    &#35 adjust to your path.
-    &#35 See: /usr/share/doc/mod_auth_mellon*/README for
-    &#35 detailed description of MellonCond
+    &#35; Enable authentication only for part of the web site
+    &#35; adjust to your path.
+    &#35; See: /usr/share/doc/mod_auth_mellon*/README for
+    &#35; detailed description of MellonCond
 
     &lt;Location /&gt;
 
        SSLRequireSSL
        MellonEnable "auth"
-       &#35
-       &#35 user authentication
+       &#35;
+       &#35; user authentication
        MellonCond ADFS_LOGIN <b>loginname</b> [MAP]
-       &#35
-       &#35 group authentication (e-groups)
+       &#35;
+       &#35; group authentication (e-groups)
        MellonCond ADFS_GROUP <b>groupname</b> [MAP]
 
      &lt;/Location&gt;</pre>
@@ -72,27 +72,27 @@ MellonSPMetadataFile /etc/httpd/conf.d/mellon/https_<b>HOSTNAME</b>.cern.ch_mell
 <br /><br />
 Or edit <i><b>.htaccess</b></i> file in a directory to be protected by mod_auth_mellon and insert in it:
 <pre>
- &#35 Enable authentication only for part of the web site
- &#35 adjust to your path.
- &#35 See: /usr/share/doc/mod_auth_mellon*/README for
- &#35 detailed description of MellonCond
+ &#35; Enable authentication only for part of the web site
+ &#35; adjust to your path.
+ &#35; See: /usr/share/doc/mod_auth_mellon*/README for
+ &#35; detailed description of MellonCond
 
  &lt;Location /&gt;
 
     SSLRequireSSL
     MellonEnable "auth"
-    &#35
-    &#35 user authentication
+    &#35;
+    &#35; user authentication
     MellonCond ADFS_LOGIN <b>loginname</b> [MAP]
-    &#35
-    &#35 group authentication (e-groups)
+    &#35;
+    &#35; group authentication (e-groups)
     MellonCond ADFS_GROUP <b>groupname</b> [MAP]
 
   &lt;/Location&gt;</pre>
 <li>Check that there aren't any syntax errors in the Apache configuration files by running the following command:
-  <pre>&#35 /usr/sbin/apachectl -t</pre>
+  <pre>&#35; /usr/sbin/apachectl -t</pre>
 <li>And if there aren't any syntax errors, then restart Apache for the changes to take effect:
-  <pre>&#35 /sbin/service httpd restart</pre>
+  <pre>&#35; /sbin/service httpd restart</pre>
 </li>
 </ol>
 <hr>
@@ -110,7 +110,7 @@ Or edit <i><b>.htaccess</b></i> file in a directory to be protected by mod_auth_
    <li>
      <b>Application Uri:</b> https://<b>HOSTNAME</b>.cern.ch/mellon/metadata
     <br />
-    (<b>Note:</b> same URL as used in metadata generation in the <a href="&#35cfg">Configuration</a> section above, subsititute <b>HOSTNAME</b> by your system hostname.)
+    (<b>Note:</b> same URL as used in metadata generation in the <a href="&#35;cfg">Configuration</a> section above, subsititute <b>HOSTNAME</b> by your system hostname.)
     <br /><br />
   </li>
 
@@ -157,7 +157,7 @@ Then if everything is correctly registered, your CERN SSO enabled application sh
         <pre>tail -f /var/log/httpd/ssl_error_log</pre>
       </li>
       <li>
-        For addional or alternative debugging you can, if you are using Firefox use this <a href="https://addons.mozilla.org/en-US/firefox/addon/saml-message-decoder-extension/">SAML Message Decoder Add&&#3545;on</a> <!-- or if you are using Google Chrome you can use this  <a href="https://chrome.google.com/webstore/detail/saml-message-decoder/mpabchoaimgbdbbjjieoaeiibojelbhm">SAML Message Decoder extension.</a> -->
+        For addional or alternative debugging you can, if you are using Firefox use this <a href="https://addons.mozilla.org/en-US/firefox/addon/saml-message-decoder-extension/">SAML Message Decoder Add&&#35;45;on</a> <!-- or if you are using Google Chrome you can use this  <a href="https://chrome.google.com/webstore/detail/saml-message-decoder/mpabchoaimgbdbbjjieoaeiibojelbhm">SAML Message Decoder extension.</a> -->
       </li>
     </ul>
     <br/>
@@ -171,4 +171,4 @@ Then if everything is correctly registered, your CERN SSO enabled application sh
 <h3>Support</h3>
 Please contact <a href="mailto:service-desk@cern.ch">CERN Service Desk</a> or use <a href="http://cern.ch/service-portal">CERN Service Portal</a> for support.
 
-<!--&#35include virtual="/linux/layout/footer" -->
+<!--&#35;include virtual="/linux/layout/footer" -->
diff --git a/docs/centos7/hardware/index.md b/docs/centos7/hardware/index.md
index e0a16b47e..be224bac4 100644
--- a/docs/centos7/hardware/index.md
+++ b/docs/centos7/hardware/index.md
@@ -98,15 +98,15 @@ Descriptions below are provided 'as-is' without any warranty.
 <li>In the laptop BIOS make sure 'Secure Boot' is disabled, and optionally enable 'UEFI boot'.
 <li>Install CERN CentOS 7.2 using PXE, and included ethernet adapter.
 <li>On first system boot, uncheck 'start AFS on system boot'.
-<li>Update the system: <pre># yum update</pre> (but <b>DO NOT</b> reboot yet).
-<li>Install upstream kernel (4.7 as of Sep 2016): <pre># yum --enablerepo=elrepo-kernel install kernel-ml</pre>
-<li>Set system to boot with above kernel: <pre># grep -P "submenu|^menuentry" /etc/grub2{-efi}.cfg | cut -d "'" -f2
-&#35 grub2-set-default "&lt;submenu title&gt;&lt;menu entry title&gt;"</pre>
+<li>Update the system: <pre>&#35; yum update</pre> (but <b>DO NOT</b> reboot yet).
+<li>Install upstream kernel (4.7 as of Sep 2016): <pre>&#35; yum --enablerepo=elrepo-kernel install kernel-ml</pre>
+<li>Set system to boot with above kernel: <pre>&#35; grep -P "submenu|^menuentry" /etc/grub2{-efi}.cfg | cut -d "'" -f2
+&#35; grub2-set-default "&lt;submenu title&gt;&lt;menu entry title&gt;"</pre>
 <li>Install updated firmware for WiFi card from: <a href="https://wireless.wiki.kernel.org/en/users/drivers/iwlwifi">https://wireless.wiki.kernel.org/en/users/drivers/iwlwifi</a>
  <ul>
  <li>Download version iwlwifi-8000-ucode-16.242414.0.tgz (or newer).
  <li>unzip the archive, copy iwlwifi-8000C-16.ucode to <pre>/lib/firmware</pre>
- <li>set selinux context: <pre>&#35 chcon system_u:object_r:lib_t:s0 /lib/firmware/iwlwifi-8000C-16.ucode</pre>
+ <li>set selinux context: <pre>&#35; chcon system_u:object_r:lib_t:s0 /lib/firmware/iwlwifi-8000C-16.ucode</pre>
  </ul>
 <li>Reboot the system.
 </ul>
@@ -135,8 +135,8 @@ All features of ThinkPad X1 Carbon system installed as above do function correct
 <ul>
 <li>Install nvidia drivers from ElRepo repository:
 <pre>
-&#35 yum --enablerepo=elrepo install nvidia-x11-drv (nvidia-x11-drv-32bit)
-&#35 reboot
+&#35; yum --enablerepo=elrepo install nvidia-x11-drv (nvidia-x11-drv-32bit)
+&#35; reboot
 </pre>
 <li>While monitors setup can be autoconfigured, you may want to put in place
 your own <pre>/etc/X11/xorg.conf</pre> X11 configuration file.
@@ -155,8 +155,8 @@ your own <pre>/etc/X11/xorg.conf</pre> X11 configuration file.
     <li> Default Open source driver (nouveau) works, however if you want better OpenGL performances you should activate the proprietary nvidia driver.
     <li> Install nvidia drivers from ElRepo repository:
     <pre>
-    &#35 yum --enablerepo=elrepo install nvidia-x11-drv
-    &#35 reboot
+    &#35; yum --enablerepo=elrepo install nvidia-x11-drv
+    &#35; reboot
     </pre>
 </ul>
 
@@ -168,7 +168,7 @@ Without a device specific configuration some mouse/keyboard lockups may happen w
 <ul>
  <li>Please install:
      <pre>
-     &#35 yum install logitech-p710e-config
+     &#35; yum install logitech-p710e-config
      </pre>
  <li>Then reboot your system (or restart XWindows)
  <li>Configure the device as <b>Duplex analog audio</b> in your audio mixer.
@@ -184,7 +184,7 @@ Without a device specific configuration some mouse/keyboard lockups may happen w
 <ul>
  <li>Please install:
      <pre>
-     &#35 yum install logitech-h570e-config
+     &#35; yum install logitech-h570e-config
      </pre>
  <li>Then reboot your system (or restart XWindows)
  <li>Configure the device as <b>Duplex analog audio</b> in your audio mixer.
diff --git a/docs/docs/lyncav.md b/docs/docs/lyncav.md
index 4974fddc6..4c5597104 100644
--- a/docs/docs/lyncav.md
+++ b/docs/docs/lyncav.md
@@ -1,4 +1,4 @@
-<!--&#35include virtual="/linux/layout/header" -->
+<!--&#35;include virtual="/linux/layout/header" -->
 # Pidgin integration with Microsoft Skype for Business (formerly Lync): Voice/Video
 
 <p>
@@ -24,16 +24,16 @@ Sharing using Kerberos authentication.
 
 As root on your CERN CentOS 7 system run:
 <pre>
-&#35 yum install pidginvv-release
+&#35; yum install pidginvv-release
 </pre>
 <p>
-(if you use upstream CentOS 7, not CERN CentOS 7 save this <a href="../lyncav/pidginvv.repo">repository definition file</a> as <i>/etc/yum.repos.d/pidginvv.repo</i> and enable EPEL repository: <i>&#35 yum install epel-release</i>)
+(if you use upstream CentOS 7, not CERN CentOS 7 save this <a href="../lyncav/pidginvv.repo">repository definition file</a> as <i>/etc/yum.repos.d/pidginvv.repo</i> and enable EPEL repository: <i>&#35; yum install epel-release</i>)
 <p>
 
 then:
 
 <pre>
-&#35 yum install pidginvv
+&#35; yum install pidginvv
 </pre>
 
 Above commands will install a version of pidgin internet messenger built with voice and video support on your system (including all needed
@@ -148,7 +148,7 @@ While connecting a message "user.name@cern.ch disconnected - Read Error" is show
 <p>
 Workaround:  disable ipv6 on your system:
 <pre>
-&#35 /usr/sbin/sysctl -w net.ipv6.conf.all.disable_ipv6=1
+&#35; /usr/sbin/sysctl -w net.ipv6.conf.all.disable_ipv6=1
 </pre>
 an retry.
 <p>
@@ -161,9 +161,9 @@ transfers hang or timeout.
 <p>
 Workaround: open a range of high-numbered port range in your local system firewall:
 <pre>
-&#35 firewall-cmd --zone=public --add-port=50000-59999/udp --permanent
-&#35 firewall-cmd --zone=public --add-port=50000-59999/tcp --permanent
-&#35 firewall-cmd --reload
+&#35; firewall-cmd --zone=public --add-port=50000-59999/udp --permanent
+&#35; firewall-cmd --zone=public --add-port=50000-59999/tcp --permanent
+&#35; firewall-cmd --reload
 </pre>
 and retry.
 
@@ -177,14 +177,14 @@ If you connect from public network same port ranges (50000-59999) as for Desktop
 <p>
 If you connect from a home network, your router must have UPnP (Universal Plug and Play) service enabled and your local system firewall must be opened for uPnP traffic. CentOS firewalld assumes that when on a non-routable network (typical home NAT network setup) your system is in 'home' firewall zone, you can check this running:
 <pre>
-&#35 firewall-cmd --get-active-zones
+&#35; firewall-cmd --get-active-zones
 home
   interfaces: XXXX
 </pre>
 If this is the case you should allow all traffic from yor home router to your system by running:
 <pre>
-&#35 firewall-cmd --zone=home  --add-rich-rule='rule family="ipv4" source address="X.X.X.X" accept' --permanent
-&#35 firewall-cmd --reload
+&#35; firewall-cmd --zone=home  --add-rich-rule='rule family="ipv4" source address="X.X.X.X" accept' --permanent
+&#35; firewall-cmd --reload
 </pre>
 where <b>X.X.X.X</b> is your home router address (usually: <b>192.168.1.1</b>/<b>192.168.0.1</b>).
 
@@ -225,7 +225,7 @@ Sometimes after a previous attempt of a Video Call, pidgin reports <b>webcam err
 Workaround: may need to restart the application. Alternatively: use another webcam application (<i>cheese</i>) or command
 line video4linux tools (<i>v4l2-ctl</i>) to reset the webcam, to install these run:
 <pre>
-&#35 yum install cheese v4l-utils
+&#35; yum install cheese v4l-utils
 </pre>
 
 <h3>Microphone Error</h3>
@@ -249,20 +249,20 @@ Please check <a href="https://github.com/tieto/sipe/issues">Tieto sipe issue tra
 
 Pidgin with Voice/Video enabled depends on additional applications and libraries which have been compiled and can also be used independently:
 <ul>
- <li><b>remmina</b> (updated remote desktop / multi protocol application) <pre>&#35 /usr/bin/scl enable pidginvv remmina</pre> (you may want to install additional remmina plugins too: <pre> &#35 yum install pidginvv-remmina-plugins-gnome pidginvv-remmina-plugins-spice pidginvv-remmina-plugins-vnc pidginvv-remmina-plugins-xdmcp</pre>)
+ <li><b>remmina</b> (updated remote desktop / multi protocol application) <pre>&#35; /usr/bin/scl enable pidginvv remmina</pre> (you may want to install additional remmina plugins too: <pre> &#35; yum install pidginvv-remmina-plugins-gnome pidginvv-remmina-plugins-spice pidginvv-remmina-plugins-vnc pidginvv-remmina-plugins-xdmcp</pre>)
 (make sure your default system remmina is not running at the same time)
 
- <li><b>freerdp</b> (updated remote desktop RDP client ) <pre>&#35 /usr/bin/scl enable pidginvv xfreerdp</pre>
- <li><b>other software</b> (audio/video encoders/decoders, codecs and gstreamer1 framework .. etc). To see available packages run: <pre> &#35 yum search pidginvv </pre>. In order to use these you can follow this example: <pre>&#35 yum install pidginvv-x264
-&#35 scl enable pidginvv bash
-&#35 x264 --help
+ <li><b>freerdp</b> (updated remote desktop RDP client ) <pre>&#35; /usr/bin/scl enable pidginvv xfreerdp</pre>
+ <li><b>other software</b> (audio/video encoders/decoders, codecs and gstreamer1 framework .. etc). To see available packages run: <pre> &#35; yum search pidginvv </pre>. In order to use these you can follow this example: <pre>&#35; yum install pidginvv-x264
+&#35; scl enable pidginvv bash
+&#35; x264 --help
 </pre>
  <li>Additional pidgin plugins:
  <ul>
-   <li>Mattermost Chat: <pre>&#35 yum install pidginvv-pidgin-mattermost</pre> (see <a href="../mattermost">documentation</a> for configuration information)
-   <li>Facebook Chat: <pre>&#35 yum install pidginvv-pidgin-facebook</pre> (instant messaging only, no Workplace Chat)
-   <li>Skype Chat: <pre>&#35 yum install pidginvv-pidgin-skypeweb</pre> (instant messaging only)
-   <li>Google Hangouts: <pre>&#35 yum install pidginvv-pidgin-hangouts</pre> (instant messaging only, initiates outgoing voice/video call and connects but no sound/image, cannot receive calls)
+   <li>Mattermost Chat: <pre>&#35; yum install pidginvv-pidgin-mattermost</pre> (see <a href="../mattermost">documentation</a> for configuration information)
+   <li>Facebook Chat: <pre>&#35; yum install pidginvv-pidgin-facebook</pre> (instant messaging only, no Workplace Chat)
+   <li>Skype Chat: <pre>&#35; yum install pidginvv-pidgin-skypeweb</pre> (instant messaging only)
+   <li>Google Hangouts: <pre>&#35; yum install pidginvv-pidgin-hangouts</pre> (instant messaging only, initiates outgoing voice/video call and connects but no sound/image, cannot receive calls)
  </ul>
 </ul>
 
@@ -273,4 +273,4 @@ Please report problems to <a href="mailto:linux.support@cern.ch">linux support @
 
 <hr>
 
-<!--&#35include virtual="/linux/layout/footer" -->
+<!--&#35;include virtual="/linux/layout/footer" -->
diff --git a/docs/docs/mattermost.md b/docs/docs/mattermost.md
index 3a473b494..5133a1dc5 100644
--- a/docs/docs/mattermost.md
+++ b/docs/docs/mattermost.md
@@ -13,11 +13,11 @@ This documentation outlines the setup process allowing to use other Linux client
 
 As root on your CERN CentOS 7 system run:
 <pre>
-# yum install mattermost-desktop
+&#35; yum install mattermost-desktop
 </pre>
 in order to install mattermost desktop client, or run:
 <pre>
-# yum --enablerepo=cern-testing install pidgin pidgin-mattermost pidgin-mattermost-sso-helper
+&#35; yum --enablerepo=cern-testing install pidgin pidgin-mattermost pidgin-mattermost-sso-helper
 </pre>
 <p>
 in order to install pidgin - mattermost integration.
@@ -27,7 +27,7 @@ in order to install pidgin - mattermost integration.
 
 Obtain Gitlab authentication token:
 <pre>
-# pidgin-mattermost-sso-helper
+&#35; pidgin-mattermost-sso-helper
 XXXXXXXXXXXXXXXXXXXXXX
 </pre>
 Pidgin:
@@ -66,7 +66,7 @@ For more information about Pidgin Mattermost plugin please visit: <a href="https
 
 <h3>Installation</h3>
 
-# yum --enablerepo=cern-testing install pidgin-matterircd-sso-helper
+&#35; yum --enablerepo=cern-testing install pidgin-matterircd-sso-helper
 
 This configuration process assumes standard CERN CentOS 7 (CC7) desktop with Kerberos authentication
 in use. (this is needed in order to obtain mattermost gitlab authentication token using cern-get-sso-cookie).
@@ -79,8 +79,8 @@ in use. (this is needed in order to obtain mattermost gitlab authentication toke
  <td>&nbsp;</td>
  <td>
  <pre>
- # systemctl enable matterircd
- # systemctl start matterircd
+ &#35; systemctl enable matterircd
+ &#35; systemctl start matterircd
  </pre>
 (default configuration will start <a href="https://github.com/42wim/matterircd">matterircd</a> listening on localhost port 6667, logging to <i>/var/log/matterircd/matterircd.log</i>)
  </td>
@@ -166,7 +166,7 @@ in use. (this is needed in order to obtain mattermost gitlab authentication toke
  Add Matternost channels to your list: <b></b>
   <ul>
    <li><b>Tools -> Room List -> Account: cernlogin@localhost (IRC) -> Get List</b>
-   <li><b>Add Chat -> Channel: #XXXX -> Add</b>
+   <li><b>Add Chat -> Channel: &#35;XXXX -> Add</b>
  </ul>
 </td>
 </tr>
@@ -188,7 +188,7 @@ in use. (this is needed in order to obtain mattermost gitlab authentication toke
 <li>All users in a chat room (mattermost channel) are always 'online' (this is mattermost limitation)
 <li>messages exchanged while you have been offline are not visible but you can ask server to do a 'scrollback' for you, type
      in conversation window:
-    <pre>/msg mattermost scrollback #linux 1000</pre>
+    <pre>/msg mattermost scrollback &#35;linux 1000</pre>
      and check mattermost buddy conversation.
 <li>login method is ... complicated: matterircd author <a href="https://github.com/42wim/matterircd/issues/72">did not implement NickServ</a>.
 <li>current version of matterircd (v0.10.2) works with Mattermost 3.4 platform: for the update to 3.5 coming soon updated matterircd (v0.11.0) will be required.
diff --git a/docs/docs/ptrace_kernel_upgrade.md b/docs/docs/ptrace_kernel_upgrade.md
index f10e6e77b..cd6569069 100644
--- a/docs/docs/ptrace_kernel_upgrade.md
+++ b/docs/docs/ptrace_kernel_upgrade.md
@@ -1,4 +1,4 @@
-<!--&#35include virtual="/linux/layout/header" -->
+<!--&#35;include virtual="/linux/layout/header" -->
 # ptrace
 
 <p>CERN has seen a number of compromised Linux machines during the last
@@ -24,8 +24,8 @@ it.
 <a name="check">
 <ul>
 <li>if you have AFS:
-<pre>&#35 cd /afs/cern.ch/project/security/cern/public/tools/check-rootkit
-&#35 ./crk</pre>
+<pre>&#35; cd /afs/cern.ch/project/security/cern/public/tools/check-rootkit
+&#35; ./crk</pre>
 
 <p>(see the README file there and <tt>"crk -h"</tt> for more details)
 
@@ -36,14 +36,14 @@ it.
   local directory and the script run from there, please see the README
   file for details.
 
-<pre>&#35 scp -r username@lxplus:/afs/cern.ch/project/security/cern/public/tools/check-rootkit   /tmp/check-rootkit
-&#35 cd /tmp/check-rootkit
-&#35 ./crk</pre>
+<pre>&#35; scp -r username@lxplus:/afs/cern.ch/project/security/cern/public/tools/check-rootkit   /tmp/check-rootkit
+&#35; cd /tmp/check-rootkit
+&#35; ./crk</pre>
 
   <li>Alternatively, a simple check for the rootkit ("suckit") seen
   lately at CERN is
 
-  <pre>&#35 ls -li /sbin/init /sbin/telinit</pre>
+  <pre>&#35; ls -li /sbin/init /sbin/telinit</pre>
 
   <p>On a "good" machine, this should give <tt>/sbin/telinit</tt> as a
   symbolic link to <tt>init</tt>. With the rootkit, both appear as regular
@@ -79,7 +79,7 @@ Base distribution: Red Hat Linux release 7.3 (Valhalla)<br>
 Previous kernel(s): 2.4.18-17.7.x, 2.4.18-18.7.x
 
 <p>Please follow the recipe published at <a
-  href="http://linux.web.cern.ch/linux&#35731kern1"
+  href="http://linux.web.cern.ch/linux&#35;731kern1"
   >http://linux.web.cern.ch/linux/</a>
 
 <p>When upgrading OpenAFS, you may receive messages about editing
@@ -99,8 +99,8 @@ Previous kernel(s): 2.4.9-31.1.cern
 7.3.2 repository, before being able to do the kernel upgrade itself
 (thanks to T.Wildish):
 
-<pre>&#35 cd /afs/cern.ch/project/linux/redhat/cern/7.3.2/i386/RedHat/RPMS/
-&#35 rpm -Fvh modutils-*rpm dev-*rpm iptables-*rpm xfsprogs-*rpm
+<pre>&#35; cd /afs/cern.ch/project/linux/redhat/cern/7.3.2/i386/RedHat/RPMS/
+&#35; rpm -Fvh modutils-*rpm dev-*rpm iptables-*rpm xfsprogs-*rpm
 </pre>
 
 
@@ -117,7 +117,7 @@ Previous kernel(s): 2.2.19-6.2.1.1, 2.2.12-20
   6.1.1-based desktop machine, this will create more problems for you
   in the future when no more updates will be made available:
 
-<pre>&#35 cd /afs/cern.ch/project/linux/redhat/cern/6.1.1/updates/
+<pre>&#35; cd /afs/cern.ch/project/linux/redhat/cern/6.1.1/updates/
 </pre>
 
   Upgrade the kernel RPMs that you have already installed. Please note
@@ -128,7 +128,7 @@ Previous kernel(s): 2.2.19-6.2.1.1, 2.2.12-20
   install the kernel in parallel to the one you already have,
   i.e. <tt>rpm -i</tt> instead of <tt>rpm -F</tt>)
 
-<pre>&#35 rpm -Fvh kernel-2.2.24-6.2.3.1.i686.rpm \
+<pre>&#35; rpm -Fvh kernel-2.2.24-6.2.3.1.i686.rpm \
            kernel-headers-2.2.24-6.2.3.1.i386.rpm \
            kernel-utils-2.2.24-6.2.3.1.i386.rpm
 </pre>
@@ -145,16 +145,16 @@ some older distribution.</p>
   need additional modules to boot (e.g. with a SCSI or RAID system
   disk), you can prepare an initial RAM disk with the following command:
 
-<pre>&#35 /sbin/mkinitrd /boot/initrd-2.2.24-6.2.3.1.img 2.2.24-6.2.3.1
+<pre>&#35; /sbin/mkinitrd /boot/initrd-2.2.24-6.2.3.1.img 2.2.24-6.2.3.1
 </pre>
 
 Run LILO to update the boot information:
-<pre>&#35 /sbin/lilo
+<pre>&#35; /sbin/lilo
 </pre>
 
   Upgrade AFS to a version that has modules for the new kernel:
 
-<pre>&#35 /usr/sue/etc/sue.install afs
+<pre>&#35; /usr/sue/etc/sue.install afs
 </pre>
 
   Reboot and test.
@@ -172,7 +172,7 @@ configuration (use <tt>/sbin/lsmod</tt> to identify kernel modules
 loaded during operation), and preload these via explicit
 <tt>/sbin/modprobe</tt> commands.
 
-<pre>&#35 echo "/nomoremodules" > /proc/sys/kernel/modprobe
+<pre>&#35; echo "/nomoremodules" > /proc/sys/kernel/modprobe
 </pre>
 
 <p>From now on, failed attempts to load modules will show up in
@@ -185,5 +185,5 @@ loaded during operation), and preload these via explicit
 you will need to change the <tt>/etc/lilo.conf</tt> file (and re-run
 <tt>/sbin/lilo</tt>), or change <tt>/etc/grub.conf</tt>.
 
-<!--&#35include virtual="/linux/layout/footer" -->
+<!--&#35;include virtual="/linux/layout/footer" -->
 
diff --git a/docs/docs/smartcards.md b/docs/docs/smartcards.md
index e02810476..a23d16725 100644
--- a/docs/docs/smartcards.md
+++ b/docs/docs/smartcards.md
@@ -35,11 +35,11 @@ As root on your system:
 <ul>
 <li> Execute:
 <pre>
-&#35 /usr/bin/yum --enablerepo=slc6-cernonly install cern-smartcard firefox-aetssic thunderbird-aetssic gdm-plugin-smartcard
-&#35 /usr/bin/yum remove esc openct coolkey
-&#35 /sbin/chkconfig --del pcscd
-&#35 /sbin/chkconfig --add pcscd
-&#35 /sbin/service pcscd restart
+&#35; /usr/bin/yum --enablerepo=slc6-cernonly install cern-smartcard firefox-aetssic thunderbird-aetssic gdm-plugin-smartcard
+&#35; /usr/bin/yum remove esc openct coolkey
+&#35; /sbin/chkconfig --del pcscd
+&#35; /sbin/chkconfig --add pcscd
+&#35; /sbin/service pcscd restart
 </pre>
 <li> Copy:
  <ul>
@@ -53,7 +53,7 @@ As root on your system:
 	<li>Copy <a href="../smartcards/fingerprint-auth-ac">fingerprint-auth-ac</a> to <i>/etc/pam.d/fingerprint-auth-ac</i>
         <li>Execute as root:
             <pre>
- &#35 /usr/bin/gconftool-2 --direct --config-source=xml:readwrite:/etc/gconf/gconf.xml.mandatory \
+ &#35; /usr/bin/gconftool-2 --direct --config-source=xml:readwrite:/etc/gconf/gconf.xml.mandatory \
                         -s /desktop/gnome/peripherals/smartcard/removal_action lock_screen \
                         --type string
 	    </pre>
@@ -61,7 +61,7 @@ As root on your system:
  </ul>
 <li> Reboot the system:
 <pre>
-&#35 /sbin/shutdown -r now
+&#35; /sbin/shutdown -r now
 </pre>
 </ul>
 <p>
@@ -70,7 +70,7 @@ Detailed installation/configuration instructions follow.
 <a name="install"></a><h2>Installation</h2>
 As root on your SLC6 system run:
 <pre>
-&#35 yum --enablerepo=slc6-cernonly install cern-smartcard
+&#35; yum --enablerepo=slc6-cernonly install cern-smartcard
 </pre>
 to add basic smartcard / pkinit support to your system, following packages will be installed:
 <ul>
@@ -81,7 +81,7 @@ to add basic smartcard / pkinit support to your system, following packages will
 <li> Generic USB CCID smart card reader driver (<i>ccid</i>)
 </ul>
 <pre>
-&#35 yum --enablerepo=slc6-cernonly install firefox-aetssic thunderbird-aetssic gdm-plugin-smartcard
+&#35; yum --enablerepo=slc6-cernonly install firefox-aetssic thunderbird-aetssic gdm-plugin-smartcard
 </pre>
 to add smartcard support to Firefox,Thunderbird and Gnome Display Manager -  following packages will be installed:
 <ul>
@@ -92,15 +92,15 @@ to add smartcard support to Firefox,Thunderbird and Gnome Display Manager -  fol
 </ul>
 After installing above packages please restart Firefox / Thunderbird
 <pre>
-&#35 yum remove esc openct coolkey
+&#35; yum remove esc openct coolkey
 </pre>
 to remove ESC (Enterprise Security Client Smart Card Client), OpenCT (Middleware framework for smart card terminals) and CoolKey ( CoolKey PKCS #11 module) - which interfere with SafeSign middleware used for CERN SmartCards.
 <p>
 Make sure that pcscd (PC/SC Lite smart card daemon) is started:
 <pre>
-&#35 /sbin/chkconfig --del pcscd
-&#35 /sbin/chkconfig --add pcscd
-&#35 /sbin/service pcscd restart
+&#35; /sbin/chkconfig --del pcscd
+&#35; /sbin/chkconfig --add pcscd
+&#35; /sbin/service pcscd restart
 </pre>
 (the <i>/sbin/chkconfig --del pcscd</i> is a workaround: we have observed that on some systems <b>pcscd</b> is started in wrong order)
 <hr>
@@ -173,7 +173,7 @@ Please edit/change <i>system/password/smartcard/fingerprint -auth-ac</i> files <
 
 If you would like to lock screen automatically on smart card removal, execute as root:
 <pre>
-&#35 /usr/bin/gconftool-2 --direct --config-source=xml:readwrite:/etc/gconf/gconf.xml.mandatory \
+&#35; /usr/bin/gconftool-2 --direct --config-source=xml:readwrite:/etc/gconf/gconf.xml.mandatory \
                        -s /desktop/gnome/peripherals/smartcard/removal_action lock_screen \
                        --type string
 </pre>
@@ -343,7 +343,7 @@ Select one of your certificates and click <b>OK</b> to sign the document.
 <h4>Pcscd</h4>
 On some systems <b>pcscd</b> (PC/SC Smart Card Daemon) demon is started in wrong order and dies upon startup (should be started after haldaemon but sometimes is started before). Please check:
 <pre>
-&#35 service pcscd status
+&#35; service pcscd status
 </pre>
 and if the result is:
 <pre>
@@ -351,25 +351,25 @@ pcscd dead but subsys locked ...
 </pre>
 check the following:
 <pre>
-&#35 ls -1 /etc/rc3.d/S*{pcscd,haldaemon}
+&#35; ls -1 /etc/rc3.d/S*{pcscd,haldaemon}
 /etc/rc3.d/S26haldaemon
 /etc/rc3.d/S27pcscd
 </pre>
 If the order is reversed (for example <i>S25pcscd</i> and <i>S26haldaemon</i>) please execute following:
 <pre>
-&#35 /sbin/chkconfig --del pcscd
-&#35 /sbin/chkconfig --add pcscd
+&#35; /sbin/chkconfig --del pcscd
+&#35; /sbin/chkconfig --add pcscd
 </pre>
 then check the order again, and restart pcscd:
 <pre>
-&#35 /sbin/service pcscd restart
+&#35; /sbin/service pcscd restart
 </pre>
 
 
 <h4>Kinit</h4>
 <b>kinit</b> hangs 'forever' when called without username by different user than the certificate on the smartcard is for:
 <pre>
-&#35 whoami && kinit
+&#35; whoami && kinit
 jarek
 Jarek Polok PIN:
 kinit: Client name mismatch while getting initial credentials
@@ -377,10 +377,10 @@ kinit: Client name mismatch while getting initial credentials
 </pre>
 The certificate matches username 'jpolok' but current username is 'jarek' (press <b>Ctrl-C</b> to break). As a workaround use:
 <pre>
-&#35 whoami && kinit jpolok
+&#35; whoami && kinit jpolok
 jarek
 Jarek Polok PIN:
-&#35
+&#35;
 </pre>
 <strike><h4>Gnome Screensaver (while using SmartCard for logins 1/3)</h4>
 While unlocking the screen Kerberos ticket and AFS token are not always properly refreshed: on unlock these should be extended by 24 hours
@@ -419,7 +419,7 @@ no support for smartcards.
 <h4>pkcs11-tool</h4>
 pkcs11-tool (partially) fails testing the card/certificates:
 <pre>
-&#35 /usr/bin/pkcs11-tool --module libaetpkss.so -t --login
+&#35; /usr/bin/pkcs11-tool --module libaetpkss.so -t --login
 Using slot 0 with a present token (0xcd01)
 Logging in to "Jarek Polok".
 Please enter User PIN:
@@ -443,7 +443,7 @@ Decryption (RSA)
 ...
 Aborting.
 
-&#35 /usr/bin/pkcs11-tool --module libaetpkss.so -s --login
+&#35; /usr/bin/pkcs11-tool --module libaetpkss.so -s --login
 Using slot 0 with a present token (0xcd01)
 Logging in to "Jarek Polok".
 Please enter User PIN:
@@ -461,18 +461,18 @@ Before reporting a problem, please verify the following on your system:
 <ul>
 <li> That <b>pcscd</b> daemon is running:
 <pre>
-&#35 /sbin/service pcscd status
+&#35; /sbin/service pcscd status
 pcscd (pid XXXXX) is running...
 </pre>
 <li> SafeSign module installation in NSS database:
 <pre>
-&#35 /usr/bin/modutil -list -dbdir /etc/pki/nssdb
+&#35; /usr/bin/modutil -list -dbdir /etc/pki/nssdb
 
-Listing of PKCS &#3511 Modules
+Listing of PKCS &#35;11 Modules
 -----------------------------------------------------------
-  1. NSS Internal PKCS &#3511 Module
+  1. NSS Internal PKCS &#35;11 Module
 ...
-  2. SafeSign IC PKCS&#3511 Module
+  2. SafeSign IC PKCS&#35;11 Module
 	library name: libaetpkss.so
 	 slots: 5 slots attached
 	status: loaded
@@ -483,7 +483,7 @@ Listing of PKCS &#3511 Modules
 </pre>
 <li> System trusted certificates:
 <pre>
-&#35 /usr/bin/certutil -L -d /etc/pki/nssdb
+&#35; /usr/bin/certutil -L -d /etc/pki/nssdb
 
 Certificate Nickname                                         Trust Attributes
                                                              SSL,S/MIME,JAR/XPI
@@ -493,13 +493,13 @@ CERN Trusted Certification Authority                         CT,C,C
 </pre>
 <li> SmartCard/reader:
 <pre>
-&#35 /usr/bin/tokenman
+&#35; /usr/bin/tokenman
 </pre>
 (or select 'SafeSign Identity Client Token Manager' from menu 'Applications' , submenu 'System Tools')
-<li> PKCS&#3511 module state  in firefox/thunderbird (select 'Edit' - 'Preferences' - 'Advanced' - 'Encryption' - 'Security Devices') - you should see 'A.E.T. SafeSign IC PKCS&#3511 Module' loaded.)
+<li> PKCS&#35;11 module state  in firefox/thunderbird (select 'Edit' - 'Preferences' - 'Advanced' - 'Encryption' - 'Security Devices') - you should see 'A.E.T. SafeSign IC PKCS&#35;11 Module' loaded.)
 <li> pam_pkcs11 mapper (if SmartCard used for logins):
 <pre>
-&#35 /usr/bin/pkcs11_inspect
+&#35; /usr/bin/pkcs11_inspect
 PIN for token:
 Printing data for mapper cn:
 jpolok
@@ -508,9 +508,9 @@ Jarek Polok
 </pre>
 <li>Kerberos ticket/AFS token:
 <pre>
-&#35 kinit
+&#35; kinit
 Jarek Polok PIN:
-&#35 klist
+&#35; klist
 Ticket cache: FILE:/tmp/krb5cc_14213
 Default principal: jpolok@CERN.CH
 
@@ -519,7 +519,7 @@ Valid starting     Expires            Service principal
 	renew until 07/25/12 10:20:09
 07/20/12 10:20:13  07/21/12 11:20:09  afs/cern.ch@CERN.CH
 	renew until 07/25/12 10:20:09
-&#35 tokens
+&#35; tokens
 
 Tokens held by the Cache Manager:
 
@@ -528,7 +528,7 @@ User's (AFS ID 14213) tokens for afs@cern.ch [Expires Jul 21 11:20]
 </pre>
 <li>token state with pkcs11-tool:
 <pre>
-&#35 /usr/bin/pkcs11-tool --module libaetpkss.so -L
+&#35; /usr/bin/pkcs11-tool --module libaetpkss.so -L
 Available slots:
 Slot 0 (0xcd01): SCM SCR 3311 (21121110201685) 00 00
   token label:   Jarek Polok
diff --git a/docs/docs/ssokrb5.md b/docs/docs/ssokrb5.md
index a7590163a..7e18aa05e 100644
--- a/docs/docs/ssokrb5.md
+++ b/docs/docs/ssokrb5.md
@@ -1,4 +1,4 @@
-<!--&#35include virtual="/linux/layout/header" -->
+<!--&#35;include virtual="/linux/layout/header" -->
 # Using Kerberos authentication for CERN Single Sign On (SSO) / firefox
 <h2>>Using Kerberos authentication for CERN Single Sign On (SSO) / firefox </h2>
 CERN uses Microsoft Active Directory Federation Services (ADFS) to provide Single Sign-On (SSO) to provide
@@ -16,7 +16,7 @@ Linux distributions, the same functionality shall be applicable on any modern Li
 
 As root on your SLC6 or SLC5 system run:
 <pre>
-&#35 yum install mozilla-prefs
+&#35; yum install mozilla-prefs
 </pre>
 
 once installation of required software packages finishes, please restart Firefox.<br>
@@ -25,9 +25,9 @@ once installation of required software packages finishes, please restart Firefox
 <h2>Software installation for Chromium </h2>
 <a href="https://www.chromium.org/developers/design-documents/http-authentication">Official documentation</a> explains in details the different options.
 <pre>
-&#35 mkdir -p /etc/opt/chrome/policies/{recommended,managed}
-&#35 chmod -w /etc/opt/chrome/policies/managed
-&#35 echo '{ "AuthServerWhitelist": "*.cern.ch" }' &gt; /etc/opt/chrome/policies/managed/cern.json
+&#35; mkdir -p /etc/opt/chrome/policies/{recommended,managed}
+&#35; chmod -w /etc/opt/chrome/policies/managed
+&#35; echo '{ "AuthServerWhitelist": "*.cern.ch" }' &gt; /etc/opt/chrome/policies/managed/cern.json
 </pre>
 <em>Note:</em> As of chrome/chromium 41 old command line option --auth-server-whitelist is disabled.
 
@@ -39,7 +39,7 @@ once installation of required software packages finishes, please restart Firefox
     <td>While redirected to CERN Single Sign-On login page (login.cern.ch) for authentication click on
         <b>Sign in using your current Windows/Kerberos credentials</b> (you may also choose <b>[autologon]</b> next to it)<br><br>
         <em>Note:</em> username/password popup window <b>should not</b> appear</b><br> - if it does, please
-        verify the validity of your credentials by running: <pre>&#35 klist</pre> - its output should
+        verify the validity of your credentials by running: <pre>&#35; klist</pre> - its output should
         show a valid ticket with expiry date in the future:
         <pre>
 Ticket cache: FILE:/tmp/krb5cc_14213_RZEYN11810
@@ -54,4 +54,4 @@ Valid starting     Expires            Service principal
  </tbody>
  </table>
 
-<!--&#35include virtual="/linux/layout/footer" -->
+<!--&#35;include virtual="/linux/layout/footer" -->
diff --git a/docs/koji/garbagecollection.md b/docs/koji/garbagecollection.md
index 3a8a4e5f8..27b3de7f1 100644
--- a/docs/koji/garbagecollection.md
+++ b/docs/koji/garbagecollection.md
@@ -83,7 +83,7 @@
   tag *-testing *-qa && order >= 1 && age > 12 weeks: untag
   tag *-stable *-stable1 *-stable2 *-stable3 && order >= 3: untag
 
-  C&#35; default: do nothing
+  &#35; default: do nothing
   tag * :: keep
 </pre>
 
diff --git a/docs/libreoffice.md b/docs/libreoffice.md
index a0c241ff2..aa826af56 100644
--- a/docs/libreoffice.md
+++ b/docs/libreoffice.md
@@ -9,17 +9,17 @@ This document explains how to install latest stable version of LibreOffice on yo
 <h2>Installation</h2>
 As root on your system run:
 <pre>
-C&#35 yum install libreoffice-release
-C&#35 yum groupinstall "LibreOffice 6"
+&#35; yum install libreoffice-release
+&#35; yum groupinstall "LibreOffice 6"
 </pre>
 Above commands will install default set of LibreOffice packages, additional
 packages can be installed individually by running:
 <pre>
-C&#35 yum install <b>packagename</b>
+&#35; yum install <b>packagename</b>
 </pre>
 to see the list of all available packages run:
 <pre>
-C&#35 yum search libreoffice6 libobasis6
+&#35; yum search libreoffice6 libobasis6
 </pre>
 LibreOffice 6 is installed on the system in parallel
 to preexisting LibreOffice 4/5.
@@ -27,6 +27,6 @@ to preexisting LibreOffice 4/5.
 Select <b>LibreOffice 6.1</b> from system <b>Applications</b> menu, <b>Office</b> submenu.
 Or start it from command line:
 <pre>
-C&#35 libreoffice6.1
+&#35; libreoffice6.1
 </pre>
 
diff --git a/docs/ovm/index.md b/docs/ovm/index.md
index 53d71ca46..54b462feb 100644
--- a/docs/ovm/index.md
+++ b/docs/ovm/index.md
@@ -57,7 +57,7 @@ file by downloading this example <a href="ovm2/ovm2.repo">ovm2.repo</a>.
 
 To update your system run as root:
 <pre>
-C&#35 /usr/bin/yum update
+&#35; /usr/bin/yum update
 </pre>
 
 <hr>
@@ -72,7 +72,7 @@ file by downloading this example <a href="ovm3/ovm3.repo">ovm3.repo</a>.
 
 To update your system run as root:
 <pre>
-C&#35 /usr/bin/yum update
+&#35; /usr/bin/yum update
 </pre>
 
 
diff --git a/docs/scientific6/docs/dfsaccess.md b/docs/scientific6/docs/dfsaccess.md
index 3997e11d1..de15a43c5 100644
--- a/docs/scientific6/docs/dfsaccess.md
+++ b/docs/scientific6/docs/dfsaccess.md
@@ -59,7 +59,7 @@ Nautilus uses GVFS (virtual filesystem for GNOME desktop) as its backend to acce
 <p>
 To mount DFS from command line use:
 <pre>
-&#35 gvfs-mount smb://cerndfs.cern.ch/dfs/
+&#35; gvfs-mount smb://cerndfs.cern.ch/dfs/
 </pre>
 To list DFS content:
 <pre>
@@ -81,7 +81,7 @@ smbclient -k //cerndfs.cern.ch/dfs
 </pre>
 For smbclient commands please see:
 <pre>
-&#35 man smbclient
+&#35; man smbclient
 </pre>
 
 <hr>
diff --git a/docs/scientific6/docs/softwaremgmt.md b/docs/scientific6/docs/softwaremgmt.md
index b3def0e61..0246e1e0d 100644
--- a/docs/scientific6/docs/softwaremgmt.md
+++ b/docs/scientific6/docs/softwaremgmt.md
@@ -130,32 +130,32 @@ debuginfo packages associated to the repositories.
 <br>
 <b>/etc/sysconfig/yum-autoupdate</b><br> - contains settings of automatic updates system:<br>
 <pre>
-&#35 YUMHOUR=4 (0..23)
+&#35; YUMHOUR=4 (0..23)
 </pre>
 Hour at which the automatic update system shall act (when invoked from <i>/etc/cron.hourly/yum-autoupdate</i>). Please note that this is not the exact time at which the update will start: The system will first wait for a random (but shorter than one hour) time interval.
 (Please avoid setting YUMHOUR to 0 or 1 - at that time the software repositories are synchronized between servers and in some cases it could lead to transient errors)
 <pre>
-&#35 YUMMAIL=1 (1/0)
+&#35; YUMMAIL=1 (1/0)
 </pre>
 - enables / disables e-mail messages from the update system.
 <pre>
-&#35 YUMMAILTO="root" (whoever@somewhere.there)
+&#35; YUMMAILTO="root" (whoever@somewhere.there)
 </pre>/
 - e-mail address where information messages are sent.
 <pre>
-&#35 YUMUPDATE=1 (1|0)
+&#35; YUMUPDATE=1 (1|0)
 </pre>
 If set to <b>1</b> updates are applied, if <b>0</b> system only checks the availability of updates and sends e-mail notification.
 <pre>
-&#35 YUMUPDATESECONLY=0 (1|0)
+&#35; YUMUPDATESECONLY=0 (1|0)
 </pre>
 If set to <b>1</b> only security updates are applied / checked for, if to <b>0</b> all updates are applied / checked for.
 <pre>
-&#35 YUMRANDOMWAIT=30 (0..60)
+&#35; YUMRANDOMWAIT=30 (0..60)
 </pre>
 Maximum time od random wait (past <i>YUMHOUR</i>) before update system starts.
 <pre>
-&#35 YUMCLEAN=1 (1|0)
+&#35; YUMCLEAN=1 (1|0)
 </pre>
 If set to <b>1</b> system will clean up unused local package cache contents (<i>/var/cache/yum</i>).
 
-- 
GitLab


From 7cf1c5219e7eb32224e276cb6df5fa221a3a9aca Mon Sep 17 00:00:00 2001
From: Daniel Juarez <daniel.juarez.gonzalez@cern.ch>
Date: Wed, 22 Apr 2020 17:34:44 +0200
Subject: [PATCH 2/2] Getting changes from master

---
 docs/docs/mattermost.md | 148 ----------------------------------------
 1 file changed, 148 deletions(-)

diff --git a/docs/docs/mattermost.md b/docs/docs/mattermost.md
index f31fe98af..eaf88ae22 100644
--- a/docs/docs/mattermost.md
+++ b/docs/docs/mattermost.md
@@ -58,152 +58,4 @@ using above procedure.
 <p>
 For more information about Pidgin Mattermost plugin please visit: <a href="https://github.com/EionRobb/purple-mattermost">https://github.com/EionRobb/purple-mattermost</a>.
 
-<<<<<<< HEAD
-<!--
-<em>Note:<em> Information below is obsolete, please use above method.
-
-<h2>Configuration of Pidgin/Mattermost integration (using IRC bridge)</h2>
-
-<h3>Installation</h3>
-
-&#35; yum --enablerepo=cern-testing install pidgin-matterircd-sso-helper
-
-This configuration process assumes standard CERN CentOS 7 (CC7) desktop with Kerberos authentication
-in use. (this is needed in order to obtain mattermost gitlab authentication token using cern-get-sso-cookie).
-
-<h3>matterircd</h3>
-<table>
-<tbody>
-<tr>
- Review <i>/etc/sysconfig/pidgin-matterircd-sso-helper</i>, then enable it and start:
- <td>&nbsp;</td>
- <td>
- <pre>
- &#35; systemctl enable matterircd
- &#35; systemctl start matterircd
- </pre>
-(default configuration will start <a href="https://github.com/42wim/matterircd">matterircd</a> listening on localhost port 6667, logging to <i>/var/log/matterircd/matterircd.log</i>)
- </td>
-</tr>
-</tbody>
-</table>
-<h3>pidgin-matterircd-sso-helper</h3>
-<table>
-<tbody>
-<tr>
- <td>&nbsp;</td>
- <td>
- Review <i>/etc/sysconfig/pidgin-matterircd-sso-helper</i>, and create (if needed) <i>~/.pidgin-matterircd-sso-helper</i> file
- containing at least mattermost team configuration:
- <pre>
- MMDEFTEAM="your-mattermost-team"
- </pre>
- (default team is "it-dep").
-  </td>
-</tr>
-</tbody>
-</table>
-<h3>pidgin</h3>
-<table>
-<tbody>
-<tr>
- <td><a target="snapwindow" href="pidgin-mmost/pidgin-mmost1.png"><img src="pidgin-mmost/pidgin-mmost1.png" width="300" ></a></td>
- <td>
- Add new account: <b>Accounts -> Manage Accounts -> Add</b>
-  <ul>
-   <li>Protocol: <b>IRC</b>
-   <li>Username: <b>cernlogin</b>
-   <li>Server: <b>localhost</b>
-   <li>Password: (leave empty)
-   <li>Local alias: (leave empty)
-  </ul>
-  </td>
-</tr>
-<tr>
- <td><a target="snapwindow" href="pidgin-mmost/pidgin-mmost2.png"><img src="pidgin-mmost/pidgin-mmost2.png" width="300" ></a></td>
- <td>
- Add new Buddy: <b>Buddies -> New Buddy</b>
-  <ul>
-   <li>Account: <b>cernlogin</b>
-   <li>Buddy's username: <b>mattermost</b>
-  </ul>
-  </td>
-</tr>
-<tr>
- <td><a target="snapwindow" href="pidgin-mmost/pidgin-mmost3.png"><img src="pidgin-mmost/pidgin-mmost3.png" width="300" ></a></td>
- <td>
- Add new Buddy Pounce: <b>Tools -> Buddy Pounces -> Add</b>
-  <ul>
-   <li>Account: <b>cernlogin</b>
-   <li>Buddy name: <b>mattermost</b>
-   <li>Pounce When Buddy...
-        <ul>
-         <li>Signs On
-         <li>Action: Execute command <b>/usr/bin/pidgin-matterircd-sso-helper</b>
-        </ul>
-  </ul>
-  </td>
-</tr>
-<tr>
- <td>&nbsp;</a></td>
- <td>
- Enable / Re-enable new account: <b>Accounts -> cernlogin@localhost (IRC) -> Enable</b>
-  </td>
-</tr>
-<tr>
- <td><a target="snapwindow" href="pidgin-mmost/pidgin-mmost4.png"><img src="pidgin-mmost/pidgin-mmost4.png" width="300" ></a></td>
- <td>
- Check conversation window for buddy mattermost, after few seconds you should see a message alike:
- <pre>
-      cernlogin: login mattermost.web.cern.ch it-dep MMAUTHTOKEN=XXXXX
-      mattermost: login OK
- </pre>
-  </td>
-</tr>
-<tr>
- <td><a target="snapwindow" href="pidgin-mmost/pidgin-mmost5.png"><img src="pidgin-mmost/pidgin-mmost5.png" width="300" ></a></td>
- <td>
- Add Matternost channels to your list: <b></b>
-  <ul>
-   <li><b>Tools -> Room List -> Account: cernlogin@localhost (IRC) -> Get List</b>
-   <li><b>Add Chat -> Channel: &#35;XXXX -> Add</b>
- </ul>
-</td>
-</tr>
-<tr>
- <td><a target="snapwindow" href="pidgin-mmost/pidgin-mmost6.png"><img src="pidgin-mmost/pidgin-mmost6.png" width="300" ></a></td>
- <td>
- &nbsp;
- </td>
-</tr>
-</tbody>
-</table>
-
-<hr>
-
-<a name="knownprbs"></a><h2>Known problems</h2>
-
-<ul>
-<li>If you loose connection, please disable and reenable account to trigger re-login process
-<li>All users in a chat room (mattermost channel) are always 'online' (this is mattermost limitation)
-<li>messages exchanged while you have been offline are not visible but you can ask server to do a 'scrollback' for you, type
-     in conversation window:
-    <pre>/msg mattermost scrollback &#35;linux 1000</pre>
-     and check mattermost buddy conversation.
-<li>login method is ... complicated: matterircd author <a href="https://github.com/42wim/matterircd/issues/72">did not implement NickServ</a>.
-<li>current version of matterircd (v0.10.2) works with Mattermost 3.4 platform: for the update to 3.5 coming soon updated matterircd (v0.11.0) will be required.
-<li>yes - it works also with <a href="lyncav">Pidgin with Voice / Video</a>.
-</ul>
-
--->
-<hr>
-
-<h2>Reporting problems</h2>
-Please report problems to <a href="mailto:linux.support@cern.ch">linux support @ CERN</a>.
-
-<hr>
-
-
-=======
 <hr>
->>>>>>> master
-- 
GitLab