diff --git a/doc/source/deployment_guide.rst b/doc/source/deployment_guide.rst
index 37e0a79708..083a298578 100644
--- a/doc/source/deployment_guide.rst
+++ b/doc/source/deployment_guide.rst
@@ -1276,9 +1276,9 @@ expiring_objects_account_name         expiring_objects
 
 [proxy-server]
 
-============================  ===============  =============================
+============================  ===============  =====================================
 Option                        Default          Description
-----------------------------  ---------------  -----------------------------
+----------------------------  ---------------  -------------------------------------
 use                                            Entry point for paste.deploy for
                                                the proxy server.  For most
                                                cases, this should be
@@ -1398,7 +1398,7 @@ concurrency_timeout           conn_timeout     This parameter controls how long
                                                firing of the threads. This number
                                                should be between 0 and node_timeout.
                                                The default is conn_timeout (0.5).
-============================  ===============  =============================
+============================  ===============  =====================================
 
 [tempauth]
 
diff --git a/doc/source/ops_runbook/diagnose.rst b/doc/source/ops_runbook/diagnose.rst
index 9066112093..c1a2a2e99a 100644
--- a/doc/source/ops_runbook/diagnose.rst
+++ b/doc/source/ops_runbook/diagnose.rst
@@ -185,7 +185,7 @@ The following table lists known issues:
      - object-replicator .... responded as unmounted
      - A storage server disk is unavailable
      - Repair and remount the file system (on the remote node)
-   * - /var/log/swift/*.log
+   * - /var/log/swift/\*.log
      - STDOUT: EXCEPTION IN
      - A unexpected error occurred
      - Read the Traceback details, if it matches known issues
diff --git a/swift/obj/diskfile.py b/swift/obj/diskfile.py
index 991dc5228a..27b19af58a 100644
--- a/swift/obj/diskfile.py
+++ b/swift/obj/diskfile.py
@@ -1289,10 +1289,10 @@ class BaseDiskFileManager(object):
 
         timestamps is a dict which may contain items mapping:
 
-            ts_data -> timestamp of data or tombstone file,
-            ts_meta -> timestamp of meta file, if one exists
-            ts_ctype -> timestamp of meta file containing most recent
-                        content-type value, if one exists
+        - ts_data -> timestamp of data or tombstone file,
+        - ts_meta -> timestamp of meta file, if one exists
+        - ts_ctype -> timestamp of meta file containing most recent
+                      content-type value, if one exists
 
         where timestamps are instances of
         :class:`~swift.common.utils.Timestamp`