--- a/doc/book/en/admin/index.rst	Wed Apr 14 16:32:20 2010 +0200
+++ b/doc/book/en/admin/index.rst	Wed Apr 14 16:33:30 2010 +0200
@@ -2,9 +2,9 @@
 
 .. _Part3:
 
--------------------------
-Part III - Administration
--------------------------
+--------------
+Administration
+--------------
 
 This part is for installation and administration of the *CubicWeb* framework and
 instances based on that framework.

--- a/doc/book/en/admin/setup.rst	Wed Apr 14 16:32:20 2010 +0200
+++ b/doc/book/en/admin/setup.rst	Wed Apr 14 16:33:30 2010 +0200
@@ -141,6 +141,15 @@
 
 Please be careful to select the right python (2.5) and postgres (8.4) versions.
 
+A windows compiled recent version of gettext::
+
+  http://ftp.logilab.org/pub/gettext/gettext-0.17-win32-setup.exe
+
+A pre-compiled version of rql for windows (take care of retrieving the
+most recent version available there)::
+
+  http://ftp.logilab.org/pub/rql/rql-0.23.0.win32-py2.5.exe
+
 Pyro enables remote access to cubicweb repository instances. Get it there::
 
   http://sourceforge.net/projects/pyro/files/

--- a/doc/book/en/annexes/index.rst	Wed Apr 14 16:32:20 2010 +0200
+++ b/doc/book/en/annexes/index.rst	Wed Apr 14 16:33:30 2010 +0200
@@ -2,9 +2,9 @@
 
 .. _Part4:
 
---------------------
-Part IV - Appendixes
---------------------
+----------
+Appendixes
+----------
 
 The following chapters are reference material.
 

--- a/doc/book/en/conf.py	Wed Apr 14 16:32:20 2010 +0200
+++ b/doc/book/en/conf.py	Wed Apr 14 16:33:30 2010 +0200
@@ -35,7 +35,7 @@
 extensions = ['sphinx.ext.autodoc', 'logilab.common.sphinx_ext']#, 'sphinxcontrib.aafig']
 autoclass_content = 'both'
 # Add any paths that contain templates here, relative to this directory.
-templates_path = ['.templates']
+#templates_path = []
 
 # The suffix of source filenames.
 source_suffix = '.rst'

--- a/doc/book/en/development/index.rst	Wed Apr 14 16:32:20 2010 +0200
+++ b/doc/book/en/development/index.rst	Wed Apr 14 16:33:30 2010 +0200
@@ -1,8 +1,8 @@
 .. _Part2:
 
----------------------
-Part II - Development
----------------------
+-----------
+Development
+-----------
 
 This part is about developing web applications with the *CubicWeb* framework.
 

--- a/doc/book/en/index.rst	Wed Apr 14 16:32:20 2010 +0200
+++ b/doc/book/en/index.rst	Wed Apr 14 16:33:30 2010 +0200
@@ -44,10 +44,19 @@
 =================
 
 .. toctree::
+   :maxdepth: 2
+
+   intro/index
+   tutorials/index
+
+.. toctree::
    :maxdepth: 3
 
-   intro/index
    development/index
+
+.. toctree::
+   :maxdepth: 2
+
    admin/index
    annexes/index
 

--- a/doc/book/en/intro/index.rst	Wed Apr 14 16:32:20 2010 +0200
+++ b/doc/book/en/intro/index.rst	Wed Apr 14 16:33:30 2010 +0200
@@ -2,9 +2,9 @@
 
 .. _Part1:
 
------------------------------------
-Part I - Introduction to *CubicWeb*
------------------------------------
+--------------------------
+Introduction to *CubicWeb*
+--------------------------
 
 This first part of the book offers different reading path to
 discover the *CubicWeb* framework, provides a tutorial to get a quick
@@ -15,7 +15,5 @@
    :maxdepth: 2
    :numbered:
 
-   book-map
    history
    concepts.rst
-   tutorial/index