diff --git a/content/foundation/mailinglists.md b/content/foundation/mailinglists.md
index cfefbc9..1089382 100644
--- a/content/foundation/mailinglists.md
+++ b/content/foundation/mailinglists.md
@@ -41,19 +41,25 @@
 ### Request addresses for [un]subscribing ###
 
 If you want to subscribe
-to <tt>*list*@apache.org</tt>, you need to send a message to
+to <code><em>list</em>@apache.org</code>, you need to send a message to
 
-<tt>*list*-subscribe@apache.org</tt>
+<pre>
+<em>list</em>-subscribe@apache.org
+</pre>
 
 To get off a list, send a message to
 
-<tt>*list*-**un**subscribe@apache.org</tt>
+<pre>
+<em>list</em>-<b>un</b>subscribe@apache.org
+</pre>
 
 To unsubscribe a different e-mail - e.g.
-you used to be subscribed as **user@oldname.example** - send a message
+you used to be subscribed as **`user@oldname.example`** - send a message
 to
 
-<tt>*list*-unsubscribe-**user=oldname.example**@apache.org</tt>
+<pre>
+<em>list</em>-unsubscribe-<b>user=oldname.example</b>@apache.org
+</pre>
 
 [The list moderators can also do this.]
 
@@ -83,7 +89,9 @@
 To find out more about a list's features, including how to contact the list owner (moderator),
 send a message to 
 
-<tt>*list*-help@apache.org</tt>
+<pre>
+<em>list</em>-help@apache.org
+</pre>
 
 Ezmlm lists also generally provide subscribers with a way to request
 specific past messages or ranges of messages: send mail to the list's help
@@ -100,11 +108,15 @@
 
 You can also subscribe to most mailing lists in digest form. To do this for <tt>*list*@apache.org</tt>, send a message to
 
-<tt>*list*-digest-subscribe@apache.org</tt>
+<pre>
+<em>list</em>-digest-subscribe@apache.org
+</pre>
 
 To get off a digest list, send a message to
 
-<tt>*list*-digest-**un**subscribe@apache.org</tt>
+<pre>
+<em>list</em>-digest-<b>un</b>subscribe@apache.org
+</pre>
 
 If you need to unsubscribe a different email or get help with a digest list the same instructions as for subscribing/unsubscribing 
 above apply. Just remember to add *-digest* after the list name and before the *-subscribe* or *-unsubscribe*.
diff --git a/content/info/verification.md b/content/info/verification.md
index 34b8c6f..ecd4f3c 100644
--- a/content/info/verification.md
+++ b/content/info/verification.md
@@ -120,7 +120,7 @@
     gpg:               imported: 1
 
 In this example, you have now received a public key for an entity known as
-'Sander Striker &lt;striker@apache.org&gt;' However, you have no way of
+`Sander Striker <striker@apache.org>`. However, you have no way of
 verifying this key was created by the person known as Sander Striker. But,
 let's try to verify the release signature again.
 
diff --git a/content/jcp/priorhistory.md b/content/jcp/priorhistory.md
index dfbb1ee..fa4ba6c 100644
--- a/content/jcp/priorhistory.md
+++ b/content/jcp/priorhistory.md
@@ -114,7 +114,7 @@
 If you are interested in representing the ASF on a new or existing expert
 group that doesn't have ASF representation, or participating with the
 existing activities on an expert group, please [send email to the JCP open
-list](mailto:jcp-open@apache.org?Subject=Interest in Participation) and
+list](mailto:jcp-open@apache.org?Subject=Interest%20in%20Participation) and
 indicate your interest.
 
 ### Current Representation  {#CurrentReps}
@@ -192,7 +192,7 @@
 with TCKs at the ASF:
 
 - A project can request access to a TCK by sending email to [the JCP open
-list.](mailto:jcp-open@apache.org?Subject=Need TCK for Apache Project) 
+list](mailto:jcp-open@apache.org?Subject=Need%20TCK%20for%20Apache%20Project). 
 
 - This TCK is for use * **only** * for the purpose of the Apache project,
 and no other.