diff --git a/docs/database/domain-database/groups.md b/docs/database/domain-database/groups.md index 136abf1..1368ece 100644 --- a/docs/database/domain-database/groups.md +++ b/docs/database/domain-database/groups.md @@ -15,7 +15,7 @@ Group management is implemented using so-called linking tables. Hence, it is pos - associate domains (and clients!) with any number of groups, - manage lists together with groups, -- use the same groups for deny and allowlist domains at the same time. +- use the same groups for denylist and allowlist domains at the same time. The linking tables are particularly simple, as they only link group `id`s with list `id`s. As an example, we describe the `domainlist_by_group` table. The `adlist` and `client` linking tables are constructed similarly. diff --git a/docs/group_management/index.md b/docs/group_management/index.md index 641c773..664633f 100644 --- a/docs/group_management/index.md +++ b/docs/group_management/index.md @@ -1,4 +1,4 @@ -Any subscribed list or domain on the allow-/deny-/regex-lists can be managed through groups. This allows not only grouping them to highlight their relationship, but also enabling/disabling them together if one, for instance, wants to visit a specific service only temporarily. +Any subscribed list or domain on the allowlist, denylist, or regex list can be managed through groups. This allows not only grouping them to highlight their relationship, but also enabling/disabling them together if one, for instance, wants to visit a specific service only temporarily. Group `Default` (`group_id` `0`) is special as it is automatically assigned to domains and clients not being a member of other groups. Each newly added client or domain gets assigned to group zero when being added. diff --git a/docs/guides/misc/allowlist-denylist.md b/docs/guides/misc/allowlist-denylist.md index 3e5d1d8..5c82740 100644 --- a/docs/guides/misc/allowlist-denylist.md +++ b/docs/guides/misc/allowlist-denylist.md @@ -16,7 +16,7 @@ Each script accepts the following parameters: Domains passed are parsed by the script to ensure they are valid domains. If a domain is invalid it will be ignored. -By default, Allowed/Denied domains are associated with the Default Group only. If the domain should be associated with other groups, these will need to be selected in **Group Management > Domains** within the Pi-Hole web frontend. +By default, allowed or denied domains are associated with the Default Group only. If the domain should be associated with other groups, these will need to be selected in **Group Management > Domains** within the Pi-Hole web frontend. #### Example `pihole allow` usages diff --git a/docs/regex/index.md b/docs/regex/index.md index 210e014..ec01db8 100644 --- a/docs/regex/index.md +++ b/docs/regex/index.md @@ -34,4 +34,4 @@ Once the debugging mode is enabled, each match will be logged to `/var/log/pihol The given DB ID corresponds to the ID of the corresponding row in the `domainlist` database table. -Note that validation is only done on the first occurrence of a domain to increase the computational efficiency of *FTL*DNS. The result of this evaluation is stored in an internal DNS cache that is separate from `dnsmasq`'s own DNS cache. This allows us to only flush this special cache when modifying the deny and allowlists *without* having to flush the entire DNS cache collected so far. +Note that validation is only done on the first occurrence of a domain to increase the computational efficiency of *FTL*DNS. The result of this evaluation is stored in an internal DNS cache that is separate from `dnsmasq`'s own DNS cache. This allows us to only flush this special cache when modifying the denylist or allowlist *without* having to flush the entire DNS cache collected so far. diff --git a/docs/regex/pi-hole.md b/docs/regex/pi-hole.md index 762a0bb..7fb317a 100644 --- a/docs/regex/pi-hole.md +++ b/docs/regex/pi-hole.md @@ -22,7 +22,7 @@ but not dig A abc ``` -This allows you to do query type based deny-/allowlisting. +This allows you to do query type based denylisting and allowlisting. Some user-provided examples are: