From 8d886621c17d35a4f82be9a2baa2f9fa13fbe2fe Mon Sep 17 00:00:00 2001
From: zzz <zzz@mail.i2p>
Date: Thu, 23 Oct 2008 13:33:25 +0000
Subject: [PATCH] jbigi and other updates

---
 www.i2p2/pages/how_networkcomparisons.html | 21 +++++++++++++++++++++
 www.i2p2/pages/jbigi.html                  | 22 ++++++++++++++--------
 www.i2p2/pages/naming.html                 |  1 +
 www.i2p2/pages/techintro.html              |  3 +++
 4 files changed, 39 insertions(+), 8 deletions(-)

diff --git a/www.i2p2/pages/how_networkcomparisons.html b/www.i2p2/pages/how_networkcomparisons.html
index 9bf1ab3b..e4ee6f01 100644
--- a/www.i2p2/pages/how_networkcomparisons.html
+++ b/www.i2p2/pages/how_networkcomparisons.html
@@ -172,6 +172,27 @@ currently take advantage of TOR to outproxy.</p>
 <a href="http://wiki.noreply.org/noreply/TheOnionRouter/TorFAQ#ComparisonI2P">the TOR FAQ</a>
 for a TOR/I2P comparison from the TOR perspective.</p>
 
+<h3>Comparison of TOR and I2P Terminology</h3>
+While TOR and I2P are similar in many ways, much of the terminology is different.
+<table>
+<tr><th align="left">Tor<th align="left">I2P
+<tr><td>Cell<td>Message
+<tr><td>Client<td>Router
+<tr><td>Circuit<td>Tunnel
+<tr><td>Directory<td>NetDb
+<tr><td>Directory Server<td>Floodfill Router
+<tr><td>Entry Guards<td>Fast Peers
+<tr><td>Entry Node<td>Inproxy
+<tr><td>Exit Node<td>Outproxy
+<tr><td>Hidden Service<td>Eepsite or Destination
+<tr><td>Hidden Service Descriptor<td>LeaseSet
+<tr><td>Introduction point<td>Inbound Gateway
+<tr><td>Node<td>Router
+<tr><td>Relay<td>Router
+<tr><td>Rendezvous Point<td>somewhat like Inbound Gateway + Outbound Endpoint
+<tr><td>Server<td>Router
+</table>
+
 <h3>Benefits of TOR over I2P</h3>
 <ul>
  <li>More efficient w/ memory usage</li>
diff --git a/www.i2p2/pages/jbigi.html b/www.i2p2/pages/jbigi.html
index 5a824bcf..53fcc5e9 100644
--- a/www.i2p2/pages/jbigi.html
+++ b/www.i2p2/pages/jbigi.html
@@ -16,9 +16,9 @@ included in your OS / distribution or installed already, it can be received from
 <a href="http://gmplib.org/#DOWNLOAD">http://gmplib.org/#DOWNLOAD</a>. Even if you
 have already installed it as binary, it might still be worth a try to compile
 GMP yourself, since then it will be able to use the specific instructions of
-your processor. The latest GMP 4.2.2 is also
-possible to be used instead of GMP 4.1.4. But latest GMP 4.2.2 needs more
-testing before setting the default requirement for building jbigi.jar.</p>
+your processor. The latest GMP may also
+be used instead of GMP 4.2.2, but it hasn't been tested by us.
+</p>
 
 <h2>Step-by-step instructions</h2>
 <ol>
@@ -49,14 +49,20 @@ for an older processor, and the native BigInteger library was loaded, you are pr
 <a href="download.html">the download page</a>, or get the cutting-edge source
 out of the monotone database mtn.i2p2.de</li>
 <li>Inside the source tree change directory to: <code>core/c/jbigi</code></li>
-<li>Read the README file. You must download GMP version 4.2.2 from
+<li>Read the README file.
+If you have a /usr/lib/libgmp.so file, you do not have to download GMP.
+Use the 'dynamic' argument to build.sh.
+Otherwise, you must download GMP version 4.2.2 from
 from <a href="http://gmplib.org/#DOWNLOAD">http://gmplib.org/#DOWNLOAD</a>, saving it to gmp-4.2.2.tar.bz2.
+If you decide to use a newer version, change the VER= line in <code>core/c/jbigi/build.sh</code>.
 <li>Take a look at <code>build.sh</code>, if your <code>JAVA_HOME</code>
 environment variable is set and you are using Linux then it might just work.
-Otherwise change the settings.</li>
-<li>Run <code>build.sh</code><br/>
-Maybe the built spew out some errors of missing jni.h and jni_md.h files.
-Easy solution is to copy these files from your java install into the core/c/jbigi/jbigi/include/ directory.</br>
+Otherwise change the settings. Remember, you need the Java SDK installed.</li>
+<li>Run <code>build.sh</code> (if you downloaded GMP) or
+ <code>build.sh dynamic</code> (if you have /usr/lib/libgmp.so).<br/>
+Maybe the build spewed out some errors of missing jni.h and jni_md.h files.
+Either copy these files from your java install into the core/c/jbigi/jbigi/include/ directory,
+or fix $JAVA_HOME.<br>
 You can run the <code>build.sh</code> from the <code>core/c/</code> directory which will
 build all available jbigi libs into a jbigi.jar.</br>
 A file named <code>libjbigi.so</code> should be created in the current
diff --git a/www.i2p2/pages/naming.html b/www.i2p2/pages/naming.html
index eb94cba1..0614d7e5 100644
--- a/www.i2p2/pages/naming.html
+++ b/www.i2p2/pages/naming.html
@@ -275,6 +275,7 @@ your own or others' addressbook subscriptions.
 </p>
 
 <h2>Discussion</h2>
+See also <a href="https://zooko.com/distnames.html">Names: Decentralized, Secure, Human-Meaningful: Choose Two</a>.
 <h3>Comments by jrandom</h3>
 (adapted from a post in the old Syndie, November 26, 2005)
 <p>
diff --git a/www.i2p2/pages/techintro.html b/www.i2p2/pages/techintro.html
index 3aa8a6ca..35753be9 100644
--- a/www.i2p2/pages/techintro.html
+++ b/www.i2p2/pages/techintro.html
@@ -723,6 +723,9 @@ systems and papers.  While there are a few similar efforts worth reviewing, both
 technical and functional comparisons, two in particular are pulled out here - Tor
 and Freenet.
 </p>
+<p>
+See also the <a href="how_networkcomparisons.html">Network Comparisons Page</a>.
+</p>
 
 <h2 id="similar.tor">Tor</h2>
 <p><i><a href="http://www.torproject.org/">website</a></i></p>