diff --git a/www.i2p2/pages/faq.html b/www.i2p2/pages/faq.html
index c67460fa954a3b2be26bde4a6f1721b00f67c606..fe6ae3ab2b3e4876c13b3d8dd5aaa09408a829d1 100644
--- a/www.i2p2/pages/faq.html
+++ b/www.i2p2/pages/faq.html
@@ -13,6 +13,9 @@ Here are some places, pick one or more.
<li>Discuss with the developers on IRC #i2p
</ul>
</p>
+<p>
+Please include relevant information from the router logs and wrapper logs.
+</p>
<h3 id="subscriptions">I'm missing lots of hosts in my addressbook. What are some good subscription links?
<span class="permalink">(<a href="#subscriptions">link</a>)</span></h3>
@@ -319,9 +322,11 @@ Then tell your IRC client to connect to localhost port 6668.
<li><b>Local I2P ports</b>, listening only to local connections by default:
<ul>
<li><b>7654:</b> I2P Client Protocol port, used by client apps</li>
- <li><b>7656:</b> SAM bridge, a higher level socket API for clients</li>
+ <li><b>7656:</b> SAM bridge, a higher level socket API for clients
+ <i>May be disabled in the clients.config file</i></li>
<li><b>7657:</b> your router console</li>
- <li><b>7658:</b> your eepsite</li>
+ <li><b>7658:</b> your eepsite
+ <i>May be disabled in the clients.config file</i></li>
<li><b>32000:</b> local control channel for the service wrapper</li>
</ul>
</li>
@@ -329,11 +334,12 @@ Then tell your IRC client to connect to localhost port 6668.
<ul><p>
<li><b>Default I2PTunnel ports</b>, listening only to local connections by default:
+ <i>All may be disabled on the i2ptunnel page in the router console</i>
<ul>
<li><b>4444:</b> HTTP proxy</li>
- <li><b>6668:</b> round robin across the irc2p IRC network</li>
- <li><b>7659:</b> smtp.postman.i2p</li>
- <li><b>7660:</b> pop.postman.i2p</li>
+ <li><b>6668:</b> IRC proxy</li>
+ <li><b>7659:</b> Outgoing mail to smtp.postman.i2p</li>
+ <li><b>7660:</b> Incoming mail from pop.postman.i2p</li>
<li><b>8998:</b> mtn.i2p2.i2p (Monotone - disabled by default)</li>
</ul>
</li>
diff --git a/www.i2p2/pages/getinvolved.html b/www.i2p2/pages/getinvolved.html
index 0722fd98dd605a2827b9d39ce8a03cfc01c1e9be..b6dd9dff429410fca0e1543e1e8b7caf30cdb19d 100644
--- a/www.i2p2/pages/getinvolved.html
+++ b/www.i2p2/pages/getinvolved.html
@@ -30,6 +30,13 @@ There's plenty to do if you know Java or are ready to learn.
Check for open tickets on <a href="http://trac.i2p2.i2p/">trac</a>
or the TODO list on <a href="http://zzz.i2p/">zzz.i2p</a> for
some ideas on where to start.
+See the <a href="newdevelopers.html">new developer's guide</a> for details.
+<li><b>Analysis</b> -
+Study or test the code to look for vulnerabilities.
+Both anonymity vulnerabilities from the various
+<a href="how_threatmodel.html">threat models</a>,
+and DOS and other weaknesses due to securities holes,
+need researching.
</ol>
{% endblock %}
diff --git a/www.i2p2/pages/how_networkcomparisons.html b/www.i2p2/pages/how_networkcomparisons.html
index eabbe205d009d09c79516812241fddd31a2cef55..9bf1ab3bcdef1778cb172290bad7884e6bdf403c 100644
--- a/www.i2p2/pages/how_networkcomparisons.html
+++ b/www.i2p2/pages/how_networkcomparisons.html
@@ -131,7 +131,7 @@ comparison of Tarzan, Crowds, Onion Routing (OR), and I2P:</p>
http://dev.i2p.net/~jrandom/wiki/comparison.png</a>)</p>
<h2>TOR / Onion Routing</h2>
-<i><a href="http://freehaven.net/tor/">[TOR]</a>
+<i><a href="http://www.torproject.org/">[TOR]</a>
<a href="http://www.onion-router.net">[Onion Routing]</a></i>
<p>TOR and Onion Routing are both anonymizing proxy networks,
allowing people to tunnel out through their low latency mix
@@ -168,6 +168,10 @@ to build outproxy functionality on top of an anonymous
communication layer, they can). In fact, some I2P users
currently take advantage of TOR to outproxy.</p>
+<p>See also the
+<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>Benefits of TOR over I2P</h3>
<ul>
<li>More efficient w/ memory usage</li>
diff --git a/www.i2p2/pages/how_networkdatabase.html b/www.i2p2/pages/how_networkdatabase.html
index c38ff7afae1061a0a88ff24a3191832bb6a4e74e..644ed8aafa7127141271fb0da471a569eb279a3c 100644
--- a/www.i2p2/pages/how_networkdatabase.html
+++ b/www.i2p2/pages/how_networkdatabase.html
@@ -60,7 +60,13 @@ encryption keys. These additional keys can be used for garlic routing messages
to the router on which the destination is located (though these keys are <b>not</b>
the router's keys - they are generated by the client and given to the router to
use). End to end client messages are still, of course, encrypted with the
-destination's public keys.</p>
+destination's public keys.
+[UPDATE - This is no longer true, we don't do end-to-end client encryption
+any more, as explained in
+<a href="how_intro.html">the introduction</a>.
+So is there any use for the first encryption key, signing key, and certificate?
+Can they be removed?
+</p>
<h2><a name="bootstrap">Bootstrapping</a></h2>
@@ -460,6 +466,8 @@ There are several places where a floodfill peer is selected - this fix addresses
(random - need to add qualification, because timeouts are long)
<li>Who a ff peer sends in reply to a failed search (3 closest to the search)
<li>Who a ff peer floods to (all other ff peers)
+<li>The list of ff peers sent in the NTCP every-6-hour "whisper"
+(although this may not longer be necessary due to other ff improvements)
</ol>
<p>
Lots more that could and should be done -
@@ -483,15 +491,16 @@ More improvement on recognizing failing floodfill peers
<li>
Continue to reduce netDb entry size to reduce N**2 traffic
<li>
-Manual list of floodfill peers to exclude? (troublemakers)
+Manual list of floodfill peers to exclude?
+(<a href="how_threatmodel.html#blocklist">blocklists</a> by router ident)
<li>
Similar changes in StoreJob? Probably not - it is much smarter about
retries. And the anonymity concerns in floodfill stores are much greater,
so we have to be more careful.
<li>
-Finally - 3 or 4 releases later - Implement automatic opt-in
-to floodfill for some percentage of class O peers, based on analysis of the network
-using the improved integration and dbHistory stats.
+[Scheduled for Release 0.6.2.1]
+Implement automatic opt-in
+to floodfill for some percentage of class O peers, based on analysis of the network.
</ul>
<p>
@@ -502,7 +511,7 @@ None of this was a problem when we had only two ff routers, and they were both u
24/7. Again, jrandom's absence has pointed us to places that need improvement.
</p><p>
-To assist in this effort, additional profile data for floodfill peers is
+To assist in this effort, additional profile data for floodfill peers are
now (as of release 0.6.1.33) displayed on the "Profiles" page in
the router console.
We will use this to analyze which data are appropriate for
diff --git a/www.i2p2/pages/licenses.html b/www.i2p2/pages/licenses.html
index ae600c5d60cb219ca37b1e15b7e90ad5da374a9b..74fc734b69ba3559e556a159835104c446bd7890 100644
--- a/www.i2p2/pages/licenses.html
+++ b/www.i2p2/pages/licenses.html
@@ -1,9 +1,11 @@
{% extends "_layout.html" %}
{% block title %}Licenses{% endblock %}
-{% block content %}<p>As required by our threat model (among other reasons), the
+{% block content %}<p>
+As required by our
+<a href="how_threatmodel.html">threat model</a> (among other reasons), the
software developed to support the anonymous communication
network we call I2P must be freely available, open source,
-and user modifiable. To meet this criteria, we make use of
+and user modifiable. To meet these criteria, we make use of
a variety of legal and software engineering techniques so
as to remove as many barriers to entry for those considering
making use of or contributing to the I2P effort.</p>
@@ -239,7 +241,7 @@ summary of the license terms - please see the specific license for the component
or source code in question for authoritative terms. Component source locations and
resource packaging may be changed if the repository is reorganized.</p>
-<h2>Commit privileges</h2>
+<h2><a id="commit">Commit privileges</h2>
<p>
Developers may push changes to a distributed monotone repository if you
receive permission from the person running that repository.
diff --git a/www.i2p2/pages/newdevelopers.html b/www.i2p2/pages/newdevelopers.html
new file mode 100644
index 0000000000000000000000000000000000000000..9fb151e29080e942fc1e0ea364f69ef7bc84ff96
--- /dev/null
+++ b/www.i2p2/pages/newdevelopers.html
@@ -0,0 +1,48 @@
+{% extends "_layout.html" %}
+{% block title %}New Developer's Guide{% endblock %}
+{% block content %}
+Here's a very quick guide to getting started.
+<ul>
+<li>
+Not quite ready for coding?
+Try <a href="getinvolved.html">getting involved</a> first.
+
+<li>
+For development on the i2p router or the embedded applications,
+learn Java :)
+
+<li>
+Study the <a href="how_intro.html">how intro</a>,
+the <a href="how.html">other "how" documents</a>,
+the <a href="techintro.html">tech intro</a>,
+and associated documents.
+
+<li>
+For development on the i2p router or the embedded applications,
+get the monotone source repository installed - short instructions:
+<ul>
+<li>Install monotone
+<li>Enable the i2tunnel client tunnel on port 8997 pointing to mtn.i2p2.i2p
+<li>mtn -d i2p.mtn init
+<li>mtn -d i2p.mtn pull 127.0.0.1:8997 i2p.i2p
+</ul>
+Long version: see the <a href="monotone.html">monotone page</a>.
+
+<li>
+For development on new applications,
+see the <a href="applications">application development guide</a>.
+
+<li>
+See <a href="http://zzz.i2p/forums/3">zzz's todo lists</a>
+and <a href="todo.html">this website's todo list</a>
+for ideas.
+
+<li>
+Say hi to the developers on #i2p
+
+<li>
+See the bottom of <a href="licenses.html">licenses.html</a> for
+commit privilege requirements.
+
+</ul>
+{% endblock %}
diff --git a/www.i2p2/pages/roadmap.html b/www.i2p2/pages/roadmap.html
index 43929f134d000f8f88a02bea165ceb835abb5387..dc91d0b318d821a6c81976c6aff6df0f1188d2de 100644
--- a/www.i2p2/pages/roadmap.html
+++ b/www.i2p2/pages/roadmap.html
@@ -1,20 +1,6 @@
{% extends "_layout.html" %}
{% block title %}Roadmap{% endblock %}
-{% block content %}<h2 id="0.6.2">0.6.2</h2>
-June 2008
-<ul>
-<li>NAT/firewall hole punching support for UDP (SSU introducers)</li>
-<li>Strict tunnel
- peer ordering to address various threat models in
- light of predecessor attacks.</li>
-<li>Basic content distribution infrastructure, suitable
- for address books, blogs, and forums</li>
-<li>Working: blogs, chat, mail, news, BT, eepsites, search</li>
-<li>Solid <a href="how_peerselection.html">peer selection</a> algorithms</li>
-<li>Adaptive and efficient <a href="tunnel-alt.html">tunnel build</a> algorithms</li>
-<li>Enhanced reliability, performance, and efficiency</li>
-<li>Up-to-date website</li>
-</ul>
+{% block content %}
<h2 id="0.7">0.7</h2>
Late 2008
diff --git a/www.i2p2/pages/todo.html b/www.i2p2/pages/todo.html
index 1981d7416fceeeda0d878692c4d48aabc1fe2533..d54f6dc37241328051b2d1b7cf0b57ae9d1b8b67 100644
--- a/www.i2p2/pages/todo.html
+++ b/www.i2p2/pages/todo.html
@@ -216,7 +216,7 @@ samples when dealing with longer tunnels.</p>
</li>
<li><h3 id="ordering">Strict ordering of participants within tunnels</h3>
-<b><i>Implemented in I2P <strike>0.6.1.33</strike> 0.6.2</a></i></b>
+<b><i>Implemented in release 0.6.2</a></i></b>
<p>As Connelly <a href="http://dev.i2p/pipermail/i2p/2004-July/000335.html">proposed</a>
to deal with the <a href="http://prisms.cs.umass.edu/brian/pubs/wright-tissec.pdf">predecessor attack</a>
@@ -329,7 +329,7 @@ pass it along, except at any peers where the clove exposed includes delay instru
<li><h2 id="performance">Performance</h2><ul>
<li><h3 id="reply">Persistent Tunnel / Lease Selection</h3>
-<b><i>Outbound tunnel selection implemented in 0.6.1.30, inbound lease selection scheduled for release 0.6.2</i></b>
+<b><i>Outbound tunnel selection implemented in 0.6.1.30, inbound lease selection implemented in release 0.6.2</i></b>
<p>Selecting tunnels and leases at random for every message creates
a large incidence of out-of-order delivery, which prevents the streaming lib from
@@ -338,11 +338,11 @@ By persisting with the same selections for a given connection,
the transfer rate is much faster.
</p></li>
- <li><h3 id="reply">Reply LeaseSet Bundling</h3>
-<b><i>Scheduled for fixing in release 0.6.2</i></b>
+ <li><h3 id="reply">Reduction of Reply LeaseSet Bundling</h3>
+<b><i>Implemented in release 0.6.2</i></b>
-<p>Currently, I2P bundles a reply leaseset (typically 1056 bytes) with every outbound
-client message, which is a massive overhead. A fix is in testing now.
+<p>I2P bundled a reply leaseset (typically 1056 bytes) with every outbound
+client message, which was a massive overhead. Fixed in 0.6.2.
</p></li>
<li><h3 id="sessionTag">Migrate sessionTag to synchronized PRNG</h3>