Merge branch 'master' into patch-1

.github/workflows/ci.yml

@@ -10,7 +10,7 @@ on:
 
 env:
   FORCE_COLOR: 2
-  NODE: 16
+  NODE: 20
   PYTHON_VERSION: "3.11"
 
 jobs:

docs/main/faq.md

@@ -105,3 +105,16 @@ Restart the web server:
 ```bash
 sudo service lighttpd restart
 ```
+
+### In which order are locally defined DNS records used?
+
+**Answer:**
+
+The order of locally defined DNS records is:
+
+1. The device's host name and `pi.hole`
+2. Configured in a config file in `/etc/dnsmasq.d/`
+3. Read from `/etc/hosts`
+4. Read from the "Local (custom) DNS" list (stored in `/etc/pihole/custom.list`)
+
+Only the first record will trigger an address-to-name association.

docs/routers/ubiquiti-usg.md

@@ -53,7 +53,7 @@ If you'd rather have your USG forward all DNS traffic to Pi-hole, you can comple
 ```
 
 !!! warning
-    Keep in mind that if you are using your USG's IP address as an upstream resolver for your Pi-hole together with this configureation, ***this will cause a resolver loop***. Make sure to have another upstream DNS server(s) set in your Pi-hole's configuration, or use Pi-hole as [your own recursive DNS server with Unbound](https://docs.pi-hole.net/guides/dns/unbound/?h=unbound#configure-unbound).
+    Keep in mind that if you are using your USG's IP address as an upstream resolver for your Pi-hole together with this configuration, ***this will cause a resolver loop***. Make sure to have another upstream DNS server(s) set in your Pi-hole's configuration, or use Pi-hole as [your own recursive DNS server with Unbound](https://docs.pi-hole.net/guides/dns/unbound/?h=unbound#configure-unbound).
 
 Log into your Unifi Cloud Key. Go to **Settings** -> **Internet**. Click on the WAN line that appears.