diff --git a/LICENSE.txt b/LICENSE.txt
index 62a70df7f95b328a418a66bb8745f9bb923231a5..83510e368af618538d909c21499ca4efcfc4985d 100644
--- a/LICENSE.txt
+++ b/LICENSE.txt
@@ -53,3 +53,6 @@ See https://creativecommons.org/licenses/by-sa/4.0/
- All other flag icons: public domain, courtesy mjames@gmail.com http://www.famfamfam.com/
OS icons (i2p2www/static/images/download/):
- Courtesy dakirby309 http://dakirby309.deviantart.com/art/Metro-UI-Icon-Set-725-Icons-280724102
+ Homepage Background Image:
+ - Used with permission of pexels.com https://www.pexels.com/license/
+ - original source: https://pixabay.com/illustrations/star-sky-star-space-night-sky-3621630/
diff --git a/i2p2www/blog/2004/07/20/status.html b/i2p2www/blog/2004/07/20/status.html
index 2e32c8fbc6c44d4291f2f97e98c392b09a185ed4..1a734ad2a258ce325acb2c7cf6caa4745b2fb089 100644
--- a/i2p2www/blog/2004/07/20/status.html
+++ b/i2p2www/blog/2004/07/20/status.html
@@ -14,8 +14,8 @@ great job of upgrading - we only have two holdouts now (one
at 0.3.2.2 and one way back at 0.3.1.4 :). Over the last
few days the network has been more reliable than usual -
people are staying on irc.duck.i2p for hours at a time,
-larger file downloads are succeeding from eepsites, and
-general eepsite reachability is fairly good. Since its
+larger file downloads are succeeding from eepsites(I2P Sites), and
+general eepsite(I2P Site) reachability is fairly good. Since its
going well and I want to keep you on your toes, I decided
to change a few fundamental concepts and we'll have them
deployed in a 0.3.3 release in a day or two.
@@ -86,7 +86,7 @@ to jump on -
news be a simple heading, with an announcements page
below?
* i2ptunnel_services, i2ptunnel_tuning, i2ptunnel_lan:
- We need someone to rewrite the 'how to set up an eepsite'
+ We need someone to rewrite the 'how to set up an eepsite(I2P Site)'
page, as well as include answers to the two most
frequently asked I2PTunnel questions (how to access it
through a LAN and how to configure its tunnels - answers
diff --git a/i2p2www/blog/2004/08/03/status.html b/i2p2www/blog/2004/08/03/status.html
index ce5c2385cd074ef4610bc8ad789770aaccab8d9f..0d3d6bc5e121efff3315d06183882c13d5eba408 100644
--- a/i2p2www/blog/2004/08/03/status.html
+++ b/i2p2www/blog/2004/08/03/status.html
@@ -15,7 +15,7 @@ hi y'all, lets get this status update out of the way
With last week's 0.3.4 release, the new net is performing pretty
well - irc connections are lasting for several hours at a time and
-eepsite retrieval seems to be pretty reliable. Throughput is
+eepsite(I2P Site) retrieval seems to be pretty reliable. Throughput is
still generally low, though slightly improved (I used to see a
consistent 4-5KBps, now I consistently see a 5-8KBps). oOo has
posted up a pair of scripts summarizing the irc activity,
diff --git a/i2p2www/blog/2004/08/10/status.html b/i2p2www/blog/2004/08/10/status.html
index d5f5d58fa4473f611d9ab5d7603dedd93d4c42c5..4c17be9de1ae835453bdb1752682bd44f9594361 100644
--- a/i2p2www/blog/2004/08/10/status.html
+++ b/i2p2www/blog/2004/08/10/status.html
@@ -14,7 +14,7 @@ Hey everyone, weekly update time
Well, we've pushed out the 0.3.4.1 release the other day, and it has
been doing pretty well. Connect times on irc have been consistently
for multiple hours, and transfer rates are doing pretty good as well
-(I pulled 25KBps from one eepsite the other day using 3 parallel
+(I pulled 25KBps from one eepsite(I2P Site) the other day using 3 parallel
streams).
One really cool feature added in with the 0.3.4.1 release (that I
diff --git a/i2p2www/blog/2004/08/24/status.html b/i2p2www/blog/2004/08/24/status.html
index 61bc90f5f51b0800b68b1b640ddbeeecd356bc3c..2d40721bcb16bad09455a9c7a3fa845e850eca75 100644
--- a/i2p2www/blog/2004/08/24/status.html
+++ b/i2p2www/blog/2004/08/24/status.html
@@ -23,7 +23,7 @@ pretty well since. There have been some problems with some newly
introduced tunnel testing and peer selection code, but after some
tweaking since the release, its pretty solid. I don't know if the
irc server is on the new rev yet, so we generally have to rely on
-testing with eepsites and the http outproxies (squid.i2p and
+testing with eepsites(I2P Sites) and the http outproxies (squid.i2p and
www1.squid.i2p). Large (>5MB) file transfers in the 0.3.4.3
release are still not reliable enough, but in my testing, the
modifications since then have improved things further.
@@ -125,12 +125,12 @@ let the new jcpuid code choose the right one).
* 2.3) i2paddresshelper
oOo has put together a really cool helper to let people browse
-eepsites without updating their hosts.txt. It is committed to CVS
+eepsites(I2P Sites) without updating their hosts.txt. It is committed to CVS
and will be deployed in the next release, but people may want to
consider updating links accordingly (cervantes has updated
forum.i2p's [i2p] bbcode to support it with a "Try it [i2p]" link).
-Basically you just make a link to the eepsite with whatever name you
+Basically you just make a link to the eepsite(I2P Site) with whatever name you
want, then tack on a special url parameter specifying the
destination:
@@ -138,7 +138,7 @@ destination:
Behind the scenes, its pretty safe - you can't spoof some other
address, and the name is *not* persisted in hosts.txt, but it will
-let you see images / etc linked to on eepsites that you wouldn't be
+let you see images / etc linked to on eepsites(I2P Sites) that you wouldn't be
able to with the old <a rel="nofollow" href="http://i2p/base64/">http://i2p/base64/</a> trick. If you want to always
be able to use "wowthisiscool.i2p" to reach that site, you will
still of course have to add the entry to your hosts.txt (until the
diff --git a/i2p2www/blog/2004/09/14/status.html b/i2p2www/blog/2004/09/14/status.html
index ede0b78847458647f82d39e98e57bde23312d8b2..9ae6901a579af93229616939ff9a2776729e42b5 100644
--- a/i2p2www/blog/2004/09/14/status.html
+++ b/i2p2www/blog/2004/09/14/status.html
@@ -107,11 +107,11 @@ about implementing transparent DCC though, so perhaps the IRC
side could be used for public chat and DCC for private file
transfers or serverless chat.
-General eepsite functionality is also important, and what we
+General eepsite(I2P Site) functionality is also important, and what we
have now is completely unsatisfactory. As DrWoo points out [9],
there are significant anonymity risks with the current setup,
and even though oOo has made some patches filtering some
-headers, there is much more work to be done before eepsites can
+headers, there is much more work to be done before eepsites(I2P Sites) can
be considered secure. There are a few different approaches to
addressing this, all of which can work, but all of which
require work. I do know that duck mentioned he had someone
@@ -151,9 +151,9 @@ network load. It doesn't, however, offer the full richness of
normal websites, but the 1.8 million active LiveJournal users
don't seem to mind.
-Beyond that, securing the eepsite architecture would be my
+Beyond that, securing the eepsite(I2P Site) architecture would be my
next preference, allowing browsers the safety they need and
-letting people serve eepsites 'out of the box'.
+letting people serve eepsites(I2P Sites) 'out of the box'.
File transfer and distributed data storage are also incredibly
powerful, but they don't seem to be as community oriented as
diff --git a/i2p2www/blog/2004/10/05/status.html b/i2p2www/blog/2004/10/05/status.html
index f3d37a442efe6bec60035224aa9ff6e43b6ca061..f5c9d08777603bd4497a8339d77a8db878bb7026 100644
--- a/i2p2www/blog/2004/10/05/status.html
+++ b/i2p2www/blog/2004/10/05/status.html
@@ -14,7 +14,7 @@ Hi y'all, its weekly update time
After a pretty bumpy 0.4.1 release (and subsequent rapid 0.4.1.1
update), the net seems to be back to normal - 50-something peers
-actrive at the moment, and both irc and eepsites are reachable. Most
+actrive at the moment, and both irc and eepsites(I2P Sites) are reachable. Most
of the pain was caused by insufficient testing of the new transport
outside lab conditions (e.g. sockets breaking at strange times,
excessive delays, etc). Next time we need to make changes at that
@@ -133,7 +133,7 @@ lib, we'll switch 'em.
* 4) Bundled eepserver
As was mentioned in the 0.4.1 release notes [3], we've bunded the
-software and configuration necessary for running an eepsite out of
+software and configuration necessary for running an eepsite(I2P Site) out of
the box - you can simply drop a file in the ./eepsite/docroot/
directory and share the I2P destination found on the router console.
diff --git a/i2p2www/blog/2004/10/19/status.html b/i2p2www/blog/2004/10/19/status.html
index 538d884b1791808820c6a80e621cb417e4840c82..6cc95bb62fdba0c0d3fc012686aac9df0cbb3548 100644
--- a/i2p2www/blog/2004/10/19/status.html
+++ b/i2p2www/blog/2004/10/19/status.html
@@ -67,11 +67,11 @@ More news when there's more news.
* 4) files.i2p
-Ok, we've had a lot of new eepsites lately, which is kickass. I just
+Ok, we've had a lot of new eepsites(I2P Sites) lately, which is kickass. I just
want to point out this one especially as its got a pretty neat
feature for the rest of us. If you haven't been to files.i2p, its
basically a google-like search engine, with a cache of the sites it
-spiders (so you can both search and browse when the eepsite is
+spiders (so you can both search and browse when the eepsite(I2P Site) is
offline). v.cool.
* 5) ???
diff --git a/i2p2www/blog/2004/10/26/status.html b/i2p2www/blog/2004/10/26/status.html
index 980186a9024460ade56f0bb646ae8abb3a369d11..33a551aef1bc5882bd7c9567edfcc9f0a6926205 100644
--- a/i2p2www/blog/2004/10/26/status.html
+++ b/i2p2www/blog/2004/10/26/status.html
@@ -12,7 +12,7 @@ Hi y'all, weekly update time
* 1) Net status
I don't want to jinx it, but for the last week the network has been
-pretty much as before - fairly stable for irc, eepsites loading
+pretty much as before - fairly stable for irc, eepsites(I2P Sites) loading
reliably, though large files still often require resuming. Basically
nothing new to report, beyond the fact that there's
nothing new to report.
diff --git a/i2p2www/blog/2004/11/02/status.html b/i2p2www/blog/2004/11/02/status.html
index 664d200b3c373fc1bf16a9bcf6adcffcb4054c8c..2d845786ec60948c73c0efa77ceb123e34788582 100644
--- a/i2p2www/blog/2004/11/02/status.html
+++ b/i2p2www/blog/2004/11/02/status.html
@@ -13,9 +13,9 @@ Hi y'all, time for the weekly update
* 1) Net status
-Pretty much as before - a steady number of peers, eepsites fairly
+Pretty much as before - a steady number of peers, eepsites(I2P Sites) fairly
reachable, and irc for hours on end. You can get a peek at the
-reachability of various eepsites through a few different pages:
+reachability of various eepsites(I2P Sites) through a few different pages:
- <a rel="nofollow" href="http://gott.i2p/sites.html">http://gott.i2p/sites.html</a>
- <a rel="nofollow" href="http://www.baffled.i2p/links.html">http://www.baffled.i2p/links.html</a>
- <a rel="nofollow" href="http://thetower.i2p/pings.txt">http://thetower.i2p/pings.txt</a>
diff --git a/i2p2www/blog/2004/11/23/status.html b/i2p2www/blog/2004/11/23/status.html
index 8f46c762b07eacb06933084927e691a20beb2b8a..198188de13f3af26a45e23c5f8d070cb98745ce2 100644
--- a/i2p2www/blog/2004/11/23/status.html
+++ b/i2p2www/blog/2004/11/23/status.html
@@ -78,7 +78,7 @@ old lib - I2PTunnel and SAM streams automatically use it, but from
a packet perspective, it is *not* backwards compatible. This leaves
us with an interesting dilemma - there is nothing within I2P
requiring us to make 0.4.2 into a manditory upgrade, however people
-who don't upgrade won't be able to use I2PTunnel - no eepsites, no
+who don't upgrade won't be able to use I2PTunnel - no eepsites(I2P Sites), no
IRC, no outproxy, no email. I don't want to alienate our long time
users by forcing them to upgrade, but I also don't want to alienate
them by having everything useful break ;)
diff --git a/i2p2www/blog/2004/11/30/status.html b/i2p2www/blog/2004/11/30/status.html
index 61cf05b9490e5b0820d8e7f61a2f18d7ad3f3b0b..de152e43772c42e06018d3cd5fb88eec443387e0 100644
--- a/i2p2www/blog/2004/11/30/status.html
+++ b/i2p2www/blog/2004/11/30/status.html
@@ -7,7 +7,7 @@ Hi y'all
1) 0.4.2 and 0.4.2.1
2) mail.i2p
3) i2p-bt
-4) eepsites
+4) eepsites(I2P Sites)
5) ???
* 1) 0.4.2 and 0.4.2.1
@@ -36,10 +36,10 @@ some trouble with the i2p-bt port. Some of the problems have been
identified found and fixed in the streaming lib, but further work
is necessary to get it where we need it to be.
-* 4) eepsites
+* 4) eepsites(I2P Sites)
There has been some discussion over the months on the list, in the
-channel, and on the forum about some problems with how eepsites
+channel, and on the forum about some problems with how eepsites(I2P Sites)
and the eepproxy work - recently some have mentioned problems with
how and what headers are filtered, others have brought up the
dangers of poorly configured browsers, and there's also DrWoo's
diff --git a/i2p2www/blog/2004/12/21/status.html b/i2p2www/blog/2004/12/21/status.html
index 4e8e679a2f1d332a6bd25ebffd0b842929fa0bac..d059c7f1230d015558746341afd5bf6c09a15b78 100644
--- a/i2p2www/blog/2004/12/21/status.html
+++ b/i2p2www/blog/2004/12/21/status.html
@@ -7,7 +7,7 @@ Ev'nin folks, time for our status update
1) 0.4.2.4 & 0.4.2.5
2) 0.5 strategy
3) naming
-4) eepsite roundup
+4) eepsite(I2P Site) roundup
5) ???
1) 0.4.2.4 & 0.4.2.5
@@ -77,9 +77,9 @@ based manager at <a rel="nofollow" href="http://susi.i2p/susidns/manager">http:
through the stats at <a rel="nofollow" href="http://orion.i2p/">http://orion.i2p/</a> and
<a rel="nofollow" href="http://susi.i2p/susisworld.html">http://susi.i2p/susisworld.html</a>
-* 4) eepsite roundup
+* 4) eepsite(I2P Site) roundup
-There have been some notable developments on various eepsites worth
+There have been some notable developments on various eepsites(I2P Sites) worth
mentioning:
= <a rel="nofollow" href="http://frosk.i2p/">http://frosk.i2p/</a> - I2PContent doc updates
diff --git a/i2p2www/blog/2004/12/28/status.html b/i2p2www/blog/2004/12/28/status.html
index 0d158b8cc166e8072f5931b633a3c8ed1ed91464..8ae02da6e74129dc123821d2b7c835bbb0fc002f 100644
--- a/i2p2www/blog/2004/12/28/status.html
+++ b/i2p2www/blog/2004/12/28/status.html
@@ -36,7 +36,7 @@ Nothing substantial to report here yet though.
Very brief summary, I know, but most of the work over the last week
has been on paper. As mentioned [1] on the list, Connelly is
-running an intersection attack against some eepsites, so once
+running an intersection attack against some eepsites(I2P Sites), so once
there's some data to report on, I'm sure he'll give us the scoop.
Anyone else have anything to bring up - if so, swing on by the
meeting.
diff --git a/i2p2www/blog/2005/02/15/status.html b/i2p2www/blog/2005/02/15/status.html
index cf62c7a2ed4e6eaa8c725f9665753aab384b9a0d..063529beeec016494d443d56b475702dd32c0f1c 100644
--- a/i2p2www/blog/2005/02/15/status.html
+++ b/i2p2www/blog/2005/02/15/status.html
@@ -49,11 +49,11 @@ be a BACKWARDS INCOMPATIBLE RELEASE, to give you time to plan for
updating, I'll fix a simple deadline of THIS FRIDAY as when 0.5
will be released.
-As bla mentioned on irc, eepsite hosts may want to take their site
+As bla mentioned on irc, eepsite(I2P Site) hosts may want to take their site
down on Thursday or Friday and keep them down until Saturday when
many users will have upgraded. This will help reduce the effect of
an intersection attack (e.g. if 90% of the network has migrated to
-0.5 and you're still on 0.4, if someone reaches your eepsite, they
+0.5 and you're still on 0.4, if someone reaches your eepsite(I2P Site), they
know you're one of the 10% of routers left on the network).
I could start to get into whats been updated in 0.5, but I'd end up
diff --git a/i2p2www/blog/2005/03/01/status.html b/i2p2www/blog/2005/03/01/status.html
index 563b4631402e2bf65a53cb3f1615625a6b45c307..d92c951cf7a2cdd303b46b7673c7bd91ecc16e44 100644
--- a/i2p2www/blog/2005/03/01/status.html
+++ b/i2p2www/blog/2005/03/01/status.html
@@ -62,8 +62,8 @@ smeghead during the meeting?
Legion has also created a fork off the i2p-bt rev, merged in some
other code, patched up some things, and has a windows binary
-available on his eepsite. The announcement [2] seems to suggest
-that source may be made available, though its not up on the eepsite
+available on his eepsite(I2P Site). The announcement [2] seems to suggest
+that source may be made available, though its not up on the eepsite(I2P Site)
at the moment. The i2p devs haven't audited (or even seen) the code
to that client, so those who need anonymity may want to get and
review a copy of the code first.
diff --git a/i2p2www/blog/2005/04/05/status.html b/i2p2www/blog/2005/04/05/status.html
index bd84ef2c11264154be9b515123a5379cfbff98a4..29b4549f22ebe726742c9199dd07562fb7b15cd4 100644
--- a/i2p2www/blog/2005/04/05/status.html
+++ b/i2p2www/blog/2005/04/05/status.html
@@ -15,7 +15,7 @@ Last week's 0.5.0.5 release has had its ups and downs - the major
change to address some attacks in the netDb seems to work as
expected, but has exposed some long overlooked bugs in the netDb's
operation. This has caused some substantial reliability issues,
-especially for eepsites. The bugs have however been identified and
+especially for eepsites(I2P Sites). The bugs have however been identified and
addressed in CVS, and those fixes among a few others will be pushed
out as a 0.5.0.6 release within the next day.
diff --git a/i2p2www/blog/2005/04/19/status.html b/i2p2www/blog/2005/04/19/status.html
index 2b67bff51ba245b7c5878b4be177cce1efe898c1..f20092f6f9b60b30c0d5c0be34c0ba4e37104dda 100644
--- a/i2p2www/blog/2005/04/19/status.html
+++ b/i2p2www/blog/2005/04/19/status.html
@@ -13,7 +13,7 @@ Hi y'all, its that time of the week again,
* 1) Net status
Over the nearly two weeks since 0.5.0.6 came out, things have been
-mostly positive, though service providers (eepsites, ircd, etc) have
+mostly positive, though service providers (eepsites(I2P Sites), ircd, etc) have
been running into some bugs as of late. While clients are in good
shape, over time a server may run into situation where failing
tunnels can trigger some excessive throttling code, preventing
diff --git a/i2p2www/blog/2005/05/03/status.html b/i2p2www/blog/2005/05/03/status.html
index 6491dae372638fccc82ce0f16b647b1269ac0e22..644283de76f4a09a32618333db2c99bd1d0e8cc5 100644
--- a/i2p2www/blog/2005/05/03/status.html
+++ b/i2p2www/blog/2005/05/03/status.html
@@ -53,7 +53,7 @@ there's a lot of work to do before its ready for joe sixpack,
earlier this evening I was able to fire it up, browse sirup's shared
files, grab some data, and use its *cough* "instant" chat interface.
-There's lots more info up on sirup's eepsite [2], and help testing
+There's lots more info up on sirup's eepsite(I2P Site) [2], and help testing
by people already in the i2p community would be great (though
please, until sirup blesses it as a public release, and i2p is at
least 0.6 if not 1.0, lets keep it within the i2p community). I
diff --git a/i2p2www/blog/2005/08/23/status.html b/i2p2www/blog/2005/08/23/status.html
index 83c81ade576142bf421af85dfa68dd58452ccf40..55fe2ac9f932c0fe3452654b8359ab854780f551 100644
--- a/i2p2www/blog/2005/08/23/status.html
+++ b/i2p2www/blog/2005/08/23/status.html
@@ -69,7 +69,7 @@ Can I hear a "w00t"?
As mentioned on the list and in the channel, we've got a new
client app for secure and authenticated blogging / content
-distribution. With Syndie, the "is your eepsite up" question goes
+distribution. With Syndie, the "is your eepsite(I2P Site) up" question goes
away, as you can read the content even when the site is down, but
Syndie avoids all the ugly issues inherent in content distribution
networks by focusing on the frontend. Anyway, its very much a work
diff --git a/i2p2www/blog/2005/09/06/status.html b/i2p2www/blog/2005/09/06/status.html
index d959867daa54c8575939cfbddfa9b8fdc817f718..0941372e616b175b787fd67c4bb5fe44d674773b 100644
--- a/i2p2www/blog/2005/09/06/status.html
+++ b/i2p2www/blog/2005/09/06/status.html
@@ -18,7 +18,7 @@ some room for improvement, but it seems that the new netDb is
performing as designed. We've even had the fallback tested out -
when the floodfill peers are unreachable, routers fall back on the
kademlia netDb, and the other day when that scenario occurred, irc
-and eepsite reliability was not substantially diminished.
+and eepsite(I2P Site) reliability was not substantially diminished.
I did receive a question regarding how the new netDb works, and have
posted up the answer [1] on my blog [2]. As always, if anyone has
@@ -51,7 +51,7 @@ Susi has whipped up yet another web application for us - susidns [3].
This serves as a simple interface for managing the addressbook app -
its entries, subscriptions, etc. Its looking pretty good, so
hopefully we'll be able to ship it as one of the default apps soon,
-but for now, its a snap to grab from her eepsite, save it to your
+but for now, its a snap to grab from her eepsite(I2P Site), save it to your
webapps directory, restart your router, and you're good to go.
[3] <a rel="nofollow" href="http://susi.i2p/?page_id=13">http://susi.i2p/?page_id=13</a>
diff --git a/i2p2www/blog/2005/11/22/status.html b/i2p2www/blog/2005/11/22/status.html
index 43133c27c7a00f510f13313464d0028253f6271b..ce3081dccafbfaa3a0a9aede1240b9d3511689fb 100644
--- a/i2p2www/blog/2005/11/22/status.html
+++ b/i2p2www/blog/2005/11/22/status.html
@@ -33,7 +33,7 @@ peer review for I2P's anonymity [3]. The more I think about it the
more I like it, though I think Raccoon23 is probably right in that
we want to wait until 0.9/1.0-beta before running these types of
contests. We could even do different contests for different
-applications on top of I2P - one for eepsites, one for irc users,
+applications on top of I2P - one for eepsites(I2P Sites), one for irc users,
one for I2Phex users, one for anon-BT users, one for Syndie users,
etc. This, meshed with the suggestion of trying with both passive
'foxes' and fairly advanced 'foxes' should give us the opportunity
diff --git a/i2p2www/blog/2006/01/03/status.html b/i2p2www/blog/2006/01/03/status.html
index 8dc0a9eb776ffd63013b57b1cf1bc28969f8ebd1..32ab982513f169ba9397fc79819e334183475170 100644
--- a/i2p2www/blog/2006/01/03/status.html
+++ b/i2p2www/blog/2006/01/03/status.html
@@ -71,7 +71,7 @@ Saying 2005 broke a lot of ground is a bit of an understatement -
we've improved I2P numerous ways in the 25 releases last year,
grew the network 5-fold, deployed several new client applications
(Syndie, I2Phex, I2PSnark, I2PRufus), migrated to postman's and
-cervantes' new irc2p IRC network, and saw some useful eepsites
+cervantes' new irc2p IRC network, and saw some useful eepsites(I2P Sites)
bloom (such as zzz's stats.i2p, orion's orion.i2p, and tino's proxy
and monitoring services, just to name a few). The community has
also matured a bit more, in no small part thanks to the support
diff --git a/i2p2www/blog/2006/01/10/status.html b/i2p2www/blog/2006/01/10/status.html
index 65dd8f131b931bc58b1908fba79eacd3b3f8de09..0123178d6661486ddd08bad5a44b1abb963b0399 100644
--- a/i2p2www/blog/2006/01/10/status.html
+++ b/i2p2www/blog/2006/01/10/status.html
@@ -95,7 +95,7 @@ long requested feature - support for persistent HTTP connections,
allowing you to send multiple HTTP requests over a single stream,
receiving multiple replies in return. I think someone first asked
for this two years ago or so, and it could help with some types of
-eepsite or outproxying a bunch. I know the work isn't done yet, but
+eepsite(I2P Site) or outproxying a bunch. I know the work isn't done yet, but
its coming along. Hopefully zzz can give us a status update during
the meeting.
diff --git a/i2p2www/blog/2006/08/01/status.html b/i2p2www/blog/2006/08/01/status.html
index 7e4cf223c54450972132ee9eef8211a3449c5425..c29e41fa87e8f0741d187fea51752757aca89781 100644
--- a/i2p2www/blog/2006/08/01/status.html
+++ b/i2p2www/blog/2006/08/01/status.html
@@ -10,7 +10,7 @@ large I2PSnark transfers completing, and with quite sustantial
transfer rates achieved on individual routers - I've seen
650KBytes/sec and 17,000 participating tunnels without any
fireworks. Routers on the low end of the spectrum seem to be
-doing fine too, browsing eepsites and irc with 2 hop tunnels
+doing fine too, browsing eepsites(I2P Sites) and irc with 2 hop tunnels
using under 1KByte/sec average.
It isn't all roses for everyone though, but we're working through
@@ -24,13 +24,13 @@ clearing up the initial bumps and bruises. To answer a frequent
question, in the long run, both NTCP and SSU will be in operation -
we are not reverting to TCP-only.
-* Eepsite reachability
+* eepsite(I2P Site) reachability
-Remember folks that eepsites are reachable only when the person
+Remember folks that eepsites(I2P Sites) are reachable only when the person
who is running it has it up - if they're down, there's nothing
you can do to reach it ;) Unfortunately, for the past few days,
orion.i2p hasn't been reachable, but the net is definitely still
-working - perhaps swing by inproxy.tino.i2p or eepsites.i2p for
+working - perhaps swing by inproxy.tino.i2p or eepsites(I2P Sites).i2p for
your network survey needs.
Anyway, there's lots more going on, but it'd be a bit premature
diff --git a/i2p2www/blog/2006/10/03/status.html b/i2p2www/blog/2006/10/03/status.html
index 85e5ca30ebeee711b2c19cbc943370e004a3dd7c..1075794edbad1e02083bc5e66ef635681de4ae41 100644
--- a/i2p2www/blog/2006/10/03/status.html
+++ b/i2p2www/blog/2006/10/03/status.html
@@ -133,7 +133,7 @@ being worked on. First, from irc (and the not-yet-out-there FAQ):
<bar> a question i've been pondering is, who is later going to have
balls big enough to host syndie production servers/archives?
- <bar> aren't those going to be as easy to track down as the eepsites
+ <bar> aren't those going to be as easy to track down as the eepsites(I2P Sites)
are today?
<jrandom> public syndie archives do not have the ability to
*read* the content posted to forums, unless the forums publish
diff --git a/i2p2www/blog/2008/02/10/release-0.6.1.31.html b/i2p2www/blog/2008/02/10/release-0.6.1.31.html
index 05ec0ccbc932f7b7d278035e08e3fba572e2390d..19142485c5b2c09093922ddd0eeacb08b217a4e2 100644
--- a/i2p2www/blog/2008/02/10/release-0.6.1.31.html
+++ b/i2p2www/blog/2008/02/10/release-0.6.1.31.html
@@ -10,7 +10,7 @@ independent of jrandom and *.i2p.net servers.
Our new primary mirror is www.i2p2.de, accessible
in I2P at www.i2p2.i2p.
-Automatic updates will hosted on several eepsites,
+Automatic updates will hosted on several eepsites(I2P Sites),
signed by Complication, for which purpose 0.6.1.31
includes two new release verification keys.
diff --git a/i2p2www/blog/2009/07/31/release-0.7.6.html b/i2p2www/blog/2009/07/31/release-0.7.6.html
index 88e1e38a05a5dfc00a2734a0cb5bbd4c6b726c87..ca78f9405dad5f1fcbe9d237c1e3b503efc56516 100644
--- a/i2p2www/blog/2009/07/31/release-0.7.6.html
+++ b/i2p2www/blog/2009/07/31/release-0.7.6.html
@@ -86,7 +86,7 @@ Proxy
Installer, Split Directories, Distro-Friendly Organization
<ul>
-<li>For new installs, code and data will be split into different directories. Data (router files, config files, i2psnark files, eepsite files, etc.) will be in ~/.i2p on linux and %APPDATA%\I2P on Windows. The code directory can be read-only to the user (although the user will not be able to update in that case). On linux, the shell scripts i2prouter, runplain.sh, and eepget can be moved to a directory such as /usr/bin. All assumptions that files are in the current working directory are removed. Don't launch the router anymore in the install scripts on linux.
+<li>For new installs, code and data will be split into different directories. Data (router files, config files, i2psnark files, eepsite(I2P Site) files, etc.) will be in ~/.i2p on linux and %APPDATA%\I2P on Windows. The code directory can be read-only to the user (although the user will not be able to update in that case). On linux, the shell scripts i2prouter, runplain.sh, and eepget can be moved to a directory such as /usr/bin. All assumptions that files are in the current working directory are removed. Don't launch the router anymore in the install scripts on linux.
<li>For existing installs, about the only visible change will be a few temporary files now in the Java temporary directory (e.g. /var/tmp on linux) instead of $I2P.
</ul>
diff --git a/i2p2www/blog/2010/03/15/release-0.7.12.html b/i2p2www/blog/2010/03/15/release-0.7.12.html
index b2f384d47b014b8df9e8d2a6b47693d56050068b..94b9819689a21c8ef8e3cd0253d7da6c6439bafe 100644
--- a/i2p2www/blog/2010/03/15/release-0.7.12.html
+++ b/i2p2www/blog/2010/03/15/release-0.7.12.html
@@ -4,7 +4,7 @@ themes, translations, or standalone programs.
Some plugins are already available for testing.
We are hopeful this support will enable rapid development of innovative i2p applications.
</p><p>
-The release fixes the blank-page bug when an eepsite is not reachable,
+The release fixes the blank-page bug when an eepsite(I2P Site) is not reachable,
and also improves handling of clock skews and IP changes.
It adds support for a new, smaller tunnel build message,
that will be tested in this release and enabled in the next release.
diff --git a/i2p2www/blog/2011/03/02/release-0.8.4.html b/i2p2www/blog/2011/03/02/release-0.8.4.html
index a4fadb6533628b0954db10d27d5fa98e469ec5ef..b4cbcd6c4331e9d4314dfaec9ab698e673052348 100644
--- a/i2p2www/blog/2011/03/02/release-0.8.4.html
+++ b/i2p2www/blog/2011/03/02/release-0.8.4.html
@@ -19,7 +19,7 @@ Please volunteer on IRC #i2p-dev.
</p>
<p>* Fix a severe memory leak in router I2CP session management that caused router crashes for people running the Robert bittorrent client
-<br />* Fix a bug from 0.8.2 that filtered cookies in the HTTP Server tunnel, causing authentication problems for some eepsites
+<br />* Fix a bug from 0.8.2 that filtered cookies in the HTTP Server tunnel, causing authentication problems for some eepsites(I2P Sites)
<br />* Several fixes for rare NPEs</p>
<p><strong>I2PSnark</strong></p>
diff --git a/i2p2www/pages/downloads/browser-content.html b/i2p2www/pages/downloads/browser-content.html
index a5fa3d4248b55c8fa9e5622b8a87de64c68d7e84..afbabab9603b6aa2531e81479751df831fb607ed 100644
--- a/i2p2www/pages/downloads/browser-content.html
+++ b/i2p2www/pages/downloads/browser-content.html
@@ -159,7 +159,7 @@ and <code>{{ https }}</code>. Even the domain names are different, it's the same
{%- endtrans %}</p>
<p>{% trans -%}
Filtering is active on these outproxies (for example, mibbit and torrent
-tracker access is blocked). Eepsites
+tracker access is blocked). I2P Sites
that are accessible via .i2p addresses are also not allowed via the outproxies.
As a convenience, the outproxy blocks ad servers.
{%- endtrans %}</p>
diff --git a/i2p2www/pages/downloads/debian.html b/i2p2www/pages/downloads/debian.html
index 204864a728d055e8ae722ab9b256b02e283c72ff..f9470b4ab915906af407d73bc54e94bf4271fa70 100644
--- a/i2p2www/pages/downloads/debian.html
+++ b/i2p2www/pages/downloads/debian.html
@@ -238,7 +238,7 @@ as the default settings of 96 KB/s down / 40 KB/s up are fairly conservative.
{%- endtrans %}</p>
<p>{% trans browserconfig=site_url('about/browser-config') -%}
-If you want to reach eepsites via your browser, have a look on the <a href="{{ browserconfig }}">browser proxy setup</a> page for an easy howto.
+If you want to reach I2P Sites via your browser, have a look on the <a href="{{ browserconfig }}">browser proxy setup</a> page for an easy howto.
{%- endtrans %}</p>
{% endblock %}
diff --git a/i2p2www/pages/downloads/firefox.html b/i2p2www/pages/downloads/firefox.html
index 56d22d6a99455f44d6de31d05374b7fff284e0eb..0757c00be4ef763bcea201853398e9c88c2d8da1 100644
--- a/i2p2www/pages/downloads/firefox.html
+++ b/i2p2www/pages/downloads/firefox.html
@@ -4,7 +4,7 @@
{% block content %}
<h1>{{ _('I2P Firefox Browser Profile') }}</h1>
<p>{% trans -%}
-Now that you have joined the I2P network, you will want to see I2P sites and and
+Now that you have joined the I2P network, you will want to see I2P Sites and and
other content that is hosted on the network. The Firefox browser is
pre-configured to allow you to access the content available on the network. It
also keeps your I2P search activity separate from your internet search activity.
diff --git a/i2p2www/pages/downloads/list.html b/i2p2www/pages/downloads/list.html
index 233126f8b98932b7732a4cc1c2e125df3cbc1389..049c908c150dbf27473524cb632fd527de0ad2ea 100644
--- a/i2p2www/pages/downloads/list.html
+++ b/i2p2www/pages/downloads/list.html
@@ -65,7 +65,7 @@ Windows: Java 8 is recommended. Java 9 or higher may not work.
<p>
When you download the I2P software bundle, you get everything you need to connect
and start participating in the I2P network and community. It even includes basic
-applications for every user, like e-mail, bittorrent, and a basic I2P site for
+applications for every user, like e-mail, bittorrent, and a basic I2P Site for
you to personalize and share.
</p>
diff --git a/i2p2www/pages/downloads/post-install.html b/i2p2www/pages/downloads/post-install.html
index 445eaad5725c8ac0bcb546c53c7e6c68ad82053b..37f0e806b22396f1d5ce50cf6db8856bf0297a08 100644
--- a/i2p2www/pages/downloads/post-install.html
+++ b/i2p2www/pages/downloads/post-install.html
@@ -32,5 +32,5 @@ as the default settings of 96 KBps down / 40 KBps up are fairly slow.
{%- endtrans %}</p>
<p>{% trans browserconfig=site_url('about/browser-config') -%}
-If you want to reach eepsites via your browser, have a look on the <a href="{{ browserconfig }}">browser proxy setup</a> page for an easy howto.
+If you want to reach I2P Sites via your browser, have a look on the <a href="{{ browserconfig }}">browser proxy setup</a> page for an easy howto.
{%- endtrans %}</p>
diff --git a/i2p2www/pages/downloads/windows.html b/i2p2www/pages/downloads/windows.html
index 7c1a78bf32381148c4878a7f9cd209713c5f116d..9a5ce6748c35185606a58d3466e07194c7220276 100644
--- a/i2p2www/pages/downloads/windows.html
+++ b/i2p2www/pages/downloads/windows.html
@@ -169,7 +169,7 @@ configuration wizard.{%- endtrans %}
<p>{% trans -%}If you want to re-run the welcome wizard after completing it, you can visit the page
on{%- endtrans %} <a href="http://localhost:7657/welcome">your router console</a>.</p>
-<p>{% trans -%}That's it! You're now ready to use I2P. You can browse I2P sites, download files, host services,
+<p>{% trans -%}That's it! You're now ready to use I2P. You can browse I2P Sites, download files, host services,
e-mail and chat anonymously. Visit the <a href="https://localhost:7657/home">router console homepage</a> to
get started.{%- endtrans %}</p>
diff --git a/i2p2www/pages/global/footer.html b/i2p2www/pages/global/footer.html
index 6d2c402191f9d25bcb5290125a4f5e685f320108..47b3135d251d47a90ffac7550bc0cf7a2bc6242b 100644
--- a/i2p2www/pages/global/footer.html
+++ b/i2p2www/pages/global/footer.html
@@ -1,24 +1,25 @@
<div id="footermenu" class="first">
<ul>
- <li><a href="{{ get_url('downloads_list') }}"><div class="footeritem"><span>{{ _('Download') }}</span></div></a></li>
- <li><a href="{{ site_url('faq') }}"><div class="footeritem"><span>{{ _('FAQ') }}</span></div></a></li>
- <li><a href="{{ site_url('docs') }}"><div class="footeritem"><span>{{ _('Documentation') }}</span></div></a></li>
- <li><a href="{{ site_url('research') }}"><div class="footeritem"><span>{{ _('Research') }}</span></div></a></li>
+ <li><a href="https://mastodon.social/@i2p"><div class="footeritem"><img class="socialfooter" src="/_static/images/social/contact.png"><span>{{ _('Mastodon') }}</span></div></a></li>
+
+ <li><a href="https://reddit.com/r/i2p"><div class="footeritem"><img class="socialfooter" src="/_static/images/social/reddit-alien-brands.png"><span>Reddit</span></div></a></li>
+ <li><a href="https://twitter.com/i2p"><div class="footeritem"><img class="socialfooter" src="/_static/images/social/twitter-brands.png"><span>Twitter</span></div></a></li>
</ul>
</div>
<div id="footermenu" class="second">
<ul>
- <li><a href="{{ site_url('contact') }}"><div class="footeritem"><span>{{ _('Contact us') }}</span></div></a></li>
- <li><a href="http://{{ i2pconv('i2pforum.i2p') }}/"><div class="footeritem"><span>{{ _('Forums') }}</span></div></a></li>
- <li><a href="https://reddit.com/r/i2p"><div class="footeritem"><span>Reddit</span></div></a></li>
- <li><a href="{{ site_url('get-involved/guides/new-developers') }}"><div class="footeritem"><span>Develop</span></div></a></li>
+ <li><a href="http://{{ i2pconv('i2pforum.i2p') }}/"><div class="footeritem"><span>{{ _('Official Forums') }}</span></div></a></li>
+ <li><a href="{{ site_url('contact') }}"><div class="footeritem"><span>{{ _('Contact') }}</span></div></a></li>
+ <li><a href="{{ site_url('impressum') }}"><div class="footeritem"><span>{{ _('Impressum') }}</span></div></a></li>
+<!-- <li><a href="{{ site_url('docs') }}"><div class="footeritem"><span>{{ _('Documentation') }}</span></div></a></li>-->
+<!-- <li><a href="{{ site_url('research') }}"><div class="footeritem"><span>{{ _('Research') }}</span></div></a></li>-->
</ul>
</div>
<div id="footermenu" class="third">
<ul>
- <li><a href="{{ site_url('get-involved') }}"><div class="footeritem"><span>{{ _('Get involved!') }}</span></div></a></li>
<li><a href="{{ site_url('get-involved/donate') }}"><div class="footeritem"><span>{{ _('Donate') }}</span></div></a></li>
- <li><a href="https://i2p-metrics.np-tokumei.net/"><div class="footeritem"><span>{{ _('Metrics') }}</span></div></a></li>
- <li><a href="{{ site_url('papers') }}"><div class="footeritem"><span>{{ _('Papers') }}</span></div></a></li>
+ <li><a href="{{ site_url('get-involved') }}"><div class="footeritem"><span>{{ _('Get involved!') }}</span></div></a></li>
+ <li><a href="{{ site_url('faq') }}"><div class="footeritem"><span>{{ _('FAQ') }}</span></div></a></li>
+ <!--<li><a href="{{ site_url('get-involved/guides/new-developers') }}"><div class="footeritem"><span>Develop</span></div></a></li>-->
</ul>
</div>
diff --git a/i2p2www/pages/global/nav.html b/i2p2www/pages/global/nav.html
index 6d2b93728bcf3b9504be31d96ef6c7342bc44945..028f1ad1a16041029c1385439fe3d2025ac5f50e 100644
--- a/i2p2www/pages/global/nav.html
+++ b/i2p2www/pages/global/nav.html
@@ -4,14 +4,13 @@
<li class="has-sub"><div class="menuitem"><span>{{ _('About') }}</span></div>
<ul>
<li><a href="{{ site_url('about/intro') }}"><div class="menuitem"><span>{{ _('Introduction to I2P') }}</span></div></a></li>
- <li><a href="{{ site_url('about/software') }}"><div class="menuitem"><span>{{ _('Guide to I2P Software') }}</span></div></a></li>
- <li class="has-sub"><div class="menuitem"><span>{{ _('Help') }}</span></div>
+ <li class="has-sub"><div class="menuitem"><span>{{ _('Guide to I2P Software') }}</span></div>
<ul>
- <li><a href="{{ site_url('faq') }}"><div class="menuitem"><span>{{ _('FAQ') }}</span></div></a></li>
+ <li><a href="{{ site_url('about/software') }}"><div class="menuitem"><span>{{ _('What is Included') }}</span></div></a><li>
<li><a href="{{ site_url('about/browser-config') }}"><div class="menuitem"><span>{{ _('How to browse I2P') }}</span></div></a></li>
+ <li><a href="{{ site_url('faq') }}"><div class="menuitem"><span>{{ _('FAQ') }}</span></div></a></li>
<li class="has-sub"><div class="menuitem"><span>{{ _('Applications') }}</span></div>
<ul>
- <li><a href="{{ site_url('docs/applications/supported') }}"><div class="menuitem"><span>{{ _('Supported applications') }}</span></div></a></li>
<li><a href="{{ site_url('docs/applications/bittorrent') }}"><div class="menuitem"><span>{{ _('Bittorrent') }}</span></div></a></li>
<li><a href="{{ site_url('docs/applications/gitlab') }}"><div class="menuitem"><span>{{ _('GitLab') }}</span></div></a></li>
<li><a href="{{ site_url('docs/applications/git') }}"><div class="menuitem"><span>{{ _('Git') }}</span></div></a></li>
@@ -19,10 +18,18 @@
<li><a href="{{ site_url('docs/applications/irc') }}"><div class="menuitem"><span>{{ _('IRC') }}</span></div></a></li>
</ul>
</li>
- <li class="has-sub"><div class="menuitem"><span>{{ _('References') }}</span></div>
+ </ul>
+ </li>
+ <li class="has-sub"><div class="menuitem"><span>{{ _('Help') }}</span></div>
+ <ul>
+ <li><a href="{{ site_url('about/glossary') }}"><div class="menuitem"><span>{{ _('Glossary') }}</span></div></a></li>
+ <li><a href="{{ site_url('about/performance') }}"><div class="menuitem"><span>{{ _('Performance') }}</span></div></a></li>
+ <li class="has-sub"><div class="menuitem"><span>{{ _('Comparisons') }}</span></div>
<ul>
- <li><a href="{{ site_url('about/glossary') }}"><div class="menuitem"><span>{{ _('Glossary') }}</span></div></a></li>
- <li><a href="{{ site_url('about/performance') }}"><div class="menuitem"><span>{{ _('Performance') }}</span></div></a></li>
+ <li><a href="{{ site_url('comparison/tor') }}"><div class="menuitem"><span>Tor</span></div></a></li>
+ <li><a href="{{ site_url('comparison/freenet') }}"><div class="menuitem"><span>Freenet</span></div></a></li>
+ {#<li><a href="{{ site_url('comparison/gnunet') }}"><div class="menuitem"><span>GNUnet</span></div></a></li> #}
+ <li><a href="{{ site_url('comparison/other-networks') }}"><div class="menuitem"><span>{{ _('Other anonymous networks') }}</span></div></a></li>
</ul>
</li>
<li class="has-sub"><div class="menuitem"><span>{{ _('Verify I2P') }}</span></div>
@@ -34,7 +41,6 @@
</li>
<li class="has-sub"><div class="menuitem"><span>{{ _('Comparisons') }}</span></div>
<ul>
- <li><a href="{{ site_url('comparison') }}"><div class="menuitem"><span>{{ _('Overview of comparisons') }}</span></div></a></li>
<li><a href="{{ site_url('comparison/tor') }}"><div class="menuitem"><span>Tor</span></div></a></li>
<li><a href="{{ site_url('comparison/freenet') }}"><div class="menuitem"><span>Freenet</span></div></a></li>
{#<li><a href="{{ site_url('comparison/gnunet') }}"><div class="menuitem"><span>GNUnet</span></div></a></li> #}
@@ -44,15 +50,28 @@
<li><a href="{{ site_url('contact') }}"><div class="menuitem"><span>{{ _('Contact us') }}</span></div></a></li>
</ul>
</li>
- <li><a href="{{ site_url('get-involved') }}"><div class="menuitem"><span>{{ _('Get involved!') }}</span></div></a></li>
- <li class="has-sub"><div class="menuitem"><span>{{ _('People') }}</span></div>
+ <li class="has-sub"><div class="menuitem"><span>{{ _('Contributor Guides') }}</span></div>
<ul>
- <li><a href="{{ site_url('about/team') }}"><div class="menuitem"><span>{{ _('Team') }}</span></div></a></li>
- <li><a href="{{ site_url('about/hall-of-fame') }}"><div class="menuitem"><span>{{ _('Hall of Fame') }}</span></div></a></li>
- <li><a href="{{ site_url('contact') }}"><div class="menuitem"><span>{{ _('Contact us') }}</span></div></a></li>
+ <li><a href="{{ site_url('get-involved') }}"><div class="menuitem"><span>{{ _('Get involved!') }}</span></div></a><li>
+ <li class="has-sub"><div class="menuitem"><span>{{ _('Develop Software') }}</span></div>
+ <ul>
+ <li><a href="{{ site_url('get-involved/guides/new-developers') }}"><div class="menuitem"><span>{{ _('New developers') }}</span></div></a></li>
+ <li><a href="{{ site_url('get-involved/guides/ides') }}"><div class="menuitem"><span>{{ _('Using an IDE with I2P') }}</span></div></a></li>
+ <li><a href="{{ site_url('get-involved/guides/dev-guidelines') }}"><div class="menuitem"><span>{{ _('Developer guidelines and coding style') }}</span></div></a></li>
+ <li><a href="{{ site_url('docs/applications/git') }}"><div class="menuitem"><span>{{ _('Git') }}</span></div></a></li>
+ <li><a href="{{ site_url('get-involved/guides/monotone') }}"><div class="menuitem"><span>{{ _('Monotone') }}</span></div></a></li>
+ </ul>
+ </li>
+ <li><a href="{{ site_url('get-involved/guides/new-translators') }}"><div class="menuitem"><span>{{ _('Translate I2P into more Languages') }}</span></div></a></li>
+ <li class="has-sub"><div class="menuitem"><span>{{ _('Hosting Services') }}</span></div>
+ <ul>
+ <li><a href="{{ site_url('docs/reseed') }}"><div class="menuitem"><span>{{ _('Reseed') }}</span></div></a></li>
+ <li><a href="{{ site_url('docs/applications/gitlab') }}"><div class="menuitem"><span>{{ _('GitLab') }}</span></div></a></li>
+ </ul>
+ </li>
</ul>
</li>
- <li><a href="{{ site_url('links') }}"><div class="menuitem"><span>{{ _('Links') }}</span></div></a></li>
+ <li><a href="{{ site_url('contact') }}"><div class="menuitem"><span>{{ _('Contact and Team') }}</span></div></a></li>
</ul>
<li><a href="{{ site_url('get-involved/donate') }}"><div class="menuitem"><span class="donateitem">{{ _('Donate') }}</span></div></a></li>
<li class="has-sub"><div class="menuitem"><span>{{ _('Community') }}</span></div>
@@ -134,17 +153,6 @@
</li>
<li><a href="{{ site_url('docs/naming') }}"><div class="menuitem"><span>{{ _('Naming and addressbook') }}</span></div></a></li>
<li><a href="{{ site_url('docs/plugins') }}"><div class="menuitem"><span>{{ _('Plugins') }}</span></div></a></li>
- <li><a href="{{ site_url('docs/reseed') }}"><div class="menuitem"><span>{{ _('Reseed') }}</span></div></a></li>
- </ul>
- </li>
- <li class="has-sub"><div class="menuitem"><span>{{ _('Guides') }}</span></div>
- <ul>
- <li><a href="{{ site_url('get-involved/guides/new-developers') }}"><div class="menuitem"><span>{{ _('New developers') }}</span></div></a></li>
- <li><a href="{{ site_url('get-involved/guides/ides') }}"><div class="menuitem"><span>{{ _('Using an IDE with I2P') }}</span></div></a></li>
- <li><a href="{{ site_url('get-involved/guides/dev-guidelines') }}"><div class="menuitem"><span>{{ _('Developer guidelines and coding style') }}</span></div></a></li>
- <li><a href="{{ site_url('docs/applications/git') }}"><div class="menuitem"><span>{{ _('Git') }}</span></div></a></li>
- <li><a href="{{ site_url('get-involved/guides/monotone') }}"><div class="menuitem"><span>{{ _('Monotone') }}</span></div></a></li>
- <li><a href="{{ site_url('get-involved/guides/new-translators') }}"><div class="menuitem"><span>{{ _('New translators') }}</span></div></a></li>
</ul>
</li>
<li class="has-sub"><div class="menuitem"><span>{{ _('API') }}</span></div>
@@ -174,6 +182,11 @@
<li><a href="http://{{ i2pconv('trac.i2p2.i2p') }}/"><div class="menuitem"><span>{{ _('Bug tracker') }}</span></div></a></li>
</ul>
</li>
+ <li class="has-sub"><div class="menuitem"><span>{{ _('People') }}</span></div>
+ <ul>
+ <li><a href="{{ site_url('contact') }}"><div class="menuitem"><span>{{ _('Contact us') }}</span></div></a></li>
+ </ul>
+ </li>
</ul>
</li>
<li><a href="{{ get_url('blog_index') }}"><div class="menuitem"><span>{{ _('Blog') }}</span></div></a></li>
diff --git a/i2p2www/pages/site/about/i2pcon/2015.html b/i2p2www/pages/site/about/i2pcon/2015.html
index 62770021d00d82c6b03a000b7da3cedf70fe2f90..12caaa57f8dcce811774ea26ff472c71c2eeecd3 100644
--- a/i2p2www/pages/site/about/i2pcon/2015.html
+++ b/i2p2www/pages/site/about/i2pcon/2015.html
@@ -42,7 +42,7 @@ Slides are also available as an in-I2P torrent.
Note: Video links will be posted as they become available.
{%- endtrans %}
<p>{% trans -%}
-Note that in-I2P torrents may also be available on the clearnet due to bridging by Vuze clients.
+Note that in-I2P torrents may also be available on the non-private internet due to bridging by Vuze clients.
{%- endtrans %}
</p>
@@ -172,11 +172,11 @@ Zzz is an I2P developer.
<td>Introduction</td>
<td>zzz, Nicholas D., J</td>
<td align="center"><a href="magnet:?xt=urn:btih:6843adf1dd0c2b3902806d81b225932f17fb6780&dn=20150815_01Intro_I2PCon.mp4&tr=http://tracker2.postman.i2p/announce.php">I2P magnet link</a><br />
- <a href="magnet:?xt=urn:btih:6843adf1dd0c2b3902806d81b225932f17fb6780&dn=20150815_01Intro_I2PCon.mp4&tr=udp%3A%2F%2Ftracker.internetwarriors.net%3A1337&tr=udp%3A%2F%2Ftracker.blackunicorn.xyz%3A6969&tr=udp%3A%2F%2Ftracker.coppersurfer.tk%3A6969&tr=udp%3A%2F%2Ftracker.leechers-paradise.org%3A6969&tr=udp%3A%2F%2Fopen.demonii.com%3A1337">Clearnet magnet link</a><br />(339MB)
+ <a href="magnet:?xt=urn:btih:6843adf1dd0c2b3902806d81b225932f17fb6780&dn=20150815_01Intro_I2PCon.mp4&tr=udp%3A%2F%2Ftracker.internetwarriors.net%3A1337&tr=udp%3A%2F%2Ftracker.blackunicorn.xyz%3A6969&tr=udp%3A%2F%2Ftracker.coppersurfer.tk%3A6969&tr=udp%3A%2F%2Ftracker.leechers-paradise.org%3A6969&tr=udp%3A%2F%2Fopen.demonii.com%3A1337">Non-private internet magnet link</a><br />(339MB)
<br><a href="https://www.youtube.com/watch?v=heX8BD-J40U">YouTube</a></td>
</td>
<td align="center"><a href="magnet:?xt=urn:btih:5f0396645c3588252ac1e0adfd11eca5da96a1f8&dn=20150815_01Intro_I2PCon480p.mp4&tr=http://tracker2.postman.i2p/announce.php">I2P magnet link</a><br />
- <a href="magnet:?xt=urn:btih:5f0396645c3588252ac1e0adfd11eca5da96a1f8&dn=20150815_01Intro_I2PCon480p.mp4magnet:?xt=urn:btih:e16f0835c5468cfc5dc8142daa6b90cac7847845&dn=20150815_04PanelDiscussion_I2PCon480p.mp4&tr=udp%3A%2F%2Ftracker.internetwarriors.net%3A1337&tr=udp%3A%2F%2Ftracker.blackunicorn.xyz%3A6969&tr=udp%3A%2F%2Ftracker.coppersurfer.tk%3A6969&tr=udp%3A%2F%2Ftracker.leechers-paradise.org%3A6969&tr=udp%3A%2F%2Fopen.demonii.com%3A1337">Clearnet magnet link</a><br />(125MB)
+ <a href="magnet:?xt=urn:btih:5f0396645c3588252ac1e0adfd11eca5da96a1f8&dn=20150815_01Intro_I2PCon480p.mp4magnet:?xt=urn:btih:e16f0835c5468cfc5dc8142daa6b90cac7847845&dn=20150815_04PanelDiscussion_I2PCon480p.mp4&tr=udp%3A%2F%2Ftracker.internetwarriors.net%3A1337&tr=udp%3A%2F%2Ftracker.blackunicorn.xyz%3A6969&tr=udp%3A%2F%2Ftracker.coppersurfer.tk%3A6969&tr=udp%3A%2F%2Ftracker.leechers-paradise.org%3A6969&tr=udp%3A%2F%2Fopen.demonii.com%3A1337">Non-private internet magnet link</a><br />(125MB)
</td>
<td align="center"><a href="https://download.i2p2.de/media/i2pcon/2015/slides/I2PCon-2015-zzz-Intro.pdf">pdf</a></td>
<td align="center"><a href="https://download.i2p2.de/media/i2pcon/2015/slides/I2PCon-2015-zzz-Intro.odp">odp</a></td>
@@ -185,11 +185,11 @@ Zzz is an I2P developer.
<td>TOS and PII - What happens to your data when the company gets bought and sold?</td>
<td>Nicholas Johnston</td>
<td align="center"><a href="magnet:?xt=urn:btih:8f5cc016a7674e0ce48deec50bc9dc8f7d45a04b&dn=20150815_02NickJohnston_TOSvsPII_I2PCon.mp4&tr=http://tracker2.postman.i2p/announce.php">I2P magnet link</a><br />
- <a href="magnet:?xt=urn:btih:8f5cc016a7674e0ce48deec50bc9dc8f7d45a04b&dn=20150815_02NickJohnston_TOSvsPII_I2PCon.mp4&tr=udp%3A%2F%2Ftracker.internetwarriors.net%3A1337&tr=udp%3A%2F%2Ftracker.blackunicorn.xyz%3A6969&tr=udp%3A%2F%2Ftracker.coppersurfer.tk%3A6969&tr=udp%3A%2F%2Ftracker.leechers-paradise.org%3A6969&tr=udp%3A%2F%2Fopen.demonii.com%3A1337">Clearnet magnet link</a><br />(659MB)
+ <a href="magnet:?xt=urn:btih:8f5cc016a7674e0ce48deec50bc9dc8f7d45a04b&dn=20150815_02NickJohnston_TOSvsPII_I2PCon.mp4&tr=udp%3A%2F%2Ftracker.internetwarriors.net%3A1337&tr=udp%3A%2F%2Ftracker.blackunicorn.xyz%3A6969&tr=udp%3A%2F%2Ftracker.coppersurfer.tk%3A6969&tr=udp%3A%2F%2Ftracker.leechers-paradise.org%3A6969&tr=udp%3A%2F%2Fopen.demonii.com%3A1337">Non-private internet magnet link</a><br />(659MB)
<br><a href="https://www.youtube.com/watch?v=akrTXTCSX88">YouTube</a>
</td>
<td align="center"><a href="magnet:?xt=urn:btih:a4975953d9c231facbd3c736677243d4f24c812e&dn=20150815_02NickJohnston_TOSvsPII_I2PCon480p.mp4&tr=http://tracker2.postman.i2p/announce.php">I2P magnet link</a><br />
- <a href="magnet:?xt=urn:btih:a4975953d9c231facbd3c736677243d4f24c812e&dn=20150815_02NickJohnston_TOSvsPII_I2PCon480p.mp4&tr=udp%3A%2F%2Ftracker.internetwarriors.net%3A1337&tr=udp%3A%2F%2Ftracker.blackunicorn.xyz%3A6969&tr=udp%3A%2F%2Ftracker.coppersurfer.tk%3A6969&tr=udp%3A%2F%2Ftracker.leechers-paradise.org%3A6969&tr=udp%3A%2F%2Fopen.demonii.com%3A1337">Clearnet magnet link</a><br />(202MB)
+ <a href="magnet:?xt=urn:btih:a4975953d9c231facbd3c736677243d4f24c812e&dn=20150815_02NickJohnston_TOSvsPII_I2PCon480p.mp4&tr=udp%3A%2F%2Ftracker.internetwarriors.net%3A1337&tr=udp%3A%2F%2Ftracker.blackunicorn.xyz%3A6969&tr=udp%3A%2F%2Ftracker.coppersurfer.tk%3A6969&tr=udp%3A%2F%2Ftracker.leechers-paradise.org%3A6969&tr=udp%3A%2F%2Fopen.demonii.com%3A1337">Non-private internet magnet link</a><br />(202MB)
</td>
<td align="center"><a href="https://download.i2p2.de/media/i2pcon/2015/slides/I2PCon-2015-NickJohnston-WebsiteTOSvsYourPII.pdf">pdf</a></td>
<td align="center">--</td>
@@ -198,11 +198,11 @@ Zzz is an I2P developer.
<td>Growing the Network, Spreading the Word</td>
<td>zzz</td>
<td align="center"><a href="magnet:?xt=urn:btih:636fc73ad9d340fae440050a9b972bbab84e0133&dn=20150815_03zzz_GrowingNetworkSpreadingWord_I2PCon.mp4&tr=http://tracker2.postman.i2p/announce.php">I2P magnet link</a><br />
- <a href="magnet:?xt=urn:btih:636fc73ad9d340fae440050a9b972bbab84e0133&dn=20150815_03zzz_GrowingNetworkSpreadingWord_I2PCon.mp4&tr=udp%3A%2F%2Ftracker.internetwarriors.net%3A1337&tr=udp%3A%2F%2Ftracker.blackunicorn.xyz%3A6969&tr=udp%3A%2F%2Ftracker.coppersurfer.tk%3A6969&tr=udp%3A%2F%2Ftracker.leechers-paradise.org%3A6969&tr=udp%3A%2F%2Fopen.demonii.com%3A1337">Clearnet magnet link</a><br />(956MB)
+ <a href="magnet:?xt=urn:btih:636fc73ad9d340fae440050a9b972bbab84e0133&dn=20150815_03zzz_GrowingNetworkSpreadingWord_I2PCon.mp4&tr=udp%3A%2F%2Ftracker.internetwarriors.net%3A1337&tr=udp%3A%2F%2Ftracker.blackunicorn.xyz%3A6969&tr=udp%3A%2F%2Ftracker.coppersurfer.tk%3A6969&tr=udp%3A%2F%2Ftracker.leechers-paradise.org%3A6969&tr=udp%3A%2F%2Fopen.demonii.com%3A1337">Non-private internet magnet link</a><br />(956MB)
<br><a href="https://www.youtube.com/watch?v=2KbqgR3avqw">YouTube</a>
</td>
<td align="center"><a href="magnet:?xt=urn:btih:bc7408733e4a218eba633686aa80ea6eadef9e36&dn=20150815_03zzz_GrowingNetworkSpreadingWord_I2PCon480p.mp4&tr=http://tracker2.postman.i2p/announce.php">I2P magnet link</a><br />
- <a href="magnet:?xt=urn:btih:bc7408733e4a218eba633686aa80ea6eadef9e36&dn=20150815_03zzz_GrowingNetworkSpreadingWord_I2PCon480p.mp4&tr=udp%3A%2F%2Ftracker.internetwarriors.net%3A1337&tr=udp%3A%2F%2Ftracker.blackunicorn.xyz%3A6969&tr=udp%3A%2F%2Ftracker.coppersurfer.tk%3A6969&tr=udp%3A%2F%2Ftracker.leechers-paradise.org%3A6969&tr=udp%3A%2F%2Fopen.demonii.com%3A1337">Clearnet magnet link</a><br />(249MB)
+ <a href="magnet:?xt=urn:btih:bc7408733e4a218eba633686aa80ea6eadef9e36&dn=20150815_03zzz_GrowingNetworkSpreadingWord_I2PCon480p.mp4&tr=udp%3A%2F%2Ftracker.internetwarriors.net%3A1337&tr=udp%3A%2F%2Ftracker.blackunicorn.xyz%3A6969&tr=udp%3A%2F%2Ftracker.coppersurfer.tk%3A6969&tr=udp%3A%2F%2Ftracker.leechers-paradise.org%3A6969&tr=udp%3A%2F%2Fopen.demonii.com%3A1337">Non-private internet magnet link</a><br />(249MB)
</td>
<td align="center"><a href="https://download.i2p2.de/media/i2pcon/2015/slides/I2PCon-2015-zzz-GrowingTheNetwork.pdf">pdf</a></td>
<td align="center"><a href="https://download.i2p2.de/media/i2pcon/2015/slides/I2PCon-2015-zzz-GrowingTheNetwork.odp">odp</a></td>
@@ -211,11 +211,11 @@ Zzz is an I2P developer.
<td>Roundtable Discussion</td>
<td>Colin, David Dagon, Nicholas Johnston, zzz</td>
<td align="center"><a href="magnet:?xt=urn:btih:eb77820d2b201ace227b181e18b9e626457256bd&dn=20150815_04PanelDiscussion_I2PCon.mp4&tr=http://tracker2.postman.i2p/announce.php">I2P magnet link</a><br />
- <a href="magnet:?xt=urn:btih:eb77820d2b201ace227b181e18b9e626457256bd&dn=20150815_04PanelDiscussion_I2PCon.mp4&tr=udp%3A%2F%2Ftracker.internetwarriors.net%3A1337&tr=udp%3A%2F%2Ftracker.blackunicorn.xyz%3A6969&tr=udp%3A%2F%2Ftracker.coppersurfer.tk%3A6969&tr=udp%3A%2F%2Ftracker.leechers-paradise.org%3A6969&tr=udp%3A%2F%2Fopen.demonii.com%3A1337">Clearnet magnet link</a><br />(995MB)
+ <a href="magnet:?xt=urn:btih:eb77820d2b201ace227b181e18b9e626457256bd&dn=20150815_04PanelDiscussion_I2PCon.mp4&tr=udp%3A%2F%2Ftracker.internetwarriors.net%3A1337&tr=udp%3A%2F%2Ftracker.blackunicorn.xyz%3A6969&tr=udp%3A%2F%2Ftracker.coppersurfer.tk%3A6969&tr=udp%3A%2F%2Ftracker.leechers-paradise.org%3A6969&tr=udp%3A%2F%2Fopen.demonii.com%3A1337">Non-private internet magnet link</a><br />(995MB)
<br><a href="https://www.youtube.com/watch?v=iR1T43HFc5I">YouTube</a>
</td>
<td align="center"><a href="magnet:?xt=urn:btih:e16f0835c5468cfc5dc8142daa6b90cac7847845&dn=20150815_04PanelDiscussion_I2PCon480p.mp4&tr=http://tracker2.postman.i2p/announce.php">I2P magnet link</a><br />
- <a href="magnet:?xt=urn:btih:e16f0835c5468cfc5dc8142daa6b90cac7847845&dn=20150815_04PanelDiscussion_I2PCon480p.mp4&tr=udp%3A%2F%2Ftracker.internetwarriors.net%3A1337&tr=udp%3A%2F%2Ftracker.blackunicorn.xyz%3A6969&tr=udp%3A%2F%2Ftracker.coppersurfer.tk%3A6969&tr=udp%3A%2F%2Ftracker.leechers-paradise.org%3A6969&tr=udp%3A%2F%2Fopen.demonii.com%3A1337">Clearnet magnet link</a><br />(261MB)
+ <a href="magnet:?xt=urn:btih:e16f0835c5468cfc5dc8142daa6b90cac7847845&dn=20150815_04PanelDiscussion_I2PCon480p.mp4&tr=udp%3A%2F%2Ftracker.internetwarriors.net%3A1337&tr=udp%3A%2F%2Ftracker.blackunicorn.xyz%3A6969&tr=udp%3A%2F%2Ftracker.coppersurfer.tk%3A6969&tr=udp%3A%2F%2Ftracker.leechers-paradise.org%3A6969&tr=udp%3A%2F%2Fopen.demonii.com%3A1337">Non-private internet magnet link</a><br />(261MB)
</td>
<td align="center">--</td>
<td align="center">--</td>
@@ -251,11 +251,11 @@ Zzz is an I2P developer.
<td>I2P Monitoring and Filtration</td>
<td>David Dagon</td>
<td align="center"><a href="magnet:?xt=urn:btih:2acbaca3fbdb61ff604ba518bb8583188308e4c9&dn=20150816_05DavidDagon_I2PMonitoringFiltration_I2PCon.mp4&tr=http://tracker2.postman.i2p/announce.php">I2P magnet link</a><br />
- <a href="magnet:?xt=urn:btih:2acbaca3fbdb61ff604ba518bb8583188308e4c9&dn=20150816_05DavidDagon_I2PMonitoringFiltration_I2PCon.mp4&tr=udp%3A%2F%2Ftracker.internetwarriors.net%3A1337&tr=udp%3A%2F%2Ftracker.blackunicorn.xyz%3A6969&tr=udp%3A%2F%2Ftracker.coppersurfer.tk%3A6969&tr=udp%3A%2F%2Ftracker.leechers-paradise.org%3A6969&tr=udp%3A%2F%2Fopen.demonii.com%3A1337">Clearnet magnet link</a><br />(885MB)
+ <a href="magnet:?xt=urn:btih:2acbaca3fbdb61ff604ba518bb8583188308e4c9&dn=20150816_05DavidDagon_I2PMonitoringFiltration_I2PCon.mp4&tr=udp%3A%2F%2Ftracker.internetwarriors.net%3A1337&tr=udp%3A%2F%2Ftracker.blackunicorn.xyz%3A6969&tr=udp%3A%2F%2Ftracker.coppersurfer.tk%3A6969&tr=udp%3A%2F%2Ftracker.leechers-paradise.org%3A6969&tr=udp%3A%2F%2Fopen.demonii.com%3A1337">Non-private internet magnet link</a><br />(885MB)
<br><a href="https://www.youtube.com/watch?v=MmBvWbzPwNc">YouTube</a>
</td>
<td align="center"><a href="magnet:?xt=urn:btih:f92d674c1c34ceaca1ca6c9b309a82894acdb661&dn=20150816_05I2PMonitoringFiltration_I2PCon_480p.mp4&tr=http://tracker2.postman.i2p/announce.php">I2P magnet link</a><br />
- <a href="magnet:?xt=urn:btih:f92d674c1c34ceaca1ca6c9b309a82894acdb661&dn=20150816_05I2PMonitoringFiltration_I2PCon_480p.mp4&tr=udp%3A%2F%2Ftracker.internetwarriors.net%3A1337&tr=udp%3A%2F%2Ftracker.blackunicorn.xyz%3A6969&tr=udp%3A%2F%2Ftracker.coppersurfer.tk%3A6969&tr=udp%3A%2F%2Ftracker.leechers-paradise.org%3A6969&tr=udp%3A%2F%2Fopen.demonii.com%3A1337">Clearnet magnet link</a><br />(307MB)
+ <a href="magnet:?xt=urn:btih:f92d674c1c34ceaca1ca6c9b309a82894acdb661&dn=20150816_05I2PMonitoringFiltration_I2PCon_480p.mp4&tr=udp%3A%2F%2Ftracker.internetwarriors.net%3A1337&tr=udp%3A%2F%2Ftracker.blackunicorn.xyz%3A6969&tr=udp%3A%2F%2Ftracker.coppersurfer.tk%3A6969&tr=udp%3A%2F%2Ftracker.leechers-paradise.org%3A6969&tr=udp%3A%2F%2Fopen.demonii.com%3A1337">Non-private internet magnet link</a><br />(307MB)
</td>
<td align="center"><a href="https://download.i2p2.de/media/i2pcon/2015/slides/I2PCon-2015-dagon-MonitoringAndFiltration.pdf">pdf</a></td>
<td align="center">--</td>
@@ -264,10 +264,10 @@ Zzz is an I2P developer.
<td>The Connection Limit Challenge</td>
<td>zzz</td>
<td align="center"><a href="magnet:?xt=urn:btih:d39247352a6e48688e8fe484518545031b9cc36a&dn=20150816_06ConnectionLimitChallenge_I2PCon.mp4&tr=http://tracker2.postman.i2p/announce.php">I2P magnet link</a><br />
- <a href="magnet:?xt=urn:btih:d39247352a6e48688e8fe484518545031b9cc36a&dn=20150816_06ConnectionLimitChallenge_I2PCon.mp4&tr=udp%3A%2F%2Ftracker.internetwarriors.net%3A1337&tr=udp%3A%2F%2Ftracker.blackunicorn.xyz%3A6969&tr=udp%3A%2F%2Ftracker.coppersurfer.tk%3A6969&tr=udp%3A%2F%2Ftracker.leechers-paradise.org%3A6969&tr=udp%3A%2F%2Fopen.demonii.com%3A1337">Clearnet magnet link</a><br />(722MB)
+ <a href="magnet:?xt=urn:btih:d39247352a6e48688e8fe484518545031b9cc36a&dn=20150816_06ConnectionLimitChallenge_I2PCon.mp4&tr=udp%3A%2F%2Ftracker.internetwarriors.net%3A1337&tr=udp%3A%2F%2Ftracker.blackunicorn.xyz%3A6969&tr=udp%3A%2F%2Ftracker.coppersurfer.tk%3A6969&tr=udp%3A%2F%2Ftracker.leechers-paradise.org%3A6969&tr=udp%3A%2F%2Fopen.demonii.com%3A1337">Non-private internet magnet link</a><br />(722MB)
<br><a href="https://www.youtube.com/watch?v=qlbpYWG2ZhU">YouTube</a></td>
<td align="center"><a href="magnet:?xt=urn:btih:ac79089ef2bd7dcf34dc0549ac8e16261996f584&dn=20150816_06ConnectionLimitChallenge_I2PCon_480p.mp4&tr=http://tracker2.postman.i2p/announce.php">I2P magnet link</a><br />
- <a href="magnet:?xt=urn:btih:ac79089ef2bd7dcf34dc0549ac8e16261996f584&dn=20150816_06ConnectionLimitChallenge_I2PCon_480p.mp4&tr=udp%3A%2F%2Ftracker.internetwarriors.net%3A1337&tr=udp%3A%2F%2Ftracker.blackunicorn.xyz%3A6969&tr=udp%3A%2F%2Ftracker.coppersurfer.tk%3A6969&tr=udp%3A%2F%2Ftracker.leechers-paradise.org%3A6969&tr=udp%3A%2F%2Fopen.demonii.com%3A1337">Clearnet magnet link</a><br />(265MB)
+ <a href="magnet:?xt=urn:btih:ac79089ef2bd7dcf34dc0549ac8e16261996f584&dn=20150816_06ConnectionLimitChallenge_I2PCon_480p.mp4&tr=udp%3A%2F%2Ftracker.internetwarriors.net%3A1337&tr=udp%3A%2F%2Ftracker.blackunicorn.xyz%3A6969&tr=udp%3A%2F%2Ftracker.coppersurfer.tk%3A6969&tr=udp%3A%2F%2Ftracker.leechers-paradise.org%3A6969&tr=udp%3A%2F%2Fopen.demonii.com%3A1337">Non-private internet magnet link</a><br />(265MB)
</td>
<td align="center"><a href="https://download.i2p2.de/media/i2pcon/2015/slides/I2PCon-2015-zzz-ConnectionLimitChallenge.pdf">pdf</a></td>
<td align="center"><a href="https://download.i2p2.de/media/i2pcon/2015/slides/I2PCon-2015-zzz-ConnectionLimitChallenge.odp">odp</a></td>
@@ -276,11 +276,11 @@ Zzz is an I2P developer.
<td>Hello from Lance</td>
<td>Lance James</td>
<td align="center"><a href="magnet:?xt=urn:btih:11b20b9d6f048845ae34e5b2414e2b6d600c4cc3&dn=20150816_07LanceJames_I2PCon.mp4&tr=http://tracker2.postman.i2p/announce.php">I2P magnet link</a><br />
- <a href="magnet:?xt=urn:btih:11b20b9d6f048845ae34e5b2414e2b6d600c4cc3&dn=20150816_07LanceJames_I2PCon.mp4&tr=udp%3A%2F%2Ftracker.internetwarriors.net%3A1337&tr=udp%3A%2F%2Ftracker.blackunicorn.xyz%3A6969&tr=udp%3A%2F%2Ftracker.coppersurfer.tk%3A6969&tr=udp%3A%2F%2Ftracker.leechers-paradise.org%3A6969&tr=udp%3A%2F%2Fopen.demonii.com%3A1337">Clearnet magnet link</a><br />(439MB)
+ <a href="magnet:?xt=urn:btih:11b20b9d6f048845ae34e5b2414e2b6d600c4cc3&dn=20150816_07LanceJames_I2PCon.mp4&tr=udp%3A%2F%2Ftracker.internetwarriors.net%3A1337&tr=udp%3A%2F%2Ftracker.blackunicorn.xyz%3A6969&tr=udp%3A%2F%2Ftracker.coppersurfer.tk%3A6969&tr=udp%3A%2F%2Ftracker.leechers-paradise.org%3A6969&tr=udp%3A%2F%2Fopen.demonii.com%3A1337">Non-private internet magnet link</a><br />(439MB)
<br><a href="https://www.youtube.com/watch?v=zHEE1d60a5Y">YouTube</a>
</td>
<td align="center"><a href="magnet:?xt=urn:btih:b7cb561231a7154bf0a7880cfdbff7ae4e69fb93&dn=20150816_07LanceJames_I2PCon_480p.mp4&tr=http://tracker2.postman.i2p/announce.php">I2P magnet link</a><br />
- <a href="magnet:?xt=urn:btih:b7cb561231a7154bf0a7880cfdbff7ae4e69fb93&dn=20150816_07LanceJames_I2PCon_480p.mp4&tr=udp%3A%2F%2Ftracker.internetwarriors.net%3A1337&tr=udp%3A%2F%2Ftracker.blackunicorn.xyz%3A6969&tr=udp%3A%2F%2Ftracker.coppersurfer.tk%3A6969&tr=udp%3A%2F%2Ftracker.leechers-paradise.org%3A6969&tr=udp%3A%2F%2Fopen.demonii.com%3A1337">Clearnet magnet link</a><br />(154MB)
+ <a href="magnet:?xt=urn:btih:b7cb561231a7154bf0a7880cfdbff7ae4e69fb93&dn=20150816_07LanceJames_I2PCon_480p.mp4&tr=udp%3A%2F%2Ftracker.internetwarriors.net%3A1337&tr=udp%3A%2F%2Ftracker.blackunicorn.xyz%3A6969&tr=udp%3A%2F%2Ftracker.coppersurfer.tk%3A6969&tr=udp%3A%2F%2Ftracker.leechers-paradise.org%3A6969&tr=udp%3A%2F%2Fopen.demonii.com%3A1337">Non-private internet magnet link</a><br />(154MB)
</td>
<td align="center">--</td>
<td align="center">--</td>
@@ -289,11 +289,11 @@ Zzz is an I2P developer.
<td>I2P Application Development Introduction</td>
<td>psi</td>
<td align="center"><a href="magnet:?xt=urn:btih:f189782f819a45150444a4505a95f7e8de2053a5&dn=20150816_08Psi_I2PAppDevIntro.mp4&tr=http://tracker2.postman.i2p/announce.php">I2P magnet link</a><br />
- <a href="magnet:?xt=urn:btih:f189782f819a45150444a4505a95f7e8de2053a5&dn=20150816_08Psi_I2PAppDevIntro.mp4magnet:?xt=urn:btih:6GEXQL4BTJCRKBCEURIFVFPX5DPCAU5F&dn=20150816_08Psi_I2PAppDevIntro.mp4&tr=udp%3A%2F%2Ftracker.internetwarriors.net%3A1337&tr=udp%3A%2F%2Ftracker.blackunicorn.xyz%3A6969&tr=udp%3A%2F%2Ftracker.coppersurfer.tk%3A6969&tr=udp%3A%2F%2Ftracker.leechers-paradise.org%3A6969&tr=udp%3A%2F%2Fopen.demonii.com%3A1337&net=I2P&net=Public">Clearnet magnet link</a><br />(314MB)
+ <a href="magnet:?xt=urn:btih:f189782f819a45150444a4505a95f7e8de2053a5&dn=20150816_08Psi_I2PAppDevIntro.mp4magnet:?xt=urn:btih:6GEXQL4BTJCRKBCEURIFVFPX5DPCAU5F&dn=20150816_08Psi_I2PAppDevIntro.mp4&tr=udp%3A%2F%2Ftracker.internetwarriors.net%3A1337&tr=udp%3A%2F%2Ftracker.blackunicorn.xyz%3A6969&tr=udp%3A%2F%2Ftracker.coppersurfer.tk%3A6969&tr=udp%3A%2F%2Ftracker.leechers-paradise.org%3A6969&tr=udp%3A%2F%2Fopen.demonii.com%3A1337&net=I2P&net=Public">Non-private internet magnet link</a><br />(314MB)
<br><a href="https://www.youtube.com/watch?v=YSsoX8IrI6I">YouTube</a>
</td>
<td align="center"><a href="magnet:?xt=urn:btih:c6d18a1ed3eefe07dd578ed4314e5af72ac4423d&dn=20150816_08Psi_I2PAppDevIntro_480p.mp4&tr=http://tracker2.postman.i2p/announce.php">I2P magnet link</a><br />
- <a href="magnet:?xt=urn:btih:c6d18a1ed3eefe07dd578ed4314e5af72ac4423d&dn=20150816_08Psi_I2PAppDevIntro_480p.mp4&tr=udp%3A%2F%2Ftracker.internetwarriors.net%3A1337&tr=udp%3A%2F%2Ftracker.blackunicorn.xyz%3A6969&tr=udp%3A%2F%2Ftracker.coppersurfer.tk%3A6969&tr=udp%3A%2F%2Ftracker.leechers-paradise.org%3A6969&tr=udp%3A%2F%2Fopen.demonii.com%3A1337">Clearnet magnet link</a><br />(108MB)
+ <a href="magnet:?xt=urn:btih:c6d18a1ed3eefe07dd578ed4314e5af72ac4423d&dn=20150816_08Psi_I2PAppDevIntro_480p.mp4&tr=udp%3A%2F%2Ftracker.internetwarriors.net%3A1337&tr=udp%3A%2F%2Ftracker.blackunicorn.xyz%3A6969&tr=udp%3A%2F%2Ftracker.coppersurfer.tk%3A6969&tr=udp%3A%2F%2Ftracker.leechers-paradise.org%3A6969&tr=udp%3A%2F%2Fopen.demonii.com%3A1337">Non-private internet magnet link</a><br />(108MB)
</td>
<td align="center"><a href="https://download.i2p2.de/media/i2pcon/2015/slides/I2PCon-2015-psi-AppDevIntro.pdf">pdf</a></td>
<td align="center">--</td>
@@ -302,11 +302,11 @@ Zzz is an I2P developer.
<td>The Agony and the Ecstasy of I2P on Android</td>
<td>str4d</td>
<td align="center"><a href="magnet:?xt=urn:btih:11e1973949bf4bba4ac766397250b96a9eda8c64&dn=20150816_09str4d_AgonyEcstasyofI2POnAndroid_I2PCon.mp4&tr=http://tracker2.postman.i2p/announce.php">I2P magnet link</a><br />
- <a href="magnet:?xt=urn:btih:11e1973949bf4bba4ac766397250b96a9eda8c64&dn=20150816_09str4d_AgonyEcstasyofI2POnAndroid_I2PCon.mp4&tr=udp%3A%2F%2Ftracker.internetwarriors.net%3A1337&tr=udp%3A%2F%2Ftracker.blackunicorn.xyz%3A6969&tr=udp%3A%2F%2Ftracker.coppersurfer.tk%3A6969&tr=udp%3A%2F%2Ftracker.leechers-paradise.org%3A6969&tr=udp%3A%2F%2Fopen.demonii.com%3A1337">Clearnet magnet link</a><br />(470MB)
+ <a href="magnet:?xt=urn:btih:11e1973949bf4bba4ac766397250b96a9eda8c64&dn=20150816_09str4d_AgonyEcstasyofI2POnAndroid_I2PCon.mp4&tr=udp%3A%2F%2Ftracker.internetwarriors.net%3A1337&tr=udp%3A%2F%2Ftracker.blackunicorn.xyz%3A6969&tr=udp%3A%2F%2Ftracker.coppersurfer.tk%3A6969&tr=udp%3A%2F%2Ftracker.leechers-paradise.org%3A6969&tr=udp%3A%2F%2Fopen.demonii.com%3A1337">Non-private internet magnet link</a><br />(470MB)
<br><a href="https://www.youtube.com/watch?v=wKa3T6tdNhQ">YouTube</a>
</td>
<td align="center"><a href="magnet:?xt=urn:btih:5314c5b181d1a85b7c4decb4b307fe1c9e5fdc54&dn=20150816_09str4d_AgonyEcstasyofI2POnAndroid_I2PCon_480p.mp4&tr=http://tracker2.postman.i2p/announce.php">I2P magnet link</a><br />
- <a href="magnet:?xt=urn:btih:5314c5b181d1a85b7c4decb4b307fe1c9e5fdc54&dn=20150816_09str4d_AgonyEcstasyofI2POnAndroid_I2PCon_480p.mp4&tr=udp%3A%2F%2Ftracker.internetwarriors.net%3A1337&tr=udp%3A%2F%2Ftracker.blackunicorn.xyz%3A6969&tr=udp%3A%2F%2Ftracker.coppersurfer.tk%3A6969&tr=udp%3A%2F%2Ftracker.leechers-paradise.org%3A6969&tr=udp%3A%2F%2Fopen.demonii.com%3A1337">Clearnet magnet link</a><br />(156MB)
+ <a href="magnet:?xt=urn:btih:5314c5b181d1a85b7c4decb4b307fe1c9e5fdc54&dn=20150816_09str4d_AgonyEcstasyofI2POnAndroid_I2PCon_480p.mp4&tr=udp%3A%2F%2Ftracker.internetwarriors.net%3A1337&tr=udp%3A%2F%2Ftracker.blackunicorn.xyz%3A6969&tr=udp%3A%2F%2Ftracker.coppersurfer.tk%3A6969&tr=udp%3A%2F%2Ftracker.leechers-paradise.org%3A6969&tr=udp%3A%2F%2Fopen.demonii.com%3A1337">Non-private internet magnet link</a><br />(156MB)
</td>
<td align="center"><a href="https://download.i2p2.de/media/i2pcon/2015/slides/I2PCon-2015-str4d-Android.pdf">pdf</a></td>
<td align="center"><a href="https://download.i2p2.de/media/i2pcon/2015/slides/I2PCon-2015-str4d-Android.odp">odp</a></td>
diff --git a/i2p2www/pages/site/about/intro.html b/i2p2www/pages/site/about/intro.html
index 9174753f1ba483276f5a44c5b453d9cd0d942877..e1ba3d988fccc5928531046c8865f3f3680edabe 100644
--- a/i2p2www/pages/site/about/intro.html
+++ b/i2p2www/pages/site/about/intro.html
@@ -6,20 +6,16 @@
<p>{% trans %}The Invisible Internet Project (I2P) is a fully encrypted private network layer that has been developed with privacy and security by design in order to provide protection for your activity,
location and your identity. The software ships with a router that connects you to the network and applications for sharing, communicating and building. {%- endtrans %}</p>
-<h3>I2P Cares About Privacy</h3>
+<h3>{% trans -%}I2P Cares About Privacy{%- endtrans %}</h3>
-<p>{% trans %}The Invisible Internet values privacy and consent, which can only be achieved with privacy-by-default. It is always your choice to share, your platform to own, and the connections you want to make. It is privacy by design, plain, simple and truly free. Additionally I2P offers resistance to pattern recognition and blocking by censors. Because the network relies on peers to route traffic, location blocking is also reduced.{%- endtrans %}</p>
-
-
-<p>{% trans %}I2P hides the server from the user and the user from the server. All I2P traffic is internal to the I2P network. Traffic inside I2P does not interact with the Internet directly. It is a layer on top of the Internet. It uses encrypted unidirectional tunnels between you and your peers. No one can see where traffic is coming from, where it is going or what the contents are.
+<p>{% trans %}I2P hides the server from the user and the user from the server. All I2P traffic is internal to the I2P network. Traffic inside I2P does not interact with the Internet directly. It is a layer on top of the Internet. It uses encrypted unidirectional tunnels between you and your peers. No one can see where traffic is coming from, where it is going, or what the contents are. Additionally I2P offers resistance to pattern recognition and blocking by censors. Because the network relies on peers to route traffic, location blocking is also reduced.
{%- endtrans %}</p>
-<h3>How to Connect to the I2P Network</h3>
+<h3>{% trans -%}How to Connect to the I2P Network{%- endtrans %}</h3>
-<p>{% trans %}The Invisible Internet Project provides software to download that connects you to the network.In addition to the network privacy benefits, I2P provides an application layer that allows people to use and create familiar apps for daily use. I2P provides its own unique DNS so that you can self host or mirror content on the network. You can create and own your platform that you can add to the I2P directory or only invite your friends. The I2P network functions in the same way the Internet does, just with some extra configuration. The best part is that if you do not find something you want, you can build it. When you download the I2P software, it includes everything you need to connect, share, and create privately.
-{%- endtrans %}</p>
+<p>{% trans %}The Invisible Internet Project provides software to download that connects you to the network. In addition to the network privacy benefits, I2P provides an application layer that allows people to use and create familiar apps for daily use. I2P provides its own unique DNS so that you can self host or mirror content on the network. You can create and own your own platform that you can add to the I2P directory or only invite your friends. The I2P network functions the same way the Internet does. When you download the I2P software, it includes everything you need to connect, share, and create privately.{%- endtrans %}</p>
-<h3>An Overview of the Network</h3>
+<h3>{% trans -%}An Overview of the Network{%- endtrans %}</h3>
<p>{% trans %}I2P uses cryptography to achieve a variety of properties for the tunnels it builds and the communications it transports. I2P tunnels use transports, NTCP2 and SSU, to hide the nature of the traffic being transported over it. Connections are encrypted from router-to-router, and from client-to-client(end-to-end). Forward-secrecy is provided for all connections. Because I2P is cryptographically addressed, I2P addresses are self-authenticating and only belong to the user who generated them.
{%- endtrans %}</p>
@@ -27,16 +23,47 @@ location and your identity. The software ships with a router that connects you
<p>{% trans %}I2P is a secure and traffic protecting Internet-like layer. The network is made up of peers ("routers") and unidirectional inbound and outbound virtual tunnels. Routers communicate with each other using protocols built on existing transport mechanisms (TCP, UDP, etc), passing messages. Client applications have their own cryptographic identifier ("Destination") which enables it to send and receive messages. These clients can connect to any router and authorize the temporary allocation ("lease") of some tunnels that will be used for sending and receiving messages through the network. I2P has its own internal network database (using a modification of the Kademlia DHT) for distributing routing and contact information securely.
{%- endtrans %}</p>
-<h3>About Decentralization and I2P</h3>
+<h3>{% trans -%}About Decentralization and I2P{%- endtrans %}</h3>
<p>{% trans %}The I2P network is almost completely decentralized, with exception to what are what are called "Reseed Servers," which is how you first join the network. This is to deal with the DHT ( Distributed Hash Table ) bootstrap problem. Basically, there's not a good and reliable way to get out of running at least one permanent bootstrap node that non-network users can find to get started. Once you're connected to the network, you only discover peers by building "exploratory" tunnels, but to make your initial connection, you need to get a peer set from somewhere. The reseed servers, which you can see listed on http://127.0.0.1:7657/configreseed in the Java I2P router, provide you with those peers. You then connect to them with the I2P router until you find one who you can reach and build exploratory tunnels through. Reseed servers can tell that you bootstrapped from them, but nothing else about your traffic on the I2P network.{%- endtrans %}</p>
-<h3>I see IP addresses of all other I2P nodes in the router console. Does that mean my IP address is visible by others?</h3>
+<h3>{% trans -%}I see IP addresses of all other I2P nodes in the router console. Does that mean my IP address is visible by others?{%- endtrans %}</h3>
<p>{% trans %}Yes, this is how a fully distributed peer-to-peer network works. Every node participates in routing packets for others, so your IP address must be known to establish connections. While the fact that your computer runs I2P is public, nobody can see your activities in it. You can't say if a user behind this IP address is sharing files, hosting a website, doing research or just running a node to contribute bandwidth to the project.{%- endtrans %}
-<h3>What I2P Does Not Do</h3>
+<h3>{% trans -%}What I2P Does Not Do{%- endtrans %}</h3>
<p>{% trans %}The I2P network does not officially "Exit" traffic. It has outproxies to the Internet run by volunteers, which are centralized services. I2P is primarily a hidden service network and outproxying is not an official function, nor is it advised. The privacy benefits you get from participating in the the I2P network come from remaining in the network and not accessing the internet. I2P recommends that you use Tor Browser or a trusted VPN when you want to browse the Internet privately.{%- endtrans %}</p>
+<h3>{% trans -%}Comparisons{%- endtrans %}</h3>
+
+<p>{% trans -%}
+There are a great many other applications and projects working on anonymous
+communication and I2P has been inspired by much of their efforts. This is not
+a comprehensive list of anonymity resources - both freehaven's
+<a href="http://freehaven.net/anonbib/topic.html">Anonymity Bibliography</a>
+and GNUnet's <a href="https://www.gnunet.org/links/">related projects</a>
+serve that purpose well. That said, a few systems stand out for further
+comparison. The following have individual comparison pages:
+{%- endtrans %}</p>
+
+<ul>
+ <li><a href="{{ site_url('comparison/tor') }}">Tor / Onion Routing</a></li>
+ <li><a href="{{ site_url('comparison/freenet') }}">Freenet</a></li>
+ {#<li><a href="{{ site_url('comparison/gnunet') }}">GNUnet</a></li>#}
+</ul>
+
+<p>{% trans othernetworks=site_url('comparison/other-networks') -%}
+The following are discussed on the <a href="{{ othernetworks }}">other networks page:</a>
+{%- endtrans %}</p>
+
+<ul>
+ <li>RetroShare</li>
+ <li>Morphmix / Tarzan</li>
+ <li>Mixminion / Mixmaster</li>
+ <li>JAP</li>
+ <li>MUTE / AntsP2P</li>
+ <li>Haystack</li>
+</ul>
+
{% endblock %}
diff --git a/i2p2www/pages/site/about/software.html b/i2p2www/pages/site/about/software.html
index 95c4cbdcdf8a5322c4e3088e026a238e8c2e10aa..17f82368bfbb71b97d3bfd0f8cf19baf6d4fdbde 100644
--- a/i2p2www/pages/site/about/software.html
+++ b/i2p2www/pages/site/about/software.html
@@ -6,7 +6,7 @@
<p>{% trans %}When you install the I2P software made available at geti2p.net, you are
actually installing an I2P router and an accompanying bundle of basic
applications. The I2P Java distribution is the first I2P software gateway and
-has been actively developed since 2001.{%- endtrans %}</p>
+has been actively developed since 2003.{%- endtrans %}</p>
<p>{% trans %}The applications are made available through a webUI, which listens at
127.0.0.1:7657, and the main page of which is called the “Router Console,â€
where you monitor the health of your connection to the network and access
diff --git a/i2p2www/pages/site/about/team.html b/i2p2www/pages/site/about/team.html
index 6fdbbd942e0821988eebf7158f663de0c4dbf95b..2e1a94d8f55d2eb6d62b466f9fc9c9a719568231 100644
--- a/i2p2www/pages/site/about/team.html
+++ b/i2p2www/pages/site/about/team.html
@@ -200,7 +200,7 @@ network.
</tr>
<tr>
<td valign="top"><b>{{ _('Console') }}</b></td>
- <td valign="top" class="blue">[{{ _('vacant') }}]</td>
+ <td valign="top">[{{ _('IDK/Sadie') }}]</td>
<td valign="top"><i>{{ _('Router console HTML/CSS design') }}</i></td>
</tr>
<tr>
@@ -392,5 +392,8 @@ network.
<tr>
<td valign="top" colspan="2">{% trans %}… and many others{% endtrans %}</td>
</tr>
+<tr>
+ <td><a href="site_url(about/hall-of-fame)">Hall of Fame!</a></td>
+</tr>
</table>
{% endblock %}
diff --git a/i2p2www/pages/site/browser/_front.html b/i2p2www/pages/site/browser/_front.html
deleted file mode 100644
index 847d9712a5a18b091cc1f1bac3396f0b3136fd0a..0000000000000000000000000000000000000000
--- a/i2p2www/pages/site/browser/_front.html
+++ /dev/null
@@ -1,112 +0,0 @@
-{% extends "global/layout.html" %}
-{% block title %}{% trans bname=browser_name(), bsuff=browser_postname()%}{{ bname }} {{ bsuff }} {% endtrans %}{% endblock %}
-{% block content_nav %}
-<ol>
-<li style="list-style: none; display: inline">
-<h4>{{ _('Navigation') }}</h4>
-</li>
-<li style="list-style: none;">{% trans intro=get_url('browser_intro') %}<a href="{{ intro }}">About</a>{% endtrans %}</li>
-<li style="list-style: none;">{% trans download=get_url('browser_download') %}<a href="{{ download }}">Download</a>{% endtrans %}</li>
-<!--<li style="list-style: none;">{% trans troubleshooting=get_url('browser_troubleshooting') %}<a href="{{ troubleshooting }}">Troubleshooting</a>{% endtrans %}</li>-->
-<!--<li style="list-style: none;">{% trans known_issues=get_url('browser_known_issues') %}<a href="{{ known_issues }}">Known Issues</a>{% endtrans %}</li>-->
-<li style="list-style: none;">{% trans releasenotes=get_url('browser_releasenotes') %}<a href="{{ releasenotes }}">Release Notes</a>{% endtrans %}</li>
-<li style="list-style: none;">{% trans roadmap=get_url('browser_roadmap') %}<a href="{{ roadmap }}">Road Map</a>{% endtrans %}</li>
-<li style="list-style: none;">{% trans develop=get_url('browser_develop') %}<a href="{{ develop }}">Get Involved</a>{% endtrans %}</li>
-<li style="list-style: none;">{% trans donate=site_url('get-involved/donate') %}<a href="{{ donate }}">Donate</a>{% endtrans %}</li>
-
-</ol>
-{% endblock %}
-
-
-{% macro browser_download(name, icon, dlink) -%}
-<div class="browser-front-download">
- <div class="download-details">
- <!--<img class="browser-clip-circle" src="{{ url_for('static', filename=icon) }}" alt="{{ name }}" title="{{ name }}" />-->
- <a class="get-i2p-browser" href="{{ dlink }}">{{ caller() }}</a>
-
- {% trans download=get_url('browser_download'), bname=browser_name() %}<a href="{{ download }}">Click here to download {{ bname }} in another language or platform</a>{% endtrans %}
- </div>
-</div>
-{%- endmacro %}
-
-
-{% block content %}
-<section class="browser-front-wrapper">
- <h1>{% trans bname=browser_name(), bsuff=browser_postname()%}{{ bname }} {{ bsuff }}{% endtrans %}</h1>
-</section>
-
-<section class="browser-onboarding">
- <div class="row">
- <div class="row-image">
- <img src="{{ url_for('static', filename='images/browser/routing.svg') }}" />
- </div>
- <div class="row-text">
- <h4>{% trans bname=browser_name() %} {{ bname }} {% endtrans %}</h4>
- <p>
- <strong>{% trans bname=browser_name(), bsuff=browser_postname() %}{{ bname }} {{ bsuff }} is on hiatus for the
- next six months.</strong> I2P Browser was originally a 6 month project, which we have brought as far as we can
- without reevaluating the resources required to take it further. The project roadmap goals for the next
- 6 months will focus on modernizing the applications that were highlighted in the I2P Browser once the
- router was bundled. Browser development will potentially resume mid year. This page will be left up for
- informational purposes.{% endtrans %}
- </p>
- <p>
- {% trans %}Thank you to everyone who tested the Beta releases - it is obvious that there is a need for this product. We encourage everyone
- to continue with feedback for the I2P Browser.{% endtrans %}
- </p>
- {% trans %}You may want to consider one of the following alternatives:{% endtrans %}
- </p>
- <ul>
- <li> <strong><a href="/firefox">{% trans %}I2P Firefox Profile for Windows:{% endtrans %}</a></strong>
- {% trans %} If you are using Windows, the recommended way of accessing I2P is using the Firefox profile.{% endtrans %}
- </li>
- <li> <strong><a href="placeholder">{% trans %}I2P in Private Browsing Mode for Firefox:{% endtrans %}</a></strong>
- {% trans %} This cross-platform webextension configures an isolated contextual identity for using I2P and for
- each I2P application. It was designed to work with or without I2P Browser.{% endtrans %}
- </li>
- </ul>
- <p>
- {% trans bname=browser_name(), bsuff=browser_postname() %}Old versions of {{ bname }} {{ bsuff }} are
- still available from the link below. <strong>They should be regarded as unsafe to use, and are only here for
- historical and experimental purposes.</strong>
- {% endtrans %}
- </p>
- </div>
- </div>
-</section>
-
-<section class="browser-front-wrapper">
-{%- if detected_os == 'windows' -%}
- {%- set version = browser_version() -%}
- {%- set bname = browser_name()-%}
- {%- set name = 'Windows' -%}
- {%- set icon = 'images/browser/garlic.svg' -%}
- {%- set link = 'https://download.i2p2.de/experimental/i2pbrowser-'+version+'/windows64/i2pbrowser-install-win64-2.0-'+''+version+''+'_en-US.exe' -%}
- {% call browser_download(name, icon, link) %}
- Get {{ bname }} for Windows
- {% endcall %}
-
-{%- elif detected_os == 'macosx' -%}
- {%- set version = browser_version() -%}
- {%- set bname = browser_name()-%}
- {%- set name = 'Mac OS X' -%}
- {%- set icon = 'images/browser/garlic.svg' -%}
- {%- set link = 'https://download.i2p2.de/experimental/i2pbrowser-'+version+'/macosx64/I2PBrowser-2.0-'+version+'-osx64_en-US.dmg' -%}
- {% call browser_download(name, icon, link) %}
- Get {{ bname }} for Mac OS X
- {% endcall %}
-
-{%- elif detected_os == 'linux' -%}
- {%- set version = browser_version() -%}
- {%- set bname = browser_name()-%}
- {%- set name = 'Linux' -%}
- {%- set icon = 'images/browser/garlic.svg' -%}
- {%- set link = 'https://download.i2p2.de/experimental/i2pbrowser-'+version+'/linux64/i2p-browser-linux64-2.0-'+version+'_en-US.tar.xz' -%}
- {% call browser_download(name, icon, link) %}
- Get {{ bname }} for Linux x64
- {% endcall %}
-
-{%- endif -%}
-</section>
-
-{% endblock %}
diff --git a/i2p2www/pages/site/browser/develop.html b/i2p2www/pages/site/browser/develop.html
deleted file mode 100644
index 1c41d49806cd9b38a43315cb72b71c61bbe5b62f..0000000000000000000000000000000000000000
--- a/i2p2www/pages/site/browser/develop.html
+++ /dev/null
@@ -1,76 +0,0 @@
-{% extends "global/layout.html" %}
-{% block title %}{% trans bname=browser_name()%}{{ bname }}: Get Involved {% endtrans %}{% endblock %}
-{% block content_nav %}
-<ol>
-<li style="list-style: none; display: inline">
-<h4>{{ _('Navigation') }}</h4>
-</li>
-<li style="list-style: none;">{% trans browser_main=get_url('browser_frontpage') %}<a href="{{ browser_main }}">Back to browser front page</a>{% endtrans %}</li>
-</ol>
-{% endblock %}
-
-
-{% block content %}
-
-<h1>{% trans %}Get Involved{% endtrans %}</h1>
-
-{% trans bname=browser_name() %}
-<p>
-<strong>I2P Browser is on a 6-month hiatus, to re-evaluate the resources required
-to sustain it.</strong> The code is available to the community, and those of us
-who can will help community members who ask, but we are not working on it
-officially at this time.
-
-Like other browsers, {{ bname }} is actually built from a group of tools that
-work together to start and stop applications, configure settings, and secure the
-user against attacks.
-</p>
-{% endtrans %}
-
-<h2>{% trans %}Source Code{% endtrans %}</h2>
-
-<ul>
- <li>
- <a href="https://github.com/mikalv/i2p-browser-build-scripts">{% trans %}Build Scripts(Github):{% endtrans %}</a>
- {% trans %}Start here to build from source. This is the collection of build scripts that
- gathers the source code for all the components and executes each step of the
- build process.{% endtrans %}
- </li>
- <li>
- <a href="https://github.com/i2p/i2p-browser">{% trans %}Firefox Source Code(Github):{% endtrans %}</a>
- {% trans %}This is the source code of our fork of Firefox LTS, which is in turn based on the
- work of the Tor Browser team and modified for use with I2P.{% endtrans%}
- </li>
- <li>
- <a href="https://github.com/i2p/i2pbutton">{% trans %}I2PButton Browser Extension(Github):{% endtrans %}</a>
- {% trans %} Start here to experiment with your changes. Many of our essential features
- are facilitated by this plugin.
- {% endtrans %}
- </li>
-</ul>
-
-<h2>{% trans %}Essential Documentation{% endtrans %}</h2>
-
-<ul>
- <li>
- <a href="http://{{ i2pconv('trac.i2p2.i2p') }}//wiki/I2P_Browser_develop_n_hacks">{% trans bname=browser_name() %}{{ bname }} Development:{% endtrans %}</a>
- {% trans bname=browser_name() %}Meeh's notes on developing and porting features to the {{ bname }}{% endtrans %}.
- </li>
-</ul>
-
-<h2>{% trans %}Contact Us{% endtrans %}</h2>
-
-<ul>
- <li>
- <a href="http://{{ i2pconv('trac.i2p2.i2p') }}">{% trans %}Bug Tracker{% endtrans %}</a>
- {% trans %}Should you wish to communicate with us on a service other than Github,
- you may contact us via the I2P Bug Tracker.{% endtrans %}
- </li>
- <li>
- <a href="http://{{ i2pconv('lists.i2p') }}/hyperkitty/list/i2p-browser-dev@lists.i2p.email/2019/8/">{% trans %}Mailing List{% endtrans %}</a>
- {% trans bname=browser_name() %} We also have a public mailing list for discussion of the {{ bname }}.{% endtrans %}
- </li>
-</ul>
-
-{% endblock %}
-
diff --git a/i2p2www/pages/site/browser/donate.html b/i2p2www/pages/site/browser/donate.html
deleted file mode 100644
index 3c727fca409caea2d174d7cf562b04cd40064704..0000000000000000000000000000000000000000
--- a/i2p2www/pages/site/browser/donate.html
+++ /dev/null
@@ -1,21 +0,0 @@
-{% extends "global/layout.html" %}
-{% block title %}{{ _('The I2P Browser') }}{% endblock %}
-{% block content_nav %}
-<ol>
-<li style="list-style: none; display: inline">
-<h4>{{ _('Navigation') }}</h4>
-</li>
-<li style="list-style: none;">{% trans browser_main=get_url('browser_frontpage') %}<a href="{{ browser_main }}">Back to browser front page</a>{% endtrans %}</li>
-</ol>
-{% endblock %}
-
-
-{% block content %}
-
-<h1>{% trans %}Donate{% endtrans %}</h1>
-
-<a href="{{ site_url('get-involved/donate') }}">You can support all I2P development {{ _('here') }}
-BTC, LTC, ETH, ANC, XMR and PayPal are accepted.</a>
-
-{% endblock %}
-
diff --git a/i2p2www/pages/site/browser/download.html b/i2p2www/pages/site/browser/download.html
deleted file mode 100644
index 86ef753c4e50d4def0518b9ecc08b3ed959990bc..0000000000000000000000000000000000000000
--- a/i2p2www/pages/site/browser/download.html
+++ /dev/null
@@ -1,129 +0,0 @@
-{% extends "global/layout.html" %}
-{%- from "downloads/macros" import package_outer with context -%}
-{% block title %}{% trans bname=browser_name() %}{{ bname }} Downloads {% endtrans %}{% endblock %}
-
-{% block content_nav %}
-<ol>
- <li style="list-style: none; display: inline">
- <h4>{{ _('Navigation') }}</h4>
- </li>
- <li style="list-style: none;">{% trans browser_main=get_url('browser_frontpage') %}<a href="{{ browser_main }}">Back to browser front page</a>{% endtrans %}</li>
- <li style="list-style: none; display: inline">
- <h4>{{ _('Platforms') }}</h4>
- </li>
- <li style="list-style: none;"><a href="#windows">{% trans %}Windows{% endtrans %}</a></li>
- <li style="list-style: none;"><a href="#macosx">{% trans %}Mac OS X{% endtrans %}</a></li>
- <li style="list-style: none;"><a href="#linux">{% trans %}Linux{% endtrans %}</a></li>
-</ol>
-{% endblock %}
-
-
-{% block content %}
-
-
-<section id="download">
- <h1>{% trans bname=browser_name() %}{{ bname }} Downloads {% endtrans %}</h1>
-
-
- <p>{% trans bname=browser_name(), bsuff=browser_postname(), bvers=browser_version() -%}
- <strong> The {{ bname }} {{ bsuff }} is on hiatus for the next six months while the resources
- required to maintain it are re-evaluated.</strong> Downloads are still available for
- archival and testing purposes.
- {%- endtrans %}</p>
- <p>{% trans bname=browser_name(), bsuff=browser_postname(), bvers=browser_version() -%}
- The {{ bname }} {{ bsuff }} is a fork of TorBrowser/Mozilla Firefox ESR
- that comes preconfigured to use I2P securely.
- {%- endtrans %}</p>
- <p>{% trans -%}
- Builds for Linux, Windows and Mac OS X are available. We provide
- binaries for 64bit systems.
- {%- endtrans %}</p>
- {% trans bname=browser_name(), bsuff=browser_postname(), bvers=browser_version() %}
- Status: {{ bvers }} {% endtrans %}
- <ul>
- <li><a href="https://github.com/i2p/i2p-browser">Firefox Branch</a></li>
- <li><a href="https://github.com/mikalv/i2p-browser-build-scripts">Build Scripts</a></li>
- <li><a href="https://github.com/i2p/i2pbutton">Browser Extension</a></li>
- </ul>
-
- {%- set version = browser_version() -%}
- {%- set name = 'Windows' -%}
- {%- set icon = 'images/download/windows.png' -%}
- {%- set filename = 'i2pbrowser-install-win64-2.0-{{ version }}_en-US.exe' -%}
- {%- set filename = browser_filename('win64','2.0',version,'en-US','.exe') -%}
- {%- set hash = '71f2baad93c1309ee744951e5296b2eb17f0fcc92d45a3149cae5393527ebea3' -%}
- {% call package_outer('windows', name, icon) %}
- <div class="file">
- <h3 id="windows">Windows</h3>
- <a class="default"
- href="https://download.i2p2.de/experimental/i2pbrowser-{{ version }}/windows64/i2pbrowser-install-win64-2.0-{{ version }}_en-US.exe">
- <span class="name">{{ filename }}</span>
- </a>
- </div>
- <div class="meta">
- <div class="hash">
- <code>{{ hash }}</code>
- </div>
- </div>
- <p>{% trans -%}
- The default is to download the English version, however it's also built for some other languages,
- please check out the link below if you want to see if we have the browser in your language.
- {%- endtrans %}</p>
- <a
- href="https://download.i2p2.de/experimental/i2pbrowser-{{ version }}/windows64/">https://download.i2p2.de/experimental/i2pbrowser-{{ version }}/windows64/</a>
- {% endcall %}
-
- {%- set version = browser_version() -%}
- {%- set name = 'Mac OS X' -%}
- {%- set icon = 'images/download/mac-osx.png' -%}
- {%- set filename = browser_filename('osx64','2.0',version,'en-US','.dmg') -%}
- {%- set hash = '99b2a9b917fb8f66e192b4950116f63f6b386fe76f68d78b014ade2f05d18e7f' -%}
- {% call package_outer('mac-osx', name, icon) %}
- <div class="file">
- <h3 id="macosx">Mac OS X</h3>
- <a class="default"
- href="https://download.i2p2.de/experimental/i2pbrowser-{{ version }}/macosx64/I2PBrowser-2.0-{{ version }}-osx64_en-US.dmg">
- <span class="name">{{ filename }}</span>
- </a>
- </div>
- <div class="meta">
- <div class="hash">
- <code>{{ hash }}</code>
- </div>
- </div>
- <p>{% trans -%}
- The default is to download the English version, however it's also built for some other languages,
- please check out the link below if you want to see if we have the browser in your language.
- {%- endtrans %}</p>
- <a
- href="https://download.i2p2.de/experimental/i2pbrowser-{{ version }}/macosx64/">https://download.i2p2.de/experimental/i2pbrowser-{{ version }}/macosx64/</a>
- {% endcall %}
-
- {%- set version = browser_version() -%}
- {%- set name = 'Linux' -%}
- {%- set icon = 'images/download/freebsd-tux.png' -%}
- {%- set filename = browser_filename('linux64','2.0',version,'en-US','.tar.gz') -%}
- {%- set hash = '67664d298216450921c5c9638d2c6b9ce0c69aaeb2d177be23440d33e98fdbcf' -%}
- {% call package_outer('freebsd-tux', name, icon) %}
- <div class="file">
- <h3 id="linux">Linux</h3>
- <a class="default"
- href="https://download.i2p2.de/experimental/i2pbrowser-{{ version }}/linux64/i2p-browser-linux64-2.0-{{ version }}_en-US.tar.xz">
- <span class="name">{{ filename }}</span>
- </a>
- </div>
- <div class="meta">
- <div class="hash">
- <code>{{ hash }}</code>
- </div>
- </div>
- <p>{% trans -%}
- The default is to download the English version, however it's also built for some other languages,
- please check out the link below if you want to see if we have the browser in your language.
- {%- endtrans %}</p>
- <a
- href="https://download.i2p2.de/experimental/i2pbrowser-{{ version }}/linux64">https://download.i2p2.de/experimental/i2pbrowser-{{ version }}/linux64</a>
- {% endcall %}
-</section>
-
-{% endblock %}
diff --git a/i2p2www/pages/site/browser/faq.html b/i2p2www/pages/site/browser/faq.html
deleted file mode 100644
index 3d9215e306a067f2e2b573456ce1f11cf0a0a9fb..0000000000000000000000000000000000000000
--- a/i2p2www/pages/site/browser/faq.html
+++ /dev/null
@@ -1,134 +0,0 @@
-{% extends "global/layout.html" %}
-{% block title %}{% trans bname=browser_name() %}{{ bname }} Downloads {% endtrans %}{% endblock %}
-{% block content_nav %}
-<ol>
-
- <li style="list-style: none; display: inline">
- <h4>{{ _('Navigation') }}</h4>
- </li>
- <li style="list-style: none;">{% trans browser_main=get_url('browser_frontpage') %}<a href="{{ browser_main }}">Back to browser front page</a>{% endtrans %}</li>
- <li style="list-style: none; display: inline">
- <h4>{{ _('Browser FAQs') }}</h4>
- </li>
- <li><a href="#what">{% trans %}What is it and how does it work?{% endtrans %}</a></li>
- <li><a href="#why">{% trans %}Why did we make it?{% endtrans %}</a></li>
- <li><a href="#the-problem">{% trans %}Who is it for, what problem does it solve?{% endtrans %}</a></li>
- <li><a href="#spec-requirements">{% trans %}What are the requirements/ specs to use it?{% endtrans %}</a></li>
- <li><a href="#development-help">{% trans %}How can I help out with development?{% endtrans %}</a></li>
- <li><a href="#keeping-up-to-date">{% trans %}Where can I keep up to date with what is going on/ where is the conversation?{% endtrans %}</a></li>
- <li><a href="#funding">{% trans %}How can fund development?{% endtrans %}</a></li>
-</ol>
-{% endblock %}
-
-
-{% block content %}
-<h2>Browser FAQs</h2>
-
-
-<h3 id="what">
- <span class="permalink">
- <a href="#what">{% trans %}What is it and how does it work?{% endtrans %}</a>
- </span>
-</h3>
-
-<p>{% trans bname=browser_name() %}It’s a web browser, like all others it enables you to browse and search the web. {{ bname }} is however
- very focused on the privacy rights of the user and does not favour a company’s income in trade of the users privacy.
- As of the writing moment {{ bname }} is made to work with I2P, but with some adjustments it should just as well work
- with Tor or on the internet.{% endtrans %}
-</p>
-<p>{% trans %}When you connect to a website, it is not only the operators of that website who can record information
- about your visit.{% endtrans %}
-</p>
-<p>{% trans bname=browser_name() %}Most websites now use numerous third-party services, including social networking “Like†buttons,
- analytics trackers, and advertising beacons, all of which can link your activity across different sites. And because
- of that, the {{ bname }} is designed to prevent websites from “fingerprinting†or identifying you based on your
- browser configuration. By default, {{ bname }} does not keep any browsing history. Cookies are only valid for a single
- session (until {{ bname }} is exited or a New Identity is requested).{% endtrans %}
-</p>
-
-<p>{% trans bname=browser_name() %}A key feature is that {{ bname }} will block browser plugins such as Flash, RealPlayer, Quicktime,
- and others: they can be manipulated into revealing your IP address. We do not recommend installing additional
- add-ons or plugins into {{ bname }} even the user is free to do so. Plugins or addons may bypass I2P or compromise
- your privacy. {{ bname }} already comes with NoScript, and other patches to protect your privacy and security.{% endtrans %}
-</p>
-
-
-<h3 id="why">
- <span class="permalink">
- <a href="#why">{% trans %}Why did we make it?{% endtrans %}</a>
- </span>
-</h3>
-
-<p>{% trans bname=browser_name() -%}The main reason we made it is because as any other very technical project it can be hard for mr smith in
- the street to get himself into this and figure out how to benefit from it. The {{ bname }} was therefore made to
- extend the user base of I2P to non-super technical people and make it a worthy alternative to Tor.{%- endtrans %}</p>
-
-<p>{% trans %}We wish to enable all people to defend themself against tracking and surveillance.
- And for people in some countries, circumvent censorship.{% endtrans %}</p>
-
-
-<h3 id="the-problem">
- <span class="permalink">
- <a href="#the-problem">{% trans %}Who is it for, what problem does it solve?{% endtrans %}</a>
- </span>
-</h3>
-
-<p>{% trans -%}It’s for both technical and non technical people who wish to protect their privacy either because of
- preferences or safety, no matter who they are and where they are. It should make a lot of potential dangers harmless
- for these people that they will encounter on the internet. For example stop spying software that’s targeted or not. It
- also per default disables a lot of features which are questionable in terms of security and privacy
- concerns.{%- endtrans %}</p>
-
-
-<h3 id="spec-requirements">
- <span class="permalink">
- <a href="#spec-requirements">{% trans %}What are the requirements/ specs to use it?{% endtrans %}</a>
- </span>
-</h3>
-
-<p>{% trans %}Any Linux, Windows or Mac OS X with 64bit support will work. For Linux the builds are usually tested on Debian and Arch Linux, but it should work with all distros.{% endtrans %}</p>
-
-
-<h3 id="development-help">
- <span class="permalink">
- <a href="#development-help">{% trans %}How can I help out with development?{% endtrans %}</a>
- </span>
-</h3>
-
-<p>{% trans -%}The development happens on github, anyone can create a github account and make a pull request for either
- some bug they have discovered, or a trac ticket they found and wanted to solve, translations and so on.{%- endtrans %}
-</p>
-
-
-
-<h3 id="keeping-up-to-date">
- <span class="permalink">
- <a href="#keeping-up-to-date">{% trans %}Where can I keep up to date with what is going on/ where is the conversation?{% endtrans %}</a>
- </span>
-</h3>
-
-<p>{% trans -%}For the moment it’s only on trac - but we plan to start using mailing lists found at our mailing lists website:{%- endtrans %}
-{%- if is_i2p_internal == True -%}
-<a href="https://lists.i2p.email/">https://lists.i2p.email/</a>.
-{% trans -%}Trac is located at:{%- endtrans %} <a href="https://trac.i2p2.de">https://trac.i2p2.de</a>.
-{%- else -%}
-<a href="http://lists.i2p/">http://lists.i2p/</a>.
-{% trans -%}Trac is located at:{%- endtrans %} <a href="http://trac.i2p2.i2p">http://trac.i2p2.i2p</a>.
-{%- endif -%}
-</p>
-
-
-<h3 id="funding">
- <span class="permalink">
- <a href="#funding">{% trans %}How can fund development?{% endtrans %}</a>
- </span>
-</h3>
-
-<p>{% trans -%}Per today the way to fund it is to fund I2P itself, we consider to upgrade our donation program to enable
- donators to specify which parts of the I2P project they wish to fund, if it’s the router core, the console, the
- browser or any other component that can be seen as a sub project of I2P.{%- endtrans %}</p>
-
-<p>{% trans %}You can find our donation page <a href="/en/get-involved/donate">here</a>.{% endtrans %}</p>
-
-
-{% endblock %}
\ No newline at end of file
diff --git a/i2p2www/pages/site/browser/intro.html b/i2p2www/pages/site/browser/intro.html
deleted file mode 100644
index 5d7584c5c7ef1a6fedf47513c115481e8b8acacb..0000000000000000000000000000000000000000
--- a/i2p2www/pages/site/browser/intro.html
+++ /dev/null
@@ -1,111 +0,0 @@
-{% extends "global/layout.html" %}
-{% block title %}{% trans bname=browser_name(), bsuff=browser_postname()%}{{ bname }} {{ bsuff }} {% endtrans %}{% endblock %}
-{% block content_nav %}
-<ol>
-<li style="list-style: none; display: inline">
-<h4>{{ _('Navigation') }}</h4>
-</li>
-<li style="list-style: none;">{% trans browser_main=get_url('browser_frontpage') %}<a href="{{ browser_main }}">Back to browser front page</a>{% endtrans %}</li>
-<li style="list-style: none;">{% trans bname=browser_name() %}About {{ bname }}{% endtrans %}</li>
-<li style="list-style: none;"><a href="#safeguard">{% trans %}Introduction{% endtrans %}</a></li>
-<li style="list-style: none;"><a href="#landing">{% trans %}Landing Page{% endtrans %}</a></li>
-<li style="list-style: none;"><a href="#browsing">{% trans %}Web Browsing{% endtrans %}</a></li>
-<li style="list-style: none;"><a href="#privacy">{% trans %}Privacy{% endtrans %}</a></li>
-<li style="list-style: none;"><a href="#bittorrent">{% trans %}File Sharing{% endtrans %}</a></li>
-<li style="list-style: none;"><a href="#email">{% trans %}Private E-Mail{% endtrans %}</a></li>
-</ol>
-{% endblock %}
-
-
-{% block content %}
-
-<h1>{% trans bname=browser_name(), bsuff=browser_postname() %}{{ bname }} {{ bsuff }}{% endtrans %}</h1>
-
-<h2 id="safeguard">
- <span class="permalink">
- <a href="#safeguard">{% trans bname=browser_name() %}About {{ bname }}{% endtrans %}</a>
- </span>
-</h2>
-<p>
-{% trans bname=browser_name(), bsuff=browser_postname() %}{{ bname }} {{ bsuff }} is an easy-to-use bundle
-that provides a streamlined way to use I2P applications and to browse I2P sites.
-Although it can provide access to the regular internet via an outproxy, it also
-integrates secure decentralized browsing, file sharing, and e-mail.{% endtrans %}
-</p>
-<img class="screenshot" src="{{ url_for('static', filename='images/browser/screenshots/2-eepsite.png') }}" />
-
-<h2 id="landing">
- <span class="permalink">
- <a href="#landing">{% trans %}Access Panel{% endtrans %}</a>
- </span>
-</h2>
-<p>
-{% trans bname=browser_name() %}{{ bname }} changes the ways that you access I2P, streamlining the
-process for new users. Just the information you need, direct access to
-applications, and no configuration.{% endtrans %}
-</p>
-<img class="screenshot" src="{{ url_for('static', filename='images/browser/screenshots/1-home.png') }}" />
-
-<h2 id="browsing">
- <span class="permalink">
- <a href="#browsing">{% trans %}Web Browsing{% endtrans %}</a>
- </span>
-</h2>
-<p>
-{% trans bname=browser_name() %}Like other browsers, {{ bname }} enables you to browse and search the
-internet. {{ bname }} also employs a variety of security enhancements to protect
-your privacy while you browse the web.{% endtrans %}
-</p>
-<img class="screenshot" src="{{ url_for('static', filename='images/browser/screenshots/2-outproxy.png') }}" />
-
-<h2 id="privacy">
- <span class="permalink">
- <a href="#privacy">{% trans %}Privacy{% endtrans %}</a>
- </span>
-</h2>
-<p>
-{% trans bname=browser_name() %}Most websites now use numerous third-party trackers, all of which can
-link your activity across different sites. Besides blocking third-party
-trackers, {{ bname }} avoids caching unnecessary data, enforces boundaries
-between sites and applications, and hides your connection from un-authorized
-observers.{% endtrans %}
-</p>
-<img class="screenshot" src="{{ url_for('static', filename='images/browser/screenshots/2-settings.png') }}" />
-
-<h2 id="bittorrent">
- <span class="permalink">
- <a href="#bittorrent">{% trans %}File Sharing{% endtrans %}</a>
- </span>
-</h2>
-<p>
-{% trans bname=browser_name() %}I2P has always been capable of Peer-to-Peer file sharing and {{ bname }}
-is no exception. By integrating the I2PSnark BitTorrent client,
-private, safe Peer-to-Peer filesharing is at the user's fingertips.{% endtrans %}
-</p>
-<img class="screenshot" src="{{ url_for('static', filename='images/browser/screenshots/3-snark.png') }}" />
-
-<p>
-{% trans bname=browser_name() %}By using I2P, a whole world of private file-sharing options will
-become available to you.{% endtrans %}
-</p>
-
-<p>
-{% trans bname=browser_name() %}Using Peer-to-Peer to distribute data means more people can help
-you find it, which gets it to you more quickly and reliably.{% endtrans %}
-</p>
-<img class="screenshot" src="{{ url_for('static', filename='images/browser/screenshots/3-add.png') }}" />
-<img class="screenshot" src="{{ url_for('static', filename='images/browser/screenshots/3-proof.png') }}" />
-
-<h2 id="email">
- <span class="permalink">
- <a href="#email">{% trans %}Private E-Mail{% endtrans %}</a>
- </span>
-</h2>
-<p>
-{% trans bname=browser_name() %}E-Mail service is available from providers within the I2P network
-that are capable of relaying e-mail to all e-mail addresses. {{ bname }} is
-pre-configured to access these services and set you up with an account.{% endtrans %}
-</p>
-<img class="screenshot" src="{{ url_for('static', filename='images/browser/screenshots/4-email.png') }}" />
-{% endblock %}
-
diff --git a/i2p2www/pages/site/browser/releasenotes.html b/i2p2www/pages/site/browser/releasenotes.html
deleted file mode 100644
index 0e315b0a5d5a22ce7e51f2eef4b7dcf86ca61b83..0000000000000000000000000000000000000000
--- a/i2p2www/pages/site/browser/releasenotes.html
+++ /dev/null
@@ -1,127 +0,0 @@
-{% extends "global/layout.html" %}
-{% block title %}{% trans bname=browser_name()%}{{ bname }} Release Notes {% endtrans %}{% endblock %}
-{% block content_nav %}
-<ol>
-<li style="list-style: none; display: inline">
-<h4>{{ _('Navigation') }}</h4>
-</li>
-<li style="list-style: none;">{% trans browser_main=get_url('browser_frontpage') %}<a href="{{ browser_main }}">Back to browser front page</a>{% endtrans %}</li>
-<li style="list-style: none;">{% trans %}Release Notes{% endtrans %}</li>
-<li style="list-style: none;"><a href="#r20b7">{% trans %}Version 2.0 Beta 7{% endtrans %}</a></li>
-<li style="list-style: none;"><a href="#r20b6">{% trans %}Version 2.0 Beta 6{% endtrans %}</a></li>
-<li style="list-style: none;"><a href="#r20b5">{% trans %}Version 2.0 Beta 5{% endtrans %}</a></li>
-<li style="list-style: none;"><a href="#r20b4">{% trans %}Version 2.0 Beta 4{% endtrans %}</a></li>
-<li style="list-style: none;"><a href="#r20b3">{% trans %}Version 2.0 Beta 3{% endtrans %}</a></li>
-<li style="list-style: none;"><a href="#r20b2">{% trans %}Version 2.0 Beta 2{% endtrans %}</a></li>
-<li style="list-style: none;"><a href="#r20b1">{% trans %}Version 2.0 Beta 1{% endtrans %}</a></li>
-</ol>
-{% endblock %}
-
-{% block content %}
-
-<h1>{% trans %}Release Notes{% endtrans %}</h1>
-
-<h3 id="r20b7">
- <span class="permalink">
- <a href="#r20b7">{% trans %}2.0 Beta 7 (Nov 4 2019){% endtrans %}</a>
- </span>
-</h3>
-
-<ol style="list-style-type: square;">
- <li>Fix NoScript Bug</li>
- <li>JSON-RPC2 client for router communication</li>
- <li>Delay the user dialog</li>
- <li>Implement continuous integration</li>
-</ol>
-
-<h3 id="r20b6">
- <span class="permalink">
- <a href="#r20b6">{% trans %}2.0 Beta 6 (Sep 16 2019){% endtrans %}</a>
- </span>
-</h3>
-
-<ol style="list-style-type: square;">
- <li>Bug fixes for browser/router integration</li>
- <li>Use better ports for router configuration</li>
-</ol>
-
-<h3 id="r20b5">
- <span class="permalink">
- <a href="#r20b5">{% trans %}2.0 Beta 5 (Sep 12 2019){% endtrans %}</a>
- </span>
-</h3>
-
-<ol style="list-style-type: square;">
- <li>New browser icon/graphic</li>
- <li>Disable enterprise policies for the browser</li>
- <li>Bundle id is now unique on Mac OS X</li>
- <li>Improvements of default preferences</li>
- <li>about:i2p text updates</li>
- <li>Onboarding improvements</li>
- <li>Improvements for NoScript integration</li>
- <li>Improvements for cookie control</li>
- <li>Default ports changed to not crash with already installed routers</li>
- <li>The browser now ships with the router on Linux</li>
- <li>The browser now ships with the router on Windows</li>
- <li>The browser now ships with the router on Mac OS X</li>
-</ol>
-
-<h3 id="r20b4">
- <span class="permalink">
- <a href="#r20b4">{% trans %}2.0 Beta 4 (Jun 27 2019){% endtrans %}</a>
- </span>
-</h3>
-
-<ol style="list-style-type: square;">
- <li>Security fix for CVE-2019-11707.</li>
- <li>Added garlic addressbar icon. Ticket #2539</li>
- <li>Don't allow enterprise policies in the browser.</li>
- <li>Implemented network.dns.blockDotI2P preference option.</li>
- <li>Disable WebGL readPixel() for web content. See Tor ticket #30541</li>
-</ol>
-
-<h3 id="r20b3">
- <span class="permalink">
- <a href="#r20b3">{% trans %}2.0 Beta 3 (Jun 10 2019){% endtrans %}</a>
- </span>
-</h3>
-
-<ol style="list-style-type: square;">
- <li>Feature: New Identity - which would reset your browser profile. Behaves about the same as TorBrowser's equal.</li>
- <li>New/updated plugin: noscript.</li>
- <li>New plugin: i2pbutton.</li>
- <li>.i2p sites are now shown as secure in the addressbar.</li>
- <li>A about:i2p page with some info & router health check status.</li>
- <li>Itoopie in the toolbar via i2pbutton.</li>
- <li>Issue with proxy settings corrected.</li>
-</ol>
-
-<h3 id="r20b2">
- <span class="permalink">
- <a href="#r20b2">{% trans %}2.0 Beta 2 (May 28 2019){% endtrans %}</a>
- </span>
-</h3>
-
-<ol style="list-style-type: square;">
- <li>Bugfixes.</li>
- <li>Graphics updates.</li>
- <li>Rebranding.</li>
-</ol>
-
-<h3 id="r20b1">
- <span class="permalink">
- <a href="#r20b1">{% trans %}2.0 Beta 1 (Mar 6 2019){% endtrans %}</a>
- </span>
-</h3>
-
-<p>Initial release based upon Firefox ESR 60.7 and Tor Browser Bundle.</p>
-
-<h3 id="r10b1">
- <span class="permalink">
- <a href="#r10b1">{% trans %}1.0 Beta 1 (2014){% endtrans %}</a>
- </span>
-</h3>
-
-<p>Lost in history, was labeled "Abscond Browser" at the time.</p>
-
-{% endblock %}
diff --git a/i2p2www/pages/site/browser/roadmap.html b/i2p2www/pages/site/browser/roadmap.html
deleted file mode 100644
index 15b6cd1d30d2bb13a8a53e1212f6a5f97de4dfd2..0000000000000000000000000000000000000000
--- a/i2p2www/pages/site/browser/roadmap.html
+++ /dev/null
@@ -1,58 +0,0 @@
-{% extends "global/layout.html" %}
-{% block title %}{% trans bname=browser_name()%}{{ bname }} Roadmap {% endtrans %}{% endblock %}
-{% block content_nav %}
-<ol>
-<li style="list-style: none; display: inline">
-<h4>{{ _('Navigation') }}</h4>
-</li>
-<li style="list-style: none;">{% trans browser_main=get_url('browser_frontpage') %}<a href="{{ browser_main }}">Back to browser front page</a>{% endtrans %}</li>
-<li style="list-style: none;"><a href="#roadmap">{% trans %}Roadmap{% endtrans %}</li>
-<li style="list-style: none;"><a href="#r20b8">{% trans %}Version 2.0 Beta 8{% endtrans %}</a></li>
-<li style="list-style: none;"><a href="#r30b9">{% trans %}Version 3.0 Beta 9{% endtrans %}</a></li>
-<li style="list-style: none;"><a href="#r30b10">{% trans %}Version 3.0 Beta 10{% endtrans %}</a></li>
-</ol>
-{% endblock %}
-
-
-{% block content %}
-
-<h1 id="roadmap">{% trans %}Roadmap{% endtrans %}</h1>
-
-<h3 id="r20b8">
- <span class="permalink">
- <a href="#r20b8">{% trans %}2.0 Beta 8 (Nov 2019){% endtrans %}</a>
- </span>
-</h3>
-
-<ol style="list-style-type: square;">
- <li>Cancelled</li>
-</ol>
-
-<h3 id="r30b9">
- <span class="permalink">
- <a href="#r30b9">{% trans %}3.0 Beta 9 (Dec 2019){% endtrans %}</a>
- </span>
-</h3>
-
-<ol style="list-style-type: square;">
- <li>Release using ESR 68, deprecate ESR 60</li>
- <li>Replace Tor/Firefox onboarding slideshow completely with something self-contained</li>
- <li>Move JSON-RPC and I2PControl to web extension, simplify I2Pbutton</li>
- <li>Protocol Handlers for Router Console and Mailto</li>
- <li>Dynamic Themes/Contextual Identities</li>
- <li>Donation Call-to-Action</li>
- <li>Smart Landing Page improvements</li>
-</ol>
-
-<h3 id="r30b10">
- <span class="permalink">
- <a href="#r30b10">{% trans %}3.0 Beta 10 (Jan 2019){% endtrans %}</a>
- </span>
-</h3>
-
-<ol style="list-style-type: square;">
- <li>Research I2P Plugins Support</li>
- <li>Research Peer-to-Peer messaging support compatible with BiglyBT</li>
-</ol>
-
-{% endblock %}
diff --git a/i2p2www/pages/site/browser/updating.html b/i2p2www/pages/site/browser/updating.html
deleted file mode 100644
index 5507e21b68f48b0c41fb5ba9ec6eadf138e229f0..0000000000000000000000000000000000000000
--- a/i2p2www/pages/site/browser/updating.html
+++ /dev/null
@@ -1,23 +0,0 @@
-{% extends "global/layout.html" %}
-{% block title %}{{ _('The I2P Browser') }}{% endblock %}
-{% block content_nav %}
-<ol>
-<li style="list-style: none; display: inline">
-<h4>{{ _('Navigation') }}</h4>
-</li>
-<li style="list-style: none;">{% trans browser_main=get_url('browser_frontpage') %}<a href="{{ browser_main }}">Back to browser front page</a>{% endtrans %}</li>
-</ol>
-{% endblock %}
-
-
-{% block content %}
-
-<h1>{% trans %}Updating the browser{% endtrans %}</h1>
-
-
-
-
-TBA.
-
-{% endblock %}
-
diff --git a/i2p2www/pages/site/comparison/tor.html b/i2p2www/pages/site/comparison/tor.html
index 2587f608eb2da786042d947cf0ff89c838590c00..a95d6cf23c02e5a5fb700c82771c423807da278f 100644
--- a/i2p2www/pages/site/comparison/tor.html
+++ b/i2p2www/pages/site/comparison/tor.html
@@ -60,12 +60,12 @@ While Tor and I2P are similar in many ways, much of the terminology is different
<tr><td>{{ _('Entry Guards') }}<td>{{ _('Fast Peers') }}
<tr><td>{{ _('Entry Node') }}<td>{{ _('Inproxy') }}
<tr><td>{{ _('Exit Node') }}<td>{{ _('Outproxy') }}
-<tr><td>{{ _('Hidden Service') }}<td>{{ _('Hidden Service') }}, {{ _('Eepsite or Destination') }}
+<tr><td>{{ _('Hidden Service') }}<td>{{ _('Hidden Service') }}, {{ _('I2P Site or Destination') }}
<tr><td>{{ _('Hidden Service Descriptor') }}<td>{{ _('LeaseSet') }}
<tr><td>{{ _('Introduction point') }}<td>{{ _('Inbound Gateway') }}
<tr><td>{{ _('Node') }}<td>{{ _('Router') }}
<tr><td>{{ _('Onion Proxy') }}<td>{{ _('I2PTunnel Client (more or less)') }}
-<tr><td>{{ _('Onion Service') }}<td>{{ _('Hidden Service') }}, {{ _('Eepsite or Destination') }}
+<tr><td>{{ _('Onion Service') }}<td>{{ _('Hidden Service') }}, {{ _('I2P Site or Destination') }}
<tr><td>{{ _('Relay') }}<td>{{ _('Router') }}
<tr><td>{{ _('Rendezvous Point') }}<td>{{ _('somewhat like Inbound Gateway + Outbound Endpoint') }}
<tr><td>{{ _('Router Descriptor') }}<td>{{ _('RouterInfo') }}
diff --git a/i2p2www/pages/site/contact.html b/i2p2www/pages/site/contact.html
index 0612b99d4ee0bb2537a18de613524c4e337c4947..de6c950ef75b18c90c0940e65aec62e3db87cd25 100644
--- a/i2p2www/pages/site/contact.html
+++ b/i2p2www/pages/site/contact.html
@@ -4,8 +4,7 @@
<h2>{{ _('Email') }}</h2>
<p>{% trans -%}
Please do not use these email addresses for support requests.
-These are not public email lists.
-We do not provide help via email.
+For contact specific to research, outreach and security please use:
{%- endtrans %}</p>
<ul>
<li>press _at_ geti2p.net - Press contact
@@ -21,6 +20,23 @@ GPG Key fingerprint: <tt>EA27 06D6 14F5 28DB 764B F47E CFCD C461 75E6 694A</tt>
</li>
</ul>
+<h2>{{ _('Forums') }}</h2>
+<p>{% trans -%}Please visit our I2P user forum - {%- endtrans %} <a href="http://{{ i2pconv('i2pforum.i2p') }}/">{{ i2pconv('i2pforum.i2p') }}</a> ({% trans -%}available on non-private internet at https://i2pforum.net and on I2P at http://i2pforum.i2p{%- endtrans %})</p>
+
+<p>{% trans zzz=i2pconv('zzz.i2p') -%}
+ Most of the discussion about I2P's development happens on the <a href="http://{{ zzz }}">I2P developer forum</a> (only reachable from within I2P network). This is usually the best place to start with inquiries, if the dev IRC channel is inactive.
+{%- endtrans %}</p>
+
+<h2>{{ _('Social Media') }}</h2>
+
+<p>{% trans -%}
+<ul>
+ <li><a href="https://mastodon.social/@i2p">Mastodon - https://mastodon.social/@i2p</a></li>
+ <li><a href="https://twitter.com/GetI2P">Twitter - https://twitter.com/GetI2P</a></li>
+ <li><a href="https://old.reddit.com/i2p">Reddit - https://old.reddit.com/i2p</a></li>
+</ul>
+{%- endtrans %}</p>
+
<h2>IRC</h2>
<p>{% trans -%}
Our primary IRC network is the Irc2P network within I2P; a default tunnel to this network is set up with new router installs.
@@ -35,35 +51,16 @@ GPG Key fingerprint: <tt>EA27 06D6 14F5 28DB 764B F47E CFCD C461 75E6 694A</tt>
#i2p {{ _('General i2p discussion and help channel') }}
#i2p-chat {{ _('Offtopic') }}
#i2p-dev {{ _('Development talk') }}
-#i2pd-dev {{ _('Purple I2P (I2Pd) Development talk') }}
-#Abscond {{ _('Abscond browser bundle discussion and development') }}
{% endfilter %}
</pre>
-<h2>{{ _('Forums') }}</h2>
-<p>{% trans -%}Please visit our I2P user forum, which is frequented by developers/contributors too - {%- endtrans %} <a href="http://{{ i2pconv('i2pforum.i2p') }}/">{{ i2pconv('i2pforum.i2p') }}</a> ({% trans -%}available on clearnet at https://i2pforum.net and on I2P at http://i2pforum.i2p{%- endtrans %})</p>
-
-<p>{% trans zzz=i2pconv('zzz.i2p') -%}
- Most of the discussion about I2P's development happens on the <a href="http://{{ zzz }}">I2P developer forum</a> (only reachable from within I2P network). This is usually the best place to start with inquiries, if the dev IRC channel is inactive.
-{%- endtrans %}</p>
-
<h2>{{ _('Mailing lists') }}</h2>
<p>{% trans -%}
- I2P has recently reinstated it's mailing lists, and they are primarily used to discuss I2P Browser development.
-{%- endtrans %}</p>
-
-
-<h3>{{ _('Subscribing') }}</h3>
-<p>{% trans -%}
- To subscribe to a mailing list, go to the list information page (linked below) and fill out the form. I2P-internal email addresses (foobar@mail.i2p) can be used.
-{%- endtrans %}</p>
-
-<h3>{{ _('Unsubscribing') }}</h3>
-<p>{% trans -%}
- To unsubscribe from a mailing list or edit your subscription options, go to the list information page (linked below) and enter your subscription email address.
+ I2P has no active mailing lists, however archives can be accessed.
{%- endtrans %}</p>
<h3>{{ _('Lists') }}</h3>
+<p>
<ul>
<li>
<a href="http://{{ i2pconv('lists.i2p') }}/postorius/lists/i2p-browser-dev.{{ i2pconv('lists.i2p') }}/">i2p-browser-dev</a> (<a href="http://{{ i2pconv('lists.i2p') }}/hyperkitty/lists/i2p-browser-dev@{{ i2pconv('lists.i2p') }}/">{{ _('Archive') }}</a>)<br/>
@@ -78,4 +75,400 @@ GPG Key fingerprint: <tt>EA27 06D6 14F5 28DB 764B F47E CFCD C461 75E6 694A</tt>
{% trans %}General I2P discussion - anything that doesn't fit in a different list goes here{% endtrans %}
</li>
</ul>
+</p>
+
+<h2>{{ _('Team') }}</h2>
+<table border="0">
+<tr>
+ <td valign="top" rowspan="31"><b>{{ _('Admin') }}</b></td>
+ <td valign="top"><b>{{ _('Project Manager') }}</b></td>
+ <td valign="top">zzz</td>
+ <td valign="top"><i>{{ _('point of contact of last resort') }}</i></td>
+</tr>
+<tr>
+ <td valign="top"><b>{{ _('Donations treasurer') }}</b></td>
+ <td valign="top">meeh</td>
+ <td valign="top"><i>{{ _('manage donations') }}</i></td>
+</tr>
+<tr>
+ <td valign="top"><b>{{ _('PR manager') }}</b></td>
+ <td valign="top">Sadie</td>
+ <td valign="top"><i>{{ _('press contact, manages public relations and affairs') }}</i></td>
+</tr>
+<tr>
+ <td valign="top"><b>{{ _('Assistant PR manager') }}</b></td>
+ <td valign="top">idk</td>
+ <td valign="top"><i>{{ _('Public speaking, public relations assistance') }}</i></td>
+</tr>
+<tr>
+ <td valign="top"><b>{% trans forum=i2pconv('i2pforum.i2p') %}<a href="http://{{ forum }}/">Forum</a> admin{% endtrans %}</b></td>
+ <td valign="top">eche|on</td>
+ <td valign="top"><i>{{ _('manage the public user forum') }}</i></td>
+</tr>
+<tr>
+ <td valign="top"><b>{{ _('Download mirrors admin') }}</b></td>
+ <td valign="top">idk, Meeh</td>
+ <td valign="top"><i>{{ _('manage the mirrors for the download files') }}</i></td>
+</tr>
+<tr>
+ <td valign="top"><b>{{ _('Website mirrors admin') }}</b></td>
+ <td valign="top" class="blue">[{{ _('vacant') }}]</td>
+ <td valign="top"><i>{{ _('manage the mirrors for the website') }}</i></td>
+</tr>
+<tr>
+ <td valign="top"><b>{% trans monotone=site_url('get-involved/guides/monotone') %}<a href="{{ monotone }}">Monotone</a> guru{% endtrans %}</b></td>
+ <td valign="top">eche|on</td>
+ <td valign="top"><i>{{ _('manage the public monotone repositories') }}</i></td>
+</tr>
+<tr>
+ <td valign="top"><b>{{ _('Packager; Linux') }}</b></td>
+ <td valign="top">zzz</td>
+ <td valign="top"><i>{{ _('Linux (Debian/Ubuntu) distribution packager') }}</i></td>
+</tr>
+<tr>
+ <td valign="top"><b>{{ _('Packager; Windows') }}</b></td>
+ <td valign="top">zzz</td>
+ <td valign="top"><i>{{ _('Windows installer packager') }}</i></td>
+</tr>
+<tr>
+ <td valign="top"><b>{{ _('Packager; OSX') }}</b></td>
+ <td valign="top">Meeh</td>
+ <td valign="top"><i>{{ _('OSX installer packager') }}</i></td>
+</tr>
+<tr>
+ <td valign="top"><b>{{ _('Release Manager') }}</b></td>
+ <td valign="top">zzz</td>
+ <td valign="top"><i>{{ _('Builds and signs the releases') }}</i></td>
+</tr>
+<tr>
+ <td valign="top"><b>{{ _('Release Manager Alternates') }}</b></td>
+ <td valign="top">eche|on, str4d</td>
+ <td valign="top"><i>{{ _('Backup release managers') }}</i></td>
+</tr>
+<tr>
+ <td valign="top"><b>{{ _('CI admin') }}</b></td>
+ <td valign="top">idk</td>
+ <td valign="top"><i>{{ _('Maintain the Continuous Integration infrastructure') }}</i></td>
+</tr>
+<tr>
+ <td valign="top"><b>{{ _('Reseed admin') }}</b></td>
+ <td valign="top">backup</td>
+ <td valign="top"><i>{{ _('Monitors, advises and recruits reseed hosts') }}</i></td>
+</tr>
+<tr>
+ <td valign="top"><b>{{ _('Security Researcher') }}</b></td>
+ <td valign="top" class="blue">[{{ _('vacant') }}]</td>
+ <td valign="top"><i>{{ _('threat model / crypto expert') }}</i></td>
+</tr>
+<tr>
+ <td valign="top"><b><a href="https://trac.i2p2.de/">Trac</a> admin</b></td>
+ <td valign="top">Meeh</td>
+ <td valign="top"><i>{{ _('Manage the project bug tracker') }}</i></td>
+</tr>
+<tr>
+ <td valign="top"><b><a href="https://trac.i2p2.de/">Trac</a> webserver admin</b></td>
+ <td valign="top">Meeh</td>
+ <td valign="top"><i>{{ _('manage the public project webservers') }}</i></td>
+</tr>
+<tr>
+ <td valign="top"><b>{{ _('Translation admins') }}</b></td>
+ <td valign="top">eche|on, zzz, idk, Sadie</td>
+ <td valign="top">Admins on <a href="https://www.transifex.com/projects/p/I2P/">Transifex</a></td>
+</tr>
+<tr>
+ <td valign="top"><b>{{ _('User Advocate') }}</b></td>
+ <td valign="top">Sadie</td>
+ <td valign="top"><i>{{ _('gather, prioritize, advocate for user needs') }}</i></td>
+</tr>
+<tr>
+ <td valign="top"><b>{{ _('Product Development') }}</b></td>
+ <td valign="top">Sadie</td>
+ <td valign="top"><i>{{ _('supervises projects from the early planning stages to project completion') }}</i></td>
+</tr>
+<tr>
+ <td valign="top"><b>{{ _('Website Maintainer') }}</b></td>
+ <td valign="top">idk</td>
+ <td valign="top"><i>{{ _('manage the public project website content design') }}</i></td>
+</tr>
+<tr>
+ <td valign="top"><b>{% trans website=site_url() %}<a href="{{ website }}">Webserver</a> admin{% endtrans %}</b></td>
+ <td valign="top">eche|on</td>
+ <td valign="top"><i>{{ _('manage the public project webservers') }}</i></td>
+</tr>
+<tr>
+ <td valign="top"><b>{% trans website=site_url() %}<a href="{{ website }}">Website</a> admin{% endtrans %}</b></td>
+ <td valign="top">idk</td>
+ <td valign="top"><i>{{ _('manage the public project website content') }}</i></td>
+</tr>
+<tr>
+ <td valign="top"><b>{{ _('News Admin') }}</b></td>
+ <td valign="top">eche|on</td>
+ <td valign="top"><i>{{ _('manage router console news feed') }}</i></td>
+</tr>
+<tr>
+ <td valign="top"><b>{{ _('Backup News Admin') }}</b></td>
+ <td valign="top">idk</td>
+ <td valign="top"><i>{{ _('manage the backup news feed') }}</i></td>
+</tr>
+<tr>
+ <td valign="top"><b>{{ _('Design and Usability') }}</b></td>
+ <td valign="top">Sadie, idk</td>
+ <td valign="top"><i>{{ _('ongoing improvements to user experience for website and software') }}</i></td>
+</tr>
+<tr>
+ <td valign="top"><b>Google Play admin</b></td>
+ <td valign="top">idk, meeh</td>
+ <td valign="top"><i></i></td>
+</tr>
+<tr>
+ <td valign="top"><b>F-Droid admin</b></td>
+ <td valign="top">idk</td>
+ <td valign="top"><i></i></td>
+</tr>
+<tr>
+ <td valign="top"><b>Outproxy admin</b></td>
+ <td valign="top">Meeh</td>
+ <td valign="top"><i></i></td>
+</tr>
+<tr>
+ <!--<td valign="top"><b>{{ _('Director of passion') }}</b></td>
+ <td valign="top" class="blue">[{{ _('vacant') }}]</td>
+ <td valign="top"><i>{{ _('community motivator') }}</i></td>-->
+</tr>
+<tr><td colspan="4"><hr /></td></tr>
+<tr>
+ <td valign="top" rowspan="17"><b>{{ _('Dev') }}</b></td>
+ <td valign="top"><b>{{ _('Core Lead') }}</b></td>
+ <td valign="top">zzz</td>
+ <td valign="top"><i>{{ _('lead dev for the SDK and router') }}</i></td>
+</tr>
+<tr>
+ <td valign="top"><b>{% trans postman=i2pconv('hq.postman.i2p') %}<a href="http://{{ postman }}/">I2P mail</a> lead{% endtrans %}</b></td>
+ <td valign="top">postman</td>
+ <td valign="top"><i>{{ _('organize and develop the i2p mail system') }}</i></td>
+</tr>
+<tr>
+ <td valign="top"><b>{% trans bote=i2pconv('bote.i2p') %}<a href="http://{{ bote }}/">I2P-Bote</a> lead{% endtrans %}</b></td>
+ <td valign="top">str4d</td>
+ <td valign="top"><i>{{ _('I2P-Bote plugin') }}</i></td>
+</tr>
+<tr>
+ <td valign="top"><b>{% trans forum=i2pconv('i2pforum.i2p') %}<a href="http://{{ forum }}/viewforum.php?f=12">I2PSnark</a> lead{% endtrans %}</b></td>
+ <td valign="top">zzz</td>
+ <td valign="top"><i>{{ _('Maintains the integrated Bittorrent client') }}</i></td>
+</tr>
+<tr>
+ <td valign="top"><b>{% trans forum=i2pconv('i2pforum.i2p') %}<a href="http://{{ forum }}/viewforum.php?f=25">Syndie</a> lead{% endtrans %}</b></td>
+ <td valign="top" class="blue">[{{ _('vacant') }}]</td>
+ <td valign="top"><i>{{ _('Syndie development') }}</i></td>
+</tr>
+<tr>
+ <td valign="top"><b>{{ _('Susimail lead') }}</b></td>
+ <td valign="top">zzz</td>
+ <td valign="top"><i>{{ _('Susimail development') }}</i></td>
+</tr>
+<tr>
+ <td valign="top"><b>{{ _('Android lead') }}</b></td>
+ <td valign="top">idk</td>
+ <td valign="top"><i>{{ _('Android development') }}</i></td>
+</tr>
+<tr>
+ <td valign="top"><b>{{ _('Console') }}</b></td>
+ <td valign="top">{{ _('idk, Sadie') }}</td>
+ <td valign="top"><i>{{ _('Router console HTML/CSS design') }}</i></td>
+</tr>
+<tr>
+ <td valign="top"><b>{{ _('SAM') }}</b></td>
+ <td valign="top">zzz</td>
+ <td valign="top"><i>{{ _('SAM maintainer') }}</i></td>
+</tr>
+<tr>
+ <td valign="top"><b>{{ _('Translators') }}</b></td>
+ <td valign="top">{{ _('many many people!') }}</td>
+ <td valign="top">Translators on <a href="https://www.transifex.com/projects/p/I2P/">Transifex</a></td>
+</tr>
+<tr>
+<tr>
+ <td valign="top" rowspan="6"><b>{{ _('Contributors') }}</b></td>
+ <td valign="top">cervantes</td>
+ <td valign="top"><i>{{ _('fire2pe dev, console enhancements') }}</i></td>
+</tr>
+<tr>
+ <td valign="top">Mathiasdm</td>
+ <td valign="top"><i>{{ _('desktopgui, dijjer port') }}</i></td>
+</tr>
+<tr>
+ <td valign="top">zzz</td>
+ <td valign="top"><i>{{ _('Debian/Ubuntu Packager and PPA maintainer') }}</i></td>
+</tr>
+<tr>
+ <td valign="top">str4d</td>
+ <td valign="top"><i>{{ _('Routerconsole backend and UI work, website revamp, unit tests work') }}</i></td>
+</tr>
+
+<tr>
+ <td valign="top" class="blue">[{{ _('vacant') }}]</td>
+ <td valign="top" class="blue"><i>{{ _('Help needed on many fronts!') }}</i></td>
+</tr>
+<tr><td colspan="4"><hr /></td></tr>
+<tr>
+ <td valign="top" rowspan="39" colspan="2"><b>{{ _('Past contributors') }}</b></td>
+ <td valign="top">mihi</td>
+ <td valign="top"><i>{{ _('I2PTunnel development, ministreaming library') }}</i></td>
+</tr>
+<tr>
+ <td valign="top">jrandom</td>
+ <td valign="top"><i>{{ _('Project lead, Syndie lead') }}</i></td>
+</tr>
+<tr>
+ <td valign="top">Complication</td>
+ <td valign="top"><i>{{ _('Project lead, Syndie lead, I2Phex, support guru') }}</i></td>
+</tr>
+<tr>
+ <td valign="top">mkvore</td>
+ <td valign="top"><i>{{ _('iMule lead') }}</i></td>
+</tr>
+<tr>
+ <td valign="top">redzara</td>
+ <td valign="top"><i>{{ _('I2Phex work') }}</i></td>
+</tr>
+<tr>
+ <td valign="top">striker</td>
+ <td valign="top"><i>{{ _('I2Phex work') }}</i></td>
+</tr>
+<tr>
+ <td valign="top">legion</td>
+ <td valign="top"><i>{{ _('I2Phex work') }}</i></td>
+</tr>
+<tr>
+ <td valign="top">Connely</td>
+ <td valign="top"><i>{{ _('Python SAM library, attack simulations') }}</i></td>
+</tr>
+<tr>
+ <td valign="top">mastiejaner</td>
+ <td valign="top"><i>{{ _('i2pmail development') }}</i></td>
+</tr>
+<tr>
+ <td valign="top">dust</td>
+ <td valign="top"><i>{{ _('Syndie help') }}</i></td>
+</tr>
+<tr>
+ <td valign="top">susi23</td>
+ <td valign="top"><i>{{ _('i2p mail,susimail and susidns apps') }}</i></td>
+</tr>
+<tr>
+ <td valign="top">sirup</td>
+ <td valign="top"><i>{{ _('I2Phex (port of Phex to I2P)') }}</i></td>
+</tr>
+<tr>
+ <td valign="top">Ragnarok</td>
+ <td valign="top"><i>{{ _('addressbook,i2p-bt,syndie client') }}</i></td>
+</tr>
+<tr>
+ <td valign="top">duck</td>
+ <td valign="top"><i>{{ _('organize and develop the i2p-bt BitTorrent port') }}</i></td>
+</tr>
+<tr>
+ <td valign="top">Ragnarok</td>
+ <td valign="top"><i>{{ _('addressbook, i2p-bt, syndie client development') }}</i></td>
+</tr>
+<tr>
+ <td valign="top">thecrypto</td>
+ <td valign="top"><i>{{ _('encryption and signature routines, I2PIM') }}</i></td>
+</tr>
+<tr>
+ <td valign="top">aum</td>
+ <td valign="top"><i>{{ _('SAM jython code, work on stasher (DHT) and v2v (VoI2P)') }}</i></td>
+</tr>
+<tr>
+ <td valign="top">hypercubus</td>
+ <td valign="top"><i>{{ _('installer, systray, bogobot') }}</i></td>
+</tr>
+<tr>
+ <td valign="top">ugha</td>
+ <td valign="top"><i>{{ _('jbigi development, wiki migration, doc cleanup') }}</i></td>
+</tr>
+<tr>
+ <td valign="top">oOo</td>
+ <td valign="top"><i>{{ _('java debugging and client development on I2PTunnel and the router console') }}</i></td>
+</tr>
+<tr>
+ <td valign="top">BrianR</td>
+ <td valign="top"><i>{{ _('SAM perl module') }}</i></td>
+</tr>
+<tr>
+ <td valign="top">eco</td>
+ <td valign="top"><i>{{ _('i2psnark work') }}</i></td>
+</tr>
+<tr>
+ <td valign="top">shendaras</td>
+ <td valign="top"><i>{{ _('java cleanup') }}</i></td>
+</tr>
+<tr>
+ <td valign="top">JAnonymous</td>
+ <td valign="top"><i>{{ _('docs. wiki migration') }}</i></td>
+</tr>
+<tr>
+ <td valign="top">jar</td>
+ <td valign="top"><i>{{ _('translations into French') }}</i></td>
+</tr>
+<tr>
+ <td valign="top">scintilla</td>
+ <td valign="top"><i>{{ _('C port of jcpuid') }}</i></td>
+</tr>
+<tr>
+ <td valign="top">smeghead</td>
+ <td valign="top"><i>{{ _('C# SAM library, pants, fortuna integration') }}</i></td>
+</tr>
+<tr>
+ <td valign="top">Nightblade</td>
+ <td valign="top"><i>{{ _('libSAM') }}</i></td>
+</tr>
+<tr>
+ <td valign="top">dinoman</td>
+ <td valign="top"><i>{{ _('i2p-bt tracker development') }}</i></td>
+</tr>
+<tr>
+ <td valign="top">DrWoo</td>
+ <td valign="top"><i>{{ _('i2p-bt tracker development') }}</i></td>
+</tr>
+<tr>
+ <td valign="top">dr|z3d</td>
+ <td valign="top"><i>{{ _('Console and website themes') }}</i></td>
+</tr>
+ <td valign="top">walking</td>
+ <td valign="top"><i>Chinese translation</i></td>
+</tr>
+<tr>
+ <td valign="top">monkeybrains</td>
+ <td valign="top"><i>Dutch translation</i></td>
+</tr>
+<tr>
+ <td valign="top">magma</td>
+ <td valign="top"><i>French translation</i></td>
+</tr>
+<tr>
+ <td valign="top">eche|on, mixxy</td>
+ <td valign="top"><i>German translation</i></td>
+</tr>
+<tr>
+ <td valign="top">rus, 4get, slow</td>
+ <td valign="top"><i>Russian translation</i></td>
+</tr>
+<tr>
+ <td valign="top">user</td>
+ <td valign="top"><i>Spanish translation</i></td>
+</tr>
+<tr>
+ <td valign="top">thelastcode, hamada</td>
+ <td valign="top"><i>Arabic translation</i></td>
+</tr>
+<tr>
+ <td valign="top" colspan="2">{% trans %}… and many others{% endtrans %}</td>
+</tr>
+<tr>
+ <td><a href="site_url(about/hall-of-fame)">Hall of Fame!</a></td>
+</tr>
+</table>
+
{% endblock %}
diff --git a/i2p2www/pages/site/docs/api/bob.html b/i2p2www/pages/site/docs/api/bob.html
index c17636072692d9f6118bca33a3e7899c93d8d270..69556e551edc611390b1fa1474eb9ac4247c7f9f 100644
--- a/i2p2www/pages/site/docs/api/bob.html
+++ b/i2p2www/pages/site/docs/api/bob.html
@@ -256,7 +256,7 @@ telnet <- ear <- i2p <- mouth <-----------'
{% endhighlight %}
<p>{% trans -%}
-You can connect to EEPSITES too!
+You can connect to I2P SITES too!
{%- endtrans %}</p>
{% highlight lang='text' %}
@@ -289,7 +289,7 @@ $
{% endhighlight %}
<p>{% trans -%}
-Pretty cool isn't it? Try some other well known EEPSITES if you like, nonexistent ones,
+Pretty cool isn't it? Try some other well known I2P SITES if you like, nonexistent ones,
etc, to get a feel for what kind of output to expect in different situations.
For the most part, it is suggested that you ignore any of the error messages.
They would be meaningless to the application, and are only presented for human debugging.
diff --git a/i2p2www/pages/site/docs/api/i2ptunnel.html b/i2p2www/pages/site/docs/api/i2ptunnel.html
index 71db823c2667aa0de0396b614083e909ef5777e4..c8a8152702dbc208380c7132d68365708f283063 100644
--- a/i2p2www/pages/site/docs/api/i2ptunnel.html
+++ b/i2p2www/pages/site/docs/api/i2ptunnel.html
@@ -25,7 +25,7 @@ A web interface for I2PTunnel management is avaliable on
on <a href="http://localhost:7658">localhost:7658</a> for convenient and quick hosting on I2P.
<br>The document root is:{% endtrans %}
<br><b>Unix</b> - $HOME/.i2p/eepsite/docroot
-<br><b>Windows</b> - %LOCALAPPDATA%\I2P\eepsite\docroot, which expands to: C:\Users\**username**\AppData\Local\I2P\eepsite\docroot
+<br><b>Windows</b> - %LOCALAPPDATA%\I2P\I2P Site\docroot, which expands to: C:\Users\**username**\AppData\Local\I2P\I2P Site\docroot
</li>
</ul>
<h3 id="default-client-tunnels">{% trans %}Client tunnels{% endtrans %}</h3>
@@ -177,7 +177,7 @@ Accept-encoding: x-i2p-gzip, replies with Content-encoding: x-i2p-gzip in such a
<p>{% trans -%}
Functions as both a I2PTunnel HTTP Server, and a I2PTunnel HTTP client with no outproxying
capabilities. An example application would be a web application that does client-type
-requests, or loopback-testing an eepsite as a diagnostic tool.
+requests, or loopback-testing an I2P Site as a diagnostic tool.
{%- endtrans %}</p>
<h3 id="server-mode-irc">IRC Server</h3>
diff --git a/i2p2www/pages/site/docs/applications/embedding.html b/i2p2www/pages/site/docs/applications/embedding.html
index 00eaf0fb01260033799506ec6f8988731d52d6be..aa667e2b5d82b8bf4829d8dd7d8f6eb097f23e38 100644
--- a/i2p2www/pages/site/docs/applications/embedding.html
+++ b/i2p2www/pages/site/docs/applications/embedding.html
@@ -309,7 +309,7 @@ It could cause great harm both to our network and our reputation.
<h3>{% trans %}Join Us{% endtrans %}</h3>
<p>{% trans -%}
-This may be obvious, but join the community. Run I2P 24/7. Start an eepsite about your project.
+This may be obvious, but join the community. Run I2P 24/7. Start an I2P Site about your project.
Hang out in IRC #i2p-dev. Post on the forums. Spread the word.
We can help get you users, testers, translators, or even coders.
{%- endtrans %}</p>
diff --git a/i2p2www/pages/site/docs/applications/gitlab.html b/i2p2www/pages/site/docs/applications/gitlab.html
index 2299a7f1fd3c7ab103608528aa41ead6a8db9325..62d79d073d7560c8b41b08811a673375d30bc5c9 100644
--- a/i2p2www/pages/site/docs/applications/gitlab.html
+++ b/i2p2www/pages/site/docs/applications/gitlab.html
@@ -4,7 +4,7 @@
{% block accuratefor %}0.9.47{% endblock %}
{% block content %}
<h1 id="gitlab-over-i2p-setup">{% trans -%}Gitlab over I2P Setup{%- endtrans %}</h1>
-<div class="meta" data-author="idk" data-date="2020-03-16" data-excerpt="{% trans -%}Mirror I2P Git repositories and Bridge Clearnet repositories for others.{%- endtrans %}">
+<div class="meta" data-author="idk" data-date="2020-03-16" data-excerpt="{% trans -%}Mirror I2P Git repositories and Bridge Non-private internet.repositories for others.{%- endtrans %}">
</div>
<p>{% trans -%} This is the setup process I use for configuring Gitlab and I2P, with Docker in place to manage the service itself. Gitlab is very easy to host on I2P in this fashion, it can be administered by one person without much difficulty. In my configuration, I use a Debian VM to host docker containers and an I2P router, on a Debian Host system, however, this may be more than necessary for some people. These instructions should work on any Debian-based system, regardless of whether it is in a VM or not, and should easily translate to any system where Docker and an I2P router are available. This guide starts at Docker and does not assume any VM underneath. {%- endtrans %}</p>
diff --git a/i2p2www/pages/site/docs/applications/supported.html b/i2p2www/pages/site/docs/applications/supported.html
deleted file mode 100644
index 3faab028e471f5a0075c27df246d456c335f7a41..0000000000000000000000000000000000000000
--- a/i2p2www/pages/site/docs/applications/supported.html
+++ /dev/null
@@ -1,744 +0,0 @@
-{% extends "global/layout.html" %}
-{% block title %}{% trans %}Supported Applications{% endtrans %}{% endblock %}
-{% block content_nav %}
- <ul>
- <li><a href="#blogging-and-forums">{% trans %}Blogging, Forums, and Wikis{% endtrans %}</a></li>
-
- <li><a href="#decentralized-file-storage">{% trans %}Decentralized File Storage{% endtrans %}</a></li>
-
- <li>
- <a href="#development-tools">{% trans %}Development Tools{% endtrans %}</a>
-
- <ul>
- <li><a href="#version-control">{% trans %}Version control{% endtrans %}</a></li>
- </ul>
- </li>
-
- <li><a href="#domain-naming">{% trans %}Domain Naming{% endtrans %}</a></li>
-
- <li><a href="#email">{% trans %}Email{% endtrans %}</a></li>
-
- <li>
- <a href="#file-sharing">{% trans %}File Sharing{% endtrans %}</a>
-
- <ul>
- <li><a href="#bittorrent-clients">{% trans %}BitTorrent clients{% endtrans %}</a></li>
-
- <li><a href="#bittorrent-trackers-and-indexers">{% trans %}BitTorrent trackers and indexers{% endtrans %}</a></li>
-
- <li><a href="#ed2k">ED2K</a></li>
-
- <li><a href="#gnutella">Gnutella</a></li>
- </ul>
- </li>
-
- <li>
- <a href="#network-administration">{% trans %}Network Administration{% endtrans %}</a>
-
- <ul>
- <li><a href="#general-purpose-socket-utilities">{% trans %}General-purpose socket utilities{% endtrans %}</a></li>
-
- <li><a href="#sshscpsftp">SSH/SCP/SFTP</a></li>
- </ul>
- </li>
-
- <li>
- <a href="#real-time-chat">{% trans %}Real-time Chat{% endtrans %}</a>
-
- <ul>
- <li><a href="#instant-messaging-clients">{% trans %}Instant messaging clients{% endtrans %}</a></li>
-
- <li><a href="#irc-clients">{% trans %}IRC clients{% endtrans %}</a></li>
-
- <li><a href="#irc-servers">{% trans %}IRC servers{% endtrans %}</a></li>
- </ul>
- </li>
-
- <li>
- <a href="#web-browsing">{% trans %}Web Browsing{% endtrans %}</a>
-
- <ul>
- <li><a href="#anonymous-websites">{% trans %}Anonymous websites{% endtrans %}</a></li>
-
- <li><a href="#proxy-software">{% trans %}Proxy software{% endtrans %}</a></li>
-
- <li><a href="#inproxies">{% trans %}Inproxies{% endtrans %}</a></li>
-
- <li><a href="#outproxies">{% trans %}Outproxies{% endtrans %}</a></li>
- </ul>
- </li>
-
- <li>
- <a href="#website-hosting">{% trans %}Website Hosting{% endtrans %}</a>
-
- <ul>
- <li><a href="#web-servers">{% trans %}Web servers{% endtrans %}</a></li>
- </ul>
- </li>
- </ul>
-{% endblock %}
-
-{% block content %}
-<p>{% trans trac='https://trac.i2p2.de/report/1' -%}
-This is intended to be a comprehensive listing of applications used with
-I2P. If you know of something that's missing please submit a ticket on
-<a href="{{trac }}">Trac</a>, and be sure to select the
-“www†component in the submission form.
-{%- endtrans %}</p>
-
-<p>{% trans %}
-Supported applications are tagged with one or more of the following:
-{%- endtrans %}</p>
-
-<dl>
- <dt><em>{{ _('bundled') }}</em></dt>
-
- <dd>
- <p>{% trans -%}
-<em>Bundled application</em> — I2P ships with a few officially
-supported applications that let new users take immediate advantage of
-some of I2P's more useful capabilities.
-{%- endtrans %}</p>
- </dd>
-</dl>
-<dl>
- <dt><em>{{ _('plugin') }}</em></dt>
-
- <dd>
- <p>{% trans plugins=('stats.i2p/i2p/plugins/') -%}
-<em>Third-party plugin</em> — I2P's plugin system provides convenient
-deployment of I2P-enabled applications and allows tighter integration
-with the router. Plugins are [reviewed by the community](<a href=
-"http://{{ plugins }}">http://{{ plugins }}</a>) to identify security and
-anonymity issues.
-{%- endtrans %}</p>
- </dd>
-</dl>
-
-<dl>
- <dt><em>{{ _('standalone') }}, {{ _('standalone/mod') }}</em></dt>
-
- <dd>
- <p>{% trans -%}
-<em>Third-party standalone application</em> — Many standard network
-applications only require careful setup and configuration to communicate
-anonymously over I2P. These are tagged with <em>standalone</em>. Some
-applications, tagged with <em>standalone/mod</em>, require patching to
-function properly over I2P or to prevent inadvertent disclosure of
-identifying information such as the user's hostname or external IP
-address.
-{%- endtrans %}</p>
- </dd>
-</dl>
-
-<dl>
- <dt><em>{{ _('service') }}</em></dt>
-
- <dd>
- <p>{% trans -%}
-<em>Third-party essential network service</em> — Services which on
-the I2P network are analogous to those provided on the public Internet
-by hosting providers, ISPs, and Google: eepsite indexes and jump
-services, search engines, email, DNS-style name services, hosting,
-proxies, etc. These services focus on boosting the usefulness of the
-network as a whole, and making network content more discoverable.
-{%- endtrans %}</p>
- </dd>
-</dl>
-<dl>
-
- <dt><em>{{ _('unmaintained') }}</em></dt>
-
- <dd>
- <p>{% trans -%}
-<em>Unmaintained</em> — This is used to tag plugins, applications,
-and services which appear to be unmaintained and may be removed from
-this listing in the future.
-{%- endtrans %}</p>
- </dd>
-</dl>
-
-<p><strong>{% trans threatmodel=site_url('docs/how/threat-model') -%}
-Warning: Using an application, plugin, or service with I2P
-doesn't automatically protect your anonymity. I2P is merely a set of tools
-which can help you mitigate certain <a href="{{ threatmodel }}">identified
-threats to anonymity</a>. We do not and cannot make any guarantees about the
-safety of the applications, plugins, and services listed below. Most
-applications and plugins must be properly configured, and some will need to
-be patched — and even then your anonymity might not be assured. Similarly,
-services could put your anonymity at risk, either by design or through
-carelessness on their part or your own.
-{%- endtrans %}</strong></p>
-
-<p><strong>{% trans -%}
-If you have doubts about the suitability of an application,
-plugin, or service for use with I2P, you are urged to inquire about privacy
-issues with its maintainers, to search its mailing lists and bug tracker if
-one exists, and consult trusted, knowledgeable members of the I2P
-community.
-{%- endtrans %}</strong></p>
-
-<p><strong>{% trans -%}
-Take responsibility for your own anonymity and safety — always
-seek expert advice, educate yourself, practice good judgment, be mindful of
-disclosing personally identifying information, and don't take
-shortcuts.
-{%- endtrans %}</strong></p>
-
-<h3 id="blogging-and-forums"><a href="#TOC">{% trans %}Blogging, Forums, and Wikis{% endtrans %}</a></h3>
-
-<ul>
- <!-- let's disable this for now, at least, since it's nearly impossible to
- find configuration instructions; plus, there certainly isn't a plugin
- available for this.
- <li>
- <p><a href="http://www.blojsom.com/blog/"><strong>Blojsom</strong></a> —
- Lightweight blogging platform.
- <sup><em>[{{ _('plugin') }}, {{ _('standalone/mod') }}]</em></sup></p>
- </li>
- -->
-
- <li>
- <p><a href="https://github.com/trevorturk/eldorado/"><strong>El Dorado</strong></a> —
- {% trans %}Lightweight forum software.{% endtrans %}
- <sup><em>[{{ _('standalone/mod') }}]</em></sup></p>
- </li>
-
- <li>
- <p><a href="http://pebble.sourceforge.net/"><strong>Pebble</strong></a> —
- {% trans %}Another lightweight blogging platform.{% endtrans %}
- <sup><em>[{{ _('plugin') }}, {{ _('standalone/mod') }}]</em></sup></p>
- </li>
-
- <li>
- <p><a href="https://www.phpbb.com/"><strong>phpBB</strong></a> —
- {% trans %}Most popular open source forum software.{% endtrans %}
- <sup><em>[{{ _('standalone/mod') }}]</em></sup></p>
- </li>
-
- <li>
- <p><a href="http://syndie.de/"><strong>Syndie</strong></a> —
- {% trans %}Distributed forums software, originally developed by jrandom.{% endtrans %}
- <sup><em>[{{ _('plugin') }}, {{ _('standalone') }}, {{ _('unmaintained') }}]</em></sup></p>
- </li>
- <li>
- <p><a href="http://jamwiki.org"><strong>JAMWiki</strong></a> —
-{% trans plugins=i2pconv('plugins.i2p') -%}
-A Java-based MediaWiki clone. No external database needed.
-Plugin available <a href="http://{{ plugins }}/plugins/jamwiki">here</a>.
-{%- endtrans %}
- <sup><em>[{{ _('standalone') }}, {{ _('plugin') }}]</em></sup></p>
- </li>
-</ul>
-
-<h3 id="decentralized-file-storage"><a href="#TOC">{% trans %}Decentralized File Storage{% endtrans %}</a></h3>
-
-<ul>
- <li><a href="http://echelon.i2p/tahoelafs/"><strong>Tahoe-LAFS-I2P</strong></a> —
-{% trans stats=i2pconv('stats.i2p') -%}
-Port of the <a href="http://tahoe-lafs.org/"><strong>Tahoe-LAFS</strong></a>
-distributed file system to the I2P network. Controller plugin <a href=
-"http://{{ stats }}/i2p/plugins/">here</a>.
-{%- endtrans %}
- <sup><em>[{{ _('plugin') }}, {{ _('standalone') }}]</em></sup></li>
-</ul>
-
-<h3 id="development-tools"><a href="#TOC">{% trans %}Development Tools{% endtrans %}</a></h3>
-
-<h4 id="version-control"><a href="#TOC">{% trans %}Version control{% endtrans %}</a></h4>
-
-<ul>
- <li>
- <p><a href="http://git-scm.com/"><strong>Git</strong></a> —
- {% trans %}Most popular distributed version control system.{% endtrans %}
- <sup><em>[{{ _('standalone') }}]</em></sup></p>
- </li>
-
- <li>
- <p><a href="http://www.monotone.ca/"><strong>Monotone</strong></a> —
-{% trans monotone=site_url('get-involved/guides/monotone') -%}
-Another distributed version control system. Currently
-<a href="{{ monotone }}">used in I2P development</a>.
-{%- endtrans %}
- <sup><em>[{{ _('standalone') }}]</em></sup></p>
- </li>
-</ul>
-
-<h3 id="domain-naming"><a href="#TOC">{% trans %}Domain Naming{% endtrans %}</a></h3>
-
-<ul>
- <li><a href="http://127.0.0.1:7657/susidns/"><strong>susidns</strong></a> —
-{% trans naming=site_url('docs/naming') -%}
-Provides management of addressbooks, which are part of a simple,
-user-controlled <a href="{{ naming }}">I2P naming system</a> somewhat
-analogous to the Internet's Domain Name System (DNS). Addressbooks map
-Base64 destinations to short, usually human-readable “domain†names ending
-with a .i2p suffix which the I2P router's HTTP client can resolve back to
-Base64 addresses. (<em>Note:</em> While Base64 destinations are globally
-unique, addressbook “domain†names only resolve to unique destinations
-locally.)
-{%- endtrans %}
- <sup><em>[{{ _('bundled') }}]</em></sup>
- </li>
-</ul>
-
-<h3 id="email"><a href="#TOC">{% trans %}Email{% endtrans %}</a></h3>
-
-<ul>
- <li>
- <p><a href="http://{{ i2pconv('bote.i2p') }}/"><strong>I2P-Bote</strong></a> —
-{% trans -%}
-Serverless peer-to-peer email application using a distributed hash table
-(DHT) for secure mail storage.
-{%- endtrans %}
- <sup><em>[{{ _('plugin') }}]</em></sup></p>
- </li>
-
- <li>
- <p><a href="http://{{ i2pconv('hq.postman.i2p') }}/"><strong>Postman's anonymous email service</strong></a> —
-{% trans -%}
-Provides email service within the I2P network via @mail.i2p addresses,
-and email gateway service between the I2P network and the public Internet
-via @i2pmail.org addresses. One of the oldest continuous services on I2P.
-{%- endtrans %}
- <sup><em>[{{ _('service') }}]</em></sup></p>
- </li>
-
- <li>
- <p><a href="http://127.0.0.1:7657/susimail/susimail"><strong>susimail</strong></a> —
-{% trans -%}
-Simple web browser-based email interface. Configured to use Postman's
-email service by default.
-{%- endtrans %}
- <sup><em>[{{ _('bundled') }}]</em></sup></p>
- </li>
-
- <li>
- <p><strong>Sylpheed Claws, Thunderbird, other MUAs</strong> —
-{% trans reviews='http://'+i2pconv('hq.postman.i2p')+'/?page_id=9',
-smtp='http://'+i2pconv('hq.postman.i2p')+'/?page_id=10',
-pop3='http://'+i2pconv('hq.postman.i2p')+'/?page_id=11' -%}
-Can be configured to use Postman's email service. See
-<a href="{{ reviews}}">this comparison of MUAs</a>,
-and configuration settings for
-<a href="{{ smtp }}">SMTP</a> and <a href="{{ pop3 }}">POP3</a>.
-{%- endtrans %}
- <sup><em>[{{ _('standalone') }}]</em></sup></p>
- </li>
-</ul>
-
-<h3 id="file-sharing"><a href="#TOC">{% trans %}File Sharing{% endtrans %}</a></h3>
-
-<h4 id="bittorrent-clients"><a href="#TOC">{% trans %}BitTorrent clients{% endtrans %}</a></h4>
-
-<ul>
- <li>
- <p><a href="http://127.0.0.1:7657/i2psnark/"><strong>I2PSnark</strong></a> —
- {% trans %}I2P's integrated BitTorrent client.{% endtrans %}
- <sup><em>[{{ _('bundled') }}]</em></sup></p>
- </li>
-
- <li>
- <p><a href="http://echelon.i2p/i2psnarkxl"><strong>I2PSnarkXL</strong></a> —
- {% trans %}Modified version of I2PSnark, no more supported neither
- functional.{% endtrans %}
- <sup><em>[{{ _('standalone') }}]</em></sup></p>
- </li>
-
- <li>
- <p><a href="http://{{ i2pconv('bob.i2p') }}/Robert.html"><strong>Robert</strong></a> —
-{% trans %}
-A fork of rufus that uses the Basic Open Bridge (BOB) and has many
-improvements, including using the latest wxwidgets and python. It also
-supports use of seedless if installed for trackerless torrents and
-magnet-link like fetching of torrents within I2P.
-{% endtrans %}
- <sup><em>[{{ _('standalone') }}]</em></sup></p>
- </li>
-
- <li>
- <p><a href="http://www.transmissionbt.com/"><strong>Transmission</strong></a> —
-{% trans -%}
-Clean, full-featured cross-platform BitTorrent client with official
-ports for several GUI toolkits.
-{%- endtrans %}
- <sup><em>[{{ _('standalone/mod') }}]</em></sup></p>
- </li>
-
- <li>
- <p><a href="http://www.vuze.com//w/I2PHelper_HowTo"><strong>Azureus/Vuze</strong></a> —
- {% trans %}Has a plugin providing I2P support.{% endtrans %}
- <sup><em>[{{ _('standalone') }}]</em></sup></p>
- </li>
-</ul>
-
-<h4 id="bittorrent-trackers-and-indexers"><a href="#TOC">{% trans %}BitTorrent trackers and indexers{% endtrans %}</a></h4>
-
-<p>{% trans zzz=i2pconv('zzz.i2p') -%}
-For a detailed feature comparison of I2P-enabled trackers/indexers, see
-<a href="http://{{ zzz }}/files/trackers.html">here</a>.
-{%- endtrans %}</p>
-
-<ul>
- <li>
- <p><a href="http://{{ i2pconv('echelon.i2p') }}/tracker/"><strong>Bytemonsoon</strong></a> —
-{% trans -%}
-The code that powered one of the first major tracker/indexer sites on the
-Internet. Patched for I2P.
-{%- endtrans %}
- <sup><em>[{{ _('standalone/mod') }}]</em></sup></p>
- </li>
-
- <li>
- <p><a href="http://erdgeist.org/arts/software/opentracker/"><strong>opentracker</strong></a> —
-{% trans newdevs=site_url('get-involved/guides/new-developers') -%}
-Lightweight tracker/indexer. I2P mod available in the i2p.opentracker
-branch of the <a href="{{ newdevs }}">I2P Monotone repository</a>.
-{%- endtrans %}
- <sup><em>[{{ _('standalone/mod') }}]</em></sup></p>
- </li>
-
- <li>
- <p><a href="http://{{ i2pconv('stats.i2p') }}/i2p/plugins/"><strong>zzzot</strong></a> —
-{% trans zzz=i2pconv('zzz.i2p') -%}
-<a href="http://{{ zzz }}/">zzz's</a> Java-based open tracker. More info
-<a href="http://{{ zzz }}/topics/598?page=1#p2085">here</a>.
-{%- endtrans %}
- <sup><em>[{{ _('plugin') }}]</em></sup></p>
- </li>
-</ul>
-
-<h4 id="ed2k"><a href="#TOC">ED2K</a></h4>
-
-<ul>
- <li>
- <a href="http://www.imule.i2p"><strong>iMule</strong></a> —
- {% trans %}I2P port of the aMule ED2K client.{% endtrans %}
- <sup><em>[{{ _('standalone') }}]</em></sup></li>
-</ul>
-
-<h4 id="gnutella"><a href="#TOC">Gnutella</a></h4>
-
-<ul>
- <li>
- <p><a href="http://echelon.i2p/i2phex"><strong>I2Phex</strong></a> —
-{% trans stats=i2pconv('stats.i2p') -%}
-Port of the <a href="http://www.phex.org/mambo/">Phex</a> Gnutella client. Website
-for plugin version <a href="http://{{ stats }}/i2p/plugins/">here</a>.
-{%- endtrans %}
- <sup><em>[{{ _('plugin') }}, {{ _('standalone') }}]</em></sup></p>
- </li>
-
- <li>
- <p><a href="http://echelon.i2p/jwebcache"><strong>jwebcache</strong></a> —
-{% trans stats=i2pconv('stats.i2p') -%}
-Cache for Gnutella peers on I2P. Website for plugin version
-<a href="http://{{ stats }}/i2p/plugins/">here</a>.
-{%- endtrans %}
- <sup><em>[{{ _('plugin') }}, {{ _('standalone') }}]</em></sup></p>
- </li>
-</ul>
-
-<h3 id="network-administration"><a href="#TOC">{% trans %}Network Administration{% endtrans %}</a></h3>
-
-<h4 id="general-purpose-socket-utilities"><a href="#TOC">{% trans %}General-purpose socket utilities{% endtrans %}</a></h4>
-
-<ul>
- <li>
- <p><a href="https://cvsweb.openbsd.org/cgi-bin/cvsweb/src/usr.bin/nc/"><strong>netcat-openbsd</strong></a> —
-{% trans -%}
-OpenBSD's rewrite of the Unix standard tool, netcat, for socket relaying.
-Several clones, ports, and forks have appeared over the years.
-{%- endtrans %}
- <sup><em>[{{ _('standalone') }}]</em></sup></p>
- </li>
-
- <li>
- <p><a href="http://www.dest-unreach.org/socat/"><strong>socat</strong></a> —
- {% trans %}Like netcat but more powerful.{% endtrans %}
- <sup><em>[{{ _('standalone') }}]</em></sup></p>
- </li>
-
- <!--<li>
- <p><a href="http://tsocks.sourceforge.net/"><strong>tsocks</strong></a> —
- {% trans %}Proxy providing simple, transparent SOCKS-ification of network applications.{% endtrans %}
- <sup><em>[{{ _('standalone') }}]</em></sup></p>
- </li>-->
-</ul>
-
-<h4 id="sshscpsftp"><a href="#TOC">SSH/SCP/SFTP</a></h4>
-
-<ul>
- <li>
- <p><a href="http://www.openssh.com/"><strong>OpenSSH</strong></a> —
- {% trans %}Most popular implementation of the Secure Shell (SSH) protocol and related tools.{% endtrans %}
- <sup><em>[{{ _('standalone') }}]</em></sup></p>
- </li>
-
- <li>
- <p><a href="http://www.chiark.greenend.org.uk/~sgtatham/putty/"><strong>PuTTY</strong></a> —
- {% trans %}Open source Secure Shell (SSH) client for Windows.{% endtrans %}
- <sup><em>[{{ _('standalone') }}]</em></sup></p>
- </li>
-</ul>
-
-<h3 id="real-time-chat"><a href="#TOC">{% trans %}Real-time Chat{% endtrans %}</a></h3>
-
-<h4 id="instant-messaging-clients"><a href="#TOC">{% trans %}Instant messaging clients{% endtrans %}</a></h4>
-
-<ul>
- <li>
- <a href="http://echelon.i2p/qti2pmessenger"><strong>I2P Messenger</strong></a> —
- {% trans %}IM client with multiple incarnations, unsuported.{% endtrans %}
- <sup><em>[{{ _('standalone') }}]</em></sup>
- </li>
-</ul>
-
-<h4 id="irc-clients"><a href="#TOC">{% trans %}IRC clients{% endtrans %}</a></h4>
-
-<p>{% trans -%}
-Many IRC clients leak identifying information to servers or other
-clients, so I2P's IRC and SOCKS IRC client tunnels filter certain inbound
-and outbound messages to scrub data such as LAN IP addresses, external IP
-addresses, local hostnames, and the name and version of the IRC client. Two
-message types in particular, DCC and CTCP, can't be sufficiently anonymized
-without changes to the protocols or to IRC client/server code, so they are
-completely blocked, except for CTCP ACTION (the message emitted by the
-<code>/me</code> command) which isn't inherently dangerous.
-{%- endtrans %}</p>
-
-<p>{% trans -%}
-I2P's IRC filtering may not cover every possible leak — users should also
-check if their client is sending their real name or local username. Packet
-sniffers such as <a href="http://www.wireshark.org/">Wireshark</a> are
-useful here. Eliminating remaining leaks may be as simple as changing the
-client's default configuration. If that doesn't help, inform the I2P
-developers; they may be able to solve it via additional filtering.
-{%- endtrans %}</p>
-
-<ul>
- <li>
- <p><a href="http://www.oldschoolirc.com/"><strong>jIRCii</strong></a> —
-{% trans stats=i2pconv('stats.i2p') -%}
-Small Java-based IRC client. Plugin available <a href=
-"http://{{ stats }}/i2p/plugins/">here</a>.
-{%- endtrans %}
- <sup><em>[{{ _('plugin') }}, {{ _('standalone') }}]</em></sup></p>
- </li>
-
- <li>
- <p><a href="https://hexchat.github.io/"><strong>HexChat</strong></a> —
- {% trans %}Cross-platform graphical IRC client based on XChat.{% endtrans %}
- <sup><em>[{{ _('standalone') }}]</em></sup></p>
- </li>
-
- <li>
- <p><a href="http://www.irssi.org/"><strong>irssi</strong></a> —
- {% trans %}Unixy terminal-based IRC client.{% endtrans %}
- <sup><em>[{{ _('standalone') }}]</em></sup></p>
- </li>
-
- <li>
- <p><a href="http://www.weechat.org/"><strong>WeeChat</strong></a> —
- {% trans %}Another Unixy terminal-based IRC client.{% endtrans %}
- <sup><em>[{{ _('standalone') }}]</em></sup></p>
- </li>
-</ul>
-
-<h4 id="irc-servers"><a href="#TOC">{% trans %}IRC servers{% endtrans %}</a></h4>
-
-<ul>
- <li>
- <p><a href="http://ngircd.barton.de/index.php.en"><strong>ngIRCd</strong></a> —
- {% trans %}IRC server developed from scratch.{% endtrans %}
- <sup><em>[{{ _('standalone/mod') }}]</em></sup></p>
- </li>
-
- <li>
- <p><a href="http://www.unrealircd.com/"><strong>UnrealIRCd</strong></a> —
- {% trans %}Most popular IRC server.{% endtrans %}
- <sup><em>[{{ _('standalone/mod') }}]</em></sup></p>
- </li>
-</ul>
-
-<h3 id="web-browsing"><a href="#TOC">{% trans %}Web Browsing{% endtrans %}</a></h3>
-
-<h4 id="anonymous-websites"><a href="#TOC">{% trans %}Anonymous websites{% endtrans %}</a></h4>
-
-<ul>
- <li>
- <p><strong>Eepsites</strong> —
-{% trans -%}
-Any website hosted anonymously on I2P, reachable through the I2P router's HTTP proxy.
-{%- endtrans %}
- <sup><em>[{{ _('service') }}]</em></sup></p>
- </li>
-
- <li>
- <p><strong>Deepsites</strong> —
-{% trans -%}
-Distributed anonymous websites hosted
-using Tahoe-LAFS-I2P, currently only reachable with Tahoe-LAFS-I2P
-clients or through the Tahoe-LAFS-I2P HTTP proxy.
-{%- endtrans %}
- <sup><em>[{{ _('service') }}]</em></sup></p>
- </li>
-
- <li>
- <p><a href="http://{{ i2pconv('i2host.i2p') }}/"><strong>{{ i2pconv('i2host.i2p') }}</strong></a> —
-{% trans sponge=i2pconv('sponge.i2p') -%}
-Website for <a href="http://{{ sponge }}/">sponge's</a> jump service.
-Source code available.
-{%- endtrans %}
- <sup><em>[{{ _('service') }}]</em></sup></p>
- </li>
-
- <li>
- <p><a href="http://{{ i2pconv('i2jump.i2p') }}/"><strong>{{ i2pconv('i2jump.i2p') }}</strong></a> —
- {% trans %}Another jump service.{% endtrans %}
- <sup><em>[{{ _('service') }}]</em></sup></p>
- </li>
-
- <li>
- <p><a href="http://{{ i2pconv('identiguy.i2p') }}/"><strong>{{ i2pconv('identiguy.i2p') }}</strong></a> —
- {% trans %}Dynamically updated eepsite index.{% endtrans %}
- <sup><em>[{{ _('service') }}]</em></sup></p>
- </li>
-
- <li>
- <p><a href="http://{{ i2pconv('stats.i2p') }}/"><strong>{{ i2pconv('stats.i2p') }}</strong></a> —
- {% trans zzz=i2pconv('zzz.i2p') %}Website for <a href="http://{{ zzz }}/">zzz's</a> jump service.{% endtrans %}
- <sup><em>[{{ _('service') }}]</em></sup></p>
- </li>
-</ul>
-
-<h4 id="proxy-software"><a href="#TOC">{% trans %}Proxy software{% endtrans %}</a></h4>
-
-<ul>
- <li>
- <p><a href="http://www.pps.jussieu.fr/~jch/software/polipo/"><strong>Polipo</strong></a> —
- {% trans %}SOCKS-enabled caching web proxy with basic filtering capabilities.{% endtrans %}
- <sup><em>[{{ _('standalone') }}]</em></sup></p>
- </li>
-
- <li>
- <p><a href="http://www.privoxy.org/"><strong>Privoxy</strong></a> —
-{% trans -%}
-Privacy-focused non-caching web proxy with advanced filtering
-capabilities. Excels at removing ads and other junk.
-{%- endtrans %}
- <sup><em>[{{ _('standalone') }}]</em></sup></p>
- </li>
-
- <li>
- <p><a href="http://www.squid-cache.org/"><strong>Squid</strong></a> —
- {% trans %}Venerable caching web proxy.{% endtrans %}
- <sup><em>[{{ _('standalone') }}]</em></sup></p>
- </li>
-</ul>
-
-<h4 id="inproxies"><a href="#TOC">{% trans %}Inproxies{% endtrans %}</a></h4>
-
-<p>{% trans -%}
-Gateways allowing users on the public Internet to access eepsites.
-{%- endtrans %}</p>
-
-<ul>
- <li>
- <a href="http://i2p.to/"><strong>i2p.to</strong></a> —
-{% trans tino=i2pconv('tino.i2p') -%}
-<a href="http://{{ tino }}/">tino's</a> inproxy on the public Internet,
-currently out of service,
-{%- endtrans %}
- <sup><em>[{{ _('service') }}]</em></sup>
- </li>
-
-<!-- <li>
- <a href="http://i2p.us/"><strong>i2p.us</strong></a> —
-{% trans -%}
-Another inproxy on the public Internet.
-{%- endtrans %}
- <sup><em>[{{ _('service') }}]</em></sup>
- </li>
-
- <li>
- <a href="http://i2p.me/"><strong>i2p.me</strong></a> —
-
-{% trans -%}
-Another inproxy on the public Internet.
-{%- endtrans %}
- <sup><em>[{{ _('service') }}]</em></sup>
- </li>
- <a href="http://i2p.rocks/"><strong>i2p.rocks</strong></a> —
- -->
- {% trans -%}
- Another inproxy on the public Internet.
- {%- endtrans %}
- <sup><em>[{{ _('service') }}]</em></sup>
- </li>
-</ul>
-
-<h4 id="outproxies"><a href="#TOC">{% trans %}Outproxies{% endtrans %}</a></h4>
-
-<p>{% trans -%}
-Gateways allowing I2P users to access content hosted on the public Internet.
-{%- endtrans %}</p>
-
-<ul>
- <li>
- <strong>false.i2p</strong> —
- {% trans %}Publicly advertised outproxy running Squid, located in Europe.{% endtrans %}
- <sup><em>[{{ _('service') }}]</em></sup>
- </li>
-</ul>
-
-<h3 id="website-hosting"><a href="#TOC">{% trans %}Website Hosting{% endtrans %}</a></h3>
-
-<ul>
- <li>
- <a href="http://jetty.codehaus.org/jetty/"><strong>Jetty</strong></a> —
-{% trans -%}
-Lightweight web server and Java servlet container. I2P is tightly
-integrated with a bundled copy of Jetty which by default is configured to
-host the <a href="http://127.0.0.1:7658/">user's eepsite</a>. The bundled
-Jetty also serves the I2P router console and web applications bundled with
-I2P.
-{%- endtrans %}
- <sup><em>[{{ _('bundled') }}, {{ _('standalone') }}]</em></sup></li>
-</ul>
-
-<h4 id="web-servers"><a href="#TOC">{% trans %}Web servers{% endtrans %}</a></h4>
-
-<p>{% trans -%}
-In addition to Jetty, any web server should function over I2P without
-modification so long as it's HTTP-compliant. Some web servers known to
-currently serve content on the I2P network are:
-{%- endtrans %}</p>
-
-<ul>
- <li>
- <p><a href="http://httpd.apache.org/"><strong>Apache HTTP Server</strong></a> —
- {% trans %}Most popular web server on the public WWW.{% endtrans %}
- <sup><em>[{{ _('standalone') }}]</em></sup></p>
- </li>
-
- <li>
- <p><a href="http://tomcat.apache.org/"><strong>Apache Tomcat</strong></a> —
- {% trans %}Web server and Java servlet container. More features than Jetty.{% endtrans %}
- <sup><em>[{{ _('standalone') }}]</em></sup></p>
- </li>
-
- <li>
- <p><a href="http://www.lighttpd.net/"><strong>lighttpd</strong></a> —
- {% trans %}Fast lightweight web server.{% endtrans %}
- <sup><em>[{{ _('standalone') }}]</em></sup></p>
- </li>
-
- <li>
- <p><a href="http://nginx.org/"><strong>nginx</strong></a> —
- {% trans %}High-performance lightweight web server.{% endtrans %}
- <sup><em>[{{ _('standalone') }}]</em></sup></p>
- </li>
-</ul>
-<!-- vim: set noai nosi ft=html tw=79 et sw=4 ts=4 spell spelllang=en: -->
-{% endblock %}
diff --git a/i2p2www/pages/site/docs/discussions/naming.html b/i2p2www/pages/site/docs/discussions/naming.html
index 1ae02e26e26528076e1479203c8786fa11b05752..990ae24e23395479b4a0406dea51307962f048ad 100644
--- a/i2p2www/pages/site/docs/discussions/naming.html
+++ b/i2p2www/pages/site/docs/discussions/naming.html
@@ -147,7 +147,7 @@ provider, and as he likes to say, "trust is not a boolean".
The configuration step attempts to force users to think about issues of trust in an anonymous network.
{%- endtrans %}</p>
<p>{% trans -%}
-As another example, the "Eepsite Unknown" error page in the HTTP Proxy
+As another example, the "I2P Site Unknown" error page in the HTTP Proxy
lists some jump services, but doesn't "recommend" any one in particular,
and it's up to the user to pick one (or not).
jrandom would say we trust the listed providers enough to list them but not enough to
@@ -196,7 +196,7 @@ the issues of conflicts and hijacking, however.
<p>{% trans -%}
<b>Awkward, not real-time:</b>
It's a patchwork of hosts.txt providers, key-add web form providers, jump service providers,
-eepsite status reporters.
+I2P Site status reporters.
Jump servers and subscriptions are a pain, it should just work like DNS.
{%- endtrans %}</p>
<p>{% trans -%}
diff --git a/i2p2www/pages/site/docs/discussions/netdb.html b/i2p2www/pages/site/docs/discussions/netdb.html
index 55b8c9fcc2cda0af308eabc095720613bc322752..64345e4b1b1150923f1cf9f05f9e809ec4ab847c 100644
--- a/i2p2www/pages/site/docs/discussions/netdb.html
+++ b/i2p2www/pages/site/docs/discussions/netdb.html
@@ -161,7 +161,7 @@ the netDb.
I2P's netDb is very different from traditional load bearing DHTs - it only
carries network metadata, not any actual payload, which is why even a netDb
using a floodfill algorithm will be able to sustain an arbitrary amount of
-eepsite/IRC/bt/mail/syndie/etc data. We can even do some optimizations as I2P
+I2P Site/IRC/bt/mail/syndie/etc data. We can even do some optimizations as I2P
grows to distribute that load a bit further (perhaps passing bloom filters
between the netDb participants to see what they need to share), but it seems we
can get by with a much simpler solution for now.
@@ -299,7 +299,7 @@ The code now avoids peers that are shitlisted, failing, or not heard from in
half an hour, if possible.
</ol>
<p>
-One benefit is faster first contact to an eepsite (i.e. when you had to fetch
+One benefit is faster first contact to an I2P Site (i.e. when you had to fetch
the leaseset first). The lookup timeout is 10s, so if you don't start out by
asking a peer that is down, you can save 10s.
diff --git a/i2p2www/pages/site/docs/how/intro.html b/i2p2www/pages/site/docs/how/intro.html
index 0de9174c46bdfe6b4315832974375e2875eca85f..aabaf0a2bee3dff5cf1a4d61f6346812da720f14 100644
--- a/i2p2www/pages/site/docs/how/intro.html
+++ b/i2p2www/pages/site/docs/how/intro.html
@@ -25,7 +25,7 @@ even taken over to attempt more malicious attacks.
<p>{% trans i2ptunnel=site_url('docs/api/i2ptunnel') -%}
The network itself is message oriented - it is essentially a secure and anonymous IP layer, where
messages are addressed to cryptographic keys (Destinations) and can be significantly larger than IP
-packets. Some example uses of the network include "eepsites" (webservers hosting normal web
+packets. Some example uses of the network include "I2P Sites" (webservers hosting normal web
applications within I2P), a BitTorrent client ("I2PSnark"), or a distributed data store. With the
help of the <a href="{{ i2ptunnel }}">I2PTunnel</a> application, we are able to stream traditional
TCP/IP applications over I2P, such as SSH, IRC, a squid proxy, and even streaming audio. Most people
@@ -159,7 +159,7 @@ starting in August '03. I2P is currently under development, following the <a hre
{%- endtrans %}</p>
<h2>{% trans %}Who?{% endtrans %}</h2>
-<p>{% trans team=site_url('about/team') -%}
+<p>{% trans team=site_url('about/contact') -%}
We have a small <a href="{{ team }}">team</a> spread around several continents, working to advance
different aspects of the project. We are very open to other developers who want to get involved and
anyone else who would like to contribute in other ways, such as critiques, peer review, testing,
diff --git a/i2p2www/pages/site/docs/how/network-database.html b/i2p2www/pages/site/docs/how/network-database.html
index a2a44430e1953020c812a6f192d137cec4a4b59c..581c355df7e1c0914fa7dd8795a1751d507f6537 100644
--- a/i2p2www/pages/site/docs/how/network-database.html
+++ b/i2p2www/pages/site/docs/how/network-database.html
@@ -836,7 +836,7 @@ by creating a small number (8-15) of floodfill routers clustered closely in the
and distribute the RouterInfos for these routers widely.
Then, all lookups and stores for a key in that keyspace would be directed
to one of the attacker's routers.
-If successful, this could be an effective DOS attack on a particular eepsite, for example.
+If successful, this could be an effective DOS attack on a particular I2P Site, for example.
{%- endtrans %}</p>
<p>{% trans -%}
diff --git a/i2p2www/pages/site/docs/how/tech-intro.html b/i2p2www/pages/site/docs/how/tech-intro.html
index f5c38cf1ce1729e72e8ec777ba30a32cb734288d..2fcf7cde60f6e54ace3285144d75186ab132c8a1 100644
--- a/i2p2www/pages/site/docs/how/tech-intro.html
+++ b/i2p2www/pages/site/docs/how/tech-intro.html
@@ -100,7 +100,7 @@ usually a secret. What is hidden is information on what the user is doing,
if anything at all, as well as what router a particular destination is connected
to. End users will typically have several local destinations on their router
- for instance, one proxying in to IRC servers, another supporting the user's
-anonymous webserver ("eepsite"), another for an I2Phex instance, another for
+anonymous webserver ("I2P Site"), another for an I2Phex instance, another for
torrents, etc.
{%- endtrans %}</p>
@@ -904,7 +904,7 @@ system. It lets you create information, share it with others, and read posts
from those you're interested in, all while taking into consideration your
needs for security and anonymity. Rather than building its own content distribution
network, Syndie is designed to run on top of existing networks, syndicating
-content through eepsites, Tor hidden services, Freenet freesites, normal websites,
+content through I2P Sites, Tor hidden services, Freenet freesites, normal websites,
usenet newsgroups, email lists, RSS feeds, etc. Data published with Syndie
is done so as to offer pseudonymous authentication to anyone reading or archiving
it.
@@ -945,7 +945,7 @@ be sufficient for some users.
<p>{% trans -%}
I2PTunnel enables most of the applications in use. An "httpserver" pointing
-at a webserver lets anyone run their own anonymous website (or "eepsite")
+at a webserver lets anyone run their own anonymous website (or "I2P Site")
- a webserver is bundled with I2P for this purpose, but any webserver can
be used. Anyone may run a "client" pointing at one of the anonymously hosted
IRC servers, each of which are running a "server" pointing at their local
@@ -963,7 +963,7 @@ proxies to access the "server" instances pointing at an NNTP server.
<p>{% trans -%}
i2p-bt is a port of the mainline python BitTorrent client to run both the
tracker and peer communication over I2P. Tracker requests are forwarded through
-the eepproxy to eepsites specified in the torrent file while tracker responses
+the eepproxy to I2P Sites specified in the torrent file while tracker responses
refer to peers by their destination explicitly, allowing i2p-bt to open up
a <a href="#app.streaming">streaming lib</a> connection to query them for
blocks.
@@ -1041,7 +1041,7 @@ SMTP and POP3 servers - both the outproxies and inproxies communicate with
the mail.i2p SMTP and POP3 servers through I2P itself, so compromising those
non-anonymous locations does not give access to the mail accounts or activity
patterns of the user. At the moment the developers work on a decentralized
-mailsystem, called "v2mail". More information can be found on the eepsite
+mailsystem, called "v2mail". More information can be found on the I2P Site
<a href="http://{{ postman }}/">{{ postman }}</a>.
{%- endtrans %}</p>
diff --git a/i2p2www/pages/site/docs/how/threat-model.html b/i2p2www/pages/site/docs/how/threat-model.html
index 91881fdc84ffac0a9547fdaf2bfccfe02d769cd3..aa894e5b23820720798744ff565d8699be28bdf4 100644
--- a/i2p2www/pages/site/docs/how/threat-model.html
+++ b/i2p2www/pages/site/docs/how/threat-model.html
@@ -231,7 +231,7 @@ However, the attack is still possible, for example by an observer at
a large ISP or an Internet exchange point.
Those who want to defend against it
would want to take appropriate countermeasures, such as
-setting low bandwidth limits, and using unpublished or encrypted leasesets for eepsites.
+setting low bandwidth limits, and using unpublished or encrypted leasesets for I2P Sites.
Other countermeasures, such as nontrivial delays and restricted routes, are
not currently implemented.
{%- endtrans %}</p>
@@ -323,7 +323,7 @@ Limits on the number of tunnels routed through a single peer
Prevention of peers from the same /16 IP range from being members of a single tunnel
{%- endtrans %}</li>
<li>{% trans -%}
-For eepsites or other hosted services, we support
+For I2P Sites or other hosted services, we support
simultaneous hosting on multiple routers, or
<a href="#intersection">multihoming</a>
{%- endtrans %}</li>
diff --git a/i2p2www/pages/site/docs/naming.html b/i2p2www/pages/site/docs/naming.html
index ee12fd67031a948b220c24576753dd55ba42b87f..a1b8df318b486b7f3a32a5b28b8775c796566b1a 100644
--- a/i2p2www/pages/site/docs/naming.html
+++ b/i2p2www/pages/site/docs/naming.html
@@ -165,7 +165,7 @@ For more information see the <a href="{{ namingdiscussion }}#alternatives">alter
<p>{% trans -%}
The HTTP proxy does a lookup via the router for all hostnames ending in '.i2p'.
Otherwise, it forwards the request to a configured HTTP outproxy.
-Thus, in practice, all HTTP (eepsite) hostnames must end in the pseudo-Top Level Domain '.i2p'.
+Thus, in practice, all HTTP (I2P Site) hostnames must end in the pseudo-Top Level Domain '.i2p'.
{%- endtrans %}</p>
<p>{% trans i2ptld='https://datatracker.ietf.org/doc/draft-grothoff-iesg-special-use-p2p-names/',
@@ -337,7 +337,7 @@ See <a href="/spec/subscription">the specification</a> for details.
<h3>{% trans %}Outgoing Subscriptions{% endtrans %}</h3>
<p>{% trans -%}
Addressbook will publish the merged hosts.txt to a location
-(traditionally hosts.txt in the local eepsite's home directory) to be accessed by others
+(traditionally hosts.txt in the local I2P Site's home directory) to be accessed by others
for their subscriptions.
This step is optional and is disabled by default.
{%- endtrans %}</p>
diff --git a/i2p2www/pages/site/docs/ports.html b/i2p2www/pages/site/docs/ports.html
index 7131b0419218abb0548c884d2ed3cd3919b687f9..f0b298ad173fe4b4d2457610d9ca21175425edc0 100644
--- a/i2p2www/pages/site/docs/ports.html
+++ b/i2p2www/pages/site/docs/ports.html
@@ -44,7 +44,7 @@ in the 767x range.
<tr><td>7655</td><td>SAM Bridge (UDP)</td></tr>
<tr><td>7656</td><td>SAM Bridge (TCP)</td></tr>
<tr><td>7657</td><td>Router Console</td></tr>
-<tr><td>7658</td><td>Eepsite</td></tr>
+<tr><td>7658</td><td>I2P Site</td></tr>
<tr><td>7659</td><td>SMTP Proxy</td></tr>
<tr><td>7660</td><td>POP Proxy</td></tr>
<tr><td>7661</td><td>Pebble Plugin</td></tr>
@@ -54,7 +54,7 @@ in the 767x range.
<tr><td>7663</td><td>?? Plugin ??</td></tr>
<tr><td>7664</td><td>JAMWiki Plugin</td></tr>
<tr><td>7667</td><td>Router Console SSL</td></tr>
-<tr><td>7668</td><td>Eepsite SSL</td></tr>
+<tr><td>7668</td><td>I2P Site SSL</td></tr>
<tr><td>7669</td><td>Garlic Farm</td></tr>
<tr><td>7670</td><td>Git SSH</td></tr>
<tr><td></td><td><i>{% trans %}recommended spot for new plugins/applications{% endtrans %}</i></td></tr>
diff --git a/i2p2www/pages/site/docs/tunnels/unidirectional.html b/i2p2www/pages/site/docs/tunnels/unidirectional.html
index 4c96a8d9d3415341669a2d084ce18c5838fe8750..9096bdeadd41b96e4cf2d8012578ae1151e7241b 100644
--- a/i2p2www/pages/site/docs/tunnels/unidirectional.html
+++ b/i2p2www/pages/site/docs/tunnels/unidirectional.html
@@ -82,7 +82,7 @@ The paper's main point is that
deanonymizations on unidirectional tunnels take a longer time, which is an
advantage, but that an attacker can be more certain in the unidirectional case.
Therefore, the paper claims it isn't an advantage at all, but a disadvantage, at least
-with long-living eepsites.
+with long-living I2P Sites.
{%- endtrans %}</p>
<p>{% trans -%}
@@ -97,7 +97,7 @@ This conclusion is based on an arbitrary certainty vs. time weighting
(tradeoff) that may not be applicable in all cases. For
example, somebody could make a list of possible IPs then issue subpoenas to
each. Or the attacker could DDoS each in turn and via a simple
-intersection attack see if the eepsite goes down or is slowed down. So close
+intersection attack see if the I2P Site goes down or is slowed down. So close
may be good enough, or time may be more important.
{%- endtrans %}</p>
diff --git a/i2p2www/pages/site/faq.html b/i2p2www/pages/site/faq.html
index 0764190a6ac6bc830915e4bdd0f834009b17debb..58197f139e7f5d443f35e33fc8ec3d0c639170ce 100644
--- a/i2p2www/pages/site/faq.html
+++ b/i2p2www/pages/site/faq.html
@@ -3,42 +3,59 @@
{% block content_nav %}
<ol>
<li style="list-style: none; display: inline">
-<h4>{{ _('General') }}</h4>
+<h4>{{ _('I2P Router Help') }}</h4>
</li>
<li><a href="#systems">{% trans %}What systems will I2P run on?{% endtrans %}</a></li>
<li><a href="#java">{% trans %}Is installing Java required to use I2P?{% endtrans %}</a></li>
-<li><a href="#eepsite">{% trans %}Whats an "eepsite" and how do I configure my browser so I can use them?{% endtrans %}</a></li>
+<li><a href="#I2P Site">{% trans %}What is an "I2P Site" and how do I configure my browser so I can use them?{% endtrans %}</a></li>
<li><a href="#active">{% trans %}What do the Active x/y numbers mean in the router console?{% endtrans %}</a></li>
-<li><a href="#exit">{% trans %}Is my router an "exit node"(outproxy) to the regular Internet? I don't want it to be.{% endtrans %}</a></li>
-<li><a href="#netdb_ip">{% trans %}I see IP addresses of all other I2P nodes in the router console. Does that mean my IP address is visible by others?{% endtrans %}</a></li>
-<li><a href="#outproxy">{% trans %}I can't access regular Internet sites through I2P.{% endtrans %}</a></li>
-<li><a href="#proxy_safe">{% trans %}Is using an outproxy safe?{% endtrans %}</a></li>
+<li><a href="#peers">{% trans %}My router has very few active peers, is this OK?{% endtrans %}</a></li>
<li><a href="#badcontent">{% trans %}I am opposed to certain types of content. How do I keep from distributing, storing, or accessing them?{% endtrans %}</a></li>
+<li><a href="#blocking">{% trans %}Is it possible to block I2P?{% endtrans %}</a></li>
+<li><a href="#protocolfamily">{% trans %}In <code>wrapper.log</code> I see an error stating <code>Protocol family unavailable</code> when I2P is loading{% endtrans %}</a></li>
+<li><a href="#down">{% trans %}Most of the I2P Sites within I2P are down?{% endtrans %}</a></li>
+<li><a href="#port32000">{% trans %}Why is I2P listening for connections on port 32000?{% endtrans %}</a></li>
<li style="list-style: none; display: inline">
-<h4>{{ _('Getting Started') }}</h4>
+<h4>{{ _('Configuration') }}</h4>
</li>
<li><a href="#browserproxy">{% trans %}How do I configure my browser?{% endtrans %}</a></li>
<li><a href="#irc">{% trans %}How do I connect to IRC within I2P?{% endtrans %}</a></li>
-<li><a href="#myeepsite">{% trans %}How do I set up my own eepsite?{% endtrans %}</a></li>
+<li><a href="#myI2P Site">{% trans %}How do I set up my own I2P Site?{% endtrans %}</a></li>
+<li><a href="#hosting">{% trans %}If I host a website at I2P at home, containing only HTML and CSS, is it dangerous?{% endtrans %}</a></li>
+<li><a href="#addresses">{% trans %}How Does I2P find ".i2p" websites?{% endtrans %}</a></li>
+<li><a href="#addressbook">{% trans %}How do I add to the AddressBook?{% endtrans %}</a></li>
<li><a href="#ports">{% trans %}What ports does I2P use?{% endtrans %}</a></li>
<li><a href="#subscriptions">{% trans %}I'm missing lots of hosts in my addressbook. What are some good subscription links?{% endtrans %}</a></li>
<li><a href="#remote_webconsole">{% trans %}How can I access the web console from my other machines or password protect it?{% endtrans %}</a></li>
<li><a href="#remote_i2cp">{% trans %}How can I use applications from my other machines?{% endtrans %}</a></li>
<li><a href="#socks">{% trans %}Is it possible to use I2P as a SOCKS proxy?{% endtrans %}</a></li>
-<li><a href="#manual_reseed">{% trans %}How do I reseed manually?{% endtrans %}</a></li>
<li><a href="#proxy_other">{% trans %}How do I access IRC, BitTorrent, or other services on the regular Internet?{% endtrans %}</a></li>
-<li><a href="#https">{% trans %}I can't access https:// or ftp:// sites through I2P.{% endtrans %}</a></li>
<li style="list-style: none; display: inline">
-<h4>{{ _('Troubleshooting') }}</h4>
+<h4>{{ _('Reseeds') }}</h4>
</li>
-<li><a href="#cpu">{% trans %}My router is using too much CPU?!?{% endtrans %}</a></li>
<li><a href="#reseed">{% trans %}My router has been up for several minutes and has zero or very few connections{% endtrans %}</a></li>
+<li><a href="#manual_reseed">{% trans %}How do I reseed manually?{% endtrans %}</a></li>
+<li style="list-style: none; display: inline">
+<h4>{{ _('Privacy-Safety') }}</h4>
+</li>
+<li><a href="#exit">{% trans %}Is my router an "exit node"(outproxy) to the regular Internet? I don't want it to be.{% endtrans %}</a></li>
+<li><a href="#detection">{% trans %}Is it easy to detect the use of I2P by analyzing network traffic?{% endtrans %}</a></li>
+<li><a href="#safe">{% trans %}Is using I2P Safe?{% endtrans %}</a></li>
+<li><a href="#netdb_ip">{% trans %}I see IP addresses of all other I2P nodes in the router console. Does that mean my IP address is visible by others?{% endtrans %}</a></li>
+<li><a href="#proxy_safe">{% trans %}Is using an outproxy safe?{% endtrans %}</a></li>
+<li><a href="#deanon">{% trans %}What about "De-Anonymizing" attacks?{% endtrans %}</a></li>
+<li style="list-style: none; display: inline">
+<h4>Internet Access/Performance</h4>
+</li>
+<li><a href="#outproxy">{% trans %}I can't access regular Internet sites through I2P.{% endtrans %}</a></li>
+<li><a href="#https">{% trans %}I can't access https:// or ftp:// sites through I2P.{% endtrans %}</a></li>
+<li><a href="#cpu">{% trans %}Why is my router using too much CPU?{% endtrans %}</a></li>
<li><a href="#peers">{% trans %}My router has very few active peers, is this OK?{% endtrans %}</a></li>
<li><a href="#vary">{% trans %}My active peers / known peers / participating tunnels / connections / bandwidth vary dramatically over time! Is anything wrong?{% endtrans %}</a></li>
<li><a href="#slow">{% trans %}What makes downloads, torrents, web browsing, and everything else slower on I2P as compared to the regular internet?{% endtrans %}</a></li>
-<li><a href="#protocolfamily">{% trans %}In <code>wrapper.log</code> I see an error stating <code>Protocol family unavailable</code> when I2P is loading{% endtrans %}</a></li>
-<li><a href="#down">{% trans %}Most of the eepsites within I2P are down?{% endtrans %}</a></li>
-<li><a href="#port32000">{% trans %}Why is I2P listening for connections on port 32000?{% endtrans %}</a></li>
+<li style="list-style: none; display: inline">
+<h4>Bugs and Questions</h4>
+</li>
<li><a href="#bug">{% trans %}I think I found a bug, where can I report it?{% endtrans %}</a></li>
<li><a href="#question">{% trans %}I have a question!{% endtrans %}</a></li>
</ol>
@@ -46,7 +63,7 @@
{% block content %}
-<h2>General</h2>
+<h2>I2P Router Help</h2>
<h3 id="systems"><span class="permalink"><a href="#systems">
{% trans %}What systems will I2P run on?{% endtrans %}</a> </span></h3>
<p>{% trans java='https://en.wikipedia.org/wiki/Java_(programming_language)',
@@ -80,12 +97,12 @@ While the main I2P client implementation requires Java, there are several
<a href="{{ alt }}">alternative clients</a> which don't require Java.
{%- endtrans %}</p>
-<h3 id="eepsite"><span class="permalink"><a href="#eepsite">
-{% trans %}Whats an "eepsite"?{% endtrans %}</a></span>
+<h3 id="I2P Site"><span class="permalink"><a href="#I2P Site">
+{% trans %}What is an "I2P Site?"{% endtrans %}</a></span>
</h3>
-<p>{% trans -%}
-An eepsite is a website that is hosted anonymously, a hidden service which is accessible through your web browser.
-It can be accessed by setting your web browser's HTTP proxy to use the I2P web proxy (typically it listens on localhost port 4444), and browsing to the site.
+<p>{% trans browsers=site_url('about/browser-config') -%}
+Formerly called an eepSite, an I2P Site is a website that is hosted anonymously, a hidden service which is accessible through your web browser.
+It can be accessed by setting your web browser's HTTP proxy to use the I2P web proxy (typically it listens on localhost port 4444), and browsing to the site. Detailed instructions for configuring your browse can be found on the <a href="{{ browsers }}">browser configuration page</a>.
{%- endtrans %}</p>
<h3 id="active"><span class="permalink"><a href="#active">
@@ -96,70 +113,6 @@ x is the number of peers you've sent or received a message from successfully in
Try hovering your cursor over the other lines of information for a brief description.
{%- endtrans %}</p>
-<h3 id="exit"><span class="permalink"><a href="#exit">
-{% trans %}Is my router an "exit node" to the regular Internet? I don't want it to be.{% endtrans %}</a></span>
-</h3>
-<p>{% trans outproxy="http://"+i2pconv('i2pforum.i2p')+"/viewtopic.php?f=21&t=189" -%}
-No. Unlike <a href="https://www.torproject.org/">Tor</a>, "exit nodes" - or "outproxies" as they are referred to on the I2P network -
-are not an inherent part of the network.
-Only volunteers who specifically set up and run separate applications will relay traffic to the regular Internet.
-There are very, very few of these.
-
-By default, I2P's HTTP Proxy (configured to run on port 4444) includes a single outproxy: false.i2p. This is run on a voluntary basis by Meeh.
-
-There is an <a href="{{ outproxy }}">outproxy guide</a> available on our forums, if you would like to learn more about running an outproxy.
-{%- endtrans %}</p>
-
-<h3 id="netdb_ip"><span class="permalink"><a href="#netdb_ip">
-{% trans %}I see IP addresses of all other I2P nodes in the router console. Does that mean my IP address is visible by others?{% endtrans %}</a></span>
-</h3>
-<p>{% trans -%}
-Yes, and this is how a fully distributed peer-to-peer network works. Every node participates in routing packets for others, so your IP address must be known to establish connections.
-{%- endtrans %}</p>
-
-<p>{% trans -%}
-While the fact that your computer runs I2P is public, nobody can see your activities in it. You can't say if a user behind this IP address is sharing files, hosting a website, doing research or just running a node to contribute bandwidth to the project.
-{%- endtrans %}</p>
-
-<h3 id="outproxy"><span class="permalink"><a href="#outproxy">
-{% trans %}I can't access regular Internet sites through I2P.{% endtrans %}</a></span>
-</h3>
-<p>{% trans -%}
-I2P is primarily not intended, nor designed, to be used as a proxy to the regular internet.
-With that said, there are services which are provided by volunteers that act as proxies to clearnet based content - these are referred to as "outproxies" on the I2P network.
-There is an outproxy configured by default in I2P's HTTP client tunnel - false.i2p.
-While this service does currently exist, there is no guarantee that it will always be there as it is not an official service provided by the I2P project.
-If your main requirement from an anonymous network is the ability to access clearnet resources, we would recommend using <a href="https://www.torproject.org/">Tor</a>.
-{%- endtrans %}</p>
-
-<h3 id="proxy_safe"><span class="permalink"><a href="#proxy_safe">
-{% trans -%}Is using an outproxy safe?{% endtrans %}</a></span>
-</h3>
-<p>{% trans -%}
-I2P does not encrypt the Internet, neither does Tor - for example, through <a href="https://en.wikipedia.org/wiki/Transport_Layer_Security">Transport Layer Security (TLS)</a>.
-I2P and Tor both aim to transport your traffic as-is securely and anonymously over the corresponding network, to its destination.
-Any unencrypted traffic generated at your system will arrive at the outproxy (on I2P) or the exit node (on Tor) as unencrypted traffic.
-This means that you are vulnerable to snooping by the outproxy operators.
-One way to protect your outproxy traffic against this is to ensure that any traffic that will be handled by the outproxy is encrypted with TLS.
-{%- endtrans %}</p>
-
-<p>{% trans -%}
-For more information, you may read the Tor FAQ's answer to this question:
-<a href="https://www.torproject.org/docs/faq#CanExitNodesEavesdrop">https://www.torproject.org/docs/faq#CanExitNodesEavesdrop</a>
-{%- endtrans %}</p>
-
-<p>{% trans zzz=i2pconv('zzz.i2p'), i2pforum="http://"+i2pconv('i2pforum.i2p')+"/viewtopic.php?f=32&t=272" -%}
-In addition, you may be vulnerable to collusion between the outproxy operator
-and operators of other I2P services, if you use the same tunnels ("shared clients").
-There is additional discussion about this on <a href="http://{{ zzz }}/topics/217">{{ zzz }}</a>.
-This discussion has been <a href="{{ i2pforum }}">mirrored on our forums</a> as well.
-{%- endtrans %}</p>
-
-<p>{% trans threatmodel=site_url('docs/how/threat-model') %}
-Ultimately, this is a question that only you can answer because the correct answer depends on your browsing behaviour,
-your <a href="{{ threatmodel }}">threat model</a>, and how much you choose to trust the outproxy operator.
-{%- endtrans %}</p>
-
<h3 id="badcontent"><span class="permalink"><a href="#badcontent">
{% trans %}I am opposed to certain types of content. How do I keep from distributing, storing, or accessing them?{% endtrans %}</a></span>
</h3>
@@ -198,7 +151,63 @@ Your router will not request any content without your specific instruction to do
</li>
</ul>
-<h2>Getting Started</h2>
+<h3 id="blocking"><span class="permalink"><a href="#blocking">Is it possible to block I2P?</a></span></h3>
+<p>{% trans %}Yes, by far the easiest and most common way is by blocking bootstrap, or "Reseed" servers. Completely blocking all obfuscated traffic
+would work as well (although it would break many, many other things that are not I2P and most are not willing to go this far).
+In the case of reseed blocking, there is a reseed bundle on Github, blocking it will also block Github.
+You can reseed over a proxy (many can be found on Internet if you do not want to use Tor) or share reseed bundles on a friend-to-friend basis offline.{% endtrans %}</p>
+
+<h3 id="protocolfamily"><span class="permalink"><a href="#protocolfamily">
+{% trans %}In <code>wrapper.log</code> I see an error that states "<code>Protocol family unavailable</code>" when loading the Router Console{% endtrans %}</a></span>
+</h3>
+<p>{% trans -%}
+Often this error will occur with any network enabled java software on some systems that are configured to use IPv6 by default. There are a few ways to solve this:
+{%- endtrans %}</p>
+<ul>
+ <li>
+{% trans %}On Linux based systems, you can <code>echo 0 > /proc/sys/net/ipv6/bindv6only</code>{% endtrans %}
+</li>
+ <li>{% trans %}Look for the following lines in <code>wrapper.config</code>.{% endtrans %}<br />
+<code>#wrapper.java.additional.5=-Djava.net.preferIPv4Stack=true<br />
+ #wrapper.java.additional.6=-Djava.net.preferIPv6Addresses=false<br />
+</code><br />
+ {% trans %}If the lines are there, uncomment them by removing the "#"s. If the lines are not there, add them without the "#"s.{% endtrans %}
+ </li>
+</ul>
+{% trans -%}
+Another option would be to remove the <strong>::1</strong> from <code>~/.i2p/clients.config</code>
+{%- endtrans %}
+
+<p>{% trans -%}
+<strong>WARNING</strong>: For any changes to <code>wrapper.config</code> to take effect, you must completely
+stop the router and the wrapper. Clicking <em>Restart</em> on your
+router console will NOT reread this file! You must
+click <em>Shutdown</em>, wait 11 minutes, then start I2P.
+{%- endtrans %}</p>
+
+<h3 id="down"><span class="permalink"><a href="#down">
+{% trans %}Most of the I2P Sites within I2P are down?{% endtrans %}</a></span>
+</h3>
+<p>{% trans eepstatus='http://'+i2pconv('identiguy.i2p') -%}
+If you consider every I2P Site that has ever been created, yes, most of them are down.
+People and I2P Sites come and go.
+A good way to get started in I2P is check out a list of I2P Sites that are currently up.
+<a href="{{ eepstatus }}">{{ eepstatus }}</a> tracks active I2P Sites.
+{%- endtrans %}</p>
+
+<h3 id="port32000"><span class="permalink"><a href="#port32000">
+{% trans %}Why is I2P listening on port 32000?{% endtrans %}</a></span>
+</h3>
+<p>{% trans -%}
+The Tanuki java service wrapper that we use opens this port —bound to localhost— in order to communicate with software running inside the JVM.
+When the JVM is launched it is given a key so it can connect to the wrapper.
+After the JVM establishes its connection to the wrapper, the wrapper refuses any additional connections.
+{%- endtrans %}</p>
+<p>{% trans -%}
+More information can be found in the <a href="http://wrapper.tanukisoftware.com/doc/english/prop-port.html">wrapper documentation</a>.
+{%- endtrans %}</p>
+
+<h2>Configuration</h2>
<h3 id="browserproxy"><span class="permalink"><a href="#browserproxy">
{% trans %}How do I configure my browser?{% endtrans %}</a></span>
@@ -223,13 +232,29 @@ Weechat users can use the following command to add a new network:
</pre>
</code>
-<h3 id="myeepsite"><span class="permalink"><a href="#myeepsite">
-{% trans %}How do I set up my own eepsite?{% endtrans %}</a></span>
+<h3 id="myI2P Site"><span class="permalink"><a href="#myI2P Site">
+{% trans %}How do I set up my own I2P Site?{% endtrans %}</a></span>
</h3>
<p>{% trans -%}
Click on the <a href="http://localhost:7658/">Website</a> link at the top of your router console for instructions.
{%- endtrans %}</p>
+<h3 id="hosting">{% trans %}If I host a website at I2P at home, containing only HTML and CSS, is it dangerous?{% endtrans %}</h3>
+<p>{% trans %}If you're hosting a personal blog or doing something otherwise non-sensitive, then you are obviously in little danger.
+If you have privacy needs that are basically non-specific, you are in little danger. If you are hosting something sensitive, then
+your services will go down at the same time that your router goes down. Someone who observes your downtime and correlates it to
+real-world events could probably de-anonymize you with enough effort. I2P has defenses available against this like multihoming or
+Tahoe-LAFS, but they require additional set up and are only appropriate for some threat models. There is no magic solution, protecting
+yourself from a real threat will take real consideration in any case.{% endtrans %}</p>
+
+<h3 id="addresses">{% trans %}How Does I2P find ".i2p" websites? {% endtrans %}</h3>
+<p>The I2P Addressbook application maps human-readable names to long-term destinations, associated with services, making it more like a hosts file or a contact list than a network database or a DNS service. It's also local-first there is no recognized global namespace, you decide what any given .i2p domain maps to in the end. The middle-ground is something called a "Jump Service" which provides a human-readable name by redirecting you to a page where you will be asked "Do you give the I2P router permission to call $SITE_CRYPTO_KEY the name $SITE_NAME.i2p" or something to that effect. Once it's in your addressbook, you can generate your own jump URL's to help share the site with others. </p>
+
+<h3 id="addressbook">{% trans %}How do I add addresses to the Addressbook? {% endtrans %}</h3>
+<p>{% trans %}You cannot add an address without knowing at least the base32 or base64 of the site you want to visit. The "hostname" which is human-readable is only an alias for the cryptographic address, which corresponds to the base32 or base64. Without the cryptographic address, there is no way to access an I2P Site, this is by design. Distributing the address to people who do not know it yet is usually the responsibility of the Jump service provider. Visiting an I2P Site which is unknown will trigger the use of a Jump service. stats.i2p is the most reliable Jump service.{% endtrans %}</p>
+
+<p>{% trans %}If you're hosting a site via i2ptunnel, then it won't have a registration with a jump service yet. To give it a URL locally, then visit the configuration page and click the button that says "Add to Local Addressbook." Then go to http://127.0.0.1:7657/dns to look up the addresshelper URL and share it.{% endtrans %}</p>
+
<h3 id="ports"><span class="permalink"><a href="#ports">
{% trans %}What ports does I2P use?{% endtrans %}</a></span>
</h3>
@@ -415,7 +440,7 @@ These are described in detail below.
7658
</td>
<td>
- Your <a href="http://127.0.0.1:7658">eepsite</a>
+ Your <a href="http://127.0.0.1:7658">I2P Site</a>
</td>
<td>
{% trans -%}May be disabled in the <code>clients.config</code> file.
@@ -619,6 +644,121 @@ If you would like more information on the socks proxy application anyway,
there are some helpful hints on the <a href="{{ socks }}">socks page</a>.
{%- endtrans %}</p>
+<h3 id="proxy_other"><span class="permalink"><a href="#proxy_other">
+{% trans %}How do I access IRC, BitTorrent, or other services on the regular Internet?{% endtrans %}</a></span>
+</h3>
+<p>{% trans -%}
+Unless an outproxy has been specifically set up for the service you want to connect to, this cannot be done.
+There are only three types of outproxies running right now: HTTP, HTTPS, and email. Note that there is no SOCKS outproxy.
+If this type of service is required, we recommend that you use Tor.
+
+Please be aware that the Tor project <a href="https://blog.torproject.org/bittorrent-over-tor-isnt-good-idea">recommends against using BitTorrent over Tor</a>,
+as there are serious anonymity-related issues associated with doing so.
+{%- endtrans %}</p>
+
+<h2>Privacy and Safety</h2>
+
+<h3 id="exit"><span class="permalink"><a href="#exit">
+{% trans %}Is my router an "exit node" to the regular Internet? I don't want it to be.{% endtrans %}</a></span>
+</h3>
+<p>{% trans outproxy="http://"+i2pconv('i2pforum.i2p')+"/viewtopic.php?f=21&t=189" -%}
+No. Unlike <a href="https://www.torproject.org/">Tor</a>, "exit nodes" - or "outproxies" as they are referred to on the I2P network -
+are not an inherent part of the network.
+Only volunteers who specifically set up and run separate applications will relay traffic to the regular Internet.
+There are very, very few of these.
+
+By default, I2P's HTTP Proxy (configured to run on port 4444) includes a single outproxy: false.i2p. This is run on a voluntary basis by Meeh.
+
+There is an <a href="{{ outproxy }}">outproxy guide</a> available on our forums, if you would like to learn more about running an outproxy.
+{%- endtrans %}</p>
+
+<h3 id="safe"><span class="permalink"><a href="#safe">{% trans %}Is using I2P Safe?{% endtrans %}</a></span></h3>
+
+<p>Before you use I2P, use Basic Computer Hygiene Always! Apply your OS vendor provided software updates in a prompt manner. Be aware of the state of your firewall and anti-virus status if you use one. Always get your software from authentic sources.</p>
+
+<p>{% trans %}I2P strives to be safe in it's default configuration for all users.{% endtrans %}</p>
+
+<p>{% trans %} It may be dangerous to use I2P in what the project calls "Strict Countries" where the law may not be clear on anonymizing software and where risks are judged to be fairly high. Most I2P peers are not in those strict countries and the ones that are, are placed in "Hidden Mode" where they interact with the rest of the network in more limited ways, so that they are less visible to network observers.
+{% endtrans %}</p>
+
+<h3 id="netdb_ip"><span class="permalink"><a href="#netdb_ip">
+{% trans %}I see IP addresses of all other I2P nodes in the router console. Does that mean my IP address is visible by others?{% endtrans %}</a></span>
+</h3>
+<p>{% trans -%}
+Yes, and this is how a fully distributed peer-to-peer network works. Every node participates in routing packets for others, so your IP address must be known to establish connections.
+{%- endtrans %}</p>
+
+<p>{% trans -%}
+While the fact that your computer runs I2P is public, nobody can see your activities in it. You can't say if a user behind this IP address is sharing files, hosting a website, doing research or just running a node to contribute bandwidth to the project.
+{%- endtrans %}</p>
+
+<h3 id="detection"><span class="permalink"><a href="#detection">{% trans %}Is it easy to detect the use of I2P by analyzing network traffic?{% endtrans %}</a></span></h3>
+<p>{% trans %}It can be deduced that somebody is using the I2P network with some reliability, but it is a little difficult to know for sure.
+The most reliable way to know for sure would be to have a computer with a fairly stable IP address that you suspect is an I2P user, and a
+bunch of computers you control on different networks all running I2P. When one of them connects to your suspected computer, you will be able
+to see their I2P router in the netDB. This might take time, and it might never happen. You could also try blocking all obfuscated traffic
+on a particular network until you're sure every I2P router on that network has lost all of it's peers. At that point, they'll reach out
+to reseed servers to get more peers, which a network administrator can probably observe.{% endtrans %}</p>
+
+<h3 id="proxy_safe"><span class="permalink"><a href="#proxy_safe">
+{% trans -%}Is using an outproxy safe?{% endtrans %}</a></span>
+</h3>
+<p>{% trans -%}
+I2P does not encrypt the Internet, neither does Tor - for example, through <a href="https://en.wikipedia.org/wiki/Transport_Layer_Security">Transport Layer Security (TLS)</a>.
+I2P and Tor both aim to transport your traffic as-is securely and anonymously over the corresponding network, to its destination.
+Any unencrypted traffic generated at your system will arrive at the outproxy (on I2P) or the exit node (on Tor) as unencrypted traffic.
+This means that you are vulnerable to snooping by the outproxy operators.
+One way to protect your outproxy traffic against this is to ensure that any traffic that will be handled by the outproxy is encrypted with TLS.
+{%- endtrans %}</p>
+
+<p>{% trans -%}
+For more information, you may read the Tor FAQ's answer to this question:
+<a href="https://www.torproject.org/docs/faq#CanExitNodesEavesdrop">https://www.torproject.org/docs/faq#CanExitNodesEavesdrop</a>
+{%- endtrans %}</p>
+
+<p>{% trans zzz=i2pconv('zzz.i2p'), i2pforum="http://"+i2pconv('i2pforum.i2p')+"/viewtopic.php?f=32&t=272" -%}
+In addition, you may be vulnerable to collusion between the outproxy operator
+and operators of other I2P services, if you use the same tunnels ("shared clients").
+There is additional discussion about this on <a href="http://{{ zzz }}/topics/217">{{ zzz }}</a>.
+This discussion has been <a href="{{ i2pforum }}">mirrored on our forums</a> as well.
+{%- endtrans %}</p>
+
+<p>{% trans threatmodel=site_url('docs/how/threat-model') %}
+Ultimately, this is a question that only you can answer because the correct answer depends on your browsing behaviour,
+your <a href="{{ threatmodel }}">threat model</a>, and how much you choose to trust the outproxy operator.
+{%- endtrans %}</p>
+
+<h3 id="deanon"><span class="permalink"><a href="#proxy_safe">
+{% trans -%}What about "De-Anonymizing" attacks?{% endtrans %}</a></span>
+</h3>
+<p>{% trans -%}
+Reducing anonymity is typically done by A) identifying characteristics that are consistent across anonymous identities or
+B) identifying ephemeral characteristics of repeated connections. We say "reducing" anonymity because many of these characteristics
+are shared by many of our users, making these anonymity "sets," the smaller the anonymity set and the more small sets you belong to,
+the more brittle your anonymity.
+{%- endtrans %}</p>
+
+<p>{% trans -%}Attacks on I2P in the past have relied on correlating NetDB storage and verification, by randomizing
+the delay between storage and verification, we reduce the consistency with which that verification can be linked to I2P activity,
+thereby limiting the utility of that data point.
+{%- endtrans %}</p>
+
+<p>{% trans -%}Attacks on software configured to work with I2P are out of scope for I2P to solve. When browsing I2P or hosting
+I2P services, it's is the responsibility of the user to consider their threat model. Browsers are particularly problematic
+due to fingerprinting attacks, and the wide variety of information that can be gleaned from them. Using a standardized browsing
+profile is thought to help mitigate the impact of fingerprinting.
+{%- endtrans %}</p>
+
+<h2>Reseeds</h2>
+
+<h3 id="reseed"><span class="permalink"><a href="#reseed">
+{% trans %}My router has been up for several minutes and has zero or very few connections{% endtrans %}
+</a></span></h3>
+<p>{% trans -%}
+New installations of I2P carry out the reseeding process automatically, as well as when the number of known peers falls to a drastically low value.
+If you need to carry out a reseed of your router, please see the <a href="#manual_reseed">reseed instructions</a>.
+{%- endtrans %}</p>
+
<h3 id="manual_reseed"><span class="permalink"><a href="#manual_reseed">
{% trans %}How do I reseed manually?{% endtrans %}</a></span>
</h3>
@@ -626,7 +766,7 @@ there are some helpful hints on the <a href="{{ socks }}">socks page</a>.
An I2P router only needs to be seeded once, to join the network for the first
time. Reseeding involves fetching multiple "RouterInfo" files (bundled into a
signed zip-file) from at least two predefined server URLs picked from a
-volunteer-run group of clearnet HTTPS servers.
+volunteer-run group of non-private internet HTTPS servers.
{%- endtrans %}</p>
<p>{% trans -%}
@@ -690,16 +830,18 @@ sparingly (< 2 per week).
<li>{% trans %}The file is valid only a few days (< 20)!{% endtrans %}</li>
</ul>
-<h3 id="proxy_other"><span class="permalink"><a href="#proxy_other">
-{% trans %}How do I access IRC, BitTorrent, or other services on the regular Internet?{% endtrans %}</a></span>
+
+<h2>Internet Access/Performance</h2>
+
+<h3 id="outproxy"><span class="permalink"><a href="#outproxy">
+{% trans %}I can't access regular Internet sites through I2P.{% endtrans %}</a></span>
</h3>
<p>{% trans -%}
-Unless an outproxy has been specifically set up for the service you want to connect to, this cannot be done.
-There are only three types of outproxies running right now: HTTP, HTTPS, and email. Note that there is no SOCKS outproxy.
-If this type of service is required, we recommend that you use Tor.
-
-Please be aware that the Tor project <a href="https://blog.torproject.org/bittorrent-over-tor-isnt-good-idea">recommends against using BitTorrent over Tor</a>,
-as there are serious anonymity-related issues associated with doing so.
+I2P is primarily not intended, nor designed, to be used as a proxy to the regular internet.
+With that said, there are services which are provided by volunteers that act as proxies to non-private internet based content - these are referred to as "outproxies" on the I2P network.
+There is an outproxy configured by default in I2P's HTTP client tunnel - false.i2p.
+While this service does currently exist, there is no guarantee that it will always be there as it is not an official service provided by the I2P project.
+If your main requirement from an anonymous network is the ability to access non-private internet resources, we would recommend using <a href="https://www.torproject.org/">Tor</a>.
{%- endtrans %}</p>
<h3 id="https"><span class="permalink"><a href="#https">
@@ -730,8 +872,6 @@ as there are serious anonymity-related issues associated with doing so.
</li>
</ul>
-<h2>Troubleshooting</h2>
-
<h3 id="cpu"><span class="permalink"><a href="#cpu">
{% trans %}My router is using a large amount of CPU, what can I do about this?{% endtrans %} </a></span></h3>
<p>{% trans -%}
@@ -796,14 +936,6 @@ or by setting <tt>router.maxParticipatingTunnels=nnn</tt> on the <a href="http:/
</li>
</ul>
-<h3 id="reseed"><span class="permalink"><a href="#reseed">
-{% trans %}My router has been up for several minutes and has zero or very few connections{% endtrans %}
-</a></span></h3>
-<p>{% trans -%}
-New installations of I2P carry out the reseeding process automatically, as well as when the number of known peers falls to a drastically low value.
-If you need to carry out a reseed of your router, please see the <a href="#manual_reseed">reseed instructions</a>.
-{%- endtrans %}</p>
-
<h3 id="peers"><span class="permalink"><a href="#peers">
{% trans %}My router has very few active peers, is this OK?{% endtrans %}</a></span>
</h3>
@@ -900,72 +1032,22 @@ I2P is a work in progress. Lots of improvements and fixes are being implemented,
If you haven't, <a href="{{ downloadslist }}">install the latest release</a>.
{%- endtrans %}</p>
-<h3 id="protocolfamily"><span class="permalink"><a href="#protocolfamily">
-{% trans %}In <code>wrapper.log</code> I see an error that states "<code>Protocol family unavailable</code>" when loading the Router Console{% endtrans %}</a></span>
-</h3>
-<p>{% trans -%}
-Often this error will occur with any network enabled java software on some systems that are configured to use IPv6 by default. There are a few ways to solve this:
-{%- endtrans %}</p>
-<ul>
- <li>
-{% trans %}On Linux based systems, you can <code>echo 0 > /proc/sys/net/ipv6/bindv6only</code>{% endtrans %}
-</li>
- <li>{% trans %}Look for the following lines in <code>wrapper.config</code>.{% endtrans %}<br />
-<code>#wrapper.java.additional.5=-Djava.net.preferIPv4Stack=true<br />
- #wrapper.java.additional.6=-Djava.net.preferIPv6Addresses=false<br />
-</code><br />
- {% trans %}If the lines are there, uncomment them by removing the "#"s. If the lines are not there, add them without the "#"s.{% endtrans %}
- </li>
-</ul>
-{% trans -%}
-Another option would be to remove the <strong>::1</strong> from <code>~/.i2p/clients.config</code>
-{%- endtrans %}
-
-<p>{% trans -%}
-<strong>WARNING</strong>: For any changes to <code>wrapper.config</code> to take effect, you must completely
-stop the router and the wrapper. Clicking <em>Restart</em> on your
-router console will NOT reread this file! You must
-click <em>Shutdown</em>, wait 11 minutes, then start I2P.
-{%- endtrans %}</p>
-
-<h3 id="down"><span class="permalink"><a href="#down">
-{% trans %}Most of the eepsites within I2P are down?{% endtrans %}</a></span>
-</h3>
-<p>{% trans eepstatus='http://'+i2pconv('identiguy.i2p') -%}
-If you consider every eepsite that has ever been created, yes, most of them are down.
-People and eepsites come and go.
-A good way to get started in I2P is check out a list of eepsites that are currently up.
-<a href="{{ eepstatus }}">{{ eepstatus }}</a> tracks active eepsites.
-{%- endtrans %}</p>
-
-<h3 id="port32000"><span class="permalink"><a href="#port32000">
-{% trans %}Why is I2P listening on port 32000?{% endtrans %}</a></span>
-</h3>
-<p>{% trans -%}
-The Tanuki java service wrapper that we use opens this port —bound to localhost— in order to communicate with software running inside the JVM.
-When the JVM is launched it is given a key so it can connect to the wrapper.
-After the JVM establishes its connection to the wrapper, the wrapper refuses any additional connections.
-{%- endtrans %}</p>
-<p>{% trans -%}
-More information can be found in the <a href="http://wrapper.tanukisoftware.com/doc/english/prop-port.html">wrapper documentation</a>.
-{%- endtrans %}</p>
-
<h3 id="bug"><span class="permalink"><a href="#bug">
{% trans %}I think I found a bug, where can I report it?{% endtrans %}</a></span></h3>
<p>{% trans -%}
-You may report any bugs/issues that you encounter on our bugtracker, which is available over both clearnet and I2P.
-We have a discussion forum, also available on I2P and clearnet. You can join our IRC channel as well:
+You may report any bugs/issues that you encounter on our bugtracker, which is available over both non-private internet and I2P.
+We have a discussion forum, also available on I2P and non-private internet. You can join our IRC channel as well:
either through our IRC network, IRC2P, or on Freenode.{%- endtrans %}</p>
<ul>
<li>{% trans -%}Our Bugtracker:{%- endtrans %}
<ul>
- <li>{% trans -%}Clearnet:{%- endtrans %} <a href="https://trac.i2p2.de/report/1">https://trac.i2p2.de/report/1</a></li>
+ <li>{% trans -%}Non-private internet:{%- endtrans %} <a href="https://trac.i2p2.de/report/1">https://trac.i2p2.de/report/1</a></li>
<li>{% trans -%}On I2P:{%- endtrans %} <a href="http://trac.i2p2.i2p/report/1">http://trac.i2p2.i2p/report/1</a></li>
</ul>
<li>{% trans -%}Our forums:{%- endtrans %} <a href="http://{{ i2pconv('i2pforum.i2p') }}/">{{ i2pconv('i2pforum.i2p') }}</a></li>
-<li>{% trans -%}You may paste any interesting logs to a paste service such as the clearnet services listed on the
+<li>{% trans -%}You may paste any interesting logs to a paste service such as the non-private internet services listed on the
<a href="https://github.com/PrivateBin/PrivateBin/wiki/PrivateBin-Directory">PrivateBin Wiki</a>, or an I2P paste service such as this
<a href="http://paste.crypthost.i2p">PrivateBin instance</a> or this
<a href="http://pasta-nojs.i2p">Javascript-free paste service</a> and follow up on IRC in #i2p<{%- endtrans %}/li>
diff --git a/i2p2www/pages/site/get-involved/bounties.html b/i2p2www/pages/site/get-involved/bounties.html
deleted file mode 100644
index 733a24adb27850d04b504e95d7e41baeac55d5f0..0000000000000000000000000000000000000000
--- a/i2p2www/pages/site/get-involved/bounties.html
+++ /dev/null
@@ -1,12 +0,0 @@
-{% extends "global/layout.html" %}
-{% block title %}{{ _('Bounties') }}{% endblock %}
-{% block content %}
-<p>{% trans -%}
-Thank you for your interest in contributing to I2P!<br>
-<br>
-Currently there is no bounty system available.
-<br>
-{%- endtrans %}</p>
-{% endblock %}
-
-
diff --git a/i2p2www/pages/site/get-involved/develop/applications.html b/i2p2www/pages/site/get-involved/develop/applications.html
index 27988cbec50b18409366fc549f859bf65c1f56ae..d130cd6525b27cfd3aff7754babeb34df5897269 100644
--- a/i2p2www/pages/site/get-involved/develop/applications.html
+++ b/i2p2www/pages/site/get-involved/develop/applications.html
@@ -207,7 +207,7 @@ to and from I2P. At this point in time it lacks UDP support, but UDP support
is planned in the near future. BOB also contains several tools, such as
destination key generation, and verification that an address conforms to
I2P specifications. Up to date info and applications that use BOB can be
-found at this <a href="http://{{ boburl }}/">eepsite</a>.
+found at this <a href="http://{{ boburl }}/">I2P Site</a>.
{%- endtrans %}</p>
diff --git a/i2p2www/pages/site/get-involved/develop/signed-keys.html b/i2p2www/pages/site/get-involved/develop/signed-keys.html
index 3befbb97587f5be73df6864338030550c8aceb4c..fe5fddbdaf18ceac3a571a08c508aebf24794673 100644
--- a/i2p2www/pages/site/get-involved/develop/signed-keys.html
+++ b/i2p2www/pages/site/get-involved/develop/signed-keys.html
@@ -15,7 +15,7 @@ signature for his key.
</ol>
<h3 id="monotone-keys-for-zzz">{{ _('Monotone keys for zzz') }}</h3>
<p>{% trans -%}
-<u>Tip:</u> To find zzz's GPG key, on his eepsite locate the key `0xA76E0BED`, with
+<u>Tip:</u> To find zzz's GPG key, on his I2P Site locate the key `0xA76E0BED`, with
the name `zzz@mail.i2p` and the fingerprint `4456 EBBE C805 63FE 57E6 B310 4155
76BA A76E 0BED`.
{%- endtrans %}</p>
@@ -79,7 +79,7 @@ the name `zzz@mail.i2p` and the fingerprint `4456 EBBE C805 63FE 57E6 B310 4155
<h3 id="monotone-keys-for-complication">{{ _('Monotone keys for Complication') }}</h3>
<p>{% trans -%}
-<b>Tip:</b> To find Complication's GPG key, on his eepsite locate the key
+<b>Tip:</b> To find Complication's GPG key, on his I2P Site locate the key
`0x79FCCE33`, with the name `complication@mail.i2p` and the fingerprint `73CF
2862 87A7 E7D2 19FF DB66 FA1D FC6B 79FC CE33`.
{%- endtrans %}</p>
diff --git a/i2p2www/pages/site/get-involved/donate.html b/i2p2www/pages/site/get-involved/donate.html
index 99cb23762497a69cce97adefcc9053e0a3a8e4ce..a66df53d2ea84591ebefc3e77adad96fd659af85 100644
--- a/i2p2www/pages/site/get-involved/donate.html
+++ b/i2p2www/pages/site/get-involved/donate.html
@@ -1,33 +1,33 @@
{% extends "global/layout.html" %}
{% block title %}{{ _('Donate') }}{% endblock %}
{% block content %}
-<p>{% trans -%}
-Thank you for your interest in contributing to I2P!<br>
-<br>
-For nearly two decades the I2P network has provided protected communication
-platforms and access to information and resources to individuals who are
-concerned about online privacy. Designed with security and privacy first,
-peer-to-peer and decentralized, it continues to provide the opportunity for
-access to the free flow of information on its network and resist internet
-filtering and blocks. I2P has done this with the support of its community
-through volunteers and donations.
+<h2>{% trans -%}Thank you for your interest in contributing to I2P!{%- endtrans %}</h2>
+<p>{% trans -%}For almost two decades the Invisible Internet Project (I2P) has
+researched and developed a transport layer and software with a focus on providing
+privacy and security for online communication. The Invisible Internet Project
+(I2P) supports the right to access. The project works to constantly improve
+its circumvention abilities and resistance.
{%- endtrans %}</p>
-<p>{% trans %}Your donations help I2P continue to be an alternative option for
-online communication for everyone and create a space to resist the persistence
-of surveillance and monitoring of our digital lives. Your donations facilitate
-research and development to create applications that will increase access to I2P
-services, and its outreach in at-risk communities.{% endtrans %}</p>
+<p>{% trans %}Both the network and its software is completely free to use.{% endtrans %}</p>
+
+<h3>{% trans -%}Who Uses The Invisible Internet?{%- endtrans %}</h3>
+
+<p>{% trans %}
+People who are concerned about their privacy and interested in alternatives to the internet make use of the network and its applications to chat, email, torrent and run their own sites and forums. In some circumstances individuals rely on the network to communicate due to safety issues or censorship. Researchers, developers and digital rights defenders make use of the network as well.
+{% endtrans %}</p>
-<p>{% trans %}I2P accepts donations in cryptocurrencies and via Paypal. Android
-users may also support the project through the Google Play Store by choosing
-the "Donate" edition. I2P funding is handled by meeh.{% endtrans %}<br>
+<h3>{% trans -%}How Is The Invisible Internet Project Funded and How Is That Funding Used?{%- endtrans %}</h3>
-<br>
-{% trans %}The following addresses are valid as of June 10th, 2019. Please note
-that any other addresses not listed here are no longer valid. Please note that
-addresses may update and more coins may be added. {% endtrans %}
-<br><br>
+<p>{% trans %}The Invisible Internet Project (I2P) is 100% community funded. In the past the Project has received a grant from DuckDuckGo, and has received support from the OTF Usability Lab providers. This helped to guide improvements to the Java software and website UX and information architecture.
+Donations support I2P maintainers server costs, and other costs associated with keeping the network services up and running. Donations support improving the I2P protocol, application layer, outreach and design.{% endtrans %}</p>
+
+<p>{% trans %}I2P accepts donations in cryptocurrencies and via Paypal. Android users may also support the project through the Google Play Store by choosing the "Donate" edition. I2P funding is handled by meeh.{% endtrans %}</p>
+
+<p>
+{% trans %}The following addresses are valid as of June 10th, 2019. Please note that any other addresses not listed here are no longer valid. Please note that addresses may update and more coins may be added. {% endtrans %}
+</p>
+<p>
{% trans %} Double-Clicking on the cryptocurrency address will copy it onto your
clipboard.{% endtrans %}
<br></p>
@@ -42,7 +42,7 @@ clipboard.{% endtrans %}
<img class="qrcode" width="250px" src="{{ url_for('static', filename='images/donate/cur-xmr-addr.png') }}" />
<b class="address">{% trans %}XMR Address{% endtrans %}:</b> <textarea ondblclick="copy(this)" class="coinaddr" rows="1" readonly>447kucUDzM21jDxdmx7h2jFT4UT4PprD8EMjDk4Bc471gRGkbeZSfSPHcB7JtiumR7gNRJgKqf1dHa2T49nQ7jsfSZSfoLA</textarea><br>
-<p><b>{% trans %}We now also accept paypal donations!{% endtrans %}</b></p>
+<!--<p><b>{% trans %}We now also accept paypal donations!{% endtrans %}</b></p>-->
<form action="https://www.paypal.com/cgi-bin/webscr" method="post" target="_top">
<input type="hidden" name="cmd" value="_s-xclick" />
<input type="hidden" name="hosted_button_id" value="WJA7BJTH89JKN" />
diff --git a/i2p2www/pages/site/get-involved/guides/new-translators.html b/i2p2www/pages/site/get-involved/guides/new-translators.html
index 43849b96833214c6136ff4fba1832fa0dc562e5b..0e8baf44953e27293d4491cedc8dee3a615935ca 100644
--- a/i2p2www/pages/site/get-involved/guides/new-translators.html
+++ b/i2p2www/pages/site/get-involved/guides/new-translators.html
@@ -120,7 +120,7 @@ There are about 15 files in the i2p.i2p branch that needs translation:
<li>
<code>apps/routerconsole/jsp/help_xx.jsp</code></li>
<li>
- <code>installer/resources/eepsite.help/help/index_xx.html</code></li>
+ <code>installer/resources/I2P Site.help/help/index_xx.html</code></li>
<li>
<code>apps/i2ptunnel/locale/messages_xx.po</code></li>
<li>
diff --git a/i2p2www/pages/site/get-involved/guides/reseed.html b/i2p2www/pages/site/get-involved/guides/reseed.html
index bbb118f0076fee2a20c0810406804d559ad84523..9c7a4a9eba5f4d1fbc9feb476674beda2dcfd90e 100644
--- a/i2p2www/pages/site/get-involved/guides/reseed.html
+++ b/i2p2www/pages/site/get-involved/guides/reseed.html
@@ -191,7 +191,7 @@ Optional:
<p>
This How-to is tested with Ubuntu/Debian as well as FreeBSD.
-The web server has to be public reachable from all over the world, an eepsite inside I2P can be setup in addition.
+The web server has to be public reachable from all over the world, an I2P Site inside I2P can be setup in addition.
Also frequent or infrequent attempts to scrape all your reseed files, and of course attacks on your server.
The web server doesn't need to listen at default SSL/TLS port 443 - any other port can be used for obfuscation.
</p>
diff --git a/i2p2www/pages/site/get-involved/index.html b/i2p2www/pages/site/get-involved/index.html
index 32fad6e44d4d9927d54273689c451255d8741c16..8598cf082c3e8fdb6ce1db77d898cfcc27d91658 100644
--- a/i2p2www/pages/site/get-involved/index.html
+++ b/i2p2www/pages/site/get-involved/index.html
@@ -1,96 +1,85 @@
{% extends "global/layout.html" %}
-{% block title %}{% trans %}Get Involved!{% endtrans %}{% endblock %}
+{% block title %}{% trans %}Get Involved{% endtrans %}{% endblock %}
{% block content %}
-<h2>{% trans %}There are many ways you can help I2P!{% endtrans %}</h2>
+<h2>{% trans %}There are many ways you can help I2P.{% endtrans %}</h2>
<p>{% trans -%}
-To get involved, please feel free to join us on the #i2p-dev IRC channel (on
-irc.freenode.net, irc.oftc.net, or within I2P on irc.echelon.i2p, irc.dg.i2p or
-irc.postman.i2p). We also have a forum, which is available at <a href="https://i2pforum.net">i2pforum.net</a>
-on the clearnet and at <a href="http://i2pforum.i2p">i2pforum.i2p</a> inside the network. If you don't want to
-create an account on our forum, some of our developers are active Redditors who
-will talk to you on <a href="https://reddit.com/r/i2p">r/i2p</a>.
+To get involved, please feel free to join us on the forum, which is available at <a href="https://i2pforum.net">i2pforum.net</a>
+on the non-private internet and at <a href="http://i2pforum.i2p">i2pforum.i2p</a>
+inside the I2P network, or to create an account on our project Gitlab <a href="http://git.idk.i2p">inside the I2P network here</a> or <a href="https://i2pgit.org"> on the non-private internet here</a>. If you don't want to create an account on our forum, some
+of our developers are active Redditors who will talk to you on <a href="https://reddit.com/r/i2p">r/i2p</a> and many of
+us also operate <a href="https://github.com/">Github</a> accounts where we work on I2P-Related projects, but we do not
+offer official support for I2P contributions via Github.
+For real-time chat, there is an IRC network within I2P. Please join the #i2p-dev IRC channel (on
+irc.freenode.net, irc.oftc.net, or within I2P on irc.echelon.i2p, irc.dg.i2p or irc.postman.i2p).
+Other contact information is maintained on <a href="{{ team }}">this page</a>.
{%- endtrans %}</p>
-<p>{% trans team=site_url('about/team') -%}
-If you're interested in joining our <a href="{{ team }}">team</a>, please get in
-touch as we're always looking for eager contributors!
+<p>{% trans team=site_url('about/contact') -%}
+If you're interested in development, <a href="{{ team }}">please get in
+touch as we're always looking for new contributors.</a>
{%- endtrans %}</p>
<p>{% trans -%}
-We need help in many areas, and you don't need to know Java to contribute!
-Here's a list to help get you started!
+We need help in many areas, and you don't need to know Java to contribute.
+Here's a list to help get you started.
{%- endtrans %}</p>
<h3>{% trans %}Grow the Community{% endtrans %}</h3>
<ul>
-<li><b>{% trans %}Spread the Word!{% endtrans %}</b> —
+<li><b>{% trans %}Spread the Word.{% endtrans %}</b> —
{% trans -%}
Tell people about I2P on forums, blogs, and comments to articles. Fix up the
-Wikipedia article about I2P in your language. Tell your friends, and more
-importantly, use I2P to communicate with your friends! We have many tools that
+<a href="https://wikipedia.org/wiki/I2P">Wikipedia article about I2P in your language</a>. Tell your friends, and more
+importantly, use I2P to communicate with your friends. We have many tools that
can help you keep your private conversations private.
{%- endtrans %}
-</li><li><b>{{ _('Translation') }}</b> —
+</li><li><b><a href="{{ newtrans }}">{{ _('Translation') }}</a></b> —
{% trans newtrans=site_url('get-involved/guides/new-translators') -%}
Help translate the website and the software into your language. Translators are
a very important part of this decentralized project and your work is always
appreciated.
See the <a href="{{ newtrans }}">new translator's guide</a> for details.
{%- endtrans %}
+</li><li><b><a href="https://i2pgit.org/i2p-hackers/i2p.www">{{ _('Documentation') }}</a></b> —
+{% trans -%}
+Suggest changes to the website, or help fix the parts of the website that you
+notice are outdated or incomplete. Web Site development has been fully migrated to
+git, you can participate by creating an account on our project Gitlab
+<a href="http://git.idk.i2p/i2p-hackers/i2p.www">inside the I2P network here</a> or
+<a href="https://i2pgit.org/i2p-hackers/i2p.www"> on the non-private internet here</a>. We also always
+appreciate our wonderful translators, join one of our Transifex teams and help
+translate pages into other languages.
+{%- endtrans %}
</li><li><b>{{ _('Testing') }}</b> —
{% trans monotone=site_url('get-involved/guides/monotone'),
trac=i2pconv('trac.i2p2.i2p') -%}
Run the latest builds from <a href="{{ monotone }}">monotone</a> or a recent
build from the <a href="https://github.com/i2p/i2p.i2p">unofficial github mirror</a>
-and report results on #i2p or as bugs on <a href="http://{{ trac }}/report/1">Trac</a>.
-{%- endtrans %}
-</li><li><b>{{ _('Documentation') }}</b> —
-{% trans -%}
-Suggest changes to the website, or help fix the parts of the website that you
-notice outdated or incomplete. We also always appreciate our wonderful
-translators, join one of our Transifex teams and help translate pages into other
-languages.
-{%- endtrans %}
-</li><li><b>{{ _('Multimedia') }}</b> —
-{% trans -%}
-Create promotional materials, infographics, and videos about I2P. Create guides
-to setting up your favorite services on I2P, and take screenshots as you go. If
-your guide is helpful, we'd love to mirror it on our blog.
-{%- endtrans %}
-</li><li><b>{{ _('Content') }}</b> —
-{% trans -%}
-One of I2P's greatest strengths as a peer-to-peer network is that anyone can
-run their own website, it's actually a built-in feature. Create an eepSite,
-talk about something you're passionate about, or just interested in. It's easy,
-and it's getting easier every single day. Announce it on <a href="https://reddit.com/r/i2p">r/i2p</a>
-and <a href="http://i2pforum.i2p">i2pforum.i2p</a>/<a href="https://i2pforum.net">i2pforum.net</a>
-you will have visitors in no time.
+and report results on Gitlab <a href="http://git.idk.i2p/i2p-hackers/i2p.www">inside the I2P network here</a>
+or <a href="https://i2pgit.org/i2p-hackers/i2p.www"> on the non-private internet here</a>.
+For existing bugs, <a href="http://{{ trac }}/report/1">Trac</a> is still acceptable.
{%- endtrans %}
</li></ul>
<h3>{% trans %}Host Services for Yourself and Others{% endtrans %}</h3>
<ul>
-<li><b>{{ _('Services') }}</b> —
+<li><b><a href="{{ site_url('/about/software') }}">{{ _('Services') }}</a></b> —
{% trans -%}
-Running many kinds of services on eepSites is very easy. You could self-host
-almost anything, from an SSH server for yourself to an ActivityPub forum for
-everyone and anything in between. Almost anything you can think of can be made
-to work with I2P, and your service is valuable to the network.
+Self-hosting almost anything, from an SSH server for yourself to an ActivityPub
+forum for everyone and anything in between, is helpful to the I2P network,
+especially if you write down instructions for others. Almost anything you can
+think of can be made to work with I2P, and your service is valuable to the network.
{%- endtrans %}
-</li><li><b>{{ _('Reseeding') }}</b> —
+</li><li><b><a href="{{ reseed }}">{{ _('Reseeding') }}</a></b> —
{% trans reseed=site_url('get-involved/guides/reseed') -%}
-Getting new users onto the network is a very important task, and that task is
-handled by our reseed servers. The more reseed servers we have, the more
-de-centralized and redundant our infrastructure is. It's a big responsibility,
-but it's pretty easy to set up a reseed server for new routers to bootstrap
-from. Detailed instructions are on our <a href="{{ reseed }}">reseed server page</a>.
+Getting new users onto the network is a very important task, and that task is handled by our reseed servers. The more reseed servers we have, the more de-centralized and redundant our infrastructure is. It's a big responsibility, but it's pretty easy to set up a reseed server for new routers to bootstrap from. Detailed instructions are on our <a href="{{ reseed }}">reseed server page</a>.
{%- endtrans %}
</li>
</ul>
<h3>{% trans %}Develop Software{% endtrans %}</h3>
<ul>
-<li><b>{{ _('Applications') }}</b> —
+<li><b><a href="{{ site_url('/get-involved/guides/dev-guidelines') }}">{{ _('Applications') }}</a></b> —
{% trans apps=site_url('get-involved/develop/applications') -%}
-Write or port applications for I2P! There's some guidelines and
+Write or port applications for I2P. There's some guidelines and
a list of ideas on the <a href="{{ apps }}">applications page</a>.
{%- endtrans %}
-</li><li><b>{{ _('Coding') }}</b> —
+</li><li><a href="{{ site_url('/get-involved/guides/new-developers') }}"><b>{{ _('Coding') }}</a></b> —
{% trans trac=i2pconv('trac.i2p2.i2p'),
zzz=i2pconv('zzz.i2p'),
newdevs=site_url('get-involved/guides/new-developers') -%}
@@ -100,14 +89,19 @@ or the TODO list on <a href="http://{{ zzz }}">{{ zzz }}</a> for
some ideas on where to start.
See the <a href="{{ newdevs }}">new developer's guide</a> for details.
{%- endtrans %}
-</li><li><b>{{ _('Analysis') }}</b> —
+</li><li><b><a href="{{ site_url('research/index') }}">{{ _('Analysis') }}</b> —
{% trans threatmodel=site_url('docs/how/threat-model') -%}
Study or test the code to look for vulnerabilities.
Both anonymity vulnerabilities from the various
<a href="{{ threatmodel }}">threat models</a>, and DOS and other weaknesses due
to security holes, benefit from ongoing research.
{%- endtrans %}
-</li><li><b>
-<a href="{{ site_url('get-involved/donate') }}">{{ _('Donate') }}</a>
+</li></ul>
+<h3><a href="{{ site_url('get-involved/donate') }}">{% trans %}Donate{% endtrans %}</a></h3>
+<ul><li><b>
+<a href="{{ site_url('get-involved/donate') }}">{{ _('Donate') }}</a>: I2P is FOSS - Free Open-Source
+Software, which is supported by volunteers and by donations. If you use the network, please consider
+setting a monthly donation to help cover costs for maintainers and developers to keep improving the
+software and network.
</b></li></ul>
{% endblock %}
diff --git a/i2p2www/pages/site/get-involved/roadmap.html b/i2p2www/pages/site/get-involved/roadmap.html
index 62a1a822f7b5047252e12c50e77b39b87dcef77d..a98deae5f719395a6616853485c937b8b9ba23cb 100644
--- a/i2p2www/pages/site/get-involved/roadmap.html
+++ b/i2p2www/pages/site/get-involved/roadmap.html
@@ -178,7 +178,7 @@ Update onboarding information in router console readme
</li><li>
Operators guides for reseed services
</li><li>
-Revise CSS on the default I2P site to resemble console Light theme
+Revise CSS on the default I2P Site to resemble console Light theme
</li><li>
Windows Installer "Install as Windows Service" bugfixes and improvements.
</li><li>
@@ -204,7 +204,7 @@ Donation page redesign and backend (deployment)
</li><li>
New console prototype
</li><li>
-Enable setting up the Jetty eepSite with a custom directory from the I2PTunnel Wizard (Or otherwise enable serving a static directory of files using only I2PTunnel)
+Enable setting up the Jetty I2P Site with a custom directory from the I2PTunnel Wizard (Or otherwise enable serving a static directory of files using only I2PTunnel)
</li><li>
Outproxy requirements
</li><li>
@@ -448,7 +448,7 @@ IPv6 address selection improvements
</li><li>
Better tunnel peer selection for hidden and IPv6-only modes
</li><li>
-Prep for HTTPS console and eepsite by default
+Prep for HTTPS console and I2P Site by default
</li><li>
Prep for splitting up Debian package
</li><li>
@@ -467,7 +467,7 @@ Tomcat 8.5.30
</li><li>
Susimail folders, background sending
</li><li>
-Improved support for SSL console and eepsite
+Improved support for SSL console and I2P Site
</li><li>
Bug fixes, translation updates, geoip updates
</li><li>
diff --git a/i2p2www/pages/site/index.html b/i2p2www/pages/site/index.html
index b9c91fbf2b9f9e4ff43aa1966ab9a3815e977df4..4d35fb96ef379265ed5188da56f6ccc7096dc458 100644
--- a/i2p2www/pages/site/index.html
+++ b/i2p2www/pages/site/index.html
@@ -4,11 +4,9 @@
{% block metadesc %}{{ _('Anonymous peer-to-peer distributed communication layer built with open source tools and designed to run any traditional Internet service such as email, IRC or web hosting.') }}{% endblock %}
{% block content_outer %}
<div class="main">
- <img src="{{ url_for('static', filename='images/undraw_connected_world.svg') }}" class="home_splash_image" />
- <h1>{{ _('What does I2P do for you?') }}</h1>
- <p>{% trans %}The I2P network provides strong privacy protections for
- communication over the Internet. Many activities that would risk your
- privacy on the public Internet can be conducted anonymously inside I2P.
+ <!--<img src="{{ url_for('static', filename='images/pexels-jakub-novacek.jpg') }}" class="home_splash_image" />-->
+ <h1>{{ _('Welcome to the Invisible Internet') }}</h1>
+ <p>{% trans %}The Invisible Internet is a privacy by design, people-powered network. It is a truly free and anonymizing Internet alternative. Get I2P.
{% endtrans %}</p>
<a class="get-i2p" href="{{ url_for('downloads_list', lang=g.lang) }}">{% trans version=ver() %}Get I2P {{ version }}{% endtrans %}</a>
</div>
@@ -16,51 +14,38 @@
<div class="aside">
<h1>{% trans %}What is I2P?{% endtrans %}</h1>
<ul>
- <li>{% trans -%} I2P is an anonymous network built on top of the internet.
- It allows users to create and access content and build online
- communities on a network that is both distributed and dynamic. It is
- intended to protect communication and resist monitoring by third parties
- such as ISPs.
- {% endtrans %}</li>
- <li>{% trans -%}Aside from anonymizing traffic within the network, I2P
- functions with the same capabilities as the Internet, however its design
- and decentralization create a censorship resistant environment for the
- free-flow of information.
- {% endtrans %}</li>
- <li>{% trans -%}Mirrored sites hosted on the network allow access to news
- outlets and other resources in areas where information is being filtered
- or denied. Online communities wishing to organize in
- restrictive environments can do so anonymously to mitigate political
- threat and protect each other.
- {% endtrans %}</li>
+ <li>{% trans %}The Invisible Internet Project (I2P) is a fully encrypted private network layer that
+ has been developed with privacy and security by design in order to provide protection for your
+ activity, location and your identity. The software ships with a router that connects you to the
+ network and applications for sharing, communicating and building. {%- endtrans %}</li>
+ </ul>
+ <h1>{% trans %}I2P Cares About Privacy{% endtrans %}</h1>
+ <ul>
+ <li>{% trans %}I2P hides the server from the user and the user from the server. All I2P traffic is internal to the I2P network. Traffic inside I2P does not interact with the Internet directly. It is a layer on top of the Internet. It uses encrypted unidirectional tunnels between you and your peers. No one can see where traffic is coming from, where it is going, or what the contents are. Additionally I2P offers resistance to pattern recognition and blocking by censors. Because the network relies on peers to route traffic, location blocking is also reduced.{%- endtrans %}</li>
<li>
<a href="{{ site_url('about/intro') }}"><em>{% trans %}Read more…{% endtrans %}</em></a>
</li>
</ul>
</div>
+ <div class="aside">
+ <h1>Peer-to-Peer</h1>
+ <p>Everyday, people use the I2P network to connect with other people without the worry of being tracked or their data being collected. In some cases people rely on the network when they cannot safely communicate or while doing sensitive work. The network is P2P - people powered, and always growing. <a href="https://geti2p.net/en/docs/protocol">Learn more about the Protocol Stack</a>.</p>
+
+ <h1>Privacy and Security By Design</h1>
+ <p>I2P has created transport protocols that resist DPI censorship, and continuously improves its end to end encryption.
+ <a href="https://geti2p.net/en/docs/transport">Read the I2P Transport Overview</a></p>
+
+ <h1>Built For Communication</h1>
+ <p>I2P has an application layer with easy to use <a href="https://geti2p.net/en/docs/api/i2ptunnel">API’s for creating your own privacy - aware apps.</a></p>
+ </div>
<div class="aside">
<a href="{{ url_for('blog_atom', lang=g.lang) }}" class="feed-icon" title="{{ _('I2P Blog ATOM Feed') }}">{{ _('I2P Blog ATOM Feed') }}</a>
<h1>{% trans %}News & Updates{% endtrans %}</h1>
{% include "blog/latest.html" %}
</div>
- <div class="aside">
- <h1>{% trans %}Conferences Calendar 2020{% endtrans %}</h1>
- <p>I2P Developers will be visiting these conferences this year:</p>
- <p><b>Upcoming:</b></p>
- <ul>
- <li>Conference attendance is limited at this time due to COVID-19, and
- many conferences have been postponed or canceled. This section will
- be updated when the situation becomes clearer.</li>
- </ul>
- <p><b>Past:</b></p>
- <ul>
- <li>Chaos Communications Congress (December 27-30 2019, Leipzig, Germany)</li>
- <li>Our Networks Conference (September 20-22 2019, Toronto, Canada)</li>
- <li>DEF CON 27 (August 8-11 2019, Las Vegas, Nevada)</li>
- <li>USENIX FOCI (August 13, 2019, Santa Clara, California)</li>
- <li>Internet Freedom Festival (April 1-5 2019, Valencia, Spain)</li>
- <li>RightsCon (June 11-14 2019, Tunis, Tunisia)</li>
- </ul>
+ <div id="herocredit">
+ <a href="https://pixabay.com/users/montevideo-5677795/?utm_source=link-attribution&utm_medium=referral&utm_campaign=image&utm_content=3621630%22%3EMontevideo">Hero Image courtesy of Pixabay artist Montevideo</a>
</div>
</div>
+
{% endblock %}
diff --git a/i2p2www/pages/site/misc/i2ptunnel-migration.html b/i2p2www/pages/site/misc/i2ptunnel-migration.html
index ab32d273ebaaee2a3dc3ac4558acfbb52734cd76..97a10ea299eeecdaafe73dbca290022286253774 100644
--- a/i2p2www/pages/site/misc/i2ptunnel-migration.html
+++ b/i2p2www/pages/site/misc/i2ptunnel-migration.html
@@ -6,7 +6,7 @@
<p>{% trans -%}
After upgrading to the new architecture, you'll have to do a
little work to get your old I2PTunnel-driven servers running.
-Lets walk through a simple example. For an eepsite with the
+Lets walk through a simple example. For an I2P Site with the
old clientApp configuration, you had:
{%- endtrans %}</p>
<pre>
@@ -18,8 +18,8 @@ old clientApp configuration, you had:
<li>{% trans url='http://localhost:7657/i2ptunnel/' %}Jump to <a href="{{ url }}">{{ url }}</a>{% endtrans %}</li>
<li>{% trans %}Click on Add new: [Server tunnel] "GO"{% endtrans %}</li>
<li><ul>
- <li>{% trans %}For the name: <code>"eepsite"</code>{% endtrans %}</li>
- <li>{% trans %}For the description: <code>"My eepsite, isn't it pretty?"</code>{% endtrans %}</li>
+ <li>{% trans %}For the name: <code>"I2P Site"</code>{% endtrans %}</li>
+ <li>{% trans %}For the description: <code>"My I2P Site, isn't it pretty?"</code>{% endtrans %}</li>
<li{% trans %}>For the target host:{% endtrans %} <code>localhost</code></li>
<li>{% trans %}For the target port:{% endtrans %} <code>80</code></li>
<li>{% trans -%}
diff --git a/i2p2www/pages/site/misc/i2ptunnel-services.html b/i2p2www/pages/site/misc/i2ptunnel-services.html
index c9c6f6cf48799ac2cb42c47d78b86e984d3f52ef..d4a6b5934149aad410fadee16030048ee4f7e095 100644
--- a/i2p2www/pages/site/misc/i2ptunnel-services.html
+++ b/i2p2www/pages/site/misc/i2ptunnel-services.html
@@ -2,7 +2,7 @@
{% block title %}{% trans %}I2PTunnel services{% endtrans %}{% endblock %}
{% block content %}
<p>{% trans -%}
-Below is quick copy of aum's eepsite deployment guide.
+Below is quick copy of aum's I2P Site deployment guide.
{%- endtrans %}</p>
<strong>{% trans %}1. - Deploy a local server{%- endtrans %}</strong>
diff --git a/i2p2www/pages/site/misc/ticket919.html b/i2p2www/pages/site/misc/ticket919.html
index bf5e5bb8fbb009040deb2156c7c4f85993918cc8..a868fae4d35920cdb991fdb7e0ecf0e893e525b9 100644
--- a/i2p2www/pages/site/misc/ticket919.html
+++ b/i2p2www/pages/site/misc/ticket919.html
@@ -11,17 +11,17 @@ with version 0.9.5. Other operating systems are not affected.
<h2>Background</h2>
<p>A change was introduced during the 0.9.5 cycle to allow I2P's configuration files to be edited with the standard
- Windows text editor, <code>Notepad</code>. This change had the unfortunate side-effect of causing our eepsite migration code to
- fail to run on Windows systems, leading to eepsites being served from the installation directory. Consequently:
+ Windows text editor, <code>Notepad</code>. This change had the unfortunate side-effect of causing our I2P Site migration code to
+ fail to run on Windows systems, leading to I2P Sites being served from the installation directory. Consequently:
</p>
<ul>
- <li>depending upon how I2P is started, the eepsite may not be accessible; and</li>
- <li>confusion ensues—all documentation states that eepsites are served from the profile path; and</li>
+ <li>depending upon how I2P is started, the I2P Site may not be accessible; and</li>
+ <li>confusion ensues—all documentation states that I2P Sites are served from the profile path; and</li>
<li>the update to Jetty 7, included in the 0.9.6 release, will fail.</li>
</ul>
-<p>While no action is required for users that are not hosting an eepsite (or are not using the included Jetty to host an eepsite), it is
-recommended to follow this procedure to avoid issues in case you decide to run a Jetty-hosted eepsite in the future. If you are running an
-eepsite it is important to follow this procedure prior to upgrading to 0.9.6.
+<p>While no action is required for users that are not hosting an I2P Site (or are not using the included Jetty to host an I2P Site), it is
+recommended to follow this procedure to avoid issues in case you decide to run a Jetty-hosted I2P Site in the future. If you are running an
+I2P Site it is important to follow this procedure prior to upgrading to 0.9.6.
</p>
<p>
@@ -46,20 +46,20 @@ eepsite it is important to follow this procedure prior to upgrading to 0.9.6.
You should see something like the following:
<a href="{{ url_for('static', filename='images/ticket919/paths.png') }}">
<img alt="" style="padding:10px;margin-left:auto;margin-right:auto;display:block" src="{{ url_for('static', filename='images/ticket919/paths.png') }}" /></a>
- If the path at number 1 in the image above is set to <code>eepsite/jetty.xml</code>, the path needs to be updated.
+ If the path at number 1 in the image above is set to <code>I2P Site/jetty.xml</code>, the path needs to be updated.
</li>
- <li>Click the <code>Edit</code> button next to <em>I2P webserver (eepsite)</em>. The page will reload to allow the path to be edited as shown below:
+ <li>Click the <code>Edit</code> button next to <em>I2P webserver (I2P Site)</em>. The page will reload to allow the path to be edited as shown below:
<a href="{{ url_for('static', filename='images/ticket919/edit.png') }}">
<img alt="" style="padding:10px;margin-left:auto;margin-right:auto;display:block" src="{{ url_for('static', filename='images/ticket919/edit.png') }}" /></a>
- Insert the full path to your I2P configuration directory <em>before</em> the text "eepsite/jetty.xml" as shown above,
+ Insert the full path to your I2P configuration directory <em>before</em> the text "I2P Site/jetty.xml" as shown above,
then click Click the <code>Save Client Configuration</code> button.
</li>
- <li> If you're hosting an eepsite, move its contents to its proper home at <code>%APPDATA%\I2P\eepsite\docroot</code>.
+ <li> If you're hosting an I2P Site, move its contents to its proper home at <code>%APPDATA%\I2P\I2P Site\docroot</code>.
</li>
<li>At this point you should restart your I2P router.</li>
</ol>
-<p>After following the steps outlined above, your eepsite will be served from <code>%APPDATA%\I2P\eepsite\docroot</code>
+<p>After following the steps outlined above, your I2P Site will be served from <code>%APPDATA%\I2P\I2P Site\docroot</code>
and should be accessible at <a href="http://127.0.0.1:7658">http://127.0.0.1:7658</a>.
</p>
{% endblock %}
diff --git a/i2p2www/pages/site/research/vrp.html b/i2p2www/pages/site/research/vrp.html
index fbd2636ec79cf49e8655e1d3bf7e3ad275ddc8cb..43b35b90626438b4697391291326925ca2571fb0 100644
--- a/i2p2www/pages/site/research/vrp.html
+++ b/i2p2www/pages/site/research/vrp.html
@@ -12,7 +12,7 @@ This process is subject to change. Please refer to this page for the current VRP
<p>{% trans %}Researchers: while you research/hack, we ask that you refrain from the following: - Performing active exploits or Denial of Service attacks on the
i2p network - Performing social engineering on i2p development team members - Performing any physical or electronic attempts against i2p property and/or data
centers{%- endtrans %}</p>
-<p>{% trans %}As i2p is an open-source community, many volunteers and development team members run their own EepSites as well as public (“clearnetâ€) domains. These
+<p>{% trans %}As i2p is an open-source community, many volunteers and development team members run their own I2P Sites as well as public (“non-private internetâ€) domains. These
sites/servers are NOT in the scope of the vulnerability assessment / response process, only the underlying code of i2p is.{%- endtrans %}</p>
<h2 id="i.-point-of-contact-for-security-issues">I. {{ _('Point of Contact for Security Issues') }}</h2>
diff --git a/i2p2www/static/images/i2plogo.png b/i2p2www/static/images/i2plogo.png
index f7beff26bac365f3b7a6fd6e2bbbe52ed5d61c32..326a544991f8d7482bc2ddc645c8a3060b74751b 100644
Binary files a/i2p2www/static/images/i2plogo.png and b/i2p2www/static/images/i2plogo.png differ
diff --git a/i2p2www/static/images/i2plogo.svg b/i2p2www/static/images/i2plogo.svg
index d75698c56b4cb1f9a6e9f52773d3926ec1296f18..604189206af3de35dcae52bd0cc246cb99526536 100644
--- a/i2p2www/static/images/i2plogo.svg
+++ b/i2p2www/static/images/i2plogo.svg
@@ -1,119 +1,6 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<!-- Created with Inkscape (http://www.inkscape.org/) -->
-
-<svg
- xmlns:dc="http://purl.org/dc/elements/1.1/"
- xmlns:cc="http://creativecommons.org/ns#"
- xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
- xmlns:svg="http://www.w3.org/2000/svg"
- xmlns="http://www.w3.org/2000/svg"
- xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
- xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
- width="109.95727mm"
- height="27.706699mm"
- viewBox="0 0 109.95727 27.706699"
- version="1.1"
- id="svg4773"
- inkscape:version="0.92.1 r"
- sodipodi:docname="horizontal_color.svg">
- <defs
- id="defs4767" />
- <sodipodi:namedview
- id="base"
- pagecolor="#ffffff"
- bordercolor="#666666"
- borderopacity="1.0"
- inkscape:pageopacity="0.0"
- inkscape:pageshadow="2"
- inkscape:zoom="0.98994949"
- inkscape:cx="125.25987"
- inkscape:cy="51.24018"
- inkscape:document-units="mm"
- inkscape:current-layer="layer1"
- showgrid="false"
- fit-margin-top="0"
- fit-margin-left="0"
- fit-margin-right="0"
- fit-margin-bottom="0"
- inkscape:window-width="1366"
- inkscape:window-height="740"
- inkscape:window-x="0"
- inkscape:window-y="0"
- inkscape:window-maximized="1" />
- <metadata
- id="metadata4770">
- <rdf:RDF>
- <cc:Work
- rdf:about="">
- <dc:format>image/svg+xml</dc:format>
- <dc:type
- rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
- <dc:title></dc:title>
- </cc:Work>
- </rdf:RDF>
- </metadata>
- <g
- inkscape:label="Layer 1"
- inkscape:groupmode="layer"
- id="layer1"
- transform="translate(-55.768389,-115.63486)">
- <g
- id="g5355">
- <path
- inkscape:connector-curvature="0"
- id="path4516"
- style="fill:#231f20;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:0.46456254"
- d="m 55.768389,116.32817 h 5.625388 v 26.53071 h -5.625388 z" />
- <path
- inkscape:connector-curvature="0"
- id="path4528"
- style="fill:#231f20;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:0.46456254"
- d="M 83.567492,142.85915 H 64.806129 v -3.94692 l 6.737086,-6.81049 c 1.994831,-2.04361 3.297929,-3.46052 3.910222,-4.24981 0.611829,-0.78977 1.052235,-1.52051 1.321681,-2.19367 0.268981,-0.67315 0.403705,-1.37046 0.403705,-2.09285 0,-1.07686 -0.296392,-1.8787 -0.890103,-2.40504 -0.593711,-0.52589 -1.38579,-0.78929 -2.377165,-0.78929 -1.040621,0 -2.050116,0.23877 -3.028948,0.71589 -0.979764,0.47756 -2.001336,1.15675 -3.066113,2.03756 l -3.083766,-3.65285 c 1.321681,-1.1261 2.416654,-1.92143 3.285851,-2.38646 0.868731,-0.46502 1.817367,-0.8232 2.845444,-1.07406 1.028078,-0.25087 2.178334,-0.3763 3.451235,-0.3763 1.676607,0 3.157633,0.30615 4.442612,0.91798 1.284979,0.61229 2.282403,1.46848 2.992248,2.56995 0.709385,1.10148 1.064782,2.36231 1.064782,3.78154 0,1.23667 -0.217415,2.39575 -0.651785,3.47912 -0.434369,1.08288 -1.107514,2.19365 -2.01946,3.33183 -0.911472,1.13818 -2.517923,2.75997 -4.818901,4.86443 l -3.451235,3.24962 v 0.2569 h 11.693973 z" />
- <path
- inkscape:connector-curvature="0"
- id="path4532"
- style="fill:#231f20;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:0.46456254"
- d="m 92.213601,128.81343 h 1.850822 c 1.730025,0 3.024298,-0.34145 3.88374,-1.02529 0.858507,-0.68337 1.288228,-1.67846 1.288228,-2.98528 0,-1.31843 -0.360032,-2.29215 -1.079636,-2.92164 -0.720078,-0.62854 -1.848504,-0.94352 -3.384343,-0.94352 h -2.558811 z m 12.703009,-4.21033 c 0,2.85566 -0.89243,5.03911 -2.67682,6.55126 -1.78485,1.51261 -4.322284,2.26845 -7.612787,2.26845 h -2.413402 v 9.43621 h -5.625393 v -26.53071 h 8.474561 c 3.218022,0 5.664411,0.69266 7.340551,2.078 1.6752,1.38532 2.51329,3.45076 2.51329,6.19679" />
- <path
- inkscape:connector-curvature="0"
- id="path4536"
- style="fill:#ffc434;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:0.46456254"
- d="m 121.18308,137.09597 c 0,-3.44937 -2.79621,-6.24557 -6.24559,-6.24557 -3.44937,0 -6.24557,2.7962 -6.24557,6.24557 0,3.44939 2.7962,6.24559 6.24557,6.24559 3.44938,0 6.24559,-2.7962 6.24559,-6.24559" />
- <path
- inkscape:connector-curvature="0"
- id="path4540"
- style="fill:#60ab60;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:0.46456254"
- d="m 121.18308,122.24846 c 0,-3.44937 -2.79621,-6.24557 -6.24559,-6.24557 -3.44937,0 -6.24557,2.7962 -6.24557,6.24557 0,3.44938 2.7962,6.24559 6.24557,6.24559 3.44938,0 6.24559,-2.79621 6.24559,-6.24559" />
- <path
- inkscape:connector-curvature="0"
- id="path4544"
- style="fill:#e15647;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:0.46456254"
- d="m 136.03063,137.09597 c 0,-3.44937 -2.7962,-6.24557 -6.24557,-6.24557 -3.44939,0 -6.24559,2.7962 -6.24559,6.24557 0,3.44939 2.7962,6.24559 6.24559,6.24559 3.44937,0 6.24557,-2.7962 6.24557,-6.24559" />
- <path
- inkscape:connector-curvature="0"
- id="path4548"
- style="fill:#ffc434;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:0.46456254"
- d="m 136.03063,122.24846 c 0,-3.44937 -2.7962,-6.24557 -6.24557,-6.24557 -3.44939,0 -6.24559,2.7962 -6.24559,6.24557 0,3.44938 2.7962,6.24559 6.24559,6.24559 3.44937,0 6.24557,-2.79621 6.24557,-6.24559" />
- <path
- inkscape:connector-curvature="0"
- id="path4552"
- style="fill:#ffc434;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:0.46456254"
- d="m 150.87814,137.09597 c 0,-3.44937 -2.7962,-6.24557 -6.24557,-6.24557 -3.44938,0 -6.24559,2.7962 -6.24559,6.24557 0,3.44939 2.79621,6.24559 6.24559,6.24559 3.44937,0 6.24557,-2.7962 6.24557,-6.24559" />
- <path
- inkscape:connector-curvature="0"
- id="path4556"
- style="fill:#60ab60;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:0.46456254"
- d="m 150.87814,122.24846 c 0,-3.44937 -2.7962,-6.24557 -6.24557,-6.24557 -3.44938,0 -6.24559,2.7962 -6.24559,6.24557 0,3.44938 2.79621,6.24559 6.24559,6.24559 3.44937,0 6.24557,-2.79621 6.24557,-6.24559" />
- <path
- inkscape:connector-curvature="0"
- id="path4560"
- style="fill:#60ab60;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:0.46456254"
- d="m 165.72566,137.09597 c 0,-3.44937 -2.7962,-6.24557 -6.24559,-6.24557 -3.44937,0 -6.24557,2.7962 -6.24557,6.24557 0,3.44939 2.7962,6.24559 6.24557,6.24559 3.44939,0 6.24559,-2.7962 6.24559,-6.24559" />
- <path
- inkscape:connector-curvature="0"
- id="path4564"
- style="fill:#e15647;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:0.46456254"
- d="m 165.72566,122.24846 c 0,-3.44937 -2.7962,-6.24557 -6.24559,-6.24557 -3.44937,0 -6.24557,2.7962 -6.24557,6.24557 0,3.44938 2.7962,6.24559 6.24557,6.24559 3.44939,0 6.24559,-2.79621 6.24559,-6.24559" />
- </g>
- </g>
+<svg width="340" height="140" viewBox="0 0 340 140" fill="none" xmlns="http://www.w3.org/2000/svg">
+<path d="M118.352 20.7544C105.257 7.67428 87.8477 0.471191 69.3317 0.471191C50.8158 0.471191 33.4062 7.67428 20.3112 20.7544C7.21629 33.8344 0.00502883 51.2243 0.00502883 69.7193C0.00502883 85.0999 5.00363 99.697 14.2063 111.702L2.7608 123.135C-0.920266 126.812 -0.920266 132.769 2.7608 136.446C6.44186 140.123 12.406 140.123 16.0871 136.446L27.5627 124.983C39.5312 134.055 54.0543 138.967 69.3418 138.967C87.8577 138.967 105.267 131.764 118.362 118.684C131.457 105.604 138.668 88.2142 138.668 69.7193C138.658 51.2243 131.447 33.8344 118.352 20.7544ZM83.3218 106.589C83.3117 106.599 83.3117 106.599 83.3017 106.609C75.8993 113.993 63.8705 113.993 56.4681 106.609C49.0658 99.2148 49.0658 87.1996 56.4681 79.8056C60.1693 76.1086 65.0271 74.2601 69.8849 74.2601C74.7427 74.2601 79.6005 76.1086 83.3017 79.8056C90.694 87.1895 90.704 99.1947 83.3218 106.589ZM44.3789 67.7201C32.4306 79.6549 30.6403 97.949 38.9881 111.803C36.6246 110.346 34.422 108.608 32.4105 106.599C18.3802 92.5843 18.3802 69.7796 32.4105 55.7652C39.4306 48.753 48.6433 45.2569 57.8561 45.2569C67.0688 45.2569 76.2915 48.763 83.3017 55.7652C85.3132 57.7744 87.0431 59.9846 88.5014 62.3354C74.6421 53.9971 56.3273 55.7853 44.3789 67.7201ZM106.263 106.609C105.006 107.865 103.698 109.04 102.351 110.145C107.943 101.606 110.96 91.6299 110.96 81.1819C110.96 67.0169 105.438 53.6957 95.4109 43.6797C77.3476 25.6569 49.4278 23.3563 28.8501 36.7679C29.9665 35.4117 31.1432 34.0956 32.4105 32.8399C42.2769 22.9846 55.392 17.5597 69.3317 17.5597C83.2715 17.5597 96.3966 22.9846 106.263 32.8399C116.13 42.6952 121.561 55.7853 121.561 69.7193C121.561 83.6533 116.119 96.7535 106.263 106.609Z" fill="#526BCE"/>
+<path d="M253.465 96.4118H230.172V95.8793L238.771 88.7164C259.691 71.3165 265.021 62.275 265.021 51.6662C265.021 34.5777 251.001 23.3863 229.005 23.3863C211.344 23.3863 198.802 31.4835 195.001 45.1865C193.703 49.878 197.193 54.5294 202.071 54.5294H211.264C214.432 54.5294 217.178 52.48 218.234 49.5063C219.843 44.9855 223.795 42.5343 229.005 42.5343C235.865 42.5343 240.742 46.7838 240.742 53.8061C240.742 60.2959 236.579 64.4952 229.81 70.0909L203.731 91.6399C198.571 95.8994 195.584 102.239 195.584 108.929C195.584 112.988 198.873 116.273 202.936 116.273H258.655C262.718 116.273 266.007 112.988 266.007 108.929C266.007 102.018 260.385 96.4118 253.465 96.4118Z" fill="#363A68"/>
+<path d="M181.252 24.6422C173.668 24.6422 166.94 30.7803 166.94 38.3652V109.422C166.94 113.209 170.008 116.273 173.799 116.273H180.91C184.712 116.273 187.789 113.199 187.789 109.402V90.2134V64.1436V50.1192V31.1621C187.779 27.5656 184.852 24.6422 181.252 24.6422Z" fill="#363A68"/>
+<path d="M305.955 24.6422H293.585H293.574H286.474C278.89 24.6422 272.735 30.7803 272.735 38.3652V109.422C272.735 113.209 275.803 116.273 279.594 116.273H286.705C290.507 116.273 293.585 113.199 293.585 109.402V94.1314V90.2134C293.585 89.5805 294.097 89.0681 294.731 89.0681H305.06C325.98 89.0681 340 76.7616 340 57.0309C340 37.5314 326.342 24.6422 305.955 24.6422ZM303.622 69.7494H301.53H299.991H295.184C294.319 69.7494 293.615 69.0662 293.585 68.2023V50.1192C293.585 47.025 296.451 44.5134 299.991 44.5134H303.612C313.589 44.5134 319.583 49.1648 319.583 57.041C319.583 64.8669 313.599 69.7494 303.622 69.7494Z" fill="#363A68"/>
</svg>
diff --git a/i2p2www/static/images/pexels-montevideo-starsky.jpg b/i2p2www/static/images/pexels-montevideo-starsky.jpg
new file mode 100644
index 0000000000000000000000000000000000000000..7057c716fb5edba2d869c8d191ee34bd8fdee440
Binary files /dev/null and b/i2p2www/static/images/pexels-montevideo-starsky.jpg differ
diff --git a/i2p2www/static/images/social/contact.png b/i2p2www/static/images/social/contact.png
new file mode 100644
index 0000000000000000000000000000000000000000..07c75305b95a6959e9879bc887db7c6b368e401e
Binary files /dev/null and b/i2p2www/static/images/social/contact.png differ
diff --git a/i2p2www/static/images/social/forum.png b/i2p2www/static/images/social/forum.png
new file mode 100644
index 0000000000000000000000000000000000000000..0cad641e8e8a910e185c15b49d00e2e9617a01b0
Binary files /dev/null and b/i2p2www/static/images/social/forum.png differ
diff --git a/i2p2www/static/images/social/reddit-alien-brands.png b/i2p2www/static/images/social/reddit-alien-brands.png
new file mode 100644
index 0000000000000000000000000000000000000000..c49521713d937a9125a906b69f991ce49029f735
Binary files /dev/null and b/i2p2www/static/images/social/reddit-alien-brands.png differ
diff --git a/i2p2www/static/images/social/twitter-brands.png b/i2p2www/static/images/social/twitter-brands.png
new file mode 100644
index 0000000000000000000000000000000000000000..d25f05fc4df69232dab5e668b8bd8c7ed74eb67b
Binary files /dev/null and b/i2p2www/static/images/social/twitter-brands.png differ
diff --git a/i2p2www/static/styles/duck/default.css b/i2p2www/static/styles/duck/default.css
index 881f958b27b8c28cb5bad92b976313af540c935f..85f8579b20fada1c3cfb884931093d508cf63f65 100644
--- a/i2p2www/static/styles/duck/default.css
+++ b/i2p2www/static/styles/duck/default.css
@@ -16,17 +16,21 @@
body {
font-family: Droid Sans, Helvetica, sans-serif;
- background-color : #9795b214;
+ background-color: #FFFAF0;
width: 100%;
}
+body::before {
+ opacity: .4;
+}
+
a {
color: #4a4a4a;
text-decoration: none;
}
a:hover {
- color: var(--i2pmossy);
+ color: #ED8936;
}
dl p.first {
@@ -57,11 +61,9 @@ div.hide {
div#topbar .title, div#content > .title {
font-family: "URW Gothic L", "Century Gothic", sans-serif;
- text-transform: uppercase;
font-size: 2.1875rem;
font-weight: bold;
- text-shadow: 1px 1px 1px rgba(0,0,0,.2);
- color: #333333;
+ color: #363A68;
line-height:41px;
vertical-align:middle;
}
@@ -83,7 +85,7 @@ div#topbar #logo img:hover {
}
div#topbar #scalelogo {
- height: 3.5rem;
+ height: 5.5rem;
margin-left: 1rem;
}
@@ -101,19 +103,17 @@ div#content {
div#content .main {
background: url('../../images/dots.png') 0 10% no-repeat;
- background: linear-gradient(-45deg, #265ea7 1%,#9dadb5 26%, #222187 56%,#323638 100%);
- background: -webkit-linear-gradient(-45deg, #265ea7 1%,#9dadb5 26%, #222187 56%,#323638 100%);
+ background: url('/_static/images/pexels-montevideo-starsky.jpg');
+ background-size: auto;
background-size: 100% auto;
width: auto;
padding: 4em 10% 4em 10%;
position: relative;
margin: 0 auto;
- text-shadow: 1px 1px 1px rgba(255,255,255,.5);
line-height: 1.5em;
- border: 2px solid #abcc71;
+ border: 2px solid #4456B7;
border-left: none;
border-right: none;
- box-shadow: 0px 2px 8px rgba(0,0,0,.2);
}
div#content .main h1 {
@@ -129,6 +129,11 @@ div#content .main p {
color: var(--i2poffwhite);
}
+div#herocredit {
+ text-align: right;
+ font-size: 8px;
+}
+
.main .get-i2p {
display: block;
top: 50%;
@@ -138,13 +143,13 @@ div#content .main p {
color: white;
font-family: Arial, Helvetica, sans-serif;
font-weight: bold;
- text-transform: uppercase;
+/* text-transform: uppercase;*/
text-decoration: none;
text-align: center;
- background: green;
+ background: #60ab60;
border-radius: .3em;
text-shadow: 1px 1px 1px rgba(0,0,0,.2);
- box-shadow: 2px 2px 4px rgba(0, 0, 0, 0.3), 1em 3em 2em 0.5em rgba(255, 255, 255, 0.3) inset, inset -.2em -.5em 1em -0em rgba(0,0,0,.3);
+ /*box-shadow: 2px 2px 4px rgba(0, 0, 0, 0.3), 1em 3em 2em 0.5em rgba(255, 255, 255, 0.3) inset, inset -.2em -.5em 1em -0em rgba(0,0,0,.3);*/
}
div#content .aside-wrap {
@@ -167,8 +172,8 @@ div#content .aside h1 {
padding: 1em 0;
border-bottom: 1px solid rgba(171, 204, 113, 0.6);
font-size: 1.4em;
- color: #222200;
- text-shadow: 1px 1px 1px rgba(0,0,0,.3);
+ color: #363a68;
+ /*text-shadow: 1px 1px 1px rgba(0,0,0,.3);*/
}
div#content .aside p {
@@ -201,7 +206,7 @@ div#content .feed-icon {
div#content .inner {
background: rgba(0, 0, 0, 0.05);
- border-top: 2px solid #abcc71;
+ border-top: 2px solid #4456B7;
color: black;
line-height: 1.5em;
position: relative;
@@ -209,7 +214,7 @@ div#content .inner {
}
div#content .inner:before {
- box-shadow: 0 6px 12px -12px inset;
+ /*box-shadow: 0 6px 12px -12px inset;*/
content: " ";
height: 12px;
left: 0;
@@ -220,7 +225,7 @@ div#content .inner:before {
div#content .inner:after {
bottom: 0;
- box-shadow: 0px -6px 12px -12px inset;
+ /*box-shadow: 0px -6px 12px -12px inset;*/
content: " ";
height: 12px;
left: 0;
@@ -229,21 +234,20 @@ div#content .inner:after {
}
div#content .inner .fluid {
- background-color: var(--i2poffwhite);
+ background-color: #FFFAF0; /*var(--i2poffwhite);*/
}
div#content .sidebar {
background: white;
- border-bottom: 1px solid #abcc71;
+ border-bottom: 1px solid #ECF3FF;
font-size: 0.875rem;
}
div#content .sidebar .top {
- border-bottom: 2px solid #abcc71;
+ border-bottom: 2px solid #4456B7;
}
div#content .sidebar nav {
- background: rgba(171, 204, 113, 0.6);
padding: 1em;
}
@@ -347,7 +351,7 @@ div#content .inner .box img {
*/
.package {
- border: 6px solid rgba(171, 204, 113, 0.7);
+ border: 3px solid #546BD2;
border-radius: 5px;
margin: 10px;
padding: 10px;
@@ -374,7 +378,7 @@ div#content .inner .box img {
.filedownload {
padding: 5px;
background-color: rgba(255,255,255,0.2);
- box-shadow: -1px -1px 1px 1px rgb(51, 51, 51) inset;
+ /*box-shadow: -1px -1px 1px 1px rgb(51, 51, 51) inset;*/
text-align: center;
}
@@ -419,7 +423,7 @@ div#content .inner .box img {
}
.warning {
- background-color: rgba(171, 204, 113, 0.7);
+ background-color: #ECF3FF;
border: 1px dashed rgb(208, 14, 14);
border-radius: 5px;
margin: 5px;
@@ -529,7 +533,7 @@ div#content .inner ul.DREAD {
}
#posts article {
- border: 2px solid #d00e0e;
+ border: 2px solid #546BD2;
border-radius: 5px;
margin: 10px 0;
padding: 10px;
@@ -629,10 +633,16 @@ pre.literal-block {
* Footer
*/
+.socialfooter {
+ height: 32px;
+ padding-right: 16px;
+}
+
#global-footer {
width: auto;
- border-top: 2px solid #abcc71;
- background: transparent;
+ /* border-top: 2px solid #4456B7;*/
+ border-top: 2px solid #FFFAF0;
+ background: #3C468A;
font-size: 0.75rem;
padding: 1em 10%;
display: flex;
diff --git a/i2p2www/static/styles/duck/desktop.css b/i2p2www/static/styles/duck/desktop.css
index 5969fb6251190f3156984d3618f7b20917139ff9..cb88b54fc86c0e2ce3ec71e80707749889389723 100644
--- a/i2p2www/static/styles/duck/desktop.css
+++ b/i2p2www/static/styles/duck/desktop.css
@@ -152,6 +152,8 @@ menu ul,
margin-left: -10px;
}
+/**#4456B7*/
+
#cssmenu > ul > li > div.menuitem {
border-radius: 5px 5px 0 0;
-moz-border-radius: 5px 5px 0 0;
@@ -189,7 +191,7 @@ menu ul,
}
#cssmenu .has-sub ul li {
- border-left: 1px solid var(--i2poffwhite);
+ border-left: 1px #363A68;
}
#cssmenu .has-sub ul li.has-sub > div.menuitem:after {
@@ -201,9 +203,9 @@ menu ul,
}
#cssmenu .has-sub ul li div.menuitem {
- background: var(--i2pcharcoal);
- border-bottom: 1px dotted var(--i2poffwhite);
- color: var(--i2poffwhite);
+ background:#363A68;
+ border-bottom: 1px solid #ECF3FF;
+ color: #FFFAF0;
font-size: 9pt;
display: block;
line-height: 120%;
@@ -303,12 +305,13 @@ div#content .aside:first-child {
div#content .inner .fluid {
background-repeat: repeat-y;
- border-left: 1px solid #abcc71;
+ border-left: 1px solid #4456B7;
margin-left: 0.625rem;
}
div#content .inner .sidebar {
- border-right: 1px solid #abcc71;
+ border-right: 1px solid #4456B7;
+ border-bottom: 1px solid #4456b7;
float: left;
width: 250px;
}
@@ -404,7 +407,7 @@ div##global-footer .aside.fifth {
}
#footermenu div.footeritem {
- color: var(--i2pcharcoal);
+ color: #FFFAF0;
display: inline-block;
font-family: "URW Gothic L", "Century Gothic", sans-serif;
font-size: 1.25em;
diff --git a/i2p2www/static/styles/duck/images/i2plogo.png b/i2p2www/static/styles/duck/images/i2plogo.png
index 809d30052e1e2c8cb7ff7119418e4ebf7251eef5..326a544991f8d7482bc2ddc645c8a3060b74751b 100644
Binary files a/i2p2www/static/styles/duck/images/i2plogo.png and b/i2p2www/static/styles/duck/images/i2plogo.png differ
diff --git a/i2p2www/static/styles/duck/widescreen.css b/i2p2www/static/styles/duck/widescreen.css
index eca5764ebf44fffbda08200b91780b2a5ec20e6a..f48f00c42e122492a9e7f2a62039c7eba4d73029 100644
--- a/i2p2www/static/styles/duck/widescreen.css
+++ b/i2p2www/static/styles/duck/widescreen.css
@@ -1,5 +1,4 @@
div#content .inner .fluid {
- border-right: 1px solid #abcc71;
margin-right: 22%;
}
diff --git a/i2p2www/templatevars.py b/i2p2www/templatevars.py
index 3819cdeb33add958403f50b06ae9a73099f03b89..ec6d9f7d014dac628005f5b161dfcdbb0709e7fa 100644
--- a/i2p2www/templatevars.py
+++ b/i2p2www/templatevars.py
@@ -190,9 +190,9 @@ def utility_processor():
# Shorthand for getting the logo for the current theme
def get_logo_for_theme():
- logo = 'styles/' + g.theme + '/images/i2plogo.svg'
+ logo = 'styles/' + g.theme + '/images/i2plogo.png'
if not os.path.isfile(safe_join(STATIC_DIR, logo)):
- logo = 'images/i2plogo.svg'
+ logo = 'images/i2plogo.png'
return logo
def get_current_version(string=None, ver=None):
diff --git a/licenses/LICENSE-fontawesome.txt b/licenses/LICENSE-fontawesome.txt
new file mode 100644
index 0000000000000000000000000000000000000000..dbadee1ebe83b6cb7ce92bb528ba512a073746fb
--- /dev/null
+++ b/licenses/LICENSE-fontawesome.txt
@@ -0,0 +1,411 @@
+Fontawesome license file:
+
+Attribution 4.0 International
+
+=======================================================================
+
+Creative Commons Corporation ("Creative Commons") is not a law firm and
+does not provide legal services or legal advice. Distribution of
+Creative Commons public licenses does not create a lawyer-client or
+other relationship. Creative Commons makes its licenses and related
+information available on an "as-is" basis. Creative Commons gives no
+warranties regarding its licenses, any material licensed under their
+terms and conditions, or any related information. Creative Commons
+disclaims all liability for damages resulting from their use to the
+fullest extent possible.
+
+Using Creative Commons Public Licenses
+
+Creative Commons public licenses provide a standard set of terms and
+conditions that creators and other rights holders may use to share
+original works of authorship and other material subject to copyright
+and certain other rights specified in the public license below. The
+following considerations are for informational purposes only, are not
+exhaustive, and do not form part of our licenses.
+
+ Considerations for licensors: Our public licenses are
+ intended for use by those authorized to give the public
+ permission to use material in ways otherwise restricted by
+ copyright and certain other rights. Our licenses are
+ irrevocable. Licensors should read and understand the terms
+ and conditions of the license they choose before applying it.
+ Licensors should also secure all rights necessary before
+ applying our licenses so that the public can reuse the
+ material as expected. Licensors should clearly mark any
+ material not subject to the license. This includes other CC-
+ licensed material, or material used under an exception or
+ limitation to copyright. More considerations for licensors:
+ wiki.creativecommons.org/Considerations_for_licensors
+
+ Considerations for the public: By using one of our public
+ licenses, a licensor grants the public permission to use the
+ licensed material under specified terms and conditions. If
+ the licensor's permission is not necessary for any reason--for
+ example, because of any applicable exception or limitation to
+ copyright--then that use is not regulated by the license. Our
+ licenses grant only permissions under copyright and certain
+ other rights that a licensor has authority to grant. Use of
+ the licensed material may still be restricted for other
+ reasons, including because others have copyright or other
+ rights in the material. A licensor may make special requests,
+ such as asking that all changes be marked or described.
+ Although not required by our licenses, you are encouraged to
+ respect those requests where reasonable. More considerations
+ for the public:
+ wiki.creativecommons.org/Considerations_for_licensees
+
+=======================================================================
+
+Creative Commons Attribution 4.0 International Public License
+
+By exercising the Licensed Rights (defined below), You accept and agree
+to be bound by the terms and conditions of this Creative Commons
+Attribution 4.0 International Public License ("Public License"). To the
+extent this Public License may be interpreted as a contract, You are
+granted the Licensed Rights in consideration of Your acceptance of
+these terms and conditions, and the Licensor grants You such rights in
+consideration of benefits the Licensor receives from making the
+Licensed Material available under these terms and conditions.
+
+
+Section 1 -- Definitions.
+
+ a. Adapted Material means material subject to Copyright and Similar
+ Rights that is derived from or based upon the Licensed Material
+ and in which the Licensed Material is translated, altered,
+ arranged, transformed, or otherwise modified in a manner requiring
+ permission under the Copyright and Similar Rights held by the
+ Licensor. For purposes of this Public License, where the Licensed
+ Material is a musical work, performance, or sound recording,
+ Adapted Material is always produced where the Licensed Material is
+ synched in timed relation with a moving image.
+
+ b. Adapter's License means the license You apply to Your Copyright
+ and Similar Rights in Your contributions to Adapted Material in
+ accordance with the terms and conditions of this Public License.
+
+ c. Copyright and Similar Rights means copyright and/or similar rights
+ closely related to copyright including, without limitation,
+ performance, broadcast, sound recording, and Sui Generis Database
+ Rights, without regard to how the rights are labeled or
+ categorized. For purposes of this Public License, the rights
+ specified in Section 2(b)(1)-(2) are not Copyright and Similar
+ Rights.
+
+ d. Effective Technological Measures means those measures that, in the
+ absence of proper authority, may not be circumvented under laws
+ fulfilling obligations under Article 11 of the WIPO Copyright
+ Treaty adopted on December 20, 1996, and/or similar international
+ agreements.
+
+ e. Exceptions and Limitations means fair use, fair dealing, and/or
+ any other exception or limitation to Copyright and Similar Rights
+ that applies to Your use of the Licensed Material.
+
+ f. Licensed Material means the artistic or literary work, database,
+ or other material to which the Licensor applied this Public
+ License.
+
+ g. Licensed Rights means the rights granted to You subject to the
+ terms and conditions of this Public License, which are limited to
+ all Copyright and Similar Rights that apply to Your use of the
+ Licensed Material and that the Licensor has authority to license.
+
+ h. Licensor means the individual(s) or entity(ies) granting rights
+ under this Public License.
+
+ i. Share means to provide material to the public by any means or
+ process that requires permission under the Licensed Rights, such
+ as reproduction, public display, public performance, distribution,
+ dissemination, communication, or importation, and to make material
+ available to the public including in ways that members of the
+ public may access the material from a place and at a time
+ individually chosen by them.
+
+ j. Sui Generis Database Rights means rights other than copyright
+ resulting from Directive 96/9/EC of the European Parliament and of
+ the Council of 11 March 1996 on the legal protection of databases,
+ as amended and/or succeeded, as well as other essentially
+ equivalent rights anywhere in the world.
+
+ k. You means the individual or entity exercising the Licensed Rights
+ under this Public License. Your has a corresponding meaning.
+
+
+Section 2 -- Scope.
+
+ a. License grant.
+
+ 1. Subject to the terms and conditions of this Public License,
+ the Licensor hereby grants You a worldwide, royalty-free,
+ non-sublicensable, non-exclusive, irrevocable license to
+ exercise the Licensed Rights in the Licensed Material to:
+
+ a. reproduce and Share the Licensed Material, in whole or
+ in part; and
+
+ b. produce, reproduce, and Share Adapted Material.
+
+ 2. Exceptions and Limitations. For the avoidance of doubt, where
+ Exceptions and Limitations apply to Your use, this Public
+ License does not apply, and You do not need to comply with
+ its terms and conditions.
+
+ 3. Term. The term of this Public License is specified in Section
+ 6(a).
+
+ 4. Media and formats; technical modifications allowed. The
+ Licensor authorizes You to exercise the Licensed Rights in
+ all media and formats whether now known or hereafter created,
+ and to make technical modifications necessary to do so. The
+ Licensor waives and/or agrees not to assert any right or
+ authority to forbid You from making technical modifications
+ necessary to exercise the Licensed Rights, including
+ technical modifications necessary to circumvent Effective
+ Technological Measures. For purposes of this Public License,
+ simply making modifications authorized by this Section 2(a)
+ (4) never produces Adapted Material.
+
+ 5. Downstream recipients.
+
+ a. Offer from the Licensor -- Licensed Material. Every
+ recipient of the Licensed Material automatically
+ receives an offer from the Licensor to exercise the
+ Licensed Rights under the terms and conditions of this
+ Public License.
+
+ b. No downstream restrictions. You may not offer or impose
+ any additional or different terms or conditions on, or
+ apply any Effective Technological Measures to, the
+ Licensed Material if doing so restricts exercise of the
+ Licensed Rights by any recipient of the Licensed
+ Material.
+
+ 6. No endorsement. Nothing in this Public License constitutes or
+ may be construed as permission to assert or imply that You
+ are, or that Your use of the Licensed Material is, connected
+ with, or sponsored, endorsed, or granted official status by,
+ the Licensor or others designated to receive attribution as
+ provided in Section 3(a)(1)(A)(i).
+
+ b. Other rights.
+
+ 1. Moral rights, such as the right of integrity, are not
+ licensed under this Public License, nor are publicity,
+ privacy, and/or other similar personality rights; however, to
+ the extent possible, the Licensor waives and/or agrees not to
+ assert any such rights held by the Licensor to the limited
+ extent necessary to allow You to exercise the Licensed
+ Rights, but not otherwise.
+
+ 2. Patent and trademark rights are not licensed under this
+ Public License.
+
+ 3. To the extent possible, the Licensor waives any right to
+ collect royalties from You for the exercise of the Licensed
+ Rights, whether directly or through a collecting society
+ under any voluntary or waivable statutory or compulsory
+ licensing scheme. In all other cases the Licensor expressly
+ reserves any right to collect such royalties.
+
+
+Section 3 -- License Conditions.
+
+Your exercise of the Licensed Rights is expressly made subject to the
+following conditions.
+
+ a. Attribution.
+
+ 1. If You Share the Licensed Material (including in modified
+ form), You must:
+
+ a. retain the following if it is supplied by the Licensor
+ with the Licensed Material:
+
+ i. identification of the creator(s) of the Licensed
+ Material and any others designated to receive
+ attribution, in any reasonable manner requested by
+ the Licensor (including by pseudonym if
+ designated);
+
+ ii. a copyright notice;
+
+ iii. a notice that refers to this Public License;
+
+ iv. a notice that refers to the disclaimer of
+ warranties;
+
+ v. a URI or hyperlink to the Licensed Material to the
+ extent reasonably practicable;
+
+ b. indicate if You modified the Licensed Material and
+ retain an indication of any previous modifications; and
+
+ c. indicate the Licensed Material is licensed under this
+ Public License, and include the text of, or the URI or
+ hyperlink to, this Public License.
+
+ 2. You may satisfy the conditions in Section 3(a)(1) in any
+ reasonable manner based on the medium, means, and context in
+ which You Share the Licensed Material. For example, it may be
+ reasonable to satisfy the conditions by providing a URI or
+ hyperlink to a resource that includes the required
+ information.
+
+ 3. If requested by the Licensor, You must remove any of the
+ information required by Section 3(a)(1)(A) to the extent
+ reasonably practicable.
+
+ 4. If You Share Adapted Material You produce, the Adapter's
+ License You apply must not prevent recipients of the Adapted
+ Material from complying with this Public License.
+
+
+Section 4 -- Sui Generis Database Rights.
+
+Where the Licensed Rights include Sui Generis Database Rights that
+apply to Your use of the Licensed Material:
+
+ a. for the avoidance of doubt, Section 2(a)(1) grants You the right
+ to extract, reuse, reproduce, and Share all or a substantial
+ portion of the contents of the database;
+
+ b. if You include all or a substantial portion of the database
+ contents in a database in which You have Sui Generis Database
+ Rights, then the database in which You have Sui Generis Database
+ Rights (but not its individual contents) is Adapted Material; and
+
+ c. You must comply with the conditions in Section 3(a) if You Share
+ all or a substantial portion of the contents of the database.
+
+For the avoidance of doubt, this Section 4 supplements and does not
+replace Your obligations under this Public License where the Licensed
+Rights include other Copyright and Similar Rights.
+
+
+Section 5 -- Disclaimer of Warranties and Limitation of Liability.
+
+ a. UNLESS OTHERWISE SEPARATELY UNDERTAKEN BY THE LICENSOR, TO THE
+ EXTENT POSSIBLE, THE LICENSOR OFFERS THE LICENSED MATERIAL AS-IS
+ AND AS-AVAILABLE, AND MAKES NO REPRESENTATIONS OR WARRANTIES OF
+ ANY KIND CONCERNING THE LICENSED MATERIAL, WHETHER EXPRESS,
+ IMPLIED, STATUTORY, OR OTHER. THIS INCLUDES, WITHOUT LIMITATION,
+ WARRANTIES OF TITLE, MERCHANTABILITY, FITNESS FOR A PARTICULAR
+ PURPOSE, NON-INFRINGEMENT, ABSENCE OF LATENT OR OTHER DEFECTS,
+ ACCURACY, OR THE PRESENCE OR ABSENCE OF ERRORS, WHETHER OR NOT
+ KNOWN OR DISCOVERABLE. WHERE DISCLAIMERS OF WARRANTIES ARE NOT
+ ALLOWED IN FULL OR IN PART, THIS DISCLAIMER MAY NOT APPLY TO YOU.
+
+ b. TO THE EXTENT POSSIBLE, IN NO EVENT WILL THE LICENSOR BE LIABLE
+ TO YOU ON ANY LEGAL THEORY (INCLUDING, WITHOUT LIMITATION,
+ NEGLIGENCE) OR OTHERWISE FOR ANY DIRECT, SPECIAL, INDIRECT,
+ INCIDENTAL, CONSEQUENTIAL, PUNITIVE, EXEMPLARY, OR OTHER LOSSES,
+ COSTS, EXPENSES, OR DAMAGES ARISING OUT OF THIS PUBLIC LICENSE OR
+ USE OF THE LICENSED MATERIAL, EVEN IF THE LICENSOR HAS BEEN
+ ADVISED OF THE POSSIBILITY OF SUCH LOSSES, COSTS, EXPENSES, OR
+ DAMAGES. WHERE A LIMITATION OF LIABILITY IS NOT ALLOWED IN FULL OR
+ IN PART, THIS LIMITATION MAY NOT APPLY TO YOU.
+
+ c. The disclaimer of warranties and limitation of liability provided
+ above shall be interpreted in a manner that, to the extent
+ possible, most closely approximates an absolute disclaimer and
+ waiver of all liability.
+
+
+Section 6 -- Term and Termination.
+
+ a. This Public License applies for the term of the Copyright and
+ Similar Rights licensed here. However, if You fail to comply with
+ this Public License, then Your rights under this Public License
+ terminate automatically.
+
+ b. Where Your right to use the Licensed Material has terminated under
+ Section 6(a), it reinstates:
+
+ 1. automatically as of the date the violation is cured, provided
+ it is cured within 30 days of Your discovery of the
+ violation; or
+
+ 2. upon express reinstatement by the Licensor.
+
+ For the avoidance of doubt, this Section 6(b) does not affect any
+ right the Licensor may have to seek remedies for Your violations
+ of this Public License.
+
+ c. For the avoidance of doubt, the Licensor may also offer the
+ Licensed Material under separate terms or conditions or stop
+ distributing the Licensed Material at any time; however, doing so
+ will not terminate this Public License.
+
+ d. Sections 1, 5, 6, 7, and 8 survive termination of this Public
+ License.
+
+
+Section 7 -- Other Terms and Conditions.
+
+ a. The Licensor shall not be bound by any additional or different
+ terms or conditions communicated by You unless expressly agreed.
+
+ b. Any arrangements, understandings, or agreements regarding the
+ Licensed Material not stated herein are separate from and
+ independent of the terms and conditions of this Public License.
+
+
+Section 8 -- Interpretation.
+
+ a. For the avoidance of doubt, this Public License does not, and
+ shall not be interpreted to, reduce, limit, restrict, or impose
+ conditions on any use of the Licensed Material that could lawfully
+ be made without permission under this Public License.
+
+ b. To the extent possible, if any provision of this Public License is
+ deemed unenforceable, it shall be automatically reformed to the
+ minimum extent necessary to make it enforceable. If the provision
+ cannot be reformed, it shall be severed from this Public License
+ without affecting the enforceability of the remaining terms and
+ conditions.
+
+ c. No term or condition of this Public License will be waived and no
+ failure to comply consented to unless expressly agreed to by the
+ Licensor.
+
+ d. Nothing in this Public License constitutes or may be interpreted
+ as a limitation upon, or waiver of, any privileges and immunities
+ that apply to the Licensor or You, including from the legal
+ processes of any jurisdiction or authority.
+
+
+=======================================================================
+
+Creative Commons is not a party to its public
+licenses. Notwithstanding, Creative Commons may elect to apply one of
+its public licenses to material it publishes and in those instances
+will be considered the “Licensor.†The text of the Creative Commons
+public licenses is dedicated to the public domain under the CC0 Public
+Domain Dedication. Except for the limited purpose of indicating that
+material is shared under a Creative Commons public license or as
+otherwise permitted by the Creative Commons policies published at
+creativecommons.org/policies, Creative Commons does not authorize the
+use of the trademark "Creative Commons" or any other trademark or logo
+of Creative Commons without its prior written consent including,
+without limitation, in connection with any unauthorized modifications
+to any of its public licenses or any other arrangements,
+understandings, or agreements concerning use of licensed material. For
+the avoidance of doubt, this paragraph does not form part of the
+public licenses.
+
+Creative Commons may be contacted at creativecommons.org.
+
+
+======================================================================
+======================================================================
+
+As the list of changed icons was too extensive to fit into either a
+mtn checkin or into the history.txt, they are appended here for
+reference.
+
+./i2p.i2p/i2p2www/static/images/social/contact.png
+./i2p.i2p/i2p2www/static/images/social/reddit-alien-brands.png
+./i2p.i2p/i2p2www/static/images/social/twitter-brands.png
+
+