merged proposed and experimental documentation, as it didn't make sense to keep two separate sections

--HG--
rename : docs/proposed/_images/scrapy_architecture.odg => docs/experimental/_images/scrapy_architecture.odg
rename : docs/proposed/_images/scrapy_architecture.png => docs/experimental/_images/scrapy_architecture.png
rename : docs/proposed/index.rst => docs/experimental/index.rst
rename : docs/proposed/newitem-fields.rst => docs/experimental/newitem-fields.rst
rename : docs/proposed/newitem.rst => docs/experimental/newitem.rst

docs/_templates/index.html

@@ -6,17 +6,15 @@
     <td width="50%">
       <p class="biglink"><a class="biglink" href="{{ pathto("intro/index") }}">Getting started</a><br/>
          <span class="linkdescr">for an overview and tutorial</span></p>
-      <p class="biglink"><a class="biglink" href="{{ pathto("ref/index") }}">API Reference</a><br/>
-         <span class="linkdescr">all details about Scrapy stable API</span></p>
-      <p class="biglink"><a class="biglink" href="{{ pathto("howto/index") }}">Experimental Features</a><br/>
-         <span class="linkdescr">use with caution</span></p>
-    </td><td width="50%">
       <p class="biglink"><a class="biglink" href="{{ pathto("topics/index") }}">Using Scrapy</a><br/>
          <span class="linkdescr">usage guide and key concepts</span></p>
+      <p class="biglink"><a class="biglink" href="{{ pathto("ref/index") }}">API Reference</a><br/>
+         <span class="linkdescr">all details about Scrapy stable API</span></p>
+    </td><td width="50%">
       <p class="biglink"><a class="biglink" href="{{ pathto("faq") }}">Frequently Asked Questions</a><br/>
          <span class="linkdescr">for common questions</span></p>
-      <p class="biglink"><a class="biglink" href="{{ pathto("proposed/index") }}">Proposed documentation</a><br/>
-         <span class="linkdescr">documentation in progress or unstable features</span></p>
+      <p class="biglink"><a class="biglink" href="{{ pathto("proposed/index") }}">Experimental Features</a><br/>
+         <span class="linkdescr">use with caution</span></p>
     </td></tr>
   </table>
 

docs/contents.rst

@@ -11,5 +11,4 @@ Scrapy documentation contents
    ref/index
    faq
    topics/adaptors
-   experimental
-   proposed/index
+   experimental/index

docs/experimental.rst

@@ -1,15 +0,0 @@
-.. _ref-experimental:
-
-Experimental features
-=====================
-
-This section documents experimental features that may become stable in future
-Scrapy releases, but whose API is not yet stable. Use them with caution, and
-subscribe to the `mailing lists <http://scrapy.org/community/>`_ to be notified
-of any changes.
-
-.. toctree::
-   :maxdepth: 1
-
-   topics/adaptors
-

docs/experimental/index.rst

@@ -0,0 +1,24 @@
+.. _experimental-index:
+
+Experimental features
+=====================
+
+This section documents experimental features that may become stable in the
+future, but whose API is not yet stable. Use them with caution, and subscribe
+to the `mailing lists <http://scrapy.org/community/>`_ to be notified of any
+changes. 
+
+This section may also contain documentation which is outdated or incomplete (as
+it's not revised so frequently), or documentation which overlaps with existing
+(stable) documentation and needs to be manually merged, use at your own risk.
+
+.. warning::
+
+   This documentation is a work in progress, use at your own risk.
+
+.. toctree::
+   :maxdepth: 1
+
+   newitem
+   newitem-fields
+

docs/proposed/index.rst

@@ -1,22 +0,0 @@
-.. _proposed-index:
-
-Proposed documentation
-======================
-
-This section contains documentation which is not yet completed, or which
-overlaps with existing documentation and needs to be manually merged. It may
-also contain outdated information, as it's not revised so frequently.
-
-.. warning::
-
-   This is experimental or "work in progress" documentation, use at your own
-   risk!
-
-.. toctree::
-   :maxdepth: 1
-
-   newitem
-   newitem-fields
-   spiders
-
-