--- a/doc/book/en/admin/gae.rst	Fri Apr 23 12:40:48 2010 +0200
+++ b/doc/book/en/admin/gae.rst	Fri Apr 23 14:55:10 2010 +0200
@@ -210,7 +210,7 @@
 This cookie values needs to be provided to ``laxctl`` commands
 in order to handle datastore administration requests.
 
-.. image:: ../images/lax-book.02-cookie-values.en.png
+.. image:: ../images/lax-book_02-cookie-values_en.png
    :alt: displaying the detailed view of the cookie values returned
 
 

--- a/doc/book/en/admin/site-config.rst	Fri Apr 23 12:40:48 2010 +0200
+++ b/doc/book/en/admin/site-config.rst	Fri Apr 23 14:55:10 2010 +0200
@@ -3,7 +3,7 @@
 User interface for web site configuration
 =========================================
 
-.. image:: ../images/lax-book.03-site-config-panel.en.png
+.. image:: ../images/lax-book_03-site-config-panel_en.png
 
 This panel allows you to configure the appearance of your instance site.
 Six menus are available and we will go through each of them to explain how

--- a/doc/book/en/annexes/faq.rst	Fri Apr 23 12:40:48 2010 +0200
+++ b/doc/book/en/annexes/faq.rst	Fri Apr 23 14:55:10 2010 +0200
@@ -249,7 +249,7 @@
    By default all instance will look for a ``logo.png`` to be
    rendered in the logo section.
 
-   .. image:: ../images/lax-book.06-main-template-logo.en.png
+   .. image:: ../images/lax-book_06-main-template-logo_en.png
 
 2. In your cube directory, you can specify which file to use for the logo.
    This is configurable in ``mycube/data/external_resources``: ::

--- a/doc/book/en/development/datamodel/define-workflows.rst	Fri Apr 23 12:40:48 2010 +0200
+++ b/doc/book/en/development/datamodel/define-workflows.rst	Fri Apr 23 14:55:10 2010 +0200
@@ -128,7 +128,7 @@
 * `U`, the user executing that may pass the transition
 
 
-.. image:: ../../images/03-transitions-view.en.png
+.. image:: ../../images/03-transitions-view_en.png
 
 You can notice that in the action box of a BlogEntry, the state is now
 listed as well as the possible transitions for the current state

--- a/doc/book/en/development/devweb/form.rst	Fri Apr 23 12:40:48 2010 +0200
+++ b/doc/book/en/development/devweb/form.rst	Fri Apr 23 14:55:10 2010 +0200
@@ -99,7 +99,7 @@
 javascript (`$('#sendmail')` being the jQuery call to get the element with DOM id
 set to 'sendmail', which is our form DOM id as specified by its `domid`
 attribute), another to cancel the form which will go back to the previous page
-using another javascript call. Also we specify image to used as button icon a
+using another javascript call. Also we specify an image to use as button icon as a
 resource identifier (see :ref:`external_resources`) given as last argument to
 :class:`cubicweb.web.formwidgets.ImgButton`.
 
