2 files changed, 118 insertions, 0 deletions
diff --git a/docs/changelog.rst b/docs/changelog.rst
new file mode 100644
index 0000000..5f25818
--- /dev/null
+++ b/docs/changelog.rst
@@ -0,0 +1,117 @@
+ChangeLog
+=========
+
+1.2.0 (current)
+---------------
+
+*New:*
+    - Add :class:`~factory.CircularSubFactory` to solve circular dependencies between factories
+    - Better creation/building customization hooks at :meth:`factory.Factory._build` and :meth:`factory.Factory.create`.
+
+1.1.5 (09/07/2012)
+------------------
+
+*Bugfix:*
+
+    - Fix :class:`~factory.PostGenerationDeclaration` and derived classes.
+
+1.1.4 (19/06/2012)
+------------------
+
+*New:*
+
+    - Add :meth:`~factory.use_strategy` decorator to override a
+      :class:`~factory.Factory`'s default strategy
+    - Improve test running (tox, python2.6/2.7)
+    - Introduce :class:`~factory.PostGeneration` and
+      :class:`~factory.RelatedFactory`
+
+1.1.3 (9/03/2012)
+-----------------
+
+*Bugfix:*
+
+  - Fix packaging rules
+
+1.1.2 (25/02/2012)
+------------------
+
+*New:*
+
+  - Add :class:`~factory.Iterator` and :class:`~factory.InfiniteIterator` for :class:`~factory.Factory` attribute declarations.
+  - Provide :func:`~factory.Factory.generate` and :func:`~factory.Factory.simple_generate`, that allow specifying the instantiation strategy directly.
+    Also provides :func:`~factory.Factory.generate_batch` and :func:`~factory.Factory.simple_generate_batch`.
+
+1.1.1 (24/02/2012)
+------------------
+
+*New:*
+
+  - Add :func:`~factory.Factory.build_batch`, :func:`~factory.Factory.create_batch` and :func:`~factory.Factory.stub_batch`, to instantiate factories in batch
+
+1.1.0 (24/02/2012)
+------------------
+
+*New:*
+
+  - Improve the :class:`~factory.SelfAttribute` syntax to fetch sub-attributes using the ``foo.bar`` syntax;
+  - Add :class:`~factory.ContainerAttribute` to fetch attributes from the container of a :class:`~factory.SubFactory`.
+  - Provide the :func:`~factory.make_factory` helper: ``MyClassFactory = make_factory(MyClass, x=3, y=4)``
+  - Add :func:`~factory.build`, :func:`~factory.create`, :func:`~factory.stub` helpers
+
+*Bugfix:*
+
+  - Allow classmethod/staticmethod on factories
+
+*Deprecation:*
+
+  - Auto-discovery of :attr:`~factory.Factory.FACTORY_FOR` based on class name is now deprecated
+
+1.0.4 (21/12/2011)
+------------------
+
+*New:*
+
+  - Improve the algorithm for populating a :class:`~factory.Factory` attributes dict
+  - Add ``python setup.py test`` command to run the test suite
+  - Allow custom build functions
+  - Introduce :data:`~factory.MOGO_BUILD` build function
+  - Add support for inheriting from multiple :class:`~factory.Factory`
+  - Base :class:`~factory.Factory` classes can now be declared :attr:`abstract <factory.Factory.ABSTRACT_FACTORY`.
+  - Provide :class:`~factory.DjangoModelFactory`, whose :class:`~factory.Sequence` counter starts at the next free database id
+  - Introduce :class:`~factory.SelfAttribute`, a shortcut for ``factory.LazyAttribute(lambda o: o.foo.bar.baz``.
+
+*Bugfix:*
+
+  - Handle nested :class:`~factory.SubFactory`
+  - Share sequence counter between parent and subclasses
+  - Fix :class:`~factory.SubFactory` / :class:`~factory.Sequence` interferences
+
+1.0.2 (16/05/2011)
+------------------
+
+*New:*
+
+  - Introduce :class:`~factory.SubFactory`
+
+1.0.1 (13/05/2011)
+------------------
+
+*New:*
+
+  - Allow :class:`~factory.Factory` inheritance
+  - Improve handling of custom build/create functions
+
+*Bugfix:*
+
+  - Fix concurrency between :class:`~factory.LazyAttribute` and :class:`~factory.Sequence`
+
+1.0.0 (22/08/2010)
+------------------
+
+*New:*
+
+  - First version of factory_boy
+
+
+.. vim:et:ts=4:sw=4:tw=119:ft=rst:
diff --git a/docs/index.rst b/docs/index.rst
index f0b5dcc..f91b830 100644
--- a/docs/index.rst
+++ b/docs/index.rst
@@ -61,6 +61,7 @@ Contents:
     subfactory
     post_generation
     internals
+    changelog
 
 Indices and tables
 ==================