@@ -17,7 +17,7 @@
 
 
 class ListTools(ToolBase):
-    '''List all the tools controlled by `Navigation`'''
+    '''List all the tools controlled by the `ToolManager`'''
     # keyboard shortcut
     default_keymap = 'm'
     description = 'List Tools'
@@ -72,7 +72,8 @@ def trigger(self, *args, **kwargs):
 # Remove the forward button
 fig.canvas.manager.toolmanager.remove_tool('forward')
 
-# To add a custom tool to the toolbar at specific location
+# To add a custom tool to the toolbar at specific location inside
+# the navigation group
 fig.canvas.manager.toolbar.add_tool('List', 'navigation', 1)
 
 plt.show()
@@ -99,7 +99,7 @@ def func(event)
 
     def toolmanager_disconnect(self, cid):
         """
-        Disconnect callback id cid
+        Disconnect callback id *cid*
 
         Example usage::
 
@@ -196,9 +196,7 @@ def remove_tool(self, name):
 
     def add_tool(self, name, tool, *args, **kwargs):
         """
-        Add tool to `ToolManager`
-
-        Add a tool to the tools controlled by ToolManager
+        Add *tool* to `ToolManager`
 
         If successful adds a new event `tool_trigger_name` where **name** is
         the **name** of the tool, this event is fired everytime
 
@@ -936,7 +936,7 @@ def trigger(self, sender, event, data=None):
         self.window.present()
 
 
-class DialogLineprops:
+class DialogLineprops(object):
     """
     A GUI dialog for controlling lineprops
     """