Merge 075a40b into 280eab2

scrapy · Aug 18, 2015 · 9fbf30c · 9fbf30c
2 parents 280eab2 + 075a40b
commit 9fbf30c
Show file tree

Hide file tree

Showing 61 changed files with 3,102 additions and 519 deletions.
diff --git a/docs/index.rst b/docs/index.rst
@@ -206,6 +206,7 @@ Extending Scrapy
    :hidden:
 
    topics/architecture
+   topics/addons
    topics/downloader-middleware
    topics/spider-middleware
    topics/extensions
@@ -217,6 +218,9 @@ Extending Scrapy
 :doc:`topics/architecture`
     Understand the Scrapy architecture.
 
+:doc:`topics/addons`
+    Enable and configure built-in and third-party extensions.
+
 :doc:`topics/downloader-middleware`
     Customize how pages get requested and downloaded.