From d988d2006fa8571d906400feaf2b23d7cedac0c2 Mon Sep 17 00:00:00 2001
From: Bruno Oliveira <nicoddemus@gmail.com>
Date: Tue, 25 Aug 2015 23:54:05 -0300
Subject: [PATCH] Mention cookie-cutter in the docs and fix broken links to
 <extplugin>

---
 doc/en/writing_plugins.rst | 22 ++++++++++++++++------
 1 file changed, 16 insertions(+), 6 deletions(-)

diff --git a/doc/en/writing_plugins.rst b/doc/en/writing_plugins.rst
index 240b85b37..1e9807cf5 100644
--- a/doc/en/writing_plugins.rst
+++ b/doc/en/writing_plugins.rst
@@ -16,7 +16,7 @@ reporting by calling `well specified hooks`_ of the following plugins:
 
 * :ref:`builtin plugins`: loaded from pytest's internal ``_pytest`` directory.
 
-* :ref:`external plugins <extplugin>`: modules discovered through
+* :ref:`external plugins <plugins_index>`: modules discovered through
   `setuptools entry points`_
 
 * `conftest.py plugins`_: modules auto-discovered in test directories
@@ -100,8 +100,8 @@ Here is how you might run it::
     conftest.py file.
 
 
-Writing a plugin by looking at examples
----------------------------------------
+Writing your own plugin
+-----------------------
 
 .. _`setuptools`: http://pypi.python.org/pypi/setuptools
 
@@ -110,12 +110,22 @@ you can copy from:
 
 * a custom collection example plugin: :ref:`yaml plugin`
 * around 20 doc:`builtin plugins` which provide pytest's own functionality
-* many :doc:`external plugins` providing additional features
+* many :ref:`external plugins <plugins_index>` providing additional features
 
 All of these plugins implement the documented `well specified hooks`_
 to extend and add functionality.
 
-You can also :ref:`contribute your plugin to pytest-dev<submitplugin>`
+.. note::
+    Make sure to check out the excellent
+    `cookiecutter-pytest-plugin <https://github.com/pytest-dev/cookiecutter-pytest-plugin>`_
+    project, which is a `cookiecutter template <https://github.com/audreyr/cookiecutter>`_
+    for authoring plugins.
+
+    The template provides an excellent starting point with a working plugin,
+    tests running with tox, comprehensive README and
+    entry-pointy already pre-configured.
+
+Also consider :ref:`contributing your plugin to pytest-dev<submitplugin>`
 once it has some happy users other than yourself.
 
 
@@ -244,7 +254,7 @@ Let's look at a possible implementation:
 .. code-block:: python
 
     def pytest_collection_modifyitems(config, items):
-        # called after collectin is completed
+        # called after collection is completed
         # you can modify the ``items`` list
 
 Here, ``pytest`` will pass in ``config`` (the pytest config object)