From a12e1bf304e45ad3e0f01b2194e7ebc12736ce5c Mon Sep 17 00:00:00 2001
From: JamieMagee <jamie.magee@gmail.com>
Date: Sun, 22 Oct 2017 23:57:16 +0200
Subject: [PATCH 1/2] Replace deprecated tt tag with kbd tag

---
 help.php                          | 4 ++--
 scripts/pi-hole/php/loginpage.php | 6 +++---
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/help.php b/help.php
index 102c6e72..0642a841 100644
--- a/help.php
+++ b/help.php
@@ -70,7 +70,7 @@
     <div class="col-md-12">
     <h2>White- / Blacklist</h2>
     <p>Add or remove domains (or subdomains) from the white-/blacklist. If a domain is added to e.g. the whitelist, any possible entry of the same domain will be automatically removed from the blacklist and vice versa.</p>
-    <p>Wildcard blacklisting is supported (entering <tt>something.de</tt> will block this domain including all subdomains like <tt>a.bb.c.999.something.de</tt>). Note that wildcard whitelisting is <em>not</em> supported.</p>
+    <p>Wildcard blacklisting is supported (entering <kbd>something.de</kbd> will block this domain including all subdomains like <kbd>a.bb.c.999.something.de</kbd>). Note that wildcard whitelisting is <em>not</em> supported.</p>
     <p>You can white-/blacklist multiple entries at a time if you separate the domains by spaces.</p>
     </div>
 </div>
@@ -89,7 +89,7 @@
 <div class="row">
     <div class="col-md-12">
     <h2>Tools &rarr; Query adlists</h2>
-    This function is useful to find out what list a domain appears on. Since we don't control what the third-parties put on the block lists, you may find that a domain you normally visit stops working. If this is the case, you could run  this command to scan for strings in the list of blocked domains and it will return the list the domain is found on. This proved useful a while back when the Mahakala list was adding <tt>apple.com</tt> and <tt>microsoft.com</tt> to their block list.</p>
+    This function is useful to find out what list a domain appears on. Since we don't control what the third-parties put on the block lists, you may find that a domain you normally visit stops working. If this is the case, you could run  this command to scan for strings in the list of blocked domains and it will return the list the domain is found on. This proved useful a while back when the Mahakala list was adding <kbd>apple.com</kbd> and <kbd>microsoft.com</kbd> to their block list.</p>
     </div>
 </div>
 <div class="row">
diff --git a/scripts/pi-hole/php/loginpage.php b/scripts/pi-hole/php/loginpage.php
index 61b10518..201f2b0c 100644
--- a/scripts/pi-hole/php/loginpage.php
+++ b/scripts/pi-hole/php/loginpage.php
@@ -13,7 +13,7 @@
 
         <div class="panel-title text-center"><span class="logo-lg" style="font-size: 25px;">Pi-<b>hole</b></span></div>
       <p class="login-box-msg">Sign in to start your session</p>
