doc/book/en/20-01-intro.en.txt
changeset 111 7a06f06de32f
parent 109 10b63bb96e70
--- a/doc/book/en/20-01-intro.en.txt	Thu Nov 20 15:04:33 2008 +0100
+++ b/doc/book/en/20-01-intro.en.txt	Thu Nov 20 10:22:44 2008 -0800
@@ -9,9 +9,9 @@
 `Google AppEngine`_ is provided with a partial port of the `Django`
 framework, but Google stated at Google IO 2008 that it would not
 support a specific Python web framework and that all
-community-supported frameworks would be more than welcome[1]_. 
+community-supported frameworks would be more than welcome [1]_. 
 
-Therefore Logilab_ ported `CubicWeb` to run on top of `Google AppEngine`'s
+Therefore `Logilab`_ ported `CubicWeb` to run on top of `Google AppEngine`'s
 datastore.
 
 .. _`Google AppEngine`: http://code.google.com/appengine/docs/whatisgoogleappengine.html
@@ -22,43 +22,23 @@
 Essentials
 ----------
 
-XXXFIXME MERGE WITH 02-foundation.en.txt
-
-Schema
-
-  The schema defines the data model of an application as entities and
-  relationships. It is the core of an application.  Entities and
-  relationships are modeled with a comprehensive language made of
-  Python classes. 
+To build a web application for `Google App Engine`'s datastore, you
+need to have a good understanding of the main concepts of our 
+`CubicWeb` framework.
 
-Query language
-
-  A full-blown query language named RQL is used to formulate 
-  requests to the datastore.
+The main concepts are:
 
-Result set
+  - *schema*
 
-  A resultset encapsulates the results of a request sent to
-  the datastore and informations about this request.  
+  - *query language*
 
-Views 
+  - *result set*
 
-  A view is applied to a `result set` to present it as HTML, XML,
-  JSON, CSV, etc. Views are implemented as Python classes. There is no
-  templating language.
-
-Generated user interface
+  - *views*
 
-  A user interface is generated on-the-fly from the schema definition:
-  entities can be created, displayed, updated and deleted. As display
-  views are not very fancy, it is usually necessary to develop your
-  own. Any generated view can be overridden by defining a new one with
-  the same identifier.
+  - *generated user interface*
 
-Components
+  - *cube*
 
-  Pieces of schema and sets of views can be combined into
-  components. Larger applications can be built faster by importing
-  components, adding entities and relationships and overriding the
-  views that need to display or edit informations not provided by
-  components.
+You can find detailled explanation of those concepts in :ref:`TermsVocabulary`.
+