diff --git a/docs/glossary.rst b/docs/glossary.rst
index 585ea0a..dc6f3eb 100644
--- a/docs/glossary.rst
+++ b/docs/glossary.rst
@@ -63,4 +63,4 @@
 
     text
         This type corresponds to ``unicode`` on Python 2 and ``str`` on Python
-        3.  This is equivalent to `six.text_type`.
+        3.  This is equivalent to ``six.text_type``.
diff --git a/docs/x509.rst b/docs/x509.rst
index 19ff6d7..56d2ad6 100644
--- a/docs/x509.rst
+++ b/docs/x509.rst
@@ -185,7 +185,7 @@
 
     .. versionadded:: 0.8
 
-    An X.509 name consists of a list of NameAttribute objects.
+    An X.509 name consists of a list of NameAttribute instances.
 
     .. attribute:: oid
 
@@ -210,7 +210,7 @@
 
         :type: :class:`str`
 
-        The dotted string value of the OID (e.g. "2.5.4.3")
+        The dotted string value of the OID (e.g. "``2.5.4.3``")
 
 Object Identifiers
 ~~~~~~~~~~~~~~~~~~
@@ -220,63 +220,63 @@
 
 .. data:: OID_COMMON_NAME
 
-    Corresponds to the dotted string "2.5.4.3".
+    Corresponds to the dotted string "``2.5.4.3``".
 
 .. data:: OID_COUNTRY_NAME
 
-    Corresponds to the dotted string "2.5.4.6".
+    Corresponds to the dotted string "``2.5.4.6``".
 
 .. data:: OID_LOCALITY_NAME
 
-    Corresponds to the dotted string "2.5.4.7".
+    Corresponds to the dotted string "``2.5.4.7``".
 
 .. data:: OID_STATE_OR_PROVINCE_NAME
 
-    Corresponds to the dotted string "2.5.4.8".
+    Corresponds to the dotted string "``2.5.4.8``".
 
 .. data:: OID_ORGANIZATION_NAME
 
-    Corresponds to the dotted string "2.5.4.10".
+    Corresponds to the dotted string "``2.5.4.10``".
 
 .. data:: OID_ORGANIZATIONAL_UNIT_NAME
 
-    Corresponds to the dotted string "2.5.4.11".
+    Corresponds to the dotted string "``2.5.4.11``".
 
 .. data:: OID_SERIAL_NUMBER
 
-    Corresponds to the dotted string "2.5.4.5".
+    Corresponds to the dotted string "``2.5.4.5``".
 
 .. data:: OID_SURNAME
 
-    Corresponds to the dotted string "2.5.4.4".
+    Corresponds to the dotted string "``2.5.4.4``".
 
 .. data:: OID_GIVEN_NAME
 
-    Corresponds to the dotted string "2.5.4.42".
+    Corresponds to the dotted string "``2.5.4.42``".
 
 .. data:: OID_TITLE
 
-    Corresponds to the dotted string "2.5.4.12".
+    Corresponds to the dotted string "``2.5.4.12``".
 
 .. data:: OID_GENERATION_QUALIFIER
 
-    Corresponds to the dotted string "2.5.4.44".
+    Corresponds to the dotted string "``2.5.4.44``".
 
 .. data:: OID_DN_QUALIFIER
 
-    Corresponds to the dotted string "2.5.4.46".
+    Corresponds to the dotted string "``2.5.4.46``".
 
 .. data:: OID_PSEUDONYM
 
-    Corresponds to the dotted string "2.5.4.65".
+    Corresponds to the dotted string "``2.5.4.65``".
 
 .. data:: OID_DOMAIN_COMPONENT
 
-    Corresponds to the dotted string "0.9.2342.19200300.100.1.25".
+    Corresponds to the dotted string "``0.9.2342.19200300.100.1.25``".
 
 .. data:: OID_EMAIL_ADDRESS
 
-    Corresponds to the dotted string "1.2.840.113549.1.9.1".
+    Corresponds to the dotted string "``1.2.840.113549.1.9.1``".
 
 Exceptions
 ~~~~~~~~~~