merge
authorSandrine Ribeau <sandrine.ribeau@logilab.fr>
Mon, 29 Dec 2008 15:37:12 -0800
changeset 307 6231a61dabfa
parent 306 1ed1da008e50 (diff)
parent 304 fe183404aae1 (current diff)
child 308 73a352526577
merge
--- a/doc/book/en/A02c-maintemplate.en.txt	Mon Dec 29 23:55:53 2008 +0100
+++ b/doc/book/en/A02c-maintemplate.en.txt	Mon Dec 29 15:37:12 2008 -0800
@@ -95,7 +95,7 @@
 
       def call(self, **kwargs):
           self.w(u'<div class="footer">')
-          self.w(u'This website has been created with <a href="http://lax.logilab.org">LAX</a>.')
+          self.w(u'This website has been created with <a href="http://cubicweb.org">CubicWeb</a>.')
           self.w(u'</div>')
 
 Updating a view does not require any restart of the server. By reloading
--- a/doc/book/en/B0020-define-workflows.en.txt	Mon Dec 29 23:55:53 2008 +0100
+++ b/doc/book/en/B0020-define-workflows.en.txt	Mon Dec 29 15:37:12 2008 -0800
@@ -47,9 +47,6 @@
 Set-up a workflow
 -----------------
 
-Before starting, make sure you refresh your mind by reading [link to
-definition_workflow chapter].
-
 We want to create a workflow to control the quality of the BlogEntry 
 submitted on your application. When a BlogEntry is created by a user
 its state should be `submitted`. To be visible to all, it needs to
@@ -62,8 +59,8 @@
 to be published and visible to all.
 
 There are two ways to create a workflow, form the user interface,
-and also by defining it in ``migration/postcreate.py``. This script
-is executed each time a new ``./bin/laxctl db-init`` is done. 
+and also by defining it in ``migration/postcreate.py``. 
+This script is executed each time a new ``cubicweb-ctl db-init`` is done. 
 If you create the states and transitions through the user interface
 this means that next time you will need to initialize the database
 you will have to re-create all the entities. 
@@ -89,7 +86,7 @@
       entry_of = SubjectRelation('Blog', cardinality='?*')
       in_state = SubjectRelation('State', cardinality='1*')
 
-As you updated the schema, you will have re-execute ``./bin/laxctl db-init``
+As you updated the schema, you will have re-execute ``cubicweb-ctl db-init``
 to initialize the database and migrate your existing entities.
 [WRITE ABOUT MIGRATION]
 
--- a/doc/book/en/B1020-define-views.en.txt	Mon Dec 29 23:55:53 2008 +0100
+++ b/doc/book/en/B1020-define-views.en.txt	Mon Dec 29 15:37:12 2008 -0800
@@ -48,7 +48,7 @@
 
 A view includes :
 
