Merge branch 'development' into promoTweaksTheSecond

# Conflicts:
#	advanced/Scripts/blacklist.sh
#	advanced/Scripts/whitelist.sh

advanced/Scripts/whitelist.sh

@@ -11,18 +11,19 @@
 # (at your option) any later version.
 
 
-helpFunc()
-{
-	echo "::: Immediately whitelists one or more domains in the hosts file"
-	echo ":::"
-	echo "::: Usage: pihole -w domain1 [domain2 ...]"
-	echo ":::"
-	echo "::: Options:"
-	echo ":::  -d, --delmode			Remove domains from the whitelist"
-	echo ":::  -nr, --noreload			Update Whitelist without refreshing dnsmasq"
-	echo ":::  -q, --quiet				output is less verbose"
-	echo ":::  -h, --help				Show this help dialog"
-	echo ":::  -l, --list				Display your whitelisted domains"
+helpFunc() {
+	cat << EOM
+::: Immediately whitelists one or more domains in the hosts file
+:::
+::: Usage: pihole -w domain1 [domain2 ...]
+:::
+::: Options:
+:::  -d, --delmode			Remove domains from the whitelist
+:::  -nr, --noreload			Update Whitelist without refreshing dnsmasq
+:::  -q, --quiet			output is less verbose
+:::  -h, --help				Show this help dialog
+:::  -l, --list				Display your whitelisted domains
+EOM
 	exit 1
 }
 
@@ -52,7 +53,7 @@ HandleOther(){
 	fi
 }
 
-PopWhitelistFile(){
+PopWhitelistFile() {
 	#check whitelist file exists, and if not, create it
 	if [[ ! -f ${whitelist} ]];then
   	  touch ${whitelist}
@@ -67,7 +68,7 @@ PopWhitelistFile(){
 	done
 }
 
-AddDomain(){
+AddDomain() {
 #| sed 's/\./\\./g'
 	bool=false
 
@@ -88,7 +89,7 @@ AddDomain(){
 	fi
 }
 
-RemoveDomain(){
+RemoveDomain() {
 
   bool=false
   grep -Ex -q "$1" ${whitelist} || bool=true
@@ -139,3 +140,4 @@ if ${reload}; then
 fi
 
 
+