Merge pull request #4943 from takluyver/docs-shotgun-4

Docs shotgun 4

IPython/html/widgets/widget.py

@@ -196,8 +196,10 b' class Widget(LoggingConfigurable):'
         Parameters
         ----------
         callback: callable
-            callback will be passed two arguments when a message arrives:
+            callback will be passed two arguments when a message arrives::
+            
                 callback(widget, content)
+            
         remove: bool
             True if the callback should be unregistered."""
         self._msg_callbacks.register_callback(callback, remove=remove)
@@ -208,8 +210,10 b' class Widget(LoggingConfigurable):'
         Parameters
         ----------
         callback: method handler
-            Must have a signature of:
+            Must have a signature of::
+            
                 callback(widget, **kwargs)
+            
             kwargs from display are passed through without modification.
         remove: bool
             True if the callback should be unregistered."""

IPython/nbconvert/utils/pandoc.py

@@ -47,9 +47,11 b" def pandoc(source, fmt, to, extra_args=None, encoding='utf-8'):"
     out : unicode
       Output as returned by pandoc.
 
-    Exceptions
-    ----------
-    This function will raise PandocMissing if pandoc is not installed.
+    Raises
+    ------
+    PandocMissing
+      If pandoc is not installed.
+    
     Any error messages generated by pandoc are printed to stderr.
 
     """
@@ -70,15 +72,14 b" def pandoc(source, fmt, to, extra_args=None, encoding='utf-8'):"
 def get_pandoc_version():
     """Gets the Pandoc version if Pandoc is installed.
     
-    Return
-    ------
     If the minimal version is not met, it will probe Pandoc for its version, cache it and return that value.
     If the minimal version is met, it will return the cached version and stop probing Pandoc 
-    (unless `clean_cache()` is called).
+    (unless :func:`clean_cache()` is called).
 
-    Exceptions
-    ----------
-    PandocMissing will be raised if pandoc is unavailable.
+    Raises
+    ------
+    PandocMissing
+      If pandoc is unavailable.
     """
     global __version
 
@@ -95,9 +96,10 b' def get_pandoc_version():'
 def check_pandoc_version():
     """Returns True if minimal pandoc version is met.
 
-    Exceptions
-    ----------
-    PandocMissing will be raised if pandoc is unavailable.
+    Raises
+    ------
+    PandocMissing
+      If pandoc is unavailable.
     """
     v = get_pandoc_version()
     ok = check_version(v , _minimal_version )