Merge branch 'master' into ftldns/configfile

Signed-off-by: DL6ER <dl6er@dl6er.de>

Conflicts:
	mkdocs.yml
This commit is contained in:
DL6ER
2018-05-05 23:29:03 +02:00
5 changed files with 246 additions and 2 deletions
+3 -2
View File
@@ -29,9 +29,10 @@ pages:
- 'Configuration': "ftldns/configfile.md"
- 'Blocking mode': "ftldns/blockingmode.md"
- 'RegEx blocking': "ftldns/regex.md"
# - 'Privacy levels': "ftldns/privacy.md"
- 'Privacy levels': "ftldns/privacylevels.md"
# - 'Long-term database': "ftldns/database.md"
# - 'API documentation': "ftldns/api.md"
- 'Telnet API': "ftldns/telnet-api.md"
- 'Install from source': "ftldns/compile.md"
- 'In-depth manual': "ftldns/in-depth.md"
- 'Guides':
# - 'Pi-hole as All-Around DNS Solution': guides/unbound.md