debian updates

i2p2www/pages/downloads/debian.html

@@ -3,6 +3,14 @@
 {% block content %}
 <h1>{{ _('Debian I2P Packages') }}</h1>
 
+<h2 id="bionic">{{ _('Debian Sid, Ubuntu Bionic 18.04') }}</h2>
+{% trans -%}
+I2P is available in the official repositories for Ubuntu Bionic 18.04 and Debian Sid.
+Install the "i2p" package using your package manager, as you would any other package.
+The instructions below are not required.
+{%- endtrans %}
+
+<h2 id="others">{{ _('Debian Stretch and older, Ubuntu Artful 17.10 and older') }}</h2>
 {% trans -%}
 The Debian packages
 have been tested and <em>should </em>work on x86/x86_64 platforms running:
@@ -24,7 +32,7 @@ with these packages on <a href="{{ trac }}">Trac</a> at
   <li>{% trans %}Option 2: <a href="#debian">Debian</a> (including Debian-derivatives){% endtrans %}</li>
 </ul>
 
-<h2 id="ubuntu">{{ _('Instructions for Ubuntu 12.04 Precise Pangolin (and newer) and derivatives like Linux Mint &amp; Trisquel') }}</h2>
+<h2 id="ubuntu">{{ _('Instructions for Ubuntu and derivatives like Linux Mint &amp; Trisquel') }}</h2>
 <h5>{{ _('Adding the PPA via the command line and installing I2P') }}</h5>
 <ol>
   <li>
@@ -80,7 +88,7 @@ part of <a href="#Post-install_work">starting I2P</a> and configuring it for you
 
 <h2 id="debian">{{ _('Instructions for Debian') }}</h2>
 
-<em>Currently supported architectures include amd64, i386, armel, armhf (for Raspbian), and powerpc.</em>
+<em>Currently supported architectures include amd64, i386, armel, armhf (for Raspbian).</em>
 
 <p>{% trans -%}
 Note: The steps below should be performed with root access (i.e., switching
@@ -96,32 +104,19 @@ For Wheezy:<br>
 </pre>
 
 <br />
-For Jessie (stable):<br />
+For Jessie:<br />
 <pre>
     <code>deb https://deb.i2p2.de/ jessie main
     deb-src https://deb.i2p2.de/ jessie main</code>
 </pre>
 
 <br />
-For Stretch (not available until I2P 0.9.30):<br />
+For Stretch (stable):<br />
 <pre>
      <code>deb https://deb.i2p2.de/ stretch main
      deb-src https://deb.i2p2.de/ stretch main</code>
 </pre>
 
-<br />
-For Stretch (I2P development builds for testing):<br />
-<pre>
-     <code>deb https://deb.i2p2.de/ stretch-testing main
-     deb-src https://deb.i2p2.de/ stretch-testing main</code>
-</pre>
-
-<br />
-For Testing or Unstable (Sid) (will not work until I2P 0.9.30):<br />
-<pre>
-     <code>deb https://deb.i2p2.de/ unstable main
-     deb-src https://deb.i2p2.de/ unstable main</code>
-</pre>
   </li>
 
   <li>{% trans repokey=url_for('static', filename='i2p-debian-repo.key.asc') -%}