# HG changeset patch
# User Adrien Di Mascio <Adrien.DiMascio@logilab.fr>
# Date 1248355747 -7200
# Node ID d0f31e11993602ce828b378674a220866bcbd90a
# Parent  aa25d6b244c8212598cf70f0a6b2be27e27a0674# Parent  b44611f734badf72d7e68a64dc483fbb66e27139
merge

diff -r aa25d6b244c8 -r d0f31e119936 cwconfig.py
--- a/cwconfig.py	Thu Jul 23 15:28:41 2009 +0200
+++ b/cwconfig.py	Thu Jul 23 15:29:07 2009 +0200
@@ -149,7 +149,7 @@
         CUBES_DIR = '%(APYCOT_ROOT)s/local/share/cubicweb/cubes/' % os.environ
         # create __init__ file
         file(join(CUBES_DIR, '__init__.py'), 'w').close()
-    elif exists(join(CW_SOFTWARE_ROOT, '.hg')):
+    elif exists(join(CW_SOFTWARE_ROOT, '.hg')) or os.environ.get('CW_MODE') == 'user':
         mode = 'dev'
         CUBES_DIR = abspath(normpath(join(CW_SOFTWARE_ROOT, '../cubes')))
     else:
diff -r aa25d6b244c8 -r d0f31e119936 doc/book/en/admin/setup.rst
--- a/doc/book/en/admin/setup.rst	Thu Jul 23 15:28:41 2009 +0200
+++ b/doc/book/en/admin/setup.rst	Thu Jul 23 15:29:07 2009 +0200
@@ -106,15 +106,16 @@
 Add the following lines to either `.bashrc` or `.bash_profile` to configure
 your development environment ::
 
-  export PYTHONPATH=/full/path/to/cubicweb-forest
+    export PYTHONPATH=/full/path/to/cubicweb-forest
 
-If you installed the debian packages, no configuration is required.
-Your new cubes will be placed in `/usr/share/cubicweb/cubes` and
-your applications will be placed in `/etc/cubicweb.d`.
+If you installed *CubicWeb* with packages, no configuration is required and your
+new cubes will be placed in `/usr/share/cubicweb/cubes` and your applications
+will be placed in `/etc/cubicweb.d`.
 
-To use others directories then you will have to configure the
-following environment variables as follows::
+You may run a system-wide install of *CubicWeb* in "user mode" and use it for
+development by setting the following environment variable::
 
+    export CW_MODE=user
     export CW_CUBES_PATH=~/lib/cubes
     export CW_INSTANCES_DIR=~/etc/cubicweb.d/
     export CW_INSTANCES_DATA_DIR=$CW_INSTANCES_DIR
diff -r aa25d6b244c8 -r d0f31e119936 stdlib.txt
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/stdlib.txt	Thu Jul 23 15:29:07 2009 +0200
@@ -0,0 +1,18 @@
+addressbook
+basket
+blog
+book
+calendar
+comment
+company
+email
+file
+folder
+i18ncontent
+keyword
+link
+mailinglist
+person
+tag
+timeseries
+vcsfile