From 6c48c7704792cac486f095223017670ca7e82d4a Mon Sep 17 00:00:00 2001
From: Daniel Berteaud <daniel@firewall-services.com>
Date: Wed, 22 Jul 2015 21:47:08 +0200
Subject: [PATCH] MOve apache sample conf in doc

---
 {conf => docs/httpd}/httpd_alias.conf   | 0
 {conf => docs/httpd}/httpd_vhost.conf   | 0
 templates/default/documentation.html.ep | 2 +-
 3 files changed, 1 insertion(+), 1 deletion(-)
 rename {conf => docs/httpd}/httpd_alias.conf (100%)
 rename {conf => docs/httpd}/httpd_vhost.conf (100%)

diff --git a/conf/httpd_alias.conf b/docs/httpd/httpd_alias.conf
similarity index 100%
rename from conf/httpd_alias.conf
rename to docs/httpd/httpd_alias.conf
diff --git a/conf/httpd_vhost.conf b/docs/httpd/httpd_vhost.conf
similarity index 100%
rename from conf/httpd_vhost.conf
rename to docs/httpd/httpd_vhost.conf
diff --git a/templates/default/documentation.html.ep b/templates/default/documentation.html.ep
index c67ebd3..63ac1a0 100644
--- a/templates/default/documentation.html.ep
+++ b/templates/default/documentation.html.ep
@@ -262,7 +262,7 @@ mysql -uroot vroom < /opt/vroom/docs/database/schema.mysql</pre>
         Setup Apache
       </h3>
       <p>
-        Two sample apache configurations are provided in the <strong>conf</strong> directory
+        Two sample apache configurations are provided in the <strong>doc/httpd</strong> directory
         <ul>
           <li><strong>httpd_alias.conf</strong> should work out of the box, VROOM will be available at <em>https://yourservername/vroom</em></li>
           <li><strong>httpd_vhost.conf</strong> is an alternative which you can use if you prefer working with named virtualhosts