arno/pi-hole
1
0
Fork 0
mirror of https://github.com/pi-hole/pi-hole synced 2024-12-22 23:08:07 +00:00
Code Issues Releases Wiki Activity

Merge pull request #1228 from r0ckarong/development

Browse Source 
Justify and improve help texts, add missing wildcard description
This commit is contained in:
DL6ER 2017-02-08 14:05:53 +01:00 committed by GitHub
commit 7785dac50e
2 changed files with 16 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
advanced/Scripts/list.sh
View File

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

19
pihole
View File

@ -274,19 +274,20 @@ helpFunc() {
::: Add -h after -w (whitelist), -b (blacklist), -c (chronometer), or -a (admin) for more information on usage ::: Add -h after -w (whitelist), -b (blacklist), -c (chronometer), or -a (admin) for more information on usage
::: :::
::: Options: ::: Options:
::: -w, whitelist Whitelist domains ::: -w, whitelist Whitelist domain(s)
::: -b, blacklist Blacklist domains ::: -b, blacklist Blacklist domain(s) (exact match)
::: -d, debug Start a debugging session if having trouble ::: -wild, wildcard Blacklist whole domain(s) (wildcard)
::: -f, flush Flush the pihole.log file ::: -d, debug Start a debugging session
::: -t, tail Output the last lines of the pihole.log file. Lines are appended as the file grows ::: -f, flush Flush the 'pihole.log' file
::: -up, updatePihole Update Pi-hole ::: -t, tail Output the last lines of the 'pihole.log' file. Lines are appended as the file grows
::: -up, updatePihole Update Pi-hole components
::: -r, reconfigure Reconfigure or Repair Pi-hole ::: -r, reconfigure Reconfigure or Repair Pi-hole
::: -g, updateGravity Update the list of ad-serving domains ::: -g, updateGravity Update the list of ad-serving domains
::: -c, chronometer Calculates stats and displays to an LCD ::: -c, chronometer Calculates stats and displays to an LCD
::: -h, help Show this help dialog ::: -h, help Show this help dialog
::: -v, version Show current versions ::: -v, version Show installed versions of Pi-Hole and Web-Admin
::: -q, query Query the adlists for a specific domain ::: -q, query Query the adlists for a specific domain
::: Use pihole -q domain -exact if you want to see exact matches only ::: Use 'pihole -q domain -exact' if you want to see exact matches only
::: -l, logging Enable or Disable logging (pass 'on' or 'off') ::: -l, logging Enable or Disable logging (pass 'on' or 'off')
::: -a, admin Admin webpage options ::: -a, admin Admin webpage options
::: uninstall Uninstall Pi-Hole from your system :(! ::: uninstall Uninstall Pi-Hole from your system :(!
@ -294,7 +295,7 @@ helpFunc() {
::: enable Enable Pi-Hole DNS Blocking ::: enable Enable Pi-Hole DNS Blocking
::: disable Disable Pi-Hole DNS Blocking ::: disable Disable Pi-Hole DNS Blocking
::: Blocking can also be disabled only temporarily, e.g., ::: Blocking can also be disabled only temporarily, e.g.,
::: pihole disable 5m - will disable blocking for 5 minutes ::: 'pihole disable 5m' - will disable blocking for 5 minutes
::: restartdns Restart dnsmasq ::: restartdns Restart dnsmasq
EOM EOM
exit 0 exit 0