Merge 68ea951 into cfae62f

scrapy · Aug 25, 2015 · 21e5754 · 21e5754
2 parents cfae62f + 68ea951
commit 21e5754
Show file tree

Hide file tree

Showing 59 changed files with 3,106 additions and 521 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.