From 2b5f9ac9d698e55ee8d5ae6639872700f6fa20aa Mon Sep 17 00:00:00 2001
From: Daniel Berteaud <daniel@firewall-services.com>
Date: Fri, 13 Mar 2015 09:43:05 +0100
Subject: [PATCH] Remove final CR in <pre> sections

---
 templates/default/documentation.html.ep | 40 ++++++++++++---------------------
 1 file changed, 14 insertions(+), 26 deletions(-)

diff --git a/templates/default/documentation.html.ep b/templates/default/documentation.html.ep
index 03e93fc..adc3196 100644
--- a/templates/default/documentation.html.ep
+++ b/templates/default/documentation.html.ep
@@ -110,8 +110,7 @@ gpgcheck=1
 gpgkey=http://repo.firewall-services.com/RPM-GPG-KEY
 enablegroups=0
 _EOF
-yum install epel-release
-        </pre>
+yum install epel-release</pre>
       </p>
       <h3 id="c7_dependencies">
         Install dependencies
@@ -123,8 +122,7 @@ yum install git tar wget httpd mod_ssl openssl mariadb-server \\
            'perl(Mojolicious)' 'perl(Mojolicious::Plugin::I18N)' 'perl(Mojolicious::Plugin::Mail)' \\
            'perl(Crypt::SaltedHash)' 'perl(Etherpad::API)' 'perl(LWP::Protocol::https)' \\
            'perl(Sesion::Token)' 'perl(Mojolicious::Plugin::Database)' 'perl(Email::Valid)' \\
-           'perl(Config::Simple)' 'perl(Session::Token)' 'perl(URI)'
-        </pre>
+           'perl(Config::Simple)' 'perl(Session::Token)' 'perl(URI)'</pre>
       </p>
       <h3 id="c7_clone_git">
         Clone the repository
@@ -133,8 +131,7 @@ yum install git tar wget httpd mod_ssl openssl mariadb-server \\
         Lets install VROOM in <strong>/opt/vroom</strong>
         <pre>
 cd /opt
-git clone https://github.com/dani/vroom.git
-        </pre>
+git clone https://github.com/dani/vroom.git</pre>
       </p>
       <h3 id="c7_database">
         Database
@@ -143,17 +140,14 @@ git clone https://github.com/dani/vroom.git
         A database will be used to store rooms configuration, you must enable the server.
         <pre>
 systemctl enable mariadb.service
-systemctl start mariadb.service
-        </pre>
+systemctl start mariadb.service</pre>
         Now, create a new database for VROOM 
         <pre>
-mysql -uroot
-        </pre>
+mysql -uroot</pre>
         <pre>
 CREATE DATABASE `vroom` CHARACTER SET utf8 COLLATE utf8_general_ci;
 GRANT ALL PRIVILEGES ON `vroom`.* TO 'vroom'@'localhost' IDENTIFIED BY 'MySuperPassw0rd';
-FLUSH PRIVILEGES;
-        </pre>
+FLUSH PRIVILEGES;</pre>
       </p>
       <p class="alert alert-info">
         It's better to generate a long, random password here. Just write it somewhere, you'll need it later
@@ -161,8 +155,7 @@ FLUSH PRIVILEGES;
       <p>
         Now that we have our MySQL database, we can create the tables
         <pre>
-mysql -uroot vroom < /opt/vroom/docs/database/schema.mysql
-        </pre>
+mysql -uroot vroom < /opt/vroom/docs/database/schema.mysql</pre>
       </p>
       <h3 id="c7_apache">
         Setup Apache
@@ -185,8 +178,7 @@ mysql -uroot vroom < /opt/vroom/docs/database/schema.mysql
         You also have to make sure the <strong>mod_proxy_ws</strong> module is enabled, which is not the case by default on CentOS 7
         <pre>
 echo "LoadModule proxy_wstunnel_module modules/mod_proxy_wstunnel.so" \\
- > /etc/httpd/conf.modules.d/00-proxy_ws.conf
-        </pre>
+ > /etc/httpd/conf.modules.d/00-proxy_ws.conf</pre>
       </p>
       <h3 id="c7_systemd_unit">
         Setup systemd units
@@ -196,8 +188,7 @@ echo "LoadModule proxy_wstunnel_module modules/mod_proxy_wstunnel.so" \\
         <pre>
 cp /opt/vroom/docs/systemd/vroom.service /etc/systemd/system/
 systemctl daemon-reload
-systemctl enable vroom
-        </pre>
+systemctl enable vroom</pre>
       </p>
       <h2 id="config_vroom">
         Configure VROOM
@@ -205,8 +196,7 @@ systemctl enable vroom
       <p>
         Now, we just need to configure vroom itself. Just copy the sample conf file
         <pre>
-cp /opt/vroom/conf/settings.ini.dist /opt/vroom/conf/settings.ini
-        </pre>
+cp /opt/vroom/conf/settings.ini.dist /opt/vroom/conf/settings.ini</pre>
         And edit it to your need
       </p>
       <h1 id="customize">
@@ -226,14 +216,12 @@ cp /opt/vroom/conf/settings.ini.dist /opt/vroom/conf/settings.ini
       <p>
         If you want to customize the look and feel of VROOM, you can create your own templates.
         To do so, just copy the existing ones
-        <pres>
-cp -a /opt/vroom/templates/default /opt/vroom/templates/my_template
-        </pres>
+        <pre>
+cp -a /opt/vroom/templates/default /opt/vroom/templates/my_template</pre>
         Then edit <strong>/opt/vroom/conf/settings.ini</strong> and set <kbd>template = 'my_template'</kbd>
         Restart VROOM so the configuration change is applied
-        <pres>
-systemctl restart vroom.service
-        </pres>
+        <pre>
+systemctl restart vroom.service</pre>
         And you can start modifying your template.
         <p class="alert alert-danger">
           As VROOM is still in early development, you'll have to closely follow how the default template evolve and merge the changes in your own template