diff --git a/docs/index.rst b/docs/index.rst
index bafe40e..c266353 100644
--- a/docs/index.rst
+++ b/docs/index.rst
@@ -21,7 +21,7 @@ Contents:
 Source, license, & bug reports
 ==============================
 The source code which was used to generate this documentation is accessible by
-clicking the little [source]_ links next to the docs. Current source code can
+clicking the little `source` links next to the docs. Current source code can
 be found in this github repository_. The **master** branch always reflects the
 latest release, all releases are tagged with signed, annotated git tags, and
 the **develop** branch represents the state of the next release.
diff --git a/gnupg/_meta.py b/gnupg/_meta.py
index 57a0dfb..cce747e 100644
--- a/gnupg/_meta.py
+++ b/gnupg/_meta.py
@@ -7,12 +7,12 @@
 #           © 2008-2012 Vinay Sajip
 #           © 2005 Steve Traugott
 #           © 2004 A.M. Kuchling
-# 
+#
 # This program is free software: you can redistribute it and/or modify it
 # under the terms of the GNU General Public License as published by the Free
 # Software Foundation, either version 3 of the License, or (at your option)
 # any later version.
-# 
+#
 # This program is distributed in the hope that it will be useful, but WITHOUT
 # ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
 # FITNESS FOR A PARTICULAR PURPOSE. See the included LICENSE file for details.
@@ -604,7 +604,7 @@ class GPGBase(object):
         :param str keyids: A space-delimited string containing the keyids to
                            request.
         :param str keyserver: The keyserver to request the ``keyids`` from;
-                              defaults to :property:`gnupg.GPG.keyserver`.
+                              defaults to `gnupg.GPG.keyserver`.
         """
         if not keyserver:
             keyserver = self.keyserver
diff --git a/gnupg/_trust.py b/gnupg/_trust.py
index 30f7439..1f5b266 100644
--- a/gnupg/_trust.py
+++ b/gnupg/_trust.py
@@ -7,12 +7,12 @@
 #           © 2008-2012 Vinay Sajip
 #           © 2005 Steve Traugott
 #           © 2004 A.M. Kuchling
-# 
+#
 # This program is free software: you can redistribute it and/or modify it
 # under the terms of the GNU General Public License as published by the Free
 # Software Foundation, either version 3 of the License, or (at your option)
 # any later version.
-# 
+#
 # This program is distributed in the hope that it will be useful, but WITHOUT
 # ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
 # FITNESS FOR A PARTICULAR PURPOSE. See the included LICENSE file for details.
@@ -78,11 +78,11 @@ def import_ownertrust(self, trustdb=None):
 def fix_trustdb(cls, trustdb=None):
     """Attempt to repair a broken trustdb.gpg file.
 
-    GnuPG>=2.0.x has this magical-seeming flag: '--fix-trustdb'. You'd think
+    GnuPG>=2.0.x has this magical-seeming flag: `--fix-trustdb`. You'd think
     it would fix the the trustdb. Hah! It doesn't. Here's what it does
     instead:
 
-    (python-gnupg)∃!isisⒶwintermute:(testing/digest-algo *$=)~/code/python-gnupg ∴ gpg2 --fix-trustdb
+    (python-gnupg)∃!isisⒶwintermute:(testing/digest-algo)~/code/python-gnupg ∴ gpg2 --fix-trustdb
     gpg: You may try to re-create the trustdb using the commands:
     gpg:   cd ~/.gnupg
     gpg:   gpg2 --export-ownertrust > otrust.tmp
diff --git a/gnupg/gnupg.py b/gnupg/gnupg.py
index 0605f68..c907a32 100644
--- a/gnupg/gnupg.py
+++ b/gnupg/gnupg.py
@@ -7,12 +7,12 @@
 #           © 2008-2012 Vinay Sajip
 #           © 2005 Steve Traugott
 #           © 2004 A.M. Kuchling
-# 
+#
 # This program is free software: you can redistribute it and/or modify it
 # under the terms of the GNU General Public License as published by the Free
 # Software Foundation, either version 3 of the License, or (at your option)
 # any later version.
-# 
+#
 # This program is distributed in the hope that it will be useful, but WITHOUT
 # ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
 # FITNESS FOR A PARTICULAR PURPOSE. See the included LICENSE file for details.
@@ -373,7 +373,7 @@ class GPG(GPGBase):
         :param str keyids: Each ``keyids`` argument should be a string
              containing a keyid to request.
         :param str keyserver: The keyserver to request the ``keyids`` from;
-             defaults to :property:`gnupg.GPG.keyserver`.
+             defaults to `gnupg.GPG.keyserver`.
         """
         if keyids:
             keys = ' '.join([key for key in keyids])