diff --git a/docs/source/plugin-api.rst b/docs/source/plugin-api.rst
index b19660c1..0b2cb110 100644
--- a/docs/source/plugin-api.rst
+++ b/docs/source/plugin-api.rst
@@ -5,7 +5,7 @@ The plugin API
 
 If you want to set up an editor/IDE-plugin with **Jedi**, you first need to
 ``import jedi``. You then have direct access to the :class:`.Script`,
-:class:`.NotFoundError` and :func:`.set_debug_function` objects.
+:exc:`.NotFoundError` and :func:`.set_debug_function` objects.
 
 
 API documentation
diff --git a/jedi/api_classes.py b/jedi/api_classes.py
index 1c949db6..0ce100d7 100644
--- a/jedi/api_classes.py
+++ b/jedi/api_classes.py
@@ -93,8 +93,8 @@ class BaseDefinition(object):
     @property
     def line_nr(self):
         """
-        .. warning:: Deprecated! It's just here for backwards compatibility,
-            use `api_classes.BaseDefinition.line` instead.
+        .. deprecated:: 0.5.0
+           Use :attr:`.line` instead.
         .. todo:: Remove!
         """
         warnings.warn("Use line instead.", DeprecationWarning)
@@ -102,7 +102,7 @@ class BaseDefinition(object):
 
     @property
     def line(self):
-        """ The line where the definition occurs (starting with 1). """
+        """The line where the definition occurs (starting with 1)."""
         return self.start_pos[0]
 
     @property
@@ -112,7 +112,7 @@ class BaseDefinition(object):
 
     @property
     def doc(self):
-        """ Return a document string for this completion object. """
+        """Return a document string for this completion object."""
         try:
             return self.definition.doc
         except AttributeError: