diff --git a/IPython/terminal/embed.py b/IPython/terminal/embed.py
index f9c1944..fddf5d8 100644
--- a/IPython/terminal/embed.py
+++ b/IPython/terminal/embed.py
@@ -44,15 +44,14 @@ class EmbeddedMagics(Magics):
         the interactive shell interfering again.
 
 
-        Kill Instance Option
-        --------------------
-
-        If for some reasons you need to kill the location where the instance is
-        created and not called, for example if you create a single instance in
-        one place and debug in many locations, you can use the ``--instance``
-        option to kill this specific instance. Like for the ``call location``
-        killing an "instance" should work even if it is recreated within a
-        loop.
+        Kill Instance Option:
+
+            If for some reasons you need to kill the location where the instance
+            is created and not called, for example if you create a single
+            instance in one place and debug in many locations, you can use the
+            ``--instance`` option to kill this specific instance. Like for the
+            ``call location`` killing an "instance" should work even if it is
+            recreated within a loop.
 
         .. note::
 
diff --git a/IPython/terminal/interactiveshell.py b/IPython/terminal/interactiveshell.py
index 1f12017..c836cc7 100644
--- a/IPython/terminal/interactiveshell.py
+++ b/IPython/terminal/interactiveshell.py
@@ -104,9 +104,7 @@ class TerminalInteractiveShell(InteractiveShell):
             IPython own testing machinery, and emacs inferior-shell integration through elpy.
 
             This mode default to `True` if the `IPY_TEST_SIMPLE_PROMPT`
-            environment variable is set, or the current terminal is not a tty.
-
-            """
+            environment variable is set, or the current terminal is not a tty."""
             ).tag(config=True)
 
     @property
diff --git a/IPython/utils/tokenize2.py b/IPython/utils/tokenize2.py
index 510dbf1..9da7f3c 100644
--- a/IPython/utils/tokenize2.py
+++ b/IPython/utils/tokenize2.py
@@ -392,7 +392,8 @@ def tokenize(readline):
     must be a callable object which provides the same interface as the
     readline() method of built-in file objects.  Each call to the function
     should return one line of input as bytes.  Alternately, readline
-    can be a callable function terminating with StopIteration:
+    can be a callable function terminating with :class:`StopIteration`::
+
         readline = open(myfile, 'rb').__next__  # Example of alternate readline
 
     The generator produces 5-tuples with these members: the token type; the
diff --git a/IPython/utils/tokenutil.py b/IPython/utils/tokenutil.py
index 724dc69..02155d1 100644
--- a/IPython/utils/tokenutil.py
+++ b/IPython/utils/tokenutil.py
@@ -38,7 +38,7 @@ def line_at_cursor(cell, cursor_pos=0):
     Returns
     -------
     
-    (line, offset): (text, integer)
+    (line, offset): (string, integer)
         The line with the current cursor, and the character offset of the start of the line.
     """
     offset = 0
diff --git a/docs/source/config/details.rst b/docs/source/config/details.rst
index 841acab..f1967de 100644
--- a/docs/source/config/details.rst
+++ b/docs/source/config/details.rst
@@ -195,7 +195,7 @@ With (X)EMacs >= 24, You can enable IPython in python-mode with:
 .. _TextMate: http://macromates.com/
 .. _vim: http://www.vim.org/
 
-.. _custom_keyboard_shortcuts
+.. _custom_keyboard_shortcuts:
 
 Keyboard Shortcuts
 ==================
diff --git a/docs/source/whatsnew/development.rst b/docs/source/whatsnew/development.rst
index 869ff11..3ba5459 100644
--- a/docs/source/whatsnew/development.rst
+++ b/docs/source/whatsnew/development.rst
@@ -52,6 +52,7 @@ completer interface:
 .. image:: ../_images/jedi_type_inference_60.png
     :alt: Jedi showing ability to do type inference
     :align: center
+    :width: 400px
     :target: ../_images/jedi_type_inference_60.png
 
 The appearance of the completer is controlled by the
@@ -63,7 +64,7 @@ The use of Jedi also full fill a number of request and fix a number of bugs
 like case insensitive completion, completion after division operator: See
 :ghpull:`10182`.
 
-Extra patches and updates will be needed to the :any:`ipykernel` package for
+Extra patches and updates will be needed to the :mod:`ipykernel` package for
 this feature to be available to other clients like jupyter Notebook, Lab,
 Nteract, Hydrogen...