# HG changeset patch
# User Sandrine Ribeau <sandrine.ribeau@logilab.fr>
# Date 1227049686 28800
# Node ID 45c4176e29eb540181bd23b9f8b077ea2593dddb
# Parent  f756ead5746acbe13e59d63b61e8c8545bb521de# Parent  d507caa1b386e8bce565bc1d4a621263564b69de
merge

diff -r f756ead5746a -r 45c4176e29eb doc/book/en/01-introduction.en.txt
--- a/doc/book/en/01-introduction.en.txt	Tue Nov 18 15:06:33 2008 -0800
+++ b/doc/book/en/01-introduction.en.txt	Tue Nov 18 15:08:06 2008 -0800
@@ -326,9 +326,6 @@
 The above source code defines a new primary view for
 ``BlogEntry``. 
 
-Le code que nous avons modifié définit une vue primaire pour une entité de 
-type `BlogEntry`. 
-
 Since views are applied to resultsets and resulsets can be tables of
 data, it is needed to recover the entity from its (row,col)
 coordinates. We will get to this in more detail later.
diff -r f756ead5746a -r 45c4176e29eb doc/book/en/index.txt
--- a/doc/book/en/index.txt	Tue Nov 18 15:06:33 2008 -0800
+++ b/doc/book/en/index.txt	Tue Nov 18 15:08:06 2008 -0800
@@ -6,20 +6,25 @@
 `CubicWeb` - The Semantic Web is a construction game!
 =====================================================
 
-`CubicWeb` allows us to quickly develop content management web
-application, based on a data model, the schema.
+`CubicWeb` is a semantic web application framework that empowers developers
+to efficiently build web applications by reusing components (called `cubes`)
+and following the well known object-oriented design principles.
+
+Its main features:
 
-With a data model driven engine, a real query language, a 
-view selection mecanism for automatic HTML/XML/text generation, 
-reusables components, `CubicWeb` is an end to end solution
-to promote quick and efficient development.
+* a engine driven by the explicit data model of the application, 
+* a query language similar to W3C's SPARQL, 
+* a selection+view mechanism for semi-automatic XHTML/XML/JSON/text generation, 
+* a library of reusable components (data model and views) that fulfill common needs,
+* the power and flexibility of the Python programming language,
 
-If you like Python and its standard libraey, you will like `CubicWeb`
-which includes its own `cubes` standard library.
+make `CubicWeb` a mature end to end solution for web 
+application development that promotes quality, reusability and 
+efficiency.
 
-For curious, a :ref:`Overview` and its simplicity.
+The unbeliever will read the :ref:`Overview`.
 
-For impatients, :ref:`MiseEnPlaceEnv`.
+The impatient will move right away to :ref:`MiseEnPlaceEnv`.
 
 .. _Logilab: http://www.logilab.fr/
 .. _GoogleAppEngine: http://code.google.com/appengine/