Merge branch 'development' into adminPageAsOption

This commit is contained in:
Mcat12 2017-02-09 16:27:07 -05:00 committed by GitHub
commit ba67144e34
4 changed files with 48 additions and 24 deletions

View file

@ -42,14 +42,14 @@ helpFunc() {
::: Usage: pihole -${letter} domain1 [domain2 ...]
:::
::: Options:
::: -d, --delmode Remove domains from the ${word}list
::: -nr, --noreload Update ${word}list without refreshing dnsmasq
::: -q, --quiet output is less verbose
::: -h, --help Show this help dialog
::: -l, --list Display your ${word}listed domains
::: -d, --delmode Remove domains from the ${word}list
::: -nr, --noreload Update ${word}list without refreshing dnsmasq
::: -q, --quiet Output is less verbose
::: -h, --help Show this help dialog
::: -l, --list Display your ${word}listed domains
EOM
if [[ "${letter}" == "b" ]]; then
echo "::: -wild, --wildcard Add whitecard entry (only blacklist)"
echo "::: -wild, --wildcard Add wildcard entry (only blacklist)"
fi
exit 0
}
@ -229,4 +229,3 @@ PoplistFile
if ${reload}; then
Reload
fi