[Zope-Checkins] CVS: Zope - TODO.txt:1.1.2.12

[Fred L. Drake, Jr.]

Update of /cvs-repository/Zope
In directory cvs.zope.org:/tmp/cvs-serv1608

Modified Files:
      Tag: chrism-install-branch
	TODO.txt 
Log Message:
Update information on ZConfig merge state.


=== Zope/TODO.txt 1.1.2.11 => 1.1.2.12 ===
--- Zope/TODO.txt:1.1.2.11	Mon Jan 13 20:18:17 2003
+++ Zope/TODO.txt	Thu Jan 23 17:10:51 2003
@@ -24,7 +24,13 @@
   against it.
 
   Recurring task so long as this branch lives.
-  Last done by Chris - Jan 13
+  Last done by Fred - Jan 23
+
+  To merge into the branch, do this on the ZConfig branch:
+    cvs up -j zconfig-chrism-install-branch-last-merge -j HEAD
+
+  then do this on the ZConfig trunk:
+    cvs tag -F zconfig-chrism-install-branch-last-merge
 
 Move ZServer from root of Zope "home" directory to SOFTWARE_HOME