From 02cf8fb52252b92074f1a3b0430989d21928e929 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?M=C3=A1rcio=20Carlos?= <marcioc.antao@gmail.com>
Date: Tue, 12 Nov 2013 15:16:31 -0200
Subject: Update apache_settings.xml

Remove Black Space and fix <br tag
---
 config/apache_mod_security-dev/apache_settings.xml | 24 ++++++++--------------
 1 file changed, 8 insertions(+), 16 deletions(-)

diff --git a/config/apache_mod_security-dev/apache_settings.xml b/config/apache_mod_security-dev/apache_settings.xml
index cafd9e36..de350cf1 100644
--- a/config/apache_mod_security-dev/apache_settings.xml
+++ b/config/apache_mod_security-dev/apache_settings.xml
@@ -93,7 +93,7 @@
 			<fielddescr>Server hostname</fielddescr>
 			<fieldname>hostname</fieldname>
 			<description>
-				<![CDATA[Enter the servers hostname<br/
+				<![CDATA[Enter the servers hostname<br>
 					NOTE: Leave blank to use this devices hostname.]]>
 			</description>
 			<type>input</type>
@@ -102,11 +102,8 @@
 			<fielddescr>Default Bind to IP Address</fielddescr>
 			<fieldname>globalbindtoipaddr</fieldname>
 			<description>
-				<![CDATA[
-					This is the IP address the Proxy Server will listen on. 
-					<br/>
-					NOTE: Leave blank to bind to *
-				]]>
+				<![CDATA[This is the IP address the Proxy Server will listen on.<br/>
+					NOTE: Leave blank to bind to *]]>
 			</description>
 			<type>input</type>
 		</field>
@@ -114,10 +111,8 @@
 			<fielddescr>Default Bind to port</fielddescr>
 			<fieldname>globalbindtoport</fieldname>
 			<description>
-				<![CDATA[
-					This is the port the Proxy Server will listen on.<br>
-					NOTE: Leave blank to bind to 80
-				]]>					
+				<![CDATA[This is the port the Proxy Server will listen on.<br>
+					NOTE: Leave blank to bind to 80]]>					
 			</description>
 			<type>input</type>
 			<size>5</size>
@@ -286,7 +281,7 @@
                         <fielddescr>Status Page</fielddescr>
                         <fieldname>statuspage</fieldname>
                         <description>
-                                <![CDATA[Enable a Status Page for Apache and Mod_proxy. Acess htt://DefaultBindIP:DefaultBindPort/status-server]]>
+                                <![CDATA[Enable a status page for Apache and Mod_proxy. Access http://DefaultBindIP:DefaultBindPort/status-server]]>
                         </description>
                         <type>select</type>        
                         <options>
@@ -298,11 +293,8 @@
 			<fielddescr>Network Access Status Page</fielddescr>
 			<fieldname>netaccessstatus</fieldname>
 			<description>
-				<![CDATA[
-					Network can access a status page. Ex: 172.16.1.0/24
-					<br/>
-					NOTE: Leave blank define all networks
-				]]>
+				<![CDATA[Network can access a status page. Ex: 172.16.1.0/24<br/>
+					NOTE: Leave blank define all networks]]>
 			</description>
 			<type>input</type>
 		</field>
-- 
cgit v1.2.3


From 0ca35e6b9f7d2a0e45379a0adfe7dddf76ac3a53 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?M=C3=A1rcio=20Carlos?= <marcioc.antao@gmail.com>
Date: Tue, 12 Nov 2013 15:24:03 -0200
Subject: Update apache.template

Add Mod_status Variable in Template
---
 config/apache_mod_security-dev/apache.template | 1 -
 1 file changed, 1 deletion(-)

diff --git a/config/apache_mod_security-dev/apache.template b/config/apache_mod_security-dev/apache.template
index cb2b3e17..362e28a4 100644
--- a/config/apache_mod_security-dev/apache.template
+++ b/config/apache_mod_security-dev/apache.template
@@ -197,7 +197,6 @@ DocumentRoot "{$apache_dir}/www/apache22"
     Deny from all
 </Directory>
 
-
 {$mod_status}
 
 #
-- 
cgit v1.2.3