Merge branch 'master' into release/v6.0

Author: yubiuser

docs/ftldns/cache_dump.md

@@ -9,7 +9,7 @@ sudo killall -USR1 pihole-FTL
 Such a cache dump looks like
 
 ``` plain
-cache size 10000, 0/20984 cache insertions re-used unexpired cache entries.
+cache size 10000, 0/20984 cache insertions reused unexpired cache entries.
 queries forwarded 10247, queries answered locally 14713
 queries for authoritative zones 0
 pool memory in use 22272, max 24048, allocated 480000
@@ -80,7 +80,7 @@ where we stripped lines like `Dec 15 20:32:02 dnsmasq[4177892]:` for the sake of
 ### Cache metrics
 
 ``` plain
-cache size 10000, 0/20984 cache insertions re-used unexpired cache entries.
+cache size 10000, 0/20984 cache insertions reused unexpired cache entries.
 ```
 
 tells us that the cache size is 10000 (Pi-hole's default value). None of the 20984 cache insertions had to overwrite still valid cache lines. If this number is zero, your cache was sufficiently large at any time. If this number is notably larger than zero, you should consider increasing the cache size.

docs/guides/dns/unbound.md

@@ -90,8 +90,8 @@ server:
     do-udp: yes
     do-tcp: yes
 
-    # May be set to yes if you have IPv6 connectivity
-    do-ip6: no
+    # May be set to no if you don't have IPv6 connectivity
+    do-ip6: yes
 
     # You want to leave this to no unless you have *native* IPv6. With 6to4 and
     # Terredo tunnels your web browser should favor IPv4 for the same reasons
@@ -156,14 +156,6 @@ dig pi-hole.net @127.0.0.1 -p 5335
 
 The first query may be quite slow, but subsequent queries, also to other domains under the same TLD, should be fairly quick.
 
-You should also consider adding
-
-``` plain
-edns-packet-max=1232
-```
-
-to a config file like `/etc/dnsmasq.d/99-edns.conf` to signal FTL to adhere to this limit.
-
 ### Test validation
 
 You can test DNSSEC validation using
@@ -222,16 +214,14 @@ sudo service unbound restart
 !!! warning
     It's not recommended to increase verbosity for daily use, as unbound logs a lot. But it might be helpful for debugging purposes.
 
-There are five levels of verbosity
+There are five levels of verbosity:
 
-```
-Level 0 means no verbosity, only errors
-Level 1 gives operational information
-Level 2 gives  detailed operational  information
-Level 3 gives query level information
-Level 4 gives  algorithm  level  information
-Level 5 logs client identification for cache misses
-```
+- Level 0 means no verbosity, only errors
+- Level 1 gives operational information
+- Level 2 gives detailed operational  information
+- Level 3 gives query level information
+- Level 4 gives algorithm level information
+- Level 5 logs client identification for cache misses
 
 First, specify the log file, human-readable timestamps and the verbosity level in the `server` part of
 `/etc/unbound/unbound.conf.d/pi-hole.conf`: