--- a/doc/book/en/Z012-create-instance.en.txt Tue Jul 28 23:21:39 2009 +0200
+++ b/doc/book/en/Z012-create-instance.en.txt Tue Jul 28 23:48:19 2009 +0200
@@ -52,7 +52,7 @@
sufficient. You can allways modify the parameters later by editing
configuration files. When a user/psswd is requested to access the database
please use the login you create at the time you configured the database
-(:ref:`ConfigurationPostgres`).
+(:ref:`ConfigurationPostgresql`).
It is important to distinguish here the user used to access the database and
the user used to login to the cubicweb instance. When a *CubicWeb* instance
--- a/doc/book/en/admin/create-instance.rst Tue Jul 28 23:21:39 2009 +0200
+++ b/doc/book/en/admin/create-instance.rst Tue Jul 28 23:48:19 2009 +0200
@@ -20,7 +20,7 @@
sufficient. You can anyway modify the configuration later on by editing
configuration files. When a user/psswd is requested to access the database
please use the login you create at the time you configured the database
-(:ref:`ConfigurationPostgres`).
+(:ref:`ConfigurationPostgresql`).
It is important to distinguish here the user used to access the database and the
user used to login to the cubicweb instance. When an instance starts, it uses
--- a/doc/book/en/admin/gae.rst Tue Jul 28 23:21:39 2009 +0200
+++ b/doc/book/en/admin/gae.rst Tue Jul 28 23:48:19 2009 +0200
@@ -1,5 +1,7 @@
.. -*- coding: utf-8 -*-
+.. _GoogleAppEngineSource:
+
CubicWeb in Google AppEngine
============================
@@ -26,7 +28,7 @@
Please follow instructions on how to install *CubicWeb* framework
-(:ref:`CubicWebInstallation`).
+(:ref:`SetUpEnv`).
Installation
------------
--- a/doc/book/en/annexes/rql/index.rst Tue Jul 28 23:21:39 2009 +0200
+++ b/doc/book/en/annexes/rql/index.rst Tue Jul 28 23:48:19 2009 +0200
@@ -8,5 +8,4 @@
intro
language
- dbapi
implementation
--- a/doc/book/en/development/datamodel/baseschema.rst Tue Jul 28 23:21:39 2009 +0200
+++ b/doc/book/en/development/datamodel/baseschema.rst Tue Jul 28 23:48:19 2009 +0200
@@ -1,6 +1,6 @@
Pre-defined entities in the library
-----------------------------------
+-----------------------------------
The library defines a set of entity schemas that are required by the system
or commonly used in *CubicWeb* instances.
--- a/doc/book/en/development/devcore/index.rst Tue Jul 28 23:21:39 2009 +0200
+++ b/doc/book/en/development/devcore/index.rst Tue Jul 28 23:48:19 2009 +0200
@@ -5,7 +5,6 @@
:maxdepth: 1
vreg.rst
- selection.rst
appobject.rst
selectors.rst
dbapi.rst
--- a/doc/book/en/development/devweb/internationalization.rst Tue Jul 28 23:21:39 2009 +0200
+++ b/doc/book/en/development/devweb/internationalization.rst Tue Jul 28 23:48:19 2009 +0200
@@ -1,9 +1,9 @@
.. -*- coding: utf-8 -*-
-.. _internationalisation:
+.. _internationalization:
-Internationalisation
+Internationalization
---------------------
Cubicweb fully supports the internalization of its content and interface.
--- a/doc/book/en/development/devweb/views.rst Tue Jul 28 23:21:39 2009 +0200
+++ b/doc/book/en/development/devweb/views.rst Tue Jul 28 23:48:19 2009 +0200
@@ -1,3 +1,6 @@
+
+.. _Views:
+
Views
-----
@@ -76,8 +79,7 @@
- Using `templatable`, `content_type` and HTTP cache configuration
-.. code-block:: python
-
+.. sourcecode:: python
class RSSView(XMLView):
id = 'rss'
@@ -88,11 +90,9 @@
cache_max_age = 60*60*2 # stay in http cache for 2 hours by default
-
- Using custom selector
-.. code-block:: python
-
+.. sourcecode:: python
class SearchForAssociationView(EntityView):
"""view called by the edition view when the user asks
@@ -112,9 +112,9 @@
We'll show you now an example of a ``primary`` view and how to customize it.
If you want to change the way a ``BlogEntry`` is displayed, just override
-the method ``cell_call()`` of the view ``primary`` in ``BlogDemo/views.py`` ::
+the method ``cell_call()`` of the view ``primary`` in ``BlogDemo/views.py``:
-.. code-block:: python
+.. sourcecode:: python
from cubicweb.view import EntityView
from cubicweb.selectors import implements
@@ -148,7 +148,7 @@
Let us now improve the primary view of a blog
-.. code-block:: python
+.. sourcecode:: python
class BlogPrimaryView(EntityView):
id = 'primary'
@@ -215,9 +215,9 @@
[FILLME]
-
XML views, binaries...
----------------------
+
For views generating other formats than HTML (an image generated dynamically
for example), and which can not simply be included in the HTML page generated
by the main template (see above), you have to:
--- a/doc/book/en/development/migration/index.rst Tue Jul 28 23:21:39 2009 +0200
+++ b/doc/book/en/development/migration/index.rst Tue Jul 28 23:48:19 2009 +0200
@@ -129,12 +129,11 @@
* `drop_relation_definition(subjtype, rtype, objtype, commit=True)`, removes
a relation definition.
-* `sync_schema_props_perms(ertype=None, syncperms=True,
- syncprops=True, syncrdefs=True, commit=True)`,
+* `sync_schema_props_perms(ertype=None, syncperms=True, syncprops=True, syncrdefs=True, commit=True)`,
synchronizes properties and/or permissions on:
- * the whole schema if ertype is None
- * an entity or relation type schema if ertype is a string
- * a relation definition if ertype is a 3-uple (subject, relation, object)
+ - the whole schema if ertype is None
+ - an entity or relation type schema if ertype is a string
+ - a relation definition if ertype is a 3-uple (subject, relation, object)
* `change_relation_props(subjtype, rtype, objtype, commit=True, **kwargs)`, changes
properties of a relation definition by using the named parameters of the properties
--- a/doc/book/en/development/profiling/index.rst Tue Jul 28 23:21:39 2009 +0200
+++ b/doc/book/en/development/profiling/index.rst Tue Jul 28 23:48:19 2009 +0200
@@ -22,7 +22,8 @@
<RQL QUERY> <QUERY ARGS IF ANY> -- <TIME SPENT>
CubicWeb also provides the **exlog** command to examine and summarize data found
-in such a file::
+in such a file:
+::
$ cubicweb-ctl exlog < ~/myapp-rql.log
0.07 50 Any A WHERE X eid %(x)s, X firstname A {}
0.05 50 Any A WHERE X eid %(x)s, X lastname A {}
--- a/doc/book/en/development/webstdlib/editcontroller.rst Tue Jul 28 23:21:39 2009 +0200
+++ b/doc/book/en/development/webstdlib/editcontroller.rst Tue Jul 28 23:48:19 2009 +0200
@@ -1,4 +1,5 @@
.. -*- coding: utf-8 -*-
+
The 'edit' controller (:mod:`cubicweb.web.views.editcontroller`)
----------------------------------------------------------------
--- a/doc/book/en/development/webstdlib/urlpublish.rst Tue Jul 28 23:21:39 2009 +0200
+++ b/doc/book/en/development/webstdlib/urlpublish.rst Tue Jul 28 23:48:19 2009 +0200
@@ -1,4 +1,5 @@
.. -*- coding: utf-8 -*-
+
URL Rewriting (:mod:`cubicweb.web.views.urlpublish`) and (:mod:`cubicweb.web.views.urlrewrite`)
------------------------------------------------------------------------------------------------
--- a/doc/book/en/development/webstdlib/xmlrss.rst Tue Jul 28 23:21:39 2009 +0200
+++ b/doc/book/en/development/webstdlib/xmlrss.rst Tue Jul 28 23:48:19 2009 +0200
@@ -1,3 +1,5 @@
+.. _XmlAndRss:
+
XML and RSS views (:mod:`cubicweb.web.views.xmlrss`)
----------------------------------------------------
--- a/doc/book/en/intro/tutorial/components.rst Tue Jul 28 23:21:39 2009 +0200
+++ b/doc/book/en/intro/tutorial/components.rst Tue Jul 28 23:48:19 2009 +0200
@@ -39,6 +39,7 @@
* zone: Zone (to define places within larger places, for example a
city in a state in a country)
+.. _`CubicWeb Forge`: http://www.cubicweb.org/project/
Adding comments to BlogDemo
~~~~~~~~~~~~~~~~~~~~~~~~~~~~
--- a/doc/book/en/intro/tutorial/conclusion.rst Tue Jul 28 23:21:39 2009 +0200
+++ b/doc/book/en/intro/tutorial/conclusion.rst Tue Jul 28 23:48:19 2009 +0200
@@ -9,7 +9,7 @@
according to your needs.
Many features are available to extend your application, for example: RSS channel
-integration (:ref:`rss`), hooks (:ref:`hooks`), support of sources such as
-Google App Engine (:ref:`gaecontents`) and lots of others to discover through
-our book.
+integration (:ref:`XmlAndRss`), hooks (:ref:`hooks`), support of sources such as
+Google App Engine (:ref:`GoogleAppEngineSource`) and lots of others to discover
+through our book.
--- a/doc/book/en/intro/tutorial/create-cube.rst Tue Jul 28 23:21:39 2009 +0200
+++ b/doc/book/en/intro/tutorial/create-cube.rst Tue Jul 28 23:48:19 2009 +0200
@@ -14,7 +14,7 @@
This will create in the cubes directory (``/path/to/forest/cubes`` for Mercurial
installation, ``/usr/share/cubicweb/cubes`` for debian packages installation)
-a directory named ``blog`` reflecting the structure described in :ref:`cubesConcepts`.
+a directory named ``blog`` reflecting the structure described in :ref:`Concepts`.
.. _DefineDataModel:
@@ -268,6 +268,7 @@
The view has a ``self.w()`` method that is used to output data, in our
example HTML output.
-You can find more details about views and selectors in :ref:`ViewDefinition`.
+.. note::
+ You can find more details about views and selectors in :ref:`ViewDefinition`.
--- a/doc/book/en/intro/tutorial/maintemplate.rst Tue Jul 28 23:21:39 2009 +0200
+++ b/doc/book/en/intro/tutorial/maintemplate.rst Tue Jul 28 23:48:19 2009 +0200
@@ -89,9 +89,9 @@
````````````````
If you want to change the footer for example, look
-for HTMLPageFooter and override it in your views file as in: ::
+for HTMLPageFooter and override it in your views file as in:
-..code-block :: python
+.. sourcecode:: python
from cubicweb.web.views.basetemplates import HTMLPageFooter