--- a/doc/book/en/Z012-create-instance.en.txt	Fri Jul 24 14:33:37 2009 +0200
+++ b/doc/book/en/Z012-create-instance.en.txt	Fri Jul 24 14:36:38 2009 +0200
@@ -8,14 +8,14 @@
 --------------------
 
 A *CubicWeb* instance is a container that
-refers to cubes and configuration parameters for your web application.
+refers to cubes and configuration parameters for your web instance.
 Each instance is stored as a directory in ``~/etc/cubicweb.d`` which enables 
-us to run your application.
+us to run your instance.
 
 What is a cube?
 ---------------
 
-Cubes represent data and basic building bricks of your web applications :
+Cubes represent data and basic building bricks of your web instances :
 blogs, person, date, addressbook and a lot more.
 
 .. XXX They related to each other by a 'Schema' which is also the PostGres representation.
@@ -35,7 +35,7 @@
 ------------------------------------
 
 We can create an instance to view our
-application in a web browser. ::
+instance in a web browser. ::
 
   cubicweb-ctl create blog myblog
 
@@ -55,14 +55,14 @@
 (:ref:`ConfigurationPostgres`).
 
 It is important to distinguish here the user used to access the database and
-the user used to login to the cubicweb application. When a *CubicWeb* application
+the user used to login to the cubicweb instance. When a *CubicWeb* instance
 starts, it uses the login/psswd for the database to get the schema and handle
 low level transaction. But, when ``cubicweb-ctl create`` asks for
-a manager login/psswd of *CubicWeb*, it refers to an application user
-to administrate your web application. 
+a manager login/psswd of *CubicWeb*, it refers to an instance user
+to administrate your web instance. 
 The configuration files are stored in *~/etc/cubicweb.d/myblog/*. 
 
-To launch the web application, you just type ::
+To launch the web instance, you just type ::
 
   cubicweb-ctl start myblog
 

--- a/doc/book/en/development/cubes/available-cubes.rst	Fri Jul 24 14:33:37 2009 +0200
+++ b/doc/book/en/development/cubes/available-cubes.rst	Fri Jul 24 14:36:38 2009 +0200
@@ -2,7 +2,7 @@
 Available cubes
 ---------------
 
-An application is based on several basic cubes. In the set of available
+An instance is based on several basic cubes. In the set of available
 basic cubes we can find for example :
 
 Base entity types

--- a/doc/book/en/development/datamodel/baseschema.rst	Fri Jul 24 14:33:37 2009 +0200
+++ b/doc/book/en/development/datamodel/baseschema.rst	Fri Jul 24 14:36:38 2009 +0200
@@ -3,7 +3,7 @@
 ----------------------------------
 
 The library defines a set of entity schemas that are required by the system
-or commonly used in *CubicWeb* applications.
+or commonly used in *CubicWeb* instances.
 
 
 Entity types used to store the schema
@@ -18,7 +18,7 @@
 ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 * `CWUser`, system users
 * `CWGroup`, users groups
-* `CWPermission`, used to configure the security of the application
+* `CWPermission`, used to configure the security of the instance
 
 Entity types used to manage workflows
 ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
@@ -29,10 +29,10 @@
 Other entity types
 ~~~~~~~~~~~~~~~~~~
 * `CWCache`
-* `CWProperty`, used to configure the application
+* `CWProperty`, used to configure the instance
 
 * `EmailAddress`, email address, used by the system to send notifications
   to the users and also used by others optionnals schemas
 
 * `Bookmark`, an entity type used to allow a user to customize his links within
-  the application
+  the instance