@@ -162,7 +162,7 @@
 
 Also notice that our controller has a selector that deny access to it to
 anonymous users (we don't want our instance to be used as a spam relay), but also
-check expected parameters are specified in forms. That avoid later defensive
+check expected parameters are specified in forms. That avoids later defensive
 programming (though it's not enough to handle all possible error cases).
 
 To conclude our example, suppose we wish a different form layout and that existent

--- a/doc/book/en/development/devweb/views/primary.rst	Fri Apr 23 12:40:48 2010 +0200
+++ b/doc/book/en/development/devweb/views/primary.rst	Fri Apr 23 14:55:10 2010 +0200
@@ -235,7 +235,7 @@
 The view method ``self.w()`` is used to output data. Here `lines
 08-09` output HTML for the publication date of the entry.
 
-.. image:: ../../../images/lax-book.09-new-view-blogentry.en.png
+.. image:: ../../../images/lax-book_09-new-view-blogentry_en.png
    :alt: blog entries now look much nicer
 
 Let us now improve the primary view of a blog
@@ -308,5 +308,5 @@
 Assuming we added entries to the blog titled `MyLife`, displaying it
 now allows to read its description and all its entries.
 
-.. image:: ../../../images/lax-book.10-blog-with-two-entries.en.png
+.. image:: ../../../images/lax-book_10-blog-with-two-entries_en.png
    :alt: a blog and all its entries

Binary file doc/book/en/images/03-transitions-view.en.png has changed

Binary file doc/book/en/images/03-transitions-view_en.png has changed

Binary file doc/book/en/images/archi_globale.en.png has changed

Binary file doc/book/en/images/archi_globale_en.png has changed

Binary file doc/book/en/images/cbw-add-relation-entryof.en.png has changed

Binary file doc/book/en/images/cbw-add-relation-entryof_en.png has changed

Binary file doc/book/en/images/cbw-create-blog.en.png has changed

Binary file doc/book/en/images/cbw-create-blog_en.png has changed

Binary file doc/book/en/images/cbw-detail-one-blogentry.en.png has changed

Binary file doc/book/en/images/cbw-detail-one-blogentry_en.png has changed

Binary file doc/book/en/images/cbw-list-one-blog.en.png has changed

Binary file doc/book/en/images/cbw-list-one-blog_en.png has changed

Binary file doc/book/en/images/cbw-list-two-blog.en.png has changed

Binary file doc/book/en/images/cbw-list-two-blog_en.png has changed

Binary file doc/book/en/images/cbw-schema.en.png has changed

Binary file doc/book/en/images/cbw-schema_en.png has changed

Binary file doc/book/en/images/cbw-update-primary-view.en.png has changed

Binary file doc/book/en/images/cbw-update-primary-view_en.png has changed

Binary file doc/book/en/images/lax-book.00-login.en.png has changed

Binary file doc/book/en/images/lax-book.01-start.en.png has changed

Binary file doc/book/en/images/lax-book.02-cookie-values.en.png has changed

Binary file doc/book/en/images/lax-book.02-create-blog.en.png has changed

Binary file doc/book/en/images/lax-book.03-list-one-blog.en.png has changed

Binary file doc/book/en/images/lax-book.03-site-config-panel.en.png has changed

Binary file doc/book/en/images/lax-book.03-state-submitted.en.png has changed

Binary file doc/book/en/images/lax-book.03-transitions-view.en.png has changed

Binary file doc/book/en/images/lax-book.04-detail-one-blog.en.png has changed

Binary file doc/book/en/images/lax-book.05-list-two-blog.en.png has changed

Binary file doc/book/en/images/lax-book.06-add-relation-entryof.en.png has changed

Binary file doc/book/en/images/lax-book.06-header-no-login.en.png has changed

Binary file doc/book/en/images/lax-book.06-main-template-layout.en.png has changed

Binary file doc/book/en/images/lax-book.06-main-template-logo.en.png has changed

Binary file doc/book/en/images/lax-book.06-simple-main-template.en.png has changed

Binary file doc/book/en/images/lax-book.07-detail-one-blogentry.en.png has changed

Binary file doc/book/en/images/lax-book.08-schema.en.png has changed

Binary file doc/book/en/images/lax-book.09-new-view-blogentry.en.png has changed

Binary file doc/book/en/images/lax-book.10-blog-with-two-entries.en.png has changed

Binary file doc/book/en/images/lax-book_00-login_en.png has changed

Binary file doc/book/en/images/lax-book_01-start_en.png has changed

Binary file doc/book/en/images/lax-book_02-cookie-values_en.png has changed

Binary file doc/book/en/images/lax-book_02-create-blog_en.png has changed

Binary file doc/book/en/images/lax-book_03-list-one-blog_en.png has changed

Binary file doc/book/en/images/lax-book_03-site-config-panel_en.png has changed

Binary file doc/book/en/images/lax-book_03-state-submitted_en.png has changed

Binary file doc/book/en/images/lax-book_03-transitions-view_en.png has changed

Binary file doc/book/en/images/lax-book_04-detail-one-blog_en.png has changed

Binary file doc/book/en/images/lax-book_05-list-two-blog_en.png has changed

Binary file doc/book/en/images/lax-book_06-add-relation-entryof_en.png has changed

Binary file doc/book/en/images/lax-book_06-header-no-login_en.png has changed

Binary file doc/book/en/images/lax-book_06-main-template-layout_en.png has changed

Binary file doc/book/en/images/lax-book_06-main-template-logo_en.png has changed

Binary file doc/book/en/images/lax-book_06-simple-main-template_en.png has changed

Binary file doc/book/en/images/lax-book_07-detail-one-blogentry_en.png has changed

Binary file doc/book/en/images/lax-book_08-schema_en.png has changed

Binary file doc/book/en/images/lax-book_09-new-view-blogentry_en.png has changed

Binary file doc/book/en/images/lax-book_10-blog-with-two-entries_en.png has changed

--- a/doc/book/en/intro/concepts.rst	Fri Apr 23 12:40:48 2010 +0200
+++ b/doc/book/en/intro/concepts.rst	Fri Apr 23 14:55:10 2010 +0200
@@ -59,7 +59,7 @@
 repository. For applications that support high traffic, several web (front-end)
 and data (back-end) instances can be set-up to share the load.
 
-.. image:: ../images/archi_globale.en.png
+.. image:: ../images/archi_globale_en.png
 
 The command :command:`cubicweb-ctl list` also displays the list of instances
 installed on your system.

--- a/doc/book/en/tutorials/base/create-cube.rst	Fri Apr 23 12:40:48 2010 +0200
+++ b/doc/book/en/tutorials/base/create-cube.rst	Fri Apr 23 14:55:10 2010 +0200
@@ -174,7 +174,7 @@
 ``everything about technology`` as the description, then validate the form by
 clicking on ``Validate``.
 
-.. image:: ../../images/cbw-create-blog.en.png
+.. image:: ../../images/cbw-create-blog_en.png
    :alt: from to create blog
 
 Click on the logo at top left to get back to the home page, then
@@ -182,7 +182,7 @@
 You should be seeing a list with a single item ``Tech-blog`` you
 just created.
 
-.. image:: ../../images/cbw-list-one-blog.en.png
+.. image:: ../../images/cbw-list-one-blog_en.png
    :alt: displaying a list of a single blog
 
 Clicking on this item will get you to its detailed description except
@@ -194,7 +194,7 @@
 again to follow the Blog link for the second time. The list now
 has two items.
 
-.. image:: ../../images/cbw-list-two-blog.en.png
+.. image:: ../../images/cbw-list-two-blog_en.png
    :alt: displaying a list of two blogs
 
 Add a BlogEntry
@@ -215,21 +215,21 @@
 combobox titled ``add relation`` would have showed up.
 
 
-.. image:: ../../images/cbw-add-relation-entryof.en.png
+.. image:: ../../images/cbw-add-relation-entryof_en.png
    :alt: editing a blog entry to add a relation to a blog
 
 Validate the changes by clicking ``Validate``. The entity BlogEntry
 that is displayed now includes a link to the entity Blog named
 ``MyLife``.
 
-.. image:: ../../images/cbw-detail-one-blogentry.en.png
+.. image:: ../../images/cbw-detail-one-blogentry_en.png
    :alt: displaying the detailed view of a blogentry
 
 Note that all of this was handled by the framework and that the only input
 that was provided so far is the schema. To get a graphical view of the schema,
 point your browser to the URL http://localhost:8080/schema
 
-.. image:: ../../images/cbw-schema.en.png
+.. image:: ../../images/cbw-schema_en.png
    :alt: graphical view of the schema (aka data-model)
 
 
@@ -325,7 +325,7 @@
 
 You can now see that the publication date has a prefix.
 
-.. image:: ../../images/cbw-update-primary-view.en.png
+.. image:: ../../images/cbw-update-primary-view_en.png
    :alt: modified primary view
 
 

--- a/doc/book/en/tutorials/base/maintemplate.rst	Fri Apr 23 12:40:48 2010 +0200
+++ b/doc/book/en/tutorials/base/maintemplate.rst	Fri Apr 23 14:55:10 2010 +0200
@@ -8,7 +8,7 @@
 
 A page is composed as indicated on the schema below:
 
-.. image:: ../../images/lax-book.06-main-template-layout.en.png
+.. image:: ../../images/lax-book_06-main-template-layout_en.png
 
 In this section we will demonstrate a change in one of the main
 interesting template from the three you will look for,
@@ -83,7 +83,7 @@
 
 
 
-.. image:: ../../images/lax-book.06-header-no-login.en.png
+.. image:: ../../images/lax-book_06-header-no-login_en.png
 
 Customize footer
 ````````````````
@@ -121,7 +121,7 @@
 be used based on TheMainTemplate called SimpleMainTemplate which does not have
 a top section.
 
-.. image:: ../../images/lax-book.06-simple-main-template.en.png
+.. image:: ../../images/lax-book_06-simple-main-template_en.png
 
 XXX
 [WRITE ME]