aboutsummaryrefslogtreecommitdiffstats
path: root/config
diff options
context:
space:
mode:
authorMarcello Coutinho <marcellocoutinho@gmail.com>2013-11-12 09:37:46 -0800
committerMarcello Coutinho <marcellocoutinho@gmail.com>2013-11-12 09:37:46 -0800
commitb1647de7222feb13f420df55de94abbadeab12a0 (patch)
tree6c399334e5897a8685f205f24e0d31cab4310bfd /config
parent63d03dab164bb44ce4747629f14a022086aac3ec (diff)
parent0ca35e6b9f7d2a0e45379a0adfe7dddf76ac3a53 (diff)
downloadpfsense-packages-b1647de7222feb13f420df55de94abbadeab12a0.tar.gz
pfsense-packages-b1647de7222feb13f420df55de94abbadeab12a0.tar.bz2
pfsense-packages-b1647de7222feb13f420df55de94abbadeab12a0.zip
Merge pull request #543 from djgel/patch-8
Update apache_settings.xml
Diffstat (limited to 'config')
-rw-r--r--config/apache_mod_security-dev/apache.template1
-rw-r--r--config/apache_mod_security-dev/apache_settings.xml24
2 files changed, 8 insertions, 17 deletions
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}
#
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>