diff --git a/www.i2p2/pages/debian.html b/www.i2p2/pages/debian.html
new file mode 100644
index 00000000..b9999878
--- /dev/null
+++ b/www.i2p2/pages/debian.html
@@ -0,0 +1,142 @@
+
+{% extends "_layout.html" %}
+{% block title %}Debian/Ubuntu{% endblock %}
+{% block content %}
+
Debian I2P Packages
+
+The packages hosted on the I2P Launchpad site
+have been tested and confirmed to work on x86/x86_64 platforms running
+
+Although untested, the I2P packages may work on systems not listed
+above.
+
+ - Option 1: Recent versions of Ubuntu and
+its derivatives (Try this if you're
+not using Debian)
+
+ - Option 2: Debian (including systems based
+on Debian and older
+versions of Ubuntu)
+ - Option 3: Non-Linux (and possibly
+Non-x86
+architectures)
+
+
+Instructions for Linux Mint, Trisquel, & Ubuntu (Lucid and
+later)
+
+ - Open a terminal and enter:
+ sudo apt-add-repository
+ppa:i2p-maintainers/i2p
+This command will add the PPA to /etc/apt/sources.list.d and fetch the
+gpg key that the repository has been signed with. The GPG key ensures
+that the packages have not been tampered with since being built.
+ - Notify your package manager of the new PPA by entering
+ sudo apt-get update
+This command will retrieve the latest list of software from each
+repository that is enabled on your system, including the I2P PPA that
+was added with the earlier command.
+ - You are now ready to install I2P!
+ sudo apt-get install i2p
+
+After the installation process completes you can move on to the next
+part of starting
+I2P and configuring it for your system.
+Instructions for Debian (Lenny and newer)
+
+The steps below should be performed with root access (i.e., switching
+user to root with "su" or by prefixing each command with "sudo").
+
+ - Add the following entries to
/etc/apt/sources.list.d/i2p.list
+
+ deb
+http://ppa.launchpad.net/i2p-maintainers/i2p/ubuntu natty
+main
+ deb-src
+http://ppa.launchpad.net/i2p-maintainers/i2p/ubuntu natty
+main
+These two lines should work regardless of the Debian version installed.
+ - Add the GPG key that signs the repository with the following
+command:
+ apt-key adv --keyserver keyserver.ubuntu.com
+--recv-keys EB2CC88B
+
+You'll have output like the following if the command was successful:
+ 
+ - Notify your package manager of the new PPA by entering
+ apt-get update
+This command will retrieve the latest list of software from every
+repository enabled on your system, including the I2P PPA added in step
+1.
+ - You are now ready to install I2P!
+ apt-get install i2p
+
+After the installation process completes you can move on to the next
+part of starting
+I2P and configuring it for your system.
+Instructions for Non-Linux / Non-x86
+
+The steps below should be performed with root access (i.e., switching
+user to root with "su" or by prefixing each command with "sudo").
+
+ - Download the i2p-router
+package from the PPA.
+
+
+ - Make sure you have Java installed. Running apt-get install default-jvm should
+be sufficient.
+You are now ready to install I2P!
+ dpkg -i i2p-router_*.deb
+ - It is recommended to compile jbigi for
+your system to acheive better performance. Instructions are available here.
+
+After the installation process completes you can move on to the next
+part of starting
+I2P and configuring it for your system.
+Post-install work
+Using these I2P packages the I2P router can be started in the following
+three ways:
+
+ - "on demand" using the i2prouter script. Simply run "i2prouter
+start" from a command prompt. (Note: Do not use
+sudo or run it as root!)
+ - "on demand" without the java service wrapper
+(needed on non-Linux/non-x86 systems) by running "i2prouter-nowrapper".
+(Note: Do not
+use sudo or run it as root!)
+ - as a service that automatically runs when your system boots, even
+before logging in. The service can be enabled with "dpkg-reconfigure
+i2p" as root or using sudo. This is the recommended means of operation.
+
+
+When installing for the first time, please remember to adjust
+your NAT/firewall
+if you can, bearing in mind the Internet-facing ports I2P uses,
+described here among other ports.
+If you have successfully opened your port to inbound TCP, also enable
+inbound TCP on the
+configuration page.
+
+Also, please review and adjust the bandwidth settings on the
+configuration page,
+as the default settings of 96 KBps down / 40 KBps up are fairly slow.
+
+
+If you want to reach eepsites via your browser, have a look on the browser proxy setup page for a easy
+howto.
+
+{% endblock %}
diff --git a/www.i2p2/pages/download.html b/www.i2p2/pages/download.html
index ecf290b8..39aa2b40 100644
--- a/www.i2p2/pages/download.html
+++ b/www.i2p2/pages/download.html
@@ -9,29 +9,28 @@ Java Runtime 1.5 or higher.
IcedTea6
recommended)
-Determine your installed Java version here
+Determine your installed Java version here
or type java -version at your command prompt.
Clean installs
-- Graphical installer:
+ - Graphical installer:
i2pinstall_0.8.6.exe
(SHA256
0bd9927d607d2ac9986732b29b1c4b15a0fbb3521b2fa14dded10d5a57333efc
- sig)
+ sig)
Download that file and run it. If you're not on windows, you can
type java -jar i2pinstall_0.8.6.exe
(yes, really)
-- Command line (headless) install:
+ - Command line (headless) install:
Download the graphical installer file above and
run java -jar i2pinstall_0.8.6.exe -console
from the command line.
- This will work on windows. linux, and mac (yes really).
-
-- Source install:
+ This will work on windows. linux, and mac (yes really). - Debian package
+- Source install:
i2psource_0.8.6.tar.bz2
(SHA256
d784ab7ccfdf60f7ad71d625cd88c88c9290d3aeecfa419e03a7930e3faa72d0
- sig)
+ sig)
Alternately, you can fetch the source from monotone.
-
+
Run (tar xjvf i2psource_0.8.6.tar.bz2 ; cd i2p-0.8.6 ; ant pkg)
then either
run the GUI installer or headless install as above
@@ -85,18 +84,18 @@ may get a "downloaded version is not greater than current version" error,
and should use the manual update method below.
If you are running 0.7.4 or earlier, please see
-the 0.7.5 release notes
+the 0.7.5 release notes
for important information about how to configure your router to automatically
receive the release.
If you are running 0.6.1.30 or earlier, please see
-instructions
+instructions
for important information about how to configure your router to automatically
receive the release.
-- If you have reconfigured your router following the instructions, you should see a link on your
+
- If you have reconfigured your router following the instructions, you should see a link on your
router console allowing
you to download and install the new release by just clicking on that
link.
diff --git a/www.i2p2/static/images/add-key-terminal.png b/www.i2p2/static/images/add-key-terminal.png
new file mode 100644
index 00000000..6f2c8491
Binary files /dev/null and b/www.i2p2/static/images/add-key-terminal.png differ