Merge branch 'master' into topics-twitch-tv

Author: kenyonj

topics/pihole/index.md

@@ -0,0 +1,13 @@
+---
+aliases: pi-hole
+created_by: Jacob Salmela, Dan Schaper, Adam Warner and DL6ER
+display_name: Pi Hole
+github_url: https://github.com/pi-hole/pi-hole
+logo: pihole.png
+released: June 15, 2015
+short_description: A black hole for Internet advertisements.
+topic: pihole
+url: https://pi-hole.net/
+wikipedia_url: https://en.wikipedia.org/wiki/Pi-hole
+---
+Pi-hole is a Linux network-level advertisement and Internet tracker blocking application which acts as a DNS sinkhole (and optionally a DHCP server), intended for use on a private network. It is designed for use on embedded devices with network capability, such as the Raspberry Pi, but it can be used on other machines running Linux and cloud implementations.