[Gzz-commits] manuscripts storm/article.rst ./gzigzag.bib

[Toni Alatalo]

CVSROOT:        /cvsroot/gzz
Module name:    manuscripts
Changes by:     Toni Alatalo <address@hidden>   03/02/15 12:41:07

Modified files:
        storm          : article.rst 
        .              : gzigzag.bib 

Log message:
        resolved conflict, zope reference finally

CVSWeb URLs:
http://savannah.gnu.org/cgi-bin/viewcvs/gzz/manuscripts/storm/article.rst.diff?tr1=1.185&tr2=1.186&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/gzz/manuscripts/gzigzag.bib.diff?tr1=1.40&tr2=1.41&r1=text&r2=text

Patches:
Index: manuscripts/gzigzag.bib
diff -u manuscripts/gzigzag.bib:1.40 manuscripts/gzigzag.bib:1.41
--- manuscripts/gzigzag.bib:1.40        Sat Feb 15 12:38:31 2003
+++ manuscripts/gzigzag.bib     Sat Feb 15 12:41:07 2003
@@ -3181,3 +3181,9 @@
   YEAR = 1999,
   url = {http://citeseer.nj.nec.com/227358.html}
 }
+
address@hidden,
+  author =       {Zope Corporation},
+  title =        {{Z}ope},
+  howpublished = {\url{http://zope.org/}
+}
Index: manuscripts/storm/article.rst
diff -u manuscripts/storm/article.rst:1.185 manuscripts/storm/article.rst:1.186
--- manuscripts/storm/article.rst:1.185 Sat Feb 15 12:36:06 2003
+++ manuscripts/storm/article.rst       Sat Feb 15 12:41:07 2003
@@ -1103,9 +1103,9 @@
 
 One possibility is to take an existing system
 (with features outside the focus of Gzz)
-which implements strict versioning, and to modify it to use Storm for storage. 
-A candidate is the object-oriented Web publishing environment Zope [ref 
zope.org/com, book,
-article?], which is Free Software and stores everything by default as diffs to
+that implements strict versioning, and to modify it to use Storm for storage. 
+A candidate is the object-oriented Web publishing environment Zope [zope]_, 
+which is Free Software and stores everything by default as diffs to
 a (flat file) database. Another way is studying the applicability of the 
 open hypermedia protocol (OHP) [reich-davis99-ohp].