doc: remove blocks manual; move site anatomy to manuals.

zotonic · Oct 31, 2012 · 9703dcf · 9703dcf
1 parent 4b421f0
commit 9703dcf
Show file tree

Hide file tree

Showing 5 changed files with 21 additions and 7 deletions.
diff --git a/doc/manuals/datamodel/resources.rst b/doc/manuals/datamodel/resources.rst
@@ -77,6 +77,21 @@ files that are no longer referenced by any media.
 .. seealso:: :ref:`model-media`
 
 
+Blocks
+......
+
+Blocks are a specific feature in a resource. The ``blocks`` property
+of a resource is a list of blocks which can be dynamically added and
+removed from the resource in the admin edit page. Each module can
+define their own blocks, which consist of an edit template and a view
+template.
+
+The survey module uses the blocks feature to allow you to dynamically
+create a list of questions which a user has to answer.
+
+.. todo:: Fix blocks documentation
+
+
 Pivot columns
 .............
 

diff --git a/doc/manuals/in-depth.rst b/doc/manuals/in-depth.rst
@@ -3,17 +3,17 @@ In-depth manuals
 
 .. toctree::
 
-   dispatch
+   site-anatomy
    modules/index
-   services
+   dispatch
    auth
    notification
    datamodel/index
-   blocks
    i18n
    media-files
    templates/index
    lib-files
    controllers
    email
+   services
    cookbook/index
diff --git a/doc/manuals/site-anatomy.rst b/doc/manuals/site-anatomy.rst
@@ -1,4 +1,4 @@
-.. _tutorial-site-anatomy:
+.. _manual-site-anatomy:
 
 Anatomy of a site
 =================

diff --git a/doc/tutorials/index.rst b/doc/tutorials/index.rst
@@ -9,7 +9,6 @@ Topics:
    preinstall
    install
    install-addsite
-   site-anatomy
    zotonic_status
    install-troubleshooting
 
diff --git a/doc/tutorials/install-addsite.rst b/doc/tutorials/install-addsite.rst
@@ -49,5 +49,5 @@ called ``yoursite``.
 8. Congratulations! You got your first site running.
 
 To learn more about how sites work and what consists of a
-:term:`Zotonic site`, please see the next chapter,
-:ref:`tutorial-site-anatomy`.
+:term:`Zotonic site`, please see the in-depth manual,
+:ref:`manual-site-anatomy`.