diff -r b6753521129d -r 1294a6bdf3bf doc/book/en/intro/concepts/index.rst --- a/doc/book/en/intro/concepts/index.rst Fri Jul 24 13:50:59 2009 +0200 +++ b/doc/book/en/intro/concepts/index.rst Fri Jul 24 14:33:37 2009 +0200 @@ -67,8 +67,9 @@ directory is looked up, as well as the paths in :envvar:`CW_INSTANCES_DIR` environment variable. -The term application can refer to an instance or to a cube, depending on the -context. This book will try to avoid using this term and use *cube* and +The term application is used to refer at "something that should do something as a +whole", eg more like a project and so can refer to an instance or to a cube, +depending on the context. This book will try to use *application*, *cube* and *instance* as appropriate. Data Repository @@ -166,7 +167,7 @@ At startup, the `registry` or registers base, inspects a number of directories looking for compatible classes definition. After a recording process, the objects are assigned to registers so that they can be selected dynamically while the -application is running. +instance is running. Selectors ~~~~~~~~~ @@ -215,7 +216,7 @@ **No need for a complicated ORM when you have a powerful query language** -All the persistant data in a CubicWeb application is retrieved and modified by using the +All the persistent data in a CubicWeb instance is retrieved and modified by using the Relation Query Language. This query language is inspired by SQL but is on a higher level in order to