diff --git a/.mailmap b/.mailmap
index f2aa13e934..3045e13840 100644
--- a/.mailmap
+++ b/.mailmap
@@ -1,6 +1,7 @@
 Greg Holt <gholt@rackspace.com> gholt <gholt@brim.net>
 Greg Holt <gholt@rackspace.com> gholt <devnull@brim.net>
 Greg Holt <gholt@rackspace.com> gholt <z-github@brim.net>
+Greg Holt <gholt@rackspace.com> gholt <z-launchpad@brim.net>
 Greg Holt <gholt@rackspace.com>
 John Dickinson <me@not.mn> <john.dickinson@rackspace.com>
 Michael Barton <mike@weirdlooking.com> <michael.barton@rackspace.com>
diff --git a/doc/source/howto_installmultinode.rst b/doc/source/howto_installmultinode.rst
index 04ee1640cf..685364feb3 100644
--- a/doc/source/howto_installmultinode.rst
+++ b/doc/source/howto_installmultinode.rst
@@ -108,8 +108,8 @@ Configure the Proxy node
         openssl req -new -x509 -nodes -out cert.crt -keyout cert.key
 
 .. note::
-	If you don't create the cert files, Swift silently uses http internally rather than https. This document assumes that you have created
-	these certs, so if you're following along step-by-step, create them. In a
+    If you don't create the cert files, Swift silently uses http internally rather than https. This document assumes that you have created
+    these certs, so if you're following along step-by-step, create them. In a
     production cluster, you should terminate SSL before the proxy server. SSL
     support is provided for testing purposes only.