-- an identifier (all objects in `LAX` are entered in a registry
+- an identifier (all objects in `CubicWeb` are entered in a registry
   and this identifier will be used as a key)
   
 - a filter to select the resulsets it can be applied to
@@ -65,6 +65,17 @@
 will have to read the code in directory ``cubicweb/web/views/`` (XXX
 improve doc).
 
+`CubicWeb` provides a lot of standard views for the default class
+`EntityType`. You can find them in ``cubicweb/web/views/``.
+
+The basic views defined are : 
+
+*null* 
+  
+
+
+
+
 For example, the view named ``primary`` is the one used to display
 a single entity.
 
--- a/doc/book/en/B1060-templates.en.txt	Mon Dec 29 23:55:53 2008 +0100
+++ b/doc/book/en/B1060-templates.en.txt	Mon Dec 29 15:37:12 2008 -0800
@@ -145,7 +145,7 @@
   class MyHTMLPageFooter(HTMLPageFooter):
       def call(self, **kwargs):
           self.w(u'<div class="footer">')
-          self.w(u'This website has been created with <a href="http://lax.logilab.org">LAX</a>.')
+          self.w(u'This website has been created with <a href="http://cubicweb.org">CubicWeb</a>.')
           self.w(u'</div>')
 
 Updating a view does not require any restart of the server. By reloading
--- a/doc/book/en/B2052-install.en.txt	Mon Dec 29 23:55:53 2008 +0100
+++ b/doc/book/en/B2052-install.en.txt	Mon Dec 29 15:37:12 2008 -0800
@@ -11,8 +11,6 @@
 - The `Google AppEngine SDK` can be downloaded from:
   http://code.google.com/appengine/downloads.html
 
-- `LAX` is available as an extension of `CubicWeb` under the GPLv2
-  license which can be downloaded from : http://cubicweb.org/
 
 Please follow instructions on how to install `CubicWeb` framework
 (:ref:`CubicWebInstallation`). 
@@ -62,7 +60,7 @@
   
 This skeleton directory is a working `AppEngine` application. You will
 recognize the files ``app.yaml`` and ``main.py``. All the rest is the
-`LAX` framework and its third-party libraries. You will notice that 
+`CubicWeb` framework and its third-party libraries. You will notice that 
 the directory ``cubes`` is a library of reusable cubes.
 
 The main directories that you should know about are:
@@ -101,7 +99,7 @@
 Generating translation files
 ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 
-`LAX` is fully internationalized. Translation catalogs are found in
+`CubicWeb` is fully internationalized. Translation catalogs are found in
 ``myapp/i18n``. To compile the translation files, use the `gettext` tools
 or the ``laxctl`` command ::
 
--- a/doc/book/en/C011-bis-installation.en.txt	Mon Dec 29 23:55:53 2008 +0100
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,79 +0,0 @@
-.. -*- coding: utf-8 -*-
-
-.. _installationGAE:
-
-Installation de `CubicWeb` pour GoogleAppEngine
-===============================================
-
-Qu'est-ce que `LAX` ?
-=======================
-
-`LAX` (Logilab Appengine eXtension) est un framework d'application
-web basé sur `Google AppEngine`.
-
-`LAX` est un portage de la partie web de la plate-forme applicative
-développée par Logilab depuis 2001.  Cette plate-forme publie des
-données tirées de bases SQL, d'annuaires LDAP et de systèmes de
-gestion de version. En avril 2008, elle a été portée pour fonctionner
-sur le "datastore" de `Google AppEngine`.
-
-XXX: faire un parallèle entre Django/GAE et LAX/GAE
-
-
-Téléchargement des sources
-==========================
-
-- Les sources de `Google AppEngine` peuvent être récupérées à l'adresse
-  suivante : http://code.google.com/appengine/downloads.html
-
-- Les sources de `LAX` se trouvent à l'adresse suivante :
-  http://lax.logilab.org/
-
-
-Installation
-============
-
-Une fois décompactée, l'archive `lax-0.1.0-alpha.tar.gz`, on obtient
-l'arborescence suivante::
-  
-  .
-  |-- app.yaml
-  |-- custom.py
-  |-- data
-  |-- ginco/
-  |-- i18n/
-  |-- logilab/
-  |-- main.py
-  |-- mx/
-  |-- rql/
-  |-- schema.py
-  |-- simplejson/
-  |-- tools/
-  |   |-- generate_schema_img.py
-  |   `-- i18ncompile.py
-  |-- views.py
-  |-- yams/
-  `-- yapps/
-
-  
-On retrouve le squelette d'une application web de `Google AppEngine`
-(fichiers ``app.yaml``, ``main.py`` en particulier) avec les dépendances
-supplémentaires nécessaires à l'utilisation du framework `LAX`
-
-
-Lancement de l'application de base
-==================================
-
-Plusieurs répertoires doivent être accessibles via la variable 
-d'environnement ``PYTHONPATH`` ::
-
-  $ export PYTHONPATH=/path/to/google_appengine:/path/to/google_appengine/lib/yaml/lib:/path/to/myapp/
-
-Le répertoire yaml n'est nécessaire que pour le lancement des scripts
-qui se trouvent dans lax/tools et pour l'exécution des tests unitaires.
-
-Pour démarrer::
-
-  $ python /path/to/google_appengine/dev_appserver.py /path/to/lax
-
-
--- a/doc/book/en/D010-faq.en.txt	Mon Dec 29 23:55:53 2008 +0100
+++ b/doc/book/en/D010-faq.en.txt	Mon Dec 29 15:37:12 2008 -0800
@@ -3,7 +3,7 @@
 Frequently Asked Questions
 ==========================
 
-* Why does not LAX have a template language ?
+* Why does not CubicWeb have a template language ?
 
   It does. Actually, you can use your preferred template language if you
   want. [explain how to use a template language]
@@ -22,7 +22,7 @@
 
   [copy answer from forum]
 
-* LAX looks pretty recent. Is it stable ?
+* CubicWeb looks pretty recent. Is it stable ?
 
   [answer that framework has evolved over the past seven years and that
   data migrated from one schema to the other ever since]
--- a/doc/book/en/D020-api-reference.en.txt	Mon Dec 29 23:55:53 2008 +0100
+++ b/doc/book/en/D020-api-reference.en.txt	Mon Dec 29 15:37:12 2008 -0800
@@ -13,7 +13,7 @@
 `String`, `Int`, `Float`, `Boolean`, `Date`, `Time`, `Datetime`,
 `Interval`, `Password`, `Bytes`.
 
-See `yams' API <http://lax.logilab.org/apidoc>`_
+See `yams' API <http://www.cubicweb.org/doc/en/modindex.html>`_
 
 Constraints
 ~~~~~~~~~~~
@@ -23,11 +23,11 @@
 `BoundConstraint`, `IntervalBoundConstraint`,
 `StaticVocabularyConstraint`, `MultipleStaticVocabularyConstraint`.
 
-See `yams' API <http://lax.logilab.org/apidoc>`_
+See `yams' API <http://www.cubicweb.org/doc/en/modindex.html>`_
 
 Views API
 ---------
 
-See `yams' API <http://lax.logilab.org/apidoc>`_
+See `yams' API <http://www.cubicweb.org/doc/en/modindex.html>`_
 [WRITE ME]