[Gzz-commits] manuscripts FutureVision/fenpdf-shot.png Sigs/b...

[Benja Fallenstein]

CVSROOT:        /cvsroot/gzz
Module name:    manuscripts
Branch:         
Changes by:     Benja Fallenstein <address@hidden>      03/11/03 14:17:18

Modified files:
        FutureVision   : fenpdf-shot.png 
        Sigs           : birthday.bc 
        pointers       : article.rst 

Log message:
        resolve conflict properly

CVSWeb URLs:
http://savannah.gnu.org/cgi-bin/viewcvs/gzz/manuscripts/FutureVision/fenpdf-shot.png.diff?tr1=1.1&tr2=1.2&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/gzz/manuscripts/Sigs/birthday.bc.diff?tr1=1.3&tr2=1.4&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/gzz/manuscripts/pointers/article.rst.diff?tr1=1.102&tr2=1.103&r1=text&r2=text

Patches:
Index: manuscripts/FutureVision/fenpdf-shot.png
Index: manuscripts/Sigs/birthday.bc
diff -u manuscripts/Sigs/birthday.bc:1.3 manuscripts/Sigs/birthday.bc:1.4
--- manuscripts/Sigs/birthday.bc:1.3    Mon May 19 16:36:55 2003
+++ manuscripts/Sigs/birthday.bc        Mon Nov  3 14:17:18 2003
@@ -7,8 +7,11 @@
 define birthday(n, k) {
     return (( (n-k+0.5) * (l(n) - l(n-k)) - k));
     }
+
+b0 = birthday(2^160, 10^15);
+print "Birthday(2^160, 10^15): ", b0, " conf ", 1-e(b0), "\n";
     
-for(k=15; k<30; k++) {
-    b = birthday(2^56, 2^k); 
-    print k, "   ", b, " conf ", 1-e(b), "\n";
-}
+#for(k=15; k<30; k++) {
+#    b = birthday(2^56, 2^k); 
+#    print k, "   ", b, " conf ", 1-e(b), "\n";
+#}
Index: manuscripts/pointers/article.rst
diff -u manuscripts/pointers/article.rst:1.102 
manuscripts/pointers/article.rst:1.103
--- manuscripts/pointers/article.rst:1.102      Mon Nov  3 14:15:11 2003
+++ manuscripts/pointers/article.rst    Mon Nov  3 14:17:18 2003
@@ -56,8 +56,7 @@
 A new version of a Web page would have a different hash,
 and thus a different URI.
 
-There are some (non-file-sharing) P2P systems 
-There are a few (non-file-sharing) P2P systems 
+There are some (non-filesharing) P2P systems 
 that do offer an update mechanism. *CFS* [dabek01widearea]_
 is a file system based on Chord [stoica01chord]_, storing
 data in a distributed hashtable (DHT). CFS identifies