[Checkins] SVN: grok/trunk/ Some more tweaks.

[Martijn Faassen]

Log message for revision 103960:
  Some more tweaks.
  

Changed:
  U   grok/trunk/CHANGES.txt
  U   grok/trunk/doc/upgrade.txt

-=-
Modified: grok/trunk/CHANGES.txt
===================================================================
--- grok/trunk/CHANGES.txt	2009-09-14 16:15:17 UTC (rev 103959)
+++ grok/trunk/CHANGES.txt	2009-09-14 16:15:32 UTC (rev 103960)
@@ -11,10 +11,12 @@
   https://bugs.launchpad.net/grok/+bug/220440
 
 * Default location for Data.fs and logfiles of grok's sample application is
-  now var/filestorage/ and var/log/ instead of parts/data/ and parts/log/.
+  now ``var/filestorage/`` and ``var/log/`` instead of ``parts/data/``
+  and ``parts/log/``.
 
-* Bumped grokcore.view version: the View class is now split into View (with a
-  template) and CodeView (with just a render() method).
+* Bumped grokcore.view version: the ``View`` class is now split into
+  ``View`` (with a template) and ``CodeView`` (with just a render()
+  method).
 
 * Bump used `z3c.testsetup` version (now: 0.4). Fix
   https://bugs.launchpad.net/grok/+bug/395125
@@ -41,8 +43,8 @@
 
 * changed interpreter name from 'python' to 'grokpy'
 
-* Changed the default permission to grok.View instead of zope.Public. 
-  https://bugs.launchpad.net/grok/+bug/387332
+* Changed the default permission to ``zope.View`` instead of
+  ``zope.Public``.  https://bugs.launchpad.net/grok/+bug/387332
 
 * Restructured the upgrade and change documentation so that they now
   get generated into separate files by Sphinx

Modified: grok/trunk/doc/upgrade.txt
===================================================================
--- grok/trunk/doc/upgrade.txt	2009-09-14 16:15:17 UTC (rev 103959)
+++ grok/trunk/doc/upgrade.txt	2009-09-14 16:15:32 UTC (rev 103960)
@@ -63,6 +63,14 @@
 
   .. _`Paste Deploy`: http://pythonpaste.org/deploy/
 
+  **Warning**. Please be aware that the ``parts/data`` and
+  ``parts/log`` directories are deprecated and will not be used
+  anymore. The only reasons there are still ``[data]`` and ``[log]``
+  sections in the new ``buildout.cfg``structure is to make sure we
+  don't accidentally throw away important data. Back up at least any
+  important ``Data.fs`` *before* making any changes to a project, or
+  when you upgrade any deployment.
+
   To switch over your project to use a new layout, create a new, empty
   project with grokproject and compare it with your current
   layout. You can then compare it with your existing project layout
@@ -75,10 +83,14 @@
   generated by buildout into ``parts/etc``.  Find more information on
   configuration and settings in ``etc/README.txt``.
 
-  Log files are now placed in ``parts/log``.
+  The ``Data.fs`` file is now placed in ``var/filestorage``. Please
+  your backed-up version of ``Data.fs`` in there to reuse your older
+  data.
 
+  Log files are now placed in ``var/log``. 
+
   Before re-running buildout to generate the new templates, please be
-  awware that ``parts/zopectl`` and ``parts/app`` will be deleted when
+  aware that ``parts/zopectl`` and ``parts/app`` will be deleted when
   you re-run buildout. This means that ``parts/zopectl/access.log``
   will be removed, and you may want to backup this file first.