-      <div id="cookieInfo" class="panel-title text-center" style="color:#F00; font-size: 150%" hidden>Verify that cookies are allowed for <tt><?php echo $_SERVER['HTTP_HOST']; ?></tt></div>
+      <div id="cookieInfo" class="panel-title text-center" style="color:#F00; font-size: 150%" hidden>Verify that cookies are allowed for <kbd><?php echo $_SERVER['HTTP_HOST']; ?></kbd></div>
       <?php if ($wrongpassword) { ?>
         <div class="form-group has-error login-box-msg">
           <label class="control-label"><i class="fa fa-times-circle-o"></i> Wrong password!</label>
@@ -30,8 +30,8 @@
         <div class="row">
           <div class="col-xs-8">
           <ul>
-            <li><tt>Return</tt> &rarr; Log in and go to requested page (<?php echo $scriptname; ?>)</li>
-            <li><tt>Ctrl+Return</tt> &rarr; Log in and go to Settings page</li>
+            <li><kbd>Return</kbd> &rarr; Log in and go to requested page (<?php echo $scriptname; ?>)</li>
+            <li><kbd>Ctrl+Return</kbd> &rarr; Log in and go to Settings page</li>
           </ul>
           </div>
           <div class="col-xs-4">

From 6fd0c5eff858d607147e1cfc372fd576c3ff6233 Mon Sep 17 00:00:00 2001
From: Jamie Magee <jamie.magee@gmail.com>
Date: Wed, 25 Oct 2017 12:56:18 +0000
Subject: [PATCH 2/2] Replace <tt> tags with <samp> tags

---
 help.php                          | 4 ++--
 scripts/pi-hole/php/loginpage.php | 6 +++---
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/help.php b/help.php
index 0642a841..c3a1f875 100644
--- a/help.php
+++ b/help.php
@@ -70,7 +70,7 @@
     <div class="col-md-12">
     <h2>White- / Blacklist</h2>
     <p>Add or remove domains (or subdomains) from the white-/blacklist. If a domain is added to e.g. the whitelist, any possible entry of the same domain will be automatically removed from the blacklist and vice versa.</p>
-    <p>Wildcard blacklisting is supported (entering <kbd>something.de</kbd> will block this domain including all subdomains like <kbd>a.bb.c.999.something.de</kbd>). Note that wildcard whitelisting is <em>not</em> supported.</p>
+    <p>Wildcard blacklisting is supported (entering <samp>something.de</samp> will block this domain including all subdomains like <samp>a.bb.c.999.something.de</samp>). Note that wildcard whitelisting is <em>not</em> supported.</p>
     <p>You can white-/blacklist multiple entries at a time if you separate the domains by spaces.</p>
     </div>
 </div>
@@ -89,7 +89,7 @@
 <div class="row">
     <div class="col-md-12">
     <h2>Tools &rarr; Query adlists</h2>
-    This function is useful to find out what list a domain appears on. Since we don't control what the third-parties put on the block lists, you may find that a domain you normally visit stops working. If this is the case, you could run  this command to scan for strings in the list of blocked domains and it will return the list the domain is found on. This proved useful a while back when the Mahakala list was adding <kbd>apple.com</kbd> and <kbd>microsoft.com</kbd> to their block list.</p>
+    This function is useful to find out what list a domain appears on. Since we don't control what the third-parties put on the block lists, you may find that a domain you normally visit stops working. If this is the case, you could run  this command to scan for strings in the list of blocked domains and it will return the list the domain is found on. This proved useful a while back when the Mahakala list was adding <samp>apple.com</samp> and <samp>microsoft.com</samp> to their block list.</p>
     </div>
 </div>
 <div class="row">
diff --git a/scripts/pi-hole/php/loginpage.php b/scripts/pi-hole/php/loginpage.php
index 201f2b0c..cf080756 100644
--- a/scripts/pi-hole/php/loginpage.php
+++ b/scripts/pi-hole/php/loginpage.php
@@ -13,7 +13,7 @@
 
         <div class="panel-title text-center"><span class="logo-lg" style="font-size: 25px;">Pi-<b>hole</b></span></div>
       <p class="login-box-msg">Sign in to start your session</p>
-      <div id="cookieInfo" class="panel-title text-center" style="color:#F00; font-size: 150%" hidden>Verify that cookies are allowed for <kbd><?php echo $_SERVER['HTTP_HOST']; ?></kbd></div>
+      <div id="cookieInfo" class="panel-title text-center" style="color:#F00; font-size: 150%" hidden>Verify that cookies are allowed for <samp><?php echo $_SERVER['HTTP_HOST']; ?></samp></div>
       <?php if ($wrongpassword) { ?>
         <div class="form-group has-error login-box-msg">
           <label class="control-label"><i class="fa fa-times-circle-o"></i> Wrong password!</label>
@@ -30,8 +30,8 @@
         <div class="row">
           <div class="col-xs-8">
           <ul>
-            <li><kbd>Return</kbd> &rarr; Log in and go to requested page (<?php echo $scriptname; ?>)</li>
-            <li><kbd>Ctrl+Return</kbd> &rarr; Log in and go to Settings page</li>
+            <li><samp>Return</samp> &rarr; Log in and go to requested page (<?php echo $scriptname; ?>)</li>
+            <li><samp>Ctrl+Return</samp> &rarr; Log in and go to Settings page</li>
           </ul>
           </div>
           <div class="col-xs-4">