From d5d3dfcdb53820b7d2760511359587aeaf82cea6 Mon Sep 17 00:00:00 2001
From: Hynek Schlawack <hs@ox.cx>
Date: Wed, 28 Jan 2015 16:02:18 +0100
Subject: [PATCH] Some minor doc polish

---
 attr/_make.py | 12 ++++--------
 docs/api.rst  |  6 +++++-
 2 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/attr/_make.py b/attr/_make.py
index 0a02caabf..a2dd1a7fe 100644
--- a/attr/_make.py
+++ b/attr/_make.py
@@ -17,13 +17,9 @@ class Attribute(object):
     *Read-only* representation of an attribute.
 
     :attribute name: The name of the attribute.
-    :attribute default_value: Value that is used if an ``attrs``-generated
-        ``__init__`` is used and no value is passed while instantiating.
-    :attribute default_factory: :func:`callable` that is called to obtain
-        a default value if an ``attrs``-generated ``__init__`` is used and no
-        value is passed while instantiating.
-    :attribute validator: :func:`callable` that is called on the attribute
-        if an ``attrs``-generated ``__init__`` is used.
+    :attribute default_value: see :func:`attr.ib`
+    :attribute default_factory: see :func:`attr.ib`
+    :attribute validator: see :func:`attr.ib`
     """
     def __init__(self, name, default_value, default_factory, validator):
         self.name = name
@@ -134,7 +130,7 @@ def _add_methods(maybe_cl=None, add_repr=True, add_cmp=True, add_hash=True,
     :type add_cmp: bool
 
     :param add_hash: Add a ``__hash__`` method that returns the :func:`hash` of
-    a tuple of all ``attrs`` attribute values.
+        a tuple of all ``attrs`` attribute values.
     :type add_hash: bool
 
     :param add_init: Add a ``__init__`` method that initialiazes the ``attrs``
diff --git a/docs/api.rst b/docs/api.rst
index 229fc65b0..3ea84f80e 100644
--- a/docs/api.rst
+++ b/docs/api.rst
@@ -7,10 +7,14 @@ API
 
 ``attrs`` works by decorating a class using :func:`attr.s` and then optionally defining attributes on the class using :func:`attr.ib`.
 
+.. note::
+
+   When this documentation speaks about "``attrs`` attributes" it means those attributes that are defined using :func:`attr.ib` in the class body.
+
 Thus simplest possible usage would be:
 
 .. doctest::
-   
+
    >>> import attr
    >>> @attr.s
    ... class Empty(object):