[CMF-checkins] SVN: CMF/branches/1.6/ - stitching GenericSetup back in as a svn:external and update docs.

[Jens Vagelpohl]

Log message for revision 41349:
  - stitching GenericSetup back in as a svn:external and update docs.

Changed:
  _U  CMF/branches/1.6/
  U   CMF/branches/1.6/CHANGES.txt
  A   CMF/branches/1.6/EXTERNALS.txt
  U   CMF/branches/1.6/INSTALL.txt
  U   CMF/branches/1.6/INSTALL_SVN.txt

-=-

Property changes on: CMF/branches/1.6
___________________________________________________________________
Name: svn:externals
   + #
# Used for maintenance of external resources in this svn bundle.  Edit
# this file as appropriate and then run the following command from within
# the checkout directory where this file lives on your local machine:
#
# svn propset svn:externals -F ./EXTERNALS.TXT .
#
GenericSetup svn://svn.zope.org/repos/main/GenericSetup/trunk


Modified: CMF/branches/1.6/CHANGES.txt
===================================================================
--- CMF/branches/1.6/CHANGES.txt	2006-01-17 08:42:21 UTC (rev 41348)
+++ CMF/branches/1.6/CHANGES.txt	2006-01-17 20:13:30 UTC (rev 41349)
@@ -17,7 +17,7 @@
   Others
 
     - Removed GenericSetup as a package inside CMF, it is now a standalone
-      product.
+      product, but still distributed as part of the CMF package.
 
     - CMFCore utils: Made _checkPermission depend on Zope's checkPermission.
       There is no longer a need to modify the checkPermission behavior in CMF.

Added: CMF/branches/1.6/EXTERNALS.txt
===================================================================
--- CMF/branches/1.6/EXTERNALS.txt	2006-01-17 08:42:21 UTC (rev 41348)
+++ CMF/branches/1.6/EXTERNALS.txt	2006-01-17 20:13:30 UTC (rev 41349)
@@ -0,0 +1,8 @@
+#
+# Used for maintenance of external resources in this svn bundle.  Edit
+# this file as appropriate and then run the following command from within
+# the checkout directory where this file lives on your local machine:
+#
+# svn propset svn:externals -F ./EXTERNALS.TXT .
+#
+GenericSetup svn://svn.zope.org/repos/main/GenericSetup/trunk


Property changes on: CMF/branches/1.6/EXTERNALS.txt
___________________________________________________________________
Name: svn:eol-style
   + native

Modified: CMF/branches/1.6/INSTALL.txt
===================================================================
--- CMF/branches/1.6/INSTALL.txt	2006-01-17 08:42:21 UTC (rev 41348)
+++ CMF/branches/1.6/INSTALL.txt	2006-01-17 20:13:30 UTC (rev 41349)
@@ -3,7 +3,6 @@
   Requirements
 
     - Zope 2.8.1 or later
-    - GenericSetup lateer than version 1.0
 
   Assumptions
 
@@ -39,11 +38,13 @@
         $ ln -s /usr/local/zope/CMF-1.6.x/CMFSetup .
         $ ln -s /usr/local/zope/CMF-1.6.x/CMFUid .
         $ ln -s /usr/local/zope/CMF-1.6.x/DCWorkflow .
+        $ ln -s /usr/local/zope/CMF-1.6.x/GenericSetup .
 
        or, as a shortcut::
 
         $ ln -s /usr/local/zope/CMF-1.6.x/CMF* .
         $ ln -s /usr/local/zope/CMF-1.6.x/DCWorkflow .
+        $ ln -s /usr/local/zope/CMF-1.6.x/GenericSetup .
 
        Since linking doesn't apply on Windows, you will need
        to cut or copy the files from the place where you unpacked

Modified: CMF/branches/1.6/INSTALL_SVN.txt
===================================================================
--- CMF/branches/1.6/INSTALL_SVN.txt	2006-01-17 08:42:21 UTC (rev 41348)
+++ CMF/branches/1.6/INSTALL_SVN.txt	2006-01-17 20:13:30 UTC (rev 41349)
@@ -12,7 +12,7 @@
       the sources for a specific version from Subversion.
 
  *Please note that current versions of the CMF (1.6 and later) require Zope 
- 2.8.1 or later and GenericSetup later than version 1.0.
+ 2.8.1 or later.
 
   * For help with Subversion in general, see "Version Control with 
     Subversion" at http://svnbook.red-bean.com/
@@ -41,6 +41,8 @@
 
       - DCWorkflow
 
+      - GenericSetup
+
      ... and several others.
 
   2. Copy or link each of these subdirectories into the 'Products' directory of
@@ -51,6 +53,7 @@
       $ ln -s /tmp/CMF-head/CMFDefault .
       $ ln -s /tmp/CMF-head/CMFTopic .
       $ ln -s /tmp/CMF-head/DCWorkflow .
+      $ ln -s /tmp/CMF-head/GenericSetup .
       ...
 
   3. Verify filesystem products:
@@ -68,6 +71,8 @@
 
       - DCWorkflow
 
+      - GenericSetup
+
       ...
 
   4. Create a CMF Site: